@finos/legend-application-studio 18.0.0 → 18.0.1

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

@@ -70,7 +70,7 @@ import {
   enumMapping_setEnumValueMappings,
   enumValueMapping_addSourceValue,
   enumValueMapping_setSourceValues,
-  mapping_setPropertyMappings,
+  instanceSetImpl_setPropertyMappings,
   operationMapping_setParameters,
   pureInstanceSetImpl_setPropertyMappings,
   purePropertyMapping_setTransformer,
@@ -208,14 +208,8 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
         propertyType instanceof Unit ||
         propertyType instanceof Measure
       ) {
-        // only allow one property mapping per primitive property
-        assertTrue(
-          !existingPropertyMappings.length ||
-            existingPropertyMappings.length === 1,
-          'Only one property mapping should exist per simple type (e.g. primitive, measure, unit) property',
-        );
         return existingPropertyMappings.length
-          ? [existingPropertyMappings[0] as PurePropertyMapping]
+          ? existingPropertyMappings
           : [
               new PurePropertyMapping(
                 setImplementation,
@@ -226,14 +220,8 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
               ),
             ];
       } else if (propertyType instanceof Enumeration) {
-        // only allow one property mapping per enumeration property
-        assertTrue(
-          !existingPropertyMappings.length ||
-            existingPropertyMappings.length === 1,
-          'Only one property mapping should exist per enumeration type property',
-        );
         const enumerationPropertyMapping = existingPropertyMappings.length
-          ? [existingPropertyMappings[0] as PurePropertyMapping]
+          ? existingPropertyMappings
           : [
               new PurePropertyMapping(
                 setImplementation,
@@ -323,10 +311,15 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
     pureInstanceSetImpl_setPropertyMappings(
       setImplementation,
       decoratedPropertyMappings.concat(
-        propertyMappingsBeforeDecoration.filter(
-          (propertyMapping) =>
-            !decoratedPropertyMappings.includes(propertyMapping),
-        ),
+        propertyMappingsBeforeDecoration
+          .filter(
+            (propertyMapping) =>
+              !isStubbed_RawLambda(propertyMapping.transform),
+          )
+          .filter(
+            (propertyMapping) =>
+              !decoratedPropertyMappings.includes(propertyMapping),
+          ),
       ),
       this.editorStore.changeDetectionState.observerContext,
     );
@@ -355,14 +348,8 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
         propertyType instanceof Unit ||
         propertyType instanceof Measure
       ) {
-        // only allow one property mapping per primitive property
-        assertTrue(
-          !existingPropertyMappings.length ||
-            existingPropertyMappings.length === 1,
-          'Only one property mapping should exist per simple type (e.g. primitive, measure, unit) property',
-        );
         return existingPropertyMappings.length
-          ? [existingPropertyMappings[0] as FlatDataPropertyMapping]
+          ? existingPropertyMappings
           : [
               new FlatDataPropertyMapping(
                 setImplementation,
@@ -439,13 +426,20 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
         setImplementation,
         decoratePropertyMapping,
       );
-    mapping_setPropertyMappings(
+    instanceSetImpl_setPropertyMappings(
       setImplementation,
       decoratedPropertyMappings.concat(
-        propertyMappingsBeforeDecoration.filter(
-          (propertyMapping) =>
-            !decoratedPropertyMappings.includes(propertyMapping),
-        ),
+        propertyMappingsBeforeDecoration
+          .filter(
+            (propertyMapping) =>
+              (propertyMapping instanceof FlatDataPropertyMapping &&
+                !isStubbed_RawLambda(propertyMapping.transform)) ||
+              propertyMapping instanceof EmbeddedFlatDataPropertyMapping,
+          )
+          .filter(
+            (propertyMapping) =>
+              !decoratedPropertyMappings.includes(propertyMapping),
+          ),
       ),
       this.editorStore.changeDetectionState.observerContext,
     );
@@ -486,15 +480,9 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
         propertyType instanceof Unit ||
         propertyType instanceof Measure
       ) {
-        // only allow one property mapping per primitive property
-        assertTrue(
-          !existingPropertyMappings.length ||
-            existingPropertyMappings.length === 1,
-          'Only one property mapping should exist per simple type (e.g. primitive, measure, unit) property',
-        );
         if (existingPropertyMappings.length) {
           // TODO?: do we want to check the type of the property mapping here?
-          return [existingPropertyMappings[0] as PropertyMapping];
+          return existingPropertyMappings;
         }
         const newPropertyMapping = new RelationalPropertyMapping(
           setImplementation,
@@ -506,16 +494,10 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
           stub_RawRelationalOperationElement();
         return [newPropertyMapping];
       } else if (propertyType instanceof Enumeration) {
-        // only allow one property mapping per enumeration property
-        assertTrue(
-          !existingPropertyMappings.length ||
-            existingPropertyMappings.length === 1,
-          'Only one property mapping should exist per enumeration type property',
-        );
         let ePropertyMapping: PropertyMapping[] = [];
         if (existingPropertyMappings.length) {
           // TODO?: do we want to check the type of the property mapping here?
-          ePropertyMapping = [existingPropertyMappings[0] as PropertyMapping];
+          ePropertyMapping = existingPropertyMappings;
         } else {
           const newPropertyMapping = new RelationalPropertyMapping(
             setImplementation,
@@ -613,13 +595,23 @@ export class MappingElementDecorator implements SetImplementationVisitor<void> {
         setImplementation,
         decoratePropertyMapping,
       );
-    mapping_setPropertyMappings(
+    instanceSetImpl_setPropertyMappings(
       setImplementation,
       decoratedPropertyMappings.concat(
-        propertyMappingsBeforeDecoration.filter(
-          (propertyMapping) =>
-            !decoratedPropertyMappings.includes(propertyMapping),
-        ),
+        propertyMappingsBeforeDecoration
+          .filter(
+            (propertyMapping) =>
+              (propertyMapping instanceof RelationalPropertyMapping &&
+                !isStubbed_RawRelationalOperationElement(
+                  propertyMapping.relationalOperation,
+                )) ||
+              propertyMapping instanceof
+                EmbeddedRelationalInstanceSetImplementation,
+          )
+          .filter(
+            (propertyMapping) =>
+              !decoratedPropertyMappings.includes(propertyMapping),
+          ),
       ),
       this.editorStore.changeDetectionState.observerContext,
     );
@@ -708,7 +700,7 @@ export class MappingElementDecorationCleaner
   visit_PureInstanceSetImplementation(
     setImplementation: PureInstanceSetImplementation,
   ): void {
-    mapping_setPropertyMappings(
+    instanceSetImpl_setPropertyMappings(
       setImplementation,
       setImplementation.propertyMappings.filter(
         (propertyMapping) => !isStubbed_RawLambda(propertyMapping.transform),
@@ -722,7 +714,7 @@ export class MappingElementDecorationCleaner
       | FlatDataInstanceSetImplementation
       | EmbeddedFlatDataPropertyMapping,
   ): void {
-    mapping_setPropertyMappings(
+    instanceSetImpl_setPropertyMappings(
       setImplementation,
       setImplementation.propertyMappings.filter(
         (propertyMapping) =>

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

@@ -29,13 +29,20 @@ import {
   getNullableFirstElement,
   assertTrue,
   URL_SEPARATOR,
+  filterByType,
 } from '@finos/legend-shared';
 import { LEGEND_STUDIO_APP_EVENT } from '../../../LegendStudioAppEvent.js';
 import { Version } from '@finos/legend-server-sdlc';
 import {
   type Service,
   type ServiceRegistrationResult,
+  type PureExecution,
   ServiceExecutionMode,
+  buildLambdaVariableExpressions,
+  VariableExpression,
+  TYPICAL_MULTIPLICITY_TYPE,
+  generateMultiplicityString,
+  multiplicityComparator,
 } from '@finos/legend-graph';
 import { ServiceRegistrationEnvironmentConfig } from '../../../../application/LegendStudioApplicationConfig.js';
 import {
@@ -314,5 +321,37 @@ export class ServiceRegistrationState {
         'Service version can not be empty in Semi-interactive and Prod service type',
       );
     }
+
+    // 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 invalidParams = buildLambdaVariableExpressions(
+      (this.service.execution as PureExecution).func,
+      this.editorStore.graphManagerState,
+    )
+      .filter(filterByType(VariableExpression))
+      .filter(
+        (p) =>
+          !supportedServiceParamMultiplicties.some((m) =>
+            multiplicityComparator(m, p.multiplicity),
+          ),
+      );
+    assertTrue(
+      invalidParams.length === 0,
+      `Parameter(s)${invalidParams.map(
+        (p) =>
+          ` ${p.name}: [${generateMultiplicityString(
+            p.multiplicity.lowerBound,
+            p.multiplicity.upperBound,
+          )}]`,
+      )} has/have unsupported multiplicity. Supported multiplicities include ${supportedServiceParamMultiplicties.map(
+        (m) => ` [${generateMultiplicityString(m.lowerBound, m.upperBound)}]`,
+      )}.`,
+    );
   }
 }

package/src/stores/graphModifier/DSL_Mapping_GraphModifierHelper.ts

@@ -86,7 +86,7 @@ import {
 } from '@finos/legend-shared';
 import { action } from 'mobx';
 
-export const mapping_setPropertyMappings = action(
+export const instanceSetImpl_setPropertyMappings = action(
   (
     si: InstanceSetImplementation,
     pm: PropertyMapping[],
@@ -97,6 +97,17 @@ export const mapping_setPropertyMappings = action(
     );
   },
 );
+
+export const instanceSetImpl_deletePropertyMapping = action(
+  (si: InstanceSetImplementation, pm: PropertyMapping): void => {
+    deleteEntry(
+      si.propertyMappings,
+      pm,
+      (p1, p2) => p1.property._UUID === p2.property._UUID,
+    );
+  },
+);
+
 export const setImpl_setRoot = action(
   (owner: SetImplementation, val: boolean): void => {
     owner.root.value = val;