@finos/legend-graph 29.0.5 → 30.0.0

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/to/V1_PropertyMappingBuilder.ts

@@ -82,6 +82,7 @@ import { V1_transformRelationalOperationElement } from '../from/V1_DatabaseTrans
 import { V1_GraphTransformerContextBuilder } from '../from/V1_GraphTransformerContext.js';
 import {
   getAllEnumerationMappings,
+  getAllIncludedMappings,
   getClassMappingById,
   getClassMappingsByClass,
 } from '../../../../../../../graph/helpers/DSL_Mapping_Helper.js';
@@ -90,7 +91,7 @@ import type { AbstractProperty } from '../../../../../../../graph/metamodel/pure
 import { BindingTransformer } from '../../../../../../../graph/metamodel/pure/packageableElements/externalFormat/store/DSL_ExternalFormat_BindingTransformer.js';
 import type { Mapping } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/Mapping.js';
 import { V1_resolveBinding } from './V1_DSL_ExternalFormat_GraphBuilderHelper.js';
-import { TEMPORARY__UnresolvedSetImplementation } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/TEMPORARY__UnresolvedSetImplementation.js';
+import { INTERNAL__UnresolvedSetImplementation } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/INTERNAL__UnresolvedSetImplementation.js';
 import {
   getAssociatedPropertyClass,
   getOwnProperty,
@@ -103,8 +104,9 @@ import type { V1_FlatDataAssociationPropertyMapping } from '../../../model/packa
 import { FlatDataAssociationPropertyMapping } from '../../../../../../../graph/metamodel/pure/packageableElements/store/flatData/mapping/FlatDataAssociationPropertyMapping.js';
 import type { V1_INTERNAL__UnknownPropertyMapping } from '../../../model/packageableElements/mapping/V1_INTERNAL__UnknownPropertyMapping.js';
 import { INTERNAL__UnknownPropertyMapping } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/INTERNAL__UnknownPropertyMapping.js';
+import { INTERNAL__PseudoMapping } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/INTERNAL__PseudoMapping.js';
 
-const TEMPORARY__getClassMappingByIdOrReturnUnresolved = (
+const TEMPORARY__resolveSetImplementationByID = (
   mapping: Mapping,
   id: string,
   context: V1_GraphBuilderContext,
@@ -112,27 +114,34 @@ const TEMPORARY__getClassMappingByIdOrReturnUnresolved = (
   const classMapping = returnUndefOnError(() =>
     getClassMappingById(mapping, id),
   );
+  const isMappingWithUnknownMappingIncludes = getAllIncludedMappings(
+    mapping,
+  ).includes(INTERNAL__PseudoMapping.INSTANCE);
 
   if (!classMapping) {
     const message = `Can't find class mapping with ID '${id}' in mapping '${mapping.path}'`;
     /**
-     * In strict-mode, graph builder will consider this as an error
+     * If the mapping has unknown mapping includes, this kind of problems
+     * might be due to the fact that the class mapping is not reachable due to the system
+     * not knowing how to analyze the unknown mapping include, as such, we will not throw
+     * errors, otherwise, we should in strict-mode
+     *
      * See https://github.com/finos/legend-studio/issues/880
      * See https://github.com/finos/legend-studio/issues/941
      *
      * @discrepancy graph-building
      */
-    if (context.options?.strict) {
+    if (context.options?.strict && !isMappingWithUnknownMappingIncludes) {
       throw new GraphBuilderError(message);
     }
     context.logService.warn(LogEvent.create(message));
-    return new TEMPORARY__UnresolvedSetImplementation(id, mapping);
+    return new INTERNAL__UnresolvedSetImplementation(id, mapping);
   }
 
   return classMapping;
 };
 
-const resolvePropertyMappingSource = (
+const resolvePropertyMappingSourceImplementation = (
   immediateParent: PropertyMappingsImplementation,
   value: V1_PropertyMapping,
   topParent: InstanceSetImplementation | undefined,
@@ -140,7 +149,7 @@ const resolvePropertyMappingSource = (
 ): SetImplementation | undefined => {
   if (immediateParent instanceof AssociationImplementation) {
     if (value.source) {
-      return TEMPORARY__getClassMappingByIdOrReturnUnresolved(
+      return TEMPORARY__resolveSetImplementationByID(
         immediateParent._PARENT,
         value.source,
         context,
@@ -278,12 +287,11 @@ export class V1_PropertyMappingBuilder
     const topParent = guaranteeNonNullable(this.topParent);
     if (propertyType instanceof Class) {
       if (protocol.target) {
-        targetSetImplementation =
-          TEMPORARY__getClassMappingByIdOrReturnUnresolved(
-            topParent._PARENT,
-            protocol.target,
-            this.context,
-          );
+        targetSetImplementation = TEMPORARY__resolveSetImplementationByID(
+          topParent._PARENT,
+          protocol.target,
+          this.context,
+        );
       } else {
         // NOTE: if no there is one non-root class mapping, auto-nominate that as the target set implementation
         targetSetImplementation = getClassMappingsByClass(
@@ -293,7 +301,7 @@ export class V1_PropertyMappingBuilder
       }
     }
     const sourceSetImplementation = protocol.source
-      ? TEMPORARY__getClassMappingByIdOrReturnUnresolved(
+      ? TEMPORARY__resolveSetImplementationByID(
           topParent._PARENT,
           protocol.source,
           this.context,
@@ -385,7 +393,7 @@ export class V1_PropertyMappingBuilder
     const propertyType = property.genericType.value.rawType;
     if (propertyType instanceof Class && protocol.target) {
       targetSetImplementation = this.topParent
-        ? TEMPORARY__getClassMappingByIdOrReturnUnresolved(
+        ? TEMPORARY__resolveSetImplementationByID(
             this.topParent._PARENT,
             protocol.target,
             this.context,
@@ -615,7 +623,7 @@ export class V1_PropertyMappingBuilder
       }
       if (protocol.target) {
         targetSetImplementation = parentMapping
-          ? TEMPORARY__getClassMappingByIdOrReturnUnresolved(
+          ? TEMPORARY__resolveSetImplementationByID(
               parentMapping,
               protocol.target,
               this.context,
@@ -631,7 +639,7 @@ export class V1_PropertyMappingBuilder
       }
     }
     const sourceSetImplementation = guaranteeNonNullable(
-      resolvePropertyMappingSource(
+      resolvePropertyMappingSourceImplementation(
         this.immediateParent,
         protocol,
         this.topParent,
@@ -757,12 +765,11 @@ export class V1_PropertyMappingBuilder
       const parentMapping = this.immediateParent._PARENT;
 
       if (protocol.target) {
-        targetSetImplementation =
-          TEMPORARY__getClassMappingByIdOrReturnUnresolved(
-            parentMapping,
-            protocol.target,
-            this.context,
-          );
+        targetSetImplementation = TEMPORARY__resolveSetImplementationByID(
+          parentMapping,
+          protocol.target,
+          this.context,
+        );
       } else {
         targetSetImplementation = getClassMappingsByClass(
           parentMapping,
@@ -771,7 +778,7 @@ export class V1_PropertyMappingBuilder
       }
     }
     const sourceSetImplementation = guaranteeNonNullable(
-      resolvePropertyMappingSource(
+      resolvePropertyMappingSourceImplementation(
         this.immediateParent,
         protocol,
         this.topParent,
@@ -869,12 +876,11 @@ export class V1_PropertyMappingBuilder
       InferableMappingElementIdExplicitValue.create(id, ''),
       undefined,
     );
-    inline.inlineSetImplementation =
-      TEMPORARY__getClassMappingByIdOrReturnUnresolved(
-        topParent._PARENT,
-        protocol.setImplementationId,
-        this.context,
-      );
+    inline.inlineSetImplementation = TEMPORARY__resolveSetImplementationByID(
+      topParent._PARENT,
+      protocol.setImplementationId,
+      this.context,
+    );
     return inline;
   }
 
@@ -1043,12 +1049,30 @@ export class V1_PropertyMappingBuilder
     const _association = xStoreParent.association.value;
     const property = getOwnProperty(_association, protocol.property.property);
     const sourceSetImplementation = guaranteeNonNullable(
-      this.allClassMappings.find((c) => c.id.value === protocol.source),
-      `Can't find XStore property mapping source implementation with ID '${protocol.source}'`,
-    );
-    const targetSetImplementation = this.allClassMappings.find(
-      (c) => c.id.value === protocol.target,
+      resolvePropertyMappingSourceImplementation(
+        this.immediateParent,
+        protocol,
+        this.topParent,
+        this.context,
+      ),
     );
+    let targetSetImplementation: SetImplementation | undefined;
+    const propertyType = property.genericType.value.rawType;
+    if (propertyType instanceof Class) {
+      const parentMapping = this.immediateParent._PARENT;
+      if (protocol.target) {
+        targetSetImplementation = TEMPORARY__resolveSetImplementationByID(
+          parentMapping,
+          protocol.target,
+          this.context,
+        );
+      } else {
+        targetSetImplementation = getClassMappingsByClass(
+          parentMapping,
+          guaranteeType(propertyType, Class),
+        )[0];
+      }
+    }
     const xStorePropertyMapping = new XStorePropertyMapping(
       xStoreParent,
       PropertyImplicitReference.create(
@@ -1106,12 +1130,32 @@ export class V1_PropertyMappingBuilder
       propertyMapping?.property ??
       this.context.resolveProperty(protocol.property);
 
-    const sourceSetImplementation = this.allClassMappings.find(
-      (c) => c.id.value === protocol.source,
-    );
-    const targetSetImplementation = this.allClassMappings.find(
-      (c) => c.id.value === protocol.target,
+    const sourceSetImplementation = guaranteeNonNullable(
+      resolvePropertyMappingSourceImplementation(
+        this.immediateParent,
+        protocol,
+        this.topParent,
+        this.context,
+      ),
     );
+    let targetSetImplementation: SetImplementation | undefined;
+    const propertyType = property.value.genericType.value.rawType;
+    if (propertyType instanceof Class) {
+      const parentMapping = this.immediateParent._PARENT;
+
+      if (protocol.target) {
+        targetSetImplementation = TEMPORARY__resolveSetImplementationByID(
+          parentMapping,
+          protocol.target,
+          this.context,
+        );
+      } else {
+        targetSetImplementation = getClassMappingsByClass(
+          parentMapping,
+          guaranteeType(propertyType, Class),
+        )[0];
+      }
+    }
 
     const aggregationAwarePropertyMapping = new AggregationAwarePropertyMapping(
       this.topParent ?? this.immediateParent,

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/to/helpers/V1_ConnectionBuilderHelper.ts

@@ -32,14 +32,13 @@ import {
 import { JsonModelConnection } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/modelToModel/connection/JsonModelConnection.js';
 import { XmlModelConnection } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/modelToModel/connection/XmlModelConnection.js';
 import { FlatDataConnection } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/flatData/connection/FlatDataConnection.js';
-import type { Store } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/Store.js';
+import { Store } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/Store.js';
 import { FlatData } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/flatData/model/FlatData.js';
 import { Database } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/relational/model/Database.js';
 import { ModelStore } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/modelToModel/model/ModelStore.js';
 import {
   type PackageableElementReference,
   PackageableElementImplicitReference,
-  PackageableElementExplicitReference,
 } from '../../../../../../../../graph/metamodel/pure/packageableElements/PackageableElementReference.js';
 import { ModelChainConnection } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/modelToModel/connection/ModelChainConnection.js';
 import type { V1_GraphBuilderContext } from '../V1_GraphBuilderContext.js';
@@ -60,7 +59,6 @@ import type { DSL_Mapping_PureProtocolProcessorPlugin_Extension } from '../../..
 import type { V1_ModelChainConnection } from '../../../../model/packageableElements/store/modelToModel/connection/V1_ModelChainConnection.js';
 import { V1_buildPostProcessor } from './V1_PostProcessorBuilderHelper.js';
 import type { V1_INTERNAL__UnknownConnection } from '../../../../model/packageableElements/connection/V1_INTERNAL__UnknownConnection.js';
-import { INTERNAL__PseudoStore } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/INTERNAL__PseudoStore.js';
 import { INTERNAL__UnknownConnection } from '../../../../../../../../graph/metamodel/pure/packageableElements/connection/INTERNAL__UnknownConnection.js';
 
 class V1_ConnectionBuilder implements V1_ConnectionVisitor<Connection> {
@@ -99,9 +97,21 @@ class V1_ConnectionBuilder implements V1_ConnectionVisitor<Connection> {
     connection: V1_INTERNAL__UnknownConnection,
   ): Connection {
     const metamodel = new INTERNAL__UnknownConnection(
-      PackageableElementExplicitReference.create(
-        INTERNAL__PseudoStore.INSTANCE,
-      ),
+      !this.embeddedConnectionStore
+        ? this.context.resolveStore(
+            guaranteeNonNullable(
+              connection.store,
+              `Connection 'store' field is missing`,
+            ),
+          )
+        : connection.store
+        ? this.context.resolveStore(connection.store)
+        : ((): PackageableElementReference<Store> => {
+            if (this.embeddedConnectionStore.value instanceof Store) {
+              return this.embeddedConnectionStore;
+            }
+            throw new Error(`Connection store must be a store`);
+          })(),
     );
     metamodel.content = connection.content;
     return metamodel;

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/to/helpers/V1_MappingBuilderHelper.ts

@@ -215,26 +215,25 @@ export const V1_buildEnumerationMapping = (
 };
 
 export const V1_buildMappingInclude = (
-  mappingInclude: V1_MappingInclude,
+  protocol: V1_MappingInclude,
   context: V1_GraphBuilderContext,
   parentMapping: Mapping,
 ): MappingInclude => {
-  if (mappingInclude instanceof V1_INTERNAL__UnknownMappingInclude) {
-    return new INTERNAL__UnknownMappingInclude(parentMapping);
-  } else if (mappingInclude instanceof V1_MappingIncludeMapping) {
+  if (protocol instanceof V1_INTERNAL__UnknownMappingInclude) {
+    const metamodel = new INTERNAL__UnknownMappingInclude(parentMapping);
+    metamodel.content = protocol.content;
+    return metamodel;
+  } else if (protocol instanceof V1_MappingIncludeMapping) {
     const includedMapping = new MappingIncludeMapping(
       parentMapping,
-      context.resolveMapping(mappingInclude.includedMapping),
+      context.resolveMapping(protocol.includedMapping),
     );
-    if (
-      mappingInclude.sourceDatabasePath &&
-      mappingInclude.targetDatabasePath
-    ) {
+    if (protocol.sourceDatabasePath && protocol.targetDatabasePath) {
       includedMapping.storeSubstitutions.push(
         new SubstituteStore(
           includedMapping,
-          context.resolveStore(mappingInclude.sourceDatabasePath),
-          context.resolveStore(mappingInclude.targetDatabasePath),
+          context.resolveStore(protocol.sourceDatabasePath),
+          context.resolveStore(protocol.targetDatabasePath),
         ),
       );
     }
@@ -247,14 +246,14 @@ export const V1_buildMappingInclude = (
       ).V1_getExtraMappingIncludeBuilders?.() ?? [],
   );
   for (const builder of extraIncludeMappingBuilders) {
-    const builtInclude = builder(mappingInclude, parentMapping, context);
+    const builtInclude = builder(protocol, parentMapping, context);
     if (builtInclude) {
       return builtInclude;
     }
   }
   throw new UnsupportedOperationError(
     `Can't transform mapping include: no compatible transformer available from plugins`,
-    mappingInclude,
+    protocol,
   );
 };
 

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/to/helpers/V1_ServiceBuilderHelper.ts

@@ -166,7 +166,9 @@ export const V1_buildServiceTestSuite = (
 ): ServiceTestSuite => {
   const serviceTestSuite = new ServiceTestSuite();
   serviceTestSuite.id = element.id;
-  serviceTestSuite.testData = buildTestData(element.testData, context);
+  serviceTestSuite.testData = element.testData
+    ? buildTestData(element.testData, context)
+    : undefined;
   serviceTestSuite.tests = element.tests.map((test) =>
     V1_buildServiceTest(
       guaranteeType(test, V1_ServiceTest),

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/to/helpers/V1_ValueSpecificationBuilderHelper.ts

@@ -38,6 +38,7 @@ import {
   type GraphFetchTree,
   PropertyGraphFetchTree,
   RootGraphFetchTree,
+  SubTypeGraphFetchTree,
   GraphFetchTreeInstanceValue,
 } from '../../../../../../../../graph/metamodel/pure/valueSpecification/GraphFetchTree.js';
 import { ValueSpecification } from '../../../../../../../../graph/metamodel/pure/valueSpecification/ValueSpecification.js';
@@ -99,6 +100,7 @@ import {
   KeyExpression,
   KeyExpressionInstanceValue,
 } from '../../../../../../../../graph/metamodel/pure/valueSpecification/KeyExpressionInstanceValue.js';
+import { V1_SubTypeGraphFetchTree } from '../../../../model/valueSpecification/raw/classInstance/graph/V1_SubTypeGraphFetchTree.js';
 
 const buildPrimtiveInstanceValue = (
   type: PRIMITIVE_TYPE,
@@ -691,6 +693,13 @@ export function V1_buildGraphFetchTree(
       openVariables,
       processingContext,
     );
+  } else if (graphFetchTree instanceof V1_SubTypeGraphFetchTree) {
+    return buildSubTypeGraphFetchTree(
+      graphFetchTree,
+      context,
+      openVariables,
+      processingContext,
+    );
   }
   throw new UnsupportedOperationError(
     `Can't build graph fetch tree`,
@@ -791,7 +800,7 @@ function buildRootGraphFetchTree(
   processingContext: V1_ProcessingContext,
 ): RootGraphFetchTree {
   const _class = context.resolveClass(rootGraphFetchTree.class);
-  const children = rootGraphFetchTree.subTrees.map((subTree) =>
+  const subTreeChildren = rootGraphFetchTree.subTrees.map((subTree) =>
     V1_buildGraphFetchTree(
       subTree,
       context,
@@ -800,9 +809,42 @@ function buildRootGraphFetchTree(
       processingContext,
     ),
   );
+  const subTypeTreeChildren = rootGraphFetchTree.subTypeTrees.map(
+    (subTypeTree) =>
+      buildSubTypeGraphFetchTree(
+        subTypeTree,
+        context,
+        openVariables,
+        processingContext,
+      ),
+  );
   const _rootGraphFetchTree = new RootGraphFetchTree(
     PackageableElementExplicitReference.create(_class.value),
   );
-  _rootGraphFetchTree.subTrees = children;
+  _rootGraphFetchTree.subTrees = subTreeChildren;
+  _rootGraphFetchTree.subTypeTrees = subTypeTreeChildren;
   return _rootGraphFetchTree;
 }
+
+function buildSubTypeGraphFetchTree(
+  subTypeGraphFetchTree: V1_SubTypeGraphFetchTree,
+  context: V1_GraphBuilderContext,
+  openVariables: string[],
+  processingContext: V1_ProcessingContext,
+): SubTypeGraphFetchTree {
+  const subTypeClass = context.resolveClass(subTypeGraphFetchTree.subTypeClass);
+  const children = subTypeGraphFetchTree.subTrees.map((subTree) =>
+    V1_buildGraphFetchTree(
+      subTree,
+      context,
+      subTypeClass.value,
+      openVariables,
+      processingContext,
+    ),
+  );
+  const _subTypeGraphFetchTree = new SubTypeGraphFetchTree(
+    PackageableElementExplicitReference.create(subTypeClass.value),
+  );
+  _subTypeGraphFetchTree.subTrees = children;
+  return _subTypeGraphFetchTree;
+}

package/src/graph-manager/protocol/pure/v1/transformation/pureProtocol/V1_PackageableElementSerialization.ts

@@ -20,6 +20,7 @@ import {
   UnsupportedOperationError,
   assertErrorThrown,
   guaranteeIsString,
+  isString,
 } from '@finos/legend-shared';
 import type { V1_PackageableConnection } from '../../model/packageableElements/connection/V1_PackageableConnection.js';
 import type { V1_Association } from '../../model/packageableElements/domain/V1_Association.js';
@@ -89,6 +90,7 @@ import {
   V1_MEASURE_ELEMENT_PROTOCOL_TYPE,
   V1_profileModelSchema,
   V1_PROFILE_ELEMENT_PROTOCOL_TYPE,
+  V1_INTERNAL__UnknownFunctionActivatorModelSchema,
 } from './serializationHelpers/V1_DomainSerializationHelper.js';
 import type {
   PureProtocolProcessorPlugin,
@@ -107,6 +109,8 @@ import {
 import type { V1_ExecutionEnvironmentInstance } from '../../model/packageableElements/service/V1_ExecutionEnvironmentInstance.js';
 import { V1_INTERNAL__UnknownPackageableElement } from '../../model/packageableElements/V1_INTERNAL__UnknownPackageableElement.js';
 import type { V1_INTERNAL__UnknownFunctionActivator } from '../../model/packageableElements/function/V1_INTERNAL__UnknownFunctionActivator.js';
+import type { SubtypeInfo } from '../../../../../action/protocol/ProtocolInfo.js';
+import { V1_INTERNAL__UnknownStore } from '../../model/packageableElements/store/V1_INTERNAL__UnknownStore.js';
 
 class V1_PackageableElementSerializer
   implements V1_PackageableElementVisitor<PlainObject<V1_PackageableElement>>
@@ -147,6 +151,12 @@ class V1_PackageableElementSerializer
     return element.content;
   }
 
+  visit_INTERNAL__UnknownStore(
+    element: V1_INTERNAL__UnknownStore,
+  ): PlainObject<V1_PackageableElement> {
+    return element.content;
+  }
+
   visit_Profile(element: V1_Profile): PlainObject<V1_PackageableElement> {
     return serialize(V1_profileModelSchema, element);
   }
@@ -257,6 +267,7 @@ export const V1_serializePackageableElement = (
 export const V1_deserializePackageableElement = (
   json: PlainObject<V1_PackageableElement>,
   plugins: PureProtocolProcessorPlugin[],
+  subtypeInfo?: SubtypeInfo | undefined,
 ): V1_PackageableElement => {
   const packagePath = guaranteeIsString(
     json.package,
@@ -315,6 +326,24 @@ export const V1_deserializePackageableElement = (
           }
         }
 
+        if (subtypeInfo && isString(json._type)) {
+          if (subtypeInfo.functionActivatorSubtypes.includes(json._type)) {
+            const protocol = deserialize(
+              V1_INTERNAL__UnknownFunctionActivatorModelSchema,
+              json,
+            );
+            protocol.content = json;
+            return protocol;
+          }
+          if (subtypeInfo.storeSubtypes.includes(json._type)) {
+            const protocol = new V1_INTERNAL__UnknownStore();
+            protocol.name = name;
+            protocol.package = packagePath;
+            protocol.content = json;
+            return protocol;
+          }
+        }
+
         // Fall back to create unknown stub if not supported
         const protocol = new V1_INTERNAL__UnknownPackageableElement();
         protocol.name = name;

package/src/graph-manager/protocol/pure/v1/transformation/pureProtocol/V1_PureProtocolSerialization.ts

@@ -48,6 +48,7 @@ import type { PureProtocolProcessorPlugin } from '../../../PureProtocolProcessor
 import type { Entity } from '@finos/legend-storage';
 import { GraphDataDeserializationError } from '../../../../../../graph-manager/GraphManagerUtils.js';
 import { V1_PureModelContextText } from '../../model/context/V1_PureModelContextText.js';
+import type { SubtypeInfo } from '../../../../../action/protocol/ProtocolInfo.js';
 
 enum V1_SDLCType {
   ALLOY = 'alloy',
@@ -64,6 +65,7 @@ export const V1_entitiesToPureModelContextData = async (
   entities: Entity[] | undefined,
   graph: V1_PureModelContextData,
   plugins: PureProtocolProcessorPlugin[],
+  subtypeInfo?: SubtypeInfo | undefined,
   /**
    * FIXME: to be deleted when most users have migrated to using full function signature as function name
    * Currently, SDLC store many functions in legacy form (entity path does
@@ -87,6 +89,7 @@ export const V1_entitiesToPureModelContextData = async (
         const element = V1_deserializePackageableElement(
           entity.content as PlainObject<V1_PackageableElement>,
           plugins,
+          subtypeInfo,
         );
         TEMPORARY__entityPathIndex?.set(element.path, entity.path);
         return element;
@@ -164,6 +167,7 @@ const V1_pureModelContextCompositeModelSchema = createModelSchema(
 
 export const V1_setupPureModelContextDataSerialization = (
   plugins: PureProtocolProcessorPlugin[],
+  subtypeInfo?: SubtypeInfo | undefined,
 ): void => {
   createModelSchema(V1_PureModelContextData, {
     _type: usingConstantValueSchema(V1_PureModelContextType.DATA),
@@ -173,7 +177,7 @@ export const V1_setupPureModelContextDataSerialization = (
         (element: V1_PackageableElement) =>
           V1_serializePackageableElement(element, plugins),
         (element: PlainObject<V1_PackageableElement>) =>
-          V1_deserializePackageableElement(element, plugins),
+          V1_deserializePackageableElement(element, plugins, subtypeInfo),
       ),
     ),
     serializer: usingModelSchema(V1_Protocol.serialization.schema),
@@ -196,7 +200,7 @@ export const V1_serializePureModelContext = (
     return serialize(V1_pureModelContextPointerModelSchema, pureModelContext);
   } else if (pureModelContext instanceof V1_PureModelContextData) {
     const rawPMCD = V1_serializePureModelContextData(pureModelContext);
-    if (pureModelContext.INTERNAL__rawDependencyEntities.length) {
+    if (pureModelContext.INTERNAL__rawDependencyEntities?.length) {
       rawPMCD.elements = [
         ...(rawPMCD as { elements: PlainObject[] }).elements,
         ...pureModelContext.INTERNAL__rawDependencyEntities.map(

package/src/graph-manager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_ConnectionSerializationHelper.ts

@@ -630,6 +630,13 @@ export const V1_deserializeAuthenticationStrategy = (
   }
 };
 
+const V1_INTERNAL__UnknownConnectionModelSchema = createModelSchema(
+  V1_INTERNAL__UnknownConnection,
+  {
+    store: alias('element', optional(primitive())),
+  },
+);
+
 export const V1_serializeConnectionValue = (
   protocol: V1_Connection,
   allowPointer: boolean,
@@ -711,8 +718,10 @@ export const V1_deserializeConnectionValue = (
       }
 
       // Fall back to create unknown stub if not supported
-      const protocol = new V1_INTERNAL__UnknownConnection();
-      protocol.store = undefined;
+      const protocol = deserialize(
+        V1_INTERNAL__UnknownConnectionModelSchema,
+        json,
+      );
       protocol.content = json;
       return protocol;
     }

package/src/graph-manager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_MappingSerializationHelper.ts

@@ -267,8 +267,8 @@ const rootRelationalClassMappingModelSchema = createModelSchema(
   {
     _type: usingConstantValueSchema(V1_ClassMappingType.ROOT_RELATIONAL),
     class: primitive(),
-    extendsClassMappingId: optional(primitive()),
     distinct: primitive(),
+    extendsClassMappingId: optional(primitive()),
     filter: usingModelSchema(V1_filterMappingModelSchema),
     groupBy: customList(
       V1_serializeRelationalOperationElement,

package/src/graph-manager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_ServiceSerializationHelper.ts

@@ -34,6 +34,7 @@ import {
   customListWithSchema,
   customEquivalentList,
   customList,
+  optionalCustomUsingModelSchema,
 } from '@finos/legend-shared';
 import {
   type V1_ServiceExecution,
@@ -164,7 +165,7 @@ export const V1_serviceTestSuiteModelSchema = (
   createModelSchema(V1_ServiceTestSuite, {
     _type: usingConstantValueSchema(V1_TestSuiteType.SERVICE_TEST_SUITE),
     id: primitive(),
-    testData: usingModelSchema(V1_testDataModelSchema(plugins)),
+    testData: optionalCustomUsingModelSchema(V1_testDataModelSchema(plugins)),
     tests: list(
       custom(
         (val) => V1_serializeAtomicTest(val, plugins),