@finos/legend-query-builder 0.4.3 → 0.5.0

package/lib/stores/{QueryBuilderMilestoningState.js → milestoning/QueryBuilderMilestoningState.js}

@@ -13,12 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { BUSINESS_DATE_MILESTONING_PROPERTY_NAME, PROCESSING_DATE_MILESTONING_PROPERTY_NAME, GenericType, GenericTypeExplicitReference, getMilestoneTemporalStereotype, MILESTONING_STEREOTYPE, observe_ValueSpecification, VariableExpression, Multiplicity, PrimitiveType, } from '@finos/legend-graph';
-import { hashArray } from '@finos/legend-shared';
+import { GenericType, GenericTypeExplicitReference, getMilestoneTemporalStereotype, MILESTONING_STEREOTYPE, observe_ValueSpecification, VariableExpression, Multiplicity, PrimitiveType, } from '@finos/legend-graph';
+import { hashArray, guaranteeNonNullable, } from '@finos/legend-shared';
 import { action, computed, makeObservable, observable } from 'mobx';
-import { QUERY_BUILDER_HASH_STRUCTURE } from '../graphManager/QueryBuilderHashUtils.js';
-import { LambdaParameterState } from './shared/LambdaParameterState.js';
+import { QUERY_BUILDER_HASH_STRUCTURE } from '../../graphManager/QueryBuilderHashUtils.js';
+import { LambdaParameterState } from '../shared/LambdaParameterState.js';
+import { QueryBuilderBitemporalMilestoningImplementation } from './QueryBuilderBitemporalMilestoningImplementation.js';
+import { QueryBuilderBusinessTemporalMilestoningImplementation } from './QueryBuilderBusinessTemporalMilestoningImplementation.js';
+import { QueryBuilderProcessingTemporalMilestoningImplementation } from './QueryBuilderProcessingTemporalMilestoningImplementation.js';
 export class QueryBuilderMilestoningState {
+    milestoningImplementations = [];
     queryBuilderState;
     showMilestoningEditor = false;
     // TODO: Change this when we modify how we deal with milestoning.
@@ -34,9 +38,13 @@ export class QueryBuilderMilestoningState {
             setProcessingDate: action,
             setBusinessDate: action,
             setShowMilestoningEditor: action,
+            clearMilestoningDates: action,
             hashCode: computed,
         });
         this.queryBuilderState = queryBuilderState;
+        this.milestoningImplementations.push(new QueryBuilderBusinessTemporalMilestoningImplementation(this, MILESTONING_STEREOTYPE.BUSINESS_TEMPORAL));
+        this.milestoningImplementations.push(new QueryBuilderProcessingTemporalMilestoningImplementation(this, MILESTONING_STEREOTYPE.PROCESSING_TEMPORAL));
+        this.milestoningImplementations.push(new QueryBuilderBitemporalMilestoningImplementation(this, MILESTONING_STEREOTYPE.BITEMPORAL));
     }
     get isMilestonedQuery() {
         return Boolean(this.businessDate ?? this.processingDate);
@@ -44,23 +52,11 @@ export class QueryBuilderMilestoningState {
     setShowMilestoningEditor(val) {
         this.showMilestoningEditor = val;
     }
+    getMilestoningImplementation(stereotype) {
+        return guaranteeNonNullable(this.milestoningImplementations.find((imp) => imp.stereotype === stereotype));
+    }
     initializeQueryMilestoningParameters(stereotype) {
-        switch (stereotype) {
-            case MILESTONING_STEREOTYPE.BUSINESS_TEMPORAL: {
-                this.setBusinessDate(this.buildMilestoningParameter(BUSINESS_DATE_MILESTONING_PROPERTY_NAME));
-                break;
-            }
-            case MILESTONING_STEREOTYPE.PROCESSING_TEMPORAL: {
-                this.setProcessingDate(this.buildMilestoningParameter(PROCESSING_DATE_MILESTONING_PROPERTY_NAME));
-                break;
-            }
-            case MILESTONING_STEREOTYPE.BITEMPORAL: {
-                this.setProcessingDate(this.buildMilestoningParameter(PROCESSING_DATE_MILESTONING_PROPERTY_NAME));
-                this.setBusinessDate(this.buildMilestoningParameter(BUSINESS_DATE_MILESTONING_PROPERTY_NAME));
-                break;
-            }
-            default:
-        }
+        this.getMilestoningImplementation(stereotype).initializeMilestoningParameters(true);
     }
     setProcessingDate(val) {
         this.processingDate = val
@@ -72,6 +68,10 @@ export class QueryBuilderMilestoningState {
             ? observe_ValueSpecification(val, this.queryBuilderState.observableContext)
             : val;
     }
+    clearMilestoningDates() {
+        this.setBusinessDate(undefined);
+        this.setProcessingDate(undefined);
+    }
     updateMilestoningConfiguration() {
         const currentclass = this.queryBuilderState.class;
         if (currentclass !== undefined) {

package/lib/stores/milestoning/QueryBuilderMilestoningState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderMilestoningState.js","sourceRoot":"","sources":["../../../src/stores/milestoning/QueryBuilderMilestoningState.ts"],"names":[],"mappings":"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"}

package/lib/stores/milestoning/QueryBuilderProcessingTemporalMilestoningImplementation.d.ts

@@ -0,0 +1,26 @@
+/**
+ * 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 ValueSpecification, type SimpleFunctionExpression, type AbstractPropertyExpression } from '@finos/legend-graph';
+import { QueryBuilderMilestoningImplementation } from './QueryBuilderMilestoningImplementation.js';
+export declare class QueryBuilderProcessingTemporalMilestoningImplementation extends QueryBuilderMilestoningImplementation {
+    getMilestoningDate(): ValueSpecification | undefined;
+    getMilestoningToolTipText(): string;
+    initializeMilestoningParameters(force?: boolean): void;
+    processGetAllParamaters(parameterValues: ValueSpecification[]): void;
+    buildGetAllParameters(getAllFunction: SimpleFunctionExpression): void;
+    generateMilestoningDate(isDatePropagationSupported: boolean, hasDefaultMilestoningDate: boolean, prevPropertyExpression: AbstractPropertyExpression | undefined): ValueSpecification;
+}
+//# sourceMappingURL=QueryBuilderProcessingTemporalMilestoningImplementation.d.ts.map

package/lib/stores/milestoning/QueryBuilderProcessingTemporalMilestoningImplementation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderProcessingTemporalMilestoningImplementation.d.ts","sourceRoot":"","sources":["../../../src/stores/milestoning/QueryBuilderProcessingTemporalMilestoningImplementation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,kBAAkB,EAEvB,KAAK,wBAAwB,EAC7B,KAAK,0BAA0B,EAEhC,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,qCAAqC,EAAE,MAAM,4CAA4C,CAAC;AAEnG,qBAAa,uDAAwD,SAAQ,qCAAqC;IAChH,kBAAkB,IAAI,kBAAkB,GAAG,SAAS;IAIpD,yBAAyB,IAAI,MAAM;IAInC,+BAA+B,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,IAAI;IAUtD,uBAAuB,CAAC,eAAe,EAAE,kBAAkB,EAAE,GAAG,IAAI;IAQpE,qBAAqB,CAAC,cAAc,EAAE,wBAAwB,GAAG,IAAI;IASrE,uBAAuB,CACrB,0BAA0B,EAAE,OAAO,EACnC,yBAAyB,EAAE,OAAO,EAClC,sBAAsB,EAAE,0BAA0B,GAAG,SAAS,GAC7D,kBAAkB;CAoBtB"}

package/lib/stores/milestoning/QueryBuilderProcessingTemporalMilestoningImplementation.js

@@ -0,0 +1,55 @@
+/**
+ * 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 { PROCESSING_DATE_MILESTONING_PROPERTY_NAME, INTERNAL__PropagatedValue, } from '@finos/legend-graph';
+import { assertTrue, guaranteeNonNullable } from '@finos/legend-shared';
+import { getParameterValue } from '../../components/QueryBuilderSideBar.js';
+import { QueryBuilderMilestoningImplementation } from './QueryBuilderMilestoningImplementation.js';
+export class QueryBuilderProcessingTemporalMilestoningImplementation extends QueryBuilderMilestoningImplementation {
+    getMilestoningDate() {
+        return this.milestoningState.processingDate;
+    }
+    getMilestoningToolTipText() {
+        return `Processing Date: ${getParameterValue(this.getMilestoningDate())}`;
+    }
+    initializeMilestoningParameters(force) {
+        if (!this.milestoningState.processingDate || force) {
+            this.milestoningState.setProcessingDate(this.milestoningState.buildMilestoningParameter(PROCESSING_DATE_MILESTONING_PROPERTY_NAME));
+        }
+    }
+    processGetAllParamaters(parameterValues) {
+        assertTrue(parameterValues.length === 2, `Can't process getAll() expression: when used with a milestoned class getAll() expects a parameter`);
+        this.milestoningState.setProcessingDate(parameterValues[1]);
+    }
+    buildGetAllParameters(getAllFunction) {
+        getAllFunction.parametersValues.push(guaranteeNonNullable(this.getMilestoningDate(), `Milestoning class should have a parameter of type 'Date'`));
+    }
+    generateMilestoningDate(isDatePropagationSupported, hasDefaultMilestoningDate, prevPropertyExpression) {
+        this.initializeMilestoningParameters();
+        if (isDatePropagationSupported &&
+            prevPropertyExpression &&
+            !hasDefaultMilestoningDate) {
+            return new INTERNAL__PropagatedValue(() => guaranteeNonNullable(prevPropertyExpression.parametersValues[1]));
+        }
+        else {
+            const milestoningDate = new INTERNAL__PropagatedValue(() => guaranteeNonNullable(this.getMilestoningDate()));
+            milestoningDate.isPropagatedValue = hasDefaultMilestoningDate
+                ? false
+                : isDatePropagationSupported;
+            return milestoningDate;
+        }
+    }
+}
+//# sourceMappingURL=QueryBuilderProcessingTemporalMilestoningImplementation.js.map

package/lib/stores/milestoning/QueryBuilderProcessingTemporalMilestoningImplementation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryBuilderProcessingTemporalMilestoningImplementation.js","sourceRoot":"","sources":["../../../src/stores/milestoning/QueryBuilderProcessingTemporalMilestoningImplementation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,yCAAyC,EAGzC,yBAAyB,GAC1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,qCAAqC,EAAE,MAAM,4CAA4C,CAAC;AAEnG,MAAM,OAAO,uDAAwD,SAAQ,qCAAqC;IAChH,kBAAkB;QAChB,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC;IAC9C,CAAC;IAED,yBAAyB;QACvB,OAAO,oBAAoB,iBAAiB,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,EAAE,CAAC;IAC5E,CAAC;IAED,+BAA+B,CAAC,KAAe;QAC7C,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,cAAc,IAAI,KAAK,EAAE;YAClD,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CACrC,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,CAC7C,yCAAyC,CAC1C,CACF,CAAC;SACH;IACH,CAAC;IAED,uBAAuB,CAAC,eAAqC;QAC3D,UAAU,CACR,eAAe,CAAC,MAAM,KAAK,CAAC,EAC5B,mGAAmG,CACpG,CAAC;QACF,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,qBAAqB,CAAC,cAAwC;QAC5D,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAClC,oBAAoB,CAClB,IAAI,CAAC,kBAAkB,EAAE,EACzB,0DAA0D,CAC3D,CACF,CAAC;IACJ,CAAC;IAED,uBAAuB,CACrB,0BAAmC,EACnC,yBAAkC,EAClC,sBAA8D;QAE9D,IAAI,CAAC,+BAA+B,EAAE,CAAC;QACvC,IACE,0BAA0B;YAC1B,sBAAsB;YACtB,CAAC,yBAAyB,EAC1B;YACA,OAAO,IAAI,yBAAyB,CAAC,GAAG,EAAE,CACxC,oBAAoB,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CACjE,CAAC;SACH;aAAM;YACL,MAAM,eAAe,GAAG,IAAI,yBAAyB,CAAC,GAAG,EAAE,CACzD,oBAAoB,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAChD,CAAC;YACF,eAAe,CAAC,iBAAiB,GAAG,yBAAyB;gBAC3D,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,0BAA0B,CAAC;YAC/B,OAAO,eAAe,CAAC;SACxB;IACH,CAAC;CACF"}

package/lib/stores/shared/LambdaParameterState.d.ts

@@ -13,12 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { type ObserverContext, type Type, type ValueSpecification, type PureModel, VariableExpression } from '@finos/legend-graph';
+import { type ObserverContext, type Type, type ValueSpecification, type PureModel, type GraphManagerState, type RawLambda, VariableExpression, LambdaFunction, Multiplicity, ParameterValue } from '@finos/legend-graph';
 import { type Hashable } from '@finos/legend-shared';
 export declare enum PARAMETER_SUBMIT_ACTION {
     EXECUTE = "EXECUTE",
     EXPORT = "EXPORT"
 }
+export declare const buildParametersLetLambdaFunc: (graph: PureModel, lambdaParametersStates: LambdaParameterState[]) => LambdaFunction;
+/**
+ * For most query executions we will use the stragtical method of sending in `paramValues` as part of the execution input payload.
+ * However when the user wants to use a function value as the parameter value, engine does not understand this i.e for date param the functions `now()`, `today()`.
+ * Engine Does not support this because those functions require a building of execution nodes inside the execution plan.
+ * To continue supporting this execution flow , we will add let statements for parameter values with function values so that they can be evaluated to constants in the execution plan.
+ */
+export declare const doesLambdaParameterStateContainFunctionValues: (parameterState: LambdaParameterState) => boolean;
+export declare const getParameterStatesWithFunctionValues: (parameterStates: LambdaParameterState[]) => LambdaParameterState[];
+export declare const buildExecutionParameterValues: (paramStates: LambdaParameterState[], graphState: GraphManagerState) => ParameterValue[];
+export declare const getExecutionQueryFromRawLambda: (rawLambda: RawLambda, parameterStates: LambdaParameterState[], graphManagerState: GraphManagerState) => RawLambda;
+export declare const buildExecutionQueryFromLambdaFunction: (lambdaFunction: LambdaFunction, parameterStates: LambdaParameterState[], graphManagerState: GraphManagerState) => LambdaFunction;
 export declare class LambdaParameterState implements Hashable {
     readonly uuid: string;
     readonly parameter: VariableExpression;
@@ -30,7 +42,7 @@ export declare class LambdaParameterState implements Hashable {
     mockParameterValue(): void;
     setValue(value: ValueSpecification | undefined): void;
     changeVariableType(type: Type): void;
-    changeMultiplicity(variableExpression: VariableExpression, lowerBound: number, uppderBound: number | undefined): void;
+    changeMultiplicity(variableExpression: VariableExpression, mul: Multiplicity): void;
     get variableName(): string;
     get variableType(): Type | undefined;
 }

package/lib/stores/shared/LambdaParameterState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LambdaParameterState.d.ts","sourceRoot":"","sources":["../../../src/stores/shared/LambdaParameterState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,SAAS,EAKd,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAGL,KAAK,QAAQ,EAId,MAAM,sBAAsB,CAAC;AAQ9B,oBAAY,uBAAuB;IACjC,OAAO,YAAY;IACnB,MAAM,WAAW;CAClB;AAMD,qBAAa,oBAAqB,YAAW,QAAQ;IACnD,QAAQ,CAAC,IAAI,SAAU;IACvB,QAAQ,CAAC,SAAS,EAAE,kBAAkB,CAAC;IACvC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,iBAAiB,EAAE,eAAe,CAAC;IAE5C,KAAK,EAAE,kBAAkB,GAAG,SAAS,CAAC;gBAGpC,kBAAkB,EAAE,kBAAkB,EACtC,iBAAiB,EAAE,eAAe,EAClC,KAAK,EAAE,SAAS;IAalB,IAAI,QAAQ,IAAI,MAAM,CAKrB;IAED,kBAAkB,IAAI,IAAI;IAM1B,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,SAAS,GAAG,IAAI;IAWrD,kBAAkB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAUpC,kBAAkB,CAChB,kBAAkB,EAAE,kBAAkB,EACtC,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,GAAG,SAAS,GAC9B,IAAI;IAcP,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,IAAI,YAAY,IAAI,IAAI,GAAG,SAAS,CAEnC;CACF;AAED,qBAAa,kCAAkC;IAC7C,SAAS,UAAS;IAClB,YAAY,EACR;QACE,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7B,KAAK,EAAE,MAAM,CAAC;KACf,GACD,SAAS,CAAC;;IAYd,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAIhC,eAAe,CACb,GAAG,EACC;QACE,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7B,KAAK,EAAE,MAAM,CAAC;KACf,GACD,SAAS,GACZ,IAAI;IAIP,IAAI,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAKvD,KAAK,IAAI,IAAI;CAId;AAED,8BAAsB,qBAAsB,YAAW,QAAQ;IAC7D,eAAe,EAAE,oBAAoB,EAAE,CAAM;IAC7C,0BAA0B,qCAA4C;;IAQtE,IAAI,QAAQ,IAAI,MAAM,CAKrB;IAED,YAAY,CAAC,GAAG,EAAE,oBAAoB,GAAG,IAAI;IAI7C,eAAe,CAAC,GAAG,EAAE,oBAAoB,GAAG,IAAI;IAIhD,aAAa,CAAC,GAAG,EAAE,oBAAoB,EAAE,GAAG,IAAI;CAGjD"}
+{"version":3,"file":"LambdaParameterState.d.ts","sourceRoot":"","sources":["../../../src/stores/shared/LambdaParameterState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,SAAS,EACd,KAAK,iBAAiB,EACtB,KAAK,SAAS,EAKd,kBAAkB,EAGlB,cAAc,EAId,YAAY,EAKZ,cAAc,EAEf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAGL,KAAK,QAAQ,EAMd,MAAM,sBAAsB,CAAC;AAQ9B,oBAAY,uBAAuB;IACjC,OAAO,YAAY;IACnB,MAAM,WAAW;CAClB;AAOD,eAAO,MAAM,4BAA4B,UAChC,SAAS,0BACQ,oBAAoB,EAAE,KAC7C,cA6BF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,6CAA6C,mBACxC,oBAAoB,KACnC,OAIA,CAAC;AAEJ,eAAO,MAAM,oCAAoC,oBAC9B,oBAAoB,EAAE,KACtC,oBAAoB,EACgD,CAAC;AAExE,eAAO,MAAM,6BAA6B,gBAC3B,oBAAoB,EAAE,cACvB,iBAAiB,KAC5B,cAAc,EAUX,CAAC;AAEP,eAAO,MAAM,8BAA8B,cAC9B,SAAS,mBACH,oBAAoB,EAAE,qBACpB,iBAAiB,KACnC,SA0BF,CAAC;AAEF,eAAO,MAAM,qCAAqC,mBAChC,cAAc,mBACb,oBAAoB,EAAE,qBACpB,iBAAiB,KACnC,cAwBF,CAAC;AAEF,qBAAa,oBAAqB,YAAW,QAAQ;IACnD,QAAQ,CAAC,IAAI,SAAU;IACvB,QAAQ,CAAC,SAAS,EAAE,kBAAkB,CAAC;IACvC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,iBAAiB,EAAE,eAAe,CAAC;IAE5C,KAAK,EAAE,kBAAkB,GAAG,SAAS,CAAC;gBAGpC,kBAAkB,EAAE,kBAAkB,EACtC,iBAAiB,EAAE,eAAe,EAClC,KAAK,EAAE,SAAS;IAalB,IAAI,QAAQ,IAAI,MAAM,CAKrB;IAED,kBAAkB,IAAI,IAAI;IAM1B,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,SAAS,GAAG,IAAI;IAWrD,kBAAkB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAUpC,kBAAkB,CAChB,kBAAkB,EAAE,kBAAkB,EACtC,GAAG,EAAE,YAAY,GAChB,IAAI;IAQP,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,IAAI,YAAY,IAAI,IAAI,GAAG,SAAS,CAEnC;CACF;AAED,qBAAa,kCAAkC;IAC7C,SAAS,UAAS;IAClB,YAAY,EACR;QACE,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7B,KAAK,EAAE,MAAM,CAAC;KACf,GACD,SAAS,CAAC;;IAYd,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAIhC,eAAe,CACb,GAAG,EACC;QACE,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7B,KAAK,EAAE,MAAM,CAAC;KACf,GACD,SAAS,GACZ,IAAI;IAIP,IAAI,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAKvD,KAAK,IAAI,IAAI;CAId;AAED,8BAAsB,qBAAsB,YAAW,QAAQ;IAC7D,eAAe,EAAE,oBAAoB,EAAE,CAAM;IAC7C,0BAA0B,qCAA4C;;IAQtE,IAAI,QAAQ,IAAI,MAAM,CAKrB;IAED,YAAY,CAAC,GAAG,EAAE,oBAAoB,GAAG,IAAI;IAI7C,eAAe,CAAC,GAAG,EAAE,oBAAoB,GAAG,IAAI;IAIhD,aAAa,CAAC,GAAG,EAAE,oBAAoB,EAAE,GAAG,IAAI;CAGjD"}

package/lib/stores/shared/LambdaParameterState.js

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { GenericType, GenericTypeExplicitReference, observe_ValueSpecification, observe_VariableExpression, VariableExpression, } from '@finos/legend-graph';
-import { addUniqueEntry, deleteEntry, hashArray, IllegalStateError, uuid, } from '@finos/legend-shared';
+import { GenericType, GenericTypeExplicitReference, observe_ValueSpecification, observe_VariableExpression, VariableExpression, SimpleFunctionExpression, PackageableElementExplicitReference, LambdaFunction, FunctionType, CORE_PURE_PATH, extractElementNameFromPath, Multiplicity, PrimitiveInstanceValue, PrimitiveType, SUPPORTED_FUNCTIONS, areMultiplicitiesEqual, ParameterValue, buildRawLambdaFromLambdaFunction, } from '@finos/legend-graph';
+import { addUniqueEntry, deleteEntry, hashArray, IllegalStateError, uuid, isNonNullable, guaranteeNonNullable, } from '@finos/legend-shared';
 import { makeObservable, observable, action, computed } from 'mobx';
 import { generateVariableExpressionMockValue } from './ValueSpecificationEditorHelper.js';
 import { valueSpecification_setGenericType, valueSpecification_setMultiplicity, } from './ValueSpecificationModifierHelper.js';
@@ -28,6 +28,80 @@ var LAMABA_PARAMETER_HASH_STRUCTURE;
     LAMABA_PARAMETER_HASH_STRUCTURE["LAMBDA_PARAMETER_STATE"] = "LAMBDA_PARAMETER_STATE";
     LAMABA_PARAMETER_HASH_STRUCTURE["LAMBDA_PARAMETERS_STATE"] = "LAMBDA_PARAMETERS_STATE";
 })(LAMABA_PARAMETER_HASH_STRUCTURE || (LAMABA_PARAMETER_HASH_STRUCTURE = {}));
+export const buildParametersLetLambdaFunc = (graph, lambdaParametersStates) => {
+    const letlambdaFunction = new LambdaFunction(new FunctionType(PackageableElementExplicitReference.create(graph.getType(CORE_PURE_PATH.ANY)), Multiplicity.ONE));
+    letlambdaFunction.expressionSequence = lambdaParametersStates
+        .map((queryParamState) => {
+        if (queryParamState.value) {
+            const letFunc = new SimpleFunctionExpression(extractElementNameFromPath(SUPPORTED_FUNCTIONS.LET));
+            const letVar = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(new GenericType(PrimitiveType.STRING)));
+            letVar.values = [queryParamState.variableName];
+            letFunc.parametersValues.push(letVar);
+            letFunc.parametersValues.push(queryParamState.value);
+            return letFunc;
+        }
+        return undefined;
+    })
+        .filter(isNonNullable);
+    return letlambdaFunction;
+};
+/**
+ * For most query executions we will use the stragtical method of sending in `paramValues` as part of the execution input payload.
+ * However when the user wants to use a function value as the parameter value, engine does not understand this i.e for date param the functions `now()`, `today()`.
+ * Engine Does not support this because those functions require a building of execution nodes inside the execution plan.
+ * To continue supporting this execution flow , we will add let statements for parameter values with function values so that they can be evaluated to constants in the execution plan.
+ */
+export const doesLambdaParameterStateContainFunctionValues = (parameterState) => parameterState.value instanceof SimpleFunctionExpression &&
+    [Multiplicity.ONE, Multiplicity.ZERO_ONE].some((p) => areMultiplicitiesEqual(p, parameterState.parameter.multiplicity));
+export const getParameterStatesWithFunctionValues = (parameterStates) => parameterStates.filter(doesLambdaParameterStateContainFunctionValues);
+export const buildExecutionParameterValues = (paramStates, graphState) => paramStates
+    .filter((ps) => !doesLambdaParameterStateContainFunctionValues(ps))
+    .map((queryParamState) => {
+    const paramValue = new ParameterValue();
+    paramValue.name = queryParamState.parameter.name;
+    paramValue.value = graphState.graphManager.serializeValueSpecification(guaranteeNonNullable(queryParamState.value));
+    return paramValue;
+});
+export const getExecutionQueryFromRawLambda = (rawLambda, parameterStates, graphManagerState) => {
+    const paramsWithLetStatements = getParameterStatesWithFunctionValues(parameterStates);
+    if (paramsWithLetStatements.length > 0) {
+        const execuLambdaFunction = buildParametersLetLambdaFunc(graphManagerState.graph, paramsWithLetStatements);
+        // remove parameters added as let statements from lambda parameters
+        execuLambdaFunction.functionType.parameters = parameterStates
+            .filter((ps) => !paramsWithLetStatements.includes(ps))
+            .map((e) => e.parameter);
+        const execQuery = buildRawLambdaFromLambdaFunction(execuLambdaFunction, graphManagerState);
+        // reset paramaters
+        if (Array.isArray(rawLambda.body) && Array.isArray(execQuery.body)) {
+            execQuery.body = [
+                ...execQuery.body,
+                ...rawLambda.body,
+            ];
+            return execQuery;
+        }
+    }
+    return rawLambda;
+};
+export const buildExecutionQueryFromLambdaFunction = (lambdaFunction, parameterStates, graphManagerState) => {
+    const funcParameterStates = getParameterStatesWithFunctionValues(parameterStates);
+    if (funcParameterStates.length) {
+        // To handle parameter value with function calls we
+        // 1. remove those parameters from parameter list
+        // 2. add let statements with parameter values
+        lambdaFunction.functionType.parameters = parameterStates
+            .filter((ps) => !funcParameterStates.includes(ps))
+            .map((e) => e.parameter);
+        const letsFuncs = buildParametersLetLambdaFunc(graphManagerState.graph, funcParameterStates);
+        lambdaFunction.expressionSequence = [
+            ...letsFuncs.expressionSequence,
+            ...lambdaFunction.expressionSequence,
+        ];
+    }
+    else {
+        lambdaFunction.functionType.parameters = parameterStates.map((e) => e.parameter);
+    }
+    return lambdaFunction;
+};
 export class LambdaParameterState {
     uuid = uuid();
     parameter;
@@ -68,11 +142,10 @@ export class LambdaParameterState {
             this.mockParameterValue();
         }
     }
-    changeMultiplicity(variableExpression, lowerBound, uppderBound) {
+    changeMultiplicity(variableExpression, mul) {
         const current = this.parameter.multiplicity;
-        if (current.lowerBound !== lowerBound ||
-            current.upperBound !== uppderBound) {
-            valueSpecification_setMultiplicity(variableExpression, this.graph.getMultiplicity(lowerBound, uppderBound));
+        if (!areMultiplicitiesEqual(current, mul)) {
+            valueSpecification_setMultiplicity(variableExpression, mul);
             this.mockParameterValue();
         }
     }

package/lib/stores/shared/LambdaParameterState.js.map

@@ -1 +1 @@
-{"version":3,"file":"LambdaParameterState.js","sourceRoot":"","sources":["../../../src/stores/shared/LambdaParameterState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LambdaParameterState.js","sourceRoot":"","sources":["../../../src/stores/shared/LambdaParameterState.ts"],"names":[],"mappings":"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"}

package/lib/stores/shared/ValueSpecificationEditorHelper.d.ts

@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { type PureModel, type InstanceValue, type VariableExpression, Enumeration, PrimitiveInstanceValue, PRIMITIVE_TYPE } from '@finos/legend-graph';
+import { type PureModel, type InstanceValue, VariableExpression, type ValueSpecification, type Type, Enumeration, PrimitiveInstanceValue, PRIMITIVE_TYPE } from '@finos/legend-graph';
 export declare const createMockEnumerationProperty: (enumeration: Enumeration) => string;
 export declare const buildPrimitiveInstanceValue: (graph: PureModel, type: PRIMITIVE_TYPE, value: unknown) => PrimitiveInstanceValue;
+export declare const buildDefaultInstanceValue: (graph: PureModel, type: Type) => ValueSpecification;
 export declare const generateVariableExpressionMockValue: (parameter: VariableExpression, graph: PureModel) => InstanceValue | undefined;
+export declare const getValueSpecificationStringValue: (valueSpecification: ValueSpecification) => string | undefined;
 //# sourceMappingURL=ValueSpecificationEditorHelper.d.ts.map

package/lib/stores/shared/ValueSpecificationEditorHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ValueSpecificationEditorHelper.d.ts","sourceRoot":"","sources":["../../../src/stores/shared/ValueSpecificationEditorHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,kBAAkB,EAIvB,WAAW,EAMX,sBAAsB,EAEtB,cAAc,EACf,MAAM,qBAAqB,CAAC;AA2C7B,eAAO,MAAM,6BAA6B,gBAC3B,WAAW,KACvB,MACyE,CAAC;AAE7E,eAAO,MAAM,2BAA2B,UAC/B,SAAS,QACV,cAAc,SACb,OAAO,KACb,sBAQF,CAAC;AAEF,eAAO,MAAM,mCAAmC,cACnC,kBAAkB,SACtB,SAAS,KACf,aAAa,GAAG,SAqClB,CAAC"}
+{"version":3,"file":"ValueSpecificationEditorHelper.d.ts","sourceRoot":"","sources":["../../../src/stores/shared/ValueSpecificationEditorHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,kBAAkB,EAClB,KAAK,kBAAkB,EACvB,KAAK,IAAI,EAKT,WAAW,EAMX,sBAAsB,EAEtB,cAAc,EAGf,MAAM,qBAAqB,CAAC;AAiD7B,eAAO,MAAM,6BAA6B,gBAC3B,WAAW,KACvB,MACyE,CAAC;AAE7E,eAAO,MAAM,2BAA2B,UAC/B,SAAS,QACV,cAAc,SACb,OAAO,KACb,sBAQF,CAAC;AAEF,eAAO,MAAM,yBAAyB,UAC7B,SAAS,QACV,IAAI,KACT,kBA4CF,CAAC;AAEF,eAAO,MAAM,mCAAmC,cACnC,kBAAkB,SACtB,SAAS,KACf,aAAa,GAAG,SAqClB,CAAC;AAEF,eAAO,MAAM,gCAAgC,uBACvB,kBAAkB,KACrC,MAAM,GAAG,SAkBX,CAAC"}

package/lib/stores/shared/ValueSpecificationEditorHelper.js

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { CollectionInstanceValue, DATE_FORMAT, DATE_TIME_FORMAT, Enumeration, EnumValueExplicitReference, EnumValueInstanceValue, GenericType, GenericTypeExplicitReference, getEnumValue, PrimitiveInstanceValue, PrimitiveType, PRIMITIVE_TYPE, } from '@finos/legend-graph';
-import { addDays, formatDate, Randomizer } from '@finos/legend-shared';
+import { VariableExpression, CollectionInstanceValue, DATE_FORMAT, DATE_TIME_FORMAT, Enumeration, EnumValueExplicitReference, EnumValueInstanceValue, GenericType, GenericTypeExplicitReference, getEnumValue, PrimitiveInstanceValue, PrimitiveType, PRIMITIVE_TYPE, INTERNAL__PropagatedValue, SimpleFunctionExpression, } from '@finos/legend-graph';
+import { addDays, formatDate, Randomizer, UnsupportedOperationError, } from '@finos/legend-shared';
+import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationHelper.js';
 import { instanceValue_setValues } from './ValueSpecificationModifierHelper.js';
 const createMockPrimitiveProperty = (primitiveType, propertyName) => {
     const randomizer = new Randomizer();
@@ -45,6 +46,37 @@ export const buildPrimitiveInstanceValue = (graph, type, value) => {
     instanceValue_setValues(instance, [value]);
     return instance;
 };
+export const buildDefaultInstanceValue = (graph, type) => {
+    const path = type.path;
+    switch (path) {
+        case PRIMITIVE_TYPE.STRING:
+        case PRIMITIVE_TYPE.BOOLEAN:
+        case PRIMITIVE_TYPE.STRICTDATE:
+        case PRIMITIVE_TYPE.DATETIME:
+        case PRIMITIVE_TYPE.NUMBER:
+        case PRIMITIVE_TYPE.DECIMAL:
+        case PRIMITIVE_TYPE.FLOAT:
+        case PRIMITIVE_TYPE.BINARY:
+        case PRIMITIVE_TYPE.INTEGER: {
+            return buildPrimitiveInstanceValue(graph, path, generateDefaultValueForPrimitiveType(path));
+        }
+        case PRIMITIVE_TYPE.DATE: {
+            return buildPrimitiveInstanceValue(graph, PRIMITIVE_TYPE.STRICTDATE, generateDefaultValueForPrimitiveType(path));
+        }
+        default:
+            if (type instanceof Enumeration) {
+                if (type.values.length > 0) {
+                    const enumValueInstanceValue = new EnumValueInstanceValue(GenericTypeExplicitReference.create(new GenericType(type)));
+                    instanceValue_setValues(enumValueInstanceValue, [
+                        EnumValueExplicitReference.create(type.values[0]),
+                    ]);
+                    return enumValueInstanceValue;
+                }
+                throw new UnsupportedOperationError(`Can't get default value for enumeration since enumeration '${path}' has no value`);
+            }
+            throw new UnsupportedOperationError(`Can't get default value for type'${path}'`);
+    }
+};
 export const generateVariableExpressionMockValue = (parameter, graph) => {
     const varType = parameter.genericType?.value.rawType;
     const multiplicity = parameter.multiplicity;
@@ -72,4 +104,28 @@ export const generateVariableExpressionMockValue = (parameter, graph) => {
     }
     return undefined;
 };
+export const getValueSpecificationStringValue = (valueSpecification) => {
+    if (valueSpecification instanceof PrimitiveInstanceValue) {
+        return valueSpecification.values[0]?.toString();
+    }
+    else if (valueSpecification instanceof EnumValueInstanceValue) {
+        const _enum = valueSpecification.values[0];
+        return `${_enum?.ownerReference.value.name}.${_enum?.value.name}`;
+    }
+    else if (valueSpecification instanceof VariableExpression) {
+        return valueSpecification.name;
+    }
+    else if (valueSpecification instanceof INTERNAL__PropagatedValue) {
+        return getValueSpecificationStringValue(valueSpecification.getValue());
+    }
+    else if (valueSpecification instanceof SimpleFunctionExpression) {
+        return valueSpecification.functionName;
+    }
+    else if (valueSpecification instanceof CollectionInstanceValue) {
+        return valueSpecification.values
+            .map(getValueSpecificationStringValue)
+            .join(',');
+    }
+    return undefined;
+};
 //# sourceMappingURL=ValueSpecificationEditorHelper.js.map

package/lib/stores/shared/ValueSpecificationEditorHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"ValueSpecificationEditorHelper.js","sourceRoot":"","sources":["../../../src/stores/shared/ValueSpecificationEditorHelper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ValueSpecificationEditorHelper.js","sourceRoot":"","sources":["../../../src/stores/shared/ValueSpecificationEditorHelper.ts"],"names":[],"mappings":"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"}

package/lib/stores/watermark/QueryBuilderWatermarkStateBuilder.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SimpleFunctionExpression } from '@finos/legend-graph';
+import { type LambdaFunction, SimpleFunctionExpression } from '@finos/legend-graph';
 import type { QueryBuilderState } from '../QueryBuilderState.js';
-export declare const processWatermarkExpression: (expression: SimpleFunctionExpression, queryBuilderState: QueryBuilderState) => void;
+export declare const processWatermarkExpression: (expression: SimpleFunctionExpression, queryBuilderState: QueryBuilderState, parentLambda: LambdaFunction) => void;
 //# sourceMappingURL=QueryBuilderWatermarkStateBuilder.d.ts.map

package/lib/stores/watermark/QueryBuilderWatermarkStateBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderWatermarkStateBuilder.d.ts","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkStateBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,wBAAwB,EAEzB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAGjE,eAAO,MAAM,0BAA0B,eACzB,wBAAwB,qBACjB,iBAAiB,KACnC,IAqBF,CAAC"}
+{"version":3,"file":"QueryBuilderWatermarkStateBuilder.d.ts","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkStateBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,cAAc,EACnB,wBAAwB,EAEzB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAGjE,eAAO,MAAM,0BAA0B,eACzB,wBAAwB,qBACjB,iBAAiB,gBACtB,cAAc,KAC3B,IAsBF,CAAC"}

package/lib/stores/watermark/QueryBuilderWatermarkStateBuilder.js

@@ -17,13 +17,13 @@ import { SimpleFunctionExpression, matchFunctionName, } from '@finos/legend-grap
 import { assertTrue, guaranteeType } from '@finos/legend-shared';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graphManager/QueryBuilderSupportedFunctions.js';
 import { QueryBuilderValueSpecificationProcessor } from '../QueryBuilderStateBuilder.js';
-export const processWatermarkExpression = (expression, queryBuilderState) => {
+export const processWatermarkExpression = (expression, queryBuilderState, parentLambda) => {
     // check preceding expression
     const precedingExpression = guaranteeType(expression.parametersValues[0], SimpleFunctionExpression, `Can't process forWatermark() expression: only support forWatermark() immediately following an expression`);
     assertTrue(matchFunctionName(precedingExpression.functionName, [
         QUERY_BUILDER_SUPPORTED_FUNCTIONS.GET_ALL,
     ]), `Can't process forWatermark() expression: only support forWatermark() immediately following getAll()`);
-    QueryBuilderValueSpecificationProcessor.process(precedingExpression, queryBuilderState);
+    QueryBuilderValueSpecificationProcessor.process(precedingExpression, parentLambda, queryBuilderState);
     const watermarkValue = expression.parametersValues[1];
     queryBuilderState.watermarkState.setValue(watermarkValue);
 };

package/lib/stores/watermark/QueryBuilderWatermarkStateBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderWatermarkStateBuilder.js","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkStateBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,wBAAwB,EACxB,iBAAiB,GAClB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,iCAAiC,EAAE,MAAM,sDAAsD,CAAC;AAEzG,OAAO,EAAE,uCAAuC,EAAE,MAAM,gCAAgC,CAAC;AAEzF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,UAAoC,EACpC,iBAAoC,EAC9B,EAAE;IACR,6BAA6B;IAC7B,MAAM,mBAAmB,GAAG,aAAa,CACvC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAC9B,wBAAwB,EACxB,0GAA0G,CAC3G,CAAC;IACF,UAAU,CACR,iBAAiB,CAAC,mBAAmB,CAAC,YAAY,EAAE;QAClD,iCAAiC,CAAC,OAAO;KAC1C,CAAC,EACF,qGAAqG,CACtG,CAAC;IAEF,uCAAuC,CAAC,OAAO,CAC7C,mBAAmB,EACnB,iBAAiB,CAClB,CAAC;IAEF,MAAM,cAAc,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IACtD,iBAAiB,CAAC,cAAc,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AAC5D,CAAC,CAAC"}
+{"version":3,"file":"QueryBuilderWatermarkStateBuilder.js","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkStateBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,wBAAwB,EACxB,iBAAiB,GAClB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,iCAAiC,EAAE,MAAM,sDAAsD,CAAC;AAEzG,OAAO,EAAE,uCAAuC,EAAE,MAAM,gCAAgC,CAAC;AAEzF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,UAAoC,EACpC,iBAAoC,EACpC,YAA4B,EACtB,EAAE;IACR,6BAA6B;IAC7B,MAAM,mBAAmB,GAAG,aAAa,CACvC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAC9B,wBAAwB,EACxB,0GAA0G,CAC3G,CAAC;IACF,UAAU,CACR,iBAAiB,CAAC,mBAAmB,CAAC,YAAY,EAAE;QAClD,iCAAiC,CAAC,OAAO;KAC1C,CAAC,EACF,qGAAqG,CACtG,CAAC;IAEF,uCAAuC,CAAC,OAAO,CAC7C,mBAAmB,EACnB,YAAY,EACZ,iBAAiB,CAClB,CAAC;IAEF,MAAM,cAAc,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IACtD,iBAAiB,CAAC,cAAc,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AAC5D,CAAC,CAAC"}

package/lib/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SimpleFunctionExpression } from '@finos/legend-graph';
+import { type LambdaFunction } from '@finos/legend-graph';
 import type { QueryBuilderWatermarkState } from './QueryBuilderWatermarkState.js';
-export declare const buildWatermarkExpression: (watermarkState: QueryBuilderWatermarkState, getAllFunc: SimpleFunctionExpression) => SimpleFunctionExpression | undefined;
+export declare const buildWatermarkExpression: (watermarkState: QueryBuilderWatermarkState, lambdaFunction: LambdaFunction) => void;
 //# sourceMappingURL=QueryBuilderWatermarkValueSpecificationBuilder.d.ts.map

package/lib/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderWatermarkValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,wBAAwB,EAEzB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAElF,eAAO,MAAM,wBAAwB,mBACnB,0BAA0B,cAC9B,wBAAwB,KACnC,wBAAwB,GAAG,SAiB7B,CAAC"}
+{"version":3,"file":"QueryBuilderWatermarkValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAElF,eAAO,MAAM,wBAAwB,mBACnB,0BAA0B,kBAC1B,cAAc,KAC7B,IAqBF,CAAC"}

package/lib/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.js

@@ -14,17 +14,20 @@
  * limitations under the License.
  */
 import { SimpleFunctionExpression, extractElementNameFromPath, } from '@finos/legend-graph';
+import { guaranteeNonNullable } from '@finos/legend-shared';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graphManager/QueryBuilderSupportedFunctions.js';
-export const buildWatermarkExpression = (watermarkState, getAllFunc) => {
+export const buildWatermarkExpression = (watermarkState, lambdaFunction) => {
     if (!watermarkState.value) {
-        return undefined;
+        return;
     }
+    const currentExpression = guaranteeNonNullable(lambdaFunction.expressionSequence[0]);
     // main filter expression
     const watermarkExpression = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.WATERMARK));
     // param [0]
-    watermarkExpression.parametersValues.push(getAllFunc);
+    watermarkExpression.parametersValues.push(currentExpression);
     // param [1]
     watermarkExpression.parametersValues.push(watermarkState.value);
-    return watermarkExpression;
+    // replace watermark as main expression
+    lambdaFunction.expressionSequence[0] = watermarkExpression;
 };
 //# sourceMappingURL=QueryBuilderWatermarkValueSpecificationBuilder.js.map

package/lib/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderWatermarkValueSpecificationBuilder.js","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,wBAAwB,EACxB,0BAA0B,GAC3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iCAAiC,EAAE,MAAM,sDAAsD,CAAC;AAGzG,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,cAA0C,EAC1C,UAAoC,EACE,EAAE;IACxC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IAED,yBAAyB;IACzB,MAAM,mBAAmB,GAAG,IAAI,wBAAwB,CACtD,0BAA0B,CAAC,iCAAiC,CAAC,SAAS,CAAC,CACxE,CAAC;IAEF,YAAY;IACZ,mBAAmB,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAEtD,YAAY;IACZ,mBAAmB,CAAC,gBAAgB,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAEhE,OAAO,mBAAmB,CAAC;AAC7B,CAAC,CAAC"}
+{"version":3,"file":"QueryBuilderWatermarkValueSpecificationBuilder.js","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,wBAAwB,EACxB,0BAA0B,GAE3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,iCAAiC,EAAE,MAAM,sDAAsD,CAAC;AAGzG,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,cAA0C,EAC1C,cAA8B,EACxB,EAAE;IACR,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE;QACzB,OAAO;KACR;IACD,MAAM,iBAAiB,GAAG,oBAAoB,CAC5C,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,CACrC,CAAC;IAEF,yBAAyB;IACzB,MAAM,mBAAmB,GAAG,IAAI,wBAAwB,CACtD,0BAA0B,CAAC,iCAAiC,CAAC,SAAS,CAAC,CACxE,CAAC;IAEF,YAAY;IACZ,mBAAmB,CAAC,gBAAgB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAE7D,YAAY;IACZ,mBAAmB,CAAC,gBAAgB,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAEhE,uCAAuC;IACvC,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC;AAC7D,CAAC,CAAC"}

package/lib/stores/workflows/ServiceQueryBuilderState.js

@@ -86,7 +86,7 @@ export class ServiceQueryBuilderState extends QueryBuilderState {
      */
     propagateExecutionContextChange(executionContext) {
         const mapping = executionContext.mapping;
-        this.changeMapping(mapping);
+        this.changeMapping(mapping, { keepQueryContent: true });
         this.changeRuntime(executionContext.runtimeValue);
         const compatibleClasses = getMappingCompatibleClasses(mapping, this.graphManagerState.usableClasses);
         // if there is no chosen class or the chosen one is not compatible

package/lib/stores/workflows/ServiceQueryBuilderState.js.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceQueryBuilderState.js","sourceRoot":"","sources":["../../../src/stores/workflows/ServiceQueryBuilderState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ServiceQueryBuilderState.js","sourceRoot":"","sources":["../../../src/stores/workflows/ServiceQueryBuilderState.ts"],"names":[],"mappings":"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"}