@finos/legend-query-builder 0.1.2 → 0.2.1

package/lib/stores/shared/ValueSpecificationEditorHelper.js

@@ -0,0 +1,77 @@
+/**
+ * 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 { CollectionInstanceValue, DATE_FORMAT, DATE_TIME_FORMAT, Enumeration, EnumValueExplicitReference, EnumValueInstanceValue, GenericType, GenericTypeExplicitReference, getEnumValue, PrimitiveInstanceValue, PrimitiveType, PRIMITIVE_TYPE, TYPICAL_MULTIPLICITY_TYPE, } from '@finos/legend-graph';
+import { Randomizer } from '@finos/legend-shared';
+import { addDays, format } from 'date-fns';
+import { instanceValue_setValues } from './ValueSpecificationModifierHelper.js';
+const createMockPrimitiveProperty = (primitiveType, propertyName) => {
+    const randomizer = new Randomizer();
+    switch (primitiveType.name) {
+        case PRIMITIVE_TYPE.BOOLEAN:
+            return randomizer.getRandomItemInCollection([true, false]) ?? true;
+        case PRIMITIVE_TYPE.FLOAT:
+            return randomizer.getRandomFloat();
+        case PRIMITIVE_TYPE.DECIMAL:
+            return randomizer.getRandomDouble();
+        case PRIMITIVE_TYPE.NUMBER:
+        case PRIMITIVE_TYPE.INTEGER:
+            return randomizer.getRandomWholeNumber(100);
+        // NOTE that `Date` is the umbrella type that comprises `StrictDate` and `DateTime`, but for simplicity, we will generate `Date` as `StrictDate`
+        case PRIMITIVE_TYPE.DATE:
+        case PRIMITIVE_TYPE.STRICTDATE:
+            return format(randomizer.getRandomDate(new Date(Date.now()), addDays(Date.now(), 100)), DATE_FORMAT);
+        case PRIMITIVE_TYPE.DATETIME:
+            return format(randomizer.getRandomDate(new Date(Date.now()), addDays(Date.now(), 100)), DATE_TIME_FORMAT);
+        case PRIMITIVE_TYPE.STRING:
+        default:
+            return `${propertyName} ${randomizer.getRandomWholeNumber(100)}`;
+    }
+};
+export const createMockEnumerationProperty = (enumeration) => new Randomizer().getRandomItemInCollection(enumeration.values)?.name ?? '';
+export const buildPrimitiveInstanceValue = (graph, type, value) => {
+    const multiplicityOne = graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE);
+    const instance = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(new GenericType(graph.getPrimitiveType(type))), multiplicityOne);
+    instanceValue_setValues(instance, [value]);
+    return instance;
+};
+export const generateVariableExpressionMockValue = (parameter, graph) => {
+    const varType = parameter.genericType?.value.rawType;
+    const multiplicity = parameter.multiplicity;
+    if ((!multiplicity.upperBound || multiplicity.upperBound > 1) && varType) {
+        return new CollectionInstanceValue(multiplicity, GenericTypeExplicitReference.create(new GenericType(varType)));
+    }
+    if (varType instanceof PrimitiveType) {
+        const primitiveInstanceValue = new PrimitiveInstanceValue(GenericTypeExplicitReference.create(varType.name === PRIMITIVE_TYPE.DATE
+            ? new GenericType(graph.getPrimitiveType(PRIMITIVE_TYPE.STRICTDATE))
+            : new GenericType(varType)), multiplicity);
+        instanceValue_setValues(primitiveInstanceValue, [
+            createMockPrimitiveProperty(varType, parameter.name === '' ? 'myVar' : parameter.name),
+        ]);
+        return primitiveInstanceValue;
+    }
+    else if (varType instanceof Enumeration) {
+        const enumValueInstance = new EnumValueInstanceValue(GenericTypeExplicitReference.create(new GenericType(varType)), multiplicity);
+        const mock = createMockEnumerationProperty(varType);
+        if (mock !== '') {
+            instanceValue_setValues(enumValueInstance, [
+                EnumValueExplicitReference.create(getEnumValue(varType, mock)),
+            ]);
+        }
+        return enumValueInstance;
+    }
+    return undefined;
+};
+//# sourceMappingURL=ValueSpecificationEditorHelper.js.map

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

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

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

@@ -0,0 +1,33 @@
+/**
+ * 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 Multiplicity, type FunctionExpression, type ValueSpecification, type ObserverContext, type VariableExpression, type InstanceValue, type GraphFetchTree, type AbstractPropertyExpression, type GenericTypeReference, type SimpleFunctionExpression, type PackageableElementReference, type Function, type LambdaFunction, type FunctionType, type CollectionInstanceValue, type PropertyReference } from '@finos/legend-graph';
+export declare const valueSpecification_setGenericType: (target: ValueSpecification, val: GenericTypeReference | undefined) => void;
+export declare const valueSpecification_setMultiplicity: (target: ValueSpecification, val: Multiplicity) => void;
+export declare const simpleFunctionExpression_setFunc: (target: SimpleFunctionExpression, val: PackageableElementReference<Function> | undefined) => void;
+export declare const functionExpression_setParametersValues: (target: FunctionExpression, val: ValueSpecification[], context: ObserverContext) => void;
+export declare const functionExpression_setParameterValue: (target: FunctionExpression, val: ValueSpecification, idx: number, context: ObserverContext) => void;
+export declare const functionExpression_addParameterValue: (target: FunctionExpression, val: ValueSpecification, context: ObserverContext) => void;
+export declare const propertyExpression_setFunc: (target: AbstractPropertyExpression, val: PropertyReference) => void;
+export declare const variableExpression_setName: (target: VariableExpression, val: string) => void;
+export declare const collectionInstanceValue_setValues: (target: CollectionInstanceValue, val: ValueSpecification[], observableContext: ObserverContext) => void;
+export declare const instanceValue_setValue: (target: InstanceValue, val: unknown, idx: number) => void;
+export declare const instanceValue_setValues: (target: InstanceValue, val: unknown[]) => void;
+export declare const graphFetchTree_addSubTree: (target: GraphFetchTree, val: GraphFetchTree) => void;
+export declare const graphFetchTree_removeSubTree: (target: GraphFetchTree, val: GraphFetchTree) => void;
+export declare const lambdaFunction_setExpressionSequence: (target: LambdaFunction, val: ValueSpecification[], observableContext: ObserverContext) => void;
+export declare const lambdaFunction_setExpression: (target: LambdaFunction, val: ValueSpecification, idx: number, observableContext: ObserverContext) => void;
+export declare const functionType_setParameters: (target: FunctionType, val: VariableExpression[]) => void;
+//# sourceMappingURL=ValueSpecificationModifierHelper.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ValueSpecificationModifierHelper.d.ts","sourceRoot":"","sources":["../../../src/stores/shared/ValueSpecificationModifierHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,0BAA0B,EAC/B,KAAK,oBAAoB,EACzB,KAAK,wBAAwB,EAC7B,KAAK,2BAA2B,EAChC,KAAK,QAAQ,EACb,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,uBAAuB,EAC5B,KAAK,iBAAiB,EAKvB,MAAM,qBAAqB,CAAC;AAI7B,eAAO,MAAM,iCAAiC,WACnC,kBAAkB,OAAO,oBAAoB,GAAG,SAAS,KAAG,IAGtE,CAAC;AAEF,eAAO,MAAM,kCAAkC,WACpC,kBAAkB,OAAO,YAAY,KAAG,IAGlD,CAAC;AAEF,eAAO,MAAM,gCAAgC,WAEjC,wBAAwB,OAE3B,4BAA4B,QAAQ,CAAC,GAAG,SAAS,KACrD,IAGJ,CAAC;AAEF,eAAO,MAAM,sCAAsC,WAEvC,kBAAkB,OACrB,kBAAkB,EAAE,WAChB,eAAe,KACvB,IAKJ,CAAC;AAEF,eAAO,MAAM,oCAAoC,WAErC,kBAAkB,OACrB,kBAAkB,OAClB,MAAM,WACF,eAAe,KACvB,IAGJ,CAAC;AAEF,eAAO,MAAM,oCAAoC,WAErC,kBAAkB,OACrB,kBAAkB,WACd,eAAe,KACvB,IAGJ,CAAC;AAEF,eAAO,MAAM,0BAA0B,WAC5B,0BAA0B,OAAO,iBAAiB,KAAG,IAG/D,CAAC;AAEF,eAAO,MAAM,0BAA0B,WAC5B,kBAAkB,OAAO,MAAM,KAAG,IAG5C,CAAC;AAEF,eAAO,MAAM,iCAAiC,WAElC,uBAAuB,OAC1B,kBAAkB,EAAE,qBACN,eAAe,SAMrC,CAAC;AAEF,eAAO,MAAM,sBAAsB,WACxB,aAAa,OAAO,OAAO,OAAO,MAAM,SAGlD,CAAC;AAEF,eAAO,MAAM,uBAAuB,WACzB,aAAa,OAAO,OAAO,EAAE,SAKvC,CAAC;AAEF,eAAO,MAAM,yBAAyB,WAC3B,cAAc,OAAO,cAAc,KAAG,IAGhD,CAAC;AAEF,eAAO,MAAM,4BAA4B,WAC9B,cAAc,OAAO,cAAc,KAAG,IAGhD,CAAC;AAEF,eAAO,MAAM,oCAAoC,WAErC,cAAc,OACjB,kBAAkB,EAAE,qBACN,eAAe,SAMrC,CAAC;AAEF,eAAO,MAAM,4BAA4B,WAE7B,cAAc,OACjB,kBAAkB,OAClB,MAAM,qBACQ,eAAe,SAOrC,CAAC;AAEF,eAAO,MAAM,0BAA0B,WAC5B,YAAY,OAAO,kBAAkB,EAAE,SAGjD,CAAC"}

package/lib/stores/shared/ValueSpecificationModifierHelper.js

@@ -0,0 +1,71 @@
+/**
+ * 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 { observe_ValueSpecification, observe_GenericTypeReference, observe_PackageableElementReference, observe_VariableExpression, } from '@finos/legend-graph';
+import { addUniqueEntry, deleteEntry } from '@finos/legend-shared';
+import { action } from 'mobx';
+export const valueSpecification_setGenericType = action((target, val) => {
+    target.genericType = val ? observe_GenericTypeReference(val) : undefined;
+});
+export const valueSpecification_setMultiplicity = action((target, val) => {
+    target.multiplicity = val;
+});
+export const simpleFunctionExpression_setFunc = action((target, 
+// eslint-disable-next-line @typescript-eslint/ban-types
+val) => {
+    target.func = val ? observe_PackageableElementReference(val) : undefined;
+});
+export const functionExpression_setParametersValues = action((target, val, context) => {
+    target.parametersValues = val.map((v) => observe_ValueSpecification(v, context));
+});
+export const functionExpression_setParameterValue = action((target, val, idx, context) => {
+    target.parametersValues[idx] = observe_ValueSpecification(val, context);
+});
+export const functionExpression_addParameterValue = action((target, val, context) => {
+    target.parametersValues.push(observe_ValueSpecification(val, context));
+});
+export const propertyExpression_setFunc = action((target, val) => {
+    target.func = val;
+});
+export const variableExpression_setName = action((target, val) => {
+    target.name = val;
+});
+export const collectionInstanceValue_setValues = action((target, val, observableContext) => {
+    target.values = val.map((v) => observe_ValueSpecification(v, observableContext));
+});
+export const instanceValue_setValue = action((target, val, idx) => {
+    target.values[idx] = val;
+});
+export const instanceValue_setValues = action((target, val) => {
+    // TODO?: do we have to observe the values here?
+    // we might need to do so when we refactor collection value
+    target.values = val;
+});
+export const graphFetchTree_addSubTree = action((target, val) => {
+    addUniqueEntry(target.subTrees, val);
+});
+export const graphFetchTree_removeSubTree = action((target, val) => {
+    deleteEntry(target.subTrees, val);
+});
+export const lambdaFunction_setExpressionSequence = action((target, val, observableContext) => {
+    target.expressionSequence = val.map((v) => observe_ValueSpecification(v, observableContext));
+});
+export const lambdaFunction_setExpression = action((target, val, idx, observableContext) => {
+    target.expressionSequence[idx] = observe_ValueSpecification(val, observableContext);
+});
+export const functionType_setParameters = action((target, val) => {
+    target.parameters = val.map((v) => observe_VariableExpression(v));
+});
+//# sourceMappingURL=ValueSpecificationModifierHelper.js.map

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-query-builder",
-  "version": "0.1.2",
+  "version": "0.2.1",
   "description": "Legend query builder core",
   "keywords": [
     "legend",
@@ -41,38 +41,35 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@ag-grid-community/client-side-row-model": "28.1.1",
-    "@ag-grid-community/core": "28.1.1",
-    "@ag-grid-community/react": "28.1.1",
-    "@finos/legend-application": "8.0.2",
-    "@finos/legend-art": "3.3.0",
-    "@finos/legend-graph": "17.0.1",
-    "@finos/legend-server-depot": "4.1.0",
-    "@finos/legend-shared": "6.1.3",
-    "@finos/legend-storage": "3.0.12",
+    "@ag-grid-community/client-side-row-model": "28.2.0",
+    "@ag-grid-community/core": "28.2.0",
+    "@ag-grid-community/react": "28.2.0",
+    "@finos/legend-application": "9.0.1",
+    "@finos/legend-art": "4.0.1",
+    "@finos/legend-graph": "18.0.1",
+    "@finos/legend-server-depot": "4.1.1",
+    "@finos/legend-shared": "6.1.4",
+    "@finos/legend-storage": "3.0.13",
     "@testing-library/react": "13.4.0",
+    "@types/papaparse": "5.3.5",
     "@types/react": "18.0.21",
     "@types/react-dom": "18.0.6",
-    "@types/react-router-dom": "5.3.3",
     "date-fns": "2.29.3",
-    "history": "5.3.0",
     "mobx": "6.6.2",
     "mobx-react-lite": "3.4.0",
     "monaco-editor": "0.34.0",
+    "papaparse": "5.3.2",
     "react": "18.2.0",
     "react-dnd": "16.0.1",
     "react-dom": "18.2.0",
     "react-hotkeys": "2.0.0",
-    "react-resize-detector": "7.1.2",
-    "react-router": "5.3.4",
-    "react-router-dom": "5.3.4",
     "serializr": "2.0.5"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.0.19",
+    "@finos/legend-dev-utils": "2.0.20",
     "@jest/globals": "29.1.2",
     "cross-env": "7.0.3",
-    "eslint": "8.24.0",
+    "eslint": "8.25.0",
     "jest": "29.1.2",
     "npm-run-all": "4.1.5",
     "rimraf": "3.0.2",

package/src/components/QueryBuilder.tsx

@@ -296,7 +296,10 @@ export const QueryBuilder = observer(
           </div>
         </div>
         <GlobalHotKeys keyMap={keyMap} handlers={handlers}>
-          <Backdrop className="backdrop" open={queryBuilderState.backdrop} />
+          <Backdrop
+            className="backdrop"
+            open={queryBuilderState.showBackdrop}
+          />
           <div className="query-builder__content">
             <div className="query-builder__activity-bar">
               <div className="query-builder__activity-bar__items"></div>

package/src/components/QueryBuilderComponentTestUtils.tsx

@@ -16,8 +16,6 @@
 
 import { jest } from '@jest/globals';
 import { type RenderResult, render, waitFor } from '@testing-library/react';
-import { Router } from 'react-router';
-import { createMemoryHistory } from 'history';
 import { Log } from '@finos/legend-shared';
 import {
   type RawMappingModelCoverageAnalysisResult,
@@ -34,6 +32,8 @@ import {
   WebApplicationNavigator,
   TEST__provideMockedWebApplicationNavigator,
   LegendApplicationComponentFrameworkProvider,
+  Router,
+  createMemoryHistory,
 } from '@finos/legend-application';
 import type { Entity } from '@finos/legend-storage';
 import { QueryBuilder } from './QueryBuilder.js';

package/src/components/QueryBuilderDiffPanel.tsx

@@ -20,13 +20,13 @@ import {
   TAB_SIZE,
   useApplicationStore,
 } from '@finos/legend-application';
-import { useResizeDetector } from 'react-resize-detector';
 import {
   baseTextEditorSettings,
   clsx,
   Dialog,
   disableEditorHotKeys,
   disposeDiffEditor,
+  useResizeDetector,
 } from '@finos/legend-art';
 import { observer } from 'mobx-react-lite';
 import { editor as monacoEditorAPI } from 'monaco-editor';

package/src/components/QueryBuilderParametersPanel.tsx

@@ -45,15 +45,15 @@ import {
 import {
   type PackageableElementOption,
   buildElementOption,
-  variableExpression_setName,
-  LambdaParameterState,
-  LambdaParameterValuesEditor,
   getPackageableElementOptionFormatter,
   useApplicationStore,
 } from '@finos/legend-application';
 import { useDrag } from 'react-dnd';
 import { generateEnumerableNameFromToken } from '@finos/legend-shared';
 import { DEFAULT_VARIABLE_NAME } from '../stores/QueryBuilderConfig.js';
+import { variableExpression_setName } from '../stores/shared/ValueSpecificationModifierHelper.js';
+import { LambdaParameterState } from '../stores/shared/LambdaParameterState.js';
+import { LambdaParameterValuesEditor } from './shared/LambdaParameterValuesEditor.js';
 
 const VariableExpressionEditor = observer(
   (props: {
@@ -114,6 +114,7 @@ const VariableExpressionEditor = observer(
       event,
     ) => {
       lambdaParameterState.changeMultiplicity(
+        varState,
         parseInt(event.target.value),
         multiplity.upperBound,
       );
@@ -133,6 +134,7 @@ const VariableExpressionEditor = observer(
         !isNaN(parseInt(value, 10))
       ) {
         lambdaParameterState.changeMultiplicity(
+          varState,
           multiplity.lowerBound,
           value === MULTIPLICITY_INFINITE || value === ''
             ? undefined
@@ -182,7 +184,7 @@ const VariableExpressionEditor = observer(
                   spellCheck={false}
                   value={varState.name}
                   onChange={changeVariableName}
-                  placeholder={`Parameter name`}
+                  placeholder="Parameter name"
                   validationErrorMessage={validationMessage}
                 />
               </div>
@@ -418,9 +420,8 @@ export const QueryBuilderParametersPanel = observer(
         )}
         {queryParameterState.parameterValuesEditorState.showModal && (
           <LambdaParameterValuesEditor
-            graph={
-              queryParameterState.queryBuilderState.graphManagerState.graph
-            }
+            graph={queryBuilderState.graphManagerState.graph}
+            observerContext={queryBuilderState.observableContext}
             lambdaParametersState={queryParameterState}
           />
         )}

package/src/components/QueryBuilderPropertyExpressionEditor.tsx

@@ -52,10 +52,8 @@ import {
   isSuperType,
 } from '@finos/legend-graph';
 import { guaranteeNonNullable } from '@finos/legend-shared';
-import {
-  propertyExpression_setParametersValue,
-  BasicValueSpecificationEditor,
-} from '@finos/legend-application';
+import { BasicValueSpecificationEditor } from './shared/BasicValueSpecificationEditor.js';
+import { functionExpression_setParameterValue } from '../stores/shared/ValueSpecificationModifierHelper.js';
 
 const DerivedPropertyParameterValueEditor = observer(
   (props: {
@@ -71,10 +69,10 @@ const DerivedPropertyParameterValueEditor = observer(
     ).value.rawType;
     const handleDrop = useCallback(
       (item: QueryBuilderParameterDragSource): void => {
-        propertyExpression_setParametersValue(
+        functionExpression_setParameterValue(
           derivedPropertyExpressionState.propertyExpression,
-          idx + 1,
           item.variable.parameter,
+          idx + 1,
           derivedPropertyExpressionState.queryBuilderState.observableContext,
         );
       },
@@ -108,9 +106,8 @@ const DerivedPropertyParameterValueEditor = observer(
       [handleDrop],
     );
     const resetParameterValue = (): void => {
-      propertyExpression_setParametersValue(
+      functionExpression_setParameterValue(
         derivedPropertyExpressionState.propertyExpression,
-        idx + 1,
         generateMilestonedPropertyParameterValue(
           derivedPropertyExpressionState,
           idx,
@@ -120,6 +117,7 @@ const DerivedPropertyParameterValueEditor = observer(
             derivedPropertyExpressionState.queryBuilderState.graphManagerState
               .graph,
           ),
+        idx + 1,
         derivedPropertyExpressionState.queryBuilderState.observableContext,
       );
     };
@@ -142,15 +140,19 @@ const DerivedPropertyParameterValueEditor = observer(
                 derivedPropertyExpressionState.parameterValues[idx],
               )}
               setValueSpecification={(val: ValueSpecification): void => {
-                propertyExpression_setParametersValue(
+                functionExpression_setParameterValue(
                   derivedPropertyExpressionState.propertyExpression,
-                  idx + 1,
                   val,
+                  idx + 1,
                   derivedPropertyExpressionState.queryBuilderState
                     .observableContext,
                 );
               }}
               graph={graph}
+              obseverContext={
+                derivedPropertyExpressionState.queryBuilderState
+                  .observableContext
+              }
               typeCheckOption={{
                 expectedType: parameterType,
                 match:
@@ -273,7 +275,8 @@ export const QueryBuilderPropertyExpressionBadge = observer(
   }) => {
     const { propertyExpressionState, onPropertyExpressionChange } = props;
     const type =
-      propertyExpressionState.propertyExpression.func.genericType.value.rawType;
+      propertyExpressionState.propertyExpression.func.value.genericType.value
+        .rawType;
     const hasDerivedPropertyInExpression = Boolean(
       propertyExpressionState.derivedPropertyExpressionStates.length,
     );
@@ -359,7 +362,7 @@ export const QueryBuilderPropertyExpressionBadge = observer(
               propertyExpressionState={propertyExpressionState}
             />
             <QueryBuilderPropertyInfoTooltip
-              property={propertyExpressionState.propertyExpression.func}
+              property={propertyExpressionState.propertyExpression.func.value}
               path={getPropertyPath(propertyExpressionState.propertyExpression)}
               isMapped={true}
               placement="bottom-end"

package/src/components/QueryBuilderResultPanel.tsx

@@ -48,9 +48,6 @@ import {
   ActionAlertType,
   EDITOR_LANGUAGE,
   ExecutionPlanViewer,
-  instanceValue_changeValue,
-  instanceValue_changeValues,
-  PARAMETER_SUBMIT_ACTION,
   TAB_SIZE,
   TextInputEditor,
   useApplicationStore,
@@ -81,6 +78,11 @@ import {
 } from '../stores/fetch-structure/projection/post-filter/operators/QueryBuilderPostFilterOperator_In.js';
 import type { QueryBuilderPostFilterOperator } from '../stores/fetch-structure/projection/post-filter/QueryBuilderPostFilterOperator.js';
 import { QueryBuilderProjectionState } from '../stores/fetch-structure/projection/QueryBuilderProjectionState.js';
+import {
+  instanceValue_setValue,
+  instanceValue_setValues,
+} from '../stores/shared/ValueSpecificationModifierHelper.js';
+import { PARAMETER_SUBMIT_ACTION } from '../stores/shared/LambdaParameterState.js';
 
 const QueryBuilderGridResultContextMenu = observer(
   forwardRef<
@@ -135,7 +137,7 @@ const QueryBuilderGridResultContextMenu = observer(
       conditionValue: InstanceValue,
     ): void => {
       if (event?.value !== null) {
-        instanceValue_changeValue(
+        instanceValue_setValue(
           conditionValue,
           conditionValue instanceof EnumValueInstanceValue
             ? EnumValueExplicitReference.create(
@@ -223,7 +225,7 @@ const QueryBuilderGridResultContextMenu = observer(
           conditionState.changeOperator(
             isFilterBy ? postFilterInOperator : postFilterNotInOperator,
           );
-          instanceValue_changeValues(conditionState.value as InstanceValue, [
+          instanceValue_setValues(conditionState.value as InstanceValue, [
             currentValueSpecificaton,
             newValueSpecification,
           ]);
@@ -245,7 +247,7 @@ const QueryBuilderGridResultContextMenu = observer(
             isFilterBy ? postFilterEqualOperator : postFilterNotEqualOperator
           ).getDefaultFilterConditionValue(conditionState);
           updateFilterConditionValue(newValueSpecification as InstanceValue);
-          instanceValue_changeValues(conditionState.value as InstanceValue, [
+          instanceValue_setValues(conditionState.value as InstanceValue, [
             ...(conditionState.value as InstanceValue).values,
             newValueSpecification,
           ]);

package/src/components/QueryBuilderTextEditor.tsx

@@ -38,7 +38,7 @@ export const QueryBuilderTextEditor = observer(
     const discardChanges = (): void => {
       queryBuilderState.textEditorState.setMode(undefined);
       // force close the backdrop just in case changes are discarded when there are grammar issues
-      queryBuilderState.setBackdrop(false);
+      queryBuilderState.setShowBackdrop(false);
     };
     const mode = queryTextEditorState.mode;
     useEffect(() => {
@@ -83,7 +83,7 @@ export const QueryBuilderTextEditor = observer(
             >
               {mode === QueryBuilderTextEditorMode.TEXT && (
                 <QueryBuilderLambdaEditor
-                  className={'query-builder-text-mode__lambda-editor'}
+                  className="query-builder-text-mode__lambda-editor"
                   disabled={queryTextEditorState.isConvertingLambdaToString}
                   queryBuilderState={queryBuilderState}
                   lambdaEditorState={queryTextEditorState}

package/src/components/QueryBuilder_TestID.ts

@@ -15,6 +15,8 @@
  */
 
 export enum QUERY_BUILDER_TEST_ID {
+  LAMBDA_EDITOR__EDITOR_INPUT = 'lambda-editor__editor__input',
+
   QUERY_BUILDER = 'query__builder',
   QUERY_BUILDER_SETUP = 'query__builder__setup',
   QUERY_BUILDER_PROJECTION = 'query__builder__projection',

package/src/components/explorer/QueryBuilderExplorerPanel.tsx

@@ -436,7 +436,7 @@ const QueryBuilderExplorerTreeNodeContainer = observer(
         }
         disabled={
           !(node instanceof QueryBuilderExplorerTreePropertyNodeData) ||
-          queryBuilderState.backdrop
+          queryBuilderState.showBackdrop
         }
         menuProps={{ elevation: 7 }}
         onOpen={onContextMenuOpen}
@@ -801,7 +801,7 @@ export const QueryBuilderExplorerPanel = observer(
       <div
         data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_EXPLORER}
         className={clsx('panel query-builder__explorer', {
-          backdrop__element: queryBuilderState.backdrop,
+          backdrop__element: queryBuilderState.showBackdrop,
         })}
       >
         <div className="panel__header">

package/src/components/explorer/QueryBuilderMilestoningEditor.tsx

@@ -36,7 +36,8 @@ import { useDrop } from 'react-dnd';
 import { VariableExpressionViewer } from '../QueryBuilderParametersPanel.js';
 import { Dialog, PanelEntryDropZonePlaceholder } from '@finos/legend-art';
 import { generateDefaultValueForPrimitiveType } from '../../stores/QueryBuilderValueSpecificationHelper.js';
-import { BasicValueSpecificationEditor } from '@finos/legend-application';
+import { BasicValueSpecificationEditor } from '../shared/BasicValueSpecificationEditor.js';
+import { instanceValue_setValues } from '../../stores/shared/ValueSpecificationModifierHelper.js';
 
 const MilestoningParameterEditor = observer(
   (props: {
@@ -106,9 +107,9 @@ const MilestoningParameterEditor = observer(
         ),
         queryBuilderState.observableContext,
       );
-      parameter.values = [
+      instanceValue_setValues(parameter, [
         generateDefaultValueForPrimitiveType(PRIMITIVE_TYPE.STRICTDATE),
-      ];
+      ]);
       if (stereotype === MILESTONING_STEREOTYPE.BUSINESS_TEMPORAL) {
         queryBuilderState.milestoningState.setBusinessDate(parameter);
       } else {
@@ -126,6 +127,7 @@ const MilestoningParameterEditor = observer(
           <BasicValueSpecificationEditor
             valueSpecification={milestoningParameter}
             graph={queryBuilderState.graphManagerState.graph}
+            obseverContext={queryBuilderState.observableContext}
             setValueSpecification={(val: ValueSpecification): void =>
               stereotype === MILESTONING_STEREOTYPE.BUSINESS_TEMPORAL
                 ? queryBuilderState.milestoningState.setBusinessDate(val)

package/src/components/fetch-structure/QueryBuilderPostFilterPanel.tsx

@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  useApplicationStore,
-  BasicValueSpecificationEditor,
-} from '@finos/legend-application';
+import { useApplicationStore } from '@finos/legend-application';
 import {
   type TreeNodeContainerProps,
   type TreeNodeViewProps,
@@ -101,6 +98,7 @@ import { QUERY_BUILDER_TEST_ID } from '../QueryBuilder_TestID.js';
 import { isTypeCompatibleForAssignment } from '../../stores/QueryBuilderValueSpecificationHelper.js';
 import { QUERY_BUILDER_GROUP_OPERATION } from '../../stores/QueryBuilderGroupOperationHelper.js';
 import { QueryBuilderProjectionState } from '../../stores/fetch-structure/projection/QueryBuilderProjectionState.js';
+import { BasicValueSpecificationEditor } from '../shared/BasicValueSpecificationEditor.js';
 
 const QueryBuilderPostFilterConditionContextMenu = observer(
   forwardRef<
@@ -506,6 +504,10 @@ const QueryBuilderPostFilterConditionEditor = observer(
                     valueSpecification={node.condition.value}
                     setValueSpecification={changeValueSpecification}
                     graph={graph}
+                    obseverContext={
+                      node.condition.postFilterState.projectionState
+                        .queryBuilderState.observableContext
+                    }
                     typeCheckOption={{
                       expectedType: guaranteeNonNullable(
                         node.condition.columnState.getReturnType(),

package/src/components/fetch-structure/QueryBuilderResultModifierPanel.tsx

@@ -99,7 +99,7 @@ const ColumnSortEditor = observer(
           className="query-builder__projection__options__sort__remove-btn btn--dark btn--caution"
           onClick={deleteColumnSort}
           tabIndex={-1}
-          title={'Remove'}
+          title="Remove"
         >
           <TimesIcon />
         </button>