@finos/legend-graph 16.0.0 → 17.0.1

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

@@ -63,7 +63,7 @@ import {
   PureListInstanceValue,
   CollectionInstanceValue,
 } from '../../../../../../../../graph/metamodel/pure/valueSpecification/InstanceValue.js';
-import { Multiplicity } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/Multiplicity.js';
+import type { Multiplicity } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/Multiplicity.js';
 import type { Type } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/Type.js';
 import { PropertyExplicitReference } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/PropertyReference.js';
 import { PackageableElementExplicitReference } from '../../../../../../../../graph/metamodel/pure/packageableElements/PackageableElementReference.js';
@@ -168,7 +168,7 @@ export class V1_ValueSpecificationBuilder
   visit_Variable(variable: V1_Variable): ValueSpecification {
     this.openVariables.push(variable.name);
     if (variable.class && variable.multiplicity) {
-      const multiplicity = new Multiplicity(
+      const multiplicity = this.context.graph.getMultiplicity(
         variable.multiplicity.lowerBound,
         variable.multiplicity.upperBound,
       );
@@ -264,7 +264,7 @@ export class V1_ValueSpecificationBuilder
       ),
     );
     const instance = new CollectionInstanceValue(
-      new Multiplicity(
+      this.context.graph.getMultiplicity(
         valueSpecification.multiplicity.lowerBound,
         valueSpecification.multiplicity.upperBound,
       ),
@@ -380,7 +380,7 @@ export class V1_ValueSpecificationBuilder
       PRIMITIVE_TYPE.INTEGER,
       valueSpecification.values,
       this.context,
-      new Multiplicity(
+      this.context.graph.getMultiplicity(
         valueSpecification.multiplicity.lowerBound,
         valueSpecification.multiplicity.upperBound,
       ),
@@ -392,7 +392,7 @@ export class V1_ValueSpecificationBuilder
       PRIMITIVE_TYPE.DECIMAL,
       valueSpecification.values,
       this.context,
-      new Multiplicity(
+      this.context.graph.getMultiplicity(
         valueSpecification.multiplicity.lowerBound,
         valueSpecification.multiplicity.upperBound,
       ),
@@ -404,7 +404,7 @@ export class V1_ValueSpecificationBuilder
       PRIMITIVE_TYPE.STRING,
       valueSpecification.values,
       this.context,
-      new Multiplicity(
+      this.context.graph.getMultiplicity(
         valueSpecification.multiplicity.lowerBound,
         valueSpecification.multiplicity.upperBound,
       ),
@@ -416,7 +416,7 @@ export class V1_ValueSpecificationBuilder
       PRIMITIVE_TYPE.BOOLEAN,
       valueSpecification.values,
       this.context,
-      new Multiplicity(
+      this.context.graph.getMultiplicity(
         valueSpecification.multiplicity.lowerBound,
         valueSpecification.multiplicity.upperBound,
       ),
@@ -428,7 +428,7 @@ export class V1_ValueSpecificationBuilder
       PRIMITIVE_TYPE.FLOAT,
       valueSpecification.values,
       this.context,
-      new Multiplicity(
+      this.context.graph.getMultiplicity(
         valueSpecification.multiplicity.lowerBound,
         valueSpecification.multiplicity.upperBound,
       ),
@@ -440,7 +440,7 @@ export class V1_ValueSpecificationBuilder
       PRIMITIVE_TYPE.DATETIME,
       valueSpecification.values,
       this.context,
-      new Multiplicity(
+      this.context.graph.getMultiplicity(
         valueSpecification.multiplicity.lowerBound,
         valueSpecification.multiplicity.upperBound,
       ),
@@ -452,7 +452,7 @@ export class V1_ValueSpecificationBuilder
       PRIMITIVE_TYPE.STRICTDATE,
       valueSpecification.values,
       this.context,
-      new Multiplicity(
+      this.context.graph.getMultiplicity(
         valueSpecification.multiplicity.lowerBound,
         valueSpecification.multiplicity.upperBound,
       ),
@@ -464,7 +464,7 @@ export class V1_ValueSpecificationBuilder
       PRIMITIVE_TYPE.STRICTTIME,
       valueSpecification.values,
       this.context,
-      new Multiplicity(
+      this.context.graph.getMultiplicity(
         valueSpecification.multiplicity.lowerBound,
         valueSpecification.multiplicity.upperBound,
       ),
@@ -476,7 +476,7 @@ export class V1_ValueSpecificationBuilder
       PRIMITIVE_TYPE.LATESTDATE,
       [],
       this.context,
-      new Multiplicity(
+      this.context.graph.getMultiplicity(
         valueSpecification.multiplicity.lowerBound,
         valueSpecification.multiplicity.upperBound,
       ),

package/src/graphManager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_ConnectionSerializationHelper.ts

@@ -66,8 +66,8 @@ import {
   V1_MiddleTierUsernamePasswordAuthenticationStrategy,
 } from '../../../model/packageableElements/store/relational/connection/V1_AuthenticationStrategy.js';
 import type { PureProtocolProcessorPlugin } from '../../../../PureProtocolProcessorPlugin.js';
-import type { StoreRelational_PureProtocolProcessorPlugin_Extension } from '../../../../StoreRelational_PureProtocolProcessorPlugin_Extension.js';
-import type { DSLMapping_PureProtocolProcessorPlugin_Extension } from '../../../../DSLMapping_PureProtocolProcessorPlugin_Extension.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 { V1_ConnectionPointer } from '../../../model/packageableElements/connection/V1_ConnectionPointer.js';
 
 export const V1_PACKAGEABLE_CONNECTION_ELEMENT_PROTOCOL_TYPE = 'connection';
@@ -279,7 +279,7 @@ export const V1_serializeDatasourceSpecification = (
     plugins.flatMap(
       (plugin) =>
         (
-          plugin as StoreRelational_PureProtocolProcessorPlugin_Extension
+          plugin as STO_Relational_PureProtocolProcessorPlugin_Extension
         ).V1_getExtraConnectionDatasourceSpecificationProtocolSerializers?.() ??
         [],
     );
@@ -319,7 +319,7 @@ export const V1_deserializeDatasourceSpecification = (
         plugins.flatMap(
           (plugin) =>
             (
-              plugin as StoreRelational_PureProtocolProcessorPlugin_Extension
+              plugin as STO_Relational_PureProtocolProcessorPlugin_Extension
             ).V1_getExtraConnectionDatasourceSpecificationProtocolDeserializers?.() ??
             [],
         );
@@ -482,7 +482,7 @@ export const V1_serializeAuthenticationStrategy = (
     plugins.flatMap(
       (plugin) =>
         (
-          plugin as StoreRelational_PureProtocolProcessorPlugin_Extension
+          plugin as STO_Relational_PureProtocolProcessorPlugin_Extension
         ).V1_getExtraConnectionAuthenticationStrategyProtocolSerializers?.() ??
         [],
     );
@@ -544,7 +544,7 @@ export const V1_deserializeAuthenticationStrategy = (
         plugins.flatMap(
           (plugin) =>
             (
-              plugin as StoreRelational_PureProtocolProcessorPlugin_Extension
+              plugin as STO_Relational_PureProtocolProcessorPlugin_Extension
             ).V1_getExtraConnectionAuthenticationStrategyProtocolDeserializers?.() ??
             [],
         );
@@ -587,7 +587,7 @@ export const V1_serializeConnectionValue = (
   const extraConnectionProtocolSerializers = plugins.flatMap(
     (plugin) =>
       (
-        plugin as DSLMapping_PureProtocolProcessorPlugin_Extension
+        plugin as DSL_Mapping_PureProtocolProcessorPlugin_Extension
       ).V1_getExtraConnectionProtocolSerializers?.() ?? [],
   );
   for (const serializer of extraConnectionProtocolSerializers) {
@@ -629,7 +629,7 @@ export const V1_deserializeConnectionValue = (
       const extraConnectionProtocolDeserializers = plugins.flatMap(
         (plugin) =>
           (
-            plugin as DSLMapping_PureProtocolProcessorPlugin_Extension
+            plugin as DSL_Mapping_PureProtocolProcessorPlugin_Extension
           ).V1_getExtraConnectionProtocolDeserializers?.() ?? [],
       );
       for (const deserializer of extraConnectionProtocolDeserializers) {

package/src/graphManager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/{V1_DSLExternalFormat_ProtocolHelper.ts → V1_DSL_ExternalFormat_ProtocolHelper.ts}

@@ -28,12 +28,12 @@ import {
   serialize,
   deserialize,
 } from 'serializr';
-import { V1_ExternalFormatConnection } from '../../../model/packageableElements/externalFormat/connection/V1_DSLExternalFormat_ExternalFormatConnection.js';
-import { V1_UrlStream } from '../../../model/packageableElements/externalFormat/connection/V1_DSLExternalFormat_UrlStream.js';
-import { V1_Schema } from '../../../model/packageableElements/externalFormat/schemaSet/V1_DSLExternalFormat_Schema.js';
-import { V1_SchemaSet } from '../../../model/packageableElements/externalFormat/schemaSet/V1_DSLExternalFormat_SchemaSet.js';
-import { V1_Binding } from '../../../model/packageableElements/externalFormat/store/V1_DSLExternalFormat_Binding.js';
-import { V1_ModelUnit } from '../../../model/packageableElements/externalFormat/store/V1_DSLExternalFormat_ModelUnit.js';
+import { V1_ExternalFormatConnection } from '../../../model/packageableElements/externalFormat/connection/V1_DSL_ExternalFormat_ExternalFormatConnection.js';
+import { V1_UrlStream } from '../../../model/packageableElements/externalFormat/connection/V1_DSL_ExternalFormat_UrlStream.js';
+import { V1_Schema } from '../../../model/packageableElements/externalFormat/schemaSet/V1_DSL_ExternalFormat_Schema.js';
+import { V1_SchemaSet } from '../../../model/packageableElements/externalFormat/schemaSet/V1_DSL_ExternalFormat_SchemaSet.js';
+import { V1_Binding } from '../../../model/packageableElements/externalFormat/store/V1_DSL_ExternalFormat_Binding.js';
+import { V1_ModelUnit } from '../../../model/packageableElements/externalFormat/store/V1_DSL_ExternalFormat_ModelUnit.js';
 
 export const V1_SCHEMA_SET_ELEMENT_PROTOCOL_TYPE = 'externalFormatSchemaSet';
 export const V1_BINDING_ELEMENT_PROTOCOL_TYPE = 'binding';

package/src/graphManager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_DataElementSerializationHelper.ts

@@ -34,7 +34,7 @@ import {
   optional,
   list,
 } from 'serializr';
-import type { DSLData_PureProtocolProcessorPlugin_Extension } from '../../../../DSLData_PureProtocolProcessorPlugin_Extension.js';
+import type { DSL_Data_PureProtocolProcessorPlugin_Extension } from '../../../../DSL_Data_PureProtocolProcessorPlugin_Extension.js';
 import type { PureProtocolProcessorPlugin } from '../../../../PureProtocolProcessorPlugin.js';
 import {
   type V1_EmbeddedData,
@@ -119,7 +119,7 @@ export const V1_serializeEmbeddedDataType = (
   const extraEmbeddedDataSerializers = plugins.flatMap(
     (plugin) =>
       (
-        plugin as DSLData_PureProtocolProcessorPlugin_Extension
+        plugin as DSL_Data_PureProtocolProcessorPlugin_Extension
       ).V1_getExtraEmbeddedDataProtocolSerializers?.() ?? [],
   );
   for (const serializer of extraEmbeddedDataSerializers) {
@@ -152,7 +152,7 @@ export const V1_deserializeEmbeddedDataType = (
       const extraEmbeddedDataProtocolDeserializers = plugins.flatMap(
         (plugin) =>
           (
-            plugin as DSLData_PureProtocolProcessorPlugin_Extension
+            plugin as DSL_Data_PureProtocolProcessorPlugin_Extension
           ).V1_getExtraEmbeddedDataProtocolDeserializers?.() ?? [],
       );
       for (const deserializer of extraEmbeddedDataProtocolDeserializers) {

package/src/graphManager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_MappingSerializationHelper.ts

@@ -97,11 +97,13 @@ import type { V1_AbstractFlatDataPropertyMapping } from '../../../model/packagea
 import { V1_XStorePropertyMapping } from '../../../model/packageableElements/mapping/xStore/V1_XStorePropertyMapping.js';
 import { V1_XStoreAssociationMapping } from '../../../model/packageableElements/mapping/xStore/V1_XStoreAssociationMapping.js';
 import { V1_RelationalInputData } from '../../../model/packageableElements/store/relational/mapping/V1_RelationalInputData.js';
-import type { DSLMapping_PureProtocolProcessorPlugin_Extension } from '../../../../DSLMapping_PureProtocolProcessorPlugin_Extension.js';
+import type { DSL_Mapping_PureProtocolProcessorPlugin_Extension } from '../../../../DSL_Mapping_PureProtocolProcessorPlugin_Extension.js';
 import type { PureProtocolProcessorPlugin } from '../../../../PureProtocolProcessorPlugin.js';
-import { V1_BindingTransformer } from '../../../model/packageableElements/externalFormat/store/V1_BindingTransformer.js';
+import { V1_BindingTransformer } from '../../../model/packageableElements/externalFormat/store/V1_DSL_ExternalFormat_BindingTransformer.js';
 import { V1_MergeOperationClassMapping } from '../../../model/packageableElements/mapping/V1_MergeOperationClassMapping.js';
 import type { V1_RelationalOperationElement } from '../../../model/packageableElements/store/relational/model/V1_RelationalOperationElement.js';
+import { V1_FlatDataAssociationMapping } from '../../../model/packageableElements/store/flatData/mapping//V1_FlatDataAssociationMapping.js';
+import { V1_FlatDataAssociationPropertyMapping } from '../../../model/packageableElements/store/flatData/mapping/V1_FlatDataAssociationPropertyMapping.js';
 
 enum V1_ClassMappingType {
   OPERATION = 'operation',
@@ -116,6 +118,7 @@ enum V1_ClassMappingType {
 enum V1_PropertyMappingType {
   PURE = 'purePropertyMapping',
   FLAT_DATA = 'flatDataPropertyMapping',
+  ASSOCIATION_FLAT_DATA = 'flatDataAssociationPropertyMapping',
   EMBEDDED_FLAT_DATA = 'embeddedFlatDataPropertyMapping',
   RELATIONAL = 'relationalPropertyMapping',
   EMBEDDED_RELATIONAL = 'embeddedPropertyMapping',
@@ -315,6 +318,20 @@ const relationalPropertyMappingModelSchema = createModelSchema(
   },
 );
 
+const flatDataAssociationPropertyMappingModelSchema = createModelSchema(
+  V1_FlatDataAssociationPropertyMapping,
+  {
+    _type: usingConstantValueSchema(
+      V1_PropertyMappingType.ASSOCIATION_FLAT_DATA,
+    ),
+    flatData: primitive(),
+    property: usingModelSchema(V1_propertyPointerModelSchema),
+    sectionName: primitive(),
+    source: optional(primitive()),
+    target: optional(primitive()),
+  },
+);
+
 const embeddedRelationalPropertyMappingModelSchema = createModelSchema(
   V1_EmbeddedRelationalPropertyMapping,
   {
@@ -644,7 +661,7 @@ function V1_serializeClassMapping(
     const extraClassMappingSerializers = plugins.flatMap(
       (plugin) =>
         (
-          plugin as DSLMapping_PureProtocolProcessorPlugin_Extension
+          plugin as DSL_Mapping_PureProtocolProcessorPlugin_Extension
         ).V1_getExtraClassMappingSerializers?.() ?? [],
     );
     for (const serializer of extraClassMappingSerializers) {
@@ -684,7 +701,7 @@ function V1_deserializeClassMapping(
         const extraClassMappingDeserializers = plugins.flatMap(
           (plugin) =>
             (
-              plugin as DSLMapping_PureProtocolProcessorPlugin_Extension
+              plugin as DSL_Mapping_PureProtocolProcessorPlugin_Extension
             ).V1_getExtraClassMappingDeserializers?.() ?? [],
         );
         for (const deserializer of extraClassMappingDeserializers) {
@@ -824,6 +841,7 @@ const V1_mappingTestModelSchema = createModelSchema(V1_MappingTest, {
 enum V1_AssociationMappingType {
   RELATIONAL = 'relational',
   XSTORE = 'xStore',
+  FLAT_DATA = 'flatData',
 }
 
 const V1_serializeAssociationPropertMapping = (
@@ -833,6 +851,8 @@ const V1_serializeAssociationPropertMapping = (
     return serialize(relationalPropertyMappingModelSchema, protocol);
   } else if (protocol instanceof V1_XStorePropertyMapping) {
     return serialize(xStorePropertyMappingModelSchema, protocol);
+  } else if (protocol instanceof V1_FlatDataAssociationPropertyMapping) {
+    return serialize(flatDataAssociationPropertyMappingModelSchema, protocol);
   }
   return SKIP;
 };
@@ -845,6 +865,8 @@ const V1_deserializeAssociationPropertMapping = (
       return deserialize(relationalPropertyMappingModelSchema, json);
     case V1_PropertyMappingType.XSTORE:
       return deserialize(xStorePropertyMappingModelSchema, json);
+    case V1_PropertyMappingType.ASSOCIATION_FLAT_DATA:
+      return deserialize(flatDataAssociationPropertyMappingModelSchema, json);
     default:
       return SKIP;
   }
@@ -866,6 +888,22 @@ const relationalAssociationMappingModelschema = createModelSchema(
   },
 );
 
+const flatDataAssociationMappingModelschema = createModelSchema(
+  V1_FlatDataAssociationMapping,
+  {
+    _type: usingConstantValueSchema(V1_AssociationMappingType.FLAT_DATA),
+    association: primitive(),
+    id: optional(primitive()),
+    propertyMappings: list(
+      custom(
+        (val) => V1_serializeAssociationPropertMapping(val),
+        (val) => V1_deserializeAssociationPropertMapping(val),
+      ),
+    ),
+    stores: list(primitive()),
+  },
+);
+
 const xStoreAssociationMappingModelschema = createModelSchema(
   V1_XStoreAssociationMapping,
   {
@@ -889,6 +927,8 @@ const V1_serializeAssociationMapping = (
     return serialize(relationalAssociationMappingModelschema, protocol);
   } else if (protocol instanceof V1_XStoreAssociationMapping) {
     return serialize(xStoreAssociationMappingModelschema, protocol);
+  } else if (protocol instanceof V1_FlatDataAssociationMapping) {
+    return serialize(flatDataAssociationMappingModelschema, protocol);
   }
   throw new UnsupportedOperationError(
     `Can't serialize association mapping`,
@@ -904,6 +944,8 @@ const V1_deserializeAssociationMapping = (
       return deserialize(relationalAssociationMappingModelschema, json);
     case V1_AssociationMappingType.XSTORE:
       return deserialize(xStoreAssociationMappingModelschema, json);
+    case V1_AssociationMappingType.FLAT_DATA:
+      return deserialize(flatDataAssociationMappingModelschema, json);
     default:
       throw new UnsupportedOperationError(
         `Can't deserialize association mapping of type '${json._type}'`,

package/src/graphManager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_MilestoningSerializationHelper.ts

@@ -31,7 +31,7 @@ import { V1_BusinessSnapshotMilestoning } from '../../../model/packageableElemen
 import type { V1_Milestoning } from '../../../model/packageableElements/store/relational/model/milestoning/V1_Milestoning.js';
 import { V1_ProcessingMilestoning } from '../../../model/packageableElements/store/relational/model/milestoning/V1_ProcessingMilestoning.js';
 import type { PureProtocolProcessorPlugin } from '../../../../PureProtocolProcessorPlugin.js';
-import type { StoreRelational_PureProtocolProcessorPlugin_Extension } from '../../../../StoreRelational_PureProtocolProcessorPlugin_Extension.js';
+import type { STO_Relational_PureProtocolProcessorPlugin_Extension } from '../../../../STO_Relational_PureProtocolProcessorPlugin_Extension.js';
 import {
   V1_deserializeRawValueSpecification,
   V1_serializeRawValueSpecification,
@@ -99,7 +99,7 @@ export const V1_serializeMilestoning = (
   const extraMilestoningProtocolSerializers = plugins.flatMap(
     (plugin) =>
       (
-        plugin as StoreRelational_PureProtocolProcessorPlugin_Extension
+        plugin as STO_Relational_PureProtocolProcessorPlugin_Extension
       ).V1_getExtraMilestoningProtocolSerializers?.() ?? [],
   );
   for (const serializer of extraMilestoningProtocolSerializers) {
@@ -129,7 +129,7 @@ export const V1_deserializeMilestoning = (
       const extraMilestoningProtocolDeserializers = plugins.flatMap(
         (plugin) =>
           (
-            plugin as StoreRelational_PureProtocolProcessorPlugin_Extension
+            plugin as STO_Relational_PureProtocolProcessorPlugin_Extension
           ).V1_getExtraMilestoningProtocolDeserializers?.() ?? [],
       );
       for (const deserializer of extraMilestoningProtocolDeserializers) {

package/src/graphManager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_PostProcessorSerializationHelper.ts

@@ -36,7 +36,7 @@ import {
 } from '@finos/legend-shared';
 import { V1_MapperPostProcessor } from '../../../model/packageableElements/store/relational/connection/postprocessor/V1_MapperPostProcessor.js';
 import type { PureProtocolProcessorPlugin } from '../../../../PureProtocolProcessorPlugin.js';
-import type { StoreRelational_PureProtocolProcessorPlugin_Extension } from '../../../../StoreRelational_PureProtocolProcessorPlugin_Extension.js';
+import type { STO_Relational_PureProtocolProcessorPlugin_Extension } from '../../../../STO_Relational_PureProtocolProcessorPlugin_Extension.js';
 
 enum V1_MapperType {
   TABLE = 'table',
@@ -109,7 +109,7 @@ export const V1_serializePostProcessor = (
   const extraPostprocessorProtocolSerializers = plugins.flatMap(
     (plugin) =>
       (
-        plugin as StoreRelational_PureProtocolProcessorPlugin_Extension
+        plugin as STO_Relational_PureProtocolProcessorPlugin_Extension
       ).V1_getExtraConnectionPostProcessorProtocolSerializers?.() ?? [],
   );
   for (const serializer of extraPostprocessorProtocolSerializers) {
@@ -135,7 +135,7 @@ export const V1_deserializePostProcessor = (
       const extraPostprocessorProtocolDeserializers = plugins.flatMap(
         (plugin) =>
           (
-            plugin as StoreRelational_PureProtocolProcessorPlugin_Extension
+            plugin as STO_Relational_PureProtocolProcessorPlugin_Extension
           ).V1_getExtraConnectionPostProcessorProtocolDeserializers?.() ?? [],
       );
       for (const deserializer of extraPostprocessorProtocolDeserializers) {

package/src/graphManager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_ServiceSerializationHelper.ts

@@ -164,8 +164,8 @@ export const V1_serviceTestSuiteModelSchema = (
     testData: usingModelSchema(V1_testDataModelSchema(plugins)),
     tests: list(
       custom(
-        (val) => V1_serializeAtomicTest(val),
-        (val) => V1_deserializeAtomicTest(val),
+        (val) => V1_serializeAtomicTest(val, plugins),
+        (val) => V1_deserializeAtomicTest(val, plugins),
       ),
     ),
   });

package/src/graphManager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_TestSerializationHelper.ts

@@ -31,6 +31,7 @@ import {
   SKIP,
 } from 'serializr';
 import type { PureProtocolProcessorPlugin } from '../../../../PureProtocolProcessorPlugin.js';
+import type { Testable_PureProtocolProcessorPlugin_Extension } from '../../../../Testable_PureProtocolProcessorPlugin_Extension.js';
 import { V1_MultiExecutionServiceTestResult } from '../../../model/packageableElements/service/V1_MultiExecutionServiceTestResult.js';
 import { V1_ServiceTest } from '../../../model/packageableElements/service/V1_ServiceTest.js';
 import { V1_ServiceTestSuite } from '../../../model/packageableElements/service/V1_ServiceTestSuite.js';
@@ -67,7 +68,7 @@ export enum V1_AtomicTestType {
   SERVICE_TEST = 'serviceTest',
 }
 
-enum V1_TestAssertionType {
+export enum V1_TestAssertionType {
   EQUAL_TO = 'equalTo',
   EQUAL_TO_JSON = 'equalToJson',
   EQUAL_TO_TDS = 'equalToTDS',
@@ -225,23 +226,54 @@ export function V1_deserializeTestResult(
 
 export const V1_serializeAtomicTest = (
   protocol: V1_AtomicTest,
+  plugins: PureProtocolProcessorPlugin[],
 ): PlainObject<V1_AtomicTest> => {
   if (protocol instanceof V1_ServiceTest) {
     return serialize(V1_serviceTestModelSchema, protocol);
   }
-  throw new UnsupportedOperationError(`Can't serialize atomic test`, protocol);
+  const extraAtomicTestSerializers = plugins.flatMap(
+    (plugin) =>
+      (
+        plugin as Testable_PureProtocolProcessorPlugin_Extension
+      ).V1_getExtraAtomicTestProtocolSerializers?.() ?? [],
+  );
+  for (const serializer of extraAtomicTestSerializers) {
+    const atomicTestProtocolJson = serializer(protocol, plugins);
+    if (atomicTestProtocolJson) {
+      return atomicTestProtocolJson;
+    }
+  }
+
+  throw new UnsupportedOperationError(
+    `Can't serialize atomic test: no compatible serializer available from plugins`,
+    protocol,
+  );
 };
 
 export const V1_deserializeAtomicTest = (
   json: PlainObject<V1_AtomicTest>,
+  plugins: PureProtocolProcessorPlugin[],
 ): V1_AtomicTest => {
   switch (json._type) {
     case V1_AtomicTestType.SERVICE_TEST:
       return deserialize(V1_serviceTestModelSchema, json);
-    default:
+    default: {
+      const extraAtomicTestProtocolDeserializers = plugins.flatMap(
+        (plugin) =>
+          (
+            plugin as Testable_PureProtocolProcessorPlugin_Extension
+          ).V1_getExtraAtomicTestProtocolDeserializers?.() ?? [],
+      );
+      for (const deserializer of extraAtomicTestProtocolDeserializers) {
+        const atomicTestProtocol = deserializer(json, plugins);
+        if (atomicTestProtocol) {
+          return atomicTestProtocol;
+        }
+      }
       throw new UnsupportedOperationError(
-        `Can't deserialize atomic test of type '${json._type}'`,
+        `Can't deserialize atomic test of type '${json._type}': no compatible deserializer available from plugins`,
       );
+    }
   }
 };
 

package/src/graphManager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_ValueSpecificationSerializer.ts

@@ -162,8 +162,8 @@ const hackedUnitSchema = createModelSchema(V1_HackedUnit, {
 const variableModelSchema = createModelSchema(V1_Variable, {
   _type: usingConstantValueSchema(V1_ValueSpecificationType.VARIABLE),
   class: optional(primitive()),
-  name: primitive(),
   multiplicity: usingModelSchema(V1_multiplicitySchema),
+  name: primitive(),
 });
 
 const enumValueModelSchema = createModelSchema(V1_EnumValue, {