@patterkit/runtime 0.2.0 → 0.2.1

package/dist/index.js

@@ -1,5 +1,6 @@
 // src/engine.ts
 import { evaluate, deserialiseAst } from "@wildwinter/expr";
+import { matchedSpecificity as scoreSpecificity } from "@wildwinter/expr-specificity";
 import { ScopeRegistry } from "@wildwinter/scoperegistry";
 import { patterDialect, interpolate, splitRef, stripCaptions } from "@patterkit/dialect";
 import { walkNodes, effectiveGameId, castStringKey, DEFAULT_CAPTION_DELIMITERS, DEFAULT_CAPTION_CHARACTER } from "@patterkit/model";
@@ -1005,21 +1006,8 @@ var Flow = class {
    * node (comparisons, scoped vars, literals, other calls) is an atom, evaluated whole.
    */
   matchedSpec(node, want) {
-    if (node.kind === "binary" && (node.op === "and" || node.op === "or")) {
-      const behaveAsAnd = node.op === "and" === want;
-      const l = this.matchedSpec(node.left, want);
-      const r = this.matchedSpec(node.right, want);
-      return behaveAsAnd ? l > 0 && r > 0 ? l + r : 0 : Math.max(l, r);
-    }
-    if (node.kind === "unary" && node.op === "not") {
-      return this.matchedSpec(node.operand, !want);
-    }
-    if (node.kind === "call" && node.name === "check_flags") {
-      const operands = Math.max(1, node.args.length - 1);
-      const hit = truthy(evaluate(node, this.evalCtx, patterDialect));
-      return want ? hit ? operands : 0 : hit ? 0 : 1;
-    }
-    return truthy(evaluate(node, this.evalCtx, patterDialect)) === want ? 1 : 0;
+    const evalTruthy = (n) => truthy(evaluate(n, this.evalCtx, patterDialect));
+    return scoreSpecificity(node, evalTruthy, { want });
   }
   /** A selector's cursor state - shared across flows (`group.shared`) or this flow's own. */
   selectorState(group) {