@finos/legend-graph 4.0.2 → 6.0.0

package/src/models/protocols/pure/v1/transformation/pureGraph/to/V1_ProtocolToMetaModelGraphSecondPassBuilder.ts

@@ -20,14 +20,17 @@ import {
   UnsupportedOperationError,
   IllegalStateError,
   assertNonNullable,
-  guaranteeNonNullable,
   assertTrue,
   LogEvent,
+  guaranteeType,
 } from '@finos/legend-shared';
 import { Stereotype } from '../../../../../../metamodels/pure/packageableElements/domain/Stereotype';
 import { Tag } from '../../../../../../metamodels/pure/packageableElements/domain/Tag';
 import { Enum } from '../../../../../../metamodels/pure/packageableElements/domain/Enum';
-import type { V1_GraphBuilderContext } from '../../../transformation/pureGraph/to/V1_GraphBuilderContext';
+import {
+  V1_buildFullPath,
+  type V1_GraphBuilderContext,
+} from '../../../transformation/pureGraph/to/V1_GraphBuilderContext';
 import type { V1_GenerationSpecification } from '../../../model/packageableElements/generationSpecification/V1_GenerationSpecification';
 import type {
   V1_PackageableElement,
@@ -48,8 +51,8 @@ import {
   V1_buildTaggedValue,
 } from '../../../transformation/pureGraph/to/helpers/V1_DomainBuilderHelper';
 import {
-  V1_buildServiceTest,
   V1_buildServiceExecution,
+  V1_buildLegacyServiceTest,
 } from '../../../transformation/pureGraph/to/helpers/V1_ServiceBuilderHelper';
 import {
   V1_buildEnumerationMapping,
@@ -74,6 +77,10 @@ import {
 import type { V1_Measure } from '../../../model/packageableElements/domain/V1_Measure';
 import type { V1_SectionIndex } from '../../../model/packageableElements/section/V1_SectionIndex';
 import { V1_buildSection } from '../../../transformation/pureGraph/to/helpers/V1_SectionBuilderHelper';
+import type { V1_DataElement } from '../../../model/packageableElements/data/V1_DataElement';
+import { V1_ProtocolToMetaModelEmbeddedDataBuilder } from './helpers/V1_DataElementBuilderHelper';
+import { V1_buildTestSuite } from './helpers/V1_TestBuilderHelper';
+import { ServiceTestSuite } from '../../../../../../metamodels/pure/packageableElements/service/ServiceTestSuite';
 
 export class V1_ProtocolToMetaModelGraphSecondPassBuilder
   implements V1_PackageableElementVisitor<void>
@@ -91,13 +98,19 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
   }
 
   visit_Profile(element: V1_Profile): void {
-    const profile = this.context.graph.getProfile(
-      this.context.graph.buildPath(element.package, element.name),
+    const profile = this.context.currentSubGraph.getOwnProfile(
+      V1_buildFullPath(element.package, element.name),
     );
     const uniqueStereotypes = new Set<string>();
     profile.stereotypes = element.stereotypes.map((stereotype) => {
       if (uniqueStereotypes.has(stereotype)) {
-        /* @MARKER: RELAXED GRAPH CHECK - See https://github.com/finos/legend-studio/issues/660 */
+        /**
+         * This test is skipped because we want to temporarily relax graph building algorithm
+         * to ease Pure -> Legend migration push.
+         * See https://github.com/finos/legend-studio/issues/660
+         *
+         * @discrepancy graph-building
+         */
         this.context.log.warn(
           LogEvent.create(
             `Found duplicated stereotype '${stereotype}' in profile '${element.path}'`,
@@ -110,7 +123,13 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
     const uniqueTags = new Set<string>();
     profile.tags = element.tags.map((tag) => {
       if (uniqueTags.has(tag)) {
-        /* @MARKER: RELAXED GRAPH CHECK - See https://github.com/finos/legend-studio/issues/660 */
+        /**
+         * This test is skipped because we want to temporarily relax graph building algorithm
+         * to ease Pure -> Legend migration push.
+         * See https://github.com/finos/legend-studio/issues/660
+         *
+         * @discrepancy graph-building
+         */
         this.context.log.warn(
           LogEvent.create(
             `Found duplicated tag '${tag}' in profile '${element.path}'`,
@@ -123,8 +142,9 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
   }
 
   visit_Enumeration(element: V1_Enumeration): void {
-    const path = this.context.graph.buildPath(element.package, element.name);
-    const enumeration = this.context.graph.getEnumeration(path);
+    const enumeration = this.context.currentSubGraph.getOwnEnumeration(
+      V1_buildFullPath(element.package, element.name),
+    );
     enumeration.stereotypes = element.stereotypes
       .map((stereotype) => this.context.resolveStereotype(stereotype))
       .filter(isNonNullable);
@@ -138,7 +158,13 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
         `Enum value 'value' field is missing or empty`,
       );
       if (uniqueEnumValues.has(enumValue.value)) {
-        /* @MARKER: RELAXED GRAPH CHECK - See https://github.com/finos/legend-studio/issues/660 */
+        /**
+         * This test is skipped because we want to temporarily relax graph building algorithm
+         * to ease Pure -> Legend migration push.
+         * See https://github.com/finos/legend-studio/issues/660
+         *
+         * @discrepancy graph-building
+         */
         this.context.log.warn(
           LogEvent.create(
             `Found duplicated value '${enumValue.value}' in enumeration '${enumeration.path}'`,
@@ -162,8 +188,8 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
       element.canonicalUnit,
       `Measure 'canonicalUnit' field is missing`,
     );
-    const measure = this.context.graph.getMeasure(
-      this.context.graph.buildPath(element.package, element.name),
+    const measure = this.context.currentSubGraph.getOwnMeasure(
+      V1_buildFullPath(element.package, element.name),
     );
     measure.canonicalUnit = V1_buildUnit(
       element.canonicalUnit,
@@ -177,8 +203,8 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
   }
 
   visit_Class(element: V1_Class): void {
-    const _class = this.context.graph.getClass(
-      this.context.graph.buildPath(element.package, element.name),
+    const _class = this.context.currentSubGraph.getOwnClass(
+      V1_buildFullPath(element.package, element.name),
     );
     _class.stereotypes = element.stereotypes
       .map((stereotype) => this.context.resolveStereotype(stereotype))
@@ -205,8 +231,8 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
       protocol.returnMultiplicity,
       `Function 'returnMultiplicity' field is missing`,
     );
-    const func = this.context.graph.getFunction(
-      this.context.graph.buildPath(protocol.package, protocol.name),
+    const func = this.context.currentSubGraph.getOwnFunction(
+      V1_buildFullPath(protocol.package, protocol.name),
     );
     func.returnType = this.context.resolveType(protocol.returnType);
     func.returnMultiplicity = this.context.graph.getMultiplicity(
@@ -226,8 +252,8 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
   }
 
   visit_FlatData(element: V1_FlatData): void {
-    const flatData = this.context.graph.getFlatDataStore(
-      this.context.graph.buildPath(element.package, element.name),
+    const flatData = this.context.currentSubGraph.getOwnFlatDataStore(
+      V1_buildFullPath(element.package, element.name),
     );
     flatData.sections = element.sections.map((section) =>
       V1_buildFlatDataSection(section, flatData, this.context),
@@ -235,8 +261,8 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
   }
 
   visit_Database(element: V1_Database): void {
-    const database = this.context.graph.getDatabase(
-      this.context.graph.buildPath(element.package, element.name),
+    const database = this.context.currentSubGraph.getOwnDatabase(
+      V1_buildFullPath(element.package, element.name),
     );
     database.includes = element.includedStores.map((includedStore) =>
       this.context.resolveDatabase(includedStore),
@@ -247,8 +273,8 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
   }
 
   visit_Mapping(element: V1_Mapping): void {
-    const mapping = this.context.graph.getMapping(
-      this.context.graph.buildPath(element.package, element.name),
+    const mapping = this.context.currentSubGraph.getOwnMapping(
+      V1_buildFullPath(element.package, element.name),
     );
     const mappingIncludesSet = new Set<string>();
     mapping.includes = element.includedMappings.map((i) => {
@@ -274,8 +300,8 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
       element.pattern,
       `Service 'pattern' field is missing or empty`,
     );
-    const service = this.context.graph.getService(
-      this.context.graph.buildPath(element.package, element.name),
+    const service = this.context.currentSubGraph.getOwnService(
+      V1_buildFullPath(element.package, element.name),
     );
     service.stereotypes = element.stereotypes
       .map((stereotype) => this.context.resolveStereotype(stereotype))
@@ -293,12 +319,21 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
       this.context,
       service,
     );
-    service.test = V1_buildServiceTest(element.test, this.context, service);
+    if (element.test) {
+      service.test = V1_buildLegacyServiceTest(
+        element.test,
+        this.context,
+        service,
+      );
+    }
+    service.tests = element.testSuites
+      .map((testSuite) => V1_buildTestSuite(testSuite, this.context))
+      .map((e) => guaranteeType(e, ServiceTestSuite));
   }
 
   visit_SectionIndex(element: V1_SectionIndex): void {
-    const sectionIndex = guaranteeNonNullable(
-      this.context.graph.getOwnSectionIndex(element.path),
+    const sectionIndex = this.context.currentSubGraph.getOwnSectionIndex(
+      element.path,
     );
     sectionIndex.sections = element.sections.map((section) =>
       V1_buildSection(section, this.context, sectionIndex),
@@ -310,8 +345,8 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
       element.type,
       `File generation 'type' field is missing or empty`,
     );
-    const fileGeneration = this.context.graph.getFileGeneration(
-      this.context.graph.buildPath(element.package, element.name),
+    const fileGeneration = this.context.currentSubGraph.getOwnFileGeneration(
+      V1_buildFullPath(element.package, element.name),
     );
     fileGeneration.type = element.type;
     fileGeneration.configurationProperties =
@@ -323,9 +358,10 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
   }
 
   visit_GenerationSpecification(element: V1_GenerationSpecification): void {
-    const generationSpec = this.context.graph.getGenerationSpecification(
-      this.context.graph.buildPath(element.package, element.name),
-    );
+    const generationSpec =
+      this.context.currentSubGraph.getOwnGenerationSpecification(
+        V1_buildFullPath(element.package, element.name),
+      );
     generationSpec.generationNodes = element.generationNodes.map((node) =>
       V1_buildGenerationTreeNode(node, this.context),
     );
@@ -335,8 +371,8 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
   }
 
   visit_PackageableRuntime(element: V1_PackageableRuntime): void {
-    const runtime = this.context.graph.getRuntime(
-      this.context.graph.buildPath(element.package, element.name),
+    const runtime = this.context.currentSubGraph.getOwnRuntime(
+      V1_buildFullPath(element.package, element.name),
     );
     runtime.runtimeValue = V1_buildEngineRuntime(
       element.runtimeValue,
@@ -345,8 +381,8 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
   }
 
   visit_PackageableConnection(element: V1_PackageableConnection): void {
-    const connection = this.context.graph.getConnection(
-      this.context.graph.buildPath(element.package, element.name),
+    const connection = this.context.currentSubGraph.getOwnConnection(
+      V1_buildFullPath(element.package, element.name),
     );
     if (element.connectionValue instanceof V1_ConnectionPointer) {
       throw new IllegalStateError(
@@ -358,4 +394,19 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
         new V1_ProtocolToMetaModelConnectionBuilder(this.context),
       );
   }
+
+  visit_DataElement(element: V1_DataElement): void {
+    const dataElement = this.context.currentSubGraph.getOwnDataElement(
+      V1_buildFullPath(element.package, element.name),
+    );
+    dataElement.stereotypes = element.stereotypes
+      .map((stereotype) => this.context.resolveStereotype(stereotype))
+      .filter(isNonNullable);
+    dataElement.taggedValues = element.taggedValues
+      .map((taggedValue) => V1_buildTaggedValue(taggedValue, this.context))
+      .filter(isNonNullable);
+    dataElement.data = element.data.accept_EmbeddedDataVisitor(
+      new V1_ProtocolToMetaModelEmbeddedDataBuilder(this.context),
+    );
+  }
 }

package/src/models/protocols/pure/v1/transformation/pureGraph/to/V1_ProtocolToMetaModelGraphThirdPassBuilder.ts

@@ -25,7 +25,10 @@ import {
 } from '@finos/legend-shared';
 import { CORE_PURE_PATH } from '../../../../../../../MetaModelConst';
 import { Class } from '../../../../../../metamodels/pure/packageableElements/domain/Class';
-import type { V1_GraphBuilderContext } from '../../../transformation/pureGraph/to/V1_GraphBuilderContext';
+import {
+  V1_buildFullPath,
+  type V1_GraphBuilderContext,
+} from '../../../transformation/pureGraph/to/V1_GraphBuilderContext';
 import type {
   V1_PackageableElement,
   V1_PackageableElementVisitor,
@@ -54,6 +57,7 @@ import type { V1_Measure } from '../../../model/packageableElements/domain/V1_Me
 import { V1_buildDatabaseSchemaViewsFirstPass } from '../../../transformation/pureGraph/to/helpers/V1_DatabaseBuilderHelper';
 import type { V1_SectionIndex } from '../../../model/packageableElements/section/V1_SectionIndex';
 import { GraphBuilderError } from '../../../../../../../graphManager/GraphManagerUtils';
+import type { V1_DataElement } from '../../../model/packageableElements/data/V1_DataElement';
 
 export class V1_ProtocolToMetaModelGraphThirdPassBuilder
   implements V1_PackageableElementVisitor<void>
@@ -83,8 +87,8 @@ export class V1_ProtocolToMetaModelGraphThirdPassBuilder
   }
 
   visit_Class(element: V1_Class): void {
-    const _class = this.context.graph.getClass(
-      this.context.graph.buildPath(element.package, element.name),
+    const _class = this.context.currentSubGraph.getOwnClass(
+      V1_buildFullPath(element.package, element.name),
     );
     element.superTypes.forEach((type) => {
       // supertype `Any` will not be processed
@@ -102,7 +106,7 @@ export class V1_ProtocolToMetaModelGraphThirdPassBuilder
           assertErrorThrown(error);
           // NOTE: reconsider this as we might need to get elements from `system` and `platform` as well
           throw new GraphBuilderError(
-            `Can't find supertype '${type}' of class '${this.context.graph.buildPath(
+            `Can't find supertype '${type}' of class '${V1_buildFullPath(
               element.package,
               element.name,
             )}': ${error.message}`,
@@ -113,7 +117,13 @@ export class V1_ProtocolToMetaModelGraphThirdPassBuilder
     const uniqueProperties = new Set<string>();
     element.properties.forEach((property) => {
       if (uniqueProperties.has(property.name)) {
-        /* @MARKER: RELAXED GRAPH CHECK - See https://github.com/finos/legend-studio/issues/660 */
+        /**
+         * This test is skipped because we want to temporarily relax graph building algorithm
+         * to ease Pure -> Legend migration push.
+         * See https://github.com/finos/legend-studio/issues/660
+         *
+         * @discrepancy graph-building
+         */
         this.context.log.warn(
           LogEvent.create(
             `Found duplicated property '${property.name}' in class '${_class.path}'`,
@@ -126,17 +136,23 @@ export class V1_ProtocolToMetaModelGraphThirdPassBuilder
   }
 
   visit_Association(element: V1_Association): void {
+    const association = this.context.currentSubGraph.getOwnAssociation(
+      V1_buildFullPath(element.package, element.name),
+    );
     assertTrue(
       element.properties.length === 2,
       'Association must have exactly 2 properties',
     );
-    const association = this.context.graph.getAssociation(
-      this.context.graph.buildPath(element.package, element.name),
-    );
     const first = guaranteeNonNullable(element.properties[0]);
     const second = guaranteeNonNullable(element.properties[1]);
     if (first.name === second.name) {
-      /* @MARKER: RELAXED GRAPH CHECK - See https://github.com/finos/legend-studio/issues/660 */
+      /**
+       * This test is skipped because we want to temporarily relax graph building algorithm
+       * to ease Pure -> Legend migration push.
+       * See https://github.com/finos/legend-studio/issues/660
+       *
+       * @discrepancy graph-building
+       */
       this.context.log.warn(
         LogEvent.create(
           `Found duplicated property '${element.properties[0]?.name}' in association '${element.name}'`,
@@ -166,14 +182,12 @@ export class V1_ProtocolToMetaModelGraphThirdPassBuilder
   }
 
   visit_FlatData(element: V1_FlatData): void {
-    this.context.graph.getFlatDataStore(
-      this.context.graph.buildPath(element.package, element.name),
-    );
+    return;
   }
 
   visit_Database(element: V1_Database): void {
-    const database = this.context.graph.getDatabase(
-      this.context.graph.buildPath(element.package, element.name),
+    const database = this.context.currentSubGraph.getOwnDatabase(
+      V1_buildFullPath(element.package, element.name),
     );
     element.schemas.forEach((schema) =>
       V1_buildDatabaseSchemaViewsFirstPass(schema, database, this.context),
@@ -181,8 +195,9 @@ export class V1_ProtocolToMetaModelGraphThirdPassBuilder
   }
 
   visit_Mapping(element: V1_Mapping): void {
-    const path = this.context.graph.buildPath(element.package, element.name);
-    const mapping = this.context.graph.getMapping(path);
+    const mapping = this.context.currentSubGraph.getOwnMapping(
+      V1_buildFullPath(element.package, element.name),
+    );
     mapping.classMappings = element.classMappings.map((classMapping) =>
       classMapping.accept_ClassMappingVisitor(
         new V1_ProtocolToMetaModelClassMappingFirstPassBuilder(
@@ -216,4 +231,8 @@ export class V1_ProtocolToMetaModelGraphThirdPassBuilder
   visit_PackageableConnection(element: V1_PackageableConnection): void {
     throw new UnsupportedOperationError();
   }
+
+  visit_DataElement(element: V1_DataElement): void {
+    throw new UnsupportedOperationError();
+  }
 }

package/src/models/protocols/pure/v1/transformation/pureGraph/to/V1_ProtocolToMetaModelPropertyMappingBuilder.ts

@@ -31,10 +31,7 @@ import type { PropertyMappingsImplementation } from '../../../../../../metamodel
 import { EmbeddedFlatDataPropertyMapping } from '../../../../../../metamodels/pure/packageableElements/store/flatData/mapping/EmbeddedFlatDataPropertyMapping';
 import { FlatDataPropertyMapping } from '../../../../../../metamodels/pure/packageableElements/store/flatData/mapping/FlatDataPropertyMapping';
 import type { EnumerationMapping } from '../../../../../../metamodels/pure/packageableElements/mapping/EnumerationMapping';
-import {
-  TEMPORARY__UnresolvedSetImplementation,
-  type SetImplementation,
-} from '../../../../../../metamodels/pure/packageableElements/mapping/SetImplementation';
+import type { SetImplementation } from '../../../../../../metamodels/pure/packageableElements/mapping/SetImplementation';
 import { Class } from '../../../../../../metamodels/pure/packageableElements/domain/Class';
 import type { Association } from '../../../../../../metamodels/pure/packageableElements/domain/Association';
 import type { TableAlias } from '../../../../../../metamodels/pure/packageableElements/store/relational/model/RelationalOperationElement';
@@ -75,7 +72,7 @@ import { MappingClass } from '../../../../../../metamodels/pure/packageableEleme
 import { LocalMappingPropertyInfo } from '../../../../../../metamodels/pure/packageableElements/mapping/LocalMappingPropertyInfo';
 import type { AggregationAwareSetImplementation } from '../../../../../../metamodels/pure/packageableElements/mapping/aggregationAware/AggregationAwareSetImplementation';
 import { AggregationAwarePropertyMapping } from '../../../../../../metamodels/pure/packageableElements/mapping/aggregationAware/AggregationAwarePropertyMapping';
-import { V1_resolvePathsInRawLambda } from './helpers/V1_ValueSpecificationPathResolver';
+import { V1_buildRawLambdaWithResolvedPaths } from './helpers/V1_ValueSpecificationPathResolver';
 import {
   V1_deserializeRelationalOperationElement,
   V1_serializeRelationalOperationElement,
@@ -92,8 +89,15 @@ import type { AbstractProperty } from '../../../../../../metamodels/pure/package
 import { BindingTransformer } from '../../../../../../metamodels/pure/packageableElements/externalFormat/store/DSLExternalFormat_BindingTransformer';
 import type { Mapping } from '../../../../../../metamodels/pure/packageableElements/mapping/Mapping';
 import { V1_resolveBinding } from './V1_DSLExternalFormat_GraphBuilderHelper';
+import { TEMPORARY__UnresolvedSetImplementation } from '../../../../../../metamodels/pure/packageableElements/mapping/TEMPORARY__UnresolvedSetImplementation';
 
-/* @MARKER: RELAXED GRAPH CHECK - See https://github.com/finos/legend-studio/issues/880 */
+/**
+ * This test is skipped because we want to temporarily relax graph building algorithm
+ * to ease Pure -> Legend migration push.
+ * See https://github.com/finos/legend-studio/issues/880
+ *
+ * @discrepancy graph-building
+ */
 const TEMPORARY__getClassMappingByIdOrReturnUnresolved = (
   mapping: Mapping,
   id: string,
@@ -220,7 +224,6 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
             protocol.target,
           );
       } else {
-        /* @MARKER: ACTION ANALYTICS */
         // NOTE: if no there is one non-root class mapping, auto-nominate that as the target set implementation
         const setImplementation = getClassMappingsByClass(
           topParent.parent,
@@ -241,7 +244,11 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
     const purePropertyMapping = new PurePropertyMapping(
       topParent,
       property,
-      V1_resolvePathsInRawLambda(this.context, [], protocol.transform.body),
+      V1_buildRawLambdaWithResolvedPaths(
+        [],
+        protocol.transform.body,
+        this.context,
+      ),
       sourceSetImplementation ?? topParent,
       targetSetImplementation,
       protocol.explodeProperty,
@@ -322,7 +329,11 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
         ),
         property,
       ),
-      V1_resolvePathsInRawLambda(this.context, [], protocol.transform.body),
+      V1_buildRawLambdaWithResolvedPaths(
+        [],
+        protocol.transform.body,
+        this.context,
+      ),
       sourceSetImplementation,
       targetSetImplementation,
     );
@@ -834,10 +845,10 @@ export class V1_ProtocolToMetaModelPropertyMappingBuilder
       guaranteeNonNullable(sourceSetImplementation),
       targetSetImplementation,
     );
-    xStorePropertyMapping.crossExpression = V1_resolvePathsInRawLambda(
-      this.context,
+    xStorePropertyMapping.crossExpression = V1_buildRawLambdaWithResolvedPaths(
       protocol.crossExpression.parameters,
       protocol.crossExpression.body,
+      this.context,
     );
     return xStorePropertyMapping;
   }

package/src/models/protocols/pure/v1/transformation/pureGraph/to/V1_ProtocolToMetaModelRawValueSpecificationBuilder.ts

@@ -21,8 +21,8 @@ import type { V1_GraphBuilderContext } from '../../../transformation/pureGraph/t
 import type { V1_RawValueSpecificationVisitor } from '../../../model/rawValueSpecification/V1_RawValueSpecification';
 import type { V1_RawLambda } from '../../../model/rawValueSpecification/V1_RawLambda';
 import type { V1_RawVariable } from '../../../model/rawValueSpecification/V1_RawVariable';
-import type { V1_RawInstanceValue } from '../../../model/rawValueSpecification/V1_RawInstanceValue';
-import { RawInstanceValue } from '../../../../../../metamodels/pure/rawValueSpecification/RawInstanceValue';
+import type { V1_RawPrimitiveInstanceValue } from '../../../model/rawValueSpecification/V1_RawPrimitiveInstanceValue';
+import { RawPrimitiveInstanceValue } from '../../../../../../metamodels/pure/rawValueSpecification/RawPrimitiveInstanceValue';
 
 export class V1_ProtocolToMetaModelRawValueSpecificationBuilder
   implements V1_RawValueSpecificationVisitor<RawValueSpecification>
@@ -53,14 +53,18 @@ export class V1_ProtocolToMetaModelRawValueSpecificationBuilder
     );
   }
 
-  visit_InstanceValue(
-    valueSpecification: V1_RawInstanceValue,
+  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 RawInstanceValue(type, multiplicity, valueSpecification.values);
+    return new RawPrimitiveInstanceValue(
+      type,
+      multiplicity,
+      valueSpecification.values,
+    );
   }
 }

package/src/models/protocols/pure/v1/transformation/pureGraph/to/helpers/V1_AggregationAwareClassMappingBuilderHelper.ts

@@ -26,17 +26,17 @@ import { GroupByFunctionSpecification } from '../../../../../../../metamodels/pu
 import { AggregationFunctionSpecification } from '../../../../../../../metamodels/pure/packageableElements/mapping/aggregationAware/AggregationFunctionSpecification';
 import type { V1_AggregateFunction } from '../../../../model/packageableElements/store/relational/mapping/aggregationAware/V1_AggregateFunction';
 import { V1_ProtocolToMetaModelClassMappingFirstPassBuilder } from '../V1_ProtocolToMetaModelClassMappingFirstPassBuilder';
-import { V1_resolvePathsInRawLambda } from './V1_ValueSpecificationPathResolver';
+import { V1_buildRawLambdaWithResolvedPaths } from './V1_ValueSpecificationPathResolver';
 
 const buildGroupByFunction = (
   groupByFunction: V1_GroupByFunction,
   context: V1_GraphBuilderContext,
 ): GroupByFunctionSpecification => {
   const groupByFunctionSpecification = new GroupByFunctionSpecification(
-    V1_resolvePathsInRawLambda(
-      context,
+    V1_buildRawLambdaWithResolvedPaths(
       groupByFunction.groupByFn.parameters,
       groupByFunction.groupByFn.body,
+      context,
     ),
   );
 
@@ -47,15 +47,15 @@ const buildAggregateFunction = (
   aggregationFunction: V1_AggregateFunction,
   context: V1_GraphBuilderContext,
 ): AggregationFunctionSpecification => {
-  const mapFn = V1_resolvePathsInRawLambda(
-    context,
+  const mapFn = V1_buildRawLambdaWithResolvedPaths(
     aggregationFunction.mapFn.parameters,
     aggregationFunction.mapFn.body,
-  );
-  const aggregateFn = V1_resolvePathsInRawLambda(
     context,
+  );
+  const aggregateFn = V1_buildRawLambdaWithResolvedPaths(
     aggregationFunction.aggregateFn.parameters,
     aggregationFunction.aggregateFn.body,
+    context,
   );
   return new AggregationFunctionSpecification(mapFn, aggregateFn);
 };

package/src/models/protocols/pure/v1/transformation/pureGraph/to/helpers/V1_DataElementBuilderHelper.ts

@@ -0,0 +1,93 @@
+/**
+ * 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 { UnsupportedOperationError } from '@finos/legend-shared';
+import {
+  type EmbeddedData,
+  DataElementReference,
+  ExternalFormatData,
+  ModelStoreData,
+} from '../../../../../../../metamodels/pure/data/EmbeddedData';
+import type { Class } from '../../../../../../../metamodels/pure/packageableElements/domain/Class';
+import type { DSLData_PureProtocolProcessorPlugin_Extension } from '../../../../../DSLData_PureProtocolProcessorPlugin_Extension';
+import type {
+  V1_DataElementReference,
+  V1_EmbeddedData,
+  V1_EmbeddedDataVisitor,
+  V1_ExternalFormatData,
+  V1_ModelStoreData,
+} from '../../../../model/data/V1_EmbeddedData';
+
+import type { V1_GraphBuilderContext } from '../V1_GraphBuilderContext';
+
+export class V1_ProtocolToMetaModelEmbeddedDataBuilder
+  implements V1_EmbeddedDataVisitor<EmbeddedData>
+{
+  context: V1_GraphBuilderContext;
+
+  constructor(context: V1_GraphBuilderContext) {
+    this.context = context;
+  }
+
+  visit_EmbeddedData(embeddedData: V1_EmbeddedData): EmbeddedData {
+    const extraEmbeddedDataBuilders = this.context.extensions.plugins.flatMap(
+      (plugin) =>
+        (
+          plugin as DSLData_PureProtocolProcessorPlugin_Extension
+        ).V1_getExtraEmbeddedDataBuilders?.() ?? [],
+    );
+    for (const builder of extraEmbeddedDataBuilders) {
+      const metamodel = builder(embeddedData, this.context);
+      if (metamodel) {
+        return metamodel;
+      }
+    }
+
+    throw new UnsupportedOperationError(
+      `Can't build embedded data: no compatible builder available from plugins`,
+      embeddedData,
+    );
+  }
+
+  visit_ExternalFormatData(
+    externalFormatData: V1_ExternalFormatData,
+  ): EmbeddedData {
+    const metamodel = new ExternalFormatData();
+    metamodel.contentType = externalFormatData.contentType;
+    metamodel.data = externalFormatData.data;
+    return metamodel;
+  }
+
+  visit_ModelStoreData(modelStoreData: V1_ModelStoreData): EmbeddedData {
+    const metamodel = new ModelStoreData();
+    const instances = new Map<Class, object>();
+    Array.from(modelStoreData.instances.entries()).forEach((e) =>
+      instances.set(this.context.graph.getClass(e[0]), e[1]),
+    );
+    metamodel.instances = instances;
+    return metamodel;
+  }
+
+  visit_DataElementReference(
+    dataElementReference: V1_DataElementReference,
+  ): EmbeddedData {
+    const metamodel = new DataElementReference();
+    metamodel.dataElement = this.context.resolveDataElement(
+      dataElementReference.dataElement,
+    );
+    return metamodel;
+  }
+}