@finos/legend-extension-dsl-data-space 10.4.248 → 10.4.249

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

@@ -94,6 +94,7 @@ import {
   DataSpaceTemplateExecutableInfo,
   DataSpaceFunctionPointerExecutableInfo,
   DataSpaceExecutionContextRuntimeMetadata,
+  DataSpaceMappingProviderAnalysisResult,
 } from '../../../action/analytics/DataSpaceAnalysis.js';
 import { DiagramAnalysisResult } from '@finos/legend-extension-dsl-diagram';
 import { DSL_DataSpace_PureGraphManagerExtension } from '../DSL_DataSpace_PureGraphManagerExtension.js';
@@ -635,6 +636,7 @@ export class V1_DSL_DataSpace_PureGraphManagerExtension extends DSL_DataSpace_Pu
     const runtimeModels = uniq(
       analysisResult.executionContexts
         .map((context) => context.defaultRuntime)
+        .filter(isNonNullable)
         .concat(
           analysisResult.executionContexts.flatMap(
             (val) => val.compatibleRuntimes,
@@ -666,10 +668,12 @@ export class V1_DSL_DataSpace_PureGraphManagerExtension extends DSL_DataSpace_Pu
           PackageableElementPointerType.MAPPING,
           execContext.mapping,
         );
-        contextProtocol.defaultRuntime = new V1_PackageableElementPointer(
-          PackageableElementPointerType.RUNTIME,
-          execContext.defaultRuntime,
-        );
+        if (execContext.defaultRuntime) {
+          contextProtocol.defaultRuntime = new V1_PackageableElementPointer(
+            PackageableElementPointerType.RUNTIME,
+            execContext.defaultRuntime,
+          );
+        }
         return contextProtocol;
       },
     );
@@ -746,10 +750,13 @@ export class V1_DSL_DataSpace_PureGraphManagerExtension extends DSL_DataSpace_Pu
       if (runtimeEntitiesRetriever) {
         try {
           const defaultRuntime = guaranteeNonNullable(
-            analysisResult.executionContexts.find(
-              (value) => value.name === analysisResult.defaultExecutionContext,
-            ),
-          ).defaultRuntime;
+            guaranteeNonNullable(
+              analysisResult.executionContexts.find(
+                (value) =>
+                  value.name === analysisResult.defaultExecutionContext,
+              ),
+            ).defaultRuntime,
+          );
           await this.processRuntimeInfo(
             runtimeEntitiesRetriever,
             defaultRuntime,
@@ -869,9 +876,11 @@ export class V1_DSL_DataSpace_PureGraphManagerExtension extends DSL_DataSpace_Pu
       contextAnalysisResult.title = context.title;
       contextAnalysisResult.description = context.description;
       contextAnalysisResult.mapping = graph.getMapping(context.mapping);
-      contextAnalysisResult.defaultRuntime = graph.getRuntime(
-        context.defaultRuntime,
-      );
+      if (context.defaultRuntime) {
+        contextAnalysisResult.defaultRuntime = graph.getRuntime(
+          context.defaultRuntime,
+        );
+      }
       if (context.runtimeMetadata) {
         const metadata = new DataSpaceExecutionContextRuntimeMetadata();
         if (context.runtimeMetadata.storePath) {
@@ -885,6 +894,13 @@ export class V1_DSL_DataSpace_PureGraphManagerExtension extends DSL_DataSpace_Pu
         }
         contextAnalysisResult.runtimeMetadata = metadata;
       }
+      if (context.mappingProvider) {
+        const mappingProviderAnalysisResult =
+          new DataSpaceMappingProviderAnalysisResult();
+        mappingProviderAnalysisResult.element = context.mappingProvider.element;
+        mappingProviderAnalysisResult.keys = context.mappingProvider.keys;
+        contextAnalysisResult.mappingProvider = mappingProviderAnalysisResult;
+      }
 
       // for handling deprecated mappingModelCoverageAnalysisResult
       if (context.mappingModelCoverageAnalysisResult) {
@@ -910,9 +926,14 @@ export class V1_DSL_DataSpace_PureGraphManagerExtension extends DSL_DataSpace_Pu
         contextAnalysisResult,
       );
     });
-    result.defaultExecutionContext = guaranteeNonNullable(
-      result.executionContextsIndex.get(analysisResult.defaultExecutionContext),
-    );
+    if (analysisResult.defaultExecutionContext) {
+      result.defaultExecutionContext = guaranteeNonNullable(
+        result.executionContextsIndex.get(
+          analysisResult.defaultExecutionContext,
+        ),
+        `Can't find default execution context '${analysisResult.defaultExecutionContext}'`,
+      );
+    }
 
     // elements documentation
     result.elementDocs = analysisResult.elementDocs.flatMap((docEntry) => {

package/src/graph-manager/protocol/pure/v1/engine/analytics/V1_DataSpaceAnalysis.ts

@@ -84,6 +84,7 @@ class V1_DataSpaceExecutionContextAnalysisResult {
   title?: string | undefined;
   description?: string | undefined;
   mapping!: string;
+  mappingProvider?: V1_DataSpaceMappingProviderAnalysisResult;
   defaultRuntime!: string;
   compatibleRuntimes!: string[];
   /**
@@ -94,6 +95,18 @@ class V1_DataSpaceExecutionContextAnalysisResult {
   runtimeMetadata?: V1_DataSpaceExecutionContextRuntimeMetadata;
 }
 
+class V1_DataSpaceMappingProviderAnalysisResult {
+  element!: string;
+  keys: string[] = [];
+
+  static readonly serialization = new SerializationFactory(
+    createModelSchema(V1_DataSpaceMappingProviderAnalysisResult, {
+      element: primitive(),
+      keys: list(primitive()),
+    }),
+  );
+}
+
 class V1_DataSpaceExecutionContextRuntimeMetadata {
   storePath?: string;
   connectionPath?: string;
@@ -128,6 +141,11 @@ const V1_dataSpaceExecutionContextAnalysisResultModelSchema = (
       ),
     ),
     mapping: primitive(),
+    mappingProvider: optional(
+      usingModelSchema(
+        V1_DataSpaceMappingProviderAnalysisResult.serialization.schema,
+      ),
+    ),
     name: primitive(),
     title: optional(primitive()),
     runtimeMetadata: usingModelSchema(
@@ -377,7 +395,7 @@ const V1_dataSpaceMultiExecutionServiceExecutableInfoModelSchema = (
     _type: usingConstantValueSchema(
       V1_DATA_SPACE_MULTI_EXECUTION_SERVICE_EXECUTABLE_INFO_TYPE,
     ),
-    keyedExecutableInfoList: list(
+    keyedExecutableInfos: list(
       usingModelSchema(
         V1_dataSpaceMultiExecutionServiceKeyedExecutableInfoModelSchema(
           plugins,
@@ -519,7 +537,7 @@ export class V1_DataSpaceAnalysisResult {
   >;
 }
 
-const V1_dataSpaceAnalysisResultModelSchema = (
+export const V1_dataSpaceAnalysisResultModelSchema = (
   plugins: PureProtocolProcessorPlugin[],
 ): ModelSchema<V1_DataSpaceAnalysisResult> =>
   createModelSchema(V1_DataSpaceAnalysisResult, {
@@ -557,23 +575,21 @@ const V1_dataSpaceAnalysisResultModelSchema = (
     executables: customListWithSchema(
       V1_dataSpaceExecutableAnalysisResultModelSchema(plugins),
     ),
-    mappingToMappingCoverageResult: optional(
-      custom(
-        (val) =>
-          serializeMap(val, (_val) =>
-            serialize(
-              V1_MappingModelCoverageAnalysisResult.serialization.schema,
-              _val,
-            ),
+    mappingToMappingCoverageResult: optionalCustom(
+      (val) =>
+        serializeMap(val, (_val) =>
+          serialize(
+            V1_MappingModelCoverageAnalysisResult.serialization.schema,
+            _val,
           ),
-        (val) =>
-          deserializeMap(val, (_val) =>
-            deserialize(
-              V1_MappingModelCoverageAnalysisResult.serialization.schema,
-              _val,
-            ),
+        ),
+      (val) =>
+        deserializeMap(val, (_val) =>
+          deserialize(
+            V1_MappingModelCoverageAnalysisResult.serialization.schema,
+            _val,
           ),
-      ),
+        ),
     ),
   });
 

package/tsconfig.json

@@ -57,6 +57,7 @@
     "./src/__lib__/query/DSL_DataSpace_LegendQueryDocumentation.ts",
     "./src/__lib__/shared/DSL_DataSpace_LegendNavigation.ts",
     "./src/__lib__/to-delete/DSL_DataSpace_LegendQueryNavigation_to_delete.ts",
+    "./src/components/DataSpaceLegendAISchema.ts",
     "./src/components/index.ts",
     "./src/components/query-builder/QueryDataSpaceUtil.ts",
     "./src/components/query-builder/index.ts",