@contember/engine-content-api 1.2.0-rc.3 → 1.2.0-rc.5
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 +3 -1
- package/dist/src/mapper/select/optimizer/WhereOptimizer.js.map +1 -1
- package/dist/src/mapper/select/optimizer/WhereReplacer.d.ts +3 -1
- package/dist/src/mapper/select/optimizer/WhereReplacer.d.ts.map +1 -1
- package/dist/src/mapper/select/optimizer/WhereReplacer.js +42 -18
- package/dist/src/mapper/select/optimizer/WhereReplacer.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/tests/cases/unit/whereOptimizer.test.js +114 -13
- package/dist/tests/cases/unit/whereOptimizer.test.js.map +1 -1
- package/dist/tests/tsconfig.tsbuildinfo +1 -1
- package/package.json +11 -11
- package/src/mapper/select/optimizer/WhereOptimizer.ts +3 -1
- package/src/mapper/select/optimizer/WhereReplacer.ts +45 -18
- package/tests/cases/unit/whereOptimizer.test.ts +120 -13
|
@@ -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;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;
|
|
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;IAyBrB,OAAO,CAAC,iBAAiB;CAqCzB"}
|
|
@@ -117,7 +117,9 @@ class WhereOptimizer {
|
|
|
117
117
|
const a = result[j];
|
|
118
118
|
const b = result[i];
|
|
119
119
|
if (i !== j && typeof a !== 'boolean' && typeof b !== 'boolean') {
|
|
120
|
-
const elResult = (0, WhereReplacer_1.replaceWhere)(a, b, { [entity.primary]: replacement }
|
|
120
|
+
const elResult = (0, WhereReplacer_1.replaceWhere)(a, b, { [entity.primary]: replacement }, {
|
|
121
|
+
replaceSubOperands: true,
|
|
122
|
+
});
|
|
121
123
|
if (elResult !== a) {
|
|
122
124
|
if (!copied) {
|
|
123
125
|
result = [...result];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WhereOptimizer.js","sourceRoot":"","sources":["../../../../../src/mapper/select/optimizer/WhereOptimizer.ts"],"names":[],"mappings":";;;AAEA,0DAA4D;AAC5D,uCAAgE;AAChE,mDAA8C;AAgB9C,MAAa,cAAc;IAG1B,YACkB,KAAmB,EACnB,kBAAsC;QADtC,UAAK,GAAL,KAAK,CAAc;QACnB,uBAAkB,GAAlB,kBAAkB,CAAoB;IAExD,CAAC;IAEM,QAAQ,CAAC,KAA0B,EAAE,MAAoB,EAAE,EAAE,YAAY,GAAG,EAAE,EAAE,mBAAmB,GAAG,EAAE,KAA6B,EAAE;QAC7I,IAAI,qBAAqB,GAA8B,EAAE,CAAA;QACzD,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE;YAC7B,MAAM,EAAE,GAAG,YAAY,CAAC,CAAC,CAAC,CAAA;YAC1B,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;gBACrD,qBAAqB,GAAG,EAAE,CAAA;aAC1B;iBAAM;gBACN,qBAAqB,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,YAAY,CAAC,MAAM,EAAE,CAAC,CAAA;aAC1G;SACD;QACD,IAAI,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,qBAAqB,CAAC,CAAA;QAErE,IAAI,OAAO,MAAM,KAAK,SAAS,EAAE;YAChC,OAAO,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,EAAE,CAAA;SACpE;QACD,IAAI,OAAO,GAAG,KAAK,CAAA;QACnB,KAAK,MAAM,SAAS,IAAI,mBAAmB,EAAE;YAC5C,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;YAC3D,MAAM,SAAS,GAAG,IAAA,4BAAY,EAAC,MAAM,EAAE,kBAAkB,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;YAClG,IAAI,SAAS,KAAK,MAAM,EAAE;gBACzB,MAAM,GAAG,SAAS,CAAA;gBAClB,OAAO,GAAG,IAAI,CAAA;aACd;SACD;QACD,IAAI,OAAO,EAAE;YACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;SACpC;QAED,OAAO,MAAM,CAAA;IACd,CAAC;IAEO,aAAa,CAAC,KAA0B,EAAE,MAAoB,EAAE,YAAuC;QAC9G,MAAM,QAAQ,GAAuB,EAAE,CAAA;QAEvC,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;YACxB,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAA;YACxB,IAAI,OAAO,GAAqB,SAAS,CAAA;YACzC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE;gBAC1C,SAAQ;aACR;iBAAM,IAAI,GAAG,KAAK,KAAK,EAAE;gBACzB,MAAM,aAAa,GAAsC,EAAE,CAAA;gBAC3D,KAAK,MAAM,UAAU,IAAI,KAAuC,EAAE;oBACjE,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;oBACzE,IAAI,YAAY,KAAK,KAAK,EAAE;wBAC3B,OAAO,KAAK,CAAA;qBACZ;oBACD,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;iBAChC;gBACD,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;aAC/D;iBAAM,IAAI,GAAG,KAAK,IAAI,EAAE;gBACxB,MAAM,aAAa,GAAsC,EAAE,CAAA;gBAC3D,KAAK,MAAM,UAAU,IAAI,KAAuC,EAAE;oBACjE,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;oBACzE,IAAI,YAAY,KAAK,IAAI,EAAE;wBAC1B,OAAO,GAAG,IAAI,CAAA;wBACd,MAAK;qBACL;oBACD,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;iBAChC;gBACD,IAAI,OAAO,KAAK,IAAI,EAAE;oBACrB,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;iBAC9D;aAED;iBAAM,IAAI,GAAG,KAAK,KAAK,EAAE;gBACzB,OAAO,GAAG,IAAA,qBAAW,EAAC,IAAI,CAAC,aAAa,CAAC,KAA4B,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAA;aAE7F;iBAAM;gBACN,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,CAAC,CAAA;aAClE;YAED,IAAI,OAAO,KAAK,KAAK,EAAE;gBACtB,OAAO,KAAK,CAAA;aAEZ;iBAAM,IAAI,OAAO,KAAK,SAAS,EAAE;gBACjC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;aACtB;SACD;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;IACxD,CAAC;IAEO,UAAU,CAAC,QAAqC,EAAE,MAAoB,EAAE,YAAuC;QACtH,MAAM,SAAS,GAAG,IAAA,oBAAU,EAAC,QAAQ,CAAC,CAAA;QACtC,IAAI,OAAO,SAAS,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE;YACnE,OAAO,SAAS,CAAA;SAChB;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,YAAY,CAAC,CAAA;QACtF,IAAI,MAAM,KAAK,SAAS,CAAC,EAAE,EAAE;YAC5B,OAAO,SAAS,CAAA;SAChB;QACD,OAAO,IAAA,oBAAU,EAAC,MAAM,CAAC,CAAA;IAC1B,CAAC;IAEO,WAAW,CAAC,QAAqC,EAAE,MAAoB,EAAE,YAAuC;QACvH,MAAM,SAAS,GAAG,IAAA,qBAAW,EAAC,QAAQ,CAAC,CAAA;QACvC,IAAI,OAAO,SAAS,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;YACpE,OAAO,SAAS,CAAA;SAChB;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,YAAY,CAAC,CAAA;QACxF,IAAI,MAAM,KAAK,SAAS,CAAC,GAAG,EAAE;YAC7B,OAAO,SAAS,CAAA;SAChB;QACD,OAAO,IAAA,qBAAW,EAAC,MAAM,CAAC,CAAA;IAC3B,CAAC;IAEO,aAAa,CAAC,QAA+B,EAAE,MAAoB,EAAE,WAA4B,EAAE,YAAuC;QACjJ,IAAI,MAAM,GAAsC,QAAQ,CAAA;QACxD,IAAI,MAAM,GAAG,KAAK,CAAA;QAClB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAA;QAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;YAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;gBAC/B,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;gBACnB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;gBACnB,IAAI,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,KAAK,SAAS,IAAI,OAAO,CAAC,KAAK,SAAS,EAAE;oBAChE,MAAM,QAAQ,GAAG,IAAA,4BAAY,EAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"WhereOptimizer.js","sourceRoot":"","sources":["../../../../../src/mapper/select/optimizer/WhereOptimizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
import { Input } from '@contember/schema';
|
|
2
|
-
export declare const replaceWhere: (subject: Input.OptionalWhere, find: Input.OptionalWhere, replace: Input.OptionalWhere
|
|
2
|
+
export declare const replaceWhere: (subject: Input.OptionalWhere, find: Input.OptionalWhere, replace: Input.OptionalWhere, opts?: {
|
|
3
|
+
replaceSubOperands?: boolean;
|
|
4
|
+
}) => Input.OptionalWhere;
|
|
3
5
|
//# 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,eAAO,MAAM,YAAY,YAAa,MAAM,aAAa,QAAQ,MAAM,aAAa,WAAW,MAAM,aAAa,
|
|
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,SAAQ;IAAE,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAAE,KAAQ,MAAM,aA6CvK,CAAA"}
|
|
@@ -5,42 +5,66 @@ 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, opts = {}) => {
|
|
9
9
|
if ((0, fast_deep_equal_1.default)(subject, find)) {
|
|
10
10
|
return replace;
|
|
11
11
|
}
|
|
12
12
|
let result = subject;
|
|
13
13
|
let copied = false;
|
|
14
|
+
// copy on write to preserve referential integrity, when nothing has changed
|
|
15
|
+
const write = (key, value) => {
|
|
16
|
+
if (!copied) {
|
|
17
|
+
result = { ...result };
|
|
18
|
+
copied = true;
|
|
19
|
+
}
|
|
20
|
+
result[key] = value;
|
|
21
|
+
};
|
|
14
22
|
for (const key in subject) {
|
|
15
23
|
const value = subject[key];
|
|
16
24
|
if (key === 'not') {
|
|
17
|
-
const newNot = (0, exports.replaceWhere)(value, find, replace);
|
|
25
|
+
const newNot = (0, exports.replaceWhere)(value, find, replace, opts);
|
|
18
26
|
if (newNot !== value) {
|
|
19
|
-
|
|
20
|
-
result = { ...result };
|
|
21
|
-
}
|
|
22
|
-
result['not'] = newNot;
|
|
27
|
+
write('not', newNot);
|
|
23
28
|
}
|
|
24
29
|
}
|
|
25
30
|
else if (key === 'and' || key === 'or') {
|
|
26
|
-
const
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
if (newEl !== el) {
|
|
31
|
-
itemChanged = true;
|
|
32
|
-
}
|
|
33
|
-
items.push(newEl);
|
|
31
|
+
const operands = value;
|
|
32
|
+
const subOperandsToFind = opts.replaceSubOperands && Object.keys(find).length === 1 && find[key] ? find[key] : null;
|
|
33
|
+
if (subOperandsToFind !== null && containsAllOperands(operands, subOperandsToFind)) {
|
|
34
|
+
write(key, [replace]);
|
|
34
35
|
}
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
36
|
+
else {
|
|
37
|
+
const items = [];
|
|
38
|
+
let itemChanged = false;
|
|
39
|
+
for (const el of operands) {
|
|
40
|
+
const newEl = (0, exports.replaceWhere)(el, find, replace, opts);
|
|
41
|
+
if (newEl !== el) {
|
|
42
|
+
itemChanged = true;
|
|
43
|
+
}
|
|
44
|
+
items.push(newEl);
|
|
45
|
+
}
|
|
46
|
+
if (itemChanged) {
|
|
47
|
+
write(key, items);
|
|
38
48
|
}
|
|
39
|
-
result[key] = items;
|
|
40
49
|
}
|
|
41
50
|
}
|
|
42
51
|
}
|
|
43
52
|
return result;
|
|
44
53
|
};
|
|
45
54
|
exports.replaceWhere = replaceWhere;
|
|
55
|
+
const containsAllOperands = (subjectOperands, findOperands) => {
|
|
56
|
+
for (const op1 of findOperands) {
|
|
57
|
+
let found = false;
|
|
58
|
+
for (const op2 of subjectOperands) {
|
|
59
|
+
if ((0, fast_deep_equal_1.default)(op1, op2)) {
|
|
60
|
+
found = true;
|
|
61
|
+
break;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
if (!found) {
|
|
65
|
+
return false;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
return true;
|
|
69
|
+
};
|
|
46
70
|
//# sourceMappingURL=WhereReplacer.js.map
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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,EAAE,OAAyC,EAAE,EAAuB,EAAE;IACvL,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,4EAA4E;IAC5E,MAAM,KAAK,GAAG,CAAmB,GAAM,EAAE,KAA6B,EAAE,EAAE;QACzE,IAAI,CAAC,MAAM,EAAE;YACZ,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,CAAA;YACtB,MAAM,GAAG,IAAI,CAAA;SACb;QACD,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;IACpB,CAAC,CAAA;IAED,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,EAAE,IAAI,CAAC,CAAA;YAC9E,IAAI,MAAM,KAAK,KAAK,EAAE;gBACrB,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;aACpB;SACD;aAAM,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,IAAI,EAAE;YACzC,MAAM,QAAQ,GAAG,KAA8B,CAAA;YAC/C,MAAM,iBAAiB,GAAG,IAAI,CAAC,kBAAkB,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAE,IAAI,CAAC,GAAG,CAA2B,CAAC,CAAC,CAAC,IAAI,CAAA;YAC9I,IAAI,iBAAiB,KAAK,IAAI,IAAI,mBAAmB,CAAC,QAAQ,EAAE,iBAAiB,CAAC,EAAE;gBACnF,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAA;aACrB;iBAAM;gBACN,MAAM,KAAK,GAA0B,EAAE,CAAA;gBACvC,IAAI,WAAW,GAAG,KAAK,CAAA;gBACvB,KAAK,MAAM,EAAE,IAAI,QAAQ,EAAE;oBAC1B,MAAM,KAAK,GAAG,IAAA,oBAAY,EAAC,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;oBACnD,IAAI,KAAK,KAAK,EAAE,EAAE;wBACjB,WAAW,GAAG,IAAI,CAAA;qBAClB;oBACD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;iBACjB;gBACD,IAAI,WAAW,EAAE;oBAChB,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;iBACjB;aACD;SAED;KACD;IACD,OAAO,MAAM,CAAA;AACd,CAAC,CAAA;AA7CY,QAAA,YAAY,gBA6CxB;AAGD,MAAM,mBAAmB,GAAG,CAAC,eAAsC,EAAE,YAAmC,EAAW,EAAE;IACpH,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;QAC/B,IAAI,KAAK,GAAG,KAAK,CAAA;QACjB,KAAK,MAAM,GAAG,IAAI,eAAe,EAAE;YAClC,IAAI,IAAA,yBAAS,EAAC,GAAG,EAAE,GAAG,CAAC,EAAE;gBACxB,KAAK,GAAG,IAAI,CAAA;gBACZ,MAAK;aACL;SACD;QACD,IAAI,CAAC,KAAK,EAAE;YACX,OAAO,KAAK,CAAA;SACZ;KACD;IACD,OAAO,IAAI,CAAA;AACZ,CAAC,CAAA"}
|