From d13d37a33aba5be2716ee40aff949b45317a5113 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Thu, 17 Oct 2024 22:49:07 +0200
Subject: [PATCH 1/3] Include freedesktop sdk TypeScript extension

---
 Makefile                                |  2 +-
 build-aux/re.sonny.Workbench.Devel.json |  5 +-
 build-aux/re.sonny.Workbench.json       |  5 +-
 build-aux/wip/run.js                    | 14 ++---
 data/app.metainfo.xml                   |  4 ++
 src/cli/main.js                         | 77 ++++++++++++++++++++++++-
 src/langs/css/CssDocument.js            |  2 +-
 src/langs/javascript/biome.json         |  3 +-
 8 files changed, 97 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 12ac5ea7a..d9315993d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL:=/bin/bash -O globstar
 
 setup:
 	flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
-	flatpak install --or-update --user --noninteractive flathub org.gnome.Sdk//47 org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//24.08 org.freedesktop.Sdk.Extension.vala//24.08 org.freedesktop.Sdk.Extension.llvm18//24.08 org.freedesktop.Sdk.Extension.node20//24.08 #org.freedesktop.Sdk.Extension.typescript//24.08
+	flatpak install --or-update --user --noninteractive flathub org.gnome.Sdk//47 org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//24.08 org.freedesktop.Sdk.Extension.vala//24.08 org.freedesktop.Sdk.Extension.llvm18//24.08 org.freedesktop.Sdk.Extension.node20//24.08 org.freedesktop.Sdk.Extension.typescript//24.08
 # flatpak remote-add --user --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo
 # flatpak remote-add --user --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo
 # flatpak install --or-update --user --noninteractive gnome-nightly org.gnome.Sdk//master
diff --git a/build-aux/re.sonny.Workbench.Devel.json b/build-aux/re.sonny.Workbench.Devel.json
index 0bbc6c099..607f7853a 100644
--- a/build-aux/re.sonny.Workbench.Devel.json
+++ b/build-aux/re.sonny.Workbench.Devel.json
@@ -8,10 +8,11 @@
     "org.freedesktop.Sdk.Extension.vala",
     "org.freedesktop.Sdk.Extension.rust-stable",
     "org.freedesktop.Sdk.Extension.llvm18",
-    "org.freedesktop.Sdk.Extension.node20"
+    "org.freedesktop.Sdk.Extension.node20",
+    "org.freedesktop.Sdk.Extension.typescript"
   ],
   "build-options": {
-    "append-path": "/usr/lib/sdk/vala/bin:/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/node20/bin",
+    "append-path": "/usr/lib/sdk/vala/bin:/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/node20/bin:/usr/lib/sdk/typescript/bin",
     "append-ld-library-path": "/usr/lib/sdk/vala/lib"
   },
   "command": "workbench",
diff --git a/build-aux/re.sonny.Workbench.json b/build-aux/re.sonny.Workbench.json
index 13ed0dac4..f8aea1e24 100644
--- a/build-aux/re.sonny.Workbench.json
+++ b/build-aux/re.sonny.Workbench.json
@@ -8,10 +8,11 @@
     "org.freedesktop.Sdk.Extension.vala",
     "org.freedesktop.Sdk.Extension.rust-stable",
     "org.freedesktop.Sdk.Extension.llvm18",
-    "org.freedesktop.Sdk.Extension.node20"
+    "org.freedesktop.Sdk.Extension.node20",
+    "org.freedesktop.Sdk.Extension.typescript"
   ],
   "build-options": {
-    "append-path": "/usr/lib/sdk/vala/bin:/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/node20/bin",
+    "append-path": "/usr/lib/sdk/vala/bin:/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/node20/bin:/usr/lib/sdk/typescript/bin",
     "append-ld-library-path": "/usr/lib/sdk/vala/lib"
   },
   "command": "workbench",
diff --git a/build-aux/wip/run.js b/build-aux/wip/run.js
index 0c4b58dd6..1cdeea95c 100755
--- a/build-aux/wip/run.js
+++ b/build-aux/wip/run.js
@@ -19,13 +19,12 @@ Gio._promisify(
   "wait_check_finish",
 );
 
-// const path = GLib.get_current_dir();
-const path = "/home/sonny/Projects/Workbench";
+const path = GLib.get_current_dir();
 console.debug(programInvocationName, programArgs);
 const argv = minimist(programArgs, { boolean: true });
 console.debug(argv);
 
-const [manifest_path] = argv._;
+const [manifest_path, ...arg] = argv._;
 if (!manifest_path) {
   // eslint-disable-next-line no-restricted-globals
   print(`${programInvocationName} [--verbose] [--debug] MANIFEST`);
@@ -124,7 +123,8 @@ await buildCommand(["meson", "install", "-C", "_build"]);
 // ]);
 
 // starts workbench
-await runCommand([manifest.command]);
+const command = arg.length ? arg : [manifest.command];
+await runCommand(command);
 
 function buildCommand(argv) {
   let PATH =
@@ -165,9 +165,9 @@ async function runCommand(argv) {
       `--bind-mount=/run/user/1000/doc=/run/user/1000/doc/by-app/${flatpak_id}`,
       ...manifest["finish-args"],
 
-      // Non default permissions
-      // see Permissions.js
-      // consider getting installed overrides instead
+      // Non default permissions, see Permissions.js
+      // consider getting installed overrides instead with
+      // flatpak override --user --show re.sonny.Workbench.Devel
       "--share=network",
       "--socket=pulseaudio",
       "--device=input",
diff --git a/data/app.metainfo.xml b/data/app.metainfo.xml
index 346f2565a..707dde48a 100644
--- a/data/app.metainfo.xml
+++ b/data/app.metainfo.xml
@@ -55,7 +55,10 @@
         <p>Library:</p>
         <ul>
           <li>Add "Button Row" demo</li>
+          <li>Add "Gamepad" demo</li>
           <li>Add "List View with Sections" demo</li>
+          <li>Add "List View with a Tree" demo</li>
+          <li>Add "Bottom Sheet" demo</li>
           <li>Update "Spinner" to use AdwSpinner</li>
           <li>Port "Dialog" to Python</li>
           <li>Port "List View" to Python</li>
@@ -91,6 +94,7 @@
           <li>Port "Actions" to Vala</li>
           <li>Port "Dialog" to Vala</li>
           <li>Port "CSS Gradients" to Vala</li>
+          <li>Port "Snapshot" to Vala</li>
         </ul>
         <p>Dependencies:</p>
         <ul>
diff --git a/src/cli/main.js b/src/cli/main.js
index 77ca0f791..8655f9bcd 100644
--- a/src/cli/main.js
+++ b/src/cli/main.js
@@ -87,7 +87,15 @@ const window = new Adw.ApplicationWindow();
 
 function createLSPClients({ root_uri }) {
   return Object.fromEntries(
-    ["javascript", "blueprint", "css", "vala", "rust", "python"].map((id) => {
+    [
+      "javascript",
+      "blueprint",
+      "css",
+      "vala",
+      "rust",
+      "python",
+      "typescript",
+    ].map((id) => {
       const lang = languages.find((language) => language.id === id);
       const lspc = createLSPClient({
         lang,
@@ -344,6 +352,73 @@ async function ci({ filenames }) {
       });
     }
 
+    const file_typescript = demo_dir.get_child("main.ts");
+    if (file_typescript.query_exists(null)) {
+      print(`  ${file_typescript.get_path()}`);
+
+      const uri = file_typescript.get_uri();
+      const languageId = "typescript";
+      let version = 0;
+
+      const [contents] = await file_typescript.load_contents_async(null);
+      const text = new TextDecoder().decode(contents);
+
+      await lsp_clients.typescript._notify("textDocument/didOpen", {
+        textDocument: {
+          uri,
+          languageId,
+          version: version++,
+          text,
+        },
+      });
+
+      const diagnostics = await waitForDiagnostics({
+        uri,
+        lspc: lsp_clients.typescript,
+      });
+      if (diagnostics.length > 0) {
+        printerr(serializeDiagnostics({ diagnostics }));
+        return false;
+      }
+      print(`  ✅ lints`);
+
+      const checks = await checkFile({
+        lspc: lsp_clients.typescript,
+        file: file_typescript,
+        lang: getLanguage("typescript"),
+        uri,
+      });
+      if (!checks) return false;
+
+      const js_object_ids = getCodeObjectIds(text);
+      for (const object_id of js_object_ids) {
+        if (!blueprint_object_ids.includes(object_id)) {
+          print(`  ❌ Reference to inexistant object id "${object_id}"`);
+          return false;
+        }
+      }
+
+      globalThis.workbench = {
+        window,
+        application,
+        builder,
+        template,
+        resolve(path) {
+          return demo_dir.resolve_relative_path(path).get_uri();
+        },
+        preview() {},
+      };
+
+      await import(`file://${file_typescript.get_path()}`);
+      print("  ✅ runs");
+
+      await lsp_clients.typescript._notify("textDocument/didClose", {
+        textDocument: {
+          uri,
+        },
+      });
+    }
+
     const file_vala = demo_dir.get_child("main.vala");
     if (file_vala.query_exists(null)) {
       print(`  ${file_vala.get_path()}`);
diff --git a/src/langs/css/CssDocument.js b/src/langs/css/CssDocument.js
index cced3fce0..733d0cd77 100644
--- a/src/langs/css/CssDocument.js
+++ b/src/langs/css/CssDocument.js
@@ -25,7 +25,7 @@ export class CssDocument extends Document {
       },
     });
 
-    // Biome doesn't support diff - it just returns one edit
+    // GTKCssLanguageServer doesn't support diff - it just returns one edit
     // we don't want to loose the cursor position so we use this
     const state = this.code_view.saveState();
     applyTextEdits(text_edits, this.buffer);
diff --git a/src/langs/javascript/biome.json b/src/langs/javascript/biome.json
index 4786af4fb..ca5b2788e 100644
--- a/src/langs/javascript/biome.json
+++ b/src/langs/javascript/biome.json
@@ -12,7 +12,8 @@
       "recommended": false,
       "correctness": {
         "noUndeclaredVariables": "error",
-        "noUnusedVariables": "warn"
+        "noUnusedVariables": "warn",
+        "noUnusedImports": "warn"
       }
     }
   }

From 473c494f89b3de0b2f16babe48288ba534d32bc9 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Thu, 17 Oct 2024 23:04:59 +0200
Subject: [PATCH 2/3] update ubuntu

---
 .github/workflows/CI.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
index 3899fabbd..88bd3d7a4 100644
--- a/.github/workflows/CI.yaml
+++ b/.github/workflows/CI.yaml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   CI:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-24.10
     steps:
       - uses: actions/checkout@v3
         with:

From cc97d68c8a7342cb3e31879e2d4e77decd128b2b Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Thu, 17 Oct 2024 23:11:03 +0200
Subject: [PATCH 3/3] Revert "update ubuntu"

This reverts commit 473c494f89b3de0b2f16babe48288ba534d32bc9.
---
 .github/workflows/CI.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
index 88bd3d7a4..3899fabbd 100644
--- a/.github/workflows/CI.yaml
+++ b/.github/workflows/CI.yaml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   CI:
-    runs-on: ubuntu-24.10
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v3
         with: