@finos/legend-graph 32.6.11 → 32.6.13

package/src/graph-manager/protocol/pure/v1/model/packageableElements/type/V1_RelationType.ts

@@ -19,17 +19,22 @@ import type { V1_Type } from './V1_Type.js';
 import { CORE_HASH_STRUCTURE } from '../../../../../../../graph/Core_HashUtils.js';
 import type { V1_GenericType } from './V1_GenericType.js';
 import type { V1_Multiplicity } from '../domain/V1_Multiplicity.js';
+import type { V1_TaggedValue } from '../domain/V1_TaggedValue.js';
 
 export class V1_RelationTypeColumn implements Hashable {
   name!: string;
   genericType!: V1_GenericType;
   multiplicity!: V1_Multiplicity;
+  description?: string | undefined;
+  taggedValues: V1_TaggedValue[] | undefined = undefined;
 
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.RELATION_TYPE,
       this.name,
       this.genericType,
+      this.description,
+      hashArray(this.taggedValues ?? []),
     ]);
   }
 }

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

@@ -159,6 +159,8 @@ import { isStubbed_RawRelationalOperationElement } from '../../../../../../../gr
 import { pruneSourceInformation } from '../../../../../../../graph/MetaModelUtils.js';
 import { FlatDataAssociationImplementation } from '../../../../../../../graph/metamodel/pure/packageableElements/store/flatData/mapping/FlatDataAssociationImplementation.js';
 import { V1_FlatDataAssociationMapping } from '../../../model/packageableElements/store/flatData/mapping/V1_FlatDataAssociationMapping.js';
+import { ModelJoinAssociationImplementation } from '../../../../../../../graph/metamodel/pure/packageableElements/mapping/modelJoin/ModelJoinAssociationImplementation.js';
+import { V1_ModelJoinAssociationMapping } from '../../../model/packageableElements/mapping/modelJoin/V1_ModelJoinAssociationMapping.js';
 import type { FlatDataAssociationPropertyMapping } from '../../../../../../../graph/metamodel/pure/packageableElements/store/flatData/mapping/FlatDataAssociationPropertyMapping.js';
 import { V1_FlatDataAssociationPropertyMapping } from '../../../model/packageableElements/store/flatData/mapping/V1_FlatDataAssociationPropertyMapping.js';
 import { V1_MappingTest } from '../../../model/packageableElements/mapping/V1_MappingTest.js';
@@ -1458,6 +1460,26 @@ const transformXStorelAssociationImplementation = (
   return xStoreMapping;
 };
 
+const transformModelJoinAssociationImplementation = (
+  element: ModelJoinAssociationImplementation,
+  context: V1_GraphTransformerContext,
+): V1_ModelJoinAssociationMapping => {
+  const modelJoinMapping = new V1_ModelJoinAssociationMapping();
+  modelJoinMapping.stores = element.stores.map(
+    (store) => store.valueForSerialization ?? '',
+  );
+  modelJoinMapping.association = new V1_PackageableElementPointer(
+    PackageableElementPointerType.ASSOCIATION,
+    element.association.valueForSerialization ?? '',
+  );
+  modelJoinMapping.joinCondition =
+    element.joinCondition.accept_RawValueSpecificationVisitor(
+      new V1_RawValueSpecificationTransformer(context),
+    ) as V1_RawLambda;
+  modelJoinMapping.id = mappingElementIdSerializer(element.id);
+  return modelJoinMapping;
+};
+
 const transformAssociationImplementation = (
   element: AssociationImplementation,
   context: V1_GraphTransformerContext,
@@ -1468,6 +1490,8 @@ const transformAssociationImplementation = (
     return transformXStorelAssociationImplementation(element, context);
   } else if (element instanceof FlatDataAssociationImplementation) {
     return transformFlatDataAssociationImplementation(element, context);
+  } else if (element instanceof ModelJoinAssociationImplementation) {
+    return transformModelJoinAssociationImplementation(element, context);
   }
   throw new UnsupportedOperationError(
     `Can't transform association implementation`,

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

@@ -33,10 +33,13 @@ import {
 } from '../../../../../../../../graph/helpers/DSL_Mapping_Helper.js';
 import { FlatDataAssociationImplementation } from '../../../../../../../../graph/metamodel/pure/packageableElements/store/flatData/mapping/FlatDataAssociationImplementation.js';
 import { V1_FlatDataAssociationMapping } from '../../../../model/packageableElements/store/flatData/mapping/V1_FlatDataAssociationMapping.js';
+import { V1_ModelJoinAssociationMapping } from '../../../../model/packageableElements/mapping/modelJoin/V1_ModelJoinAssociationMapping.js';
+import { ModelJoinAssociationImplementation } from '../../../../../../../../graph/metamodel/pure/packageableElements/mapping/modelJoin/ModelJoinAssociationImplementation.js';
+import { V1_buildRawLambdaWithResolvedPaths } from './V1_ValueSpecificationPathResolver.js';
 
 const getInferredAssociationMappingId = (
   _association: Association,
-  classMapping: V1_RelationalAssociationMapping,
+  classMapping: V1_AssociationMapping,
 ): InferableMappingElementIdImplicitValue =>
   InferableMappingElementIdImplicitValue.create(
     classMapping.id ?? fromElementPathToMappingElementId(_association.path),
@@ -155,6 +158,30 @@ const buildXStoreAssociationMapping = (
   return xStoreAssociationImplementation;
 };
 
+const buildModelJoinAssociationMapping = (
+  element: V1_ModelJoinAssociationMapping,
+  parentMapping: Mapping,
+  context: V1_GraphBuilderContext,
+): ModelJoinAssociationImplementation => {
+  const association = context.resolveAssociation(element.association.path);
+  const modelJoinAssociationImplementation =
+    new ModelJoinAssociationImplementation(
+      getInferredAssociationMappingId(association.value, element),
+      parentMapping,
+      association,
+    );
+  modelJoinAssociationImplementation.stores = element.stores.map(
+    context.resolveStore,
+  );
+  modelJoinAssociationImplementation.joinCondition =
+    V1_buildRawLambdaWithResolvedPaths(
+      element.joinCondition.parameters,
+      element.joinCondition.body,
+      context,
+    );
+  return modelJoinAssociationImplementation;
+};
+
 // TODO: consider changing to visitor pattern ?
 export const V1_buildAssociationMapping = (
   element: V1_AssociationMapping,
@@ -167,6 +194,8 @@ export const V1_buildAssociationMapping = (
     return buildXStoreAssociationMapping(element, parentMapping, context);
   } else if (element instanceof V1_FlatDataAssociationMapping) {
     return buildFlatDataAssociationMapping(element, parentMapping, context);
+  } else if (element instanceof V1_ModelJoinAssociationMapping) {
+    return buildModelJoinAssociationMapping(element, parentMapping, context);
   }
   throw new UnsupportedOperationError(
     `Can't build association mapping`,

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

@@ -110,6 +110,7 @@ import { V1_AggregationAwarePropertyMapping } from '../../../model/packageableEl
 import type { V1_AbstractFlatDataPropertyMapping } from '../../../model/packageableElements/store/flatData/mapping/V1_AbstractFlatDataPropertyMapping.js';
 import { V1_XStorePropertyMapping } from '../../../model/packageableElements/mapping/xStore/V1_XStorePropertyMapping.js';
 import { V1_XStoreAssociationMapping } from '../../../model/packageableElements/mapping/xStore/V1_XStoreAssociationMapping.js';
+import { V1_ModelJoinAssociationMapping } from '../../../model/packageableElements/mapping/modelJoin/V1_ModelJoinAssociationMapping.js';
 import type { DSL_Mapping_PureProtocolProcessorPlugin_Extension } from '../../../../extensions/DSL_Mapping_PureProtocolProcessorPlugin_Extension.js';
 import type { PureProtocolProcessorPlugin } from '../../../../PureProtocolProcessorPlugin.js';
 import { V1_BindingTransformer } from '../../../model/packageableElements/externalFormat/store/V1_DSL_ExternalFormat_BindingTransformer.js';
@@ -996,6 +997,7 @@ enum V1_AssociationMappingType {
   RELATIONAL = 'relational',
   XSTORE = 'xStore',
   FLAT_DATA = 'flatData',
+  MODEL_JOIN = 'modelJoin',
 }
 
 const V1_serializeAssociationPropertyMapping = (
@@ -1095,6 +1097,24 @@ const xStoreAssociationMappingModelschema = createModelSchema(
   },
 );
 
+const modelJoinAssociationMappingModelschema = createModelSchema(
+  V1_ModelJoinAssociationMapping,
+  {
+    _type: usingConstantValueSchema(V1_AssociationMappingType.MODEL_JOIN),
+    association: custom(
+      (val) => serialize(V1_packageableElementPointerModelSchema, val),
+      (val) =>
+        V1_serializePackageableElementPointer(
+          val,
+          PackageableElementPointerType.ASSOCIATION,
+        ),
+    ),
+    id: optional(primitive()),
+    joinCondition: usingModelSchema(V1_rawLambdaModelSchema),
+    stores: list(primitive()),
+  },
+);
+
 const V1_serializeAssociationMapping = (
   protocol: V1_AssociationMapping,
 ): PlainObject<V1_AssociationMapping> => {
@@ -1104,6 +1124,8 @@ const V1_serializeAssociationMapping = (
     return serialize(xStoreAssociationMappingModelschema, protocol);
   } else if (protocol instanceof V1_FlatDataAssociationMapping) {
     return serialize(flatDataAssociationMappingModelschema, protocol);
+  } else if (protocol instanceof V1_ModelJoinAssociationMapping) {
+    return serialize(modelJoinAssociationMappingModelschema, protocol);
   }
   throw new UnsupportedOperationError(
     `Can't serialize association mapping`,
@@ -1121,6 +1143,8 @@ const V1_deserializeAssociationMapping = (
       return deserialize(xStoreAssociationMappingModelschema, json);
     case V1_AssociationMappingType.FLAT_DATA:
       return deserialize(flatDataAssociationMappingModelschema, json);
+    case V1_AssociationMappingType.MODEL_JOIN:
+      return deserialize(modelJoinAssociationMappingModelschema, json);
     default:
       throw new UnsupportedOperationError(
         `Can't deserialize association mapping of type '${json._type}'`,

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

@@ -19,6 +19,7 @@ import {
   custom,
   deserialize,
   list,
+  optional,
   primitive,
   serialize,
 } from 'serializr';
@@ -29,6 +30,7 @@ import {
   customList,
   isString,
   optionalCustomList,
+  optionalCustomListWithSchema,
   returnUndefOnError,
   UnsupportedOperationError,
   usingConstantValueSchema,
@@ -36,7 +38,10 @@ import {
   type PlainObject,
 } from '@finos/legend-shared';
 import { V1_Multiplicity } from '../../../model/packageableElements/domain/V1_Multiplicity.js';
-import { V1_multiplicityModelSchema } from './V1_CoreSerializationHelper.js';
+import {
+  V1_multiplicityModelSchema,
+  V1_taggedValueModelSchema,
+} from './V1_CoreSerializationHelper.js';
 import { matchFunctionName } from '../../../../../../../graph/MetaModelUtils.js';
 import { CORE_PURE_PATH } from '../../../../../../../graph/MetaModelConst.js';
 import { V1_getGenericTypeFullPath } from '../../../helpers/V1_DomainHelper.js';
@@ -94,6 +99,7 @@ const packageableTypeModelSchema = createModelSchema(V1_PackageableType, {
 export const V1_relationTypeColumnModelSchema = createModelSchema(
   V1_RelationTypeColumn,
   {
+    description: optional(primitive()),
     genericType: custom(
       (val) => serialize(V1_genericTypeModelSchema, val),
       (val) => V1_deserializeGenericType(val),
@@ -113,6 +119,7 @@ export const V1_relationTypeColumnModelSchema = createModelSchema(
     ),
     multiplicity: usingModelSchema(V1_multiplicityModelSchema),
     name: primitive(),
+    taggedValues: optionalCustomListWithSchema(V1_taggedValueModelSchema),
   },
 );
 

package/src/index.ts

@@ -356,6 +356,13 @@ export {
   V1_DataProductInfo,
   V1_ModelAccessPointGroupInfo,
   V1_AccessPointGroupInfoType,
+  V1_Producer,
+  V1_ProducerType,
+  V1_AppDirProducer,
+  V1_KerberosProducer,
+  V1_IngestDefinitionInfo,
+  V1_Dataset,
+  V1_DependencyAccessPoint,
   V1_DatabaseDDL,
   V1_SampleQuery,
   V1_ExecutableInfo,
@@ -835,6 +842,7 @@ export * from './graph-manager/extensions/DSL_ExternalFormat_PureGraphManagerPlu
 // V1 protocols
 export * from './graph-manager/protocol/pure/v1/model/packageableElements/V1_PackageableElement.js';
 export { V1_StereotypePtr } from './graph-manager/protocol/pure/v1/model/packageableElements/domain/V1_StereotypePtr.js';
+export { V1_TagPtr } from './graph-manager/protocol/pure/v1/model/packageableElements/domain/V1_TagPtr.js';
 export { V1_TaggedValue } from './graph-manager/protocol/pure/v1/model/packageableElements/domain/V1_TaggedValue.js';
 export { V1_PropertyPointer } from './graph-manager/protocol/pure/v1/model/packageableElements/domain/V1_PropertyPointer.js';
 export { V1_SectionIndex } from './graph-manager/protocol/pure/v1/model/packageableElements/section/V1_SectionIndex.js';
@@ -928,6 +936,7 @@ export { InstanceSetImplementation } from './graph/metamodel/pure/packageableEle
 export { EnumerationMapping } from './graph/metamodel/pure/packageableElements/mapping/EnumerationMapping.js';
 export * from './graph/metamodel/pure/packageableElements/mapping/EnumValueMapping.js';
 export { AssociationImplementation } from './graph/metamodel/pure/packageableElements/mapping/AssociationImplementation.js';
+export { ModelJoinAssociationImplementation } from './graph/metamodel/pure/packageableElements/mapping/modelJoin/ModelJoinAssociationImplementation.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';
@@ -985,6 +994,7 @@ export {
 } from './graph-manager/protocol/pure/v1/model/packageableElements/connection/V1_Connection.js';
 export { V1_ConnectionPointer } from './graph-manager/protocol/pure/v1/model/packageableElements/connection/V1_ConnectionPointer.js';
 export { V1_Mapping } from './graph-manager/protocol/pure/v1/model/packageableElements/mapping/V1_Mapping.js';
+export { V1_ModelJoinAssociationMapping } from './graph-manager/protocol/pure/v1/model/packageableElements/mapping/modelJoin/V1_ModelJoinAssociationMapping.js';
 export {
   V1_MappingInclude,
   V1_MappingIncludeMapping,

package/tsconfig.json

@@ -247,6 +247,7 @@
     "./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/modelJoin/ModelJoinAssociationImplementation.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",
@@ -668,6 +669,7 @@
     "./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/modelJoin/V1_ModelJoinAssociationMapping.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",
     "./src/graph-manager/protocol/pure/v1/model/packageableElements/mapping/xStore/V1_XStorePropertyMapping.ts",