@finos/legend-query-builder 1.0.2 → 1.0.4

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

@@ -13,21 +13,21 @@
  * 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';
+import { type Multiplicity, type FunctionExpression, 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_setParametersValues: (target: FunctionExpression, values: 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 collectionInstanceValue_setValues: (target: CollectionInstanceValue, values: ValueSpecification[], observerContext: ObserverContext) => void;
+export declare const instanceValue_setValue: (target: InstanceValue, val: unknown, idx: number, observerContext: ObserverContext) => void;
+export declare const instanceValue_setValues: (target: InstanceValue, values: unknown[], observerContext: ObserverContext) => void;
+export declare const graphFetchTree_addSubTree: (target: GraphFetchTree, val: GraphFetchTree, observerContext: ObserverContext) => 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 lambdaFunction_setExpressionSequence: (target: LambdaFunction, val: ValueSpecification[], observerContext: ObserverContext) => void;
+export declare const lambdaFunction_setExpression: (target: LambdaFunction, val: ValueSpecification, idx: number, observerContext: 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

@@ -1 +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"}
+{"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,kBAAkB,EAClB,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,EAMvB,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,UAClB,kBAAkB,EAAE,WACnB,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,UACvB,kBAAkB,EAAE,mBACX,eAAe,SAMnC,CAAC;AAEF,eAAO,MAAM,sBAAsB,WAEvB,aAAa,OAChB,OAAO,OACP,MAAM,mBACM,eAAe,SAOnC,CAAC;AAEF,eAAO,MAAM,uBAAuB,WAExB,aAAa,UACb,OAAO,EAAE,mBACA,eAAe,SAQnC,CAAC;AAEF,eAAO,MAAM,yBAAyB,WAE1B,cAAc,OACjB,cAAc,mBACF,eAAe,KAC/B,IAMJ,CAAC;AAEF,eAAO,MAAM,4BAA4B,WAC9B,cAAc,OAAO,cAAc,KAAG,IAGhD,CAAC;AAEF,eAAO,MAAM,oCAAoC,WAErC,cAAc,OACjB,kBAAkB,EAAE,mBACR,eAAe,SAMnC,CAAC;AAEF,eAAO,MAAM,4BAA4B,WAE7B,cAAc,OACjB,kBAAkB,OAClB,MAAM,mBACM,eAAe,SAOnC,CAAC;AAEF,eAAO,MAAM,0BAA0B,WAC5B,YAAY,OAAO,kBAAkB,EAAE,SAGjD,CAAC"}

package/lib/stores/shared/ValueSpecificationModifierHelper.js

@@ -13,7 +13,7 @@
  * 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 { ValueSpecification, observe_ValueSpecification, observe_GenericTypeReference, observe_PackageableElementReference, observe_VariableExpression, observe_GraphFetchTree, } from '@finos/legend-graph';
 import { addUniqueEntry, deleteEntry } from '@finos/legend-shared';
 import { action } from 'mobx';
 export const valueSpecification_setGenericType = action((target, val) => {
@@ -27,8 +27,8 @@ export const simpleFunctionExpression_setFunc = action((target,
 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_setParametersValues = action((target, values, context) => {
+    target.parametersValues = values.map((val) => observe_ValueSpecification(val, context));
 });
 export const functionExpression_setParameterValue = action((target, val, idx, context) => {
     target.parametersValues[idx] = observe_ValueSpecification(val, context);
@@ -42,28 +42,31 @@ export const propertyExpression_setFunc = action((target, 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 collectionInstanceValue_setValues = action((target, values, observerContext) => {
+    target.values = values.map((val) => observe_ValueSpecification(val, observerContext));
 });
-export const instanceValue_setValue = action((target, val, idx) => {
-    target.values[idx] = val;
+export const instanceValue_setValue = action((target, val, idx, observerContext) => {
+    target.values[idx] =
+        val instanceof ValueSpecification
+            ? observe_ValueSpecification(val, observerContext)
+            : 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 instanceValue_setValues = action((target, values, observerContext) => {
+    target.values = values.map((val) => val instanceof ValueSpecification
+        ? observe_ValueSpecification(val, observerContext)
+        : val);
 });
-export const graphFetchTree_addSubTree = action((target, val) => {
-    addUniqueEntry(target.subTrees, val);
+export const graphFetchTree_addSubTree = action((target, val, observerContext) => {
+    addUniqueEntry(target.subTrees, observe_GraphFetchTree(val, observerContext));
 });
 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_setExpressionSequence = action((target, val, observerContext) => {
+    target.expressionSequence = val.map((v) => observe_ValueSpecification(v, observerContext));
 });
-export const lambdaFunction_setExpression = action((target, val, idx, observableContext) => {
-    target.expressionSequence[idx] = observe_ValueSpecification(val, observableContext);
+export const lambdaFunction_setExpression = action((target, val, idx, observerContext) => {
+    target.expressionSequence[idx] = observe_ValueSpecification(val, observerContext);
 });
 export const functionType_setParameters = action((target, val) => {
     target.parameters = val.map((v) => observe_VariableExpression(v));

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

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

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,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"}
+{"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;IAMnD,cAAc,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO;IAMrD,IAAI,QAAQ,IAAI,MAAM,CAKrB;CACF"}

package/lib/stores/watermark/QueryBuilderWatermarkState.js

@@ -52,7 +52,7 @@ export class QueryBuilderWatermarkState {
     }
     setValue(val) {
         this.value = val
-            ? observe_ValueSpecification(val, this.queryBuilderState.observableContext)
+            ? observe_ValueSpecification(val, this.queryBuilderState.observerContext)
             : undefined;
     }
     isVariableUsed(variable) {

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,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"}
+{"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,CAAC,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC;YACzE,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-query-builder",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Legend query builder core",
   "keywords": [
     "legend",
@@ -41,38 +41,39 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@ag-grid-community/client-side-row-model": "29.1.0",
-    "@ag-grid-community/core": "29.1.0",
-    "@ag-grid-community/react": "29.1.0",
-    "@ag-grid-community/styles": "29.1.0",
-    "@finos/legend-application": "13.0.2",
-    "@finos/legend-art": "5.0.36",
-    "@finos/legend-graph": "24.0.1",
-    "@finos/legend-server-depot": "4.4.6",
-    "@finos/legend-shared": "8.0.1",
-    "@finos/legend-storage": "3.0.41",
+    "@ag-grid-community/client-side-row-model": "29.2.0",
+    "@ag-grid-community/core": "29.2.0",
+    "@ag-grid-community/react": "29.2.0",
+    "@ag-grid-community/styles": "29.2.0",
+    "@finos/legend-application": "13.0.4",
+    "@finos/legend-art": "5.0.38",
+    "@finos/legend-graph": "25.0.0",
+    "@finos/legend-server-depot": "4.4.8",
+    "@finos/legend-shared": "8.0.3",
+    "@finos/legend-storage": "3.0.43",
     "@testing-library/react": "14.0.0",
     "@types/papaparse": "5.3.7",
-    "@types/react": "18.0.28",
+    "@types/react": "18.0.29",
     "@types/react-dom": "18.0.11",
-    "mobx": "6.8.0",
+    "mathjs": "11.7.0",
+    "mobx": "6.9.0",
     "mobx-react-lite": "3.4.3",
     "monaco-editor": "0.36.1",
-    "papaparse": "5.4.0",
+    "papaparse": "5.4.1",
     "react": "18.2.0",
     "react-dnd": "16.0.1",
     "react-dom": "18.2.0",
     "serializr": "3.0.2"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.0.46",
+    "@finos/legend-dev-utils": "2.0.47",
     "@jest/globals": "29.5.0",
     "cross-env": "7.0.3",
     "eslint": "8.36.0",
     "jest": "29.5.0",
     "npm-run-all": "4.1.5",
-    "rimraf": "4.4.0",
-    "sass": "1.59.3",
+    "rimraf": "4.4.1",
+    "sass": "1.60.0",
     "typescript": "5.0.2"
   },
   "peerDependencies": {

package/src/components/QueryBuilderConstantExpressionPanel.tsx

@@ -52,7 +52,7 @@ import { BasicValueSpecificationEditor } from './shared/BasicValueSpecificationE
 import { VariableViewer } from './shared/QueryBuilderVariableSelector.js';
 import { QUERY_BUILDER_TEST_ID } from '../application/QueryBuilderTesting.js';
 
-// Note: We currently only allow constant variables for primitive types of multiplicity ONE.
+// NOTE: We currently only allow constant variables for primitive types of multiplicity ONE.
 // This is why we don't show multiplicity in the editor.
 const QueryBuilderConstantExpressionEditor = observer(
   (props: { constantState: QueryBuilderConstantExpressionState }) => {
@@ -100,6 +100,7 @@ const QueryBuilderConstantExpressionEditor = observer(
       const valSpec = buildDefaultInstanceValue(
         queryBuilderState.graphManagerState.graph,
         variableType,
+        queryBuilderState.observerContext,
       );
       constantState.setValueSpec(valSpec);
     };
@@ -167,7 +168,7 @@ const QueryBuilderConstantExpressionEditor = observer(
                     constantState.setValueSpec(val);
                   }}
                   graph={queryBuilderState.graphManagerState.graph}
-                  obseverContext={queryBuilderState.observableContext}
+                  obseverContext={queryBuilderState.observerContext}
                   typeCheckOption={{
                     expectedType: variableType,
                     match: variableType === PrimitiveType.DATETIME,
@@ -209,6 +210,7 @@ export const QueryBuilderConstantExpressionPanel = observer(
         const defaultVal = buildDefaultInstanceValue(
           graph,
           PrimitiveType.STRING,
+          queryBuilderState.observerContext,
         );
         const constantName = generateEnumerableNameFromToken(
           varNames,

package/src/components/QueryBuilderParametersPanel.tsx

@@ -249,7 +249,7 @@ export const QueryBuilderParametersPanel = observer(
               new GenericType(PrimitiveType.STRING),
             ),
           ),
-          queryBuilderState.observableContext,
+          queryBuilderState.observerContext,
           queryBuilderState.graphManagerState.graph,
         );
         queryParameterState.setSelectedParameter(parmaterState);
@@ -329,7 +329,7 @@ export const QueryBuilderParametersPanel = observer(
         {queryParameterState.parameterValuesEditorState.showModal && (
           <LambdaParameterValuesEditor
             graph={queryBuilderState.graphManagerState.graph}
-            observerContext={queryBuilderState.observableContext}
+            observerContext={queryBuilderState.observerContext}
             lambdaParametersState={queryParameterState}
           />
         )}

package/src/components/QueryBuilderPropertyExpressionEditor.tsx

@@ -88,7 +88,7 @@ const DerivedPropertyParameterValueEditor = observer(
           derivedPropertyExpressionState.propertyExpression,
           item.variable,
           idx + 1,
-          derivedPropertyExpressionState.queryBuilderState.observableContext,
+          derivedPropertyExpressionState.queryBuilderState.observerContext,
         );
       },
       [derivedPropertyExpressionState, idx],
@@ -156,7 +156,7 @@ const DerivedPropertyParameterValueEditor = observer(
             guaranteeType(nextExpression, AbstractPropertyExpression),
             guaranteeNonNullable(newParameterValue),
             index + 1,
-            queryBuilderState.observableContext,
+            queryBuilderState.observerContext,
           );
         }
       });
@@ -201,9 +201,10 @@ const DerivedPropertyParameterValueEditor = observer(
             variable,
             derivedPropertyExpressionState.queryBuilderState.graphManagerState
               .graph,
+            derivedPropertyExpressionState.queryBuilderState.observerContext,
           ),
         idx + 1,
-        derivedPropertyExpressionState.queryBuilderState.observableContext,
+        derivedPropertyExpressionState.queryBuilderState.observerContext,
       );
       const derivedPropertyExpressionStates =
         derivedPropertyExpressionState.propertyExpressionState
@@ -244,13 +245,12 @@ const DerivedPropertyParameterValueEditor = observer(
                   val,
                   idx + 1,
                   derivedPropertyExpressionState.queryBuilderState
-                    .observableContext,
+                    .observerContext,
                 );
               }}
               graph={graph}
               obseverContext={
-                derivedPropertyExpressionState.queryBuilderState
-                  .observableContext
+                derivedPropertyExpressionState.queryBuilderState.observerContext
               }
               typeCheckOption={{
                 expectedType: parameterType,

package/src/components/QueryBuilderResultPanel.tsx

@@ -155,6 +155,7 @@ const QueryBuilderGridResultContextMenu = observer(
               )
             : event?.value,
           0,
+          tdsState.queryBuilderState.observerContext,
         );
       }
     };
@@ -230,10 +231,11 @@ const QueryBuilderGridResultContextMenu = observer(
           conditionState.changeOperator(
             isFilterBy ? postFilterInOperator : postFilterNotInOperator,
           );
-          instanceValue_setValues(conditionState.value as InstanceValue, [
-            currentValueSpecificaton,
-            newValueSpecification,
-          ]);
+          instanceValue_setValues(
+            conditionState.value as InstanceValue,
+            [currentValueSpecificaton, newValueSpecification],
+            tdsState.queryBuilderState.observerContext,
+          );
         }
       } else {
         const doesValueAlreadyExist =
@@ -252,10 +254,14 @@ const QueryBuilderGridResultContextMenu = observer(
             isFilterBy ? postFilterEqualOperator : postFilterNotEqualOperator
           ).getDefaultFilterConditionValue(conditionState);
           updateFilterConditionValue(newValueSpecification as InstanceValue);
-          instanceValue_setValues(conditionState.value as InstanceValue, [
-            ...(conditionState.value as InstanceValue).values,
-            newValueSpecification,
-          ]);
+          instanceValue_setValues(
+            conditionState.value as InstanceValue,
+            [
+              ...(conditionState.value as InstanceValue).values,
+              newValueSpecification,
+            ],
+            tdsState.queryBuilderState.observerContext,
+          );
         }
       }
     };
@@ -326,18 +332,16 @@ const QueryBuilderGridResult = observer(
     const [cellDoubleClickedEvent, setCellDoubleClickedEvent] =
       useState<CellMouseOverEvent | null>(null);
     const columns = executionResult.result.columns;
-    let rowNumber = 1;
-    const rowData = executionResult.result.rows.map((_row) => {
+    const rowData = executionResult.result.rows.map((_row, rowIdx) => {
       const row: PlainObject = {};
       const cols = executionResult.result.columns;
-      _row.values.forEach((value, idx) => {
+      _row.values.forEach((value, colIdx) => {
         // `ag-grid` shows `false` value as empty string so we have
         // call `.toString()` to avoid this behavior.
         // See https://github.com/finos/legend-studio/issues/1008
-        row[cols[idx] as string] = isBoolean(value) ? String(value) : value;
-        row.rowNumber = rowNumber;
+        row[cols[colIdx] as string] = isBoolean(value) ? String(value) : value;
       });
-      rowNumber += 1;
+      row.rowNumber = rowIdx;
       return row;
     });
 
@@ -370,7 +374,7 @@ const QueryBuilderGridResult = observer(
             },
           }}
           modules={[ClientSideRowModelModule]}
-          // Note: we use onCellMouseOver as a bit of a workaround
+          // NOTE: we use onCellMouseOver as a bit of a workaround
           // since we use the context menu so we want the user to be
           // able to right click any cell and have the context menu
           // options use the data belonging to the row that they are

package/src/components/explorer/QueryBuilderExplorerPanel.tsx

@@ -69,10 +69,7 @@ import { useDrag } from 'react-dnd';
 import { QueryBuilderPropertyInfoTooltip } from '../shared/QueryBuilderPropertyInfoTooltip.js';
 import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 import { flowResult } from 'mobx';
-import {
-  getPropertyChainName,
-  prettyPropertyName,
-} from '../../stores/QueryBuilderPropertyEditorState.js';
+import { getPropertyChainName } from '../../stores/QueryBuilderPropertyEditorState.js';
 import {
   type Type,
   type Multiplicity,
@@ -92,7 +89,11 @@ import {
 import { useApplicationStore } from '@finos/legend-application';
 import { getClassPropertyIcon } from '../shared/ElementIconUtils.js';
 import { QUERY_BUILDER_TEST_ID } from '../../application/QueryBuilderTesting.js';
-import { filterByType, guaranteeNonNullable } from '@finos/legend-shared';
+import {
+  filterByType,
+  guaranteeNonNullable,
+  prettyCONSTName,
+} from '@finos/legend-shared';
 import { QueryBuilderPropertySearchPanel } from './QueryBuilderPropertySearchPanel.js';
 import { QueryBuilderTDSState } from '../../stores/fetch-structure/tds/QueryBuilderTDSState.js';
 import { QueryBuilderSimpleProjectionColumnState } from '../../stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js';
@@ -226,9 +227,7 @@ const QueryBuilderExplorerPreviewDataModal = observer(
           darkMode={true}
           className="editor-modal query-builder__explorer__preview-data-modal"
         >
-          <ModalHeader
-            title={prettyPropertyName(previewDataState.propertyName)}
-          />
+          <ModalHeader title={prettyCONSTName(previewDataState.propertyName)} />
           <PanelLoadingIndicator
             isLoading={previewDataState.isGeneratingPreviewData}
           />
@@ -577,8 +576,8 @@ const QueryBuilderExplorerTreeNodeContainer = observer(
                 >
                   {explorerState.humanizePropertyName
                     ? node instanceof QueryBuilderExplorerTreeSubTypeNodeData
-                      ? TYPE_CAST_TOKEN + prettyPropertyName(node.label)
-                      : prettyPropertyName(node.label)
+                      ? TYPE_CAST_TOKEN + prettyCONSTName(node.label)
+                      : prettyCONSTName(node.label)
                     : node instanceof QueryBuilderExplorerTreeSubTypeNodeData
                     ? TYPE_CAST_TOKEN + node.label
                     : node.label}
@@ -942,7 +941,7 @@ export const QueryBuilderExplorerPanel = observer(
           <DragPreviewLayer
             labelGetter={(item: QueryBuilderExplorerTreeDragSource): string =>
               explorerState.humanizePropertyName
-                ? prettyPropertyName(item.node.label)
+                ? prettyCONSTName(item.node.label)
                 : item.node.label
             }
             types={Object.values(QUERY_BUILDER_EXPLORER_TREE_DND_TYPE)}

package/src/components/explorer/QueryBuilderMilestoningEditor.tsx

@@ -104,11 +104,13 @@ const MilestoningParameterEditor = observer(
             new GenericType(PrimitiveType.STRICTDATE),
           ),
         ),
-        queryBuilderState.observableContext,
+        queryBuilderState.observerContext,
+      );
+      instanceValue_setValues(
+        parameter,
+        [generateDefaultValueForPrimitiveType(PRIMITIVE_TYPE.STRICTDATE)],
+        queryBuilderState.observerContext,
       );
-      instanceValue_setValues(parameter, [
-        generateDefaultValueForPrimitiveType(PRIMITIVE_TYPE.STRICTDATE),
-      ]);
       if (stereotype === MILESTONING_STEREOTYPE.BUSINESS_TEMPORAL) {
         queryBuilderState.milestoningState.setBusinessDate(parameter);
       } else {
@@ -126,7 +128,7 @@ const MilestoningParameterEditor = observer(
           <BasicValueSpecificationEditor
             valueSpecification={milestoningParameter}
             graph={queryBuilderState.graphManagerState.graph}
-            obseverContext={queryBuilderState.observableContext}
+            obseverContext={queryBuilderState.observerContext}
             setValueSpecification={(val: ValueSpecification): void =>
               stereotype === MILESTONING_STEREOTYPE.BUSINESS_TEMPORAL
                 ? queryBuilderState.milestoningState.setBusinessDate(val)

package/src/components/explorer/QueryBuilderPropertySearchPanel.tsx

@@ -38,7 +38,11 @@ import {
   getAllClassProperties,
   getAllOwnClassProperties,
 } from '@finos/legend-graph';
-import { debounce, guaranteeNonNullable } from '@finos/legend-shared';
+import {
+  debounce,
+  guaranteeNonNullable,
+  prettyCONSTName,
+} from '@finos/legend-shared';
 import { observer } from 'mobx-react-lite';
 import { useDrag } from 'react-dnd';
 import { QUERY_BUILDER_PROPERTY_SEARCH_TYPE } from '../../stores/QueryBuilderConfig.js';
@@ -50,7 +54,6 @@ import {
   getQueryBuilderPropertyNodeData,
   type QueryBuilderExplorerState,
 } from '../../stores/explorer/QueryBuilderExplorerState.js';
-import { prettyPropertyName } from '../../stores/QueryBuilderPropertyEditorState.js';
 import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 import {
   QueryBuilderSubclassInfoTooltip,
@@ -62,7 +65,7 @@ import { TextSearchAdvancedConfigMenu } from '@finos/legend-application';
 
 const prettyPropertyNameFromNodeId = (name: string): string => {
   let propNameArray = name.split('.');
-  propNameArray = propNameArray.map((p) => prettyPropertyName(p));
+  propNameArray = propNameArray.map(prettyCONSTName);
   let propName = '';
   propNameArray.forEach((p) => {
     propName = `${propName + p}/`;
@@ -76,7 +79,7 @@ const prettyPropertyNameForSubType = (name: string): string => {
   propNameArray = propNameArray
     .map((p) => p.replace(/.*::/, ''))
     .filter((p) => p !== '')
-    .map((p) => prettyPropertyName(p));
+    .map((p) => prettyCONSTName(p));
   let propName = '';
   propNameArray.slice(0, -1).forEach((p) => {
     propName = `${propName}(@${p})/`;
@@ -84,7 +87,7 @@ const prettyPropertyNameForSubType = (name: string): string => {
   propNameArray = guaranteeNonNullable(
     propNameArray[propNameArray.length - 1],
   ).split('.');
-  propNameArray = propNameArray.map((p) => prettyPropertyName(p));
+  propNameArray = propNameArray.map((p) => prettyCONSTName(p));
   propName = `${propName}(@${propNameArray[0]})/`;
   propNameArray.slice(1).forEach((p) => {
     propName = `${propName + p}/`;
@@ -98,7 +101,7 @@ const prettyPropertyNameForSubTypeClass = (name: string): string => {
   propNameArray = propNameArray
     .map((p) => p.replace(/.*::/, ''))
     .filter((p) => p !== '')
-    .map((p) => prettyPropertyName(p));
+    .map((p) => prettyCONSTName(p));
   let propName = '';
   propNameArray.forEach((p) => {
     propName = `${propName}@${p}`;

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

@@ -416,7 +416,7 @@ const QueryBuilderPostFilterConditionEditor = observer(
                     valueSpecification={node.condition.value}
                     setValueSpecification={changeValueSpecification}
                     graph={graph}
-                    obseverContext={queryBuilderState.observableContext}
+                    obseverContext={queryBuilderState.observerContext}
                     typeCheckOption={{
                       expectedType: guaranteeNonNullable(
                         node.condition.columnState.getColumnType(),

package/src/components/filter/QueryBuilderFilterPanel.tsx

@@ -269,7 +269,7 @@ const QueryBuilderFilterConditionEditor = observer(
                     valueSpecification={node.condition.value}
                     setValueSpecification={changeValueSpecification}
                     graph={graph}
-                    obseverContext={queryBuilderState.observableContext}
+                    obseverContext={queryBuilderState.observerContext}
                     typeCheckOption={{
                       expectedType:
                         node.condition.propertyExpressionState