merge-merge-conflict.ts -- fix merge onMergeConflict

TODO.md

@@ -4,8 +4,6 @@
 
 > https://github.com/cicada-lang/propagator/issues/9
 
-fix `merge` on`MergeConflict`
-
 # 4.4 Dependencies Improve Search
 
 > https://github.com/cicada-lang/propagator/issues/4

src/merge-conflict/MergeConflict.ts

@@ -5,3 +5,7 @@ export type MergeConflict = {
 export const theMergeConflict: MergeConflict = {
   "@type": "MergeConflict",
 }
+
+export function isMergeConflict(x: any): x is MergeConflict {
+  return x === theMergeConflict
+}

src/merge-conflict/detectMergeConflict.ts

@@ -1,10 +1,10 @@
 import { isBelief } from "../belief/index.js"
 import { defineGeneric } from "../generic/defineGeneric.js"
 import { defineHandler } from "../generic/index.js"
-import { theMergeConflict } from "./MergeConflict.js"
+import { isMergeConflict } from "./MergeConflict.js"
 
 export const detectMergeConflict = defineGeneric({
-  default: (x) => x === theMergeConflict,
+  default: isMergeConflict,
 })
 
 // If it so happens that two supported values contradict each other,

src/merge/index.ts

@@ -1,6 +1,7 @@
 export * from "./merge-belief-system.js"
 export * from "./merge-belief.js"
 export * from "./merge-interval.js"
+export * from "./merge-merge-conflict.js"
 export * from "./merge-nothing.js"
 export * from "./merge-number.js"
 export * from "./merge.js"

src/merge/isAnything.ts

@@ -0,0 +1,3 @@
+export function isAnything(_: any): true {
+  return true
+}

src/merge/merge-merge-conflict.ts

@@ -0,0 +1,15 @@
+import { defineHandler } from "../generic/index.js"
+import { isMergeConflict, theMergeConflict } from "../merge-conflict/index.js"
+import { isAnything } from "./isAnything.js"
+import { merge } from "./merge.js"
+
+defineHandler(
+  merge,
+  [isAnything, isMergeConflict],
+  (content, increment) => theMergeConflict,
+)
+defineHandler(
+  merge,
+  [isMergeConflict, isAnything],
+  (content, increment) => theMergeConflict,
+)

src/merge/merge-nothing.ts

@@ -1,10 +1,7 @@
 import { defineHandler } from "../generic/index.js"
 import { isNothing } from "../nothing/index.js"
+import { isAnything } from "./isAnything.js"
 import { merge } from "./merge.js"
 
-function isAnything(x: any): true {
-  return true
-}
-
 defineHandler(merge, [isAnything, isNothing], (content, increment) => content)
 defineHandler(merge, [isNothing, isAnything], (content, increment) => increment)