@finos/legend-graph 10.1.0 → 11.0.0

package/src/models/protocols/pure/v1/transformation/pureGraph/from/V1_MappingTransformer.ts

@@ -235,7 +235,7 @@ export const V1_getObjectInputType = (type: string): V1_ObjectInputType => {
       return V1_ObjectInputType.XML;
     default:
       throw new UnsupportedOperationError(
-        `Encountered unsupproted object input type '${type}'`,
+        `Encountered unsupported object input type '${type}'`,
       );
   }
 };
@@ -344,7 +344,6 @@ const transformClassMappingPropertyMappings = (
   values: PropertyMapping[],
   isTransformingEmbeddedPropertyMapping: boolean,
   context: V1_GraphTransformerContext,
-  isTransformingSourceId: boolean,
 ): V1_PropertyMapping[] =>
   values
     .filter((value) => {
@@ -374,7 +373,6 @@ const transformClassMappingPropertyMappings = (
         value,
         isTransformingEmbeddedPropertyMapping,
         context,
-        isTransformingSourceId,
       ),
     );
 
@@ -384,12 +382,14 @@ const transformSimpleFlatDataPropertyMapping = (
 ): V1_FlatDataPropertyMapping => {
   const flatDataPropertyMapping = new V1_FlatDataPropertyMapping();
   flatDataPropertyMapping.enumMappingId =
-    element.transformer.valueForSerialization;
+    element.transformer?.valueForSerialization;
   flatDataPropertyMapping.property = V1_transformPropertyReference(
     element.property,
   );
-  flatDataPropertyMapping.source = element.sourceSetImplementation.id.value;
-  flatDataPropertyMapping.target = element.targetSetImplementation?.id.value;
+  flatDataPropertyMapping.source =
+    element.sourceSetImplementation.valueForSerialization;
+  flatDataPropertyMapping.target =
+    element.targetSetImplementation?.valueForSerialization;
   if (!isStubbed_RawLambda(element.transform)) {
     flatDataPropertyMapping.transform =
       element.transform.accept_RawValueSpecificationVisitor(
@@ -414,11 +414,10 @@ const transformEmbeddedFlatDataPropertyMapping = (
     element.propertyMappings,
     false, // TODO: we might ned to turn this on in the future once we start working on the gramar roundtrip for flat-data
     context,
-    false,
   );
   embedded.root = false;
-  embedded.source = element.sourceSetImplementation.id.value;
-  embedded.target = element.targetSetImplementation?.id.value;
+  embedded.source = element.sourceSetImplementation.valueForSerialization;
+  embedded.target = element.targetSetImplementation?.valueForSerialization;
   return embedded;
 };
 
@@ -427,23 +426,18 @@ const transformPurePropertyMapping = (
   context: V1_GraphTransformerContext,
 ): V1_PurePropertyMapping => {
   const purePropertyMapping = new V1_PurePropertyMapping();
-  purePropertyMapping.enumMappingId = element.transformer.valueForSerialization;
+  purePropertyMapping.enumMappingId =
+    element.transformer?.valueForSerialization;
   purePropertyMapping.property = V1_transformPropertyReference(
     element.property,
     {
       isTransformingLocalPropertyMapping: Boolean(element.localMappingProperty),
     },
   );
-  /**
-   * Omit this information during protocol transformation as it can be
-   * interpreted while building the graph; and will help grammar-roundtrip
-   * tests (involving engine) to pass. Ideally, this requires grammar parser
-   * and composer in engine to be more consistent.
-   *
-   * @discrepancy grammar-roundtrip
-   */
-  purePropertyMapping.source = '';
-  purePropertyMapping.target = element.targetSetImplementation?.id.value;
+  purePropertyMapping.source =
+    element.sourceSetImplementation.valueForSerialization;
+  purePropertyMapping.target =
+    element.targetSetImplementation?.valueForSerialization;
   if (!isStubbed_RawLambda(element.transform)) {
     purePropertyMapping.transform =
       element.transform.accept_RawValueSpecificationVisitor(
@@ -463,10 +457,9 @@ const transformRelationalPropertyMapping = (
   element: RelationalPropertyMapping,
   isTransformingEmbeddedPropertyMapping: boolean,
   context: V1_GraphTransformerContext,
-  isTransformingSourceId: boolean,
 ): V1_RelationalPropertyMapping => {
   const propertyMapping = new V1_RelationalPropertyMapping();
-  propertyMapping.enumMappingId = element.transformer.valueForSerialization;
+  propertyMapping.enumMappingId = element.transformer?.valueForSerialization;
   propertyMapping.property = V1_transformPropertyReference(element.property, {
     isTransformingEmbeddedPropertyMapping:
       isTransformingEmbeddedPropertyMapping,
@@ -483,19 +476,10 @@ const transformRelationalPropertyMapping = (
           element.relationalOperation as Record<PropertyKey, unknown>,
         )
   ) as V1_RawRelationalOperationElement;
-  // NOTE: isTransformingSourceId is needed for the roundtrip of association relational property mapping
-  propertyMapping.source = isTransformingSourceId
-    ? element.sourceSetImplementation.id.value
-    : /**
-       * Omit this information during protocol transformation as it can be
-       * interpreted while building the graph; and will help grammar-roundtrip
-       * tests (involving engine) to pass. Ideally, this requires grammar parser
-       * and composer in engine to be more consistent.
-       *
-       * @discrepancy grammar-roundtrip
-       */
-      undefined;
-  propertyMapping.target = element.targetSetImplementation?.id.value;
+  propertyMapping.source =
+    element.sourceSetImplementation.valueForSerialization;
+  propertyMapping.target =
+    element.targetSetImplementation?.valueForSerialization;
   if (element.bindingTransformer?.binding) {
     const bindingTransformer = new V1_BindingTransformer();
     bindingTransformer.binding = guaranteeNonEmptyString(
@@ -521,16 +505,8 @@ const transformEmbeddedRelationalPropertyMapping = (
     isTransformingEmbeddedPropertyMapping:
       isTransformingEmbeddedPropertyMapping,
   });
-  /**
-   * Omit this information during protocol transformation as it can be
-   * interpreted while building the graph; and will help grammar-roundtrip
-   * tests (involving engine) to pass. Ideally, this requires grammar parser
-   * and composer in engine to be more consistent.
-   *
-   * @discrepancy grammar-roundtrip
-   */
-  embedded.source = undefined;
-  embedded.target = element.targetSetImplementation?.id.value;
+  embedded.source = element.sourceSetImplementation.valueForSerialization;
+  embedded.target = element.targetSetImplementation?.valueForSerialization;
   const classMapping = new V1_RelationalClassMapping();
   classMapping.primaryKey = element.primaryKey.map((pk) =>
     V1_transformRelationalOperationElement(pk, context),
@@ -539,7 +515,6 @@ const transformEmbeddedRelationalPropertyMapping = (
     element.propertyMappings,
     true,
     context,
-    false,
   );
   classMapping.root = element.root.valueForSerialization;
   /**
@@ -569,16 +544,8 @@ const transformInlineEmbeddedRelationalPropertyMapping = (
     isTransformingEmbeddedPropertyMapping:
       isTransformingEmbeddedPropertyMapping,
   });
-  /**
-   * Omit this information during protocol transformation as it can be
-   * interpreted while building the graph; and will help grammar-roundtrip
-   * tests (involving engine) to pass. Ideally, this requires grammar parser
-   * and composer in engine to be more consistent.
-   *
-   * @discrepancy grammar-roundtrip
-   */
-  embedded.source = undefined;
-  embedded.target = element.targetSetImplementation?.id.value;
+  embedded.source = element.sourceSetImplementation.valueForSerialization;
+  embedded.target = element.targetSetImplementation?.valueForSerialization;
   embedded.setImplementationId = element.inlineSetImplementation.id.value;
   if (element.localMappingProperty) {
     embedded.localMappingProperty = transformLocalPropertyInfo(
@@ -598,16 +565,8 @@ const transformOtherwiseEmbeddedRelationalPropertyMapping = (
     isTransformingEmbeddedPropertyMapping:
       isTransformingEmbeddedPropertyMapping,
   });
-  /**
-   * Omit this information during protocol transformation as it can be
-   * interpreted while building the graph; and will help grammar-roundtrip
-   * tests (involving engine) to pass. Ideally, this requires grammar parser
-   * and composer in engine to be more consistent.
-   *
-   * @discrepancy grammar-roundtrip
-   */
-  embedded.source = undefined;
-  embedded.target = element.targetSetImplementation?.id.value;
+  embedded.source = element.sourceSetImplementation.valueForSerialization;
+  embedded.target = element.targetSetImplementation?.valueForSerialization;
   const classMapping = new V1_RelationalClassMapping();
   classMapping.primaryKey = element.primaryKey.map((pk) =>
     V1_transformRelationalOperationElement(pk, context),
@@ -616,7 +575,6 @@ const transformOtherwiseEmbeddedRelationalPropertyMapping = (
     element.propertyMappings,
     true,
     context,
-    false,
   );
   classMapping.root = element.root.valueForSerialization;
   /**
@@ -633,7 +591,6 @@ const transformOtherwiseEmbeddedRelationalPropertyMapping = (
     element.otherwisePropertyMapping,
     true,
     context,
-    false,
   ) as V1_RelationalPropertyMapping;
   // use the same property as the parent otherwise
   embedded.otherwisePropertyMapping.property = embedded.property;
@@ -651,8 +608,8 @@ const transformXStorePropertyMapping = (
 ): V1_XStorePropertyMapping => {
   const xstore = new V1_XStorePropertyMapping();
   xstore.property = V1_transformPropertyReference(element.property);
-  xstore.source = element.sourceSetImplementation.id.value;
-  xstore.target = element.targetSetImplementation?.id.value;
+  xstore.source = element.sourceSetImplementation.valueForSerialization;
+  xstore.target = element.targetSetImplementation?.valueForSerialization;
   if (!isStubbed_RawLambda(element.crossExpression)) {
     xstore.crossExpression =
       element.crossExpression.accept_RawValueSpecificationVisitor(
@@ -672,8 +629,10 @@ const transformAggregationAwarePropertyMapping = (
 ): V1_AggregationAwarePropertyMapping => {
   const propertyMapping = new V1_AggregationAwarePropertyMapping();
   propertyMapping.property = V1_transformPropertyReference(element.property);
-  propertyMapping.source = element.sourceSetImplementation.id.value;
-  propertyMapping.target = element.targetSetImplementation?.id.value;
+  propertyMapping.source =
+    element.sourceSetImplementation.valueForSerialization;
+  propertyMapping.target =
+    element.targetSetImplementation?.valueForSerialization;
   if (element.localMappingProperty) {
     propertyMapping.localMappingProperty = transformLocalPropertyInfo(
       element.localMappingProperty,
@@ -686,18 +645,15 @@ class PropertyMappingTransformer
   implements PropertyMappingVisitor<V1_PropertyMapping>
 {
   isTransformingEmbeddedPropertyMapping = false;
-  isTransformingSourceId = false;
   context: V1_GraphTransformerContext;
 
   constructor(
     isTransformingEmbeddedPropertyMapping: boolean,
     context: V1_GraphTransformerContext,
-    isTransformingSourceId: boolean,
   ) {
     this.isTransformingEmbeddedPropertyMapping =
       isTransformingEmbeddedPropertyMapping;
     this.context = context;
-    this.isTransformingSourceId = isTransformingSourceId;
   }
 
   visit_PropertyMapping(propertyMapping: PropertyMapping): V1_PropertyMapping {
@@ -750,7 +706,6 @@ class PropertyMappingTransformer
       propertyMapping,
       this.isTransformingEmbeddedPropertyMapping,
       this.context,
-      this.isTransformingSourceId,
     );
   }
   visit_EmbeddedRelationalPropertyMapping(
@@ -862,11 +817,10 @@ const transformPureInstanceSetImplementation = (
     element.propertyMappings,
     true,
     context,
-    false,
   );
   classMapping.extendsClassMappingId = element.superSetImplementationId;
   classMapping.root = element.root.valueForSerialization;
-  classMapping.srcClass = element.srcClass.valueForSerialization;
+  classMapping.srcClass = element.srcClass?.valueForSerialization;
   return classMapping;
 };
 
@@ -888,7 +842,6 @@ const transformFlatDataInstanceSetImpl = (
     element.propertyMappings,
     true,
     context,
-    false,
   );
   classMapping.root = element.root.valueForSerialization;
   classMapping.extendsClassMappingId = element.superSetImplementationId;
@@ -934,7 +887,6 @@ const transformRootRelationalSetImpl = (
     element.propertyMappings,
     false,
     context,
-    false,
   );
   classMapping.root = element.root.valueForSerialization;
   return classMapping;
@@ -953,7 +905,6 @@ const transformRelationalInstanceSetImpl = (
     element.propertyMappings,
     true,
     context,
-    false,
   );
   classMapping.root = element.root.valueForSerialization;
   /**
@@ -1054,7 +1005,6 @@ const transformAggregationAwareSetImplementation = (
     element.propertyMappings,
     false,
     context,
-    false,
   );
   classMapping.extendsClassMappingId = element.superSetImplementationId;
   classMapping.aggregateSetImplementations =
@@ -1069,13 +1019,11 @@ function transformProperyMapping(
   propertyMapping: PropertyMapping,
   isTransformingEmbeddedPropertyMapping: boolean,
   context: V1_GraphTransformerContext,
-  isTransformingSourceId: boolean,
 ): V1_PropertyMapping {
   return propertyMapping.accept_PropertyMappingVisitor(
     new PropertyMappingTransformer(
       isTransformingEmbeddedPropertyMapping,
       context,
-      isTransformingSourceId,
     ),
   );
 }
@@ -1212,7 +1160,6 @@ const transformRelationalAssociationImplementation = (
     element.propertyMappings,
     true,
     context,
-    true,
   );
   relationalMapping.id = mappingElementIdSerializer(element.id);
   return relationalMapping;
@@ -1231,7 +1178,6 @@ const transformXStorelAssociationImplementation = (
     element.propertyMappings,
     false,
     context,
-    false,
   );
   xStoreMapping.id = mappingElementIdSerializer(element.id);
   return xStoreMapping;

package/src/models/protocols/pure/v1/transformation/pureGraph/from/V1_ValueSpecificationTransformer.ts

@@ -428,7 +428,7 @@ export function V1_transformGraphFetchTree(
       ),
     );
     _propertyGraphTree.property = value.property.value.name;
-    _propertyGraphTree.subType = value.subType.value?.path;
+    _propertyGraphTree.subType = value.subType?.value.path;
     _propertyGraphTree.subTrees = value.subTrees.map((e) =>
       V1_transformGraphFetchTree(
         e,

package/src/models/protocols/pure/v1/transformation/pureGraph/to/{V1_ProtocolToMetaModelClassMappingFirstPassBuilder.ts → V1_ClassMappingFirstPassBuilder.ts}

@@ -30,7 +30,7 @@ import { PureInstanceSetImplementation } from '../../../../../../metamodels/pure
 import { FlatDataInstanceSetImplementation } from '../../../../../../metamodels/pure/packageableElements/store/flatData/mapping/FlatDataInstanceSetImplementation.js';
 import { RootRelationalInstanceSetImplementation } from '../../../../../../metamodels/pure/packageableElements/store/relational/mapping/RootRelationalInstanceSetImplementation.js';
 import { InferableMappingElementRootExplicitValue } from '../../../../../../metamodels/pure/packageableElements/mapping/InferableMappingElementRoot.js';
-import type { V1_GraphBuilderContext } from '../../../transformation/pureGraph/to/V1_GraphBuilderContext.js';
+import type { V1_GraphBuilderContext } from './V1_GraphBuilderContext.js';
 import type {
   V1_ClassMappingVisitor,
   V1_ClassMapping,
@@ -41,13 +41,12 @@ import type { V1_RelationalClassMapping } from '../../../model/packageableElemen
 import type { V1_RootFlatDataClassMapping } from '../../../model/packageableElements/store/flatData/mapping/V1_RootFlatDataClassMapping.js';
 import type { V1_RootRelationalClassMapping } from '../../../model/packageableElements/store/relational/mapping/V1_RootRelationalClassMapping.js';
 import type { V1_AggregationAwareClassMapping } from '../../../model/packageableElements/store/relational/mapping/aggregationAware/V1_AggregationAwareClassMapping.js';
-import { V1_getInferredClassMappingId } from '../../../transformation/pureGraph/to/helpers/V1_MappingBuilderHelper.js';
+import { V1_getInferredClassMappingId } from './helpers/V1_MappingBuilderHelper.js';
 import { AggregationAwareSetImplementation } from '../../../../../../metamodels/pure/packageableElements/mapping/aggregationAware/AggregationAwareSetImplementation.js';
 import type { InstanceSetImplementation } from '../../../../../../metamodels/pure/packageableElements/mapping/InstanceSetImplementation.js';
 import { V1_buildAggregateContainer } from './helpers/V1_AggregationAwareClassMappingBuilderHelper.js';
 import { V1_buildRawLambdaWithResolvedPaths } from './helpers/V1_ValueSpecificationPathResolver.js';
 import { V1_buildRelationalMappingFilter } from './helpers/V1_RelationalClassMappingBuilderHelper.js';
-import { optionalizePackageableElementReference } from '../../../../../../metamodels/pure/packageableElements/PackageableElementReference.js';
 import type { DSLMapping_PureProtocolProcessorPlugin_Extension } from '../../../../DSLMapping_PureProtocolProcessorPlugin_Extension.js';
 import type { V1_MergeOperationClassMapping } from '../../../model/packageableElements/mapping/V1_MergeOperationClassMapping.js';
 import { MergeOperationSetImplementation } from '../../../../../../metamodels/pure/packageableElements/mapping/MergeOperationSetImplementation.js';
@@ -55,10 +54,10 @@ import { MergeOperationSetImplementation } from '../../../../../../metamodels/pu
 const getClassMappingOperationType = (value: string): OperationType =>
   guaranteeNonNullable(
     Object.values(OperationType).find((type) => type === value),
-    `Encountered unsupproted class mapping operation type '${value}'`,
+    `Encountered unsupported class mapping operation type '${value}'`,
   );
 
-export class V1_ProtocolToMetaModelClassMappingFirstPassBuilder
+export class V1_ClassMappingFirstPassBuilder
   implements V1_ClassMappingVisitor<SetImplementation>
 {
   context: V1_GraphBuilderContext;
@@ -167,7 +166,7 @@ export class V1_ProtocolToMetaModelClassMappingFirstPassBuilder
       this.parent,
       targetClass,
       InferableMappingElementRootExplicitValue.create(classMapping.root),
-      optionalizePackageableElementReference(srcClassReference),
+      srcClassReference,
     );
     pureInstanceSetImplementation.filter = classMapping.filter
       ? V1_buildRawLambdaWithResolvedPaths(
@@ -262,10 +261,7 @@ export class V1_ProtocolToMetaModelClassMappingFirstPassBuilder
         targetClass,
         InferableMappingElementRootExplicitValue.create(classMapping.root),
         classMapping.mainSetImplementation.accept_ClassMappingVisitor(
-          new V1_ProtocolToMetaModelClassMappingFirstPassBuilder(
-            this.context,
-            mapping,
-          ),
+          new V1_ClassMappingFirstPassBuilder(this.context, mapping),
         ) as InstanceSetImplementation,
       );
     aggragetionAwareInstanceSetImplementation.aggregateSetImplementations =

package/src/models/protocols/pure/v1/transformation/pureGraph/to/{V1_ProtocolToMetaModelClassMappingSecondPassBuilder.ts → V1_ClassMappingSecondPassBuilder.ts}

@@ -51,14 +51,13 @@ import type {
 import type { V1_OperationClassMapping } from '../../../model/packageableElements/mapping/V1_OperationClassMapping.js';
 import type { V1_PureInstanceClassMapping } from '../../../model/packageableElements/store/modelToModel/mapping/V1_PureInstanceClassMapping.js';
 import type { V1_RelationalClassMapping } from '../../../model/packageableElements/store/relational/mapping/V1_RelationalClassMapping.js';
-import { V1_ProtocolToMetaModelPropertyMappingBuilder } from './V1_ProtocolToMetaModelPropertyMappingBuilder.js';
+import { V1_PropertyMappingBuilder } from './V1_PropertyMappingBuilder.js';
 import type { V1_RootFlatDataClassMapping } from '../../../model/packageableElements/store/flatData/mapping/V1_RootFlatDataClassMapping.js';
 import type { V1_RootRelationalClassMapping } from '../../../model/packageableElements/store/relational/mapping/V1_RootRelationalClassMapping.js';
 import type { V1_AggregationAwareClassMapping } from '../../../model/packageableElements/store/relational/mapping/aggregationAware/V1_AggregationAwareClassMapping.js';
 import { V1_getInferredClassMappingId } from './helpers/V1_MappingBuilderHelper.js';
 import { AggregationAwareSetImplementation } from '../../../../../../metamodels/pure/packageableElements/mapping/aggregationAware/AggregationAwareSetImplementation.js';
 import type { V1_AggregateSetImplementationContainer } from '../../../model/packageableElements/store/relational/mapping/aggregationAware/V1_AggregateSetImplementationContainer.js';
-import { PackageableElementImplicitReference } from '../../../../../../metamodels/pure/packageableElements/PackageableElementReference.js';
 import {
   extractClassMappingsFromAggregationAwareClassMappings,
   getAllClassMappings,
@@ -68,7 +67,7 @@ import {
 import type { DSLMapping_PureProtocolProcessorPlugin_Extension } from '../../../../DSLMapping_PureProtocolProcessorPlugin_Extension.js';
 import type { V1_MergeOperationClassMapping } from '../../../model/packageableElements/mapping/V1_MergeOperationClassMapping.js';
 
-export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
+export class V1_ClassMappingSecondPassBuilder
   implements V1_ClassMappingVisitor<void>
 {
   context: V1_GraphBuilderContext;
@@ -125,8 +124,8 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
         }
         return new SetImplementationContainer(
           SetImplementationImplicitReference.create(
-            PackageableElementImplicitReference.create(this.parent, ''),
             setImplementation,
+            undefined,
           ),
         );
       })
@@ -166,7 +165,7 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
     pureInstanceSetImplementation.propertyMappings =
       classMapping.propertyMappings.map((propertyMapping) =>
         propertyMapping.accept_PropertyMappingVisitor(
-          new V1_ProtocolToMetaModelPropertyMappingBuilder(
+          new V1_PropertyMappingBuilder(
             this.context,
             pureInstanceSetImplementation,
             pureInstanceSetImplementation,
@@ -200,7 +199,7 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
     flatDataInstanceSetImplementation.propertyMappings =
       classMapping.propertyMappings.map((propertyMapping) =>
         propertyMapping.accept_PropertyMappingVisitor(
-          new V1_ProtocolToMetaModelPropertyMappingBuilder(
+          new V1_PropertyMappingBuilder(
             this.context,
             flatDataInstanceSetImplementation,
             flatDataInstanceSetImplementation,
@@ -258,7 +257,7 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
       rootRelationalInstanceSetImplementation.groupBy = groupBy;
     }
     const embedded: EmbeddedRelationalInstanceSetImplementation[] = [];
-    const tableAliasMap = new Map<string, TableAlias>();
+    const tableAliasIndex = new Map<string, TableAlias>();
     V1_buildRelationalClassMapping(
       classMapping,
       this.context,
@@ -267,16 +266,16 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
       this.parent,
       embedded,
       getAllEnumerationMappings(this.parent),
-      tableAliasMap,
+      tableAliasIndex,
     );
     // TODO filterMapping
     // NOTE: why are we adding embedded relational property mappings to class mapping in the backend????
     if (!mainTableAlias && !classMapping.extendsClassMappingId) {
       const tables = new Set(
-        Array.from(tableAliasMap.values()).map((e) => e.relation),
+        Array.from(tableAliasIndex.values()).map((e) => e.relation),
       );
       const dbs = new Set(
-        Array.from(tableAliasMap.values()).map(
+        Array.from(tableAliasIndex.values()).map(
           (e) => e.relation.value.schema._OWNER,
         ),
       );
@@ -328,16 +327,13 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
     }
     const mapping = this.context.graph.getMapping(this.parent.path);
     classMapping.mainSetImplementation.accept_ClassMappingVisitor(
-      new V1_ProtocolToMetaModelClassMappingSecondPassBuilder(
-        this.context,
-        mapping,
-      ),
+      new V1_ClassMappingSecondPassBuilder(this.context, mapping),
     );
 
     aggragetionAwareInstanceSetImplementation.propertyMappings =
       classMapping.propertyMappings.map((propertyMapping) =>
         propertyMapping.accept_PropertyMappingVisitor(
-          new V1_ProtocolToMetaModelPropertyMappingBuilder(
+          new V1_PropertyMappingBuilder(
             this.context,
             aggragetionAwareInstanceSetImplementation,
             aggragetionAwareInstanceSetImplementation,
@@ -356,10 +352,7 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
     classMapping.aggregateSetImplementations.forEach(
       (aggregateSetImpl: V1_AggregateSetImplementationContainer) =>
         aggregateSetImpl.setImplementation.accept_ClassMappingVisitor(
-          new V1_ProtocolToMetaModelClassMappingSecondPassBuilder(
-            this.context,
-            mapping,
-          ),
+          new V1_ClassMappingSecondPassBuilder(this.context, mapping),
         ),
     );
 

package/src/models/protocols/pure/v1/transformation/pureGraph/to/{V1_ProtocolToMetaModelGraphFifthPassBuilder.ts → V1_ElementFifthPassBuilder.ts}

@@ -45,7 +45,7 @@ import { V1_buildDatabaseSchemaViewsSecondPass } from './helpers/V1_DatabaseBuil
 import type { V1_SectionIndex } from '../../../model/packageableElements/section/V1_SectionIndex.js';
 import type { V1_DataElement } from '../../../model/packageableElements/data/V1_DataElement.js';
 
-export class V1_ProtocolToMetaModelGraphFifthPassBuilder
+export class V1_ElementFifthPassBuilder
   implements V1_PackageableElementVisitor<void>
 {
   context: V1_GraphBuilderContext;

package/src/models/protocols/pure/v1/transformation/pureGraph/to/{V1_ProtocolToMetaModelGraphFirstPassBuilder.ts → V1_ElementFirstPassBuilder.ts}

@@ -68,7 +68,7 @@ import type { Package } from '../../../../../../metamodels/pure/packageableEleme
 import type { V1_DataElement } from '../../../model/packageableElements/data/V1_DataElement.js';
 import { DataElement } from '../../../../../../metamodels/pure/packageableElements/data/DataElement.js';
 
-export class V1_ProtocolToMetaModelGraphFirstPassBuilder
+export class V1_ElementFirstPassBuilder
   implements V1_PackageableElementVisitor<PackageableElement>
 {
   context: V1_GraphBuilderContext;

package/src/models/protocols/pure/v1/transformation/pureGraph/to/{V1_ProtocolToMetaModelGraphFourthPassBuilder.ts → V1_ElementFourthPassBuilder.ts}

@@ -32,7 +32,7 @@ import type { V1_FlatData } from '../../../model/packageableElements/store/flatD
 import type { V1_Database } from '../../../model/packageableElements/store/relational/model/V1_Database.js';
 import type { V1_Mapping } from '../../../model/packageableElements/mapping/V1_Mapping.js';
 import type { V1_Service } from '../../../model/packageableElements/service/V1_Service.js';
-import { V1_ProtocolToMetaModelClassMappingSecondPassBuilder } from './V1_ProtocolToMetaModelClassMappingSecondPassBuilder.js';
+import { V1_ClassMappingSecondPassBuilder } from './V1_ClassMappingSecondPassBuilder.js';
 import {
   V1_buildMappingTest,
   V1_resolveClassMappingRoot,
@@ -51,7 +51,7 @@ import { V1_buildAssociationMapping } from './helpers/V1_AssociationMappingHelpe
 import { V1_buildMilestoningProperties } from './helpers/V1_MilestoneBuilderHelper.js';
 import type { V1_DataElement } from '../../../model/packageableElements/data/V1_DataElement.js';
 
-export class V1_ProtocolToMetaModelGraphFourthPassBuilder
+export class V1_ElementFourthPassBuilder
   implements V1_PackageableElementVisitor<void>
 {
   context: V1_GraphBuilderContext;
@@ -123,10 +123,7 @@ export class V1_ProtocolToMetaModelGraphFourthPassBuilder
     );
     element.classMappings.forEach((classMapping) =>
       classMapping.accept_ClassMappingVisitor(
-        new V1_ProtocolToMetaModelClassMappingSecondPassBuilder(
-          this.context,
-          mapping,
-        ),
+        new V1_ClassMappingSecondPassBuilder(this.context, mapping),
       ),
     );
     mapping.tests = element.tests.map((test) =>

package/src/models/protocols/pure/v1/transformation/pureGraph/to/{V1_ProtocolToMetaModelGraphSecondPassBuilder.ts → V1_ElementSecondPassBuilder.ts}

@@ -30,7 +30,7 @@ import { Enum } from '../../../../../../metamodels/pure/packageableElements/doma
 import {
   V1_buildFullPath,
   type V1_GraphBuilderContext,
-} from '../../../transformation/pureGraph/to/V1_GraphBuilderContext.js';
+} from './V1_GraphBuilderContext.js';
 import type { V1_GenerationSpecification } from '../../../model/packageableElements/generationSpecification/V1_GenerationSpecification.js';
 import type {
   V1_PackageableElement,
@@ -49,42 +49,42 @@ import {
   V1_buildVariable,
   V1_buildUnit,
   V1_buildTaggedValue,
-} from '../../../transformation/pureGraph/to/helpers/V1_DomainBuilderHelper.js';
+} from './helpers/V1_DomainBuilderHelper.js';
 import {
   V1_buildServiceExecution,
   V1_buildLegacyServiceTest,
-} from '../../../transformation/pureGraph/to/helpers/V1_ServiceBuilderHelper.js';
+} from './helpers/V1_ServiceBuilderHelper.js';
 import {
   V1_buildEnumerationMapping,
   V1_buildMappingInclude,
-} from '../../../transformation/pureGraph/to/helpers/V1_MappingBuilderHelper.js';
-import { V1_buildFlatDataSection } from '../../../transformation/pureGraph/to/helpers/V1_FlatDataStoreBuilderHelper.js';
-import { V1_buildSchema } from '../../../transformation/pureGraph/to/helpers/V1_DatabaseBuilderHelper.js';
+} from './helpers/V1_MappingBuilderHelper.js';
+import { V1_buildFlatDataSection } from './helpers/V1_FlatDataStoreBuilderHelper.js';
+import { V1_buildSchema } from './helpers/V1_DatabaseBuilderHelper.js';
 import {
   V1_buildConfigurationProperty,
   V1_buildScopeElement,
-} from '../../../transformation/pureGraph/to/helpers/V1_FileGenerationBuilderHelper.js';
-import { V1_buildEngineRuntime } from '../../../transformation/pureGraph/to/helpers/V1_RuntimeBuilderHelper.js';
+} from './helpers/V1_FileGenerationBuilderHelper.js';
+import { V1_buildEngineRuntime } from './helpers/V1_RuntimeBuilderHelper.js';
 import type { V1_PackageableRuntime } from '../../../model/packageableElements/runtime/V1_PackageableRuntime.js';
 import type { V1_PackageableConnection } from '../../../model/packageableElements/connection/V1_PackageableConnection.js';
-import { V1_ProtocolToMetaModelConnectionBuilder } from './V1_ProtocolToMetaModelConnectionBuilder.js';
+import { V1_buildConnection } from './helpers/V1_ConnectionBuilderHelper.js';
 import { V1_ConnectionPointer } from '../../../model/packageableElements/connection/V1_ConnectionPointer.js';
 import type { V1_FileGenerationSpecification } from '../../../model/packageableElements/fileGeneration/V1_FileGenerationSpecification.js';
 import {
   V1_buildGenerationTreeNode,
   V1_buildFileGenerationPointer,
-} from '../../../transformation/pureGraph/to/helpers/V1_GenerationSpecificationBuilderHelper.js';
+} from './helpers/V1_GenerationSpecificationBuilderHelper.js';
 import type { V1_Measure } from '../../../model/packageableElements/domain/V1_Measure.js';
 import type { V1_SectionIndex } from '../../../model/packageableElements/section/V1_SectionIndex.js';
-import { V1_buildSection } from '../../../transformation/pureGraph/to/helpers/V1_SectionBuilderHelper.js';
+import { V1_buildSection } from './helpers/V1_SectionBuilderHelper.js';
 import type { V1_DataElement } from '../../../model/packageableElements/data/V1_DataElement.js';
-import { V1_ProtocolToMetaModelEmbeddedDataBuilder } from './helpers/V1_DataElementBuilderHelper.js';
+import { V1_buildEmbeddedData } from './helpers/V1_DataElementBuilderHelper.js';
 import { V1_buildTestSuite } from './helpers/V1_TestBuilderHelper.js';
 import { ServiceTestSuite } from '../../../../../../metamodels/pure/packageableElements/service/ServiceTestSuite.js';
 import { V1_getIncludedMappingPath } from '../../../helper/V1_DSLMapping_Helper.js';
 import { V1_DataElementReference } from '../../../model/data/V1_EmbeddedData.js';
 
-export class V1_ProtocolToMetaModelGraphSecondPassBuilder
+export class V1_ElementSecondPassBuilder
   implements V1_PackageableElementVisitor<void>
 {
   context: V1_GraphBuilderContext;
@@ -392,10 +392,10 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
         'Packageable connection value cannot be a connection pointer',
       );
     }
-    connection.connectionValue =
-      element.connectionValue.accept_ConnectionVisitor(
-        new V1_ProtocolToMetaModelConnectionBuilder(this.context),
-      );
+    connection.connectionValue = V1_buildConnection(
+      element.connectionValue,
+      this.context,
+    );
   }
 
   visit_DataElement(element: V1_DataElement): void {
@@ -413,8 +413,6 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
         'Cannot use Data element reference in a Data element',
       );
     }
-    dataElement.data = element.data.accept_EmbeddedDataVisitor(
-      new V1_ProtocolToMetaModelEmbeddedDataBuilder(this.context),
-    );
+    dataElement.data = V1_buildEmbeddedData(element.data, this.context);
   }
 }