@finos/legend-extension-dsl-data-space 6.1.15 → 7.0.0

package/src/graphManager/action/changeDetection/{DSLDataSpace_ObserverHelper.ts → DSL_DataSpace_ObserverHelper.ts}

@@ -21,7 +21,7 @@ import {
   skipObserved,
 } from '@finos/legend-graph';
 import { makeObservable, override } from 'mobx';
-import type { DataSpace } from '../../../graph/metamodel/pure/model/packageableElements/dataSpace/DSLDataSpace_DataSpace.js';
+import type { DataSpace } from '../../../graph/metamodel/pure/model/packageableElements/dataSpace/DSL_DataSpace_DataSpace.js';
 
 export const observe_DataSpace = skipObserved(
   (metamodel: DataSpace): DataSpace => {

package/src/graphManager/protocol/pure/{DSLDataSpace_PureGraphManagerExtension.ts → DSL_DataSpace_PureGraphManagerExtension.ts}

@@ -19,24 +19,25 @@ import {
   AbstractPureGraphManagerExtension,
 } from '@finos/legend-graph';
 import type { Entity } from '@finos/legend-storage';
-import { guaranteeNonNullable } from '@finos/legend-shared';
-import type { DataSpaceAnalysisResult } from '../../action/analytics/DataSpaceAnalysis.js';
+import { guaranteeNonNullable, type PlainObject } from '@finos/legend-shared';
+import type { DataSpaceAnalysisResult } from '../../action/analytics/DSL_DataSpace_DataSpaceAnalysis.js';
 
-export abstract class DSLDataSpace_PureGraphManagerExtension extends AbstractPureGraphManagerExtension {
+export abstract class DSL_DataSpace_PureGraphManagerExtension extends AbstractPureGraphManagerExtension {
   abstract analyzeDataSpace(
     dataSpacePath: string,
     entities: Entity[],
     dependencyEntitiesIndex: Map<string, Entity[]>,
+    cacheRetriever?: () => Promise<PlainObject<DataSpaceAnalysisResult>>,
   ): Promise<DataSpaceAnalysisResult>;
 }
 
 export const getDSLDataSpaceGraphManagerExtension = (
   graphManager: AbstractPureGraphManager,
-): DSLDataSpace_PureGraphManagerExtension =>
+): DSL_DataSpace_PureGraphManagerExtension =>
   guaranteeNonNullable(
     graphManager.extensions.find(
       (extension) =>
-        extension instanceof DSLDataSpace_PureGraphManagerExtension,
+        extension instanceof DSL_DataSpace_PureGraphManagerExtension,
     ),
     `Can't find DSL Data Space Pure graph manager extension`,
-  ) as DSLDataSpace_PureGraphManagerExtension;
+  ) as DSL_DataSpace_PureGraphManagerExtension;

package/src/graphManager/protocol/pure/{DSLDataSpace_PureGraphManagerExtensionBuilder.ts → DSL_DataSpace_PureGraphManagerExtensionBuilder.ts}

@@ -18,10 +18,10 @@ import type {
   AbstractPureGraphManager,
   AbstractPureGraphManagerExtension,
 } from '@finos/legend-graph';
-import { V1_DSLDataSpace_PureGraphManagerExtension } from './v1/V1_DSLDataSpace_PureGraphManagerExtension.js';
+import { V1_DSL_DataSpace_PureGraphManagerExtension } from './v1/V1_DSL_DataSpace_PureGraphManagerExtension.js';
 
-export const DSLDataSpace_buildGraphManagerExtension = (
+export const DSL_DataSpace_buildGraphManagerExtension = (
   graphManager: AbstractPureGraphManager,
 ): AbstractPureGraphManagerExtension =>
   // NOTE: until we support more client versions, we always default to return V1
-  new V1_DSLDataSpace_PureGraphManagerExtension(graphManager);
+  new V1_DSL_DataSpace_PureGraphManagerExtension(graphManager);

package/src/graphManager/protocol/pure/{DSLDataSpace_PureProtocolProcessorPlugin.ts → DSL_DataSpace_PureProtocolProcessorPlugin.ts}

@@ -15,12 +15,12 @@
  */
 
 import packageJson from '../../../../package.json';
-import V1_SYSTEM_MODELS from './v1/V1_DSLDataSpace_SystemModels.json';
+import V1_SYSTEM_MODELS from './v1/V1_DSL_DataSpace_SystemModels.json';
 import {
   V1_DataSpace,
   V1_DataSpaceExecutionContext,
   V1_DataSpaceSupportEmail,
-} from './v1/model/packageableElements/dataSpace/V1_DSLDataSpace_DataSpace.js';
+} from './v1/model/packageableElements/dataSpace/V1_DSL_DataSpace_DataSpace.js';
 import {
   type PlainObject,
   guaranteeNonEmptyString,
@@ -33,13 +33,13 @@ 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';
+} from './v1/transformation/pureProtocol/V1_DSL_DataSpace_ProtocolHelper.js';
+import { getOwnDataSpace } from '../../DSL_DataSpace_GraphManagerHelper.js';
 import {
   DataSpace,
   DataSpaceExecutionContext,
   DataSpaceSupportEmail,
-} from '../../../graph/metamodel/pure/model/packageableElements/dataSpace/DSLDataSpace_DataSpace.js';
+} from '../../../graph/metamodel/pure/model/packageableElements/dataSpace/DSL_DataSpace_DataSpace.js';
 import {
   type PackageableElement,
   type V1_ElementProtocolClassifierPathGetter,
@@ -64,14 +64,14 @@ import {
   V1_buildFullPath,
 } from '@finos/legend-graph';
 import {
-  V1_DSLDiagram_PackageableElementPointerType,
+  V1_DSL_Diagram_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 {
+export class DSL_DataSpace_PureProtocolProcessorPlugin extends PureProtocolProcessorPlugin {
   constructor() {
     super(
       packageJson.extensions.pureProtocolProcessorPlugin,
@@ -260,7 +260,7 @@ export class DSLDataSpace_PureProtocolProcessorPlugin extends PureProtocolProces
           protocol.featuredDiagrams = metamodel.featuredDiagrams?.map(
             (diagramPath) =>
               new V1_PackageableElementPointer(
-                V1_DSLDiagram_PackageableElementPointerType,
+                V1_DSL_Diagram_PackageableElementPointerType,
                 diagramPath.valueForSerialization ?? '',
               ),
           );

package/src/graphManager/protocol/pure/v1/{V1_DSLDataSpace_PureGraphManagerExtension.ts → V1_DSL_DataSpace_PureGraphManagerExtension.ts}

@@ -28,31 +28,34 @@ import {
   V1_PackageableRuntime,
   V1_EngineRuntime,
   V1_Class,
+  GRAPH_MANAGER_EVENT,
 } from '@finos/legend-graph';
 import type { Entity } from '@finos/legend-storage';
 import {
   ActionState,
+  assertErrorThrown,
   guaranteeNonEmptyString,
   guaranteeNonNullable,
   guaranteeType,
   isNonNullable,
+  LogEvent,
   uniq,
   type PlainObject,
 } from '@finos/legend-shared';
-import { DataSpaceSupportEmail } from '../../../../graph/metamodel/pure/model/packageableElements/dataSpace/DSLDataSpace_DataSpace.js';
-import { V1_DataSpaceSupportEmail } from '../../../../graphManager/protocol/pure/v1/model/packageableElements/dataSpace/V1_DSLDataSpace_DataSpace.js';
+import { DataSpaceSupportEmail } from '../../../../graph/metamodel/pure/model/packageableElements/dataSpace/DSL_DataSpace_DataSpace.js';
+import { V1_DataSpaceSupportEmail } from '../../../../graphManager/protocol/pure/v1/model/packageableElements/dataSpace/V1_DSL_DataSpace_DataSpace.js';
 import {
   DataSpaceAnalysisResult,
   DataSpaceExecutionContextAnalysisResult,
   DataSpaceStereotypeInfo,
   DataSpaceTaggedValueInfo,
-} from '../../../action/analytics/DataSpaceAnalysis.js';
-import { DSLDataSpace_PureGraphManagerExtension } from '../DSLDataSpace_PureGraphManagerExtension.js';
-import { V1_DataSpaceAnalysisResult } from './engine/analytics/V1_DataSpaceAnalysis.js';
+} from '../../../action/analytics/DSL_DataSpace_DataSpaceAnalysis.js';
+import { DSL_DataSpace_PureGraphManagerExtension } from '../DSL_DataSpace_PureGraphManagerExtension.js';
+import { V1_DataSpaceAnalysisResult } from './engine/analytics/V1_DSL_DataSpace_DataSpaceAnalysis.js';
 
 const ANALYZE_DATA_SPACE_TRACE = 'analyze data space';
 
-export class V1_DSLDataSpace_PureGraphManagerExtension extends DSLDataSpace_PureGraphManagerExtension {
+export class V1_DSL_DataSpace_PureGraphManagerExtension extends DSL_DataSpace_PureGraphManagerExtension {
   declare graphManager: V1_PureGraphManager;
 
   constructor(graphManager: AbstractPureGraphManager) {
@@ -68,36 +71,52 @@ export class V1_DSLDataSpace_PureGraphManagerExtension extends DSLDataSpace_Pure
     dataSpacePath: string,
     entities: Entity[],
     dependencyEntitiesIndex: Map<string, Entity[]>,
+    cacheRetriever?: () => Promise<PlainObject<DataSpaceAnalysisResult>>,
   ): Promise<DataSpaceAnalysisResult> {
-    // prepare graph data for analysis
-    // NOTE: we don't do serialization roundtrip here to save time
-    const graphDataForAnalysis = {
-      _type: V1_PureModelContextType.DATA,
-      elements: Array.from(dependencyEntitiesIndex.values())
-        .flat()
-        .concat(entities)
-        .map((entity) => entity.content),
-    };
-
-    const engineServerClient = this.graphManager.engine.getEngineServerClient();
-    const analysisResult = V1_DataSpaceAnalysisResult.serialization.fromJson(
-      await engineServerClient.postWithTracing<
+    let cachResult: PlainObject<V1_DataSpaceAnalysisResult> | undefined;
+    if (cacheRetriever) {
+      try {
+        cachResult = await cacheRetriever();
+      } catch (error) {
+        assertErrorThrown(error);
+        this.graphManager.log.warn(
+          LogEvent.create(GRAPH_MANAGER_EVENT.CACHE_MANAGER_FAILURE),
+          `Can't fetch data space analysis result cache: ${error.message}`,
+        );
+      }
+    }
+    const engineClient = this.graphManager.engine.getEngineServerClient();
+    const analysisResult =
+      cachResult ??
+      (await engineClient.postWithTracing<
         PlainObject<V1_DataSpaceAnalysisResult>
       >(
-        engineServerClient.getTraceData(ANALYZE_DATA_SPACE_TRACE),
-        `${engineServerClient._pure()}/analytics/dataSpace/render`,
+        engineClient.getTraceData(ANALYZE_DATA_SPACE_TRACE),
+        `${engineClient._pure()}/analytics/dataSpace/render`,
         {
           clientVersion: V1_PureGraphManager.TARGET_PROTOCOL_VERSION,
           dataSpace: dataSpacePath,
-          model: graphDataForAnalysis,
+          model: {
+            _type: V1_PureModelContextType.DATA,
+            elements: Array.from(dependencyEntitiesIndex.values())
+              .flat()
+              .concat(entities)
+              .map((entity) => entity.content),
+          },
         },
         {},
         undefined,
         undefined,
         { enableCompression: true },
-      ),
+      ));
+    return this.buildDataSpaceAnalytics(
+      V1_DataSpaceAnalysisResult.serialization.fromJson(analysisResult),
     );
+  }
 
+  private async buildDataSpaceAnalytics(
+    analysisResult: V1_DataSpaceAnalysisResult,
+  ): Promise<DataSpaceAnalysisResult> {
     const result = new DataSpaceAnalysisResult();
     result.name = analysisResult.name;
     result.package = analysisResult.package;

package/src/graphManager/protocol/pure/v1/engine/analytics/{V1_DataSpaceAnalysis.ts → V1_DSL_DataSpace_DataSpaceAnalysis.ts}

@@ -24,8 +24,8 @@ import {
   primitive,
   SKIP,
 } from 'serializr';
-import type { V1_DataSpaceSupportInfo } from '../../../../../../graphManager/protocol/pure/v1/model/packageableElements/dataSpace/V1_DSLDataSpace_DataSpace.js';
-import { V1_deserializeSupportInfo } from '../../../../../../graphManager/protocol/pure/v1/transformation/pureProtocol/V1_DSLDataSpace_ProtocolHelper.js';
+import type { V1_DataSpaceSupportInfo } from '../../../../../../graphManager/protocol/pure/v1/model/packageableElements/dataSpace/V1_DSL_DataSpace_DataSpace.js';
+import { V1_deserializeSupportInfo } from '../../../../../../graphManager/protocol/pure/v1/transformation/pureProtocol/V1_DSL_DataSpace_ProtocolHelper.js';
 
 class V1_DataSpaceTaggedValueInfo {
   profile!: string;

package/src/graphManager/protocol/pure/v1/model/packageableElements/dataSpace/{V1_DSLDataSpace_DataSpace.ts → V1_DSL_DataSpace_DataSpace.ts}

@@ -15,7 +15,7 @@
  */
 
 import { hashArray, type Hashable } from '@finos/legend-shared';
-import { DATA_SPACE_HASH_STRUCTURE } from '../../../../../../../graph/DSLDataSpace_HashUtils.js';
+import { DATA_SPACE_HASH_STRUCTURE } from '../../../../../../../graph/DSL_DataSpace_HashUtils.js';
 import {
   V1_PackageableElement,
   type V1_PackageableElementPointer,

package/src/graphManager/protocol/pure/v1/transformation/pureGraph/{V1_DSLDataSpace_GraphBuilderHelper.ts → V1_DSL_DataSpace_GraphBuilderHelper.ts}

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import { getDataSpace } from '../../../../../../graphManager/DSLDataSpace_GraphManagerHelper.js';
-import type { DataSpace } from '../../../../../../graph/metamodel/pure/model/packageableElements/dataSpace/DSLDataSpace_DataSpace.js';
+import { getDataSpace } from '../../../../../DSL_DataSpace_GraphManagerHelper.js';
+import type { DataSpace } from '../../../../../../graph/metamodel/pure/model/packageableElements/dataSpace/DSL_DataSpace_DataSpace.js';
 import type {
   PackageableElementImplicitReference,
   V1_GraphBuilderContext,

package/src/graphManager/protocol/pure/v1/transformation/pureProtocol/{V1_DSLDataSpace_ProtocolHelper.ts → V1_DSL_DataSpace_ProtocolHelper.ts}

@@ -44,7 +44,7 @@ import {
   V1_DataSpace,
   V1_DataSpaceExecutionContext,
   V1_DataSpaceSupportEmail,
-} from '../../model/packageableElements/dataSpace/V1_DSLDataSpace_DataSpace.js';
+} from '../../model/packageableElements/dataSpace/V1_DSL_DataSpace_DataSpace.js';
 
 export const V1_DATA_SPACE_ELEMENT_PROTOCOL_TYPE = 'dataSpace';
 export const V1_DATA_SPACE_SUPPORT_EMAIL_TYPE = 'email';

package/src/index.ts

@@ -14,19 +14,21 @@
  * limitations under the License.
  */
 
-export * from './DSLDataSpace_Extension.js';
-export { DSLDataSpace_LegendStudioApplicationPlugin } from './components/studio/DSLDataSpace_LegendStudioApplicationPlugin.js';
-export { DSLDataSpace_LegendQueryApplicationPlugin } from './components/query/DSLDataSpace_LegendQueryApplicationPlugin.js';
+export * from './DSL_DataSpace_Extension.js';
+export { DSL_DataSpace_LegendStudioApplicationPlugin } from './components/studio/DSL_DataSpace_LegendStudioApplicationPlugin.js';
+export { DSL_DataSpace_LegendQueryApplicationPlugin } from './components/query/DSL_DataSpace_LegendQueryApplicationPlugin.js';
 
-export { DataSpaceViewer } from './components/DataSpaceViewer.js';
+export { DataSpaceViewer } from './components/DSL_DataSpace_DataSpaceViewer.js';
 
 export {
   DATA_SPACE_ELEMENT_CLASSIFIER_PATH,
   extractDataSpaceTaxonomyNodes,
-} from './graphManager/protocol/pure/DSLDataSpace_PureProtocolProcessorPlugin.js';
+} from './graphManager/protocol/pure/DSL_DataSpace_PureProtocolProcessorPlugin.js';
 
-export { DataSpaceViewerState } from './stores/DataSpaceViewerState.js';
+export { DataSpaceViewerState } from './stores/DSL_DataSpace_DataSpaceViewerState.js';
 
-export * from './graphManager/DSLDataSpace_GraphManagerHelper.js';
-export { getDSLDataSpaceGraphManagerExtension } from './graphManager/protocol/pure/DSLDataSpace_PureGraphManagerExtension.js';
-export { DataSpaceAnalysisResult } from './graphManager/action/analytics/DataSpaceAnalysis.js';
+export * from './graphManager/DSL_DataSpace_GraphManagerHelper.js';
+export { getDSLDataSpaceGraphManagerExtension } from './graphManager/protocol/pure/DSL_DataSpace_PureGraphManagerExtension.js';
+export * from './graphManager/action/analytics/DSL_DataSpace_DataSpaceAnalysis.js';
+
+export * from './graphManager/action/analytics/DSL_DataSpace_DataSpaceAnalysisHelper.js';

package/src/stores/{DataSpaceViewerState.ts → DSL_DataSpace_DataSpaceViewerState.ts}

@@ -29,7 +29,7 @@ import { action, computed, makeObservable, observable } from 'mobx';
 import type {
   DataSpaceAnalysisResult,
   DataSpaceExecutionContextAnalysisResult,
-} from '../graphManager/action/analytics/DataSpaceAnalysis.js';
+} from '../graphManager/action/analytics/DSL_DataSpace_DataSpaceAnalysis.js';
 
 export enum DATA_SPACE_VIEWER_ACTIVITY_MODE {
   MODELS_OVERVIEW = 'MODELS_OVERVIEW',

package/src/stores/query/{DataSpaceQueryBuilderState.ts → DSL_DataSpace_DataSpaceQueryBuilderState.ts}

@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-import type { GenericLegendApplicationStore } from '@finos/legend-application';
+import {
+  type GenericLegendApplicationStore,
+  DEFAULT_TYPEAHEAD_SEARCH_LIMIT,
+  DEFAULT_TYPEAHEAD_SEARCH_MINIMUM_SEARCH_LENGTH,
+} from '@finos/legend-application';
 import { QueryBuilderState } from '@finos/legend-query-builder';
 import {
   type GraphManagerState,
@@ -36,17 +40,16 @@ import {
   getNullableFirstElement,
 } from '@finos/legend-shared';
 import { action, flow, makeObservable, observable } from 'mobx';
-import { renderDataSpaceQueryBuilderSetupPanelContent } from '../../components/query/DataSpaceQueryBuilder.js';
-import {
-  DEFAULT_DATA_SPACE_LOADER_LIMIT,
-  MINIMUM_DATA_SPACE_LOADER_SEARCH_LENGTH,
-} from '../../DSLDataSpace_Const.js';
+import { renderDataSpaceQueryBuilderSetupPanelContent } from '../../components/query/DSL_DataSpace_DataSpaceQueryBuilder.js';
 import type {
   DataSpace,
   DataSpaceExecutionContext,
-} from '../../graph/metamodel/pure/model/packageableElements/dataSpace/DSLDataSpace_DataSpace.js';
-import { DATA_SPACE_ELEMENT_CLASSIFIER_PATH } from '../../graphManager/protocol/pure/DSLDataSpace_PureProtocolProcessorPlugin.js';
-import { type DataSpaceInfo, extractDataSpaceInfo } from './DataSpaceInfo.js';
+} 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 {
+  type DataSpaceInfo,
+  extractDataSpaceInfo,
+} from './DSL_DataSpace_DataSpaceInfo.js';
 
 export class DataSpaceQueryBuilderState extends QueryBuilderState {
   readonly dataSpace: DataSpace;
@@ -124,7 +127,7 @@ export class DataSpaceQueryBuilderState extends QueryBuilderState {
 
   *loadDataSpaces(searchText: string): GeneratorFn<void> {
     const isValidSearchString =
-      searchText.length >= MINIMUM_DATA_SPACE_LOADER_SEARCH_LENGTH;
+      searchText.length >= DEFAULT_TYPEAHEAD_SEARCH_MINIMUM_SEARCH_LENGTH;
     this.loadDataSpacesState.inProgress();
     const toGetSnapShot = this.versionId === SNAPSHOT_VERSION_ALIAS;
     try {
@@ -134,7 +137,7 @@ export class DataSpaceQueryBuilderState extends QueryBuilderState {
           {
             search: isValidSearchString ? searchText : undefined,
             scope: toGetSnapShot ? DepotScope.SNAPSHOT : DepotScope.RELEASES,
-            limit: DEFAULT_DATA_SPACE_LOADER_LIMIT,
+            limit: DEFAULT_TYPEAHEAD_SEARCH_LIMIT,
           },
         )) as StoredEntity[]
       ).map((storedEntity) =>

package/src/stores/query/{DataSpaceQueryCreatorStore.ts → DSL_DataSpace_DataSpaceQueryCreatorStore.ts}

@@ -26,13 +26,9 @@ import {
 import {
   QueryEditorStore,
   type QueryExportConfiguration,
-  type LegendQueryPluginManager,
   type LegendQueryApplicationStore,
 } from '@finos/legend-application-query';
-import type {
-  DepotServerClient,
-  ProjectGAVCoordinates,
-} from '@finos/legend-server-depot';
+import type { DepotServerClient } from '@finos/legend-server-depot';
 import {
   guaranteeNonNullable,
   guaranteeType,
@@ -41,13 +37,14 @@ import {
 import {
   QUERY_PROFILE_PATH,
   QUERY_PROFILE_TAG_DATA_SPACE,
-} from '../../DSLDataSpace_Const.js';
-import { getDataSpace } from '../../graphManager/DSLDataSpace_GraphManagerHelper.js';
-import { DataSpaceQueryBuilderState } from './DataSpaceQueryBuilderState.js';
-import type { DataSpaceInfo } from './DataSpaceInfo.js';
-import { generateDataSpaceQueryCreatorRoute } from './DSLDataSpace_LegendQueryRouter.js';
-import type { DataSpaceExecutionContext } from '../../graph/metamodel/pure/model/packageableElements/dataSpace/DSLDataSpace_DataSpace.js';
+} from '../../DSL_DataSpace_Const.js';
+import { getDataSpace } from '../../graphManager/DSL_DataSpace_GraphManagerHelper.js';
+import { DataSpaceQueryBuilderState } from './DSL_DataSpace_DataSpaceQueryBuilderState.js';
+import type { DataSpaceInfo } from './DSL_DataSpace_DataSpaceInfo.js';
+import { generateDataSpaceQueryCreatorRoute } from './DSL_DataSpace_LegendQueryRouter.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';
 
 export const createQueryDataSpaceTaggedValue = (
   dataSpacePath: string,
@@ -71,7 +68,6 @@ export class DataSpaceQueryCreatorStore extends QueryEditorStore {
   constructor(
     applicationStore: LegendQueryApplicationStore,
     depotServerClient: DepotServerClient,
-    pluginManager: LegendQueryPluginManager,
     groupId: string,
     artifactId: string,
     versionId: string,
@@ -80,7 +76,7 @@ export class DataSpaceQueryCreatorStore extends QueryEditorStore {
     runtimePath: string | undefined,
     executionKey: string | undefined,
   ) {
-    super(applicationStore, depotServerClient, pluginManager);
+    super(applicationStore, depotServerClient);
 
     this.groupId = groupId;
     this.artifactId = artifactId;

package/src/stores/query/{DataSpaceQuerySetupState.ts → DSL_DataSpace_DataSpaceQuerySetupState.ts}

@@ -20,7 +20,7 @@ import type { Entity } from '@finos/legend-storage';
 import {
   type QuerySetupStore,
   QuerySetupState,
-  generateStudioProjectViewUrl,
+  EXTERNAL_APPLICATION_NAVIGATION__generateStudioProjectViewUrl,
 } from '@finos/legend-application-query';
 import {
   type StoredEntity,
@@ -34,16 +34,20 @@ import {
   assertErrorThrown,
 } from '@finos/legend-shared';
 import { action, flow, flowResult, makeObservable, observable } from 'mobx';
-import type { DataSpaceAnalysisResult } from '../../graphManager/action/analytics/DataSpaceAnalysis.js';
-import { getDSLDataSpaceGraphManagerExtension } from '../../graphManager/protocol/pure/DSLDataSpace_PureGraphManagerExtension.js';
-import { DATA_SPACE_ELEMENT_CLASSIFIER_PATH } from '../../graphManager/protocol/pure/DSLDataSpace_PureProtocolProcessorPlugin.js';
-import { DataSpaceViewerState } from '../DataSpaceViewerState.js';
-import { generateDataSpaceQueryCreatorRoute } from './DSLDataSpace_LegendQueryRouter.js';
-import { type DataSpaceInfo, extractDataSpaceInfo } from './DataSpaceInfo.js';
+import { getDSLDataSpaceGraphManagerExtension } from '../../graphManager/protocol/pure/DSL_DataSpace_PureGraphManagerExtension.js';
+import { DATA_SPACE_ELEMENT_CLASSIFIER_PATH } from '../../graphManager/protocol/pure/DSL_DataSpace_PureProtocolProcessorPlugin.js';
+import { DataSpaceViewerState } from '../DSL_DataSpace_DataSpaceViewerState.js';
+import { generateDataSpaceQueryCreatorRoute } from './DSL_DataSpace_LegendQueryRouter.js';
 import {
-  DEFAULT_DATA_SPACE_LOADER_LIMIT,
-  MINIMUM_DATA_SPACE_LOADER_SEARCH_LENGTH,
-} from '../../DSLDataSpace_Const.js';
+  type DataSpaceInfo,
+  extractDataSpaceInfo,
+} from './DSL_DataSpace_DataSpaceInfo.js';
+import {
+  DEFAULT_TYPEAHEAD_SEARCH_LIMIT,
+  DEFAULT_TYPEAHEAD_SEARCH_MINIMUM_SEARCH_LENGTH,
+} from '@finos/legend-application';
+import { retrieveAnalyticsResultCache } from '../../graphManager/action/analytics/DSL_DataSpace_DataSpaceAnalysisHelper.js';
+import type { DataSpaceAnalysisResult } from '../../graphManager/action/analytics/DSL_DataSpace_DataSpaceAnalysis.js';
 
 export class DataSpaceQuerySetupState extends QuerySetupState {
   dataSpaces: DataSpaceInfo[] = [];
@@ -84,7 +88,7 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
 
   *loadDataSpaces(searchText: string): GeneratorFn<void> {
     const isValidSearchString =
-      searchText.length >= MINIMUM_DATA_SPACE_LOADER_SEARCH_LENGTH;
+      searchText.length >= DEFAULT_TYPEAHEAD_SEARCH_MINIMUM_SEARCH_LENGTH;
     this.loadDataSpacesState.inProgress();
     try {
       this.dataSpaces = (
@@ -95,7 +99,7 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
             scope: this.toGetSnapShot
               ? DepotScope.SNAPSHOT
               : DepotScope.RELEASES,
-            limit: DEFAULT_DATA_SPACE_LOADER_LIMIT,
+            limit: DEFAULT_TYPEAHEAD_SEARCH_LIMIT,
           },
         )) as StoredEntity[]
       ).map((storedEntity) =>
@@ -149,8 +153,15 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
         dataSpace.path,
         entities,
         dependencyEntitiesIndex,
+        () =>
+          retrieveAnalyticsResultCache(
+            dataSpace.groupId,
+            dataSpace.artifactId,
+            dataSpace.versionId,
+            dataSpace.path,
+            this.setupStore.depotServerClient,
+          ),
       )) as DataSpaceAnalysisResult;
-
       this.dataSpaceViewerState = new DataSpaceViewerState(
         dataSpace.groupId,
         dataSpace.artifactId,
@@ -164,7 +175,7 @@ export class DataSpaceQuerySetupState extends QuerySetupState {
             entityPath: string | undefined,
           ): void =>
             this.setupStore.applicationStore.navigator.openNewWindow(
-              generateStudioProjectViewUrl(
+              EXTERNAL_APPLICATION_NAVIGATION__generateStudioProjectViewUrl(
                 this.setupStore.applicationStore.config.studioUrl,
                 groupId,
                 artifactId,

package/src/stores/query/{DSLDataSpace_LegendQueryRouter.ts → DSL_DataSpace_LegendQueryRouter.ts}

@@ -16,7 +16,7 @@
 
 import { generateExtensionUrlPattern } from '@finos/legend-application';
 import { LEGEND_QUERY_PATH_PARAM_TOKEN } from '@finos/legend-application-query';
-import { generateGAVCoordinates } from '@finos/legend-server-depot';
+import { generateGAVCoordinates } from '@finos/legend-storage';
 import { generatePath } from 'react-router';
 
 export enum DATA_SPACE_QUERY_CREATOR_PATH_PARAM_TOKEN {

package/tsconfig.json

@@ -33,40 +33,41 @@
     }
   ],
   "files": [
-    "./src/DSLDataSpace_Const.ts",
-    "./src/DSLDataSpace_Extension.ts",
+    "./src/DSL_DataSpace_Const.ts",
+    "./src/DSL_DataSpace_Extension.ts",
     "./src/index.ts",
-    "./src/components/studio/DSLDataSpace_CodeSnippets.ts",
-    "./src/components/studio/DSLDataSpace_LegendStudioDocumentation.ts",
-    "./src/graph/DSLDataSpace_HashUtils.ts",
-    "./src/graph/DSLDataSpace_PureGraphPlugin.ts",
-    "./src/graph/metamodel/pure/model/packageableElements/dataSpace/DSLDataSpace_DataSpace.ts",
-    "./src/graphManager/DSLDataSpace_GraphManagerHelper.ts",
-    "./src/graphManager/DSLDataSpace_PureGraphManagerPlugin.ts",
-    "./src/graphManager/action/analytics/DataSpaceAnalysis.ts",
-    "./src/graphManager/action/changeDetection/DSLDataSpace_ObserverHelper.ts",
-    "./src/graphManager/protocol/pure/DSLDataSpace_PureGraphManagerExtension.ts",
-    "./src/graphManager/protocol/pure/DSLDataSpace_PureGraphManagerExtensionBuilder.ts",
-    "./src/graphManager/protocol/pure/DSLDataSpace_PureProtocolProcessorPlugin.ts",
-    "./src/graphManager/protocol/pure/v1/V1_DSLDataSpace_PureGraphManagerExtension.ts",
-    "./src/graphManager/protocol/pure/v1/engine/analytics/V1_DataSpaceAnalysis.ts",
-    "./src/graphManager/protocol/pure/v1/model/packageableElements/dataSpace/V1_DSLDataSpace_DataSpace.ts",
-    "./src/graphManager/protocol/pure/v1/transformation/pureGraph/V1_DSLDataSpace_GraphBuilderHelper.ts",
-    "./src/graphManager/protocol/pure/v1/transformation/pureProtocol/V1_DSLDataSpace_ProtocolHelper.ts",
-    "./src/stores/DataSpaceViewerState.ts",
-    "./src/stores/query/DSLDataSpace_LegendQueryRouter.ts",
-    "./src/stores/query/DataSpaceInfo.ts",
-    "./src/stores/query/DataSpaceQueryBuilderState.ts",
-    "./src/stores/query/DataSpaceQueryCreatorStore.ts",
-    "./src/stores/query/DataSpaceQuerySetupState.ts",
-    "./src/components/DSLDataSpace_Icon.tsx",
-    "./src/components/DataSpaceViewer.tsx",
-    "./src/components/query/DSLDataSpace_LegendQueryApplicationPlugin.tsx",
-    "./src/components/query/DataSpaceQueryBuilder.tsx",
-    "./src/components/query/DataSpaceQueryCreator.tsx",
-    "./src/components/query/DataSpaceQuerySetup.tsx",
-    "./src/components/studio/DSLDataSpace_LegendStudioApplicationPlugin.tsx",
-    "./src/graphManager/protocol/pure/v1/V1_DSLDataSpace_SystemModels.json"
+    "./src/components/studio/DSL_DataSpace_CodeSnippets.ts",
+    "./src/components/studio/DSL_DataSpace_LegendStudioDocumentation.ts",
+    "./src/graph/DSL_DataSpace_HashUtils.ts",
+    "./src/graph/DSL_DataSpace_PureGraphPlugin.ts",
+    "./src/graph/metamodel/pure/model/packageableElements/dataSpace/DSL_DataSpace_DataSpace.ts",
+    "./src/graphManager/DSL_DataSpace_GraphManagerHelper.ts",
+    "./src/graphManager/DSL_DataSpace_PureGraphManagerPlugin.ts",
+    "./src/graphManager/action/analytics/DSL_DataSpace_DataSpaceAnalysis.ts",
+    "./src/graphManager/action/analytics/DSL_DataSpace_DataSpaceAnalysisHelper.ts",
+    "./src/graphManager/action/changeDetection/DSL_DataSpace_ObserverHelper.ts",
+    "./src/graphManager/protocol/pure/DSL_DataSpace_PureGraphManagerExtension.ts",
+    "./src/graphManager/protocol/pure/DSL_DataSpace_PureGraphManagerExtensionBuilder.ts",
+    "./src/graphManager/protocol/pure/DSL_DataSpace_PureProtocolProcessorPlugin.ts",
+    "./src/graphManager/protocol/pure/v1/V1_DSL_DataSpace_PureGraphManagerExtension.ts",
+    "./src/graphManager/protocol/pure/v1/engine/analytics/V1_DSL_DataSpace_DataSpaceAnalysis.ts",
+    "./src/graphManager/protocol/pure/v1/model/packageableElements/dataSpace/V1_DSL_DataSpace_DataSpace.ts",
+    "./src/graphManager/protocol/pure/v1/transformation/pureGraph/V1_DSL_DataSpace_GraphBuilderHelper.ts",
+    "./src/graphManager/protocol/pure/v1/transformation/pureProtocol/V1_DSL_DataSpace_ProtocolHelper.ts",
+    "./src/stores/DSL_DataSpace_DataSpaceViewerState.ts",
+    "./src/stores/query/DSL_DataSpace_DataSpaceInfo.ts",
+    "./src/stores/query/DSL_DataSpace_DataSpaceQueryBuilderState.ts",
+    "./src/stores/query/DSL_DataSpace_DataSpaceQueryCreatorStore.ts",
+    "./src/stores/query/DSL_DataSpace_DataSpaceQuerySetupState.ts",
+    "./src/stores/query/DSL_DataSpace_LegendQueryRouter.ts",
+    "./src/components/DSL_DataSpace_DataSpaceViewer.tsx",
+    "./src/components/DSL_DataSpace_Icon.tsx",
+    "./src/components/query/DSL_DataSpace_DataSpaceQueryBuilder.tsx",
+    "./src/components/query/DSL_DataSpace_DataSpaceQueryCreator.tsx",
+    "./src/components/query/DSL_DataSpace_DataSpaceQuerySetup.tsx",
+    "./src/components/query/DSL_DataSpace_LegendQueryApplicationPlugin.tsx",
+    "./src/components/studio/DSL_DataSpace_LegendStudioApplicationPlugin.tsx",
+    "./src/graphManager/protocol/pure/v1/V1_DSL_DataSpace_SystemModels.json"
   ],
   "include": [
     "src/**/*.ts",

package/lib/DSLDataSpace_Const.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DSLDataSpace_Const.d.ts","sourceRoot":"","sources":["../src/DSLDataSpace_Const.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,eAAO,MAAM,kBAAkB,gCAAgC,CAAC;AAChE,eAAO,MAAM,4BAA4B,cAAc,CAAC;AAExD,eAAO,MAAM,+BAA+B,KAAK,CAAC;AAClD,eAAO,MAAM,uCAAuC,IAAI,CAAC"}

package/lib/DSLDataSpace_Const.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DSLDataSpace_Const.js","sourceRoot":"","sources":["../src/DSLDataSpace_Const.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,gFAAgF;AAChF,sDAAsD;AACtD,MAAM,CAAC,MAAM,kBAAkB,GAAG,6BAA6B,CAAC;AAChE,MAAM,CAAC,MAAM,4BAA4B,GAAG,WAAW,CAAC;AAExD,MAAM,CAAC,MAAM,+BAA+B,GAAG,EAAE,CAAC;AAClD,MAAM,CAAC,MAAM,uCAAuC,GAAG,CAAC,CAAC"}

package/lib/DSLDataSpace_Extension.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DSLDataSpace_Extension.d.ts","sourceRoot":"","sources":["../src/DSLDataSpace_Extension.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAKtD,qBAAa,+BAAgC,SAAQ,cAAc;;CAQlE"}

package/lib/DSLDataSpace_Extension.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DSLDataSpace_Extension.js","sourceRoot":"","sources":["../src/DSLDataSpace_Extension.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,WAAW,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,mCAAmC,EAAE,MAAM,uDAAuD,CAAC;AAC5G,OAAO,EAAE,wCAAwC,EAAE,MAAM,0EAA0E,CAAC;AACpI,OAAO,EAAE,4BAA4B,EAAE,MAAM,yCAAyC,CAAC;AAEvF,MAAM,OAAO,+BAAgC,SAAQ,cAAc;IACjE;QACE,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,kBAAkB,EAAE,WAAW,CAAC,OAAO,EAAE;YACpE,IAAI,4BAA4B,EAAE;YAClC,IAAI,mCAAmC,EAAE;YACzC,IAAI,wCAAwC,EAAE;SAC/C,CAAC,CAAC;IACL,CAAC;CACF"}

package/lib/components/DSLDataSpace_Icon.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DSLDataSpace_Icon.d.ts","sourceRoot":"","sources":["../../src/components/DSLDataSpace_Icon.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;;AAIH,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAIjC,CAAC"}

package/lib/components/DSLDataSpace_Icon.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DSLDataSpace_Icon.js","sourceRoot":"","sources":["../../src/components/DSLDataSpace_Icon.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,MAAM,CAAC,MAAM,aAAa,GAAa,GAAG,EAAE,CAAC,CAC3C,cAAK,SAAS,EAAC,uBAAuB,YACpC,KAAC,UAAU,KAAG,GACV,CACP,CAAC"}

package/lib/components/DataSpaceViewer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DataSpaceViewer.d.ts","sourceRoot":"","sources":["../../src/components/DataSpaceViewer.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAiCH,OAAO,EACL,KAAK,oBAAoB,EAE1B,MAAM,mCAAmC,CAAC;AAwa3C,eAAO,MAAM,eAAe,WAClB;IAAE,oBAAoB,EAAE,oBAAoB,CAAA;CAAE;;CA+JvD,CAAC"}