@finos/legend-query-builder 4.14.31 → 4.14.33

package/src/stores/fetch-structure/tds/projection/QueryBuilderProjectionStateBuilder.ts

@@ -28,7 +28,6 @@ import {
   V1_RawLambda,
   VariableExpression,
   PrimitiveInstanceValue,
-  ColSpecArrayInstance,
 } from '@finos/legend-graph';
 import {
   assertNonNullable,
@@ -45,10 +44,7 @@ import {
   QUERY_BUILDER_SUPPORTED_FUNCTIONS,
   QUERY_BUILDER_SUPPORTED_GET_ALL_FUNCTIONS,
 } from '../../../../graph/QueryBuilderMetaModelConst.js';
-import {
-  QUERY_BUILDER_LAMBDA_WRITER_MODE,
-  type QueryBuilderState,
-} from '../../../QueryBuilderState.js';
+import { type QueryBuilderState } from '../../../QueryBuilderState.js';
 import { QueryBuilderValueSpecificationProcessor } from '../../../QueryBuilderStateBuilder.js';
 import {
   extractNullableNumberFromInstanceValue,
@@ -63,74 +59,11 @@ import {
 import { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import { SortColumnState } from '../QueryResultSetModifierState.js';
 
-export const processTypedTDSProjectExpression = (
-  expression: SimpleFunctionExpression,
-  queryBuilderState: QueryBuilderState,
-  parentLambda: LambdaFunction,
-): void => {
-  // check parameters
-  assertTrue(
-    expression.parametersValues.length === 2,
-    `Can't process project() expression: project() expects 2 arguments`,
-  );
-  // update fetch-structure
-  queryBuilderState.fetchStructureState.changeImplementation(
-    FETCH_STRUCTURE_IMPLEMENTATION.TABULAR_DATA_STRUCTURE,
-  );
-
-  // check preceding expression
-  const precedingExpression = guaranteeType(
-    expression.parametersValues[0],
-    SimpleFunctionExpression,
-    `Can't process project() expression: only support project() immediately following an expression`,
-  );
-  assertTrue(
-    matchFunctionName(precedingExpression.functionName, [
-      QUERY_BUILDER_SUPPORTED_GET_ALL_FUNCTIONS.GET_ALL,
-      QUERY_BUILDER_SUPPORTED_GET_ALL_FUNCTIONS.GET_ALL_VERSIONS,
-      QUERY_BUILDER_SUPPORTED_GET_ALL_FUNCTIONS.GET_ALL_VERSIONS_IN_RANGE,
-      QUERY_BUILDER_SUPPORTED_FUNCTIONS.FILTER,
-      QUERY_BUILDER_SUPPORTED_FUNCTIONS.WATERMARK,
-    ]),
-    `Can't process project() expression: only support project() immediately following either getAll(), filter(), or forWatermark()`,
-  );
-  QueryBuilderValueSpecificationProcessor.process(
-    precedingExpression,
-    parentLambda,
-    queryBuilderState,
-  );
-  // check columns
-  const classInstance = expression.parametersValues[1];
-  assertType(
-    classInstance,
-    ColSpecArrayInstance,
-    `Can't process project() expression: project() expects argument #1 to be a ColSpecArrayInstance`,
-  );
-  queryBuilderState.setLambdaWriteMode(
-    QUERY_BUILDER_LAMBDA_WRITER_MODE.TYPED_FETCH_STRUCTURE,
-  );
-  QueryBuilderValueSpecificationProcessor.processChild(
-    classInstance,
-    expression,
-    parentLambda,
-    queryBuilderState,
-  );
-};
-
 export const processTDSProjectExpression = (
   expression: SimpleFunctionExpression,
   queryBuilderState: QueryBuilderState,
   parentLambda: LambdaFunction,
 ): void => {
-  if (expression.parametersValues.length === 2) {
-    processTypedTDSProjectExpression(
-      expression,
-      queryBuilderState,
-      parentLambda,
-    );
-
-    return;
-  }
   // update fetch-structure
   queryBuilderState.fetchStructureState.changeImplementation(
     FETCH_STRUCTURE_IMPLEMENTATION.TABULAR_DATA_STRUCTURE,

package/src/stores/fetch-structure/tds/projection/QueryBuilderTypedProjectionStateBuilder.ts

@@ -0,0 +1,103 @@
+/**
+ * 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 {
+  type LambdaFunction,
+  SimpleFunctionExpression,
+  matchFunctionName,
+  ColSpecArrayInstance,
+} from '@finos/legend-graph';
+import { FETCH_STRUCTURE_IMPLEMENTATION } from '../../QueryBuilderFetchStructureImplementationState.js';
+import { assertTrue, assertType, guaranteeType } from '@finos/legend-shared';
+import {
+  QUERY_BUILDER_LAMBDA_WRITER_MODE,
+  type QueryBuilderState,
+} from '../../../QueryBuilderState.js';
+import {
+  QUERY_BUILDER_SUPPORTED_FUNCTIONS,
+  QUERY_BUILDER_SUPPORTED_GET_ALL_FUNCTIONS,
+} from '../../../../graph/QueryBuilderMetaModelConst.js';
+import { QueryBuilderValueSpecificationProcessor } from '../../../QueryBuilderStateBuilder.js';
+
+export const processTypedTDSProjectExpression = (
+  expression: SimpleFunctionExpression,
+  queryBuilderState: QueryBuilderState,
+  parentLambda: LambdaFunction,
+): void => {
+  // check parameters
+  assertTrue(
+    expression.parametersValues.length === 2,
+    `Can't process typed project() expression: typed project() expects 2 arguments`,
+  );
+  // update fetch-structure
+  queryBuilderState.fetchStructureState.changeImplementation(
+    FETCH_STRUCTURE_IMPLEMENTATION.TABULAR_DATA_STRUCTURE,
+  );
+
+  // check preceding expression
+  const precedingExpression = guaranteeType(
+    expression.parametersValues[0],
+    SimpleFunctionExpression,
+    `Can't process typed project() expression: only support typed project() immediately following an expression`,
+  );
+  assertTrue(
+    matchFunctionName(precedingExpression.functionName, [
+      QUERY_BUILDER_SUPPORTED_GET_ALL_FUNCTIONS.GET_ALL,
+      QUERY_BUILDER_SUPPORTED_GET_ALL_FUNCTIONS.GET_ALL_VERSIONS,
+      QUERY_BUILDER_SUPPORTED_GET_ALL_FUNCTIONS.GET_ALL_VERSIONS_IN_RANGE,
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.FILTER,
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.WATERMARK,
+    ]),
+    `Can't process typed project() expression: only support typed project() immediately following either getAll(), filter(), or forWatermark()`,
+  );
+  QueryBuilderValueSpecificationProcessor.process(
+    precedingExpression,
+    parentLambda,
+    queryBuilderState,
+  );
+  // check columns
+  const classInstance = expression.parametersValues[1];
+  assertType(
+    classInstance,
+    ColSpecArrayInstance,
+    `Can't process typed project() expression: typed project() expects argument #1 to be a ColSpec Array Instance`,
+  );
+  queryBuilderState.setLambdaWriteMode(
+    QUERY_BUILDER_LAMBDA_WRITER_MODE.TYPED_FETCH_STRUCTURE,
+  );
+  QueryBuilderValueSpecificationProcessor.processChild(
+    classInstance,
+    expression,
+    parentLambda,
+    queryBuilderState,
+  );
+};
+
+export const isTypedProjectionExpression = (
+  expression: SimpleFunctionExpression,
+): boolean => {
+  if (
+    matchFunctionName(expression.functionName, [
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_PROJECT,
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.RELATION_PROJECT,
+    ])
+  ) {
+    if (expression.parametersValues.length === 2) {
+      return expression.parametersValues[1] instanceof ColSpecArrayInstance;
+    }
+  }
+  return false;
+};

package/tsconfig.json

@@ -136,6 +136,7 @@
     "./src/stores/fetch-structure/tds/projection/QueryBuilderProjectionStateBuilder.ts",
     "./src/stores/fetch-structure/tds/projection/QueryBuilderProjectionValueSpecificationBuilder.ts",
     "./src/stores/fetch-structure/tds/projection/QueryBuilderRelationProjectValueSpecBuidler.ts",
+    "./src/stores/fetch-structure/tds/projection/QueryBuilderTypedProjectionStateBuilder.ts",
     "./src/stores/fetch-structure/tds/window/QueryBuilderWindowGroupByOperatorLoader.ts",
     "./src/stores/fetch-structure/tds/window/QueryBuilderWindowState.ts",
     "./src/stores/fetch-structure/tds/window/QueryBuilderWindowStateBuilder.ts",