@finos/legend-query-builder 4.9.4 → 4.10.0

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

@@ -20,6 +20,7 @@ import {
   type FunctionExpression,
   AbstractPropertyExpression,
   PRIMITIVE_TYPE,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   guaranteeNonNullable,
@@ -35,7 +36,6 @@ import type {
 } from '../QueryBuilderPostFilterState.js';
 import {
   generateDefaultValueForPrimitiveType,
-  getNonCollectionValueSpecificationType,
   isTypeCompatibleForAssignment,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
@@ -69,11 +69,11 @@ export class QueryBuilderPostFilterOperator_GreaterThan
     postFilterConditionState: PostFilterConditionState,
   ): boolean {
     return isTypeCompatibleForAssignment(
-      postFilterConditionState.value
-        ? getNonCollectionValueSpecificationType(postFilterConditionState.value)
+      !postFilterConditionState.rightConditionValue.isCollection
+        ? postFilterConditionState.rightConditionValue.type
         : undefined,
       guaranteeNonNullable(
-        postFilterConditionState.columnState.getColumnType(),
+        postFilterConditionState.leftConditionValue.getColumnType(),
       ),
     );
   }
@@ -81,7 +81,8 @@ export class QueryBuilderPostFilterOperator_GreaterThan
   getDefaultFilterConditionValue(
     postFilterConditionState: PostFilterConditionState,
   ): ValueSpecification {
-    const propertyType = postFilterConditionState.columnState.getColumnType();
+    const propertyType =
+      postFilterConditionState.leftConditionValue.getColumnType();
     switch (propertyType?.path) {
       case PRIMITIVE_TYPE.NUMBER:
       case PRIMITIVE_TYPE.DECIMAL:
@@ -121,10 +122,10 @@ export class QueryBuilderPostFilterOperator_GreaterThan
     return buildPostFilterConditionExpression(
       postFilterConditionState,
       this,
-      postFilterConditionState.columnState.getColumnType()?.path ===
-        PRIMITIVE_TYPE.DATETIME &&
-        postFilterConditionState.value?.genericType?.value.rawType.path !==
-          PRIMITIVE_TYPE.DATETIME
+      postFilterConditionState.leftConditionValue.getColumnType() ===
+        PrimitiveType.DATETIME &&
+        postFilterConditionState.rightConditionValue.type !==
+          PrimitiveType.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_AFTER_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.GREATER_THAN,
     );

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

@@ -19,6 +19,7 @@ import {
   type ValueSpecification,
   AbstractPropertyExpression,
   PRIMITIVE_TYPE,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
 import type {
@@ -42,10 +43,10 @@ export class QueryBuilderPostFilterOperator_GreaterThanEqual extends QueryBuilde
     return buildPostFilterConditionExpression(
       postFilterConditionState,
       this,
-      postFilterConditionState.columnState.getColumnType()?.path ===
-        PRIMITIVE_TYPE.DATETIME &&
-        postFilterConditionState.value?.genericType?.value.rawType.path !==
-          PRIMITIVE_TYPE.DATETIME
+      postFilterConditionState.leftConditionValue.getColumnType() ===
+        PrimitiveType.DATETIME &&
+        postFilterConditionState.rightConditionValue.type !==
+          PrimitiveType.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_AFTER_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.GREATER_THAN_EQUAL,
     );

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

@@ -34,9 +34,10 @@ import {
 } from '@finos/legend-shared';
 import { QueryBuilderPostFilterOperator } from '../QueryBuilderPostFilterOperator.js';
 import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
-import type {
-  PostFilterConditionState,
-  QueryBuilderPostFilterState,
+import {
+  PostFilterValueSpecConditionValueState,
+  type PostFilterConditionState,
+  type QueryBuilderPostFilterState,
 } from '../QueryBuilderPostFilterState.js';
 import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import {
@@ -75,47 +76,51 @@ export class QueryBuilderPostFilterOperator_In
     postFilterConditionState: PostFilterConditionState,
   ): boolean {
     const propertyType = guaranteeNonNullable(
-      postFilterConditionState.columnState.getColumnType(),
+      postFilterConditionState.leftConditionValue.getColumnType(),
     );
-    const valueSpec = postFilterConditionState.value;
-    if (valueSpec instanceof CollectionInstanceValue) {
-      if (valueSpec.values.length === 0) {
-        return true;
-      }
-      const collectionType = getCollectionValueSpecificationType(
-        postFilterConditionState.postFilterState.tdsState.queryBuilderState
-          .graphManagerState.graph,
-        valueSpec.values,
-      );
-      if (!collectionType) {
-        return false;
-      }
-      if (
-        (
-          [
-            PRIMITIVE_TYPE.NUMBER,
-            PRIMITIVE_TYPE.INTEGER,
-            PRIMITIVE_TYPE.DECIMAL,
-            PRIMITIVE_TYPE.FLOAT,
-          ] as string[]
-        ).includes(propertyType.path)
-      ) {
-        return (
-          [
-            PRIMITIVE_TYPE.NUMBER,
-            PRIMITIVE_TYPE.INTEGER,
-            PRIMITIVE_TYPE.DECIMAL,
-            PRIMITIVE_TYPE.FLOAT,
-          ] as string[]
-        ).includes(collectionType.path);
-      }
-      return collectionType === propertyType;
-    } else if (valueSpec instanceof VariableExpression) {
-      // check if not a single value
-      if (valueSpec.multiplicity.upperBound === 1) {
-        return false;
+    const rightSide = postFilterConditionState.rightConditionValue;
+    // `in`/`not in` doest not support right hand value being column state as the multipliticy for columns are [0..1]
+    if (rightSide instanceof PostFilterValueSpecConditionValueState) {
+      const valueSpec = rightSide.value;
+      if (valueSpec instanceof CollectionInstanceValue) {
+        if (valueSpec.values.length === 0) {
+          return true;
+        }
+        const collectionType = getCollectionValueSpecificationType(
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .graphManagerState.graph,
+          valueSpec.values,
+        );
+        if (!collectionType) {
+          return false;
+        }
+        if (
+          (
+            [
+              PRIMITIVE_TYPE.NUMBER,
+              PRIMITIVE_TYPE.INTEGER,
+              PRIMITIVE_TYPE.DECIMAL,
+              PRIMITIVE_TYPE.FLOAT,
+            ] as string[]
+          ).includes(propertyType.path)
+        ) {
+          return (
+            [
+              PRIMITIVE_TYPE.NUMBER,
+              PRIMITIVE_TYPE.INTEGER,
+              PRIMITIVE_TYPE.DECIMAL,
+              PRIMITIVE_TYPE.FLOAT,
+            ] as string[]
+          ).includes(collectionType.path);
+        }
+        return collectionType === propertyType;
+      } else if (valueSpec instanceof VariableExpression) {
+        // check if not a single value
+        if (valueSpec.multiplicity.upperBound === 1) {
+          return false;
+        }
+        return propertyType === valueSpec.genericType?.value.rawType;
       }
-      return propertyType === valueSpec.genericType?.value.rawType;
     }
     return false;
   }
@@ -124,7 +129,7 @@ export class QueryBuilderPostFilterOperator_In
     postFilterConditionState: PostFilterConditionState,
   ): ValueSpecification {
     const propertyType = guaranteeNonNullable(
-      postFilterConditionState.columnState.getColumnType(),
+      postFilterConditionState.leftConditionValue.getColumnType(),
     );
     return new CollectionInstanceValue(
       Multiplicity.ONE,

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

@@ -27,6 +27,7 @@ import {
   type PostFilterConditionState,
   type QueryBuilderPostFilterState,
   TDS_COLUMN_GETTER,
+  PostFilterValueSpecConditionValueState,
 } from '../QueryBuilderPostFilterState.js';
 import { QueryBuilderSimpleProjectionColumnState } from '../../projection/QueryBuilderProjectionColumnState.js';
 import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
@@ -53,20 +54,27 @@ export class QueryBuilderPostFilterOperator_IsEmpty
   isCompatibleWithConditionValue(
     postFilterConditionState: PostFilterConditionState,
   ): boolean {
-    return postFilterConditionState.value === undefined;
+    if (
+      postFilterConditionState.rightConditionValue instanceof
+        PostFilterValueSpecConditionValueState &&
+      postFilterConditionState.rightConditionValue.value === undefined
+    ) {
+      return true;
+    }
+    return false;
   }
 
   override isCompatibleWithPostFilterColumn(
     postFilterState: PostFilterConditionState,
   ): boolean {
-    const columnType = postFilterState.columnState.getColumnType();
+    const columnType = postFilterState.leftConditionValue.getColumnType();
     if (columnType && this.isCompatibleWithType(columnType)) {
       if (
-        postFilterState.columnState instanceof
+        postFilterState.leftConditionValue instanceof
         QueryBuilderSimpleProjectionColumnState
       ) {
         return isPropertyExpressionChainOptional(
-          postFilterState.columnState.propertyExpressionState
+          postFilterState.leftConditionValue.propertyExpressionState
             .propertyExpression,
         );
       }

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

@@ -20,6 +20,7 @@ import {
   AbstractPropertyExpression,
   type FunctionExpression,
   PRIMITIVE_TYPE,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   guaranteeNonNullable,
@@ -35,7 +36,6 @@ import type {
 } from '../QueryBuilderPostFilterState.js';
 import {
   generateDefaultValueForPrimitiveType,
-  getNonCollectionValueSpecificationType,
   isTypeCompatibleForAssignment,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
@@ -69,11 +69,11 @@ export class QueryBuilderPostFilterOperator_LessThan
     postFilterConditionState: PostFilterConditionState,
   ): boolean {
     return isTypeCompatibleForAssignment(
-      postFilterConditionState.value
-        ? getNonCollectionValueSpecificationType(postFilterConditionState.value)
+      !postFilterConditionState.rightConditionValue.isCollection
+        ? postFilterConditionState.rightConditionValue.type
         : undefined,
       guaranteeNonNullable(
-        postFilterConditionState.columnState.getColumnType(),
+        postFilterConditionState.leftConditionValue.getColumnType(),
       ),
     );
   }
@@ -81,7 +81,8 @@ export class QueryBuilderPostFilterOperator_LessThan
   getDefaultFilterConditionValue(
     postFilterConditionState: PostFilterConditionState,
   ): ValueSpecification {
-    const propertyType = postFilterConditionState.columnState.getColumnType();
+    const propertyType =
+      postFilterConditionState.leftConditionValue.getColumnType();
     switch (propertyType?.path) {
       case PRIMITIVE_TYPE.NUMBER:
       case PRIMITIVE_TYPE.DECIMAL:
@@ -121,10 +122,10 @@ export class QueryBuilderPostFilterOperator_LessThan
     return buildPostFilterConditionExpression(
       postFilterConditionState,
       this,
-      postFilterConditionState.columnState.getColumnType()?.path ===
-        PRIMITIVE_TYPE.DATETIME &&
-        postFilterConditionState.value?.genericType?.value.rawType.path !==
-          PRIMITIVE_TYPE.DATETIME
+      postFilterConditionState.leftConditionValue.getColumnType() ===
+        PrimitiveType.DATETIME &&
+        postFilterConditionState.rightConditionValue.type !==
+          PrimitiveType.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_BEFORE_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.LESS_THAN,
     );

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

@@ -19,6 +19,7 @@ import {
   type ValueSpecification,
   AbstractPropertyExpression,
   PRIMITIVE_TYPE,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import { buildPostFilterConditionState } from '../QueryBuilderPostFilterStateBuilder.js';
 import type {
@@ -45,10 +46,10 @@ export class QueryBuilderPostFilterOperator_LessThanEqual
     return buildPostFilterConditionExpression(
       postFilterConditionState,
       this,
-      postFilterConditionState.columnState.getColumnType()?.path ===
-        PRIMITIVE_TYPE.DATETIME &&
-        postFilterConditionState.value?.genericType?.value.rawType.path !==
-          PRIMITIVE_TYPE.DATETIME
+      postFilterConditionState.leftConditionValue.getColumnType() ===
+        PrimitiveType.DATETIME &&
+        postFilterConditionState.rightConditionValue.type !==
+          PrimitiveType.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_BEFORE_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.LESS_THAN_EQUAL,
     );

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

@@ -36,7 +36,6 @@ import type {
 import {
   buildNotExpression,
   generateDefaultValueForPrimitiveType,
-  getNonCollectionValueSpecificationType,
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
 import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
@@ -59,16 +58,17 @@ export class QueryBuilderPostFilterOperator_StartWith
   isCompatibleWithConditionValue(
     postFilterConditionState: PostFilterConditionState,
   ): boolean {
-    const type = postFilterConditionState.value
-      ? getNonCollectionValueSpecificationType(postFilterConditionState.value)
-      : undefined;
-    return PrimitiveType.STRING === type;
+    return (
+      !postFilterConditionState.rightConditionValue.isCollection &&
+      PrimitiveType.STRING === postFilterConditionState.rightConditionValue.type
+    );
   }
 
   getDefaultFilterConditionValue(
     postFilterConditionState: PostFilterConditionState,
   ): ValueSpecification {
-    const propertyType = postFilterConditionState.columnState.getColumnType();
+    const propertyType =
+      postFilterConditionState.leftConditionValue.getColumnType();
     switch (propertyType?.path) {
       case PRIMITIVE_TYPE.STRING: {
         return buildPrimitiveInstanceValue(

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

@@ -372,20 +372,42 @@ export class QueryBuilderDerivationProjectionColumnState
     const variable = projectionParameter[0] as VariableExpression;
     assertNonEmptyString(variable.name);
     // assign variable to query class
+    const queryBuilderState = this.tdsState.queryBuilderState;
     const rawVariableExpression = new RawVariableExpression(
       variable.name,
       Multiplicity.ONE,
       PackageableElementExplicitReference.create(
-        guaranteeNonNullable(this.tdsState.queryBuilderState.class),
+        guaranteeNonNullable(queryBuilderState.class),
       ),
     );
     const _rawVariableExpression =
-      this.tdsState.queryBuilderState.graphManagerState.graphManager.serializeRawValueSpecification(
+      queryBuilderState.graphManagerState.graphManager.serializeRawValueSpecification(
         rawVariableExpression,
       );
+    const parameters = queryBuilderState.parametersState.parameterStates.map(
+      (_param) =>
+        queryBuilderState.graphManagerState.graphManager.serializeValueSpecification(
+          _param.parameter,
+        ),
+    );
+    const letExpressions = queryBuilderState.constantState.constants
+      .map((_const) => _const.buildLetExpression())
+      .map((expres) =>
+        queryBuilderState.graphManagerState.graphManager.serializeValueSpecification(
+          expres,
+        ),
+      );
+    let lambdaBody = this.lambda.body;
+    if (letExpressions.length) {
+      if (Array.isArray(this.lambda.body)) {
+        lambdaBody = [...letExpressions, ...(this.lambda.body as object[])];
+      } else {
+        lambdaBody = [...letExpressions, this.lambda.body];
+      }
+    }
     const isolatedLambda = new RawLambda(
-      [_rawVariableExpression],
-      this.lambda.body,
+      [_rawVariableExpression, ...parameters],
+      lambdaBody,
     );
     return isolatedLambda;
   }