cruddl 2.6.0-alpha.4 → 2.7.0-alpha.0
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/query-tree/flex-search.d.ts +2 -1
- package/dist/src/query-tree/flex-search.js +6 -1
- package/dist/src/query-tree/flex-search.js.map +1 -1
- package/dist/src/schema/scalars/fixed-point-decimals.js +5 -6
- package/dist/src/schema/scalars/fixed-point-decimals.js.map +1 -1
- package/dist/src/schema/scalars/int53.js +3 -4
- package/dist/src/schema/scalars/int53.js.map +1 -1
- package/dist/src/schema-generation/filter-input-types/filter-fields.js +2 -3
- package/dist/src/schema-generation/filter-input-types/filter-fields.js.map +1 -1
- package/dist/src/schema-generation/flex-search-filter-input-types/generator.js +1 -1
- package/dist/src/schema-generation/flex-search-filter-input-types/generator.js.map +1 -1
- package/dist/src/schema-generation/flex-search-generator.js +5 -4
- package/dist/src/schema-generation/flex-search-generator.js.map +1 -1
- package/dist/src/utils/error-with-cause.js +1 -2
- package/dist/src/utils/error-with-cause.js.map +1 -1
- package/dist/src/utils/visitor.js +1 -2
- package/dist/src/utils/visitor.js.map +1 -1
- package/package.json +1 -1
|
@@ -28,7 +28,8 @@ export declare class FlexSearchComplexOperatorQueryNode extends QueryNode {
|
|
|
28
28
|
readonly logicalOperator: BinaryOperator;
|
|
29
29
|
private readonly fieldNode;
|
|
30
30
|
readonly analyzer: string;
|
|
31
|
-
|
|
31
|
+
readonly returnFalseForNoTokens: boolean;
|
|
32
|
+
constructor(expression: string, comparisonOperator: BinaryOperatorWithAnalyzer, logicalOperator: BinaryOperator, fieldNode: QueryNode, analyzer: string, returnFalseForNoTokens: boolean);
|
|
32
33
|
describe(): string;
|
|
33
34
|
expand(tokenizations: ReadonlyArray<FlexSearchTokenization>): QueryNode;
|
|
34
35
|
}
|
|
@@ -32,13 +32,14 @@ exports.FlexSearchQueryNode = FlexSearchQueryNode;
|
|
|
32
32
|
* to tokenize the search expression, before the sub-tree for this expression can be built.
|
|
33
33
|
*/
|
|
34
34
|
class FlexSearchComplexOperatorQueryNode extends base_1.QueryNode {
|
|
35
|
-
constructor(expression, comparisonOperator, logicalOperator, fieldNode, analyzer) {
|
|
35
|
+
constructor(expression, comparisonOperator, logicalOperator, fieldNode, analyzer, returnFalseForNoTokens) {
|
|
36
36
|
super();
|
|
37
37
|
this.expression = expression;
|
|
38
38
|
this.comparisonOperator = comparisonOperator;
|
|
39
39
|
this.logicalOperator = logicalOperator;
|
|
40
40
|
this.fieldNode = fieldNode;
|
|
41
41
|
this.analyzer = analyzer;
|
|
42
|
+
this.returnFalseForNoTokens = returnFalseForNoTokens;
|
|
42
43
|
}
|
|
43
44
|
describe() {
|
|
44
45
|
return `COMPLEX_OPERATOR(${this.comparisonOperator}, ${this.expression}, ${this.analyzer})`;
|
|
@@ -46,6 +47,10 @@ class FlexSearchComplexOperatorQueryNode extends base_1.QueryNode {
|
|
|
46
47
|
expand(tokenizations) {
|
|
47
48
|
const tokenization = tokenizations.find(value => value.expression === this.expression && value.analyzer === this.analyzer);
|
|
48
49
|
const tokens = tokenization ? tokenization.tokens : [];
|
|
50
|
+
// because we want something like '-' to find nothing
|
|
51
|
+
if (this.returnFalseForNoTokens && !tokens.length) {
|
|
52
|
+
return new literals_1.ConstBoolQueryNode(false);
|
|
53
|
+
}
|
|
49
54
|
const neutralOperand = this.logicalOperator === operators_1.BinaryOperator.AND ? literals_1.ConstBoolQueryNode.TRUE : literals_1.ConstBoolQueryNode.FALSE;
|
|
50
55
|
return utils_2.simplifyBooleans(tokens
|
|
51
56
|
.map(value => new operators_1.OperatorWithAnalyzerQueryNode(this.fieldNode, this.comparisonOperator, new literals_1.LiteralQueryNode(value), this.analyzer))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flex-search.js","sourceRoot":"","sources":["../../../src/query-tree/flex-search.ts"],"names":[],"mappings":";;;AACA,qEAAwE;AACxE,wEAAkE;AAClE,0CAAsD;AACtD,iCAAmC;AACnC,yCAAkE;AAClE,2CAAwG;AACxG,mCAA2C;AAC3C,2CAAgD;AAEhD;;GAEG;AACH,MAAa,mBAAoB,SAAQ,gBAAS;IAM9C,YAAY,MAKX;QACG,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,IAAI,6BAAkB,CAAC,IAAI,CAAC,CAAC;QAC5E,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,IAAI,6BAAiB,CAAC,oBAAY,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3G,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;QAC5C,IAAI,CAAC,uBAAuB,GAAG,MAAM,CAAC,uBAAuB,IAAI,KAAK,CAAC;IAC3E,CAAC;IAED,QAAQ;QACJ,OAAO,CACH,sBAAsB,IAAI,CAAC,cAAe,CAAC,IAAI,EAAE;YACjD,SAAS,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ;YAC7C,cAAM,CACF,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,6BAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CACzG,CACJ,CAAC;IACN,CAAC;CACJ;AA5BD,kDA4BC;AAED;;;GAGG;AACH,MAAa,kCAAmC,SAAQ,gBAAS;IAC7D,YACa,UAAkB,EAClB,kBAA8C,EAC9C,eAA+B,EACvB,SAAoB,EAC5B,QAAgB;
|
|
1
|
+
{"version":3,"file":"flex-search.js","sourceRoot":"","sources":["../../../src/query-tree/flex-search.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.GraphQLDecimal3 = exports.GraphQLDecimal2 = exports.GraphQLDecimal1 = void 0;
|
|
4
4
|
const graphql_1 = require("graphql");
|
|
5
|
-
const util_1 = require("util");
|
|
6
5
|
function createFixedPointDecimalType(decimals) {
|
|
7
6
|
const typeName = `Decimal${decimals}`;
|
|
8
7
|
// this allows for up to 8192 rounding errors (that could occur when summing up values) with decimals <= 3
|
|
@@ -13,14 +12,14 @@ function createFixedPointDecimalType(decimals) {
|
|
|
13
12
|
function coerceFixedPointDecimal(value) {
|
|
14
13
|
// same logic like Float
|
|
15
14
|
if (typeof value !== 'number' || !isFinite(value)) {
|
|
16
|
-
throw new graphql_1.GraphQLError(`${typeName} cannot represent non numeric value: `.concat(
|
|
15
|
+
throw new graphql_1.GraphQLError(`${typeName} cannot represent non numeric value: `.concat(JSON.stringify(value)));
|
|
17
16
|
}
|
|
18
17
|
const num = Number(value.toFixed(decimals));
|
|
19
18
|
if (num > maxValue) {
|
|
20
|
-
throw new graphql_1.GraphQLError(`${typeName} cannot represent value larger than ${maxValueStr}: `.concat(
|
|
19
|
+
throw new graphql_1.GraphQLError(`${typeName} cannot represent value larger than ${maxValueStr}: `.concat(JSON.stringify(value)));
|
|
21
20
|
}
|
|
22
21
|
if (num < minValue) {
|
|
23
|
-
throw new graphql_1.GraphQLError(`${typeName} cannot represent value smaller than ${minValueStr}: `.concat(
|
|
22
|
+
throw new graphql_1.GraphQLError(`${typeName} cannot represent value smaller than ${minValueStr}: `.concat(JSON.stringify(value)));
|
|
24
23
|
}
|
|
25
24
|
return num;
|
|
26
25
|
}
|
|
@@ -31,10 +30,10 @@ function createFixedPointDecimalType(decimals) {
|
|
|
31
30
|
const value = parseFloat(valueNode.value);
|
|
32
31
|
const num = Number(value.toFixed(decimals));
|
|
33
32
|
if (num > maxValue) {
|
|
34
|
-
throw new graphql_1.GraphQLError(`${typeName} cannot represent value larger than ${maxValueStr}: `.concat(
|
|
33
|
+
throw new graphql_1.GraphQLError(`${typeName} cannot represent value larger than ${maxValueStr}: `.concat(JSON.stringify(value)));
|
|
35
34
|
}
|
|
36
35
|
if (num < minValue) {
|
|
37
|
-
throw new graphql_1.GraphQLError(`${typeName} cannot represent value smaller than ${minValueStr}: `.concat(
|
|
36
|
+
throw new graphql_1.GraphQLError(`${typeName} cannot represent value smaller than ${minValueStr}: `.concat(JSON.stringify(value)));
|
|
38
37
|
}
|
|
39
38
|
return num;
|
|
40
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fixed-point-decimals.js","sourceRoot":"","sources":["../../../../src/schema/scalars/fixed-point-decimals.ts"],"names":[],"mappings":";;;AAAA,qCAAkF;
|
|
1
|
+
{"version":3,"file":"fixed-point-decimals.js","sourceRoot":"","sources":["../../../../src/schema/scalars/fixed-point-decimals.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,16 +2,15 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.GraphQLInt53 = void 0;
|
|
4
4
|
const graphql_1 = require("graphql");
|
|
5
|
-
const util_1 = require("util");
|
|
6
5
|
function coerceInt53(value) {
|
|
7
6
|
if (typeof value !== 'number' || !Number.isInteger(value)) {
|
|
8
|
-
throw new graphql_1.GraphQLError(`Int53 cannot represent non-integer value: ${
|
|
7
|
+
throw new graphql_1.GraphQLError(`Int53 cannot represent non-integer value: ${JSON.stringify(value)}`);
|
|
9
8
|
}
|
|
10
9
|
if (value > Number.MAX_SAFE_INTEGER) {
|
|
11
|
-
throw new graphql_1.GraphQLError(`Int53 cannot represent value larger than ${Number.MAX_SAFE_INTEGER}: ${
|
|
10
|
+
throw new graphql_1.GraphQLError(`Int53 cannot represent value larger than ${Number.MAX_SAFE_INTEGER}: ${JSON.stringify(value)}`);
|
|
12
11
|
}
|
|
13
12
|
if (value < Number.MIN_SAFE_INTEGER) {
|
|
14
|
-
throw new graphql_1.GraphQLError(`Int53 cannot represent value smaller than ${Number.MIN_SAFE_INTEGER}: ${
|
|
13
|
+
throw new graphql_1.GraphQLError(`Int53 cannot represent value smaller than ${Number.MIN_SAFE_INTEGER}: ${JSON.stringify(value)}`);
|
|
15
14
|
}
|
|
16
15
|
return value;
|
|
17
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"int53.js","sourceRoot":"","sources":["../../../../src/schema/scalars/int53.ts"],"names":[],"mappings":";;;AAAA,qCAAkF;
|
|
1
|
+
{"version":3,"file":"int53.js","sourceRoot":"","sources":["../../../../src/schema/scalars/int53.ts"],"names":[],"mappings":";;;AAAA,qCAAkF;AAElF,SAAS,WAAW,CAAC,KAAc;IAC/B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;QACvD,MAAM,IAAI,sBAAY,CAAC,6CAA6C,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;KAChG;IAED,IAAI,KAAK,GAAG,MAAM,CAAC,gBAAgB,EAAE;QACjC,MAAM,IAAI,sBAAY,CAClB,4CAA4C,MAAM,CAAC,gBAAgB,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAClG,CAAC;KACL;IAED,IAAI,KAAK,GAAG,MAAM,CAAC,gBAAgB,EAAE;QACjC,MAAM,IAAI,sBAAY,CAClB,6CAA6C,MAAM,CAAC,gBAAgB,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CACnG,CAAC;KACL;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,UAAU,CAAC,SAAoB;IACpC,IAAI,SAAS,CAAC,IAAI,KAAK,cAAI,CAAC,GAAG,EAAE;QAC7B,MAAM,IAAI,sBAAY,CAAC,6CAA6C,eAAK,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;KACtG;IAED,IAAI,GAAG,GAAG,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACxC,IAAI,GAAG,GAAG,MAAM,CAAC,gBAAgB,EAAE;QAC/B,MAAM,IAAI,sBAAY,CAClB,4CAA4C,MAAM,CAAC,gBAAgB,KAAK,SAAS,CAAC,KAAK,EAAE,EACzF,SAAS,CACZ,CAAC;KACL;IACD,IAAI,GAAG,GAAG,MAAM,CAAC,gBAAgB,EAAE;QAC/B,MAAM,IAAI,sBAAY,CAClB,6CAA6C,MAAM,CAAC,gBAAgB,KAAK,SAAS,CAAC,KAAK,EAAE,EAC1F,SAAS,CACZ,CAAC;KACL;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAEY,QAAA,YAAY,GAAG,IAAI,2BAAiB,CAAC;IAC9C,IAAI,EAAE,OAAO;IACb,WAAW,EAAE;;qNAEoM;IACjN,SAAS,EAAE,WAAW;IACtB,UAAU,EAAE,WAAW;IACvB,YAAY,EAAE,UAAU;CAC3B,CAAC,CAAC"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.StringMapSomeValueFilterField = exports.OrFilterField = exports.AndFilterField = exports.EntityExtensionFilterField = exports.NestedObjectFilterField = exports.QuantifierFilterField = exports.ScalarOrEnumFilterField = exports.StringMapEntryFilterField = exports.ScalarOrEnumFieldFilterField = exports.getScalarFilterValueNode = void 0;
|
|
4
4
|
const graphql_1 = require("graphql");
|
|
5
5
|
const js_joda_1 = require("js-joda");
|
|
6
|
-
const util_1 = require("util");
|
|
7
6
|
const model_1 = require("../../model");
|
|
8
7
|
const query_tree_1 = require("../../query-tree");
|
|
9
8
|
const quantifiers_1 = require("../../query-tree/quantifiers");
|
|
@@ -191,7 +190,7 @@ class AndFilterField {
|
|
|
191
190
|
this.inputType = new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(filterType.getInputType()));
|
|
192
191
|
}
|
|
193
192
|
getFilterNode(sourceNode, filterValue) {
|
|
194
|
-
if (!
|
|
193
|
+
if (!Array.isArray(filterValue) || !filterValue.length) {
|
|
195
194
|
return new query_tree_1.ConstBoolQueryNode(true);
|
|
196
195
|
}
|
|
197
196
|
const values = (filterValue || []);
|
|
@@ -208,7 +207,7 @@ class OrFilterField {
|
|
|
208
207
|
this.inputType = new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(filterType.getInputType()));
|
|
209
208
|
}
|
|
210
209
|
getFilterNode(sourceNode, filterValue) {
|
|
211
|
-
if (!
|
|
210
|
+
if (!Array.isArray(filterValue)) {
|
|
212
211
|
return new query_tree_1.ConstBoolQueryNode(true); // regard as omitted
|
|
213
212
|
}
|
|
214
213
|
const values = filterValue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-fields.js","sourceRoot":"","sources":["../../../../src/schema-generation/filter-input-types/filter-fields.ts"],"names":[],"mappings":";;;AAAA,qCAAsF;AACtF,qCAAwC;AACxC
|
|
1
|
+
{"version":3,"file":"filter-fields.js","sourceRoot":"","sources":["../../../../src/schema-generation/filter-input-types/filter-fields.ts"],"names":[],"mappings":"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"}
|
|
@@ -148,7 +148,7 @@ class FlexSearchFilterTypeGenerator {
|
|
|
148
148
|
if (!(valueNode instanceof query_tree_1.LiteralQueryNode) || typeof valueNode.value !== 'string') {
|
|
149
149
|
throw new Error('FlexSearchComplexFilters requires a LiteralQueryNode with a string-value, as valueNode');
|
|
150
150
|
}
|
|
151
|
-
return new flex_search_1.FlexSearchComplexOperatorQueryNode(valueNode.value, comparisonOperator, logicalOperator, fieldNode, analyzer);
|
|
151
|
+
return new flex_search_1.FlexSearchComplexOperatorQueryNode(valueNode.value, comparisonOperator, logicalOperator, fieldNode, analyzer, true);
|
|
152
152
|
}
|
|
153
153
|
generateFilterFieldsForNonListEnumField(field, graphQLEnumType) {
|
|
154
154
|
if (field.isList || !field.type.isEnumType) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/schema-generation/flex-search-filter-input-types/generator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/schema-generation/flex-search-filter-input-types/generator.ts"],"names":[],"mappings":";;;;AAAA,qCAAgE;AAChE,oFAA0C;AAC1C,uCAA4E;AAC5E,iDAM0B;AAC1B,8DAAkF;AAClF,sDAYgC;AAChC,8CAAiE;AACjE,gEAAoE;AACpE,6CAA4C;AAE5C,+DAA8G;AAC9G,sEAAyD;AACzD,sDAAsH;AACtH,2CAMqB;AACrB,mDAUyB;AACzB,iDAA4D;AAE5D,MAAa,6BAA6B;IACtC,YAAoB,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;IAAG,CAAC;IAG5D,QAAQ,CAAC,IAAgB,EAAE,aAAsB;QAC7C,MAAM,0BAA0B,GAAG,IAAI,CAAC,4BAA4B,CAChE,IAAI,EACJ,GAAG,EAAE;YACD,OAAO,eAAO,CACV,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,mBAAmB,IAAI,KAAK,CAAC,2BAA2B,CAAC,EAC3F,CAAC,KAAY,EAAE,EAAE,CAAC,IAAI,CAAC,mCAAmC,CAAC,KAAK,EAAE,aAAa,CAAC,CACnF,CAAC;QACN,CAAC,EACD,aAAa,CAChB,CAAC;QACF,OAAO,0BAA0B,CAAC;IACtC,CAAC;IAEO,4BAA4B,CAChC,IAAU,EACV,MAAmD,EACnD,aAAsB;QAEtB,SAAS,SAAS;YACd,MAAM,YAAY,GAAG,CAAC,GAAG,qCAAY,CAAC,MAAM,CAAC,CAAC,CAAC;YAC/C,IAAI,CAAC,aAAa,EAAE;gBAChB,OAAO,YAAY,CAAC,MAAM,CAAC;oBACvB,IAAI,wCAAwB,CAAC,UAAU,CAAC;oBACxC,IAAI,uCAAuB,CAAC,UAAU,CAAC;iBAC1C,CAAC,CAAC;aACN;iBAAM;gBACH,OAAO,YAAY,CAAC;aACvB;QACL,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,yCAA0B,CAC7C,mCAA2B,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,EACrD,SAAS,EACT,+BAA+B,IAAI,CAAC,IAAI,iGAAiG;YACzI,aAAa;YACT,CAAC,CAAC,4HAA4H;YAC9H,CAAC,CAAC,kGAAkG,CAC3G,CAAC;QACF,OAAO,UAAU,CAAC;IACtB,CAAC;IAEM,mCAAmC,CACtC,KAAY,EACZ,aAAsB;QAEtB,IAAI,KAAK,CAAC,MAAM,EAAE;YACd,OAAO,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC,CAAC;SACpD;QACD,IAAI,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE;YACzB,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,8BAAiB,CAAC,IAAI,EAAE;gBAC5C,OAAO,IAAI,CAAC,iCAAiC,CAAC,KAAK,CAAC,CAAC;aACxD;YACD,OAAO,IAAI,CAAC,oCAAoC,CAAC,KAAK,CAAC,CAAC;SAC3D;QACD,IAAI,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE;YACzB,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;YAC3D,IAAI,KAAK,CAAC,IAAI,CAAC,qBAAqB,EAAE;gBAClC,OAAO,CAAC,IAAI,oDAAoC,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;aACvE;iBAAM;gBACH,OAAO,CAAC,IAAI,iDAAiC,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;aACpE;SACJ;QACD,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE;YACvB,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACpE,OAAO,IAAI,CAAC,uCAAuC,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;SAC/E;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAEO,oCAAoC,CAAC,KAAY;QACrD,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE;YAC1C,MAAM,IAAI,KAAK,CAAC,aAAa,KAAK,CAAC,IAAI,2BAA2B,CAAC,CAAC;SACvE;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5D,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC;QAC/C,IAAI,YAAY,GAA4B,EAAE,CAAC;QAC/C,IAAI,KAAK,CAAC,mBAAmB,EAAE;YAC3B,YAAY,GAAG,YAAY,CAAC,MAAM,CAC9B,YAAY,CAAC,GAAG,CACZ,IAAI,CAAC,EAAE,CACH,IAAI,sDAAsC,CACtC,KAAK,EACL,SAAS,CAAC,IAAI,KAAK,QAAQ;gBACvB,CAAC,CAAC,+CAAmC,CAAC,IAAI,CAAC;gBAC3C,CAAC,CAAC,wCAA4B,CAAC,IAAI,CAAC,EACxC,IAAI,KAAK,6BAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,EAC7C,SAAS,EACT,KAAK,CAAC,kBAAkB,CAC3B,CACR,CACJ,CAAC;SACL;QAED,IAAI,KAAK,CAAC,kBAAkB,IAAI,KAAK,CAAC,2BAA2B,EAAE;YAC/D,YAAY,GAAG,YAAY,CAAC,MAAM,CAC9B,8CAAkC,CAAC,GAAG,CAClC,IAAI,CAAC,EAAE,CACH,IAAI,sDAAsC,CACtC,KAAK,EACL,IAAI,CAAC,8BAA8B,CAAC,IAAI,CAAC,EACzC,IAAI,EACJ,SAAS,EACT,KAAK,CAAC,oCAAoC,EAAE,CAC/C,CACR,CACJ,CAAC;SACL;QACD,OAAO,YAAY,CAAC;IACxB,CAAC;IAEO,8BAA8B,CAClC,IAAY;QAEZ,QAAQ,IAAI,EAAE;YACV,KAAK,yCAA6B;gBAC9B,OAAO,kCAAoB,CAAC,uCAA0B,CAAC,6BAA6B,CAAC,CAAC;YAC1F,KAAK,6CAAiC;gBAClC,OAAO,qCAAuB,CAAC,uCAA0B,CAAC,6BAA6B,CAAC,CAAC;YAC7F,KAAK,0CAA8B;gBAC/B,OAAO,CAAC,SAAoB,EAAE,SAAoB,EAAE,QAAiB,EAAE,EAAE;oBACrE,IAAI,CAAC,QAAQ,EAAE;wBACX,OAAO,IAAI,kCAAqB,CAAC,wCAA0B,CAAC,CAAC;qBAChE;oBACD,OAAO,IAAI,CAAC,6BAA6B,CACrC,uCAA0B,CAAC,6BAA6B,EACxD,2BAAc,CAAC,GAAG,EAClB,SAAS,EACT,SAAS,EACT,QAAQ,CACX,CAAC;gBACN,CAAC,CAAC;YACN,KAAK,8CAAkC;gBACnC,OAAO,CAAC,SAAoB,EAAE,SAAoB,EAAE,QAAiB,EAAE,EAAE;oBACrE,IAAI,CAAC,QAAQ,EAAE;wBACX,OAAO,IAAI,kCAAqB,CAAC,wCAA0B,CAAC,CAAC;qBAChE;oBACD,OAAO,iBAAG,CACN,IAAI,CAAC,6BAA6B,CAC9B,uCAA0B,CAAC,6BAA6B,EACxD,2BAAc,CAAC,GAAG,EAClB,SAAS,EACT,SAAS,EACT,QAAQ,CACX,CACJ,CAAC;gBACN,CAAC,CAAC;YACN,KAAK,2CAA+B;gBAChC,OAAO,CAAC,SAAoB,EAAE,SAAoB,EAAE,QAAiB,EAAE,EAAE;oBACrE,IAAI,CAAC,QAAQ,EAAE;wBACX,OAAO,IAAI,kCAAqB,CAAC,wCAA0B,CAAC,CAAC;qBAChE;oBACD,OAAO,IAAI,CAAC,6BAA6B,CACrC,uCAA0B,CAAC,2BAA2B,EACtD,2BAAc,CAAC,EAAE,EACjB,SAAS,EACT,SAAS,EACT,QAAQ,CACX,CAAC;gBACN,CAAC,CAAC;YACN,KAAK,+CAAmC;gBACpC,OAAO,CAAC,SAAoB,EAAE,SAAoB,EAAE,QAAiB,EAAE,EAAE;oBACrE,IAAI,CAAC,QAAQ,EAAE;wBACX,OAAO,IAAI,kCAAqB,CAAC,wCAA0B,CAAC,CAAC;qBAChE;oBACD,OAAO,iBAAG,CACN,IAAI,CAAC,6BAA6B,CAC9B,uCAA0B,CAAC,2BAA2B,EACtD,2BAAc,CAAC,EAAE,EACjB,SAAS,EACT,SAAS,EACT,QAAQ,CACX,CACJ,CAAC;gBACN,CAAC,CAAC;YACN,KAAK,6CAAiC;gBAClC,OAAO,CAAC,SAAoB,EAAE,SAAoB,EAAE,QAAiB,EAAE,EAAE;oBACrE,IAAI,CAAC,QAAQ,EAAE;wBACX,OAAO,IAAI,kCAAqB,CAAC,wCAA0B,CAAC,CAAC;qBAChE;oBACD,OAAO,IAAI,CAAC,6BAA6B,CACrC,uCAA0B,CAAC,2BAA2B,EACtD,2BAAc,CAAC,GAAG,EAClB,SAAS,EACT,SAAS,EACT,QAAQ,CACX,CAAC;gBACN,CAAC,CAAC;YACN,KAAK,iDAAqC;gBACtC,OAAO,CAAC,SAAoB,EAAE,SAAoB,EAAE,QAAiB,EAAE,EAAE;oBACrE,IAAI,CAAC,QAAQ,EAAE;wBACX,OAAO,IAAI,kCAAqB,CAAC,wCAA0B,CAAC,CAAC;qBAChE;oBACD,OAAO,iBAAG,CACN,IAAI,CAAC,6BAA6B,CAC9B,uCAA0B,CAAC,2BAA2B,EACtD,2BAAc,CAAC,GAAG,EAClB,SAAS,EACT,SAAS,EACT,QAAQ,CACX,CACJ,CAAC;gBACN,CAAC,CAAC;YACN,KAAK,uCAA2B;gBAC5B,OAAO,kCAAoB,CAAC,uCAA0B,CAAC,2BAA2B,CAAC,CAAC;YACxF,KAAK,2CAA+B;gBAChC,OAAO,qCAAuB,CAAC,uCAA0B,CAAC,2BAA2B,CAAC,CAAC;YAC3F;gBACI,MAAM,IAAI,KAAK,CAAC,uBAAuB,IAAI,mBAAmB,CAAC,CAAC;SACvE;IACL,CAAC;IAEO,6BAA6B,CACjC,kBAA8C,EAC9C,eAA+B,EAC/B,SAAoB,EACpB,SAAoB,EACpB,QAAgB;QAEhB,IAAI,CAAC,CAAC,SAAS,YAAY,6BAAgB,CAAC,IAAI,OAAO,SAAS,CAAC,KAAK,KAAK,QAAQ,EAAE;YACjF,MAAM,IAAI,KAAK,CAAC,wFAAwF,CAAC,CAAC;SAC7G;QACD,OAAO,IAAI,gDAAkC,CACzC,SAAS,CAAC,KAAK,EACf,kBAAkB,EAClB,eAAe,EACf,SAAS,EACT,QAAQ,EACR,IAAI,CACP,CAAC;IACN,CAAC;IAEO,uCAAuC,CAC3C,KAAY,EACZ,eAAgC;QAEhC,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE;YACxC,MAAM,IAAI,KAAK,CAAC,aAAa,KAAK,CAAC,IAAI,yBAAyB,CAAC,CAAC;SACrE;QACD,OAAO,8BAAkB,CAAC,GAAG,CACzB,IAAI,CAAC,EAAE,CACH,IAAI,sDAAsC,CACtC,KAAK,EACL,4BAAgB,CAAC,IAAI,CAAC,EACtB,IAAI,KAAK,6BAAiB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,EAC7C,eAAe,EACf,KAAK,CAAC,kBAAkB,CAC3B,CACR,CAAC;IACN,CAAC;IAGO,6BAA6B,CAAC,KAAY,EAAE,IAA2B;QAC3E,MAAM,SAAS,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,IAAI,KAAK,CAAC,IAAI,YAAY,kBAAU,EAAE;YAClC,OAAO,IAAI,CAAC,8BAA8B,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;SAC5E;aAAM,IAAI,KAAK,CAAC,IAAI,YAAY,gBAAQ,EAAE;YACvC,OAAO,IAAI,CAAC,4BAA4B,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;SAC1E;aAAM;YACH,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAClD,IAAI,KAAK,CAAC,IAAI,CAAC,qBAAqB,EAAE;gBAClC,OAAO,CAAC,IAAI,oDAAoC,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;aACvE;iBAAM;gBACH,OAAO,CAAC,IAAI,iDAAiC,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;aACpE;SACJ;IACL,CAAC;IAEO,8BAA8B,CAClC,IAAgB,EAChB,KAAY,EACZ,IAA2B;QAE3B,MAAM,YAAY,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAEtD,IAAI,YAAY,GAA6C,EAAE,CAAC;QAChE,IAAI,KAAK,CAAC,mBAAmB,EAAE;YAC3B,YAAY,GAAG,YAAY,CAAC,MAAM,CAC9B,YAAY,CAAC,GAAG,CACZ,IAAI,CAAC,EAAE,CACH,IAAI,sDAAsC,CACtC,KAAK,EACL,IAAI,CAAC,IAAI,KAAK,QAAQ;gBAClB,CAAC,CAAC,+CAAmC,CAAC,IAAI,CAAC;gBAC3C,CAAC,CAAC,wCAA4B,CAAC,IAAI,CAAC,EACxC,IAAI,EACJ,IAAI,CAAC,iBAAiB,EACtB,KAAK,CAAC,kBAAkB,EACxB,IAAI,CACP,CACR,CACJ,CAAC;SACL;QAED,IAAI,KAAK,CAAC,kBAAkB,IAAI,KAAK,CAAC,2BAA2B,EAAE;YAC/D,YAAY,GAAG,YAAY,CAAC,MAAM,CAC9B,8CAAkC,CAAC,GAAG,CAClC,IAAI,CAAC,EAAE,CACH,IAAI,sDAAsC,CACtC,KAAK,EACL,IAAI,CAAC,8BAA8B,CAAC,IAAI,CAAC,EACzC,IAAI,EACJ,IAAI,CAAC,iBAAiB,EACtB,KAAK,CAAC,0BAA0B,CACnC,CACR,CACJ,CAAC;SACL;QAED,OAAO,YAAY,CAAC;IACxB,CAAC;IAEO,4BAA4B,CAAC,IAAc,EAAE,KAAY,EAAE,IAA2B;QAC1F,OAAO,8BAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACjC,OAAO,IAAI,sDAAsC,CAC7C,KAAK,EACL,wCAA4B,CAAC,IAAI,CAAC,EAClC,IAAI,EACJ,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,EACrC,SAAS,EACT,IAAI,CACP,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,qBAAqB,CAAC,IAAU;QACpC,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,EAAE;YACxC,OAAO,iCAAqB,CAAC;SAChC;QACD,OAAO,6CAAiC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAC9D,CAAC;IAEO,iCAAiC,CAAC,KAAY;QAClD,OAAO;YACH,IAAI,wDAAwC,CACxC,KAAK,EACL,IAAI,CAAC,2CAA2C,CAC5C,KAAK,CAAC,mBAAmB,EACzB,KAAK,CAAC,2BAA2B,CACpC,CACJ;SACJ,CAAC;IACN,CAAC;IAGO,2CAA2C,CAC/C,iBAA0B,EAC1B,iBAA0B;QAE1B,MAAM,MAAM,GAA4B,CAAC,IAAI,sDAAsC,EAAE,CAAC,CAAC;QACvF,IAAI,iBAAiB,EAAE;YACnB,MAAM,CAAC,IAAI,CACP,GAAG,4CAAgC,CAAC,GAAG,CACnC,YAAY,CAAC,EAAE,CACX,IAAI,iDAAiC,CACjC,+CAAmC,CAAC,YAAY,CAAC,EACjD,YAAY,EACZ,uBAAa,EACb,KAAK,CACR,CACR,CACJ,CAAC;SACL;QACD,IAAI,iBAAiB,EAAE;YACnB,MAAM,CAAC,IAAI,CACP,GAAG,8CAAkC,CAAC,GAAG,CACrC,YAAY,CAAC,EAAE,CACX,IAAI,iDAAiC,CACjC,IAAI,CAAC,8BAA8B,CAAC,YAAY,CAAC,EACjD,YAAY,EACZ,uBAAa,EACb,IAAI,CACP,CACR,CACJ,CAAC;SACL;QAED,IAAI,QAAgB,CAAC;QACrB,IAAI,iBAAiB,EAAE;YACnB,IAAI,iBAAiB,EAAE;gBACnB,QAAQ,GAAG,oBAAoB,CAAC;aACnC;iBAAM;gBACH,QAAQ,GAAG,SAAS,CAAC;aACxB;SACJ;aAAM,IAAI,iBAAiB,EAAE;YAC1B,QAAQ,GAAG,UAAU,CAAC;SACzB;aAAM;YACH,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;SAC1E;QAED,OAAO,IAAI,yCAA0B,CACjC,sBAAsB,QAAQ,QAAQ,EACtC,MAAM,EACN,+DAA+D;YAC3D,gQAAgQ,CACvQ,CAAC;IACN,CAAC;CACJ;AA9YG;IADC,4BAAQ,EAAE;6DAaV;AAiPD;IADC,4BAAQ,EAAE;kFAeV;AA+ED;IADC,4BAAQ,EAAE;gGAoDV;AAjZL,sEAkZC"}
|
|
@@ -138,10 +138,11 @@ class FlexSearchGenerator {
|
|
|
138
138
|
}
|
|
139
139
|
};
|
|
140
140
|
}
|
|
141
|
-
buildFlexSearchExpressionFilterNode(rootEntityType, itemVariable,
|
|
142
|
-
if (!
|
|
141
|
+
buildFlexSearchExpressionFilterNode(rootEntityType, itemVariable, expressionParam) {
|
|
142
|
+
if (!expressionParam || !expressionParam.trim()) {
|
|
143
143
|
return query_tree_1.ConstBoolQueryNode.TRUE;
|
|
144
144
|
}
|
|
145
|
+
const expression = expressionParam;
|
|
145
146
|
function getQueryNodeFromField(field, path = []) {
|
|
146
147
|
if (field.type.isObjectType) {
|
|
147
148
|
return field.type.fields
|
|
@@ -149,9 +150,9 @@ class FlexSearchGenerator {
|
|
|
149
150
|
.reduce(input_types_1.or, query_tree_1.ConstBoolQueryNode.FALSE);
|
|
150
151
|
}
|
|
151
152
|
const identityNode = new flex_search_1.FlexSearchStartsWithQueryNode(new query_tree_1.FieldPathQueryNode(itemVariable, path.concat(field)), new query_tree_1.LiteralQueryNode(expression));
|
|
152
|
-
const
|
|
153
|
+
const fullTextQueryNode = new flex_search_1.FlexSearchComplexOperatorQueryNode(expression, query_tree_1.BinaryOperatorWithAnalyzer.FLEX_SEARCH_CONTAINS_PREFIX, query_tree_1.BinaryOperator.AND, new query_tree_1.FieldPathQueryNode(itemVariable, path.concat(field)), field.getFlexSearchFulltextAnalyzerOrThrow(), true);
|
|
153
154
|
return new query_tree_1.BinaryOperationQueryNode(field.isFlexSearchIndexed && field.isIncludedInSearch ? identityNode : query_tree_1.ConstBoolQueryNode.FALSE, query_tree_1.BinaryOperator.OR, field.isFlexSearchFulltextIndexed && field.isFulltextIncludedInSearch && field.flexSearchLanguage
|
|
154
|
-
?
|
|
155
|
+
? fullTextQueryNode
|
|
155
156
|
: query_tree_1.ConstBoolQueryNode.FALSE);
|
|
156
157
|
}
|
|
157
158
|
return rootEntityType.fields
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flex-search-generator.js","sourceRoot":"","sources":["../../../src/schema-generation/flex-search-generator.ts"],"names":[],"mappings":";;;AAAA,qCAAuE;AAEvE,
|
|
1
|
+
{"version":3,"file":"flex-search-generator.js","sourceRoot":"","sources":["../../../src/schema-generation/flex-search-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ErrorWithCause = void 0;
|
|
4
|
-
const util_1 = require("util");
|
|
5
4
|
/**
|
|
6
5
|
* ErrorWithCause extends the default node Error to support causes.
|
|
7
6
|
* Each error can have one cause. The stack of the causing error is appended
|
|
@@ -27,6 +26,6 @@ function extractMessage(message, cause) {
|
|
|
27
26
|
if (cause instanceof Error) {
|
|
28
27
|
return `${message}: ${cause.message}`;
|
|
29
28
|
}
|
|
30
|
-
return `${message}: NonError: ${
|
|
29
|
+
return `${message}: NonError: ${cause}`;
|
|
31
30
|
}
|
|
32
31
|
//# sourceMappingURL=error-with-cause.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-with-cause.js","sourceRoot":"","sources":["../../../src/utils/error-with-cause.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"error-with-cause.js","sourceRoot":"","sources":["../../../src/utils/error-with-cause.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,MAAa,cAAe,SAAQ,KAAK;IAErC,YAAY,OAAe,EAAE,KAAuB;QAChD,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;QACtC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QAClC,IAAI,KAAK,YAAY,KAAK,EAAE;YACxB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;gBAClB,IAAI,CAAC,KAAK,GAAG,GAAG,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;aACpF;SACJ;IACL,CAAC;CACJ;AAZD,wCAYC;AAED,SAAS,cAAc,CAAC,OAAe,EAAE,KAAuB;IAC5D,IAAI,KAAK,KAAK,SAAS,EAAE;QACrB,OAAO,OAAO,CAAC;KAClB;IACD,IAAI,KAAK,YAAY,KAAK,EAAE;QACxB,OAAO,GAAG,OAAO,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC;KACzC;IACD,OAAO,GAAG,OAAO,eAAe,KAAK,EAAE,CAAC;AAC5C,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.visitObject = void 0;
|
|
4
|
-
const util_1 = require("util");
|
|
5
4
|
function visitObject(node, visitor) {
|
|
6
5
|
return visitObject0(node, visitor);
|
|
7
6
|
}
|
|
@@ -34,7 +33,7 @@ function visitObjectOrArray(nodeOrArray, visitor, key) {
|
|
|
34
33
|
if (typeof nodeOrArray != 'object' || nodeOrArray === null) {
|
|
35
34
|
return nodeOrArray;
|
|
36
35
|
}
|
|
37
|
-
if (!
|
|
36
|
+
if (!Array.isArray(nodeOrArray)) {
|
|
38
37
|
return visitObject0(nodeOrArray, visitor, key);
|
|
39
38
|
}
|
|
40
39
|
return nodeOrArray.map(item => visitObject0(item, visitor, key));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitor.js","sourceRoot":"","sources":["../../../src/utils/visitor.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"visitor.js","sourceRoot":"","sources":["../../../src/utils/visitor.ts"],"names":[],"mappings":";;;AAUA,SAAgB,WAAW,CAAI,IAAO,EAAE,OAAmB;IACvD,OAAO,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACvC,CAAC;AAFD,kCAEC;AAED,SAAS,YAAY,CAAI,IAAO,EAAE,OAAmB,EAAE,GAAY;IAC/D,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IAExD,2BAA2B;IAC3B,MAAM,UAAU,GAAG,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,qBAAqB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAE3F,OAAO,KAAK,CAAI,UAAU,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,qBAAqB,CAAI,MAAS,EAAE,OAAmB;IAC5D,MAAM,cAAc,GAA0B,EAAE,CAAC;IACjD,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;QACrC,MAAM,QAAQ,GAAI,MAAc,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAC9D,IAAI,QAAQ,IAAI,QAAQ,EAAE;YACtB,cAAc,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC;YACjC,UAAU,GAAG,IAAI,CAAC;SACrB;KACJ;IAED,IAAI,CAAC,UAAU,EAAE;QACb,OAAO,MAAM,CAAC;KACjB;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5D,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;IAC9C,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,kBAAkB,CAAI,WAAoB,EAAE,OAAqB,EAAE,GAAuB;IAC/F,IAAI,OAAO,WAAW,IAAI,QAAQ,IAAI,WAAW,KAAK,IAAI,EAAE;QACxD,OAAO,WAAW,CAAC;KACtB;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QAC7B,OAAO,YAAY,CAAC,WAAgB,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;KACvD;IACD,OAAO,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;AACrE,CAAC;AAED,SAAS,KAAK,CAAI,GAAM,EAAE,OAAmB,EAAE,GAAuB;IAClE,IAAI,OAAO,CAAC,KAAK,EAAE;QACf,OAAO,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;KAClC;IACD,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC;AAC7B,CAAC;AAED,SAAS,KAAK,CAAI,GAAM,EAAE,OAAmB,EAAE,GAAuB;IAClE,IAAI,OAAO,CAAC,KAAK,EAAE;QACf,OAAO,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;KAClC;IACD,OAAO,GAAG,CAAC;AACf,CAAC"}
|