@finos/legend-query-builder 4.16.51 → 4.16.53

package/src/stores/QueryBuilderResultState.ts

@@ -54,7 +54,6 @@ import type { DataGridColumnState } from '@finos/legend-lego/data-grid';
 import { downloadStream } from '@finos/legend-application';
 import { QueryBuilderDataGridCustomAggregationFunction } from '../components/result/tds/QueryBuilderTDSGridResult.js';
 import { QueryBuilderTDSState } from './fetch-structure/tds/QueryBuilderTDSState.js';
-import { QueryBuilderEmbeddedFromExecutionContextState } from './QueryBuilderExecutionContextState.js';
 
 export const DEFAULT_LIMIT = 1000;
 
@@ -409,8 +408,8 @@ export class QueryBuilderResultState {
       const result =
         (yield this.queryBuilderState.graphManagerState.graphManager.exportData(
           query,
-          this.queryBuilderState.executionContextState.mapping,
-          this.queryBuilderState.executionContextState.runtimeValue,
+          this.queryBuilderState.executionContextState.explicitMappingValue,
+          this.queryBuilderState.executionContextState.explicitRuntimeValue,
           this.queryBuilderState.graphManagerState.graph,
           {
             serializationFormat,
@@ -476,11 +475,11 @@ export class QueryBuilderResultState {
     try {
       this.setIsRunningQuery(true);
       const currentHashCode = this.queryBuilderState.hashCode;
-      const mapping = guaranteeNonNullable(
+      guaranteeNonNullable(
         this.queryBuilderState.executionContextState.mapping,
         'Mapping is required to execute query',
       );
-      const runtime = guaranteeNonNullable(
+      guaranteeNonNullable(
         this.queryBuilderState.executionContextState.runtimeValue,
         `Runtime is required to execute query`,
       );
@@ -503,12 +502,8 @@ export class QueryBuilderResultState {
       const contextstate = this.queryBuilderState.executionContextState;
       promise = this.queryBuilderState.graphManagerState.graphManager.runQuery(
         query,
-        contextstate instanceof QueryBuilderEmbeddedFromExecutionContextState
-          ? undefined
-          : mapping,
-        contextstate instanceof QueryBuilderEmbeddedFromExecutionContextState
-          ? undefined
-          : runtime,
+        contextstate.explicitMappingValue,
+        contextstate.explicitRuntimeValue,
         this.queryBuilderState.graphManagerState.graph,
         {
           parameterValues,
@@ -584,11 +579,11 @@ export class QueryBuilderResultState {
   *generatePlan(debug: boolean): GeneratorFn<void> {
     try {
       this.isGeneratingPlan = true;
-      const mapping = guaranteeNonNullable(
+      guaranteeNonNullable(
         this.queryBuilderState.executionContextState.mapping,
         'Mapping is required to execute query',
       );
-      const runtime = guaranteeNonNullable(
+      guaranteeNonNullable(
         this.queryBuilderState.executionContextState.runtimeValue,
         `Runtime is required to execute query`,
       );
@@ -600,14 +595,6 @@ export class QueryBuilderResultState {
         this.queryBuilderState.graphManagerState.graph,
       );
       const contextstate = this.queryBuilderState.executionContextState;
-      const _mapping =
-        contextstate instanceof QueryBuilderEmbeddedFromExecutionContextState
-          ? undefined
-          : mapping;
-      const _runtime =
-        contextstate instanceof QueryBuilderEmbeddedFromExecutionContextState
-          ? undefined
-          : runtime;
       if (debug) {
         QueryBuilderTelemetryHelper.logEvent_ExecutionPlanDebugLaunched(
           this.queryBuilderState.applicationStore.telemetryService,
@@ -615,8 +602,8 @@ export class QueryBuilderResultState {
         const debugResult =
           (yield this.queryBuilderState.graphManagerState.graphManager.debugExecutionPlanGeneration(
             query,
-            _mapping,
-            _runtime,
+            contextstate.explicitMappingValue,
+            contextstate.explicitRuntimeValue,
             this.queryBuilderState.graphManagerState.graph,
             report,
           )) as { plan: RawExecutionPlan; debug: string };
@@ -629,8 +616,8 @@ export class QueryBuilderResultState {
         rawPlan =
           (yield this.queryBuilderState.graphManagerState.graphManager.generateExecutionPlan(
             query,
-            _mapping,
-            _runtime,
+            contextstate.explicitMappingValue,
+            contextstate.explicitRuntimeValue,
             this.queryBuilderState.graphManagerState.graph,
             report,
           )) as object;

package/src/stores/QueryBuilderState.ts

@@ -244,6 +244,7 @@ export abstract class QueryBuilderState implements CommandRegistrar {
       setGetAllFunction: action,
       setLambdaWriteMode: action,
       setINTERNAL__enableInitializingDefaultSimpleExpressionValue: action,
+      TEMPORARY_initializeExecContext: action,
 
       resetQueryResult: action,
       resetQueryContent: action,
@@ -259,14 +260,9 @@ export abstract class QueryBuilderState implements CommandRegistrar {
 
     this.applicationStore = applicationStore;
     this.graphManagerState = graphManagerState;
-    this.executionContextState = config?.enableTypedTDS
-      ? new QueryBuilderEmbeddedFromExecutionContextState(this)
-      : new QueryBuilderExternalExecutionContextState(this);
-    if (config?.enableTypedTDS) {
-      this.setLambdaWriteMode(
-        QUERY_BUILDER_LAMBDA_WRITER_MODE.TYPED_FETCH_STRUCTURE,
-      );
-    }
+    this.executionContextState = this.TEMPORARY_initializeExecContext(
+      Boolean(config?.enableTypedTDS),
+    );
     this.milestoningState = new QueryBuilderMilestoningState(this);
     this.explorerState = new QueryBuilderExplorerState(this);
     this.parametersState = new QueryBuilderParametersState(this);
@@ -296,6 +292,19 @@ export abstract class QueryBuilderState implements CommandRegistrar {
       false;
   }
 
+  TEMPORARY_initializeExecContext(
+    isTypedTDS: boolean,
+  ): QueryBuilderExecutionContextState {
+    if (isTypedTDS) {
+      const context = new QueryBuilderEmbeddedFromExecutionContextState(this);
+      this.setLambdaWriteMode(
+        QUERY_BUILDER_LAMBDA_WRITER_MODE.TYPED_FETCH_STRUCTURE,
+      );
+      return context;
+    }
+    return new QueryBuilderExternalExecutionContextState(this);
+  }
+
   get isMappingReadOnly(): boolean {
     return false;
   }