@finos/legend-application-studio 18.0.1 → 18.0.2

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

@@ -36,12 +36,12 @@ import {
   getAllClassConstraints,
   getAllClassDerivedProperties,
 } from '@finos/legend-graph';
-import { LambdaEditorState } from '@finos/legend-application';
 import {
   constraint_setFunctionDefinition,
   derivedProperty_setBody,
   derivedProperty_setParameters,
-} from '../../graphModifier/DomainGraphModifierHelper.js';
+} from '../../shared/modifier/DomainGraphModifierHelper.js';
+import { LambdaEditorState } from '@finos/legend-query-builder';
 
 export const CONSTRAINT_SOURCE_ID_LABEL = 'constraint';
 export const DERIVED_PROPERTY_SOURCE_ID_LABEL = 'derivedProperty';

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

@@ -26,7 +26,7 @@ import {
 import {
   createObservableFileGeneration,
   fileGeneration_setType,
-} from '../../graphModifier/DSL_Generation_GraphModifierHelper.js';
+} from '../../shared/modifier/DSL_Generation_GraphModifierHelper.js';
 import { handlePostCreateAction } from '../../editor/NewElementState.js';
 
 export class ElementFileGenerationState {

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

@@ -35,7 +35,7 @@ import {
   buildSourceInformationSourceId,
   isStubbed_PackageableElement,
 } from '@finos/legend-graph';
-import { LambdaEditorState } from '@finos/legend-application';
+import { LambdaEditorState } from '@finos/legend-query-builder';
 
 export enum FUNCTION_SPEC_TAB {
   GENERAL = 'GENERAL',

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

@@ -67,14 +67,14 @@ import {
   generateIdentifiedConnectionId,
 } from '@finos/legend-graph';
 import type { DSL_Mapping_LegendStudioApplicationPlugin_Extension } from '../../DSL_Mapping_LegendStudioApplicationPlugin_Extension.js';
-import { packageableElementReference_setValue } from '../../graphModifier/DomainGraphModifierHelper.js';
+import { packageableElementReference_setValue } from '../../shared/modifier/DomainGraphModifierHelper.js';
 import {
   runtime_addIdentifiedConnection,
   runtime_addMapping,
   runtime_addUniqueStoreConnectionsForStore,
   runtime_deleteIdentifiedConnection,
   runtime_deleteMapping,
-} from '../../graphModifier/DSL_Mapping_GraphModifierHelper.js';
+} from '../../shared/modifier/DSL_Mapping_GraphModifierHelper.js';
 
 export const getClassMappingStore = (
   setImplementation: SetImplementation,

package/src/stores/editor-state/element-editor-state/connection/ConnectionEditorState.ts

@@ -59,7 +59,7 @@ import type { DSL_Mapping_LegendStudioApplicationPlugin_Extension } from '../../
 import {
   relationDbConnection_setNewAuthenticationStrategy,
   relationDbConnection_setDatasourceSpecification,
-} from '../../../graphModifier/STO_Relational_GraphModifierHelper.js';
+} from '../../../shared/modifier/STO_Relational_GraphModifierHelper.js';
 import {
   MapperPostProcessorEditorState,
   type PostProcessorEditorState,

package/src/stores/editor-state/element-editor-state/connection/DatabaseBuilderState.ts

@@ -49,7 +49,7 @@ import {
   getNullableSchema,
   getNullableTable,
 } from '@finos/legend-graph';
-import { connection_setStore } from '../../../graphModifier/DSL_Mapping_GraphModifierHelper.js';
+import { connection_setStore } from '../../../shared/modifier/DSL_Mapping_GraphModifierHelper.js';
 
 export abstract class DatabaseBuilderTreeNodeData implements TreeNodeData {
   isOpen?: boolean | undefined;

package/src/stores/editor-state/element-editor-state/data/EmbeddedDataState.ts

@@ -42,7 +42,7 @@ import {
   relationalData_setTableName,
   relationalData_setTableSchemaName,
   relationalData_setTableValues,
-} from '../../../graphModifier/DSL_Data_GraphModifierHelper.js';
+} from '../../../shared/modifier/DSL_Data_GraphModifierHelper.js';
 import { EmbeddedDataType } from '../../ExternalFormatState.js';
 
 export const createEmbeddedData = (

package/src/stores/editor-state/element-editor-state/external-format/DSL_ExternalFormat_SchemaSetEditorState.ts

@@ -55,7 +55,7 @@ import { type EntityChange, EntityChangeType } from '@finos/legend-server-sdlc';
 import type { EditorStore } from '../../../EditorStore.js';
 import { ElementEditorState } from '../ElementEditorState.js';
 import { LEGEND_STUDIO_APP_EVENT } from '../../../LegendStudioAppEvent.js';
-import { configurationProperty_setValue } from '../../../graphModifier/DSL_Generation_GraphModifierHelper.js';
+import { configurationProperty_setValue } from '../../../shared/modifier/DSL_Generation_GraphModifierHelper.js';
 
 export enum SCHEMA_SET_TAB_TYPE {
   SCHEMAS = 'SCHEMAS',

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

@@ -99,13 +99,12 @@ import {
   stub_Class,
   findPropertyMapping,
 } from '@finos/legend-graph';
-import { LambdaEditorState } from '@finos/legend-application';
 import type {
   DSL_Mapping_LegendStudioApplicationPlugin_Extension,
   MappingElementLabel,
 } from '../../../DSL_Mapping_LegendStudioApplicationPlugin_Extension.js';
 import type { LegendStudioApplicationPlugin } from '../../../LegendStudioApplicationPlugin.js';
-import { flatData_setSourceRootRecordType } from '../../../graphModifier/STO_FlatData_GraphModifierHelper.js';
+import { flatData_setSourceRootRecordType } from '../../../shared/modifier/STO_FlatData_GraphModifierHelper.js';
 import {
   pureInstanceSetImpl_setSrcClass,
   mapping_addClassMapping,
@@ -117,9 +116,10 @@ import {
   mapping_deleteTest,
   setImpl_updateRootOnCreate,
   setImpl_updateRootOnDelete,
-} from '../../../graphModifier/DSL_Mapping_GraphModifierHelper.js';
+} from '../../../shared/modifier/DSL_Mapping_GraphModifierHelper.js';
 import { BASIC_SET_IMPLEMENTATION_TYPE } from '../../../shared/ModelClassifierUtils.js';
-import { rootRelationalSetImp_setMainTableAlias } from '../../../graphModifier/STO_Relational_GraphModifierHelper.js';
+import { rootRelationalSetImp_setMainTableAlias } from '../../../shared/modifier/STO_Relational_GraphModifierHelper.js';
+import { LambdaEditorState } from '@finos/legend-query-builder';
 
 export interface MappingExplorerTreeNodeData extends TreeNodeData {
   mappingElement: MappingElement;

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

@@ -67,15 +67,15 @@ import {
 } from '@finos/legend-graph';
 import type { EditorStore } from '../../../EditorStore.js';
 import {
-  enumMapping_setEnumValueMappings,
+  enumerationMapping_setEnumValueMappings,
   enumValueMapping_addSourceValue,
   enumValueMapping_setSourceValues,
-  instanceSetImpl_setPropertyMappings,
+  instanceSetImplementation_setPropertyMappings,
   operationMapping_setParameters,
   pureInstanceSetImpl_setPropertyMappings,
   purePropertyMapping_setTransformer,
-} from '../../../graphModifier/DSL_Mapping_GraphModifierHelper.js';
-import { rootRelationalSetImp_setPropertyMappings } from '../../../graphModifier/STO_Relational_GraphModifierHelper.js';
+} from '../../../shared/modifier/DSL_Mapping_GraphModifierHelper.js';
+import { rootRelationalSetImp_setPropertyMappings } from '../../../shared/modifier/STO_Relational_GraphModifierHelper.js';
 import type { DSL_Mapping_LegendStudioApplicationPlugin_Extension } from '../../../DSL_Mapping_LegendStudioApplicationPlugin_Extension.js';
 
 /**
@@ -157,7 +157,7 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
       }
     });
     if (enumValueMappingsToAdd.length) {
-      enumMapping_setEnumValueMappings(
+      enumerationMapping_setEnumValueMappings(
         enumerationMapping,
         enumerationMapping.enumValueMappings.concat(enumValueMappingsToAdd),
       );
@@ -311,6 +311,8 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
     pureInstanceSetImpl_setPropertyMappings(
       setImplementation,
       decoratedPropertyMappings.concat(
+        // NOTE: here, we remove some low-quality property mappings
+        // i.e. stubbed property mappings from before adding new decorated property mappings
         propertyMappingsBeforeDecoration
           .filter(
             (propertyMapping) =>
@@ -426,9 +428,12 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
         setImplementation,
         decoratePropertyMapping,
       );
-    instanceSetImpl_setPropertyMappings(
+    instanceSetImplementation_setPropertyMappings(
       setImplementation,
       decoratedPropertyMappings.concat(
+        // NOTE: here, we remove some low-quality property mappings
+        // i.e. stubbed property mappings, incompatible property mappings
+        // from before adding new decorated property mappings
         propertyMappingsBeforeDecoration
           .filter(
             (propertyMapping) =>
@@ -595,9 +600,12 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
         setImplementation,
         decoratePropertyMapping,
       );
-    instanceSetImpl_setPropertyMappings(
+    instanceSetImplementation_setPropertyMappings(
       setImplementation,
       decoratedPropertyMappings.concat(
+        // NOTE: here, we remove some low-quality property mappings
+        // i.e. stubbed property mappings, incompatible property mappings
+        // from before adding new decorated property mappings
         propertyMappingsBeforeDecoration
           .filter(
             (propertyMapping) =>
@@ -669,7 +677,7 @@ export class MappingElementDecorationCleaner
         enumValueMapping.sourceValues.filter(isNonNullable),
       );
     });
-    enumMapping_setEnumValueMappings(
+    enumerationMapping_setEnumValueMappings(
       enumerationMapping,
       nonEmptyEnumValueMappings,
     );
@@ -700,7 +708,7 @@ export class MappingElementDecorationCleaner
   visit_PureInstanceSetImplementation(
     setImplementation: PureInstanceSetImplementation,
   ): void {
-    instanceSetImpl_setPropertyMappings(
+    instanceSetImplementation_setPropertyMappings(
       setImplementation,
       setImplementation.propertyMappings.filter(
         (propertyMapping) => !isStubbed_RawLambda(propertyMapping.transform),
@@ -714,7 +722,7 @@ export class MappingElementDecorationCleaner
       | FlatDataInstanceSetImplementation
       | EmbeddedFlatDataPropertyMapping,
   ): void {
-    instanceSetImpl_setPropertyMappings(
+    instanceSetImplementation_setPropertyMappings(
       setImplementation,
       setImplementation.propertyMappings.filter(
         (propertyMapping) =>

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

@@ -24,7 +24,7 @@ import type {
   SetImplementation,
   Type,
 } from '@finos/legend-graph';
-import { LambdaEditorState } from '@finos/legend-application';
+import { LambdaEditorState } from '@finos/legend-query-builder';
 
 export class MappingElementState {
   readonly uuid = uuid();

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

@@ -104,30 +104,30 @@ import {
   ActionAlertActionType,
   ActionAlertType,
   ExecutionPlanState,
-  LambdaEditorState,
   TAB_SIZE,
 } from '@finos/legend-application';
 import {
   objectInputData_setData,
   runtime_addIdentifiedConnection,
   runtime_addMapping,
-} from '../../../graphModifier/DSL_Mapping_GraphModifierHelper.js';
-import { flatData_setData } from '../../../graphModifier/STO_FlatData_GraphModifierHelper.js';
+} from '../../../shared/modifier/DSL_Mapping_GraphModifierHelper.js';
+import { flatData_setData } from '../../../shared/modifier/STO_FlatData_GraphModifierHelper.js';
 import {
   service_addTestSuite,
   service_initNewService,
   service_setExecution,
-} from '../../../graphModifier/DSL_Service_GraphModifierHelper.js';
+} from '../../../shared/modifier/DSL_Service_GraphModifierHelper.js';
 import {
   localH2DatasourceSpecification_setTestDataSetupCsv,
   localH2DatasourceSpecification_setTestDataSetupSqls,
   relationalInputData_setData,
-} from '../../../graphModifier/STO_Relational_GraphModifierHelper.js';
+} from '../../../shared/modifier/STO_Relational_GraphModifierHelper.js';
 import {
   createEmptyEqualToJsonAssertion,
   createBareExternalFormat,
 } from '../../../shared/testable/TestableUtils.js';
 import { SERIALIZATION_FORMAT } from '../service/testable/ServiceTestEditorState.js';
+import { LambdaEditorState } from '@finos/legend-query-builder';
 
 export class MappingExecutionQueryState extends LambdaEditorState {
   editorStore: EditorStore;

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

@@ -84,12 +84,8 @@ import {
   generateIdentifiedConnectionId,
   DEPRECATED__validate_MappingTest,
 } from '@finos/legend-graph';
-import {
-  ExecutionPlanState,
-  LambdaEditorState,
-  TAB_SIZE,
-} from '@finos/legend-application';
-import { flatData_setData } from '../../../graphModifier/STO_FlatData_GraphModifierHelper.js';
+import { ExecutionPlanState, TAB_SIZE } from '@finos/legend-application';
+import { flatData_setData } from '../../../shared/modifier/STO_FlatData_GraphModifierHelper.js';
 import {
   expectedOutputMappingTestAssert_setExpectedOutput,
   mappingTest_setAssert,
@@ -97,12 +93,13 @@ import {
   objectInputData_setData,
   runtime_addIdentifiedConnection,
   runtime_addMapping,
-} from '../../../graphModifier/DSL_Mapping_GraphModifierHelper.js';
+} from '../../../shared/modifier/DSL_Mapping_GraphModifierHelper.js';
 import {
   localH2DatasourceSpecification_setTestDataSetupCsv,
   localH2DatasourceSpecification_setTestDataSetupSqls,
   relationalInputData_setData,
-} from '../../../graphModifier/STO_Relational_GraphModifierHelper.js';
+} from '../../../shared/modifier/STO_Relational_GraphModifierHelper.js';
+import { LambdaEditorState } from '@finos/legend-query-builder';
 
 export enum TEST_RESULT {
   NONE = 'NONE', // test has not run yet

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

@@ -39,8 +39,8 @@ import {
   stub_RawLambda,
   isStubbed_RawLambda,
 } from '@finos/legend-graph';
-import { LambdaEditorState } from '@finos/legend-application';
-import { pureInstanceSetImpl_setMappingFilter } from '../../../graphModifier/DSL_Mapping_GraphModifierHelper.js';
+import { pureInstanceSetImpl_setMappingFilter } from '../../../shared/modifier/DSL_Mapping_GraphModifierHelper.js';
+import { LambdaEditorState } from '@finos/legend-query-builder';
 
 export class PurePropertyMappingState extends PropertyMappingState {
   editorStore: EditorStore;

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

@@ -30,14 +30,9 @@ import {
   RuntimeEditorState,
 } from '../../../editor-state/element-editor-state/RuntimeEditorState.js';
 import {
-  buildParametersLetLambdaFunc,
   DEFAULT_TYPEAHEAD_SEARCH_LIMIT,
   DEFAULT_TYPEAHEAD_SEARCH_MINIMUM_SEARCH_LENGTH,
   ExecutionPlanState,
-  LambdaEditorState,
-  LambdaParametersState,
-  LambdaParameterState,
-  PARAMETER_SUBMIT_ACTION,
   TAB_SIZE,
 } from '@finos/legend-application';
 import {
@@ -70,7 +65,7 @@ import {
   stub_Mapping,
 } from '@finos/legend-graph';
 import { type Entity, parseGACoordinates } from '@finos/legend-storage';
-import { runtime_addMapping } from '../../../graphModifier/DSL_Mapping_GraphModifierHelper.js';
+import { runtime_addMapping } from '../../../shared/modifier/DSL_Mapping_GraphModifierHelper.js';
 import type { EditorStore } from '../../../EditorStore.js';
 import {
   keyedExecutionParameter_setKey,
@@ -81,7 +76,14 @@ import {
   pureSingleExecution_setMapping,
   pureSingleExecution_setRuntime,
   service_setExecution,
-} from '../../../graphModifier/DSL_Service_GraphModifierHelper.js';
+} from '../../../shared/modifier/DSL_Service_GraphModifierHelper.js';
+import {
+  buildParametersLetLambdaFunc,
+  LambdaEditorState,
+  LambdaParametersState,
+  LambdaParameterState,
+  PARAMETER_SUBMIT_ACTION,
+} from '@finos/legend-query-builder';
 
 export class ServiceExecutionParameterState extends LambdaParametersState {
   executionState: ServicePureExecutionState;

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

@@ -268,7 +268,7 @@ export class ServiceRegistrationState {
             label: 'Launch Service',
             type: ActionAlertActionType.PROCEED,
             handler: (): void => {
-              this.editorStore.applicationStore.navigator.openNewWindow(
+              this.editorStore.applicationStore.navigator.visitAddress(
                 generateServiceManagementUrl(
                   config.managementUrl,
                   serviceRegistrationResult.pattern,

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

@@ -51,7 +51,7 @@ import type { EditorStore } from '../../../../EditorStore.js';
 import {
   service_addConnectionTestData,
   service_setConnectionTestDataEmbeddedData,
-} from '../../../../graphModifier/DSL_Service_GraphModifierHelper.js';
+} from '../../../../shared/modifier/DSL_Service_GraphModifierHelper.js';
 import {
   createMockEnumerationProperty,
   createMockPrimitiveProperty,

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

@@ -23,7 +23,6 @@ import {
   ParameterValue,
   buildLambdaVariableExpressions,
   VariableExpression,
-  generateVariableExpressionMockValue,
 } from '@finos/legend-graph';
 import { action, flow, makeObservable, observable } from 'mobx';
 import { TestableTestEditorState } from '../../testable/TestableEditorState.js';
@@ -35,7 +34,7 @@ import {
   service_setParameterValues,
   service_setParameterValueSpec,
   service_setSerializationFormat,
-} from '../../../../graphModifier/DSL_Service_GraphModifierHelper.js';
+} from '../../../../shared/modifier/DSL_Service_GraphModifierHelper.js';
 import {
   assertErrorThrown,
   deleteEntry,
@@ -46,6 +45,7 @@ import {
   uuid,
 } from '@finos/legend-shared';
 import type { EditorStore } from '../../../../EditorStore.js';
+import { generateVariableExpressionMockValue } from '@finos/legend-query-builder';
 
 export enum SERIALIZATION_FORMAT {
   PURE = 'PURE',

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

@@ -46,7 +46,7 @@ import {
   service_addTest,
   service_addTestSuite,
   service_deleteTestSuite,
-} from '../../../../graphModifier/DSL_Service_GraphModifierHelper.js';
+} from '../../../../shared/modifier/DSL_Service_GraphModifierHelper.js';
 import { createEmptyEqualToJsonAssertion } from '../../../../shared/testable/TestableUtils.js';
 import type { ServiceEditorState } from '../ServiceEditorState.js';
 import { ServiceTestDataState } from './ServiceTestDataState.js';

package/src/stores/editor-state/element-editor-state/testable/TestAssertionState.ts

@@ -36,7 +36,7 @@ import {
 } from '@finos/legend-shared';
 import { action, flow, makeObservable, observable } from 'mobx';
 import type { EditorStore } from '../../../EditorStore.js';
-import { externalFormatData_setData } from '../../../graphModifier/DSL_Data_GraphModifierHelper.js';
+import { externalFormatData_setData } from '../../../shared/modifier/DSL_Data_GraphModifierHelper.js';
 import {
   getTestableResultFromAssertionStatus,
   TESTABLE_RESULT,

package/src/stores/editor-state/element-editor-state/testable/TestableEditorState.ts

@@ -35,7 +35,7 @@ import {
 } from '@finos/legend-shared';
 import { action, makeObservable, observable } from 'mobx';
 import type { EditorStore } from '../../../EditorStore.js';
-import { atomicTest_addAssertion } from '../../../graphModifier/Testable_GraphModifierHelper.js';
+import { atomicTest_addAssertion } from '../../../shared/modifier/Testable_GraphModifierHelper.js';
 import { createEmptyEqualToJsonAssertion } from '../../../shared/testable/TestableUtils.js';
 import { TESTABLE_RESULT } from '../../../sidebar-state/testable/GlobalTestRunnerState.js';
 import {

package/src/stores/project-viewer/ProjectViewerStore.ts

@@ -112,7 +112,7 @@ export class ProjectViewerStore {
     if (entityPath) {
       this.elementPath = entityPath;
       if (projectId) {
-        this.editorStore.applicationStore.navigator.goTo(
+        this.editorStore.applicationStore.navigator.goToLocation(
           versionId
             ? generateViewVersionRoute(projectId, versionId)
             : revisionId
@@ -125,7 +125,7 @@ export class ProjectViewerStore {
           artifactId,
           versionId: _versionId,
         } = parseGAVCoordinates(gav);
-        this.editorStore.applicationStore.navigator.goTo(
+        this.editorStore.applicationStore.navigator.goToLocation(
           generateViewProjectByGAVRoute(groupId, artifactId, _versionId),
         );
       }

package/src/stores/shared/ModelClassifierUtils.ts

@@ -74,14 +74,3 @@ export enum BASIC_SET_IMPLEMENTATION_TYPE {
   OPERATION = 'operation',
   INSTANCE = 'instance',
 }
-
-export enum SET_IMPLEMENTATION_TYPE {
-  OPERATION = 'operation',
-  MERGE_OPERATION = 'mergeOperation',
-  PUREINSTANCE = 'pureInstance',
-  FLAT_DATA = 'flatData',
-  EMBEDDED_FLAT_DATA = 'embeddedFlatData',
-  RELATIONAL = 'relational',
-  EMBEDDED_RELATIONAL = 'embeddedRelational',
-  AGGREGATION_AWARE = 'aggregationAware',
-}

package/src/stores/{graphModifier → shared/modifier}/DSL_Mapping_GraphModifierHelper.ts

@@ -86,7 +86,7 @@ import {
 } from '@finos/legend-shared';
 import { action } from 'mobx';
 
-export const instanceSetImpl_setPropertyMappings = action(
+export const instanceSetImplementation_setPropertyMappings = action(
   (
     si: InstanceSetImplementation,
     pm: PropertyMapping[],
@@ -98,23 +98,18 @@ export const instanceSetImpl_setPropertyMappings = action(
   },
 );
 
-export const instanceSetImpl_deletePropertyMapping = action(
+export const instanceSetImplementation_deletePropertyMapping = action(
   (si: InstanceSetImplementation, pm: PropertyMapping): void => {
-    deleteEntry(
-      si.propertyMappings,
-      pm,
-      (p1, p2) => p1.property._UUID === p2.property._UUID,
-    );
+    deleteEntry(si.propertyMappings, pm);
   },
 );
 
-export const setImpl_setRoot = action(
+export const setImplementation_setRoot = action(
   (owner: SetImplementation, val: boolean): void => {
     owner.root.value = val;
   },
 );
 
-//
 export const mapping_addClassMapping = action(
   (
     mapping: Mapping,
@@ -179,13 +174,13 @@ export const mapping_addTest = action(
 
 // --------------------------------------------- Enumeration Mapping -------------------------------------
 
-export const enumMapping_setId = action(
+export const enumerationMapping_setId = action(
   (eM: EnumerationMapping, val: string): void => {
     eM.id.value = val;
   },
 );
 
-export const enumMapping_setSourceType = action(
+export const enumerationMapping_setSourceType = action(
   (
     eM: EnumerationMapping,
     value: PackageableElementReference<Type> | undefined,
@@ -196,18 +191,18 @@ export const enumMapping_setSourceType = action(
   },
 );
 
-export const enumMapping_setEnumValueMappings = action(
+export const enumerationMapping_setEnumValueMappings = action(
   (eM: EnumerationMapping, value: EnumValueMapping[]): void => {
     eM.enumValueMappings = value.map(observe_EnumValueMapping);
   },
 );
-export const enumMapping_updateSourceType = action(
+export const enumerationMapping_updateSourceType = action(
   (
     eM: EnumerationMapping,
     value: PackageableElementReference<Type> | undefined,
   ): void => {
     if (eM.sourceType?.value !== value?.value) {
-      enumMapping_setSourceType(eM, value);
+      enumerationMapping_setSourceType(eM, value);
       eM.enumValueMappings = eM.enumValueMappings.map((enumValueMapping) => {
         enumValueMapping.sourceValues = [];
         enumValueMapping.sourceValues.push(
@@ -362,15 +357,15 @@ export const setImpl_updateRootOnCreate = action(
       setImp.class.value,
     ).filter((si) => si !== setImp);
     if (classMappingsWithSimilarTarget.length) {
-      setImpl_setRoot(setImp, false);
+      setImplementation_setRoot(setImp, false);
       if (classMappingsWithSimilarTarget.length === 1) {
-        setImpl_setRoot(
+        setImplementation_setRoot(
           classMappingsWithSimilarTarget[0] as SetImplementation,
           false,
         );
       }
     } else {
-      setImpl_setRoot(setImp, true);
+      setImplementation_setRoot(setImp, true);
     }
   },
 );
@@ -387,7 +382,7 @@ export const setImpl_updateRootOnDelete = action(
       setImp.class.value,
     ).filter((si) => si !== setImp);
     if (classMappingsWithSimilarTarget.length === 1) {
-      setImpl_setRoot(
+      setImplementation_setRoot(
         classMappingsWithSimilarTarget[0] as SetImplementation,
         false,
       );
@@ -409,10 +404,10 @@ export const setImpl_nominateRoot = action(
     );
     classMappingsWithSimilarTarget.forEach((si) => {
       if (si !== setImp) {
-        setImpl_setRoot(si, false);
+        setImplementation_setRoot(si, false);
       }
     });
-    setImpl_setRoot(setImp, true);
+    setImplementation_setRoot(setImp, true);
   },
 );
 

package/src/stores/{graphModifier → shared/modifier}/DomainGraphModifierHelper.ts

@@ -59,7 +59,6 @@ import {
   observe_TaggedValue,
   observe_Constraint,
   observe_GenericType,
-  observe_Multiplicity,
   observe_Type,
   observe_Unit,
   observe_RawLambda,
@@ -194,7 +193,7 @@ export const property_setGenericType = action(
 );
 export const property_setMultiplicity = action(
   (_property: Property | DerivedProperty, value: Multiplicity): void => {
-    _property.multiplicity = observe_Multiplicity(value);
+    _property.multiplicity = value;
   },
 );
 export const stereotypeReference_setValue = action(
@@ -356,7 +355,7 @@ export const function_setReturnType = action(
 );
 export const function_setReturnMultiplicity = action(
   (_func: ConcreteFunctionDefinition, val: Multiplicity): void => {
-    _func.returnMultiplicity = observe_Multiplicity(val);
+    _func.returnMultiplicity = val;
   },
 );
 

package/src/stores/{graphModifier/ValueSpecificationGraphModifierHelper.ts → shared/modifier/RawValueSpecificationGraphModifierHelper.ts}

@@ -17,25 +17,22 @@ import {
   type Multiplicity,
   type RawVariableExpression,
   type Type,
-  observe_Multiplicity,
   observe_Type,
 } from '@finos/legend-graph';
 import { action } from 'mobx';
 
-// --------------------------------------------- Raw Value Specification -------------------------------------
-
 export const rawVariableExpression_setName = action(
-  (rV: RawVariableExpression, value: string): void => {
-    rV.name = value;
+  (target: RawVariableExpression, value: string): void => {
+    target.name = value;
   },
 );
 export const rawVariableExpression_setType = action(
-  (rV: RawVariableExpression, value: Type): void => {
-    rV.type.value = observe_Type(value);
+  (target: RawVariableExpression, value: Type): void => {
+    target.type.value = observe_Type(value);
   },
 );
 export const rawVariableExpression_setMultiplicity = action(
-  (rV: RawVariableExpression, value: Multiplicity): void => {
-    rV.multiplicity = observe_Multiplicity(value);
+  (target: RawVariableExpression, value: Multiplicity): void => {
+    target.multiplicity = value;
   },
 );