@finos/legend-graph 19.2.1 → 20.0.0

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

@@ -24,7 +24,6 @@ import {
   isString,
   guaranteeType,
 } from '@finos/legend-shared';
-import { PRIMITIVE_TYPE } from '../../../../../../../../graph/MetaModelConst.js';
 import { FlatDataSection } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/flatData/model/FlatDataSection.js';
 import {
   type FlatDataDataType,
@@ -61,6 +60,7 @@ import {
   V1_RootFlatDataRecordType,
 } from '../../../../model/packageableElements/store/flatData/model/V1_FlatDataDataType.js';
 import type { V1_FlatDataProperty } from '../../../../model/packageableElements/store/flatData/model/V1_FlatDataProperty.js';
+import { PrimitiveType } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/PrimitiveType.js';
 
 const buildFlatDataDataType = (
   type: V1_FlatDataDataType,
@@ -91,47 +91,29 @@ const buildFlatDataDataType = (
     return recordField;
   };
   if (type instanceof V1_FlatDataString) {
-    return new FlatDataString(
-      context.graph.getPrimitiveType(PRIMITIVE_TYPE.STRING),
-    );
+    return new FlatDataString(PrimitiveType.STRING);
   } else if (type instanceof V1_FlatDataBoolean) {
-    const booleanType = new FlatDataBoolean(
-      context.graph.getPrimitiveType(PRIMITIVE_TYPE.BOOLEAN),
-    );
+    const booleanType = new FlatDataBoolean(PrimitiveType.BOOLEAN);
     booleanType.trueString = type.trueString;
     booleanType.falseString = type.falseString;
     return booleanType;
   } else if (type instanceof V1_FlatDataNumber) {
     if (type instanceof V1_FlatDataInteger) {
-      return new FlatDataInteger(
-        context.graph.getPrimitiveType(PRIMITIVE_TYPE.INTEGER),
-      );
+      return new FlatDataInteger(PrimitiveType.INTEGER);
     } else if (type instanceof V1_FlatDataDecimal) {
-      return new FlatDataDecimal(
-        context.graph.getPrimitiveType(PRIMITIVE_TYPE.DECIMAL),
-      );
+      return new FlatDataDecimal(PrimitiveType.DECIMAL);
     } else if (type instanceof V1_FlatDataFloat) {
-      return new FlatDataFloat(
-        context.graph.getPrimitiveType(PRIMITIVE_TYPE.FLOAT),
-      );
+      return new FlatDataFloat(PrimitiveType.FLOAT);
     }
-    return new FlatDataNumber(
-      context.graph.getPrimitiveType(PRIMITIVE_TYPE.NUMBER),
-    );
+    return new FlatDataNumber(PrimitiveType.NUMBER);
   } else if (type instanceof V1_FlatDataDate) {
     let timeType: FlatDataDate;
     if (type instanceof V1_FlatDataStrictDate) {
-      timeType = new FlatDataStrictDate(
-        context.graph.getPrimitiveType(PRIMITIVE_TYPE.STRICTDATE),
-      );
+      timeType = new FlatDataStrictDate(PrimitiveType.STRICTDATE);
     } else if (type instanceof V1_FlatDataDateTime) {
-      timeType = new FlatDataDateTime(
-        context.graph.getPrimitiveType(PRIMITIVE_TYPE.DATETIME),
-      );
+      timeType = new FlatDataDateTime(PrimitiveType.DATETIME);
     } else {
-      timeType = new FlatDataDate(
-        context.graph.getPrimitiveType(PRIMITIVE_TYPE.DATE),
-      );
+      timeType = new FlatDataDate(PrimitiveType.DATE);
     }
     timeType.dateFormat = type.dateFormat;
     timeType.timeZone = type.timeZone;

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

@@ -22,9 +22,8 @@ import {
   assertType,
   UnsupportedOperationError,
 } from '@finos/legend-shared';
-import { PRIMITIVE_TYPE } from '../../../../../../../../graph/MetaModelConst.js';
 import { fromElementPathToMappingElementId } from '../../../../../../../../graph/MetaModelUtils.js';
-import { Type } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/Type.js';
+import type { Type } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/Type.js';
 import type { Mapping } from '../../../../../../../../graph/metamodel/pure/packageableElements/mapping/Mapping.js';
 import { EnumerationMapping } from '../../../../../../../../graph/metamodel/pure/packageableElements/mapping/EnumerationMapping.js';
 import { Enumeration } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/Enumeration.js';
@@ -67,7 +66,7 @@ import {
 } 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_DSL_Mapping_Helper.js';
+import { PrimitiveType } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/PrimitiveType.js';
 
 export const V1_getInferredClassMappingId = (
   _class: Class,
@@ -99,9 +98,8 @@ const buildEnumValueMapping = (
   // there is no indicator of what enumeration the enum value belongs to
   if (
     sourceType === undefined ||
-    (sourceType instanceof Type &&
-      (sourceType.name === PRIMITIVE_TYPE.INTEGER ||
-        sourceType.name === PRIMITIVE_TYPE.STRING))
+    sourceType === PrimitiveType.INTEGER ||
+    sourceType === PrimitiveType.STRING
   ) {
     enumValueMapping.sourceValues = srcEnumValueMapping.sourceValues.map(
       (sourceValue) => new SourceValue(sourceValue.value as string | number),
@@ -183,7 +181,7 @@ export const V1_buildMappingInclude = (
 ): MappingInclude => {
   const includedMapping = new MappingInclude(
     parentMapping,
-    context.resolveMapping(V1_getIncludedMappingPath(mappingInclude)),
+    context.resolveMapping(mappingInclude.includedMapping),
   );
   if (mappingInclude.sourceDatabasePath && mappingInclude.targetDatabasePath) {
     includedMapping.storeSubstitutions.push(

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

@@ -25,7 +25,6 @@ import {
   PRIMITIVE_TYPE,
   MILESTONING_START_DATE_PARAMETER_NAME,
   BUSINESS_DATE_MILESTONING_PROPERTY_NAME,
-  TYPICAL_MULTIPLICITY_TYPE,
 } from '../../../../../../../../graph/MetaModelConst.js';
 import type { PropertyOwner } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/AbstractProperty.js';
 import { Class } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/Class.js';
@@ -37,18 +36,19 @@ import { V1_Multiplicity } from '../../../../model/packageableElements/domain/V1
 import type { V1_ValueSpecification } from '../../../../model/valueSpecification/V1_ValueSpecification.js';
 import { V1_Variable } from '../../../../model/valueSpecification/V1_Variable.js';
 import { V1_serializeValueSpecification } from '../../../pureProtocol/serializationHelpers/V1_ValueSpecificationSerializer.js';
+import type { PureProtocolProcessorPlugin } from '../../../../../PureProtocolProcessorPlugin.js';
+import { Multiplicity } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/Multiplicity.js';
+import { PrimitiveType } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/PrimitiveType.js';
 
 const buildMilestoningParameter = (
   parameterName: string,
+  plugins: PureProtocolProcessorPlugin[],
 ): PlainObject<V1_ValueSpecification> => {
   const milestoningParameter = new V1_Variable();
   milestoningParameter.name = parameterName;
-  const multiplicity = new V1_Multiplicity();
-  multiplicity.lowerBound = 1;
-  multiplicity.upperBound = 1;
-  milestoningParameter.multiplicity = multiplicity;
+  milestoningParameter.multiplicity = V1_Multiplicity.ONE;
   milestoningParameter.class = PRIMITIVE_TYPE.DATE;
-  const json = V1_serializeValueSpecification(milestoningParameter);
+  const json = V1_serializeValueSpecification(milestoningParameter, plugins);
   return json;
 };
 
@@ -59,10 +59,8 @@ const V1_TEMPORARY_buildMilestoningDateProperty = (
 ): Property =>
   new Property(
     propertyName,
-    graph.getTypicalMultiplicity(TYPICAL_MULTIPLICITY_TYPE.ONE),
-    GenericTypeExplicitReference.create(
-      new GenericType(graph.getPrimitiveType(PRIMITIVE_TYPE.DATE)),
-    ),
+    Multiplicity.ONE,
+    GenericTypeExplicitReference.create(new GenericType(PrimitiveType.DATE)),
     owner,
   );
 
@@ -127,6 +125,7 @@ export const V1_TEMPORARY_buildMilestoningClass = (
 export const V1_buildMilestoningProperties = (
   propertyOwner: PropertyOwner,
   graph: PureModel,
+  plugins: PureProtocolProcessorPlugin[],
 ): void => {
   propertyOwner.properties.forEach((property) => {
     if (property.genericType.value.rawType instanceof Class) {
@@ -145,7 +144,10 @@ export const V1_buildMilestoningProperties = (
             property._OWNER,
           );
           dateProperty.parameters = [
-            buildMilestoningParameter(BUSINESS_DATE_MILESTONING_PROPERTY_NAME),
+            buildMilestoningParameter(
+              BUSINESS_DATE_MILESTONING_PROPERTY_NAME,
+              plugins,
+            ),
           ];
           const milestonedAllVersions = new Property(
             `${property.name}${MILESTONING_VERSION_PROPERTY_SUFFIX.ALL_VERSIONS}`,
@@ -164,8 +166,14 @@ export const V1_buildMilestoningProperties = (
             property._OWNER,
           );
           milestonedAllVersionsInRange.parameters = [
-            buildMilestoningParameter(MILESTONING_START_DATE_PARAMETER_NAME),
-            buildMilestoningParameter(MILESTONING_END_DATE_PARAMETER_NAME),
+            buildMilestoningParameter(
+              MILESTONING_START_DATE_PARAMETER_NAME,
+              plugins,
+            ),
+            buildMilestoningParameter(
+              MILESTONING_END_DATE_PARAMETER_NAME,
+              plugins,
+            ),
           ];
           propertyOwner._generatedMilestonedProperties.push(dateProperty);
           propertyOwner._generatedMilestonedProperties.push(
@@ -188,6 +196,7 @@ export const V1_buildMilestoningProperties = (
           dateProperty.parameters = [
             buildMilestoningParameter(
               PROCESSING_DATE_MILESTONING_PROPERTY_NAME,
+              plugins,
             ),
           ];
           const milestonedAllVersions = new Property(
@@ -207,8 +216,14 @@ export const V1_buildMilestoningProperties = (
             property._OWNER,
           );
           milestonedAllVersionsInRange.parameters = [
-            buildMilestoningParameter(MILESTONING_START_DATE_PARAMETER_NAME),
-            buildMilestoningParameter(MILESTONING_END_DATE_PARAMETER_NAME),
+            buildMilestoningParameter(
+              MILESTONING_START_DATE_PARAMETER_NAME,
+              plugins,
+            ),
+            buildMilestoningParameter(
+              MILESTONING_END_DATE_PARAMETER_NAME,
+              plugins,
+            ),
           ];
           propertyOwner._generatedMilestonedProperties.push(dateProperty);
           propertyOwner._generatedMilestonedProperties.push(
@@ -231,8 +246,12 @@ export const V1_buildMilestoningProperties = (
           dateProperty.parameters = [
             buildMilestoningParameter(
               PROCESSING_DATE_MILESTONING_PROPERTY_NAME,
+              plugins,
+            ),
+            buildMilestoningParameter(
+              BUSINESS_DATE_MILESTONING_PROPERTY_NAME,
+              plugins,
             ),
-            buildMilestoningParameter(BUSINESS_DATE_MILESTONING_PROPERTY_NAME),
           ];
           const milestonedAllVersions = new Property(
             `${property.name}${MILESTONING_VERSION_PROPERTY_SUFFIX.ALL_VERSIONS}`,