@finos/legend-graph 23.1.0 → 24.0.0

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

@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-import { createModelSchema, list, primitive, custom } from 'serializr';
+import { createModelSchema, list, primitive } from 'serializr';
 import {
-  serializeArray,
-  deserializeArray,
   usingModelSchema,
   usingConstantValueSchema,
+  customEquivalentList,
 } from '@finos/legend-shared';
 import { V1_packageableElementPointerDeserializerSchema } from '../../../transformation/pureProtocol/serializationHelpers/V1_CoreSerializationHelper.js';
 import {
@@ -33,17 +32,7 @@ export const V1_GENERATION_SPECIFICATION_ELEMENT_PROTOCOL_TYPE =
 export const V1_generationTreeNodeModelSchema = createModelSchema(
   V1_GenerationTreeNode,
   {
-    children: custom(
-      (values) =>
-        serializeArray(values, (value) => value, {
-          skipIfEmpty: true,
-          INTERNAL__forceReturnEmptyInTest: true,
-        }),
-      (values) =>
-        deserializeArray(values, (value) => value, {
-          skipIfEmpty: false,
-        }),
-    ),
+    children: customEquivalentList(),
     generationElement: primitive(),
     id: primitive(),
   },

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

@@ -29,7 +29,6 @@ import {
 import {
   type PlainObject,
   usingConstantValueSchema,
-  deserializeArray,
   assertTrue,
   guaranteeIsNumber,
   guaranteeIsString,
@@ -37,9 +36,10 @@ import {
   isNonNullable,
   shallowStringify,
   UnsupportedOperationError,
-  serializeArray,
   usingModelSchema,
   optionalCustom,
+  optionalCustomList,
+  customList,
 } from '@finos/legend-shared';
 import {
   ATOMIC_TEST_TYPE,
@@ -101,11 +101,10 @@ 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 { DSL_Mapping_PureProtocolProcessorPlugin_Extension } from '../../../../DSL_Mapping_PureProtocolProcessorPlugin_Extension.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 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';
 import { V1_MappingTestSuite } from '../../../model/packageableElements/mapping/V1_MappingTestSuite.js';
@@ -255,25 +254,10 @@ const rootRelationalClassMappingModelSchema = createModelSchema(
     extendsClassMappingId: optional(primitive()),
     distinct: primitive(),
     filter: usingModelSchema(V1_filterMappingModelSchema),
-    groupBy: custom(
-      (values) =>
-        serializeArray(
-          values,
-          (value: V1_RelationalOperationElement) =>
-            V1_serializeRelationalOperationElement(value),
-          {
-            skipIfEmpty: true,
-            INTERNAL__forceReturnEmptyInTest: true,
-          },
-        ),
-      (values) =>
-        deserializeArray(
-          values,
-          (val) => V1_deserializeRelationalOperationElement(val),
-          {
-            skipIfEmpty: false,
-          },
-        ),
+    groupBy: customList(
+      V1_serializeRelationalOperationElement,
+      V1_deserializeRelationalOperationElement,
+      { INTERNAL__forceReturnEmptyInTest: true },
     ),
     id: optional(primitive()),
     mainTable: usingModelSchema(V1_tablePtrModelSchema),
@@ -1174,25 +1158,12 @@ export const V1_mappingModelSchema = (
 ): ModelSchema<V1_Mapping> =>
   createModelSchema(V1_Mapping, {
     _type: usingConstantValueSchema(V1_MAPPING_ELEMENT_PROTOCOL_TYPE),
-    associationMappings: custom(
-      (values) =>
-        serializeArray(
-          values,
-          (value: V1_AssociationMapping) =>
-            V1_serializeAssociationMapping(value),
-          {
-            skipIfEmpty: true,
-            INTERNAL__forceReturnEmptyInTest: true,
-          },
-        ),
-      (values) =>
-        deserializeArray(
-          values,
-          (val) => V1_deserializeAssociationMapping(val),
-          {
-            skipIfEmpty: false,
-          },
-        ),
+    associationMappings: customList(
+      V1_serializeAssociationMapping,
+      V1_deserializeAssociationMapping,
+      {
+        INTERNAL__forceReturnEmptyInTest: true,
+      },
     ),
     classMappings: list(
       custom(
@@ -1221,19 +1192,9 @@ export const V1_mappingModelSchema = (
     ),
     name: primitive(),
     package: primitive(),
-    testSuites: optionalCustom(
-      (values) =>
-        serializeArray(
-          values,
-          (value: V1_TestSuite) => V1_serializeTestSuite(value, plugins),
-          {
-            skipIfEmpty: true,
-          },
-        ),
-      (values) =>
-        deserializeArray(values, (v) => V1_deserializeTestSuite(v, plugins), {
-          skipIfEmpty: false,
-        }),
+    testSuites: optionalCustomList(
+      (value: V1_TestSuite) => V1_serializeTestSuite(value, plugins),
+      (value) => V1_deserializeTestSuite(value, plugins),
     ),
     tests: list(usingModelSchema(V1_mappingTestModelLegacySchema)),
   });

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 { STO_Relational_PureProtocolProcessorPlugin_Extension } from '../../../../STO_Relational_PureProtocolProcessorPlugin_Extension.js';
+import type { STO_Relational_PureProtocolProcessorPlugin_Extension } from '../../../../extensions/STO_Relational_PureProtocolProcessorPlugin_Extension.js';
 import {
   V1_deserializeRawValueSpecification,
   V1_serializeRawValueSpecification,

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 { STO_Relational_PureProtocolProcessorPlugin_Extension } from '../../../../STO_Relational_PureProtocolProcessorPlugin_Extension.js';
+import type { STO_Relational_PureProtocolProcessorPlugin_Extension } from '../../../../extensions/STO_Relational_PureProtocolProcessorPlugin_Extension.js';
 
 enum V1_MapperType {
   TABLE = 'table',

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

@@ -28,11 +28,12 @@ import {
 import {
   type PlainObject,
   usingConstantValueSchema,
-  deserializeArray,
   UnsupportedOperationError,
-  serializeArray,
   usingModelSchema,
   optionalCustom,
+  customListWithSchema,
+  customEquivalentList,
+  customList,
 } from '@finos/legend-shared';
 import {
   type V1_ServiceExecution,
@@ -159,24 +160,7 @@ export const V1_serviceTestModelSchema = createModelSchema(V1_ServiceTest, {
   ),
   id: primitive(),
   keys: list(primitive()),
-  parameters: custom(
-    (values) =>
-      serializeArray(
-        values,
-        (value) => serialize(V1_parameterValueModelSchema, value),
-        {
-          skipIfEmpty: true,
-        },
-      ),
-    (values) =>
-      deserializeArray(
-        values,
-        (v) => deserialize(V1_parameterValueModelSchema, v),
-        {
-          skipIfEmpty: false,
-        },
-      ),
-  ),
+  parameters: customListWithSchema(V1_parameterValueModelSchema),
   serializationFormat: optional(primitive()),
 });
 
@@ -298,17 +282,9 @@ const testContainerModelSchema = createModelSchema(
   V1_DEPRECATED__TestContainer,
   {
     assert: usingModelSchema(V1_rawLambdaModelSchema),
-    parametersValues: custom(
-      (values) =>
-        serializeArray(values, (value) => value, {
-          skipIfEmpty: true,
-          INTERNAL__forceReturnEmptyInTest: true,
-        }),
-      (values) =>
-        deserializeArray(values, (v) => v, {
-          skipIfEmpty: false,
-        }),
-    ),
+    parametersValues: customEquivalentList({
+      INTERNAL__forceReturnEmptyInTest: true,
+    }),
   },
 );
 
@@ -379,77 +355,24 @@ export const V1_serviceModelSchema = (
     owners: list(primitive()),
     package: primitive(),
     pattern: primitive(),
-    stereotypes: custom(
-      (values) =>
-        serializeArray(
-          values,
-          (value) => serialize(V1_stereotypePtrSchema, value),
-          {
-            skipIfEmpty: true,
-            INTERNAL__forceReturnEmptyInTest: true,
-          },
-        ),
-      (values) =>
-        deserializeArray(
-          values,
-          (v) => deserialize(V1_stereotypePtrSchema, v),
-          {
-            skipIfEmpty: false,
-          },
-        ),
-    ),
-    taggedValues: custom(
-      (values) =>
-        serializeArray(
-          values,
-          (value) => serialize(V1_taggedValueSchema, value),
-          {
-            skipIfEmpty: true,
-            INTERNAL__forceReturnEmptyInTest: true,
-          },
-        ),
-      (values) =>
-        deserializeArray(values, (v) => deserialize(V1_taggedValueSchema, v), {
-          skipIfEmpty: false,
-        }),
-    ),
+    stereotypes: customListWithSchema(V1_stereotypePtrSchema, {
+      INTERNAL__forceReturnEmptyInTest: true,
+    }),
+    taggedValues: customListWithSchema(V1_taggedValueSchema, {
+      INTERNAL__forceReturnEmptyInTest: true,
+    }),
     test: optionalCustom(
       V1_serializeLegacyServiceTest,
       V1_deserializeLegacyServiceTest,
     ),
-    testSuites: custom(
-      (values) =>
-        serializeArray(
-          values,
-          (value: V1_TestSuite) => V1_serializeTestSuite(value, plugins),
-          {
-            skipIfEmpty: true,
-            INTERNAL__forceReturnEmptyInTest: true,
-          },
-        ),
-      (values) =>
-        deserializeArray(values, (v) => V1_deserializeTestSuite(v, plugins), {
-          skipIfEmpty: false,
-        }),
-    ),
-    postValidations: custom(
-      (values) =>
-        serializeArray(
-          values,
-          (value: V1_PostValidation) =>
-            serialize(V1_servicePostValidationModelSchema, value),
-          {
-            skipIfEmpty: true,
-            INTERNAL__forceReturnEmptyInTest: true,
-          },
-        ),
-      (values) =>
-        deserializeArray(
-          values,
-          (v) => deserialize(V1_servicePostValidationModelSchema, v),
-          {
-            skipIfEmpty: false,
-          },
-        ),
+    testSuites: customList(
+      (value: V1_TestSuite) => V1_serializeTestSuite(value, plugins),
+      (value) => V1_deserializeTestSuite(value, plugins),
+      {
+        INTERNAL__forceReturnEmptyInTest: true,
+      },
     ),
+    postValidations: customListWithSchema(V1_servicePostValidationModelSchema, {
+      INTERNAL__forceReturnEmptyInTest: true,
+    }),
   });

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

@@ -31,6 +31,7 @@ import {
   UnsupportedOperationError,
   serializeArray,
   usingModelSchema,
+  customEquivalentList,
 } from '@finos/legend-shared';
 import { V1_FlatData } from '../../../model/packageableElements/store/flatData/model/V1_FlatData.js';
 import { V1_FlatDataProperty } from '../../../model/packageableElements/store/flatData/model/V1_FlatDataProperty.js';
@@ -282,17 +283,7 @@ function V1_flatDataSectionDeserializer(value: {
 
 export const V1_flatDataModelSchema = createModelSchema(V1_FlatData, {
   _type: usingConstantValueSchema(V1_FLAT_DATA_ELEMENT_PROTOCOL_TYPE),
-  includedStores: custom(
-    (values) =>
-      serializeArray(values, (value: string) => value, {
-        skipIfEmpty: true,
-        INTERNAL__forceReturnEmptyInTest: true,
-      }),
-    (values) =>
-      deserializeArray(values, (value) => value, {
-        skipIfEmpty: false,
-      }),
-  ),
+  includedStores: customEquivalentList(),
   name: primitive(),
   package: primitive(),
   sections: list(

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

@@ -33,7 +33,7 @@ import {
 } from 'serializr';
 import { ATOMIC_TEST_TYPE } from '../../../../../../../graph/MetaModelConst.js';
 import type { PureProtocolProcessorPlugin } from '../../../../PureProtocolProcessorPlugin.js';
-import type { Testable_PureProtocolProcessorPlugin_Extension } from '../../../../Testable_PureProtocolProcessorPlugin_Extension.js';
+import type { Testable_PureProtocolProcessorPlugin_Extension } from '../../../../extensions/Testable_PureProtocolProcessorPlugin_Extension.js';
 import { V1_MappingTest } from '../../../model/packageableElements/mapping/V1_MappingTest.js';
 import { V1_MappingTestSuite } from '../../../model/packageableElements/mapping/V1_MappingTestSuite.js';
 import { V1_MultiExecutionServiceTestResult } from '../../../model/packageableElements/service/V1_MultiExecutionServiceTestResult.js';

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

@@ -26,13 +26,12 @@ import {
 import {
   type PlainObject,
   optionalCustom,
-  deserializeArray,
-  serializeArray,
   deserializeMap,
   serializeMap,
   usingModelSchema,
   usingConstantValueSchema,
   UnsupportedOperationError,
+  customList,
 } from '@finos/legend-shared';
 import type { V1_ExecutionPlan } from '../../../../model/executionPlan/V1_ExecutionPlan.js';
 import { V1_SimpleExecutionPlan } from '../../../../model/executionPlan/V1_SimpleExecutionPlan.js';
@@ -145,20 +144,9 @@ const SQLExecutionNodeModelSchema = createModelSchema(V1_SQLExecutionNode, {
     (val) => V1_serializeDatabaseConnectionValue(val),
     (val) => V1_deserializeDatabaseConnectionValue(val),
   ),
-  executionNodes: custom(
-    (values) =>
-      serializeArray(
-        values,
-        (value: V1_ResultType) => V1_serializeExecutionNode(value),
-        {
-          skipIfEmpty: true,
-          INTERNAL__forceReturnEmptyInTest: true,
-        },
-      ),
-    (values) =>
-      deserializeArray(values, (value) => V1_deserializeExecutionNode(value), {
-        skipIfEmpty: false,
-      }),
+  executionNodes: customList(
+    V1_serializeExecutionNode,
+    V1_deserializeExecutionNode,
   ),
   onConnectionCloseCommitQuery: optional(primitive()),
   onConnectionCloseRollbackQuery: optional(primitive()),