@finos/legend-application-query 5.2.6 → 5.2.7

package/src/stores/fetch-structure/projection/post-filter/{QueryBuilderPostFilterValueSpecificationProcessor.ts → QueryBuilderPostFilterStateBuilder.ts}

@@ -15,16 +15,18 @@
  */
 
 import {
-  type LambdaFunctionInstanceValue,
+  LambdaFunctionInstanceValue,
   AbstractPropertyExpression,
   extractElementNameFromPath,
   PrimitiveInstanceValue,
   matchFunctionName,
   VariableExpression,
   FunctionExpression,
+  type SimpleFunctionExpression,
 } from '@finos/legend-graph';
 import {
   assertTrue,
+  assertType,
   guaranteeIsString,
   guaranteeNonNullable,
   guaranteeType,
@@ -32,7 +34,6 @@ import {
 } from '@finos/legend-shared';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../QueryBuilder_Const.js';
 import type { QueryBuilderAggregateColumnState } from '../aggregation/QueryBuilderAggregationState.js';
-import { FETCH_STRUCTURE_MODE } from '../../QueryBuilderFetchStructureState.js';
 import type { QueryBuilderPostFilterOperator } from './QueryBuilderPostFilterOperator.js';
 import {
   type QueryBuilderPostFilterState,
@@ -48,13 +49,14 @@ import {
   QueryBuilderDerivationProjectionColumnState,
 } from '../QueryBuilderProjectionColumnState.js';
 import { toGroupOperation } from '../../../QueryBuilderGroupOperationHelper.js';
+import { QueryBuilderProjectionState } from '../QueryBuilderProjectionState.js';
+import type { QueryBuilderState } from '../../../QueryBuilderState.js';
 
 const findProjectionColumnState = (
   propertyExpression: AbstractPropertyExpression,
   postFilterState: QueryBuilderPostFilterState,
 ): QueryBuilderProjectionColumnState | QueryBuilderAggregateColumnState => {
-  const fetchStructureState =
-    postFilterState.projectionState.fetchStructureState;
+  const projectionState = postFilterState.projectionState;
   const properyExpressionName = propertyExpression.func.name;
   assertTrue(
     Object.values(TDS_COLUMN_GETTER).includes(
@@ -75,8 +77,8 @@ const findProjectionColumnState = (
     'Can`t process TDS column expression: Column should be a string primitive instance value',
   );
   const columnStates = [
-    ...fetchStructureState.projectionState.aggregationState.columns,
-    ...fetchStructureState.projectionState.columns,
+    ...projectionState.aggregationState.columns,
+    ...projectionState.columns,
   ];
   const columnState = guaranteeNonNullable(
     columnStates.find((c) => c.columnName === columnName),
@@ -180,7 +182,7 @@ export const buildPostFilterConditionState = (
   return postConditionState;
 };
 
-const processPostFilterExpression = (
+const processPostFilterTree = (
   expression: FunctionExpression,
   postFilterState: QueryBuilderPostFilterState,
   parentPostFilterNodeId: string | undefined,
@@ -189,10 +191,10 @@ const processPostFilterExpression = (
     ? postFilterState.getNode(parentPostFilterNodeId)
     : undefined;
   if (
-    [
+    matchFunctionName(expression.functionName, [
       QUERY_BUILDER_SUPPORTED_FUNCTIONS.AND,
       QUERY_BUILDER_SUPPORTED_FUNCTIONS.OR,
-    ].some((fn) => matchFunctionName(expression.functionName, fn))
+    ])
   ) {
     const groupNode = new QueryBuilderPostFilterTreeGroupNodeData(
       parentPostFilterNodeId,
@@ -200,7 +202,7 @@ const processPostFilterExpression = (
     );
     postFilterState.nodes.set(groupNode.id, groupNode);
     expression.parametersValues.forEach((postFilterExpression) =>
-      processPostFilterExpression(
+      processPostFilterTree(
         guaranteeType(
           postFilterExpression,
           FunctionExpression,
@@ -235,43 +237,61 @@ const processPostFilterExpression = (
   }
 };
 
-export const processPostFilterLambda = (
-  postFilterLambda: LambdaFunctionInstanceValue,
-  postFilterState: QueryBuilderPostFilterState,
+export const processTDSPostFilterExpression = (
+  expression: SimpleFunctionExpression,
+  queryBuilderState: QueryBuilderState,
 ): void => {
-  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`,
-  );
-  const rootExpression = guaranteeType(
-    lambdaFunc.expressionSequence[0],
-    FunctionExpression,
-    `Can't process post-filter lambda: only support post-filter lambda body of type 'FunctionExpression'`,
-  );
-  assertTrue(
-    lambdaFunc.functionType.parameters.length === 1,
-    `Can't process post-filter lambda: only support post-filter lambda with 1 parameter`,
-  );
-  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);
+  if (
+    queryBuilderState.fetchStructureState.implementation instanceof
+    QueryBuilderProjectionState
+  ) {
+    const projectionState =
+      queryBuilderState.fetchStructureState.implementation;
+    const postFilterState = projectionState.postFilterState;
+    const fetchStructureState = projectionState.fetchStructureState;
+    const postFilterLambda = expression.parametersValues[1];
+    assertType(
+      postFilterLambda,
+      LambdaFunctionInstanceValue,
+      `Can't process post-filter expression: expects argument #1 to be a lambda function`,
+    );
+
+    assertType(
+      fetchStructureState.implementation,
+      QueryBuilderProjectionState,
+      `Can't process post-filter lambda: post-filter lambda must use projection fetch structure`,
+    );
+    assertTrue(
+      Boolean(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`,
+    );
+    const rootExpression = guaranteeType(
+      lambdaFunc.expressionSequence[0],
+      FunctionExpression,
+      `Can't process post-filter lambda: only support post-filter lambda body of type 'FunctionExpression'`,
+    );
+    assertTrue(
+      lambdaFunc.functionType.parameters.length === 1,
+      `Can't process post-filter lambda: only support post-filter lambda with 1 parameter`,
+    );
+    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,
+    );
+    processPostFilterTree(rootExpression, postFilterState, undefined);
+
+    projectionState.setShowPostFilterPanel(true);
+    postFilterState.simplifyTree();
+  }
 };

package/src/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterValueSpecificationBuilder.ts

@@ -21,15 +21,10 @@ import {
   type LambdaFunction,
   type ValueSpecification,
 } from '@finos/legend-graph';
-import {
-  assertTrue,
-  guaranteeNonNullable,
-  isNonNullable,
-} from '@finos/legend-shared';
+import { 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,
@@ -105,11 +100,6 @@ export const appendPostFilter = (
   ) {
     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,

package/src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_Contain.ts

@@ -28,7 +28,7 @@ import {
 } from '@finos/legend-shared';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../QueryBuilder_Const.js';
 import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
-import { buildPostFilterConditionState } from '../QueryBuilderPostFilterValueSpecificationProcessor.js';
+import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
 import type {
   PostFilterConditionState,
   QueryBuilderPostFilterState,

package/src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.ts

@@ -24,7 +24,7 @@ import {
 import { UnsupportedOperationError } from '@finos/legend-shared';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../QueryBuilder_Const.js';
 import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
-import { buildPostFilterConditionState } from '../QueryBuilderPostFilterValueSpecificationProcessor.js';
+import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
 import type {
   PostFilterConditionState,
   QueryBuilderPostFilterState,

package/src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_Equal.ts

@@ -37,7 +37,7 @@ import {
 } from '@finos/legend-shared';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../QueryBuilder_Const.js';
 import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
-import { buildPostFilterConditionState } from '../QueryBuilderPostFilterValueSpecificationProcessor.js';
+import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
 import type {
   PostFilterConditionState,
   QueryBuilderPostFilterState,

package/src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThan.ts

@@ -29,7 +29,7 @@ import {
 } from '@finos/legend-shared';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../QueryBuilder_Const.js';
 import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
-import { buildPostFilterConditionState } from '../QueryBuilderPostFilterValueSpecificationProcessor.js';
+import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
 import type {
   PostFilterConditionState,
   QueryBuilderPostFilterState,

package/src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_GreaterThanEqual.ts

@@ -22,7 +22,7 @@ import {
   SUPPORTED_FUNCTIONS,
 } from '@finos/legend-graph';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../QueryBuilder_Const.js';
-import { buildPostFilterConditionState } from '../QueryBuilderPostFilterValueSpecificationProcessor.js';
+import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
 import type {
   PostFilterConditionState,
   QueryBuilderPostFilterState,

package/src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_In.ts

@@ -30,7 +30,7 @@ import {
 import { guaranteeNonNullable } from '@finos/legend-shared';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../QueryBuilder_Const.js';
 import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
-import { buildPostFilterConditionState } from '../QueryBuilderPostFilterValueSpecificationProcessor.js';
+import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
 import type {
   PostFilterConditionState,
   QueryBuilderPostFilterState,

package/src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_IsEmpty.ts

@@ -22,7 +22,7 @@ import {
   PRIMITIVE_TYPE,
 } from '@finos/legend-graph';
 import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
-import { buildPostFilterConditionState } from '../QueryBuilderPostFilterValueSpecificationProcessor.js';
+import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
 import {
   type PostFilterConditionState,
   type QueryBuilderPostFilterState,

package/src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_LessThan.ts

@@ -29,7 +29,7 @@ import {
 } from '@finos/legend-shared';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../QueryBuilder_Const.js';
 import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
-import { buildPostFilterConditionState } from '../QueryBuilderPostFilterValueSpecificationProcessor.js';
+import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
 import type {
   PostFilterConditionState,
   QueryBuilderPostFilterState,

package/src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_LessThanEqual.ts

@@ -22,7 +22,7 @@ import {
   SUPPORTED_FUNCTIONS,
 } from '@finos/legend-graph';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../QueryBuilder_Const.js';
-import { buildPostFilterConditionState } from '../QueryBuilderPostFilterValueSpecificationProcessor.js';
+import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
 import type {
   PostFilterConditionState,
   QueryBuilderPostFilterState,

package/src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_StartWith.ts

@@ -25,7 +25,7 @@ import {
 import { UnsupportedOperationError } from '@finos/legend-shared';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../QueryBuilder_Const.js';
 import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
-import { buildPostFilterConditionState } from '../QueryBuilderPostFilterValueSpecificationProcessor.js';
+import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
 import type {
   PostFilterConditionState,
   QueryBuilderPostFilterState,

package/src/stores/filter/QueryBuilderFilterStateBuilder.ts

@@ -0,0 +1,155 @@
+/**
+ * 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 {
+  AbstractPropertyExpression,
+  LambdaFunctionInstanceValue,
+  matchFunctionName,
+  SimpleFunctionExpression,
+  VariableExpression,
+} from '@finos/legend-graph';
+import {
+  assertTrue,
+  assertType,
+  guaranteeNonNullable,
+  guaranteeType,
+  returnUndefOnError,
+  UnsupportedOperationError,
+} from '@finos/legend-shared';
+import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../QueryBuilder_Const.js';
+import { toGroupOperation } from '../QueryBuilderGroupOperationHelper.js';
+import type { QueryBuilderState } from '../QueryBuilderState.js';
+import { validatePropertyExpressionChain } from '../QueryBuilderValueSpecificationHelper.js';
+import {
+  type QueryBuilderFilterState,
+  QueryBuilderFilterTreeConditionNodeData,
+  QueryBuilderFilterTreeGroupNodeData,
+} from './QueryBuilderFilterState.js';
+
+const processFilterTree = (
+  expression: SimpleFunctionExpression,
+  filterState: QueryBuilderFilterState,
+  parentFilterNodeId: string | undefined,
+): void => {
+  const parentNode = parentFilterNodeId
+    ? filterState.getNode(parentFilterNodeId)
+    : undefined;
+  if (
+    matchFunctionName(expression.functionName, [
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.AND,
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.OR,
+    ])
+  ) {
+    const groupNode = new QueryBuilderFilterTreeGroupNodeData(
+      parentFilterNodeId,
+      toGroupOperation(expression.functionName),
+    );
+    filterState.nodes.set(groupNode.id, groupNode);
+    expression.parametersValues.forEach((filterExpression) =>
+      processFilterTree(
+        guaranteeType(
+          filterExpression,
+          SimpleFunctionExpression,
+          `Can't process filter group expression: each child expression must be a function expression`,
+        ),
+        filterState,
+        groupNode.id,
+      ),
+    );
+    filterState.addNodeFromNode(groupNode, parentNode);
+  } else {
+    const propertyExpression = expression.parametersValues[0];
+    if (propertyExpression instanceof AbstractPropertyExpression) {
+      const currentPropertyExpression = propertyExpression.parametersValues[0];
+      if (currentPropertyExpression instanceof AbstractPropertyExpression) {
+        validatePropertyExpressionChain(
+          currentPropertyExpression,
+          filterState.queryBuilderState.graphManagerState.graph,
+        );
+      }
+    }
+    for (const operator of filterState.operators) {
+      // NOTE: this allow plugin author to either return `undefined` or throw error
+      // if there is a problem with building the lambda. Either case, the plugin is
+      // considered as not supporting the lambda.
+      const filterConditionState = returnUndefOnError(() =>
+        operator.buildFilterConditionState(filterState, expression),
+      );
+      if (filterConditionState) {
+        filterState.addNodeFromNode(
+          new QueryBuilderFilterTreeConditionNodeData(
+            undefined,
+            filterConditionState,
+          ),
+          parentNode,
+        );
+        return;
+      }
+    }
+    throw new UnsupportedOperationError(
+      `Can't process filter() expression: no compatible filter operator processer available from plugins`,
+    );
+  }
+};
+
+export const processFilterExpression = (
+  expression: SimpleFunctionExpression,
+  queryBuilderState: QueryBuilderState,
+): void => {
+  const filterState = queryBuilderState.filterState;
+  const filterLambda = expression.parametersValues[1];
+  assertType(
+    filterLambda,
+    LambdaFunctionInstanceValue,
+    `Can't process filter() expression: filter() expects argument #1 to be a lambda function`,
+  );
+
+  const lambdaFunc = guaranteeNonNullable(
+    filterLambda.values[0],
+    `Can't process filter() lambda: filter() lambda function is missing`,
+  );
+  assertTrue(
+    lambdaFunc.expressionSequence.length === 1,
+    `Can't process filter() lambda: only support filter() lambda body with 1 expression`,
+  );
+  const rootExpression = guaranteeType(
+    lambdaFunc.expressionSequence[0],
+    SimpleFunctionExpression,
+    `Can't process filter() lambda: only support filter() lambda body with 1 expression`,
+  );
+
+  assertTrue(
+    lambdaFunc.functionType.parameters.length === 1,
+    `Can't process filter() lambda: only support filter() lambda with 1 parameter`,
+  );
+  filterState.setLambdaParameterName(
+    guaranteeType(
+      lambdaFunc.functionType.parameters[0],
+      VariableExpression,
+      `Can't process filter() lambda: only support filter() lambda with 1 parameter`,
+    ).name,
+  );
+
+  processFilterTree(rootExpression, filterState, undefined);
+
+  /**
+   * NOTE: Since group operations like and/or do not take more than 2 parameters, if there are
+   * more than 2 clauses in each group operations, then these clauses are converted into an
+   * unbalanced tree. However, this would look quite bad for UX, as such, we simplify the tree.
+   * After building the filter state.
+   */
+  filterState.simplifyTree();
+};

package/src/stores/filter/operators/QueryBuilderFilterOperatorHelper.ts

@@ -36,8 +36,8 @@ import {
 } from '../QueryBuilderFilterState.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../QueryBuilder_Const.js';
 import { buildGenericLambdaFunctionInstanceValue } from '../../QueryBuilderValueSpecificationHelper.js';
-import { buildPropertyExpressionChain } from '../../QueryBuilderValueSpecificationBuilder.js';
 import type { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
+import { buildPropertyExpressionChain } from '../../QueryBuilderValueSpecificationBuilderHelper.js';
 
 const getPropertyExpressionChainVariable = (
   propertyExpression: AbstractPropertyExpression,
@@ -261,12 +261,12 @@ export const buildFilterConditionExpression = (
  */
 const buildFilterConditionStateWithExists = (
   filterState: QueryBuilderFilterState,
-  precedingExpression: SimpleFunctionExpression,
+  parentExpression: SimpleFunctionExpression,
   operatorFunctionFullPath: string,
 ): [FilterConditionState | undefined, SimpleFunctionExpression | undefined] => {
   if (
     matchFunctionName(
-      precedingExpression.functionName,
+      parentExpression.functionName,
       QUERY_BUILDER_SUPPORTED_FUNCTIONS.EXISTS,
     )
   ) {
@@ -277,7 +277,7 @@ const buildFilterConditionStateWithExists = (
     // e.g. |Firm.all()->filter(x|$x.employees->exists(x_1|$x_1->subType(@Develper).id->exists(x_2|$x_2 == 1))
     // In the first exists() lambda, `$x_1->subType(@Develper).id` is an `AbstractPropertyExpression`.
     const existsLambdaExpressions: AbstractPropertyExpression[] = [];
-    let mainFilterExpression: SimpleFunctionExpression = precedingExpression;
+    let mainFilterExpression: SimpleFunctionExpression = parentExpression;
     while (
       matchFunctionName(
         mainFilterExpression.functionName,
@@ -338,7 +338,7 @@ const buildFilterConditionStateWithExists = (
         TYPICAL_MULTIPLICITY_TYPE.ONE,
       );
     const initialPropertyExpression = guaranteeType(
-      precedingExpression.parametersValues[0],
+      parentExpression.parametersValues[0],
       AbstractPropertyExpression,
     );
     let flattenedPropertyExpressionChain = new AbstractPropertyExpression(

package/tsconfig.json

@@ -21,7 +21,7 @@
     "noImplicitOverride": true,
     "noUncheckedIndexedAccess": true,
     "exactOptionalPropertyTypes": true,
-    "forceConsistentCasingInFileNames": true,
+    "forceConsistentCasingInFileNames": false,
     "outDir": "./lib",
     "tsBuildInfoFile": "./build/prod.tsbuildinfo",
     "rootDir": "./src",
@@ -59,12 +59,13 @@
     "./src/stores/QueryBuilderResultState.ts",
     "./src/stores/QueryBuilderSetupState.ts",
     "./src/stores/QueryBuilderState.ts",
-    "./src/stores/QueryBuilderTestUtils.ts",
+    "./src/stores/QueryBuilderStateBuilder.ts",
+    "./src/stores/QueryBuilderStateTestUtils.ts",
     "./src/stores/QueryBuilderTypeaheadHelper.ts",
     "./src/stores/QueryBuilderUnsupportedState.ts",
     "./src/stores/QueryBuilderValueSpecificationBuilder.ts",
+    "./src/stores/QueryBuilderValueSpecificationBuilderHelper.ts",
     "./src/stores/QueryBuilderValueSpecificationHelper.ts",
-    "./src/stores/QueryBuilderValueSpecificationProcessor.ts",
     "./src/stores/QueryEditorStore.ts",
     "./src/stores/QueryEditorStoreTestUtils.ts",
     "./src/stores/QueryParametersState.ts",
@@ -76,15 +77,18 @@
     "./src/stores/fetch-structure/QueryBuilderFetchStructureImplementationState.ts",
     "./src/stores/fetch-structure/QueryBuilderFetchStructureState.ts",
     "./src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.ts",
+    "./src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeStateBuilder.ts",
     "./src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeUtil.ts",
     "./src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchValueSpecificationBuilder.ts",
     "./src/stores/fetch-structure/projection/QueryBuilderProjectionColumnState.ts",
     "./src/stores/fetch-structure/projection/QueryBuilderProjectionState.ts",
+    "./src/stores/fetch-structure/projection/QueryBuilderProjectionStateBuilder.ts",
     "./src/stores/fetch-structure/projection/QueryBuilderProjectionValueSpecificationBuilder.ts",
     "./src/stores/fetch-structure/projection/QueryResultSetModifierState.ts",
     "./src/stores/fetch-structure/projection/aggregation/QueryBuilderAggregateOperator.ts",
     "./src/stores/fetch-structure/projection/aggregation/QueryBuilderAggregateOperatorLoader.ts",
     "./src/stores/fetch-structure/projection/aggregation/QueryBuilderAggregationState.ts",
+    "./src/stores/fetch-structure/projection/aggregation/QueryBuilderAggregationStateBuilder.ts",
     "./src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperatorHelper.ts",
     "./src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Average.ts",
     "./src/stores/fetch-structure/projection/aggregation/operators/QueryBuilderAggregateOperator_Count.ts",
@@ -99,8 +103,8 @@
     "./src/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterOperator.ts",
     "./src/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterOperatorLoader.ts",
     "./src/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterState.ts",
+    "./src/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterStateBuilder.ts",
     "./src/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterValueSpecificationBuilder.ts",
-    "./src/stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterValueSpecificationProcessor.ts",
     "./src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperatorHelper.ts",
     "./src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_Contain.ts",
     "./src/stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_EndWith.ts",
@@ -115,7 +119,8 @@
     "./src/stores/filter/QueryBuilderFilterOperator.ts",
     "./src/stores/filter/QueryBuilderFilterOperatorLoader.ts",
     "./src/stores/filter/QueryBuilderFilterState.ts",
-    "./src/stores/filter/QueryBuilderValueSpecificationBuilder.ts",
+    "./src/stores/filter/QueryBuilderFilterStateBuilder.ts",
+    "./src/stores/filter/QueryBuilderFilterValueSpecificationBuilder.ts",
     "./src/stores/filter/operators/QueryBuilderFilterOperatorHelper.ts",
     "./src/stores/filter/operators/QueryBuilderFilterOperator_Contain.ts",
     "./src/stores/filter/operators/QueryBuilderFilterOperator_EndWith.ts",

package/tsconfig.package.json

@@ -21,7 +21,7 @@
     "noImplicitOverride": true,
     "noUncheckedIndexedAccess": true,
     "exactOptionalPropertyTypes": true,
-    "forceConsistentCasingInFileNames": true,
+    "forceConsistentCasingInFileNames": false,
     "outDir": "./lib",
     "tsBuildInfoFile": "./build/package.tsbuildinfo",
     "rootDir": "./"

package/lib/stores/QueryBuilderTestUtils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBuilderTestUtils.d.ts","sourceRoot":"","sources":["../../src/stores/QueryBuilderTestUtils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EACL,KAAK,SAAS,EACd,KAAK,qCAAqC,EAG3C,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAKpD,OAAO,EACL,iBAAiB,EAElB,MAAM,wBAAwB,CAAC;AAGhC,eAAO,MAAM,2BAA2B,aAC5B,MAAM,EAAE,cACN,SAAS,GAAG,SAAS,qBAE7B;IACE,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B,GACD,SAAS,0CAET,qCAAqC,GACrC,SAAS,KACZ,QAAQ,iBAAiB,CAgD3B,CAAC"}

package/lib/stores/QueryBuilderTestUtils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBuilderTestUtils.js","sourceRoot":"","sources":["../../src/stores/QueryBuilderTestUtils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAC1E,OAAO,EAGL,4BAA4B,EAC5B,8BAA8B,GAC/B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,wBAAwB,EAAE,MAAM,4CAA4C,CAAC;AACtF,OAAO,EAAE,+BAA+B,EAAE,MAAM,oDAAoD,CAAC;AACrG,OAAO,EACL,iBAAiB,EACjB,wBAAwB,GACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,yCAAyC,EAAE,MAAM,gCAAgC,CAAC;AAE3F,MAAM,CAAC,MAAM,2BAA2B,GAAG,KAAK,EAC9C,QAAkB,EAClB,SAAiC,EACjC,gBAMa,EACb,qCAEa,EACe,EAAE;IAC9B,MAAM,aAAa,GAAG,wBAAwB,CAAC,MAAM,EAAE,CAAC;IACxD,aAAa,CAAC,UAAU,CAAC,CAAC,IAAI,+BAA+B,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC5E,MAAM,gBAAgB,GAAG,6BAA6B,CACpD,yCAAyC,EAAE,EAC3C,wBAAwB,CAAC,MAAM,EAAE,CAClC,CAAC;IACF,MAAM,iBAAiB,GAAG,8BAA8B,CAAC,aAAa,CAAC,CAAC;IACxE,MAAM,4BAA4B,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;IAChE,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,CAC7C,gBAAgB,EAChB,iBAAiB,EACjB,IAAI,wBAAwB,EAAE,CAC/B,CAAC;IACF,IAAI,SAAS,EAAE;QACb,iBAAiB,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;KACtD;IACD,IAAI,gBAAgB,EAAE;QACpB,MAAM,KAAK,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAAC;QACxD,iBAAiB,CAAC,eAAe,CAAC,MAAM,GAAG,KAAK,CAAC,QAAQ,CACvD,gBAAgB,CAAC,MAAM,CACxB,CAAC;QACF,iBAAiB,CAAC,eAAe,CAAC,OAAO,GAAG,KAAK,CAAC,UAAU,CAC1D,gBAAgB,CAAC,OAAO,CACzB,CAAC;QACF,IAAI,gBAAgB,CAAC,OAAO,EAAE;YAC5B,iBAAiB,CAAC,eAAe,CAAC,YAAY,GAAG,KAAK,CAAC,UAAU,CAC/D,gBAAgB,CAAC,OAAO,CACzB,CAAC;SACH;KACF;IACD,IAAI,qCAAqC,EAAE;QACzC,IAAI;aACD,KAAK,CACJ,iBAAiB,CAAC,iBAAiB,CAAC,YAAY,EAChD,6BAA6B,CAC9B;aACA,iBAAiB,CAChB,iBAAiB,CAAC,iBAAiB,CAAC,YAAY,CAAC,uCAAuC,CACtF,qCAAqC,CACtC,CACF,CAAC;QAEJ,MAAM,UAAU,CACd,iBAAiB,CAAC,aAAa,CAAC,2BAA2B,EAAE,CAC9D,CAAC;KACH;IACD,OAAO,iBAAiB,CAAC;AAC3B,CAAC,CAAC"}