@finos/legend-application-studio 20.0.3 → 20.0.4

package/src/stores/editor-state/element-editor-state/service/ServiceRegistrationState.ts

@@ -40,9 +40,9 @@ import {
   ServiceExecutionMode,
   buildLambdaVariableExpressions,
   VariableExpression,
-  TYPICAL_MULTIPLICITY_TYPE,
   generateMultiplicityString,
-  multiplicityComparator,
+  areMultiplicitiesEqual,
+  Multiplicity,
 } from '@finos/legend-graph';
 import { ServiceRegistrationEnvironmentConfig } from '../../../../application/LegendStudioApplicationConfig.js';
 import {
@@ -336,13 +336,11 @@ export class ServiceRegistrationState {
     }
 
     // validate service parameter multiplicities
-    const supportedServiceParamMultiplicties = [
-      TYPICAL_MULTIPLICITY_TYPE.ONE,
-      TYPICAL_MULTIPLICITY_TYPE.ZEROMANY,
-      TYPICAL_MULTIPLICITY_TYPE.ZEROONE,
-    ].map((p) =>
-      this.editorStore.graphManagerState.graph.getTypicalMultiplicity(p),
-    );
+    const SUPPORTED_SERVICE_PARAMETER_MULTIPLICITIES = [
+      Multiplicity.ONE,
+      Multiplicity.ZERO_MANY,
+      Multiplicity.ZERO_ONE,
+    ];
     const invalidParams = buildLambdaVariableExpressions(
       (this.service.execution as PureExecution).func,
       this.editorStore.graphManagerState,
@@ -350,8 +348,8 @@ export class ServiceRegistrationState {
       .filter(filterByType(VariableExpression))
       .filter(
         (p) =>
-          !supportedServiceParamMultiplicties.some((m) =>
-            multiplicityComparator(m, p.multiplicity),
+          !SUPPORTED_SERVICE_PARAMETER_MULTIPLICITIES.some((m) =>
+            areMultiplicitiesEqual(m, p.multiplicity),
           ),
       );
     assertTrue(
@@ -362,7 +360,7 @@ export class ServiceRegistrationState {
             p.multiplicity.lowerBound,
             p.multiplicity.upperBound,
           )}]`,
-      )} has/have unsupported multiplicity. Supported multiplicities include ${supportedServiceParamMultiplicties.map(
+      )} has/have unsupported multiplicity. Supported multiplicities include ${SUPPORTED_SERVICE_PARAMETER_MULTIPLICITIES.map(
         (m) => ` [${generateMultiplicityString(m.lowerBound, m.upperBound)}]`,
       )}.`,
     );

package/src/stores/editor-state/element-editor-state/service/testable/ServiceTestEditorState.ts

@@ -43,6 +43,7 @@ import {
   isNonNullable,
   returnUndefOnError,
   uuid,
+  type PlainObject,
 } from '@finos/legend-shared';
 import type { EditorStore } from '../../../../EditorStore.js';
 import { generateVariableExpressionMockValue } from '@finos/legend-query-builder';
@@ -304,7 +305,7 @@ export class ServiceTestSetupState {
     return paramValues.map((pValue) => {
       const spec = returnUndefOnError(() =>
         this.editorStore.graphManagerState.graphManager.buildValueSpecification(
-          pValue.value as Record<PropertyKey, unknown>,
+          pValue.value as PlainObject,
           this.editorStore.graphManagerState.graph,
         ),
       );

package/src/stores/shared/MockDataUtils.ts

@@ -20,6 +20,7 @@ import {
   formatDate,
   Randomizer,
   UnsupportedOperationError,
+  type PlainObject,
 } from '@finos/legend-shared';
 import type { EditorStore } from '../EditorStore.js';
 import {
@@ -85,19 +86,14 @@ export const createMockClassInstance = (
   _class: Class,
   traverseNonRequiredProperties = false,
   depth = 0,
-): Record<PropertyKey, unknown> => {
+): PlainObject => {
   const properties = traverseNonRequiredProperties
     ? getAllClassProperties(_class)
     : getAllClassProperties(_class).filter((p) => p.multiplicity.lowerBound);
   const mockData: Record<string, object | string | number | boolean> = {};
   properties.forEach((property) => {
     const propertyType = property.genericType.value.rawType;
-    let propertyMockData:
-      | Record<PropertyKey, unknown>
-      | string
-      | number
-      | boolean
-      | undefined;
+    let propertyMockData: PlainObject | string | number | boolean | undefined;
     switch (getClassPropertyType(propertyType)) {
       case CLASS_PROPERTY_TYPE.PRIMITIVE:
         propertyMockData = createMockPrimitiveProperty(
@@ -163,7 +159,7 @@ export const createMockDataForClass = (
   element: Class,
   maxDepth = 100,
   depthForCycle = 3,
-): Record<PropertyKey, unknown> => {
+): PlainObject => {
   const depth = classHasCycle(element, true, new Set<string>())
     ? Math.max(depthForCycle, 0)
     : Math.max(maxDepth, 0);

package/src/stores/shared/modifier/DSL_Mapping_GraphModifierHelper.ts

@@ -46,11 +46,10 @@ import {
   type PurePropertyMapping,
   type ObjectInputData,
   type ObserverContext,
+  type Type,
   PackageableElementExplicitReference,
   Enumeration,
-  PRIMITIVE_TYPE,
   SourceValue,
-  Type,
   getOwnClassMappingsByClass,
   observe_SetImplementation,
   observe_EnumerationMapping,
@@ -76,6 +75,7 @@ import {
   observe_EnumerationMappingReference,
   type EnumerationMappingReference,
   type SourceValueType,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   addUniqueEntry,
@@ -255,7 +255,7 @@ export const enumValueMapping_updateSourceValue = action(
       // Here we update the source values depending on the source type.
       sourceValue_setValue(
         sourceValue,
-        sourceType instanceof Type && sourceType.name === PRIMITIVE_TYPE.INTEGER
+        sourceType === PrimitiveType.INTEGER
           ? parseInt(val as string, 10)
           : val,
       );