@finos/legend-extension-dsl-data-space 9.2.9 → 10.0.1

package/src/components/DataSpaceDiagramViewer.tsx

@@ -25,10 +25,8 @@ import {
 import type { DataSpaceViewerState } from '../stores/DataSpaceViewerState.js';
 import { observer } from 'mobx-react-lite';
 import { forwardRef, useEffect, useRef } from 'react';
-import {
-  DiagramRenderer,
-  type Diagram,
-} from '@finos/legend-extension-dsl-diagram';
+import { type Diagram } from '@finos/legend-extension-dsl-diagram/graph';
+import { DiagramRenderer } from '@finos/legend-extension-dsl-diagram/application';
 import {
   getNullableFirstElement,
   getNullableLastElement,

package/src/components/DataSpaceExecutionContextViewer.tsx

@@ -23,7 +23,7 @@ import {
 } from '@finos/legend-art';
 import { type PackageableRuntime } from '@finos/legend-graph';
 import { type DataSpaceViewerState } from '../stores/DataSpaceViewerState.js';
-import type { DataSpaceExecutionContextAnalysisResult } from '../graphManager/action/analytics/DataSpaceAnalysis.js';
+import type { DataSpaceExecutionContextAnalysisResult } from '../graph-manager/action/analytics/DataSpaceAnalysis.js';
 import { useApplicationStore } from '@finos/legend-application';
 
 type ExecutionContextOption = {

package/src/components/DataSpaceModelsDocumentation.tsx

@@ -51,7 +51,7 @@ import {
   DataSpaceModelDocumentationEntry,
   DataSpacePropertyDocumentationEntry,
   type NormalizedDataSpaceDocumentationEntry,
-} from '../graphManager/action/analytics/DataSpaceAnalysis.js';
+} from '../graph-manager/action/analytics/DataSpaceAnalysis.js';
 import { debounce, isNonNullable, prettyCONSTName } from '@finos/legend-shared';
 import { useApplicationStore } from '@finos/legend-application';
 import {
@@ -78,7 +78,7 @@ import {
   DataGrid,
   type DataGridCellRendererParams,
 } from '@finos/legend-lego/data-grid';
-import { FuzzySearchAdvancedConfigMenu } from '@finos/legend-application/components';
+import { FuzzySearchAdvancedConfigMenu } from '@finos/legend-lego/application';
 
 const getMilestoningLabel = (val: string | undefined): string | undefined => {
   switch (val) {

package/src/components/DataSpaceQuickStart.tsx

@@ -25,15 +25,12 @@ import {
   clsx,
 } from '@finos/legend-art';
 import { type DataSpaceViewerState } from '../stores/DataSpaceViewerState.js';
-import {
-  CODE_EDITOR_LANGUAGE,
-  useApplicationStore,
-} from '@finos/legend-application';
+import { useApplicationStore } from '@finos/legend-application';
 import {
   DataSpaceExecutableTDSResult,
   type DataSpaceExecutableAnalysisResult,
   type DataSpaceExecutableTDSResultColumn,
-} from '../graphManager/action/analytics/DataSpaceAnalysis.js';
+} from '../graph-manager/action/analytics/DataSpaceAnalysis.js';
 import { DataSpaceMarkdownTextViewer } from './DataSpaceMarkdownTextViewer.js';
 import type { DSL_DataSpace_LegendApplicationPlugin_Extension } from '../stores/DSL_DataSpace_LegendApplicationPlugin_Extension.js';
 import { useState } from 'react';
@@ -42,7 +39,10 @@ import {
   DataGrid,
   type DataGridCellRendererParams,
 } from '@finos/legend-lego/data-grid';
-import { CodeEditor } from '@finos/legend-lego/code-editor';
+import {
+  CODE_EDITOR_LANGUAGE,
+  CodeEditor,
+} from '@finos/legend-lego/code-editor';
 
 enum TDS_EXECUTABLE_ACTION_TAB {
   COLUMN_SPECS = 'COLUMN_SPECS',

package/src/components/index.ts

@@ -0,0 +1,20 @@
+/**
+ * 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.
+ */
+
+export { DSL_DataSpace_LegendApplicationPlugin } from './DSL_DataSpace_LegendApplicationPlugin.js';
+export { DataSpaceViewer } from './DataSpaceViewer.js';
+export * from '../stores/DSL_DataSpace_LegendApplicationPlugin_Extension.js';
+export { DataSpaceViewerState } from '../stores/DataSpaceViewerState.js';

package/src/components/query/DSL_DataSpace_LegendQueryApplicationPlugin.tsx

@@ -35,17 +35,17 @@ import {
 import {
   DATA_SPACE_QUERY_ROUTE_PATTERN,
   generateDataSpaceQuerySetupRoute,
-} from '../../application/query/DSL_DataSpace_LegendQueryNavigation.js';
+} from '../../__lib__/query/DSL_DataSpace_LegendQueryNavigation.js';
 import { DataSpaceQueryCreator } from './DataSpaceQueryCreator.js';
 import { createQueryDataSpaceTaggedValue } from '../../stores/query/DataSpaceQueryCreatorStore.js';
 import { Query, isValidFullPath } from '@finos/legend-graph';
 import {
   QUERY_PROFILE_PATH,
   QUERY_PROFILE_TAG_DATA_SPACE,
-} from '../../DSL_DataSpace_Const.js';
+} from '../../graph/DSL_DataSpace_MetaModelConst.js';
 import { DataSpaceQueryBuilderState } from '../../stores/query/DataSpaceQueryBuilderState.js';
 import type { DataSpaceInfo } from '../../stores/query/DataSpaceInfo.js';
-import { getOwnDataSpace } from '../../graphManager/DSL_DataSpace_GraphManagerHelper.js';
+import { getOwnDataSpace } from '../../graph-manager/DSL_DataSpace_GraphManagerHelper.js';
 import { assertErrorThrown, LogEvent, uuid } from '@finos/legend-shared';
 import type { QueryBuilderState } from '@finos/legend-query-builder';
 import { DataSpaceQuerySetup } from './DataSpaceQuerySetup.js';
@@ -60,13 +60,13 @@ export class DSL_DataSpace_LegendQueryApplicationPlugin extends LegendQueryAppli
       // data space query editor setup
       {
         key: 'data-space-query-setup-application-page',
-        urlPatterns: [DATA_SPACE_QUERY_ROUTE_PATTERN.SETUP],
+        addressPatterns: [DATA_SPACE_QUERY_ROUTE_PATTERN.SETUP],
         renderer: DataSpaceQuerySetup,
       },
       // data space query editor
       {
         key: 'data-space-query-editor-application-page',
-        urlPatterns: [DATA_SPACE_QUERY_ROUTE_PATTERN.CREATE],
+        addressPatterns: [DATA_SPACE_QUERY_ROUTE_PATTERN.CREATE],
         renderer: DataSpaceQueryCreator,
       },
     ];

package/src/components/query/DataSpaceQueryBuilder.tsx

@@ -346,7 +346,6 @@ const DataSpaceQueryBuilderSetupPanelContent = observer(
                     darkMode:
                       !applicationStore.layoutService
                         .TEMPORARY__isLightColorThemeEnabled,
-                    pureModel: queryBuilderState.graphManagerState.graph,
                   })}
                 />
               </div>

package/src/components/query/DataSpaceQueryCreator.tsx

@@ -15,19 +15,20 @@
  */
 
 import { observer, useLocalObservable } from 'mobx-react-lite';
-import { useApplicationStore, useParams } from '@finos/legend-application';
-import { useDepotServerClient } from '@finos/legend-server-depot';
+import { useApplicationStore } from '@finos/legend-application';
+import { useParams } from '@finos/legend-application/browser';
 import {
   QueryEditor,
   QueryEditorStoreContext,
   useLegendQueryApplicationStore,
+  useLegendQueryBaseStore,
 } from '@finos/legend-application-query';
 import { DataSpaceQueryCreatorStore } from '../../stores/query/DataSpaceQueryCreatorStore.js';
 import {
   type DataSpaceQueryCreatorPathParams,
   DATA_SPACE_QUERY_CREATOR_ROUTE_PATTERN_TOKEN,
   DATA_SPACE_QUERY_CREATOR_QUERY_PARAM_TOKEN,
-} from '../../application/query/DSL_DataSpace_LegendQueryNavigation.js';
+} from '../../__lib__/query/DSL_DataSpace_LegendQueryNavigation.js';
 import { parseGAVCoordinates } from '@finos/legend-storage';
 
 const DataSpaceQueryCreatorStoreProvider: React.FC<{
@@ -47,12 +48,12 @@ const DataSpaceQueryCreatorStoreProvider: React.FC<{
 }) => {
   const { groupId, artifactId, versionId } = parseGAVCoordinates(gav);
   const applicationStore = useLegendQueryApplicationStore();
-  const depotServerClient = useDepotServerClient();
+  const baseStore = useLegendQueryBaseStore();
   const store = useLocalObservable(
     () =>
       new DataSpaceQueryCreatorStore(
         applicationStore,
-        depotServerClient,
+        baseStore.depotServerClient,
         groupId,
         artifactId,
         versionId,

package/src/components/query/DataSpaceQuerySetup.tsx

@@ -17,11 +17,11 @@
 import { observer, useLocalObservable } from 'mobx-react-lite';
 import { debounce } from '@finos/legend-shared';
 import { useApplicationStore } from '@finos/legend-application';
-import { useDepotServerClient } from '@finos/legend-server-depot';
 import {
   QueryEditor,
   QueryEditorStoreContext,
   useLegendQueryApplicationStore,
+  useLegendQueryBaseStore,
 } from '@finos/legend-application-query';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { flowResult } from 'mobx';
@@ -47,9 +47,13 @@ const DataSpaceQuerySetupStoreProvider: React.FC<{
   children: React.ReactNode;
 }> = ({ children }) => {
   const applicationStore = useLegendQueryApplicationStore();
-  const depotServerClient = useDepotServerClient();
+  const baseStore = useLegendQueryBaseStore();
   const store = useLocalObservable(
-    () => new DataSpaceQuerySetupStore(applicationStore, depotServerClient),
+    () =>
+      new DataSpaceQuerySetupStore(
+        applicationStore,
+        baseStore.depotServerClient,
+      ),
   );
   return (
     <QueryEditorStoreContext.Provider value={store}>

package/src/components/query/index.ts

@@ -0,0 +1,17 @@
+/**
+ * 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.
+ */
+
+export { DSL_DataSpace_LegendQueryApplicationPlugin } from './DSL_DataSpace_LegendQueryApplicationPlugin.js';

package/src/components/studio/DSL_DataSpace_LegendStudioApplicationPlugin.tsx

@@ -34,6 +34,7 @@ import {
   type ExplorerContextMenuItemRendererConfiguration,
   type EditorExtensionStateCreator,
   type EditorExtensionComponentRendererConfiguration,
+  type PureGrammarElementLabeler,
 } from '@finos/legend-application-studio';
 import {
   PackageableElementExplicitReference,
@@ -45,27 +46,24 @@ import {
   DataSpace,
   DataSpaceExecutionContext,
 } from '../../graph/metamodel/pure/model/packageableElements/dataSpace/DSL_DataSpace_DataSpace.js';
-import { DSL_DATA_SPACE_LEGEND_STUDIO_DOCUMENTATION_KEY } from '../../application/studio/DSL_DataSpace_LegendStudioDocumentation.js';
-import {
-  PURE_GRAMMAR_DATA_SPACE_ELEMENT_TYPE_LABEL,
-  PURE_GRAMMAR_DATA_SPACE_PARSER_NAME,
-} from '../../graphManager/DSL_DataSpace_PureGraphManagerPlugin.js';
-import { SIMPLE_DATA_SPACE_SNIPPET } from '../../application/studio/DSL_DataSpace_LegendStudioCodeSnippet.js';
-import type {
-  DocumentationEntry,
-  PureGrammarTextSuggestion,
-} from '@finos/legend-application';
+import { DSL_DATA_SPACE_LEGEND_STUDIO_DOCUMENTATION_KEY } from '../../__lib__/studio/DSL_DataSpace_LegendStudioDocumentation.js';
+import { SIMPLE_DATA_SPACE_SNIPPET } from '../../__lib__/studio/DSL_DataSpace_LegendStudioCodeSnippet.js';
+import type { DocumentationEntry } from '@finos/legend-application';
 import { DataSpaceIcon } from '../DSL_DataSpace_Icon.js';
 import { DataSpacePreviewState } from '../../stores/studio/DataSpacePreviewState.js';
 import {
   DataSpacePreviewDialog,
   DataSpacePreviewAction,
 } from './DataSpacePreviewAction.js';
+import type { PureGrammarTextSuggestion } from '@finos/legend-lego/code-editor';
 
 const DATA_SPACE_ELEMENT_TYPE = 'DATA SPACE';
 const DATA_SPACE_ELEMENT_PROJECT_EXPLORER_DND_TYPE =
   'PROJECT_EXPLORER_DATA_SPACE';
 
+const PURE_GRAMMAR_DATA_SPACE_PARSER_NAME = 'DataSpace';
+const PURE_GRAMMAR_DATA_SPACE_ELEMENT_TYPE_LABEL = 'DataSpace';
+
 export class DSL_DataSpace_LegendStudioApplicationPlugin
   extends LegendStudioApplicationPlugin
   implements DSL_LegendStudioApplicationPlugin_Extension
@@ -108,6 +106,25 @@ export class DSL_DataSpace_LegendStudioApplicationPlugin
     ];
   }
 
+  getExtraPureGrammarParserNames(): string[] {
+    return [PURE_GRAMMAR_DATA_SPACE_PARSER_NAME];
+  }
+
+  getExtraPureGrammarKeywords(): string[] {
+    return [PURE_GRAMMAR_DATA_SPACE_ELEMENT_TYPE_LABEL];
+  }
+
+  getExtraPureGrammarElementLabelers(): PureGrammarElementLabeler[] {
+    return [
+      (element: PackageableElement): string | undefined => {
+        if (element instanceof DataSpace) {
+          return PURE_GRAMMAR_DATA_SPACE_ELEMENT_TYPE_LABEL;
+        }
+        return undefined;
+      },
+    ];
+  }
+
   getExtraSupportedElementTypes(): string[] {
     return [DATA_SPACE_ELEMENT_TYPE];
   }

package/src/components/studio/index.ts

@@ -0,0 +1,17 @@
+/**
+ * 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.
+ */
+
+export { DSL_DataSpace_LegendStudioApplicationPlugin } from './DSL_DataSpace_LegendStudioApplicationPlugin.js';

package/src/graph/metamodel/pure/model/packageableElements/dataSpace/DSL_DataSpace_DataSpace.ts

@@ -27,7 +27,7 @@ import {
   type Package,
 } from '@finos/legend-graph';
 import { DATA_SPACE_HASH_STRUCTURE } from '../../../../../DSL_DataSpace_HashUtils.js';
-import type { Diagram } from '@finos/legend-extension-dsl-diagram';
+import type { Diagram } from '@finos/legend-extension-dsl-diagram/graph';
 
 export class DataSpaceExecutionContext implements Hashable {
   name!: string;

package/src/{DSL_DataSpace_Extension.ts → graph-manager/DSL_DataSpace_GraphManagerPreset.ts}

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-import packageJson from '../package.json';
+import packageJson from '../../package.json';
 import { AbstractPreset } from '@finos/legend-shared';
-import { DSL_DataSpace_PureGraphManagerPlugin } from './graphManager/DSL_DataSpace_PureGraphManagerPlugin.js';
-import { DSL_DataSpace_PureProtocolProcessorPlugin } from './graphManager/protocol/pure/DSL_DataSpace_PureProtocolProcessorPlugin.js';
-import { DSL_DataSpace_PureGraphPlugin } from './graph/DSL_DataSpace_PureGraphPlugin.js';
+import { DSL_DataSpace_PureGraphManagerPlugin } from './DSL_DataSpace_PureGraphManagerPlugin.js';
+import { DSL_DataSpace_PureProtocolProcessorPlugin } from './protocol/pure/DSL_DataSpace_PureProtocolProcessorPlugin.js';
+import { DSL_DataSpace_PureGraphPlugin } from '../graph/DSL_DataSpace_PureGraphPlugin.js';
 
 export class DSL_DataSpace_GraphManagerPreset extends AbstractPreset {
   constructor() {

package/src/{graphManager → graph-manager}/DSL_DataSpace_PureGraphManagerPlugin.ts

@@ -21,14 +21,11 @@ import {
   type ObserverContext,
   type ElementObserver,
   type PackageableElement,
-  type PureGrammarElementLabeler,
   type PureGraphManagerExtensionBuilder,
 } from '@finos/legend-graph';
 import { observe_DataSpace } from './action/changeDetection/DSL_DataSpace_ObserverHelper.js';
 import { DSL_DataSpace_buildGraphManagerExtension } from './protocol/pure/DSL_DataSpace_PureGraphManagerExtensionBuilder.js';
 
-export const PURE_GRAMMAR_DATA_SPACE_PARSER_NAME = 'DataSpace';
-export const PURE_GRAMMAR_DATA_SPACE_ELEMENT_TYPE_LABEL = 'DataSpace';
 export const PURE_ENTERPRISE_PROFILE_PATH = 'meta::pure::profiles::enterprise';
 export const PURE_ENTERPRISE_PROFILE_TAXONOMY_NODE_STEREOTYPE = 'taxonomyNodes';
 export const PURE_DATA_SPACE_INFO_PROFILE_PATH =
@@ -48,25 +45,6 @@ export class DSL_DataSpace_PureGraphManagerPlugin extends PureGraphManagerPlugin
     return [DSL_DataSpace_buildGraphManagerExtension];
   }
 
-  override getExtraPureGrammarParserNames(): string[] {
-    return [PURE_GRAMMAR_DATA_SPACE_PARSER_NAME];
-  }
-
-  override getExtraPureGrammarKeywords(): string[] {
-    return [PURE_GRAMMAR_DATA_SPACE_ELEMENT_TYPE_LABEL];
-  }
-
-  override getExtraPureGrammarElementLabelers(): PureGrammarElementLabeler[] {
-    return [
-      (element: PackageableElement): string | undefined => {
-        if (element instanceof DataSpace) {
-          return PURE_GRAMMAR_DATA_SPACE_ELEMENT_TYPE_LABEL;
-        }
-        return undefined;
-      },
-    ];
-  }
-
   override getExtraElementObservers(): ElementObserver[] {
     return [
       (

package/src/{graphManager → graph-manager}/action/analytics/DataSpaceAnalysis.ts

@@ -22,7 +22,7 @@ import {
 } from '@finos/legend-graph';
 import { prettyCONSTName, uuid } from '@finos/legend-shared';
 import type { DataSpaceSupportInfo } from '../../../graph/metamodel/pure/model/packageableElements/dataSpace/DSL_DataSpace_DataSpace.js';
-import type { Diagram } from '@finos/legend-extension-dsl-diagram';
+import type { Diagram } from '@finos/legend-extension-dsl-diagram/graph';
 
 export class DataSpaceExecutionContextAnalysisResult {
   name!: string;

package/src/graph-manager/index.ts

@@ -0,0 +1,28 @@
+/**
+ * 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.
+ */
+
+export * from './DSL_DataSpace_GraphManagerPreset.js';
+
+export {
+  DATA_SPACE_ELEMENT_CLASSIFIER_PATH,
+  extractDataSpaceTaxonomyNodes,
+} from './protocol/pure/DSL_DataSpace_PureProtocolProcessorPlugin.js';
+
+export * from './DSL_DataSpace_GraphManagerHelper.js';
+export { DSL_DataSpace_getGraphManagerExtension } from './protocol/pure/DSL_DataSpace_PureGraphManagerExtension.js';
+
+export * from './action/analytics/DataSpaceAnalysis.js';
+export * from './action/analytics/DataSpaceAnalysisHelper.js';

package/src/{graphManager → graph-manager}/protocol/pure/DSL_DataSpace_PureProtocolProcessorPlugin.ts

@@ -78,7 +78,7 @@ import {
   type PackageableElementReference,
   Package,
 } from '@finos/legend-graph';
-import { V1_resolveDiagram } from '@finos/legend-extension-dsl-diagram';
+import { V1_resolveDiagram } from '@finos/legend-extension-dsl-diagram/graph';
 
 export const DATA_SPACE_ELEMENT_CLASSIFIER_PATH =
   'meta::pure::metamodel::dataSpace::DataSpace';

package/src/{graphManager → graph-manager}/protocol/pure/v1/V1_DSL_DataSpace_PureGraphManagerExtension.ts

@@ -48,7 +48,7 @@ import {
 import {
   V1_DataSpaceSupportCombinedInfo,
   V1_DataSpaceSupportEmail,
-} from '../../../../graphManager/protocol/pure/v1/model/packageableElements/dataSpace/V1_DSL_DataSpace_DataSpace.js';
+} from '../../../../graph-manager/protocol/pure/v1/model/packageableElements/dataSpace/V1_DSL_DataSpace_DataSpace.js';
 import {
   DataSpaceAnalysisResult,
   DataSpaceDiagramAnalysisResult,
@@ -75,7 +75,7 @@ import {
   V1_DataSpaceExecutableTDSResult,
   V1_DataSpaceServiceExecutableInfo,
 } from './engine/analytics/V1_DataSpaceAnalysis.js';
-import { getDiagram } from '@finos/legend-extension-dsl-diagram';
+import { getDiagram } from '@finos/legend-extension-dsl-diagram/graph';
 
 const ANALYZE_DATA_SPACE_TRACE = 'analyze data space';
 const TEMPORARY__TDS_SAMPLE_VALUES__DELIMETER = '-- e.g.';

package/src/stores/DSL_DataSpace_LegendApplicationPlugin_Extension.ts

@@ -19,7 +19,7 @@ import type { DataSpaceViewerState } from './DataSpaceViewerState.js';
 import type {
   DataSpaceExecutableAnalysisResult,
   DataSpaceExecutableTDSResult,
-} from '../graphManager/action/analytics/DataSpaceAnalysis.js';
+} from '../graph-manager/action/analytics/DataSpaceAnalysis.js';
 
 export type TDSExecutableActionConfiguration = {
   key: string;

package/src/stores/DataSpaceModelsDocumentationState.ts

@@ -16,13 +16,13 @@
 
 import { action, computed, makeObservable, observable } from 'mobx';
 import type { DataSpaceViewerState } from './DataSpaceViewerState.js';
-import { FuzzySearchAdvancedConfigState } from '@finos/legend-application/components';
 import { type TreeData, type TreeNodeData } from '@finos/legend-art';
 import {
   ActionState,
   filterByType,
   guaranteeNonNullable,
   FuzzySearchEngine,
+  FuzzySearchAdvancedConfigState,
 } from '@finos/legend-shared';
 import {
   DataSpaceAssociationDocumentationEntry,
@@ -30,7 +30,7 @@ import {
   DataSpaceEnumerationDocumentationEntry,
   DataSpaceModelDocumentationEntry,
   type NormalizedDataSpaceDocumentationEntry,
-} from '../graphManager/action/analytics/DataSpaceAnalysis.js';
+} from '../graph-manager/action/analytics/DataSpaceAnalysis.js';
 import { CORE_PURE_PATH, ELEMENT_PATH_DELIMITER } from '@finos/legend-graph';
 
 export enum ModelsDocumentationFilterTreeNodeCheckType {

package/src/stores/DataSpaceViewerDataAccessState.ts

@@ -100,7 +100,8 @@ export class DataSpaceViewerDataAccessState {
 
     try {
       const reports =
-        (yield this.dataSpaceViewerState.graphManagerState.graphManager.checkEntitlements(
+        (yield this.dataSpaceViewerState.graphManagerState.graphManager.checkDatasetEntitlements(
+          this.datasets.map((d) => d.specification),
           this.dataSpaceViewerState.currentExecutionContext.mapping,
           this.dataSpaceViewerState.currentExecutionContext.defaultRuntime,
           undefined,

package/src/stores/DataSpaceViewerState.ts

@@ -18,11 +18,11 @@ import type {
   GenericLegendApplicationStore,
   NavigationZone,
 } from '@finos/legend-application';
+import { type ClassView } from '@finos/legend-extension-dsl-diagram/graph';
 import {
-  type ClassView,
   type DiagramRenderer,
   DIAGRAM_INTERACTION_MODE,
-} from '@finos/legend-extension-dsl-diagram';
+} from '@finos/legend-extension-dsl-diagram/application';
 import type {
   BasicGraphManagerState,
   GraphData,
@@ -37,11 +37,11 @@ import type {
   DataSpaceAnalysisResult,
   DataSpaceDiagramAnalysisResult,
   DataSpaceExecutionContextAnalysisResult,
-} from '../graphManager/action/analytics/DataSpaceAnalysis.js';
+} from '../graph-manager/action/analytics/DataSpaceAnalysis.js';
 import {
   PURE_DATA_SPACE_INFO_PROFILE_PATH,
   PURE_DATA_SPACE_INFO_PROFILE_VERIFIED_STEREOTYPE,
-} from '../graphManager/DSL_DataSpace_PureGraphManagerPlugin.js';
+} from '../graph-manager/DSL_DataSpace_PureGraphManagerPlugin.js';
 import { DataSpaceViewerDataAccessState } from './DataSpaceViewerDataAccessState.js';
 import { DataSpaceViewerModelsDocumentationState } from './DataSpaceModelsDocumentationState.js';
 

package/src/stores/query/DataSpaceAdvancedSearchState.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { ClassView } from '@finos/legend-extension-dsl-diagram';
+import type { ClassView } from '@finos/legend-extension-dsl-diagram/graph';
 import {
   GraphDataWithOrigin,
   type Class,
@@ -35,18 +35,18 @@ import {
   assertErrorThrown,
 } from '@finos/legend-shared';
 import { action, flow, flowResult, makeObservable, observable } from 'mobx';
-import { DSL_DataSpace_getGraphManagerExtension } from '../../graphManager/protocol/pure/DSL_DataSpace_PureGraphManagerExtension.js';
-import { DATA_SPACE_ELEMENT_CLASSIFIER_PATH } from '../../graphManager/protocol/pure/DSL_DataSpace_PureProtocolProcessorPlugin.js';
+import { DSL_DataSpace_getGraphManagerExtension } from '../../graph-manager/protocol/pure/DSL_DataSpace_PureGraphManagerExtension.js';
+import { DATA_SPACE_ELEMENT_CLASSIFIER_PATH } from '../../graph-manager/protocol/pure/DSL_DataSpace_PureProtocolProcessorPlugin.js';
 import { DataSpaceViewerState } from '../DataSpaceViewerState.js';
-import { generateDataSpaceQueryCreatorRoute } from '../../application/query/DSL_DataSpace_LegendQueryNavigation.js';
+import { generateDataSpaceQueryCreatorRoute } from '../../__lib__/query/DSL_DataSpace_LegendQueryNavigation.js';
 import { type DataSpaceInfo, extractDataSpaceInfo } from './DataSpaceInfo.js';
 import {
   DEFAULT_TYPEAHEAD_SEARCH_LIMIT,
   DEFAULT_TYPEAHEAD_SEARCH_MINIMUM_SEARCH_LENGTH,
   type GenericLegendApplicationStore,
 } from '@finos/legend-application';
-import { retrieveAnalyticsResultCache } from '../../graphManager/action/analytics/DataSpaceAnalysisHelper.js';
-import type { DataSpaceAnalysisResult } from '../../graphManager/action/analytics/DataSpaceAnalysis.js';
+import { retrieveAnalyticsResultCache } from '../../graph-manager/action/analytics/DataSpaceAnalysisHelper.js';
+import type { DataSpaceAnalysisResult } from '../../graph-manager/action/analytics/DataSpaceAnalysis.js';
 
 export class DataSpaceAdvancedSearchState {
   readonly applicationStore: GenericLegendApplicationStore;

package/src/stores/query/DataSpaceQueryBuilderState.ts

@@ -45,7 +45,7 @@ import type {
   DataSpace,
   DataSpaceExecutionContext,
 } from '../../graph/metamodel/pure/model/packageableElements/dataSpace/DSL_DataSpace_DataSpace.js';
-import { DATA_SPACE_ELEMENT_CLASSIFIER_PATH } from '../../graphManager/protocol/pure/DSL_DataSpace_PureProtocolProcessorPlugin.js';
+import { DATA_SPACE_ELEMENT_CLASSIFIER_PATH } from '../../graph-manager/protocol/pure/DSL_DataSpace_PureProtocolProcessorPlugin.js';
 import { type DataSpaceInfo, extractDataSpaceInfo } from './DataSpaceInfo.js';
 import { DataSpaceAdvancedSearchState } from './DataSpaceAdvancedSearchState.js';
 

package/src/stores/query/DataSpaceQueryCreatorStore.ts

@@ -40,11 +40,11 @@ import {
   QUERY_PROFILE_PATH,
   QUERY_PROFILE_TAG_CLASS,
   QUERY_PROFILE_TAG_DATA_SPACE,
-} from '../../DSL_DataSpace_Const.js';
-import { getDataSpace } from '../../graphManager/DSL_DataSpace_GraphManagerHelper.js';
+} from '../../graph/DSL_DataSpace_MetaModelConst.js';
+import { getDataSpace } from '../../graph-manager/DSL_DataSpace_GraphManagerHelper.js';
 import { DataSpaceQueryBuilderState } from './DataSpaceQueryBuilderState.js';
 import type { DataSpaceInfo } from './DataSpaceInfo.js';
-import { generateDataSpaceQueryCreatorRoute } from '../../application/query/DSL_DataSpace_LegendQueryNavigation.js';
+import { generateDataSpaceQueryCreatorRoute } from '../../__lib__/query/DSL_DataSpace_LegendQueryNavigation.js';
 import type { DataSpaceExecutionContext } from '../../graph/metamodel/pure/model/packageableElements/dataSpace/DSL_DataSpace_DataSpace.js';
 import type { QueryBuilderState } from '@finos/legend-query-builder';
 import type { ProjectGAVCoordinates } from '@finos/legend-storage';

package/src/stores/query/DataSpaceQuerySetupStore.ts

@@ -41,8 +41,8 @@ import {
   type GeneratorFn,
 } from '@finos/legend-shared';
 import { type DataSpaceInfo, extractDataSpaceInfo } from './DataSpaceInfo.js';
-import { DATA_SPACE_ELEMENT_CLASSIFIER_PATH } from '../../graphManager/protocol/pure/DSL_DataSpace_PureProtocolProcessorPlugin.js';
-import { generateDataSpaceQueryCreatorRoute } from '../../application/query/DSL_DataSpace_LegendQueryNavigation.js';
+import { DATA_SPACE_ELEMENT_CLASSIFIER_PATH } from '../../graph-manager/protocol/pure/DSL_DataSpace_PureProtocolProcessorPlugin.js';
+import { generateDataSpaceQueryCreatorRoute } from '../../__lib__/query/DSL_DataSpace_LegendQueryNavigation.js';
 import { renderDataSpaceQuerySetupSetupPanelContent } from '../../components/query/DataSpaceQuerySetup.js';
 import { DataSpaceAdvancedSearchState } from './DataSpaceAdvancedSearchState.js';
 

package/src/stores/studio/DataSpacePreviewState.ts

@@ -19,7 +19,7 @@ import {
   queryClass,
   type EditorStore,
 } from '@finos/legend-application-studio';
-import type { ClassView } from '@finos/legend-extension-dsl-diagram';
+import type { ClassView } from '@finos/legend-extension-dsl-diagram/graph';
 import {
   type GeneratorFn,
   guaranteeNonNullable,
@@ -28,8 +28,8 @@ import {
 } from '@finos/legend-shared';
 import { action, flow, makeObservable, observable } from 'mobx';
 import type { DataSpace } from '../../graph/metamodel/pure/model/packageableElements/dataSpace/DSL_DataSpace_DataSpace.js';
-import type { DataSpaceAnalysisResult } from '../../graphManager/action/analytics/DataSpaceAnalysis.js';
-import { DSL_DataSpace_getGraphManagerExtension } from '../../graphManager/protocol/pure/DSL_DataSpace_PureGraphManagerExtension.js';
+import type { DataSpaceAnalysisResult } from '../../graph-manager/action/analytics/DataSpaceAnalysis.js';
+import { DSL_DataSpace_getGraphManagerExtension } from '../../graph-manager/protocol/pure/DSL_DataSpace_PureGraphManagerExtension.js';
 import { DataSpaceViewerState } from '../DataSpaceViewerState.js';
 import { LiveGraphData } from '@finos/legend-graph';