@finos/legend-graph 16.0.0 → 17.0.1

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

@@ -84,12 +84,12 @@ import {
   getAllEnumerationMappings,
   getClassMappingById,
   getClassMappingsByClass,
-} from '../../../../../../../graph/helpers/DSLMapping_Helper.js';
+} from '../../../../../../../graph/helpers/DSL_Mapping_Helper.js';
 import { GraphBuilderError } from '../../../../../../../graphManager/GraphManagerUtils.js';
 import type { AbstractProperty } from '../../../../../../../graph/metamodel/pure/packageableElements/domain/AbstractProperty.js';
-import { BindingTransformer } from '../../../../../../../graph/metamodel/pure/packageableElements/externalFormat/store/DSLExternalFormat_BindingTransformer.js';
+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_DSLExternalFormat_GraphBuilderHelper.js';
+import { V1_resolveBinding } from './V1_DSL_ExternalFormat_GraphBuilderHelper.js';
 import { TEMPORARY__UnresolvedSetImplementation } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/TEMPORARY__UnresolvedSetImplementation.js';
 import {
   getAssociatedPropertyClass,
@@ -97,8 +97,10 @@ import {
   getClassProperty,
 } from '../../../../../../../graph/helpers/DomainHelper.js';
 import { SetImplementationImplicitReference } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/SetImplementationReference.js';
-import type { DSLMapping_PureProtocolProcessorPlugin_Extension } from '../../../../DSLMapping_PureProtocolProcessorPlugin_Extension.js';
+import type { DSL_Mapping_PureProtocolProcessorPlugin_Extension } from '../../../../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';
 
 /**
  * This test is skipped because we want to temporarily relax graph building algorithm
@@ -114,7 +116,7 @@ const TEMPORARY__getClassMappingByIdOrReturnUnresolved = (
   returnUndefOnError(() => getClassMappingById(mapping, id)) ??
   new TEMPORARY__UnresolvedSetImplementation(id, mapping);
 
-const resolveRelationalPropertyMappingSource = (
+const resolvePropertyMappingSource = (
   immediateParent: PropertyMappingsImplementation,
   value: V1_PropertyMapping,
   topParent: InstanceSetImplementation | undefined,
@@ -179,7 +181,7 @@ export class V1_PropertyMappingBuilder
       this.context.extensions.plugins.flatMap(
         (plugin) =>
           (
-            plugin as DSLMapping_PureProtocolProcessorPlugin_Extension
+            plugin as DSL_Mapping_PureProtocolProcessorPlugin_Extension
           ).V1_getExtraPropertyMappingBuilders?.() ?? [],
       );
     for (const builder of extraPropertyMappingBuilders) {
@@ -597,7 +599,7 @@ export class V1_PropertyMappingBuilder
       }
     }
     const sourceSetImplementation = guaranteeNonNullable(
-      resolveRelationalPropertyMappingSource(
+      resolvePropertyMappingSource(
         this.immediateParent,
         protocol,
         this.topParent,
@@ -684,6 +686,89 @@ export class V1_PropertyMappingBuilder
     return relationalPropertyMapping;
   }
 
+  visit_FlatDataAssociationPropertyMapping(
+    protocol: V1_FlatDataAssociationPropertyMapping,
+  ): PropertyMapping {
+    assertNonNullable(
+      protocol.property,
+      `FlatData property mapping 'property' field is missing`,
+    );
+    assertNonEmptyString(
+      protocol.property.property,
+      `FlatData property mapping 'property.property' field is missing or empty`,
+    );
+    assertNonNullable(
+      protocol.flatData,
+      `FlatData property mapping 'flatdata' field is missing`,
+    );
+    assertNonNullable(
+      protocol.sectionName,
+      `FlatData property mapping 'sectionName' field is missing`,
+    );
+    // NOTE: mapping for derived property is not supported
+    let propertyOwner: Association;
+    if (this.immediateParent instanceof AssociationImplementation) {
+      propertyOwner = this.immediateParent.association.value;
+    } else {
+      throw new GraphBuilderError(
+        `Can't find property owner class for property '${protocol.property.property}'`,
+      );
+    }
+    const property = getOwnProperty(propertyOwner, protocol.property.property);
+
+    // NOTE: mapping for derived property is not supported
+    // since we are not doing embedded property mappings yet, the target must have already been added to the mapping
+    const propertyType = property.genericType.value.rawType;
+    let targetSetImplementation: SetImplementation | undefined;
+    if (propertyType instanceof Class) {
+      const parentMapping = this.immediateParent._PARENT;
+
+      if (protocol.target) {
+        targetSetImplementation =
+          TEMPORARY__getClassMappingByIdOrReturnUnresolved(
+            parentMapping,
+            protocol.target,
+          );
+      } else {
+        targetSetImplementation = getClassMappingsByClass(
+          parentMapping,
+          guaranteeType(propertyType, Class),
+        )[0];
+      }
+    }
+    const sourceSetImplementation = guaranteeNonNullable(
+      resolvePropertyMappingSource(
+        this.immediateParent,
+        protocol,
+        this.topParent,
+      ),
+    );
+    const flatDataAssociationPropertyMapping =
+      new FlatDataAssociationPropertyMapping(
+        this.topParent ?? this.immediateParent,
+        PropertyImplicitReference.create(
+          PackageableElementImplicitReference.create(
+            propertyOwner,
+            protocol.property.class ?? '',
+          ),
+          property,
+        ),
+        SetImplementationImplicitReference.create(
+          sourceSetImplementation,
+          protocol.source,
+        ),
+        targetSetImplementation
+          ? SetImplementationImplicitReference.create(
+              targetSetImplementation,
+              protocol.target,
+            )
+          : undefined,
+      );
+    flatDataAssociationPropertyMapping.flatData = protocol.flatData;
+    flatDataAssociationPropertyMapping.sectionName = protocol.sectionName;
+    return flatDataAssociationPropertyMapping;
+  }
+
   visit_InlineEmbeddedPropertyMapping(
     protocol: V1_InlineEmbeddedPropertyMapping,
   ): PropertyMapping {

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

@@ -30,7 +30,9 @@ import { XStoreAssociationImplementation } from '../../../../../../../../graph/m
 import {
   getAllEnumerationMappings,
   getAllIncludedMappings,
-} from '../../../../../../../../graph/helpers/DSLMapping_Helper.js';
+} from '../../../../../../../../graph/helpers/DSL_Mapping_Helper.js';
+import { FlatDataAssociationImplementation } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/flatData/mapping/FlatDataAssociationImplementation.js';
+import { V1_FlatDataAssociationMapping } from '../../../../model/packageableElements/store/flatData/mapping/V1_FlatDataAssociationMapping.js';
 
 const getInferredAssociationMappingId = (
   _association: Association,
@@ -79,6 +81,43 @@ const buildRelationalAssociationMapping = (
   return relationalAssociationImplementation;
 };
 
+const buildFlatDataAssociationMapping = (
+  element: V1_FlatDataAssociationMapping,
+  parentMapping: Mapping,
+  context: V1_GraphBuilderContext,
+): FlatDataAssociationImplementation => {
+  const allClassMappings = [
+    parentMapping,
+    ...getAllIncludedMappings(parentMapping),
+  ]
+    .map((m) => m.classMappings)
+    .flat();
+  const association = context.resolveAssociation(element.association);
+  const flatDataAssociationImplementation =
+    new FlatDataAssociationImplementation(
+      getInferredAssociationMappingId(association.value, element),
+      parentMapping,
+      association,
+    );
+  flatDataAssociationImplementation.stores = element.stores.map(
+    context.resolveStore,
+  );
+  flatDataAssociationImplementation.propertyMappings =
+    element.propertyMappings.map((propertyMapping) =>
+      propertyMapping.accept_PropertyMappingVisitor(
+        new V1_PropertyMappingBuilder(
+          context,
+          flatDataAssociationImplementation,
+          undefined,
+          getAllEnumerationMappings(parentMapping),
+          undefined,
+          allClassMappings,
+        ),
+      ),
+    );
+  return flatDataAssociationImplementation;
+};
+
 const buildXStoreAssociationMapping = (
   element: V1_XStoreAssociationMapping,
   parentMapping: Mapping,
@@ -126,6 +165,8 @@ export const V1_buildAssociationMapping = (
     return buildRelationalAssociationMapping(element, parentMapping, context);
   } else if (element instanceof V1_XStoreAssociationMapping) {
     return buildXStoreAssociationMapping(element, parentMapping, context);
+  } else if (element instanceof V1_FlatDataAssociationMapping) {
+    return buildFlatDataAssociationMapping(element, parentMapping, context);
   }
   throw new UnsupportedOperationError(
     `Can't build association mapping`,

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

@@ -56,7 +56,7 @@ import {
   V1_buildDatasourceSpecification,
   V1_buildAuthenticationStrategy,
 } from './V1_RelationalConnectionBuilderHelper.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 { V1_ModelChainConnection } from '../../../../model/packageableElements/store/modelToModel/connection/V1_ModelChainConnection.js';
 import { V1_buildPostProcessor } from './V1_PostProcessorBuilderHelper.js';
 
@@ -76,7 +76,7 @@ class V1_ConnectionBuilder implements V1_ConnectionVisitor<Connection> {
     const extraConnectionBuilders = this.context.extensions.plugins.flatMap(
       (plugin) =>
         (
-          plugin as DSLMapping_PureProtocolProcessorPlugin_Extension
+          plugin as DSL_Mapping_PureProtocolProcessorPlugin_Extension
         ).V1_getExtraConnectionBuilders?.() ?? [],
     );
     for (const builder of extraConnectionBuilders) {

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 { DSLData_PureProtocolProcessorPlugin_Extension } from '../../../../../DSLData_PureProtocolProcessorPlugin_Extension.js';
+import type { DSL_Data_PureProtocolProcessorPlugin_Extension } from '../../../../../DSL_Data_PureProtocolProcessorPlugin_Extension.js';
 import type {
   V1_DataElementReference,
   V1_EmbeddedData,
@@ -48,7 +48,7 @@ class V1_EmbeddedDataBuilder implements V1_EmbeddedDataVisitor<EmbeddedData> {
     const extraEmbeddedDataBuilders = this.context.extensions.plugins.flatMap(
       (plugin) =>
         (
-          plugin as DSLData_PureProtocolProcessorPlugin_Extension
+          plugin as DSL_Data_PureProtocolProcessorPlugin_Extension
         ).V1_getExtraEmbeddedDataBuilders?.() ?? [],
     );
     for (const builder of extraEmbeddedDataBuilders) {

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

@@ -31,7 +31,7 @@ import {
   getJoinType,
   getSchema,
   getView,
-} from '../../../../../../../../graph/helpers/StoreRelational_Helper.js';
+} from '../../../../../../../../graph/helpers/STO_Relational_Helper.js';
 import { Schema } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/relational/model/Schema.js';
 import { Table } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/relational/model/Table.js';
 import { Column } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/relational/model/Column.js';

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

@@ -64,10 +64,10 @@ import { RelationalInputData } from '../../../../../../../../graph/metamodel/pur
 import {
   getAllClassMappings,
   getObjectInputType,
-} from '../../../../../../../../graph/helpers/DSLMapping_Helper.js';
-import { getRelationalInputType } from '../../../../../../../../graph/helpers/StoreRelational_Helper.js';
+} from '../../../../../../../../graph/helpers/DSL_Mapping_Helper.js';
+import { getRelationalInputType } from '../../../../../../../../graph/helpers/STO_Relational_Helper.js';
 import { getEnumValue } from '../../../../../../../../graph/helpers/DomainHelper.js';
-import { V1_getIncludedMappingPath } from '../../../../helpers/V1_DSLMapping_Helper.js';
+import { V1_getIncludedMappingPath } from '../../../../helpers/V1_DSL_Mapping_Helper.js';
 
 export const V1_getInferredClassMappingId = (
   _class: Class,

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

@@ -31,7 +31,6 @@ import { Class } from '../../../../../../../../graph/metamodel/pure/packageableE
 import { DerivedProperty } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/DerivedProperty.js';
 import { GenericType } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/GenericType.js';
 import { GenericTypeExplicitReference } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/GenericTypeReference.js';
-import { Multiplicity } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/Multiplicity.js';
 import { Property } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/Property.js';
 import { V1_Multiplicity } from '../../../../model/packageableElements/domain/V1_Multiplicity.js';
 import type { V1_ValueSpecification } from '../../../../model/valueSpecification/V1_ValueSpecification.js';
@@ -83,7 +82,7 @@ export const V1_buildMilestoningProperties = (
           ];
           const milestonedAllVersions = new Property(
             `${property.name}${MILESTONING_VERSION_PROPERTY_SUFFIX.ALL_VERSIONS}`,
-            new Multiplicity(property.multiplicity.lowerBound, undefined),
+            graph.getMultiplicity(property.multiplicity.lowerBound, undefined),
             GenericTypeExplicitReference.create(
               new GenericType(property.genericType.value.rawType),
             ),
@@ -126,7 +125,7 @@ export const V1_buildMilestoningProperties = (
           ];
           const milestonedAllVersions = new Property(
             `${property.name}${MILESTONING_VERSION_PROPERTY_SUFFIX.ALL_VERSIONS}`,
-            new Multiplicity(property.multiplicity.lowerBound, undefined),
+            graph.getMultiplicity(property.multiplicity.lowerBound, undefined),
             GenericTypeExplicitReference.create(
               new GenericType(property.genericType.value.rawType),
             ),
@@ -172,7 +171,7 @@ export const V1_buildMilestoningProperties = (
           ];
           const milestonedAllVersions = new Property(
             `${property.name}${MILESTONING_VERSION_PROPERTY_SUFFIX.ALL_VERSIONS}`,
-            new Multiplicity(property.multiplicity.lowerBound, undefined),
+            graph.getMultiplicity(property.multiplicity.lowerBound, undefined),
             GenericTypeExplicitReference.create(
               new GenericType(property.genericType.value.rawType),
             ),

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 { StoreRelational_PureProtocolProcessorPlugin_Extension } from '../../../../../StoreRelational_PureProtocolProcessorPlugin_Extension.js';
+import type { STO_Relational_PureProtocolProcessorPlugin_Extension } from '../../../../../STO_Relational_PureProtocolProcessorPlugin_Extension.js';
 import { RawPrimitiveInstanceValue } from '../../../../../../../../graph/metamodel/pure/rawValueSpecification/RawPrimitiveInstanceValue.js';
 import { V1_RawValueSpecificationBuilder } from '../V1_RawValueSpecificationBuilder.js';
 
@@ -122,7 +122,7 @@ export const V1_buildMilestoning = (
   const extraMilestoningBuilders = context.extensions.plugins.flatMap(
     (plugin) =>
       (
-        plugin as StoreRelational_PureProtocolProcessorPlugin_Extension
+        plugin as STO_Relational_PureProtocolProcessorPlugin_Extension
       ).V1_getExtraMilestoningBuilders?.() ?? [],
   );
   for (const builder of extraMilestoningBuilders) {

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 { StoreRelational_PureProtocolProcessorPlugin_Extension } from '../../../../../StoreRelational_PureProtocolProcessorPlugin_Extension.js';
+import type { STO_Relational_PureProtocolProcessorPlugin_Extension } from '../../../../../STO_Relational_PureProtocolProcessorPlugin_Extension.js';
 
 const buildSchemaNameMapper = (schema: V1_SchemaNameMapper): SchemaNameMapper =>
   new SchemaNameMapper(schema.from, schema.to);
@@ -57,7 +57,7 @@ export const V1_buildPostProcessor = (
   const extraPostProcessorBuilders = context.extensions.plugins.flatMap(
     (plugin) =>
       (
-        plugin as StoreRelational_PureProtocolProcessorPlugin_Extension
+        plugin as STO_Relational_PureProtocolProcessorPlugin_Extension
       ).V1_getExtraConnectionPostProcessorBuilders?.() ?? [],
   );
   for (const builder of extraPostProcessorBuilders) {

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

@@ -65,7 +65,7 @@ import {
   V1_GCPWorkloadIdentityFederationAuthenticationStrategy,
   V1_MiddleTierUsernamePasswordAuthenticationStrategy,
 } from '../../../../model/packageableElements/store/relational/connection/V1_AuthenticationStrategy.js';
-import type { StoreRelational_PureProtocolProcessorPlugin_Extension } from '../../../../../StoreRelational_PureProtocolProcessorPlugin_Extension.js';
+import type { STO_Relational_PureProtocolProcessorPlugin_Extension } from '../../../../../STO_Relational_PureProtocolProcessorPlugin_Extension.js';
 
 export const V1_buildDatasourceSpecification = (
   protocol: V1_DatasourceSpecification,
@@ -220,7 +220,7 @@ export const V1_buildDatasourceSpecification = (
     context.extensions.plugins.flatMap(
       (plugin) =>
         (
-          plugin as StoreRelational_PureProtocolProcessorPlugin_Extension
+          plugin as STO_Relational_PureProtocolProcessorPlugin_Extension
         ).V1_getExtraConnectionDatasourceSpecificationBuilders?.() ?? [],
     );
   for (const builder of extraConnectionDatasourceSpecificationBuilders) {
@@ -327,7 +327,7 @@ export const V1_buildAuthenticationStrategy = (
     context.extensions.plugins.flatMap(
       (plugin) =>
         (
-          plugin as StoreRelational_PureProtocolProcessorPlugin_Extension
+          plugin as STO_Relational_PureProtocolProcessorPlugin_Extension
         ).V1_getExtraConnectionAuthenticationStrategyBuilders?.() ?? [],
     );
   for (const builder of extraConnectionAuthenticationStrategyBuilders) {

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

@@ -34,8 +34,10 @@ import type { V1_TestSuite } from '../../../../model/test/V1_TestSuite.js';
 import type { V1_GraphBuilderContext } from '../V1_GraphBuilderContext.js';
 import { V1_buildEmbeddedData } from './V1_DataElementBuilderHelper.js';
 import { V1_buildServiceTestSuite } from './V1_ServiceBuilderHelper.js';
+import type { V1_AtomicTest } from '../../../../model/test/V1_AtomicTest.js';
+import type { Testable_PureProtocolProcessorPlugin_Extension } from '../../../../../Testable_PureProtocolProcessorPlugin_Extension.js';
 
-const buildEqualTo = (
+const V1_buildEqualTo = (
   element: V1_EqualTo,
   parentTest: AtomicTest | undefined,
 ): EqualTo => {
@@ -46,7 +48,7 @@ const buildEqualTo = (
   return equalTo;
 };
 
-const buildEqualToJson = (
+export const V1_buildEqualToJson = (
   element: V1_EqualToJson,
   parentTest: AtomicTest | undefined,
   context: V1_GraphBuilderContext,
@@ -82,15 +84,37 @@ export const V1_buildTestAssertion = (
   context: V1_GraphBuilderContext,
 ): TestAssertion => {
   if (value instanceof V1_EqualTo) {
-    return buildEqualTo(value, parentTest);
+    return V1_buildEqualTo(value, parentTest);
   } else if (value instanceof V1_EqualToJson) {
-    return buildEqualToJson(value, parentTest, context);
+    return V1_buildEqualToJson(value, parentTest, context);
   } else if (value instanceof V1_EqualToTDS) {
     return buildEqualToTDS(value, parentTest, context);
   }
   throw new UnsupportedOperationError(`Can't build test assertion`, value);
 };
 
+export const V1_buildAtomicTest = (
+  value: V1_AtomicTest,
+  context: V1_GraphBuilderContext,
+): AtomicTest => {
+  const extraAtomicTestBuilder = context.extensions.plugins.flatMap(
+    (plugin) =>
+      (
+        plugin as Testable_PureProtocolProcessorPlugin_Extension
+      ).V1_getExtraAtomicTestBuilders?.() ?? [],
+  );
+  for (const builder of extraAtomicTestBuilder) {
+    const metamodel = builder(value, context);
+    if (metamodel) {
+      return metamodel;
+    }
+  }
+  throw new UnsupportedOperationError(
+    `Can't build AtomicTest: no compatible builder available from plugins`,
+    value,
+  );
+};
+
 export const V1_buildTestSuite = (
   parent: Testable,
   value: V1_TestSuite,

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

@@ -49,6 +49,8 @@ import {
   V1_TestError,
 } from '../../../../model/test/result/V1_TestResult.js';
 import type { V1_AtomicTestId } from '../../../../model/test/V1_AtomicTestId.js';
+import type { PureProtocolProcessorPlugin } from '../../../../../PureProtocolProcessorPlugin.js';
+import type { Testable_PureProtocolProcessorPlugin_Extension } from '../../../../../Testable_PureProtocolProcessorPlugin_Extension.js';
 
 const buildAtomicTestId = (
   element: V1_AtomicTestId,
@@ -74,48 +76,107 @@ const buildAtomicTestId = (
 const buildAssertFail = (
   element: V1_AssertFail,
   atomicTest: AtomicTest,
+  plugins: PureProtocolProcessorPlugin[],
 ): AssertFail => {
-  const assertion = guaranteeNonNullable(
-    atomicTest.assertions.find((a) => a.id === element.id),
+  let assertion = atomicTest.assertions.find((a) => a.id === element.id);
+  const extraAssertionBuilder = plugins.flatMap(
+    (plugin) =>
+      (
+        plugin as Testable_PureProtocolProcessorPlugin_Extension
+      ).V1_getExtraTestableAssertionBuilders?.() ?? [],
+  );
+
+  for (const builder of extraAssertionBuilder) {
+    const assertionBuilder = builder(atomicTest, element);
+    if (assertionBuilder) {
+      assertion = assertionBuilder;
+    }
+  }
+
+  if (assertion) {
+    return new AssertFail(assertion, element.message);
+  }
+  throw new UnsupportedOperationError(
+    `Can't build AssertFail: no compatible builder available from plugins`,
+    element,
   );
-  return new AssertFail(assertion, element.message);
 };
+
 const buildAssertPass = (
   element: V1_AssertPass,
   atomicTest: AtomicTest,
+  plugins: PureProtocolProcessorPlugin[],
 ): AssertPass => {
-  const assertion = guaranteeNonNullable(
-    atomicTest.assertions.find((a) => a.id === element.id),
+  let assertion = atomicTest.assertions.find((a) => a.id === element.id);
+  const extraAssertionBuilder = plugins.flatMap(
+    (plugin) =>
+      (
+        plugin as Testable_PureProtocolProcessorPlugin_Extension
+      ).V1_getExtraTestableAssertionBuilders?.() ?? [],
+  );
+
+  for (const builder of extraAssertionBuilder) {
+    const assertionBuilder = builder(atomicTest, element);
+    if (assertionBuilder) {
+      assertion = assertionBuilder;
+    }
+  }
+
+  if (assertion) {
+    return new AssertPass(assertion);
+  }
+  throw new UnsupportedOperationError(
+    `Can't build AssertPass: no compatible builder available from plugins`,
+    element,
   );
-  return new AssertPass(assertion);
 };
 
 const buildEqualToJsonAssertFail = (
   element: V1_EqualToJsonAssertFail,
   atomicTest: AtomicTest,
+  plugins: PureProtocolProcessorPlugin[],
 ): EqualToJsonAssertFail => {
-  const assertion = guaranteeNonNullable(
-    atomicTest.assertions.find((a) => a.id === element.id),
+  let assertion = atomicTest.assertions.find((a) => a.id === element.id);
+  const extraAssertionBuilder = plugins.flatMap(
+    (plugin) =>
+      (
+        plugin as Testable_PureProtocolProcessorPlugin_Extension
+      ).V1_getExtraTestableAssertionBuilders?.() ?? [],
   );
-  const equalToJsonAssertFail = new EqualToJsonAssertFail(
-    assertion,
-    element.message,
+
+  for (const builder of extraAssertionBuilder) {
+    const assertionBuilder = builder(atomicTest, element);
+    if (assertionBuilder) {
+      assertion = assertionBuilder;
+    }
+  }
+
+  if (assertion) {
+    const equalToJsonAssertFail = new EqualToJsonAssertFail(
+      assertion,
+      element.message,
+    );
+    equalToJsonAssertFail.actual = element.actual;
+    equalToJsonAssertFail.expected = element.expected;
+    return equalToJsonAssertFail;
+  }
+  throw new UnsupportedOperationError(
+    `Can't build EqualToJsonAssertFail: no compatible builder available from plugins`,
+    element,
   );
-  equalToJsonAssertFail.actual = element.actual;
-  equalToJsonAssertFail.expected = element.expected;
-  return equalToJsonAssertFail;
 };
 
 const buildAssertionStatus = (
   value: V1_AssertionStatus,
   atomicTest: AtomicTest,
+  plugins: PureProtocolProcessorPlugin[],
 ): AssertionStatus => {
   if (value instanceof V1_EqualToJsonAssertFail) {
-    return buildEqualToJsonAssertFail(value, atomicTest);
+    return buildEqualToJsonAssertFail(value, atomicTest, plugins);
   } else if (value instanceof V1_AssertFail) {
-    return buildAssertFail(value, atomicTest);
+    return buildAssertFail(value, atomicTest, plugins);
   } else if (value instanceof V1_AssertPass) {
-    return buildAssertPass(value, atomicTest);
+    return buildAssertPass(value, atomicTest, plugins);
   }
   throw new UnsupportedOperationError(`Can't build assertion status`, value);
 };
@@ -132,12 +193,13 @@ export const V1_buildTestError = (
 export const V1_buildTestFailed = (
   element: V1_TestFailed,
   testable: Testable,
+  plugins: PureProtocolProcessorPlugin[],
 ): TestFailed => {
   const testFailed = new TestFailed();
   testFailed.atomicTestId = buildAtomicTestId(element.atomicTestId, testable);
   testFailed.testable = testable;
   testFailed.assertStatuses = element.assertStatuses.map((e) =>
-    buildAssertionStatus(e, testFailed.atomicTestId.atomicTest),
+    buildAssertionStatus(e, testFailed.atomicTestId.atomicTest, plugins),
   );
   return testFailed;
 };
@@ -155,6 +217,7 @@ export const V1_buildTestPassed = (
 export const V1_buildMultiExecutionServiceTestResult = (
   element: V1_MultiExecutionServiceTestResult,
   testable: Testable,
+  plugins: PureProtocolProcessorPlugin[],
 ): MultiExecutionServiceTestResult => {
   const multi = new MultiExecutionServiceTestResult();
   multi.testable = testable;
@@ -163,7 +226,7 @@ export const V1_buildMultiExecutionServiceTestResult = (
   Array.from(element.keyIndexedTestResults.entries()).forEach((result) => {
     multi.keyIndexedTestResults.set(
       result[0],
-      V1_buildTestResult(result[1], testable),
+      V1_buildTestResult(result[1], testable, plugins),
     );
   });
   return multi;
@@ -172,15 +235,16 @@ export const V1_buildMultiExecutionServiceTestResult = (
 export function V1_buildTestResult(
   element: V1_TestResult,
   testable: Testable,
+  plugins: PureProtocolProcessorPlugin[],
 ): TestResult {
   if (element instanceof V1_TestPassed) {
     return V1_buildTestPassed(element, testable);
   } else if (element instanceof V1_TestFailed) {
-    return V1_buildTestFailed(element, testable);
+    return V1_buildTestFailed(element, testable, plugins);
   } else if (element instanceof V1_TestError) {
     return V1_buildTestError(element, testable);
   } else if (element instanceof V1_MultiExecutionServiceTestResult) {
-    return V1_buildMultiExecutionServiceTestResult(element, testable);
+    return V1_buildMultiExecutionServiceTestResult(element, testable, plugins);
   }
   throw new UnsupportedOperationError(`Can't build test result`, element);
 }