Fix TypeScript typechecking not working

.gitmodules

@@ -8,6 +8,6 @@
 	path = blueprint-compiler
 	url = https://gitlab.gnome.org/jwestman/blueprint-compiler.git
 [submodule "src/langs/typescript/template/gi-types"]
-	path = gi-types
+	path = src/langs/typescript/template/gi-types
 	url = https://gitlab.gnome.org/BrainBlasted/gi-typescript-definitions.git
-	branch = nightly
+	branch = main

src/langs/typescript/template/tsconfig.json

@@ -8,13 +8,16 @@
     "outDir": "compiled_javascript",
     "baseUrl": ".",
     "paths": {
-      "*": ["*", "@pkgdatadir@/langs/typescript/gi-types/*"]
+      "*": [
+        "*",
+        "@pkgdatadir@/langs/typescript/gi-types/*"
+      ]
     },
     "skipLibCheck": true
   },
   "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"
   ]
 }

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

@@ -1,50 +1,17 @@
-// import Adw from "gi://Adw";
-// import Gtk from "gi://Gtk?version=4.0";
-// import GObject from "gi://GObject";
-
-// additional type declarations for GJS
+/// <reference path="../template/gi-types/index.d.ts" />
 
-// additional GJS log utils
-declare function print(...args: any[]): void;
-declare function log(...args: any[]): void;
-
-// GJS pkg global
-declare const pkg: {
-  version: string;
-  name: string;
-};
+import Adw from "gi://Adw";
+import Gtk from "gi://Gtk?version=4.0";
+// import GObject from "gi://GObject";
 
-// old GJS global imports
-// used like: imports.format.printf("...");
-declare module imports {
-  // format import
-  const format: {
-    format(this: String, ...args: any[]): string;
-    printf(fmt: string, ...args: any[]): string;
-    vprintf(fmt: string, args: any[]): string;
+declare global {
+  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;
   };
 }
-
-// gettext import
-declare module "gettext" {
-  export function gettext(id: string): string;
-  export function ngettext(
-    singular: string,
-    plural: string,
-    n: number,
-  ): string;
-}
-
-// TODO: uncomment correct typings after we switch to `ts-for-gir`
-// 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;
-// };
-
-// global workbench object
-declare const workbench: any;