@finos/legend-graph 9.0.1 → 10.0.0

package/src/models/protocols/pure/v1/model/test/assertion/V1_EqualToTDS.ts

@@ -14,32 +14,16 @@
  * limitations under the License.
  */
 
-import { hashArray, type Hashable } from '@finos/legend-shared';
+import { hashArray } from '@finos/legend-shared';
 import { CORE_HASH_STRUCTURE } from '../../../../../../../MetaModelConst.js';
-import type {
-  V1_RelationalDataTableColumn,
-  V1_RelationalDataTableRow,
-} from '../../data/V1_RelationalData.js';
+import type { V1_ExternalFormatData } from '../../data/V1_EmbeddedData.js';
 import {
   type V1_TestAssertionVisitor,
   V1_TestAssertion,
 } from './V1_TestAssertion.js';
 
-export class V1_RelationalTDS implements Hashable {
-  columns: V1_RelationalDataTableColumn[] = [];
-  rows: V1_RelationalDataTableRow[] = [];
-
-  get hashCode(): string {
-    return hashArray([
-      CORE_HASH_STRUCTURE.RELATIONAL_TDS,
-      hashArray(this.columns),
-      hashArray(this.rows),
-    ]);
-  }
-}
-
 export class V1_EqualToTDS extends V1_TestAssertion {
-  expected!: V1_RelationalTDS;
+  expected!: V1_ExternalFormatData;
 
   get hashCode(): string {
     return hashArray([

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

@@ -22,9 +22,9 @@ import {
   ModelStoreData,
 } from '../../../../../../metamodels/pure/data/EmbeddedData.js';
 import {
-  type RelationalDataTable,
-  RelationalData,
-} from '../../../../../../metamodels/pure/data/RelationalData.js';
+  type RelationalCSVDataTable,
+  RelationalCSVData,
+} from '../../../../../../metamodels/pure/data/RelationalCSVData.js';
 import type { DataElement } from '../../../../../../metamodels/pure/packageableElements/data/DataElement.js';
 import type { DSLData_PureProtocolProcessorPlugin_Extension } from '../../../../DSLData_PureProtocolProcessorPlugin_Extension.js';
 import {
@@ -34,11 +34,9 @@ import {
   V1_ModelStoreData,
 } from '../../../model/data/V1_EmbeddedData.js';
 import {
-  V1_RelationalData,
-  V1_RelationalDataTable,
-  V1_RelationalDataTableColumn,
-  V1_RelationalDataTableRow,
-} from '../../../model/data/V1_RelationalData.js';
+  V1_RelationalCSVData,
+  V1_RelationalCSVDataTable,
+} from '../../../model/data/V1_RelationalCSVData.js';
 import { V1_DataElement } from '../../../model/packageableElements/data/V1_DataElement.js';
 import { V1_initPackageableElement } from './V1_CoreTransformerHelper.js';
 import {
@@ -79,30 +77,21 @@ const V1_transformDataElementReference = (
   return dataElementReference;
 };
 
-const V1_transformRelationalDataTable = (
-  element: RelationalDataTable,
-): V1_RelationalDataTable => {
-  const table = new V1_RelationalDataTable();
-  table.tableName = element.tableName;
-  table.schemaName = element.schemaName;
-  table.rows = element.rows.map((e) => {
-    const row = new V1_RelationalDataTableRow();
-    row.values = e.values;
-    return row;
-  });
-  table.columns = element.columns.map((e) => {
-    const col = new V1_RelationalDataTableColumn();
-    col.value = e.value;
-    return col;
-  });
+const V1_transformRelationalCSVDataTable = (
+  element: RelationalCSVDataTable,
+): V1_RelationalCSVDataTable => {
+  const table = new V1_RelationalCSVDataTable();
+  table.table = element.table;
+  table.schema = element.schema;
+  table.values = element.values;
   return table;
 };
 
-const V1_transformRelationalData = (
-  element: RelationalData,
-): V1_RelationalData => {
-  const data = new V1_RelationalData();
-  data.tables = element.tables.map(V1_transformRelationalDataTable);
+const V1_transformRelationalCSVData = (
+  element: RelationalCSVData,
+): V1_RelationalCSVData => {
+  const data = new V1_RelationalCSVData();
+  data.tables = element.tables.map(V1_transformRelationalCSVDataTable);
   return data;
 };
 
@@ -116,8 +105,8 @@ export const V1_transformEmbeddedData = (
     return V1_transformExternalFormatData(metamodel);
   } else if (metamodel instanceof DataElementReference) {
     return V1_transformDataElementReference(metamodel);
-  } else if (metamodel instanceof RelationalData) {
-    return V1_transformRelationalData(metamodel);
+  } else if (metamodel instanceof RelationalCSVData) {
+    return V1_transformRelationalCSVData(metamodel);
   }
   const extraEmbeddedDataTransformers = context.plugins.flatMap(
     (plugin) =>

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

@@ -105,6 +105,7 @@ export const V1_transformServiceTest = (
 ): V1_ServiceTest => {
   const serviceTest = new V1_ServiceTest();
   serviceTest.id = element.id;
+  serviceTest.serializationFormat = element.serializationFormat;
   serviceTest.parameters = element.parameters.map((parameter) =>
     transformParameterValue(parameter),
   );

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

@@ -36,10 +36,7 @@ import type {
   TestSuite,
 } from '../../../../../../metamodels/pure/test/Test.js';
 import { EqualToTDS } from '../../../../../../metamodels/pure/test/assertion/EqualToTDS.js';
-import {
-  V1_EqualToTDS,
-  V1_RelationalTDS,
-} from '../../../model/test/assertion/V1_EqualToTDS.js';
+import { V1_EqualToTDS } from '../../../model/test/assertion/V1_EqualToTDS.js';
 
 const transformEqualTo = (element: EqualTo): V1_EqualTo => {
   const equalTo = new V1_EqualTo();
@@ -58,9 +55,7 @@ const transformEqualToJson = (element: EqualToJson): V1_EqualToJson => {
 const transformEqualToTDS = (element: EqualToTDS): V1_EqualToTDS => {
   const equalToTDS = new V1_EqualToTDS();
   equalToTDS.id = element.id;
-  equalToTDS.expected = new V1_RelationalTDS();
-  equalToTDS.expected.columns = element.expected.columns;
-  equalToTDS.expected.rows = element.expected.rows;
+  equalToTDS.expected = V1_transformExternalFormatData(element.expected);
   return equalToTDS;
 };
 

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

@@ -82,6 +82,7 @@ import { V1_ProtocolToMetaModelEmbeddedDataBuilder } from './helpers/V1_DataElem
 import { V1_buildTestSuite } from './helpers/V1_TestBuilderHelper.js';
 import { ServiceTestSuite } from '../../../../../../metamodels/pure/packageableElements/service/ServiceTestSuite.js';
 import { V1_getIncludedMappingPath } from '../../../helper/V1_DSLMapping_Helper.js';
+import { V1_DataElementReference } from '../../../model/data/V1_EmbeddedData.js';
 
 export class V1_ProtocolToMetaModelGraphSecondPassBuilder
   implements V1_PackageableElementVisitor<void>
@@ -329,7 +330,7 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
       );
     }
     service.tests = element.testSuites
-      .map((testSuite) => V1_buildTestSuite(testSuite, this.context))
+      .map((testSuite) => V1_buildTestSuite(service, testSuite, this.context))
       .map((e) => guaranteeType(e, ServiceTestSuite));
   }
 
@@ -407,6 +408,11 @@ export class V1_ProtocolToMetaModelGraphSecondPassBuilder
     dataElement.taggedValues = element.taggedValues
       .map((taggedValue) => V1_buildTaggedValue(taggedValue, this.context))
       .filter(isNonNullable);
+    if (element.data instanceof V1_DataElementReference) {
+      throw new IllegalStateError(
+        'Cannot use Data element reference in a Data element',
+      );
+    }
     dataElement.data = element.data.accept_EmbeddedDataVisitor(
       new V1_ProtocolToMetaModelEmbeddedDataBuilder(this.context),
     );

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

@@ -22,11 +22,9 @@ import {
   ModelStoreData,
 } from '../../../../../../../metamodels/pure/data/EmbeddedData.js';
 import {
-  RelationalData,
-  RelationalDataTable,
-  RelationalDataTableColumn,
-  RelationalDataTableRow,
-} from '../../../../../../../metamodels/pure/data/RelationalData.js';
+  RelationalCSVData,
+  RelationalCSVDataTable,
+} from '../../../../../../../metamodels/pure/data/RelationalCSVData.js';
 import type { Class } from '../../../../../../../metamodels/pure/packageableElements/domain/Class.js';
 import type { DSLData_PureProtocolProcessorPlugin_Extension } from '../../../../../DSLData_PureProtocolProcessorPlugin_Extension.js';
 import type {
@@ -36,8 +34,7 @@ import type {
   V1_ExternalFormatData,
   V1_ModelStoreData,
 } from '../../../../model/data/V1_EmbeddedData.js';
-import type { V1_RelationalData } from '../../../../model/data/V1_RelationalData.js';
-
+import type { V1_RelationalCSVData } from '../../../../model/data/V1_RelationalCSVData.js';
 import type { V1_GraphBuilderContext } from '../V1_GraphBuilderContext.js';
 
 export class V1_ProtocolToMetaModelEmbeddedDataBuilder
@@ -98,22 +95,13 @@ export class V1_ProtocolToMetaModelEmbeddedDataBuilder
     return metamodel;
   }
 
-  visit_RelationalData(relationalData: V1_RelationalData): EmbeddedData {
-    const metamodel = new RelationalData();
+  visit_RelationalData(relationalData: V1_RelationalCSVData): EmbeddedData {
+    const metamodel = new RelationalCSVData();
     metamodel.tables = relationalData.tables.map((t) => {
-      const table = new RelationalDataTable();
-      table.schemaName = t.schemaName;
-      table.columns = t.columns.map((c) => {
-        const col = new RelationalDataTableColumn();
-        col.value = c.value;
-        return col;
-      });
-      table.tableName = t.tableName;
-      table.rows = t.rows.map((r) => {
-        const row = new RelationalDataTableRow();
-        row.values = r.values;
-        return row;
-      });
+      const table = new RelationalCSVDataTable();
+      table.schema = t.schema;
+      table.table = t.table;
+      table.values = t.values;
       return table;
     });
     return metamodel;

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

@@ -161,6 +161,12 @@ const schemaExists = (database: Database, _schema: string): boolean =>
   DEFAULT_DATABASE_SCHEMA_NAME === _schema ||
   _schemaExists(database, _schema, new Set<Database>());
 
+export const V1_findSchema = (database: Database, _schema: string): void =>
+  assertTrue(
+    schemaExists(database, _schema),
+    `Can't find schema '${_schema}' in database '${database}'`,
+  );
+
 export const V1_findRelation = (
   database: Database,
   schemaName: string,
@@ -193,10 +199,7 @@ export const V1_getRelation = (
   schemaName: string,
   relationName: string,
 ): Relation => {
-  assertTrue(
-    schemaExists(db, schemaName),
-    `Can't find schema '${schemaName}' in database '${db}'`,
-  );
+  V1_findSchema(db, schemaName);
   return guaranteeNonNullable(
     V1_findRelation(db, schemaName, relationName),
     `Can't find table '${relationName}' in schema '${schemaName}' and database '${db.path}'`,

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

@@ -20,6 +20,7 @@ import {
   assertNonEmptyString,
   assertType,
   assertNonNullable,
+  guaranteeType,
 } from '@finos/legend-shared';
 import { GRAPH_MANAGER_EVENT } from '../../../../../../../../graphManager/GraphManagerEvent.js';
 import {
@@ -35,7 +36,7 @@ import {
   KeyedExecutionParameter,
 } from '../../../../../../../metamodels/pure/packageableElements/service/ServiceExecution.js';
 import type { V1_GraphBuilderContext } from '../../../../transformation/pureGraph/to/V1_GraphBuilderContext.js';
-import type { V1_ServiceTest } from '../../../../model/packageableElements/service/V1_ServiceTest.js';
+import { V1_ServiceTest } from '../../../../model/packageableElements/service/V1_ServiceTest.js';
 import {
   type V1_ServiceExecution,
   V1_PureSingleExecution,
@@ -53,26 +54,6 @@ import { V1_buildEngineRuntime } from './V1_RuntimeBuilderHelper.js';
 import { V1_PackageableElementPointer } from '../../../../model/packageableElements/V1_PackageableElement.js';
 import { V1_buildRawLambdaWithResolvedPaths } from './V1_ValueSpecificationPathResolver.js';
 import { GraphBuilderError } from '../../../../../../../../graphManager/GraphManagerUtils.js';
-import {
-  type DEPRECATED__ServiceTest,
-  DEPRECATED__KeyedSingleExecutionTest,
-  DEPRECATED__MultiExecutionTest,
-  DEPRECATED__SingleExecutionTest,
-  DEPRECATED__TestContainer,
-} from '../../../../../../../metamodels/pure/packageableElements/service/DEPRECATED__ServiceTest.js';
-import { ConnectionTestData } from '../../../../../../../metamodels/pure/packageableElements/service/ConnectionTestData.js';
-import { ParameterValue } from '../../../../../../../metamodels/pure/packageableElements/service/ParameterValue.js';
-import { ServiceTestSuite } from '../../../../../../../metamodels/pure/packageableElements/service/ServiceTestSuite.js';
-import { TestData } from '../../../../../../../metamodels/pure/packageableElements/service/ServiceTestData.js';
-import type { V1_ConnectionTestData } from '../../../../model/packageableElements/service/V1_ConnectionTestData.js';
-import type { V1_ParameterValue } from '../../../../model/packageableElements/service/V1_ParameterValue.js';
-import type { V1_ServiceTestSuite } from '../../../../model/packageableElements/service/V1_ServiceTestSuite.js';
-import type { V1_TestData } from '../../../../model/packageableElements/service/V1_TestData.js';
-import {
-  V1_buildTestAssertion,
-  V1_buildAtomicTest,
-} from './V1_TestBuilderHelper.js';
-import { V1_ProtocolToMetaModelEmbeddedDataBuilder } from './V1_DataElementBuilderHelper.js';
 import {
   type V1_DEPRECATED__ServiceTest,
   V1_DEPRECATED__SingleExecutionTest,
@@ -80,6 +61,23 @@ import {
 } from '../../../../model/packageableElements/service/V1_DEPRECATED__ServiceTest.js';
 import type { TestSuite } from '../../../../../../../metamodels/pure/test/Test.js';
 import { PackageableElementPointerType } from '../../../../../../../../MetaModelConst.js';
+import type { V1_ConnectionTestData } from '../../../../model/packageableElements/service/V1_ConnectionTestData.js';
+import { ConnectionTestData } from '../../../../../../../metamodels/pure/packageableElements/service/ConnectionTestData.js';
+import { V1_ProtocolToMetaModelEmbeddedDataBuilder } from './V1_DataElementBuilderHelper.js';
+import type { V1_ParameterValue } from '../../../../model/packageableElements/service/V1_ParameterValue.js';
+import { ParameterValue } from '../../../../../../../metamodels/pure/packageableElements/service/ParameterValue.js';
+import type { V1_TestData } from '../../../../model/packageableElements/service/V1_TestData.js';
+import { TestData } from '../../../../../../../metamodels/pure/packageableElements/service/ServiceTestData.js';
+import { V1_buildTestAssertion } from './V1_TestBuilderHelper.js';
+import type { V1_ServiceTestSuite } from '../../../../model/packageableElements/service/V1_ServiceTestSuite.js';
+import { ServiceTestSuite } from '../../../../../../../metamodels/pure/packageableElements/service/ServiceTestSuite.js';
+import {
+  type DEPRECATED__ServiceTest,
+  DEPRECATED__KeyedSingleExecutionTest,
+  DEPRECATED__SingleExecutionTest,
+  DEPRECATED__TestContainer,
+  DEPRECATED__MultiExecutionTest,
+} from '../../../../../../../metamodels/pure/packageableElements/service/DEPRECATED__ServiceTest.js';
 
 const buildConnectionTestData = (
   element: V1_ConnectionTestData,
@@ -114,12 +112,13 @@ const buildTestData = (
 
 export const V1_buildServiceTest = (
   element: V1_ServiceTest,
-  parentSuite: TestSuite | undefined,
+  parentSuite: TestSuite,
   context: V1_GraphBuilderContext,
 ): ServiceTest => {
   const serviceTest = new ServiceTest();
   serviceTest.id = element.id;
-  serviceTest.__parentSuite = parentSuite;
+  serviceTest.__parent = parentSuite;
+  serviceTest.serializationFormat = element.serializationFormat;
   serviceTest.parameters = element.parameters.map((parameter) =>
     buildParameterValue(parameter),
   );
@@ -137,7 +136,11 @@ export const V1_buildServiceTestSuite = (
   serviceTestSuite.id = element.id;
   serviceTestSuite.testData = buildTestData(element.testData, context);
   serviceTestSuite.tests = element.tests.map((test) =>
-    V1_buildAtomicTest(test, serviceTestSuite, context),
+    V1_buildServiceTest(
+      guaranteeType(test, V1_ServiceTest),
+      serviceTestSuite,
+      context,
+    ),
   );
   return serviceTestSuite;
 };

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

@@ -18,29 +18,22 @@ import { guaranteeType, UnsupportedOperationError } from '@finos/legend-shared';
 import { ExternalFormatData } from '../../../../../../../metamodels/pure/data/EmbeddedData.js';
 import { EqualTo } from '../../../../../../../metamodels/pure/test/assertion/EqualTo.js';
 import { EqualToJson } from '../../../../../../../metamodels/pure/test/assertion/EqualToJson.js';
-import {
-  EqualToTDS,
-  RelationalTDS,
-} from '../../../../../../../metamodels/pure/test/assertion/EqualToTDS.js';
+import { EqualToTDS } from '../../../../../../../metamodels/pure/test/assertion/EqualToTDS.js';
 import type { TestAssertion } from '../../../../../../../metamodels/pure/test/assertion/TestAssertion.js';
 import type {
   AtomicTest,
   TestSuite,
 } from '../../../../../../../metamodels/pure/test/Test.js';
-import { V1_ServiceTest } from '../../../../model/packageableElements/service/V1_ServiceTest.js';
+import type { Testable } from '../../../../../../../metamodels/pure/test/Testable.js';
 import { V1_ServiceTestSuite } from '../../../../model/packageableElements/service/V1_ServiceTestSuite.js';
 import { V1_EqualTo } from '../../../../model/test/assertion/V1_EqualTo.js';
 import { V1_EqualToJson } from '../../../../model/test/assertion/V1_EqualToJson.js';
 import { V1_EqualToTDS } from '../../../../model/test/assertion/V1_EqualToTDS.js';
 import type { V1_TestAssertion } from '../../../../model/test/assertion/V1_TestAssertion.js';
-import type { V1_AtomicTest } from '../../../../model/test/V1_AtomicTest.js';
 import type { V1_TestSuite } from '../../../../model/test/V1_TestSuite.js';
 import type { V1_GraphBuilderContext } from '../V1_GraphBuilderContext.js';
 import { V1_ProtocolToMetaModelEmbeddedDataBuilder } from './V1_DataElementBuilderHelper.js';
-import {
-  V1_buildServiceTest,
-  V1_buildServiceTestSuite,
-} from './V1_ServiceBuilderHelper.js';
+import { V1_buildServiceTestSuite } from './V1_ServiceBuilderHelper.js';
 
 const buildEqualTo = (
   element: V1_EqualTo,
@@ -78,24 +71,15 @@ const buildEqualToTDS = (
   const equalToTDS = new EqualToTDS();
   equalToTDS.id = element.id;
   equalToTDS.parentTest = parentTest;
-  const expected = new RelationalTDS();
-  expected.columns = element.expected.columns;
-  expected.rows = element.expected.rows;
-  equalToTDS.expected = expected;
+  equalToTDS.expected = guaranteeType(
+    element.expected.accept_EmbeddedDataVisitor(
+      new V1_ProtocolToMetaModelEmbeddedDataBuilder(context),
+    ),
+    ExternalFormatData,
+  );
   return equalToTDS;
 };
 
-export const V1_buildAtomicTest = (
-  value: V1_AtomicTest,
-  parentSuite: TestSuite | undefined,
-  context: V1_GraphBuilderContext,
-): AtomicTest => {
-  if (value instanceof V1_ServiceTest) {
-    return V1_buildServiceTest(value, parentSuite, context);
-  }
-  throw new UnsupportedOperationError(`Can't build atomic test`, value);
-};
-
 export const V1_buildTestAssertion = (
   value: V1_TestAssertion,
   parentTest: AtomicTest | undefined,
@@ -112,11 +96,17 @@ export const V1_buildTestAssertion = (
 };
 
 export const V1_buildTestSuite = (
+  parent: Testable,
   value: V1_TestSuite,
   context: V1_GraphBuilderContext,
 ): TestSuite => {
+  let suite: TestSuite | undefined;
   if (value instanceof V1_ServiceTestSuite) {
-    return V1_buildServiceTestSuite(value, context);
+    suite = V1_buildServiceTestSuite(value, context);
+  }
+  if (suite) {
+    suite.__parent = parent;
+    return suite;
   }
   throw new UnsupportedOperationError(`Can't build test suite`, value);
 };

package/src/models/protocols/pure/v1/transformation/pureProtocol/serializationHelpers/V1_DataElementSerializationHelper.ts

@@ -43,11 +43,9 @@ import {
   V1_DataElementReference,
 } from '../../../model/data/V1_EmbeddedData.js';
 import {
-  V1_RelationalData,
-  V1_RelationalDataTable,
-  V1_RelationalDataTableColumn,
-  V1_RelationalDataTableRow,
-} from '../../../model/data/V1_RelationalData.js';
+  V1_RelationalCSVData,
+  V1_RelationalCSVDataTable,
+} from '../../../model/data/V1_RelationalCSVData.js';
 import { V1_DataElement } from '../../../model/packageableElements/data/V1_DataElement.js';
 import {
   V1_stereotypePtrSchema,
@@ -60,7 +58,7 @@ export enum V1_EmbeddedDataType {
   MODEL_STORE_DATA = 'modelStore',
   EXTERNAL_FORMAT_DATA = 'externalFormat',
   DATA_ELEMENT_REFERENCE = 'reference',
-  RELATIONAL_DATA = 'relationalData',
+  RELATIONAL_DATA = 'relationalCSVData',
 }
 
 export const V1_modelStoreDataModelSchema = createModelSchema(
@@ -91,31 +89,16 @@ export const V1_dataElementReferenceModelSchema = createModelSchema(
   },
 );
 
-export const V1_relationalDataTableColumnSchema = createModelSchema(
-  V1_RelationalDataTableColumn,
-  {
-    value: primitive(),
-  },
-);
-
-export const V1_relationalDataTableRowModelSchema = createModelSchema(
-  V1_RelationalDataTableRow,
-  {
-    values: primitive(),
-  },
-);
-
 const V1_relationalDataTableModelSchema = createModelSchema(
-  V1_RelationalDataTable,
+  V1_RelationalCSVDataTable,
   {
-    columns: list(usingModelSchema(V1_relationalDataTableColumnSchema)),
-    rows: list(usingModelSchema(V1_relationalDataTableRowModelSchema)),
-    schemaName: optional(primitive()),
-    tableName: primitive(),
+    schema: optional(primitive()),
+    table: primitive(),
+    values: primitive(),
   },
 );
 
-const V1_relationalDataModelSchema = createModelSchema(V1_RelationalData, {
+const V1_relationalDataModelSchema = createModelSchema(V1_RelationalCSVData, {
   _type: usingConstantValueSchema(V1_EmbeddedDataType.RELATIONAL_DATA),
   tables: list(usingModelSchema(V1_relationalDataTableModelSchema)),
 });
@@ -130,7 +113,7 @@ export const V1_serializeEmbeddedDataType = (
     return serialize(V1_modelStoreDataModelSchema, protocol);
   } else if (protocol instanceof V1_DataElementReference) {
     return serialize(V1_dataElementReferenceModelSchema, protocol);
-  } else if (protocol instanceof V1_RelationalData) {
+  } else if (protocol instanceof V1_RelationalCSVData) {
     return serialize(V1_relationalDataModelSchema, protocol);
   }
   const extraEmbeddedDataSerializers = plugins.flatMap(

package/src/models/protocols/pure/v1/transformation/pureProtocol/serializationHelpers/V1_ServiceSerializationHelper.ts

@@ -23,6 +23,7 @@ import {
   serialize,
   raw,
   type ModelSchema,
+  optional,
 } from 'serializr';
 import {
   type PlainObject,
@@ -151,6 +152,7 @@ export const V1_serviceTestModelSchema = createModelSchema(V1_ServiceTest, {
         },
       ),
   ),
+  serializationFormat: optional(primitive()),
 });
 
 export const V1_serviceTestSuiteModelSchema = (

package/src/models/protocols/pure/v1/transformation/pureProtocol/serializationHelpers/V1_TestSerializationHelper.ts

@@ -37,10 +37,7 @@ import { V1_AssertPass } from '../../../model/test/assertion/status/V1_AssertPas
 import { V1_EqualToJsonAssertFail } from '../../../model/test/assertion/status/V1_EqualToJsonAssertFail.js';
 import { V1_EqualTo } from '../../../model/test/assertion/V1_EqualTo.js';
 import { V1_EqualToJson } from '../../../model/test/assertion/V1_EqualToJson.js';
-import {
-  V1_EqualToTDS,
-  V1_RelationalTDS,
-} from '../../../model/test/assertion/V1_EqualToTDS.js';
+import { V1_EqualToTDS } from '../../../model/test/assertion/V1_EqualToTDS.js';
 import type { V1_TestAssertion } from '../../../model/test/assertion/V1_TestAssertion.js';
 import {
   type V1_TestResult,
@@ -51,11 +48,7 @@ import {
 import type { V1_AtomicTest } from '../../../model/test/V1_AtomicTest.js';
 import { V1_AtomicTestId } from '../../../model/test/V1_AtomicTestId.js';
 import type { V1_TestSuite } from '../../../model/test/V1_TestSuite.js';
-import {
-  V1_externalFormatDataModelSchema,
-  V1_relationalDataTableColumnSchema,
-  V1_relationalDataTableRowModelSchema,
-} from './V1_DataElementSerializationHelper.js';
+import { V1_externalFormatDataModelSchema } from './V1_DataElementSerializationHelper.js';
 import {
   V1_serviceTestModelSchema,
   V1_serviceTestSuiteModelSchema,
@@ -161,14 +154,9 @@ export const V1_equalToJsonModelSchema = createModelSchema(V1_EqualToJson, {
   id: primitive(),
 });
 
-const V1_relationalTDSModelSchema = createModelSchema(V1_RelationalTDS, {
-  columns: list(usingModelSchema(V1_relationalDataTableColumnSchema)),
-  rows: list(usingModelSchema(V1_relationalDataTableRowModelSchema)),
-});
-
 const V1_equalToTDSModelSchema = createModelSchema(V1_EqualToTDS, {
   _type: usingConstantValueSchema(V1_TestAssertionType.EQUAL_TO_TDS),
-  expected: usingModelSchema(V1_relationalTDSModelSchema),
+  expected: usingModelSchema(V1_externalFormatDataModelSchema),
   id: primitive(),
 });
 

package/tsconfig.json

@@ -69,6 +69,7 @@
     "./src/graphManager/action/SourceInformation.ts",
     "./src/graphManager/action/SourceInformationHelper.ts",
     "./src/graphManager/action/TEMPORARY__AbstractEngineConfig.ts",
+    "./src/graphManager/action/analytics/MappingAnalytics.ts",
     "./src/graphManager/action/changeDetection/CoreObserverHelper.ts",
     "./src/graphManager/action/changeDetection/DSLData_ObserverHelper.ts",
     "./src/graphManager/action/changeDetection/DSLExternalFormat_ObserverHelper.ts",
@@ -84,6 +85,7 @@
     "./src/graphManager/action/changeDetection/StoreRelational_ObserverHelper.ts",
     "./src/graphManager/action/changeDetection/Testable_ObserverHelper.ts",
     "./src/graphManager/action/changeDetection/ValueSpecificationObserver.ts",
+    "./src/graphManager/action/creation/DSLExternalFormat_ModelCreatorHelper.ts",
     "./src/graphManager/action/creation/DSLMapping_ModelCreatorHelper.ts",
     "./src/graphManager/action/creation/DomainModelCreatorHelper.ts",
     "./src/graphManager/action/creation/RawValueSpecificationCreatorHelper.ts",
@@ -118,7 +120,7 @@
     "./src/models/metamodels/pure/InferableValue.ts",
     "./src/models/metamodels/pure/Reference.ts",
     "./src/models/metamodels/pure/data/EmbeddedData.ts",
-    "./src/models/metamodels/pure/data/RelationalData.ts",
+    "./src/models/metamodels/pure/data/RelationalCSVData.ts",
     "./src/models/metamodels/pure/executionPlan/ExecutionPlan.ts",
     "./src/models/metamodels/pure/executionPlan/nodes/ExecutionNode.ts",
     "./src/models/metamodels/pure/executionPlan/nodes/RelationalInstantiationExecutionNode.ts",
@@ -316,12 +318,13 @@
     "./src/models/protocols/pure/v1/engine/V1_EngineError.ts",
     "./src/models/protocols/pure/v1/engine/V1_EngineHelper.ts",
     "./src/models/protocols/pure/v1/engine/V1_EngineServerClient.ts",
-    "./src/models/protocols/pure/v1/engine/V1_ExecutionHelper.ts",
+    "./src/models/protocols/pure/v1/engine/analytics/V1_MappingAnalytics.ts",
     "./src/models/protocols/pure/v1/engine/compilation/V1_CompilationError.ts",
     "./src/models/protocols/pure/v1/engine/compilation/V1_CompileResult.ts",
     "./src/models/protocols/pure/v1/engine/compilation/V1_LambdaReturnTypeResult.ts",
     "./src/models/protocols/pure/v1/engine/execution/V1_ExecuteInput.ts",
     "./src/models/protocols/pure/v1/engine/execution/V1_ExecutionError.ts",
+    "./src/models/protocols/pure/v1/engine/execution/V1_ExecutionHelper.ts",
     "./src/models/protocols/pure/v1/engine/execution/V1_ExecutionResult.ts",
     "./src/models/protocols/pure/v1/engine/externalFormat/V1_ExternalFormatDescription.ts",
     "./src/models/protocols/pure/v1/engine/externalFormat/V1_ExternalFormatModelGeneration.ts",
@@ -351,7 +354,7 @@
     "./src/models/protocols/pure/v1/model/context/V1_PureModelContextText.ts",
     "./src/models/protocols/pure/v1/model/context/V1_SDLC.ts",
     "./src/models/protocols/pure/v1/model/data/V1_EmbeddedData.ts",
-    "./src/models/protocols/pure/v1/model/data/V1_RelationalData.ts",
+    "./src/models/protocols/pure/v1/model/data/V1_RelationalCSVData.ts",
     "./src/models/protocols/pure/v1/model/executionPlan/V1_ExecutionPlan.ts",
     "./src/models/protocols/pure/v1/model/executionPlan/V1_SimpleExecutionPlan.ts",
     "./src/models/protocols/pure/v1/model/executionPlan/nodes/V1_ExecutionNode.ts",

package/lib/models/metamodels/pure/data/RelationalData.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"RelationalData.d.ts","sourceRoot":"","sources":["../../../../../src/models/metamodels/pure/data/RelationalData.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EAAE,KAAK,mBAAmB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAE3E,qBAAa,yBAA0B,YAAW,QAAQ;IACxD,KAAK,EAAG,MAAM,CAAC;IAEf,IAAI,QAAQ,IAAI,MAAM,CAKrB;CACF;AACD,qBAAa,sBAAuB,YAAW,QAAQ;IACrD,MAAM,EAAG,MAAM,CAAC;IAEhB,IAAI,QAAQ,IAAI,MAAM,CAKrB;CACF;AAED,qBAAa,mBAAoB,YAAW,QAAQ;IAClD,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,SAAS,EAAG,MAAM,CAAC;IACnB,OAAO,EAAE,yBAAyB,EAAE,CAAM;IAC1C,IAAI,EAAE,sBAAsB,EAAE,CAAM;IAEpC,IAAI,QAAQ,IAAI,MAAM,CAQrB;CACF;AACD,qBAAa,cAAe,SAAQ,YAAa,YAAW,QAAQ;IAClE,MAAM,EAAE,mBAAmB,EAAE,CAAM;IAEnC,0BAA0B,CAAC,CAAC,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC,CAAC,GAAG,CAAC;IAIjE,IAAI,QAAQ,IAAI,MAAM,CAKrB;CACF"}

package/lib/models/metamodels/pure/data/RelationalData.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"RelationalData.js","sourceRoot":"","sources":["../../../../../src/models/metamodels/pure/data/RelationalData.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAiB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAA4B,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAE3E,MAAM,OAAO,yBAAyB;IACpC,KAAK,CAAU;IAEf,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,mBAAmB,CAAC,4BAA4B;YAChD,IAAI,CAAC,KAAK;SACX,CAAC,CAAC;IACL,CAAC;CACF;AACD,MAAM,OAAO,sBAAsB;IACjC,MAAM,CAAU;IAEhB,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,mBAAmB,CAAC,yBAAyB;YAC7C,IAAI,CAAC,MAAM;SACZ,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,mBAAmB;IAC9B,UAAU,CAAqB;IAC/B,SAAS,CAAU;IACnB,OAAO,GAAgC,EAAE,CAAC;IAC1C,IAAI,GAA6B,EAAE,CAAC;IAEpC,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,mBAAmB,CAAC,qBAAqB;YACzC,IAAI,CAAC,UAAU,IAAI,EAAE;YACrB,IAAI,CAAC,SAAS;YACd,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC;YACvB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;SACrB,CAAC,CAAC;IACL,CAAC;CACF;AACD,MAAM,OAAO,cAAe,SAAQ,YAAY;IAC9C,MAAM,GAA0B,EAAE,CAAC;IAEnC,0BAA0B,CAAI,OAA+B;QAC3D,OAAO,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,mBAAmB,CAAC,qBAAqB;YACzC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC;SACvB,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/models/protocols/pure/v1/engine/V1_ExecutionHelper.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"V1_ExecutionHelper.d.ts","sourceRoot":"","sources":["../../../../../../src/models/protocols/pure/v1/engine/V1_ExecutionHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,EACL,KAAK,eAAe,EASrB,MAAM,iEAAiE,CAAC;AACzE,OAAO,EACL,KAAK,kBAAkB,EAOxB,MAAM,mCAAmC,CAAC;AAqE3C,eAAO,MAAM,uBAAuB,aACxB,kBAAkB,KAC3B,eAaF,CAAC"}

package/lib/models/protocols/pure/v1/engine/V1_ExecutionHelper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"V1_ExecutionHelper.js","sourceRoot":"","sources":["../../../../../../src/models/protocols/pure/v1/engine/V1_ExecutionHelper.ts"],"names":[],"mappings":"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"}

package/lib/models/protocols/pure/v1/model/data/V1_RelationalData.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"V1_RelationalData.d.ts","sourceRoot":"","sources":["../../../../../../../src/models/protocols/pure/v1/model/data/V1_RelationalData.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,KAAK,QAAQ,EAAa,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EACL,eAAe,EACf,KAAK,sBAAsB,EAC5B,MAAM,sBAAsB,CAAC;AAE9B,qBAAa,4BAA6B,YAAW,QAAQ;IAC3D,KAAK,EAAG,MAAM,CAAC;IAEf,IAAI,QAAQ,IAAI,MAAM,CAKrB;CACF;AAED,qBAAa,yBAA0B,YAAW,QAAQ;IACxD,MAAM,EAAG,MAAM,CAAC;IAEhB,IAAI,QAAQ,IAAI,MAAM,CAKrB;CACF;AAED,qBAAa,sBAAuB,YAAW,QAAQ;IACrD,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,SAAS,EAAG,MAAM,CAAC;IACnB,OAAO,EAAE,4BAA4B,EAAE,CAAM;IAC7C,IAAI,EAAE,yBAAyB,EAAE,CAAM;IAEvC,IAAI,QAAQ,IAAI,MAAM,CAQrB;CACF;AAED,qBAAa,iBAAkB,SAAQ,eAAgB,YAAW,QAAQ;IACxE,MAAM,EAAE,sBAAsB,EAAE,CAAM;IAEtC,0BAA0B,CAAC,CAAC,EAAE,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC,GAAG,CAAC;IAIpE,IAAI,QAAQ,IAAI,MAAM,CAKrB;CACF"}