@finos/legend-extension-dsl-data-space 10.4.244 → 10.4.246

package/src/graph-manager/protocol/pure/DSL_DataSpace_PureProtocolProcessorPlugin.ts

@@ -21,6 +21,7 @@ import {
   V1_DataSpaceDiagram,
   V1_DataSpaceElementPointer,
   V1_DataSpaceExecutionContext,
+  V1_DataSpaceMappingProvider,
   V1_DataSpacePackageableElementExecutable,
   V1_DataSpaceSupportCombinedInfo,
   V1_DataSpaceSupportEmail,
@@ -51,6 +52,7 @@ import {
   type DataSpaceElement,
   DataSpace,
   DataSpaceExecutionContext,
+  DataSpaceMappingProvider,
   DataSpaceSupportCombinedInfo,
   DataSpaceSupportEmail,
   DataSpaceDiagram,
@@ -144,43 +146,56 @@ export class DSL_DataSpace_PureProtocolProcessorPlugin
             elementProtocol.package,
             elementProtocol.name,
           );
-          element.executionContexts = guaranteeNonNullable(
-            elementProtocol.executionContexts,
-            `Data product 'executionContexts' field is missing`,
-          ).map((contextProtocol) => {
-            const execContext = new DataSpaceExecutionContext();
-            execContext.name = guaranteeNonEmptyString(
-              contextProtocol.name,
-              `Data product execution context 'name' field is missing or empty`,
-            );
-            execContext.title = contextProtocol.title;
-            execContext.description = contextProtocol.description;
-            execContext.mapping = PackageableElementExplicitReference.create(
-              context.graph.getMapping(contextProtocol.mapping.path),
-            );
-            execContext.defaultRuntime =
-              PackageableElementExplicitReference.create(
-                context.graph.getRuntime(contextProtocol.defaultRuntime.path),
+          element.executionContexts = elementProtocol.executionContexts?.map(
+            (contextProtocol) => {
+              const execContext = new DataSpaceExecutionContext();
+              execContext.name = guaranteeNonEmptyString(
+                contextProtocol.name,
+                `Data product execution context 'name' field is missing or empty`,
               );
-            execContext.testData = contextProtocol.testData
-              ? guaranteeType(
-                  V1_buildEmbeddedData(contextProtocol.testData, context),
-                  DataElementReference,
+              execContext.title = contextProtocol.title;
+              execContext.description = contextProtocol.description;
+              execContext.mapping = contextProtocol.mapping
+                ? PackageableElementExplicitReference.create(
+                    context.graph.getMapping(contextProtocol.mapping.path),
+                  )
+                : undefined;
+              execContext.defaultRuntime = contextProtocol.defaultRuntime
+                ? PackageableElementExplicitReference.create(
+                    context.graph.getRuntime(
+                      contextProtocol.defaultRuntime.path,
+                    ),
+                  )
+                : undefined;
+              if (contextProtocol.mappingProvider) {
+                const mappingProvider = new DataSpaceMappingProvider();
+                mappingProvider.element = context.resolveElement(
+                  contextProtocol.mappingProvider.element.path,
+                  false,
+                );
+                mappingProvider.keys = contextProtocol.mappingProvider.keys;
+                execContext.mappingProvider = mappingProvider;
+              }
+              execContext.testData = contextProtocol.testData
+                ? guaranteeType(
+                    V1_buildEmbeddedData(contextProtocol.testData, context),
+                    DataElementReference,
+                  )
+                : undefined;
+              return execContext;
+            },
+          );
+          element.defaultExecutionContext =
+            elementProtocol.defaultExecutionContext
+              ? guaranteeNonNullable(
+                  element.executionContexts?.find(
+                    (execContext) =>
+                      execContext.name ===
+                      elementProtocol.defaultExecutionContext,
+                  ),
+                  `Can't find default execution context '${elementProtocol.defaultExecutionContext}'`,
                 )
               : undefined;
-            return execContext;
-          });
-          element.defaultExecutionContext = guaranteeNonNullable(
-            element.executionContexts.find(
-              (execContext) =>
-                execContext.name ===
-                guaranteeNonEmptyString(
-                  elementProtocol.defaultExecutionContext,
-                  `Data product 'defaultExecutionContext' field is missing or empty`,
-                ),
-            ),
-            `Can't find default execution context '${elementProtocol.defaultExecutionContext}'`,
-          );
           context.currentSubGraph.setOwnElementInExtension(
             path,
             element,
@@ -426,20 +441,36 @@ export class DSL_DataSpace_PureProtocolProcessorPlugin
           protocol.taggedValues = metamodel.taggedValues.map(
             V1_transformTaggedValue,
           );
-          protocol.executionContexts = metamodel.executionContexts.map(
+          protocol.executionContexts = metamodel.executionContexts?.map(
             (execContext) => {
               const contextProtocol = new V1_DataSpaceExecutionContext();
               contextProtocol.name = execContext.name;
               contextProtocol.title = execContext.title;
               contextProtocol.description = execContext.description;
-              contextProtocol.mapping = new V1_PackageableElementPointer(
-                PackageableElementPointerType.MAPPING,
-                execContext.mapping.valueForSerialization ?? '',
-              );
-              contextProtocol.defaultRuntime = new V1_PackageableElementPointer(
-                PackageableElementPointerType.RUNTIME,
-                execContext.defaultRuntime.valueForSerialization ?? '',
-              );
+              contextProtocol.mapping = execContext.mapping
+                ? new V1_PackageableElementPointer(
+                    PackageableElementPointerType.MAPPING,
+                    execContext.mapping.valueForSerialization ?? '',
+                  )
+                : undefined;
+              contextProtocol.defaultRuntime = execContext.defaultRuntime
+                ? new V1_PackageableElementPointer(
+                    PackageableElementPointerType.RUNTIME,
+                    execContext.defaultRuntime.valueForSerialization ?? '',
+                  )
+                : undefined;
+              if (execContext.mappingProvider) {
+                const mappingProviderProtocol =
+                  new V1_DataSpaceMappingProvider();
+                mappingProviderProtocol.element =
+                  new V1_PackageableElementPointer(
+                    undefined,
+                    execContext.mappingProvider.element.valueForSerialization ??
+                      '',
+                  );
+                mappingProviderProtocol.keys = execContext.mappingProvider.keys;
+                contextProtocol.mappingProvider = mappingProviderProtocol;
+              }
               contextProtocol.testData = execContext.testData
                 ? guaranteeType(
                     V1_transformEmbeddedData(execContext.testData, context),
@@ -450,7 +481,7 @@ export class DSL_DataSpace_PureProtocolProcessorPlugin
             },
           );
           protocol.defaultExecutionContext =
-            metamodel.defaultExecutionContext.name;
+            metamodel.defaultExecutionContext?.name;
           protocol.title = metamodel.title;
           protocol.description = metamodel.description;
           protocol.elements = metamodel.elements?.map((pointer) => {
@@ -572,9 +603,16 @@ export class DSL_DataSpace_PureProtocolProcessorPlugin
             protocol.includedDataSpace,
             context,
           );
+          const defaultExecutionContext = guaranteeNonNullable(
+            dataSpace.value.defaultExecutionContext,
+            `Can't include data product '${protocol.includedDataSpace}' in a mapping: 'defaultExecutionContext' is required`,
+          );
           const includedMapping = new MappingIncludeDataSpace(
             parentMapping,
-            dataSpace.value.defaultExecutionContext.mapping,
+            guaranteeNonNullable(
+              defaultExecutionContext.mapping,
+              `Can't include data product '${protocol.includedDataSpace}' in a mapping: default execution context 'mapping' is required`,
+            ),
             dataSpace,
           );
           return includedMapping;
@@ -652,25 +690,22 @@ export class DSL_DataSpace_PureProtocolProcessorPlugin
                 V1_deserializeDataSpace(content),
               );
               if (v1DataSpace) {
-                if (v1DataSpace.executionContexts.length === 1) {
-                  const exec = guaranteeNonNullable(
-                    v1DataSpace.executionContexts[0],
-                  );
+                const executionContexts = v1DataSpace.executionContexts ?? [];
+                if (executionContexts.length === 1) {
+                  const exec = guaranteeNonNullable(executionContexts[0]);
                   return {
-                    mapping: exec.mapping.path,
-                    runtime: exec.defaultRuntime.path,
+                    mapping: exec.mapping?.path ?? '',
+                    runtime: exec.defaultRuntime?.path ?? '',
                   };
                 }
                 const resvoled =
                   queryExec.executionKey ?? v1DataSpace.defaultExecutionContext;
                 const resolvedExec = guaranteeNonNullable(
-                  v1DataSpace.executionContexts.find(
-                    (e) => e.name === resvoled,
-                  ),
+                  executionContexts.find((e) => e.name === resvoled),
                 );
                 return {
-                  mapping: resolvedExec.mapping.path,
-                  runtime: resolvedExec.defaultRuntime.path,
+                  mapping: resolvedExec.mapping?.path ?? '',
+                  runtime: resolvedExec.defaultRuntime?.path ?? '',
                 };
               }
             }

package/src/graph-manager/protocol/pure/v1/V1_DSL_DataSpace_PureGraphManagerExtension.ts

@@ -183,10 +183,10 @@ export class V1_DSL_DataSpace_PureGraphManagerExtension extends DSL_DataSpace_Pu
         execContext.executionKey;
     } else if (currentQuery.mapping && currentQuery.runtime) {
       dataSpaceTemplateExecutable.executionContextKey = guaranteeNonNullable(
-        dataSpaceProtocol.executionContexts.filter(
+        dataSpaceProtocol.executionContexts?.filter(
           (ec) =>
-            ec.mapping.path === currentQuery.mapping &&
-            ec.defaultRuntime.path === currentQuery.runtime,
+            ec.mapping?.path === currentQuery.mapping &&
+            ec.defaultRuntime?.path === currentQuery.runtime,
         )[0]?.name,
         'can`t find a corresponding executatin key based on query`s mapping and runtime in data product',
       );

package/src/graph-manager/protocol/pure/v1/model/packageableElements/dataSpace/V1_DSL_DataSpace_DataSpace.ts

@@ -26,12 +26,26 @@ import {
   type V1_DataElementReference,
 } from '@finos/legend-graph';
 
+export class V1_DataSpaceMappingProvider implements Hashable {
+  element!: V1_PackageableElementPointer;
+  keys: string[] = [];
+
+  get hashCode(): string {
+    return hashArray([
+      DATA_SPACE_HASH_STRUCTURE.DATA_SPACE_MAPPING_PROVIDER,
+      this.element.path,
+      hashArray(this.keys),
+    ]);
+  }
+}
+
 export class V1_DataSpaceExecutionContext implements Hashable {
   name!: string;
   title?: string | undefined;
   description?: string | undefined;
-  mapping!: V1_PackageableElementPointer;
-  defaultRuntime!: V1_PackageableElementPointer;
+  mapping?: V1_PackageableElementPointer | undefined;
+  defaultRuntime?: V1_PackageableElementPointer | undefined;
+  mappingProvider?: V1_DataSpaceMappingProvider | undefined;
   testData: V1_DataElementReference | undefined;
 
   get hashCode(): string {
@@ -40,8 +54,9 @@ export class V1_DataSpaceExecutionContext implements Hashable {
       this.name,
       this.title ?? '',
       this.description ?? '',
-      this.mapping.path,
-      this.defaultRuntime.path,
+      this.mapping?.path ?? '',
+      this.defaultRuntime?.path ?? '',
+      this.mappingProvider ?? '',
       this.testData ?? '',
     ]);
   }
@@ -175,8 +190,8 @@ export class V1_DataSpace extends V1_PackageableElement implements Hashable {
   taggedValues: V1_TaggedValue[] = [];
   title?: string | undefined;
   description?: string | undefined;
-  executionContexts!: V1_DataSpaceExecutionContext[];
-  defaultExecutionContext!: string;
+  executionContexts?: V1_DataSpaceExecutionContext[] | undefined;
+  defaultExecutionContext?: string | undefined;
   elements?: V1_DataSpaceElementPointer[] | undefined;
   executables?: V1_DataSpaceExecutable[] | undefined;
   diagrams?: V1_DataSpaceDiagram[] | undefined;
@@ -189,8 +204,8 @@ export class V1_DataSpace extends V1_PackageableElement implements Hashable {
       hashArray(this.taggedValues),
       this.title ?? '',
       this.description ?? '',
-      hashArray(this.executionContexts),
-      this.defaultExecutionContext,
+      hashArray(this.executionContexts ?? []),
+      this.defaultExecutionContext ?? '',
       hashArray(this.elements ?? []),
       hashArray(this.executables ?? []),
       hashArray(this.diagrams ?? []),

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

@@ -48,6 +48,7 @@ import {
   type V1_DataSpaceExecutable,
   V1_DataSpace,
   V1_DataSpaceExecutionContext,
+  V1_DataSpaceMappingProvider,
   V1_DataSpaceSupportEmail,
   V1_DataSpaceSupportCombinedInfo,
   V1_DataSpaceDiagram,
@@ -64,12 +65,27 @@ const V1_DATA_SPACE_PACKAGEABLE_ELEMENT_EXECUTABLE =
   'dataSpacePackageableElementExecutable';
 const V1_DATA_SPACE_TEMPLATE_EXECUTABLE = 'dataSpaceTemplateExecutable';
 
+const V1_dataSpaceMappingProviderModelSchema = createModelSchema(
+  V1_DataSpaceMappingProvider,
+  {
+    element: usingModelSchema(V1_packageableElementPointerModelSchema),
+    keys: list(primitive()),
+  },
+);
+
 const V1_dataSpaceExecutionContextModelSchema = createModelSchema(
   V1_DataSpaceExecutionContext,
   {
-    defaultRuntime: usingModelSchema(V1_packageableElementPointerModelSchema),
+    defaultRuntime: optional(
+      usingModelSchema(V1_packageableElementPointerModelSchema),
+    ),
     description: optional(primitive()),
-    mapping: usingModelSchema(V1_packageableElementPointerModelSchema),
+    mapping: optional(
+      usingModelSchema(V1_packageableElementPointerModelSchema),
+    ),
+    mappingProvider: optional(
+      usingModelSchema(V1_dataSpaceMappingProviderModelSchema),
+    ),
     name: primitive(),
     title: optional(primitive()),
     testData: optional(usingModelSchema(V1_dataElementReferenceModelSchema)),
@@ -204,7 +220,7 @@ const V1_dataSpaceDiagramModelSchema = createModelSchema(V1_DataSpaceDiagram, {
 
 const V1_dataSpaceModelSchema = createModelSchema(V1_DataSpace, {
   _type: usingConstantValueSchema(V1_DATA_SPACE_ELEMENT_PROTOCOL_TYPE),
-  defaultExecutionContext: primitive(),
+  defaultExecutionContext: optional(primitive()),
   description: optional(primitive()),
   diagrams: list(object(V1_dataSpaceDiagramModelSchema)),
   elements: optionalCustomListWithSchema(V1_dataSpaceElementPointerModelSchema),
@@ -214,7 +230,9 @@ const V1_dataSpaceModelSchema = createModelSchema(V1_DataSpace, {
       (val) => V1_deserializeDataspaceExecutable(val),
     ),
   ),
-  executionContexts: list(object(V1_dataSpaceExecutionContextModelSchema)),
+  executionContexts: optional(
+    list(object(V1_dataSpaceExecutionContextModelSchema)),
+  ),
   featuredDiagrams: optionalCustomListWithSchema(
     V1_packageableElementPointerModelSchema,
   ),

package/src/stores/query-builder/DataSpaceQueryBuilderState.ts

@@ -286,8 +286,9 @@ export class DataSpaceQueryBuilderState extends QueryBuilderState {
         this.dataSpace.title,
         this.dataSpace.name,
         this.dataSpace.path,
-        this.dataSpace.defaultExecutionContext.title ??
-          this.dataSpace.defaultExecutionContext.name,
+        this.dataSpace.defaultExecutionContext?.title ??
+          this.dataSpace.defaultExecutionContext?.name ??
+          '',
       ),
     };
   }
@@ -316,8 +317,9 @@ export class DataSpaceQueryBuilderState extends QueryBuilderState {
       element.title,
       element.name,
       element.path,
-      element.defaultExecutionContext.title ??
-        element.defaultExecutionContext.name,
+      element.defaultExecutionContext?.title ??
+        element.defaultExecutionContext?.name ??
+        '',
     );
   }