merge current gi.ts rework branch

gjsify · Mar 8, 2024 · e017f12 · e017f12
2 parents 95bd723 + 2158fee
commit e017f12
Show file tree

Hide file tree

Showing 36 changed files with 429 additions and 480 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -5,4 +5,4 @@
 [submodule "types"]
 	path = types
 	url = https://github.com/gjsify/types
-	branch = next
+	branch = next
diff --git a/.yarn/releases/yarn-4.1.0.cjs → .yarn/releases/yarn-4.1.1.cjs b/.yarn/releases/yarn-4.1.0.cjs → .yarn/releases/yarn-4.1.1.cjs
diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typescript",
-  "version": "5.3.3-sdk",
+  "version": "5.4.2-sdk",
   "main": "./lib/typescript.js",
   "type": "commonjs",
   "bin": {

diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -2,4 +2,4 @@ compressionLevel: mixed
 
 enableGlobalCache: false
 
-yarnPath: .yarn/releases/yarn-4.1.0.cjs
+yarnPath: .yarn/releases/yarn-4.1.1.cjs
diff --git a/examples/gjs/adw-1-hello/package.json b/examples/gjs/adw-1-hello/package.json
@@ -22,9 +22,9 @@
   "devDependencies": {
     "@babel/core": "^7.24.0",
     "@rollup/plugin-babel": "^6.0.4",
-    "rollup": "^4.12.0",
-    "typescript": "^5.2.2",
-    "vite": "^5.1.4"
+    "rollup": "^4.12.1",
+    "typescript": "^5.4.2",
+    "vite": "^5.1.5"
   },
   "dependencies": {
     "@girs/adw-1": "workspace:^",

diff --git a/examples/gjs/gio-2-cat/package.json b/examples/gjs/gio-2-cat/package.json
@@ -21,7 +21,7 @@
   "license": "MIT",
   "devDependencies": {
     "esbuild": "^0.20.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   },
   "dependencies": {
     "@girs/gio-2.0": "workspace:^",

diff --git a/examples/gjs/gio-2-dbus/package.json b/examples/gjs/gio-2-dbus/package.json
@@ -24,7 +24,7 @@
   "license": "MIT",
   "devDependencies": {
     "esbuild": "^0.20.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   },
   "dependencies": {
     "@girs/gjs": "workspace:^"

diff --git a/examples/gjs/gio-2-list-model/package.json b/examples/gjs/gio-2-list-model/package.json
@@ -20,6 +20,6 @@
   "license": "MIT",
   "devDependencies": {
     "esbuild": "^0.20.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   }
 }
diff --git a/examples/gjs/glib-2-spawn-command/package.json b/examples/gjs/glib-2-spawn-command/package.json
@@ -23,7 +23,7 @@
   "devDependencies": {
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     "ts-loader": "^9.5.1",
-    "typescript": "^5.2.2",
+    "typescript": "^5.4.2",
     "webpack": "^5.90.3",
     "webpack-cli": "^5.1.4"
   },

diff --git a/examples/gjs/glib-2-variant/package.json b/examples/gjs/glib-2-variant/package.json
@@ -21,6 +21,6 @@
   "license": "MIT",
   "devDependencies": {
     "esbuild": "^0.20.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   }
 }
diff --git a/examples/gjs/gtk-3-browser/package.json b/examples/gjs/gtk-3-browser/package.json
@@ -24,7 +24,7 @@
   "devDependencies": {
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     "ts-loader": "^9.5.1",
-    "typescript": "^5.2.2",
+    "typescript": "^5.4.2",
     "webpack": "^5.90.3",
     "webpack-cli": "^5.1.4"
   },

diff --git a/examples/gjs/gtk-3-builder/package.json b/examples/gjs/gtk-3-builder/package.json
@@ -24,7 +24,7 @@
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     "raw-loader": "^4.0.2",
     "ts-loader": "^9.5.1",
-    "typescript": "^5.2.2",
+    "typescript": "^5.4.2",
     "webpack": "^5.90.3",
     "webpack-cli": "^5.1.4"
   },

diff --git a/examples/gjs/gtk-3-calc/package.json b/examples/gjs/gtk-3-calc/package.json
@@ -21,7 +21,7 @@
   "license": "MIT",
   "devDependencies": {
     "esbuild": "^0.20.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   },
   "dependencies": {
     "@girs/gjs": "workspace:^",

diff --git a/examples/gjs/gtk-3-editor/package.json b/examples/gjs/gtk-3-editor/package.json
@@ -22,7 +22,7 @@
   "devDependencies": {
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     "ts-loader": "^9.5.1",
-    "typescript": "^5.2.2",
+    "typescript": "^5.4.2",
     "webpack": "^5.90.3",
     "webpack-cli": "^5.1.4"
   },

diff --git a/examples/gjs/gtk-3-gettext/package.json b/examples/gjs/gtk-3-gettext/package.json
@@ -21,7 +21,7 @@
   "license": "MIT",
   "devDependencies": {
     "esbuild": "^0.20.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   },
   "dependencies": {
     "@girs/gjs": "workspace:^",

diff --git a/examples/gjs/gtk-3-hello-2/package.json b/examples/gjs/gtk-3-hello-2/package.json
@@ -21,7 +21,7 @@
   "license": "MIT",
   "devDependencies": {
     "esbuild": "^0.20.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   },
   "dependencies": {
     "@girs/gjs": "workspace:^",

diff --git a/examples/gjs/gtk-3-hello/package.json b/examples/gjs/gtk-3-hello/package.json
@@ -23,7 +23,7 @@
   "devDependencies": {
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     "ts-loader": "^9.5.1",
-    "typescript": "^5.2.2",
+    "typescript": "^5.4.2",
     "webpack": "^5.90.3",
     "webpack-cli": "^5.1.4"
   },

diff --git a/examples/gjs/gtk-3-template/package.json b/examples/gjs/gtk-3-template/package.json
@@ -21,7 +21,7 @@
   "license": "MIT",
   "devDependencies": {
     "esbuild": "^0.20.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   },
   "dependencies": {
     "@girs/gjs": "workspace:^",

diff --git a/examples/gjs/gtk-3-webkit/package.json b/examples/gjs/gtk-3-webkit/package.json
@@ -21,7 +21,7 @@
   "license": "MIT",
   "devDependencies": {
     "esbuild": "^0.20.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   },
   "dependencies": {
     "@girs/gjs": "workspace:^",

diff --git a/examples/gjs/gtk-4-application/package.json b/examples/gjs/gtk-4-application/package.json
@@ -21,7 +21,7 @@
   "license": "MIT",
   "devDependencies": {
     "esbuild": "^0.20.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   },
   "dependencies": {
     "@girs/gio-2.0": "workspace:^",

diff --git a/examples/gjs/gtk-4-custom-widget/package.json b/examples/gjs/gtk-4-custom-widget/package.json
@@ -22,7 +22,7 @@
   "devDependencies": {
     "@ts-for-gir/cli": "workspace:^",
     "esbuild": "^0.20.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   },
   "dependencies": {
     "@girs/gio-2.0": "workspace:^",

diff --git a/examples/gjs/gtk-4-list-store/package.json b/examples/gjs/gtk-4-list-store/package.json
@@ -21,7 +21,7 @@
   "license": "MIT",
   "devDependencies": {
     "esbuild": "^0.20.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   },
   "dependencies": {
     "@girs/gio-2.0": "workspace:^",

diff --git a/examples/gjs/gtk-4-template/package.json b/examples/gjs/gtk-4-template/package.json
@@ -22,7 +22,7 @@
   "devDependencies": {
     "@ts-for-gir/cli": "workspace:^",
     "esbuild": "^0.20.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   },
   "dependencies": {
     "@girs/gio-2.0": "workspace:^",

diff --git a/examples/gjs/run-async/package.json b/examples/gjs/run-async/package.json
@@ -20,7 +20,7 @@
   "license": "MIT",
   "devDependencies": {
     "esbuild": "^0.20.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   },
   "dependencies": {
     "@girs/adw-1": "workspace:^",

diff --git a/examples/gjs/soup-3-http/package.json b/examples/gjs/soup-3-http/package.json
@@ -23,7 +23,7 @@
   "license": "MIT",
   "devDependencies": {
     "esbuild": "^0.20.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   },
   "dependencies": {
     "@girs/gio-2.0": "workspace:^",

diff --git a/examples/gjs/soup-3-websocket/package.json b/examples/gjs/soup-3-websocket/package.json
@@ -21,7 +21,7 @@
   "license": "MIT",
   "devDependencies": {
     "esbuild": "^0.20.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   },
   "dependencies": {
     "@girs/gio-2.0": "workspace:^",

diff --git a/examples/gjs/timers/package.json b/examples/gjs/timers/package.json
@@ -21,7 +21,7 @@
   "license": "MIT",
   "devDependencies": {
     "esbuild": "^0.20.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   },
   "dependencies": {
     "@girs/gjs": "workspace:^"

diff --git a/package.json b/package.json
@@ -79,20 +79,20 @@
   ],
   "devDependencies": {
     "@ts-for-gir/cli": "workspace:^",
-    "@typescript-eslint/eslint-plugin": "^7.1.0",
-    "@typescript-eslint/parser": "^7.1.0",
+    "@typescript-eslint/eslint-plugin": "^7.1.1",
+    "@typescript-eslint/parser": "^7.1.1",
     "concurrently": "^8.2.2",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
     "prettier": "^3.2.5",
     "rimraf": "^5.0.5",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   },
   "workspaces": [
     "examples/*/*",
     "packages/*",
     "types/*"
   ],
-  "packageManager": "[email protected].0"
+  "packageManager": "[email protected].1"
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -54,17 +54,17 @@
   ],
   "devDependencies": {
     "@types/inquirer": "^9.0.7",
-    "@types/node": "^20.11.24",
+    "@types/node": "^20.11.25",
     "@types/yargs": "^17.0.32",
-    "@typescript-eslint/eslint-plugin": "^7.1.0",
-    "@typescript-eslint/parser": "^7.1.0",
+    "@typescript-eslint/eslint-plugin": "^7.1.1",
+    "@typescript-eslint/parser": "^7.1.1",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
     "prettier": "^3.2.5",
     "rimraf": "^5.0.5",
     "ts-node": "^10.9.2",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   },
   "dependencies": {
     "@gi.ts/parser": "workspace:^",

diff --git a/packages/generator-base/package.json b/packages/generator-base/package.json
@@ -34,15 +34,15 @@
     "generator"
   ],
   "devDependencies": {
-    "@types/node": "^20.11.24",
-    "@typescript-eslint/eslint-plugin": "^7.1.0",
-    "@typescript-eslint/parser": "^7.1.0",
+    "@types/node": "^20.11.25",
+    "@typescript-eslint/eslint-plugin": "^7.1.1",
+    "@typescript-eslint/parser": "^7.1.1",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
     "prettier": "^3.2.5",
     "rimraf": "^5.0.5",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   },
   "dependencies": {
     "@ts-for-gir/lib": "workspace:^"

diff --git a/packages/generator-html-doc/package.json b/packages/generator-html-doc/package.json
@@ -34,15 +34,15 @@
     "generator"
   ],
   "devDependencies": {
-    "@types/node": "^20.11.24",
-    "@typescript-eslint/eslint-plugin": "^7.1.0",
-    "@typescript-eslint/parser": "^7.1.0",
+    "@types/node": "^20.11.25",
+    "@typescript-eslint/eslint-plugin": "^7.1.1",
+    "@typescript-eslint/parser": "^7.1.1",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
     "prettier": "^3.2.5",
     "rimraf": "^5.0.5",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   },
   "dependencies": {
     "@ts-for-gir/generator-base": "workspace:^",

diff --git a/packages/generator-typescript/package.json b/packages/generator-typescript/package.json
@@ -42,16 +42,16 @@
   ],
   "devDependencies": {
     "@types/ejs": "^3.1.5",
-    "@types/node": "^20.11.24",
+    "@types/node": "^20.11.25",
     "@types/xml2js": "^0.4.14",
-    "@typescript-eslint/eslint-plugin": "^7.1.0",
-    "@typescript-eslint/parser": "^7.1.0",
+    "@typescript-eslint/eslint-plugin": "^7.1.1",
+    "@typescript-eslint/parser": "^7.1.1",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
     "prettier": "^3.2.5",
     "rimraf": "^5.0.5",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   },
   "dependencies": {
     "@ts-for-gir/generator-base": "workspace:^",

diff --git a/packages/generator-typescript/templates/gjs/module-ambient.d.ts b/packages/generator-typescript/templates/gjs/module-ambient.d.ts
@@ -20,5 +20,4 @@ declare module 'gi://<%= name %>?version=<%= version %>' {
 declare module 'gi://<%= name %>' {
     <%- moduleImportStr %>;
     export default <%- girModule.importNamespace -%>;
-}
-<%_ } _%>
+}
diff --git a/packages/lib/package.json b/packages/lib/package.json
@@ -53,15 +53,15 @@
         "@types/ejs": "^3.1.5",
         "@types/eslint": "8.56.5",
         "@types/lodash": "^4.14.202",
-        "@types/node": "^20.11.24",
-        "@typescript-eslint/eslint-plugin": "^7.1.0",
-        "@typescript-eslint/parser": "^7.1.0",
+        "@types/node": "^20.11.25",
+        "@typescript-eslint/eslint-plugin": "^7.1.1",
+        "@typescript-eslint/parser": "^7.1.1",
         "eslint": "^8.57.0",
         "eslint-config-prettier": "^9.1.0",
         "eslint-plugin-prettier": "^5.1.3",
         "prettier": "^3.2.5",
         "rimraf": "^5.0.5",
-        "typescript": "^5.2.2"
+        "typescript": "^5.4.2"
     },
     "dependencies": {
         "@gi.ts/parser": "workspace:^",

diff --git a/packages/parser/package.json b/packages/parser/package.json
@@ -31,12 +31,12 @@
     "fast-xml-parser": "^4.3.5"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^7.1.0",
-    "@typescript-eslint/parser": "^7.1.0",
+    "@typescript-eslint/eslint-plugin": "^7.1.1",
+    "@typescript-eslint/parser": "^7.1.1",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
     "prettier": "^3.2.5",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.2"
   }
 }