npm - @finos/legend-query-builder - Versions diffs - 4.18.2 → 4.18.4 - Mend

@finos/legend-query-builder 4.18.2 → 4.18.4

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.

Files changed (113) hide show

package/lib/stores/filter/operators/QueryBuilderFilterOperator_EndWith.js CHANGED Viewed

@@ -26,8 +26,7 @@ export class QueryBuilderFilterOperator_EndWith extends QueryBuilderFilterOperat
         return 'ends with';
     }
     isCompatibleWithFilterConditionProperty(filterConditionState) {
-        return (getStandardPrimitiveTypeEquivalent(filterConditionState.propertyExpressionState.propertyExpression.func
-            .value.genericType.value.rawType) === PRIMITIVE_TYPE.STRING);
+        return (getStandardPrimitiveTypeEquivalent(filterConditionState.leftConditionType) === PRIMITIVE_TYPE.STRING);
     }
     isCompatibleWithFilterConditionValue(filterConditionState) {
         const type = filterConditionState.rightConditionValue &&
@@ -38,8 +37,7 @@ export class QueryBuilderFilterOperator_EndWith extends QueryBuilderFilterOperat
             getStandardPrimitiveTypeEquivalent(type) === PRIMITIVE_TYPE.STRING);
     }
     getDefaultFilterConditionValue(filterConditionState) {
-        const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType;
+        const propertyType = filterConditionState.leftConditionType;
         switch (propertyType.path) {
             case PRIMITIVE_TYPE.STRING: {
                 return buildDefaultInstanceValue(filterConditionState.filterState.queryBuilderState.graphManagerState

package/lib/stores/filter/operators/QueryBuilderFilterOperator_EndWith.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderFilterOperator_EndWith.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_EndWith.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EACL,cAAc,GAGf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,SAAS,EACT,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,yBAAyB,EACzB,8BAA8B,GAC/B,MAAM,0DAA0D,CAAC;AAClE,OAAO,EACL,kBAAkB,EAClB,kCAAkC,EAClC,mBAAmB,GACpB,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AACjG,OAAO,EAAE,kCAAkC,EAAE,MAAM,qCAAqC,CAAC;AACzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAC;AAE3F,MAAM,OAAO,kCACX,SAAQ,0BAA0B;IAGlC,QAAQ;QACN,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,uCAAuC,CACrC,oBAA0C;QAE1C,OAAO,CACL,kCAAkC,CAChC,oBAAoB,CAAC,~~uBAAuB~~,~~CAAC~~,~~kBAAkB,CAAC,IAAI;aACjE,~~KAAK,~~CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CACnC,KAAK,~~cAAc,CAAC,MAAM,CAC5B,CAAC;IACJ,CAAC;IAED,oCAAoC,CAClC,oBAA0C;QAE1C,MAAM,IAAI,GACR,oBAAoB,CAAC,mBAAmB;YACxC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,YAAY;YACpD,CAAC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,IAAI;YAC/C,CAAC,CAAC,SAAS,CAAC;QAChB,OAAO,CACL,IAAI,KAAK,SAAS;YAClB,kCAAkC,CAAC,IAAI,CAAC,KAAK,cAAc,CAAC,MAAM,CACnE,CAAC;IACJ,CAAC;IAED,8BAA8B,CAC5B,oBAA0C;QAE1C,MAAM,YAAY,~~GAChB~~,oBAAoB,CAAC,~~uBAAuB~~,CAAC~~,kBAAkB,CAAC,IAAI,CAAC,KAAK~~;~~aACvE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,~~QAAQ,YAAY,CAAC,IAAI,EAAE,CAAC;YAC1B,KAAK,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;gBAC3B,OAAO,yBAAyB,CAC9B,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,iBAAiB;qBACjE,KAAK,EACR,YAAY,EACZ,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,eAAe,EAClE,oBAAoB,CAAC,WAAW,CAAC,iBAAiB;qBAC/C,wDAAwD,CAC5D,CAAC;YACJ,CAAC;YACD;gBACE,MAAM,IAAI,yBAAyB,CACjC,gDAAgD,IAAI,CAAC,QAAQ,EAAE,uCAAuC,YAAY,CAAC,IAAI,GAAG,CAC3H,CAAC;QACN,CAAC;IACH,CAAC;IAED,8BAA8B,CAC5B,oBAA0C,EAC1C,mBAAwC;QAExC,OAAO,8BAA8B,CACnC,oBAAoB,EACpB,iCAAiC,CAAC,SAAS,EAC3C,mBAAmB,CACpB,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,WAAoC,EACpC,UAAoC;QAEpC,OAAO,yBAAyB,CAC9B,WAAW,EACX,UAAU,EACV,iCAAiC,CAAC,SAAS,EAC3C,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,wBAAwB;SAC5D,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,qCAAsC,SAAQ,kCAAkC;IAClF,QAAQ;QACf,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAEQ,8BAA8B,CACrC,oBAA0C,EAC1C,mBAAwC;QAExC,OAAO,kBAAkB,CACvB,KAAK,CAAC,8BAA8B,CAClC,oBAAoB,EACpB,mBAAmB,CACpB,CACF,CAAC;IACJ,CAAC;IAEQ,yBAAyB,CAChC,WAAoC,EACpC,UAAoC;QAEpC,MAAM,eAAe,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;QACxD,OAAO,eAAe;YACpB,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,WAAW,EAAE,eAAe,CAAC;YAC/D,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,4BAA4B;SAChE,CAAC,CAAC;IACL,CAAC;CACF"}
1	+ {"version":3,"file":"QueryBuilderFilterOperator_EndWith.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_EndWith.ts"],"names":[],"mappings":"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"}

package/lib/stores/filter/operators/QueryBuilderFilterOperator_Equal.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderFilterOperator_Equal.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_Equal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,~~EAI9B~~,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,sBAAsB,CAAC;~~AAehE~~,qBAAa,gCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;~~IAyBV~~,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;~~IAWV~~,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;~~IAcjC~~,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;~~IAarB~~,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAcnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AAED,qBAAa,mCAAoC,SAAQ,gCAAgC;IAC9E,QAAQ,IAAI,MAAM;IAIlB,8BAA8B,CACrC,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IASZ,yBAAyB,CAChC,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAOnC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}
1	+ {"version":3,"file":"QueryBuilderFilterOperator_Equal.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_Equal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAG9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,sBAAsB,CAAC;AAgBhE,qBAAa,gCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAuBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAUV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IAYjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IAYrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAcnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AAED,qBAAa,mCAAoC,SAAQ,gCAAgC;IAC9E,QAAQ,IAAI,MAAM;IAIlB,8BAA8B,CACrC,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IASZ,yBAAyB,CAChC,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAOnC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}

package/lib/stores/filter/operators/QueryBuilderFilterOperator_Equal.js CHANGED Viewed

@@ -16,7 +16,7 @@
 import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
 import { Enumeration, PRIMITIVE_TYPE, } from '@finos/legend-graph';
 import { hashArray } from '@finos/legend-shared';
-import { buildFilterConditionState, buildFilterConditionExpression, } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
+import { buildFilterConditionState, buildFilterConditionExpression, getFilterExpressionLeftSideTypePath, } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import { buildNotExpression, getStandardPrimitiveTypeEquivalent, isTypeCompatibleForAssignment, unwrapNotExpression, } from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
@@ -26,8 +26,7 @@ export class QueryBuilderFilterOperator_Equal extends QueryBuilderFilterOperator
         return 'is';
     }
     isCompatibleWithFilterConditionProperty(filterConditionState) {
-        const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType;
+        const propertyType = filterConditionState.leftConditionType;
         const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
         return ((normalizedType !== undefined &&
             [
@@ -48,27 +47,24 @@ export class QueryBuilderFilterOperator_Equal extends QueryBuilderFilterOperator
         return isTypeCompatibleForAssignment(filterConditionState.rightConditionValue &&
             !filterConditionState.rightConditionValue.isCollection
             ? filterConditionState.rightConditionValue.type
-            : undefined, filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType);
+            : undefined, filterConditionState.leftConditionType);
     }
     getDefaultFilterConditionValue(filterConditionState) {
-        const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType;
+        const propertyType = filterConditionState.leftConditionType;
         return buildDefaultInstanceValue(filterConditionState.filterState.queryBuilderState.graphManagerState
             .graph, propertyType, filterConditionState.filterState.queryBuilderState.observerContext, filterConditionState.filterState.queryBuilderState
             .INTERNAL__enableInitializingDefaultSimpleExpressionValue);
     }
     buildFilterConditionExpression(filterConditionState, lambdaParameterName) {
-        return buildFilterConditionExpression(filterConditionState, filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+        return buildFilterConditionExpression(filterConditionState, filterConditionState.leftConditionType.path === PRIMITIVE_TYPE.DATETIME &&
             filterConditionState.rightConditionValue?.type?.path !==
                 PRIMITIVE_TYPE.DATETIME
             ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_DAY
             : QUERY_BUILDER_SUPPORTED_FUNCTIONS.EQUAL, lambdaParameterName);
     }
     buildFilterConditionState(filterState, expression) {
-        return buildFilterConditionState(filterState, expression, expression.parametersValues[0].func.value
-            .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+        return buildFilterConditionState(filterState, expression, getFilterExpressionLeftSideTypePath(expression) ===
+            PRIMITIVE_TYPE.DATETIME &&
             expression.parametersValues[1]?.genericType?.value.rawType.path !==
                 PRIMITIVE_TYPE.DATETIME
             ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_DAY

package/lib/stores/filter/operators/QueryBuilderFilterOperator_Equal.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderFilterOperator_Equal.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_Equal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,~~EAIL~~,WAAW,EACX,cAAc,GACf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAiB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EACL,yBAAyB,EACzB,8BAA8B,~~GAC/B~~,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AACjG,OAAO,EACL,kBAAkB,EAClB,kCAAkC,EAClC,6BAA6B,EAC7B,mBAAmB,GACpB,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAAE,kCAAkC,EAAE,MAAM,qCAAqC,CAAC;AACzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAC;AAE3F,MAAM,OAAO,gCACX,SAAQ,0BAA0B;IAGlC,QAAQ;QACN,OAAO,IAAI,CAAC;IACd,CAAC;IAED,uCAAuC,CACrC,oBAA0C;QAE1C,MAAM,YAAY,~~GAChB~~,oBAAoB,CAAC,~~uBAAuB~~,CAAC~~,kBAAkB,CAAC,IAAI,CAAC,KAAK~~;~~aACvE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,~~MAAM,cAAc,GAAG,kCAAkC,CAAC,YAAY,CAAC,CAAC;QACxE,OAAO,CACL,CAAC,cAAc,KAAK,SAAS;YAEzB;gBACE,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,KAAK;gBACpB,cAAc,CAAC,IAAI;gBACnB,cAAc,CAAC,UAAU;gBACzB,cAAc,CAAC,QAAQ;aAE1B,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YAC7B,uEAAuE;YACvE,CAAC,YAAY,YAAY,WAAW,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CACxE,CAAC;IACJ,CAAC;IAED,oCAAoC,CAClC,oBAA0C;QAE1C,OAAO,6BAA6B,CAClC,oBAAoB,CAAC,mBAAmB;YACtC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,YAAY;YACtD,CAAC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,IAAI;YAC/C,CAAC,CAAC,SAAS,EACb,oBAAoB,CAAC,~~uBAAuB~~,~~CAAC~~,~~kBAAkB,~~CAAC~~,IAAI,CAAC,KAAK~~;~~aACvE,WAAW,CAAC,KAAK,CAAC,OAAO,CAC7B,CAAC;~~IACJ,CAAC;IAED,8BAA8B,CAC5B,oBAA0C;QAE1C,MAAM,YAAY,~~GAChB~~,oBAAoB,CAAC,~~uBAAuB~~,CAAC~~,kBAAkB,CAAC,IAAI,CAAC,KAAK~~;~~aACvE~~,~~WAAW,CAAC,KAAK,CAAC,~~OAAO,~~CAAC;QAC/B,OAAO,~~yBAAyB,CAC9B,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,iBAAiB;aACjE,KAAK,EACR,YAAY,EACZ,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,eAAe,EAClE,oBAAoB,CAAC,WAAW,CAAC,iBAAiB;aAC/C,wDAAwD,CAC5D,CAAC;IACJ,CAAC;IAED,8BAA8B,CAC5B,oBAA0C,EAC1C,mBAAwC;QAExC,OAAO,8BAA8B,CACnC,oBAAoB,EACpB,oBAAoB,CAAC,~~uBAAuB~~,CAAC,~~kBAAkB,CAAC,~~IAAI,~~CAAC,~~KAAK~~;aACvE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,~~cAAc,CAAC,QAAQ;~~YAC3D~~,oBAAoB,CAAC,mBAAmB,EAAE,IAAI,EAAE,IAAI;gBAClD,cAAc,CAAC,QAAQ;YACzB,CAAC,CAAC,iCAAiC,CAAC,SAAS;YAC7C,CAAC,CAAC,iCAAiC,CAAC,KAAK,EAC3C,mBAAmB,CACpB,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,WAAoC,EACpC,UAAoC;QAEpC,OAAO,yBAAyB,CAC9B,WAAW,EACX,UAAU,~~EACT~~,~~UAAU~~,CAAC,~~gBAAgB~~,CAAC~~,CAAC,CAAgC,CAAC,IAAI,CAAC,KAAK~~;~~aACtE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,~~cAAc,CAAC,QAAQ;~~YAC3D~~,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;gBAC7D,cAAc,CAAC,QAAQ;YACzB,CAAC,CAAC,iCAAiC,CAAC,SAAS;YAC7C,CAAC,CAAC,iCAAiC,CAAC,KAAK,EAC3C,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,qBAAqB;SACzD,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,mCAAoC,SAAQ,gCAAgC;IAC9E,QAAQ;QACf,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEQ,8BAA8B,CACrC,oBAA0C,EAC1C,mBAAwC;QAExC,OAAO,kBAAkB,CACvB,KAAK,CAAC,8BAA8B,CAClC,oBAAoB,EACpB,mBAAmB,CACpB,CACF,CAAC;IACJ,CAAC;IAEQ,yBAAyB,CAChC,WAAoC,EACpC,UAAoC;QAEpC,MAAM,eAAe,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;QACxD,OAAO,eAAe;YACpB,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,WAAW,EAAE,eAAe,CAAC;YAC/D,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,yBAAyB;SAC7D,CAAC,CAAC;IACL,CAAC;CACF"}
1	+ {"version":3,"file":"QueryBuilderFilterOperator_Equal.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_Equal.ts"],"names":[],"mappings":"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"}

package/lib/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderFilterOperator_GreaterThan.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,~~EAG9B~~,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;~~AAa9B~~,qBAAa,sCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;~~IAqBV~~,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;~~IAWV~~,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;~~IA4BjC~~,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;~~IAarB~~,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAcnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF"}
1	+ {"version":3,"file":"QueryBuilderFilterOperator_GreaterThan.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAE9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAc9B,qBAAa,sCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAmBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAUV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IA0BjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IAYrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAcnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF"}

package/lib/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.js CHANGED Viewed

@@ -16,7 +16,7 @@
 import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
 import { PRIMITIVE_TYPE, } from '@finos/legend-graph';
 import { UnsupportedOperationError, hashArray, } from '@finos/legend-shared';
-import { buildFilterConditionState, buildFilterConditionExpression, } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
+import { buildFilterConditionState, buildFilterConditionExpression, getFilterExpressionLeftSideTypePath, } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import { getStandardPrimitiveTypeEquivalent, isTypeCompatibleForAssignment, } from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
@@ -26,8 +26,7 @@ export class QueryBuilderFilterOperator_GreaterThan extends QueryBuilderFilterOp
         return '>';
     }
     isCompatibleWithFilterConditionProperty(filterConditionState) {
-        const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType;
+        const propertyType = filterConditionState.leftConditionType;
         const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
         return (normalizedType !== undefined &&
             [
@@ -44,12 +43,10 @@ export class QueryBuilderFilterOperator_GreaterThan extends QueryBuilderFilterOp
         return isTypeCompatibleForAssignment(filterConditionState.rightConditionValue &&
             !filterConditionState.rightConditionValue.isCollection
             ? filterConditionState.rightConditionValue.type
-            : undefined, filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType);
+            : undefined, filterConditionState.leftConditionType);
     }
     getDefaultFilterConditionValue(filterConditionState) {
-        const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType;
+        const propertyType = filterConditionState.leftConditionType;
         switch (propertyType.path) {
             case PRIMITIVE_TYPE.NUMBER:
             case PRIMITIVE_TYPE.DECIMAL:
@@ -67,16 +64,15 @@ export class QueryBuilderFilterOperator_GreaterThan extends QueryBuilderFilterOp
         }
     }
     buildFilterConditionExpression(filterConditionState, lambdaParameterName) {
-        return buildFilterConditionExpression(filterConditionState, filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+        return buildFilterConditionExpression(filterConditionState, filterConditionState.leftConditionType.path === PRIMITIVE_TYPE.DATETIME &&
             filterConditionState.rightConditionValue?.type?.path !==
                 PRIMITIVE_TYPE.DATETIME
             ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_AFTER_DAY
             : QUERY_BUILDER_SUPPORTED_FUNCTIONS.GREATER_THAN, lambdaParameterName);
     }
     buildFilterConditionState(filterState, expression) {
-        return buildFilterConditionState(filterState, expression, expression.parametersValues[0].func.value
-            .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+        return buildFilterConditionState(filterState, expression, getFilterExpressionLeftSideTypePath(expression) ===
+            PRIMITIVE_TYPE.DATETIME &&
             expression.parametersValues[1]?.genericType?.value.rawType.path !==
                 PRIMITIVE_TYPE.DATETIME
             ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_AFTER_DAY

package/lib/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderFilterOperator_GreaterThan.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,~~EAIL~~,cAAc,GACf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,yBAAyB,EACzB,SAAS,GACV,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,yBAAyB,EACzB,8BAA8B,~~GAC/B~~,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AACjG,OAAO,EACL,kCAAkC,EAClC,6BAA6B,GAC9B,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAAE,kCAAkC,EAAE,MAAM,qCAAqC,CAAC;AACzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAC;AAE3F,MAAM,OAAO,sCACX,SAAQ,0BAA0B;IAGlC,QAAQ;QACN,OAAO,GAAG,CAAC;IACb,CAAC;IAED,uCAAuC,CACrC,oBAA0C;QAE1C,MAAM,YAAY,~~GAChB~~,oBAAoB,CAAC,~~uBAAuB~~,CAAC~~,kBAAkB,CAAC,IAAI,CAAC,KAAK~~;~~aACvE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,~~MAAM,cAAc,GAAG,kCAAkC,CAAC,YAAY,CAAC,CAAC;QACxE,OAAO,CACL,cAAc,KAAK,SAAS;YAE1B;gBACE,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,KAAK;gBACpB,cAAc,CAAC,IAAI;gBACnB,cAAc,CAAC,UAAU;gBACzB,cAAc,CAAC,QAAQ;aAE1B,CAAC,QAAQ,CAAC,cAAc,CAAC,CAC3B,CAAC;IACJ,CAAC;IAED,oCAAoC,CAClC,oBAA0C;QAE1C,OAAO,6BAA6B,CAClC,oBAAoB,CAAC,mBAAmB;YACtC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,YAAY;YACtD,CAAC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,IAAI;YAC/C,CAAC,CAAC,SAAS,EACb,oBAAoB,CAAC,~~uBAAuB~~,~~CAAC~~,~~kBAAkB,~~CAAC~~,IAAI,CAAC,KAAK~~;~~aACvE,WAAW,CAAC,KAAK,CAAC,OAAO,CAC7B,CAAC;~~IACJ,CAAC;IAED,8BAA8B,CAC5B,oBAA0C;QAE1C,MAAM,YAAY,~~GAChB~~,oBAAoB,CAAC,~~uBAAuB~~,CAAC~~,kBAAkB,CAAC,IAAI,CAAC,KAAK~~;~~aACvE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,~~QAAQ,YAAY,CAAC,IAAI,EAAE,CAAC;YAC1B,KAAK,cAAc,CAAC,MAAM,CAAC;YAC3B,KAAK,cAAc,CAAC,OAAO,CAAC;YAC5B,KAAK,cAAc,CAAC,KAAK,CAAC;YAC1B,KAAK,cAAc,CAAC,OAAO,CAAC;YAC5B,KAAK,cAAc,CAAC,UAAU,CAAC;YAC/B,KAAK,cAAc,CAAC,QAAQ,CAAC;YAC7B,KAAK,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;gBACzB,OAAO,yBAAyB,CAC9B,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,iBAAiB;qBACjE,KAAK,EACR,YAAY,EACZ,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,eAAe,EAClE,oBAAoB,CAAC,WAAW,CAAC,iBAAiB;qBAC/C,wDAAwD,CAC5D,CAAC;YACJ,CAAC;YACD;gBACE,MAAM,IAAI,yBAAyB,CACjC,gDAAgD,IAAI,CAAC,QAAQ,EAAE,uCAAuC,YAAY,CAAC,IAAI,GAAG,CAC3H,CAAC;QACN,CAAC;IACH,CAAC;IAED,8BAA8B,CAC5B,oBAA0C,EAC1C,mBAAwC;QAExC,OAAO,8BAA8B,CACnC,oBAAoB,EACpB,oBAAoB,CAAC,~~uBAAuB~~,CAAC,~~kBAAkB,CAAC,~~IAAI,~~CAAC,~~KAAK~~;aACvE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,~~cAAc,CAAC,QAAQ;~~YAC3D~~,oBAAoB,CAAC,mBAAmB,EAAE,IAAI,EAAE,IAAI;gBAClD,cAAc,CAAC,QAAQ;YACzB,CAAC,CAAC,iCAAiC,CAAC,YAAY;YAChD,CAAC,CAAC,iCAAiC,CAAC,YAAY,EAClD,mBAAmB,CACpB,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,WAAoC,EACpC,UAAoC;QAEpC,OAAO,yBAAyB,CAC9B,WAAW,EACX,UAAU,~~EACT~~,~~UAAU~~,CAAC,~~gBAAgB~~,CAAC~~,CAAC,CAAgC,CAAC,IAAI,CAAC,KAAK~~;~~aACtE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,~~cAAc,CAAC,QAAQ;~~YAC3D~~,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;gBAC7D,cAAc,CAAC,QAAQ;YACzB,CAAC,CAAC,iCAAiC,CAAC,YAAY;YAChD,CAAC,CAAC,iCAAiC,CAAC,YAAY,EAClD,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,4BAA4B;SAChE,CAAC,CAAC;IACL,CAAC;CACF"}
1	+ {"version":3,"file":"QueryBuilderFilterOperator_GreaterThan.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.ts"],"names":[],"mappings":"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"}

package/lib/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderFilterOperator_GreaterThanEqual.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,~~EAE9B~~,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;~~AAa9B~~,qBAAa,2CACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;~~IAqBV~~,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;~~IAWV~~,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;~~IA4BjC~~,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;~~IAarB~~,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAcnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF"}
1	+ {"version":3,"file":"QueryBuilderFilterOperator_GreaterThanEqual.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAc9B,qBAAa,2CACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAmBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAUV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IA0BjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IAYrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAcnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF"}

package/lib/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.js CHANGED Viewed

@@ -16,7 +16,7 @@
 import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
 import { PRIMITIVE_TYPE, } from '@finos/legend-graph';
 import { UnsupportedOperationError, hashArray, } from '@finos/legend-shared';
-import { buildFilterConditionState, buildFilterConditionExpression, } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
+import { buildFilterConditionState, buildFilterConditionExpression, getFilterExpressionLeftSideTypePath, } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import { getStandardPrimitiveTypeEquivalent, isTypeCompatibleForAssignment, } from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
@@ -26,8 +26,7 @@ export class QueryBuilderFilterOperator_GreaterThanEqual extends QueryBuilderFil
         return '>=';
     }
     isCompatibleWithFilterConditionProperty(filterConditionState) {
-        const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType;
+        const propertyType = filterConditionState.leftConditionType;
         const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
         return (normalizedType !== undefined &&
             [
@@ -44,12 +43,10 @@ export class QueryBuilderFilterOperator_GreaterThanEqual extends QueryBuilderFil
         return isTypeCompatibleForAssignment(filterConditionState.rightConditionValue &&
             !filterConditionState.rightConditionValue.isCollection
             ? filterConditionState.rightConditionValue.type
-            : undefined, filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType);
+            : undefined, filterConditionState.leftConditionType);
     }
     getDefaultFilterConditionValue(filterConditionState) {
-        const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType;
+        const propertyType = filterConditionState.leftConditionType;
         switch (propertyType.path) {
             case PRIMITIVE_TYPE.NUMBER:
             case PRIMITIVE_TYPE.DECIMAL:
@@ -67,16 +64,15 @@ export class QueryBuilderFilterOperator_GreaterThanEqual extends QueryBuilderFil
         }
     }
     buildFilterConditionExpression(filterConditionState, lambdaParameterName) {
-        return buildFilterConditionExpression(filterConditionState, filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+        return buildFilterConditionExpression(filterConditionState, filterConditionState.leftConditionType.path === PRIMITIVE_TYPE.DATETIME &&
             filterConditionState.rightConditionValue?.type?.path !==
                 PRIMITIVE_TYPE.DATETIME
             ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_AFTER_DAY
             : QUERY_BUILDER_SUPPORTED_FUNCTIONS.GREATER_THAN_EQUAL, lambdaParameterName);
     }
     buildFilterConditionState(filterState, expression) {
-        return buildFilterConditionState(filterState, expression, expression.parametersValues[0].func.value
-            .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+        return buildFilterConditionState(filterState, expression, getFilterExpressionLeftSideTypePath(expression) ===
+            PRIMITIVE_TYPE.DATETIME &&
             expression.parametersValues[1]?.genericType?.value.rawType.path !==
                 PRIMITIVE_TYPE.DATETIME
             ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_AFTER_DAY

package/lib/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderFilterOperator_GreaterThanEqual.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EACL,cAAc,~~GAIf~~,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,yBAAyB,EACzB,SAAS,GACV,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,yBAAyB,EACzB,8BAA8B,~~GAC/B~~,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AACjG,OAAO,EACL,kCAAkC,EAClC,6BAA6B,GAC9B,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAAE,kCAAkC,EAAE,MAAM,qCAAqC,CAAC;AACzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAC;AAE3F,MAAM,OAAO,2CACX,SAAQ,0BAA0B;IAGlC,QAAQ;QACN,OAAO,IAAI,CAAC;IACd,CAAC;IAED,uCAAuC,CACrC,oBAA0C;QAE1C,MAAM,YAAY,~~GAChB~~,oBAAoB,CAAC,~~uBAAuB~~,CAAC~~,kBAAkB,CAAC,IAAI,CAAC,KAAK~~;~~aACvE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,~~MAAM,cAAc,GAAG,kCAAkC,CAAC,YAAY,CAAC,CAAC;QACxE,OAAO,CACL,cAAc,KAAK,SAAS;YAE1B;gBACE,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,KAAK;gBACpB,cAAc,CAAC,IAAI;gBACnB,cAAc,CAAC,UAAU;gBACzB,cAAc,CAAC,QAAQ;aAE1B,CAAC,QAAQ,CAAC,cAAc,CAAC,CAC3B,CAAC;IACJ,CAAC;IAED,oCAAoC,CAClC,oBAA0C;QAE1C,OAAO,6BAA6B,CAClC,oBAAoB,CAAC,mBAAmB;YACtC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,YAAY;YACtD,CAAC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,IAAI;YAC/C,CAAC,CAAC,SAAS,EACb,oBAAoB,CAAC,~~uBAAuB~~,~~CAAC~~,~~kBAAkB,~~CAAC~~,IAAI,CAAC,KAAK~~;~~aACvE,WAAW,CAAC,KAAK,CAAC,OAAO,CAC7B,CAAC;~~IACJ,CAAC;IAED,8BAA8B,CAC5B,oBAA0C;QAE1C,MAAM,YAAY,~~GAChB~~,oBAAoB,CAAC,~~uBAAuB~~,CAAC~~,kBAAkB,CAAC,IAAI,CAAC,KAAK~~;~~aACvE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,~~QAAQ,YAAY,CAAC,IAAI,EAAE,CAAC;YAC1B,KAAK,cAAc,CAAC,MAAM,CAAC;YAC3B,KAAK,cAAc,CAAC,OAAO,CAAC;YAC5B,KAAK,cAAc,CAAC,KAAK,CAAC;YAC1B,KAAK,cAAc,CAAC,OAAO,CAAC;YAC5B,KAAK,cAAc,CAAC,UAAU,CAAC;YAC/B,KAAK,cAAc,CAAC,QAAQ,CAAC;YAC7B,KAAK,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;gBACzB,OAAO,yBAAyB,CAC9B,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,iBAAiB;qBACjE,KAAK,EACR,YAAY,EACZ,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,eAAe,EAClE,oBAAoB,CAAC,WAAW,CAAC,iBAAiB;qBAC/C,wDAAwD,CAC5D,CAAC;YACJ,CAAC;YACD;gBACE,MAAM,IAAI,yBAAyB,CACjC,gDAAgD,IAAI,CAAC,QAAQ,EAAE,uCAAuC,YAAY,CAAC,IAAI,GAAG,CAC3H,CAAC;QACN,CAAC;IACH,CAAC;IAED,8BAA8B,CAC5B,oBAA0C,EAC1C,mBAAwC;QAExC,OAAO,8BAA8B,CACnC,oBAAoB,EACpB,oBAAoB,CAAC,~~uBAAuB~~,CAAC,~~kBAAkB,CAAC,~~IAAI,~~CAAC,~~KAAK~~;aACvE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,~~cAAc,CAAC,QAAQ;~~YAC3D~~,oBAAoB,CAAC,mBAAmB,EAAE,IAAI,EAAE,IAAI;gBAClD,cAAc,CAAC,QAAQ;YACzB,CAAC,CAAC,iCAAiC,CAAC,kBAAkB;YACtD,CAAC,CAAC,iCAAiC,CAAC,kBAAkB,EACxD,mBAAmB,CACpB,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,WAAoC,EACpC,UAAoC;QAEpC,OAAO,yBAAyB,CAC9B,WAAW,EACX,UAAU,~~EACT~~,~~UAAU~~,CAAC,~~gBAAgB~~,CAAC~~,CAAC,CAAgC,CAAC,IAAI,CAAC,KAAK~~;~~aACtE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,~~cAAc,CAAC,QAAQ;~~YAC3D~~,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,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,kCAAkC;SACtE,CAAC,CAAC;IACL,CAAC;CACF"}
1	+ {"version":3,"file":"QueryBuilderFilterOperator_GreaterThanEqual.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.ts"],"names":[],"mappings":"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"}

package/lib/stores/filter/operators/QueryBuilderFilterOperator_In.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderFilterOperator_In.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_In.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,oBAAoB,EAE1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAQ9B,MAAM,qBAAqB,CAAC;AAY7B,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,sBAAsB,CAAC;AAGhE,qBAAa,6BACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;~~IAwBV~~,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;~~IA+DV~~,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;~~IAUjC~~,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IAQrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IASnC,IAAI,QAAQ,IAAI,MAAM,CAErB;CACF;AAED,qBAAa,gCAAiC,SAAQ,6BAA6B;IACxE,QAAQ,IAAI,MAAM;IAIlB,8BAA8B,CACrC,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IASZ,yBAAyB,CAChC,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAOnC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}
1	+ {"version":3,"file":"QueryBuilderFilterOperator_In.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_In.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,oBAAoB,EAE1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAQ9B,MAAM,qBAAqB,CAAC;AAY7B,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,sBAAsB,CAAC;AAGhE,qBAAa,6BACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAsBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IA6DV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IAQjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IAQrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IASnC,IAAI,QAAQ,IAAI,MAAM,CAErB;CACF;AAED,qBAAa,gCAAiC,SAAQ,6BAA6B;IACxE,QAAQ,IAAI,MAAM;IAIlB,8BAA8B,CACrC,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IASZ,yBAAyB,CAChC,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAOnC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}

package/lib/stores/filter/operators/QueryBuilderFilterOperator_In.js CHANGED Viewed

@@ -26,8 +26,7 @@ export class QueryBuilderFilterOperator_In extends QueryBuilderFilterOperator {
         return 'is in list of';
     }
     isCompatibleWithFilterConditionProperty(filterConditionState) {
-        const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType;
+        const propertyType = filterConditionState.leftConditionType;
         const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
         return ((normalizedType !== undefined &&
             [
@@ -44,8 +43,7 @@ export class QueryBuilderFilterOperator_In extends QueryBuilderFilterOperator {
             propertyType instanceof Enumeration);
     }
     isCompatibleWithFilterConditionValue(filterConditionState) {
-        const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType;
+        const propertyType = filterConditionState.leftConditionType;
         const rightSide = filterConditionState.rightConditionValue;
         // `in`/`not in` does not support right hand value being column state as the multipliticy for columns are [0..1]
         if (rightSide instanceof FilterValueSpecConditionValueState) {
@@ -93,8 +91,7 @@ export class QueryBuilderFilterOperator_In extends QueryBuilderFilterOperator {
         return false;
     }
     getDefaultFilterConditionValue(filterConditionState) {
-        const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType;
+        const propertyType = filterConditionState.leftConditionType;
         return new CollectionInstanceValue(Multiplicity.ONE, GenericTypeExplicitReference.create(new GenericType(propertyType)));
     }
     buildFilterConditionExpression(filterConditionState, lambdaParameterName) {

package/lib/stores/filter/operators/QueryBuilderFilterOperator_In.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderFilterOperator_In.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_In.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,kCAAkC,GACnC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAGL,kBAAkB,EAClB,uBAAuB,EACvB,4BAA4B,EAC5B,WAAW,EACX,WAAW,EACX,cAAc,EACd,YAAY,GACb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,yBAAyB,EACzB,8BAA8B,GAC/B,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AACjG,OAAO,EACL,kBAAkB,EAClB,mCAAmC,EACnC,kCAAkC,EAClC,mBAAmB,GACpB,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAAiB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,kCAAkC,EAAE,MAAM,qCAAqC,CAAC;AAEzF,MAAM,OAAO,6BACX,SAAQ,0BAA0B;IAGlC,QAAQ;QACN,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,uCAAuC,CACrC,oBAA0C;QAE1C,MAAM,YAAY,~~GAChB~~,oBAAoB,CAAC,~~uBAAuB~~,CAAC~~,kBAAkB,CAAC,IAAI,CAAC,KAAK~~;~~aACvE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,~~MAAM,cAAc,GAAG,kCAAkC,CAAC,YAAY,CAAC,CAAC;QACxE,OAAO,CACL,CAAC,cAAc,KAAK,SAAS;YAEzB;gBACE,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,KAAK;gBACpB,cAAc,CAAC,IAAI;gBACnB,cAAc,CAAC,UAAU;gBACzB,cAAc,CAAC,QAAQ;aAE1B,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YAC7B,6FAA6F;YAC7F,YAAY,YAAY,WAAW,CACpC,CAAC;IACJ,CAAC;IAED,oCAAoC,CAClC,oBAA0C;QAE1C,MAAM,YAAY,~~GAChB~~,oBAAoB,CAAC,~~uBAAuB~~,CAAC~~,kBAAkB,CAAC,IAAI,CAAC,KAAK~~;~~aACvE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,~~MAAM,SAAS,GAAG,oBAAoB,CAAC,mBAAmB,CAAC;QAC3D,gHAAgH;QAChH,IAAI,SAAS,YAAY,kCAAkC,EAAE,CAAC;YAC5D,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC;YAClC,IAAI,SAAS,YAAY,uBAAuB,EAAE,CAAC;gBACjD,IAAI,SAAS,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAClC,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,MAAM,cAAc,GAAG,mCAAmC,CACxD,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,iBAAiB;qBACjE,KAAK,EACR,SAAS,CAAC,MAAM,CACjB,CAAC;gBACF,IAAI,CAAC,cAAc,EAAE,CAAC;oBACpB,OAAO,KAAK,CAAC;gBACf,CAAC;gBACD,IAEI;oBACE,cAAc,CAAC,MAAM;oBACrB,cAAc,CAAC,OAAO;oBACtB,cAAc,CAAC,OAAO;oBACtB,cAAc,CAAC,KAAK;oBACpB,cAAc,CAAC,IAAI;oBACnB,cAAc,CAAC,UAAU;oBACzB,cAAc,CAAC,QAAQ;iBAE1B,CAAC,QAAQ,CACR,kCAAkC,CAAC,YAAY,CAAC;oBAC9C,YAAY,CAAC,IAAI,CACpB,EACD,CAAC;oBACD,OACE;wBACE,cAAc,CAAC,MAAM;wBACrB,cAAc,CAAC,OAAO;wBACtB,cAAc,CAAC,OAAO;wBACtB,cAAc,CAAC,KAAK;wBACpB,cAAc,CAAC,IAAI;wBACnB,cAAc,CAAC,UAAU;wBACzB,cAAc,CAAC,QAAQ;qBAE1B,CAAC,QAAQ,CACR,kCAAkC,CAAC,cAAc,CAAC;wBAChD,cAAc,CAAC,IAAI,CACtB,CAAC;gBACJ,CAAC;gBACD,OAAO,cAAc,KAAK,YAAY,CAAC;YACzC,CAAC;iBAAM,IAAI,SAAS,YAAY,kBAAkB,EAAE,CAAC;gBACnD,8BAA8B;gBAC9B,IAAI,SAAS,CAAC,YAAY,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;oBAC5C,OAAO,KAAK,CAAC;gBACf,CAAC;gBACD,OAAO,YAAY,KAAK,SAAS,CAAC,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC;YAC/D,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,8BAA8B,CAC5B,oBAA0C;QAE1C,MAAM,YAAY,~~GAChB~~,oBAAoB,CAAC,~~uBAAuB~~,CAAC~~,kBAAkB,CAAC,IAAI,CAAC,KAAK~~;~~aACvE~~,~~WAAW,CAAC,KAAK,CAAC,~~OAAO,~~CAAC;QAC/B,OAAO,~~IAAI,uBAAuB,CAChC,YAAY,CAAC,GAAG,EAChB,4BAA4B,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,YAAY,CAAC,CAAC,CACnE,CAAC;IACJ,CAAC;IAED,8BAA8B,CAC5B,oBAA0C,EAC1C,mBAAwC;QAExC,OAAO,8BAA8B,CACnC,oBAAoB,EACpB,iCAAiC,CAAC,EAAE,EACpC,mBAAmB,CACpB,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,WAAoC,EACpC,UAAoC;QAEpC,OAAO,yBAAyB,CAC9B,WAAW,EACX,UAAU,EACV,iCAAiC,CAAC,EAAE,EACpC,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC,CAAC,kCAAkC,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAC5E,CAAC;CACF;AAED,MAAM,OAAO,gCAAiC,SAAQ,6BAA6B;IACxE,QAAQ;QACf,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAEQ,8BAA8B,CACrC,oBAA0C,EAC1C,mBAAwC;QAExC,OAAO,kBAAkB,CACvB,KAAK,CAAC,8BAA8B,CAClC,oBAAoB,EACpB,mBAAmB,CACpB,CACF,CAAC;IACJ,CAAC;IAEQ,yBAAyB,CAChC,WAAoC,EACpC,UAAoC;QAEpC,MAAM,eAAe,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;QACxD,OAAO,eAAe;YACpB,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,WAAW,EAAE,eAAe,CAAC;YAC/D,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,sBAAsB;SAC1D,CAAC,CAAC;IACL,CAAC;CACF"}
1	+ {"version":3,"file":"QueryBuilderFilterOperator_In.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_In.ts"],"names":[],"mappings":"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"}

package/lib/stores/filter/operators/QueryBuilderFilterOperator_IsEmpty.d.ts CHANGED Viewed

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { QueryBuilderFilterState, FilterConditionState } from '../QueryBuilderFilterState.js';
+import { type QueryBuilderFilterState, type FilterConditionState } from '../QueryBuilderFilterState.js';
 import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
 import { type ValueSpecification, type SimpleFunctionExpression } from '@finos/legend-graph';
 import { type Hashable } from '@finos/legend-shared';

package/lib/stores/filter/operators/QueryBuilderFilterOperator_IsEmpty.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderFilterOperator_IsEmpty.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_IsEmpty.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,~~EACV,~~uBAAuB,~~EACvB~~,oBAAoB,~~EACrB~~,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAI9B,MAAM,qBAAqB,CAAC;AAW7B,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,sBAAsB,CAAC;AAGhE,qBAAa,kCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;~~IAmBV~~,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAIV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IAIjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IAQrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAUnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AAED,qBAAa,qCAAsC,SAAQ,kCAAkC;IAClF,QAAQ,IAAI,MAAM;IAIlB,8BAA8B,CACrC,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IASZ,yBAAyB,CAChC,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAOnC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}
1	+ {"version":3,"file":"QueryBuilderFilterOperator_IsEmpty.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_IsEmpty.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,oBAAoB,EAE1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAI9B,MAAM,qBAAqB,CAAC;AAW7B,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,sBAAsB,CAAC;AAGhE,qBAAa,kCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAqBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAIV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IAIjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IAQrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAUnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AAED,qBAAa,qCAAsC,SAAQ,kCAAkC;IAClF,QAAQ,IAAI,MAAM;IAIlB,8BAA8B,CACrC,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IASZ,yBAAyB,CAChC,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAOnC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}

package/lib/stores/filter/operators/QueryBuilderFilterOperator_IsEmpty.js CHANGED Viewed

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { FilterPropertyExpressionSourceState, } from '../QueryBuilderFilterState.js';
 import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
 import { Enumeration, PrimitiveType, PrecisePrimitiveType, } from '@finos/legend-graph';
 import { buildFilterConditionState, buildFilterConditionExpression, } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
@@ -25,10 +26,11 @@ export class QueryBuilderFilterOperator_IsEmpty extends QueryBuilderFilterOperat
         return 'is empty';
     }
     isCompatibleWithFilterConditionProperty(filterConditionState) {
-        const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType;
+        const propertyType = filterConditionState.leftConditionType;
         // First check if property is optional
-        if (!isPropertyExpressionChainOptional(filterConditionState.propertyExpressionState.propertyExpression)) {
+        if (!(filterConditionState.sourceState instanceof
+            FilterPropertyExpressionSourceState) ||
+            !isPropertyExpressionChainOptional(filterConditionState.propertyExpressionState.propertyExpression)) {
             return false;
         }
         return (propertyType instanceof Enumeration ||

package/lib/stores/filter/operators/QueryBuilderFilterOperator_IsEmpty.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderFilterOperator_IsEmpty.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_IsEmpty.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;~~AAMH~~,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAGL,WAAW,EACX,aAAa,EACb,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,yBAAyB,EACzB,8BAA8B,GAC/B,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AACjG,OAAO,EACL,kBAAkB,EAClB,iCAAiC,EACjC,mBAAmB,GACpB,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAAiB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,kCAAkC,EAAE,MAAM,qCAAqC,CAAC;AAEzF,MAAM,OAAO,kCACX,SAAQ,0BAA0B;IAGlC,QAAQ;QACN,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,uCAAuC,CACrC,oBAA0C;QAE1C,MAAM,YAAY,~~GAChB~~,oBAAoB,CAAC,~~uBAAuB~~,CAAC,~~kBAAkB~~,~~CAAC~~,~~IAAI,~~CAAC,~~KAAK;aACvE~~,~~WAAW~~,CAAC,~~KAAK~~,~~CAAC~~,~~OAAO,CAAC~~;~~QAC/B~~,~~sCAAsC;QACtC,IACE,~~CAAC,iCAAiC,CAChC,oBAAoB,CAAC,uBAAuB,CAAC,kBAAkB,CAChE,EACD,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,CACL,YAAY,YAAY,WAAW;YACnC,YAAY,YAAY,aAAa;YACrC,YAAY,YAAY,oBAAoB,CAC7C,CAAC;IACJ,CAAC;IAED,oCAAoC,CAClC,oBAA0C;QAE1C,OAAO,oBAAoB,CAAC,mBAAmB,KAAK,SAAS,CAAC;IAChE,CAAC;IAED,8BAA8B,CAC5B,oBAA0C;QAE1C,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,8BAA8B,CAC5B,oBAA0C,EAC1C,mBAAwC;QAExC,OAAO,8BAA8B,CACnC,oBAAoB,EACpB,iCAAiC,CAAC,QAAQ,EAC1C,mBAAmB,CACpB,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,WAAoC,EACpC,UAAoC;QAEpC,OAAO,yBAAyB,CAC9B,WAAW,EACX,UAAU,EACV,iCAAiC,CAAC,QAAQ,EAC1C,IAAI,EACJ,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,wBAAwB;SAC5D,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,qCAAsC,SAAQ,kCAAkC;IAClF,QAAQ;QACf,OAAO,cAAc,CAAC;IACxB,CAAC;IAEQ,8BAA8B,CACrC,oBAA0C,EAC1C,mBAAwC;QAExC,OAAO,kBAAkB,CACvB,KAAK,CAAC,8BAA8B,CAClC,oBAAoB,EACpB,mBAAmB,CACpB,CACF,CAAC;IACJ,CAAC;IAEQ,yBAAyB,CAChC,WAAoC,EACpC,UAAoC;QAEpC,MAAM,eAAe,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;QACxD,OAAO,eAAe;YACpB,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,WAAW,EAAE,eAAe,CAAC;YAC/D,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,4BAA4B;SAChE,CAAC,CAAC;IACL,CAAC;CACF"}
1	+ {"version":3,"file":"QueryBuilderFilterOperator_IsEmpty.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_IsEmpty.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,mCAAmC,GACpC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAGL,WAAW,EACX,aAAa,EACb,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,yBAAyB,EACzB,8BAA8B,GAC/B,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AACjG,OAAO,EACL,kBAAkB,EAClB,iCAAiC,EACjC,mBAAmB,GACpB,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAAiB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,kCAAkC,EAAE,MAAM,qCAAqC,CAAC;AAEzF,MAAM,OAAO,kCACX,SAAQ,0BAA0B;IAGlC,QAAQ;QACN,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,uCAAuC,CACrC,oBAA0C;QAE1C,MAAM,YAAY,GAAG,oBAAoB,CAAC,iBAAiB,CAAC;QAC5D,sCAAsC;QACtC,IACE,CAAC,CACC,oBAAoB,CAAC,WAAW;YAChC,mCAAmC,CACpC;YACD,CAAC,iCAAiC,CAChC,oBAAoB,CAAC,uBAAuB,CAAC,kBAAkB,CAChE,EACD,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,CACL,YAAY,YAAY,WAAW;YACnC,YAAY,YAAY,aAAa;YACrC,YAAY,YAAY,oBAAoB,CAC7C,CAAC;IACJ,CAAC;IAED,oCAAoC,CAClC,oBAA0C;QAE1C,OAAO,oBAAoB,CAAC,mBAAmB,KAAK,SAAS,CAAC;IAChE,CAAC;IAED,8BAA8B,CAC5B,oBAA0C;QAE1C,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,8BAA8B,CAC5B,oBAA0C,EAC1C,mBAAwC;QAExC,OAAO,8BAA8B,CACnC,oBAAoB,EACpB,iCAAiC,CAAC,QAAQ,EAC1C,mBAAmB,CACpB,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,WAAoC,EACpC,UAAoC;QAEpC,OAAO,yBAAyB,CAC9B,WAAW,EACX,UAAU,EACV,iCAAiC,CAAC,QAAQ,EAC1C,IAAI,EACJ,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,wBAAwB;SAC5D,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,qCAAsC,SAAQ,kCAAkC;IAClF,QAAQ;QACf,OAAO,cAAc,CAAC;IACxB,CAAC;IAEQ,8BAA8B,CACrC,oBAA0C,EAC1C,mBAAwC;QAExC,OAAO,kBAAkB,CACvB,KAAK,CAAC,8BAA8B,CAClC,oBAAoB,EACpB,mBAAmB,CACpB,CACF,CAAC;IACJ,CAAC;IAEQ,yBAAyB,CAChC,WAAoC,EACpC,UAAoC;QAEpC,MAAM,eAAe,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;QACxD,OAAO,eAAe;YACpB,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,WAAW,EAAE,eAAe,CAAC;YAC/D,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAED,IAAa,QAAQ;QACnB,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,4BAA4B;SAChE,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/stores/filter/operators/QueryBuilderFilterOperator_LessThan.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderFilterOperator_LessThan.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_LessThan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,~~EAE9B~~,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;~~AAa9B~~,qBAAa,mCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;~~IAqBV~~,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;~~IAWV~~,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;~~IA4BjC~~,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;~~IAarB~~,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAcnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF"}
1	+ {"version":3,"file":"QueryBuilderFilterOperator_LessThan.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_LessThan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAc9B,qBAAa,mCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAmBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAUV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IA0BjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IAYrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAcnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF"}

package/lib/stores/filter/operators/QueryBuilderFilterOperator_LessThan.js CHANGED Viewed

@@ -16,7 +16,7 @@
 import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
 import { PRIMITIVE_TYPE, } from '@finos/legend-graph';
 import { hashArray, UnsupportedOperationError, } from '@finos/legend-shared';
-import { buildFilterConditionState, buildFilterConditionExpression, } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
+import { buildFilterConditionState, buildFilterConditionExpression, getFilterExpressionLeftSideTypePath, } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import { getStandardPrimitiveTypeEquivalent, isTypeCompatibleForAssignment, } from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
@@ -26,8 +26,7 @@ export class QueryBuilderFilterOperator_LessThan extends QueryBuilderFilterOpera
         return '<';
     }
     isCompatibleWithFilterConditionProperty(filterConditionState) {
-        const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType;
+        const propertyType = filterConditionState.leftConditionType;
         const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
         return (normalizedType !== undefined &&
             [
@@ -44,12 +43,10 @@ export class QueryBuilderFilterOperator_LessThan extends QueryBuilderFilterOpera
         return isTypeCompatibleForAssignment(filterConditionState.rightConditionValue &&
             !filterConditionState.rightConditionValue.isCollection
             ? filterConditionState.rightConditionValue.type
-            : undefined, filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType);
+            : undefined, filterConditionState.leftConditionType);
     }
     getDefaultFilterConditionValue(filterConditionState) {
-        const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType;
+        const propertyType = filterConditionState.leftConditionType;
         switch (propertyType.path) {
             case PRIMITIVE_TYPE.NUMBER:
             case PRIMITIVE_TYPE.DECIMAL:
@@ -67,16 +64,15 @@ export class QueryBuilderFilterOperator_LessThan extends QueryBuilderFilterOpera
         }
     }
     buildFilterConditionExpression(filterConditionState, lambdaParameterName) {
-        return buildFilterConditionExpression(filterConditionState, filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+        return buildFilterConditionExpression(filterConditionState, filterConditionState.leftConditionType.path === PRIMITIVE_TYPE.DATETIME &&
             filterConditionState.rightConditionValue?.type?.path !==
                 PRIMITIVE_TYPE.DATETIME
             ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_BEFORE_DAY
             : QUERY_BUILDER_SUPPORTED_FUNCTIONS.LESS_THAN, lambdaParameterName);
     }
     buildFilterConditionState(filterState, expression) {
-        return buildFilterConditionState(filterState, expression, expression.parametersValues[0].func.value
-            .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+        return buildFilterConditionState(filterState, expression, getFilterExpressionLeftSideTypePath(expression) ===
+            PRIMITIVE_TYPE.DATETIME &&
             expression.parametersValues[1]?.genericType?.value.rawType.path !==
                 PRIMITIVE_TYPE.DATETIME
             ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_BEFORE_DAY

package/lib/stores/filter/operators/QueryBuilderFilterOperator_LessThan.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderFilterOperator_LessThan.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_LessThan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EACL,cAAc,~~GAIf~~,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,SAAS,EACT,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,yBAAyB,EACzB,8BAA8B,~~GAC/B~~,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AACjG,OAAO,EACL,kCAAkC,EAClC,6BAA6B,GAC9B,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAAE,kCAAkC,EAAE,MAAM,qCAAqC,CAAC;AACzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAC;AAE3F,MAAM,OAAO,mCACX,SAAQ,0BAA0B;IAGlC,QAAQ;QACN,OAAO,GAAG,CAAC;IACb,CAAC;IAED,uCAAuC,CACrC,oBAA0C;QAE1C,MAAM,YAAY,~~GAChB~~,oBAAoB,CAAC,~~uBAAuB~~,CAAC~~,kBAAkB,CAAC,IAAI,CAAC,KAAK~~;~~aACvE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,~~MAAM,cAAc,GAAG,kCAAkC,CAAC,YAAY,CAAC,CAAC;QACxE,OAAO,CACL,cAAc,KAAK,SAAS;YAE1B;gBACE,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,KAAK;gBACpB,cAAc,CAAC,IAAI;gBACnB,cAAc,CAAC,UAAU;gBACzB,cAAc,CAAC,QAAQ;aAE1B,CAAC,QAAQ,CAAC,cAAc,CAAC,CAC3B,CAAC;IACJ,CAAC;IAED,oCAAoC,CAClC,oBAA0C;QAE1C,OAAO,6BAA6B,CAClC,oBAAoB,CAAC,mBAAmB;YACtC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,YAAY;YACtD,CAAC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,IAAI;YAC/C,CAAC,CAAC,SAAS,EACb,oBAAoB,CAAC,~~uBAAuB~~,~~CAAC~~,~~kBAAkB,~~CAAC~~,IAAI,CAAC,KAAK~~;~~aACvE,WAAW,CAAC,KAAK,CAAC,OAAO,CAC7B,CAAC;~~IACJ,CAAC;IAED,8BAA8B,CAC5B,oBAA0C;QAE1C,MAAM,YAAY,~~GAChB~~,oBAAoB,CAAC,~~uBAAuB~~,CAAC~~,kBAAkB,CAAC,IAAI,CAAC,KAAK~~;~~aACvE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,~~QAAQ,YAAY,CAAC,IAAI,EAAE,CAAC;YAC1B,KAAK,cAAc,CAAC,MAAM,CAAC;YAC3B,KAAK,cAAc,CAAC,OAAO,CAAC;YAC5B,KAAK,cAAc,CAAC,KAAK,CAAC;YAC1B,KAAK,cAAc,CAAC,OAAO,CAAC;YAC5B,KAAK,cAAc,CAAC,UAAU,CAAC;YAC/B,KAAK,cAAc,CAAC,QAAQ,CAAC;YAC7B,KAAK,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;gBACzB,OAAO,yBAAyB,CAC9B,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,iBAAiB;qBACjE,KAAK,EACR,YAAY,EACZ,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,eAAe,EAClE,oBAAoB,CAAC,WAAW,CAAC,iBAAiB;qBAC/C,wDAAwD,CAC5D,CAAC;YACJ,CAAC;YACD;gBACE,MAAM,IAAI,yBAAyB,CACjC,gDAAgD,IAAI,CAAC,QAAQ,EAAE,uCAAuC,YAAY,CAAC,IAAI,GAAG,CAC3H,CAAC;QACN,CAAC;IACH,CAAC;IAED,8BAA8B,CAC5B,oBAA0C,EAC1C,mBAAwC;QAExC,OAAO,8BAA8B,CACnC,oBAAoB,EACpB,oBAAoB,CAAC,~~uBAAuB~~,CAAC,~~kBAAkB,CAAC,~~IAAI,~~CAAC,~~KAAK~~;aACvE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,~~cAAc,CAAC,QAAQ;~~YAC3D~~,oBAAoB,CAAC,mBAAmB,EAAE,IAAI,EAAE,IAAI;gBAClD,cAAc,CAAC,QAAQ;YACzB,CAAC,CAAC,iCAAiC,CAAC,aAAa;YACjD,CAAC,CAAC,iCAAiC,CAAC,SAAS,EAC/C,mBAAmB,CACpB,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,WAAoC,EACpC,UAAoC;QAEpC,OAAO,yBAAyB,CAC9B,WAAW,EACX,UAAU,~~EACT~~,~~UAAU~~,CAAC,~~gBAAgB~~,CAAC~~,CAAC,CAAgC,CAAC,IAAI,CAAC,KAAK~~;~~aACtE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,~~cAAc,CAAC,QAAQ;~~YAC3D~~,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;gBAC7D,cAAc,CAAC,QAAQ;YACzB,CAAC,CAAC,iCAAiC,CAAC,aAAa;YACjD,CAAC,CAAC,iCAAiC,CAAC,SAAS,EAC/C,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,yBAAyB;SAC7D,CAAC,CAAC;IACL,CAAC;CACF"}
1	+ {"version":3,"file":"QueryBuilderFilterOperator_LessThan.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_LessThan.ts"],"names":[],"mappings":"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"}

package/lib/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderFilterOperator_LessThanEqual.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,~~EAE9B~~,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;~~AAa9B~~,qBAAa,wCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;~~IAqBV~~,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;~~IAWV~~,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;~~IA4BjC~~,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;~~IAarB~~,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAcnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF"}
1	+ {"version":3,"file":"QueryBuilderFilterOperator_LessThanEqual.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAc9B,qBAAa,wCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAmBV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAUV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IA0BjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IAYrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAcnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF"}

package/lib/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.js CHANGED Viewed

@@ -16,7 +16,7 @@
 import { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
 import { PRIMITIVE_TYPE, } from '@finos/legend-graph';
 import { UnsupportedOperationError, hashArray, } from '@finos/legend-shared';
-import { buildFilterConditionState, buildFilterConditionExpression, } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
+import { buildFilterConditionState, buildFilterConditionExpression, getFilterExpressionLeftSideTypePath, } from './QueryBuilderFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graph/QueryBuilderMetaModelConst.js';
 import { getStandardPrimitiveTypeEquivalent, isTypeCompatibleForAssignment, } from '../../QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../QueryBuilderStateHashUtils.js';
@@ -26,8 +26,7 @@ export class QueryBuilderFilterOperator_LessThanEqual extends QueryBuilderFilter
         return '<=';
     }
     isCompatibleWithFilterConditionProperty(filterConditionState) {
-        const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType;
+        const propertyType = filterConditionState.leftConditionType;
         const normalizedType = getStandardPrimitiveTypeEquivalent(propertyType);
         return (normalizedType !== undefined &&
             [
@@ -44,12 +43,10 @@ export class QueryBuilderFilterOperator_LessThanEqual extends QueryBuilderFilter
         return isTypeCompatibleForAssignment(filterConditionState.rightConditionValue &&
             !filterConditionState.rightConditionValue.isCollection
             ? filterConditionState.rightConditionValue.type
-            : undefined, filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType);
+            : undefined, filterConditionState.leftConditionType);
     }
     getDefaultFilterConditionValue(filterConditionState) {
-        const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType;
+        const propertyType = filterConditionState.leftConditionType;
         switch (propertyType.path) {
             case PRIMITIVE_TYPE.NUMBER:
             case PRIMITIVE_TYPE.DECIMAL:
@@ -67,16 +64,15 @@ export class QueryBuilderFilterOperator_LessThanEqual extends QueryBuilderFilter
         }
     }
     buildFilterConditionExpression(filterConditionState, lambdaParameterName) {
-        return buildFilterConditionExpression(filterConditionState, filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+        return buildFilterConditionExpression(filterConditionState, filterConditionState.leftConditionType.path === PRIMITIVE_TYPE.DATETIME &&
             filterConditionState.rightConditionValue?.type?.path !==
                 PRIMITIVE_TYPE.DATETIME
             ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_BEFORE_DAY
             : QUERY_BUILDER_SUPPORTED_FUNCTIONS.LESS_THAN_EQUAL, lambdaParameterName);
     }
     buildFilterConditionState(filterState, expression) {
-        return buildFilterConditionState(filterState, expression, expression.parametersValues[0].func.value
-            .genericType.value.rawType.path === PRIMITIVE_TYPE.DATETIME &&
+        return buildFilterConditionState(filterState, expression, getFilterExpressionLeftSideTypePath(expression) ===
+            PRIMITIVE_TYPE.DATETIME &&
             expression.parametersValues[1]?.genericType?.value.rawType.path !==
                 PRIMITIVE_TYPE.DATETIME
             ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_BEFORE_DAY

package/lib/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderFilterOperator_LessThanEqual.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EACL,cAAc,~~GAIf~~,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,yBAAyB,EACzB,SAAS,GACV,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,yBAAyB,EACzB,8BAA8B,~~GAC/B~~,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AACjG,OAAO,EACL,kCAAkC,EAClC,6BAA6B,GAC9B,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAAE,kCAAkC,EAAE,MAAM,qCAAqC,CAAC;AACzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAC;AAE3F,MAAM,OAAO,wCACX,SAAQ,0BAA0B;IAGlC,QAAQ;QACN,OAAO,IAAI,CAAC;IACd,CAAC;IAED,uCAAuC,CACrC,oBAA0C;QAE1C,MAAM,YAAY,~~GAChB~~,oBAAoB,CAAC,~~uBAAuB~~,CAAC~~,kBAAkB,CAAC,IAAI,CAAC,KAAK~~;~~aACvE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,~~MAAM,cAAc,GAAG,kCAAkC,CAAC,YAAY,CAAC,CAAC;QACxE,OAAO,CACL,cAAc,KAAK,SAAS;YAE1B;gBACE,cAAc,CAAC,MAAM;gBACrB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,OAAO;gBACtB,cAAc,CAAC,KAAK;gBACpB,cAAc,CAAC,IAAI;gBACnB,cAAc,CAAC,UAAU;gBACzB,cAAc,CAAC,QAAQ;aAE1B,CAAC,QAAQ,CAAC,cAAc,CAAC,CAC3B,CAAC;IACJ,CAAC;IAED,oCAAoC,CAClC,oBAA0C;QAE1C,OAAO,6BAA6B,CAClC,oBAAoB,CAAC,mBAAmB;YACtC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,YAAY;YACtD,CAAC,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,IAAI;YAC/C,CAAC,CAAC,SAAS,EACb,oBAAoB,CAAC,~~uBAAuB~~,~~CAAC~~,~~kBAAkB,~~CAAC~~,IAAI,CAAC,KAAK~~;~~aACvE,WAAW,CAAC,KAAK,CAAC,OAAO,CAC7B,CAAC;~~IACJ,CAAC;IAED,8BAA8B,CAC5B,oBAA0C;QAE1C,MAAM,YAAY,~~GAChB~~,oBAAoB,CAAC,~~uBAAuB~~,CAAC~~,kBAAkB,CAAC,IAAI,CAAC,KAAK~~;~~aACvE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC;QAC/B,~~QAAQ,YAAY,CAAC,IAAI,EAAE,CAAC;YAC1B,KAAK,cAAc,CAAC,MAAM,CAAC;YAC3B,KAAK,cAAc,CAAC,OAAO,CAAC;YAC5B,KAAK,cAAc,CAAC,KAAK,CAAC;YAC1B,KAAK,cAAc,CAAC,OAAO,CAAC;YAC5B,KAAK,cAAc,CAAC,UAAU,CAAC;YAC/B,KAAK,cAAc,CAAC,QAAQ,CAAC;YAC7B,KAAK,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;gBACzB,OAAO,yBAAyB,CAC9B,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,iBAAiB;qBACjE,KAAK,EACR,YAAY,EACZ,oBAAoB,CAAC,WAAW,CAAC,iBAAiB,CAAC,eAAe,EAClE,oBAAoB,CAAC,WAAW,CAAC,iBAAiB;qBAC/C,wDAAwD,CAC5D,CAAC;YACJ,CAAC;YACD;gBACE,MAAM,IAAI,yBAAyB,CACjC,gDAAgD,IAAI,CAAC,QAAQ,EAAE,uCAAuC,YAAY,CAAC,IAAI,GAAG,CAC3H,CAAC;QACN,CAAC;IACH,CAAC;IAED,8BAA8B,CAC5B,oBAA0C,EAC1C,mBAAwC;QAExC,OAAO,8BAA8B,CACnC,oBAAoB,EACpB,oBAAoB,CAAC,~~uBAAuB~~,CAAC,~~kBAAkB,CAAC,~~IAAI,~~CAAC,~~KAAK~~;aACvE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,~~cAAc,CAAC,QAAQ;~~YAC3D~~,oBAAoB,CAAC,mBAAmB,EAAE,IAAI,EAAE,IAAI;gBAClD,cAAc,CAAC,QAAQ;YACzB,CAAC,CAAC,iCAAiC,CAAC,mBAAmB;YACvD,CAAC,CAAC,iCAAiC,CAAC,eAAe,EACrD,mBAAmB,CACpB,CAAC;IACJ,CAAC;IAED,yBAAyB,CACvB,WAAoC,EACpC,UAAoC;QAEpC,OAAO,yBAAyB,CAC9B,WAAW,EACX,UAAU,~~EACT~~,~~UAAU~~,CAAC,~~gBAAgB~~,CAAC~~,CAAC,CAAgC,CAAC,IAAI,CAAC,KAAK~~;~~aACtE~~,~~WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,~~cAAc,CAAC,QAAQ;~~YAC3D~~,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;gBAC7D,cAAc,CAAC,QAAQ;YACzB,CAAC,CAAC,iCAAiC,CAAC,mBAAmB;YACvD,CAAC,CAAC,iCAAiC,CAAC,eAAe,EACrD,IAAI,CACL,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,kCAAkC,CAAC,+BAA+B;SACnE,CAAC,CAAC;IACL,CAAC;CACF"}
1	+ {"version":3,"file":"QueryBuilderFilterOperator_LessThanEqual.js","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.ts"],"names":[],"mappings":"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"}

package/lib/stores/filter/operators/QueryBuilderFilterOperator_StartWith.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"QueryBuilderFilterOperator_StartWith.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_StartWith.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAc9B,qBAAa,oCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;~~IASV~~,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAYV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;~~IAsBjC~~,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IAQrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IASnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AAED,qBAAa,uCAAwC,SAAQ,oCAAoC;IACtF,QAAQ,IAAI,MAAM;IAIlB,8BAA8B,CACrC,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IASZ,yBAAyB,CAChC,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAOnC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}
1	+ {"version":3,"file":"QueryBuilderFilterOperator_StartWith.d.ts","sourceRoot":"","sources":["../../../../src/stores/filter/operators/QueryBuilderFilterOperator_StartWith.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,wBAAwB,EAC9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,QAAQ,EAGd,MAAM,sBAAsB,CAAC;AAc9B,qBAAa,oCACX,SAAQ,0BACR,YAAW,QAAQ;IAEnB,QAAQ,IAAI,MAAM;IAIlB,uCAAuC,CACrC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAQV,oCAAoC,CAClC,oBAAoB,EAAE,oBAAoB,GACzC,OAAO;IAYV,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,GACzC,kBAAkB,GAAG,SAAS;IAoBjC,8BAA8B,CAC5B,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IAQrB,yBAAyB,CACvB,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IASnC,IAAI,QAAQ,IAAI,MAAM,CAIrB;CACF;AAED,qBAAa,uCAAwC,SAAQ,oCAAoC;IACtF,QAAQ,IAAI,MAAM;IAIlB,8BAA8B,CACrC,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,GACvC,kBAAkB;IASZ,yBAAyB,CAChC,WAAW,EAAE,uBAAuB,EACpC,UAAU,EAAE,wBAAwB,GACnC,oBAAoB,GAAG,SAAS;IAOnC,IAAa,QAAQ,IAAI,MAAM,CAI9B;CACF"}

package/lib/stores/filter/operators/QueryBuilderFilterOperator_StartWith.js CHANGED Viewed

@@ -26,8 +26,7 @@ export class QueryBuilderFilterOperator_StartWith extends QueryBuilderFilterOper
         return 'starts with';
     }
     isCompatibleWithFilterConditionProperty(filterConditionState) {
-        return (getStandardPrimitiveTypeEquivalent(filterConditionState.propertyExpressionState.propertyExpression.func
-            .value.genericType.value.rawType) === PRIMITIVE_TYPE.STRING);
+        return (getStandardPrimitiveTypeEquivalent(filterConditionState.leftConditionType) === PRIMITIVE_TYPE.STRING);
     }
     isCompatibleWithFilterConditionValue(filterConditionState) {
         const type = filterConditionState.rightConditionValue &&
@@ -38,8 +37,7 @@ export class QueryBuilderFilterOperator_StartWith extends QueryBuilderFilterOper
             getStandardPrimitiveTypeEquivalent(type) === PRIMITIVE_TYPE.STRING);
     }
     getDefaultFilterConditionValue(filterConditionState) {
-        const propertyType = filterConditionState.propertyExpressionState.propertyExpression.func.value
-            .genericType.value.rawType;
+        const propertyType = filterConditionState.leftConditionType;
         switch (propertyType.path) {
             case PRIMITIVE_TYPE.STRING: {
                 return buildDefaultInstanceValue(filterConditionState.filterState.queryBuilderState.graphManagerState