@finos/legend-query-builder 4.5.1 → 4.6.0

package/src/stores/QueryBuilderConstantsState.ts

@@ -17,6 +17,7 @@
 import {
   type Type,
   type ValueSpecification,
+  type INTERNAL__UnknownValueSpecification,
   GenericType,
   GenericTypeExplicitReference,
   observe_ValueSpecification,
@@ -37,7 +38,7 @@ import type { QueryBuilderState } from './QueryBuilderState.js';
 import { buildDefaultInstanceValue } from './shared/ValueSpecificationEditorHelper.js';
 import { valueSpecification_setGenericType } from './shared/ValueSpecificationModifierHelper.js';
 
-export class QueryBuilderConstantExpressionState implements Hashable {
+export abstract class QueryBuilderConstantExpressionState implements Hashable {
   readonly queryBuilderState: QueryBuilderState;
   readonly uuid = uuid();
   variable: VariableExpression;
@@ -48,13 +49,36 @@ export class QueryBuilderConstantExpressionState implements Hashable {
     variable: VariableExpression,
     value: ValueSpecification,
   ) {
+    this.queryBuilderState = queryBuilderState;
+    this.variable = variable;
+    this.value = value;
+  }
+
+  get hashCode(): string {
+    return hashArray([
+      QUERY_BUILDER_STATE_HASH_STRUCTURE.CONSTANT_EXPRESSION_STATE,
+      this.variable.name,
+      this.value,
+    ]);
+  }
+}
+
+export class QueryBuilderSimpleConstantExpressionState
+  extends QueryBuilderConstantExpressionState
+  implements Hashable
+{
+  constructor(
+    queryBuilderState: QueryBuilderState,
+    variable: VariableExpression,
+    value: ValueSpecification,
+  ) {
+    super(queryBuilderState, variable, value);
     makeObservable(this, {
       variable: observable,
       value: observable,
       setValueSpec: action,
       changeValSpecType: action,
     });
-    this.queryBuilderState = queryBuilderState;
     this.value = observe_ValueSpecification(
       value,
       this.queryBuilderState.observerContext,
@@ -63,7 +87,6 @@ export class QueryBuilderConstantExpressionState implements Hashable {
       variable,
       this.queryBuilderState.observerContext,
     );
-    this.variable = variable;
   }
 
   changeValSpecType(type: Type): void {
@@ -106,13 +129,24 @@ export class QueryBuilderConstantExpressionState implements Hashable {
       );
     }
   }
+}
 
-  get hashCode(): string {
-    return hashArray([
-      QUERY_BUILDER_STATE_HASH_STRUCTURE.CONSTANT_EXPRESSION_STATE,
-      this.variable.name,
-      this.value,
-    ]);
+export class QueryBuilderCalculatedConstantExpressionState
+  extends QueryBuilderConstantExpressionState
+  implements Hashable
+{
+  declare value: INTERNAL__UnknownValueSpecification;
+
+  constructor(
+    queryBuilderState: QueryBuilderState,
+    variable: VariableExpression,
+    value: INTERNAL__UnknownValueSpecification,
+  ) {
+    super(queryBuilderState, variable, value);
+    makeObservable(this, {
+      variable: observable,
+      value: observable,
+    });
   }
 }
 

package/src/stores/QueryBuilderStateBuilder.ts

@@ -31,7 +31,7 @@ import {
   type GraphFetchTreeInstanceValue,
   type ValueSpecificationVisitor,
   InstanceValue,
-  type INTERNAL__UnknownValueSpecification,
+  INTERNAL__UnknownValueSpecification,
   type LambdaFunction,
   type KeyExpressionInstanceValue,
   matchFunctionName,
@@ -81,7 +81,11 @@ import {
 import { LambdaParameterState } from './shared/LambdaParameterState.js';
 import { processTDS_OLAPGroupByExpression } from './fetch-structure/tds/window/QueryBuilderWindowStateBuilder.js';
 import { processWatermarkExpression } from './watermark/QueryBuilderWatermarkStateBuilder.js';
-import { QueryBuilderConstantExpressionState } from './QueryBuilderConstantsState.js';
+import {
+  type QueryBuilderConstantExpressionState,
+  QueryBuilderCalculatedConstantExpressionState,
+  QueryBuilderSimpleConstantExpressionState,
+} from './QueryBuilderConstantsState.js';
 import { checkIfEquivalent } from './milestoning/QueryBuilderMilestoningHelper.js';
 import type { QueryBuilderParameterValue } from './QueryBuilderParametersState.js';
 import { QueryBuilderEmbeddedFromExecutionContextState } from './QueryBuilderExecutionContextState.js';
@@ -143,12 +147,20 @@ const processLetExpression = (
   );
   // process right side (value)
   const rightSide = guaranteeNonNullable(parameters[1]);
-  // final
-  const constantExpression = new QueryBuilderConstantExpressionState(
-    queryBuilderState,
-    varExp,
-    rightSide,
-  );
+  let constantExpression: QueryBuilderConstantExpressionState;
+  if (rightSide instanceof INTERNAL__UnknownValueSpecification) {
+    constantExpression = new QueryBuilderCalculatedConstantExpressionState(
+      queryBuilderState,
+      varExp,
+      rightSide,
+    );
+  } else {
+    constantExpression = new QueryBuilderSimpleConstantExpressionState(
+      queryBuilderState,
+      varExp,
+      rightSide,
+    );
+  }
   queryBuilderState.constantState.setShowConstantPanel(true);
   queryBuilderState.constantState.addConstant(constantExpression);
 };

package/src/stores/QueryBuilderValueSpecificationBuilder.ts

@@ -40,7 +40,7 @@ import type { QueryBuilderFetchStructureState } from './fetch-structure/QueryBui
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../graph/QueryBuilderMetaModelConst.js';
 import { buildWatermarkExpression } from './watermark/QueryBuilderWatermarkValueSpecificationBuilder.js';
 import { buildExecutionQueryFromLambdaFunction } from './shared/LambdaParameterState.js';
-import type { QueryBuilderConstantExpressionState } from './QueryBuilderConstantsState.js';
+import { type QueryBuilderConstantExpressionState } from './QueryBuilderConstantsState.js';
 import {
   QueryBuilderEmbeddedFromExecutionContextState,
   type QueryBuilderExecutionContextState,