@finos/legend-graph 4.0.1 → 5.0.0

package/src/models/protocols/pure/v1/V1_PureGraphManager.ts

@@ -37,6 +37,7 @@ import {
   type ActionState,
   StopWatch,
   assertNonEmptyString,
+  filterByType,
 } from '@finos/legend-shared';
 import type { TEMPORARY__AbstractEngineConfig } from '../../../../graphManager/action/TEMPORARY__AbstractEngineConfig';
 import {
@@ -91,7 +92,7 @@ import {
   V1_deserializeValueSpecification,
 } from './transformation/pureProtocol/serializationHelpers/V1_ValueSpecificationSerializer';
 import V1_CORE_SYSTEM_MODELS from './V1_Core_SystemModels.json';
-import { V1_PackageableElementSerializer } from './transformation/pureProtocol/V1_PackageableElementSerialization';
+import { V1_serializePackageableElement } from './transformation/pureProtocol/V1_PackageableElementSerialization';
 import {
   V1_entitiesToPureModelContextData,
   V1_serializePureModelContext,
@@ -118,7 +119,7 @@ import {
 } from './transformation/pureGraph/to/V1_GraphBuilderContext';
 import { V1_PureModelContextPointer } from './model/context/V1_PureModelContextPointer';
 import { V1_Engine } from './engine/V1_Engine';
-import { V1_PackageableElementTransformer } from './transformation/pureGraph/from/V1_PackageableElementTransformer';
+import { V1_transformPackageableElement } from './transformation/pureGraph/from/V1_PackageableElementTransformer';
 import {
   V1_transformRawLambda,
   V1_RawValueSpecificationTransformer,
@@ -233,6 +234,7 @@ import { V1_SERVICE_ELEMENT_PROTOCOL_TYPE } from './transformation/pureProtocol/
 import { MappingInclude } from '../../../metamodels/pure/packageableElements/mapping/MappingInclude';
 import type { ModelGenerationConfiguration } from '../../../ModelGenerationConfiguration';
 import type { MappingGeneration_PureProtocolProcessorPlugin_Extension } from '../MappingGeneration_PureProtocolProcessorPlugin_Extension';
+import type { Package } from '../../../metamodels/pure/packageableElements/domain/Package';
 
 const V1_FUNCTION_SUFFIX_MULTIPLICITY_INFINITE = 'MANY';
 
@@ -527,6 +529,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
       graphBuilderState.fail();
       this.log.error(
         LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_FAILURE),
+        error,
       );
       throw new SystemGraphBuilderError(error);
     } finally {
@@ -581,12 +584,12 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
       const buildInputs: V1_GraphBuilderInput[] = Array.from(
         dependencyDataMap.entries(),
       ).map(([dependencyKey, dependencyData]) => ({
+        model: graph.dependencyManager.getModel(dependencyKey),
         data: indexPureModelContextData(
           report,
           dependencyData,
           this.extensions,
         ),
-        model: graph.dependencyManager.getModel(dependencyKey),
       }));
 
       // build
@@ -610,6 +613,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
       assertErrorThrown(error);
       this.log.error(
         LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_FAILURE),
+        error,
       );
       graphBuilderState.fail();
       throw new DependencyGraphBuilderError(error);
@@ -662,7 +666,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
        * but when we write (serialize) we write only resolved paths. In the future once the issue with dependency is solved we will
        * perserve the element path both resolved and unresolved
        */
-      if (!options?.TEMPORARY__keepSectionIndex) {
+      if (!options?.TEMPORARY__preserveSectionIndex) {
         graph.TEMPORARY__deleteOwnSectionIndex();
       }
 
@@ -676,6 +680,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
       assertErrorThrown(error);
       this.log.error(
         LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_FAILURE),
+        error,
       );
       graphBuilderState.fail();
       /**
@@ -721,17 +726,12 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
       stopWatch.record(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_ELEMENTS_DESERIALIZED);
 
       // prepare build inputs
-      const buildInputs = Array.from(generatedDataMap.entries()).map(
-        ([generationParentPath, generatedData]) => ({
-          parentElementPath: generationParentPath,
-          data: indexPureModelContextData(
-            report,
-            generatedData,
-            this.extensions,
-          ),
-          model: generatedModel,
-        }),
-      );
+      const buildInputs: V1_GraphBuilderInput[] = Array.from(
+        generatedDataMap.entries(),
+      ).map(([generationParentPath, generatedData]) => ({
+        model: generatedModel,
+        data: indexPureModelContextData(report, generatedData, this.extensions),
+      }));
 
       // build
       await this.buildGraphFromInputs(
@@ -754,6 +754,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
       assertErrorThrown(error);
       this.log.error(
         LogEvent.create(GRAPH_MANAGER_EVENT.GRAPH_BUILDER_FAILURE),
+        error,
       );
       graphBuilderState.fail();
       /**
@@ -853,25 +854,37 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     inputs: V1_GraphBuilderInput[],
     options?: GraphBuilderOptions,
   ): Promise<void> {
+    // create the element path cache for faster duplication check
+    // NOTE: We base on the assumption here that our graph building is cascading, i.e.
+    // it first builds core, system, dependencies, graph, and generation.
+    // this way, as we build the a graph, we know the next step's duplication check
+    // has path cache consisting of all element from its base graphs
+    const elementPathCache = new Set<string>(
+      graph.allElements.map((el) => el.path),
+    );
+
     await Promise.all(
-      inputs.flatMap((input) =>
-        input.data.nativeElements.map((element) =>
-          this.visitWithErrorHandling(
-            element,
-            new V1_ProtocolToMetaModelGraphFirstPassBuilder(
-              this.getBuilderContext(graph, input.model, element, options),
+      inputs.flatMap(async (input) => {
+        // create the package cache
+        const packageCache = new Map<string, Package>();
+
+        await Promise.all(
+          input.data.nativeElements.map((element) =>
+            this.visitWithGraphBuilderErrorHandling(
+              element,
+              new V1_ProtocolToMetaModelGraphFirstPassBuilder(
+                this.getBuilderContext(graph, input.model, element, options),
+                packageCache,
+                elementPathCache,
+              ),
             ),
           ),
-        ),
-      ),
-    );
-    await Promise.all(
-      this.extensions.sortedExtraElementBuilders.map(async (builder) => {
+        );
         await Promise.all(
-          inputs.flatMap((input) =>
+          this.extensions.sortedExtraElementBuilders.flatMap(async (builder) =>
             (input.data.otherElementsByBuilder.get(builder) ?? []).map(
               (element) =>
-                this.visitWithErrorHandling(
+                this.visitWithGraphBuilderErrorHandling(
                   element,
                   new V1_ProtocolToMetaModelGraphFirstPassBuilder(
                     this.getBuilderContext(
@@ -880,6 +893,8 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
                       element,
                       options,
                     ),
+                    packageCache,
+                    elementPathCache,
                   ),
                 ),
             ),
@@ -898,7 +913,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await Promise.all(
       inputs.flatMap((input) =>
         input.data.profiles.map((element) =>
-          this.visitWithErrorHandling(
+          this.visitWithGraphBuilderErrorHandling(
             element,
             new V1_ProtocolToMetaModelGraphSecondPassBuilder(
               this.getBuilderContext(graph, input.model, element, options),
@@ -910,7 +925,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await Promise.all(
       inputs.flatMap((input) =>
         input.data.classes.map((element) =>
-          this.visitWithErrorHandling(
+          this.visitWithGraphBuilderErrorHandling(
             element,
             new V1_ProtocolToMetaModelGraphSecondPassBuilder(
               this.getBuilderContext(graph, input.model, element, options),
@@ -922,7 +937,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await Promise.all(
       inputs.flatMap((input) =>
         input.data.enumerations.map((element) =>
-          this.visitWithErrorHandling(
+          this.visitWithGraphBuilderErrorHandling(
             element,
             new V1_ProtocolToMetaModelGraphSecondPassBuilder(
               this.getBuilderContext(graph, input.model, element, options),
@@ -934,7 +949,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await Promise.all(
       inputs.flatMap((input) =>
         input.data.measures.map((element) =>
-          this.visitWithErrorHandling(
+          this.visitWithGraphBuilderErrorHandling(
             element,
             new V1_ProtocolToMetaModelGraphSecondPassBuilder(
               this.getBuilderContext(graph, input.model, element, options),
@@ -946,7 +961,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await Promise.all(
       inputs.flatMap((input) =>
         input.data.functions.map((element) =>
-          this.visitWithErrorHandling(
+          this.visitWithGraphBuilderErrorHandling(
             element,
             new V1_ProtocolToMetaModelGraphSecondPassBuilder(
               this.getBuilderContext(graph, input.model, element, options),
@@ -959,7 +974,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await Promise.all(
       inputs.flatMap((input) =>
         input.data.classes.map((element) =>
-          this.visitWithErrorHandling(
+          this.visitWithGraphBuilderErrorHandling(
             element,
             new V1_ProtocolToMetaModelGraphThirdPassBuilder(
               this.getBuilderContext(graph, input.model, element, options),
@@ -971,7 +986,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await Promise.all(
       inputs.flatMap((input) =>
         input.data.associations.map((element) =>
-          this.visitWithErrorHandling(
+          this.visitWithGraphBuilderErrorHandling(
             element,
             new V1_ProtocolToMetaModelGraphThirdPassBuilder(
               this.getBuilderContext(graph, input.model, element, options),
@@ -984,7 +999,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await Promise.all(
       inputs.flatMap((input) =>
         input.data.classes.map((element) =>
-          this.visitWithErrorHandling(
+          this.visitWithGraphBuilderErrorHandling(
             element,
             new V1_ProtocolToMetaModelGraphFifthPassBuilder(
               this.getBuilderContext(graph, input.model, element, options),
@@ -1003,7 +1018,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await Promise.all(
       inputs.flatMap((input) =>
         input.data.stores.map((element) =>
-          this.visitWithErrorHandling(
+          this.visitWithGraphBuilderErrorHandling(
             element,
             new V1_ProtocolToMetaModelGraphSecondPassBuilder(
               this.getBuilderContext(graph, input.model, element, options),
@@ -1015,7 +1030,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await Promise.all(
       inputs.flatMap((input) =>
         input.data.stores.map((element) =>
-          this.visitWithErrorHandling(
+          this.visitWithGraphBuilderErrorHandling(
             element,
             new V1_ProtocolToMetaModelGraphThirdPassBuilder(
               this.getBuilderContext(graph, input.model, element, options),
@@ -1027,7 +1042,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await Promise.all(
       inputs.flatMap((input) =>
         input.data.stores.map((element) =>
-          this.visitWithErrorHandling(
+          this.visitWithGraphBuilderErrorHandling(
             element,
             new V1_ProtocolToMetaModelGraphFourthPassBuilder(
               this.getBuilderContext(graph, input.model, element, options),
@@ -1039,7 +1054,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await Promise.all(
       inputs.flatMap((input) =>
         input.data.stores.map((element) =>
-          this.visitWithErrorHandling(
+          this.visitWithGraphBuilderErrorHandling(
             element,
             new V1_ProtocolToMetaModelGraphFifthPassBuilder(
               this.getBuilderContext(graph, input.model, element, options),
@@ -1058,7 +1073,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await Promise.all(
       inputs.flatMap((input) =>
         input.data.mappings.map((element) =>
-          this.visitWithErrorHandling(
+          this.visitWithGraphBuilderErrorHandling(
             element,
             new V1_ProtocolToMetaModelGraphSecondPassBuilder(
               this.getBuilderContext(graph, input.model, element, options),
@@ -1070,7 +1085,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await Promise.all(
       inputs.flatMap((input) =>
         input.data.mappings.map((element) =>
-          this.visitWithErrorHandling(
+          this.visitWithGraphBuilderErrorHandling(
             element,
             new V1_ProtocolToMetaModelGraphThirdPassBuilder(
               this.getBuilderContext(graph, input.model, element, options),
@@ -1082,7 +1097,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await Promise.all(
       inputs.flatMap((input) =>
         input.data.mappings.map((element) =>
-          this.visitWithErrorHandling(
+          this.visitWithGraphBuilderErrorHandling(
             element,
             new V1_ProtocolToMetaModelGraphFourthPassBuilder(
               this.getBuilderContext(graph, input.model, element, options),
@@ -1102,7 +1117,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await Promise.all(
       inputs.flatMap((input) =>
         input.data.connections.map((element) =>
-          this.visitWithErrorHandling(
+          this.visitWithGraphBuilderErrorHandling(
             element,
             new V1_ProtocolToMetaModelGraphSecondPassBuilder(
               this.getBuilderContext(graph, input.model, element, options),
@@ -1114,7 +1129,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await Promise.all(
       inputs.flatMap((input) =>
         input.data.runtimes.map((element) =>
-          this.visitWithErrorHandling(
+          this.visitWithGraphBuilderErrorHandling(
             element,
             new V1_ProtocolToMetaModelGraphSecondPassBuilder(
               this.getBuilderContext(graph, input.model, element, options),
@@ -1133,7 +1148,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await Promise.all(
       inputs.flatMap((input) =>
         input.data.services.map((element) =>
-          this.visitWithErrorHandling(
+          this.visitWithGraphBuilderErrorHandling(
             element,
             new V1_ProtocolToMetaModelGraphSecondPassBuilder(
               this.getBuilderContext(graph, input.model, element, options),
@@ -1152,7 +1167,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await Promise.all(
       inputs.flatMap((input) =>
         input.data.fileGenerations.map((element) =>
-          this.visitWithErrorHandling(
+          this.visitWithGraphBuilderErrorHandling(
             element,
             new V1_ProtocolToMetaModelGraphSecondPassBuilder(
               this.getBuilderContext(graph, input.model, element, options),
@@ -1171,7 +1186,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await Promise.all(
       inputs.flatMap((input) =>
         input.data.generationSpecifications.map((element) =>
-          this.visitWithErrorHandling(
+          this.visitWithGraphBuilderErrorHandling(
             element,
             new V1_ProtocolToMetaModelGraphSecondPassBuilder(
               this.getBuilderContext(graph, input.model, element, options),
@@ -1190,7 +1205,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await Promise.all(
       inputs.flatMap((input) =>
         input.data.sectionIndices.map((element) =>
-          this.visitWithErrorHandling(
+          this.visitWithGraphBuilderErrorHandling(
             element,
             new V1_ProtocolToMetaModelGraphSecondPassBuilder(
               this.getBuilderContext(graph, input.model, element, options),
@@ -1212,7 +1227,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
           inputs.flatMap((input) =>
             (input.data.otherElementsByBuilder.get(builder) ?? []).map(
               (element) =>
-                this.visitWithErrorHandling(
+                this.visitWithGraphBuilderErrorHandling(
                   element,
                   new V1_ProtocolToMetaModelGraphSecondPassBuilder(
                     this.getBuilderContext(
@@ -1230,7 +1245,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
           inputs.flatMap((input) =>
             (input.data.otherElementsByBuilder.get(builder) ?? []).map(
               (element) =>
-                this.visitWithErrorHandling(
+                this.visitWithGraphBuilderErrorHandling(
                   element,
                   new V1_ProtocolToMetaModelGraphThirdPassBuilder(
                     this.getBuilderContext(
@@ -1248,7 +1263,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
           inputs.flatMap((input) =>
             (input.data.otherElementsByBuilder.get(builder) ?? []).map(
               (element) =>
-                this.visitWithErrorHandling(
+                this.visitWithGraphBuilderErrorHandling(
                   element,
                   new V1_ProtocolToMetaModelGraphFourthPassBuilder(
                     this.getBuilderContext(
@@ -1266,7 +1281,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
           inputs.flatMap((input) =>
             (input.data.otherElementsByBuilder.get(builder) ?? []).map(
               (element) =>
-                this.visitWithErrorHandling(
+                this.visitWithGraphBuilderErrorHandling(
                   element,
                   new V1_ProtocolToMetaModelGraphFifthPassBuilder(
                     this.getBuilderContext(
@@ -1284,7 +1299,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     );
   }
 
-  private visitWithErrorHandling<T>(
+  private visitWithGraphBuilderErrorHandling<T>(
     element: V1_PackageableElement,
     visitor: V1_PackageableElementVisitor<T>,
   ): Promise<T> {
@@ -1294,7 +1309,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
       assertErrorThrown(err);
       const error =
         err instanceof GraphBuilderError ? err : new GraphBuilderError(err);
-      error.message = `Error processing element '${element.path}': ${err.message}`;
+      error.message = `Can't build element '${element.path}': ${err.message}`;
       throw error;
     }
   }
@@ -1854,10 +1869,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     const protocolGraph = this.getFullGraphModelData(graph);
     const targetService = guaranteeNonNullable(
       protocolGraph.elements
-        .filter(
-          (element: V1_PackageableElement): element is V1_Service =>
-            element instanceof V1_Service,
-        )
+        .filter(filterByType(V1_Service))
         .find((element) => element.path === service.path),
       `Can't run service test: service '${service.path}' not found`,
     );
@@ -1901,6 +1913,8 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         data.origin = new V1_PureModelContextPointer(protocol);
         data.elements = [this.elementToProtocol<V1_Service>(service)];
         // SDLC info
+        // TODO: We may need to add `runtime` pointers if the runtime defned in the service is a packageable runtime
+        // and not embedded.
         const execution = service.execution;
         if (execution instanceof PureSingleExecution) {
           sdlcInfo.packageableElementPointers = [
@@ -1909,6 +1923,15 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
               execution.mapping.value.path,
             ),
           ];
+        } else if (execution instanceof PureMultiExecution) {
+          sdlcInfo.packageableElementPointers =
+            execution.executionParameters.map(
+              (e) =>
+                new V1_PackageableElementPointer(
+                  V1_PackageableElementPointerType.MAPPING,
+                  e.mapping.value.path,
+                ),
+            );
         } else {
           throw new UnsupportedOperationError(
             `Can't register service with the specified execution`,
@@ -2077,12 +2100,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         ...graph.dependencyManager.mappings,
       ];
       const v1Mappings = graphBuilderInput
-        .map((e) =>
-          e.data.elements.filter(
-            (type: V1_PackageableElement): type is V1_Mapping =>
-              type instanceof V1_Mapping,
-          ),
-        )
+        .map((e) => e.data.elements.filter(filterByType(V1_Mapping)))
         .flat();
       const context = new V1_GraphBuilderContextBuilder(
         graph,
@@ -2112,12 +2130,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         ...graph.dependencyManager.runtimes,
       ];
       const v1Runtimes = graphBuilderInput
-        .map((e) =>
-          e.data.elements.filter(
-            (type: V1_PackageableElement): type is V1_PackageableRuntime =>
-              type instanceof V1_PackageableRuntime,
-          ),
-        )
+        .map((e) => e.data.elements.filter(filterByType(V1_PackageableRuntime)))
         .flat();
       v1Runtimes.forEach((element) => {
         const runtime = runtimes.find((e) => e.path === element.path);
@@ -2165,12 +2178,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         ...graph.dependencyManager.services,
       ];
       const v1Services = graphBuilderInput
-        .map((e) =>
-          e.data.elements.filter(
-            (type: V1_PackageableElement): type is V1_Service =>
-              type instanceof V1_Service,
-          ),
-        )
+        .map((e) => e.data.elements.filter(filterByType(V1_Service)))
         .flat();
       // build service multi execution keys
       v1Services.forEach((element) => {
@@ -2357,17 +2365,14 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     element: PackageableElement,
     options?: { keepSourceInformation?: boolean | undefined } | undefined,
   ): T =>
-    element.accept_PackageableElementVisitor(
-      new V1_PackageableElementTransformer(
+    V1_transformPackageableElement(
+      element,
+      this.pluginManager.getPureProtocolProcessorPlugins(),
+      new V1_GraphTransformerContextBuilder(
         this.pluginManager.getPureProtocolProcessorPlugins(),
-        new V1_GraphTransformerContextBuilder(
-          this.pluginManager.getPureProtocolProcessorPlugins(),
-        )
-          .withKeepSourceInformationFlag(
-            Boolean(options?.keepSourceInformation),
-          )
-          .build(),
-      ),
+      )
+        .withKeepSourceInformationFlag(Boolean(options?.keepSourceInformation))
+        .build(),
     ) as T;
 
   private pureModelContextDataToEntities = (
@@ -2381,10 +2386,9 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     elementProtocol: V1_PackageableElement,
   ): Entity => ({
     path: this.getElementPath(elementProtocol),
-    content: elementProtocol.accept_PackageableElementVisitor(
-      new V1_PackageableElementSerializer(
-        this.pluginManager.getPureProtocolProcessorPlugins(),
-      ),
+    content: V1_serializePackageableElement(
+      elementProtocol,
+      this.pluginManager.getPureProtocolProcessorPlugins(),
     ),
     classifierPath: this.getElementClassiferPath(elementProtocol),
   });
@@ -2486,7 +2490,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     const dependencyManager = graph.dependencyManager;
     const generatedModel = graph.generationModel;
     graphData.elements = [
-      ...dependencyManager.allElements,
+      ...dependencyManager.allOwnElements,
       ...generatedModel.allOwnElements,
     ].map((element) => this.elementToProtocol(element));
     this.log.info(
@@ -2534,7 +2538,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
 
   // --------------------------------------------- HACKY ---------------------------------------------
 
-  HACKY_createGetAllLambda(_class: Class): RawLambda {
+  HACKY__createGetAllLambda(_class: Class): RawLambda {
     return new RawLambda(
       [],
       [
@@ -2552,7 +2556,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     );
   }
 
-  HACKY_createServiceTestAssertLambda(assertData: string): RawLambda {
+  HACKY__createServiceTestAssertLambda(assertData: string): RawLambda {
     return new RawLambda(
       [
         {
@@ -2603,7 +2607,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     );
   }
 
-  HACKY_extractServiceTestAssertionData(query: RawLambda): string | undefined {
+  HACKY__extractServiceTestAssertionData(query: RawLambda): string | undefined {
     let json: string | undefined;
     try {
       json = (
@@ -2628,4 +2632,17 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     }
     return json;
   }
+
+  HACKY__createDefaultBlankLambda(): RawLambda {
+    return new RawLambda(
+      [{ _type: 'var', name: 'x' }],
+      [
+        {
+          _type: 'string',
+          multiplicity: { lowerBound: 1, upperBound: 1 },
+          values: [''],
+        },
+      ],
+    );
+  }
 }

package/src/models/protocols/pure/v1/engine/V1_Engine.ts

@@ -510,7 +510,7 @@ export class V1_Engine {
           new V1_GenerateFileInput(textModel, configs),
         ),
       )
-    ).map((output) => V1_GenerationOutput.serialization.fromJson(output));
+    ).map(V1_GenerationOutput.serialization.fromJson);
   }
   // ------------------------------------------- External Format -----------------------------------------
 
@@ -587,7 +587,7 @@ export class V1_Engine {
       await this.engineServerClient.runServiceTests(
         V1_serializePureModelContextData(model),
       )
-    ).map((result) => V1_ServiceTestResult.serialization.fromJson(result));
+    ).map(V1_ServiceTestResult.serialization.fromJson);
   }
 
   async registerService(
@@ -639,7 +639,7 @@ export class V1_Engine {
       await this.engineServerClient.searchQueries(
         V1_QuerySearchSpecification.serialization.toJson(searchSpecification),
       )
-    ).map((query) => V1_LightQuery.serialization.fromJson(query));
+    ).map(V1_LightQuery.serialization.fromJson);
   }
 
   async getQuery(queryId: string): Promise<V1_Query> {

package/src/models/protocols/pure/v1/model/packageableElements/V1_PackageableElement.ts

@@ -58,7 +58,6 @@ export interface V1_PackageableElementVisitor<T> {
 export abstract class V1_PackageableElement implements Hashable {
   package!: string;
   name!: string;
-  parentSection?: string | undefined;
 
   get path(): string {
     return `${this.package}${ELEMENT_PATH_DELIMITER}${this.name}`;
@@ -73,6 +72,7 @@ export abstract class V1_PackageableElement implements Hashable {
   ): T;
 }
 
+// TODO: to be moved out of metamodel
 export enum V1_PackageableElementPointerType {
   STORE = 'STORE',
   MAPPING = 'MAPPING',

package/src/models/protocols/pure/v1/model/packageableElements/connection/V1_Connection.ts

@@ -22,16 +22,6 @@ import type { V1_XmlModelConnection } from '../../../model/packageableElements/s
 import type { V1_FlatDataConnection } from '../../../model/packageableElements/store/flatData/connection/V1_FlatDataConnection';
 import type { V1_ConnectionPointer } from './V1_ConnectionPointer';
 
-export enum V1_ConnectionType {
-  CONNECTION_POINTER = 'connectionPointer',
-  MODEL_CONNECTION = 'ModelConnection',
-  MODEL_CHAIN_CONNECTION = 'ModelChainConnection',
-  JSON_MODEL_CONNECTION = 'JsonModelConnection',
-  XML_MODEL_CONNECTION = 'XmlModelConnection',
-  FLAT_DATA_CONNECTION = 'FlatDataConnection',
-  RELATIONAL_DATABASE_CONNECTION = 'RelationalDatabaseConnection',
-}
-
 export interface V1_ConnectionVisitor<T> {
   visit_Connection(connection: V1_Connection): T;
   visit_ConnectionPointer(connection: V1_ConnectionPointer): T;

package/src/models/protocols/pure/v1/model/packageableElements/mapping/V1_InputData.ts

@@ -17,7 +17,5 @@
 import type { Hashable } from '@finos/legend-shared';
 
 export abstract class V1_InputData implements Hashable {
-  private readonly _$nominalTypeBrand!: 'V1_InputData';
-
   abstract get hashCode(): string;
 }

package/src/models/protocols/pure/v1/model/packageableElements/mapping/V1_MappingTestAssert.ts

@@ -17,7 +17,5 @@
 import type { Hashable } from '@finos/legend-shared';
 
 export abstract class V1_MappingTestAssert implements Hashable {
-  private readonly _$nominalTypeBrand!: 'V1_MappingTestAssert';
-
   abstract get hashCode(): string;
 }

package/src/models/protocols/pure/v1/model/packageableElements/service/V1_ServiceExecution.ts

@@ -19,14 +19,7 @@ import { CORE_HASH_STRUCTURE } from '../../../../../../../MetaModelConst';
 import type { V1_Runtime } from '../../../model/packageableElements/runtime/V1_Runtime';
 import type { V1_RawLambda } from '../../../model/rawValueSpecification/V1_RawLambda';
 
-export enum V1_ServiceExecutionType {
-  PURE_SINGLE_EXECUTION = 'pureSingleExecution',
-  PURE_MULTI_EXECUTION = 'pureMultiExecution',
-}
-
 export abstract class V1_ServiceExecution implements Hashable {
-  private readonly _$nominalTypeBrand!: 'V1_ServiceExecution';
-
   abstract get hashCode(): string;
 }
 

package/src/models/protocols/pure/v1/model/packageableElements/service/V1_ServiceTest.ts

@@ -19,8 +19,6 @@ import { CORE_HASH_STRUCTURE } from '../../../../../../../MetaModelConst';
 import type { V1_RawLambda } from '../../../model/rawValueSpecification/V1_RawLambda';
 
 export abstract class V1_ServiceTest implements Hashable {
-  private readonly _$nominalTypeBrand!: 'V1_ServiceTest';
-
   abstract get hashCode(): string;
 }