@finos/legend-graph 0.0.6 → 0.1.0

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

@@ -119,7 +119,7 @@ import type { V1_RawLambda } from './model/rawValueSpecification/V1_RawLambda';
 import { V1_ExecuteInput } from './engine/execution/V1_ExecuteInput';
 import type { V1_PureModelContextGenerationInput } from './engine/import/V1_PureModelContextGenerationInput';
 import { V1_buildValueSpecification } from './transformation/pureGraph/to/helpers/V1_ValueSpecificationBuilderHelper';
-import { V1_ValueSpecificationTransformer } from './transformation/pureGraph/from/V1_ValueSpecificationTransformer';
+import { V1_transformRootValueSpecification } from './transformation/pureGraph/from/V1_ValueSpecificationTransformer';
 import { V1_Profile } from './model/packageableElements/domain/V1_Profile';
 import { V1_Class } from './model/packageableElements/domain/V1_Class';
 import { V1_Enumeration } from './model/packageableElements/domain/V1_Enumeration';
@@ -148,6 +148,7 @@ import {
   V1_DatabaseBuilderConfig,
   V1_DatabaseBuilderInput,
   V1_DatabasePattern,
+  V1_setupDatabaseBuilderInputSerialization,
   V1_TargetDatabase,
 } from './engine/generation/V1_DatabaseBuilderInput';
 import { V1_transformRelationalDatabaseConnection } from './transformation/pureGraph/from/V1_ConnectionTransformer';
@@ -157,6 +158,10 @@ import { V1_ServiceStore } from './model/packageableElements/store/relational/V1
 import type { V1_Multiplicity } from './model/packageableElements/domain/V1_Multiplicity';
 import type { V1_RawVariable } from './model/rawValueSpecification/V1_RawVariable';
 import { V1_setupDatabaseSerialization } from './transformation/pureProtocol/serializationHelpers/V1_DatabaseSerializationHelper';
+import {
+  V1_setupEngineRuntimeSerialization,
+  V1_setupLegacyRuntimeSerialization,
+} from './transformation/pureProtocol/serializationHelpers/V1_RuntimeSerializationHelper';
 import type { DSLGenerationSpecification_PureProtocolProcessorPlugin_Extension } from '../DSLGenerationSpecification_PureProtocolProcessorPlugin_Extension';
 import type { RawRelationalOperationElement } from '../../../metamodels/pure/packageableElements/store/relational/model/RawRelationalOperationElement';
 import { V1_GraphTransformerContextBuilder } from './transformation/pureGraph/from/V1_GraphTransformerContext';
@@ -379,13 +384,22 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     this.extensions = new V1_GraphBuilderExtensions(
       this.pluginManager.getPureProtocolProcessorPlugins(),
     );
-    // setup (de)serializer using plugins
+    // setup serialization plugins
     V1_setupPureModelContextDataSerialization(
       this.pluginManager.getPureProtocolProcessorPlugins(),
     );
     V1_setupDatabaseSerialization(
       this.pluginManager.getPureProtocolProcessorPlugins(),
     );
+    V1_setupEngineRuntimeSerialization(
+      this.pluginManager.getPureProtocolProcessorPlugins(),
+    );
+    V1_setupLegacyRuntimeSerialization(
+      this.pluginManager.getPureProtocolProcessorPlugins(),
+    );
+    V1_setupDatabaseBuilderInputSerialization(
+      this.pluginManager.getPureProtocolProcessorPlugins(),
+    );
   }
 
   TEMP__getEngineConfig(): TEMP__AbstractEngineConfig {
@@ -1661,14 +1675,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     valueSpecification: ValueSpecification,
   ): Record<PropertyKey, unknown> {
     return V1_serializeValueSpecification(
-      valueSpecification.accept_ValueSpecificationVisitor(
-        new V1_ValueSpecificationTransformer(
-          [],
-          new Map<string, unknown[]>(),
-          true,
-          false,
-        ),
-      ),
+      V1_transformRootValueSpecification(valueSpecification),
     ) as Record<PropertyKey, unknown>;
   }
 
@@ -1942,7 +1949,8 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
   async registerService(
     graph: PureModel,
     service: Service,
-    projectId: string,
+    groupdId: string,
+    artifactId: string,
     server: string,
     executionMode: ServiceExecutionMode,
     version: string | undefined,
@@ -1962,7 +1970,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         break;
       }
       case ServiceExecutionMode.SEMI_INTERACTIVE: {
-        const sdlcInfo = new V1_AlloySdlc(projectId, version);
+        const sdlcInfo = new V1_AlloySdlc(groupdId, artifactId, version);
         const pointer = new V1_PureModelContextPointer(protocol, sdlcInfo);
         // data
         const data = new V1_PureModelContextData();
@@ -1988,7 +1996,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         break;
       }
       case ServiceExecutionMode.PROD: {
-        const sdlcInfo = new V1_AlloySdlc(projectId, version);
+        const sdlcInfo = new V1_AlloySdlc(groupdId, artifactId, version);
         const pointer = new V1_PureModelContextPointer(protocol, sdlcInfo);
         sdlcInfo.packageableElementPointers = [
           new V1_PackageableElementPointer(

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

@@ -81,6 +81,7 @@ import { V1_ServiceStorage } from './service/V1_ServiceStorage';
 import { V1_ServiceRegistrationResult } from './service/V1_ServiceRegistrationResult';
 import type { V1_PureModelContext } from '../model/context/V1_PureModelContext';
 import { ServiceExecutionMode } from '../../../../../graphManager/action/service/ServiceExecutionMode';
+import { serialize } from 'serializr';
 
 class V1_EngineConfig extends TEMP__AbstractEngineConfig {
   private engine: V1_Engine;
@@ -598,7 +599,7 @@ export class V1_Engine {
   ): Promise<V1_PureModelContextData> {
     return V1_deserializePureModelContextData(
       await this.engineServerClient.buildDatabase(
-        V1_DatabaseBuilderInput.serialization.toJson(input),
+        serialize(V1_DatabaseBuilderInput, input),
       ),
     );
   }

package/src/models/protocols/pure/v1/engine/generation/V1_DatabaseBuilderInput.ts

@@ -27,6 +27,7 @@ import {
   V1_deserializeConnectionValue,
 } from '../../transformation/pureProtocol/serializationHelpers/V1_ConnectionSerializationHelper';
 import type { V1_RelationalDatabaseConnection } from '../../model/packageableElements/store/relational/connection/V1_RelationalDatabaseConnection';
+import type { PureProtocolProcessorPlugin } from '../../../PureProtocolProcessorPlugin';
 
 export class V1_DatabasePattern {
   schemaPattern!: string;
@@ -78,15 +79,17 @@ export class V1_DatabaseBuilderInput {
   connection!: V1_RelationalDatabaseConnection;
   config!: V1_DatabaseBuilderConfig;
   targetDatabase!: V1_TargetDatabase;
-
-  static readonly serialization = new SerializationFactory(
-    createModelSchema(V1_DatabaseBuilderInput, {
-      config: usingModelSchema(V1_DatabaseBuilderConfig.serialization.schema),
-      connection: custom(
-        (val) => V1_serializeConnectionValue(val, false),
-        (val) => V1_deserializeConnectionValue(val, false),
-      ),
-      targetDatabase: usingModelSchema(V1_TargetDatabase.serialization.schema),
-    }),
-  );
 }
+
+export const V1_setupDatabaseBuilderInputSerialization = (
+  plugins: PureProtocolProcessorPlugin[],
+): void => {
+  createModelSchema(V1_DatabaseBuilderInput, {
+    config: usingModelSchema(V1_DatabaseBuilderConfig.serialization.schema),
+    connection: custom(
+      (val) => V1_serializeConnectionValue(val, false, plugins),
+      (val) => V1_deserializeConnectionValue(val, false, plugins),
+    ),
+    targetDatabase: usingModelSchema(V1_TargetDatabase.serialization.schema),
+  });
+};

package/src/models/protocols/pure/v1/model/context/V1_AlloySdlc.ts

@@ -27,10 +27,16 @@ export abstract class V1_Sdlc {
 }
 
 export class V1_AlloySdlc extends V1_Sdlc {
-  project: string;
+  groupId: string;
+  artifactId: string;
 
-  constructor(project: string, version: string | undefined) {
+  constructor(
+    groupId: string,
+    artifactId: string,
+    version: string | undefined,
+  ) {
     super(version);
-    this.project = project;
+    this.groupId = groupId;
+    this.artifactId = artifactId;
   }
 }

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

@@ -34,6 +34,7 @@ export enum V1_ConnectionType {
 
 /* @MARKER: NEW CONNECTION TYPE SUPPORT --- consider adding connection type handler here whenever support for a new one is added to the app */
 export interface V1_ConnectionVisitor<T> {
+  visit_Connection(connection: V1_Connection): T;
   visit_ConnectionPointer(connection: V1_ConnectionPointer): T;
   visit_JsonModelConnection(connection: V1_JsonModelConnection): T;
   visit_ModelChainConnection(connection: V1_ModelChainConnection): T;

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

@@ -46,6 +46,7 @@ export abstract class V1_ClassMapping implements Hashable {
   class?: string | undefined;
   root!: boolean;
   mappingClass?: V1_MappingClass | undefined;
+  extendsClassMappingId?: string | undefined;
 
   get hashCode(): string {
     return hashArray([

package/src/models/protocols/pure/v1/model/packageableElements/store/relational/mapping/V1_RootRelationalClassMapping.ts

@@ -46,6 +46,7 @@ export class V1_RootRelationalClassMapping
       this.distinct.toString(),
       hashArray(this.groupBy),
       this.filter ?? '',
+      this.extendsClassMappingId ?? '',
     ]);
   }
 }

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

@@ -82,6 +82,7 @@ import { V1_FlatDataConnection } from '../../../model/packageableElements/store/
 import { V1_ModelChainConnection } from '../../../model/packageableElements/store/modelToModel/connection/V1_ModelChainConnection';
 import { V1_transformPostProcessor } from './V1_PostProcessorTransformer';
 import type { StoreRelational_PureProtocolProcessorPlugin_Extension } from '../../../../StoreRelational_PureProtocolProcessorPlugin_Extension';
+import type { DSLMapping_PureProtocolProcessorPlugin_Extension } from '../../../../DSLMapping_PureProtocolProcessorPlugin_Extension';
 import type { V1_GraphTransformerContext } from './V1_GraphTransformerContext';
 
 const transformStaticDatasourceSpecification = (
@@ -315,6 +316,25 @@ class ConnectionTransformer implements ConnectionVisitor<V1_Connection> {
     this.context = context;
   }
 
+  visit_Connection(connection: Connection): V1_Connection {
+    const extraConnectionTransformers = this.context.plugins.flatMap(
+      (plugin) =>
+        (
+          plugin as DSLMapping_PureProtocolProcessorPlugin_Extension
+        ).V1_getExtraConnectionTransformers?.() ?? [],
+    );
+    for (const transformer of extraConnectionTransformers) {
+      const connectionProtocol = transformer(connection, this.context);
+      if (connectionProtocol) {
+        return connectionProtocol;
+      }
+    }
+    throw new UnsupportedOperationError(
+      `Can't transform connection: no compatible transformer available from plugins`,
+      connection,
+    );
+  }
+
   visit_ConnectionPointer(connection: ConnectionPointer): V1_Connection {
     return transformConnectionPointer(connection);
   }

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

@@ -825,9 +825,12 @@ const transformRootRelationalSetImpl = (
   classMapping.class = V1_transformElementReference(element.class);
   classMapping.distinct = element.distinct ?? false;
   classMapping.id = mappingElementIdSerializer(element.id);
-  classMapping.mainTable = V1_transformTableAliasToTablePointer(
-    element.mainTableAlias,
-  );
+  if (element.mainTableAlias) {
+    classMapping.mainTable = V1_transformTableAliasToTablePointer(
+      element.mainTableAlias,
+    );
+  }
+  classMapping.extendsClassMappingId = element.superSetImplementationId;
   classMapping.primaryKey = element.primaryKey.map((pk) =>
     V1_transformRelationalOperationElement(pk, context),
   );

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

@@ -40,10 +40,8 @@ import type {
   CollectionInstanceValue,
   InstanceValue,
 } from '../../../../../../metamodels/pure/valueSpecification/InstanceValue';
-import type {
-  LambdaFunction,
-  LambdaFunctionInstanceValue,
-} from '../../../../../../metamodels/pure/valueSpecification/LambdaFunction';
+import { LambdaFunctionInstanceValue } from '../../../../../../metamodels/pure/valueSpecification/LambdaFunction';
+import type { LambdaFunction } from '../../../../../../metamodels/pure/valueSpecification/LambdaFunction';
 import type {
   AbstractPropertyExpression,
   FunctionExpression,
@@ -82,7 +80,7 @@ import type { PackageableElement } from '../../../../../../metamodels/pure/packa
 import type { INTERNAL__UnknownValueSpecification } from '../../../../../../metamodels/pure/valueSpecification/INTERNAL__UnknownValueSpecification';
 import { V1_INTERNAL__UnknownValueSpecfication } from '../../../model/valueSpecification/V1_INTERNAL__UnknownValueSpecfication';
 
-export class V1_ValueSpecificationTransformer
+class V1_ValueSpecificationTransformer
   implements ValueSpecificationVisitor<V1_ValueSpecification>
 {
   inScope: string[] = [];
@@ -352,14 +350,21 @@ export class V1_ValueSpecificationTransformer
   ): V1_ValueSpecification {
     const _variable = new V1_Variable();
     _variable.name = valueSpecification.name;
+    const genericType = valueSpecification.genericType;
+    if (this.isParameter && genericType) {
+      const multiplicity = new V1_Multiplicity();
+      multiplicity.lowerBound = valueSpecification.multiplicity.lowerBound;
+      multiplicity.upperBound = valueSpecification.multiplicity.upperBound;
+      _variable.multiplicity = multiplicity;
+      _variable.class = genericType.value.rawType.path;
+    }
     return _variable;
   }
 
   visit_LambdaFunctionInstanceValue(
     valueSpecification: LambdaFunctionInstanceValue,
   ): V1_ValueSpecification {
-    const _lambda = guaranteeNonNullable(valueSpecification.values[0]);
-    return V1_transformLambdaFunction(_lambda);
+    return V1_transformLambdaFunctionInstanceValue(valueSpecification);
   }
 
   visit_AbstractPropertyExpression(
@@ -449,9 +454,11 @@ export const V1_transformLambdaBody = (
   );
 };
 
-export function V1_transformLambdaFunction(
-  lambdaFunc: LambdaFunction,
+export function V1_transformLambdaFunctionInstanceValue(
+  valueSpecification: LambdaFunctionInstanceValue,
+  isRootLambda?: boolean,
 ): V1_Lambda {
+  const lambdaFunc = guaranteeNonNullable(valueSpecification.values[0]);
   const lambda = new V1_Lambda();
   lambda.parameters = lambdaFunc.functionType.parameters.map((p) =>
     guaranteeType(
@@ -459,7 +466,7 @@ export function V1_transformLambdaFunction(
         new V1_ValueSpecificationTransformer(
           [],
           new Map<string, unknown[]>(),
-          true,
+          Boolean(isRootLambda),
           false,
         ),
       ),
@@ -469,3 +476,20 @@ export function V1_transformLambdaFunction(
   lambda.body = V1_transformLambdaBody(lambdaFunc, false);
   return lambda;
 }
+
+export function V1_transformRootValueSpecification(
+  valueSpecification: ValueSpecification,
+): V1_ValueSpecification {
+  if (valueSpecification instanceof LambdaFunctionInstanceValue) {
+    return V1_transformLambdaFunctionInstanceValue(valueSpecification, true);
+  } else {
+    return valueSpecification.accept_ValueSpecificationVisitor(
+      new V1_ValueSpecificationTransformer(
+        [],
+        new Map<string, unknown[]>(),
+        true,
+        false,
+      ),
+    );
+  }
+}

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

@@ -57,7 +57,9 @@ import type { V1_AggregateSetImplementationContainer } from '../../../model/pack
 import { PackageableElementImplicitReference } from '../../../../../../metamodels/pure/packageableElements/PackageableElementReference';
 import {
   extractClassMappingsFromAggregationAwareClassMappings,
-  getClassMappingById,
+  getAllClassMappings,
+  getAllEnumerationMappings,
+  getOwnClassMappingById,
 } from '../../../../../../../helpers/MappingHelper';
 
 export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
@@ -80,7 +82,7 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
       this.context.resolveClass(classMapping.class).value,
       classMapping,
     ).value;
-    const operationSetImplementation = getClassMappingById(this.parent, id);
+    const operationSetImplementation = getOwnClassMappingById(this.parent, id);
     assertType(
       operationSetImplementation,
       OperationSetImplementation,
@@ -88,7 +90,7 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
     );
     operationSetImplementation.parameters = classMapping.parameters
       .map((parameter) => {
-        const setImplementation = this.parent.allClassMappings.find(
+        const setImplementation = getAllClassMappings(this.parent).find(
           (cm) => cm.id.value === parameter,
         );
         if (!setImplementation) {
@@ -117,7 +119,7 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
       'Model-to-model class mapping class is missing',
     );
     const pureInstanceSetImplementation = guaranteeType(
-      getClassMappingById(
+      getOwnClassMappingById(
         this.parent,
         V1_getInferredClassMappingId(
           this.context.resolveClass(classMapping.class).value,
@@ -150,7 +152,7 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
       'Flat-data class mapping class is missing',
     );
     const flatDataInstanceSetImplementation = guaranteeType(
-      getClassMappingById(
+      getOwnClassMappingById(
         this.parent,
         V1_getInferredClassMappingId(
           this.context.resolveClass(classMapping.class).value,
@@ -166,7 +168,7 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
             this.context,
             flatDataInstanceSetImplementation,
             flatDataInstanceSetImplementation,
-            this.parent.allEnumerationMappings,
+            getAllEnumerationMappings(this.parent),
           ),
         ),
       ) as AbstractFlatDataPropertyMapping[];
@@ -184,7 +186,7 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
       'Relational class mapping class is missing',
     );
     const rootRelationalInstanceSetImplementation = guaranteeType(
-      getClassMappingById(
+      getOwnClassMappingById(
         this.parent,
         V1_getInferredClassMappingId(
           this.context.resolveClass(classMapping.class).value,
@@ -194,6 +196,10 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
       RootRelationalInstanceSetImplementation,
     );
     rootRelationalInstanceSetImplementation.distinct = classMapping.distinct;
+    if (classMapping.extendsClassMappingId) {
+      rootRelationalInstanceSetImplementation.superSetImplementationId =
+        classMapping.extendsClassMappingId;
+    }
     let mainTableAlias: TableAlias | undefined;
     if (classMapping.mainTable) {
       const relation = this.context.resolveRelation(classMapping.mainTable);
@@ -224,12 +230,12 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
       rootRelationalInstanceSetImplementation,
       this.parent,
       embedded,
-      this.parent.allEnumerationMappings,
+      getAllEnumerationMappings(this.parent),
       tableAliasMap,
     );
     // TODO filterMapping
     // NOTE: why are we adding embedded relational property mappings to class mapping in the backend????
-    if (!mainTableAlias) {
+    if (!mainTableAlias && !classMapping.extendsClassMappingId) {
       const tables = new Set(
         Array.from(tableAliasMap.values()).map((e) => e.relation),
       );
@@ -252,7 +258,10 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
       mainTableAlias.database = Array.from(dbs.values())[0];
       rootRelationalInstanceSetImplementation.mainTableAlias = mainTableAlias;
     }
-    if (!rootRelationalInstanceSetImplementation.primaryKey.length) {
+    if (
+      !rootRelationalInstanceSetImplementation.primaryKey.length &&
+      !classMapping.extendsClassMappingId
+    ) {
       V1_buildRelationalPrimaryKey(rootRelationalInstanceSetImplementation);
     }
     return rootRelationalInstanceSetImplementation;
@@ -266,7 +275,7 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
       'Aggregation-aware class mapping class is missing',
     );
     const aggragetionAwareInstanceSetImplementation = guaranteeType(
-      getClassMappingById(
+      getOwnClassMappingById(
         this.parent,
         V1_getInferredClassMappingId(
           this.context.resolveClass(classMapping.class).value,
@@ -293,7 +302,7 @@ export class V1_ProtocolToMetaModelClassMappingSecondPassBuilder
             this.parent.enumerationMappings,
             new Map<string, TableAlias>(),
             [
-              ...mapping.allClassMappings,
+              ...getAllClassMappings(mapping),
               ...extractClassMappingsFromAggregationAwareClassMappings(mapping),
             ],
             undefined,

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

@@ -19,6 +19,7 @@ import {
   guaranteeNonNullable,
   assertTrue,
   assertType,
+  UnsupportedOperationError,
 } from '@finos/legend-shared';
 import { MODEL_STORE_NAME } from '../../../../../../../MetaModelConst';
 import type { DatabaseType } from '../../../../../../metamodels/pure/packageableElements/store/relational/connection/RelationalDatabaseConnection';
@@ -36,7 +37,10 @@ import type { PackageableElementReference } from '../../../../../../metamodels/p
 import { PackageableElementImplicitReference } from '../../../../../../metamodels/pure/packageableElements/PackageableElementReference';
 import { ModelChainConnection } from '../../../../../../metamodels/pure/packageableElements/store/modelToModel/connection/ModelChainConnection';
 import type { V1_GraphBuilderContext } from '../../../transformation/pureGraph/to/V1_GraphBuilderContext';
-import type { V1_ConnectionVisitor } from '../../../model/packageableElements/connection/V1_Connection';
+import type {
+  V1_Connection,
+  V1_ConnectionVisitor,
+} from '../../../model/packageableElements/connection/V1_Connection';
 import type { V1_JsonModelConnection } from '../../../model/packageableElements/store/modelToModel/connection/V1_JsonModelConnection';
 import type { V1_XmlModelConnection } from '../../../model/packageableElements/store/modelToModel/connection/V1_XmlModelConnection';
 import type { V1_FlatDataConnection } from '../../../model/packageableElements/store/flatData/connection/V1_FlatDataConnection';
@@ -46,6 +50,7 @@ import {
   V1_buildDatasourceSpecification,
   V1_buildAuthenticationStrategy,
 } from '../../../transformation/pureGraph/to/helpers/V1_RelationalConnectionBuilderHelper';
+import type { DSLMapping_PureProtocolProcessorPlugin_Extension } from '../../../../DSLMapping_PureProtocolProcessorPlugin_Extension';
 import type { V1_ModelChainConnection } from '../../../model/packageableElements/store/modelToModel/connection/V1_ModelChainConnection';
 import { V1_buildPostProcessor } from './helpers/V1_PostProcessorBuilderHelper';
 
@@ -63,6 +68,26 @@ export class V1_ProtocolToMetaModelConnectionBuilder
     this.embeddedConnectionStore = embeddedConnectionStore;
   }
 
+  visit_Connection(connection: V1_Connection): Connection {
+    const extraConnectionBuilders = this.context.extensions.plugins.flatMap(
+      (plugin) =>
+        (
+          plugin as DSLMapping_PureProtocolProcessorPlugin_Extension
+        ).V1_getExtraConnectionBuilders?.() ?? [],
+    );
+    for (const builder of extraConnectionBuilders) {
+      const store = this.embeddedConnectionStore;
+      const extraConnection = builder(connection, this.context, store);
+      if (extraConnection) {
+        return extraConnection;
+      }
+    }
+    throw new UnsupportedOperationError(
+      `Can't build new connection: no compatible builder available from plugins`,
+      connection,
+    );
+  }
+
   visit_ConnectionPointer(connection: V1_ConnectionPointer): Connection {
     assertNonNullable(
       connection.connection,

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

@@ -66,6 +66,7 @@ import {
   getRelationalInputType,
   RelationalInputData,
 } from '../../../../../../../metamodels/pure/packageableElements/store/relational/mapping/RelationalInputData';
+import { getAllClassMappings } from '../../../../../../../../helpers/MappingHelper';
 
 export const V1_getInferredClassMappingId = (
   _class: Class,
@@ -285,7 +286,7 @@ export const V1_buildMappingTest = (
 
 export const V1_resolveClassMappingRoot = (mapping: Mapping): void => {
   const classToSetImplMap = new Map<Class, Set<SetImplementation>>();
-  mapping.allClassMappings.forEach((setImpl) => {
+  getAllClassMappings(mapping).forEach((setImpl) => {
     const targetClass = guaranteeNonNullable(setImpl.class.value);
     const setImplsWithTargetClass = classToSetImplMap.get(targetClass);
     if (setImplsWithTargetClass) {
@@ -300,7 +301,11 @@ export const V1_resolveClassMappingRoot = (mapping: Mapping): void => {
     const _classMappings = entries[1];
     if (_classMappings.size === 1) {
       const classMapping = Array.from(_classMappings.values())[0];
-      if (classMapping.root.value === false) {
+      // ensure you are only altering current mapping
+      if (
+        classMapping.root.value === false &&
+        classMapping.parent === mapping
+      ) {
         classMapping.root = InferableMappingElementRootImplicitValue.create(
           true,
           classMapping.root.value,

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

@@ -77,7 +77,7 @@ export const V1_buildRelationalPrimaryKey = (
   if (rootRelational.groupBy) {
     rootRelational.primaryKey = rootRelational.groupBy.columns;
   } else if (!rootRelational.primaryKey.length) {
-    const relation = rootRelational.mainTableAlias.relation.value;
+    const relation = rootRelational.mainTableAlias?.relation.value;
     const mainTable = rootRelational.mainTableAlias;
     let columns: Column[] = [];
     if (relation instanceof Table || relation instanceof View) {
@@ -90,7 +90,9 @@ export const V1_buildRelationalPrimaryKey = (
       // This might cause bugs in the future.
       // We need more (manual) tests for confidence
       mainTableAlias.column = ColumnExplicitReference.create(col);
-      mainTableAlias.alias = mainTable;
+      if (mainTable) {
+        mainTableAlias.alias = mainTable;
+      }
       return mainTableAlias;
     });
   }

package/src/models/protocols/pure/v1/transformation/pureProtocol/V1_PackageableElementSerialization.ts

@@ -98,11 +98,13 @@ export class V1_PackageableElementSerializer
   implements V1_PackageableElementVisitor<PlainObject<V1_PackageableElement>>
 {
   extraElementProtocolSerializers: V1_ElementProtocolSerializer[] = [];
+  plugins: PureProtocolProcessorPlugin[];
 
   constructor(plugins: PureProtocolProcessorPlugin[]) {
     this.extraElementProtocolSerializers = plugins.flatMap(
       (plugin) => plugin.V1_getExtraElementProtocolSerializers?.() ?? [],
     );
+    this.plugins = plugins;
   }
 
   visit_PackageableElement(
@@ -180,7 +182,10 @@ export class V1_PackageableElementSerializer
   visit_PackageableConnection(
     element: V1_PackageableConnection,
   ): PlainObject<V1_PackageableElement> {
-    return serialize(V1_packageableConnectionModelSchema, element);
+    return serialize(
+      V1_packageableConnectionModelSchema(this.plugins),
+      element,
+    );
   }
 
   visit_FileGeneration(
@@ -234,7 +239,7 @@ export const V1_deserializePackageableElement = (
     case V1_SERVICE_ELEMENT_PROTOCOL_TYPE:
       return deserialize(V1_servicedModelSchema, json);
     case V1_PACKAGEABLE_CONNECTION_ELEMENT_PROTOCOL_TYPE:
-      return deserialize(V1_packageableConnectionModelSchema, json);
+      return deserialize(V1_packageableConnectionModelSchema(plugins), json);
     case V1_PACKAGEABLE_RUNTIME_ELEMENT_PROTOCOL_TYPE:
       return deserialize(V1_packageableRuntimeModelSchema, json);
     case V1_FILE_GENERATION_ELEMENT_PROTOCOL_TYPE:

package/src/models/protocols/pure/v1/transformation/pureProtocol/V1_PureProtocolSerialization.ts

@@ -42,7 +42,7 @@ import { V1_PureModelContextComposite } from '../../model/context/V1_PureModelCo
 import { V1_Protocol } from '../../model/V1_Protocol';
 import { V1_AlloySdlc } from '../../model/context/V1_AlloySdlc';
 import type { V1_PureModelContext } from '../../model/context/V1_PureModelContext';
-import { V1_packageableElementPointerDeserrializerSchema } from '../../transformation/pureProtocol/serializationHelpers/V1_CoreSerializationHelper';
+import { V1_packageableElementPointerDeserializerSchema } from '../../transformation/pureProtocol/serializationHelpers/V1_CoreSerializationHelper';
 import type { PureProtocolProcessorPlugin } from '../../../PureProtocolProcessorPlugin';
 import type { Entity } from '@finos/legend-model-storage';
 import { GraphDataDeserializationError } from '../../../../../../graphManager/GraphManagerUtils';
@@ -102,9 +102,10 @@ const alloySdlcSerializationModelSchema = createModelSchema(V1_AlloySdlc, {
   _type: usingConstantValueSchema(V1_SdlcType.ALLOY),
   baseVersion: optional(primitive()),
   version: primitive(),
-  project: primitive(),
+  groupdId: primitive(),
+  artifactId: primitive(),
   packageableElementPointers: list(
-    usingModelSchema(V1_packageableElementPointerDeserrializerSchema),
+    usingModelSchema(V1_packageableElementPointerDeserializerSchema),
   ),
 });