@finos/legend-query-builder 1.0.2 → 1.0.4

package/src/stores/QueryBuilderTextEditorState.ts

@@ -198,7 +198,10 @@ export class QueryBuilderTextEditorState extends LambdaEditorState {
           `Can't parse query. Please fix error before closing: ${this.parserError.message}`,
         );
       } else {
-        this.queryBuilderState.rebuildWithQuery(this.rawLambdaState.lambda);
+        this.queryBuilderState.rebuildWithQuery(this.rawLambdaState.lambda, {
+          preserveParameterValues: true,
+          preserveResult: true,
+        });
         this.setMode(undefined);
       }
       return;

package/src/stores/QueryBuilderValueSpecificationBuilderHelper.ts

@@ -114,7 +114,7 @@ export const buildPropertyExpressionChain = (
           functionExpression_setParametersValues(
             currentExpression,
             [guaranteeNonNullable(currentExpression.parametersValues[0])],
-            queryBuilderState.observableContext,
+            queryBuilderState.observerContext,
           );
         }
       } else {

package/src/stores/QueryBuilderValueSpecificationHelper.ts

@@ -44,6 +44,8 @@ import {
   GenericTypeExplicitReference,
   GenericType,
   INTERNAL__PropagatedValue,
+  isSubType,
+  type ObserverContext,
 } from '@finos/legend-graph';
 import {
   addUniqueEntry,
@@ -59,6 +61,7 @@ import {
   getDerivedPropertyMilestoningSteoreotype,
   validateMilestoningPropertyExpressionChain,
 } from './milestoning/QueryBuilderMilestoningHelper.js';
+import { instanceValue_setValues } from './shared/ValueSpecificationModifierHelper.js';
 
 export const getNonCollectionValueSpecificationType = (
   valueSpecification: ValueSpecification,
@@ -355,3 +358,36 @@ export const isValueExpressionReferencedInValue = (
   }
   return false;
 };
+
+/**
+ * Some expression which represents a value and can be simplified to make
+ * editing experience easier
+ *
+ * e.g. -5 is often represented as minus(5), which is a function expression
+ * but we want to simplify it to a primitive instance value with value -5
+ */
+export const simplifyValueExpression = (
+  value: ValueSpecification,
+  observerContext: ObserverContext,
+): ValueSpecification => {
+  if (
+    value instanceof SimpleFunctionExpression &&
+    matchFunctionName(
+      value.functionName,
+      QUERY_BUILDER_SUPPORTED_FUNCTIONS.MINUS,
+    ) &&
+    value.parametersValues.length === 1 &&
+    value.parametersValues[0] instanceof PrimitiveInstanceValue
+  ) {
+    const val = value.parametersValues[0];
+    if (isSubType(val.genericType.value.rawType, PrimitiveType.NUMBER)) {
+      instanceValue_setValues(
+        val,
+        [(val.values[0] as number) * -1],
+        observerContext,
+      );
+    }
+    return val;
+  }
+  return value;
+};

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

@@ -298,10 +298,18 @@ export const addQueryBuilderPropertyNode = (
     treeData.nodes.set(childNode.id, childNode);
     if (parentNode) {
       addUniqueEntry(parentNode.childrenIds, childNode.id);
-      graphFetchTree_addSubTree(parentNode.tree, childNode.tree);
+      graphFetchTree_addSubTree(
+        parentNode.tree,
+        childNode.tree,
+        queryBuilderState.observerContext,
+      );
     } else {
       addUniqueEntry(treeData.rootIds, childNode.id);
-      graphFetchTree_addSubTree(treeData.tree, childNode.tree);
+      graphFetchTree_addSubTree(
+        treeData.tree,
+        childNode.tree,
+        queryBuilderState.observerContext,
+      );
     }
   }
 };

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

@@ -410,7 +410,7 @@ export class PostFilterConditionState implements Hashable {
     this.value = val
       ? observe_ValueSpecification(
           val,
-          this.postFilterState.tdsState.queryBuilderState.observableContext,
+          this.postFilterState.tdsState.queryBuilderState.observerContext,
         )
       : undefined;
   }

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

@@ -49,6 +49,7 @@ import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../../graphManager/Quer
 import type { QueryBuilderState } from '../../../QueryBuilderState.js';
 import { QueryBuilderTDSState } from '../QueryBuilderTDSState.js';
 import { toGroupOperation } from '../../../QueryBuilderGroupOperationHelper.js';
+import { simplifyValueExpression } from '../../../QueryBuilderValueSpecificationHelper.js';
 
 const findProjectionColumnState = (
   propertyExpression: AbstractPropertyExpression,
@@ -150,11 +151,17 @@ export const buildPostFilterConditionState = (
 
     // get operation value specification
     const value = expression.parametersValues[1];
+
     // create state
     postConditionState = new PostFilterConditionState(
       postFilterState,
       columnState,
-      value,
+      value
+        ? simplifyValueExpression(
+            value,
+            postFilterState.tdsState.queryBuilderState.observerContext,
+          )
+        : undefined,
       operator,
     );
 
@@ -178,6 +185,24 @@ const processPostFilterTree = (
   postFilterState: QueryBuilderPostFilterState,
   parentPostFilterNodeId: string | undefined,
 ): void => {
+  // // NOTE: This checks if the expression is a simple function expression of Minus
+  // // since negative numbers are returned as a SimpleFunctionExpression of minus(number)
+  // // rather than a PrimitiveInstanceValue of -number, so here
+  // // we replace the parameter value of the expression directly with a PrimitiveInstanceValue
+  // if (
+  //   expression.parametersValues[1] instanceof SimpleFunctionExpression &&
+  //   expression.parametersValues[1].functionName === MINUS_STRING &&
+  //   expression.parametersValues[1].parametersValues[0] instanceof
+  //     PrimitiveInstanceValue
+  // ) {
+  //   expression.parametersValues[1].parametersValues[0].values[0] =
+  //     parseFloat(
+  //       expression.parametersValues[1].parametersValues[0].values[0] as string,
+  //     ) * -1;
+  //   expression.parametersValues[1] =
+  //     expression.parametersValues[1].parametersValues[0];
+  // }
+
   const parentNode = parentPostFilterNodeId
     ? postFilterState.getNode(parentPostFilterNodeId)
     : undefined;

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

@@ -79,6 +79,8 @@ export class QueryBuilderPostFilterOperator_Contain
             .graphManagerState.graph,
           propertyType.path,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .observerContext,
         );
       }
       default:

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

@@ -75,6 +75,8 @@ export class QueryBuilderPostFilterOperator_EndWith
             .graphManagerState.graph,
           propertyType.path,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .observerContext,
         );
       }
       default:

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

@@ -117,6 +117,8 @@ export class QueryBuilderPostFilterOperator_Equal
             .graphManagerState.graph,
           propertyType.path,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .observerContext,
         );
       }
       case PRIMITIVE_TYPE.DATE: {
@@ -125,6 +127,8 @@ export class QueryBuilderPostFilterOperator_Equal
             .graphManagerState.graph,
           PRIMITIVE_TYPE.STRICTDATE,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .observerContext,
         );
       }
       default:
@@ -135,9 +139,16 @@ export class QueryBuilderPostFilterOperator_Equal
                 new GenericType(propertyType),
               ),
             );
-            instanceValue_setValues(enumValueInstanceValue, [
-              EnumValueExplicitReference.create(propertyType.values[0] as Enum),
-            ]);
+            instanceValue_setValues(
+              enumValueInstanceValue,
+              [
+                EnumValueExplicitReference.create(
+                  propertyType.values[0] as Enum,
+                ),
+              ],
+              postFilterConditionState.postFilterState.tdsState
+                .queryBuilderState.observerContext,
+            );
             return enumValueInstanceValue;
           }
           throw new UnsupportedOperationError(

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

@@ -95,6 +95,8 @@ export class QueryBuilderPostFilterOperator_GreaterThan
             .graphManagerState.graph,
           propertyType.path,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .observerContext,
         );
       }
       case PRIMITIVE_TYPE.DATE: {
@@ -103,6 +105,8 @@ export class QueryBuilderPostFilterOperator_GreaterThan
             .graphManagerState.graph,
           PRIMITIVE_TYPE.STRICTDATE,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .observerContext,
         );
       }
       default:

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

@@ -95,6 +95,8 @@ export class QueryBuilderPostFilterOperator_LessThan
             .graphManagerState.graph,
           propertyType.path,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .observerContext,
         );
       }
       case PRIMITIVE_TYPE.DATE: {
@@ -103,6 +105,8 @@ export class QueryBuilderPostFilterOperator_LessThan
             .graphManagerState.graph,
           PRIMITIVE_TYPE.STRICTDATE,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .observerContext,
         );
       }
       default:

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

@@ -76,6 +76,8 @@ export class QueryBuilderPostFilterOperator_StartWith
             .graphManagerState.graph,
           propertyType.path,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          postFilterConditionState.postFilterState.tdsState.queryBuilderState
+            .observerContext,
         );
       }
       default:

package/src/stores/filter/QueryBuilderFilterState.ts

@@ -167,7 +167,7 @@ export class FilterConditionState implements Hashable {
     // observe the property expression
     observe_ValueSpecification(
       propertyExpression,
-      this.filterState.queryBuilderState.observableContext,
+      this.filterState.queryBuilderState.observerContext,
     );
 
     this.propertyExpressionState = new QueryBuilderPropertyExpressionState(
@@ -204,7 +204,7 @@ export class FilterConditionState implements Hashable {
     this.value = val
       ? observe_ValueSpecification(
           val,
-          this.filterState.queryBuilderState.observableContext,
+          this.filterState.queryBuilderState.observerContext,
         )
       : undefined;
   }

package/src/stores/filter/operators/QueryBuilderFilterOperatorValueSpecificationBuilder.ts

@@ -35,7 +35,10 @@ import {
   type QueryBuilderFilterState,
 } from '../QueryBuilderFilterState.js';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../../graphManager/QueryBuilderSupportedFunctions.js';
-import { buildGenericLambdaFunctionInstanceValue } from '../../QueryBuilderValueSpecificationHelper.js';
+import {
+  buildGenericLambdaFunctionInstanceValue,
+  simplifyValueExpression,
+} from '../../QueryBuilderValueSpecificationHelper.js';
 import type { QueryBuilderFilterOperator } from '../QueryBuilderFilterOperator.js';
 import { buildPropertyExpressionChain } from '../../QueryBuilderValueSpecificationBuilderHelper.js';
 
@@ -488,9 +491,19 @@ export const buildFilterConditionState = (
       )}() expression: property is not compatible with operator`,
     );
     filterConditionState.setOperator(operator);
-    filterConditionState.setValue(
-      hasNoValue ? undefined : mainExpressionWithOperator.parametersValues[1],
-    );
+
+    // value
+    const value = mainExpressionWithOperator.parametersValues[1];
+    if (hasNoValue || !value) {
+      filterConditionState.setValue(undefined);
+    } else {
+      filterConditionState.setValue(
+        simplifyValueExpression(
+          value,
+          filterConditionState.filterState.queryBuilderState.observerContext,
+        ),
+      );
+    }
     if (!operator.isCompatibleWithFilterConditionValue(filterConditionState)) {
       filterConditionState.setValue(
         operator.getDefaultFilterConditionValue(filterConditionState),

package/src/stores/filter/operators/QueryBuilderFilterOperator_Contain.ts

@@ -84,6 +84,7 @@ export class QueryBuilderFilterOperator_Contain
             .graph,
           propertyType.path,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
       default:

package/src/stores/filter/operators/QueryBuilderFilterOperator_EndWith.ts

@@ -84,6 +84,7 @@ export class QueryBuilderFilterOperator_EndWith
             .graph,
           propertyType.path,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
       default:

package/src/stores/filter/operators/QueryBuilderFilterOperator_Equal.ts

@@ -118,6 +118,7 @@ export class QueryBuilderFilterOperator_Equal
             .graph,
           propertyType.path,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
       case PRIMITIVE_TYPE.DATE: {
@@ -126,6 +127,7 @@ export class QueryBuilderFilterOperator_Equal
             .graph,
           PRIMITIVE_TYPE.STRICTDATE,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
       default:
@@ -136,9 +138,16 @@ export class QueryBuilderFilterOperator_Equal
                 new GenericType(propertyType),
               ),
             );
-            instanceValue_setValues(enumValueInstanceValue, [
-              EnumValueExplicitReference.create(propertyType.values[0] as Enum),
-            ]);
+            instanceValue_setValues(
+              enumValueInstanceValue,
+              [
+                EnumValueExplicitReference.create(
+                  propertyType.values[0] as Enum,
+                ),
+              ],
+              filterConditionState.filterState.queryBuilderState
+                .observerContext,
+            );
             return enumValueInstanceValue;
           }
           throw new UnsupportedOperationError(

package/src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThan.ts

@@ -101,6 +101,7 @@ export class QueryBuilderFilterOperator_GreaterThan
             .graph,
           propertyType.path,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
       case PRIMITIVE_TYPE.DATE: {
@@ -109,6 +110,7 @@ export class QueryBuilderFilterOperator_GreaterThan
             .graph,
           PRIMITIVE_TYPE.STRICTDATE,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
       default:

package/src/stores/filter/operators/QueryBuilderFilterOperator_GreaterThanEqual.ts

@@ -101,6 +101,7 @@ export class QueryBuilderFilterOperator_GreaterThanEqual
             .graph,
           propertyType.path,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
       case PRIMITIVE_TYPE.DATE: {
@@ -109,6 +110,7 @@ export class QueryBuilderFilterOperator_GreaterThanEqual
             .graph,
           PRIMITIVE_TYPE.STRICTDATE,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
       default:

package/src/stores/filter/operators/QueryBuilderFilterOperator_LessThan.ts

@@ -101,6 +101,7 @@ export class QueryBuilderFilterOperator_LessThan
             .graph,
           propertyType.path,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
       case PRIMITIVE_TYPE.DATE: {
@@ -109,6 +110,7 @@ export class QueryBuilderFilterOperator_LessThan
             .graph,
           PRIMITIVE_TYPE.STRICTDATE,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
       default:

package/src/stores/filter/operators/QueryBuilderFilterOperator_LessThanEqual.ts

@@ -101,6 +101,7 @@ export class QueryBuilderFilterOperator_LessThanEqual
             .graph,
           propertyType.path,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
       case PRIMITIVE_TYPE.DATE: {
@@ -109,6 +110,7 @@ export class QueryBuilderFilterOperator_LessThanEqual
             .graph,
           PRIMITIVE_TYPE.STRICTDATE,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
       default:

package/src/stores/filter/operators/QueryBuilderFilterOperator_StartWith.ts

@@ -84,6 +84,7 @@ export class QueryBuilderFilterOperator_StartWith
             .graph,
           propertyType.path,
           generateDefaultValueForPrimitiveType(propertyType.path),
+          filterConditionState.filterState.queryBuilderState.observerContext,
         );
       }
       default:

package/src/stores/milestoning/QueryBuilderMilestoningState.ts

@@ -114,19 +114,13 @@ export class QueryBuilderMilestoningState implements Hashable {
 
   setProcessingDate(val: ValueSpecification | undefined): void {
     this.processingDate = val
-      ? observe_ValueSpecification(
-          val,
-          this.queryBuilderState.observableContext,
-        )
+      ? observe_ValueSpecification(val, this.queryBuilderState.observerContext)
       : val;
   }
 
   setBusinessDate(val: ValueSpecification | undefined): void {
     this.businessDate = val
-      ? observe_ValueSpecification(
-          val,
-          this.queryBuilderState.observableContext,
-        )
+      ? observe_ValueSpecification(val, this.queryBuilderState.observerContext)
       : val;
   }
 
@@ -165,7 +159,7 @@ export class QueryBuilderMilestoningState implements Hashable {
     ) {
       const variableState = new LambdaParameterState(
         milestoningParameter,
-        this.queryBuilderState.observableContext,
+        this.queryBuilderState.observerContext,
         this.queryBuilderState.graphManagerState.graph,
       );
       variableState.mockParameterValue();

package/src/stores/shared/LambdaParameterState.ts

@@ -201,13 +201,13 @@ export class LambdaParameterState implements Hashable {
   readonly uuid = uuid();
   readonly parameter: VariableExpression;
   readonly graph: PureModel;
-  readonly observableContext: ObserverContext;
+  readonly observerContext: ObserverContext;
 
   value: ValueSpecification | undefined;
 
   constructor(
     variableExpression: VariableExpression,
-    observableContext: ObserverContext,
+    observerContext: ObserverContext,
     graph: PureModel,
   ) {
     makeObservable(this, {
@@ -217,7 +217,7 @@ export class LambdaParameterState implements Hashable {
       hashCode: computed,
     });
 
-    this.observableContext = observableContext;
+    this.observerContext = observerContext;
     this.parameter = observe_VariableExpression(variableExpression);
     this.graph = graph;
   }
@@ -231,7 +231,11 @@ export class LambdaParameterState implements Hashable {
 
   mockParameterValue(): void {
     this.setValue(
-      generateVariableExpressionMockValue(this.parameter, this.graph),
+      generateVariableExpressionMockValue(
+        this.parameter,
+        this.graph,
+        this.observerContext,
+      ),
     );
   }
 
@@ -242,7 +246,7 @@ export class LambdaParameterState implements Hashable {
       );
     }
     this.value = value
-      ? observe_ValueSpecification(value, this.observableContext)
+      ? observe_ValueSpecification(value, this.observerContext)
       : undefined;
   }
 

package/src/stores/shared/ValueSpecificationEditorHelper.ts

@@ -33,6 +33,7 @@ import {
   INTERNAL__PropagatedValue,
   SimpleFunctionExpression,
   SUPPORTED_FUNCTIONS,
+  type ObserverContext,
 } from '@finos/legend-graph';
 import { Randomizer, UnsupportedOperationError } from '@finos/legend-shared';
 import { generateDefaultValueForPrimitiveType } from '../QueryBuilderValueSpecificationHelper.js';
@@ -58,6 +59,7 @@ export const createSupportedFunctionExpression = (
 const createMockPrimitiveValueSpecification = (
   primitiveType: PrimitiveType,
   propertyName: string,
+  observerContext: ObserverContext,
 ): ValueSpecification => {
   const primitiveTypeName = primitiveType.name;
   if (
@@ -97,7 +99,7 @@ const createMockPrimitiveValueSpecification = (
     default:
       value = `${propertyName} ${randomizer.getRandomWholeNumber(100)}`;
   }
-  instanceValue_setValues(primitiveInstanceValue, [value]);
+  instanceValue_setValues(primitiveInstanceValue, [value], observerContext);
   return primitiveInstanceValue;
 };
 
@@ -110,19 +112,21 @@ export const buildPrimitiveInstanceValue = (
   graph: PureModel,
   type: PRIMITIVE_TYPE,
   value: unknown,
+  observerContext: ObserverContext,
 ): PrimitiveInstanceValue => {
   const instance = new PrimitiveInstanceValue(
     GenericTypeExplicitReference.create(
       new GenericType(graph.getPrimitiveType(type)),
     ),
   );
-  instanceValue_setValues(instance, [value]);
+  instanceValue_setValues(instance, [value], observerContext);
   return instance;
 };
 
 export const buildDefaultInstanceValue = (
   graph: PureModel,
   type: Type,
+  observerContext: ObserverContext,
 ): ValueSpecification => {
   const path = type.path;
   switch (path) {
@@ -139,6 +143,7 @@ export const buildDefaultInstanceValue = (
         graph,
         path,
         generateDefaultValueForPrimitiveType(path),
+        observerContext,
       );
     }
     case PRIMITIVE_TYPE.DATE: {
@@ -146,6 +151,7 @@ export const buildDefaultInstanceValue = (
         graph,
         PRIMITIVE_TYPE.STRICTDATE,
         generateDefaultValueForPrimitiveType(path),
+        observerContext,
       );
     }
     default:
@@ -154,9 +160,11 @@ export const buildDefaultInstanceValue = (
           const enumValueInstanceValue = new EnumValueInstanceValue(
             GenericTypeExplicitReference.create(new GenericType(type)),
           );
-          instanceValue_setValues(enumValueInstanceValue, [
-            EnumValueExplicitReference.create(type.values[0] as Enum),
-          ]);
+          instanceValue_setValues(
+            enumValueInstanceValue,
+            [EnumValueExplicitReference.create(type.values[0] as Enum)],
+            observerContext,
+          );
           return enumValueInstanceValue;
         }
         throw new UnsupportedOperationError(
@@ -172,6 +180,7 @@ export const buildDefaultInstanceValue = (
 export const generateVariableExpressionMockValue = (
   parameter: VariableExpression,
   graph: PureModel,
+  observerContext: ObserverContext,
 ): ValueSpecification | undefined => {
   const varType = parameter.genericType?.value.rawType;
   const multiplicity = parameter.multiplicity;
@@ -182,16 +191,22 @@ export const generateVariableExpressionMockValue = (
     );
   }
   if (varType instanceof PrimitiveType) {
-    return createMockPrimitiveValueSpecification(varType, VAR_DEFAULT_NAME);
+    return createMockPrimitiveValueSpecification(
+      varType,
+      VAR_DEFAULT_NAME,
+      observerContext,
+    );
   } else if (varType instanceof Enumeration) {
     const enumValueInstance = new EnumValueInstanceValue(
       GenericTypeExplicitReference.create(new GenericType(varType)),
     );
     const mock = createMockEnumerationProperty(varType);
     if (mock !== '') {
-      instanceValue_setValues(enumValueInstance, [
-        EnumValueExplicitReference.create(getEnumValue(varType, mock)),
-      ]);
+      instanceValue_setValues(
+        enumValueInstance,
+        [EnumValueExplicitReference.create(getEnumValue(varType, mock))],
+        observerContext,
+      );
     }
     return enumValueInstance;
   }