mongo-query-normalizer 0.1.0 → 0.2.0

package/dist/normalize.js

@@ -5,21 +5,20 @@ const hash_1 = require("./ast/hash");
 const compile_1 = require("./compile/compile");
 const normalize_context_1 = require("./normalize-context");
 const metrics_1 = require("./observe/metrics");
-const level_boundary_hints_1 = require("./observe/level-boundary-hints");
+const warnings_1 = require("./observe/warnings");
 const resolve_1 = require("./options/resolve");
 const canonicalize_1 = require("./passes/canonicalize");
 const normalize_predicate_1 = require("./passes/normalize-predicate");
 const normalize_shape_1 = require("./passes/normalize-shape");
 const simplify_1 = require("./passes/simplify");
+const normalize_scope_1 = require("./scope/normalize-scope");
 const parse_1 = require("./parse/parse");
-const hoist_common_predicates_from_or_1 = require("./rules/experimental/hoist-common-predicates-from-or");
-const detect_common_predicates_in_or_1 = require("./rules/logical/detect-common-predicates-in-or");
+const detect_common_predicates_in_or_1 = require("./rules/or-common-predicate/detect-common-predicates-in-or");
 /**
- * 主入口：parse →（shape / predicate 直至稳定）→（可选 logical / experimental）→ canonicalize → compile。
+ * 主入口：parse →（shape / predicate / scope 直至稳定）→（scope 下可选 observe-only 的 detectCommonPredicatesInOr）→ canonicalize → compile。
  */
 function normalizeQuery(query, options) {
     const normalizeContext = (0, normalize_context_1.createNormalizeContext)((0, resolve_1.resolveNormalizeOptions)(options));
-    (0, level_boundary_hints_1.applyPreviewLevelBoundaryHints)(normalizeContext);
     const beforeNode = (0, parse_1.parseQuery)(query, normalizeContext);
     recordBeforeObservation(normalizeContext, beforeNode);
     let workingNode = beforeNode;
@@ -42,53 +41,97 @@ function recordAfterObservation(normalizeContext, node) {
     normalizeContext.afterHash = (0, hash_1.hashNode)(node);
 }
 const MAX_NORMALIZE_STABLE_ROUNDS = 8;
-function runNormalizePipeline(root, normalizeContext) {
-    let node = root;
-    const shouldRunPredicate = normalizeContext.options.level === "predicate" ||
-        normalizeContext.options.level === "logical" ||
-        normalizeContext.options.level === "experimental";
-    for (let o = 0; o < MAX_NORMALIZE_STABLE_ROUNDS; o++) {
-        const outerStart = (0, hash_1.hashNode)(node);
+function runStabilizationPhases(node, normalizeContext, root, shouldRunPredicate, shouldRunScope, emitInnerNonConvergeWarnings) {
+    let n = node;
+    {
+        let shapeConverged = false;
         for (let r = 0; r < MAX_NORMALIZE_STABLE_ROUNDS; r++) {
-            const beforeRound = (0, hash_1.hashNode)(node);
-            node = (0, normalize_shape_1.normalizeShape)(node, normalizeContext);
+            const beforeRound = (0, hash_1.hashNode)(n);
+            n = (0, normalize_shape_1.normalizeShape)(n, normalizeContext);
             if (normalizeContext.bailedOut) {
                 return root;
             }
-            if ((0, hash_1.hashNode)(node) === beforeRound) {
+            if ((0, hash_1.hashNode)(n) === beforeRound) {
+                shapeConverged = true;
                 break;
             }
         }
-        if (shouldRunPredicate) {
-            for (let r = 0; r < MAX_NORMALIZE_STABLE_ROUNDS; r++) {
-                const beforeRound = (0, hash_1.hashNode)(node);
-                node = (0, normalize_predicate_1.normalizePredicate)(node, normalizeContext);
-                if (normalizeContext.bailedOut) {
-                    return root;
-                }
-                node = (0, simplify_1.simplify)(node, normalizeContext);
-                if (normalizeContext.bailedOut) {
-                    return root;
-                }
-                if ((0, hash_1.hashNode)(node) === beforeRound) {
-                    break;
-                }
+        if (!shapeConverged && emitInnerNonConvergeWarnings) {
+            (0, warnings_1.addWarning)(normalizeContext, `[mongo-query-normalizer] shape normalization did not reach a fixed point within ${MAX_NORMALIZE_STABLE_ROUNDS} internal rounds`);
+        }
+    }
+    if (shouldRunPredicate) {
+        let predicateConverged = false;
+        for (let r = 0; r < MAX_NORMALIZE_STABLE_ROUNDS; r++) {
+            const beforeRound = (0, hash_1.hashNode)(n);
+            n = (0, normalize_predicate_1.normalizePredicate)(n, normalizeContext);
+            if (normalizeContext.bailedOut) {
+                return root;
+            }
+            n = (0, simplify_1.simplify)(n, normalizeContext);
+            if (normalizeContext.bailedOut) {
+                return root;
+            }
+            if ((0, hash_1.hashNode)(n) === beforeRound) {
+                predicateConverged = true;
+                break;
             }
         }
+        if (!predicateConverged && emitInnerNonConvergeWarnings) {
+            (0, warnings_1.addWarning)(normalizeContext, `[mongo-query-normalizer] predicate normalization (with simplify) did not reach a fixed point within ${MAX_NORMALIZE_STABLE_ROUNDS} internal rounds`);
+        }
+    }
+    if (shouldRunScope) {
+        let scopeConverged = false;
+        for (let r = 0; r < MAX_NORMALIZE_STABLE_ROUNDS; r++) {
+            const beforeRound = (0, hash_1.hashNode)(n);
+            n = (0, normalize_scope_1.normalizeScope)(n, normalizeContext);
+            if (normalizeContext.bailedOut) {
+                return root;
+            }
+            n = (0, simplify_1.simplify)(n, normalizeContext);
+            if (normalizeContext.bailedOut) {
+                return root;
+            }
+            if ((0, hash_1.hashNode)(n) === beforeRound) {
+                scopeConverged = true;
+                break;
+            }
+        }
+        if (!scopeConverged && emitInnerNonConvergeWarnings) {
+            (0, warnings_1.addWarning)(normalizeContext, `[mongo-query-normalizer] scope normalization (with simplify) did not reach a fixed point within ${MAX_NORMALIZE_STABLE_ROUNDS} internal rounds`);
+        }
+    }
+    return (0, canonicalize_1.canonicalize)(n, normalizeContext);
+}
+function runNormalizePipeline(root, normalizeContext) {
+    let node = root;
+    const shouldRunPredicate = normalizeContext.options.level === "predicate" || normalizeContext.options.level === "scope";
+    const shouldRunScope = normalizeContext.options.level === "scope";
+    let outerReachedFixedPoint = false;
+    for (let o = 0; o < MAX_NORMALIZE_STABLE_ROUNDS; o++) {
+        const outerStart = (0, hash_1.hashNode)(node);
+        node = runStabilizationPhases(node, normalizeContext, root, shouldRunPredicate, shouldRunScope, true);
+        if (normalizeContext.bailedOut) {
+            return root;
+        }
         if ((0, hash_1.hashNode)(node) === outerStart) {
+            outerReachedFixedPoint = true;
             break;
         }
     }
-    const shouldRunLogicalDetect = normalizeContext.options.level === "logical" || normalizeContext.options.level === "experimental";
-    if (shouldRunLogicalDetect && normalizeContext.options.rules.detectCommonPredicatesInOr) {
-        node = (0, detect_common_predicates_in_or_1.detectCommonPredicatesInOr)(node, normalizeContext);
+    if (!outerReachedFixedPoint && !normalizeContext.bailedOut) {
+        (0, warnings_1.addWarning)(normalizeContext, `[mongo-query-normalizer] normalize pipeline did not reach an outer fixed point within ${MAX_NORMALIZE_STABLE_ROUNDS} outer rounds`);
+    }
+    if (!normalizeContext.bailedOut) {
+        node = (0, parse_1.parseQuery)((0, compile_1.compileQuery)(node, normalizeContext), normalizeContext);
+        node = runStabilizationPhases(node, normalizeContext, root, shouldRunPredicate, shouldRunScope, false);
         if (normalizeContext.bailedOut) {
             return root;
         }
     }
-    const shouldRunExperimental = normalizeContext.options.level === "experimental" && normalizeContext.options.rules.hoistCommonPredicatesFromOr;
-    if (shouldRunExperimental) {
-        node = (0, hoist_common_predicates_from_or_1.hoistCommonPredicatesFromOr)(node, normalizeContext);
+    if (normalizeContext.options.level === "scope" && normalizeContext.options.rules.detectCommonPredicatesInOr) {
+        node = (0, detect_common_predicates_in_or_1.detectCommonPredicatesInOr)(node, normalizeContext);
         if (normalizeContext.bailedOut) {
             return root;
         }
@@ -98,25 +141,35 @@ function runNormalizePipeline(root, normalizeContext) {
 }
 function buildNormalizeResult(_originalQuery, finalQuery, _beforeNode, _afterNode, normalizeContext) {
     const changed = normalizeContext.beforeHash !== normalizeContext.afterHash;
+    const meta = {
+        changed,
+        level: normalizeContext.options.level,
+        appliedRules: normalizeContext.appliedRules,
+        skippedRules: normalizeContext.skippedRules,
+        warnings: normalizeContext.warnings,
+        bailedOut: normalizeContext.bailedOut,
+        bailoutReason: normalizeContext.bailoutReason,
+        beforeHash: normalizeContext.beforeHash,
+        afterHash: normalizeContext.afterHash,
+        stats: normalizeContext.options.observe.collectMetrics && normalizeContext.beforeStats && normalizeContext.afterStats
+            ? {
+                before: normalizeContext.beforeStats,
+                after: normalizeContext.afterStats,
+            }
+            : undefined,
+    };
+    if (normalizeContext.options.observe.collectPredicateTraces) {
+        meta.predicateTraces = [...(normalizeContext.predicateTraces ?? [])];
+    }
+    if (normalizeContext.options.observe.collectScopeTraces) {
+        meta.scopeTrace = {
+            constraintRejections: [...(normalizeContext.scopeConstraintRejections ?? [])],
+            events: [...(normalizeContext.scopeTraceEvents ?? [])],
+        };
+    }
     return {
         query: finalQuery,
-        meta: {
-            changed,
-            level: normalizeContext.options.level,
-            appliedRules: normalizeContext.appliedRules,
-            skippedRules: normalizeContext.skippedRules,
-            warnings: normalizeContext.warnings,
-            bailedOut: normalizeContext.bailedOut,
-            bailoutReason: normalizeContext.bailoutReason,
-            beforeHash: normalizeContext.beforeHash,
-            afterHash: normalizeContext.afterHash,
-            stats: normalizeContext.options.observe.collectMetrics && normalizeContext.beforeStats && normalizeContext.afterStats
-                ? {
-                    before: normalizeContext.beforeStats,
-                    after: normalizeContext.afterStats,
-                }
-                : undefined,
-        },
+        meta,
     };
 }
 //# sourceMappingURL=normalize.js.map

package/dist/normalize.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize.js","sourceRoot":"","sources":["../src/normalize.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"normalize.js","sourceRoot":"","sources":["../src/normalize.ts"],"names":[],"mappings":"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"}

package/dist/options/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/options/constants.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAElG,eAAO,MAAM,aAAa,EAAE,cAAwB,CAAC;AAErD,eAAO,MAAM,cAAc,EAAE,eAG5B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,gBAG7B,CAAC;AA4EF,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,cAAc,EAAE,cAAc,CAKzE,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/options/constants.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAElG,eAAO,MAAM,aAAa,EAAE,cAAwB,CAAC;AAErD,eAAO,MAAM,cAAc,EAAE,eAG5B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,gBAK7B,CAAC;AA+DF,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,cAAc,EAAE,cAAc,CAIzE,CAAC"}

package/dist/options/constants.js

@@ -9,6 +9,8 @@ exports.DEFAULT_SAFETY = {
 exports.DEFAULT_OBSERVE = {
     collectWarnings: true,
     collectMetrics: false,
+    collectPredicateTraces: false,
+    collectScopeTraces: false,
 };
 const SORT_RULES = {
     sortLogicalChildren: true,
@@ -25,12 +27,10 @@ const PREDICATE_RULES = {
     mergeComparablePredicates: true,
     collapseContradictions: true,
 };
-const LOGICAL_EXTRA = {
+/** Default extra rules when `level` is `scope` (includes `$or` common-predicate detection). */
+const SCOPE_LEVEL_EXTRA = {
     detectCommonPredicatesInOr: true,
 };
-const EXPERIMENTAL_EXTRA = {
-    hoistCommonPredicatesFromOr: true,
-};
 function rulesForLevel(level) {
     const base = {
         ...BASE_SHAPE_RULES,
@@ -39,7 +39,6 @@ function rulesForLevel(level) {
         collapseContradictions: false,
         ...SORT_RULES,
         detectCommonPredicatesInOr: false,
-        hoistCommonPredicatesFromOr: false,
     };
     if (level === "shape") {
         return base;
@@ -51,22 +50,14 @@ function rulesForLevel(level) {
     if (level === "predicate") {
         return withPredicate;
     }
-    const withLogical = {
-        ...withPredicate,
-        ...LOGICAL_EXTRA,
-    };
-    if (level === "logical") {
-        return withLogical;
-    }
     return {
-        ...withLogical,
-        ...EXPERIMENTAL_EXTRA,
+        ...withPredicate,
+        ...SCOPE_LEVEL_EXTRA,
     };
 }
 exports.DEFAULT_RULES_BY_LEVEL = {
     shape: rulesForLevel("shape"),
     predicate: rulesForLevel("predicate"),
-    logical: rulesForLevel("logical"),
-    experimental: rulesForLevel("experimental"),
+    scope: rulesForLevel("scope"),
 };
 //# sourceMappingURL=constants.js.map

package/dist/options/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/options/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,aAAa,GAAmB,OAAO,CAAC;AAExC,QAAA,cAAc,GAAoB;IAC3C,iBAAiB,EAAE,EAAE;IACrB,kBAAkB,EAAE,GAAG;CAC1B,CAAC;AAEW,QAAA,eAAe,GAAqB;IAC7C,eAAe,EAAE,IAAI;IACrB,cAAc,EAAE,KAAK;CACxB,CAAC;AAEF,MAAM,UAAU,GAAwE;IACpF,mBAAmB,EAAE,IAAI;IACzB,mBAAmB,EAAE,IAAI;CAC5B,CAAC;AAEF,MAAM,gBAAgB,GAMlB;IACA,cAAc,EAAE,IAAI;IACpB,kBAAkB,EAAE,IAAI;IACxB,0BAA0B,EAAE,IAAI;IAChC,qBAAqB,EAAE,IAAI;CAC9B,CAAC;AAEF,MAAM,eAAe,GAGjB;IACA,yBAAyB,EAAE,IAAI;IAC/B,yBAAyB,EAAE,IAAI;IAC/B,sBAAsB,EAAE,IAAI;CAC/B,CAAC;AAEF,MAAM,aAAa,GAAuD;IACtE,0BAA0B,EAAE,IAAI;CACnC,CAAC;AAEF,MAAM,kBAAkB,GAAwD;IAC5E,2BAA2B,EAAE,IAAI;CACpC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAqB;IACxC,MAAM,IAAI,GAAmB;QACzB,GAAG,gBAAgB;QACnB,yBAAyB,EAAE,KAAK;QAChC,yBAAyB,EAAE,KAAK;QAChC,sBAAsB,EAAE,KAAK;QAC7B,GAAG,UAAU;QACb,0BAA0B,EAAE,KAAK;QACjC,2BAA2B,EAAE,KAAK;KACrC,CAAC;IAEF,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,aAAa,GAAmB;QAClC,GAAG,IAAI;QACP,GAAG,eAAe;KACrB,CAAC;IAEF,IAAI,KAAK,KAAK,WAAW,EAAE,CAAC;QACxB,OAAO,aAAa,CAAC;IACzB,CAAC;IAED,MAAM,WAAW,GAAmB;QAChC,GAAG,aAAa;QAChB,GAAG,aAAa;KACnB,CAAC;IAEF,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACtB,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,OAAO;QACH,GAAG,WAAW;QACd,GAAG,kBAAkB;KACxB,CAAC;AACN,CAAC;AAEY,QAAA,sBAAsB,GAA2C;IAC1E,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC;IAC7B,SAAS,EAAE,aAAa,CAAC,WAAW,CAAC;IACrC,OAAO,EAAE,aAAa,CAAC,SAAS,CAAC;IACjC,YAAY,EAAE,aAAa,CAAC,cAAc,CAAC;CAC9C,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/options/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,aAAa,GAAmB,OAAO,CAAC;AAExC,QAAA,cAAc,GAAoB;IAC3C,iBAAiB,EAAE,EAAE;IACrB,kBAAkB,EAAE,GAAG;CAC1B,CAAC;AAEW,QAAA,eAAe,GAAqB;IAC7C,eAAe,EAAE,IAAI;IACrB,cAAc,EAAE,KAAK;IACrB,sBAAsB,EAAE,KAAK;IAC7B,kBAAkB,EAAE,KAAK;CAC5B,CAAC;AAEF,MAAM,UAAU,GAAwE;IACpF,mBAAmB,EAAE,IAAI;IACzB,mBAAmB,EAAE,IAAI;CAC5B,CAAC;AAEF,MAAM,gBAAgB,GAMlB;IACA,cAAc,EAAE,IAAI;IACpB,kBAAkB,EAAE,IAAI;IACxB,0BAA0B,EAAE,IAAI;IAChC,qBAAqB,EAAE,IAAI;CAC9B,CAAC;AAEF,MAAM,eAAe,GAGjB;IACA,yBAAyB,EAAE,IAAI;IAC/B,yBAAyB,EAAE,IAAI;IAC/B,sBAAsB,EAAE,IAAI;CAC/B,CAAC;AAEF,+FAA+F;AAC/F,MAAM,iBAAiB,GAAuD;IAC1E,0BAA0B,EAAE,IAAI;CACnC,CAAC;AAEF,SAAS,aAAa,CAAC,KAAqB;IACxC,MAAM,IAAI,GAAmB;QACzB,GAAG,gBAAgB;QACnB,yBAAyB,EAAE,KAAK;QAChC,yBAAyB,EAAE,KAAK;QAChC,sBAAsB,EAAE,KAAK;QAC7B,GAAG,UAAU;QACb,0BAA0B,EAAE,KAAK;KACpC,CAAC;IAEF,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,aAAa,GAAmB;QAClC,GAAG,IAAI;QACP,GAAG,eAAe;KACrB,CAAC;IAEF,IAAI,KAAK,KAAK,WAAW,EAAE,CAAC;QACxB,OAAO,aAAa,CAAC;IACzB,CAAC;IAED,OAAO;QACH,GAAG,aAAa;QAChB,GAAG,iBAAiB;KACvB,CAAC;AACN,CAAC;AAEY,QAAA,sBAAsB,GAA2C;IAC1E,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC;IAC7B,SAAS,EAAE,aAAa,CAAC,WAAW,CAAC;IACrC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC;CAChC,CAAC"}

package/dist/options/resolve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/options/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAQ3F,wBAAgB,uBAAuB,CAAC,OAAO,CAAC,EAAE,gBAAgB,GAAG,wBAAwB,CAS5F"}
+{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/options/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAiC3F,wBAAgB,uBAAuB,CAAC,OAAO,CAAC,EAAE,gBAAgB,GAAG,wBAAwB,CAe5F"}

package/dist/options/resolve.js

@@ -1,7 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveNormalizeOptions = resolveNormalizeOptions;
+const predicate_safety_policy_1 = require("../predicate/safety/predicate-safety-policy");
+const scope_safety_policy_1 = require("../scope/safety/scope-safety-policy");
 const constants_1 = require("./constants");
+function mergePredicateSafetyPolicy(partial) {
+    return {
+        ...predicate_safety_policy_1.DEFAULT_PREDICATE_SAFETY_POLICY,
+        ...(partial ?? {}),
+    };
+}
+function mergeScopeSafetyPolicy(partial) {
+    const merged = { ...scope_safety_policy_1.DEFAULT_SCOPE_SAFETY_POLICY };
+    if (!partial) {
+        return merged;
+    }
+    for (const key of Object.keys(scope_safety_policy_1.DEFAULT_SCOPE_SAFETY_POLICY)) {
+        if (Object.prototype.hasOwnProperty.call(partial, key)) {
+            merged[key] = partial[key];
+        }
+    }
+    return merged;
+}
 function resolveNormalizeOptions(options) {
     const level = resolveLevel(options?.level);
     return {
@@ -9,10 +29,21 @@ function resolveNormalizeOptions(options) {
         rules: mergeRules(level, options?.rules),
         safety: mergeSafety(options?.safety),
         observe: mergeObserve(options?.observe),
+        predicate: {
+            safetyPolicy: mergePredicateSafetyPolicy(options?.predicate?.safetyPolicy),
+        },
+        scope: {
+            safetyPolicy: mergeScopeSafetyPolicy(options?.scope?.safetyPolicy),
+        },
     };
 }
 function resolveLevel(level) {
-    return level ?? constants_1.DEFAULT_LEVEL;
+    const resolved = level ?? constants_1.DEFAULT_LEVEL;
+    if (Object.prototype.hasOwnProperty.call(constants_1.DEFAULT_RULES_BY_LEVEL, resolved)) {
+        return resolved;
+    }
+    const allowed = Object.keys(constants_1.DEFAULT_RULES_BY_LEVEL).join(", ");
+    throw new Error(`[mongo-query-normalizer] invalid normalize level: ${JSON.stringify(level)}. Expected one of: ${allowed}.`);
 }
 function mergeRules(level, rules) {
     return {

package/dist/options/resolve.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/options/resolve.ts"],"names":[],"mappings":";;AAQA,0DASC;AAhBD,2CAKqB;AAErB,SAAgB,uBAAuB,CAAC,OAA0B;IAC9D,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAE3C,OAAO;QACH,KAAK;QACL,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC;QACxC,MAAM,EAAE,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC;QACpC,OAAO,EAAE,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC;KAC1C,CAAC;AACN,CAAC;AAED,SAAS,YAAY,CAAC,KAAsB;IACxC,OAAO,KAAK,IAAI,yBAAa,CAAC;AAClC,CAAC;AAED,SAAS,UAAU,CAAC,KAAqB,EAAE,KAAkD;IACzF,OAAO;QACH,GAAG,kCAAsB,CAAC,KAAK,CAAC;QAChC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;KACnB,CAAC;AACN,CAAC;AAED,SAAS,WAAW,CAAC,MAAoD;IACrE,OAAO;QACH,GAAG,0BAAc;QACjB,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;KACpB,CAAC;AACN,CAAC;AAED,SAAS,YAAY,CAAC,OAAsD;IACxE,OAAO;QACH,GAAG,2BAAe;QAClB,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;KACrB,CAAC;AACN,CAAC"}
+{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/options/resolve.ts"],"names":[],"mappings":";;AAiCA,0DAeC;AA/CD,yFAGqD;AACrD,6EAA0G;AAC1G,2CAKqB;AAErB,SAAS,0BAA0B,CAAC,OAAwC;IACxE,OAAO;QACH,GAAG,yDAA+B;QAClC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;KACrB,CAAC;AACN,CAAC;AAED,SAAS,sBAAsB,CAAC,OAAoC;IAChE,MAAM,MAAM,GAAsB,EAAE,GAAG,iDAA2B,EAAE,CAAC;IACrE,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,OAAO,MAAM,CAAC;IAClB,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,iDAA2B,CAAgC,EAAE,CAAC;QACxF,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC;YACrD,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAE,CAAC;QAChC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAgB,uBAAuB,CAAC,OAA0B;IAC9D,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAE3C,OAAO;QACH,KAAK;QACL,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC;QACxC,MAAM,EAAE,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC;QACpC,OAAO,EAAE,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC;QACvC,SAAS,EAAE;YACP,YAAY,EAAE,0BAA0B,CAAC,OAAO,EAAE,SAAS,EAAE,YAAY,CAAC;SAC7E;QACD,KAAK,EAAE;YACH,YAAY,EAAE,sBAAsB,CAAC,OAAO,EAAE,KAAK,EAAE,YAAY,CAAC;SACrE;KACJ,CAAC;AACN,CAAC;AAED,SAAS,YAAY,CAAC,KAAiC;IACnD,MAAM,QAAQ,GAAG,KAAK,IAAI,yBAAa,CAAC;IACxC,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,kCAAsB,EAAE,QAAQ,CAAC,EAAE,CAAC;QACzE,OAAO,QAAQ,CAAC;IACpB,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,kCAAsB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/D,MAAM,IAAI,KAAK,CACX,qDAAqD,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,sBAAsB,OAAO,GAAG,CAC7G,CAAC;AACN,CAAC;AAED,SAAS,UAAU,CAAC,KAAqB,EAAE,KAAkD;IACzF,OAAO;QACH,GAAG,kCAAsB,CAAC,KAAK,CAAC;QAChC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;KACnB,CAAC;AACN,CAAC;AAED,SAAS,WAAW,CAAC,MAAoD;IACrE,OAAO;QACH,GAAG,0BAAc;QACjB,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;KACpB,CAAC;AACN,CAAC;AAED,SAAS,YAAY,CAAC,OAAsD;IACxE,OAAO;QACH,GAAG,2BAAe;QAClB,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;KACrB,CAAC;AACN,CAAC"}

package/dist/options/types.d.ts

@@ -1,2 +1,2 @@
-export type { NormalizeLevel, NormalizeObserve, NormalizeOptions, NormalizeResult, NormalizeRules, NormalizeSafety, NormalizeStats, ResolvedNormalizeOptions, } from "../types";
+export type { NormalizeLevel, NormalizeObserve, NormalizeOptions, NormalizePredicateOptions, NormalizeResult, NormalizeRules, NormalizeSafety, NormalizeStats, NormalizeScopeLayerOptions, PredicateFieldTrace, ResolvedNormalizeOptions, ScopeNormalizationTrace, ScopeTraceEvent, } from "../types";
 //# sourceMappingURL=types.d.ts.map

package/dist/options/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/options/types.ts"],"names":[],"mappings":"AAAA,YAAY,EACR,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,cAAc,EACd,eAAe,EACf,cAAc,EACd,wBAAwB,GAC3B,MAAM,UAAU,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/options/types.ts"],"names":[],"mappings":"AAAA,YAAY,EACR,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAChB,yBAAyB,EACzB,eAAe,EACf,cAAc,EACd,eAAe,EACf,cAAc,EACd,0BAA0B,EAC1B,mBAAmB,EACnB,wBAAwB,EACxB,uBAAuB,EACvB,eAAe,GAClB,MAAM,UAAU,CAAC"}

package/dist/passes/normalize-predicate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-predicate.d.ts","sourceRoot":"","sources":["../../src/passes/normalize-predicate.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAA6B,SAAS,EAAE,MAAM,cAAc,CAAC;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAK7D,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,SAAS,EAAE,gBAAgB,EAAE,gBAAgB,GAAG,SAAS,CAEjG"}
+{"version":3,"file":"normalize-predicate.d.ts","sourceRoot":"","sources":["../../src/passes/normalize-predicate.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAA6B,SAAS,EAAE,MAAM,cAAc,CAAC;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAS7D,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,SAAS,EAAE,gBAAgB,EAAE,gBAAgB,GAAG,SAAS,CAEjG"}

package/dist/passes/normalize-predicate.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizePredicate = normalizePredicate;
 const builders_1 = require("../ast/builders");
+const hash_1 = require("../ast/hash");
 const guards_1 = require("../ast/guards");
-const collapse_contradictions_1 = require("../rules/predicate/collapse-contradictions");
-const dedupe_same_field_predicates_1 = require("../rules/predicate/dedupe-same-field-predicates");
-const merge_comparable_predicates_1 = require("../rules/predicate/merge-comparable-predicates");
+const warnings_1 = require("../observe/warnings");
+const build_field_bundle_1 = require("../predicate/ir/build-field-bundle");
+const normalize_field_predicate_bundle_1 = require("../predicate/normalize-field-predicate-bundle");
 function normalizePredicate(node, normalizeContext) {
     return normalizePredicateRecursive(node, normalizeContext);
 }
@@ -20,9 +21,6 @@ function normalizePredicateRecursive(node, normalizeContext) {
     }
     return node;
 }
-/**
- * 同一 `$and` 层上合并同名字段子句，再跑谓词规则（可检出 `{ $and: [{ a: 1 }, { a: 2 }] }` 等矛盾）。
- */
 function mergeAndSiblingFieldNodesUnderAnd(children, normalizeContext) {
     const byField = new Map();
     const rest = [];
@@ -41,17 +39,98 @@ function mergeAndSiblingFieldNodesUnderAnd(children, normalizeContext) {
     }
     return [...rest, ...merged];
 }
+const RULE_DEDUPE = "predicate.dedupeSameFieldPredicates";
+const RULE_MERGE = "predicate.mergeComparablePredicates";
+const RULE_COLLAPSE = "predicate.collapseContradictions";
+const MERGE_CAPABILITY_IDS = ["eq.eq", "eq.in", "eq.range", "range.range"];
+function fieldPredicatesUnchanged(a, b) {
+    if (a.length !== b.length) {
+        return false;
+    }
+    return a.every((p, i) => (0, hash_1.hashPredicate)(p) === (0, hash_1.hashPredicate)(b[i]));
+}
 function applyPredicateRulesToField(node, normalizeContext) {
-    let current = node;
-    if (normalizeContext.options.rules.dedupeSameFieldPredicates) {
-        current = (0, dedupe_same_field_predicates_1.dedupeSameFieldPredicates)(current, normalizeContext);
+    const rules = normalizeContext.options.rules;
+    const runAny = rules.dedupeSameFieldPredicates || rules.mergeComparablePredicates || rules.collapseContradictions;
+    if (!runAny) {
+        (0, warnings_1.markRuleSkipped)(normalizeContext, RULE_DEDUPE, "predicate rules disabled");
+        (0, warnings_1.markRuleSkipped)(normalizeContext, RULE_MERGE, "predicate rules disabled");
+        (0, warnings_1.markRuleSkipped)(normalizeContext, RULE_COLLAPSE, "predicate rules disabled");
+        return node;
+    }
+    const bundle = (0, build_field_bundle_1.buildFieldPredicateBundleFromFieldNode)(node);
+    const local = (0, normalize_field_predicate_bundle_1.normalizeFieldPredicateBundle)(bundle, {
+        safety: normalizeContext.options.predicate.safetyPolicy,
+        engine: {
+            dedupeAtoms: rules.dedupeSameFieldPredicates,
+            mergeComparable: rules.mergeComparablePredicates,
+            collapseContradictions: rules.collapseContradictions,
+        },
+    });
+    const out = (0, normalize_field_predicate_bundle_1.compileLocalNormalizeResultToAst)(local);
+    if (normalizeContext.options.observe.collectPredicateTraces) {
+        const trace = {
+            field: node.field,
+            atomKinds: local.atomKinds,
+            appliedCapabilityIds: [...local.appliedCapabilities],
+            skippedCapabilities: local.skippedCapabilities.map((s) => ({
+                id: s.id,
+                reason: s.reason,
+            })),
+            contradiction: local.contradiction,
+            contradictionCapabilityId: local.contradiction ? local.contradictionCapabilityId : undefined,
+            hadCoverage: local.coveredAtoms.length > 0,
+            coverageAtomCount: local.coveredAtoms.length,
+            hadTighten: local.changed && !local.contradiction,
+            impossibleEmitted: local.contradiction,
+        };
+        if (!normalizeContext.predicateTraces) {
+            normalizeContext.predicateTraces = [];
+        }
+        normalizeContext.predicateTraces.push(trace);
+    }
+    if (rules.dedupeSameFieldPredicates) {
+        if (local.atomDedupeChanged) {
+            (0, warnings_1.markRuleApplied)(normalizeContext, RULE_DEDUPE);
+        }
+        else {
+            (0, warnings_1.markRuleSkipped)(normalizeContext, RULE_DEDUPE, "no duplicate predicates");
+        }
+    }
+    else {
+        (0, warnings_1.markRuleSkipped)(normalizeContext, RULE_DEDUPE, "rule disabled");
+    }
+    if (rules.mergeComparablePredicates) {
+        const mergeTouched = local.appliedCapabilities.some((id) => MERGE_CAPABILITY_IDS.includes(id));
+        if (mergeTouched) {
+            (0, warnings_1.markRuleApplied)(normalizeContext, RULE_MERGE);
+        }
+        else {
+            (0, warnings_1.markRuleSkipped)(normalizeContext, RULE_MERGE, "no comparable predicate merge applied");
+        }
+    }
+    else {
+        (0, warnings_1.markRuleSkipped)(normalizeContext, RULE_MERGE, "rule disabled");
+    }
+    if (rules.collapseContradictions) {
+        const collapseContradictionCaps = ["eq.ne", "eq.in"];
+        const collapseHit = local.appliedCapabilities.includes("eq.ne") ||
+            (local.contradiction &&
+                local.contradictionCapabilityId !== undefined &&
+                collapseContradictionCaps.includes(local.contradictionCapabilityId));
+        if (collapseHit) {
+            (0, warnings_1.markRuleApplied)(normalizeContext, RULE_COLLAPSE);
+        }
+        else {
+            (0, warnings_1.markRuleSkipped)(normalizeContext, RULE_COLLAPSE, "no explicit contradiction");
+        }
     }
-    if ((0, guards_1.isFieldNode)(current) && normalizeContext.options.rules.mergeComparablePredicates) {
-        current = (0, merge_comparable_predicates_1.mergeComparablePredicates)(current, normalizeContext);
+    else {
+        (0, warnings_1.markRuleSkipped)(normalizeContext, RULE_COLLAPSE, "rule disabled");
     }
-    if ((0, guards_1.isFieldNode)(current) && normalizeContext.options.rules.collapseContradictions) {
-        current = (0, collapse_contradictions_1.collapseContradictions)(current, normalizeContext);
+    if ((0, guards_1.isFieldNode)(out) && out.field === node.field && fieldPredicatesUnchanged(out.predicates, node.predicates)) {
+        return node;
     }
-    return current;
+    return out;
 }
 //# sourceMappingURL=normalize-predicate.js.map

package/dist/passes/normalize-predicate.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-predicate.js","sourceRoot":"","sources":["../../src/passes/normalize-predicate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"normalize-predicate.js","sourceRoot":"","sources":["../../src/passes/normalize-predicate.ts"],"names":[],"mappings":"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"}

package/dist/predicate/analysis/detect-array-sensitive.d.ts

@@ -0,0 +1,3 @@
+import type { FieldPredicateBundle } from "../ir/field-predicate-bundle";
+export declare function detectArraySensitiveSemantics(bundle: FieldPredicateBundle): boolean;
+//# sourceMappingURL=detect-array-sensitive.d.ts.map

package/dist/predicate/analysis/detect-array-sensitive.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"detect-array-sensitive.d.ts","sourceRoot":"","sources":["../../../src/predicate/analysis/detect-array-sensitive.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AA0BzE,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAOnF"}

package/dist/predicate/analysis/detect-array-sensitive.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectArraySensitiveSemantics = detectArraySensitiveSemantics;
+function valueLooksArraySensitive(value) {
+    if (value === null || value === undefined) {
+        return false;
+    }
+    if (Array.isArray(value)) {
+        return true;
+    }
+    if (typeof value === "object") {
+        return true;
+    }
+    return false;
+}
+function atomIsArraySensitive(atom) {
+    if (atom.kind === "nin") {
+        return true;
+    }
+    if (atom.kind === "in") {
+        return atom.values.some(valueLooksArraySensitive);
+    }
+    return false;
+}
+function detectArraySensitiveSemantics(bundle) {
+    for (const atom of bundle.predicates) {
+        if (atomIsArraySensitive(atom)) {
+            return true;
+        }
+    }
+    return false;
+}
+//# sourceMappingURL=detect-array-sensitive.js.map

package/dist/predicate/analysis/detect-array-sensitive.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"detect-array-sensitive.js","sourceRoot":"","sources":["../../../src/predicate/analysis/detect-array-sensitive.ts"],"names":[],"mappings":";;AA0BA,sEAOC;AA9BD,SAAS,wBAAwB,CAAC,KAAc;IAC5C,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAmB;IAC7C,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IACtD,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAgB,6BAA6B,CAAC,MAA4B;IACtE,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;QACnC,IAAI,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC"}

package/dist/predicate/analysis/detect-null-sensitive.d.ts

@@ -0,0 +1,3 @@
+import type { FieldPredicateBundle } from "../ir/field-predicate-bundle";
+export declare function detectNullSensitiveSemantics(bundle: FieldPredicateBundle): boolean;
+//# sourceMappingURL=detect-null-sensitive.d.ts.map

package/dist/predicate/analysis/detect-null-sensitive.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"detect-null-sensitive.d.ts","sourceRoot":"","sources":["../../../src/predicate/analysis/detect-null-sensitive.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAiBzE,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAOlF"}

package/dist/predicate/analysis/detect-null-sensitive.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectNullSensitiveSemantics = detectNullSensitiveSemantics;
+function containsNull(value) {
+    return value === null;
+}
+function atomHasNullSemantics(atom) {
+    if (atom.kind === "eq" || atom.kind === "ne") {
+        return containsNull(atom.value);
+    }
+    if (atom.kind === "in" || atom.kind === "nin") {
+        return atom.values.some(containsNull);
+    }
+    return false;
+}
+function detectNullSensitiveSemantics(bundle) {
+    for (const atom of bundle.predicates) {
+        if (atomHasNullSemantics(atom)) {
+            return true;
+        }
+    }
+    return false;
+}
+//# sourceMappingURL=detect-null-sensitive.js.map