@finos/legend-application-studio 20.0.2 → 20.0.4

package/src/components/editor/edit-panel/element-generation-editor/FileGenerationEditor.tsx

@@ -29,6 +29,7 @@ import {
   UnsupportedOperationError,
   debounce,
   guaranteeNonNullable,
+  type PlainObject,
 } from '@finos/legend-shared';
 import {
   type TreeNodeContainerProps,
@@ -584,7 +585,7 @@ const GenerationStringPropertyEditor = observer(
     isReadOnly: boolean;
     update: (
       AbstractGenerationProperty: GenerationProperty,
-      newValue: Record<PropertyKey, unknown>,
+      newValue: PlainObject,
     ) => void;
     getConfigValue: (name: string) => unknown | undefined;
   }) => {
@@ -595,10 +596,7 @@ const GenerationStringPropertyEditor = observer(
     const value =
       (getConfigValue(property.name) as string | undefined) ?? defaultValue;
     const changeValue: React.ChangeEventHandler<HTMLInputElement> = (event) =>
-      update(
-        property,
-        event.target.value as unknown as Record<PropertyKey, unknown>,
-      );
+      update(property, event.target.value as unknown as PlainObject);
     return (
       <div className="panel__content__form__section">
         <div className="panel__content__form__section__header__label">
@@ -625,7 +623,7 @@ const GenerationIntegerPropertyEditor = observer(
     isReadOnly: boolean;
     update: (
       AbstractGenerationProperty: GenerationProperty,
-      newValue: Record<PropertyKey, unknown>,
+      newValue: PlainObject,
     ) => void;
     getConfigValue: (name: string) => unknown | undefined;
   }) => {
@@ -636,10 +634,7 @@ const GenerationIntegerPropertyEditor = observer(
     const value =
       (getConfigValue(property.name) as number | undefined) ?? defaultValue;
     const changeValue: React.ChangeEventHandler<HTMLInputElement> = (event) =>
-      update(
-        property,
-        event.target.value as unknown as Record<PropertyKey, unknown>,
-      );
+      update(property, event.target.value as unknown as PlainObject);
     return (
       <div className="panel__content__form__section">
         <div className="panel__content__form__section__header__label">
@@ -667,7 +662,7 @@ const GenerationBooleanPropertyEditor = observer(
     isReadOnly: boolean;
     update: (
       AbstractGenerationProperty: GenerationProperty,
-      newValue: Record<PropertyKey, unknown>,
+      newValue: PlainObject,
     ) => void;
     getConfigValue: (name: string) => unknown | undefined;
   }) => {
@@ -679,7 +674,7 @@ const GenerationBooleanPropertyEditor = observer(
       (getConfigValue(property.name) as boolean | undefined) ?? defaultValue;
     const toggle = (): void => {
       if (!isReadOnly) {
-        update(property, !value as unknown as Record<PropertyKey, unknown>);
+        update(property, !value as unknown as PlainObject);
       }
     };
     return (
@@ -717,7 +712,7 @@ const GenerationEnumPropertyEditor = observer(
     isReadOnly: boolean;
     update: (
       AbstractGenerationProperty: GenerationProperty,
-      newValue: Record<PropertyKey, unknown>,
+      newValue: PlainObject,
     ) => void;
     getConfigValue: (name: string) => unknown | undefined;
   }) => {
@@ -735,7 +730,7 @@ const GenerationEnumPropertyEditor = observer(
       property.defaultValue;
     const onChange = (val: { label: string; value: string } | null): void => {
       if (val !== null && val.value !== value) {
-        update(property, val.value as unknown as Record<PropertyKey, unknown>);
+        update(property, val.value as unknown as PlainObject);
       }
     };
     return (

package/src/components/editor/edit-panel/mapping-editor/EnumerationMappingEditor.tsx

@@ -54,7 +54,6 @@ import {
 } from '../../../../stores/editor-state/element-editor-state/mapping/MappingElementDecorator.js';
 import { useEditorStore } from '../../EditorStoreProvider.js';
 import {
-  PRIMITIVE_TYPE,
   Type,
   Enum,
   Enumeration,
@@ -64,6 +63,7 @@ import {
   type PackageableElementReference,
   getEnumValueNames,
   PackageableElementExplicitReference,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import {
   enumerationMapping_updateSourceType,
@@ -85,14 +85,7 @@ const EnumerationMappingSourceSelectorModal = observer(
   }) => {
     const { enumerationMapping, closeModal, open } = props;
     const editorStore = useEditorStore();
-    const options = [
-      editorStore.graphManagerState.graph.getPrimitiveType(
-        PRIMITIVE_TYPE.INTEGER,
-      ),
-      editorStore.graphManagerState.graph.getPrimitiveType(
-        PRIMITIVE_TYPE.STRING,
-      ),
-    ]
+    const options = [PrimitiveType.INTEGER, PrimitiveType.STRING]
       .map(buildElementOption)
       .concat(
         editorStore.graphManagerState.usableEnumerations.map(
@@ -177,8 +170,6 @@ export const SourceValueInput = observer(
       expectedType,
       isReadOnly,
     } = props;
-    const inputType =
-      expectedType?.name === PRIMITIVE_TYPE.INTEGER ? 'number' : 'text';
     const value =
       sourceValue.value instanceof Enum
         ? sourceValue.value.name
@@ -248,7 +239,7 @@ export const SourceValueInput = observer(
           onChange={onChange}
           onBlur={onBlur}
           placeholder="Source value"
-          type={inputType}
+          type={expectedType === PrimitiveType.INTEGER ? 'number' : 'text'}
         />
         <div className="enumeration-mapping-editor__enum-value__source-value__info">
           <div className="enumeration-mapping-editor__enum-value__source-value__expected-return-type">

package/src/components/editor/edit-panel/mapping-editor/InstanceSetImplementationEditor.tsx

@@ -79,12 +79,12 @@ import {
   RootFlatDataRecordType,
   Table,
   Database,
-  PRIMITIVE_TYPE,
   TableAlias,
   TableExplicitReference,
   ViewExplicitReference,
   getAllRecordTypes,
   getAllClassProperties,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import type { EditorStore } from '../../../../stores/EditorStore.js';
 import type { DSL_Mapping_LegendStudioApplicationPlugin_Extension } from '../../../../stores/DSL_Mapping_LegendStudioApplicationPlugin_Extension.js';
@@ -411,9 +411,7 @@ const MappingFilterEditor = observer(
             forceBackdrop={!!filterState.parserError}
             forceExpansion={false}
             lambdaEditorState={filterState}
-            expectedType={editorStore.graphManagerState.graph.getPrimitiveType(
-              PRIMITIVE_TYPE.BOOLEAN,
-            )}
+            expectedType={PrimitiveType.BOOLEAN}
           />
         </div>
       </div>

package/src/components/editor/edit-panel/mapping-editor/NewMappingElementModal.tsx

@@ -37,11 +37,11 @@ import {
 import { useEditorStore } from '../../EditorStoreProvider.js';
 import {
   type PackageableElement,
-  PRIMITIVE_TYPE,
   fromElementPathToMappingElementId,
   Class,
   Enumeration,
   Association,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import { BASIC_SET_IMPLEMENTATION_TYPE } from '../../../../stores/shared/ModelClassifierUtils.js';
 import {
@@ -169,9 +169,7 @@ export const NewMappingElementModal = observer(() => {
             mapping,
             id,
             spec.target,
-            editorStore.graphManagerState.graph.getPrimitiveType(
-              PRIMITIVE_TYPE.STRING,
-            ),
+            PrimitiveType.STRING,
           );
         } else if (spec.target instanceof Association) {
           throw new UnsupportedOperationError();

package/src/components/editor/edit-panel/service-editor/testable/ServiceTestsEditor.tsx

@@ -35,7 +35,7 @@ import {
   RefreshIcon,
   TimesIcon,
 } from '@finos/legend-art';
-import { type ValueSpecification, PRIMITIVE_TYPE } from '@finos/legend-graph';
+import { type ValueSpecification, PrimitiveType } from '@finos/legend-graph';
 import { BasicValueSpecificationEditor } from '@finos/legend-query-builder';
 import {
   filterByType,
@@ -242,9 +242,7 @@ const ServiceTestParameterEditor = observer(
             typeCheckOption={{
               expectedType:
                 paramState.varExpression.genericType?.value.rawType ??
-                setupState.editorStore.graphManagerState.graph.getPrimitiveType(
-                  PRIMITIVE_TYPE.STRING,
-                ),
+                PrimitiveType.STRING,
             }}
             className="query-builder__parameters__value__editor"
             resetValue={(): void => {

package/src/components/editor/edit-panel/uml-editor/ClassEditor.tsx

@@ -69,7 +69,6 @@ import {
   type Constraint,
   type Property,
   type DerivedProperty,
-  PRIMITIVE_TYPE,
   MULTIPLICITY_INFINITE,
   Class,
   GenericType,
@@ -979,9 +978,7 @@ const ConstraintEditor = observer(
               }
               lambdaEditorState={constraintState}
               forceBackdrop={hasParserError}
-              expectedType={editorStore.graphManagerState.graph.getPrimitiveType(
-                PRIMITIVE_TYPE.BOOLEAN,
-              )}
+              expectedType={PrimitiveType.BOOLEAN}
               onEditorFocus={onLambdaEditorFocus}
             />
           </div>
@@ -1556,9 +1553,6 @@ export const ClassFormEditor = observer(
         ); // attempting to read the hashCode of immutable element will throw an error
     const classState = editorState.classState;
     const isReadOnly = editorState.isReadOnly;
-    const defaultType = editorStore.graphManagerState.graph.getPrimitiveType(
-      PRIMITIVE_TYPE.STRING,
-    );
 
     // Tab
     const selectedTab = editorState.selectedTab;
@@ -1621,9 +1615,12 @@ export const ClassFormEditor = observer(
     const add = (): void => {
       if (!isReadOnly) {
         if (selectedTab === UML_EDITOR_TAB.PROPERTIES) {
-          class_addProperty(_class, stub_Property(defaultType, _class));
+          class_addProperty(
+            _class,
+            stub_Property(PrimitiveType.STRING, _class),
+          );
         } else if (selectedTab === UML_EDITOR_TAB.DERIVED_PROPERTIES) {
-          const dp = stub_DerivedProperty(defaultType, _class);
+          const dp = stub_DerivedProperty(PrimitiveType.STRING, _class);
           class_addDerivedProperty(_class, dp);
           classState.addDerivedPropertyState(dp);
         } else if (selectedTab === UML_EDITOR_TAB.CONSTRAINTS) {

package/src/stores/EditorGraphState.ts

@@ -186,6 +186,28 @@ export class EditorGraphState {
     return [this.error, ...this.warnings].filter(isNonNullable);
   }
 
+  /**
+   * This function is temporary. There is no good way to detect if a problem not coming from
+   * the main graph at the moment. In text mode, we can rely on the fact that the source information
+   * has line 0 column 0. But this is not the case for form mode, so this is just temporary
+   * to help with text-mode.
+   */
+  TEMPORARY__removeDependencyProblems(
+    problems: Problem[] | CompilationWarning[],
+  ): Problem[] | CompilationWarning[] {
+    return problems.filter((problem) => {
+      if (problem.sourceInformation) {
+        return !(
+          problem.sourceInformation.startLine === 0 &&
+          problem.sourceInformation.startColumn === 0 &&
+          problem.sourceInformation.endLine === 0 &&
+          problem.sourceInformation.endColumn === 0
+        );
+      }
+      return true;
+    });
+  }
+
   get areProblemsStale(): boolean {
     return (
       (this.editorStore.isInFormMode &&
@@ -550,7 +572,10 @@ export class EditorGraphState {
           },
         )) as CompilationResult;
 
-      this.warnings = compilationResult.warnings ?? [];
+      this.warnings = compilationResult.warnings
+        ? this.TEMPORARY__removeDependencyProblems(compilationResult.warnings)
+        : [];
+
       this.mostRecentFormModeCompilationGraphHash = currentGraphHash;
 
       if (!options?.disableNotificationOnSuccess) {
@@ -688,7 +713,9 @@ export class EditorGraphState {
 
       const entities = compilationResult.entities;
       this.mostRecentTextModeCompilationGraphHash = currentGraphHash;
-      this.warnings = compilationResult.warnings ?? [];
+      this.warnings = compilationResult.warnings
+        ? this.TEMPORARY__removeDependencyProblems(compilationResult.warnings)
+        : [];
 
       if (!options?.disableNotificationOnSuccess) {
         if (this.warnings.length) {
@@ -759,7 +786,9 @@ export class EditorGraphState {
             },
           )) as TextCompilationResult;
 
-        this.warnings = compilationResult.warnings ?? [];
+        this.warnings = compilationResult.warnings
+          ? this.TEMPORARY__removeDependencyProblems(compilationResult.warnings)
+          : [];
         this.editorStore.applicationStore.setBlockingAlert({
           message: 'Leaving text mode and rebuilding graph...',
           showLoading: true,
@@ -1222,9 +1251,12 @@ export class EditorGraphState {
   ): Promise<ProjectDependencyCoordinates[]> {
     return Promise.all(
       projectDependencies.map((dep) => {
-        // legacyDependencies
-        // We do this for backward compatible reasons as we expect current dependency ids to be in the format of {groupId}:{artifactId}.
-        // For the legacy dependency we must fetch the corresponding coordinates (group, artifact ids) from the depot server
+        /**
+         * We expect current dependency ids to be in the format of {groupId}:{artifactId}.
+         * For the legacy dependency we must fetch the corresponding coordinates (group, artifact ids) from the depot server
+         *
+         * @backwardCompatibility
+         */
         if (dep.isLegacyDependency) {
           return this.editorStore.depotServerClient
             .getProjectById(dep.projectId)

package/src/stores/editor/NewElementState.ts

@@ -41,11 +41,9 @@ import {
   type PackageableElement,
   type Runtime,
   type Store,
-  type ModelStore,
+  ModelStore,
   type Connection,
   type PureModelConnection,
-  PRIMITIVE_TYPE,
-  TYPICAL_MULTIPLICITY_TYPE,
   ELEMENT_PATH_DELIMITER,
   Package,
   Class,
@@ -74,6 +72,8 @@ import {
   DataElement,
   stub_Database,
   Measure,
+  Multiplicity,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import type { DSL_Mapping_LegendStudioApplicationPlugin_Extension } from '../DSL_Mapping_LegendStudioApplicationPlugin_Extension.js';
 import {
@@ -414,9 +414,7 @@ export class NewPackageableConnectionDriver extends NewElementDriver<Packageable
     const connection = new PackageableConnection(name);
     packageableConnection_setConnectionValue(
       connection,
-      this.newConnectionValueDriver.createConnection(
-        this.store ?? this.editorStore.graphManagerState.graph.modelStore,
-      ),
+      this.newConnectionValueDriver.createConnection(ModelStore.INSTANCE),
       this.editorStore.changeDetectionState.observerContext,
     ); // default to model store
     return connection;
@@ -786,14 +784,8 @@ export class NewElementState {
       case PACKAGEABLE_ELEMENT_TYPE.FUNCTION: {
         const fn = new ConcreteFunctionDefinition(
           name,
-          PackageableElementExplicitReference.create(
-            this.editorStore.graphManagerState.graph.getPrimitiveType(
-              PRIMITIVE_TYPE.STRING,
-            ),
-          ),
-          this.editorStore.graphManagerState.graph.getTypicalMultiplicity(
-            TYPICAL_MULTIPLICITY_TYPE.ONE,
-          ),
+          PackageableElementExplicitReference.create(PrimitiveType.STRING),
+          Multiplicity.ONE,
         );
         // default to empty string
         fn.expressionSequence =

package/src/stores/editor-state/element-editor-state/RuntimeEditorState.ts

@@ -85,7 +85,7 @@ export const getClassMappingStore = (
     editorStore.pluginManager.getApplicationPlugins(),
   );
   if (sourceElement instanceof Class) {
-    return editorStore.graphManagerState.graph.modelStore;
+    return ModelStore.INSTANCE;
   } else if (sourceElement instanceof RootFlatDataRecordType) {
     return sourceElement._OWNER._OWNER;
   } else if (sourceElement instanceof TableAlias) {
@@ -186,9 +186,7 @@ export const decorateRuntimeWithNewMapping = (
         new IdentifiedConnection(
           generateIdentifiedConnectionId(runtimeValue),
           new JsonModelConnection(
-            PackageableElementExplicitReference.create(
-              editorStore.graphManagerState.graph.modelStore,
-            ),
+            PackageableElementExplicitReference.create(ModelStore.INSTANCE),
             PackageableElementExplicitReference.create(_class),
           ),
         ),
@@ -597,9 +595,7 @@ export class IdentifiedConnectionsPerClassEditorTabState extends IdentifiedConne
 
   createDefaultConnection(): Connection {
     return new JsonModelConnection(
-      PackageableElementExplicitReference.create(
-        this.editorStore.graphManagerState.graph.modelStore,
-      ),
+      PackageableElementExplicitReference.create(ModelStore.INSTANCE),
       PackageableElementExplicitReference.create(this.class),
     );
   }

package/src/stores/editor-state/element-editor-state/mapping/MappingEditorState.ts

@@ -64,7 +64,6 @@ import {
   type EmbeddedSetImplementation,
   getAllClassMappings,
   GRAPH_MANAGER_EVENT,
-  PRIMITIVE_TYPE,
   fromElementPathToMappingElementId,
   extractSourceInformationCoordinates,
   getAllEnumerationMappings,
@@ -98,6 +97,7 @@ import {
   InferableMappingElementRootExplicitValue,
   stub_Class,
   findPropertyMapping,
+  PrimitiveType,
 } from '@finos/legend-graph';
 import type {
   DSL_Mapping_LegendStudioApplicationPlugin_Extension,
@@ -1099,9 +1099,7 @@ export class MappingEditorState extends ElementEditorState {
             this.mapping,
             suggestedId,
             spec.target,
-            this.editorStore.graphManagerState.graph.getPrimitiveType(
-              PRIMITIVE_TYPE.STRING,
-            ),
+            PrimitiveType.STRING,
           );
         }
         // NOTE: we don't support association now, nor do we support this for class

package/src/stores/editor-state/element-editor-state/mapping/MappingExecutionState.ts

@@ -98,6 +98,7 @@ import {
   TestData,
   ConnectionTestData,
   DEFAULT_TEST_SUITE_PREFIX,
+  ModelStore,
 } from '@finos/legend-graph';
 import {
   ActionAlertActionType,
@@ -301,9 +302,7 @@ export class MappingExecutionObjectInputDataState extends MappingExecutionInputD
     return createRuntimeForExecution(
       this.mapping,
       new JsonModelConnection(
-        PackageableElementExplicitReference.create(
-          this.editorStore.graphManagerState.graph.modelStore,
-        ),
+        PackageableElementExplicitReference.create(ModelStore.INSTANCE),
         PackageableElementExplicitReference.create(
           guaranteeNonNullable(this.inputData.sourceClass.value),
         ),

package/src/stores/editor-state/element-editor-state/mapping/MappingTestState.ts

@@ -76,6 +76,7 @@ import {
   stub_Class,
   generateIdentifiedConnectionId,
   DEPRECATED__validate_MappingTest,
+  ModelStore,
 } from '@finos/legend-graph';
 import { ExecutionPlanState, TAB_SIZE } from '@finos/legend-application';
 import { flatData_setData } from '../../../shared/modifier/STO_FlatData_GraphModifierHelper.js';
@@ -233,9 +234,7 @@ export class MappingTestObjectInputDataState extends MappingTestInputDataState {
       PackageableElementExplicitReference.create(this.mapping),
     );
     const connection = new JsonModelConnection(
-      PackageableElementExplicitReference.create(
-        this.editorStore.graphManagerState.graph.modelStore,
-      ),
+      PackageableElementExplicitReference.create(ModelStore.INSTANCE),
       PackageableElementExplicitReference.create(
         this.inputData.sourceClass.value,
       ),

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

@@ -23,6 +23,7 @@ import {
   stringifyLosslessJSON,
   UnsupportedOperationError,
   filterByType,
+  guaranteeNonNullable,
 } from '@finos/legend-shared';
 import type { ServiceEditorState } from './ServiceEditorState.js';
 import {
@@ -60,9 +61,9 @@ import {
   buildLambdaVariableExpressions,
   observe_ValueSpecification,
   VariableExpression,
-  buildRawLambdaFromLambdaFunction,
   stub_PackageableRuntime,
   stub_Mapping,
+  ParameterValue,
 } from '@finos/legend-graph';
 import { type Entity, parseGACoordinates } from '@finos/legend-storage';
 import { runtime_addMapping } from '../../../shared/modifier/DSL_Mapping_GraphModifierHelper.js';
@@ -78,7 +79,6 @@ import {
   service_setExecution,
 } from '../../../shared/modifier/DSL_Service_GraphModifierHelper.js';
 import {
-  buildParametersLetLambdaFunc,
   LambdaEditorState,
   LambdaParametersState,
   LambdaParameterState,
@@ -578,15 +578,15 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
     }
     try {
       this.isRunningQuery = true;
-      const query = this.getExecutionQuery();
       const promise =
         this.editorStore.graphManagerState.graphManager.executeMapping(
-          query,
+          this.queryState.query,
           this.selectedExecutionContextState.executionContext.mapping.value,
           this.selectedExecutionContextState.executionContext.runtime,
           this.editorStore.graphManagerState.graph,
           {
             useLosslessParse: true,
+            parameterValues: this.buildExecutionParameterValues(),
           },
         );
       this.setQueryRunPromise(promise);
@@ -609,29 +609,16 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
     }
   }
 
-  getExecutionQuery(): RawLambda {
-    if (this.parameterState.parameterStates.length) {
-      const letlambdaFunction = buildParametersLetLambdaFunc(
-        this.editorStore.graphManagerState.graph,
-        this.parameterState.parameterStates,
-      );
-      const letRawLambda = buildRawLambdaFromLambdaFunction(
-        letlambdaFunction,
-        this.editorStore.graphManagerState,
-      );
-      // reset parameters
-      if (
-        Array.isArray(this.queryState.query.body) &&
-        Array.isArray(letRawLambda.body)
-      ) {
-        letRawLambda.body = [
-          ...(letRawLambda.body as object[]),
-          ...(this.queryState.query.body as object[]),
-        ];
-        return letRawLambda;
-      }
-    }
-    return this.queryState.query;
+  buildExecutionParameterValues(): ParameterValue[] {
+    return this.parameterState.parameterStates.map((queryParamState) => {
+      const paramValue = new ParameterValue();
+      paramValue.name = queryParamState.parameter.name;
+      paramValue.value =
+        this.editorStore.graphManagerState.graphManager.serializeValueSpecification(
+          guaranteeNonNullable(queryParamState.value),
+        );
+      return paramValue;
+    });
   }
 
   get serviceExecutionParameters():

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);