mongo-query-normalizer 0.2.1 → 0.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -1
- package/README.zh-CN.md +3 -1
- package/dist/compile/compile.js +13 -0
- package/dist/compile/compile.js.map +1 -1
- package/dist/normalize.d.ts.map +1 -1
- package/dist/normalize.js +3 -0
- package/dist/normalize.js.map +1 -1
- package/dist/passes/normalize-predicate.d.ts.map +1 -1
- package/dist/passes/normalize-predicate.js +38 -4
- package/dist/passes/normalize-predicate.js.map +1 -1
- package/dist/predicate/capabilities/eq/eq-eq.js +9 -11
- package/dist/predicate/capabilities/eq/eq-eq.js.map +1 -1
- package/dist/predicate/capabilities/eq/eq-in.d.ts.map +1 -1
- package/dist/predicate/capabilities/eq/eq-in.js +9 -50
- package/dist/predicate/capabilities/eq/eq-in.js.map +1 -1
- package/dist/predicate/capabilities/eq/eq-range.d.ts.map +1 -1
- package/dist/predicate/capabilities/eq/eq-range.js +11 -80
- package/dist/predicate/capabilities/eq/eq-range.js.map +1 -1
- package/dist/predicate/capabilities/range/range-range.d.ts.map +1 -1
- package/dist/predicate/capabilities/range/range-range.js +1 -10
- package/dist/predicate/capabilities/range/range-range.js.map +1 -1
- package/dist/predicate/planner/relation-planner.d.ts.map +1 -1
- package/dist/predicate/planner/relation-planner.js +0 -7
- package/dist/predicate/planner/relation-planner.js.map +1 -1
- package/dist/predicate/safety/predicate-safety-policy.d.ts +8 -0
- package/dist/predicate/safety/predicate-safety-policy.d.ts.map +1 -1
- package/dist/predicate/safety/predicate-safety-policy.js.map +1 -1
- package/dist/predicate/shared/cardinality-risk.d.ts +2 -0
- package/dist/predicate/shared/cardinality-risk.d.ts.map +1 -0
- package/dist/predicate/shared/cardinality-risk.js +7 -0
- package/dist/predicate/shared/cardinality-risk.js.map +1 -0
- package/dist/predicate/shared/field-cardinality-guards.d.ts +4 -0
- package/dist/predicate/shared/field-cardinality-guards.d.ts.map +1 -0
- package/dist/predicate/shared/field-cardinality-guards.js +11 -0
- package/dist/predicate/shared/field-cardinality-guards.js.map +1 -0
- package/dist/predicate/shared/field-cardinality-policy.d.ts +3 -0
- package/dist/predicate/shared/field-cardinality-policy.d.ts.map +1 -0
- package/dist/predicate/shared/field-cardinality-policy.js +5 -0
- package/dist/predicate/shared/field-cardinality-policy.js.map +1 -0
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -8,6 +8,8 @@ An **observable, level-based** normalizer for MongoDB query objects. It stabiliz
|
|
|
8
8
|
>
|
|
9
9
|
> **As of `v0.2.0`:** predicate rewrites are intentionally narrowed to an explicitly validated surface (`eq.eq`, `eq.ne`, `eq.in`, `eq.range`, `range.range`). High-risk combinations (for example null-vs-missing, array-sensitive semantics, `$exists`/`$nin`, object-vs-dotted-path mixes, opaque mixes) remain conservative by design.
|
|
10
10
|
|
|
11
|
+
> **Note:** `predicate.safetyPolicy.allowArraySensitiveRewrite` is **deprecated**. It no longer enables unsatisfiable deductions for `$eq`/`$in` non-membership (the normalizer must not emit `IMPOSSIBLE_SELECTOR` solely from `eq ∉ in` without schema).
|
|
12
|
+
|
|
11
13
|
---
|
|
12
14
|
|
|
13
15
|
## Why it exists
|
|
@@ -75,7 +77,7 @@ normalizeQuery(inputQuery, { level: "scope" }); // scope propagation / conservat
|
|
|
75
77
|
```
|
|
76
78
|
|
|
77
79
|
- `shape`: safest structural normalization.
|
|
78
|
-
- `predicate`: dedupe / merge
|
|
80
|
+
- `predicate`: dedupe / merge comparable predicates, and contradiction collapse only for **provably safe** modeled cases (no schema assumption; multikey/array fields stay conservative).
|
|
79
81
|
- `scope`: adds inherited-constraint propagation and conservative branch decisions on top of `predicate`.
|
|
80
82
|
|
|
81
83
|
### 3) Full `options` example
|
package/README.zh-CN.md
CHANGED
|
@@ -8,6 +8,8 @@
|
|
|
8
8
|
>
|
|
9
9
|
> **`v0.2.0` 起：** `predicate` 改写面有意收敛到显式验证能力（`eq.eq`、`eq.ne`、`eq.in`、`eq.range`、`range.range`）。高风险组合（如 `null`/缺失语义、数组敏感语义、`$exists`/`$nin`、整对象与点路径混用、opaque 混用）按设计保持保守处理。
|
|
10
10
|
|
|
11
|
+
> **说明：** `predicate.safetyPolicy.allowArraySensitiveRewrite` 已**废弃**。它不再用于启用 `$eq`/`$in` 的“未命中即判死”（无 schema 时不得仅基于 `eq ∉ in` 就输出 `IMPOSSIBLE_SELECTOR`）。
|
|
12
|
+
|
|
11
13
|
---
|
|
12
14
|
|
|
13
15
|
## 为什么需要它
|
|
@@ -75,7 +77,7 @@ normalizeQuery(inputQuery, { level: "scope" }); // 启用 scope 传播/保守剪
|
|
|
75
77
|
```
|
|
76
78
|
|
|
77
79
|
- `shape`：结构稳定优先，风险最低。
|
|
78
|
-
- `predicate
|
|
80
|
+
- `predicate`：在已建模算子范围内做去重、可比合并；矛盾折叠仅针对**可证明安全**的情形（默认不做 schema 假设，数组/多键字段保持保守）。
|
|
79
81
|
- `scope`：在 `predicate` 之上增加继承约束传播与保守分支决策。
|
|
80
82
|
|
|
81
83
|
### 3) `options` 全量示例
|
package/dist/compile/compile.js
CHANGED
|
@@ -37,6 +37,19 @@ function compileFieldNode(node, _normalizeContext) {
|
|
|
37
37
|
[node.field]: node.predicates[0].value,
|
|
38
38
|
};
|
|
39
39
|
}
|
|
40
|
+
const opCounts = new Map();
|
|
41
|
+
for (const predicate of node.predicates) {
|
|
42
|
+
if (predicate.op === "raw") {
|
|
43
|
+
continue;
|
|
44
|
+
}
|
|
45
|
+
const op = predicate.op;
|
|
46
|
+
opCounts.set(op, (opCounts.get(op) ?? 0) + 1);
|
|
47
|
+
}
|
|
48
|
+
const hasDuplicateOps = [...opCounts.values()].some((c) => c > 1);
|
|
49
|
+
if (hasDuplicateOps) {
|
|
50
|
+
const parts = node.predicates.map((predicate) => compileFieldNode({ type: "field", field: node.field, predicates: [predicate] }, _normalizeContext));
|
|
51
|
+
return { $and: parts };
|
|
52
|
+
}
|
|
40
53
|
const compiled = {};
|
|
41
54
|
for (const predicate of node.predicates) {
|
|
42
55
|
if (predicate.op === "raw") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../src/compile/compile.ts"],"names":[],"mappings":";;AAMA,oCAEC;AARD,oCAA2D;AAC3D,0CAAkG;AAGlG,wDAAsD;AAEtD,SAAgB,YAAY,CAAC,IAAe,EAAE,iBAAmC;IAC7E,OAAO,WAAW,CAAC,IAAI,EAAE,iBAAiB,CAAU,CAAC;AACzD,CAAC;AAED,SAAS,WAAW,CAAC,IAAe,EAAE,gBAAkC;IACpE,IAAI,IAAA,sBAAa,EAAC,IAAI,CAAC,EAAE,CAAC;QACtB,OAAO,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE,CAAC;QACpB,OAAO,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,IAAA,qBAAY,EAAC,IAAI,CAAC,EAAE,CAAC;QACrB,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,IAAA,mBAAU,EAAC,IAAI,CAAC,EAAE,CAAC;QACnB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE,CAAC;QACpB,OAAO,iBAAiB,EAAE,CAAC;IAC/B,CAAC;IAED,OAAO,EAAE,CAAC;AACd,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAiB,EAAE,gBAAkC;IAC7E,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAEpF,OAAO;QACH,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,QAAQ;KACK,CAAC;AACjC,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAe,EAAE,iBAAmC;IAC1E,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,EAAE,CAAC;QAClE,OAAO;YACH,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK;SACd,CAAC;IACjC,CAAC;IAED,MAAM,QAAQ,GAA4B,EAAE,CAAC;IAE7C,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;QACtC,IAAI,SAAS,CAAC,EAAE,KAAK,KAAK,EAAE,CAAC;YACzB,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC;YAC/B,IAAI,IAAA,4BAAa,EAAC,MAAM,CAAC,EAAE,CAAC;gBACxB,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAiC,CAAC,CAAC;YAC/D,CAAC;iBAAM,CAAC;gBACJ,OAAO;oBACH,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM;iBACI,CAAC;YACjC,CAAC;YACD,SAAS;QACb,CAAC;QAED,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,KAAgB,CAAC;IACxD,CAAC;IAED,OAAO;QACH,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,QAAQ;KACE,CAAC;AACjC,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAgB;IACvC,IAAI,IAAA,4BAAa,EAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,GAA8B,CAAC;IAC/C,CAAC;IACD,OAAO,EAAE,CAAC;AACd,CAAC;AAED,SAAS,iBAAiB;IACtB,OAAO,EAAE,GAAG,2BAAmB,EAA6B,CAAC;AACjE,CAAC"}
|
|
1
|
+
{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../src/compile/compile.ts"],"names":[],"mappings":"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"}
|
package/dist/normalize.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../src/normalize.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAiB,gBAAgB,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEvF;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,eAAe,
|
|
1
|
+
{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../src/normalize.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAiB,gBAAgB,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEvF;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,eAAe,CAqBxF"}
|
package/dist/normalize.js
CHANGED
|
@@ -19,6 +19,9 @@ const detect_common_predicates_in_or_1 = require("./rules/or-common-predicate/de
|
|
|
19
19
|
*/
|
|
20
20
|
function normalizeQuery(query, options) {
|
|
21
21
|
const normalizeContext = (0, normalize_context_1.createNormalizeContext)((0, resolve_1.resolveNormalizeOptions)(options));
|
|
22
|
+
if (normalizeContext.options.predicate.safetyPolicy.allowArraySensitiveRewrite) {
|
|
23
|
+
(0, warnings_1.addWarning)(normalizeContext, "[mongo-query-normalizer] predicate.safetyPolicy.allowArraySensitiveRewrite is deprecated and will be removed in a future release; it no longer enables unsatisfiable (`IMPOSSIBLE_SELECTOR`) deductions for eq/in relations");
|
|
24
|
+
}
|
|
22
25
|
const beforeNode = (0, parse_1.parseQuery)(query, normalizeContext);
|
|
23
26
|
recordBeforeObservation(normalizeContext, beforeNode);
|
|
24
27
|
let workingNode = beforeNode;
|
package/dist/normalize.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize.js","sourceRoot":"","sources":["../src/normalize.ts"],"names":[],"mappings":";;AAoBA,
|
|
1
|
+
{"version":3,"file":"normalize.js","sourceRoot":"","sources":["../src/normalize.ts"],"names":[],"mappings":";;AAoBA,wCAqBC;AAzCD,qCAAsC;AAEtC,+CAAiD;AAEjD,2DAA6D;AAC7D,+CAAqD;AACrD,iDAAgD;AAChD,+CAA4D;AAC5D,wDAAqD;AACrD,sEAAkE;AAClE,8DAA0D;AAC1D,gDAA6C;AAC7C,6DAAyD;AACzD,yCAA2C;AAC3C,+GAAwG;AAGxG;;GAEG;AACH,SAAgB,cAAc,CAAC,KAAY,EAAE,OAA0B;IACnE,MAAM,gBAAgB,GAAG,IAAA,0CAAsB,EAAC,IAAA,iCAAuB,EAAC,OAAO,CAAC,CAAC,CAAC;IAClF,IAAI,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,0BAA0B,EAAE,CAAC;QAC7E,IAAA,qBAAU,EACN,gBAAgB,EAChB,6NAA6N,CAChO,CAAC;IACN,CAAC;IAED,MAAM,UAAU,GAAG,IAAA,kBAAU,EAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;IACvD,uBAAuB,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;IAEtD,IAAI,WAAW,GAAG,UAAU,CAAC;IAC7B,WAAW,GAAG,oBAAoB,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IAElE,MAAM,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC;IACxE,sBAAsB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;IAEpD,MAAM,UAAU,GAAG,IAAA,sBAAY,EAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IAE7D,OAAO,oBAAoB,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC;AAC5F,CAAC;AAED,SAAS,uBAAuB,CAAC,gBAAkC,EAAE,IAAe;IAChF,IAAI,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;QAClD,gBAAgB,CAAC,WAAW,GAAG,IAAA,0BAAgB,EAAC,IAAI,CAAC,CAAC;IAC1D,CAAC;IACD,gBAAgB,CAAC,UAAU,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,sBAAsB,CAAC,gBAAkC,EAAE,IAAe;IAC/E,IAAI,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;QAClD,gBAAgB,CAAC,UAAU,GAAG,IAAA,0BAAgB,EAAC,IAAI,CAAC,CAAC;IACzD,CAAC;IACD,gBAAgB,CAAC,SAAS,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,2BAA2B,GAAG,CAAC,CAAC;AAEtC,SAAS,sBAAsB,CAC3B,IAAe,EACf,gBAAkC,EAClC,IAAe,EACf,kBAA2B,EAC3B,cAAuB,EACvB,4BAAqC;IAErC,IAAI,CAAC,GAAG,IAAI,CAAC;IAEb,CAAC;QACG,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,2BAA2B,EAAE,CAAC,EAAE,EAAE,CAAC;YACnD,MAAM,WAAW,GAAG,IAAA,eAAQ,EAAC,CAAC,CAAC,CAAC;YAChC,CAAC,GAAG,IAAA,gCAAc,EAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;YACxC,IAAI,gBAAgB,CAAC,SAAS,EAAE,CAAC;gBAC7B,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,IAAI,IAAA,eAAQ,EAAC,CAAC,CAAC,KAAK,WAAW,EAAE,CAAC;gBAC9B,cAAc,GAAG,IAAI,CAAC;gBACtB,MAAM;YACV,CAAC;QACL,CAAC;QACD,IAAI,CAAC,cAAc,IAAI,4BAA4B,EAAE,CAAC;YAClD,IAAA,qBAAU,EACN,gBAAgB,EAChB,mFAAmF,2BAA2B,kBAAkB,CACnI,CAAC;QACN,CAAC;IACL,CAAC;IAED,IAAI,kBAAkB,EAAE,CAAC;QACrB,IAAI,kBAAkB,GAAG,KAAK,CAAC;QAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,2BAA2B,EAAE,CAAC,EAAE,EAAE,CAAC;YACnD,MAAM,WAAW,GAAG,IAAA,eAAQ,EAAC,CAAC,CAAC,CAAC;YAChC,CAAC,GAAG,IAAA,wCAAkB,EAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;YAC5C,IAAI,gBAAgB,CAAC,SAAS,EAAE,CAAC;gBAC7B,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,CAAC,GAAG,IAAA,mBAAQ,EAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;YAClC,IAAI,gBAAgB,CAAC,SAAS,EAAE,CAAC;gBAC7B,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,IAAI,IAAA,eAAQ,EAAC,CAAC,CAAC,KAAK,WAAW,EAAE,CAAC;gBAC9B,kBAAkB,GAAG,IAAI,CAAC;gBAC1B,MAAM;YACV,CAAC;QACL,CAAC;QACD,IAAI,CAAC,kBAAkB,IAAI,4BAA4B,EAAE,CAAC;YACtD,IAAA,qBAAU,EACN,gBAAgB,EAChB,uGAAuG,2BAA2B,kBAAkB,CACvJ,CAAC;QACN,CAAC;IACL,CAAC;IAED,IAAI,cAAc,EAAE,CAAC;QACjB,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,2BAA2B,EAAE,CAAC,EAAE,EAAE,CAAC;YACnD,MAAM,WAAW,GAAG,IAAA,eAAQ,EAAC,CAAC,CAAC,CAAC;YAChC,CAAC,GAAG,IAAA,gCAAc,EAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;YACxC,IAAI,gBAAgB,CAAC,SAAS,EAAE,CAAC;gBAC7B,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,CAAC,GAAG,IAAA,mBAAQ,EAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;YAClC,IAAI,gBAAgB,CAAC,SAAS,EAAE,CAAC;gBAC7B,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,IAAI,IAAA,eAAQ,EAAC,CAAC,CAAC,KAAK,WAAW,EAAE,CAAC;gBAC9B,cAAc,GAAG,IAAI,CAAC;gBACtB,MAAM;YACV,CAAC;QACL,CAAC;QACD,IAAI,CAAC,cAAc,IAAI,4BAA4B,EAAE,CAAC;YAClD,IAAA,qBAAU,EACN,gBAAgB,EAChB,mGAAmG,2BAA2B,kBAAkB,CACnJ,CAAC;QACN,CAAC;IACL,CAAC;IAED,OAAO,IAAA,2BAAY,EAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAe,EAAE,gBAAkC;IAC7E,IAAI,IAAI,GAAG,IAAI,CAAC;IAEhB,MAAM,kBAAkB,GACpB,gBAAgB,CAAC,OAAO,CAAC,KAAK,KAAK,WAAW,IAAI,gBAAgB,CAAC,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC;IAEjG,MAAM,cAAc,GAAG,gBAAgB,CAAC,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC;IAElE,IAAI,sBAAsB,GAAG,KAAK,CAAC;IAEnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,2BAA2B,EAAE,CAAC,EAAE,EAAE,CAAC;QACnD,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC;QAElC,IAAI,GAAG,sBAAsB,CACzB,IAAI,EACJ,gBAAgB,EAChB,IAAI,EACJ,kBAAkB,EAClB,cAAc,EACd,IAAI,CACP,CAAC;QACF,IAAI,gBAAgB,CAAC,SAAS,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,IAAI,IAAA,eAAQ,EAAC,IAAI,CAAC,KAAK,UAAU,EAAE,CAAC;YAChC,sBAAsB,GAAG,IAAI,CAAC;YAC9B,MAAM;QACV,CAAC;IACL,CAAC;IAED,IAAI,CAAC,sBAAsB,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC;QACzD,IAAA,qBAAU,EACN,gBAAgB,EAChB,yFAAyF,2BAA2B,eAAe,CACtI,CAAC;IACN,CAAC;IAED,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC;QAC9B,IAAI,GAAG,IAAA,kBAAU,EAAC,IAAA,sBAAY,EAAC,IAAI,EAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC,CAAC;QAC1E,IAAI,GAAG,sBAAsB,CACzB,IAAI,EACJ,gBAAgB,EAChB,IAAI,EACJ,kBAAkB,EAClB,cAAc,EACd,KAAK,CACR,CAAC;QACF,IAAI,gBAAgB,CAAC,SAAS,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAED,IAAI,gBAAgB,CAAC,OAAO,CAAC,KAAK,KAAK,OAAO,IAAI,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,CAAC;QAC1G,IAAI,GAAG,IAAA,2DAA0B,EAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAC1D,IAAI,gBAAgB,CAAC,SAAS,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAED,IAAI,GAAG,IAAA,2BAAY,EAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAE5C,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,oBAAoB,CACzB,cAAqB,EACrB,UAAiB,EACjB,WAAsB,EACtB,UAAqB,EACrB,gBAAkC;IAElC,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,KAAK,gBAAgB,CAAC,SAAS,CAAC;IAE3E,MAAM,IAAI,GAAkB;QACxB,OAAO;QACP,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK;QACrC,YAAY,EAAE,gBAAgB,CAAC,YAAY;QAC3C,YAAY,EAAE,gBAAgB,CAAC,YAAY;QAC3C,QAAQ,EAAE,gBAAgB,CAAC,QAAQ;QACnC,SAAS,EAAE,gBAAgB,CAAC,SAAS;QACrC,aAAa,EAAE,gBAAgB,CAAC,aAAa;QAC7C,UAAU,EAAE,gBAAgB,CAAC,UAAU;QACvC,SAAS,EAAE,gBAAgB,CAAC,SAAS;QACrC,KAAK,EACD,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,IAAI,gBAAgB,CAAC,WAAW,IAAI,gBAAgB,CAAC,UAAU;YAC1G,CAAC,CAAC;gBACE,MAAM,EAAE,gBAAgB,CAAC,WAAW;gBACpC,KAAK,EAAE,gBAAgB,CAAC,UAAU;aACrC;YACD,CAAC,CAAC,SAAS;KACtB,CAAC;IAEF,IAAI,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC;QAC1D,IAAI,CAAC,eAAe,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,CAAC;IACzE,CAAC;IACD,IAAI,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;QACtD,IAAI,CAAC,UAAU,GAAG;YACd,oBAAoB,EAAE,CAAC,GAAG,CAAC,gBAAgB,CAAC,yBAAyB,IAAI,EAAE,CAAC,CAAC;YAC7E,MAAM,EAAE,CAAC,GAAG,CAAC,gBAAgB,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC;SACzD,CAAC;IACN,CAAC;IAED,OAAO;QACH,KAAK,EAAE,UAAU;QACjB,IAAI;KACP,CAAC;AACN,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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;
|
|
1
|
+
{"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;AAU7D,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,SAAS,EAAE,gBAAgB,EAAE,gBAAgB,GAAG,SAAS,CAEjG"}
|
|
@@ -7,6 +7,7 @@ const guards_1 = require("../ast/guards");
|
|
|
7
7
|
const warnings_1 = require("../observe/warnings");
|
|
8
8
|
const build_field_bundle_1 = require("../predicate/ir/build-field-bundle");
|
|
9
9
|
const normalize_field_predicate_bundle_1 = require("../predicate/normalize-field-predicate-bundle");
|
|
10
|
+
const value_equality_1 = require("../predicate/utils/value-equality");
|
|
10
11
|
function normalizePredicate(node, normalizeContext) {
|
|
11
12
|
return normalizePredicateRecursive(node, normalizeContext);
|
|
12
13
|
}
|
|
@@ -21,20 +22,53 @@ function normalizePredicateRecursive(node, normalizeContext) {
|
|
|
21
22
|
}
|
|
22
23
|
return node;
|
|
23
24
|
}
|
|
25
|
+
function hasMultipleDistinctEqValues(predicates) {
|
|
26
|
+
const eqValues = [];
|
|
27
|
+
for (const p of predicates) {
|
|
28
|
+
if (p.op === "$eq") {
|
|
29
|
+
eqValues.push(p.value);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
if (eqValues.length < 2) {
|
|
33
|
+
return false;
|
|
34
|
+
}
|
|
35
|
+
const distinct = [];
|
|
36
|
+
for (const v of eqValues) {
|
|
37
|
+
if (!distinct.some((u) => (0, value_equality_1.valuesEqual)(u, v))) {
|
|
38
|
+
distinct.push(v);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
return distinct.length >= 2;
|
|
42
|
+
}
|
|
24
43
|
function mergeAndSiblingFieldNodesUnderAnd(children, normalizeContext) {
|
|
25
|
-
const
|
|
44
|
+
const byFieldNodes = new Map();
|
|
26
45
|
const rest = [];
|
|
27
46
|
for (const child of children) {
|
|
28
47
|
if ((0, guards_1.isFieldNode)(child)) {
|
|
29
|
-
|
|
30
|
-
|
|
48
|
+
// Conservative boundary:
|
|
49
|
+
// Dotted-path field conditions can be multikey-sensitive (arrays-of-documents). Merging same-field
|
|
50
|
+
// dotted-path predicates under $and can change semantics and can also cause unsafe "unsat" deductions.
|
|
51
|
+
// Keep dotted-path FieldNodes as separate $and children.
|
|
52
|
+
if (child.field.includes(".")) {
|
|
53
|
+
rest.push(child);
|
|
54
|
+
continue;
|
|
55
|
+
}
|
|
56
|
+
const cur = byFieldNodes.get(child.field) ?? [];
|
|
57
|
+
byFieldNodes.set(child.field, [...cur, child]);
|
|
31
58
|
}
|
|
32
59
|
else {
|
|
33
60
|
rest.push(child);
|
|
34
61
|
}
|
|
35
62
|
}
|
|
36
63
|
const merged = [];
|
|
37
|
-
for (const [field,
|
|
64
|
+
for (const [field, fieldNodes] of byFieldNodes) {
|
|
65
|
+
const preds = fieldNodes.flatMap((n) => n.predicates);
|
|
66
|
+
if (hasMultipleDistinctEqValues(preds)) {
|
|
67
|
+
for (const n of fieldNodes) {
|
|
68
|
+
merged.push(applyPredicateRulesToField(n, normalizeContext));
|
|
69
|
+
}
|
|
70
|
+
continue;
|
|
71
|
+
}
|
|
38
72
|
merged.push(applyPredicateRulesToField((0, builders_1.fieldNode)(field, preds), normalizeContext));
|
|
39
73
|
}
|
|
40
74
|
return [...rest, ...merged];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-predicate.js","sourceRoot":"","sources":["../../src/passes/normalize-predicate.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"normalize-predicate.js","sourceRoot":"","sources":["../../src/passes/normalize-predicate.ts"],"names":[],"mappings":";;AAcA,gDAEC;AAhBD,8CAA6D;AAC7D,sCAA4C;AAC5C,0CAA2D;AAI3D,kDAAuE;AACvE,2EAA4F;AAC5F,oGAGuD;AACvD,sEAAgE;AAEhE,SAAgB,kBAAkB,CAAC,IAAe,EAAE,gBAAkC;IAClF,OAAO,2BAA2B,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;AAC/D,CAAC;AAED,SAAS,2BAA2B,CAAC,IAAe,EAAE,gBAAkC;IACpF,IAAI,IAAA,sBAAa,EAAC,IAAI,CAAC,EAAE,CAAC;QACtB,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,2BAA2B,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC;QACxG,MAAM,cAAc,GAChB,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,iCAAiC,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;QAE1G,OAAO,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,IAAA,kBAAO,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAM,EAAC,cAAc,CAAC,CAAC;IACjF,CAAC;IAED,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE,CAAC;QACpB,OAAO,0BAA0B,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,2BAA2B,CAAC,UAA4B;IAC7D,MAAM,QAAQ,GAAc,EAAE,CAAC;IAC/B,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;QACzB,IAAI,CAAC,CAAC,EAAE,KAAK,KAAK,EAAE,CAAC;YACjB,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;IACL,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,MAAM,QAAQ,GAAc,EAAE,CAAC;IAC/B,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;QACvB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,4BAAW,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3C,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACrB,CAAC;IACL,CAAC;IACD,OAAO,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,iCAAiC,CAAC,QAAqB,EAAE,gBAAkC;IAChG,MAAM,YAAY,GAAG,IAAI,GAAG,EAAuB,CAAC;IACpD,MAAM,IAAI,GAAgB,EAAE,CAAC;IAE7B,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QAC3B,IAAI,IAAA,oBAAW,EAAC,KAAK,CAAC,EAAE,CAAC;YACrB,yBAAyB;YACzB,mGAAmG;YACnG,uGAAuG;YACvG,yDAAyD;YACzD,IAAI,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC5B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACjB,SAAS;YACb,CAAC;YACD,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAChD,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;QACnD,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAgB,EAAE,CAAC;IAC/B,KAAK,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,YAAY,EAAE,CAAC;QAC7C,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QACtD,IAAI,2BAA2B,CAAC,KAAK,CAAC,EAAE,CAAC;YACrC,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;gBACzB,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC;YACjE,CAAC;YACD,SAAS;QACb,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,IAAA,oBAAS,EAAC,KAAK,EAAE,KAAK,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC;IACvF,CAAC;IAED,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,WAAW,GAAG,qCAAqC,CAAC;AAC1D,MAAM,UAAU,GAAG,qCAAqC,CAAC;AACzD,MAAM,aAAa,GAAG,kCAAkC,CAAC;AAEzD,MAAM,oBAAoB,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;AAE3E,SAAS,wBAAwB,CAAC,CAAmB,EAAE,CAAmB;IACtE,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC;QACxB,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAA,oBAAa,EAAC,CAAC,CAAC,KAAK,IAAA,oBAAa,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACvE,CAAC;AAED,SAAS,0BAA0B,CAAC,IAAe,EAAE,gBAAkC;IACnF,MAAM,KAAK,GAAG,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC;IAC7C,MAAM,MAAM,GAAG,KAAK,CAAC,yBAAyB,IAAI,KAAK,CAAC,yBAAyB,IAAI,KAAK,CAAC,sBAAsB,CAAC;IAElH,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,IAAA,0BAAe,EAAC,gBAAgB,EAAE,WAAW,EAAE,0BAA0B,CAAC,CAAC;QAC3E,IAAA,0BAAe,EAAC,gBAAgB,EAAE,UAAU,EAAE,0BAA0B,CAAC,CAAC;QAC1E,IAAA,0BAAe,EAAC,gBAAgB,EAAE,aAAa,EAAE,0BAA0B,CAAC,CAAC;QAC7E,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,2DAAsC,EAAC,IAAI,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAG,IAAA,gEAA6B,EAAC,MAAM,EAAE;QAChD,MAAM,EAAE,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY;QACvD,MAAM,EAAE;YACJ,WAAW,EAAE,KAAK,CAAC,yBAAyB;YAC5C,eAAe,EAAE,KAAK,CAAC,yBAAyB;YAChD,sBAAsB,EAAE,KAAK,CAAC,sBAAsB;SACvD;KACJ,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,IAAA,mEAAgC,EAAC,KAAK,CAAC,CAAC;IAEpD,IAAI,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC;QAC1D,MAAM,KAAK,GAAwB;YAC/B,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,oBAAoB,EAAE,CAAC,GAAG,KAAK,CAAC,mBAAmB,CAAC;YACpD,mBAAmB,EAAE,KAAK,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACvD,EAAE,EAAE,CAAC,CAAC,EAAE;gBACR,MAAM,EAAE,CAAC,CAAC,MAAM;aACnB,CAAC,CAAC;YACH,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,yBAAyB,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC,CAAC,SAAS;YAC5F,WAAW,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC;YAC1C,iBAAiB,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM;YAC5C,UAAU,EAAE,KAAK,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa;YACjD,iBAAiB,EAAE,KAAK,CAAC,aAAa;SACzC,CAAC;QACF,IAAI,CAAC,gBAAgB,CAAC,eAAe,EAAE,CAAC;YACpC,gBAAgB,CAAC,eAAe,GAAG,EAAE,CAAC;QAC1C,CAAC;QACD,gBAAgB,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,KAAK,CAAC,yBAAyB,EAAE,CAAC;QAClC,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC1B,IAAA,0BAAe,EAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;QACnD,CAAC;aAAM,CAAC;YACJ,IAAA,0BAAe,EAAC,gBAAgB,EAAE,WAAW,EAAE,yBAAyB,CAAC,CAAC;QAC9E,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,IAAA,0BAAe,EAAC,gBAAgB,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;IACpE,CAAC;IAED,IAAI,KAAK,CAAC,yBAAyB,EAAE,CAAC;QAClC,MAAM,YAAY,GAAG,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;QAC/F,IAAI,YAAY,EAAE,CAAC;YACf,IAAA,0BAAe,EAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;QAClD,CAAC;aAAM,CAAC;YACJ,IAAA,0BAAe,EAAC,gBAAgB,EAAE,UAAU,EAAE,uCAAuC,CAAC,CAAC;QAC3F,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,IAAA,0BAAe,EAAC,gBAAgB,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;IACnE,CAAC;IAED,IAAI,KAAK,CAAC,sBAAsB,EAAE,CAAC;QAC/B,MAAM,yBAAyB,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACrD,MAAM,WAAW,GACb,KAAK,CAAC,mBAAmB,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC3C,CAAC,KAAK,CAAC,aAAa;gBAChB,KAAK,CAAC,yBAAyB,KAAK,SAAS;gBAC7C,yBAAyB,CAAC,QAAQ,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC,CAAC;QAC7E,IAAI,WAAW,EAAE,CAAC;YACd,IAAA,0BAAe,EAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;QACrD,CAAC;aAAM,CAAC;YACJ,IAAA,0BAAe,EAAC,gBAAgB,EAAE,aAAa,EAAE,2BAA2B,CAAC,CAAC;QAClF,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,IAAA,0BAAe,EAAC,gBAAgB,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;IACtE,CAAC;IAED,IAAI,IAAA,oBAAW,EAAC,GAAG,CAAC,IAAI,GAAG,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,wBAAwB,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5G,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC"}
|
|
@@ -9,7 +9,7 @@ function collectEqAtoms(predicates) {
|
|
|
9
9
|
}
|
|
10
10
|
exports.eqEqCapability = {
|
|
11
11
|
id: "eq.eq",
|
|
12
|
-
description: "Merge duplicate $eq
|
|
12
|
+
description: "Merge duplicate $eq conservatively on the same field",
|
|
13
13
|
riskLevel: "safe",
|
|
14
14
|
supportedAtomKinds: ["eq"],
|
|
15
15
|
isApplicable(ctx) {
|
|
@@ -24,21 +24,19 @@ exports.eqEqCapability = {
|
|
|
24
24
|
if (eqs.length < 2) {
|
|
25
25
|
return base;
|
|
26
26
|
}
|
|
27
|
-
const
|
|
28
|
-
for (let i =
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
changed: true,
|
|
34
|
-
};
|
|
27
|
+
const dedupedEqs = [];
|
|
28
|
+
for (let i = 0; i < eqs.length; i += 1) {
|
|
29
|
+
const current = eqs[i];
|
|
30
|
+
const alreadyIncluded = dedupedEqs.some((eq) => (0, value_equality_1.valuesEqual)(eq.value, current.value));
|
|
31
|
+
if (!alreadyIncluded) {
|
|
32
|
+
dedupedEqs.push(current);
|
|
35
33
|
}
|
|
36
34
|
}
|
|
37
35
|
const rest = ctx.bundle.predicates.filter((a) => a.kind !== "eq");
|
|
38
|
-
const covered = eqs.
|
|
36
|
+
const covered = eqs.filter((candidate) => !dedupedEqs.some((kept) => kept === candidate));
|
|
39
37
|
const next = (0, build_field_bundle_1.refreshBundleMetadata)({
|
|
40
38
|
...ctx.bundle,
|
|
41
|
-
predicates: [
|
|
39
|
+
predicates: [...dedupedEqs, ...rest],
|
|
42
40
|
});
|
|
43
41
|
return {
|
|
44
42
|
bundle: next,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eq-eq.js","sourceRoot":"","sources":["../../../../src/predicate/capabilities/eq/eq-eq.ts"],"names":[],"mappings":";;;AAAA,oEAAoE;AAIpE,+DAAqF;AACrF,+DAAyD;AAEzD,SAAS,cAAc,CAAC,UAA2B;IAC/C,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAA+C,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;AAClG,CAAC;AAEY,QAAA,cAAc,GAAwB;IAC/C,EAAE,EAAE,OAAO;IACX,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"eq-eq.js","sourceRoot":"","sources":["../../../../src/predicate/capabilities/eq/eq-eq.ts"],"names":[],"mappings":";;;AAAA,oEAAoE;AAIpE,+DAAqF;AACrF,+DAAyD;AAEzD,SAAS,cAAc,CAAC,UAA2B;IAC/C,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAA+C,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;AAClG,CAAC;AAEY,QAAA,cAAc,GAAwB;IAC/C,EAAE,EAAE,OAAO;IACX,WAAW,EAAE,sDAAsD;IACnE,SAAS,EAAE,MAAM;IACjB,kBAAkB,EAAE,CAAC,IAAI,CAAC;IAC1B,YAAY,CAAC,GAAoB;QAC7B,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;YAC9B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC;IAC7D,CAAC;IACD,KAAK,CAAC,GAAoB;QACtB,MAAM,IAAI,GAAG,IAAA,qCAAmB,EAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAClD,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,UAAU,GAA6C,EAAE,CAAC;QAChE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YACrC,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;YACvB,MAAM,eAAe,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAA,4BAAW,EAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;YACtF,IAAI,CAAC,eAAe,EAAE,CAAC;gBACnB,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7B,CAAC;QACL,CAAC;QAED,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAClE,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CACtB,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAChE,CAAC;QACF,MAAM,IAAI,GAAG,IAAA,0CAAqB,EAAC;YAC/B,GAAG,GAAG,CAAC,MAAM;YACb,UAAU,EAAE,CAAC,GAAG,UAAU,EAAE,GAAG,IAAI,CAAC;SACvC,CAAC,CAAC;QAEH,OAAO;YACH,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE,IAAI;YACb,aAAa,EAAE,KAAK;YACpB,YAAY,EAAE,OAAO;YACrB,YAAY,EAAE,EAAE;YAChB,QAAQ,EAAE,EAAE;SACf,CAAC;IACN,CAAC;CACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eq-in.d.ts","sourceRoot":"","sources":["../../../../src/predicate/capabilities/eq/eq-in.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"eq-in.d.ts","sourceRoot":"","sources":["../../../../src/predicate/capabilities/eq/eq-in.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAyBtE,eAAO,MAAM,cAAc,EAAE,mBAsD5B,CAAC"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.eqInCapability = void 0;
|
|
4
4
|
const build_field_bundle_1 = require("../../ir/build-field-bundle");
|
|
5
5
|
const relation_result_1 = require("../shared/relation-result");
|
|
6
|
-
const intersect_in_lists_1 = require("../../utils/intersect-in-lists");
|
|
7
6
|
const set_ops_1 = require("../../utils/set-ops");
|
|
8
7
|
const value_equality_1 = require("../../utils/value-equality");
|
|
9
8
|
function normalizeInAtoms(predicates) {
|
|
@@ -28,7 +27,7 @@ function normalizeInAtoms(predicates) {
|
|
|
28
27
|
}
|
|
29
28
|
exports.eqInCapability = {
|
|
30
29
|
id: "eq.in",
|
|
31
|
-
description: "
|
|
30
|
+
description: "Deduplicate $in values; when $eq value is contained in every $in list, drop redundant $in atoms (safe collapse only)",
|
|
32
31
|
riskLevel: "guarded",
|
|
33
32
|
supportedAtomKinds: ["eq", "in"],
|
|
34
33
|
isApplicable(ctx) {
|
|
@@ -36,13 +35,8 @@ exports.eqInCapability = {
|
|
|
36
35
|
if (!hasIn) {
|
|
37
36
|
return false;
|
|
38
37
|
}
|
|
39
|
-
const eq = ctx.bundle.predicates.find((a) => a.kind === "eq");
|
|
40
38
|
const needsMerge = ctx.engine.mergeComparable;
|
|
41
|
-
|
|
42
|
-
if (!needsMerge && !needsCollapse) {
|
|
43
|
-
return false;
|
|
44
|
-
}
|
|
45
|
-
if (ctx.bundle.metadata.hasArraySensitiveSemantics && !ctx.safety.allowArraySensitiveRewrite) {
|
|
39
|
+
if (!needsMerge) {
|
|
46
40
|
return false;
|
|
47
41
|
}
|
|
48
42
|
return true;
|
|
@@ -52,53 +46,18 @@ exports.eqInCapability = {
|
|
|
52
46
|
let predicates = ctx.bundle.predicates;
|
|
53
47
|
let changed = false;
|
|
54
48
|
const coveredAtoms = [];
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
changed = normalized.changed;
|
|
59
|
-
}
|
|
49
|
+
const normalized = normalizeInAtoms(predicates);
|
|
50
|
+
predicates = normalized.next;
|
|
51
|
+
changed = normalized.changed;
|
|
60
52
|
let ins = predicates.filter((a) => a.kind === "in");
|
|
61
|
-
if (ctx.engine.mergeComparable && ins.length >= 2) {
|
|
62
|
-
const prevIns = [...ins];
|
|
63
|
-
const intersected = (0, intersect_in_lists_1.intersectInAtomValues)(ins);
|
|
64
|
-
const uniq = (0, set_ops_1.uniqueUnknownArray)(intersected);
|
|
65
|
-
if (uniq.length === 0) {
|
|
66
|
-
if (ctx.engine.collapseContradictions) {
|
|
67
|
-
return {
|
|
68
|
-
...base,
|
|
69
|
-
bundle: (0, build_field_bundle_1.refreshBundleMetadata)({ ...ctx.bundle, predicates }),
|
|
70
|
-
contradiction: true,
|
|
71
|
-
changed: true,
|
|
72
|
-
};
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
else {
|
|
76
|
-
predicates = [...predicates.filter((a) => a.kind !== "in"), { kind: "in", values: uniq }];
|
|
77
|
-
coveredAtoms.push(...prevIns);
|
|
78
|
-
changed = true;
|
|
79
|
-
ins = predicates.filter((a) => a.kind === "in");
|
|
80
|
-
}
|
|
81
|
-
}
|
|
82
53
|
const eq = predicates.find((a) => a.kind === "eq");
|
|
83
|
-
if (
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
if (!found) {
|
|
87
|
-
return {
|
|
88
|
-
...base,
|
|
89
|
-
bundle: (0, build_field_bundle_1.refreshBundleMetadata)({ ...ctx.bundle, predicates }),
|
|
90
|
-
contradiction: true,
|
|
91
|
-
changed: true,
|
|
92
|
-
};
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
}
|
|
96
|
-
if (ctx.engine.mergeComparable && eq && eq.kind === "eq" && ins.length > 0) {
|
|
97
|
-
const allInsRedundant = ins.every((inAtom) => inAtom.values.some((item) => (0, value_equality_1.valuesEqual)(item, eq.value)));
|
|
98
|
-
if (allInsRedundant) {
|
|
54
|
+
if (eq && eq.kind === "eq" && ins.length > 0) {
|
|
55
|
+
const eqIsInEveryInList = ins.every((inAtom) => inAtom.values.some((item) => (0, value_equality_1.valuesEqual)(item, eq.value)));
|
|
56
|
+
if (eqIsInEveryInList) {
|
|
99
57
|
coveredAtoms.push(...ins);
|
|
100
58
|
predicates = predicates.filter((a) => a.kind !== "in");
|
|
101
59
|
changed = true;
|
|
60
|
+
ins = [];
|
|
102
61
|
}
|
|
103
62
|
}
|
|
104
63
|
if (!changed) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eq-in.js","sourceRoot":"","sources":["../../../../src/predicate/capabilities/eq/eq-in.ts"],"names":[],"mappings":";;;AAAA,oEAAoE;AAIpE,+DAAqF;AACrF,
|
|
1
|
+
{"version":3,"file":"eq-in.js","sourceRoot":"","sources":["../../../../src/predicate/capabilities/eq/eq-in.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eq-range.d.ts","sourceRoot":"","sources":["../../../../src/predicate/capabilities/eq/eq-range.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"eq-range.d.ts","sourceRoot":"","sources":["../../../../src/predicate/capabilities/eq/eq-range.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAkBtE,eAAO,MAAM,iBAAiB,EAAE,mBAwD/B,CAAC"}
|
|
@@ -4,10 +4,6 @@ exports.eqRangeCapability = void 0;
|
|
|
4
4
|
const merge_range_bounds_1 = require("../../analysis/merge-range-bounds");
|
|
5
5
|
const build_field_bundle_1 = require("../../ir/build-field-bundle");
|
|
6
6
|
const relation_result_1 = require("../shared/relation-result");
|
|
7
|
-
const intersect_in_lists_1 = require("../../utils/intersect-in-lists");
|
|
8
|
-
const set_ops_1 = require("../../utils/set-ops");
|
|
9
|
-
const value_equality_1 = require("../../utils/value-equality");
|
|
10
|
-
const bson_compare_1 = require("../../utils/bson-compare");
|
|
11
7
|
function rangeAtomFromLower(lower) {
|
|
12
8
|
if (lower.kind === "gt") {
|
|
13
9
|
return { kind: "gt", value: lower.value };
|
|
@@ -20,21 +16,13 @@ function rangeAtomFromUpper(upper) {
|
|
|
20
16
|
}
|
|
21
17
|
return { kind: "lte", value: upper.value };
|
|
22
18
|
}
|
|
23
|
-
function inValuesSameSet(a, b) {
|
|
24
|
-
const ua = (0, set_ops_1.uniqueUnknownArray)(a);
|
|
25
|
-
const ub = (0, set_ops_1.uniqueUnknownArray)(b);
|
|
26
|
-
if (ua.length !== ub.length) {
|
|
27
|
-
return false;
|
|
28
|
-
}
|
|
29
|
-
return ua.every((v) => ub.some((w) => (0, value_equality_1.valuesEqual)(v, w)));
|
|
30
|
-
}
|
|
31
19
|
exports.eqRangeCapability = {
|
|
32
20
|
id: "eq.range",
|
|
33
|
-
description: "
|
|
21
|
+
description: "When $eq/$in share a field with range atoms, canonicalize self-contradictory merged bounds only (no $in tightening)",
|
|
34
22
|
riskLevel: "safe",
|
|
35
23
|
supportedAtomKinds: ["eq", "in", "gt", "gte", "lt", "lte"],
|
|
36
24
|
isApplicable(ctx) {
|
|
37
|
-
if (!ctx.engine.mergeComparable
|
|
25
|
+
if (!ctx.engine.mergeComparable) {
|
|
38
26
|
return false;
|
|
39
27
|
}
|
|
40
28
|
const hasEq = ctx.bundle.predicates.some((a) => a.kind === "eq");
|
|
@@ -52,75 +40,18 @@ exports.eqRangeCapability = {
|
|
|
52
40
|
return base;
|
|
53
41
|
}
|
|
54
42
|
const merged = (0, merge_range_bounds_1.mergeRangeBoundsFromRangeAtoms)(rangeAtoms);
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
}
|
|
58
|
-
const eq = otherAtoms.find((a) => a.kind === "eq");
|
|
59
|
-
if (eq && eq.kind === "eq") {
|
|
60
|
-
if (!(0, bson_compare_1.isComparableScalar)(eq.value)) {
|
|
61
|
-
return {
|
|
62
|
-
...base,
|
|
63
|
-
skippedAtoms: [eq],
|
|
64
|
-
warnings: [`field ${ctx.bundle.fieldPath}: $eq is not comparable with range`],
|
|
65
|
-
};
|
|
66
|
-
}
|
|
67
|
-
if (ctx.engine.collapseContradictions && !(0, merge_range_bounds_1.valueSatisfiesMergedRange)(eq.value, merged.lower, merged.upper)) {
|
|
68
|
-
return { ...base, contradiction: true, changed: true };
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
let changed = false;
|
|
72
|
-
const coveredAtoms = [];
|
|
73
|
-
let nextInAtoms = inAtoms;
|
|
74
|
-
let shouldDropRanges = false;
|
|
75
|
-
let inTightened = false;
|
|
76
|
-
if (inAtoms.length > 0 &&
|
|
77
|
-
!merged.skippedNonComparableRange &&
|
|
78
|
-
(ctx.engine.mergeComparable || ctx.engine.collapseContradictions)) {
|
|
79
|
-
const intersected = inAtoms.length === 1 ? [...inAtoms[0].values] : (0, intersect_in_lists_1.intersectInAtomValues)(inAtoms);
|
|
80
|
-
const allComparable = intersected.length > 0 && intersected.every(bson_compare_1.isComparableScalar);
|
|
81
|
-
if (allComparable) {
|
|
82
|
-
const filtered = intersected.filter((v) => (0, merge_range_bounds_1.valueSatisfiesMergedRange)(v, merged.lower, merged.upper));
|
|
83
|
-
if (filtered.length === 0 && intersected.length > 0 && ctx.engine.collapseContradictions) {
|
|
84
|
-
return { ...base, contradiction: true, changed: true };
|
|
85
|
-
}
|
|
86
|
-
if (ctx.engine.mergeComparable && filtered.length > 0) {
|
|
87
|
-
const uniqFiltered = (0, set_ops_1.uniqueUnknownArray)(filtered);
|
|
88
|
-
inTightened =
|
|
89
|
-
inAtoms.length > 1 ||
|
|
90
|
-
(inAtoms.length === 1 && !inValuesSameSet(inAtoms[0].values, uniqFiltered));
|
|
91
|
-
if (inTightened) {
|
|
92
|
-
nextInAtoms = [{ kind: "in", values: uniqFiltered }];
|
|
93
|
-
coveredAtoms.push(...inAtoms);
|
|
94
|
-
}
|
|
95
|
-
shouldDropRanges = true;
|
|
96
|
-
changed = true;
|
|
97
|
-
}
|
|
98
|
-
}
|
|
99
|
-
}
|
|
100
|
-
if (ctx.engine.mergeComparable &&
|
|
101
|
-
eq &&
|
|
102
|
-
eq.kind === "eq" &&
|
|
103
|
-
(0, bson_compare_1.isComparableScalar)(eq.value) &&
|
|
104
|
-
(0, merge_range_bounds_1.valueSatisfiesMergedRange)(eq.value, merged.lower, merged.upper)) {
|
|
105
|
-
shouldDropRanges = true;
|
|
106
|
-
changed = true;
|
|
107
|
-
}
|
|
108
|
-
if (!changed) {
|
|
43
|
+
const hasContradictoryRangeBounds = (0, merge_range_bounds_1.mergedBoundsContradict)(merged.lower, merged.upper);
|
|
44
|
+
if (!hasContradictoryRangeBounds) {
|
|
109
45
|
return base;
|
|
110
46
|
}
|
|
111
|
-
if (shouldDropRanges) {
|
|
112
|
-
coveredAtoms.push(...rangeAtoms);
|
|
113
|
-
}
|
|
114
47
|
const rangeOut = [];
|
|
115
|
-
if (
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
rangeOut.push(rangeAtomFromUpper(merged.upper));
|
|
121
|
-
}
|
|
48
|
+
if (merged.lower) {
|
|
49
|
+
rangeOut.push(rangeAtomFromLower(merged.lower));
|
|
50
|
+
}
|
|
51
|
+
if (merged.upper) {
|
|
52
|
+
rangeOut.push(rangeAtomFromUpper(merged.upper));
|
|
122
53
|
}
|
|
123
|
-
const nextPredicates = [...otherAtoms, ...
|
|
54
|
+
const nextPredicates = [...otherAtoms, ...inAtoms, ...rangeOut];
|
|
124
55
|
const bundle = (0, build_field_bundle_1.refreshBundleMetadata)({
|
|
125
56
|
...ctx.bundle,
|
|
126
57
|
predicates: nextPredicates,
|
|
@@ -129,7 +60,7 @@ exports.eqRangeCapability = {
|
|
|
129
60
|
bundle,
|
|
130
61
|
changed: true,
|
|
131
62
|
contradiction: false,
|
|
132
|
-
coveredAtoms,
|
|
63
|
+
coveredAtoms: [],
|
|
133
64
|
skippedAtoms: [],
|
|
134
65
|
warnings: [],
|
|
135
66
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eq-range.js","sourceRoot":"","sources":["../../../../src/predicate/capabilities/eq/eq-range.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"eq-range.js","sourceRoot":"","sources":["../../../../src/predicate/capabilities/eq/eq-range.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"range-range.d.ts","sourceRoot":"","sources":["../../../../src/predicate/capabilities/range/range-range.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAkFtE,eAAO,MAAM,oBAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"range-range.d.ts","sourceRoot":"","sources":["../../../../src/predicate/capabilities/range/range-range.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAkFtE,eAAO,MAAM,oBAAoB,EAAE,mBAgFlC,CAAC"}
|
|
@@ -78,7 +78,7 @@ exports.rangeRangeCapability = {
|
|
|
78
78
|
riskLevel: "safe",
|
|
79
79
|
supportedAtomKinds: ["gt", "gte", "lt", "lte"],
|
|
80
80
|
isApplicable(ctx) {
|
|
81
|
-
if (!ctx.engine.mergeComparable
|
|
81
|
+
if (!ctx.engine.mergeComparable) {
|
|
82
82
|
return false;
|
|
83
83
|
}
|
|
84
84
|
const rangeCount = ctx.bundle.predicates.filter((a) => a.kind === "gt" || a.kind === "gte" || a.kind === "lt" || a.kind === "lte").length;
|
|
@@ -116,15 +116,6 @@ exports.rangeRangeCapability = {
|
|
|
116
116
|
}
|
|
117
117
|
others.push(p);
|
|
118
118
|
}
|
|
119
|
-
if (lower && upper) {
|
|
120
|
-
const cmp = (0, bson_compare_1.compareScalarValues)(lower.value, upper.value);
|
|
121
|
-
if (cmp === 1) {
|
|
122
|
-
return { ...base, contradiction: true, changed: true };
|
|
123
|
-
}
|
|
124
|
-
if (cmp === 0 && (lower.kind === "gt" || upper.kind === "lt")) {
|
|
125
|
-
return { ...base, contradiction: true, changed: true };
|
|
126
|
-
}
|
|
127
|
-
}
|
|
128
119
|
const hadMultipleRange = ctx.bundle.predicates.filter((a) => a.kind === "gt" || a.kind === "gte" || a.kind === "lt" || a.kind === "lte").length >= 2;
|
|
129
120
|
if (!hadMultipleRange) {
|
|
130
121
|
return base;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"range-range.js","sourceRoot":"","sources":["../../../../src/predicate/capabilities/range/range-range.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"range-range.js","sourceRoot":"","sources":["../../../../src/predicate/capabilities/range/range-range.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relation-planner.d.ts","sourceRoot":"","sources":["../../../src/predicate/planner/relation-planner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAE/E,OAAO,KAAK,EAAE,YAAY,EAAqB,MAAM,iBAAiB,CAAC;AAsBvE,wBAAgB,aAAa,CAAC,mBAAmB,EAAE,mBAAmB,EAAE,EAAE,GAAG,EAAE,eAAe,GAAG,YAAY,
|
|
1
|
+
{"version":3,"file":"relation-planner.d.ts","sourceRoot":"","sources":["../../../src/predicate/planner/relation-planner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAE/E,OAAO,KAAK,EAAE,YAAY,EAAqB,MAAM,iBAAiB,CAAC;AAsBvE,wBAAgB,aAAa,CAAC,mBAAmB,EAAE,mBAAmB,EAAE,EAAE,GAAG,EAAE,eAAe,GAAG,YAAY,CAqC5G"}
|
|
@@ -41,13 +41,6 @@ function planRelations(orderedCapabilities, ctx) {
|
|
|
41
41
|
});
|
|
42
42
|
continue;
|
|
43
43
|
}
|
|
44
|
-
if (cap.id === "eq.in" && ctx.bundle.metadata.hasArraySensitiveSemantics && !ctx.safety.allowArraySensitiveRewrite) {
|
|
45
|
-
skippedCapabilities.push({
|
|
46
|
-
id: cap.id,
|
|
47
|
-
reason: "array-sensitive rewrite disabled",
|
|
48
|
-
});
|
|
49
|
-
continue;
|
|
50
|
-
}
|
|
51
44
|
if (cap.id === "eq.in" && ctx.bundle.metadata.hasNullSemantics && !ctx.safety.allowNullSemanticRewrite) {
|
|
52
45
|
skippedCapabilities.push({
|
|
53
46
|
id: cap.id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relation-planner.js","sourceRoot":"","sources":["../../../src/predicate/planner/relation-planner.ts"],"names":[],"mappings":";;AAyBA,
|
|
1
|
+
{"version":3,"file":"relation-planner.js","sourceRoot":"","sources":["../../../src/predicate/planner/relation-planner.ts"],"names":[],"mappings":";;AAyBA,sCAqCC;AA5DD,iEAAgE;AAEhE,+DAA8D;AAE9D,MAAM,wBAAwB,GAAa,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;AAEtH,SAAS,iBAAiB,CAAC,IAA2B;IAClD,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAU,CAAC,CAAC,CAAC;IAC1D,MAAM,OAAO,GAA0B,EAAE,CAAC;IAC1C,KAAK,MAAM,EAAE,IAAI,wBAAwB,EAAE,CAAC;QACxC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACzB,IAAI,GAAG,EAAE,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC;IACL,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACrB,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YAC7C,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,SAAgB,aAAa,CAAC,mBAA0C,EAAE,GAAoB;IAC1F,MAAM,mBAAmB,GAAwB,EAAE,CAAC;IAEpD,IAAI,GAAG,CAAC,MAAM,CAAC,uBAAuB,IAAI,IAAA,yCAAoB,EAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QACzE,KAAK,MAAM,GAAG,IAAI,mBAAmB,EAAE,CAAC;YACpC,mBAAmB,CAAC,IAAI,CAAC;gBACrB,EAAE,EAAE,GAAG,CAAC,EAAE;gBACV,MAAM,EAAE,kCAAkC;aAC7C,CAAC,CAAC;QACP,CAAC;QACD,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,mBAAmB,EAAE,CAAC;IACrD,CAAC;IAED,MAAM,OAAO,GAAG,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;IACvD,MAAM,QAAQ,GAA0B,EAAE,CAAC;IAE3C,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QACxB,IAAI,CAAC,IAAA,2CAAqB,EAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;YACnC,mBAAmB,CAAC,IAAI,CAAC;gBACrB,EAAE,EAAE,GAAG,CAAC,EAAE;gBACV,MAAM,EAAE,oCAAoC;aAC/C,CAAC,CAAC;YACH,SAAS;QACb,CAAC;QAED,IAAI,GAAG,CAAC,EAAE,KAAK,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,wBAAwB,EAAE,CAAC;YACrG,mBAAmB,CAAC,IAAI,CAAC;gBACrB,EAAE,EAAE,GAAG,CAAC,EAAE;gBACV,MAAM,EAAE,gCAAgC;aAC3C,CAAC,CAAC;YACH,SAAS;QACb,CAAC;QAED,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,mBAAmB,EAAE,CAAC;AAC3D,CAAC"}
|
|
@@ -1,4 +1,12 @@
|
|
|
1
1
|
export type PredicateSafetyPolicy = {
|
|
2
|
+
/**
|
|
3
|
+
* @deprecated Deprecated: This option no longer provides reliable semantic guarantees, and will be removed in a future release.
|
|
4
|
+
*
|
|
5
|
+
* Notes:
|
|
6
|
+
* - This library cannot prove whether a field is multikey (an array) without schema knowledge.
|
|
7
|
+
* - As a result, this option no longer affects "eq.in" unsatisfiable (unsat) detection; even if set to true,
|
|
8
|
+
* it will not restore logic such as "eq ∉ in ⇒ IMPOSSIBLE_SELECTOR".
|
|
9
|
+
*/
|
|
2
10
|
allowArraySensitiveRewrite: boolean;
|
|
3
11
|
allowNullSemanticRewrite: boolean;
|
|
4
12
|
allowExistsSemanticRewrite: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"predicate-safety-policy.d.ts","sourceRoot":"","sources":["../../../src/predicate/safety/predicate-safety-policy.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,qBAAqB,GAAG;IAChC,0BAA0B,EAAE,OAAO,CAAC;IACpC,wBAAwB,EAAE,OAAO,CAAC;IAClC,0BAA0B,EAAE,OAAO,CAAC;IACpC,wBAAwB,EAAE,OAAO,CAAC;IAClC,uBAAuB,EAAE,OAAO,CAAC;CACpC,CAAC;AAEF,eAAO,MAAM,+BAA+B,EAAE,qBAM7C,CAAC"}
|
|
1
|
+
{"version":3,"file":"predicate-safety-policy.d.ts","sourceRoot":"","sources":["../../../src/predicate/safety/predicate-safety-policy.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,qBAAqB,GAAG;IAChC;;;;;;;OAOG;IACH,0BAA0B,EAAE,OAAO,CAAC;IACpC,wBAAwB,EAAE,OAAO,CAAC;IAClC,0BAA0B,EAAE,OAAO,CAAC;IACpC,wBAAwB,EAAE,OAAO,CAAC;IAClC,uBAAuB,EAAE,OAAO,CAAC;CACpC,CAAC;AAEF,eAAO,MAAM,+BAA+B,EAAE,qBAM7C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"predicate-safety-policy.js","sourceRoot":"","sources":["../../../src/predicate/safety/predicate-safety-policy.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"predicate-safety-policy.js","sourceRoot":"","sources":["../../../src/predicate/safety/predicate-safety-policy.ts"],"names":[],"mappings":";;;AAgBa,QAAA,+BAA+B,GAA0B;IAClE,0BAA0B,EAAE,KAAK;IACjC,wBAAwB,EAAE,KAAK;IAC/B,0BAA0B,EAAE,KAAK;IACjC,wBAAwB,EAAE,KAAK;IAC/B,uBAAuB,EAAE,IAAI;CAChC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cardinality-risk.d.ts","sourceRoot":"","sources":["../../../src/predicate/shared/cardinality-risk.ts"],"names":[],"mappings":"AAAA,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAE7E"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.shouldAllowSingleFieldContradiction = shouldAllowSingleFieldContradiction;
|
|
4
|
+
function shouldAllowSingleFieldContradiction(_bundle) {
|
|
5
|
+
return false;
|
|
6
|
+
}
|
|
7
|
+
//# sourceMappingURL=cardinality-risk.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cardinality-risk.js","sourceRoot":"","sources":["../../../src/predicate/shared/cardinality-risk.ts"],"names":[],"mappings":";;AAAA,kFAEC;AAFD,SAAgB,mCAAmC,CAAC,OAAgB;IAChE,OAAO,KAAK,CAAC;AACjB,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { RelationContext } from "../capabilities/shared/relation-context";
|
|
2
|
+
export declare function canCollapseSingleFieldContradiction(ctx: RelationContext): boolean;
|
|
3
|
+
export declare function canApplyScalarOnlyTightening(ctx: RelationContext): boolean;
|
|
4
|
+
//# sourceMappingURL=field-cardinality-guards.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"field-cardinality-guards.d.ts","sourceRoot":"","sources":["../../../src/predicate/shared/field-cardinality-guards.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAE/E,wBAAgB,mCAAmC,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAEjF;AAED,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAE1E"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.canCollapseSingleFieldContradiction = canCollapseSingleFieldContradiction;
|
|
4
|
+
exports.canApplyScalarOnlyTightening = canApplyScalarOnlyTightening;
|
|
5
|
+
function canCollapseSingleFieldContradiction(ctx) {
|
|
6
|
+
return ctx.fieldCardinalityPolicy === "assumeScalar";
|
|
7
|
+
}
|
|
8
|
+
function canApplyScalarOnlyTightening(ctx) {
|
|
9
|
+
return ctx.fieldCardinalityPolicy === "assumeScalar";
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=field-cardinality-guards.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"field-cardinality-guards.js","sourceRoot":"","sources":["../../../src/predicate/shared/field-cardinality-guards.ts"],"names":[],"mappings":";;AAEA,kFAEC;AAED,oEAEC;AAND,SAAgB,mCAAmC,CAAC,GAAoB;IACpE,OAAO,GAAG,CAAC,sBAAsB,KAAK,cAAc,CAAC;AACzD,CAAC;AAED,SAAgB,4BAA4B,CAAC,GAAoB;IAC7D,OAAO,GAAG,CAAC,sBAAsB,KAAK,cAAc,CAAC;AACzD,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"field-cardinality-policy.d.ts","sourceRoot":"","sources":["../../../src/predicate/shared/field-cardinality-policy.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,sBAAsB,GAAG,cAAc,GAAG,cAAc,CAAC;AAErE,eAAO,MAAM,gCAAgC,EAAE,sBAAuC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"field-cardinality-policy.js","sourceRoot":"","sources":["../../../src/predicate/shared/field-cardinality-policy.ts"],"names":[],"mappings":";;;AAEa,QAAA,gCAAgC,GAA2B,cAAc,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "mongo-query-normalizer",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.2",
|
|
4
4
|
"description": "Observable, level-based normalizer for MongoDB query objects. Defaults to conservative shape stabilization; optional predicate and scope levels with documented contracts. Predictable output and metadata—not planner optimization.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|