Draft: Switch to ts-for-gir for TypeScript definitions

.gitmodules

@@ -9,5 +9,4 @@
 	url = https://gitlab.gnome.org/jwestman/blueprint-compiler.git
 [submodule "src/langs/typescript/template/gi-types"]
 	path = gi-types
-	url = https://gitlab.gnome.org/BrainBlasted/gi-typescript-definitions.git
-	branch = nightly
+	url = https://github.com/vixalien/gi-typescript-definitions.git

build-aux/library.js

@@ -24,6 +24,8 @@ Gio._promisify(
 
 Gio._promisify(Gio.File.prototype, "copy_async", "copy_finish");
 
+Gio._promisify(Gio.Subprocess.prototype, "wait_async", "wait_finish");
+
 const loop = new GLib.MainLoop(null, false);
 
 const [pkgdatadir] = programArgs;
@@ -95,6 +97,9 @@ const demos = [];
     demos.push(demo);
   }
 
+  // compile TypeScript demos to JavaScript
+  await compileTypeScriptFiles();
+
   await Gio.File.new_for_path(pkgdatadir)
     .get_child("demos/index.json")
     .replace_contents_async(
@@ -114,6 +119,22 @@ const demos = [];
     loop.quit();
   });
 
+async function compileTypeScriptFiles() {
+  const tsc_launcher = new Gio.SubprocessLauncher();
+  tsc_launcher.set_cwd(
+    Gio.File.new_for_path(pkgdatadir).get_child("demos").get_path()
+  );
+
+  const tsc = tsc_launcher.spawnv(["tsc"]);
+  await tsc.wait_async(null);
+
+  // TODO: maybe throw when the result is false
+  const successful = tsc.get_successful();
+  tsc_launcher.close();
+
+  if (!successful) throw new Error("One or several errors happened while compiling TypeScript demos to JavaScript")
+}
+
 async function copyDemo(source, destination) {
   try {
     destination.make_directory_with_parents(null);

src/langs/javascript/template/jsconfig.json

@@ -15,7 +15,7 @@
   },
   "include": [
     "main.js",
-    "@pkgdatadir@/langs/typescript/types/ambient.d.ts",
+    "@pkgdatadir@/langs/typescript/types/workbench.d.ts",
     "@pkgdatadir@/langs/typescript/gi-types/gi.d.ts"
   ]
 }

src/langs/typescript/meson.build

@@ -5,10 +5,18 @@ configure_file(
   configuration: bin_conf,
 )
 
-install_data(
-  ['types/ambient.d.ts'],
-  install_dir: join_paths(pkgdatadir, 'langs/typescript'),
-  preserve_path: true,
+configure_file(
+  input: 'template/tsconfig.demos.json',
+  output: 'tsconfig.json',
+  install_dir: join_paths(pkgdatadir, 'demos'),
+  configuration: bin_conf,
+)
+
+configure_file(
+  input: 'types/workbench.d.ts',
+  output: 'workbench.d.ts',
+  install_dir: join_paths(pkgdatadir, 'langs/typescript/types'),
+  configuration: bin_conf,
 )
 
 install_subdir(

src/langs/typescript/template/tsconfig.demos.json

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "module": "ES2022",
+    "moduleResolution": "Bundler",
+    "target": "ES2022",
+    "skipLibCheck": true,
+    "lib": ["ES2022"],
+  },
+  "include": [
+    "./**/*.ts",
+    "@pkgdatadir@/langs/typescript/gi-types/index.d.ts",
+    "@pkgdatadir@/langs/typescript/types/workbench.d.ts",
+  ]
+}

src/langs/typescript/template/tsconfig.json

@@ -1,20 +1,16 @@
 {
   "compilerOptions": {
-    "module": "ESNext",
+    "module": "ES2022",
     "moduleResolution": "Bundler",
-    // TODO: should probably be fixed to ES2023, or whatever standard is
-    // currently supported by the latest GJS
-    "target": "ESNext",
+    "target": "ES2022",
     "outDir": "compiled_javascript",
     "baseUrl": ".",
-    "paths": {
-      "*": ["*", "@pkgdatadir@/langs/typescript/gi-types/*"]
-    },
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "lib": ["ES2022"]
   },
   "include": [
     "main.ts",
-    "@pkgdatadir@/langs/typescript/types/ambient.d.ts",
-    "@pkgdatadir@/langs/typescript/gi-types/gi.d.ts"
+    "@pkgdatadir@/langs/typescript/gi-types/index.d.ts",
+    "@pkgdatadir@/langs/typescript/types/workbench.d.ts"
   ]
 }

src/langs/typescript/types/workbench.d.ts

@@ -0,0 +1,20 @@
+/// <reference path="@pkgdatadir@/langs/typescript/gi-types/adw-1.d.ts" />
+/// <reference path="@pkgdatadir@/langs/typescript/gi-types/gtk-4.0.d.ts" />
+/// <reference path="@pkgdatadir@/langs/typescript/gi-types/gobject-2.0.d.ts" />
+
+import Gtk from "gi://Gtk?version=4.0";
+import Adw from "gi://Adw";
+import GObject from "gi://GObject";
+
+declare global {
+  // global workbench object
+  declare const workbench: {
+    window: Adw.ApplicationWindow;
+    application: Adw.Application;
+    builder: Gtk.Builder;
+    template: string;
+    resolve(path: string): string;
+    preview(object: Gtk.Widget): void;
+    build(params: Record<string, Function | GObject.Object>): void;
+  };
+}