[refactoring] extract merge-number

TODO.md

@@ -1,4 +1,3 @@
-[refactoring] extract `merge-number`
 [refactoring] extract `merge-nothing`
 
 [refactoring] extract `implies`

src/merge/index.ts

@@ -2,7 +2,7 @@ export * from "./detectMergeConflict.js"
 export * from "./merge-belief-system.js"
 export * from "./merge-belief.js"
 export * from "./merge-interval.js"
+export * from "./merge-number.js"
 export * from "./merge.js"
-// export * from "./merge-number.js"
 // export * from "./merge-nothing.js"
 export * from "./MergeConflict.js"

src/merge/merge-number.ts

@@ -0,0 +1,8 @@
+import { defineHandler } from "../generic/index.js"
+import { isNumber } from "../utils/isNumber.js"
+import { merge } from "./merge.js"
+import { theMergeConflict } from "./MergeConflict.js"
+
+defineHandler(merge, [isNumber, isNumber], (content, increment) =>
+  increment === content ? content : theMergeConflict,
+)

src/merge/merge.ts

@@ -1,8 +1,6 @@
 import { isNothing } from "../cell/index.js"
 import { defineGeneric, defineHandler } from "../generic/index.js"
-import { isNumber } from "../utils/isNumber.js"
 import { log } from "../utils/log.js"
-import { theMergeConflict } from "./MergeConflict.js"
 
 // # The contract of `merge`
 // The contract of the generic function merge is that it takes two
@@ -79,7 +77,3 @@ function isAnything(x: any): true {
 
 defineHandler(merge, [isAnything, isNothing], (content, increment) => content)
 defineHandler(merge, [isNothing, isAnything], (content, increment) => increment)
-
-defineHandler(merge, [isNumber, isNumber], (content, increment) =>
-  increment === content ? content : theMergeConflict,
-)