New GUI/IDE build script support

.github/workflows/release.yml

@@ -106,7 +106,7 @@ jobs:
         run: ./run git-clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - run: ./run  --upload-artifacts ${{ runner.os == 'Linux' }} wasm build
+      - run: ./run wasm build --wasm-upload-artifact ${{ runner.os == 'Linux' }}
         env:
           ENSO_AG_GRID_LICENSE_KEY: ${{ secrets.ENSO_AG_GRID_LICENSE_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -91,14 +91,17 @@ bench-report*.xml
 ## Binaries ##
 ##############
 
+/built-distribution/
 /enso
 /project-manager
-*.exe
 /enso.exp
 /enso.lib
+
+*.dll
+*.exe
 *.pdb
+*.so
 *.jar
-/built-distribution/
 
 
 #########

.prettierignore

@@ -40,5 +40,9 @@ ci-build/
 enso/
 
 # Popular IDEs
-.idea
 .bsp
+.idea
+.vscode
+
+# Stray files generated during build
+svm_*.md

.vscode/settings.json

@@ -1,10 +1,15 @@
 {
-  "rust-analyzer.linkedProjects": ["./app/gui2/rust-ffi/Cargo.toml"],
+  "rust-analyzer.linkedProjects": [
+    "./app/gui2/rust-ffi/Cargo.toml"
+  ],
   "vue.complete.casing.status": false,
   "vue.complete.casing.props": "camel",
   "vue.complete.casing.tags": "pascal",
   "auto-snippets.snippets": [
-    { "language": "vue", "snippet": "Vue single-file component" }
+    {
+      "language": "vue",
+      "snippet": "Vue single-file component"
+    }
   ],
   "typescript.tsdk": "node_modules/typescript/lib",
   "eslint.experimental.useFlatConfig": true,
@@ -18,5 +23,6 @@
   ],
   "files.watcherExclude": {
     "**/target": true
-  }
-}
+  },
+  "cmake.configureOnOpen": false
+}

app/gui2/package.json

@@ -9,7 +9,7 @@
   },
   "scripts": {
     "dev": "vite",
-    "build": "run-p typecheck build-only",
+    "build": "npm --workspace enso-authentication run compile && run-p typecheck build-only",
     "preview": "vite preview",
     "test:unit": "vitest",
     "test:e2e": "playwright test",

app/gui2/shared/yjsModel.ts

@@ -97,12 +97,12 @@ export class DistributedModule {
   }
 
   insertNewNode(offset: number, content: string, meta: NodeMetadata): ExprId {
-    const range = [offset, offset + content.length]
+    const range = [offset, offset + content.length] as const
     const newId = random.uuidv4() as ExprId
     this.transact(() => {
       this.doc.contents.insert(offset, content + '\n')
-      const start = Y.createRelativePositionFromTypeIndex(this.doc.contents, range[0]!)
-      const end = Y.createRelativePositionFromTypeIndex(this.doc.contents, range[1]!)
+      const start = Y.createRelativePositionFromTypeIndex(this.doc.contents, range[0], -1)
+      const end = Y.createRelativePositionFromTypeIndex(this.doc.contents, range[1])
       this.doc.idMap.set(newId, encodeRange([start, end]))
       this.doc.metadata.set(newId, meta)
     })
@@ -281,7 +281,7 @@ export class IdMap {
         // For all remaining expressions, we need to write them into the map.
         if (!this.accessed.has(expr)) return
         const range = IdMap.rangeForKey(key)
-        const start = Y.createRelativePositionFromTypeIndex(this.contents, range[0])
+        const start = Y.createRelativePositionFromTypeIndex(this.contents, range[0], -1)
         const end = Y.createRelativePositionFromTypeIndex(this.contents, range[1])
         const encoded = encodeRange([start, end])
         this.yMap.set(expr, encoded)

app/gui2/src/main.ts

@@ -5,6 +5,7 @@ const INITIAL_URL_KEY = `Enso-initial-url`
 import './assets/main.css'
 
 import { basicSetup } from 'codemirror'
+import * as dashboard from 'enso-authentication'
 import { isMac } from 'lib0/environment'
 import { decodeQueryParams } from 'lib0/url'
 import { createPinia } from 'pinia'
@@ -46,8 +47,6 @@ function stopApp() {
 
 const appRunner = { runApp, stopApp }
 
-const dashboard = await import('enso-authentication')
-
 /** The entrypoint into the IDE. */
 function main() {
   /** Note: Signing out always redirects to `/`. It is impossible to make this work,

app/gui2/src/stores/graph.ts

@@ -154,7 +154,7 @@ export const useGraphStore = defineStore('graph', () => {
       rootSpan: stmt.expression,
       position: meta == null ? Vec2.Zero() : new Vec2(meta.x, -meta.y),
       docRange: [
-        Y.createRelativePositionFromTypeIndex(text, stmt.exprOffset),
+        Y.createRelativePositionFromTypeIndex(text, stmt.exprOffset, -1),
         Y.createRelativePositionFromTypeIndex(text, stmt.exprOffset + stmt.expression.length),
       ],
     }

app/gui2/ydoc-server/languageServerSession.ts

@@ -349,16 +349,18 @@ class ModulePersistence extends ObservableV2<{ removed: () => void }> {
       newContent += synced.code
     }
 
-    newContent += META_TAG + '\n'
-
     const metaStartLine = (newContent.match(/\n/g) ?? []).length
+    let metaContent = META_TAG + '\n'
 
-    if (idMapKeys != null || (contentDelta && contentDelta.length > 0)) {
+    if (
+      idMapKeys != null ||
+      synced.idMapJson == null ||
+      (contentDelta && contentDelta.length > 0)
+    ) {
       const idMapJson = json.stringify(idMapToArray(this.doc.idMap))
-      allEdits.push(...applyDiffAsTextEdits(metaStartLine, synced.idMapJson ?? '', idMapJson))
-      newContent += idMapJson + '\n'
+      metaContent += idMapJson + '\n'
     } else {
-      newContent += synced.idMapJson + '\n'
+      metaContent += (synced.idMapJson ?? '[]') + '\n'
     }
 
     const nodeMetadata = this.syncedMeta.ide.node
@@ -385,14 +387,15 @@ class ModulePersistence extends ObservableV2<{ removed: () => void }> {
       }
 
       const metadataJson = json.stringify(this.syncedMeta)
-      allEdits.push(
-        ...applyDiffAsTextEdits(metaStartLine + 1, synced.metadataJson ?? '', metadataJson),
-      )
-      newContent += metadataJson
+      metaContent += metadataJson
     } else {
-      newContent += synced.metadataJson
+      metaContent += synced.metadataJson ?? '{}'
     }
 
+    const oldMetaContent = this.syncedContent.slice(synced.code.length)
+    allEdits.push(...applyDiffAsTextEdits(metaStartLine, oldMetaContent, metaContent))
+    newContent += metaContent
+
     const newVersion = computeTextChecksum(newContent)
 
     if (DEBUG_LOG_SYNC) {

app/ide-desktop/lib/client/electron-builder-config.ts

@@ -99,7 +99,7 @@ export function createElectronBuilderConfig(passedArgs: Arguments): electronBuil
         extraMetadata: {
             version: BUILD_INFO.version,
         },
-        copyright: 'Copyright © 2022 ${author}.',
+        copyright: `Copyright © ${new Date().getFullYear()} ${common.COMPANY_NAME}`,
         artifactName: 'enso-${os}-${version}.${ext}',
         /** Definitions of URL {@link electronBuilder.Protocol} schemes used by the IDE.
          *

app/ide-desktop/lib/client/src/bin/server.ts

@@ -100,6 +100,7 @@ export class Server {
                         logger.error(`Error creating server:`, err.http)
                         reject(err)
                     }
+                    // Prepare the YDoc server access point for the new Vue-based GUI.
                     if (httpServer) {
                         ydocServer.createGatewayServer(httpServer)
                     }

app/ide-desktop/lib/common/src/index.ts

@@ -18,6 +18,9 @@ export const DEEP_LINK_SCHEME = 'enso'
 /** Name of the product. */
 export const PRODUCT_NAME = 'Enso'
 
+/** Company name, used as the copyright holder. */
+export const COMPANY_NAME = 'New Byte Order sp. z o.o.'
+
 /** COOP, COEP, and CORP headers: https://web.dev/coop-coep/
  *
  * These are required to increase the resolution of `performance.now()` timers,

app/ide-desktop/lib/dashboard/src/authentication/package.json

@@ -9,6 +9,7 @@
     "./tailwind.css": "./tailwind.css"
   },
   "scripts": {
+    "compile": "tsc",
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {

app/ide-desktop/lib/types/modules.d.ts

@@ -185,11 +185,7 @@ declare module 'create-servers' {
         option: CreateServersOptions,
         // The types come from a third-party API and cannot be changed.
         // eslint-disable-next-line no-restricted-syntax
-        handler: (
-            // eslint-disable-next-line no-restricted-syntax
-            err: HttpError | undefined,
-            servers: CreatedServers
-        ) => void
+        handler: (err: HttpError | undefined, servers: CreatedServers) => void
     ): unknown
 }
 

build-config.yaml

@@ -6,7 +6,7 @@ required-versions:
   # NB. The Rust version is pinned in rust-toolchain.toml.
   # NB. The Node version is pinned in .node-version.
   cargo-watch: ^8.1.1
-  wasm-pack: ^0.10.2
+  wasm-pack: ^0.12.1
 #  TODO [mwu]: Script can install `flatc` later on (if `conda` is present), so this is not required. However it should
 #              be required, if `conda` is missing.
 #  flatc: =1.12.0

build/build/paths.yaml

@@ -15,6 +15,8 @@
       shader-tools.yml:
   app/:
     gui/:
+    gui2/: # The new, Vue-based GUI.
+      dist/:
     ide-desktop/:
       lib/:
         client/:
@@ -57,6 +59,9 @@
         index.js:
         style.css:
 
+    gui2/:
+      assets/:
+
     # Final WASM artifacts in `dist` directory.
     wasm/:
       dynamic-assets/: # Assets used by the WASM application.

build/build/src/ci_gen.rs

@@ -445,6 +445,7 @@ pub fn gui() -> Result<Workflow> {
     workflow.add(PRIMARY_OS, job::Lint);
     workflow.add(PRIMARY_OS, job::WasmTest);
     workflow.add(PRIMARY_OS, job::NativeTest);
+    workflow.add(PRIMARY_OS, job::NewGuiTest);
 
     // FIXME: Integration tests are currently always failing.
     //        The should be reinstated when fixed.
@@ -461,10 +462,14 @@ pub fn gui() -> Result<Workflow> {
             let _wasm_job = workflow.add(os, job::BuildWasm);
         }
         let project_manager_job = workflow.add(os, job::BuildBackend);
-        workflow.add_customized(os, job::PackageIde, |job| {
+        workflow.add_customized(os, job::PackageOldIde, |job| {
             job.needs.insert(wasm_job_linux.clone());
-            job.needs.insert(project_manager_job);
+            job.needs.insert(project_manager_job.clone());
         });
+        workflow.add_customized(os, job::PackageNewIde, |job| {
+            job.needs.insert(project_manager_job.clone());
+        });
+        workflow.add(os, job::NewGuiBuild);
     }
     Ok(workflow)
 }

build/build/src/ci_gen/job.rs

@@ -105,6 +105,22 @@ impl JobArchetype for NativeTest {
     }
 }
 
+#[derive(Clone, Copy, Debug)]
+pub struct NewGuiTest;
+impl JobArchetype for NewGuiTest {
+    fn job(&self, os: OS) -> Job {
+        plain_job(&os, "New (Vue) GUI tests", "gui2 test")
+    }
+}
+
+#[derive(Clone, Copy, Debug)]
+pub struct NewGuiBuild;
+impl JobArchetype for NewGuiBuild {
+    fn job(&self, os: OS) -> Job {
+        plain_job(&os, "New (Vue) GUI build", "gui2 build")
+    }
+}
+
 #[derive(Clone, Copy, Debug)]
 pub struct WasmTest;
 impl JobArchetype for WasmTest {
@@ -132,7 +148,7 @@ impl JobArchetype for BuildWasm {
         plain_job_customized(
             &os,
             "Build GUI (WASM)",
-            " --upload-artifacts ${{ runner.os == 'Linux' }} wasm build",
+            "wasm build --wasm-upload-artifact ${{ runner.os == 'Linux' }}",
             |step| vec![step.with_secret_exposed(crate::env::ENSO_AG_GRID_LICENSE_KEY)],
         )
     }
@@ -222,18 +238,31 @@ pub fn expose_os_specific_signing_secret(os: OS, step: Step) -> Step {
 }
 
 #[derive(Clone, Copy, Debug)]
-pub struct PackageIde;
-impl JobArchetype for PackageIde {
+pub struct PackageOldIde;
+impl JobArchetype for PackageOldIde {
     fn job(&self, os: OS) -> Job {
         plain_job_customized(
             &os,
-            "Package IDE",
+            "Package Old IDE",
             "ide build --wasm-source current-ci-run --backend-source current-ci-run",
             |step| vec![expose_os_specific_signing_secret(os, step)],
         )
     }
 }
 
+#[derive(Clone, Copy, Debug)]
+pub struct PackageNewIde;
+impl JobArchetype for PackageNewIde {
+    fn job(&self, os: OS) -> Job {
+        plain_job_customized(
+            &os,
+            "Package New IDE",
+            "ide2 build --backend-source current-ci-run --gui2-upload-artifact false",
+            |step| vec![expose_os_specific_signing_secret(os, step)],
+        )
+    }
+}
+
 #[derive(Clone, Copy, Debug)]
 pub struct CiCheckBackend;
 impl JobArchetype for CiCheckBackend {