@finos/legend-query-builder 4.2.4 → 4.3.1

package/src/stores/entitlements/QueryBuilderCheckEntitlementsState.ts

@@ -53,16 +53,18 @@ export class QueryBuilderCheckEntitlementsState implements Hashable {
 
     this.dataAccessState = undefined;
     if (
-      this.queryBuilderState.mapping &&
-      this.queryBuilderState.runtimeValue instanceof RuntimePointer
+      this.queryBuilderState.executionContextState.mapping &&
+      this.queryBuilderState.executionContextState.runtimeValue instanceof
+        RuntimePointer
     ) {
       this.dataAccessState = new DataAccessState(
         this.queryBuilderState.applicationStore,
         this.queryBuilderState.graphManagerState,
         {
-          mapping: this.queryBuilderState.mapping.path,
+          mapping: this.queryBuilderState.executionContextState.mapping.path,
           runtime:
-            this.queryBuilderState.runtimeValue.packageableRuntime.value.path,
+            this.queryBuilderState.executionContextState.runtimeValue
+              .packageableRuntime.value.path,
           getQuery: async () =>
             this.createExecutableQuery(
               this.queryBuilderState.buildQuery(),

package/src/stores/explorer/QueryBuilderExplorerState.ts

@@ -660,7 +660,7 @@ export class QueryBuilderExplorerState {
 
   refreshTreeData(): void {
     const _class = this.queryBuilderState.class;
-    const _mapping = this.queryBuilderState.mapping;
+    const _mapping = this.queryBuilderState.executionContextState.mapping;
     this.setTreeData(
       _class && _mapping && this.mappingModelCoverageAnalysisResult
         ? getQueryBuilderTreeData(
@@ -675,9 +675,9 @@ export class QueryBuilderExplorerState {
     // We will only refetch if the analysis result's mapping has changed.
     // This makes the assumption that the mapping has not been edited, which is a valid assumption since query is not for editing mappings
     if (
-      this.queryBuilderState.mapping &&
-      this.queryBuilderState.mapping.path !==
-        this.mappingModelCoverageAnalysisResult?.mapping.path
+      this.queryBuilderState.executionContextState.mapping &&
+      this.queryBuilderState.executionContextState.mapping !==
+        this.mappingModelCoverageAnalysisResult?.mapping
     ) {
       this.mappingModelCoverageAnalysisState.inProgress();
       QueryBuilderTelemetryHelper.logEvent_QueryMappingModelCoverageAnalysisLaunched(
@@ -692,7 +692,7 @@ export class QueryBuilderExplorerState {
       try {
         this.mappingModelCoverageAnalysisResult = (yield flowResult(
           this.queryBuilderState.graphManagerState.graphManager.analyzeMappingModelCoverage(
-            this.queryBuilderState.mapping,
+            this.queryBuilderState.executionContextState.mapping,
             this.queryBuilderState.graphManagerState.graph,
           ),
         )) as MappingModelCoverageAnalysisResult;
@@ -720,7 +720,7 @@ export class QueryBuilderExplorerState {
   *previewData(
     node: QueryBuilderExplorerTreePropertyNodeData,
   ): GeneratorFn<void> {
-    const runtime = this.queryBuilderState.runtimeValue;
+    const runtime = this.queryBuilderState.executionContextState.runtimeValue;
     if (!runtime) {
       this.queryBuilderState.applicationStore.notificationService.notifyWarning(
         `Can't preview data for property '${node.property.name}': runtime is not specified`,
@@ -730,7 +730,7 @@ export class QueryBuilderExplorerState {
     if (
       !node.mappingData.mapped ||
       !this.queryBuilderState.class ||
-      !this.queryBuilderState.mapping
+      !this.queryBuilderState.executionContextState.mapping
     ) {
       return;
     }
@@ -759,7 +759,7 @@ export class QueryBuilderExplorerState {
                 this.queryBuilderState,
                 propertyExpression,
               ),
-              this.queryBuilderState.mapping,
+              this.queryBuilderState.executionContextState.mapping,
               runtime,
               this.queryBuilderState.graphManagerState.graph,
             )) as ExecutionResult;
@@ -796,7 +796,7 @@ export class QueryBuilderExplorerState {
                 this.queryBuilderState,
                 propertyExpression,
               ),
-              this.queryBuilderState.mapping,
+              this.queryBuilderState.executionContextState.mapping,
               runtime,
               this.queryBuilderState.graphManagerState.graph,
             )) as ExecutionResult;

package/src/stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeStateBuilder.ts

@@ -32,11 +32,13 @@ import {
   CollectionInstanceValue,
   getClassProperty,
   PrimitiveType,
+  VariableExpression,
 } from '@finos/legend-graph';
 import {
   assertIsBoolean,
   assertIsString,
   assertTrue,
+  assertType,
   guaranteeIsString,
   guaranteeNonNullable,
   guaranteeType,
@@ -45,7 +47,7 @@ import {
   QUERY_BUILDER_PURE_PATH,
   QUERY_BUILDER_SUPPORTED_FUNCTIONS,
 } from '../../../graph/QueryBuilderMetaModelConst.js';
-import type { QueryBuilderState } from '../../QueryBuilderState.js';
+import { type QueryBuilderState } from '../../QueryBuilderState.js';
 import { QueryBuilderValueSpecificationProcessor } from '../../QueryBuilderStateBuilder.js';
 import { FETCH_STRUCTURE_IMPLEMENTATION } from '../QueryBuilderFetchStructureImplementationState.js';
 import {
@@ -56,6 +58,7 @@ import {
 } from './QueryBuilderGraphFetchTreeState.js';
 import { buildGraphFetchTreeData } from './QueryBuilderGraphFetchTreeUtil.js';
 import {} from 'mobx';
+import { QueryBuilderInternalizeState } from '../../QueryBuilderInternalizeState.js';
 
 export const processGraphFetchExpression = (
   expression: SimpleFunctionExpression,
@@ -105,6 +108,65 @@ export const processGraphFetchExpression = (
   }
 };
 
+export const processInternalizeExpression = (
+  expression: SimpleFunctionExpression,
+  queryBuilderState: QueryBuilderState,
+  parentLambda: LambdaFunction,
+): void => {
+  // update fetch-structure
+  queryBuilderState.fetchStructureState.changeImplementation(
+    FETCH_STRUCTURE_IMPLEMENTATION.GRAPH_FETCH,
+  );
+  const functionName = expression.functionName;
+  // check parameters
+  assertTrue(
+    expression.parametersValues.length === 3,
+    `Can't process ${functionName}() expression: ${functionName}() expects 2 argument`,
+  );
+
+  // first param classs
+  const classVal = expression.parametersValues[0];
+  const _class = classVal?.genericType?.value.rawType;
+  assertType(
+    _class,
+    Class,
+    `Can't process internalize() expression: internalize() return type is missing`,
+  );
+
+  queryBuilderState.setClass(_class);
+  queryBuilderState.milestoningState.clearMilestoningDates();
+  queryBuilderState.explorerState.refreshTreeData();
+
+  // binding
+  const instanceExpression = guaranteeType(
+    expression.parametersValues[1],
+    InstanceValue,
+    `Can't process internalize() expression: only support internalize() with 1st parameter as instance value`,
+  );
+  const binding = guaranteeType(
+    guaranteeType(
+      instanceExpression.values[0],
+      PackageableElementReference,
+      `Can't process internalize() expression: only support internalize() with 1st parameter as packagableElement value`,
+    ).value,
+    Binding,
+    `Can't process internalize() expression: only support internalize() with 1st parameter as binding value`,
+  );
+
+  const variableExpression = guaranteeType(
+    expression.parametersValues[2],
+    VariableExpression,
+  );
+
+  const inernalize = new QueryBuilderInternalizeState(
+    binding,
+    variableExpression,
+    queryBuilderState,
+  );
+
+  queryBuilderState.setInternalize(inernalize);
+};
+
 type PropertyValue = object | string | number | boolean;
 
 // Dynamically sets key values of config
@@ -327,6 +389,7 @@ export const processGraphFetchExternalizeExpression = (
     matchFunctionName(precedingExpression.functionName, [
       QUERY_BUILDER_SUPPORTED_FUNCTIONS.GRAPH_FETCH,
       QUERY_BUILDER_SUPPORTED_FUNCTIONS.GRAPH_FETCH_CHECKED,
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.INTERNALIZE,
     ]),
     `Can't process externalize() expression: only support externalize() in graph-fetch expression`,
   );
@@ -373,7 +436,6 @@ export const processGraphFetchExternalizeExpression = (
       Binding,
       `Can't process externalize() expression: only support externalize() with 1st parameter as binding value`,
     );
-
     const externalizeState = new GraphFetchExternalFormatSerializationState(
       graphFetchTreeState,
       binding,

package/src/stores/fetch-structure/tds/QueryBuilderTDSState.ts

@@ -452,7 +452,7 @@ export class QueryBuilderTDSState
       new QueryBuilderDerivationProjectionColumnState(
         this,
         guaranteeType(
-          this.queryBuilderState.graphManagerState.graphManager.buildRawValueSpecification(
+          this.queryBuilderState.graphManagerState.graphManager.transformValueSpecToRawValueSpec(
             columnColumnLambda,
             this.queryBuilderState.graphManagerState.graph,
           ),

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

@@ -380,10 +380,12 @@ export class PostFilterConditionState implements Hashable {
               this.value,
             ),
             guaranteeNonNullable(
-              this.postFilterState.tdsState.queryBuilderState.mapping,
+              this.postFilterState.tdsState.queryBuilderState
+                .executionContextState.mapping,
             ),
             guaranteeNonNullable(
-              this.postFilterState.tdsState.queryBuilderState.runtimeValue,
+              this.postFilterState.tdsState.queryBuilderState
+                .executionContextState.runtimeValue,
             ),
             this.postFilterState.tdsState.queryBuilderState.graphManagerState
               .graph,

package/src/stores/filter/QueryBuilderFilterState.ts

@@ -134,9 +134,12 @@ export class FilterConditionState implements Hashable {
               this.propertyExpressionState.propertyExpression,
               this.value,
             ),
-            guaranteeNonNullable(this.filterState.queryBuilderState.mapping),
             guaranteeNonNullable(
-              this.filterState.queryBuilderState.runtimeValue,
+              this.filterState.queryBuilderState.executionContextState.mapping,
+            ),
+            guaranteeNonNullable(
+              this.filterState.queryBuilderState.executionContextState
+                .runtimeValue,
             ),
             this.filterState.queryBuilderState.graphManagerState.graph,
           )) as ExecutionResult;

package/src/stores/workflows/ClassQueryBuilderState.ts

@@ -44,7 +44,8 @@ export class ClassQueryBuilderState extends QueryBuilderState {
     );
     // cascading
     const isCurrentMappingCompatible =
-      this.mapping && compatibleMappings.includes(this.mapping);
+      this.executionContextState.mapping &&
+      compatibleMappings.includes(this.executionContextState.mapping);
     if (this.isMappingReadOnly || isCurrentMappingCompatible) {
       return;
     }

package/src/stores/workflows/FunctionQueryBuilderState.ts

@@ -0,0 +1,38 @@
+/**
+ * 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 { GenericLegendApplicationStore } from '@finos/legend-application';
+import type {
+  ConcreteFunctionDefinition,
+  GraphManagerState,
+} from '@finos/legend-graph';
+import { ClassQueryBuilderState } from './ClassQueryBuilderState.js';
+
+// Note: We may want to move it to extend QueryBuilderState directly
+// but for now we will use the same setup as class as class, mapping, runtime are editable
+export class FunctionQueryBuilderState extends ClassQueryBuilderState {
+  readonly functionElement: ConcreteFunctionDefinition;
+
+  constructor(
+    applicationStore: GenericLegendApplicationStore,
+    graphManagerState: GraphManagerState,
+    functionElemenet: ConcreteFunctionDefinition,
+  ) {
+    super(applicationStore, graphManagerState);
+    this.functionElement = functionElemenet;
+    this.showParametersPanel = true;
+  }
+}

package/src/stores/workflows/ServiceQueryBuilderState.ts

@@ -78,12 +78,8 @@ export class ServiceQueryBuilderState extends QueryBuilderState {
     this.onExecutionContextChange = onExecutionContextChange;
 
     if (service.execution instanceof PureSingleExecution) {
-      assertTrue(
-        Boolean(service.execution.mapping && service.execution.runtime),
-        'Service queries without runtime/mapping are not supported',
-      );
-      this.mapping = service.execution.mapping?.value;
-      this.runtimeValue = service.execution.runtime;
+      this.executionContextState.mapping = service.execution.mapping?.value;
+      this.executionContextState.runtimeValue = service.execution.runtime;
     } else if (service.execution instanceof PureMultiExecution) {
       this.executionContexts = service.execution.executionParameters.map(
         (ep) => ({
@@ -92,7 +88,6 @@ export class ServiceQueryBuilderState extends QueryBuilderState {
           runtimeValue: ep.runtime,
         }),
       );
-
       let selectedExecutionContext: ServiceExecutionContext;
       if (executionContextKey) {
         const matchingExecutionContext = this.executionContexts.find(
@@ -115,8 +110,9 @@ export class ServiceQueryBuilderState extends QueryBuilderState {
       }
 
       this.setSelectedExecutionContext(selectedExecutionContext);
-      this.mapping = selectedExecutionContext.mapping;
-      this.runtimeValue = selectedExecutionContext.runtimeValue;
+      this.executionContextState.mapping = selectedExecutionContext.mapping;
+      this.executionContextState.runtimeValue =
+        selectedExecutionContext.runtimeValue;
     }
   }
 
@@ -131,11 +127,11 @@ export class ServiceQueryBuilderState extends QueryBuilderState {
   }
 
   override get isMappingReadOnly(): boolean {
-    return true;
+    return !this.executionContextState.specifiedInQuery;
   }
 
   override get isRuntimeReadOnly(): boolean {
-    return true;
+    return !this.executionContextState.specifiedInQuery;
   }
 
   /**

package/tsconfig.json

@@ -58,7 +58,9 @@
     "./src/stores/QueryBuilderCommand.ts",
     "./src/stores/QueryBuilderConfig.ts",
     "./src/stores/QueryBuilderConstantsState.ts",
+    "./src/stores/QueryBuilderExecutionContextState.ts",
     "./src/stores/QueryBuilderGroupOperationHelper.ts",
+    "./src/stores/QueryBuilderInternalizeState.ts",
     "./src/stores/QueryBuilderParametersState.ts",
     "./src/stores/QueryBuilderPreviewDataHelper.ts",
     "./src/stores/QueryBuilderPropertyEditorState.ts",
@@ -205,6 +207,7 @@
     "./src/stores/watermark/QueryBuilderWatermarkStateBuilder.ts",
     "./src/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.ts",
     "./src/stores/workflows/ClassQueryBuilderState.ts",
+    "./src/stores/workflows/FunctionQueryBuilderState.ts",
     "./src/stores/workflows/MappingQueryBuilderState.ts",
     "./src/stores/workflows/ServiceQueryBuilderState.ts",
     "./src/components/QueryBuilder.tsx",