@finos/legend-graph 28.1.0 → 28.1.1

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

@@ -20,7 +20,6 @@ import {
   guaranteeNonNullable,
   assertTrue,
   assertType,
-  guaranteeType,
   UnsupportedOperationError,
 } from '@finos/legend-shared';
 import { fromElementPathToMappingElementId } from '../../../../../../../../graph/MetaModelUtils.js';
@@ -32,11 +31,14 @@ import {
   EnumValueMapping,
   SourceValue,
 } from '../../../../../../../../graph/metamodel/pure/packageableElements/mapping/EnumValueMapping.js';
-import { DEPRECATED__MappingTest } from '../../../../../../../../graph/metamodel/pure/packageableElements/mapping/DEPRECATED__MappingTest.js';
-import { ObjectInputData } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/modelToModel/mapping/ObjectInputData.js';
-import type { InputData } from '../../../../../../../../graph/metamodel/pure/packageableElements/mapping/InputData.js';
-import { FlatDataInputData } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/flatData/mapping/FlatDataInputData.js';
-import { ExpectedOutputMappingTestAssert } from '../../../../../../../../graph/metamodel/pure/packageableElements/mapping/ExpectedOutputMappingTestAssert.js';
+import {
+  DEPRECATED__MappingTest,
+  type DEPRECATED__InputData,
+  DEPRECATED__ObjectInputData,
+  DEPRECATED__ExpectedOutputMappingTestAssert,
+  DEPRECATED__FlatDataInputData,
+  DEPRECATED__RelationalInputData,
+} from '../../../../../../../../graph/metamodel/pure/packageableElements/mapping/DEPRECATED__MappingTest.js';
 import type { Class } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/Class.js';
 import { InferableMappingElementIdImplicitValue } from '../../../../../../../../graph/metamodel/pure/packageableElements/mapping/InferableMappingElementId.js';
 import {
@@ -54,16 +56,17 @@ import {
   V1_getEnumValueMappingSourceValueType,
 } from '../../../../model/packageableElements/mapping/V1_EnumValueMapping.js';
 import type { V1_EnumerationMapping } from '../../../../model/packageableElements/mapping/V1_EnumerationMapping.js';
-import type { V1_DEPRECATED__MappingTest } from '../../../../model/packageableElements/mapping/V1_DEPRECATED__MappingTest.js';
-import { V1_ExpectedOutputMappingTestAssert } from '../../../../model/packageableElements/mapping/V1_ExpectedOutputMappingTestAssert.js';
-import type { V1_InputData } from '../../../../model/packageableElements/mapping/V1_InputData.js';
-import { V1_ObjectInputData } from '../../../../model/packageableElements/store/modelToModel/mapping/V1_ObjectInputData.js';
-import { V1_FlatDataInputData } from '../../../../model/packageableElements/store/flatData/mapping/V1_FlatDataInputData.js';
+import {
+  type V1_DEPRECATED__MappingTest,
+  type V1_DEPRECATED__InputData,
+  V1_DEPRECATED__ObjectInputData,
+  V1_DEPRECATED__FlatDataInputData,
+  V1_DEPRECATED__ExpectedOutputMappingTestAssert,
+  V1_DEPRECATED__RelationalInputData,
+} from '../../../../model/packageableElements/mapping/V1_DEPRECATED__MappingTest.js';
 import type { V1_ClassMapping } from '../../../../model/packageableElements/mapping/V1_ClassMapping.js';
 import type { V1_MappingInclude } from '../../../../model/packageableElements/mapping/V1_MappingInclude.js';
 import { V1_buildRawLambdaWithResolvedPaths } from './V1_ValueSpecificationPathResolver.js';
-import { V1_RelationalInputData } from '../../../../model/packageableElements/store/relational/mapping/V1_RelationalInputData.js';
-import { RelationalInputData } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/relational/mapping/RelationalInputData.js';
 import {
   getAllClassMappings,
   getObjectInputType,
@@ -71,14 +74,30 @@ import {
 import { getRelationalInputType } from '../../../../../../../../graph/helpers/STO_Relational_Helper.js';
 import { getEnumValue } from '../../../../../../../../graph/helpers/DomainHelper.js';
 import { PrimitiveType } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/PrimitiveType.js';
-import type { V1_MappingTestSuite } from '../../../../model/packageableElements/mapping/V1_MappingTestSuite.js';
-import { MappingTestSuite } from '../../../../../../../../graph/metamodel/pure/packageableElements/mapping/MappingTestSuite.js';
-import { V1_MappingTest } from '../../../../model/packageableElements/mapping/V1_MappingTest.js';
+import {
+  V1_MappingDataTestSuite,
+  V1_MappingQueryTestSuite,
+  type V1_MappingTestSuite,
+} from '../../../../model/packageableElements/mapping/V1_MappingTestSuite.js';
+import {
+  MappingDataTestSuite,
+  MappingQueryTestSuite,
+  type MappingTestSuite,
+} from '../../../../../../../../graph/metamodel/pure/packageableElements/mapping/MappingTestSuite.js';
+import {
+  V1_MappingDataTest,
+  V1_MappingQueryTest,
+  type V1_MappingTest,
+} from '../../../../model/packageableElements/mapping/V1_MappingTest.js';
 import type { TestSuite } from '../../../../../../../../graph/metamodel/pure/test/Test.js';
-import { MappingTest } from '../../../../../../../../graph/metamodel/pure/packageableElements/mapping/MappingTest.js';
+import {
+  MappingDataTest,
+  MappingQueryTest,
+  type MappingTest,
+} from '../../../../../../../../graph/metamodel/pure/packageableElements/mapping/MappingTest.js';
 import { V1_buildTestAssertion } from './V1_TestBuilderHelper.js';
 import type { V1_MappingStoreTestData } from '../../../../model/packageableElements/mapping/V1_MappingStoreTestData.js';
-import { MappingStoreTestData } from '../../../../../../../../graph/metamodel/pure/packageableElements/mapping/MappingStoreTestData.js';
+import { StoreTestData } from '../../../../../../../../graph/metamodel/pure/packageableElements/mapping/MappingStoreTestData.js';
 import { V1_buildEmbeddedData } from './V1_DataElementBuilderHelper.js';
 import { ModelStore } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/modelToModel/model/ModelStore.js';
 
@@ -212,8 +231,8 @@ export const V1_buildMappingInclude = (
 const buildMappingStoreTestData = (
   element: V1_MappingStoreTestData,
   context: V1_GraphBuilderContext,
-): MappingStoreTestData => {
-  const mappingStoreTestData = new MappingStoreTestData();
+): StoreTestData => {
+  const mappingStoreTestData = new StoreTestData();
   if (element.store === ModelStore.NAME) {
     mappingStoreTestData.store = PackageableElementExplicitReference.create(
       ModelStore.INSTANCE,
@@ -225,13 +244,14 @@ const buildMappingStoreTestData = (
   return mappingStoreTestData;
 };
 
-export const V1_buildMappingTest = (
-  element: V1_MappingTest,
+export const V1_buildMappingQueryTest = (
+  element: V1_MappingQueryTest,
   parentSuite: TestSuite,
   context: V1_GraphBuilderContext,
-): MappingTest => {
-  const mappingTest = new MappingTest();
+): MappingQueryTest => {
+  const mappingTest = new MappingQueryTest();
   mappingTest.id = element.id;
+  mappingTest.doc = element.doc;
   mappingTest.__parent = parentSuite;
   mappingTest.assertions = element.assertions.map((assertion) =>
     V1_buildTestAssertion(assertion, mappingTest, context),
@@ -244,30 +264,88 @@ export const V1_buildMappingTest = (
   return mappingTest;
 };
 
-export const V1_buildMappingTestSuite = (
-  element: V1_MappingTestSuite,
+export const V1_buildMappingDataTest = (
+  element: V1_MappingDataTest,
+  parentSuite: TestSuite,
   context: V1_GraphBuilderContext,
-): MappingTestSuite => {
-  const mappingTestSuite = new MappingTestSuite();
+): MappingDataTest => {
+  const mappingTest = new MappingDataTest();
+  mappingTest.id = element.id;
+  mappingTest.__parent = parentSuite;
+  mappingTest.doc = element.doc;
+  mappingTest.assertions = element.assertions.map((assertion) =>
+    V1_buildTestAssertion(assertion, mappingTest, context),
+  );
+  mappingTest.storeTestData = element.storeTestData.map((testData) =>
+    buildMappingStoreTestData(testData, context),
+  );
+  return mappingTest;
+};
+
+export const V1_buildMappingTest = (
+  element: V1_MappingTest,
+  parentSuite: TestSuite,
+  context: V1_GraphBuilderContext,
+): MappingTest => {
+  if (element instanceof V1_MappingDataTest) {
+    return V1_buildMappingDataTest(element, parentSuite, context);
+  } else if (element instanceof V1_MappingQueryTest) {
+    return V1_buildMappingQueryTest(element, parentSuite, context);
+  }
+  throw new UnsupportedOperationError(
+    'Unable to build mapping test: Unsupported mapping test type',
+  );
+};
+
+const V1_buildMappingDataTestSuite = (
+  element: V1_MappingDataTestSuite,
+  context: V1_GraphBuilderContext,
+): MappingDataTestSuite => {
+  const mappingTestSuite = new MappingDataTestSuite();
   mappingTestSuite.id = element.id;
-  mappingTestSuite.mappingStoreTestDatas = element.mappingStoreTestDatas.map(
-    (testData) => buildMappingStoreTestData(testData, context),
+  mappingTestSuite.storeTestData = element.storeTestData.map((testData) =>
+    buildMappingStoreTestData(testData, context),
   );
   mappingTestSuite.tests = element.tests.map((test) =>
-    V1_buildMappingTest(
-      guaranteeType(test, V1_MappingTest),
-      mappingTestSuite,
-      context,
-    ),
+    V1_buildMappingTest(test, mappingTestSuite, context),
+  );
+  return mappingTestSuite;
+};
+
+const V1_buildMappingQueryTestSuite = (
+  element: V1_MappingQueryTestSuite,
+  context: V1_GraphBuilderContext,
+): MappingQueryTestSuite => {
+  const mappingTestSuite = new MappingQueryTestSuite();
+  mappingTestSuite.id = element.id;
+  mappingTestSuite.query = V1_buildRawLambdaWithResolvedPaths(
+    element.query.parameters,
+    element.query.body,
+    context,
+  );
+  mappingTestSuite.tests = element.tests.map((test) =>
+    V1_buildMappingTest(test, mappingTestSuite, context),
   );
   return mappingTestSuite;
 };
 
+export const V1_buildMappingTestSuite = (
+  element: V1_MappingTestSuite,
+  context: V1_GraphBuilderContext,
+): MappingTestSuite => {
+  if (element instanceof V1_MappingDataTestSuite) {
+    return V1_buildMappingDataTestSuite(element, context);
+  } else if (element instanceof V1_MappingQueryTestSuite) {
+    return V1_buildMappingQueryTestSuite(element, context);
+  }
+  throw new UnsupportedOperationError('Unsupported mapping test suite type');
+};
+
 const V1_buildMappingTestInputData = (
-  inputData: V1_InputData,
+  inputData: V1_DEPRECATED__InputData,
   context: V1_GraphBuilderContext,
-): InputData => {
-  if (inputData instanceof V1_ObjectInputData) {
+): DEPRECATED__InputData => {
+  if (inputData instanceof V1_DEPRECATED__ObjectInputData) {
     assertNonNullable(
       inputData.sourceClass,
       `Object input data 'sourceClass' field is missing`,
@@ -280,12 +358,12 @@ const V1_buildMappingTestInputData = (
       inputData.data,
       `Object input data 'data' field is missing`,
     );
-    return new ObjectInputData(
+    return new DEPRECATED__ObjectInputData(
       context.resolveClass(inputData.sourceClass),
       getObjectInputType(inputData.inputType),
       inputData.data,
     );
-  } else if (inputData instanceof V1_FlatDataInputData) {
+  } else if (inputData instanceof V1_DEPRECATED__FlatDataInputData) {
     assertNonNullable(
       inputData.sourceFlatData,
       `Flat-data input data 'sourceFlatData' field is missing`,
@@ -294,11 +372,11 @@ const V1_buildMappingTestInputData = (
       inputData.data,
       `Flat-data input data 'data' field is missing`,
     );
-    return new FlatDataInputData(
+    return new DEPRECATED__FlatDataInputData(
       context.resolveFlatDataStore(inputData.sourceFlatData.path),
       inputData.data,
     );
-  } else if (inputData instanceof V1_RelationalInputData) {
+  } else if (inputData instanceof V1_DEPRECATED__RelationalInputData) {
     assertNonNullable(
       inputData.database,
       `Relational input data 'database' field is missing`,
@@ -311,7 +389,7 @@ const V1_buildMappingTestInputData = (
       inputData.data,
       `Relational input data 'data' field is missing`,
     );
-    return new RelationalInputData(
+    return new DEPRECATED__RelationalInputData(
       context.resolveDatabase(inputData.database),
       inputData.data,
       getRelationalInputType(inputData.inputType),
@@ -340,10 +418,10 @@ export const V1_buildMappingTestLegacy = (
   // TODO: fix this when we support another mapping test type
   assertType(
     mappingTest.assert,
-    V1_ExpectedOutputMappingTestAssert,
+    V1_DEPRECATED__ExpectedOutputMappingTestAssert,
     `Can't build mapping test assert of type '${mappingTest.assert}'`,
   );
-  const modelAssert = new ExpectedOutputMappingTestAssert(
+  const modelAssert = new DEPRECATED__ExpectedOutputMappingTestAssert(
     mappingTest.assert.expectedOutput,
   );
   const inputData = mappingTest.inputData.map((input) =>

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

@@ -40,24 +40,28 @@ import {
   optionalCustom,
   optionalCustomList,
   customList,
+  TEMPORARY__disableModelSchemaExtensionMechanism,
 } from '@finos/legend-shared';
 import {
   ATOMIC_TEST_TYPE,
   PRIMITIVE_TYPE,
   ELEMENT_PATH_DELIMITER,
 } from '../../../../../../../graph/MetaModelConst.js';
-import type { V1_InputData } from '../../../model/packageableElements/mapping/V1_InputData.js';
 import { V1_Mapping } from '../../../model/packageableElements/mapping/V1_Mapping.js';
-import { V1_DEPRECATED__MappingTest } from '../../../model/packageableElements/mapping/V1_DEPRECATED__MappingTest.js';
+import {
+  type V1_DEPRECATED__MappingTestAssert,
+  type V1_DEPRECATED__InputData,
+  V1_DEPRECATED__MappingTest,
+  V1_DEPRECATED__ObjectInputData,
+  V1_DEPRECATED__FlatDataInputData,
+  V1_DEPRECATED__ExpectedOutputMappingTestAssert,
+  V1_DEPRECATED__RelationalInputData,
+} from '../../../model/packageableElements/mapping/V1_DEPRECATED__MappingTest.js';
 import {
   V1_multiplicityModelSchema,
   V1_packageableElementPointerModelSchema,
 } from '../../../transformation/pureProtocol/serializationHelpers/V1_CoreSerializationHelper.js';
 import { V1_propertyPointerModelSchema } from './V1_DomainSerializationHelper.js';
-import { V1_FlatDataInputData } from '../../../model/packageableElements/store/flatData/mapping/V1_FlatDataInputData.js';
-import { V1_ObjectInputData } from '../../../model/packageableElements/store/modelToModel/mapping/V1_ObjectInputData.js';
-import { V1_ExpectedOutputMappingTestAssert } from '../../../model/packageableElements/mapping/V1_ExpectedOutputMappingTestAssert.js';
-import type { V1_MappingTestAssert } from '../../../model/packageableElements/mapping/V1_MappingTestAssert.js';
 import type { V1_AssociationMapping } from '../../../model/packageableElements/mapping/V1_AssociationMapping.js';
 import type { V1_PropertyMapping } from '../../../model/packageableElements/mapping/V1_PropertyMapping.js';
 import { V1_RelationalAssociationMapping } from '../../../model/packageableElements/store/relational/mapping/V1_RelationalAssociationMapping.js';
@@ -100,14 +104,16 @@ import { V1_AggregationAwarePropertyMapping } from '../../../model/packageableEl
 import type { V1_AbstractFlatDataPropertyMapping } from '../../../model/packageableElements/store/flatData/mapping/V1_AbstractFlatDataPropertyMapping.js';
 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 { DSL_Mapping_PureProtocolProcessorPlugin_Extension } from '../../../../extensions/DSL_Mapping_PureProtocolProcessorPlugin_Extension.js';
 import type { PureProtocolProcessorPlugin } from '../../../../PureProtocolProcessorPlugin.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 { V1_FlatDataAssociationMapping } from '../../../model/packageableElements/store/flatData/mapping/V1_FlatDataAssociationMapping.js';
 import { V1_FlatDataAssociationPropertyMapping } from '../../../model/packageableElements/store/flatData/mapping/V1_FlatDataAssociationPropertyMapping.js';
-import { V1_MappingTestSuite } from '../../../model/packageableElements/mapping/V1_MappingTestSuite.js';
+import {
+  V1_MappingDataTestSuite,
+  V1_MappingQueryTestSuite,
+} from '../../../model/packageableElements/mapping/V1_MappingTestSuite.js';
 import {
   V1_deserializeAtomicTest,
   V1_deserializeTestAssertion,
@@ -122,7 +128,10 @@ import {
   V1_deserializeEmbeddedDataType,
   V1_serializeEmbeddedDataType,
 } from './V1_DataElementSerializationHelper.js';
-import { V1_MappingTest } from '../../../model/packageableElements/mapping/V1_MappingTest.js';
+import {
+  V1_MappingDataTest,
+  V1_MappingQueryTest,
+} from '../../../model/packageableElements/mapping/V1_MappingTest.js';
 import type { V1_TestSuite } from '../../../model/test/V1_TestSuite.js';
 
 enum V1_ClassMappingType {
@@ -360,15 +369,19 @@ const embeddedRelationalPropertyMappingModelSchema = createModelSchema(
   },
 );
 
-const otherwiseEmbeddedRelationalPropertyMappingModelSchgema =
-  createModelSchema(V1_OtherwiseEmbeddedRelationalPropertyMapping, {
+const otherwiseEmbeddedRelationalPropertyMappingModelSchema = createModelSchema(
+  V1_OtherwiseEmbeddedRelationalPropertyMapping,
+  {
     _type: usingConstantValueSchema(
       V1_PropertyMappingType.OTHERWISE_EMBEDDED_RELATIONAL,
     ),
     classMapping: usingModelSchema(relationalClassMappingModelSchema),
+    localMappingProperty: usingModelSchema(
+      V1_localMappingPropertyInfoModelSchema,
+    ),
     otherwisePropertyMapping: custom(
-      (val) => V1_serializeRelationalPropertyMapping(val),
-      (val) => V1_deserializeRelationalPropertyMapping(val),
+      V1_serializeRelationalPropertyMapping,
+      V1_deserializeRelationalPropertyMapping,
     ),
     property: usingModelSchema(V1_propertyPointerModelSchema),
     /**
@@ -381,10 +394,11 @@ const otherwiseEmbeddedRelationalPropertyMappingModelSchgema =
      */
     source: optional(primitive()),
     target: optional(primitive()),
-    localMappingProperty: usingModelSchema(
-      V1_localMappingPropertyInfoModelSchema,
-    ),
-  });
+  },
+);
+TEMPORARY__disableModelSchemaExtensionMechanism(
+  otherwiseEmbeddedRelationalPropertyMappingModelSchema,
+);
 
 const inlineEmbeddedPropertyMappingModelSchema = createModelSchema(
   V1_InlineEmbeddedPropertyMapping,
@@ -434,7 +448,7 @@ function V1_serializeRelationalPropertyMapping(
     protocol instanceof V1_OtherwiseEmbeddedRelationalPropertyMapping
   ) {
     return serialize(
-      otherwiseEmbeddedRelationalPropertyMappingModelSchgema,
+      otherwiseEmbeddedRelationalPropertyMappingModelSchema,
       protocol,
     );
   } else if (protocol instanceof V1_EmbeddedRelationalPropertyMapping) {
@@ -457,7 +471,7 @@ function V1_deserializeRelationalPropertyMapping(
       return deserialize(embeddedRelationalPropertyMappingModelSchema, json);
     case V1_PropertyMappingType.OTHERWISE_EMBEDDED_RELATIONAL:
       return deserialize(
-        otherwiseEmbeddedRelationalPropertyMappingModelSchgema,
+        otherwiseEmbeddedRelationalPropertyMappingModelSchema,
         json,
       );
     case V1_PropertyMappingType.INLINE_EMBEDDED_RELATIONAL:
@@ -734,28 +748,34 @@ enum V1_MappingTestAssertType {
   EXPECTED_OUTPUT_MAPPING_TEST_ASSERT = 'expectedOutputMappingTestAssert',
 }
 
-const V1_objectInputData = createModelSchema(V1_ObjectInputData, {
+const V1_objectInputData = createModelSchema(V1_DEPRECATED__ObjectInputData, {
   _type: usingConstantValueSchema(V1_InputDataType.OBJECT),
   data: primitive(),
   inputType: primitive(),
   sourceClass: primitive(),
 });
 
-const V1_flatDataInputData = createModelSchema(V1_FlatDataInputData, {
-  _type: usingConstantValueSchema(V1_InputDataType.FLAT_DATA),
-  data: primitive(),
-  sourceFlatData: usingModelSchema(V1_packageableElementPointerModelSchema),
-});
+const V1_flatDataInputData = createModelSchema(
+  V1_DEPRECATED__FlatDataInputData,
+  {
+    _type: usingConstantValueSchema(V1_InputDataType.FLAT_DATA),
+    data: primitive(),
+    sourceFlatData: usingModelSchema(V1_packageableElementPointerModelSchema),
+  },
+);
 
-const V1_relationalInputData = createModelSchema(V1_RelationalInputData, {
-  _type: usingConstantValueSchema(V1_InputDataType.RELATIONAL),
-  data: primitive(),
-  database: primitive(),
-  inputType: primitive(),
-});
+const V1_relationalInputData = createModelSchema(
+  V1_DEPRECATED__RelationalInputData,
+  {
+    _type: usingConstantValueSchema(V1_InputDataType.RELATIONAL),
+    data: primitive(),
+    database: primitive(),
+    inputType: primitive(),
+  },
+);
 
 const V1_expectedOutputMappingTestAssertModelSchema = createModelSchema(
-  V1_ExpectedOutputMappingTestAssert,
+  V1_DEPRECATED__ExpectedOutputMappingTestAssert,
   {
     _type: usingConstantValueSchema(
       V1_MappingTestAssertType.EXPECTED_OUTPUT_MAPPING_TEST_ASSERT,
@@ -765,13 +785,13 @@ const V1_expectedOutputMappingTestAssertModelSchema = createModelSchema(
 );
 
 const V1_serializeInputData = (
-  protocol: V1_InputData,
-): PlainObject<V1_InputData> => {
-  if (protocol instanceof V1_ObjectInputData) {
+  protocol: V1_DEPRECATED__InputData,
+): PlainObject<V1_DEPRECATED__InputData> => {
+  if (protocol instanceof V1_DEPRECATED__ObjectInputData) {
     return serialize(V1_objectInputData, protocol);
-  } else if (protocol instanceof V1_FlatDataInputData) {
+  } else if (protocol instanceof V1_DEPRECATED__FlatDataInputData) {
     return serialize(V1_flatDataInputData, protocol);
-  } else if (protocol instanceof V1_RelationalInputData) {
+  } else if (protocol instanceof V1_DEPRECATED__RelationalInputData) {
     return serialize(V1_relationalInputData, protocol);
   }
   throw new UnsupportedOperationError(
@@ -781,8 +801,8 @@ const V1_serializeInputData = (
 };
 
 const V1_deserializeInputData = (
-  json: PlainObject<V1_InputData>,
-): V1_InputData => {
+  json: PlainObject<V1_DEPRECATED__InputData>,
+): V1_DEPRECATED__InputData => {
   switch (json._type) {
     case V1_InputDataType.OBJECT:
       return deserialize(V1_objectInputData, json);
@@ -798,9 +818,9 @@ const V1_deserializeInputData = (
 };
 
 const V1_serializeTestAssert = (
-  protocol: V1_MappingTestAssert,
-): PlainObject<V1_MappingTestAssert> => {
-  if (protocol instanceof V1_ExpectedOutputMappingTestAssert) {
+  protocol: V1_DEPRECATED__MappingTestAssert,
+): PlainObject<V1_DEPRECATED__MappingTestAssert> => {
+  if (protocol instanceof V1_DEPRECATED__ExpectedOutputMappingTestAssert) {
     return serialize(V1_expectedOutputMappingTestAssertModelSchema, protocol);
   }
 
@@ -811,8 +831,8 @@ const V1_serializeTestAssert = (
 };
 
 const V1_deserializeTestAssert = (
-  json: PlainObject<V1_MappingTestAssert>,
-): V1_MappingTestAssert => {
+  json: PlainObject<V1_DEPRECATED__MappingTestAssert>,
+): V1_DEPRECATED__MappingTestAssert => {
   switch (json._type) {
     case V1_MappingTestAssertType.EXPECTED_OUTPUT_MAPPING_TEST_ASSERT:
       return deserialize(V1_expectedOutputMappingTestAssertModelSchema, json);
@@ -852,25 +872,48 @@ export const V1_mappingStoreTestDataModelSchema = (
     store: primitive(),
   });
 
-export const V1_mappingTestModelSchema = createModelSchema(V1_MappingTest, {
-  _type: usingConstantValueSchema(ATOMIC_TEST_TYPE.Mapping_Test),
-  assertions: list(
-    custom(
-      (val) => V1_serializeTestAssertion(val),
-      (val) => V1_deserializeTestAssertion(val),
+export const V1_mappingQueryTestModelSchema = createModelSchema(
+  V1_MappingQueryTest,
+  {
+    _type: usingConstantValueSchema(ATOMIC_TEST_TYPE.Mapping_Query_Test),
+    assertions: list(
+      custom(
+        (val) => V1_serializeTestAssertion(val),
+        (val) => V1_deserializeTestAssertion(val),
+      ),
+    ),
+    id: primitive(),
+    doc: optional(primitive()),
+    query: usingModelSchema(V1_rawLambdaModelSchema),
+  },
+);
+
+export const V1_mappingDataTestModelSchema = (
+  plugins: PureProtocolProcessorPlugin[],
+): ModelSchema<V1_MappingDataTest> =>
+  createModelSchema(V1_MappingDataTest, {
+    _type: usingConstantValueSchema(ATOMIC_TEST_TYPE.Mapping_Data_Test),
+    assertions: list(
+      custom(
+        (val) => V1_serializeTestAssertion(val),
+        (val) => V1_deserializeTestAssertion(val),
+      ),
     ),
-  ),
-  id: primitive(),
-  query: usingModelSchema(V1_rawLambdaModelSchema),
-});
+    doc: optional(primitive()),
+    id: primitive(),
+    storeTestData: usingModelSchema(
+      V1_mappingStoreTestDataModelSchema(plugins),
+    ),
+  });
 
-export const V1_mappingTestSuiteModelSchema = (
+export const V1_mappingDataTestSuiteModelSchema = (
   plugins: PureProtocolProcessorPlugin[],
-): ModelSchema<V1_MappingTestSuite> =>
-  createModelSchema(V1_MappingTestSuite, {
-    _type: usingConstantValueSchema(V1_TestSuiteType.MAPPING_TEST_SUITE),
+): ModelSchema<V1_MappingDataTestSuite> =>
+  createModelSchema(V1_MappingDataTestSuite, {
+    _type: usingConstantValueSchema(V1_TestSuiteType.MAPPING_DATA_TEST_SUITE),
+    doc: optional(primitive()),
     id: primitive(),
-    mappingStoreTestDatas: usingModelSchema(
+    storeTestData: usingModelSchema(
       V1_mappingStoreTestDataModelSchema(plugins),
     ),
     tests: list(
@@ -881,6 +924,22 @@ export const V1_mappingTestSuiteModelSchema = (
     ),
   });
 
+export const V1_mappingQueryTestSuiteModelSchema = (
+  plugins: PureProtocolProcessorPlugin[],
+): ModelSchema<V1_MappingQueryTestSuite> =>
+  createModelSchema(V1_MappingQueryTestSuite, {
+    _type: usingConstantValueSchema(V1_TestSuiteType.MAPPING_QUERY_TEST_SUITE),
+    doc: optional(primitive()),
+    id: primitive(),
+    query: usingModelSchema(V1_rawLambdaModelSchema),
+    tests: list(
+      custom(
+        (val) => V1_serializeAtomicTest(val, plugins),
+        (val) => V1_deserializeAtomicTest(val, plugins),
+      ),
+    ),
+  });
+
 // ------------------------------------- Association Mapping -------------------------------------
 
 enum V1_AssociationMappingType {