@finos/legend-graph 32.0.6 → 32.0.7

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/to/V1_ClassMappingSecondPassBuilder.ts

@@ -67,6 +67,9 @@ import {
 import type { DSL_Mapping_PureProtocolProcessorPlugin_Extension } from '../../../../extensions/DSL_Mapping_PureProtocolProcessorPlugin_Extension.js';
 import type { V1_MergeOperationClassMapping } from '../../../model/packageableElements/mapping/V1_MergeOperationClassMapping.js';
 import type { V1_INTERNAL__UnknownClassMapping } from '../../../model/packageableElements/mapping/V1_INTERNAL__UnknownClassMapping.js';
+import type { V1_RelationFunctionClassMapping } from '../../../model/packageableElements/mapping/V1_RelationFunctionClassMapping.js';
+import { RelationFunctionInstanceSetImplementation } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/relationFunction/RelationFunctionInstanceSetImplementation.js';
+import { generateFunctionPrettyName } from '../../../../../../../graph/helpers/PureLanguageHelper.js';
 
 export class V1_ClassMappingSecondPassBuilder
   implements V1_ClassMappingVisitor<void>
@@ -365,4 +368,47 @@ export class V1_ClassMappingSecondPassBuilder
 
     return aggragetionAwareInstanceSetImplementation;
   }
+
+  visit_RelationFunctionClassMapping(
+    classMapping: V1_RelationFunctionClassMapping,
+  ): SetImplementation {
+    assertNonEmptyString(
+      classMapping.class,
+      `Relation function class mapping 'class' field is missing or empty`,
+    );
+    const relationFunctionInstanceSetImplementation = guaranteeType(
+      getOwnClassMappingById(
+        this.parent,
+        V1_getInferredClassMappingId(
+          this.context.resolveClass(classMapping.class).value,
+          classMapping,
+        ).value,
+      ),
+      RelationFunctionInstanceSetImplementation,
+    );
+    relationFunctionInstanceSetImplementation.relationFunction =
+      guaranteeNonNullable(
+        this.context.graph.functions.find(
+          (fn) =>
+            generateFunctionPrettyName(fn, {
+              fullPath: true,
+              spacing: false,
+              notIncludeParamName: true,
+            }).replaceAll(/\s/gu, '') ===
+            classMapping.relationFunction.path.replaceAll(/\s/gu, ''),
+        ),
+      );
+    relationFunctionInstanceSetImplementation.propertyMappings =
+      classMapping.propertyMappings.map((propertyMapping) =>
+        propertyMapping.accept_PropertyMappingVisitor(
+          new V1_PropertyMappingBuilder(
+            this.context,
+            relationFunctionInstanceSetImplementation,
+            relationFunctionInstanceSetImplementation,
+            getAllEnumerationMappings(this.parent),
+          ),
+        ),
+      );
+    return relationFunctionInstanceSetImplementation;
+  }
 }

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/to/V1_ElementFirstPassBuilder.ts

@@ -81,6 +81,8 @@ import { INTERNAL__UnknownElement } from '../../../../../../../graph/metamodel/p
 import type { V1_HostedService } from '../../../model/packageableElements/function/V1_HostedService.js';
 import { HostedService } from '../../../../../../../graph/metamodel/pure/packageableElements/function/HostedService.js';
 import { V1_buildFunctionActivatorActions } from './helpers/V1_LegendLambdaHelper.js';
+import { GenericTypeImplicitReference } from '../../../../../../../graph/metamodel/pure/packageableElements/domain/GenericTypeReference.js';
+import { GenericType } from '../../../../../../../graph/metamodel/pure/packageableElements/domain/GenericType.js';
 
 export class V1_ElementFirstPassBuilder
   implements V1_PackageableElementVisitor<PackageableElement>
@@ -438,7 +440,10 @@ export class V1_ElementFirstPassBuilder
     const func = new ConcreteFunctionDefinition(
       name,
       // This is just a stub to fill in when we first create the function
-      PackageableElementImplicitReference.create(PrimitiveType.STRING, ''),
+      GenericTypeImplicitReference.create(
+        PackageableElementImplicitReference.create(PrimitiveType.STRING, ''),
+        new GenericType(PrimitiveType.STRING),
+      ),
       Multiplicity.ZERO_MANY,
     );
     const path = V1_buildFullPath(element.package, name);

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/to/V1_ElementSecondPassBuilder.ts

@@ -86,10 +86,7 @@ import { V1_buildEmbeddedData } from './helpers/V1_DataElementBuilderHelper.js';
 import { V1_buildTestSuite } from './helpers/V1_TestBuilderHelper.js';
 import { ServiceTestSuite } from '../../../../../../../graph/metamodel/pure/packageableElements/service/ServiceTestSuite.js';
 import { V1_DataElementReference } from '../../../model/data/V1_EmbeddedData.js';
-import {
-  V1_buildFunctionSignature,
-  V1_getGenericTypeFullPath,
-} from '../../../helpers/V1_DomainHelper.js';
+import { V1_buildFunctionSignature } from '../../../helpers/V1_DomainHelper.js';
 import { getFunctionName } from '../../../../../../../graph/helpers/DomainHelper.js';
 import { GraphBuilderError } from '../../../../../../GraphManagerUtils.js';
 import { PostValidation } from '../../../../../../../graph/metamodel/pure/packageableElements/service/PostValidation.js';
@@ -371,8 +368,8 @@ export class V1_ElementSecondPassBuilder
     const func = this.context.currentSubGraph.getOwnFunction(
       V1_buildFullPath(protocol.package, V1_buildFunctionSignature(protocol)),
     );
-    func.returnType = this.context.resolveType(
-      V1_getGenericTypeFullPath(protocol.returnGenericType),
+    func.returnType = this.context.resolveGenericTypeFromProtocol(
+      protocol.returnGenericType,
     );
     func.returnMultiplicity = this.context.graph.getMultiplicity(
       protocol.returnMultiplicity.lowerBound,

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/to/V1_GraphBuilderContext.ts

@@ -35,7 +35,10 @@ import {
   ImportAwareCodeSection,
 } from '../../../../../../../graph/metamodel/pure/packageableElements/section/Section.js';
 import { StereotypeImplicitReference } from '../../../../../../../graph/metamodel/pure/packageableElements/domain/StereotypeReference.js';
-import { GenericTypeImplicitReference } from '../../../../../../../graph/metamodel/pure/packageableElements/domain/GenericTypeReference.js';
+import {
+  GenericTypeImplicitReference,
+  type GenericTypeReference,
+} from '../../../../../../../graph/metamodel/pure/packageableElements/domain/GenericTypeReference.js';
 import type { Type } from '../../../../../../../graph/metamodel/pure/packageableElements/domain/Type.js';
 import type { Class } from '../../../../../../../graph/metamodel/pure/packageableElements/domain/Class.js';
 import type { Enumeration } from '../../../../../../../graph/metamodel/pure/packageableElements/domain/Enumeration.js';
@@ -85,6 +88,7 @@ import {
   getOwnProperty,
   getStereotype,
   getTag,
+  newGenericType,
 } from '../../../../../../../graph/helpers/DomainHelper.js';
 import {
   getFilter,
@@ -96,6 +100,8 @@ import {
 } from '../../../../../../../graph/helpers/STO_FlatData_Helper.js';
 import type { PropertyOwner } from '../../../../../../../graph/metamodel/pure/packageableElements/domain/AbstractProperty.js';
 import type { DataElement } from '../../../../../../../graph/metamodel/pure/packageableElements/data/DataElement.js';
+import type { V1_GenericType } from '../../../model/packageableElements/type/V1_GenericType.js';
+import { V1_getGenericTypeFullPath } from '../../../helpers/V1_DomainHelper.js';
 
 export const V1_buildFullPath = (
   packagePath: string | undefined,
@@ -315,6 +321,19 @@ export class V1_GraphBuilderContext {
     return GenericTypeImplicitReference.create(ownerReference, value);
   };
 
+  resolveGenericTypeFromProtocol = (
+    genericType: V1_GenericType,
+  ): GenericTypeReference => {
+    const ownerReference = this.resolveType(
+      V1_getGenericTypeFullPath(genericType),
+    );
+    const typeArguments = genericType.typeArguments.map((g) =>
+      this.resolveGenericTypeFromProtocol(g),
+    );
+    const value = newGenericType(ownerReference.value, typeArguments);
+    return GenericTypeImplicitReference.create(ownerReference, value);
+  };
+
   resolveOwnProperty = (
     pointer: V1_PropertyPointer,
   ): PropertyImplicitReference => {

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/to/V1_PropertyMappingBuilder.ts

@@ -105,6 +105,9 @@ import { FlatDataAssociationPropertyMapping } from '../../../../../../../graph/m
 import type { V1_INTERNAL__UnknownPropertyMapping } from '../../../model/packageableElements/mapping/V1_INTERNAL__UnknownPropertyMapping.js';
 import { INTERNAL__UnknownPropertyMapping } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/INTERNAL__UnknownPropertyMapping.js';
 import { INTERNAL__PseudoMapping } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/INTERNAL__PseudoMapping.js';
+import type { V1_RelationFunctionPropertyMapping } from '../../../model/packageableElements/mapping/V1_RelationFunctionPropertyMapping.js';
+import { RelationFunctionPropertyMapping } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/relationFunction/RelationFunctionPropertyMapping.js';
+import { RelationColumn } from '../../../../../../../graph/metamodel/pure/packageableElements/relation/RelationType.js';
 
 const TEMPORARY__resolveSetImplementationByID = (
   mapping: Mapping,
@@ -1181,4 +1184,92 @@ export class V1_PropertyMappingBuilder
     }
     return aggregationAwarePropertyMapping;
   }
+
+  visit_RelationFunctionPropertyMapping(
+    protocol: V1_RelationFunctionPropertyMapping,
+  ): PropertyMapping {
+    assertNonNullable(
+      protocol.property,
+      `Relation Function property mapping 'property' field is missing`,
+    );
+    assertNonEmptyString(
+      protocol.property.property,
+      `Relation Function property mapping 'property.property' field is missing or empty`,
+    );
+    let propertyOwner: Class | Association;
+    let property: AbstractProperty;
+    let localMapping: LocalMappingPropertyInfo | undefined;
+    if (protocol.localMappingProperty) {
+      const localMappingProperty = protocol.localMappingProperty;
+      const mappingClass = new MappingClass(
+        `${this.topParent?._PARENT.path}_${this.topParent?.id}${protocol.property.property}`,
+      );
+      const _multiplicity = this.context.graph.getMultiplicity(
+        localMappingProperty.multiplicity.lowerBound,
+        localMappingProperty.multiplicity.upperBound,
+      );
+      const _property = new Property(
+        protocol.property.property,
+        _multiplicity,
+        this.context.resolveGenericType(localMappingProperty.type),
+        mappingClass,
+      );
+      property = PropertyImplicitReference.create(
+        PackageableElementImplicitReference.create(
+          mappingClass,
+          protocol.property.class,
+        ),
+        _property,
+      ).value;
+      localMapping = new LocalMappingPropertyInfo();
+      localMapping.localMappingProperty = true;
+      localMapping.localMappingPropertyMultiplicity = _multiplicity;
+      localMapping.localMappingPropertyType = this.context.resolveType(
+        localMappingProperty.type,
+      );
+      propertyOwner = property._OWNER;
+    } else {
+      if (protocol.property.class) {
+        propertyOwner = this.context.resolveClass(
+          protocol.property.class,
+        ).value;
+      } else {
+        throw new GraphBuilderError(
+          `Can't find property owner class for property '${protocol.property.property}'`,
+        );
+      }
+      property =
+        propertyOwner instanceof Class
+          ? getClassProperty(propertyOwner, protocol.property.property)
+          : getOwnProperty(propertyOwner, protocol.property.property);
+    }
+
+    const sourceSetImplementation = guaranteeNonNullable(
+      resolvePropertyMappingSourceImplementation(
+        this.immediateParent,
+        protocol,
+        this.topParent,
+        this.context,
+      ),
+    );
+    const propertyType = property.genericType.value.rawType;
+    const propertyMapping = new RelationFunctionPropertyMapping(
+      this.topParent ?? this.immediateParent,
+      PropertyImplicitReference.create(
+        PackageableElementImplicitReference.create(
+          propertyOwner,
+          protocol.property.class ?? '',
+        ),
+        property,
+      ),
+      SetImplementationImplicitReference.create(
+        sourceSetImplementation,
+        protocol.source,
+      ),
+      undefined,
+      new RelationColumn(protocol.column, propertyType),
+    );
+    propertyMapping.localMappingProperty = localMapping;
+    return propertyMapping;
+  }
 }

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/to/helpers/V1_ValueSpecificationBuilderHelper.ts

@@ -628,9 +628,7 @@ export const V1_buildBaseSimpleFunctionExpression = (
   expression.func = func;
   if (func) {
     const val = func.value;
-    expression.genericType = GenericTypeExplicitReference.create(
-      new GenericType(val.returnType.value),
-    );
+    expression.genericType = val.returnType;
     expression.multiplicity = val.returnMultiplicity;
   }
   expression.parametersValues = processedParameters;

package/src/graph-manager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_MappingSerializationHelper.ts

@@ -134,6 +134,8 @@ import { V1_MappingTest } from '../../../model/packageableElements/mapping/V1_Ma
 import type { V1_TestSuite } from '../../../model/test/V1_TestSuite.js';
 import { V1_INTERNAL__UnknownClassMapping } from '../../../model/packageableElements/mapping/V1_INTERNAL__UnknownClassMapping.js';
 import { V1_INTERNAL__UnknownMappingInclude } from '../../../model/packageableElements/mapping/V1_INTERNAL__UnknownMappingInclude.js';
+import { V1_RelationFunctionClassMapping } from '../../../model/packageableElements/mapping/V1_RelationFunctionClassMapping.js';
+import { V1_RelationFunctionPropertyMapping } from '../../../model/packageableElements/mapping/V1_RelationFunctionPropertyMapping.js';
 
 enum V1_ClassMappingType {
   OPERATION = 'operation',
@@ -143,6 +145,7 @@ enum V1_ClassMappingType {
   ROOT_RELATIONAL = 'relational',
   RELATIONAL = 'embedded',
   AGGREGATION_AWARE = 'aggregationAware',
+  RELATION_FUNCTION = 'relation',
 }
 
 enum V1_PropertyMappingType {
@@ -156,6 +159,7 @@ enum V1_PropertyMappingType {
   OTHERWISE_EMBEDDED_RELATIONAL = 'otherwiseEmbeddedPropertyMapping',
   AGGREGATION_AWARE = 'AggregationAwarePropertyMapping',
   XSTORE = 'xStorePropertyMapping',
+  RELATION_FUNCTION = 'relationFunctionPropertyMapping',
 }
 
 // ------------------------------------- Shared -------------------------------------
@@ -658,6 +662,57 @@ const aggregationAwareClassMappingModelSchema = (
     root: primitive(),
   });
 
+// ------------------------------------- Relation Function Mapping -------------------------------------
+
+const relationFunctionPropertyMappingModelSchema = createModelSchema(
+  V1_RelationFunctionPropertyMapping,
+  {
+    _type: usingConstantValueSchema(V1_PropertyMappingType.RELATION_FUNCTION),
+    localMappingProperty: usingModelSchema(
+      V1_localMappingPropertyInfoModelSchema,
+    ),
+    property: usingModelSchema(V1_propertyPointerModelSchema),
+    source: optional(primitive()),
+    target: optional(primitive()),
+    column: primitive(),
+  },
+);
+
+function V1_serializeRelationFunctionPropertyMapping(
+  protocol: V1_RelationFunctionPropertyMapping,
+): PlainObject<V1_RelationFunctionPropertyMapping> {
+  return serialize(relationFunctionPropertyMappingModelSchema, protocol);
+}
+
+function V1_deserializeRelationFunctionPropertyMapping(
+  json: PlainObject<V1_RelationFunctionPropertyMapping>,
+): V1_RelationFunctionPropertyMapping | typeof SKIP {
+  switch (json._type) {
+    case V1_PropertyMappingType.RELATION_FUNCTION:
+      return deserialize(relationFunctionPropertyMappingModelSchema, json);
+    default:
+      return SKIP;
+  }
+}
+
+const relationFunctionClassMappingModelSchema = createModelSchema(
+  V1_RelationFunctionClassMapping,
+  {
+    _type: usingConstantValueSchema(V1_ClassMappingType.RELATION_FUNCTION),
+    class: primitive(),
+    extendsClassMappingId: optional(primitive()),
+    id: optional(primitive()),
+    propertyMappings: list(
+      custom(
+        V1_serializeRelationFunctionPropertyMapping,
+        V1_deserializeRelationFunctionPropertyMapping,
+      ),
+    ),
+    root: primitive(),
+    relationFunction: usingModelSchema(V1_packageableElementPointerModelSchema),
+  },
+);
+
 // ------------------------------------- Class Mapping -------------------------------------
 
 function V1_serializeClassMapping(
@@ -680,6 +735,8 @@ function V1_serializeClassMapping(
     return serialize(relationalClassMappingModelSchema, value);
   } else if (value instanceof V1_AggregationAwareClassMapping) {
     return serialize(aggregationAwareClassMappingModelSchema(plugins), value);
+  } else if (value instanceof V1_RelationFunctionClassMapping) {
+    return serialize(relationFunctionClassMappingModelSchema, value);
   }
   const extraClassMappingSerializers = plugins.flatMap(
     (plugin) =>
@@ -730,6 +787,8 @@ function V1_deserializeClassMapping(
         aggregationAwareClassMappingModelSchema(plugins),
         json,
       );
+    case V1_ClassMappingType.RELATION_FUNCTION:
+      return deserialize(relationFunctionClassMappingModelSchema, json);
     default: {
       const extraClassMappingDeserializers = plugins.flatMap(
         (plugin) =>

package/src/index.ts

@@ -645,6 +645,7 @@ export * from './graph/metamodel/pure/packageableElements/mapping/EnumValueMappi
 export { AssociationImplementation } from './graph/metamodel/pure/packageableElements/mapping/AssociationImplementation.js';
 export { SetImplementationContainer } from './graph/metamodel/pure/packageableElements/mapping/SetImplementationContainer.js';
 export { AggregationAwareSetImplementation } from './graph/metamodel/pure/packageableElements/mapping/aggregationAware/AggregationAwareSetImplementation.js';
+export { RelationFunctionInstanceSetImplementation } from './graph/metamodel/pure/packageableElements/mapping/relationFunction/RelationFunctionInstanceSetImplementation.js';
 export * from './graph/metamodel/pure/packageableElements/mapping/InferableMappingElementId.js';
 export * from './graph/metamodel/pure/packageableElements/mapping/InferableMappingElementRoot.js';
 export { SetImplementationExplicitReference } from './graph/metamodel/pure/packageableElements/mapping/SetImplementationReference.js';

package/tsconfig.json

@@ -234,6 +234,8 @@
     "./src/graph/metamodel/pure/packageableElements/mapping/aggregationAware/AggregationAwareSetImplementation.ts",
     "./src/graph/metamodel/pure/packageableElements/mapping/aggregationAware/AggregationFunctionSpecification.ts",
     "./src/graph/metamodel/pure/packageableElements/mapping/aggregationAware/GroupByFunctionSpecification.ts",
+    "./src/graph/metamodel/pure/packageableElements/mapping/relationFunction/RelationFunctionInstanceSetImplementation.ts",
+    "./src/graph/metamodel/pure/packageableElements/mapping/relationFunction/RelationFunctionPropertyMapping.ts",
     "./src/graph/metamodel/pure/packageableElements/mapping/xStore/XStoreAssociationImplementation.ts",
     "./src/graph/metamodel/pure/packageableElements/mapping/xStore/XStorePropertyFetchDetails.ts",
     "./src/graph/metamodel/pure/packageableElements/mapping/xStore/XStorePropertyMapping.ts",
@@ -601,6 +603,8 @@
     "./src/graph-manager/protocol/pure/v1/model/packageableElements/mapping/V1_MergeOperationClassMapping.ts",
     "./src/graph-manager/protocol/pure/v1/model/packageableElements/mapping/V1_OperationClassMapping.ts",
     "./src/graph-manager/protocol/pure/v1/model/packageableElements/mapping/V1_PropertyMapping.ts",
+    "./src/graph-manager/protocol/pure/v1/model/packageableElements/mapping/V1_RelationFunctionClassMapping.ts",
+    "./src/graph-manager/protocol/pure/v1/model/packageableElements/mapping/V1_RelationFunctionPropertyMapping.ts",
     "./src/graph-manager/protocol/pure/v1/model/packageableElements/mapping/V1_RelationalAssociationMapping.ts",
     "./src/graph-manager/protocol/pure/v1/model/packageableElements/mapping/xStore/V1_XStoreAssociationMapping.ts",
     "./src/graph-manager/protocol/pure/v1/model/packageableElements/mapping/xStore/V1_XStorePropertyFetchDetails.ts",