mongo-query-normalizer 0.1.0

package/dist/core/constraint-propagation.js.map

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

package/dist/core/field-condition-normalize.d.ts

@@ -0,0 +1,22 @@
+import type { FieldCondition, FieldNode, SelectorAST } from "../ast/types";
+type NormalizeResult = {
+    conditions: FieldCondition[];
+} | {
+    impossible: true;
+};
+/**
+ * 单字段条件语义合并：仅 **modeled** 操作符（见 `operators.isModeledFieldOperator`）参与区间与 $in 合并；
+ * `$ne`、`$regex`、`$size` 及其他 op 进入 `others` 透传，不与此处推理交互。
+ */
+export declare function normalizeFieldConditions(conditions: FieldCondition[]): NormalizeResult;
+/**
+ * 对单个 FieldNode 做条件规范化，冲突或空条件时返回 FalseNode/TrueNode。
+ */
+export declare function normalizeFieldNode(node: FieldNode): SelectorAST;
+/**
+ * AST 层同字段条件语义合并：递归处理所有 FieldNode，冲突替换为 FalseNode。
+ * 管线中放在 predicateMerge 之后、simplify 之前。
+ */
+export declare function fieldConditionNormalize(ast: SelectorAST): SelectorAST;
+export {};
+//# sourceMappingURL=field-condition-normalize.d.ts.map

package/dist/core/field-condition-normalize.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"field-condition-normalize.d.ts","sourceRoot":"","sources":["../../src/core/field-condition-normalize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAe,WAAW,EAAE,MAAM,cAAc,CAAC;AAIxF,KAAK,eAAe,GACd;IAAE,UAAU,EAAE,cAAc,EAAE,CAAA;CAAE,GAChC;IAAE,UAAU,EAAE,IAAI,CAAA;CAAE,CAAC;AA4B3B;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,cAAc,EAAE,GAAG,eAAe,CAwKtF;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,SAAS,GAAG,WAAW,CAS/D;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,WAAW,GAAG,WAAW,CAYrE"}

package/dist/core/field-condition-normalize.js

@@ -0,0 +1,225 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeFieldConditions = normalizeFieldConditions;
+exports.normalizeFieldNode = normalizeFieldNode;
+exports.fieldConditionNormalize = fieldConditionNormalize;
+const builders_1 = require("../ast/builders");
+const utils_1 = require("./utils");
+function toNum(v) {
+    if (v instanceof Date) {
+        return v.getTime();
+    }
+    if (typeof v === "number") {
+        return v;
+    }
+    return undefined;
+}
+function intersectByValue(left, right) {
+    return left.filter((item) => right.some((r) => (0, utils_1.areValuesEqual)(item, r)));
+}
+function unionByValue(arrays) {
+    const result = [];
+    for (const arr of arrays) {
+        for (const v of arr) {
+            if (!result.some((r) => (0, utils_1.areValuesEqual)(r, v))) {
+                result.push(v);
+            }
+        }
+    }
+    return result;
+}
+/**
+ * 单字段条件语义合并：仅 **modeled** 操作符（见 `operators.isModeledFieldOperator`）参与区间与 $in 合并；
+ * `$ne`、`$regex`、`$size` 及其他 op 进入 `others` 透传，不与此处推理交互。
+ */
+function normalizeFieldConditions(conditions) {
+    if (conditions.length === 0) {
+        return { conditions: [] };
+    }
+    const others = [];
+    let eq;
+    let hasEqConflict = false;
+    let min;
+    let minVal;
+    let minInclusive = false;
+    let max;
+    let maxVal;
+    let maxInclusive = false;
+    let inSet;
+    let ninSet = [];
+    let exists;
+    for (const cond of conditions) {
+        const op = cond.op;
+        const value = cond.value;
+        switch (op) {
+            case "$eq": {
+                if (eq === undefined) {
+                    eq = value;
+                }
+                else if (!(0, utils_1.areValuesEqual)(eq, value)) {
+                    hasEqConflict = true;
+                }
+                break;
+            }
+            case "$gt":
+            case "$gte": {
+                const n = toNum(value);
+                if (n === undefined) {
+                    others.push(cond);
+                    break;
+                }
+                const rawMin = value;
+                if (min === undefined || n > min || (n === min && op === "$gt" && minInclusive)) {
+                    min = n;
+                    minVal = rawMin;
+                    minInclusive = op === "$gte";
+                }
+                else if (n === min && op === "$gte") {
+                    minInclusive = true;
+                }
+                break;
+            }
+            case "$lt":
+            case "$lte": {
+                const n = toNum(value);
+                if (n === undefined) {
+                    others.push(cond);
+                    break;
+                }
+                const rawMax = value;
+                if (max === undefined || n < max || (n === max && op === "$lt" && maxInclusive)) {
+                    max = n;
+                    maxVal = rawMax;
+                    maxInclusive = op === "$lte";
+                }
+                else if (n === max && op === "$lte") {
+                    maxInclusive = true;
+                }
+                break;
+            }
+            case "$in": {
+                const arr = Array.isArray(value) ? value : [value];
+                inSet = inSet === undefined ? [...arr] : intersectByValue(inSet, arr);
+                break;
+            }
+            case "$nin": {
+                const arr = Array.isArray(value) ? value : [value];
+                ninSet = unionByValue([ninSet, arr]);
+                break;
+            }
+            case "$exists": {
+                const b = Boolean(value);
+                if (exists === undefined) {
+                    exists = b;
+                }
+                else if (exists !== b) {
+                    return { impossible: true };
+                }
+                break;
+            }
+            default:
+                others.push(cond);
+        }
+    }
+    if (eq !== undefined) {
+        const num = toNum(eq);
+        if (num !== undefined) {
+            if (min !== undefined && (num < min || (num === min && !minInclusive))) {
+                hasEqConflict = true;
+            }
+            if (max !== undefined && (num > max || (num === max && !maxInclusive))) {
+                hasEqConflict = true;
+            }
+        }
+        if (inSet !== undefined && !inSet.some((v) => (0, utils_1.areValuesEqual)(v, eq))) {
+            hasEqConflict = true;
+        }
+        if (ninSet.some((v) => (0, utils_1.areValuesEqual)(v, eq))) {
+            hasEqConflict = true;
+        }
+    }
+    if (min !== undefined && max !== undefined) {
+        if (min > max || (min === max && (!minInclusive || !maxInclusive))) {
+            return { impossible: true };
+        }
+    }
+    if (inSet !== undefined && inSet.length === 0) {
+        return { impossible: true };
+    }
+    if (hasEqConflict) {
+        return { impossible: true };
+    }
+    const result = [];
+    if (eq !== undefined) {
+        result.push({ op: "$eq", value: eq });
+    }
+    else {
+        if (inSet !== undefined && inSet.length > 0) {
+            const filtered = ninSet.length > 0
+                ? inSet.filter((v) => !ninSet.some((n) => (0, utils_1.areValuesEqual)(n, v)))
+                : inSet;
+            if (filtered.length === 0) {
+                return { impossible: true };
+            }
+            result.push({ op: "$in", value: filtered });
+        }
+        else {
+            if (min !== undefined && minVal !== undefined) {
+                result.push({
+                    op: minInclusive ? "$gte" : "$gt",
+                    value: minVal,
+                });
+            }
+            if (max !== undefined && maxVal !== undefined) {
+                result.push({
+                    op: maxInclusive ? "$lte" : "$lt",
+                    value: maxVal,
+                });
+            }
+        }
+    }
+    if (exists !== undefined) {
+        result.push({ op: "$exists", value: exists });
+    }
+    if (ninSet.length > 0) {
+        result.push({ op: "$nin", value: ninSet });
+    }
+    // 已写入 result 的 op（如数值化后的 $lte）不再从 others 重复追加，避免 compile 重复键
+    const seenOps = new Set(result.map((c) => c.op));
+    for (const c of others) {
+        if (!seenOps.has(c.op)) {
+            result.push(c);
+            seenOps.add(c.op);
+        }
+    }
+    return { conditions: result };
+}
+/**
+ * 对单个 FieldNode 做条件规范化，冲突或空条件时返回 FalseNode/TrueNode。
+ */
+function normalizeFieldNode(node) {
+    const result = normalizeFieldConditions(node.conditions);
+    if ("impossible" in result) {
+        return builders_1.ASTNodeBuilder.falseNode();
+    }
+    if (result.conditions.length === 0) {
+        return builders_1.ASTNodeBuilder.trueNode();
+    }
+    return { ...node, conditions: result.conditions };
+}
+/**
+ * AST 层同字段条件语义合并：递归处理所有 FieldNode，冲突替换为 FalseNode。
+ * 管线中放在 predicateMerge 之后、simplify 之前。
+ */
+function fieldConditionNormalize(ast) {
+    if (ast.type === "true" || ast.type === "false") {
+        return ast;
+    }
+    if (ast.type === "field") {
+        return normalizeFieldNode(ast);
+    }
+    const node = ast;
+    const children = node.children.map(fieldConditionNormalize);
+    return { ...node, children };
+}
+//# sourceMappingURL=field-condition-normalize.js.map

package/dist/core/field-condition-normalize.js.map

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

package/dist/core/index.d.ts

@@ -0,0 +1,6 @@
+export { normalize } from "./normalize";
+export { predicateMerge } from "./predicate-merge";
+export { fieldConditionNormalize } from "./field-condition-normalize";
+export { simplify } from "./simplify";
+export { canonicalize } from "./canonicalize";
+//# sourceMappingURL=index.d.ts.map

package/dist/core/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC"}

package/dist/core/index.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.canonicalize = exports.simplify = exports.fieldConditionNormalize = exports.predicateMerge = exports.normalize = void 0;
+var normalize_1 = require("./normalize");
+Object.defineProperty(exports, "normalize", { enumerable: true, get: function () { return normalize_1.normalize; } });
+var predicate_merge_1 = require("./predicate-merge");
+Object.defineProperty(exports, "predicateMerge", { enumerable: true, get: function () { return predicate_merge_1.predicateMerge; } });
+var field_condition_normalize_1 = require("./field-condition-normalize");
+Object.defineProperty(exports, "fieldConditionNormalize", { enumerable: true, get: function () { return field_condition_normalize_1.fieldConditionNormalize; } });
+var simplify_1 = require("./simplify");
+Object.defineProperty(exports, "simplify", { enumerable: true, get: function () { return simplify_1.simplify; } });
+var canonicalize_1 = require("./canonicalize");
+Object.defineProperty(exports, "canonicalize", { enumerable: true, get: function () { return canonicalize_1.canonicalize; } });
+//# sourceMappingURL=index.js.map

package/dist/core/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";;;AAAA,yCAAwC;AAA/B,sGAAA,SAAS,OAAA;AAClB,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AACvB,yEAAsE;AAA7D,oIAAA,uBAAuB,OAAA;AAChC,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA;AACjB,+CAA8C;AAArC,4GAAA,YAAY,OAAA"}

package/dist/core/normalize.d.ts

@@ -0,0 +1,8 @@
+import type { SelectorAST } from "../ast/types";
+/**
+ * normalize（AST → AST）：
+ * - 只做结构等价变换：打平同 op、移除空逻辑、移除单子节点逻辑
+ * - 不做 predicate 合并/排序（交给 predicateMerge/canonicalize 阶段）
+ */
+export declare function normalize(ast: SelectorAST): SelectorAST;
+//# sourceMappingURL=normalize.d.ts.map

package/dist/core/normalize.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../src/core/normalize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,WAAW,EAAE,MAAM,cAAc,CAAC;AAG7D;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,WAAW,GAAG,WAAW,CA0CvD"}

package/dist/core/normalize.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalize = normalize;
+const builders_1 = require("../ast/builders");
+/**
+ * normalize（AST → AST）：
+ * - 只做结构等价变换：打平同 op、移除空逻辑、移除单子节点逻辑
+ * - 不做 predicate 合并/排序（交给 predicateMerge/canonicalize 阶段）
+ */
+function normalize(ast) {
+    if (ast.type !== "logical") {
+        return ast;
+    }
+    const normalizedChildren = ast.children.map((c) => normalize(c));
+    // 先同 op 打平
+    let flattened = ast.op === "$and" || ast.op === "$or"
+        ? normalizedChildren.flatMap((c) => c.type === "logical" && c.op === ast.op ? c.children : [c])
+        : normalizedChildren;
+    // $nor: 单子项为 $or 时与 Mongo 扁平 $nor:[...] 语义等价；收拢避免 $nor→$or 包装形与扁平形双轨
+    if (ast.op === "$nor" && flattened.length === 1) {
+        const only = flattened[0];
+        if (only.type === "logical" && only.op === "$or") {
+            flattened = only.children;
+        }
+    }
+    // 移除 empty logical
+    if (flattened.length === 0) {
+        switch (ast.op) {
+            case "$and":
+                return builders_1.ASTNodeBuilder.trueNode();
+            case "$or":
+                return builders_1.ASTNodeBuilder.falseNode();
+            case "$nor":
+                return builders_1.ASTNodeBuilder.trueNode();
+        }
+    }
+    // 移除 single logical（仅对 $and/$or；$nor 不能折叠，否则语义改变）
+    if (flattened.length === 1 && (ast.op === "$and" || ast.op === "$or")) {
+        return flattened[0];
+    }
+    const node = { ...ast, children: flattened };
+    return node;
+}
+//# sourceMappingURL=normalize.js.map

package/dist/core/normalize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalize.js","sourceRoot":"","sources":["../../src/core/normalize.ts"],"names":[],"mappings":";;AAQA,8BA0CC;AAjDD,8CAAiD;AAEjD;;;;GAIG;AACH,SAAgB,SAAS,CAAC,GAAgB;IACtC,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,GAAG,CAAC;IACf,CAAC;IAED,MAAM,kBAAkB,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjE,WAAW;IACX,IAAI,SAAS,GACT,GAAG,CAAC,EAAE,KAAK,MAAM,IAAI,GAAG,CAAC,EAAE,KAAK,KAAK;QACjC,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAC7B,CAAC,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC7D;QACH,CAAC,CAAC,kBAAkB,CAAC;IAE7B,qEAAqE;IACrE,IAAI,GAAG,CAAC,EAAE,KAAK,MAAM,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,EAAE,KAAK,KAAK,EAAE,CAAC;YAC/C,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,CAAC;IACL,CAAC;IAED,mBAAmB;IACnB,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,QAAQ,GAAG,CAAC,EAAE,EAAE,CAAC;YACb,KAAK,MAAM;gBACP,OAAO,yBAAc,CAAC,QAAQ,EAAE,CAAC;YACrC,KAAK,KAAK;gBACN,OAAO,yBAAc,CAAC,SAAS,EAAE,CAAC;YACtC,KAAK,MAAM;gBACP,OAAO,yBAAc,CAAC,QAAQ,EAAE,CAAC;QACzC,CAAC;IACL,CAAC;IAED,kDAAkD;IAClD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,KAAK,MAAM,IAAI,GAAG,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC;QACpE,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC;IACxB,CAAC;IAED,MAAM,IAAI,GAAgB,EAAE,GAAG,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAC1D,OAAO,IAAI,CAAC;AAChB,CAAC"}

package/dist/core/operators.d.ts

@@ -0,0 +1,11 @@
+/**
+ * 字段级操作符分层（与 README「支持矩阵」一致）：
+ *
+ * **Modeled** — fieldConditionNormalize 会合并 / 冲突检测；conflicts / tighten 会按规则推理。
+ * **Preserved** — parse 保留原 op，归并到 normalize 的 others，不参与区间与 $in 交集合并；
+ *   simplify 的 tighten 会忽略这些 op（见 conditions.ts 中 SUPPORTED_TIGHTEN_OPS）。
+ * **Unsupported at top level** — $expr / $where 等：parse 当前不展开，顶层键被跳过（与 Mongo 行为一致需注意）。
+ */
+/** 参与单字段语义合并与冲突推理的操作符（fieldConditionNormalize 的 switch 分支）。 */
+export declare function isModeledFieldOperator(op: string): boolean;
+//# sourceMappingURL=operators.d.ts.map

package/dist/core/operators.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"operators.d.ts","sourceRoot":"","sources":["../../src/core/operators.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAaH,+DAA+D;AAC/D,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAE1D"}

package/dist/core/operators.js

@@ -0,0 +1,26 @@
+"use strict";
+/**
+ * 字段级操作符分层（与 README「支持矩阵」一致）：
+ *
+ * **Modeled** — fieldConditionNormalize 会合并 / 冲突检测；conflicts / tighten 会按规则推理。
+ * **Preserved** — parse 保留原 op，归并到 normalize 的 others，不参与区间与 $in 交集合并；
+ *   simplify 的 tighten 会忽略这些 op（见 conditions.ts 中 SUPPORTED_TIGHTEN_OPS）。
+ * **Unsupported at top level** — $expr / $where 等：parse 当前不展开，顶层键被跳过（与 Mongo 行为一致需注意）。
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isModeledFieldOperator = isModeledFieldOperator;
+const MODELED_FIELD_OPERATORS = new Set([
+    "$eq",
+    "$gt",
+    "$gte",
+    "$lt",
+    "$lte",
+    "$in",
+    "$nin",
+    "$exists",
+]);
+/** 参与单字段语义合并与冲突推理的操作符（fieldConditionNormalize 的 switch 分支）。 */
+function isModeledFieldOperator(op) {
+    return MODELED_FIELD_OPERATORS.has(op);
+}
+//# sourceMappingURL=operators.js.map

package/dist/core/operators.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"operators.js","sourceRoot":"","sources":["../../src/core/operators.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;AAcH,wDAEC;AAdD,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAS;IAC5C,KAAK;IACL,KAAK;IACL,MAAM;IACN,KAAK;IACL,MAAM;IACN,KAAK;IACL,MAAM;IACN,SAAS;CACZ,CAAC,CAAC;AAEH,+DAA+D;AAC/D,SAAgB,sBAAsB,CAAC,EAAU;IAC7C,OAAO,uBAAuB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAC3C,CAAC"}

package/dist/core/predicate-merge.d.ts

@@ -0,0 +1,9 @@
+import type { SelectorAST } from "../ast/types";
+/**
+ * predicateMerge（AST → AST）：
+ * - 只在 `$and` 内合并同字段 FieldNode（conditions 拼接后由 fieldConditionNormalize 处理）
+ * - 非 modeled 同 op 异值拆成多个 FieldNode，避免 compile 重复键
+ * - 不做逻辑推理/冲突检测（交给 simplify）
+ */
+export declare function predicateMerge(ast: SelectorAST): SelectorAST;
+//# sourceMappingURL=predicate-merge.d.ts.map

package/dist/core/predicate-merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"predicate-merge.d.ts","sourceRoot":"","sources":["../../src/core/predicate-merge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA0C,WAAW,EAAE,MAAM,cAAc,CAAC;AA0FxF;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,WAAW,GAAG,WAAW,CAa5D"}

package/dist/core/predicate-merge.js

@@ -0,0 +1,105 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.predicateMerge = predicateMerge;
+const operators_1 = require("./operators");
+const utils_1 = require("./utils");
+/**
+ * 合并后的 conditions 是否允许进入同一 FieldNode。
+ * 对 **modeled** 操作符，允许多个同 op 异值（如两个 $eq）交给 fieldConditionNormalize；
+ * 对 **非 modeled** 同 op 异值则不能合并，否则 compile 无法表示为单个 BSON 对象。
+ */
+function fieldConditionsMergeable(a, b) {
+    const combined = [...a, ...b];
+    const byOp = new Map();
+    for (const c of combined) {
+        const prev = byOp.get(c.op);
+        if (prev === undefined) {
+            byOp.set(c.op, c.value);
+            continue;
+        }
+        if ((0, utils_1.areValuesEqual)(prev, c.value)) {
+            continue;
+        }
+        if ((0, operators_1.isModeledFieldOperator)(c.op)) {
+            continue;
+        }
+        return false;
+    }
+    return true;
+}
+/**
+ * 将同一字段上按出现顺序收集的 FieldNode 折叠为若干段，每段内可安全拼接 conditions。
+ */
+function foldFieldNodes(nodes) {
+    if (nodes.length === 0) {
+        return [];
+    }
+    const chunks = [];
+    let acc = nodes[0];
+    for (let k = 1; k < nodes.length; k++) {
+        const next = nodes[k];
+        if (fieldConditionsMergeable(acc.conditions, next.conditions)) {
+            acc = {
+                type: "field",
+                field: acc.field,
+                conditions: [...acc.conditions, ...next.conditions],
+            };
+        }
+        else {
+            chunks.push(acc);
+            acc = next;
+        }
+    }
+    chunks.push(acc);
+    return chunks;
+}
+/**
+ * 在 `$and` 子节点列表上按字段分组、折叠后再按「首次出现字段」顺序展开（中间 logical 等保留原位）。
+ */
+function mergeAndChildren(children) {
+    const perField = new Map();
+    for (const ch of children) {
+        if (ch.type === "field") {
+            const arr = perField.get(ch.field) ?? [];
+            arr.push(ch);
+            perField.set(ch.field, arr);
+        }
+    }
+    const foldedByField = new Map();
+    for (const [f, nodes] of perField) {
+        foldedByField.set(f, foldFieldNodes(nodes));
+    }
+    const seen = new Set();
+    const out = [];
+    for (const ch of children) {
+        if (ch.type !== "field") {
+            out.push(ch);
+            continue;
+        }
+        if (seen.has(ch.field)) {
+            continue;
+        }
+        seen.add(ch.field);
+        const folded = foldedByField.get(ch.field) ?? [];
+        out.push(...folded);
+    }
+    return out;
+}
+/**
+ * predicateMerge（AST → AST）：
+ * - 只在 `$and` 内合并同字段 FieldNode（conditions 拼接后由 fieldConditionNormalize 处理）
+ * - 非 modeled 同 op 异值拆成多个 FieldNode，避免 compile 重复键
+ * - 不做逻辑推理/冲突检测（交给 simplify）
+ */
+function predicateMerge(ast) {
+    if (ast.type !== "logical") {
+        return ast;
+    }
+    const children = ast.children.map(predicateMerge);
+    const node = { ...ast, children };
+    if (node.op !== "$and") {
+        return node;
+    }
+    return { ...node, children: mergeAndChildren(children) };
+}
+//# sourceMappingURL=predicate-merge.js.map

package/dist/core/predicate-merge.js.map

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

package/dist/core/predicateMerge.d.ts

@@ -0,0 +1,17 @@
+import type { FieldNode, SelectorAST } from "../ast/types";
+/**
+ * 判断同字段的两个 FieldNode 是否允许合并（仅做 shape/个数判断，不做语义推理）。
+ * 为保持与 MongoDB 数组字段语义一致，合并后若会产生多个 `$in` 条件则不允许合并。
+ *
+ * @param existing - 已存在的同字段 FieldNode
+ * @param incoming - 待合并的同字段 FieldNode
+ * @returns 是否允许合并
+ */
+export declare function canMergeFieldNodes(existing: FieldNode, incoming: FieldNode): boolean;
+/**
+ * predicateMerge（AST → AST）：
+ * - 只在 `$and` 内做同字段 FieldNode 合并（把 conditions 拼接到同一个 FieldNode）
+ * - 不做逻辑推理/冲突检测（交给 simplify）
+ */
+export declare function predicateMerge(ast: SelectorAST): SelectorAST;
+//# sourceMappingURL=predicateMerge.d.ts.map

package/dist/core/predicateMerge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"predicateMerge.d.ts","sourceRoot":"","sources":["../../src/core/predicateMerge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAe,WAAW,EAAE,MAAM,cAAc,CAAC;AAExE;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,GAAG,OAAO,CAIpF;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,WAAW,GAAG,WAAW,CAoC5D"}

package/dist/core/predicateMerge.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.canMergeFieldNodes = canMergeFieldNodes;
+exports.predicateMerge = predicateMerge;
+/**
+ * 判断同字段的两个 FieldNode 是否允许合并（仅做 shape/个数判断，不做语义推理）。
+ * 为保持与 MongoDB 数组字段语义一致，合并后若会产生多个 `$in` 条件则不允许合并。
+ *
+ * @param existing - 已存在的同字段 FieldNode
+ * @param incoming - 待合并的同字段 FieldNode
+ * @returns 是否允许合并
+ */
+function canMergeFieldNodes(existing, incoming) {
+    const existingInCount = existing.conditions.filter((c) => c.op === "$in").length;
+    const incomingInCount = incoming.conditions.filter((c) => c.op === "$in").length;
+    return existingInCount + incomingInCount <= 1;
+}
+/**
+ * predicateMerge（AST → AST）：
+ * - 只在 `$and` 内做同字段 FieldNode 合并（把 conditions 拼接到同一个 FieldNode）
+ * - 不做逻辑推理/冲突检测（交给 simplify）
+ */
+function predicateMerge(ast) {
+    if (ast.type !== "logical") {
+        return ast;
+    }
+    const children = ast.children.map(predicateMerge);
+    const node = { ...ast, children };
+    if (node.op !== "$and") {
+        return node;
+    }
+    const byField = new Map();
+    const others = [];
+    for (const child of node.children) {
+        if (child.type === "field") {
+            const existing = byField.get(child.field);
+            if (existing) {
+                if (!canMergeFieldNodes(existing, child)) {
+                    others.push(child);
+                    continue;
+                }
+                byField.set(child.field, {
+                    ...existing,
+                    conditions: [...existing.conditions, ...child.conditions],
+                });
+            }
+            else {
+                byField.set(child.field, child);
+            }
+        }
+        else {
+            others.push(child);
+        }
+    }
+    return { ...node, children: [...byField.values(), ...others] };
+}
+//# sourceMappingURL=predicateMerge.js.map

package/dist/core/predicateMerge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"predicateMerge.js","sourceRoot":"","sources":["../../src/core/predicateMerge.ts"],"names":[],"mappings":";;AAUA,gDAIC;AAOD,wCAoCC;AAvDD;;;;;;;GAOG;AACH,SAAgB,kBAAkB,CAAC,QAAmB,EAAE,QAAmB;IACvE,MAAM,eAAe,GAAG,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC,MAAM,CAAC;IACjF,MAAM,eAAe,GAAG,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC,MAAM,CAAC;IACjF,OAAO,eAAe,GAAG,eAAe,IAAI,CAAC,CAAC;AAClD,CAAC;AAED;;;;GAIG;AACH,SAAgB,cAAc,CAAC,GAAgB;IAC3C,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,GAAG,CAAC;IACf,CAAC;IAED,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAClD,MAAM,IAAI,GAAgB,EAAE,GAAG,GAAG,EAAE,QAAQ,EAAE,CAAC;IAE/C,IAAI,IAAI,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,EAAqB,CAAC;IAC7C,MAAM,MAAM,GAAkB,EAAE,CAAC;IAEjC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACzB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC1C,IAAI,QAAQ,EAAE,CAAC;gBACX,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC;oBACvC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACnB,SAAS;gBACb,CAAC;gBACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE;oBACrB,GAAG,QAAQ;oBACX,UAAU,EAAE,CAAC,GAAG,QAAQ,CAAC,UAAU,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC;iBAC5D,CAAC,CAAC;YACP,CAAC;iBAAM,CAAC;gBACJ,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACpC,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;IACL,CAAC;IAED,OAAO,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;AACnE,CAAC"}

package/dist/core/simplify.d.ts

@@ -0,0 +1,11 @@
+import type { SelectorAST } from "../ast/types";
+/**
+ * simplify（AST → AST）编排：
+ *
+ * 1. **约束传播**（`constraint-propagation`）：`$and` 内 sibling context、父级与子级 FieldNode 的
+ *    冲突剪枝与 tighten；tighten 仅作用于 `conditions.ts` 中声明的支持操作符，其余条件原样保留，
+ *    不改变 Mongo 语义。
+ * 2. **逻辑化简**：true/false 传播、AND 吸收 true、OR 吸收 false、AND flatten、$nor 结构化简。
+ */
+export declare function simplify(ast: SelectorAST): SelectorAST;
+//# sourceMappingURL=simplify.d.ts.map

package/dist/core/simplify.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"simplify.d.ts","sourceRoot":"","sources":["../../src/core/simplify.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAA0C,WAAW,EAAE,MAAM,cAAc,CAAC;AAUxF;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,WAAW,GAAG,WAAW,CAGtD"}