@contember/engine-content-api 1.2.0-alpha.13 → 1.2.0-alpha.15
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/dist/src/mapper/select/optimizer/WhereOptimizer.d.ts.map +1 -1
- package/dist/src/mapper/select/optimizer/WhereOptimizer.js +69 -23
- package/dist/src/mapper/select/optimizer/WhereOptimizer.js.map +1 -1
- package/dist/src/mapper/select/optimizer/WhereReplacer.d.ts +1 -4
- package/dist/src/mapper/select/optimizer/WhereReplacer.d.ts.map +1 -1
- package/dist/src/mapper/select/optimizer/WhereReplacer.js +27 -9
- package/dist/src/mapper/select/optimizer/WhereReplacer.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/tests/tsconfig.tsbuildinfo +1 -1
- package/package.json +10 -10
- package/src/mapper/select/optimizer/WhereOptimizer.ts +80 -36
- package/src/mapper/select/optimizer/WhereReplacer.ts +27 -15
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WhereOptimizer.d.ts","sourceRoot":"","sources":["../../../../../src/mapper/select/optimizer/WhereOptimizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAYzD,MAAM,WAAW,sBAAsB;IACtC,YAAY,CAAC,EAAE,KAAK,CAAC,kBAAkB,EAAE,CAAA;IACzC,mBAAmB,CAAC,EAAE,KAAK,CAAC,aAAa,EAAE,CAAA;CAC3C;
|
|
1
|
+
{"version":3,"file":"WhereOptimizer.d.ts","sourceRoot":"","sources":["../../../../../src/mapper/select/optimizer/WhereOptimizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAYzD,MAAM,WAAW,sBAAsB;IACtC,YAAY,CAAC,EAAE,KAAK,CAAC,kBAAkB,EAAE,CAAA;IACzC,mBAAmB,CAAC,EAAE,KAAK,CAAC,aAAa,EAAE,CAAA;CAC3C;AAID,qBAAa,cAAc;IAIzB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IAJpC,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAmG;gBAGnH,KAAK,EAAE,KAAK,CAAC,MAAM,EACnB,kBAAkB,EAAE,kBAAkB;IAIjD,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,YAAiB,EAAE,mBAAwB,EAAE,GAAE,sBAA2B,GAAG,KAAK,CAAC,aAAa;IA+BpK,OAAO,CAAC,aAAa;IAiDrB,OAAO,CAAC,UAAU;IAYlB,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,aAAa;IAuBrB,OAAO,CAAC,iBAAiB;CAqCzB"}
|
|
@@ -17,41 +17,74 @@ class WhereOptimizer {
|
|
|
17
17
|
processedRelationPath = [];
|
|
18
18
|
}
|
|
19
19
|
else {
|
|
20
|
-
processedRelationPath.push({
|
|
20
|
+
processedRelationPath.push({ context: el, canEliminate: true, isLast: Number(i) === relationPath.length });
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
let result = this.optimizeWhere(where, entity, processedRelationPath);
|
|
24
24
|
if (typeof result === 'boolean') {
|
|
25
25
|
return { [entity.primary]: { [result ? 'always' : 'never']: true } };
|
|
26
26
|
}
|
|
27
|
-
|
|
27
|
+
let changed = false;
|
|
28
28
|
for (const evaluated of evaluatedPredicates) {
|
|
29
29
|
const evaluatedPredicate = this.optimize(evaluated, entity);
|
|
30
|
-
|
|
30
|
+
const newResult = (0, WhereReplacer_1.replaceWhere)(result, evaluatedPredicate, { [entity.primary]: { always: true } });
|
|
31
|
+
if (newResult !== result) {
|
|
32
|
+
result = newResult;
|
|
33
|
+
changed = true;
|
|
34
|
+
}
|
|
31
35
|
}
|
|
32
|
-
if (
|
|
36
|
+
if (changed) {
|
|
33
37
|
return this.optimize(result, entity);
|
|
34
38
|
}
|
|
35
39
|
return result;
|
|
36
40
|
}
|
|
37
41
|
optimizeWhere(where, entity, relationPath) {
|
|
38
|
-
|
|
42
|
+
const operands = [];
|
|
43
|
+
for (const key in where) {
|
|
44
|
+
const value = where[key];
|
|
45
|
+
let operand = undefined;
|
|
39
46
|
if (value === undefined || value === null) {
|
|
40
|
-
|
|
47
|
+
continue;
|
|
41
48
|
}
|
|
42
49
|
else if (key === 'and') {
|
|
43
|
-
|
|
50
|
+
const innerOperands = [];
|
|
51
|
+
for (const innerValue of value) {
|
|
52
|
+
const innerOperand = this.optimizeWhere(innerValue, entity, relationPath);
|
|
53
|
+
if (innerOperand === false) {
|
|
54
|
+
return false;
|
|
55
|
+
}
|
|
56
|
+
innerOperands.push(innerOperand);
|
|
57
|
+
}
|
|
58
|
+
operand = this.optimizeAnd(innerOperands, entity, relationPath);
|
|
44
59
|
}
|
|
45
60
|
else if (key === 'or') {
|
|
46
|
-
|
|
61
|
+
const innerOperands = [];
|
|
62
|
+
for (const innerValue of value) {
|
|
63
|
+
const innerOperand = this.optimizeWhere(innerValue, entity, relationPath);
|
|
64
|
+
if (innerOperand === true) {
|
|
65
|
+
operand = true;
|
|
66
|
+
break;
|
|
67
|
+
}
|
|
68
|
+
innerOperands.push(innerOperand);
|
|
69
|
+
}
|
|
70
|
+
if (operand !== true) {
|
|
71
|
+
operand = this.optimizeOr(innerOperands, entity, relationPath);
|
|
72
|
+
}
|
|
47
73
|
}
|
|
48
74
|
else if (key === 'not') {
|
|
49
|
-
|
|
75
|
+
operand = (0, helpers_1.optimizeNot)(this.optimizeWhere(value, entity, relationPath));
|
|
50
76
|
}
|
|
51
77
|
else {
|
|
52
|
-
|
|
78
|
+
operand = this.resolveFieldValue(entity, key, value, relationPath);
|
|
79
|
+
}
|
|
80
|
+
if (operand === false) {
|
|
81
|
+
return false;
|
|
53
82
|
}
|
|
54
|
-
|
|
83
|
+
else if (operand !== undefined) {
|
|
84
|
+
operands.push(operand);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
return this.optimizeAnd(operands, entity, relationPath);
|
|
55
88
|
}
|
|
56
89
|
optimizeOr(operands, entity, relationPath) {
|
|
57
90
|
const optimized = (0, helpers_1.optimizeOr)(operands);
|
|
@@ -59,6 +92,9 @@ class WhereOptimizer {
|
|
|
59
92
|
return optimized;
|
|
60
93
|
}
|
|
61
94
|
const result = this.crossOptimize(optimized.or, entity, { never: true }, relationPath);
|
|
95
|
+
if (result === optimized.or) {
|
|
96
|
+
return optimized;
|
|
97
|
+
}
|
|
62
98
|
return (0, helpers_1.optimizeOr)(result);
|
|
63
99
|
}
|
|
64
100
|
optimizeAnd(operands, entity, relationPath) {
|
|
@@ -67,19 +103,28 @@ class WhereOptimizer {
|
|
|
67
103
|
return optimized;
|
|
68
104
|
}
|
|
69
105
|
const result = this.crossOptimize(optimized.and, entity, { always: true }, relationPath);
|
|
106
|
+
if (result === optimized.and) {
|
|
107
|
+
return optimized;
|
|
108
|
+
}
|
|
70
109
|
return (0, helpers_1.optimizeAnd)(result);
|
|
71
110
|
}
|
|
72
111
|
crossOptimize(operands, entity, replacement, relationPath) {
|
|
73
|
-
|
|
112
|
+
let result = operands;
|
|
113
|
+
let copied = false;
|
|
74
114
|
const count = result.length;
|
|
75
115
|
for (let i = 0; i < count; i++) {
|
|
76
116
|
for (let j = 0; j < count; j++) {
|
|
77
117
|
const a = result[j];
|
|
78
118
|
const b = result[i];
|
|
79
119
|
if (i !== j && typeof a !== 'boolean' && typeof b !== 'boolean') {
|
|
80
|
-
const
|
|
81
|
-
|
|
82
|
-
|
|
120
|
+
const elResult = (0, WhereReplacer_1.replaceWhere)(a, b, { [entity.primary]: replacement });
|
|
121
|
+
if (elResult !== a) {
|
|
122
|
+
if (!copied) {
|
|
123
|
+
result = [...result];
|
|
124
|
+
copied = true;
|
|
125
|
+
}
|
|
126
|
+
result[j] = this.optimizeWhere(elResult, entity, relationPath);
|
|
127
|
+
}
|
|
83
128
|
}
|
|
84
129
|
}
|
|
85
130
|
}
|
|
@@ -96,22 +141,23 @@ class WhereOptimizer {
|
|
|
96
141
|
},
|
|
97
142
|
visitRelation: context => {
|
|
98
143
|
var _a;
|
|
99
|
-
const { targetEntity, relation } = context;
|
|
100
144
|
let where = value;
|
|
101
145
|
const newRelationPath = [...relationPath];
|
|
102
|
-
|
|
146
|
+
const length = relationPath.length;
|
|
147
|
+
if (length > 0 && ((_a = relationPath[length - 1].context.targetRelation) === null || _a === void 0 ? void 0 : _a.name) === context.relation.name) {
|
|
103
148
|
const item = newRelationPath.pop();
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
where = (0, WhereReplacer_1.replaceWhere)(where, { [targetEntity.primary]: { isNull:
|
|
149
|
+
const type = item.context.type;
|
|
150
|
+
if ((item === null || item === void 0 ? void 0 : item.canEliminate) && (type === 'oneHasMany' || type === 'oneHasOneOwning' || type === 'oneHasOneInverse')) {
|
|
151
|
+
where = (0, WhereReplacer_1.replaceWhere)(where, { [context.targetEntity.primary]: { isNull: true } }, { [context.targetEntity.primary]: { never: true } });
|
|
152
|
+
where = (0, WhereReplacer_1.replaceWhere)(where, { [context.targetEntity.primary]: { isNull: false } }, { [context.targetEntity.primary]: { always: true } });
|
|
107
153
|
}
|
|
108
154
|
}
|
|
109
155
|
else {
|
|
110
156
|
// first level relation - we are sure root exists
|
|
111
|
-
const canEliminate =
|
|
112
|
-
newRelationPath.push({
|
|
157
|
+
const canEliminate = length === 0 || relationPath[length - 1].isLast;
|
|
158
|
+
newRelationPath.push({ context, isLast: false, canEliminate });
|
|
113
159
|
}
|
|
114
|
-
const optimizedWhere = this.optimizeWhere(where, targetEntity, newRelationPath);
|
|
160
|
+
const optimizedWhere = this.optimizeWhere(where, context.targetEntity, newRelationPath);
|
|
115
161
|
if (typeof optimizedWhere === 'boolean') {
|
|
116
162
|
return optimizedWhere;
|
|
117
163
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WhereOptimizer.js","sourceRoot":"","sources":["../../../../../src/mapper/select/optimizer/WhereOptimizer.ts"],"names":[],"mappings":";;;AAEA,0DAA4D;AAC5D,uCAAgE;AAChE,mDAA8C;
|
|
1
|
+
{"version":3,"file":"WhereOptimizer.js","sourceRoot":"","sources":["../../../../../src/mapper/select/optimizer/WhereOptimizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,3 @@
|
|
|
1
1
|
import { Input } from '@contember/schema';
|
|
2
|
-
export
|
|
3
|
-
count: number;
|
|
4
|
-
}
|
|
5
|
-
export declare const replaceWhere: (subject: Input.OptionalWhere, find: Input.OptionalWhere, replace: Input.OptionalWhere, resultTracker?: ReplaceWhereResult) => Input.OptionalWhere;
|
|
2
|
+
export declare const replaceWhere: (subject: Input.OptionalWhere, find: Input.OptionalWhere, replace: Input.OptionalWhere) => Input.OptionalWhere;
|
|
6
3
|
//# sourceMappingURL=WhereReplacer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WhereReplacer.d.ts","sourceRoot":"","sources":["../../../../../src/mapper/select/optimizer/WhereReplacer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAGnD,
|
|
1
|
+
{"version":3,"file":"WhereReplacer.d.ts","sourceRoot":"","sources":["../../../../../src/mapper/select/optimizer/WhereReplacer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAGnD,eAAO,MAAM,YAAY,YAAa,MAAM,aAAa,QAAQ,MAAM,aAAa,WAAW,MAAM,aAAa,KAAG,MAAM,aAmC1H,CAAA"}
|
|
@@ -5,21 +5,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.replaceWhere = void 0;
|
|
7
7
|
const fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
|
|
8
|
-
const replaceWhere = (subject, find, replace
|
|
8
|
+
const replaceWhere = (subject, find, replace) => {
|
|
9
9
|
if ((0, fast_deep_equal_1.default)(subject, find)) {
|
|
10
|
-
resultTracker.count++;
|
|
11
10
|
return replace;
|
|
12
11
|
}
|
|
13
|
-
|
|
14
|
-
|
|
12
|
+
let result = subject;
|
|
13
|
+
let copied = false;
|
|
14
|
+
for (const key in subject) {
|
|
15
|
+
const value = subject[key];
|
|
15
16
|
if (key === 'not') {
|
|
16
|
-
|
|
17
|
+
const newNot = (0, exports.replaceWhere)(value, find, replace);
|
|
18
|
+
if (newNot !== value) {
|
|
19
|
+
if (!copied) {
|
|
20
|
+
result = { ...result };
|
|
21
|
+
}
|
|
22
|
+
result['not'] = newNot;
|
|
23
|
+
}
|
|
17
24
|
}
|
|
18
25
|
else if (key === 'and' || key === 'or') {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
26
|
+
const items = [];
|
|
27
|
+
let itemChanged = false;
|
|
28
|
+
for (const el of value) {
|
|
29
|
+
const newEl = (0, exports.replaceWhere)(el, find, replace);
|
|
30
|
+
if (newEl !== el) {
|
|
31
|
+
itemChanged = true;
|
|
32
|
+
}
|
|
33
|
+
items.push(newEl);
|
|
34
|
+
}
|
|
35
|
+
if (itemChanged) {
|
|
36
|
+
if (!copied) {
|
|
37
|
+
result = { ...result };
|
|
38
|
+
}
|
|
39
|
+
result[key] = items;
|
|
40
|
+
}
|
|
23
41
|
}
|
|
24
42
|
}
|
|
25
43
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WhereReplacer.js","sourceRoot":"","sources":["../../../../../src/mapper/select/optimizer/WhereReplacer.ts"],"names":[],"mappings":";;;;;;AACA,sEAAuC;
|
|
1
|
+
{"version":3,"file":"WhereReplacer.js","sourceRoot":"","sources":["../../../../../src/mapper/select/optimizer/WhereReplacer.ts"],"names":[],"mappings":";;;;;;AACA,sEAAuC;AAEhC,MAAM,YAAY,GAAG,CAAC,OAA4B,EAAE,IAAyB,EAAE,OAA4B,EAAuB,EAAE;IAC1I,IAAI,IAAA,yBAAS,EAAC,OAAO,EAAE,IAAI,CAAC,EAAE;QAC7B,OAAO,OAAO,CAAA;KACd;IACD,IAAI,MAAM,GAAkC,OAAO,CAAA;IACnD,IAAI,MAAM,GAAG,KAAK,CAAA;IAClB,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE;QAC1B,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;QAC1B,IAAI,GAAG,KAAK,KAAK,EAAE;YAClB,MAAM,MAAM,GAAG,IAAA,oBAAY,EAAC,KAA4B,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;YACxE,IAAI,MAAM,KAAK,KAAK,EAAE;gBACrB,IAAI,CAAC,MAAM,EAAE;oBACZ,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,CAAA;iBACtB;gBACD,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAA;aACtB;SACD;aAAM,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,IAAI,EAAE;YACzC,MAAM,KAAK,GAA0B,EAAE,CAAA;YACvC,IAAI,WAAW,GAAG,KAAK,CAAA;YACvB,KAAK,MAAM,EAAE,IAAI,KAA8B,EAAE;gBAChD,MAAM,KAAK,GAAG,IAAA,oBAAY,EAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;gBAC7C,IAAI,KAAK,KAAK,EAAE,EAAE;oBACjB,WAAW,GAAG,IAAI,CAAA;iBAClB;gBACD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;aACjB;YACD,IAAI,WAAW,EAAE;gBAChB,IAAI,CAAC,MAAM,EAAE;oBACZ,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,CAAA;iBACtB;gBACD,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;aACnB;SACD;KACD;IACD,OAAO,MAAM,CAAA;AACd,CAAC,CAAA;AAnCY,QAAA,YAAY,gBAmCxB"}
|