@finos/legend-extension-dsl-data-space 3.0.4 → 4.0.0

package/lib/models/protocols/pure/DSLDataSpace_PureProtocolProcessorPlugin.js

@@ -16,12 +16,12 @@
 import packageJson from '../../../../package.json';
 import V1_SYSTEM_MODELS from './v1/V1_DSLDataSpace_SystemModels.json';
 import { V1_DataSpace, V1_DataSpaceExecutionContext, V1_DataSpaceSupportEmail, } from './v1/model/packageableElements/dataSpace/V1_DSLDataSpace_DataSpace.js';
-import { uuid, guaranteeNonEmptyString, guaranteeNonNullable, UnsupportedOperationError, isNonNullable, assertType, } from '@finos/legend-shared';
+import { guaranteeNonEmptyString, guaranteeNonNullable, UnsupportedOperationError, isNonNullable, assertType, } from '@finos/legend-shared';
 import { deserialize, serialize } from 'serializr';
 import { V1_dataSpaceModelSchema, V1_DATA_SPACE_ELEMENT_PROTOCOL_TYPE, } from './v1/transformation/pureProtocol/V1_DSLDataSpace_ProtocolHelper.js';
 import { getOwnDataSpace } from '../../../graphManager/DSLDataSpace_GraphManagerHelper.js';
 import { DataSpace, DataSpaceExecutionContext, DataSpaceSupportEmail, } from '../../metamodels/pure/model/packageableElements/dataSpace/DSLDataSpace_DataSpace.js';
-import { V1_taggedValueSchema, PackageableElementExplicitReference, V1_PackageableElementPointer, PackageableElementPointerType, V1_buildTaggedValue, V1_transformStereotype, V1_transformTaggedValue, PureProtocolProcessorPlugin, V1_ElementBuilder, V1_initPackageableElement, V1_StereotypePtr, V1_buildFullPath, } from '@finos/legend-graph';
+import { V1_taggedValueSchema, PackageableElementExplicitReference, V1_PackageableElementPointer, PackageableElementPointerType, V1_buildTaggedValue, V1_transformStereotype, V1_transformTaggedValue, PureProtocolProcessorPlugin, V1_ElementBuilder, V1_initPackageableElement, V1_buildFullPath, } from '@finos/legend-graph';
 import { V1_DSLDiagram_PackageableElementPointerType, getDiagram, } from '@finos/legend-extension-dsl-diagram';
 export const DATA_SPACE_ELEMENT_CLASSIFIER_PATH = 'meta::pure::metamodel::dataSpace::DataSpace';
 export class DSLDataSpace_PureProtocolProcessorPlugin extends PureProtocolProcessorPlugin {
@@ -50,22 +50,20 @@ export class DSLDataSpace_PureProtocolProcessorPlugin extends PureProtocolProces
                     element.taggedValues = elementProtocol.taggedValues
                         .map((taggedValue) => V1_buildTaggedValue(taggedValue, context))
                         .filter(isNonNullable);
-                    element.groupId = guaranteeNonEmptyString(elementProtocol.groupId, `Data space 'groupId' field is missing or empty`);
-                    element.artifactId = guaranteeNonEmptyString(elementProtocol.artifactId, `Data space 'artifactId' field is missing or empty`);
-                    element.versionId = guaranteeNonEmptyString(elementProtocol.versionId, `Data space 'versionId' field is missing or empty`);
                     element.executionContexts = guaranteeNonNullable(elementProtocol.executionContexts, `Data space 'executionContexts' field is missing`).map((contextProtocol) => {
                         const execContext = new DataSpaceExecutionContext();
                         execContext.name = guaranteeNonEmptyString(contextProtocol.name, `Data space execution context 'name' field is missing or empty`);
                         execContext.description = contextProtocol.description;
-                        execContext.mapping = guaranteeNonNullable(contextProtocol.mapping, `Data space execution context 'mapping' field is missing or empty`).path;
-                        execContext.defaultRuntime = guaranteeNonNullable(contextProtocol.defaultRuntime, `Data space execution context 'defaultRuntime' field is missing or empty`).path;
+                        execContext.mapping = PackageableElementExplicitReference.create(context.graph.getMapping(contextProtocol.mapping.path));
+                        execContext.defaultRuntime =
+                            PackageableElementExplicitReference.create(context.graph.getRuntime(contextProtocol.defaultRuntime.path));
                         return execContext;
                     });
                     element.defaultExecutionContext = guaranteeNonNullable(element.executionContexts.find((execContext) => execContext.name ===
                         guaranteeNonEmptyString(elementProtocol.defaultExecutionContext, `Data space 'defaultExecutionContext' field is missing or empty`)), `Can't find default execution context '${elementProtocol.defaultExecutionContext}'`);
                     element.description = elementProtocol.description;
                     if (elementProtocol.featuredDiagrams) {
-                        element.featuredDiagrams = elementProtocol.featuredDiagrams.map((pointer) => pointer.path);
+                        element.featuredDiagrams = elementProtocol.featuredDiagrams.map((pointer) => PackageableElementExplicitReference.create(getDiagram(pointer.path, context.graph)));
                     }
                     if (elementProtocol.supportInfo) {
                         if (elementProtocol.supportInfo instanceof V1_DataSpaceSupportEmail) {
@@ -122,21 +120,18 @@ export class DSLDataSpace_PureProtocolProcessorPlugin extends PureProtocolProces
                     V1_initPackageableElement(protocol, metamodel);
                     protocol.stereotypes = metamodel.stereotypes.map(V1_transformStereotype);
                     protocol.taggedValues = metamodel.taggedValues.map(V1_transformTaggedValue);
-                    protocol.groupId = metamodel.groupId;
-                    protocol.artifactId = metamodel.artifactId;
-                    protocol.versionId = metamodel.versionId;
                     protocol.executionContexts = metamodel.executionContexts.map((execContext) => {
                         const contextProtocol = new V1_DataSpaceExecutionContext();
                         contextProtocol.name = execContext.name;
                         contextProtocol.description = execContext.description;
-                        contextProtocol.mapping = new V1_PackageableElementPointer(PackageableElementPointerType.MAPPING, execContext.mapping);
-                        contextProtocol.defaultRuntime = new V1_PackageableElementPointer(PackageableElementPointerType.RUNTIME, execContext.defaultRuntime);
+                        contextProtocol.mapping = new V1_PackageableElementPointer(PackageableElementPointerType.MAPPING, execContext.mapping.valueForSerialization ?? '');
+                        contextProtocol.defaultRuntime = new V1_PackageableElementPointer(PackageableElementPointerType.RUNTIME, execContext.defaultRuntime.valueForSerialization ?? '');
                         return contextProtocol;
                     });
                     protocol.defaultExecutionContext =
                         metamodel.defaultExecutionContext.name;
                     protocol.description = metamodel.description;
-                    protocol.featuredDiagrams = metamodel.featuredDiagrams.map((diagramPath) => new V1_PackageableElementPointer(V1_DSLDiagram_PackageableElementPointerType, diagramPath));
+                    protocol.featuredDiagrams = metamodel.featuredDiagrams?.map((diagramPath) => new V1_PackageableElementPointer(V1_DSLDiagram_PackageableElementPointerType, diagramPath.valueForSerialization ?? ''));
                     if (metamodel.supportInfo) {
                         if (metamodel.supportInfo instanceof DataSpaceSupportEmail) {
                             const supportEmail = new V1_DataSpaceSupportEmail();
@@ -147,7 +142,6 @@ export class DSLDataSpace_PureProtocolProcessorPlugin extends PureProtocolProces
                             throw new UnsupportedOperationError(`Can't transform data space support info`, metamodel.supportInfo);
                         }
                     }
-                    // protocol.supportInfo = metamodel.supportInfo;
                     return protocol;
                 }
                 return undefined;
@@ -155,84 +149,6 @@ export class DSLDataSpace_PureProtocolProcessorPlugin extends PureProtocolProces
         ];
     }
 }
-export class ResolvedDataSpaceExecutionContext {
-    name;
-    description;
-    mapping;
-    defaultRuntime;
-}
-/**
- * When we actually need to use the data space, we want to resolve all of its
- * element pointers to actual reference, hence this model.
- */
-export class ResolvedDataSpace {
-    taggedValues = [];
-    stereotypes = [];
-    path;
-    groupId;
-    artifactId;
-    versionId;
-    executionContexts = [];
-    defaultExecutionContext;
-    featuredDiagrams = [];
-    description;
-    supportInfo;
-}
-export const getResolvedDataSpace = (json, graph) => {
-    const dataSpace = new ResolvedDataSpace();
-    if (json._type === V1_DATA_SPACE_ELEMENT_PROTOCOL_TYPE) {
-        const protocol = deserialize(V1_dataSpaceModelSchema, json);
-        dataSpace.path = protocol.path;
-        if (Array.isArray(json.taggedValues)) {
-            dataSpace.taggedValues = json.taggedValues
-                .map((taggedValueJson) => deserialize(V1_taggedValueSchema, taggedValueJson))
-                .map((taggedValue) => ({
-                uuid: uuid(),
-                profile: taggedValue.tag.profile,
-                tag: taggedValue.tag.value,
-                value: taggedValue.value,
-            }));
-        }
-        if (Array.isArray(json.stereotypes)) {
-            dataSpace.stereotypes = json.stereotypes
-                .map((stereotypePtrJson) => deserialize(V1_StereotypePtr, stereotypePtrJson))
-                .map((stereotypePtr) => ({
-                uuid: uuid(),
-                profile: stereotypePtr.profile,
-                stereotype: stereotypePtr.value,
-            }));
-        }
-        dataSpace.groupId = guaranteeNonEmptyString(protocol.groupId, `Data space 'groupId' field is missing or empty`);
-        dataSpace.artifactId = guaranteeNonEmptyString(protocol.artifactId, `Data space 'artifactId' field is missing or empty`);
-        dataSpace.versionId = guaranteeNonEmptyString(protocol.versionId, `Data space 'versionId' field is missing or empty`);
-        dataSpace.executionContexts = protocol.executionContexts.map((contextProtocol) => {
-            const context = new ResolvedDataSpaceExecutionContext();
-            context.name = guaranteeNonEmptyString(contextProtocol.name, `Data space execution context 'name' field is missing or empty`);
-            context.description = contextProtocol.description;
-            context.mapping = PackageableElementExplicitReference.create(graph.getMapping(contextProtocol.mapping.path));
-            context.defaultRuntime = PackageableElementExplicitReference.create(graph.getRuntime(contextProtocol.defaultRuntime.path));
-            return context;
-        });
-        dataSpace.defaultExecutionContext = guaranteeNonNullable(dataSpace.executionContexts.find((context) => context.name ===
-            guaranteeNonEmptyString(protocol.defaultExecutionContext, `Data space 'defaultExecutionContext' field is missing or empty`)), `Can't find default execution context '${protocol.defaultExecutionContext}'`);
-        dataSpace.description = protocol.description;
-        if (protocol.featuredDiagrams) {
-            dataSpace.featuredDiagrams = protocol.featuredDiagrams.map((pointer) => PackageableElementExplicitReference.create(getDiagram(pointer.path, graph)));
-        }
-        if (protocol.supportInfo) {
-            if (protocol.supportInfo instanceof V1_DataSpaceSupportEmail) {
-                const supportEmail = new DataSpaceSupportEmail();
-                supportEmail.address = guaranteeNonEmptyString(protocol.supportInfo.address, `Data space support email 'address' field is missing or empty`);
-                dataSpace.supportInfo = supportEmail;
-            }
-            else {
-                throw new UnsupportedOperationError(`Can't build data space support info`, protocol.supportInfo);
-            }
-        }
-        return dataSpace;
-    }
-    throw new UnsupportedOperationError(`Can't resolve data space`, json);
-};
 export const extractDataSpaceTaxonomyNodes = (json) => {
     const ENTERPRISE_PROFILE_PATH = `meta::pure::profiles::enterprise`;
     const TAXONOMY_NODES_TAG = `taxonomyNodes`;

package/lib/models/protocols/pure/DSLDataSpace_PureProtocolProcessorPlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"DSLDataSpace_PureProtocolProcessorPlugin.js","sourceRoot":"","sources":["../../../../src/models/protocols/pure/DSLDataSpace_PureProtocolProcessorPlugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DSLDataSpace_PureProtocolProcessorPlugin.js","sourceRoot":"","sources":["../../../../src/models/protocols/pure/DSLDataSpace_PureProtocolProcessorPlugin.ts"],"names":[],"mappings":"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"}

package/lib/models/protocols/pure/v1/model/packageableElements/dataSpace/V1_DSLDataSpace_DataSpace.d.ts

@@ -32,9 +32,6 @@ export declare class V1_DataSpaceExecutionContext implements Hashable {
 export declare class V1_DataSpace extends V1_PackageableElement implements Hashable {
     stereotypes: V1_StereotypePtr[];
     taggedValues: V1_TaggedValue[];
-    groupId: string;
-    artifactId: string;
-    versionId: string;
     executionContexts: V1_DataSpaceExecutionContext[];
     defaultExecutionContext: string;
     featuredDiagrams?: V1_PackageableElementPointer[] | undefined;

package/lib/models/protocols/pure/v1/model/packageableElements/dataSpace/V1_DSLDataSpace_DataSpace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"V1_DSLDataSpace_DataSpace.d.ts","sourceRoot":"","sources":["../../../../../../../../src/models/protocols/pure/v1/model/packageableElements/dataSpace/V1_DSLDataSpace_DataSpace.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EACL,qBAAqB,EACrB,KAAK,4BAA4B,EACjC,KAAK,4BAA4B,EACjC,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACpB,MAAM,qBAAqB,CAAC;AAE7B,8BAAsB,uBAAwB,YAAW,QAAQ;IAC/D,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC;CACjC;AAED,qBAAa,wBACX,SAAQ,uBACR,YAAW,QAAQ;IAEnB,OAAO,EAAG,MAAM,CAAC;IAEjB,IAAI,QAAQ,IAAI,MAAM,CAKrB;CACF;AAED,qBAAa,4BAA6B,YAAW,QAAQ;IAC3D,IAAI,EAAG,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,OAAO,EAAG,4BAA4B,CAAC;IACvC,cAAc,EAAG,4BAA4B,CAAC;IAE9C,IAAI,QAAQ,IAAI,MAAM,CAQrB;CACF;AAED,qBAAa,YAAa,SAAQ,qBAAsB,YAAW,QAAQ;IACzE,WAAW,EAAE,gBAAgB,EAAE,CAAM;IACrC,YAAY,EAAE,cAAc,EAAE,CAAM;IACpC,OAAO,EAAG,MAAM,CAAC;IACjB,UAAU,EAAG,MAAM,CAAC;IACpB,SAAS,EAAG,MAAM,CAAC;IACnB,iBAAiB,EAAG,4BAA4B,EAAE,CAAC;IACnD,uBAAuB,EAAG,MAAM,CAAC;IACjC,gBAAgB,CAAC,EAAE,4BAA4B,EAAE,GAAG,SAAS,CAAC;IAC9D,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,WAAW,CAAC,EAAE,uBAAuB,GAAG,SAAS,CAAC;IAElD,IAAa,QAAQ,IAAI,MAAM,CAc9B;IAED,gCAAgC,CAAC,CAAC,EAChC,OAAO,EAAE,4BAA4B,CAAC,CAAC,CAAC,GACvC,CAAC;CAGL"}
+{"version":3,"file":"V1_DSLDataSpace_DataSpace.d.ts","sourceRoot":"","sources":["../../../../../../../../src/models/protocols/pure/v1/model/packageableElements/dataSpace/V1_DSLDataSpace_DataSpace.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhE,OAAO,EACL,qBAAqB,EACrB,KAAK,4BAA4B,EACjC,KAAK,4BAA4B,EACjC,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACpB,MAAM,qBAAqB,CAAC;AAE7B,8BAAsB,uBAAwB,YAAW,QAAQ;IAC/D,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC;CACjC;AAED,qBAAa,wBACX,SAAQ,uBACR,YAAW,QAAQ;IAEnB,OAAO,EAAG,MAAM,CAAC;IAEjB,IAAI,QAAQ,IAAI,MAAM,CAKrB;CACF;AAED,qBAAa,4BAA6B,YAAW,QAAQ;IAC3D,IAAI,EAAG,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,OAAO,EAAG,4BAA4B,CAAC;IACvC,cAAc,EAAG,4BAA4B,CAAC;IAE9C,IAAI,QAAQ,IAAI,MAAM,CAQrB;CACF;AAED,qBAAa,YAAa,SAAQ,qBAAsB,YAAW,QAAQ;IACzE,WAAW,EAAE,gBAAgB,EAAE,CAAM;IACrC,YAAY,EAAE,cAAc,EAAE,CAAM;IACpC,iBAAiB,EAAG,4BAA4B,EAAE,CAAC;IACnD,uBAAuB,EAAG,MAAM,CAAC;IACjC,gBAAgB,CAAC,EAAE,4BAA4B,EAAE,GAAG,SAAS,CAAC;IAC9D,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,WAAW,CAAC,EAAE,uBAAuB,GAAG,SAAS,CAAC;IAElD,IAAa,QAAQ,IAAI,MAAM,CAW9B;IAED,gCAAgC,CAAC,CAAC,EAChC,OAAO,EAAE,4BAA4B,CAAC,CAAC,CAAC,GACvC,CAAC;CAGL"}

package/lib/models/protocols/pure/v1/model/packageableElements/dataSpace/V1_DSLDataSpace_DataSpace.js

@@ -45,9 +45,6 @@ export class V1_DataSpaceExecutionContext {
 export class V1_DataSpace extends V1_PackageableElement {
     stereotypes = [];
     taggedValues = [];
-    groupId;
-    artifactId;
-    versionId;
     executionContexts;
     defaultExecutionContext;
     featuredDiagrams;
@@ -58,9 +55,6 @@ export class V1_DataSpace extends V1_PackageableElement {
             DATA_SPACE_HASH_STRUCTURE.DATA_SPACE,
             hashArray(this.stereotypes),
             hashArray(this.taggedValues),
-            this.groupId,
-            this.artifactId,
-            this.versionId,
             hashArray(this.executionContexts),
             this.defaultExecutionContext,
             hashArray((this.featuredDiagrams ?? []).map((pointer) => pointer.path)),

package/lib/models/protocols/pure/v1/model/packageableElements/dataSpace/V1_DSLDataSpace_DataSpace.js.map

@@ -1 +1 @@
-{"version":3,"file":"V1_DSLDataSpace_DataSpace.js","sourceRoot":"","sources":["../../../../../../../../src/models/protocols/pure/v1/model/packageableElements/dataSpace/V1_DSLDataSpace_DataSpace.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,MAAM,8CAA8C,CAAC;AACzF,OAAO,EACL,qBAAqB,GAKtB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,OAAgB,uBAAuB;CAE5C;AAED,MAAM,OAAO,wBACX,SAAQ,uBAAuB;IAG/B,OAAO,CAAU;IAEjB,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,yBAAyB,CAAC,wBAAwB;YAClD,IAAI,CAAC,OAAO;SACb,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,4BAA4B;IACvC,IAAI,CAAU;IACd,WAAW,CAAsB;IACjC,OAAO,CAAgC;IACvC,cAAc,CAAgC;IAE9C,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,yBAAyB,CAAC,4BAA4B;YACtD,IAAI,CAAC,IAAI;YACT,IAAI,CAAC,WAAW,IAAI,EAAE;YACtB,IAAI,CAAC,OAAO,CAAC,IAAI;YACjB,IAAI,CAAC,cAAc,CAAC,IAAI;SACzB,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,YAAa,SAAQ,qBAAqB;IACrD,WAAW,GAAuB,EAAE,CAAC;IACrC,YAAY,GAAqB,EAAE,CAAC;IACpC,OAAO,CAAU;IACjB,UAAU,CAAU;IACpB,SAAS,CAAU;IACnB,iBAAiB,CAAkC;IACnD,uBAAuB,CAAU;IACjC,gBAAgB,CAA8C;IAC9D,WAAW,CAAsB;IACjC,WAAW,CAAuC;IAElD,IAAa,QAAQ;QACnB,OAAO,SAAS,CAAC;YACf,yBAAyB,CAAC,UAAU;YACpC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC;YAC3B,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC;YAC5B,IAAI,CAAC,OAAO;YACZ,IAAI,CAAC,UAAU;YACf,IAAI,CAAC,SAAS;YACd,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC;YACjC,IAAI,CAAC,uBAAuB;YAC5B,SAAS,CAAC,CAAC,IAAI,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACvE,IAAI,CAAC,WAAW,IAAI,EAAE;YACtB,IAAI,CAAC,WAAW,IAAI,EAAE;SACvB,CAAC,CAAC;IACL,CAAC;IAED,gCAAgC,CAC9B,OAAwC;QAExC,OAAO,OAAO,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC;CACF"}
+{"version":3,"file":"V1_DSLDataSpace_DataSpace.js","sourceRoot":"","sources":["../../../../../../../../src/models/protocols/pure/v1/model/packageableElements/dataSpace/V1_DSLDataSpace_DataSpace.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,MAAM,8CAA8C,CAAC;AACzF,OAAO,EACL,qBAAqB,GAKtB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,OAAgB,uBAAuB;CAE5C;AAED,MAAM,OAAO,wBACX,SAAQ,uBAAuB;IAG/B,OAAO,CAAU;IAEjB,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,yBAAyB,CAAC,wBAAwB;YAClD,IAAI,CAAC,OAAO;SACb,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,4BAA4B;IACvC,IAAI,CAAU;IACd,WAAW,CAAsB;IACjC,OAAO,CAAgC;IACvC,cAAc,CAAgC;IAE9C,IAAI,QAAQ;QACV,OAAO,SAAS,CAAC;YACf,yBAAyB,CAAC,4BAA4B;YACtD,IAAI,CAAC,IAAI;YACT,IAAI,CAAC,WAAW,IAAI,EAAE;YACtB,IAAI,CAAC,OAAO,CAAC,IAAI;YACjB,IAAI,CAAC,cAAc,CAAC,IAAI;SACzB,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,YAAa,SAAQ,qBAAqB;IACrD,WAAW,GAAuB,EAAE,CAAC;IACrC,YAAY,GAAqB,EAAE,CAAC;IACpC,iBAAiB,CAAkC;IACnD,uBAAuB,CAAU;IACjC,gBAAgB,CAA8C;IAC9D,WAAW,CAAsB;IACjC,WAAW,CAAuC;IAElD,IAAa,QAAQ;QACnB,OAAO,SAAS,CAAC;YACf,yBAAyB,CAAC,UAAU;YACpC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC;YAC3B,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC;YAC5B,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC;YACjC,IAAI,CAAC,uBAAuB;YAC5B,SAAS,CAAC,CAAC,IAAI,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACvE,IAAI,CAAC,WAAW,IAAI,EAAE;YACtB,IAAI,CAAC,WAAW,IAAI,EAAE;SACvB,CAAC,CAAC;IACL,CAAC;IAED,gCAAgC,CAC9B,OAAwC;QAExC,OAAO,OAAO,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC;CACF"}

package/lib/models/protocols/pure/v1/transformation/pureProtocol/V1_DSLDataSpace_ProtocolHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"V1_DSLDataSpace_ProtocolHelper.d.ts","sourceRoot":"","sources":["../../../../../../../src/models/protocols/pure/v1/transformation/pureProtocol/V1_DSLDataSpace_ProtocolHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AA0BH,OAAO,EAEL,YAAY,EAGb,MAAM,wEAAwE,CAAC;AAEhF,eAAO,MAAM,mCAAmC,cAAc,CAAC;AAC/D,eAAO,MAAM,gCAAgC,UAAU,CAAC;AAgDxD,eAAO,MAAM,uBAAuB,+CAiElC,CAAC"}
+{"version":3,"file":"V1_DSLDataSpace_ProtocolHelper.d.ts","sourceRoot":"","sources":["../../../../../../../src/models/protocols/pure/v1/transformation/pureProtocol/V1_DSLDataSpace_ProtocolHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AA2BH,OAAO,EAEL,YAAY,EAGb,MAAM,wEAAwE,CAAC;AAEhF,eAAO,MAAM,mCAAmC,cAAc,CAAC;AAC/D,eAAO,MAAM,gCAAgC,UAAU,CAAC;AAgDxD,eAAO,MAAM,uBAAuB,+CA8DlC,CAAC"}

package/lib/models/protocols/pure/v1/transformation/pureProtocol/V1_DSLDataSpace_ProtocolHelper.js

@@ -15,7 +15,7 @@
  */
 import { createModelSchema, custom, deserialize, list, object, optional, primitive, serialize, SKIP, } from 'serializr';
 import { V1_stereotypePtrSchema, V1_taggedValueSchema, V1_packageableElementPointerDeserializerSchema, } from '@finos/legend-graph';
-import { deserializeArray, serializeArray, UnsupportedOperationError, usingConstantValueSchema, usingModelSchema, } from '@finos/legend-shared';
+import { deserializeArray, serializeArray, UnsupportedOperationError, usingConstantValueSchema, usingModelSchema, optionalCustom, } from '@finos/legend-shared';
 import { V1_DataSpace, V1_DataSpaceExecutionContext, V1_DataSpaceSupportEmail, } from '../../model/packageableElements/dataSpace/V1_DSLDataSpace_DataSpace.js';
 export const V1_DATA_SPACE_ELEMENT_PROTOCOL_TYPE = 'dataSpace';
 export const V1_DATA_SPACE_SUPPORT_EMAIL_TYPE = 'email';
@@ -52,17 +52,15 @@ const V1_deserializeSupportInfo = (json) => {
 };
 export const V1_dataSpaceModelSchema = createModelSchema(V1_DataSpace, {
     _type: usingConstantValueSchema(V1_DATA_SPACE_ELEMENT_PROTOCOL_TYPE),
-    artifactId: primitive(),
     defaultExecutionContext: primitive(),
     description: optional(primitive()),
     executionContexts: list(object(V1_dataSpaceExecutionContextModelSchema)),
-    featuredDiagrams: custom((values) => serializeArray(values, (value) => serialize(V1_packageableElementPointerDeserializerSchema, value), {
+    featuredDiagrams: optionalCustom((values) => serializeArray(values, (value) => serialize(V1_packageableElementPointerDeserializerSchema, value), {
         skipIfEmpty: true,
         INTERNAL__forceReturnEmptyInTest: true,
     }), (values) => deserializeArray(values, (value) => deserialize(V1_packageableElementPointerDeserializerSchema, value), {
         skipIfEmpty: false,
     })),
-    groupId: primitive(),
     name: primitive(),
     package: primitive(),
     stereotypes: custom((values) => serializeArray(values, (value) => serialize(V1_stereotypePtrSchema, value), {
@@ -78,6 +76,5 @@ export const V1_dataSpaceModelSchema = createModelSchema(V1_DataSpace, {
     }), (values) => deserializeArray(values, (v) => deserialize(V1_taggedValueSchema, v), {
         skipIfEmpty: false,
     })),
-    versionId: primitive(),
 });
 //# sourceMappingURL=V1_DSLDataSpace_ProtocolHelper.js.map

package/lib/models/protocols/pure/v1/transformation/pureProtocol/V1_DSLDataSpace_ProtocolHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"V1_DSLDataSpace_ProtocolHelper.js","sourceRoot":"","sources":["../../../../../../../src/models/protocols/pure/v1/transformation/pureProtocol/V1_DSLDataSpace_ProtocolHelper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"V1_DSLDataSpace_ProtocolHelper.js","sourceRoot":"","sources":["../../../../../../../src/models/protocols/pure/v1/transformation/pureProtocol/V1_DSLDataSpace_ProtocolHelper.ts"],"names":[],"mappings":"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"}

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@finos/legend-extension-dsl-data-space",
-    "version": "3.0.4",
+    "version": "4.0.0",
     "description": "Legend extension for Data Space DSL",
     "keywords": [
         "legend",
@@ -62,10 +62,10 @@
     },
     "devDependencies": {
         "@finos/legend-dev-utils": "workspace:*",
-        "@jest/globals": "28.1.1",
+        "@jest/globals": "28.1.2",
         "cross-env": "7.0.3",
         "eslint": "8.18.0",
-        "jest": "28.1.1",
+        "jest": "28.1.2",
         "npm-run-all": "4.1.5",
         "rimraf": "3.0.2",
         "sass": "1.53.0",

package/lib/stores/DataSpaceViewerState.d.ts

@@ -15,7 +15,7 @@
  */
 import { type ClassView, type DiagramRenderer, Diagram } from '@finos/legend-extension-dsl-diagram';
 import type { GraphManagerState, PackageableRuntime } from '@finos/legend-graph';
-import type { ResolvedDataSpace, ResolvedDataSpaceExecutionContext } from '../models/protocols/pure/DSLDataSpace_PureProtocolProcessorPlugin.js';
+import type { DataSpace, DataSpaceExecutionContext } from '../models/metamodels/pure/model/packageableElements/dataSpace/DSLDataSpace_DataSpace.js';
 export declare enum DATA_SPACE_VIEWER_ACTIVITY_MODE {
     MODELS_OVERVIEW = "MODELS_OVERVIEW",
     EXECUTION = "EXECUTION",
@@ -27,18 +27,18 @@ export declare enum DATA_SPACE_VIEWER_ACTIVITY_MODE {
 }
 export declare class DataSpaceViewerState {
     graphManagerState: GraphManagerState;
-    dataSpaceGroupId: string;
-    dataSpaceArtifactId: string;
-    dataSpaceVersionId: string;
-    dataSpace: ResolvedDataSpace;
+    groupId: string;
+    artifactId: string;
+    versionId: string;
+    dataSpace: DataSpace;
     _renderer?: DiagramRenderer | undefined;
     currentDiagram?: Diagram | undefined;
     currentActivity: DATA_SPACE_VIEWER_ACTIVITY_MODE;
-    currentExecutionContext: ResolvedDataSpaceExecutionContext;
+    currentExecutionContext: DataSpaceExecutionContext;
     currentRuntime: PackageableRuntime;
     viewProject?: ((groupId: string, artifactId: string, versionId: string, entityPath: string | undefined) => void) | undefined;
     onDiagramClassDoubleClick?: ((classView: ClassView) => void) | undefined;
-    constructor(graphManagerState: GraphManagerState, dataSpaceGroupId: string, dataSpaceArtifactId: string, dataSpaceVersionId: string, dataSpace: ResolvedDataSpace, options?: {
+    constructor(graphManagerState: GraphManagerState, groupId: string, artifactId: string, versionId: string, dataSpace: DataSpace, options?: {
         viewProject?: (groupId: string, artifactId: string, versionId: string, entityPath: string | undefined) => void;
         onDiagramClassDoubleClick?: (classView: ClassView) => void;
     });
@@ -51,7 +51,7 @@ export declare class DataSpaceViewerState {
     setRenderer(val: DiagramRenderer): void;
     setCurrentDiagram(val: Diagram): void;
     setCurrentActivity(val: DATA_SPACE_VIEWER_ACTIVITY_MODE): void;
-    setCurrentExecutionContext(val: ResolvedDataSpaceExecutionContext): void;
+    setCurrentExecutionContext(val: DataSpaceExecutionContext): void;
     setCurrentRuntime(val: PackageableRuntime): void;
     setupRenderer(): void;
 }

package/lib/stores/DataSpaceViewerState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataSpaceViewerState.d.ts","sourceRoot":"","sources":["../../src/stores/DataSpaceViewerState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,OAAO,EAER,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EACV,iBAAiB,EAEjB,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EACV,iBAAiB,EACjB,iCAAiC,EAClC,MAAM,sEAAsE,CAAC;AAE9E,oBAAY,+BAA+B;IACzC,eAAe,oBAAoB;IACnC,SAAS,cAAc;IACvB,WAAW,gBAAgB;IAC3B,SAAS,cAAc;IACvB,aAAa,kBAAkB;IAC/B,IAAI,SAAS;IACb,OAAO,YAAY;CACpB;AAED,qBAAa,oBAAoB;IAC/B,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,iBAAiB,CAAC;IAC7B,SAAS,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;IACxC,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,eAAe,kCAAmD;IAClE,uBAAuB,EAAE,iCAAiC,CAAC;IAC3D,cAAc,EAAE,kBAAkB,CAAC;IACnC,WAAW,CAAC,EACR,CAAC,CACC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,KAC3B,IAAI,CAAC,GACV,SAAS,CAAC;IACd,yBAAyB,CAAC,EAAE,CAAC,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;gBAGvE,iBAAiB,EAAE,iBAAiB,EACpC,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,MAAM,EAC3B,kBAAkB,EAAE,MAAM,EAC1B,SAAS,EAAE,iBAAiB,EAC5B,OAAO,CAAC,EAAE;QACR,WAAW,CAAC,EAAE,CACZ,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,KAC3B,IAAI,CAAC;QACV,yBAAyB,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,CAAC;KAC5D;IAoCH,IAAI,QAAQ,IAAI,eAAe,CAK9B;IAED,IAAI,4BAA4B,IAAI,OAAO,CAE1C;IAED,IAAI,gBAAgB,IAAI,OAAO,EAAE,CAEhC;IAED,IAAI,QAAQ,IAAI,OAAO,EAAE,CAQxB;IAED,IAAI,QAAQ,IAAI,kBAAkB,EAAE,CAQnC;IAMD,IAAI,kBAAkB,IAAI,MAAM,CAiB/B;IAED,WAAW,CAAC,GAAG,EAAE,eAAe,GAAG,IAAI;IAIvC,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAIrC,kBAAkB,CAAC,GAAG,EAAE,+BAA+B,GAAG,IAAI;IAI9D,0BAA0B,CAAC,GAAG,EAAE,iCAAiC,GAAG,IAAI;IAKxE,iBAAiB,CAAC,GAAG,EAAE,kBAAkB,GAAG,IAAI;IAIhD,aAAa,IAAI,IAAI;CAKtB"}
+{"version":3,"file":"DataSpaceViewerState.d.ts","sourceRoot":"","sources":["../../src/stores/DataSpaceViewerState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,OAAO,EAER,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EACV,iBAAiB,EAEjB,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EACV,SAAS,EACT,yBAAyB,EAC1B,MAAM,yFAAyF,CAAC;AAEjG,oBAAY,+BAA+B;IACzC,eAAe,oBAAoB;IACnC,SAAS,cAAc;IACvB,WAAW,gBAAgB;IAC3B,SAAS,cAAc;IACvB,aAAa,kBAAkB;IAC/B,IAAI,SAAS;IACb,OAAO,YAAY;CACpB;AAED,qBAAa,oBAAoB;IAC/B,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;IACxC,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,eAAe,kCAAmD;IAClE,uBAAuB,EAAE,yBAAyB,CAAC;IACnD,cAAc,EAAE,kBAAkB,CAAC;IACnC,WAAW,CAAC,EACR,CAAC,CACC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,KAC3B,IAAI,CAAC,GACV,SAAS,CAAC;IACd,yBAAyB,CAAC,EAAE,CAAC,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;gBAGvE,iBAAiB,EAAE,iBAAiB,EACpC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE;QACR,WAAW,CAAC,EAAE,CACZ,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,KAC3B,IAAI,CAAC;QACV,yBAAyB,CAAC,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,CAAC;KAC5D;IAoCH,IAAI,QAAQ,IAAI,eAAe,CAK9B;IAED,IAAI,4BAA4B,IAAI,OAAO,CAE1C;IAED,IAAI,gBAAgB,IAAI,OAAO,EAAE,CAEhC;IAED,IAAI,QAAQ,IAAI,OAAO,EAAE,CAQxB;IAED,IAAI,QAAQ,IAAI,kBAAkB,EAAE,CAQnC;IAMD,IAAI,kBAAkB,IAAI,MAAM,CAiB/B;IAED,WAAW,CAAC,GAAG,EAAE,eAAe,GAAG,IAAI;IAIvC,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAIrC,kBAAkB,CAAC,GAAG,EAAE,+BAA+B,GAAG,IAAI;IAI9D,0BAA0B,CAAC,GAAG,EAAE,yBAAyB,GAAG,IAAI;IAKhE,iBAAiB,CAAC,GAAG,EAAE,kBAAkB,GAAG,IAAI;IAIhD,aAAa,IAAI,IAAI;CAKtB"}

package/lib/stores/DataSpaceViewerState.js

@@ -28,9 +28,9 @@ export var DATA_SPACE_VIEWER_ACTIVITY_MODE;
 })(DATA_SPACE_VIEWER_ACTIVITY_MODE = DATA_SPACE_VIEWER_ACTIVITY_MODE || (DATA_SPACE_VIEWER_ACTIVITY_MODE = {}));
 export class DataSpaceViewerState {
     graphManagerState;
-    dataSpaceGroupId;
-    dataSpaceArtifactId;
-    dataSpaceVersionId;
+    groupId;
+    artifactId;
+    versionId;
     dataSpace;
     _renderer;
     currentDiagram;
@@ -39,7 +39,7 @@ export class DataSpaceViewerState {
     currentRuntime;
     viewProject;
     onDiagramClassDoubleClick;
-    constructor(graphManagerState, dataSpaceGroupId, dataSpaceArtifactId, dataSpaceVersionId, dataSpace, options) {
+    constructor(graphManagerState, groupId, artifactId, versionId, dataSpace, options) {
         makeObservable(this, {
             _renderer: observable,
             currentDiagram: observable,
@@ -55,13 +55,13 @@ export class DataSpaceViewerState {
         });
         this.graphManagerState = graphManagerState;
         this.dataSpace = dataSpace;
-        this.dataSpaceGroupId = dataSpaceGroupId;
-        this.dataSpaceArtifactId = dataSpaceArtifactId;
-        this.dataSpaceVersionId = dataSpaceVersionId;
+        this.groupId = groupId;
+        this.artifactId = artifactId;
+        this.versionId = versionId;
         this.currentExecutionContext = this.dataSpace.defaultExecutionContext;
         this.currentRuntime =
             this.dataSpace.defaultExecutionContext.defaultRuntime.value;
-        this.currentDiagram = this.dataSpace.featuredDiagrams.length
+        this.currentDiagram = this.dataSpace.featuredDiagrams?.length
             ? this.dataSpace
                 .featuredDiagrams[0].value
             : this.diagrams.length
@@ -77,7 +77,7 @@ export class DataSpaceViewerState {
         return Boolean(this._renderer);
     }
     get featuredDiagrams() {
-        return this.dataSpace.featuredDiagrams.map((ref) => ref.value);
+        return this.dataSpace.featuredDiagrams?.map((ref) => ref.value) ?? [];
     }
     get diagrams() {
         return this.graphManagerState.graph

package/lib/stores/DataSpaceViewerState.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataSpaceViewerState.js","sourceRoot":"","sources":["../../src/stores/DataSpaceViewerState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DataSpaceViewerState.js","sourceRoot":"","sources":["../../src/stores/DataSpaceViewerState.ts"],"names":[],"mappings":"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"}

package/lib/stores/query/DataSpaceQuerySetupState.d.ts

@@ -14,35 +14,29 @@
  * limitations under the License.
  */
 import { type Class, QueryTaggedValue } from '@finos/legend-graph';
-import type { Entity } from '@finos/legend-model-storage';
 import { type QuerySetupStore, QuerySetupState } from '@finos/legend-query';
 import { type GeneratorFn, ActionState } from '@finos/legend-shared';
 import { DataSpaceViewerState } from '../DataSpaceViewerState.js';
-export declare type LightDataSpace = Entity & {
+export interface DataSpaceContext {
     groupId: string;
     artifactId: string;
     versionId: string;
     path: string;
-    content: {
-        groupId: string;
-        artifactId: string;
-        versionId: string;
-    };
-};
+}
 export declare const createQueryDataSpaceTaggedValue: (dataSpacePath: string, groupId: string, artifactId: string, versionId: string) => QueryTaggedValue;
 export declare class DataSpaceQuerySetupState extends QuerySetupState {
-    dataSpaces: LightDataSpace[];
+    dataSpaces: DataSpaceContext[];
     loadDataSpacesState: ActionState;
     setUpDataSpaceState: ActionState;
-    currentDataSpace?: LightDataSpace | undefined;
+    currentDataSpace?: DataSpaceContext | undefined;
     dataSpaceViewerState?: DataSpaceViewerState | undefined;
     toGetSnapShot: boolean;
     constructor(setupStore: QuerySetupStore);
-    setCurrentDataSpace(val: LightDataSpace | undefined): void;
+    setCurrentDataSpace(val: DataSpaceContext | undefined): void;
     setDataSpaceViewerState(val: DataSpaceViewerState | undefined): void;
     setToGetSnapShot(val: boolean): void;
     loadDataSpaces(searchText: string): GeneratorFn<void>;
-    setUpDataSpace(dataSpace: LightDataSpace): GeneratorFn<void>;
+    setUpDataSpace(dataSpace: DataSpaceContext): GeneratorFn<void>;
     proceedToCreateQuery(_class?: Class): GeneratorFn<void>;
 }
 //# sourceMappingURL=DataSpaceQuerySetupState.d.ts.map

package/lib/stores/query/DataSpaceQuerySetupState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataSpaceQuerySetupState.d.ts","sourceRoot":"","sources":["../../../src/stores/query/DataSpaceQuerySetupState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,KAAK,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EACL,KAAK,eAAe,EAEpB,eAAe,EAEhB,MAAM,qBAAqB,CAAC;AAQ7B,OAAO,EACL,KAAK,WAAW,EAEhB,WAAW,EAGZ,MAAM,sBAAsB,CAAC;AAM9B,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE,oBAAY,cAAc,GAAG,MAAM,GAAG;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE;QACP,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH,CAAC;AAMF,eAAO,MAAM,+BAA+B,kBAC3B,MAAM,WACZ,MAAM,cACH,MAAM,aACP,MAAM,KAChB,gBAUF,CAAC;AAEF,qBAAa,wBAAyB,SAAQ,eAAe;IAC3D,UAAU,EAAE,cAAc,EAAE,CAAM;IAClC,mBAAmB,cAAwB;IAC3C,mBAAmB,cAAwB;IAC3C,gBAAgB,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IAC9C,oBAAoB,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IACxD,aAAa,UAAS;gBAEV,UAAU,EAAE,eAAe;IAiBvC,mBAAmB,CAAC,GAAG,EAAE,cAAc,GAAG,SAAS,GAAG,IAAI;IAI1D,uBAAuB,CAAC,GAAG,EAAE,oBAAoB,GAAG,SAAS,GAAG,IAAI;IAIpE,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAInC,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC;IAuDrD,cAAc,CAAC,SAAS,EAAE,cAAc,GAAG,WAAW,CAAC,IAAI,CAAC;IAwD5D,oBAAoB,CAAC,MAAM,CAAC,EAAE,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC;CAuCzD"}
+{"version":3,"file":"DataSpaceQuerySetupState.d.ts","sourceRoot":"","sources":["../../../src/stores/query/DataSpaceQuerySetupState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,KAAK,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EACL,KAAK,eAAe,EAEpB,eAAe,EAEhB,MAAM,qBAAqB,CAAC;AAQ7B,OAAO,EACL,KAAK,WAAW,EAEhB,WAAW,EAEZ,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CACd;AAMD,eAAO,MAAM,+BAA+B,kBAC3B,MAAM,WACZ,MAAM,cACH,MAAM,aACP,MAAM,KAChB,gBAUF,CAAC;AAEF,qBAAa,wBAAyB,SAAQ,eAAe;IAC3D,UAAU,EAAE,gBAAgB,EAAE,CAAM;IACpC,mBAAmB,cAAwB;IAC3C,mBAAmB,cAAwB;IAC3C,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAChD,oBAAoB,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IACxD,aAAa,UAAS;gBAEV,UAAU,EAAE,eAAe;IAiBvC,mBAAmB,CAAC,GAAG,EAAE,gBAAgB,GAAG,SAAS,GAAG,IAAI;IAI5D,uBAAuB,CAAC,GAAG,EAAE,oBAAoB,GAAG,SAAS,GAAG,IAAI;IAIpE,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAInC,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC;IAoCrD,cAAc,CAAC,SAAS,EAAE,gBAAgB,GAAG,WAAW,CAAC,IAAI,CAAC;IAqD9D,oBAAoB,CAAC,MAAM,CAAC,EAAE,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC;CAuCzD"}

package/lib/stores/query/DataSpaceQuerySetupState.js

@@ -16,9 +16,10 @@
 import { QueryTaggedValue } from '@finos/legend-graph';
 import { CreateQueryInfoState, QuerySetupState, generateCreateQueryRoute, } from '@finos/legend-query';
 import { generateGAVCoordinates, DepotScope, ProjectData, SNAPSHOT_VERSION_ALIAS, } from '@finos/legend-server-depot';
-import { ActionState, assertErrorThrown, guaranteeNonNullable, } from '@finos/legend-shared';
+import { ActionState, assertErrorThrown, } from '@finos/legend-shared';
 import { action, flow, flowResult, makeObservable, observable } from 'mobx';
-import { DATA_SPACE_ELEMENT_CLASSIFIER_PATH, getResolvedDataSpace, } from '../../models/protocols/pure/DSLDataSpace_PureProtocolProcessorPlugin.js';
+import { getDataSpace } from '../../graphManager/DSLDataSpace_GraphManagerHelper.js';
+import { DATA_SPACE_ELEMENT_CLASSIFIER_PATH } from '../../models/protocols/pure/DSLDataSpace_PureProtocolProcessorPlugin.js';
 import { DataSpaceViewerState } from '../DataSpaceViewerState.js';
 const QUERY_PROFILE_PATH = 'meta::pure::profiles::query';
 const QUERY_PROFILE_TAG_DATA_SPACE = 'dataSpace';
@@ -78,19 +79,12 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
                     : DepotScope.RELEASES,
                 limit: 10,
             })).map((storedEntity) => ({
-                ...storedEntity.entity,
                 groupId: storedEntity.groupId,
                 artifactId: storedEntity.artifactId,
                 versionId: this.toGetSnapShot
                     ? SNAPSHOT_VERSION_ALIAS
                     : storedEntity.versionId,
                 path: storedEntity.entity.path,
-                content: {
-                    ...storedEntity.entity.content,
-                    groupId: guaranteeNonNullable(storedEntity.entity.content.groupId, `Data space 'groupId' field is missing`),
-                    artifactId: guaranteeNonNullable(storedEntity.entity.content.artifactId, `Data space 'artifactId' field is missing`),
-                    versionId: guaranteeNonNullable(storedEntity.entity.content.versionId, `Data space 'versionId' field is missing`),
-                },
             }));
             this.loadDataSpacesState.pass();
         }
@@ -109,10 +103,9 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
         }
         this.setUpDataSpaceState.inProgress();
         try {
-            const projectData = ProjectData.serialization.fromJson((yield flowResult(this.queryStore.depotServerClient.getProject(dataSpace.content.groupId, dataSpace.content.artifactId))));
-            yield flowResult(this.queryStore.buildGraph(projectData, dataSpace.content.versionId));
-            const resolvedDataSpace = getResolvedDataSpace(dataSpace.content, this.queryStore.graphManagerState.graph);
-            this.dataSpaceViewerState = new DataSpaceViewerState(this.queryStore.graphManagerState, dataSpace.groupId, dataSpace.artifactId, dataSpace.versionId, resolvedDataSpace, {
+            const projectData = ProjectData.serialization.fromJson((yield flowResult(this.queryStore.depotServerClient.getProject(dataSpace.groupId, dataSpace.artifactId))));
+            yield flowResult(this.queryStore.buildGraph(projectData, dataSpace.versionId));
+            this.dataSpaceViewerState = new DataSpaceViewerState(this.queryStore.graphManagerState, dataSpace.groupId, dataSpace.artifactId, dataSpace.versionId, getDataSpace(dataSpace.path, this.queryStore.graphManagerState.graph), {
                 viewProject: (groupId, artifactId, versionId, entityPath) => this.queryStore.viewStudioProject(groupId, artifactId, versionId, entityPath),
                 onDiagramClassDoubleClick: (classView) => {
                     this.proceedToCreateQuery(classView.class.value);
@@ -128,13 +121,13 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
     }
     *proceedToCreateQuery(_class) {
         if (this.dataSpaceViewerState) {
-            const projectData = ProjectData.serialization.fromJson((yield flowResult(this.queryStore.depotServerClient.getProject(this.dataSpaceViewerState.dataSpace.groupId, this.dataSpaceViewerState.dataSpace.artifactId))));
-            const queryInfoState = new CreateQueryInfoState(this.queryStore, projectData, this.dataSpaceViewerState.dataSpace.versionId, this.dataSpaceViewerState.currentExecutionContext.mapping.value, this.dataSpaceViewerState.currentRuntime);
+            const projectData = ProjectData.serialization.fromJson((yield flowResult(this.queryStore.depotServerClient.getProject(this.dataSpaceViewerState.groupId, this.dataSpaceViewerState.artifactId))));
+            const queryInfoState = new CreateQueryInfoState(this.queryStore, projectData, this.dataSpaceViewerState.versionId, this.dataSpaceViewerState.currentExecutionContext.mapping.value, this.dataSpaceViewerState.currentRuntime);
             queryInfoState.taggedValues = [
-                createQueryDataSpaceTaggedValue(this.dataSpaceViewerState.dataSpace.path, this.dataSpaceViewerState.dataSpaceGroupId, this.dataSpaceViewerState.dataSpaceArtifactId, this.dataSpaceViewerState.dataSpaceVersionId),
+                createQueryDataSpaceTaggedValue(this.dataSpaceViewerState.dataSpace.path, this.dataSpaceViewerState.groupId, this.dataSpaceViewerState.artifactId, this.dataSpaceViewerState.versionId),
             ];
             this.queryStore.setQueryInfoState(queryInfoState);
-            this.queryStore.applicationStore.navigator.goTo(generateCreateQueryRoute(this.dataSpaceViewerState.dataSpace.groupId, this.dataSpaceViewerState.dataSpace.artifactId, this.dataSpaceViewerState.dataSpace.versionId, this.dataSpaceViewerState.currentExecutionContext.mapping.value.path, this.dataSpaceViewerState.currentRuntime.path, _class?.path));
+            this.queryStore.applicationStore.navigator.goTo(generateCreateQueryRoute(this.dataSpaceViewerState.groupId, this.dataSpaceViewerState.artifactId, this.dataSpaceViewerState.versionId, this.dataSpaceViewerState.currentExecutionContext.mapping.value.path, this.dataSpaceViewerState.currentRuntime.path, _class?.path));
             this.setupStore.setSetupState(undefined);
         }
     }