@finos/legend-graph 19.2.1 → 20.0.0

package/src/graphManager/protocol/pure/v1/transformation/pureGraph/from/V1_ValueSpecificationTransformer.ts

@@ -16,26 +16,23 @@
 
 import {
   filterByType,
+  guaranteeIsBoolean,
+  guaranteeIsNumber,
+  guaranteeIsString,
   guaranteeNonNullable,
   guaranteeType,
   UnsupportedOperationError,
 } from '@finos/legend-shared';
 import { PRIMITIVE_TYPE } from '../../../../../../../graph/MetaModelConst.js';
-import type { AlloySerializationConfigInstanceValue } from '../../../../../../../graph/metamodel/pure/valueSpecification/AlloySerializationConfig.js';
 import {
   type GraphFetchTree,
-  type PropertyGraphFetchTreeInstanceValue,
-  type RootGraphFetchTreeInstanceValue,
+  type GraphFetchTreeInstanceValue,
   PropertyGraphFetchTree,
   RootGraphFetchTree,
 } from '../../../../../../../graph/metamodel/pure/valueSpecification/GraphFetchTree.js';
 import type {
   PrimitiveInstanceValue,
   EnumValueInstanceValue,
-  RuntimeInstanceValue,
-  PairInstanceValue,
-  MappingInstanceValue,
-  PureListInstanceValue,
   CollectionInstanceValue,
   InstanceValue,
 } from '../../../../../../../graph/metamodel/pure/valueSpecification/InstanceValue.js';
@@ -69,20 +66,21 @@ import { V1_CStrictTime } from '../../../model/valueSpecification/raw/V1_CStrict
 import { V1_CLatestDate } from '../../../model/valueSpecification/raw/V1_CLatestDate.js';
 import { V1_Multiplicity } from '../../../model/packageableElements/domain/V1_Multiplicity.js';
 import { V1_EnumValue } from '../../../model/valueSpecification/raw/V1_EnumValue.js';
-import { V1_PropertyGraphFetchTree } from '../../../model/valueSpecification/raw/graph/V1_PropertyGraphFetchTree.js';
-import { V1_RootGraphFetchTree } from '../../../model/valueSpecification/raw/graph/V1_RootGraphFetchTree.js';
-import type { V1_GraphFetchTree } from '../../../model/valueSpecification/raw/graph/V1_GraphFetchTree.js';
+import { V1_PropertyGraphFetchTree } from '../../../model/valueSpecification/raw/classInstance/graph/V1_PropertyGraphFetchTree.js';
+import { V1_RootGraphFetchTree } from '../../../model/valueSpecification/raw/classInstance/graph/V1_RootGraphFetchTree.js';
+import type { V1_GraphFetchTree } from '../../../model/valueSpecification/raw/classInstance/graph/V1_GraphFetchTree.js';
 import { V1_Collection } from '../../../model/valueSpecification/raw/V1_Collection.js';
 import { V1_PackageableElementPtr } from '../../../model/valueSpecification/raw/V1_PackageableElementPtr.js';
 import { PackageableElementReference } from '../../../../../../../graph/metamodel/pure/packageableElements/PackageableElementReference.js';
 import { Unit } from '../../../../../../../graph/metamodel/pure/packageableElements/domain/Measure.js';
 import { Class } from '../../../../../../../graph/metamodel/pure/packageableElements/domain/Class.js';
-import { V1_HackedUnit } from '../../../model/valueSpecification/raw/V1_HackedUnit.js';
-import { V1_HackedClass } from '../../../model/valueSpecification/raw/V1_HackedClass.js';
 import type { PackageableElement } from '../../../../../../../graph/metamodel/pure/packageableElements/PackageableElement.js';
 import type { INTERNAL__UnknownValueSpecification } from '../../../../../../../graph/metamodel/pure/valueSpecification/INTERNAL__UnknownValueSpecification.js';
 import { V1_INTERNAL__UnknownValueSpecification } from '../../../model/valueSpecification/V1_INTERNAL__UnknownValueSpecfication.js';
 import type { INTERNAL__PropagatedValue } from '../../../../../../../graph/metamodel/pure/valueSpecification/INTERNAL__PropagatedValue.js';
+import { V1_GenericTypeInstance } from '../../../model/valueSpecification/raw/V1_GenericTypeInstance.js';
+import { V1_ClassInstance } from '../../../model/valueSpecification/raw/V1_ClassInstance.js';
+import { V1_ClassInstanceType } from '../../pureProtocol/serializationHelpers/V1_ValueSpecificationSerializer.js';
 
 class V1_ValueSpecificationTransformer
   implements ValueSpecificationVisitor<V1_ValueSpecification>
@@ -112,205 +110,16 @@ class V1_ValueSpecificationTransformer
     return protocol;
   }
 
-  visit_RootGraphFetchTreeInstanceValue(
-    valueSpecification: RootGraphFetchTreeInstanceValue,
-  ): V1_ValueSpecification {
-    return V1_transformGraphFetchTree(
-      guaranteeNonNullable(valueSpecification.values[0]),
-      this.inScope,
-      this.open,
-      this.isParameter,
-      this.useAppliedFunction,
-    );
-  }
-
-  visit_PropertyGraphFetchTreeInstanceValue(
-    valueSpecification: PropertyGraphFetchTreeInstanceValue,
-  ): V1_ValueSpecification {
-    return V1_transformGraphFetchTree(
-      guaranteeNonNullable(valueSpecification.values[0]),
-      this.inScope,
-      this.open,
-      this.isParameter,
-      this.useAppliedFunction,
-    );
-  }
-
-  visit_AlloySerializationConfigInstanceValue(
-    valueSpecification: AlloySerializationConfigInstanceValue,
-  ): V1_ValueSpecification {
-    throw new UnsupportedOperationError();
-  }
-
-  visit_PrimitiveInstanceValue(
-    valueSpecification: PrimitiveInstanceValue,
-  ): V1_ValueSpecification {
-    const type = valueSpecification.genericType.value.rawType;
-    const multiplicity = new V1_Multiplicity();
-    multiplicity.lowerBound = valueSpecification.multiplicity.lowerBound;
-    multiplicity.upperBound = valueSpecification.multiplicity.upperBound;
-    switch (type.name) {
-      case PRIMITIVE_TYPE.INTEGER: {
-        const cInteger = new V1_CInteger();
-        cInteger.values = valueSpecification.values as number[];
-        cInteger.multiplicity = multiplicity;
-        return cInteger;
-      }
-      case PRIMITIVE_TYPE.FLOAT: {
-        const cFloat = new V1_CFloat();
-        cFloat.values = valueSpecification.values as number[];
-        cFloat.multiplicity = multiplicity;
-        return cFloat;
-      }
-      // since we don't have a corresponding protocol for abstract type `Number`, we will default to use `Decimal`
-      case PRIMITIVE_TYPE.NUMBER:
-      case PRIMITIVE_TYPE.DECIMAL: {
-        const cDecimal = new V1_CDecimal();
-        cDecimal.values = valueSpecification.values as number[];
-        cDecimal.multiplicity = multiplicity;
-        return cDecimal;
-      }
-      case PRIMITIVE_TYPE.STRING: {
-        const cString = new V1_CString();
-        cString.values = valueSpecification.values as string[];
-        cString.multiplicity = multiplicity;
-        return cString;
-      }
-      case PRIMITIVE_TYPE.BOOLEAN: {
-        const cBoolean = new V1_CBoolean();
-        cBoolean.values = valueSpecification.values as boolean[];
-        cBoolean.multiplicity = multiplicity;
-        return cBoolean;
-      }
-      // since we don't have a corresponding protocol for abstract type `Date`, we will default to use `DateTime`
-      case PRIMITIVE_TYPE.DATE:
-      case PRIMITIVE_TYPE.DATETIME: {
-        const cDateTime = new V1_CDateTime();
-        cDateTime.values = valueSpecification.values as string[];
-        cDateTime.multiplicity = multiplicity;
-        return cDateTime;
-      }
-      case PRIMITIVE_TYPE.STRICTDATE: {
-        const cStrictDate = new V1_CStrictDate();
-        cStrictDate.values = valueSpecification.values as string[];
-        cStrictDate.multiplicity = multiplicity;
-        return cStrictDate;
-      }
-      case PRIMITIVE_TYPE.STRICTTIME: {
-        const cStrictTime = new V1_CStrictTime();
-        cStrictTime.values = valueSpecification.values as string[];
-        cStrictTime.multiplicity = multiplicity;
-        return cStrictTime;
-      }
-      case PRIMITIVE_TYPE.LATESTDATE: {
-        const cPrimitiveType = new V1_CLatestDate();
-        cPrimitiveType.multiplicity = multiplicity;
-        return cPrimitiveType;
-      }
-      default:
-        throw new UnsupportedOperationError(
-          `Can't transform primtive instance value of type '${type.name}'`,
-        );
-    }
-  }
-
-  visit_InstanceValue(
-    valueSpecification: InstanceValue,
+  visit_INTERNAL__PropagatedValue(
+    valueSpecification: INTERNAL__PropagatedValue,
   ): V1_ValueSpecification {
-    if (
-      valueSpecification.values.length === 1 &&
-      valueSpecification.values[0] instanceof PackageableElementReference
-    ) {
-      const protocol = new V1_PackageableElementPtr();
-      protocol.fullPath = (
-        valueSpecification
-          .values[0] as PackageableElementReference<PackageableElement>
-      ).value.path;
-      return protocol;
-    } else if (
-      valueSpecification.values.length === 0 &&
-      valueSpecification.genericType
-    ) {
-      if (valueSpecification.genericType.value.rawType instanceof Unit) {
-        const protocol = new V1_HackedUnit();
-        protocol.unitType =
-          valueSpecification.genericType.ownerReference.valueForSerialization ??
-          '';
-        return protocol;
-      } else if (
-        valueSpecification.genericType.value.rawType instanceof Class
-      ) {
-        const protocol = new V1_HackedClass();
-        protocol.fullPath =
-          valueSpecification.genericType.ownerReference.valueForSerialization ??
-          '';
-        return protocol;
-      }
-    }
+    // NOTE: this is an synthetic construct which is to be created adhocly in the application
+    // this MUST NOT be transformed, serialized, and stored at all
     throw new UnsupportedOperationError(
-      `Can't transform instance value`,
-      valueSpecification,
+      `Can't transform propagated value: propagated value leakage detected`,
     );
   }
 
-  visit_EnumValueInstanceValue(
-    valueSpecification: EnumValueInstanceValue,
-  ): V1_ValueSpecification {
-    const _enumValue = new V1_EnumValue();
-    const _enum = guaranteeNonNullable(valueSpecification.values[0]).value;
-    _enumValue.value = _enum.name;
-    _enumValue.fullPath = _enum._OWNER.path;
-    return _enumValue;
-  }
-
-  visit_RuntimeInstanceValue(
-    valueSpecification: RuntimeInstanceValue,
-  ): V1_ValueSpecification {
-    throw new UnsupportedOperationError();
-  }
-
-  visit_PairInstanceValue(
-    valueSpecification: PairInstanceValue,
-  ): V1_ValueSpecification {
-    throw new UnsupportedOperationError();
-  }
-
-  visit_MappingInstanceValue(
-    valueSpecification: MappingInstanceValue,
-  ): V1_ValueSpecification {
-    throw new UnsupportedOperationError();
-  }
-
-  visit_PureListInstanceValue(
-    valueSpecification: PureListInstanceValue,
-  ): V1_ValueSpecification {
-    throw new UnsupportedOperationError();
-  }
-
-  visit_CollectionInstanceValue(
-    valueSpecification: CollectionInstanceValue,
-  ): V1_ValueSpecification {
-    const collection = new V1_Collection();
-    collection.multiplicity = new V1_Multiplicity();
-    collection.multiplicity.lowerBound =
-      valueSpecification.multiplicity.lowerBound;
-    collection.multiplicity.upperBound =
-      valueSpecification.multiplicity.upperBound;
-    collection.values = valueSpecification.values
-      .filter(filterByType(ValueSpecification))
-      .map((value) =>
-        value.accept_ValueSpecificationVisitor(
-          new V1_ValueSpecificationTransformer(
-            this.inScope,
-            this.open,
-            this.isParameter,
-            this.useAppliedFunction,
-          ),
-        ),
-      );
-    return collection;
-  }
-
   visit_FunctionExpression(
     valueSpecification: FunctionExpression,
   ): V1_ValueSpecification {
@@ -354,21 +163,16 @@ class V1_ValueSpecificationTransformer
     _variable.name = valueSpecification.name;
     const genericType = valueSpecification.genericType;
     if (this.isParameter && genericType) {
-      const multiplicity = new V1_Multiplicity();
-      multiplicity.lowerBound = valueSpecification.multiplicity.lowerBound;
-      multiplicity.upperBound = valueSpecification.multiplicity.upperBound;
+      const multiplicity = new V1_Multiplicity(
+        valueSpecification.multiplicity.lowerBound,
+        valueSpecification.multiplicity.upperBound,
+      );
       _variable.multiplicity = multiplicity;
       _variable.class = genericType.value.rawType.path;
     }
     return _variable;
   }
 
-  visit_LambdaFunctionInstanceValue(
-    valueSpecification: LambdaFunctionInstanceValue,
-  ): V1_ValueSpecification {
-    return V1_transformLambdaFunctionInstanceValue(valueSpecification);
-  }
-
   visit_AbstractPropertyExpression(
     valueSpecification: AbstractPropertyExpression,
   ): V1_ValueSpecification {
@@ -387,10 +191,148 @@ class V1_ValueSpecificationTransformer
     return _property;
   }
 
-  visit_INTERNAL__PropagatedValue(
-    valueSpecification: INTERNAL__PropagatedValue,
+  visit_InstanceValue(
+    valueSpecification: InstanceValue,
   ): V1_ValueSpecification {
-    throw new UnsupportedOperationError();
+    if (
+      valueSpecification.values.length === 1 &&
+      valueSpecification.values[0] instanceof PackageableElementReference
+    ) {
+      const protocol = new V1_PackageableElementPtr();
+      protocol.fullPath = (
+        valueSpecification
+          .values[0] as PackageableElementReference<PackageableElement>
+      ).value.path;
+      return protocol;
+    } else if (
+      valueSpecification.values.length === 0 &&
+      valueSpecification.genericType &&
+      (valueSpecification.genericType.value.rawType instanceof Unit ||
+        valueSpecification.genericType.value.rawType instanceof Class)
+    ) {
+      const protocol = new V1_GenericTypeInstance();
+      protocol.fullPath =
+        valueSpecification.genericType.ownerReference.valueForSerialization ??
+        '';
+      return protocol;
+    }
+    throw new UnsupportedOperationError(
+      `Can't transform instance value`,
+      valueSpecification,
+    );
+  }
+
+  visit_CollectionInstanceValue(
+    valueSpecification: CollectionInstanceValue,
+  ): V1_ValueSpecification {
+    const collection = new V1_Collection();
+    collection.multiplicity = new V1_Multiplicity(
+      valueSpecification.multiplicity.lowerBound,
+      valueSpecification.multiplicity.upperBound,
+    );
+    collection.values = valueSpecification.values
+      .filter(filterByType(ValueSpecification))
+      .map((value) =>
+        value.accept_ValueSpecificationVisitor(
+          new V1_ValueSpecificationTransformer(
+            this.inScope,
+            this.open,
+            this.isParameter,
+            this.useAppliedFunction,
+          ),
+        ),
+      );
+    return collection;
+  }
+
+  visit_EnumValueInstanceValue(
+    valueSpecification: EnumValueInstanceValue,
+  ): V1_ValueSpecification {
+    const _enumValue = new V1_EnumValue();
+    const _enum = guaranteeNonNullable(valueSpecification.values[0]).value;
+    _enumValue.value = _enum.name;
+    _enumValue.fullPath = _enum._OWNER.path;
+    return _enumValue;
+  }
+
+  visit_PrimitiveInstanceValue(
+    valueSpecification: PrimitiveInstanceValue,
+  ): V1_ValueSpecification {
+    const type = valueSpecification.genericType.value.rawType;
+    switch (type.name) {
+      case PRIMITIVE_TYPE.INTEGER: {
+        const cInteger = new V1_CInteger();
+        cInteger.value = guaranteeIsNumber(valueSpecification.values[0]);
+        return cInteger;
+      }
+      case PRIMITIVE_TYPE.FLOAT: {
+        const cFloat = new V1_CFloat();
+        cFloat.value = guaranteeIsNumber(valueSpecification.values[0]);
+        return cFloat;
+      }
+      // since we don't have a corresponding protocol for abstract type `Number`, we will default to use `Decimal`
+      case PRIMITIVE_TYPE.NUMBER:
+      case PRIMITIVE_TYPE.DECIMAL: {
+        const cDecimal = new V1_CDecimal();
+        cDecimal.value = guaranteeIsNumber(valueSpecification.values[0]);
+        return cDecimal;
+      }
+      case PRIMITIVE_TYPE.STRING: {
+        const cString = new V1_CString();
+        cString.value = guaranteeIsString(valueSpecification.values[0]);
+        return cString;
+      }
+      case PRIMITIVE_TYPE.BOOLEAN: {
+        const cBoolean = new V1_CBoolean();
+        cBoolean.value = guaranteeIsBoolean(valueSpecification.values[0]);
+        return cBoolean;
+      }
+      // since we don't have a corresponding protocol for abstract type `Date`, we will default to use `DateTime`
+      case PRIMITIVE_TYPE.DATE:
+      case PRIMITIVE_TYPE.DATETIME: {
+        const cDateTime = new V1_CDateTime();
+        cDateTime.value = guaranteeIsString(valueSpecification.values[0]);
+        return cDateTime;
+      }
+      case PRIMITIVE_TYPE.STRICTDATE: {
+        const cStrictDate = new V1_CStrictDate();
+        cStrictDate.value = guaranteeIsString(valueSpecification.values[0]);
+        return cStrictDate;
+      }
+      case PRIMITIVE_TYPE.STRICTTIME: {
+        const cStrictTime = new V1_CStrictTime();
+        cStrictTime.value = guaranteeIsString(valueSpecification.values[0]);
+        return cStrictTime;
+      }
+      case PRIMITIVE_TYPE.LATESTDATE: {
+        return new V1_CLatestDate();
+      }
+      default:
+        throw new UnsupportedOperationError(
+          `Can't transform primtive instance value of type '${type.name}'`,
+        );
+    }
+  }
+
+  visit_LambdaFunctionInstanceValue(
+    valueSpecification: LambdaFunctionInstanceValue,
+  ): V1_ValueSpecification {
+    return V1_transformLambdaFunctionInstanceValue(valueSpecification);
+  }
+
+  visit_GraphFetchTreeInstanceValue(
+    valueSpecification: GraphFetchTreeInstanceValue,
+  ): V1_ValueSpecification {
+    const classInstance = new V1_ClassInstance();
+    classInstance.type = V1_ClassInstanceType.ROOT_GRAPH_FETCH_TREE;
+    classInstance.value = V1_transformGraphFetchTree(
+      guaranteeNonNullable(valueSpecification.values[0]),
+      this.inScope,
+      this.open,
+      this.isParameter,
+      this.useAppliedFunction,
+    );
+    return classInstance;
   }
 }
 

package/src/graphManager/protocol/pure/v1/transformation/pureGraph/to/V1_ElementFirstPassBuilder.ts

@@ -15,10 +15,6 @@
  */
 
 import { assertNonEmptyString } from '@finos/legend-shared';
-import {
-  PRIMITIVE_TYPE,
-  TYPICAL_MULTIPLICITY_TYPE,
-} from '../../../../../../../graph/MetaModelConst.js';
 import type { PackageableElement } from '../../../../../../../graph/metamodel/pure/packageableElements/PackageableElement.js';
 import { Profile } from '../../../../../../../graph/metamodel/pure/packageableElements/domain/Profile.js';
 import { Enumeration } from '../../../../../../../graph/metamodel/pure/packageableElements/domain/Enumeration.js';
@@ -68,6 +64,8 @@ import type { Package } from '../../../../../../../graph/metamodel/pure/packagea
 import type { V1_DataElement } from '../../../model/packageableElements/data/V1_DataElement.js';
 import { DataElement } from '../../../../../../../graph/metamodel/pure/packageableElements/data/DataElement.js';
 import { V1_buildFunctionSignature } from '../../../helpers/V1_DomainHelper.js';
+import { Multiplicity } from '../../../../../../../graph/metamodel/pure/packageableElements/domain/Multiplicity.js';
+import { PrimitiveType } from '../../../../../../../graph/metamodel/pure/packageableElements/domain/PrimitiveType.js';
 
 export class V1_ElementFirstPassBuilder
   implements V1_PackageableElementVisitor<PackageableElement>
@@ -248,13 +246,8 @@ export class V1_ElementFirstPassBuilder
     const func = new ConcreteFunctionDefinition(
       name,
       // This is just a stub to fill in when we first create the function
-      PackageableElementImplicitReference.create(
-        this.context.graph.getPrimitiveType(PRIMITIVE_TYPE.STRING),
-        '',
-      ),
-      this.context.graph.getTypicalMultiplicity(
-        TYPICAL_MULTIPLICITY_TYPE.ZEROMANY,
-      ),
+      PackageableElementImplicitReference.create(PrimitiveType.STRING, ''),
+      Multiplicity.ZERO_MANY,
     );
     const path = V1_buildFullPath(element.package, name);
     V1_checkDuplicatedElement(path, this.context, this.elementPathCache);

package/src/graphManager/protocol/pure/v1/transformation/pureGraph/to/V1_ElementFourthPassBuilder.ts

@@ -82,14 +82,22 @@ export class V1_ElementFourthPassBuilder
     const _class = this.context.currentSubGraph.getOwnClass(
       V1_buildFullPath(element.package, element.name),
     );
-    V1_buildMilestoningProperties(_class, this.context.graph);
+    V1_buildMilestoningProperties(
+      _class,
+      this.context.graph,
+      this.context.extensions.plugins,
+    );
   }
 
   visit_Association(element: V1_Association): void {
     const association = this.context.currentSubGraph.getOwnAssociation(
       V1_buildFullPath(element.package, element.name),
     );
-    V1_buildMilestoningProperties(association, this.context.graph);
+    V1_buildMilestoningProperties(
+      association,
+      this.context.graph,
+      this.context.extensions.plugins,
+    );
   }
 
   visit_ConcreteFunctionDefinition(

package/src/graphManager/protocol/pure/v1/transformation/pureGraph/to/V1_ElementSecondPassBuilder.ts

@@ -81,7 +81,6 @@ import type { V1_DataElement } from '../../../model/packageableElements/data/V1_
 import { V1_buildEmbeddedData } from './helpers/V1_DataElementBuilderHelper.js';
 import { V1_buildTestSuite } from './helpers/V1_TestBuilderHelper.js';
 import { ServiceTestSuite } from '../../../../../../../graph/metamodel/pure/packageableElements/service/ServiceTestSuite.js';
-import { V1_getIncludedMappingPath } from '../../../helpers/V1_DSL_Mapping_Helper.js';
 import { V1_DataElementReference } from '../../../model/data/V1_EmbeddedData.js';
 import { V1_buildFunctionSignature } from '../../../helpers/V1_DomainHelper.js';
 import { getFunctionName } from '../../../../../../../graph/helpers/DomainHelper.js';
@@ -280,8 +279,8 @@ export class V1_ElementSecondPassBuilder
       V1_buildFullPath(element.package, element.name),
     );
     const mappingIncludesSet = new Set<string>();
-    mapping.includes = element.includedMappings.map((i) => {
-      const includedMappingPath = V1_getIncludedMappingPath(i);
+    mapping.includes = element.includedMappings.map((mappingInclude) => {
+      const includedMappingPath = mappingInclude.includedMapping;
       assertNonEmptyString(
         includedMappingPath,
         `Mapping include path is missing or empty`,
@@ -291,7 +290,7 @@ export class V1_ElementSecondPassBuilder
         `Duplicated mapping include '${includedMappingPath}' in mapping '${mapping.path}'`,
       );
       mappingIncludesSet.add(includedMappingPath);
-      return V1_buildMappingInclude(i, this.context, mapping);
+      return V1_buildMappingInclude(mappingInclude, this.context, mapping);
     });
     mapping.enumerationMappings = element.enumerationMappings.map(
       (enumerationMapping) =>

package/src/graphManager/protocol/pure/v1/transformation/pureGraph/to/V1_GraphBuilderContext.ts

@@ -315,37 +315,34 @@ export class V1_GraphBuilderContext {
   };
 
   resolveOwnProperty = (
-    propertyPtr: V1_PropertyPointer,
+    pointer: V1_PropertyPointer,
   ): PropertyImplicitReference => {
     assertNonEmptyString(
-      propertyPtr.class,
+      pointer.class,
       `Property pointer 'class' field is missing or empty`,
     );
     assertNonEmptyString(
-      propertyPtr.property,
+      pointer.property,
       `Property pointer 'property' field is missing or empty`,
     );
-    const ownerReference = this.resolveClass(propertyPtr.class);
-    const value = getOwnClassProperty(
-      ownerReference.value,
-      propertyPtr.property,
-    );
+    const ownerReference = this.resolveClass(pointer.class);
+    const value = getOwnClassProperty(ownerReference.value, pointer.property);
     return PropertyImplicitReference.create(ownerReference, value);
   };
 
   resolveProperty = (
-    propertyPtr: V1_PropertyPointer,
+    pointer: V1_PropertyPointer,
   ): PropertyImplicitReference => {
     assertNonEmptyString(
-      propertyPtr.class,
+      pointer.class,
       `Property pointer 'class' field is missing or empty`,
     );
     assertNonEmptyString(
-      propertyPtr.property,
+      pointer.property,
       `Property pointer 'property' field is missing or empty`,
     );
-    const ownerReference = this.resolveClass(propertyPtr.class);
-    const value = getClassProperty(ownerReference.value, propertyPtr.property);
+    const ownerReference = this.resolveClass(pointer.class);
+    const value = getClassProperty(ownerReference.value, pointer.property);
     return PropertyImplicitReference.create(ownerReference, value);
   };
 

package/src/graphManager/protocol/pure/v1/transformation/pureGraph/to/V1_RawValueSpecificationBuilder.ts

@@ -41,14 +41,13 @@ export class V1_RawValueSpecificationBuilder
   }
 
   visit_Variable(valueSpecification: V1_RawVariable): RawValueSpecification {
-    const multiplicity = this.context.graph.getMultiplicity(
-      valueSpecification.multiplicity.lowerBound,
-      valueSpecification.multiplicity.upperBound,
-    );
     const type = this.context.resolveType(valueSpecification.class);
     return new RawVariableExpression(
       valueSpecification.name,
-      multiplicity,
+      this.context.graph.getMultiplicity(
+        valueSpecification.multiplicity.lowerBound,
+        valueSpecification.multiplicity.upperBound,
+      ),
       type,
     );
   }
@@ -56,15 +55,9 @@ export class V1_RawValueSpecificationBuilder
   visit_PrimitiveInstanceValue(
     valueSpecification: V1_RawPrimitiveInstanceValue,
   ): RawValueSpecification {
-    const multiplicity = this.context.graph.getMultiplicity(
-      valueSpecification.multiplicity.lowerBound,
-      valueSpecification.multiplicity.upperBound,
-    );
-    const type = this.context.resolveType(valueSpecification.type);
     return new RawPrimitiveInstanceValue(
-      type,
-      multiplicity,
-      valueSpecification.values,
+      this.context.resolveType(valueSpecification.type),
+      valueSpecification.value,
     );
   }
 }

package/src/graphManager/protocol/pure/v1/transformation/pureGraph/to/helpers/V1_ConnectionBuilderHelper.ts

@@ -21,7 +21,6 @@ import {
   assertType,
   UnsupportedOperationError,
 } from '@finos/legend-shared';
-import { MODEL_STORE_NAME } from '../../../../../../../../graph/MetaModelConst.js';
 import {
   type DatabaseType,
   RelationalDatabaseConnection,
@@ -113,13 +112,13 @@ class V1_ConnectionBuilder implements V1_ConnectionVisitor<Connection> {
       );
     } else {
       assertTrue(
-        connection.store === undefined || connection.store === MODEL_STORE_NAME,
+        connection.store === undefined || connection.store === ModelStore.NAME,
         `Model chain connection store must be 'ModelStore'`,
       );
     }
     const modelConnection = new ModelChainConnection(
       PackageableElementImplicitReference.create(
-        this.context.graph.modelStore,
+        ModelStore.INSTANCE,
         connection.store,
       ),
     );
@@ -138,7 +137,7 @@ class V1_ConnectionBuilder implements V1_ConnectionVisitor<Connection> {
       );
     } else {
       assertTrue(
-        connection.store === undefined || connection.store === MODEL_STORE_NAME,
+        connection.store === undefined || connection.store === ModelStore.NAME,
         `JSON model connection store must be 'ModelStore'`,
       );
     }
@@ -152,7 +151,7 @@ class V1_ConnectionBuilder implements V1_ConnectionVisitor<Connection> {
     );
     return new JsonModelConnection(
       PackageableElementImplicitReference.create(
-        this.context.graph.modelStore,
+        ModelStore.INSTANCE,
         connection.store,
       ),
       this.context.resolveClass(connection.class),
@@ -169,7 +168,7 @@ class V1_ConnectionBuilder implements V1_ConnectionVisitor<Connection> {
       );
     } else {
       assertTrue(
-        connection.store === undefined || connection.store === MODEL_STORE_NAME,
+        connection.store === undefined || connection.store === ModelStore.NAME,
         `XML model connection store must be 'ModelStore'`,
       );
     }
@@ -183,7 +182,7 @@ class V1_ConnectionBuilder implements V1_ConnectionVisitor<Connection> {
     );
     return new XmlModelConnection(
       PackageableElementImplicitReference.create(
-        this.context.graph.modelStore,
+        ModelStore.INSTANCE,
         connection.store,
       ),
       this.context.resolveClass(connection.class),