@finos/legend-application-query 5.1.0 → 5.2.3

package/lib/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterValueSpecificationBuilder.js

@@ -0,0 +1,82 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { extractElementNameFromPath, SimpleFunctionExpression, TYPICAL_MULTIPLICITY_TYPE, } from '@finos/legend-graph';
+import { assertTrue, guaranteeNonNullable, isNonNullable, } from '@finos/legend-shared';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../QueryBuilder_Const.js';
+import { fromGroupOperation } from '../../../QueryBuilderGroupOperationHelper.js';
+import { buildGenericLambdaFunctionInstanceValue } from '../../../QueryBuilderValueSpecificationHelper.js';
+import { FETCH_STRUCTURE_MODE } from '../../QueryBuilderFetchStructureState.js';
+import { QueryBuilderPostFilterTreeConditionNodeData, QueryBuilderPostFilterTreeGroupNodeData, } from './QueryBuilderPostFilterState.js';
+const buildPostFilterExpression = (filterState, node) => {
+    if (node instanceof QueryBuilderPostFilterTreeConditionNodeData) {
+        return node.condition.operator.buildPostFilterConditionExpression(node.condition);
+    }
+    else if (node instanceof QueryBuilderPostFilterTreeGroupNodeData) {
+        const multiplicityOne = filterState.projectionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE);
+        const func = new SimpleFunctionExpression(extractElementNameFromPath(fromGroupOperation(node.groupOperation)), multiplicityOne);
+        const clauses = node.childrenIds
+            .map((e) => filterState.nodes.get(e))
+            .filter(isNonNullable)
+            .map((e) => buildPostFilterExpression(filterState, e))
+            .filter(isNonNullable);
+        /**
+         * NOTE: Due to a limitation (or perhaps design decision) in the engine, group operations
+         * like and/or do not take more than 2 parameters, as such, if we have more than 2, we need
+         * to create a chain of this operation to accomondate.
+         *
+         * This means that in the read direction, we might need to flatten the chains down to group with
+         * multiple clauses. This means user's intended grouping will not be kept.
+         */
+        if (clauses.length > 2) {
+            const firstClause = clauses[0];
+            let currentClause = clauses[clauses.length - 1];
+            for (let i = clauses.length - 2; i > 0; --i) {
+                const clause1 = clauses[i];
+                const clause2 = currentClause;
+                const groupClause = new SimpleFunctionExpression(extractElementNameFromPath(fromGroupOperation(node.groupOperation)), multiplicityOne);
+                groupClause.parametersValues = [clause1, clause2];
+                currentClause = groupClause;
+            }
+            func.parametersValues = [firstClause, currentClause];
+        }
+        else {
+            func.parametersValues = clauses;
+        }
+        return func.parametersValues.length ? func : undefined;
+    }
+    return undefined;
+};
+export const appendPostFilter = (postFilterState, lambda) => {
+    const postFilterConditionExpressions = postFilterState.rootIds
+        .map((e) => guaranteeNonNullable(postFilterState.nodes.get(e)))
+        .map((e) => buildPostFilterExpression(postFilterState, e))
+        .filter(isNonNullable);
+    if (!postFilterConditionExpressions.length ||
+        lambda.expressionSequence.length !== 1) {
+        return lambda;
+    }
+    assertTrue(postFilterState.projectionState.fetchStructureState.fetchStructureMode ===
+        FETCH_STRUCTURE_MODE.PROJECTION, 'Can only apply post-filter while fetching projection columns');
+    const multiplicityOne = postFilterState.projectionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE);
+    const filterLambda = buildGenericLambdaFunctionInstanceValue(postFilterState.lambdaParameterName, postFilterConditionExpressions, postFilterState.projectionState.queryBuilderState.graphManagerState.graph);
+    // main filter expression
+    const filterExpression = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_FILTER), multiplicityOne);
+    const currentExpression = guaranteeNonNullable(lambda.expressionSequence[0]);
+    filterExpression.parametersValues = [currentExpression, filterLambda];
+    lambda.expressionSequence[0] = filterExpression;
+    return lambda;
+};
+//# sourceMappingURL=QueryBuilderPostFilterValueSpecificationBuilder.js.map

package/lib/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterValueSpecificationBuilder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderPostFilterValueSpecificationBuilder.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterValueSpecificationBuilder.ts"],"names":[],"mappings":"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"}

package/lib/stores/{QueryBuilderPostFilterProcessor.d.ts → fetch-structure/projection/post-filter/QueryBuilderPostFilterValueSpecificationProcessor.d.ts}

@@ -13,12 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { type LambdaFunctionInstanceValue, AbstractPropertyExpression, FunctionExpression } from '@finos/legend-graph';
-import type { QueryBuilderAggregateColumnState } from './QueryBuilderAggregationState.js';
+import { type LambdaFunctionInstanceValue, FunctionExpression } from '@finos/legend-graph';
 import type { QueryBuilderPostFilterOperator } from './QueryBuilderPostFilterOperator.js';
 import { type QueryBuilderPostFilterState, PostFilterConditionState } from './QueryBuilderPostFilterState.js';
-import { type QueryBuilderProjectionColumnState } from './QueryBuilderProjectionState.js';
-export declare const findTdsColumnState: (propertyExpression: AbstractPropertyExpression, postFilterState: QueryBuilderPostFilterState) => QueryBuilderProjectionColumnState | QueryBuilderAggregateColumnState;
 export declare const buildPostFilterConditionState: (postFilterState: QueryBuilderPostFilterState, expression: FunctionExpression, operatorFunctionFullPath: string | undefined, operator: QueryBuilderPostFilterOperator) => PostFilterConditionState | undefined;
 export declare const processPostFilterLambda: (postFilterLambda: LambdaFunctionInstanceValue, postFilterState: QueryBuilderPostFilterState) => void;
-//# sourceMappingURL=QueryBuilderPostFilterProcessor.d.ts.map
+//# sourceMappingURL=QueryBuilderPostFilterValueSpecificationProcessor.d.ts.map

package/lib/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterValueSpecificationProcessor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderPostFilterValueSpecificationProcessor.d.ts","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterValueSpecificationProcessor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,2BAA2B,EAMhC,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAW7B,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AAC1F,OAAO,EACL,KAAK,2BAA2B,EAEhC,wBAAwB,EAKzB,MAAM,kCAAkC,CAAC;AAkE1C,eAAO,MAAM,6BAA6B,oBACvB,2BAA2B,cAChC,kBAAkB,4BACJ,MAAM,GAAG,SAAS,YAClC,8BAA8B,KACvC,wBAAwB,GAAG,SAiE7B,CAAC;AAyDF,eAAO,MAAM,uBAAuB,qBAChB,2BAA2B,mBAC5B,2BAA2B,KAC3C,IAoCF,CAAC"}

package/lib/stores/{QueryBuilderPostFilterProcessor.js → fetch-structure/projection/post-filter/QueryBuilderPostFilterValueSpecificationProcessor.js}

@@ -15,12 +15,13 @@
  */
 import { AbstractPropertyExpression, extractElementNameFromPath, PrimitiveInstanceValue, matchFunctionName, VariableExpression, FunctionExpression, } from '@finos/legend-graph';
 import { assertTrue, guaranteeIsString, guaranteeNonNullable, guaranteeType, UnsupportedOperationError, } from '@finos/legend-shared';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../QueryBuilder_Const.js';
-import { toGroupOperation } from './QueryBuilderOperatorsHelper.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../QueryBuilder_Const.js';
+import { FETCH_STRUCTURE_MODE } from '../../QueryBuilderFetchStructureState.js';
 import { getTDSColumnDerivedProperyFromType, PostFilterConditionState, QueryBuilderPostFilterTreeConditionNodeData, QueryBuilderPostFilterTreeGroupNodeData, TDS_COLUMN_GETTER, getTypeFromDerivedProperty, } from './QueryBuilderPostFilterState.js';
-import { QueryBuilderDerivationProjectionColumnState, } from './QueryBuilderProjectionState.js';
-export const findTdsColumnState = (propertyExpression, postFilterState) => {
-    const fetchStructureState = postFilterState.queryBuilderState.fetchStructureState;
+import { QueryBuilderDerivationProjectionColumnState, } from '../QueryBuilderProjectionColumnState.js';
+import { toGroupOperation } from '../../../QueryBuilderGroupOperationHelper.js';
+const findProjectionColumnState = (propertyExpression, postFilterState) => {
+    const fetchStructureState = postFilterState.projectionState.fetchStructureState;
     const properyExpressionName = propertyExpression.func.name;
     assertTrue(Object.values(TDS_COLUMN_GETTER).includes(properyExpressionName), `Can't process TDS column expression: TDS column property '${properyExpressionName}' not supported. Supported types are ${Object.values(TDS_COLUMN_GETTER).join(',')}`);
     const tdsColumnGetter = properyExpressionName;
@@ -34,7 +35,8 @@ export const findTdsColumnState = (propertyExpression, postFilterState) => {
     if (tdsColumnGetter !== TDS_COLUMN_GETTER.IS_NULL &&
         tdsColumnGetter !== TDS_COLUMN_GETTER.IS_NOT_NULL) {
         if (columnState instanceof QueryBuilderDerivationProjectionColumnState) {
-            const type = getTypeFromDerivedProperty(tdsColumnGetter, postFilterState.queryBuilderState.graphManagerState.graph);
+            const type = getTypeFromDerivedProperty(tdsColumnGetter, postFilterState.projectionState.queryBuilderState.graphManagerState
+                .graph);
             if (type) {
                 columnState.setReturnType(type);
             }
@@ -52,7 +54,7 @@ export const buildPostFilterConditionState = (postFilterState, expression, opera
     if (tdsColumnGetter &&
         expression instanceof AbstractPropertyExpression &&
         expression.func.name === tdsColumnGetter) {
-        const columnState = findTdsColumnState(expression, postFilterState);
+        const columnState = findProjectionColumnState(expression, postFilterState);
         postConditionState = new PostFilterConditionState(postFilterState, columnState, undefined, operator);
         return postConditionState;
     }
@@ -61,7 +63,7 @@ export const buildPostFilterConditionState = (postFilterState, expression, opera
         assertTrue(expression.parametersValues.length === 2, `Can't process ${extractElementNameFromPath(operatorFunctionFullPath)}() expression: ${extractElementNameFromPath(operatorFunctionFullPath)}() expects '1 argument'`);
         // get projection column
         const tdsColumnPropertyExpression = guaranteeType(expression.parametersValues[0], AbstractPropertyExpression, `Can't process ${extractElementNameFromPath(operatorFunctionFullPath)}() expression: expects property expression in lambda body`);
-        const columnState = findTdsColumnState(tdsColumnPropertyExpression, postFilterState);
+        const columnState = findProjectionColumnState(tdsColumnPropertyExpression, postFilterState);
         // get operation value specification
         const value = expression.parametersValues[1];
         // create state
@@ -98,8 +100,8 @@ const processPostFilterExpression = (expression, postFilterState, parentPostFilt
     }
 };
 export const processPostFilterLambda = (postFilterLambda, postFilterState) => {
-    const fetchStructureState = postFilterState.queryBuilderState.fetchStructureState;
-    assertTrue(fetchStructureState.isProjectionMode(), `Can't process post-filter lambda: post-filter lambda must use projection fetch structure`);
+    const fetchStructureState = postFilterState.projectionState.fetchStructureState;
+    assertTrue(fetchStructureState.fetchStructureMode === FETCH_STRUCTURE_MODE.PROJECTION, `Can't process post-filter lambda: post-filter lambda must use projection fetch structure`);
     assertTrue(Boolean(fetchStructureState.projectionState.columns.length), `Can't process post-filter lambda: post-filter lambda must have at least one projection column `);
     const lambdaFunc = guaranteeNonNullable(postFilterLambda.values[0], `Can't process post-filter lambda: post-filter lambda function is missing`);
     assertTrue(lambdaFunc.expressionSequence.length === 1, `Can't process post-filter lambda: only support post-filter lambda body with 1 expression`);
@@ -108,4 +110,4 @@ export const processPostFilterLambda = (postFilterLambda, postFilterState) => {
     postFilterState.setLambdaParameterName(guaranteeType(lambdaFunc.functionType.parameters[0], VariableExpression, `Can't process post-filter lambda: only support filter() lambda with 1 parameter of type 'VariableExpression'`).name);
     processPostFilterExpression(rootExpression, postFilterState, undefined);
 };
-//# sourceMappingURL=QueryBuilderPostFilterProcessor.js.map
+//# sourceMappingURL=QueryBuilderPostFilterValueSpecificationProcessor.js.map

package/lib/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterValueSpecificationProcessor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderPostFilterValueSpecificationProcessor.js","sourceRoot":"","sources":["../../../../../src/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterValueSpecificationProcessor.ts"],"names":[],"mappings":"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"}

package/lib/stores/{postFilterOperators → fetch-structure/projection/post-filter/operators}/QueryBuilderPostFilterOperatorHelper.d.ts

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 import { type Multiplicity, type FunctionExpression } from '@finos/legend-graph';
-import { QueryBuilderAggregateColumnState } from '../QueryBuilderAggregationState.js';
+import { QueryBuilderAggregateColumnState } from '../../aggregation/QueryBuilderAggregationState.js';
 import type { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
 import { type PostFilterConditionState } from '../QueryBuilderPostFilterState.js';
-import { type QueryBuilderProjectionColumnState } from '../QueryBuilderProjectionState.js';
+import { type QueryBuilderProjectionColumnState } from '../../QueryBuilderProjectionColumnState.js';
 export declare const getColumnMultiplicity: (columnState: QueryBuilderProjectionColumnState | QueryBuilderAggregateColumnState) => Multiplicity;
 export declare const buildPostFilterConditionExpression: (filterConditionState: PostFilterConditionState, operator: QueryBuilderPostFilterOperator, operatorFunctionFullPath: string | undefined) => FunctionExpression;
 //# sourceMappingURL=QueryBuilderPostFilterOperatorHelper.d.ts.map

package/lib/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperatorHelper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderPostFilterOperatorHelper.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperatorHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,kBAAkB,EAWxB,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAAE,gCAAgC,EAAE,MAAM,mDAAmD,CAAC;AACrG,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAC3F,OAAO,EACL,KAAK,wBAAwB,EAG9B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,KAAK,iCAAiC,EAEvC,MAAM,4CAA4C,CAAC;AAEpD,eAAO,MAAM,qBAAqB,gBAE5B,iCAAiC,GACjC,gCAAgC,KACnC,YAaF,CAAC;AAEF,eAAO,MAAM,kCAAkC,yBACvB,wBAAwB,YACpC,8BAA8B,4BAOd,MAAM,GAAG,SAAS,KAC3C,kBAoDF,CAAC"}

package/lib/stores/{postFilterOperators → fetch-structure/projection/post-filter/operators}/QueryBuilderPostFilterOperatorHelper.js

@@ -15,10 +15,10 @@
  */
 import { AbstractPropertyExpression, extractElementNameFromPath, GenericType, GenericTypeExplicitReference, PrimitiveInstanceValue, PRIMITIVE_TYPE, SimpleFunctionExpression, TYPICAL_MULTIPLICITY_TYPE, VariableExpression, getAllClassDerivedProperties, } from '@finos/legend-graph';
 import { guaranteeNonNullable, UnsupportedOperationError, } from '@finos/legend-shared';
-import { TDS_ROW } from '../../QueryBuilder_Const.js';
-import { QueryBuilderAggregateColumnState } from '../QueryBuilderAggregationState.js';
+import { TDS_ROW } from '../../../../../QueryBuilder_Const.js';
+import { QueryBuilderAggregateColumnState } from '../../aggregation/QueryBuilderAggregationState.js';
 import { getTDSColumnDerivedProperyFromType, } from '../QueryBuilderPostFilterState.js';
-import { QueryBuilderSimpleProjectionColumnState, } from '../QueryBuilderProjectionState.js';
+import { QueryBuilderSimpleProjectionColumnState, } from '../../QueryBuilderProjectionColumnState.js';
 export const getColumnMultiplicity = (columnState) => {
     if (columnState instanceof QueryBuilderAggregateColumnState) {
         return columnState.aggregationState.projectionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE);
@@ -38,8 +38,8 @@ export const buildPostFilterConditionExpression = (filterConditionState, operato
  */
 operatorFunctionFullPath) => {
     // primitives
-    const graph = filterConditionState.postFilterState.queryBuilderState.graphManagerState
-        .graph;
+    const graph = filterConditionState.postFilterState.projectionState.queryBuilderState
+        .graphManagerState.graph;
     const multiplicityOne = graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE);
     const typeString = graph.getPrimitiveType(PRIMITIVE_TYPE.STRING);
     // property expression

package/lib/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperatorHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderPostFilterOperatorHelper.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperatorHelper.ts"],"names":[],"mappings":"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"}

package/lib/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_Contain.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderPostFilterOperator_Contain.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/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;AAM7B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,KAAK,EACV,wBAAwB,EACxB,2BAA2B,EAC5B,MAAM,mCAAmC,CAAC;AAS3C,qBAAa,sCAAuC,SAAQ,8BAA8B;IACxF,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAOzC,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,OAAO;IAOV,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB;IAsBrB,kCAAkC,CAChC,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB,GAAG,SAAS;IAQjC,6BAA6B,CAC3B,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,kBAAkB,GAC7B,wBAAwB,GAAG,SAAS;CAQxC;AAED,qBAAa,yCAA0C,SAAQ,sCAAsC;IAC1F,QAAQ,IAAI,MAAM;IAGlB,kCAAkC,CACzC,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB,GAAG,SAAS;IAaxB,6BAA6B,CACpC,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,wBAAwB,GACnC,wBAAwB,GAAG,SAAS;CAMxC"}

package/lib/stores/{postFilterOperators → fetch-structure/projection/post-filter/operators}/QueryBuilderPostFilterOperator_Contain.js

@@ -15,11 +15,10 @@
  */
 import { PRIMITIVE_TYPE, buildPrimitiveInstanceValue, } from '@finos/legend-graph';
 import { guaranteeNonNullable, UnsupportedOperationError, } from '@finos/legend-shared';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
-import { buildNotExpression, getNonCollectionValueSpecificationType, unwrapNotExpression, } from '../QueryBuilderOperatorsHelper.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../QueryBuilder_Const.js';
 import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
-import { buildPostFilterConditionState } from '../QueryBuilderPostFilterProcessor.js';
-import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationBuilderHelper.js';
+import { buildPostFilterConditionState } from '../QueryBuilderPostFilterValueSpecificationProcessor.js';
+import { buildNotExpression, generateDefaultValueForPrimitiveType, getNonCollectionValueSpecificationType, unwrapNotExpression, } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorHelper.js';
 export class QueryBuilderPostFilterOperator_Contain extends QueryBuilderPostFilterOperator {
     getLabel() {
@@ -41,8 +40,8 @@ export class QueryBuilderPostFilterOperator_Contain extends QueryBuilderPostFilt
         const propertyType = guaranteeNonNullable(postFilterConditionState.columnState.getReturnType());
         switch (propertyType.path) {
             case PRIMITIVE_TYPE.STRING: {
-                return buildPrimitiveInstanceValue(postFilterConditionState.postFilterState.queryBuilderState
-                    .graphManagerState.graph, propertyType.path, generateDefaultValueForPrimitiveType(propertyType.path));
+                return buildPrimitiveInstanceValue(postFilterConditionState.postFilterState.projectionState
+                    .queryBuilderState.graphManagerState.graph, propertyType.path, generateDefaultValueForPrimitiveType(propertyType.path));
             }
             default:
                 throw new UnsupportedOperationError(`Can't get default value for post-filter operator '${this.getLabel()}' when the LHS property is of type '${propertyType.path}'`);
@@ -62,8 +61,8 @@ export class QueryBuilderPostFilterOperator_NotContain extends QueryBuilderPostF
     buildPostFilterConditionExpression(postFilterConditionState) {
         const expression = super.buildPostFilterConditionExpression(postFilterConditionState);
         return expression
-            ? buildNotExpression(postFilterConditionState.postFilterState.queryBuilderState
-                .graphManagerState.graph, expression)
+            ? buildNotExpression(postFilterConditionState.postFilterState.projectionState
+                .queryBuilderState.graphManagerState.graph, expression)
             : undefined;
     }
     buildPostFilterConditionState(postFilterState, expression) {

package/lib/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_Contain.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderPostFilterOperator_Contain.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_Contain.ts"],"names":[],"mappings":"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"}

package/lib/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderPostFilterOperator_EndWith.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/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;AAG7B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,KAAK,EACV,wBAAwB,EACxB,2BAA2B,EAC5B,MAAM,mCAAmC,CAAC;AAS3C,qBAAa,sCAAuC,SAAQ,8BAA8B;IACxF,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAOzC,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,OAAO;IAOV,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB;IAoBrB,kCAAkC,CAChC,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB,GAAG,SAAS;IAQjC,6BAA6B,CAC3B,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,kBAAkB,GAC7B,wBAAwB,GAAG,SAAS;CAQxC;AAED,qBAAa,yCAA0C,SAAQ,sCAAsC;IAC1F,QAAQ,IAAI,MAAM;IAIlB,kCAAkC,CACzC,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB,GAAG,SAAS;IAaxB,6BAA6B,CACpC,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,wBAAwB,GACnC,wBAAwB,GAAG,SAAS;CAMxC"}

package/lib/stores/{postFilterOperators → fetch-structure/projection/post-filter/operators}/QueryBuilderPostFilterOperator_EndWith.js

@@ -15,11 +15,10 @@
  */
 import { PRIMITIVE_TYPE, buildPrimitiveInstanceValue, } from '@finos/legend-graph';
 import { UnsupportedOperationError } from '@finos/legend-shared';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
-import { buildNotExpression, getNonCollectionValueSpecificationType, unwrapNotExpression, } from '../QueryBuilderOperatorsHelper.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../QueryBuilder_Const.js';
 import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
-import { buildPostFilterConditionState } from '../QueryBuilderPostFilterProcessor.js';
-import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationBuilderHelper.js';
+import { buildPostFilterConditionState } from '../QueryBuilderPostFilterValueSpecificationProcessor.js';
+import { buildNotExpression, generateDefaultValueForPrimitiveType, getNonCollectionValueSpecificationType, unwrapNotExpression, } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorHelper.js';
 export class QueryBuilderPostFilterOperator_EndWith extends QueryBuilderPostFilterOperator {
     getLabel() {
@@ -41,8 +40,8 @@ export class QueryBuilderPostFilterOperator_EndWith extends QueryBuilderPostFilt
         const propertyType = postFilterConditionState.columnState.getReturnType();
         switch (propertyType?.path) {
             case PRIMITIVE_TYPE.STRING: {
-                return buildPrimitiveInstanceValue(postFilterConditionState.postFilterState.queryBuilderState
-                    .graphManagerState.graph, propertyType.path, generateDefaultValueForPrimitiveType(propertyType.path));
+                return buildPrimitiveInstanceValue(postFilterConditionState.postFilterState.projectionState
+                    .queryBuilderState.graphManagerState.graph, propertyType.path, generateDefaultValueForPrimitiveType(propertyType.path));
             }
             default:
                 throw new UnsupportedOperationError(`Can't get default value for post-filter operator '${this.getLabel()}' when the LHS property is of type '${propertyType?.path}'`);
@@ -62,8 +61,8 @@ export class QueryBuilderPostFilterOperator_NotEndWith extends QueryBuilderPostF
     buildPostFilterConditionExpression(postFilterConditionState) {
         const expression = super.buildPostFilterConditionExpression(postFilterConditionState);
         return expression
-            ? buildNotExpression(postFilterConditionState.postFilterState.queryBuilderState
-                .graphManagerState.graph, expression)
+            ? buildNotExpression(postFilterConditionState.postFilterState.projectionState
+                .queryBuilderState.graphManagerState.graph, expression)
             : undefined;
     }
     buildPostFilterConditionState(postFilterState, expression) {

package/lib/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderPostFilterOperator_EndWith.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAKL,cAAc,EACd,2BAA2B,GAC5B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,iCAAiC,EAAE,MAAM,sCAAsC,CAAC;AACzF,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AACtF,OAAO,EAAE,6BAA6B,EAAE,MAAM,yDAAyD,CAAC;AAKxG,OAAO,EACL,kBAAkB,EAClB,oCAAoC,EACpC,sCAAsC,EACtC,mBAAmB,GACpB,MAAM,qDAAqD,CAAC;AAC7D,OAAO,EAAE,kCAAkC,EAAE,MAAM,2CAA2C,CAAC;AAE/F,MAAM,OAAO,sCAAuC,SAAQ,8BAA8B;IACxF,QAAQ;QACN,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,oBAAoB,CAAC,IAAU;QAC7B,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,MAAM,EAAE;YACvC,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,8BAA8B,CAC5B,wBAAkD;QAElD,MAAM,IAAI,GAAG,wBAAwB,CAAC,KAAK;YACzC,CAAC,CAAC,sCAAsC,CAAC,wBAAwB,CAAC,KAAK,CAAC;YACxE,CAAC,CAAC,SAAS,CAAC;QACd,OAAO,cAAc,CAAC,MAAM,KAAK,IAAI,EAAE,IAAI,CAAC;IAC9C,CAAC;IAED,8BAA8B,CAC5B,wBAAkD;QAElD,MAAM,YAAY,GAAG,wBAAwB,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC;QAC1E,QAAQ,YAAY,EAAE,IAAI,EAAE;YAC1B,KAAK,cAAc,CAAC,MAAM,CAAC,CAAC;gBAC1B,OAAO,2BAA2B,CAChC,wBAAwB,CAAC,eAAe,CAAC,eAAe;qBACrD,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,EAC5C,YAAY,CAAC,IAAI,EACjB,oCAAoC,CAAC,YAAY,CAAC,IAAI,CAAC,CACxD,CAAC;aACH;YACD;gBACE,MAAM,IAAI,yBAAyB,CACjC,qDAAqD,IAAI,CAAC,QAAQ,EAAE,uCAClE,YAAY,EAAE,IAChB,GAAG,CACJ,CAAC;SACL;IACH,CAAC;IAED,kCAAkC,CAChC,wBAAkD;QAElD,OAAO,kCAAkC,CACvC,wBAAwB,EACxB,IAAI,EACJ,iCAAiC,CAAC,SAAS,CAC5C,CAAC;IACJ,CAAC;IAED,6BAA6B,CAC3B,eAA4C,EAC5C,UAA8B;QAE9B,OAAO,6BAA6B,CAClC,eAAe,EACf,UAAU,EACV,iCAAiC,CAAC,SAAS,EAC3C,IAAI,CACL,CAAC;IACJ,CAAC;CACF;AAED,MAAM,OAAO,yCAA0C,SAAQ,sCAAsC;IAC1F,QAAQ;QACf,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAEQ,kCAAkC,CACzC,wBAAkD;QAElD,MAAM,UAAU,GAAG,KAAK,CAAC,kCAAkC,CACzD,wBAAwB,CACzB,CAAC;QACF,OAAO,UAAU;YACf,CAAC,CAAC,kBAAkB,CAChB,wBAAwB,CAAC,eAAe,CAAC,eAAe;iBACrD,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,EAC5C,UAAU,CACX;YACH,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAEQ,6BAA6B,CACpC,eAA4C,EAC5C,UAAoC;QAEpC,MAAM,eAAe,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;QACxD,OAAO,eAAe;YACpB,CAAC,CAAC,KAAK,CAAC,6BAA6B,CAAC,eAAe,EAAE,eAAe,CAAC;YACvE,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;CACF"}

package/lib/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_Equal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderPostFilterOperator_Equal.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_Equal.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,IAAI,EACT,KAAK,kBAAkB,EAEvB,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EAWxB,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,KAAK,EACV,wBAAwB,EACxB,2BAA2B,EAC5B,MAAM,mCAAmC,CAAC;AAU3C,qBAAa,oCAAqC,SAAQ,8BAA8B;IACtF,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAoBzC,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,OAAO;IAaV,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB;IA4DrB,kCAAkC,CAChC,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB,GAAG,SAAS;IAajC,6BAA6B,CAC3B,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,kBAAkB,GAC7B,wBAAwB,GAAG,SAAS;CAcxC;AACD,qBAAa,uCAAwC,SAAQ,oCAAoC;IACtF,QAAQ,IAAI,MAAM;IAIlB,kCAAkC,CACzC,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB,GAAG,SAAS;IAaxB,6BAA6B,CACpC,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,wBAAwB,GACnC,wBAAwB,GAAG,SAAS;CAMxC"}

package/lib/stores/{postFilterOperators → fetch-structure/projection/post-filter/operators}/QueryBuilderPostFilterOperator_Equal.js

@@ -15,11 +15,10 @@
  */
 import { AbstractPropertyExpression, Enumeration, EnumValueExplicitReference, EnumValueInstanceValue, GenericType, GenericTypeExplicitReference, PRIMITIVE_TYPE, TYPICAL_MULTIPLICITY_TYPE, SUPPORTED_FUNCTIONS, buildPrimitiveInstanceValue, } from '@finos/legend-graph';
 import { guaranteeNonNullable, UnsupportedOperationError, } from '@finos/legend-shared';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
-import { buildNotExpression, getNonCollectionValueSpecificationType, isTypeCompatibleWithConditionValueType, unwrapNotExpression, } from '../QueryBuilderOperatorsHelper.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../QueryBuilder_Const.js';
 import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
-import { buildPostFilterConditionState } from '../QueryBuilderPostFilterProcessor.js';
-import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationBuilderHelper.js';
+import { buildPostFilterConditionState } from '../QueryBuilderPostFilterValueSpecificationProcessor.js';
+import { buildNotExpression, generateDefaultValueForPrimitiveType, getNonCollectionValueSpecificationType, isTypeCompatibleForAssignment, unwrapNotExpression, } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorHelper.js';
 export class QueryBuilderPostFilterOperator_Equal extends QueryBuilderPostFilterOperator {
     getLabel() {
@@ -43,7 +42,7 @@ export class QueryBuilderPostFilterOperator_Equal extends QueryBuilderPostFilter
     isCompatibleWithConditionValue(postFilterConditionState) {
         const valueSpecification = postFilterConditionState.value;
         if (valueSpecification) {
-            return isTypeCompatibleWithConditionValueType(getNonCollectionValueSpecificationType(valueSpecification), guaranteeNonNullable(postFilterConditionState.columnState.getReturnType()));
+            return isTypeCompatibleForAssignment(getNonCollectionValueSpecificationType(valueSpecification), guaranteeNonNullable(postFilterConditionState.columnState.getReturnType()));
         }
         return false;
     }
@@ -52,20 +51,23 @@ export class QueryBuilderPostFilterOperator_Equal extends QueryBuilderPostFilter
         switch (propertyType.path) {
             case PRIMITIVE_TYPE.STRING:
             case PRIMITIVE_TYPE.BOOLEAN:
-            case PRIMITIVE_TYPE.DATE:
             case PRIMITIVE_TYPE.STRICTDATE:
             case PRIMITIVE_TYPE.DATETIME:
             case PRIMITIVE_TYPE.NUMBER:
             case PRIMITIVE_TYPE.DECIMAL:
             case PRIMITIVE_TYPE.FLOAT:
             case PRIMITIVE_TYPE.INTEGER: {
-                return buildPrimitiveInstanceValue(postFilterConditionState.postFilterState.queryBuilderState
-                    .graphManagerState.graph, propertyType.path, generateDefaultValueForPrimitiveType(propertyType.path));
+                return buildPrimitiveInstanceValue(postFilterConditionState.postFilterState.projectionState
+                    .queryBuilderState.graphManagerState.graph, propertyType.path, generateDefaultValueForPrimitiveType(propertyType.path));
+            }
+            case PRIMITIVE_TYPE.DATE: {
+                return buildPrimitiveInstanceValue(postFilterConditionState.postFilterState.projectionState
+                    .queryBuilderState.graphManagerState.graph, PRIMITIVE_TYPE.STRICTDATE, generateDefaultValueForPrimitiveType(propertyType.path));
             }
             default:
                 if (propertyType instanceof Enumeration) {
                     if (propertyType.values.length > 0) {
-                        const multiplicityOne = postFilterConditionState.postFilterState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE);
+                        const multiplicityOne = postFilterConditionState.postFilterState.projectionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE);
                         const enumValueInstanceValue = new EnumValueInstanceValue(GenericTypeExplicitReference.create(new GenericType(propertyType)), multiplicityOne);
                         enumValueInstanceValue.values = [
                             EnumValueExplicitReference.create(propertyType.values[0]),
@@ -102,8 +104,8 @@ export class QueryBuilderPostFilterOperator_NotEqual extends QueryBuilderPostFil
     buildPostFilterConditionExpression(postFilterConditionState) {
         const expression = super.buildPostFilterConditionExpression(postFilterConditionState);
         return expression
-            ? buildNotExpression(postFilterConditionState.postFilterState.queryBuilderState
-                .graphManagerState.graph, expression)
+            ? buildNotExpression(postFilterConditionState.postFilterState.projectionState
+                .queryBuilderState.graphManagerState.graph, expression)
             : undefined;
     }
     buildPostFilterConditionState(postFilterState, expression) {

package/lib/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_Equal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderPostFilterOperator_Equal.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_Equal.ts"],"names":[],"mappings":"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"}

package/lib/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderPostFilterOperator_GreaterThan.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EAKxB,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,KAAK,EACV,wBAAwB,EACxB,2BAA2B,EAC5B,MAAM,mCAAmC,CAAC;AAQ3C,qBAAa,0CAA2C,SAAQ,8BAA8B;IAC5F,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;IAiCrB,kCAAkC,CAChC,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB,GAAG,SAAS;IAajC,6BAA6B,CAC3B,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,kBAAkB,GAC7B,wBAAwB,GAAG,SAAS;CAcxC"}

package/lib/stores/{postFilterOperators → fetch-structure/projection/post-filter/operators}/QueryBuilderPostFilterOperator_GreaterThan.js

@@ -15,11 +15,10 @@
  */
 import { AbstractPropertyExpression, PRIMITIVE_TYPE, SUPPORTED_FUNCTIONS, buildPrimitiveInstanceValue, } from '@finos/legend-graph';
 import { guaranteeNonNullable, UnsupportedOperationError, } from '@finos/legend-shared';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
-import { getNonCollectionValueSpecificationType, isTypeCompatibleWithConditionValueType, } from '../QueryBuilderOperatorsHelper.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../QueryBuilder_Const.js';
 import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
-import { buildPostFilterConditionState } from '../QueryBuilderPostFilterProcessor.js';
-import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationBuilderHelper.js';
+import { buildPostFilterConditionState } from '../QueryBuilderPostFilterValueSpecificationProcessor.js';
+import { generateDefaultValueForPrimitiveType, getNonCollectionValueSpecificationType, isTypeCompatibleForAssignment, } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorHelper.js';
 export class QueryBuilderPostFilterOperator_GreaterThan extends QueryBuilderPostFilterOperator {
     getLabel() {
@@ -37,7 +36,7 @@ export class QueryBuilderPostFilterOperator_GreaterThan extends QueryBuilderPost
         ].includes(type.path);
     }
     isCompatibleWithConditionValue(postFilterConditionState) {
-        return isTypeCompatibleWithConditionValueType(postFilterConditionState.value
+        return isTypeCompatibleForAssignment(postFilterConditionState.value
             ? getNonCollectionValueSpecificationType(postFilterConditionState.value)
             : undefined, guaranteeNonNullable(postFilterConditionState.columnState.getReturnType()));
     }
@@ -48,11 +47,14 @@ export class QueryBuilderPostFilterOperator_GreaterThan extends QueryBuilderPost
             case PRIMITIVE_TYPE.DECIMAL:
             case PRIMITIVE_TYPE.FLOAT:
             case PRIMITIVE_TYPE.INTEGER:
-            case PRIMITIVE_TYPE.DATE:
             case PRIMITIVE_TYPE.STRICTDATE:
             case PRIMITIVE_TYPE.DATETIME: {
-                return buildPrimitiveInstanceValue(postFilterConditionState.postFilterState.queryBuilderState
-                    .graphManagerState.graph, propertyType.path, generateDefaultValueForPrimitiveType(propertyType.path));
+                return buildPrimitiveInstanceValue(postFilterConditionState.postFilterState.projectionState
+                    .queryBuilderState.graphManagerState.graph, propertyType.path, generateDefaultValueForPrimitiveType(propertyType.path));
+            }
+            case PRIMITIVE_TYPE.DATE: {
+                return buildPrimitiveInstanceValue(postFilterConditionState.postFilterState.projectionState
+                    .queryBuilderState.graphManagerState.graph, PRIMITIVE_TYPE.STRICTDATE, generateDefaultValueForPrimitiveType(propertyType.path));
             }
             default:
                 throw new UnsupportedOperationError(`Can't get default value for post-filter operator '${this.getLabel()}' when the LHS property is of type '${propertyType?.path}'`);

package/lib/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderPostFilterOperator_GreaterThan.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.ts"],"names":[],"mappings":"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"}

package/lib/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThanEqual.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderPostFilterOperator_GreaterThanEqual.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThanEqual.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EAIxB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EACV,wBAAwB,EACxB,2BAA2B,EAC5B,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAAE,0CAA0C,EAAE,MAAM,iDAAiD,CAAC;AAE7G,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;CAcxC"}

package/lib/stores/{postFilterOperators → fetch-structure/projection/post-filter/operators}/QueryBuilderPostFilterOperator_GreaterThanEqual.js

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 import { AbstractPropertyExpression, PRIMITIVE_TYPE, SUPPORTED_FUNCTIONS, } from '@finos/legend-graph';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
-import { buildPostFilterConditionState } from '../QueryBuilderPostFilterProcessor.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../QueryBuilder_Const.js';
+import { buildPostFilterConditionState } from '../QueryBuilderPostFilterValueSpecificationProcessor.js';
 import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorHelper.js';
 import { QueryBuilderPostFilterOperator_GreaterThan } from './QueryBuilderPostFilterOperator_GreaterThan.js';
 export class QueryBuilderPostFilterOperator_GreaterThanEqual extends QueryBuilderPostFilterOperator_GreaterThan {

package/lib/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThanEqual.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderPostFilterOperator_GreaterThanEqual.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThanEqual.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,0BAA0B,EAC1B,cAAc,EACd,mBAAmB,GACpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iCAAiC,EAAE,MAAM,sCAAsC,CAAC;AACzF,OAAO,EAAE,6BAA6B,EAAE,MAAM,yDAAyD,CAAC;AAKxG,OAAO,EAAE,kCAAkC,EAAE,MAAM,2CAA2C,CAAC;AAC/F,OAAO,EAAE,0CAA0C,EAAE,MAAM,iDAAiD,CAAC;AAE7G,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,WAAW,CAAC,aAAa,EAAE,EAAE,IAAI;YACxD,cAAc,CAAC,QAAQ;YACvB,wBAAwB,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;gBAC7D,cAAc,CAAC,QAAQ;YACzB,CAAC,CAAC,mBAAmB,CAAC,YAAY;YAClC,CAAC,CAAC,iCAAiC,CAAC,YAAY,CACnD,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,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI;gBAChE,cAAc,CAAC,QAAQ;YACzB,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;gBAC7D,cAAc,CAAC,QAAQ;YACzB,CAAC,CAAC,mBAAmB,CAAC,YAAY;YAClC,CAAC,CAAC,iCAAiC,CAAC,YAAY,EAClD,IAAI,CACL,CAAC;IACJ,CAAC;CACF"}

package/lib/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_In.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderPostFilterOperator_In.d.ts","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/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;AAG7B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,KAAK,EACV,wBAAwB,EACxB,2BAA2B,EAC5B,MAAM,mCAAmC,CAAC;AAQ3C,qBAAa,iCAAkC,SAAQ,8BAA8B;IACnF,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO;IAgBzC,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,OAAO;IA+CV,8BAA8B,CAC5B,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB;IAcrB,kCAAkC,CAChC,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB,GAAG,SAAS;IAQjC,6BAA6B,CAC3B,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,kBAAkB,GAC7B,wBAAwB,GAAG,SAAS;CAQxC;AAED,qBAAa,oCAAqC,SAAQ,iCAAiC;IAChF,QAAQ,IAAI,MAAM;IAIlB,kCAAkC,CACzC,wBAAwB,EAAE,wBAAwB,GACjD,kBAAkB,GAAG,SAAS;IAaxB,6BAA6B,CACpC,eAAe,EAAE,2BAA2B,EAC5C,UAAU,EAAE,wBAAwB,GACnC,wBAAwB,GAAG,SAAS;CAMxC"}

package/lib/stores/{postFilterOperators → fetch-structure/projection/post-filter/operators}/QueryBuilderPostFilterOperator_In.js

@@ -15,11 +15,11 @@
  */
 import { CollectionInstanceValue, Enumeration, PRIMITIVE_TYPE, VariableExpression, GenericTypeExplicitReference, GenericType, TYPICAL_MULTIPLICITY_TYPE, } from '@finos/legend-graph';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
-import { buildNotExpression, getCollectionValueSpecificationType, unwrapNotExpression, } from '../QueryBuilderOperatorsHelper.js';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../QueryBuilder_Const.js';
 import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
-import { buildPostFilterConditionState } from '../QueryBuilderPostFilterProcessor.js';
+import { buildPostFilterConditionState } from '../QueryBuilderPostFilterValueSpecificationProcessor.js';
 import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorHelper.js';
+import { buildNotExpression, getCollectionValueSpecificationType, unwrapNotExpression, } from '../../../../QueryBuilderValueSpecificationHelper.js';
 export class QueryBuilderPostFilterOperator_In extends QueryBuilderPostFilterOperator {
     getLabel() {
         return 'is in';
@@ -42,8 +42,8 @@ export class QueryBuilderPostFilterOperator_In extends QueryBuilderPostFilterOpe
             if (valueSpec.values.length === 0) {
                 return true;
             }
-            const collectionType = getCollectionValueSpecificationType(postFilterConditionState.postFilterState.queryBuilderState
-                .graphManagerState.graph, valueSpec.values);
+            const collectionType = getCollectionValueSpecificationType(postFilterConditionState.postFilterState.projectionState
+                .queryBuilderState.graphManagerState.graph, valueSpec.values);
             if (!collectionType) {
                 return false;
             }
@@ -72,7 +72,7 @@ export class QueryBuilderPostFilterOperator_In extends QueryBuilderPostFilterOpe
         return false;
     }
     getDefaultFilterConditionValue(postFilterConditionState) {
-        const multiplicityOne = postFilterConditionState.postFilterState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE);
+        const multiplicityOne = postFilterConditionState.postFilterState.projectionState.queryBuilderState.graphManagerState.graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE);
         const propertyType = guaranteeNonNullable(postFilterConditionState.columnState.getReturnType());
         return new CollectionInstanceValue(multiplicityOne, GenericTypeExplicitReference.create(new GenericType(propertyType)));
     }
@@ -90,8 +90,8 @@ export class QueryBuilderPostFilterOperator_NotIn extends QueryBuilderPostFilter
     buildPostFilterConditionExpression(postFilterConditionState) {
         const expression = super.buildPostFilterConditionExpression(postFilterConditionState);
         return expression
-            ? buildNotExpression(postFilterConditionState.postFilterState.queryBuilderState
-                .graphManagerState.graph, expression)
+            ? buildNotExpression(postFilterConditionState.postFilterState.projectionState
+                .queryBuilderState.graphManagerState.graph, expression)
             : undefined;
     }
     buildPostFilterConditionState(postFilterState, expression) {

package/lib/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_In.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderPostFilterOperator_In.js","sourceRoot":"","sources":["../../../../../../src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_In.ts"],"names":[],"mappings":"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"}