@finos/legend-query-builder 0.4.4 → 0.6.0

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/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/QueryBuilderWatermarkState.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { type ValueSpecification } from '@finos/legend-graph';
+import { type ValueSpecification, type VariableExpression } from '@finos/legend-graph';
 import { type Hashable } from '@finos/legend-shared';
 import type { QueryBuilderState } from '../QueryBuilderState.js';
 export declare class QueryBuilderWatermarkState implements Hashable {
@@ -25,6 +25,7 @@ export declare class QueryBuilderWatermarkState implements Hashable {
     setIsEditingWatermark(val: boolean): void;
     enableWatermark(): void;
     setValue(val: ValueSpecification | undefined): void;
+    isVariableUsed(variable: VariableExpression): boolean;
     get hashCode(): string;
 }
 //# sourceMappingURL=QueryBuilderWatermarkState.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderWatermarkState.d.ts","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,kBAAkB,EAMxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,sBAAsB,CAAC;AAGhE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,qBAAa,0BAA2B,YAAW,QAAQ;IACzD,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC9C,KAAK,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACvC,kBAAkB,UAAS;gBAEf,iBAAiB,EAAE,iBAAiB;IAchD,UAAU,IAAI,IAAI;IAWlB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAIzC,eAAe,IAAI,IAAI;IAQvB,QAAQ,CAAC,GAAG,EAAE,kBAAkB,GAAG,SAAS,GAAG,IAAI;IASnD,IAAI,QAAQ,IAAI,MAAM,CAKrB;CACF"}
+{"version":3,"file":"QueryBuilderWatermarkState.d.ts","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EAMxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,sBAAsB,CAAC;AAGhE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAGjE,qBAAa,0BAA2B,YAAW,QAAQ;IACzD,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC9C,KAAK,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACvC,kBAAkB,UAAS;gBAEf,iBAAiB,EAAE,iBAAiB;IAchD,UAAU,IAAI,IAAI;IAWlB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAIzC,eAAe,IAAI,IAAI;IAQvB,QAAQ,CAAC,GAAG,EAAE,kBAAkB,GAAG,SAAS,GAAG,IAAI;IASnD,cAAc,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO;IAMrD,IAAI,QAAQ,IAAI,MAAM,CAKrB;CACF"}

package/lib/stores/watermark/QueryBuilderWatermarkState.js

@@ -17,6 +17,7 @@ import { observe_ValueSpecification, GenericTypeExplicitReference, GenericType,
 import { hashArray } from '@finos/legend-shared';
 import { makeObservable, observable, action, computed } from 'mobx';
 import { QUERY_BUILDER_HASH_STRUCTURE } from '../../graphManager/QueryBuilderHashUtils.js';
+import { isValueExpressionReferencesinValue } from '../QueryBuilderValueSpecificationHelper.js';
 export class QueryBuilderWatermarkState {
     queryBuilderState;
     value;
@@ -54,6 +55,11 @@ export class QueryBuilderWatermarkState {
             ? observe_ValueSpecification(val, this.queryBuilderState.observableContext)
             : undefined;
     }
+    isVariableUsed(variable) {
+        return this.value
+            ? isValueExpressionReferencesinValue(variable, this.value)
+            : false;
+    }
     get hashCode() {
         return hashArray([
             QUERY_BUILDER_HASH_STRUCTURE.WATERMARK_STATE,

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

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderWatermarkState.js","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,0BAA0B,EAC1B,4BAA4B,EAC5B,WAAW,EACX,sBAAsB,EACtB,aAAa,GACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAiB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AACpE,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAG3F,MAAM,OAAO,0BAA0B;IAC5B,iBAAiB,CAAoB;IAC9C,KAAK,CAAkC;IACvC,kBAAkB,GAAG,KAAK,CAAC;IAE3B,YAAY,iBAAoC;QAC9C,cAAc,CAAC,IAAI,EAAE;YACnB,KAAK,EAAE,UAAU;YACjB,kBAAkB,EAAE,UAAU;YAC9B,QAAQ,EAAE,MAAM;YAChB,UAAU,EAAE,MAAM;YAClB,eAAe,EAAE,MAAM;YACvB,qBAAqB,EAAE,MAAM;YAC7B,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;QAEH,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC7C,CAAC;IAED,UAAU;QACR,MAAM,iBAAiB,GAAG,IAAI,sBAAsB,CAClD,4BAA4B,CAAC,MAAM,CACjC,IAAI,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,CACtC,CACF,CAAC;QAEF,iBAAiB,CAAC,MAAM,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9C,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IACnC,CAAC;IAED,qBAAqB,CAAC,GAAY;QAChC,IAAI,CAAC,kBAAkB,GAAG,GAAG,CAAC;IAChC,CAAC;IAED,eAAe;QACb,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;SAC1B;aAAM;YACL,IAAI,CAAC,UAAU,EAAE,CAAC;SACnB;IACH,CAAC;IAED,QAAQ,CAAC,GAAmC;QAC1C,IAAI,CAAC,KAAK,GAAG,GAAG;YACd,CAAC,CAAC,0BAA0B,CACxB,GAAG,EACH,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CACzC;YACH,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,4BAA4B,CAAC,eAAe;YAC5C,IAAI,CAAC,KAAK,IAAI,EAAE;SACjB,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"QueryBuilderWatermarkState.js","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,0BAA0B,EAC1B,4BAA4B,EAC5B,WAAW,EACX,sBAAsB,EACtB,aAAa,GACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAiB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AACpE,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAE3F,OAAO,EAAE,kCAAkC,EAAE,MAAM,4CAA4C,CAAC;AAEhG,MAAM,OAAO,0BAA0B;IAC5B,iBAAiB,CAAoB;IAC9C,KAAK,CAAkC;IACvC,kBAAkB,GAAG,KAAK,CAAC;IAE3B,YAAY,iBAAoC;QAC9C,cAAc,CAAC,IAAI,EAAE;YACnB,KAAK,EAAE,UAAU;YACjB,kBAAkB,EAAE,UAAU;YAC9B,QAAQ,EAAE,MAAM;YAChB,UAAU,EAAE,MAAM;YAClB,eAAe,EAAE,MAAM;YACvB,qBAAqB,EAAE,MAAM;YAC7B,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;QAEH,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC7C,CAAC;IAED,UAAU;QACR,MAAM,iBAAiB,GAAG,IAAI,sBAAsB,CAClD,4BAA4B,CAAC,MAAM,CACjC,IAAI,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,CACtC,CACF,CAAC;QAEF,iBAAiB,CAAC,MAAM,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9C,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IACnC,CAAC;IAED,qBAAqB,CAAC,GAAY;QAChC,IAAI,CAAC,kBAAkB,GAAG,GAAG,CAAC;IAChC,CAAC;IAED,eAAe;QACb,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;SAC1B;aAAM;YACL,IAAI,CAAC,UAAU,EAAE,CAAC;SACnB;IACH,CAAC;IAED,QAAQ,CAAC,GAAmC;QAC1C,IAAI,CAAC,KAAK,GAAG,GAAG;YACd,CAAC,CAAC,0BAA0B,CACxB,GAAG,EACH,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CACzC;YACH,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAED,cAAc,CAAC,QAA4B;QACzC,OAAO,IAAI,CAAC,KAAK;YACf,CAAC,CAAC,kCAAkC,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC;YAC1D,CAAC,CAAC,KAAK,CAAC;IACZ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,4BAA4B,CAAC,eAAe;YAC5C,IAAI,CAAC,KAAK,IAAI,EAAE;SACjB,CAAC,CAAC;IACL,CAAC;CACF"}

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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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-query-builder",
-  "version": "0.4.4",
+  "version": "0.6.0",
   "description": "Legend query builder core",
   "keywords": [
     "legend",
@@ -44,17 +44,17 @@
     "@ag-grid-community/client-side-row-model": "28.2.1",
     "@ag-grid-community/core": "28.2.1",
     "@ag-grid-community/react": "28.2.1",
-    "@finos/legend-application": "10.0.8",
-    "@finos/legend-art": "5.0.5",
-    "@finos/legend-graph": "20.0.2",
-    "@finos/legend-server-depot": "4.1.6",
-    "@finos/legend-shared": "6.2.2",
-    "@finos/legend-storage": "3.0.17",
+    "@finos/legend-application": "10.0.10",
+    "@finos/legend-art": "5.0.6",
+    "@finos/legend-graph": "20.1.1",
+    "@finos/legend-server-depot": "4.1.7",
+    "@finos/legend-shared": "6.2.3",
+    "@finos/legend-storage": "3.0.18",
     "@testing-library/react": "13.4.0",
     "@types/papaparse": "5.3.5",
     "@types/react": "18.0.25",
-    "@types/react-dom": "18.0.8",
-    "mobx": "6.6.2",
+    "@types/react-dom": "18.0.9",
+    "mobx": "6.7.0",
     "mobx-react-lite": "3.4.0",
     "monaco-editor": "0.34.1",
     "papaparse": "5.3.2",
@@ -64,14 +64,14 @@
     "serializr": "3.0.1"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.0.25",
-    "@jest/globals": "29.3.0",
+    "@finos/legend-dev-utils": "2.0.26",
+    "@jest/globals": "29.3.1",
     "cross-env": "7.0.3",
     "eslint": "8.27.0",
-    "jest": "29.3.0",
+    "jest": "29.3.1",
     "npm-run-all": "4.1.5",
     "rimraf": "3.0.2",
-    "sass": "1.56.0",
+    "sass": "1.56.1",
     "typescript": "4.8.4"
   },
   "peerDependencies": {

package/src/components/QueryBuilder.tsx

@@ -56,6 +56,7 @@ import { guaranteeType } from '@finos/legend-shared';
 import { QueryBuilderGraphFetchTreeState } from '../stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.js';
 import { QueryBuilderPostTDSPanel } from './fetch-structure/QueryBuilderPostTDSPanel.js';
 import { QueryBuilderWatermarkEditor } from './watermark/QueryBuilderWatermark.js';
+import { QueryBuilderConstantExpressionPanel } from './QueryBuilderConstantExpressionPanel.js';
 
 export const QUERY_BUILDER_BACKDROP_CONTAINER_ID =
   'query-builder.backdrop-container';
@@ -187,6 +188,11 @@ export const QueryBuilder = observer(
         !queryBuilderState.showParametersPanel,
       );
     };
+    const toggleConstantPanel = (): void => {
+      queryBuilderState.constantState.setShowConstantPanel(
+        !queryBuilderState.constantState.showConstantPanel,
+      );
+    };
     const toggleShowFilterPanel = (): void => {
       queryBuilderState.filterState.setShowPanel(
         !queryBuilderState.filterState.showPanel,
@@ -305,6 +311,27 @@ export const QueryBuilder = observer(
                             </MenuContentItemLabel>
                           </MenuContentItem>
                         )}
+                        {
+                          <MenuContentItem
+                            onClick={toggleConstantPanel}
+                            disabled={
+                              !queryBuilderState.isQuerySupported ||
+                              queryBuilderState.constantState.constants.length >
+                                0
+                            }
+                          >
+                            <MenuContentItemIcon>
+                              {queryBuilderState.constantState
+                                .showConstantPanel ? (
+                                <CheckIcon />
+                              ) : null}
+                            </MenuContentItemIcon>
+                            <MenuContentItemLabel className="query-builder__sub-header__menu-content">
+                              Show Constant(s)
+                            </MenuContentItemLabel>
+                          </MenuContentItem>
+                        }
+
                         <MenuContentItem
                           onClick={toggleShowFilterPanel}
                           disabled={
@@ -441,6 +468,17 @@ export const QueryBuilder = observer(
                                 />
                               </ResizablePanel>
                             )}
+                            {/* constants panel */}
+                            {queryBuilderState.constantState
+                              .showConstantPanel && <ResizablePanelSplitter />}
+                            {queryBuilderState.constantState
+                              .showConstantPanel && (
+                              <ResizablePanel minSize={40} direction={-1}>
+                                <QueryBuilderConstantExpressionPanel
+                                  queryBuilderState={queryBuilderState}
+                                />
+                              </ResizablePanel>
+                            )}
                           </ResizablePanelGroup>
                         </QueryBuilderSidebar>
                       </ResizablePanel>