@finos/legend-query-builder 4.14.88 → 4.14.89

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

@@ -19,6 +19,7 @@ import {
   type ValueSpecification,
   AbstractPropertyExpression,
   type FunctionExpression,
+  type LambdaFunction,
   PRIMITIVE_TYPE,
   PrimitiveType,
 } from '@finos/legend-graph';
@@ -35,7 +36,7 @@ import type {
   QueryBuilderPostFilterState,
 } from '../QueryBuilderPostFilterState.js';
 import { isTypeCompatibleForAssignment } from '../../../../QueryBuilderValueSpecificationHelper.js';
-import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
+import { buildPostFilterConditionExpressionHelper } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
 import { buildDefaultInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
@@ -107,8 +108,9 @@ export class QueryBuilderPostFilterOperator_LessThan
 
   buildPostFilterConditionExpression(
     postFilterConditionState: PostFilterConditionState,
+    parentExpression: LambdaFunction | undefined,
   ): ValueSpecification | undefined {
-    return buildPostFilterConditionExpression(
+    return buildPostFilterConditionExpressionHelper(
       postFilterConditionState,
       this,
       postFilterConditionState.leftConditionValue.getColumnType() ===
@@ -117,6 +119,7 @@ export class QueryBuilderPostFilterOperator_LessThan
           PrimitiveType.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_BEFORE_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.LESS_THAN,
+      parentExpression,
     );
   }
 

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

@@ -17,6 +17,7 @@
 import {
   type FunctionExpression,
   type ValueSpecification,
+  type LambdaFunction,
   AbstractPropertyExpression,
   PRIMITIVE_TYPE,
   PrimitiveType,
@@ -26,7 +27,7 @@ import type {
   PostFilterConditionState,
   QueryBuilderPostFilterState,
 } from '../QueryBuilderPostFilterState.js';
-import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
+import { buildPostFilterConditionExpressionHelper } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QueryBuilderPostFilterOperator_LessThan } from './QueryBuilderPostFilterOperator_LessThan.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
 import { type Hashable, hashArray } from '@finos/legend-shared';
@@ -42,8 +43,9 @@ export class QueryBuilderPostFilterOperator_LessThanEqual
 
   override buildPostFilterConditionExpression(
     postFilterConditionState: PostFilterConditionState,
+    parentExpression: LambdaFunction | undefined,
   ): ValueSpecification | undefined {
-    return buildPostFilterConditionExpression(
+    return buildPostFilterConditionExpressionHelper(
       postFilterConditionState,
       this,
       postFilterConditionState.leftConditionValue.getColumnType() ===
@@ -52,6 +54,7 @@ export class QueryBuilderPostFilterOperator_LessThanEqual
           PrimitiveType.DATETIME
         ? QUERY_BUILDER_SUPPORTED_FUNCTIONS.IS_ON_OR_BEFORE_DAY
         : QUERY_BUILDER_SUPPORTED_FUNCTIONS.LESS_THAN_EQUAL,
+      parentExpression,
     );
   }
 

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

@@ -19,6 +19,7 @@ import {
   type ValueSpecification,
   type SimpleFunctionExpression,
   type FunctionExpression,
+  type LambdaFunction,
   PRIMITIVE_TYPE,
   PrimitiveType,
 } from '@finos/legend-graph';
@@ -37,7 +38,7 @@ import {
   buildNotExpression,
   unwrapNotExpression,
 } from '../../../../QueryBuilderValueSpecificationHelper.js';
-import { buildPostFilterConditionExpression } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
+import { buildPostFilterConditionExpressionHelper } from './QueryBuilderPostFilterOperatorValueSpecificationBuilder.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../../graph/QueryBuilderMetaModelConst.js';
 import { QUERY_BUILDER_STATE_HASH_STRUCTURE } from '../../../../QueryBuilderStateHashUtils.js';
 import { buildDefaultInstanceValue } from '../../../../shared/ValueSpecificationEditorHelper.js';
@@ -89,11 +90,13 @@ export class QueryBuilderPostFilterOperator_StartWith
 
   buildPostFilterConditionExpression(
     postFilterConditionState: PostFilterConditionState,
+    parentExpression: LambdaFunction | undefined,
   ): ValueSpecification | undefined {
-    return buildPostFilterConditionExpression(
+    return buildPostFilterConditionExpressionHelper(
       postFilterConditionState,
       this,
       QUERY_BUILDER_SUPPORTED_FUNCTIONS.STARTS_WITH,
+      parentExpression,
     );
   }
 
@@ -125,9 +128,11 @@ export class QueryBuilderPostFilterOperator_NotStartWith
 
   override buildPostFilterConditionExpression(
     postFilterConditionState: PostFilterConditionState,
+    parentExpression: LambdaFunction | undefined,
   ): ValueSpecification | undefined {
     const expression = super.buildPostFilterConditionExpression(
       postFilterConditionState,
+      parentExpression,
     );
     return expression ? buildNotExpression(expression) : undefined;
   }

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

@@ -251,7 +251,6 @@ export const appendProjection = (
     lambdaFunction.expressionSequence[0],
     `Can't build projection expression: preceding expression is not defined`,
   );
-
   // build projection
   if (tdsState.aggregationState.columns.length) {
     // aggregation
@@ -498,7 +497,6 @@ export const appendProjection = (
       lambdaFunction.expressionSequence[0] = projectFunction;
     }
   }
-
   // build olapGroupBy
   appendOLAPGroupByState(tdsState.windowState, lambdaFunction);
 

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

@@ -26,6 +26,11 @@ import {
   V1_serializeRawValueSpecification,
   V1_transformRawLambda,
   V1_GraphTransformerContextBuilder,
+  GenericType,
+  GenericTypeExplicitReference,
+  Relation_Relation,
+  Relation_RelationalColumn,
+  Relation_RelationType,
 } from '@finos/legend-graph';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graph/QueryBuilderMetaModelConst.js';
 import {
@@ -38,7 +43,10 @@ import {
   buildPropertyExpressionChain,
   type LambdaFunctionBuilderOption,
 } from '../../../QueryBuilderValueSpecificationBuilderHelper.js';
-import { UnsupportedOperationError } from '@finos/legend-shared';
+import {
+  guaranteeNonNullable,
+  UnsupportedOperationError,
+} from '@finos/legend-shared';
 
 export const buildRelationProjection = (
   precedingExpression: ValueSpecification,
@@ -46,7 +54,9 @@ export const buildRelationProjection = (
   options?: LambdaFunctionBuilderOption,
 ): SimpleFunctionExpression => {
   const projectFunction = new SimpleFunctionExpression(
-    extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.TDS_PROJECT),
+    extractElementNameFromPath(
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.RELATION_PROJECT,
+    ),
   );
   const queryBuilderState = tdsState.queryBuilderState;
 
@@ -54,6 +64,7 @@ export const buildRelationProjection = (
 
   const colSepcArray = new ColSpecArray();
   instanceVal.values = [colSepcArray];
+  const relationType = new Relation_RelationType(Relation_RelationType.ID);
 
   tdsState.projectionColumns.forEach((projectionColumnState) => {
     const colSpec = new ColSpec();
@@ -102,7 +113,24 @@ export const buildRelationProjection = (
       );
     }
     colSpec.function1 = columnLambda;
+    const returnType = guaranteeNonNullable(
+      projectionColumnState.getColumnType(),
+      `Can't create value spec for projection column ${projectionColumnState.columnName}`,
+    );
+    relationType.columns.push(
+      new Relation_RelationalColumn(
+        projectionColumnState.columnName,
+        returnType,
+      ),
+    );
   });
   projectFunction.parametersValues = [precedingExpression, instanceVal];
+  const relationGenericType = new GenericType(Relation_Relation.INSTANCE);
+  const relationTypeGenericType = new GenericType(relationType);
+  relationGenericType.typeArguments = [
+    GenericTypeExplicitReference.create(relationTypeGenericType),
+  ];
+  projectFunction.genericType =
+    GenericTypeExplicitReference.create(relationGenericType);
   return projectFunction;
 };