@finos/legend-graph 23.1.0 → 24.0.0

package/src/graphManager/protocol/pure/v1/V1_PureGraphManager.ts

@@ -40,6 +40,7 @@ import {
   uniq,
   IllegalStateError,
   filterByType,
+  getNullableFirstElement,
 } from '@finos/legend-shared';
 import type { TEMPORARY__AbstractEngineConfig } from '../../../../graphManager/action/TEMPORARY__AbstractEngineConfig.js';
 import {
@@ -164,7 +165,7 @@ import {
   V1_setupEngineRuntimeSerialization,
   V1_setupLegacyRuntimeSerialization,
 } from './transformation/pureProtocol/serializationHelpers/V1_RuntimeSerializationHelper.js';
-import type { DSL_Generation_PureProtocolProcessorPlugin_Extension } from '../DSL_Generation_PureProtocolProcessorPlugin_Extension.js';
+import type { DSL_Generation_PureProtocolProcessorPlugin_Extension } from '../extensions/DSL_Generation_PureProtocolProcessorPlugin_Extension.js';
 import type { RawRelationalOperationElement } from '../../../../graph/metamodel/pure/packageableElements/store/relational/model/RawRelationalOperationElement.js';
 import { V1_GraphTransformerContextBuilder } from './transformation/pureGraph/from/V1_GraphTransformerContext.js';
 import type {
@@ -222,7 +223,7 @@ import {
   createGraphBuilderReport,
   createGraphManagerOperationReport,
   type GraphManagerOperationReport,
-} from '../../../GraphManagerMetrics.js';
+} from '../../../GraphManagerStatistics.js';
 import type { Package } from '../../../../graph/metamodel/pure/packageableElements/domain/Package.js';
 import { V1_DataElement } from './model/packageableElements/data/V1_DataElement.js';
 import {
@@ -238,11 +239,6 @@ import {
   TestExecuted,
   TestExecutionStatus,
 } from '../../../../graph/metamodel/pure/test/result/TestResult.js';
-import {
-  type Service,
-  type ParameterValue,
-  MultiExecutionServiceTestResult,
-} from '../../../../DSL_Service_Exports.js';
 import type { Testable } from '../../../../graph/metamodel/pure/test/Testable.js';
 import {
   getNullableIDFromTestable,
@@ -275,6 +271,14 @@ import { V1_transformParameterValue } from './transformation/pureGraph/from/V1_S
 import { V1_transformModelUnit } from './transformation/pureGraph/from/V1_DSL_ExternalFormat_Transformer.js';
 import type { ModelUnit } from '../../../../graph/metamodel/pure/packageableElements/externalFormat/store/DSL_ExternalFormat_ModelUnit.js';
 import { V1_LambdaReturnTypeInput } from './engine/compilation/V1_LambdaReturnType.js';
+import {
+  type BulkServiceRegistrationResult,
+  BulkRegistrationResultSuccess,
+  BulkRegistrationResultFail,
+} from '../../../action/service/BulkServiceRegistrationResult.js';
+import { MultiExecutionServiceTestResult } from '../../../../graph/metamodel/pure/packageableElements/service/MultiExecutionServiceTestResult.js';
+import type { ParameterValue } from '../../../../graph/metamodel/pure/packageableElements/service/ParameterValue.js';
+import type { Service } from '../../../../graph/metamodel/pure/packageableElements/service/Service.js';
 
 class V1_PureModelContextDataIndex {
   elements: V1_PackageableElement[] = [];
@@ -2599,6 +2603,137 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     );
   }
 
+  async bulkServiceRegistration(
+    services: Service[],
+    graph: PureModel,
+    groupId: string,
+    artifactId: string,
+    version: string | undefined,
+    server: string,
+    executionMode: ServiceExecutionMode,
+    options?: ServiceRegistrationOptions,
+  ): Promise<BulkServiceRegistrationResult[]> {
+    const serverServiceInfo = await this.engine.getServerServiceInfo();
+    const input: V1_PureModelContext[] = [];
+
+    const protocol = new V1_Protocol(
+      V1_PureGraphManager.PURE_PROTOCOL_NAME,
+      serverServiceInfo.services.dependencies.pure,
+    );
+    switch (executionMode) {
+      case ServiceExecutionMode.FULL_INTERACTIVE: {
+        const pmcp = this.createBulkServiceRegistrationInput(graph, services);
+        pmcp.forEach((data) => {
+          data.origin = new V1_PureModelContextPointer(protocol);
+          input.push(data);
+        });
+        break;
+      }
+      case ServiceExecutionMode.SEMI_INTERACTIVE: {
+        services.forEach((service) => {
+          const sdlcInfo = new V1_LegendSDLC(groupId, artifactId, version);
+          const pointer = new V1_PureModelContextPointer(protocol, sdlcInfo);
+          // data
+          const data = new V1_PureModelContextData();
+          data.origin = new V1_PureModelContextPointer(protocol);
+          const serviceProtocol = this.elementToProtocol<V1_Service>(service);
+
+          // override the URL pattern if specified
+          if (options?.TEMPORARY__semiInteractiveOverridePattern) {
+            serviceProtocol.pattern =
+              options.TEMPORARY__semiInteractiveOverridePattern;
+          }
+
+          data.elements = [serviceProtocol];
+
+          // 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) {
+            if (execution.mapping) {
+              sdlcInfo.packageableElementPointers = [
+                new V1_PackageableElementPointer(
+                  PackageableElementPointerType.MAPPING,
+                  execution.mapping.value.path,
+                ),
+              ];
+            }
+          } else if (execution instanceof PureMultiExecution) {
+            sdlcInfo.packageableElementPointers =
+              execution.executionParameters.map(
+                (e) =>
+                  new V1_PackageableElementPointer(
+                    PackageableElementPointerType.MAPPING,
+                    e.mapping.value.path,
+                  ),
+              );
+          } else {
+            throw new UnsupportedOperationError(
+              `Can't register service with the specified execution`,
+              execution,
+            );
+          }
+          // composite input
+          input.push(new V1_PureModelContextComposite(protocol, data, pointer));
+        });
+        break;
+      }
+      case ServiceExecutionMode.PROD: {
+        services.forEach((service) => {
+          const sdlcInfo = new V1_LegendSDLC(groupId, artifactId, version);
+          const pointer = new V1_PureModelContextPointer(protocol, sdlcInfo);
+          const data = new V1_PackageableElementPointer(
+            PackageableElementPointerType.SERVICE,
+            service.path,
+          );
+          sdlcInfo.packageableElementPointers.push(data);
+          input.push(pointer);
+        });
+        break;
+      }
+      default: {
+        throw new UnsupportedOperationError(
+          `Can't register service with execution mode '${executionMode}'`,
+        );
+      }
+    }
+
+    const results = (
+      await Promise.all(
+        input.map(async (graphData) => {
+          try {
+            const result = await this.engine.registerService(
+              graphData,
+              server,
+              executionMode,
+              Boolean(options?.TEMPORARY__useStoreModel),
+            );
+            if (result.status === 'success') {
+              return new BulkRegistrationResultSuccess(
+                result.serverURL,
+                result.pattern,
+                result.serviceInstanceId,
+              );
+            }
+            return undefined;
+          } catch (error) {
+            assertErrorThrown(error);
+            const result = new BulkRegistrationResultFail(error.message);
+            if (graphData instanceof V1_PureModelContextData) {
+              result.servicePath = getNullableFirstElement(
+                graphData.elements.filter(filterByType(V1_Service)),
+              )?.path;
+            }
+            return result;
+          }
+        }),
+      )
+    ).filter(isNonNullable);
+
+    return results;
+  }
+
   async activateService(serviceUrl: string, serviceId: string): Promise<void> {
     const serviceStorage = await this.engine.getServiceVersionInfo(
       serviceUrl,
@@ -2622,7 +2757,24 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     prunedGraphData.elements.push(this.elementToProtocol<V1_Service>(service));
     return prunedGraphData;
   };
-
+  private createBulkServiceRegistrationInput = (
+    graph: PureModel,
+    services: Service[],
+  ): V1_PureModelContextData[] => {
+    const graphData = this.getFullGraphModelData(graph);
+    const results: V1_PureModelContextData[] = [];
+    services.forEach((service) => {
+      const prunedGraphData = new V1_PureModelContextData();
+      prunedGraphData.elements = graphData.elements.filter(
+        (element) => !(element instanceof V1_Service),
+      );
+      prunedGraphData.elements.push(
+        this.elementToProtocol<V1_Service>(service),
+      );
+      results.push(prunedGraphData);
+    });
+    return results;
+  };
   // --------------------------------------------- Query ---------------------------------------------
 
   async searchQueries(

package/src/graphManager/protocol/pure/v1/engine/V1_Engine.ts

@@ -101,7 +101,7 @@ import type {
 } from './compilation/V1_CompilationResult.js';
 import { V1_CompilationWarning } from './compilation/V1_CompilationWarning.js';
 import { V1_GenerateSchemaInput } from './externalFormat/V1_GenerateSchemaInput.js';
-import type { GraphManagerOperationReport } from '../../../../GraphManagerMetrics.js';
+import type { GraphManagerOperationReport } from '../../../../GraphManagerStatistics.js';
 
 class V1_EngineConfig extends TEMPORARY__AbstractEngineConfig {
   private engine: V1_Engine;

package/src/graphManager/protocol/pure/v1/engine/V1_EngineServerClient.ts

@@ -425,6 +425,7 @@ export class V1_EngineServerClient extends AbstractServerClient {
       undefined,
       { enableCompression: true },
     );
+
   lambdaReturnType = (
     input: PlainObject<V1_LambdaReturnTypeInput>,
   ): Promise<PlainObject<V1_LambdaReturnTypeResult>> =>

package/src/graphManager/protocol/pure/v1/engine/analytics/V1_MappingModelCoverageAnalysis.ts

@@ -28,7 +28,7 @@ import {
   primitive,
   serialize,
 } from 'serializr';
-import type { Mapping } from '../../../../../../DSL_Mapping_Exports.js';
+import type { Mapping } from '../../../../../../graph/metamodel/pure/packageableElements/mapping/Mapping.js';
 import {
   EntityMappedProperty,
   EnumMappedProperty,

package/src/graphManager/protocol/pure/v1/engine/execution/V1_ExecuteInput.ts

@@ -17,18 +17,15 @@
 import {
   createModelSchema,
   custom,
-  deserialize,
   list,
   object,
   optional,
   primitive,
-  serialize,
   SKIP,
 } from 'serializr';
 import {
-  deserializeArray,
+  customListWithSchema,
   SerializationFactory,
-  serializeArray,
   usingModelSchema,
 } from '@finos/legend-shared';
 import { V1_PureModelContextData } from '../../model/context/V1_PureModelContextData.js';
@@ -70,24 +67,7 @@ export class V1_ExecuteInput {
         () => SKIP,
       ),
       context: usingModelSchema(V1_rawBaseExecutionContextModelSchema),
-      parameterValues: custom(
-        (values) =>
-          serializeArray(
-            values,
-            (value) => serialize(V1_parameterValueModelSchema, value),
-            {
-              skipIfEmpty: true,
-            },
-          ),
-        (values) =>
-          deserializeArray(
-            values,
-            (v) => deserialize(V1_parameterValueModelSchema, v),
-            {
-              skipIfEmpty: false,
-            },
-          ),
-      ),
+      parameterValues: customListWithSchema(V1_parameterValueModelSchema),
     }),
   );
 }

package/src/graphManager/protocol/pure/v1/model/packageableElements/externalFormat/connection/V1_DSL_ExternalFormat_ExternalFormatConnection.ts

@@ -15,7 +15,7 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { DSL_EXTERNAL_FORMAT_HASH_STRUCTURE } from '../../../../../../../../graph/DSL_ExternalFormat_HashUtils.js';
+import { CORE_HASH_STRUCTURE } from '../../../../../../../../graph/Core_HashUtils.js';
 import {
   V1_Connection,
   type V1_ConnectionVisitor,
@@ -30,7 +30,7 @@ export class V1_ExternalFormatConnection
 
   get hashCode(): string {
     return hashArray([
-      DSL_EXTERNAL_FORMAT_HASH_STRUCTURE.EXTERNAL_FORMAT_CONNECTION,
+      CORE_HASH_STRUCTURE.EXTERNAL_FORMAT_CONNECTION,
       this.store ?? '',
       this.externalSource,
     ]);

package/src/graphManager/protocol/pure/v1/model/packageableElements/externalFormat/connection/V1_DSL_ExternalFormat_UrlStream.ts

@@ -15,12 +15,12 @@
  */
 
 import { type Hashable, hashArray } from '@finos/legend-shared';
-import { DSL_EXTERNAL_FORMAT_HASH_STRUCTURE } from '../../../../../../../../graph/DSL_ExternalFormat_HashUtils.js';
+import { CORE_HASH_STRUCTURE } from '../../../../../../../../graph/Core_HashUtils.js';
 
 export class V1_UrlStream implements Hashable {
   url = '';
 
   get hashCode(): string {
-    return hashArray([DSL_EXTERNAL_FORMAT_HASH_STRUCTURE.URL_STREAM, this.url]);
+    return hashArray([CORE_HASH_STRUCTURE.URL_STREAM, this.url]);
   }
 }

package/src/graphManager/protocol/pure/v1/model/packageableElements/externalFormat/schemaSet/V1_DSL_ExternalFormat_Schema.ts

@@ -15,7 +15,7 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { DSL_EXTERNAL_FORMAT_HASH_STRUCTURE } from '../../../../../../../../graph/DSL_ExternalFormat_HashUtils.js';
+import { CORE_HASH_STRUCTURE } from '../../../../../../../../graph/Core_HashUtils.js';
 
 export class V1_Schema implements Hashable {
   id?: string | undefined;
@@ -24,7 +24,7 @@ export class V1_Schema implements Hashable {
 
   get hashCode(): string {
     return hashArray([
-      DSL_EXTERNAL_FORMAT_HASH_STRUCTURE.SCHEMA,
+      CORE_HASH_STRUCTURE.SCHEMA,
       this.id ?? '',
       this.location ?? '',
       this.content,

package/src/graphManager/protocol/pure/v1/model/packageableElements/externalFormat/schemaSet/V1_DSL_ExternalFormat_SchemaSet.ts

@@ -15,7 +15,7 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { DSL_EXTERNAL_FORMAT_HASH_STRUCTURE } from '../../../../../../../../graph/DSL_ExternalFormat_HashUtils.js';
+import { CORE_HASH_STRUCTURE } from '../../../../../../../../graph/Core_HashUtils.js';
 import {
   type V1_PackageableElementVisitor,
   V1_PackageableElement,
@@ -28,7 +28,7 @@ export class V1_SchemaSet extends V1_PackageableElement implements Hashable {
 
   override get hashCode(): string {
     return hashArray([
-      DSL_EXTERNAL_FORMAT_HASH_STRUCTURE.SCHEMA_SET,
+      CORE_HASH_STRUCTURE.SCHEMA_SET,
       this.path,
       this.format,
       hashArray(this.schemas),

package/src/graphManager/protocol/pure/v1/model/packageableElements/externalFormat/store/V1_DSL_ExternalFormat_Binding.ts

@@ -15,7 +15,7 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { DSL_EXTERNAL_FORMAT_HASH_STRUCTURE } from '../../../../../../../../graph/DSL_ExternalFormat_HashUtils.js';
+import { CORE_HASH_STRUCTURE } from '../../../../../../../../graph/Core_HashUtils.js';
 import { V1_Store } from '../../store/V1_Store.js';
 import type { V1_PackageableElementVisitor } from '../../V1_PackageableElement.js';
 import type { V1_ModelUnit } from './V1_DSL_ExternalFormat_ModelUnit.js';
@@ -28,7 +28,7 @@ export class V1_Binding extends V1_Store implements Hashable {
 
   override get hashCode(): string {
     return hashArray([
-      DSL_EXTERNAL_FORMAT_HASH_STRUCTURE.BINDING,
+      CORE_HASH_STRUCTURE.BINDING,
       this.path,
       this.schemaSet ?? '',
       this.schemaId ?? '',

package/src/graphManager/protocol/pure/v1/model/packageableElements/externalFormat/store/V1_DSL_ExternalFormat_ModelUnit.ts

@@ -15,7 +15,7 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { DSL_EXTERNAL_FORMAT_HASH_STRUCTURE } from '../../../../../../../../graph/DSL_ExternalFormat_HashUtils.js';
+import { CORE_HASH_STRUCTURE } from '../../../../../../../../graph/Core_HashUtils.js';
 
 export class V1_ModelUnit implements Hashable {
   packageableElementIncludes: string[] = [];
@@ -23,7 +23,7 @@ export class V1_ModelUnit implements Hashable {
 
   get hashCode(): string {
     return hashArray([
-      DSL_EXTERNAL_FORMAT_HASH_STRUCTURE.MODEL_UNIT,
+      CORE_HASH_STRUCTURE.MODEL_UNIT,
       hashArray(this.packageableElementIncludes),
       hashArray(this.packageableElementExcludes),
     ]);

package/src/graphManager/protocol/pure/v1/model/packageableElements/mapping/V1_MappingTest.ts

@@ -20,6 +20,11 @@ import type { V1_RawLambda } from '../../rawValueSpecification/V1_RawLambda.js';
 import { V1_AtomicTest } from '../../test/V1_AtomicTest.js';
 
 export class V1_MappingTest extends V1_AtomicTest implements Hashable {
+  /**
+   * Studio does not process value specification, they are left in raw JSON form
+   *
+   * @discrepancy model
+   */
   query!: V1_RawLambda;
 
   get hashCode(): string {

package/src/graphManager/protocol/pure/v1/model/packageableElements/service/V1_PostValidationAssertion.ts

@@ -20,6 +20,11 @@ import type { V1_RawLambda } from '../../rawValueSpecification/V1_RawLambda.js';
 
 export class V1_PostValidationAssertion implements Hashable {
   id!: string;
+  /**
+   * Studio does not process value specification, they are left in raw JSON form
+   *
+   * @discrepancy model
+   */
   assertion!: V1_RawLambda;
 
   get hashCode(): string {

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

@@ -88,8 +88,8 @@ import { V1_XmlModelConnection } from '../../../model/packageableElements/store/
 import { V1_FlatDataConnection } from '../../../model/packageableElements/store/flatData/connection/V1_FlatDataConnection.js';
 import { V1_ModelChainConnection } from '../../../model/packageableElements/store/modelToModel/connection/V1_ModelChainConnection.js';
 import { V1_transformPostProcessor } from './V1_PostProcessorTransformer.js';
-import type { STO_Relational_PureProtocolProcessorPlugin_Extension } from '../../../../STO_Relational_PureProtocolProcessorPlugin_Extension.js';
-import type { DSL_Mapping_PureProtocolProcessorPlugin_Extension } from '../../../../DSL_Mapping_PureProtocolProcessorPlugin_Extension.js';
+import type { STO_Relational_PureProtocolProcessorPlugin_Extension } from '../../../../extensions/STO_Relational_PureProtocolProcessorPlugin_Extension.js';
+import type { DSL_Mapping_PureProtocolProcessorPlugin_Extension } from '../../../../extensions/DSL_Mapping_PureProtocolProcessorPlugin_Extension.js';
 import type { V1_GraphTransformerContext } from './V1_GraphTransformerContext.js';
 
 const transformStaticDatasourceSpecification = (

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

@@ -26,7 +26,7 @@ import {
   RelationalCSVData,
 } from '../../../../../../../graph/metamodel/pure/data/RelationalCSVData.js';
 import type { DataElement } from '../../../../../../../graph/metamodel/pure/packageableElements/data/DataElement.js';
-import type { DSL_Data_PureProtocolProcessorPlugin_Extension } from '../../../../DSL_Data_PureProtocolProcessorPlugin_Extension.js';
+import type { DSL_Data_PureProtocolProcessorPlugin_Extension } from '../../../../extensions/DSL_Data_PureProtocolProcessorPlugin_Extension.js';
 import {
   type V1_EmbeddedData,
   V1_DataElementReference,

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

@@ -137,7 +137,7 @@ import { RelationalInputData } from '../../../../../../../graph/metamodel/pure/p
 import { V1_RelationalInputData } from '../../../model/packageableElements/store/relational/mapping/V1_RelationalInputData.js';
 import { PackageableElementPointerType } from '../../../../../../../graph/MetaModelConst.js';
 import type { V1_GraphTransformerContext } from './V1_GraphTransformerContext.js';
-import type { DSL_Mapping_PureProtocolProcessorPlugin_Extension } from '../../../../DSL_Mapping_PureProtocolProcessorPlugin_Extension.js';
+import type { DSL_Mapping_PureProtocolProcessorPlugin_Extension } from '../../../../extensions/DSL_Mapping_PureProtocolProcessorPlugin_Extension.js';
 import type { InstanceSetImplementation } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/InstanceSetImplementation.js';
 import type { SubstituteStore } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/SubstituteStore.js';
 import { V1_BindingTransformer } from '../../../model/packageableElements/externalFormat/store/V1_DSL_ExternalFormat_BindingTransformer.js';

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

@@ -23,7 +23,7 @@ import { V1_BusinessSnapshotMilestoning } from '../../../model/packageableElemen
 import { BusinessSnapshotMilestoning } from '../../../../../../../graph/metamodel/pure/packageableElements/store/relational/model/milestoning/BusinessSnapshotMilestoning.js';
 import { V1_ProcessingMilestoning } from '../../../model/packageableElements/store/relational/model/milestoning/V1_ProcessingMilestoning.js';
 import { ProcessingMilestoning } from '../../../../../../../graph/metamodel/pure/packageableElements/store/relational/model/milestoning/ProcessingMilestoning.js';
-import type { STO_Relational_PureProtocolProcessorPlugin_Extension } from '../../../../STO_Relational_PureProtocolProcessorPlugin_Extension.js';
+import type { STO_Relational_PureProtocolProcessorPlugin_Extension } from '../../../../extensions/STO_Relational_PureProtocolProcessorPlugin_Extension.js';
 import type { V1_GraphTransformerContext } from './V1_GraphTransformerContext.js';
 import { V1_RawPrimitiveInstanceValue } from '../../../model/rawValueSpecification/V1_RawPrimitiveInstanceValue.js';
 import { V1_RawValueSpecificationTransformer } from './V1_RawValueSpecificationTransformer.js';

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

@@ -29,7 +29,7 @@ import {
   V1_SchemaNameMapper,
   V1_TableNameMapper,
 } from '../../../model/packageableElements/store/relational/connection/postprocessor/V1_Mapper.js';
-import type { STO_Relational_PureProtocolProcessorPlugin_Extension } from '../../../../STO_Relational_PureProtocolProcessorPlugin_Extension.js';
+import type { STO_Relational_PureProtocolProcessorPlugin_Extension } from '../../../../extensions/STO_Relational_PureProtocolProcessorPlugin_Extension.js';
 import type { ViewReference } from '../../../../../../../graph/metamodel/pure/packageableElements/store/relational/model/ViewReference.js';
 import type { TableReference } from '../../../../../../../graph/metamodel/pure/packageableElements/store/relational/model/TableReference.js';
 import { V1_TablePtr } from '../../../model/packageableElements/store/relational/model/V1_TablePtr.js';

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

@@ -37,7 +37,7 @@ import type {
 } from '../../../../../../../graph/metamodel/pure/test/Test.js';
 import { EqualToTDS } from '../../../../../../../graph/metamodel/pure/test/assertion/EqualToTDS.js';
 import { V1_EqualToTDS } from '../../../model/test/assertion/V1_EqualToTDS.js';
-import type { Testable_PureProtocolProcessorPlugin_Extension } from '../../../../Testable_PureProtocolProcessorPlugin_Extension.js';
+import type { Testable_PureProtocolProcessorPlugin_Extension } from '../../../../extensions/Testable_PureProtocolProcessorPlugin_Extension.js';
 import {
   V1_transformMappingTest,
   V1_transformMappingTestSuite,

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

@@ -60,6 +60,7 @@ import { V1_transformMultiplicity } from '../V1_CoreTransformerHelper.js';
 import { V1_transformConnection } from '../V1_ConnectionTransformer.js';
 import { V1_DatabaseConnection } from '../../../../model/packageableElements/store/relational/connection/V1_RelationalDatabaseConnection.js';
 import { PureClientVersion } from '../../../../../../../../graphManager/GraphManagerUtils.js';
+import { V1_PureGraphManager } from '../../../../V1_PureGraphManager.js';
 
 const stringifyDataType = (dataType: RelationalDataType): string => {
   if (dataType instanceof Integer) {
@@ -235,7 +236,10 @@ export const V1_transformExecutionPlan = (
   context: V1_GraphTransformerContext,
 ): V1_ExecutionPlan => {
   const protocol = new V1_SimpleExecutionPlan();
-  protocol.serializer = new V1_Protocol('pure', PureClientVersion.VX_X_X);
+  protocol.serializer = new V1_Protocol(
+    V1_PureGraphManager.PURE_PROTOCOL_NAME,
+    PureClientVersion.VX_X_X,
+  );
   protocol.authDependent = metamodel.authDependent;
   protocol.kerberos = metamodel.kerberos;
   protocol.templateFunctions = metamodel.processingTemplateFunctions;

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

@@ -47,7 +47,7 @@ import type { InstanceSetImplementation } from '../../../../../../../graph/metam
 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 type { DSL_Mapping_PureProtocolProcessorPlugin_Extension } from '../../../../DSL_Mapping_PureProtocolProcessorPlugin_Extension.js';
+import type { DSL_Mapping_PureProtocolProcessorPlugin_Extension } from '../../../../extensions/DSL_Mapping_PureProtocolProcessorPlugin_Extension.js';
 import type { V1_MergeOperationClassMapping } from '../../../model/packageableElements/mapping/V1_MergeOperationClassMapping.js';
 import { MergeOperationSetImplementation } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/MergeOperationSetImplementation.js';
 

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

@@ -64,7 +64,7 @@ import {
   getAllEnumerationMappings,
   getOwnClassMappingById,
 } from '../../../../../../../graph/helpers/DSL_Mapping_Helper.js';
-import type { DSL_Mapping_PureProtocolProcessorPlugin_Extension } from '../../../../DSL_Mapping_PureProtocolProcessorPlugin_Extension.js';
+import type { DSL_Mapping_PureProtocolProcessorPlugin_Extension } from '../../../../extensions/DSL_Mapping_PureProtocolProcessorPlugin_Extension.js';
 import type { V1_MergeOperationClassMapping } from '../../../model/packageableElements/mapping/V1_MergeOperationClassMapping.js';
 
 export class V1_ClassMappingSecondPassBuilder

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

@@ -17,7 +17,7 @@
 import {
   getSchemaSet,
   getBinding,
-} from '../../../../../../DSL_ExternalFormat_GraphManagerHelper.js';
+} from '../../../../../../helpers/DSL_ExternalFormat_GraphManagerHelper.js';
 import type { PackageableElementImplicitReference } from '../../../../../../../graph/metamodel/pure/packageableElements/PackageableElementReference.js';
 import type { SchemaSet } from '../../../../../../../graph/metamodel/pure/packageableElements/externalFormat/schemaSet/DSL_ExternalFormat_SchemaSet.js';
 import type { Binding } from '../../../../../../../graph/metamodel/pure/packageableElements/externalFormat/store/DSL_ExternalFormat_Binding.js';

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

@@ -79,7 +79,6 @@ import type { V1_GraphBuilderExtensions } from './V1_GraphBuilderExtensions.js';
 import type { GraphBuilderOptions } from '../../../../../../../graphManager/AbstractPureGraphManager.js';
 import { DataType } from '../../../../../../../graph/metamodel/pure/packageableElements/domain/DataType.js';
 import { GraphBuilderError } from '../../../../../../../graphManager/GraphManagerUtils.js';
-import type { DataElement } from '../../../../../../../DSL_Data_Exports.js';
 import {
   getClassProperty,
   getEnumValue,
@@ -96,6 +95,7 @@ import {
   getSection,
 } from '../../../../../../../graph/helpers/STO_FlatData_Helper.js';
 import type { PropertyOwner } from '../../../../../../../graph/metamodel/pure/packageableElements/domain/AbstractProperty.js';
+import type { DataElement } from '../../../../../../../graph/metamodel/pure/packageableElements/data/DataElement.js';
 
 export const V1_buildFullPath = (
   packagePath: string | undefined,

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

@@ -97,7 +97,7 @@ import {
   getClassProperty,
 } from '../../../../../../../graph/helpers/DomainHelper.js';
 import { SetImplementationImplicitReference } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/SetImplementationReference.js';
-import type { DSL_Mapping_PureProtocolProcessorPlugin_Extension } from '../../../../DSL_Mapping_PureProtocolProcessorPlugin_Extension.js';
+import type { DSL_Mapping_PureProtocolProcessorPlugin_Extension } from '../../../../extensions/DSL_Mapping_PureProtocolProcessorPlugin_Extension.js';
 import { EnumerationMappingExplicitReference } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/EnumerationMappingReference.js';
 import type { V1_FlatDataAssociationPropertyMapping } from '../../../model/packageableElements/store/flatData/mapping/V1_FlatDataAssociationPropertyMapping.js';
 import { FlatDataAssociationPropertyMapping } from '../../../../../../../graph/metamodel/pure/packageableElements/store/flatData/mapping/FlatDataAssociationPropertyMapping.js';

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

@@ -55,7 +55,7 @@ import {
   V1_buildDatasourceSpecification,
   V1_buildAuthenticationStrategy,
 } from './V1_RelationalConnectionBuilderHelper.js';
-import type { DSL_Mapping_PureProtocolProcessorPlugin_Extension } from '../../../../../DSL_Mapping_PureProtocolProcessorPlugin_Extension.js';
+import type { DSL_Mapping_PureProtocolProcessorPlugin_Extension } from '../../../../../extensions/DSL_Mapping_PureProtocolProcessorPlugin_Extension.js';
 import type { V1_ModelChainConnection } from '../../../../model/packageableElements/store/modelToModel/connection/V1_ModelChainConnection.js';
 import { V1_buildPostProcessor } from './V1_PostProcessorBuilderHelper.js';
 

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

@@ -26,7 +26,7 @@ import {
   RelationalCSVDataTable,
 } from '../../../../../../../../graph/metamodel/pure/data/RelationalCSVData.js';
 import type { Class } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/Class.js';
-import type { DSL_Data_PureProtocolProcessorPlugin_Extension } from '../../../../../DSL_Data_PureProtocolProcessorPlugin_Extension.js';
+import type { DSL_Data_PureProtocolProcessorPlugin_Extension } from '../../../../../extensions/DSL_Data_PureProtocolProcessorPlugin_Extension.js';
 import type {
   V1_DataElementReference,
   V1_EmbeddedData,

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

@@ -80,7 +80,7 @@ import { V1_buildTestAssertion } from './V1_TestBuilderHelper.js';
 import type { V1_MappingStoreTestData } from '../../../../model/packageableElements/mapping/V1_MappingStoreTestData.js';
 import { MappingStoreTestData } from '../../../../../../../../graph/metamodel/pure/packageableElements/mapping/MappingStoreTestData.js';
 import { V1_buildEmbeddedData } from './V1_DataElementBuilderHelper.js';
-import { ModelStore } from '../../../../../../../../DSL_Mapping_Exports.js';
+import { ModelStore } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/modelToModel/model/ModelStore.js';
 
 export const V1_getInferredClassMappingId = (
   _class: Class,

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

@@ -28,7 +28,7 @@ import { BusinessSnapshotMilestoning } from '../../../../../../../../graph/metam
 import { V1_ProcessingMilestoning } from '../../../../model/packageableElements/store/relational/model/milestoning/V1_ProcessingMilestoning.js';
 import { ProcessingMilestoning } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/relational/model/milestoning/ProcessingMilestoning.js';
 import type { V1_GraphBuilderContext } from '../V1_GraphBuilderContext.js';
-import type { STO_Relational_PureProtocolProcessorPlugin_Extension } from '../../../../../STO_Relational_PureProtocolProcessorPlugin_Extension.js';
+import type { STO_Relational_PureProtocolProcessorPlugin_Extension } from '../../../../../extensions/STO_Relational_PureProtocolProcessorPlugin_Extension.js';
 import { RawPrimitiveInstanceValue } from '../../../../../../../../graph/metamodel/pure/rawValueSpecification/RawPrimitiveInstanceValue.js';
 import { V1_RawValueSpecificationBuilder } from '../V1_RawValueSpecificationBuilder.js';
 

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

@@ -30,7 +30,7 @@ import {
   TableNameMapper,
 } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/relational/connection/postprocessor/Mapper.js';
 import type { V1_GraphBuilderContext } from '../V1_GraphBuilderContext.js';
-import type { STO_Relational_PureProtocolProcessorPlugin_Extension } from '../../../../../STO_Relational_PureProtocolProcessorPlugin_Extension.js';
+import type { STO_Relational_PureProtocolProcessorPlugin_Extension } from '../../../../../extensions/STO_Relational_PureProtocolProcessorPlugin_Extension.js';
 
 const buildSchemaNameMapper = (schema: V1_SchemaNameMapper): SchemaNameMapper =>
   new SchemaNameMapper(schema.from, schema.to);