@finos/legend-application-studio 28.16.25 → 28.17.0

package/src/components/editor/panel-group/DevToolPanel.tsx

@@ -32,7 +32,11 @@ import {
 import { useEditorStore } from '../EditorStoreProvider.js';
 import { LEGEND_STUDIO_SETTING_KEY } from '../../../__lib__/LegendStudioSetting.js';
 import { flowResult } from 'mobx';
-import type { PureModel } from '@finos/legend-graph';
+import {
+  PARSER_SECTION_MARKER,
+  PURE_PARSER,
+  type PureModel,
+} from '@finos/legend-graph';
 
 export const DevToolPanel = observer(() => {
   const editorStore = useEditorStore();
@@ -71,8 +75,8 @@ export const DevToolPanel = observer(() => {
     );
   };
 
-  const downloadDependencyProjectGrammars = async (): Promise<string> => {
-    const dependencyGrammars = await Promise.all(
+  const downloadDependencyProjectGrammars = async (): Promise<string[]> => {
+    const grammars = await Promise.all(
       Array.from(
         editorStore.graphManagerState.graph.dependencyManager
           .projectDependencyModelsIndex,
@@ -88,7 +92,7 @@ export const DevToolPanel = observer(() => {
           ) as string,
       ),
     );
-    return dependencyGrammars.join('\n');
+    return grammars;
   };
 
   const downloadProjectGrammar = async (
@@ -105,14 +109,17 @@ export const DevToolPanel = observer(() => {
     const dependencyGrammars = withDependency
       ? ((await Promise.all([
           flowResult(downloadDependencyProjectGrammars()),
-        ])) as unknown as string)
-      : '';
+        ])) as unknown as string[])
+      : [];
+    const fullGrammar = [graphGrammar, ...dependencyGrammars].join(
+      `\n${PARSER_SECTION_MARKER}${PURE_PARSER.PURE}\n`,
+    );
     const fileName = `grammar.${getContentTypeFileExtension(
       ContentType.TEXT_PLAIN,
     )}`;
     downloadFileUsingDataURI(
       fileName,
-      `${graphGrammar}\n${dependencyGrammars}`,
+      `${fullGrammar}`,
       ContentType.TEXT_PLAIN,
     );
   };

package/src/stores/editor/EditorGraphState.ts

@@ -890,6 +890,6 @@ export class EditorGraphState {
         return label;
       }
     }
-    return PACKAGEABLE_ELEMENT_TYPE.INTERNAL__UNKNOWN;
+    return PACKAGEABLE_ELEMENT_TYPE.INTERNAL__UnknownElement;
   }
 }

package/src/stores/editor/GraphEditGrammarModeState.ts

@@ -27,6 +27,7 @@ import {
   EngineError,
   GraphBuilderError,
   reportGraphAnalytics,
+  INTERNAL__UnknownElement,
 } from '@finos/legend-graph';
 import {
   type GeneratorFn,
@@ -35,6 +36,7 @@ import {
   ActionState,
   StopWatch,
   assertNonNullable,
+  filterByType,
 } from '@finos/legend-shared';
 import type { Entity } from '@finos/legend-storage';
 import { makeObservable, flow, flowResult, observable } from 'mobx';
@@ -96,6 +98,11 @@ export class GraphEditGrammarModeState extends GraphEditorMode {
         sourceInformationIndex,
       );
 
+      //Include the UnknownPackageableElements when sending to compute local changes
+      //Otherwise, they get deleted because they dont exist in the graphGrammarText
+      const unknownEntities = this.getUnknownPackageableElementsAsEntities();
+      entities.push(...unknownEntities);
+
       yield flowResult(
         this.editorStore.changeDetectionState.computeLocalChangesInTextMode(
           entities,
@@ -195,6 +202,12 @@ export class GraphEditGrammarModeState extends GraphEditorMode {
     return this.grammarTextEditorState.currentTextGraphHash;
   }
 
+  getUnknownPackageableElementsAsEntities(): Entity[] {
+    return this.editorStore.graphManagerState.graph.allOwnElements.filter(
+      filterByType(INTERNAL__UnknownElement),
+    );
+  }
+
   *addElement(
     element: PackageableElement,
     packagePath: string | undefined,
@@ -354,6 +367,12 @@ export class GraphEditGrammarModeState extends GraphEditorMode {
       )) as TextCompilationResult;
 
       const entities = compilationResult.entities;
+
+      //Include the UnknownPackageableElements when updating graph and sending to compute local changes
+      //Otherwise, they get deleted because they dont exist in the CompilationResult
+      const unknownEntities = this.getUnknownPackageableElementsAsEntities();
+      entities.push(...unknownEntities);
+
       this.editorStore.graphState.setMostRecentCompilationGraphHash(
         currentGraphHash,
       );
@@ -477,8 +496,15 @@ export class GraphEditGrammarModeState extends GraphEditorMode {
             compilationResult.warnings,
           )
         : [];
-      this.editorStore.graphState.compilationResultEntities =
-        compilationResult.entities;
+
+      const entities = compilationResult.entities;
+
+      //Include the UnknownPackageableElements when updating graph
+      //Otherwise, they get deleted because they dont exist in the CompilationResult
+      const unknownEntities = this.getUnknownPackageableElementsAsEntities();
+      entities.push(...unknownEntities);
+
+      this.editorStore.graphState.compilationResultEntities = entities;
       this.editorStore.applicationStore.alertService.setBlockingAlert({
         message: 'Leaving text mode and rebuilding graph...',
         showLoading: true,
@@ -557,10 +583,11 @@ export class GraphEditGrammarModeState extends GraphEditorMode {
         this.grammarTextEditorState.setGraphGrammarText(editorGrammar),
       );
     } else {
+      //Exclude UnknownPackageableElements from GrammarText editor mode since they cant be tranformed to PureCode
       const graphGrammar =
         (yield this.editorStore.graphManagerState.graphManager.graphToPureCode(
           this.editorStore.graphManagerState.graph,
-          { pretty: true },
+          { pretty: true, excludeUnknown: true },
         )) as string;
       yield flowResult(
         this.grammarTextEditorState.setGraphGrammarText(graphGrammar),

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

@@ -170,7 +170,7 @@ export class NativeModelImporterEditorState extends ModelImporterEditorState {
       case MODEL_IMPORT_NATIVE_INPUT_TYPE.PURE_PROTOCOL: {
         const graphEntities = this.editorStore.graphManagerState.graphBuildState
           .hasSucceeded
-          ? this.editorStore.graphManagerState.graph.allOwnElements.map(
+          ? this.editorStore.graphManagerState.graph.knownAllOwnElements.map(
               (element) =>
                 this.editorStore.graphManagerState.graphManager.elementToEntity(
                   element,
@@ -187,7 +187,7 @@ export class NativeModelImporterEditorState extends ModelImporterEditorState {
       case MODEL_IMPORT_NATIVE_INPUT_TYPE.ENTITIES: {
         const graphEntities = this.editorStore.graphManagerState.graphBuildState
           .hasSucceeded
-          ? this.editorStore.graphManagerState.graph.allOwnElements.map(
+          ? this.editorStore.graphManagerState.graph.knownAllOwnElements.map(
               (element) =>
                 this.editorStore.graphManagerState.graphManager.elementToEntity(
                   element,
@@ -206,6 +206,7 @@ export class NativeModelImporterEditorState extends ModelImporterEditorState {
         this.modelText =
           (yield this.editorStore.graphManagerState.graphManager.graphToPureCode(
             this.editorStore.graphManagerState.graph,
+            { excludeUnknown: true },
           )) as string;
         break;
       }

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

@@ -31,7 +31,7 @@ import {
   type PackageableElement,
   GRAPH_MANAGER_EVENT,
   isElementReadOnly,
-  INTERNAL__UnknownPackageableElement,
+  INTERNAL__UnknownElement,
 } from '@finos/legend-graph';
 import { DEFAULT_TAB_SIZE } from '@finos/legend-application';
 import type { ElementFileGenerationState } from './ElementFileGenerationState.js';
@@ -201,14 +201,11 @@ export abstract class ElementEditorState extends EditorState {
       );
     } catch (error) {
       assertErrorThrown(error);
-      const isUnknownEntity = isType(
-        this.element,
-        INTERNAL__UnknownPackageableElement,
-      );
+      const isUnknownEntity = isType(this.element, INTERNAL__UnknownElement);
       if (isUnknownEntity) {
         const unknownEntity = guaranteeType(
           this.element,
-          INTERNAL__UnknownPackageableElement,
+          INTERNAL__UnknownElement,
         );
         this.setTextContent(
           JSON.stringify(unknownEntity.content, undefined, DEFAULT_TAB_SIZE),

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

@@ -30,6 +30,7 @@ import {
   assertTrue,
   URL_SEPARATOR,
   filterByType,
+  compareSemVerVersions,
 } from '@finos/legend-shared';
 import { LEGEND_STUDIO_APP_EVENT } from '../../../../../__lib__/LegendStudioEvent.js';
 import {
@@ -48,7 +49,6 @@ import {
   ActionAlertActionType,
   ActionAlertType,
 } from '@finos/legend-application';
-import { compareSemVerVersions } from '@finos/legend-storage';
 import { MASTER_SNAPSHOT_ALIAS } from '@finos/legend-server-depot';
 
 export const LATEST_PROJECT_REVISION = 'Latest Project Revision';

package/src/stores/editor/utils/ModelClassifierUtils.ts

@@ -73,7 +73,7 @@ export enum PACKAGEABLE_ELEMENT_TYPE {
   HOSTED_SERVICE = 'HOSTED_SERVICE',
 
   TEMPORARY__LOCAL_CONNECTION = 'LOCAL_CONNECTION',
-  INTERNAL__UNKNOWN = 'UNKNOWN',
+  INTERNAL__UnknownElement = 'UNKNOWN',
 }
 
 export enum PACKAGEABLE_ELEMENT_GROUP_BY_CATEGORY {