@finos/legend-application-studio 21.0.0 → 22.0.0

package/src/stores/LegendStudioApplicationPlugin.ts

@@ -24,6 +24,7 @@ import type {
 import type { Class, PackageableElement, Testable } from '@finos/legend-graph';
 import {
   type DocumentationEntry,
+  type PureGrammarTextSuggestion,
   LegendApplicationPlugin,
 } from '@finos/legend-application';
 import type { TestableMetadata } from './sidebar-state/testable/GlobalTestRunnerState.js';
@@ -180,55 +181,6 @@ export type PureGrammarParserElementDocumentationGetter = (
   elementKeyword: string,
 ) => DocumentationEntry | undefined;
 
-/**
- * This snippet suggestion is meant for an embedded content of an element
- * In other words, it is used to construct element snippet suggestions
- *
- * Because of that, it is expected that there are text content wrapping around
- * this snippet, so the first suggestion might not start from index 1.
- */
-export interface ElementEmbeddedContentSnippetSuggestion {
-  /**
-   * Brief description about the suggestion item to enable the users to quickly
-   * differentiate between one suggestions from another
-   */
-  description?: string | undefined;
-  /**
-   * The snippet text to be embedded in the full snippet suggestion text for the element
-   *
-   * NOTE: The snippet syntax follows that of `monaco-editor`
-   * See https://code.visualstudio.com/docs/editor/userdefinedsnippets#_create-your-own-snippets
-   */
-  text: string;
-}
-
-/**
- * This mirrors `monaco-editor` completion item structure
- * See https://microsoft.github.io/monaco-editor/api/interfaces/monaco.languages.CompletionItem.html
- */
-export interface PureGrammarTextSuggestion {
-  /**
-   * The text label of the suggestion.
-   */
-  text: string;
-  /**
-   * Brief description about the suggestion item to enable the users to quickly
-   * differentiate between one suggestions from another
-   */
-  description?: string | undefined;
-  /**
-   * Detailed documentation that explains/elaborates the suggestion item.
-   */
-  documentation?: DocumentationEntry | undefined;
-  /**
-   * A string or snippet that should be inserted when selecting this suggestion.
-   *
-   * NOTE: The snippet syntax follows that of `monaco-editor`
-   * See https://code.visualstudio.com/docs/editor/userdefinedsnippets#_create-your-own-snippets
-   */
-  insertText: string;
-}
-
 export type PureGrammarParserKeywordSuggestionGetter = (
   editorStore: EditorStore,
 ) => PureGrammarTextSuggestion[];

package/src/stores/STO_Relational_LegendStudioApplicationPlugin_Extension.ts

@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-import type {
-  DSL_LegendStudioApplicationPlugin_Extension,
-  ElementEmbeddedContentSnippetSuggestion,
-} from './LegendStudioApplicationPlugin.js';
+import type { DSL_LegendStudioApplicationPlugin_Extension } from './LegendStudioApplicationPlugin.js';
 import type {
   DatasourceSpecification,
   AuthenticationStrategy,
@@ -26,6 +23,7 @@ import type {
 } from '@finos/legend-graph';
 import type { RelationalDatabaseConnectionValueState } from './editor-state/element-editor-state/connection/ConnectionEditorState.js';
 import type { PostProcessorEditorState } from './editor-state/element-editor-state/connection/PostProcessorEditorState.js';
+import type { ElementEmbeddedContentSnippetSuggestion } from '@finos/legend-application';
 
 /**
  * NOTE: The tab-stop index of the snippet must start from 6

package/src/stores/editor-state/EditorState.ts

@@ -24,10 +24,4 @@ export abstract class EditorState extends TabState {
     super();
     this.editorStore = editorStore;
   }
-
-  /**
-   * Check if the specified tab this tab or not.
-   * This is often used when checking if a tab is already opened.
-   */
-  abstract match(tab: EditorState): boolean;
 }

package/src/stores/editor-state/FileGenerationViewerState.ts

@@ -68,7 +68,7 @@ export class FileGenerationViewerState extends EditorState {
     return this.file.name;
   }
 
-  match(tab: EditorState): boolean {
+  override match(tab: EditorState): boolean {
     return tab instanceof FileGenerationViewerState && tab.file === this.file;
   }
 }

package/src/stores/editor-state/ModelImporterState.ts

@@ -477,7 +477,7 @@ export class ModelImporterState extends EditorState {
     return 'Model Importer';
   }
 
-  match(tab: EditorState): boolean {
+  override match(tab: EditorState): boolean {
     return tab instanceof ModelImporterEditorState;
   }
 

package/src/stores/editor-state/ProjectConfigurationEditorState.ts

@@ -186,7 +186,7 @@ export class ProjectConfigurationEditorState extends EditorState {
     return 'config';
   }
 
-  match(tab: EditorState): boolean {
+  override match(tab: EditorState): boolean {
     return tab instanceof ProjectConfigurationEditorState;
   }
 

package/src/stores/editor-state/element-editor-state/ElementEditorState.ts

@@ -74,7 +74,7 @@ export abstract class ElementEditorState extends EditorState {
     return this.element.path;
   }
 
-  match(tab: EditorState): boolean {
+  override match(tab: EditorState): boolean {
     return tab instanceof ElementEditorState && tab.element === this.element;
   }
 
@@ -158,6 +158,10 @@ export abstract class ElementEditorState extends EditorState {
     return;
   }
 
+  override onOpen(): void {
+    this.editorStore.explorerTreeState.openNode(this.element);
+  }
+
   /**
    * Clone the element editor state to be replaced as processing graph
    *

package/src/stores/editor-state/element-editor-state/service/ServiceEditorState.ts

@@ -22,6 +22,7 @@ import {
   UnsupportedServiceExecutionState,
   SingleServicePureExecutionState,
   MultiServicePureExecutionState,
+  InlineServicePureExecutionState,
 } from './ServiceExecutionState.js';
 import { ServiceRegistrationState } from '../../../editor-state/element-editor-state/service/ServiceRegistrationState.js';
 import { ElementEditorState } from '../../../editor-state/element-editor-state/ElementEditorState.js';
@@ -80,12 +81,22 @@ export class ServiceEditorState extends ElementEditorState {
 
   buildExecutionState(): ServiceExecutionState {
     const execution = this.service.execution;
-    if (execution instanceof PureSingleExecution) {
+    if (
+      execution instanceof PureSingleExecution &&
+      execution.mapping &&
+      execution.runtime
+    ) {
       return new SingleServicePureExecutionState(
         this.editorStore,
         this,
         execution,
       );
+    } else if (execution instanceof PureSingleExecution) {
+      return new InlineServicePureExecutionState(
+        this.editorStore,
+        this,
+        execution,
+      );
     } else if (execution instanceof PureMultiExecution) {
       return new MultiServicePureExecutionState(
         this.editorStore,

package/src/stores/editor-state/element-editor-state/service/ServiceExecutionState.ts

@@ -23,6 +23,7 @@ import {
   stringifyLosslessJSON,
   UnsupportedOperationError,
   filterByType,
+  guaranteeNonNullable,
 } from '@finos/legend-shared';
 import type { ServiceEditorState } from './ServiceEditorState.js';
 import {
@@ -394,13 +395,21 @@ export abstract class ServiceExecutionContextState {
 }
 
 export class SingleExecutionContextState extends ServiceExecutionContextState {
-  declare executionContext: PureSingleExecution;
+  declare executionContext1: PureSingleExecution;
 
   constructor(
     executionContext: PureSingleExecution,
     executionState: ServiceExecutionState,
   ) {
-    super(executionContext, executionState);
+    super(
+      {
+        mapping:
+          executionContext.mapping as PackageableElementReference<Mapping>,
+        runtime: executionContext.runtime as Runtime,
+      },
+      executionState,
+    );
+    this.executionContext1 = executionContext;
     makeObservable(this, {
       executionContext: observable,
       setMapping: action,
@@ -409,15 +418,18 @@ export class SingleExecutionContextState extends ServiceExecutionContextState {
   }
 
   setMapping(value: Mapping): void {
+    this.executionContext.mapping =
+      PackageableElementExplicitReference.create(value);
     pureSingleExecution_setMapping(
-      this.executionContext,
+      this.executionContext1,
       value,
       this.executionState.editorStore.changeDetectionState.observerContext,
     );
   }
   setRuntime(value: Runtime): void {
+    this.executionContext.runtime = value;
     pureSingleExecution_setRuntime(
-      this.executionContext,
+      this.executionContext1,
       value,
       this.executionState.editorStore.changeDetectionState.observerContext,
     );
@@ -656,21 +668,22 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
   }
 
   useCustomRuntime(): void {
-    if (this.selectedExecutionContextState) {
-      const customRuntime = new EngineRuntime();
-      runtime_addMapping(
-        customRuntime,
-        PackageableElementExplicitReference.create(
-          this.selectedExecutionContextState.executionContext.mapping.value,
-        ),
-      );
-      decorateRuntimeWithNewMapping(
-        this.selectedExecutionContextState.executionContext.runtime,
-        this.selectedExecutionContextState.executionContext.mapping.value,
-        this.editorStore,
-      );
-      this.selectedExecutionContextState.setRuntime(customRuntime);
-    }
+    const customRuntime = new EngineRuntime();
+    guaranteeNonNullable(this.selectedExecutionContextState);
+    const executionState = this
+      .selectedExecutionContextState as ServiceExecutionContextState;
+    runtime_addMapping(
+      customRuntime,
+      PackageableElementExplicitReference.create(
+        executionState.executionContext.mapping.value,
+      ),
+    );
+    decorateRuntimeWithNewMapping(
+      executionState.executionContext.runtime,
+      executionState.executionContext.mapping.value,
+      this.editorStore,
+    );
+    executionState.setRuntime(customRuntime);
   }
 
   autoSelectRuntimeOnMappingChange(mapping: Mapping): void {
@@ -697,6 +710,48 @@ export abstract class ServicePureExecutionState extends ServiceExecutionState {
   }
 }
 
+export class InlineServicePureExecutionState extends ServicePureExecutionState {
+  declare execution: PureSingleExecution;
+
+  constructor(
+    editorStore: EditorStore,
+    serviceEditorState: ServiceEditorState,
+    execution: PureSingleExecution,
+  ) {
+    super(editorStore, serviceEditorState, execution);
+
+    makeObservable(this, {
+      queryState: observable,
+      isRunningQuery: observable,
+      isGeneratingPlan: observable,
+      isOpeningQueryEditor: observable,
+      executionResultText: observable,
+      executionPlanState: observable,
+      showChangeExecModal: observable,
+      parameterState: observable,
+      setExecutionResultText: action,
+      setQueryState: action,
+      updateExecutionQuery: action,
+      setOpeningQueryEditor: action,
+      generatePlan: flow,
+      handleExecute: flow,
+      runQuery: flow,
+    });
+    this.selectedExecutionContextState =
+      this.getInitiallySelectedExecutionContextState();
+  }
+
+  changeExecution(): void {
+    throw new Error('Method not implemented.');
+  }
+
+  getInitiallySelectedExecutionContextState():
+    | ServiceExecutionContextState
+    | undefined {
+    return undefined;
+  }
+}
+
 export class SingleServicePureExecutionState extends ServicePureExecutionState {
   declare execution: PureSingleExecution;
   declare selectedExecutionContextState: ServiceExecutionContextState;
@@ -754,23 +809,25 @@ export class SingleServicePureExecutionState extends ServicePureExecutionState {
   }
 
   changeExecution(): void {
-    const _execution = new PureMultiExecution(
-      this.multiExecutionKey,
-      this.execution.func,
-      this.serviceEditorState.service,
-    );
-    const _parameter = new KeyedExecutionParameter(
-      `execContext_1`,
-      this.execution.mapping,
-      this.execution.runtime,
-    );
-    _execution.executionParameters = [_parameter];
-    service_setExecution(
-      this.serviceEditorState.service,
-      _execution,
-      this.editorStore.changeDetectionState.observerContext,
-    );
-    this.serviceEditorState.resetExecutionState();
+    if (this.execution.mapping && this.execution.runtime) {
+      const _execution = new PureMultiExecution(
+        this.multiExecutionKey,
+        this.execution.func,
+        this.serviceEditorState.service,
+      );
+      const _parameter = new KeyedExecutionParameter(
+        `execContext_1`,
+        this.execution.mapping,
+        this.execution.runtime,
+      );
+      _execution.executionParameters = [_parameter];
+      service_setExecution(
+        this.serviceEditorState.service,
+        _execution,
+        this.editorStore.changeDetectionState.observerContext,
+      );
+      this.serviceEditorState.resetExecutionState();
+    }
   }
 }
 

package/src/stores/editor-state/element-editor-state/service/testable/ServiceTestDataState.ts

@@ -196,7 +196,7 @@ export class ConnectionTestDataState {
         .service;
     const execution = service.execution;
     let runtimes: Runtime[] = [];
-    if (execution instanceof PureSingleExecution) {
+    if (execution instanceof PureSingleExecution && execution.runtime) {
       runtimes = [execution.runtime];
     } else if (execution instanceof PureMultiExecution) {
       runtimes = execution.executionParameters.map((t) => t.runtime);
@@ -366,7 +366,10 @@ export class ServiceTestDataState {
       this.testSuiteState.testableState.serviceEditorState.service;
     const execution = service.execution;
     let runtimes: Runtime[] = [];
-    if (execution instanceof PureSingleExecution) {
+    if (
+      execution instanceof PureSingleExecution &&
+      execution.runtime !== undefined
+    ) {
       runtimes = [execution.runtime];
     } else if (execution instanceof PureMultiExecution) {
       runtimes = execution.executionParameters.map((t) => t.runtime);

package/src/stores/editor-state/element-editor-state/service/testable/ServiceTestEditorState.ts

@@ -52,19 +52,20 @@ import { generateVariableExpressionMockValue } from '@finos/legend-query-builder
 
 export enum SERIALIZATION_FORMAT {
   PURE = 'PURE',
-  // Temporary remove this option as it is currently not being read correctly.
-  // See https://github.com/finos/legend-engine/pull/799
-  // DEFAULT = 'DEFAULT',
+  DEFAULT = 'DEFAULT',
   PURE_TDSOBJECT = 'PURE_TDSOBJECT',
 }
 
 export enum SERIALIZATION_FORMAT_LABEL {
+  DEFAULT = 'DEFAULT',
   PURE = 'PURE',
   TDS = 'TDS',
 }
 
 const getSerializationFormatLabel = (val: string): string => {
   switch (val) {
+    case SERIALIZATION_FORMAT.DEFAULT:
+      return SERIALIZATION_FORMAT.DEFAULT;
     case SERIALIZATION_FORMAT.PURE:
       return SERIALIZATION_FORMAT.PURE;
     case SERIALIZATION_FORMAT.PURE_TDSOBJECT:
@@ -365,7 +366,10 @@ export class ServiceTestSetupState {
         label: getSerializationFormatLabel(test.serializationFormat),
       };
     }
-    return undefined;
+    return {
+      value: SERIALIZATION_FORMAT.DEFAULT,
+      label: SERIALIZATION_FORMAT.DEFAULT,
+    };
   }
 
   changeSerializationFormat(val: string | undefined): void {

package/src/stores/editor-state/entity-diff-editor-state/EntityChangeConflictEditorState.ts

@@ -328,7 +328,7 @@ export class EntityChangeConflictEditorState extends EntityDiffViewerState {
     );
   }
 
-  match(tab: EditorState): boolean {
+  override match(tab: EditorState): boolean {
     return (
       tab instanceof EntityChangeConflictEditorState &&
       tab.entityPath === this.entityPath

package/src/stores/editor-state/entity-diff-editor-state/EntityDiffViewState.ts

@@ -177,7 +177,7 @@ export class EntityDiffViewState extends EntityDiffViewerState {
     this.fromGrammarText = text;
   }
 
-  match(tab: EditorState): boolean {
+  override match(tab: EditorState): boolean {
     return (
       tab instanceof EntityDiffViewState &&
       tab.fromEntityPath === this.fromEntityPath &&

package/src/stores/shared/FileGenerationTreeUtils.ts

@@ -20,13 +20,15 @@ import {
   returnUndefOnError,
   addUniqueEntry,
 } from '@finos/legend-shared';
-import type { GenerationOutput } from '@finos/legend-graph';
+import {
+  DIRECTORY_PATH_DELIMITER,
+  type GenerationOutput,
+} from '@finos/legend-graph';
 
 export interface GenerationOutputResult {
   generationOutput: GenerationOutput;
   parentId?: string | undefined;
 }
-export const DIRECTORY_PATH_DELIMITER = '/';
 export const GENERATION_FILE_ROOT_NAME = 'GENERATION_FILE_ROOT';
 
 // Generation Directory Model

package/src/stores/shared/modifier/DSL_Service_GraphModifierHelper.ts

@@ -208,7 +208,9 @@ export const pureSingleExecution_setMapping = action(
     value: Mapping,
     observerContext: ObserverContext,
   ): void => {
-    pe.mapping.value = observe_Mapping(value, observerContext);
+    if (pe.mapping) {
+      pe.mapping.value = observe_Mapping(value, observerContext);
+    }
   },
 );
 export const pureSingleExecution_setRuntime = action(