@finos/legend-graph 32.0.5 → 32.0.7

package/src/graph/metamodel/pure/packageableElements/mapping/relationFunction/RelationFunctionPropertyMapping.ts

@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Copyright (c) 2025-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { CORE_HASH_STRUCTURE } from '../../../../../Core_HashUtils.js';
+import { hashArray, type Hashable } from '@finos/legend-shared';
+import {
+  type PropertyMappingVisitor,
+  PropertyMapping,
+} from '../PropertyMapping.js';
+import type { PropertyReference } from '../../domain/PropertyReference.js';
+import type { PropertyMappingsImplementation } from '../PropertyMappingsImplementation.js';
+import type { SetImplementationReference } from '../SetImplementationReference.js';
+import type { RelationColumn } from '../../relation/RelationType.js';
+
+export class RelationFunctionPropertyMapping
+  extends PropertyMapping
+  implements Hashable
+{
+  column: RelationColumn;
+
+  constructor(
+    owner: PropertyMappingsImplementation,
+    property: PropertyReference,
+    source: SetImplementationReference,
+    target: SetImplementationReference | undefined,
+    column: RelationColumn,
+  ) {
+    super(owner, property, source, target);
+    this.column = column;
+  }
+
+  override get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.RELATION_FUNCTION_PROPERTY_MAPPING,
+      super.hashCode,
+      this.column.name,
+    ]);
+  }
+
+  accept_PropertyMappingVisitor<T>(visitor: PropertyMappingVisitor<T>): T {
+    return visitor.visit_RelationFunctionPropertyMapping(this);
+  }
+}

package/src/graph/metamodel/pure/valueSpecification/RelationValueSpecification.ts

@@ -41,7 +41,23 @@ export class ColSpec implements Hashable {
     ]);
   }
 }
+export class ColSpecInstanceValue extends InstanceValue implements Hashable {
+  override values: ColSpec[] = [];
 
+  override get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.RELATION_COL_SPEC,
+      this.genericType?.ownerReference.valueForSerialization ?? '',
+      this.multiplicity,
+      hashArray(this.values),
+    ]);
+  }
+  override accept_ValueSpecificationVisitor<T>(
+    visitor: ValueSpecificationVisitor<T>,
+  ): T {
+    return visitor.visit_ColSpecInstance(this);
+  }
+}
 export class ColSpecArray implements Hashable {
   colSpecs: ColSpec[] = [];
 

package/src/graph/metamodel/pure/valueSpecification/ValueSpecification.ts

@@ -34,7 +34,10 @@ import type { VariableExpression } from './VariableExpression.js';
 import type { INTERNAL__PropagatedValue } from './INTERNAL__PropagatedValue.js';
 import type { Hashable } from '@finos/legend-shared';
 import type { KeyExpressionInstanceValue } from './KeyExpressionInstanceValue.js';
-import type { ColSpecArrayInstance } from './RelationValueSpecification.js';
+import type {
+  ColSpecArrayInstance,
+  ColSpecInstanceValue,
+} from './RelationValueSpecification.js';
 
 export interface ValueSpecificationVisitor<T> {
   visit_INTERNAL__UnknownValueSpecification(
@@ -55,6 +58,7 @@ export interface ValueSpecificationVisitor<T> {
 
   visit_InstanceValue(valueSpecification: InstanceValue): T;
   visit_ColSpecArrayInstance(valueSpeciciation: ColSpecArrayInstance): T;
+  visit_ColSpecInstance(valueSpeciciation: ColSpecInstanceValue): T;
 
   visit_CollectionInstanceValue(valueSpecification: CollectionInstanceValue): T;
   visit_EnumValueInstanceValue(valueSpecification: EnumValueInstanceValue): T;

package/src/graph-manager/action/changeDetection/DSL_Mapping_ObserverHelper.ts

@@ -132,6 +132,8 @@ import type { INTERNAL__UnknownConnection } from '../../../graph/metamodel/pure/
 import type { INTERNAL__UnknownPropertyMapping } from '../../../graph/metamodel/pure/packageableElements/mapping/INTERNAL__UnknownPropertyMapping.js';
 import type { INTERNAL__UnknownSetImplementation } from '../../../graph/metamodel/pure/packageableElements/mapping/INTERNAL__UnknownSetImplementation.js';
 import type { INTERNAL__UnknownStore } from '../../../graph/metamodel/pure/packageableElements/store/INTERNAL__UnknownStore.js';
+import type { RelationFunctionInstanceSetImplementation } from '../../../graph/metamodel/pure/packageableElements/mapping/relationFunction/RelationFunctionInstanceSetImplementation.js';
+import type { RelationFunctionPropertyMapping } from '../../../graph/metamodel/pure/packageableElements/mapping/relationFunction/RelationFunctionPropertyMapping.js';
 
 // ------------------------------------- Store -------------------------------------
 
@@ -396,6 +398,12 @@ class PropertyMappingObserver implements PropertyMappingVisitor<void> {
   visit_XStorePropertyMapping(propertyMapping: XStorePropertyMapping): void {
     // TODO
   }
+
+  visit_RelationFunctionPropertyMapping(
+    propertyMapping: RelationFunctionPropertyMapping,
+  ): void {
+    // TODO
+  }
 }
 
 export const observe_PropertyMapping = (
@@ -636,6 +644,12 @@ class SetImplementationObserver implements SetImplementationVisitor<void> {
     );
   }
 
+  visit_RelationFunctionInstanceSetImplementation(
+    setImplementation: RelationFunctionInstanceSetImplementation,
+  ): void {
+    // TODO
+  }
+
   visit_AggregationAwareSetImplementation(
     setImplementation: AggregationAwareSetImplementation,
   ): void {

package/src/graph-manager/action/changeDetection/DomainObserverHelper.ts

@@ -540,7 +540,7 @@ export const observe_ConcreteFunctionDefinition = skipObservedWithContext(
     });
 
     metamodel.parameters.forEach(observe_RawVariableExpression);
-    observe_PackageableElementReference(metamodel.returnType);
+    observe_GenericTypeReference(metamodel.returnType);
     metamodel.stereotypes.forEach(observe_StereotypeReference);
     metamodel.taggedValues.forEach(observe_TaggedValue);
     metamodel.tests.forEach((t) => observe_FunctionTestSuite(t, context));

package/src/graph-manager/action/changeDetection/ValueSpecificationObserver.ts

@@ -64,6 +64,7 @@ import type {
   ColSpec,
   ColSpecArray,
   ColSpecArrayInstance,
+  ColSpecInstanceValue,
 } from '../../../graph/metamodel/pure/valueSpecification/RelationValueSpecification.js';
 
 const observe_Abstract_ValueSpecification = (
@@ -194,6 +195,10 @@ export const observe_ColSpecArrayInstance = skipObservedWithContext(
   _observe_ColSpecArrayInstance,
 );
 
+export const observe_ColSpecInstance = skipObservedWithContext(
+  _observe_ColSpecInstance,
+);
+
 const observe_LambdaFunction = skipObservedWithContext(_observe_LambdaFunction);
 
 const observe_LambdaFunctionInstanceValue = skipObservedWithContext(
@@ -344,6 +349,10 @@ class ValueSpecificationObserver implements ValueSpecificationVisitor<void> {
   visit_ColSpecArrayInstance(valueSpeciciation: ColSpecArrayInstance): void {
     observe_ColSpecArrayInstance(valueSpeciciation, this.observerContext);
   }
+
+  visit_ColSpecInstance(valueSpeciciation: ColSpecInstanceValue): void {
+    observe_ColSpecInstance(valueSpeciciation, this.observerContext);
+  }
 }
 
 export const observe_ValueSpecification = skipObservedWithContext(
@@ -513,6 +522,18 @@ function _observe_ColSpecArrayInstance(
   return metamodel;
 }
 
+function _observe_ColSpecInstance(
+  metamodel: ColSpecInstanceValue,
+  context: ObserverContext,
+): ColSpecInstanceValue {
+  observe_Abstract_InstanceValue(metamodel, context);
+  makeObservable(metamodel, {
+    hashCode: override,
+  });
+  metamodel.values.forEach((value) => observe_ColSpec(value, context));
+  return metamodel;
+}
+
 function _observe_ColSpec(
   metamodel: ColSpec,
   context: ObserverContext,

package/src/graph-manager/protocol/pure/v1/model/packageableElements/mapping/V1_ClassMapping.ts

@@ -25,6 +25,7 @@ import type { V1_PureInstanceClassMapping } from '../../../model/packageableElem
 import type { V1_RootFlatDataClassMapping } from '../../../model/packageableElements/store/flatData/mapping/V1_RootFlatDataClassMapping.js';
 import type { V1_MergeOperationClassMapping } from './V1_MergeOperationClassMapping.js';
 import type { V1_INTERNAL__UnknownClassMapping } from './V1_INTERNAL__UnknownClassMapping.js';
+import type { V1_RelationFunctionClassMapping } from './V1_RelationFunctionClassMapping.js';
 
 export interface V1_ClassMappingVisitor<T> {
   visit_ClassMapping(classMapping: V1_ClassMapping): T;
@@ -45,6 +46,9 @@ export interface V1_ClassMappingVisitor<T> {
   visit_AggregationAwareClassMapping(
     classMapping: V1_AggregationAwareClassMapping,
   ): T;
+  visit_RelationFunctionClassMapping(
+    classMapping: V1_RelationFunctionClassMapping,
+  ): T;
 }
 
 export abstract class V1_ClassMapping implements Hashable {

package/src/graph-manager/protocol/pure/v1/model/packageableElements/mapping/V1_PropertyMapping.ts

@@ -29,6 +29,7 @@ import type { V1_EmbeddedFlatDataPropertyMapping } from '../../../model/packagea
 import type { V1_XStorePropertyMapping } from './xStore/V1_XStorePropertyMapping.js';
 import type { V1_FlatDataAssociationPropertyMapping } from '../../../model/packageableElements/store/flatData/mapping/V1_FlatDataAssociationPropertyMapping.js';
 import type { V1_INTERNAL__UnknownPropertyMapping } from './V1_INTERNAL__UnknownPropertyMapping.js';
+import type { V1_RelationFunctionPropertyMapping } from './V1_RelationFunctionPropertyMapping.js';
 
 export interface V1_PropertyMappingVisitor<T> {
   visit_PropertyMapping(propertyMapping: V1_PropertyMapping): T;
@@ -60,6 +61,9 @@ export interface V1_PropertyMappingVisitor<T> {
   visit_FlatDataAssociationPropertyMapping(
     propertyMapping: V1_FlatDataAssociationPropertyMapping,
   ): T;
+  visit_RelationFunctionPropertyMapping(
+    propertyMapping: V1_RelationFunctionPropertyMapping,
+  ): T;
 }
 
 export abstract class V1_PropertyMapping implements Hashable {

package/src/graph-manager/protocol/pure/v1/model/packageableElements/mapping/V1_RelationFunctionClassMapping.ts

@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Copyright (c) 2025-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { CORE_HASH_STRUCTURE } from '../../../../../../../graph/Core_HashUtils.js';
+import type { V1_PropertyMapping } from './V1_PropertyMapping.js';
+import {
+  type V1_ClassMappingVisitor,
+  V1_ClassMapping,
+} from './V1_ClassMapping.js';
+import type { V1_PackageableElementPointer } from '../V1_PackageableElement.js';
+import { hashArray, type Hashable } from '@finos/legend-shared';
+
+export class V1_RelationFunctionClassMapping
+  extends V1_ClassMapping
+  implements Hashable
+{
+  relationFunction!: V1_PackageableElementPointer;
+  propertyMappings: V1_PropertyMapping[] = [];
+
+  accept_ClassMappingVisitor<T>(visitor: V1_ClassMappingVisitor<T>): T {
+    return visitor.visit_RelationFunctionClassMapping(this);
+  }
+
+  override get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.RELATION_FUNCTION_INSTANCE_SET_IMPLEMENTATION,
+      super.hashCode,
+      hashArray(this.propertyMappings),
+    ]);
+  }
+}

package/src/graph-manager/protocol/pure/v1/model/packageableElements/mapping/V1_RelationFunctionPropertyMapping.ts

@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Copyright (c) 2025-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { hashArray, type Hashable } from '@finos/legend-shared';
+import { CORE_HASH_STRUCTURE } from '../../../../../../../graph/Core_HashUtils.js';
+import {
+  type V1_PropertyMappingVisitor,
+  V1_PropertyMapping,
+} from './V1_PropertyMapping.js';
+
+export class V1_RelationFunctionPropertyMapping
+  extends V1_PropertyMapping
+  implements Hashable
+{
+  column!: string;
+
+  accept_PropertyMappingVisitor<T>(visitor: V1_PropertyMappingVisitor<T>): T {
+    return visitor.visit_RelationFunctionPropertyMapping(this);
+  }
+
+  override get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.RELATION_FUNCTION_PROPERTY_MAPPING,
+      super.hashCode,
+      this.column,
+    ]);
+  }
+}

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/from/V1_DomainTransformer.ts

@@ -78,6 +78,21 @@ import { V1_DefaultValue } from '../../../model/packageableElements/domain/V1_De
 import { PackageableElementPointerType } from '../../../../../../../graph/MetaModelConst.js';
 import { V1_createGenericTypeWithElementPath } from '../../../helpers/V1_DomainHelper.js';
 import { V1_PackageableElementPointer } from '../../../model/packageableElements/V1_PackageableElement.js';
+import type { GenericType } from '../../../../../../../graph/metamodel/pure/packageableElements/domain/GenericType.js';
+import type { V1_GenericType } from '../../../model/packageableElements/type/V1_GenericType.js';
+
+export const V1_createGenericType = (
+  genericType: GenericType,
+): V1_GenericType => {
+  const protocolGenType = V1_createGenericTypeWithElementPath(
+    genericType.rawType.path,
+  );
+  const typeArguments = genericType.typeArguments ?? [];
+  protocolGenType.typeArguments = typeArguments.map((t) =>
+    V1_createGenericType(t.value),
+  );
+  return protocolGenType;
+};
 
 export const V1_createRawGenericTypeWithElementPath = (
   path: string,
@@ -331,9 +346,7 @@ export const V1_transformFunction = (
         new V1_RawValueSpecificationTransformer(context),
       ) as V1_RawVariable,
   );
-  _function.returnGenericType = V1_createGenericTypeWithElementPath(
-    element.returnType.valueForSerialization ?? '',
-  );
+  _function.returnGenericType = V1_createGenericType(element.returnType.value);
   _function.stereotypes = element.stereotypes.map(V1_transformStereotype);
   _function.taggedValues = element.taggedValues.map(V1_transformTaggedValue);
   _function.returnMultiplicity = V1_transformMultiplicity(

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/from/V1_MappingTransformer.ts

@@ -16,6 +16,7 @@
 
 import {
   guaranteeNonEmptyString,
+  guaranteeNonNullable,
   IllegalStateError,
   isNonNullable,
   UnsupportedOperationError,
@@ -175,6 +176,11 @@ import { V1_INTERNAL__UnknownPropertyMapping } from '../../../model/packageableE
 import type { INTERNAL__UnknownSetImplementation } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/INTERNAL__UnknownSetImplementation.js';
 import { V1_INTERNAL__UnknownClassMapping } from '../../../model/packageableElements/mapping/V1_INTERNAL__UnknownClassMapping.js';
 import { V1_PackageableElementPointer } from '../../../model/packageableElements/V1_PackageableElement.js';
+import type { RelationFunctionInstanceSetImplementation } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/relationFunction/RelationFunctionInstanceSetImplementation.js';
+import type { RelationFunctionPropertyMapping } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/relationFunction/RelationFunctionPropertyMapping.js';
+import { V1_RelationFunctionPropertyMapping } from '../../../model/packageableElements/mapping/V1_RelationFunctionPropertyMapping.js';
+import { V1_RelationFunctionClassMapping } from '../../../model/packageableElements/mapping/V1_RelationFunctionClassMapping.js';
+import { generateFunctionPrettyName } from '../../../../../../../graph/helpers/PureLanguageHelper.js';
 
 export const V1_transformPropertyReference = (
   element: PropertyReference,
@@ -766,6 +772,25 @@ const transformAggregationAwarePropertyMapping = (
   return propertyMapping;
 };
 
+const transformRelationFunctionPropertyMapping = (
+  element: RelationFunctionPropertyMapping,
+): V1_RelationFunctionPropertyMapping => {
+  const propertyMapping = new V1_RelationFunctionPropertyMapping();
+  propertyMapping.column = element.column.name;
+  propertyMapping.property = V1_transformPropertyReference(element.property);
+  propertyMapping.source =
+    element.sourceSetImplementation.valueForSerialization;
+  propertyMapping.target =
+    element.targetSetImplementation?.valueForSerialization;
+  if (element.localMappingProperty) {
+    propertyMapping.localMappingProperty = transformLocalPropertyInfo(
+      element.localMappingProperty,
+    );
+  }
+  propertyMapping.column = element.column.name;
+  return propertyMapping;
+};
+
 class PropertyMappingTransformer
   implements PropertyMappingVisitor<V1_PropertyMapping>
 {
@@ -885,6 +910,12 @@ class PropertyMappingTransformer
   ): V1_PropertyMapping {
     return transformAggregationAwarePropertyMapping(propertyMapping);
   }
+
+  visit_RelationFunctionPropertyMapping(
+    propertyMapping: RelationFunctionPropertyMapping,
+  ): V1_PropertyMapping {
+    return transformRelationFunctionPropertyMapping(propertyMapping);
+  }
 }
 
 const transformOperationType = (
@@ -1162,6 +1193,37 @@ const transformAggregationAwareSetImplementation = (
   return classMapping;
 };
 
+const transformRelationFunctionInstanceSetImplementation = (
+  element: RelationFunctionInstanceSetImplementation,
+  context: V1_GraphTransformerContext,
+): V1_RelationFunctionClassMapping => {
+  const functionName = generateFunctionPrettyName(
+    guaranteeNonNullable(element.relationFunction),
+    {
+      fullPath: true,
+      spacing: false,
+      notIncludeParamName: true,
+    },
+  );
+
+  const classMapping = new V1_RelationFunctionClassMapping();
+  classMapping.relationFunction = new V1_PackageableElementPointer(
+    PackageableElementPointerType.FUNCTION,
+    functionName,
+  );
+  classMapping.id = mappingElementIdSerializer(element.id);
+  classMapping.class = element.class.valueForSerialization ?? '';
+  classMapping.root = element.root.valueForSerialization;
+
+  classMapping.propertyMappings = transformClassMappingPropertyMappings(
+    element.propertyMappings,
+    false,
+    context,
+  );
+  classMapping.extendsClassMappingId = element.superSetImplementationId;
+  return classMapping;
+};
+
 // NOTE: this needs to be a function to avoid error with using before declaration for embedded property mappings due to the hoisting behavior in ES
 function transformProperyMapping(
   propertyMapping: PropertyMapping,
@@ -1279,6 +1341,15 @@ export class V1_SetImplementationTransformer
     );
   }
 
+  visit_RelationFunctionInstanceSetImplementation(
+    setImplementation: RelationFunctionInstanceSetImplementation,
+  ): V1_ClassMapping | undefined {
+    return transformRelationFunctionInstanceSetImplementation(
+      setImplementation,
+      this.context,
+    );
+  }
+
   /**
    * This test is skipped because we want to temporarily relax graph building algorithm
    * to ease Pure -> Legend migration push.

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/from/V1_ValueSpecificationTransformer.ts

@@ -86,7 +86,10 @@ import { V1_ClassInstance } from '../../../model/valueSpecification/raw/V1_Class
 import { V1_ClassInstanceType } from '../../pureProtocol/serializationHelpers/V1_ValueSpecificationSerializer.js';
 import type { KeyExpressionInstanceValue } from '../../../../../../../graph/metamodel/pure/valueSpecification/KeyExpressionInstanceValue.js';
 import { V1_CByteArray } from '../../../model/valueSpecification/raw/V1_CByteArray.js';
-import type { ColSpecArrayInstance } from '../../../../../../../graph/metamodel/pure/valueSpecification/RelationValueSpecification.js';
+import type {
+  ColSpecArrayInstance,
+  ColSpecInstanceValue,
+} from '../../../../../../../graph/metamodel/pure/valueSpecification/RelationValueSpecification.js';
 import { V1_ColSpecArray } from '../../../model/valueSpecification/raw/classInstance/relation/V1_ColSpecArray.js';
 import { V1_ColSpec } from '../../../model/valueSpecification/raw/classInstance/relation/V1_ColSpec.js';
 import { RelationColumn } from '../../../../../../../graph/metamodel/pure/packageableElements/relation/RelationType.js';
@@ -424,6 +427,29 @@ class V1_ValueSpecificationTransformer
     classInstance.value = colSpecArray;
     return classInstance;
   }
+
+  visit_ColSpecInstance(
+    valueSpecification: ColSpecInstanceValue,
+  ): V1_ValueSpecification {
+    const classInstance = new V1_ClassInstance();
+    classInstance.type = V1_ClassInstanceType.COL_SPEC;
+    const val = guaranteeNonNullable(valueSpecification.values[0]);
+    const colProtocol = new V1_ColSpec();
+    colProtocol.name = val.name;
+    const fun1 = val.function1?.accept_ValueSpecificationVisitor(
+      new V1_ValueSpecificationTransformer(
+        this.inScope,
+        this.open,
+        this.isParameter,
+        this.useAppliedFunction,
+      ),
+    );
+    if (fun1) {
+      colProtocol.function1 = guaranteeType(fun1, V1_Lambda);
+    }
+    classInstance.value = colProtocol;
+    return classInstance;
+  }
 }
 
 export function V1_transformGraphFetchTree(

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

@@ -52,6 +52,8 @@ import type { V1_MergeOperationClassMapping } from '../../../model/packageableEl
 import { MergeOperationSetImplementation } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/MergeOperationSetImplementation.js';
 import type { V1_INTERNAL__UnknownClassMapping } from '../../../model/packageableElements/mapping/V1_INTERNAL__UnknownClassMapping.js';
 import { INTERNAL__UnknownSetImplementation } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/INTERNAL__UnknownSetImplementation.js';
+import type { V1_RelationFunctionClassMapping } from '../../../model/packageableElements/mapping/V1_RelationFunctionClassMapping.js';
+import { RelationFunctionInstanceSetImplementation } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/relationFunction/RelationFunctionInstanceSetImplementation.js';
 
 const getClassMappingOperationType = (value: string): OperationType =>
   guaranteeNonNullable(
@@ -294,4 +296,20 @@ export class V1_ClassMappingFirstPassBuilder
       );
     return aggragetionAwareInstanceSetImplementation;
   }
+
+  visit_RelationFunctionClassMapping(
+    classMapping: V1_RelationFunctionClassMapping,
+  ): SetImplementation {
+    assertNonEmptyString(
+      classMapping.class,
+      `Relation function class mapping 'class' field is missing or empty`,
+    );
+    const targetClass = this.context.resolveClass(classMapping.class);
+    return new RelationFunctionInstanceSetImplementation(
+      V1_getInferredClassMappingId(targetClass.value, classMapping),
+      this.parent,
+      targetClass,
+      InferableMappingElementRootExplicitValue.create(classMapping.root),
+    );
+  }
 }

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