@finos/legend-query-builder 4.9.4 → 4.10.1
Sign up to get free protection for your applications and to get access to all the features.
- package/lib/__lib__/QueryBuilderTesting.d.ts +4 -1
- package/lib/__lib__/QueryBuilderTesting.d.ts.map +1 -1
- package/lib/__lib__/QueryBuilderTesting.js +5 -1
- package/lib/__lib__/QueryBuilderTesting.js.map +1 -1
- package/lib/components/QueryBuilderResultPanel.d.ts.map +1 -1
- package/lib/components/QueryBuilderResultPanel.js +80 -90
- package/lib/components/QueryBuilderResultPanel.js.map +1 -1
- package/lib/components/__test-utils__/QueryBuilderComponentTestUtils.d.ts +1 -0
- package/lib/components/__test-utils__/QueryBuilderComponentTestUtils.d.ts.map +1 -1
- package/lib/components/__test-utils__/QueryBuilderComponentTestUtils.js +13 -1
- package/lib/components/__test-utils__/QueryBuilderComponentTestUtils.js.map +1 -1
- package/lib/components/fetch-structure/QueryBuilderPostFilterPanel.d.ts +2 -2
- package/lib/components/fetch-structure/QueryBuilderPostFilterPanel.d.ts.map +1 -1
- package/lib/components/fetch-structure/QueryBuilderPostFilterPanel.js +42 -24
- package/lib/components/fetch-structure/QueryBuilderPostFilterPanel.js.map +1 -1
- package/lib/components/fetch-structure/QueryBuilderTDSPanel.d.ts.map +1 -1
- package/lib/components/fetch-structure/QueryBuilderTDSPanel.js +1 -1
- package/lib/components/fetch-structure/QueryBuilderTDSPanel.js.map +1 -1
- package/lib/components/filter/QueryBuilderFilterPanel.d.ts +3 -2
- package/lib/components/filter/QueryBuilderFilterPanel.d.ts.map +1 -1
- package/lib/components/filter/QueryBuilderFilterPanel.js +145 -8
- package/lib/components/filter/QueryBuilderFilterPanel.js.map +1 -1
- package/lib/index.css +16 -0
- package/lib/package.json +1 -1
- package/lib/stores/QueryBuilderConstantsState.d.ts +5 -1
- package/lib/stores/QueryBuilderConstantsState.d.ts.map +1 -1
- package/lib/stores/QueryBuilderConstantsState.js +14 -1
- package/lib/stores/QueryBuilderConstantsState.js.map +1 -1
- package/lib/stores/QueryBuilderResultState.d.ts +3 -0
- package/lib/stores/QueryBuilderResultState.d.ts.map +1 -1
- package/lib/stores/QueryBuilderResultState.js +31 -2
- package/lib/stores/QueryBuilderResultState.js.map +1 -1
- package/lib/stores/QueryBuilderStateHashUtils.d.ts +2 -0
- package/lib/stores/QueryBuilderStateHashUtils.d.ts.map +1 -1
- package/lib/stores/QueryBuilderStateHashUtils.js +2 -0
- package/lib/stores/QueryBuilderStateHashUtils.js.map +1 -1
- package/lib/stores/QueryBuilderValueSpecificationBuilder.d.ts.map +1 -1
- package/lib/stores/QueryBuilderValueSpecificationBuilder.js +3 -23
- package/lib/stores/QueryBuilderValueSpecificationBuilder.js.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterOperator.js +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterOperator.js.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterState.d.ts +31 -5
- package/lib/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterState.d.ts.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterState.js +125 -30
- package/lib/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterState.js.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterStateBuilder.d.ts.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterStateBuilder.js +21 -8
- package/lib/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterStateBuilder.js.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperatorValueSpecificationBuilder.d.ts +3 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperatorValueSpecificationBuilder.d.ts.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperatorValueSpecificationBuilder.js +20 -17
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperatorValueSpecificationBuilder.js.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Contain.d.ts.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Contain.js +4 -6
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Contain.js.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.d.ts.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.js +4 -6
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.js.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Equal.d.ts +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Equal.d.ts.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Equal.js +10 -10
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Equal.js.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.d.ts.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.js +10 -10
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.js.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThanEqual.d.ts.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThanEqual.js +5 -5
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThanEqual.js.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_In.d.ts +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_In.d.ts.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_In.js +32 -27
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_In.js.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_IsEmpty.d.ts.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_IsEmpty.js +10 -5
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_IsEmpty.js.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThan.d.ts.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThan.js +10 -10
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThan.js.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThanEqual.d.ts.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThanEqual.js +5 -5
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThanEqual.js.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.d.ts.map +1 -1
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.js +4 -6
- package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.js.map +1 -1
- package/lib/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.d.ts.map +1 -1
- package/lib/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js +17 -3
- package/lib/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js.map +1 -1
- package/lib/stores/filter/QueryBuilderFilterState.d.ts +7 -1
- package/lib/stores/filter/QueryBuilderFilterState.d.ts.map +1 -1
- package/lib/stores/filter/QueryBuilderFilterState.js +27 -0
- package/lib/stores/filter/QueryBuilderFilterState.js.map +1 -1
- package/package.json +5 -5
- package/src/__lib__/QueryBuilderTesting.ts +5 -1
- package/src/components/QueryBuilderResultPanel.tsx +127 -135
- package/src/components/__test-utils__/QueryBuilderComponentTestUtils.tsx +25 -1
- package/src/components/fetch-structure/QueryBuilderPostFilterPanel.tsx +102 -49
- package/src/components/fetch-structure/QueryBuilderTDSPanel.tsx +6 -2
- package/src/components/filter/QueryBuilderFilterPanel.tsx +239 -21
- package/src/stores/QueryBuilderConstantsState.ts +30 -0
- package/src/stores/QueryBuilderResultState.ts +36 -1
- package/src/stores/QueryBuilderStateHashUtils.ts +2 -0
- package/src/stores/QueryBuilderValueSpecificationBuilder.ts +4 -50
- package/src/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterOperator.ts +1 -1
- package/src/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterState.ts +180 -34
- package/src/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterStateBuilder.ts +38 -9
- package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperatorValueSpecificationBuilder.ts +36 -20
- package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Contain.ts +5 -6
- package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.ts +6 -6
- package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Equal.ts +12 -13
- package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.ts +10 -9
- package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThanEqual.ts +5 -4
- package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_In.ts +48 -43
- package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_IsEmpty.ts +12 -4
- package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThan.ts +10 -9
- package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_LessThanEqual.ts +5 -4
- package/src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.ts +6 -6
- package/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.ts +26 -4
- package/src/stores/filter/QueryBuilderFilterState.ts +40 -1
|
@@ -14,10 +14,10 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import { LambdaFunctionInstanceValue, AbstractPropertyExpression, extractElementNameFromPath, PrimitiveInstanceValue, matchFunctionName, VariableExpression, FunctionExpression, } from '@finos/legend-graph';
|
|
17
|
-
import { assertTrue, assertType, guaranteeIsString, guaranteeNonNullable, guaranteeType, UnsupportedOperationError, } from '@finos/legend-shared';
|
|
17
|
+
import { assertTrue, assertType, guaranteeIsString, guaranteeNonNullable, guaranteeType, returnUndefOnError, UnsupportedOperationError, } from '@finos/legend-shared';
|
|
18
18
|
import { QueryBuilderDerivationProjectionColumnState } from '../projection/QueryBuilderProjectionColumnState.js';
|
|
19
19
|
import { getTDSColumnState } from '../QueryBuilderTDSHelper.js';
|
|
20
|
-
import { getTDSColumnDerivedProperyFromType, PostFilterConditionState, QueryBuilderPostFilterTreeConditionNodeData, QueryBuilderPostFilterTreeGroupNodeData, TDS_COLUMN_GETTER, getTypeFromDerivedProperty, } from './QueryBuilderPostFilterState.js';
|
|
20
|
+
import { getTDSColumnDerivedProperyFromType, PostFilterConditionState, QueryBuilderPostFilterTreeConditionNodeData, QueryBuilderPostFilterTreeGroupNodeData, TDS_COLUMN_GETTER, getTypeFromDerivedProperty, PostFilterValueSpecConditionValueState, PostFilterTDSColumnValueConditionValueState, } from './QueryBuilderPostFilterState.js';
|
|
21
21
|
import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graph/QueryBuilderMetaModelConst.js';
|
|
22
22
|
import { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
|
|
23
23
|
import { toGroupOperation } from '../../../QueryBuilderGroupOperationHelper.js';
|
|
@@ -45,6 +45,20 @@ const findProjectionColumnState = (propertyExpression, postFilterState) => {
|
|
|
45
45
|
}
|
|
46
46
|
return columnState;
|
|
47
47
|
};
|
|
48
|
+
const buildPostFilterConditionValueState = (rightVal, conditionState) => {
|
|
49
|
+
if (rightVal instanceof AbstractPropertyExpression) {
|
|
50
|
+
const rightCol = returnUndefOnError(() => findProjectionColumnState(rightVal, conditionState.postFilterState));
|
|
51
|
+
if (rightCol) {
|
|
52
|
+
conditionState.setRightConditionVal(new PostFilterTDSColumnValueConditionValueState(conditionState, rightCol));
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
const val = rightVal
|
|
57
|
+
? simplifyValueExpression(rightVal, conditionState.postFilterState.tdsState.queryBuilderState
|
|
58
|
+
.observerContext)
|
|
59
|
+
: undefined;
|
|
60
|
+
conditionState.setRightConditionVal(new PostFilterValueSpecConditionValueState(conditionState, val));
|
|
61
|
+
};
|
|
48
62
|
export const buildPostFilterConditionState = (postFilterState, expression, operatorFunctionFullPath, operator) => {
|
|
49
63
|
let postConditionState;
|
|
50
64
|
const tdsColumnGetter = operator.getTDSColumnGetter();
|
|
@@ -52,7 +66,7 @@ export const buildPostFilterConditionState = (postFilterState, expression, opera
|
|
|
52
66
|
expression instanceof AbstractPropertyExpression &&
|
|
53
67
|
expression.func.value.name === tdsColumnGetter) {
|
|
54
68
|
const columnState = findProjectionColumnState(expression, postFilterState);
|
|
55
|
-
postConditionState = new PostFilterConditionState(postFilterState, columnState,
|
|
69
|
+
postConditionState = new PostFilterConditionState(postFilterState, columnState, operator);
|
|
56
70
|
return postConditionState;
|
|
57
71
|
}
|
|
58
72
|
else if (operatorFunctionFullPath &&
|
|
@@ -62,14 +76,13 @@ export const buildPostFilterConditionState = (postFilterState, expression, opera
|
|
|
62
76
|
const tdsColumnPropertyExpression = guaranteeType(expression.parametersValues[0], AbstractPropertyExpression, `Can't process ${extractElementNameFromPath(operatorFunctionFullPath)}() expression: expects property expression in lambda body`);
|
|
63
77
|
const columnState = findProjectionColumnState(tdsColumnPropertyExpression, postFilterState);
|
|
64
78
|
// get operation value specification
|
|
65
|
-
const
|
|
79
|
+
const rightSide = expression.parametersValues[1];
|
|
66
80
|
// create state
|
|
67
|
-
postConditionState = new PostFilterConditionState(postFilterState, columnState,
|
|
68
|
-
|
|
69
|
-
: undefined, operator);
|
|
81
|
+
postConditionState = new PostFilterConditionState(postFilterState, columnState, operator);
|
|
82
|
+
buildPostFilterConditionValueState(rightSide, postConditionState);
|
|
70
83
|
//post checks
|
|
71
84
|
assertTrue(operator.isCompatibleWithPostFilterColumn(postConditionState), `Can't process ${extractElementNameFromPath(operatorFunctionFullPath)}() expression: property is not compatible with post-filter operator`);
|
|
72
|
-
assertTrue(operator.isCompatibleWithConditionValue(postConditionState), `Operator '${operator.getLabel()}' not compatible with value specification ${
|
|
85
|
+
assertTrue(operator.isCompatibleWithConditionValue(postConditionState), `Operator '${operator.getLabel()}' not compatible with value specification ${rightSide?.toString()}`);
|
|
73
86
|
}
|
|
74
87
|
return postConditionState;
|
|
75
88
|
};
|
package/lib/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterStateBuilder.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderPostFilterStateBuilder.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterStateBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,2BAA2B,EAC3B,0BAA0B,EAC1B,0BAA0B,EAC1B,sBAAsB,EACtB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,
|
|
1
|
+
{"version":3,"file":"QueryBuilderPostFilterStateBuilder.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/tds/post-filter/QueryBuilderPostFilterStateBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,8 +13,10 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import { type FunctionExpression } from '@finos/legend-graph';
|
|
16
|
+
import { type FunctionExpression, AbstractPropertyExpression, type PureModel } from '@finos/legend-graph';
|
|
17
17
|
import type { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
|
|
18
18
|
import { type PostFilterConditionState } from '../QueryBuilderPostFilterState.js';
|
|
19
|
+
import type { QueryBuilderTDSColumnState } from '../../QueryBuilderTDSColumnState.js';
|
|
20
|
+
export declare const buildtdsPropertyExpressionFromColState: (filterConditionState: PostFilterConditionState, colState: QueryBuilderTDSColumnState, graph: PureModel, operator: QueryBuilderPostFilterOperator | undefined) => AbstractPropertyExpression;
|
|
19
21
|
export declare const buildPostFilterConditionExpression: (filterConditionState: PostFilterConditionState, operator: QueryBuilderPostFilterOperator, operatorFunctionFullPath: string | undefined) => FunctionExpression;
|
|
20
22
|
//# sourceMappingURL=QueryBuilderPostFilterOperatorValueSpecificationBuilder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderPostFilterOperatorValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperatorValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,kBAAkB,
|
|
1
|
+
{"version":3,"file":"QueryBuilderPostFilterOperatorValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperatorValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,kBAAkB,EACvB,0BAA0B,EAW1B,KAAK,SAAS,EACf,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAC3F,OAAO,EACL,KAAK,wBAAwB,EAG9B,MAAM,mCAAmC,CAAC;AAE3C,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AAEtF,eAAO,MAAM,sCAAsC,yBAC3B,wBAAwB,YACpC,0BAA0B,SAC7B,SAAS,YACN,8BAA8B,GAAG,SAAS,KACnD,0BA6BF,CAAC;AAEF,eAAO,MAAM,kCAAkC,yBACvB,wBAAwB,YACpC,8BAA8B,4BAOd,MAAM,GAAG,SAAS,KAC3C,kBAuBF,CAAC"}
|
|
@@ -17,22 +17,12 @@ import { AbstractPropertyExpression, extractElementNameFromPath, GenericType, Ge
|
|
|
17
17
|
import { guaranteeNonNullable } from '@finos/legend-shared';
|
|
18
18
|
import { getTDSColumnDerivedProperyFromType, } from '../QueryBuilderPostFilterState.js';
|
|
19
19
|
import { QUERY_BUILDER_PURE_PATH } from '../../../../../graph/QueryBuilderMetaModelConst.js';
|
|
20
|
-
export const
|
|
21
|
-
/**
|
|
22
|
-
* If provided, this will be used to construct the simple
|
|
23
|
-
* function expression for the function with the specified
|
|
24
|
-
* name. If not provided, we will fall back to use the TDS column getter function expression.
|
|
25
|
-
* This is the case because with TDS, we are provided some filter-like operators, e.g. IS_NULL, IS_NOT_NULL, etc.
|
|
26
|
-
*/
|
|
27
|
-
operatorFunctionFullPath) => {
|
|
28
|
-
// primitives
|
|
29
|
-
const graph = filterConditionState.postFilterState.tdsState.queryBuilderState
|
|
30
|
-
.graphManagerState.graph;
|
|
31
|
-
// property expression
|
|
32
|
-
const colState = filterConditionState.columnState;
|
|
20
|
+
export const buildtdsPropertyExpressionFromColState = (filterConditionState, colState, graph, operator) => {
|
|
33
21
|
const tdsPropertyExpression = new AbstractPropertyExpression('');
|
|
34
22
|
let tdsDerivedPropertyName;
|
|
35
|
-
const correspondingTDSDerivedProperty = operator
|
|
23
|
+
const correspondingTDSDerivedProperty = operator
|
|
24
|
+
? operator.getTDSColumnGetter()
|
|
25
|
+
: undefined;
|
|
36
26
|
if (correspondingTDSDerivedProperty) {
|
|
37
27
|
tdsDerivedPropertyName = correspondingTDSDerivedProperty;
|
|
38
28
|
}
|
|
@@ -45,12 +35,25 @@ operatorFunctionFullPath) => {
|
|
|
45
35
|
const colInstanceValue = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(new GenericType(PrimitiveType.STRING)));
|
|
46
36
|
colInstanceValue.values = [colState.columnName];
|
|
47
37
|
tdsPropertyExpression.parametersValues = [variableName, colInstanceValue];
|
|
38
|
+
return tdsPropertyExpression;
|
|
39
|
+
};
|
|
40
|
+
export const buildPostFilterConditionExpression = (filterConditionState, operator,
|
|
41
|
+
/**
|
|
42
|
+
* If provided, this will be used to construct the simple
|
|
43
|
+
* function expression for the function with the specified
|
|
44
|
+
* name. If not provided, we will fall back to use the TDS column getter function expression.
|
|
45
|
+
* This is the case because with TDS, we are provided some filter-like operators, e.g. IS_NULL, IS_NOT_NULL, etc.
|
|
46
|
+
*/
|
|
47
|
+
operatorFunctionFullPath) => {
|
|
48
|
+
// primitives
|
|
49
|
+
const graph = filterConditionState.postFilterState.tdsState.queryBuilderState
|
|
50
|
+
.graphManagerState.graph;
|
|
51
|
+
// property expression
|
|
52
|
+
const tdsPropertyExpression = buildtdsPropertyExpressionFromColState(filterConditionState, filterConditionState.leftConditionValue, graph, operator);
|
|
48
53
|
if (operatorFunctionFullPath) {
|
|
49
54
|
const expression = new SimpleFunctionExpression(extractElementNameFromPath(operatorFunctionFullPath));
|
|
50
55
|
expression.parametersValues.push(tdsPropertyExpression);
|
|
51
|
-
|
|
52
|
-
expression.parametersValues.push(filterConditionState.value);
|
|
53
|
-
}
|
|
56
|
+
filterConditionState.rightConditionValue.appendConditionValue(expression);
|
|
54
57
|
return expression;
|
|
55
58
|
}
|
|
56
59
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderPostFilterOperatorValueSpecificationBuilder.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperatorValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,0BAA0B,EAC1B,0BAA0B,EAC1B,WAAW,EACX,4BAA4B,EAC5B,sBAAsB,EACtB,wBAAwB,EACxB,kBAAkB,EAClB,4BAA4B,EAC5B,yBAAyB,EACzB,YAAY,EACZ,aAAa,
|
|
1
|
+
{"version":3,"file":"QueryBuilderPostFilterOperatorValueSpecificationBuilder.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperatorValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,0BAA0B,EAC1B,0BAA0B,EAC1B,WAAW,EACX,4BAA4B,EAC5B,sBAAsB,EACtB,wBAAwB,EACxB,kBAAkB,EAClB,4BAA4B,EAC5B,yBAAyB,EACzB,YAAY,EACZ,aAAa,GAEd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAGL,kCAAkC,GACnC,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,uBAAuB,EAAE,MAAM,oDAAoD,CAAC;AAG7F,MAAM,CAAC,MAAM,sCAAsC,GAAG,CACpD,oBAA8C,EAC9C,QAAoC,EACpC,KAAgB,EAChB,QAAoD,EACxB,EAAE;IAC9B,MAAM,qBAAqB,GAAG,IAAI,0BAA0B,CAAC,EAAE,CAAC,CAAC;IACjE,IAAI,sBAAyC,CAAC;IAC9C,MAAM,+BAA+B,GAAG,QAAQ;QAC9C,CAAC,CAAC,QAAQ,CAAC,kBAAkB,EAAE;QAC/B,CAAC,CAAC,SAAS,CAAC;IACd,IAAI,+BAA+B,EAAE;QACnC,sBAAsB,GAAG,+BAA+B,CAAC;KAC1D;SAAM;QACL,MAAM,IAAI,GAAG,oBAAoB,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,CAAC;QAC5D,sBAAsB,GAAG,kCAAkC,CAAC,IAAI,CAAC,CAAC;KACnE;IACD,qBAAqB,CAAC,IAAI,GAAG,yBAAyB,CAAC,MAAM,CAC3D,oBAAoB,CAClB,4BAA4B,CAC1B,KAAK,CAAC,QAAQ,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAChD,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,sBAAsB,CAAC,CACjD,CACF,CAAC;IACF,MAAM,YAAY,GAAG,IAAI,kBAAkB,CACzC,oBAAoB,CAAC,eAAe,CAAC,mBAAmB,EACxD,YAAY,CAAC,GAAG,CACjB,CAAC;IACF,MAAM,gBAAgB,GAAG,IAAI,sBAAsB,CACjD,4BAA4B,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAC3E,CAAC;IACF,gBAAgB,CAAC,MAAM,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAChD,qBAAqB,CAAC,gBAAgB,GAAG,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;IAC1E,OAAO,qBAAqB,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kCAAkC,GAAG,CAChD,oBAA8C,EAC9C,QAAwC;AACxC;;;;;GAKG;AACH,wBAA4C,EACxB,EAAE;IACtB,aAAa;IACb,MAAM,KAAK,GACT,oBAAoB,CAAC,eAAe,CAAC,QAAQ,CAAC,iBAAiB;SAC5D,iBAAiB,CAAC,KAAK,CAAC;IAC7B,sBAAsB;IACtB,MAAM,qBAAqB,GAAG,sCAAsC,CAClE,oBAAoB,EACpB,oBAAoB,CAAC,kBAAkB,EACvC,KAAK,EACL,QAAQ,CACT,CAAC;IAEF,IAAI,wBAAwB,EAAE;QAC5B,MAAM,UAAU,GAAG,IAAI,wBAAwB,CAC7C,0BAA0B,CAAC,wBAAwB,CAAC,CACrD,CAAC;QACF,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACxD,oBAAoB,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAC1E,OAAO,UAAU,CAAC;KACnB;SAAM;QACL,OAAO,qBAAqB,CAAC;KAC9B;AACH,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderPostFilterOperator_Contain.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Contain.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EAGxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,KAAK,EACV,wBAAwB,EACxB,2BAA2B,EAC5B,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"QueryBuilderPostFilterOperator_Contain.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Contain.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EAGxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,KAAK,EACV,wBAAwB,EACxB,2BAA2B,EAC5B,MAAM,mCAAmC,CAAC;AAW3C,qBAAa,sCACX,SAAQ,8BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAIzC,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,OAAO;IAOV,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB;IAwBrB,kCAAkC,CAChC,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB,GAAG,SAAS;IAQjC,6BAA6B,CAC3B,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,kBAAkB,GAC7B,wBAAwB,GAAG,SAAS;IASvC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AAED,qBAAa,yCAA0C,SAAQ,sCAAsC;IAC1F,QAAQ,IAAI,MAAM;IAGlB,kCAAkC,CACzC,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB,GAAG,SAAS;IAOxB,6BAA6B,CACpC,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,wBAAwB,GACnC,wBAAwB,GAAG,SAAS;IAOvC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}
|
|
@@ -17,7 +17,7 @@ import { PRIMITIVE_TYPE, PrimitiveType, } from '@finos/legend-graph';
|
|
|
17
17
|
import { guaranteeNonNullable, hashArray, UnsupportedOperationError, } from '@finos/legend-shared';
|
|
18
18
|
import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
|
|
19
19
|
import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
|
|
20
|
-
import { buildNotExpression, generateDefaultValueForPrimitiveType,
|
|
20
|
+
import { buildNotExpression, generateDefaultValueForPrimitiveType, unwrapNotExpression, } from '../../../../QueryBuilderValueSpecificationHelper.js';
|
|
21
21
|
import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
|
|
22
22
|
import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
|
|
23
23
|
import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
|
|
@@ -30,13 +30,11 @@ export class QueryBuilderPostFilterOperator_Contain extends QueryBuilderPostFilt
|
|
|
30
30
|
return type === PrimitiveType.STRING;
|
|
31
31
|
}
|
|
32
32
|
isCompatibleWithConditionValue(postFilterConditionState) {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
: undefined;
|
|
36
|
-
return PrimitiveType.STRING === type;
|
|
33
|
+
return (!postFilterConditionState.rightConditionValue.isCollection &&
|
|
34
|
+
PrimitiveType.STRING === postFilterConditionState.rightConditionValue.type);
|
|
37
35
|
}
|
|
38
36
|
getDefaultFilterConditionValue(postFilterConditionState) {
|
|
39
|
-
const propertyType = guaranteeNonNullable(postFilterConditionState.
|
|
37
|
+
const propertyType = guaranteeNonNullable(postFilterConditionState.leftConditionValue.getColumnType());
|
|
40
38
|
switch (propertyType.path) {
|
|
41
39
|
case PRIMITIVE_TYPE.STRING: {
|
|
42
40
|
return buildPrimitiveInstanceValue(postFilterConditionState.postFilterState.tdsState.queryBuilderState
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderPostFilterOperator_Contain.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Contain.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAKL,cAAc,EACd,aAAa,GACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,oBAAoB,EAEpB,SAAS,EACT,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AACtF,OAAO,EAAE,6BAA6B,EAAE,MAAM,0CAA0C,CAAC;AAKzF,OAAO,EACL,kBAAkB,EAClB,oCAAoC,EACpC,
|
|
1
|
+
{"version":3,"file":"QueryBuilderPostFilterOperator_Contain.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Contain.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderPostFilterOperator_EndWith.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EAGxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,KAAK,EACV,wBAAwB,EACxB,2BAA2B,EAC5B,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"QueryBuilderPostFilterOperator_EndWith.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EAGxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,KAAK,EACV,wBAAwB,EACxB,2BAA2B,EAC5B,MAAM,mCAAmC,CAAC;AAW3C,qBAAa,sCACX,SAAQ,8BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAIzC,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,OAAO;IAOV,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB;IAqBrB,kCAAkC,CAChC,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB,GAAG,SAAS;IAQjC,6BAA6B,CAC3B,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,kBAAkB,GAC7B,wBAAwB,GAAG,SAAS;IASvC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AAED,qBAAa,yCAA0C,SAAQ,sCAAsC;IAC1F,QAAQ,IAAI,MAAM;IAIlB,kCAAkC,CACzC,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB,GAAG,SAAS;IAOxB,6BAA6B,CACpC,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,wBAAwB,GACnC,wBAAwB,GAAG,SAAS;IAOvC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}
|
|
@@ -17,7 +17,7 @@ import { PRIMITIVE_TYPE, PrimitiveType, } from '@finos/legend-graph';
|
|
|
17
17
|
import { hashArray, UnsupportedOperationError, } from '@finos/legend-shared';
|
|
18
18
|
import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
|
|
19
19
|
import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
|
|
20
|
-
import { buildNotExpression, generateDefaultValueForPrimitiveType,
|
|
20
|
+
import { buildNotExpression, generateDefaultValueForPrimitiveType, unwrapNotExpression, } from '../../../../QueryBuilderValueSpecificationHelper.js';
|
|
21
21
|
import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
|
|
22
22
|
import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
|
|
23
23
|
import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
|
|
@@ -30,13 +30,11 @@ export class QueryBuilderPostFilterOperator_EndWith extends QueryBuilderPostFilt
|
|
|
30
30
|
return PrimitiveType.STRING === type;
|
|
31
31
|
}
|
|
32
32
|
isCompatibleWithConditionValue(postFilterConditionState) {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
: undefined;
|
|
36
|
-
return PrimitiveType.STRING === type;
|
|
33
|
+
return (!postFilterConditionState.rightConditionValue.isCollection &&
|
|
34
|
+
PrimitiveType.STRING === postFilterConditionState.rightConditionValue.type);
|
|
37
35
|
}
|
|
38
36
|
getDefaultFilterConditionValue(postFilterConditionState) {
|
|
39
|
-
const propertyType = postFilterConditionState.
|
|
37
|
+
const propertyType = postFilterConditionState.leftConditionValue.getColumnType();
|
|
40
38
|
switch (propertyType?.path) {
|
|
41
39
|
case PRIMITIVE_TYPE.STRING: {
|
|
42
40
|
return buildPrimitiveInstanceValue(postFilterConditionState.postFilterState.tdsState.queryBuilderState
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderPostFilterOperator_EndWith.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAKL,cAAc,EACd,aAAa,GACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,SAAS,EACT,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AACtF,OAAO,EAAE,6BAA6B,EAAE,MAAM,0CAA0C,CAAC;AAKzF,OAAO,EACL,kBAAkB,EAClB,oCAAoC,EACpC,
|
|
1
|
+
{"version":3,"file":"QueryBuilderPostFilterOperator_EndWith.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
import { type Type, type ValueSpecification, type SimpleFunctionExpression, type FunctionExpression } from '@finos/legend-graph';
|
|
17
17
|
import { type Hashable } from '@finos/legend-shared';
|
|
18
18
|
import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
|
|
19
|
-
import type
|
|
19
|
+
import { type PostFilterConditionState, type QueryBuilderPostFilterState } from '../QueryBuilderPostFilterState.js';
|
|
20
20
|
export declare class QueryBuilderPostFilterOperator_Equal extends QueryBuilderPostFilterOperator implements Hashable {
|
|
21
21
|
getLabel(): string;
|
|
22
22
|
isCompatibleWithType(type: Type): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderPostFilterOperator_Equal.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Equal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,IAAI,EACT,KAAK,kBAAkB,EAEvB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,
|
|
1
|
+
{"version":3,"file":"QueryBuilderPostFilterOperator_Equal.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Equal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,IAAI,EACT,KAAK,kBAAkB,EAEvB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EASxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,2BAA2B,EACjC,MAAM,mCAAmC,CAAC;AAa3C,qBAAa,oCACX,SAAQ,8BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAoBzC,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,OAAO;IAYV,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB;IAkErB,kCAAkC,CAChC,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB,GAAG,SAAS;IAajC,6BAA6B,CAC3B,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,kBAAkB,GAC7B,wBAAwB,GAAG,SAAS;IAevC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AACD,qBAAa,uCAAwC,SAAQ,oCAAoC;IACtF,QAAQ,IAAI,MAAM;IAIlB,kCAAkC,CACzC,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB,GAAG,SAAS;IAOxB,6BAA6B,CACpC,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,wBAAwB,GACnC,wBAAwB,GAAG,SAAS;IAOvC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}
|
package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Equal.js
CHANGED
|
@@ -13,11 +13,12 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import { AbstractPropertyExpression, Enumeration, EnumValueExplicitReference, EnumValueInstanceValue, GenericType, GenericTypeExplicitReference, PRIMITIVE_TYPE, } from '@finos/legend-graph';
|
|
16
|
+
import { AbstractPropertyExpression, Enumeration, EnumValueExplicitReference, EnumValueInstanceValue, GenericType, GenericTypeExplicitReference, PRIMITIVE_TYPE, PrimitiveType, } from '@finos/legend-graph';
|
|
17
17
|
import { guaranteeNonNullable, hashArray, UnsupportedOperationError, } from '@finos/legend-shared';
|
|
18
18
|
import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
|
|
19
19
|
import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
|
|
20
|
-
import {
|
|
20
|
+
import {} from '../QueryBuilderPostFilterState.js';
|
|
21
|
+
import { buildNotExpression, generateDefaultValueForPrimitiveType, isTypeCompatibleForAssignment, unwrapNotExpression, } from '../../../../QueryBuilderValueSpecificationHelper.js';
|
|
21
22
|
import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
|
|
22
23
|
import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
|
|
23
24
|
import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
|
|
@@ -43,14 +44,13 @@ export class QueryBuilderPostFilterOperator_Equal extends QueryBuilderPostFilter
|
|
|
43
44
|
(type instanceof Enumeration && type.values.length > 0));
|
|
44
45
|
}
|
|
45
46
|
isCompatibleWithConditionValue(postFilterConditionState) {
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
return isTypeCompatibleForAssignment(getNonCollectionValueSpecificationType(valueSpecification), guaranteeNonNullable(postFilterConditionState.columnState.getColumnType()));
|
|
47
|
+
if (!postFilterConditionState.rightConditionValue.isCollection) {
|
|
48
|
+
return isTypeCompatibleForAssignment(postFilterConditionState.rightConditionValue.type, guaranteeNonNullable(postFilterConditionState.leftConditionValue.getColumnType()));
|
|
49
49
|
}
|
|
50
50
|
return false;
|
|
51
51
|
}
|
|
52
52
|
getDefaultFilterConditionValue(postFilterConditionState) {
|
|
53
|
-
const propertyType = guaranteeNonNullable(postFilterConditionState.
|
|
53
|
+
const propertyType = guaranteeNonNullable(postFilterConditionState.leftConditionValue.getColumnType());
|
|
54
54
|
switch (propertyType.path) {
|
|
55
55
|
case PRIMITIVE_TYPE.STRING:
|
|
56
56
|
case PRIMITIVE_TYPE.BOOLEAN:
|
|
@@ -85,10 +85,10 @@ export class QueryBuilderPostFilterOperator_Equal extends QueryBuilderPostFilter
|
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
87
|
buildPostFilterConditionExpression(postFilterConditionState) {
|
|
88
|
-
return buildPostFilterConditionExpression(postFilterConditionState, this, postFilterConditionState.
|
|
89
|
-
|
|
90
|
-
postFilterConditionState.
|
|
91
|
-
|
|
88
|
+
return buildPostFilterConditionExpression(postFilterConditionState, this, postFilterConditionState.leftConditionValue.getColumnType() ===
|
|
89
|
+
PrimitiveType.DATETIME &&
|
|
90
|
+
postFilterConditionState.rightConditionValue.type !==
|
|
91
|
+
PrimitiveType.DATETIME
|
|
92
92
|
? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_DAY
|
|
93
93
|
: QUERY_BUILDER_SUPPORTED_FUNCTIONS.EQUAL);
|
|
94
94
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderPostFilterOperator_Equal.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Equal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAML,0BAA0B,EAC1B,WAAW,EACX,0BAA0B,EAC1B,sBAAsB,EACtB,WAAW,EACX,4BAA4B,EAC5B,cAAc,
|
|
1
|
+
{"version":3,"file":"QueryBuilderPostFilterOperator_Equal.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_Equal.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderPostFilterOperator_GreaterThan.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,
|
|
1
|
+
{"version":3,"file":"QueryBuilderPostFilterOperator_GreaterThan.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EAIxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,KAAK,EACV,wBAAwB,EACxB,2BAA2B,EAC5B,MAAM,mCAAmC,CAAC;AAU3C,qBAAa,0CACX,SAAQ,8BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAczC,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,OAAO;IAWV,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB;IAoCrB,kCAAkC,CAChC,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB,GAAG,SAAS;IAajC,6BAA6B,CAC3B,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,kBAAkB,GAC7B,wBAAwB,GAAG,SAAS;IAevC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF"}
|
|
@@ -13,11 +13,11 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import { AbstractPropertyExpression, PRIMITIVE_TYPE, } from '@finos/legend-graph';
|
|
16
|
+
import { AbstractPropertyExpression, PRIMITIVE_TYPE, PrimitiveType, } from '@finos/legend-graph';
|
|
17
17
|
import { guaranteeNonNullable, hashArray, UnsupportedOperationError, } from '@finos/legend-shared';
|
|
18
18
|
import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
|
|
19
19
|
import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
|
|
20
|
-
import { generateDefaultValueForPrimitiveType,
|
|
20
|
+
import { generateDefaultValueForPrimitiveType, isTypeCompatibleForAssignment, } from '../../../../QueryBuilderValueSpecificationHelper.js';
|
|
21
21
|
import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
|
|
22
22
|
import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
|
|
23
23
|
import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
|
|
@@ -38,12 +38,12 @@ export class QueryBuilderPostFilterOperator_GreaterThan extends QueryBuilderPost
|
|
|
38
38
|
].includes(type.path);
|
|
39
39
|
}
|
|
40
40
|
isCompatibleWithConditionValue(postFilterConditionState) {
|
|
41
|
-
return isTypeCompatibleForAssignment(postFilterConditionState.
|
|
42
|
-
?
|
|
43
|
-
: undefined, guaranteeNonNullable(postFilterConditionState.
|
|
41
|
+
return isTypeCompatibleForAssignment(!postFilterConditionState.rightConditionValue.isCollection
|
|
42
|
+
? postFilterConditionState.rightConditionValue.type
|
|
43
|
+
: undefined, guaranteeNonNullable(postFilterConditionState.leftConditionValue.getColumnType()));
|
|
44
44
|
}
|
|
45
45
|
getDefaultFilterConditionValue(postFilterConditionState) {
|
|
46
|
-
const propertyType = postFilterConditionState.
|
|
46
|
+
const propertyType = postFilterConditionState.leftConditionValue.getColumnType();
|
|
47
47
|
switch (propertyType?.path) {
|
|
48
48
|
case PRIMITIVE_TYPE.NUMBER:
|
|
49
49
|
case PRIMITIVE_TYPE.DECIMAL:
|
|
@@ -65,10 +65,10 @@ export class QueryBuilderPostFilterOperator_GreaterThan extends QueryBuilderPost
|
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
buildPostFilterConditionExpression(postFilterConditionState) {
|
|
68
|
-
return buildPostFilterConditionExpression(postFilterConditionState, this, postFilterConditionState.
|
|
69
|
-
|
|
70
|
-
postFilterConditionState.
|
|
71
|
-
|
|
68
|
+
return buildPostFilterConditionExpression(postFilterConditionState, this, postFilterConditionState.leftConditionValue.getColumnType() ===
|
|
69
|
+
PrimitiveType.DATETIME &&
|
|
70
|
+
postFilterConditionState.rightConditionValue.type !==
|
|
71
|
+
PrimitiveType.DATETIME
|
|
72
72
|
? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_AFTER_DAY
|
|
73
73
|
: QUERY_BUILDER_SUPPORTED_FUNCTIONS.GREATER_THAN);
|
|
74
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderPostFilterOperator_GreaterThan.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAIL,0BAA0B,EAC1B,cAAc,
|
|
1
|
+
{"version":3,"file":"QueryBuilderPostFilterOperator_GreaterThan.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderPostFilterOperator_GreaterThanEqual.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThanEqual.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,
|
|
1
|
+
{"version":3,"file":"QueryBuilderPostFilterOperator_GreaterThanEqual.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThanEqual.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EAIxB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EACV,wBAAwB,EACxB,2BAA2B,EAC5B,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAAE,0CAA0C,EAAE,MAAM,iDAAiD,CAAC;AAK7G,qBAAa,+CAAgD,SAAQ,0CAA0C;IACpG,QAAQ,IAAI,MAAM;IAIlB,kCAAkC,CACzC,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB,GAAG,SAAS;IAaxB,6BAA6B,CACpC,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,kBAAkB,GAC7B,wBAAwB,GAAG,SAAS;IAevC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import { AbstractPropertyExpression, PRIMITIVE_TYPE, } from '@finos/legend-graph';
|
|
16
|
+
import { AbstractPropertyExpression, PRIMITIVE_TYPE, PrimitiveType, } from '@finos/legend-graph';
|
|
17
17
|
import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
|
|
18
18
|
import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
|
|
19
19
|
import { QueryBuilderPostFilterOperator_GreaterThan } from './QueryBuilderPostFilterOperator_GreaterThan.js';
|
|
@@ -25,10 +25,10 @@ export class QueryBuilderPostFilterOperator_GreaterThanEqual extends QueryBuilde
|
|
|
25
25
|
return '>=';
|
|
26
26
|
}
|
|
27
27
|
buildPostFilterConditionExpression(postFilterConditionState) {
|
|
28
|
-
return buildPostFilterConditionExpression(postFilterConditionState, this, postFilterConditionState.
|
|
29
|
-
|
|
30
|
-
postFilterConditionState.
|
|
31
|
-
|
|
28
|
+
return buildPostFilterConditionExpression(postFilterConditionState, this, postFilterConditionState.leftConditionValue.getColumnType() ===
|
|
29
|
+
PrimitiveType.DATETIME &&
|
|
30
|
+
postFilterConditionState.rightConditionValue.type !==
|
|
31
|
+
PrimitiveType.DATETIME
|
|
32
32
|
? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_AFTER_DAY
|
|
33
33
|
: QUERY_BUILDER_SUPPORTED_FUNCTIONS.GREATER_THAN_EQUAL);
|
|
34
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderPostFilterOperator_GreaterThanEqual.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThanEqual.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,0BAA0B,EAC1B,cAAc,
|
|
1
|
+
{"version":3,"file":"QueryBuilderPostFilterOperator_GreaterThanEqual.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThanEqual.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,0BAA0B,EAC1B,cAAc,EACd,aAAa,GACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,0CAA0C,CAAC;AAKzF,OAAO,EAAE,kCAAkC,EAAE,MAAM,8DAA8D,CAAC;AAClH,OAAO,EAAE,0CAA0C,EAAE,MAAM,iDAAiD,CAAC;AAC7G,OAAO,EAAE,iCAAiC,EAAE,MAAM,oDAAoD,CAAC;AACvG,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,kCAAkC,EAAE,MAAM,2CAA2C,CAAC;AAE/F,MAAM,OAAO,+CAAgD,SAAQ,0CAA0C;IACpG,QAAQ;QACf,OAAO,IAAI,CAAC;IACd,CAAC;IAEQ,kCAAkC,CACzC,wBAAkD;QAElD,OAAO,kCAAkC,CACvC,wBAAwB,EACxB,IAAI,EACJ,wBAAwB,CAAC,kBAAkB,CAAC,aAAa,EAAE;YACzD,aAAa,CAAC,QAAQ;YACtB,wBAAwB,CAAC,mBAAmB,CAAC,IAAI;gBAC/C,aAAa,CAAC,QAAQ;YACxB,CAAC,CAAC,iCAAiC,CAAC,kBAAkB;YACtD,CAAC,CAAC,iCAAiC,CAAC,kBAAkB,CACzD,CAAC;IACJ,CAAC;IAEQ,6BAA6B,CACpC,eAA4C,EAC5C,UAA8B;QAE9B,OAAO,6BAA6B,CAClC,eAAe,EACf,UAAU,EACV,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,YAAY,0BAA0B;YAClE,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO;iBAChE,IAAI,KAAK,cAAc,CAAC,QAAQ;YACnC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;gBAC7D,cAAc,CAAC,QAAQ;YACzB,CAAC,CAAC,iCAAiC,CAAC,kBAAkB;YACtD,CAAC,CAAC,iCAAiC,CAAC,kBAAkB,EACxD,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,uCAAuC;SAC3E,CAAC,CAAC;IACL,CAAC;CACF"}
|
package/lib/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_In.d.ts
CHANGED
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
import { type Type, type ValueSpecification, type SimpleFunctionExpression, type FunctionExpression } from '@finos/legend-graph';
|
|
17
17
|
import { type Hashable } from '@finos/legend-shared';
|
|
18
18
|
import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
|
|
19
|
-
import type
|
|
19
|
+
import { type PostFilterConditionState, type QueryBuilderPostFilterState } from '../QueryBuilderPostFilterState.js';
|
|
20
20
|
export declare class QueryBuilderPostFilterOperator_In extends QueryBuilderPostFilterOperator implements Hashable {
|
|
21
21
|
getLabel(): string;
|
|
22
22
|
isCompatibleWithType(type: Type): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryBuilderPostFilterOperator_In.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_In.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EAQxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,KAAK,QAAQ,EAEd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"QueryBuilderPostFilterOperator_In.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/tds/post-filter/operators/QueryBuilderPostFilterOperator_In.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EAQxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,KAAK,QAAQ,EAEd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,EAEL,KAAK,wBAAwB,EAC7B,KAAK,2BAA2B,EACjC,MAAM,mCAAmC,CAAC;AAU3C,qBAAa,iCACX,SAAQ,8BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAgBzC,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,OAAO;IAmDV,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB;IAUrB,kCAAkC,CAChC,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB,GAAG,SAAS;IAQjC,6BAA6B,CAC3B,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,kBAAkB,GAC7B,wBAAwB,GAAG,SAAS;IASvC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AAED,qBAAa,oCAAqC,SAAQ,iCAAiC;IAChF,QAAQ,IAAI,MAAM;IAIlB,kCAAkC,CACzC,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB,GAAG,SAAS;IAOxB,6BAA6B,CACpC,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,wBAAwB,GACnC,wBAAwB,GAAG,SAAS;IAOvC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}
|