fix(gir): correct name of astal4 types

2024-12-19 20:54:26 -05:00 · 2024-12-19 20:54:26 -05:00 · 93547b18fa
commit 93547b18fa
parent 229018ec9f
5 changed files with 315 additions and 352 deletions
--- a/apps/update-sources/src/node-modules.ts
+++ b/apps/update-sources/src/node-modules.ts
@ -61,8 +61,7 @@ export default async() => {
    for (const path of packages) {
        if (
            path.name === 'package.json' &&
-            !path.parentPath.includes('node_modules') &&
-            !path.parentPath.includes('mk-types') // FIXME: latest breaks
+            !path.parentPath.includes('node_modules')
        ) {
            await updatePackageJson(path.parentPath, updates);

--- a/lib/pkgs/default.nix
+++ b/lib/pkgs/default.nix
@ -42,6 +42,8 @@ in {
          then "AstalIO-0.1"
          else if package.name == "astal-3.0.0"
          then "Astal-3.0"
+          else if package.name == "astal-4.0.0"
+          then "Astal-4.0"
          else (concatMapStrings capitalise (splitString "-" package.pname)) + "-0.1";
      })
      packages;
--- a/lib/pkgs/mk-types/default.nix
+++ b/lib/pkgs/mk-types/default.nix
@ -7,22 +7,27 @@
  ...
 }: let
  inherit (lib) concatMapStringsSep;
+
+  buildPhase = ''
+    npx @ts-for-gir/cli generate ${concatMapStringsSep " " (p: p.girName) withGirNames} \
+        ${concatMapStringsSep "\n" (p: "-g ${p.package.dev}/share/gir-1.0 \\") withGirNames}
+        -g ${ts-for-gir-src}/girs \
+        --ignoreVersionConflicts \
+        -o ./types
+  '';
 in
  buildNpmPackage {
    pname = "${pname}-types";
    version = "0.0.0";

-    npmDepsHash = "sha256-3ll4Xd5F8ZH/7q/gOF0jgerM6QRk71d93XIwtDssfxU=";
+    npmDepsHash = "sha256-QqLwPJJbAeiGMKUwhpUL1LME0DYm/rIgu8pAyt98KVI=";

    src = ./.;
    dontNpmBuild = true;

    buildPhase = ''
-      npx @ts-for-gir/cli generate ${concatMapStringsSep " " (p: p.girName) withGirNames} \
-          ${concatMapStringsSep "\n" (p: "-g ${p.package.dev}/share/gir-1.0 \\") withGirNames}
-          -g ${ts-for-gir-src}/girs \
-          --ignoreVersionConflicts \
-          -o ./types
+      echo -e '\n${buildPhase}\n'
+      ${buildPhase}
    '';

    installPhase = ''
--- a/lib/pkgs/mk-types/package-lock.json
+++ b/lib/pkgs/mk-types/package-lock.json
@ -5,7 +5,7 @@
    "packages": {
        "": {
            "dependencies": {
-                "@ts-for-gir/cli": "4.0.0-beta.16"
+                "@ts-for-gir/cli": "4.0.0-beta.19"
            }
        },
        "node_modules/@babel/code-frame": {
@ -119,15 +119,243 @@
                "node": ">=12.0.0"
            }
        },
+        "node_modules/@inquirer/checkbox": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.0.3.tgz",
+            "integrity": "sha512-CEt9B4e8zFOGtc/LYeQx5m8nfqQeG/4oNNv0PUvXGG0mys+wR/WbJ3B4KfSQ4Fcr3AQfpiuFOi3fVvmPfvNbxw==",
+            "license": "MIT",
+            "dependencies": {
+                "@inquirer/core": "^10.1.1",
+                "@inquirer/figures": "^1.0.8",
+                "@inquirer/type": "^3.0.1",
+                "ansi-escapes": "^4.3.2",
+                "yoctocolors-cjs": "^2.1.2"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "peerDependencies": {
+                "@types/node": ">=18"
+            }
+        },
+        "node_modules/@inquirer/confirm": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.0.tgz",
+            "integrity": "sha512-osaBbIMEqVFjTX5exoqPXs6PilWQdjaLhGtMDXMXg/yxkHXNq43GlxGyTA35lK2HpzUgDN+Cjh/2AmqCN0QJpw==",
+            "license": "MIT",
+            "dependencies": {
+                "@inquirer/core": "^10.1.1",
+                "@inquirer/type": "^3.0.1"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "peerDependencies": {
+                "@types/node": ">=18"
+            }
+        },
+        "node_modules/@inquirer/core": {
+            "version": "10.1.1",
+            "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.1.tgz",
+            "integrity": "sha512-rmZVXy9iZvO3ZStEe/ayuuwIJ23LSF13aPMlLMTQARX6lGUBDHGV8UB5i9MRrfy0+mZwt5/9bdy8llszSD3NQA==",
+            "license": "MIT",
+            "dependencies": {
+                "@inquirer/figures": "^1.0.8",
+                "@inquirer/type": "^3.0.1",
+                "ansi-escapes": "^4.3.2",
+                "cli-width": "^4.1.0",
+                "mute-stream": "^2.0.0",
+                "signal-exit": "^4.1.0",
+                "strip-ansi": "^6.0.1",
+                "wrap-ansi": "^6.2.0",
+                "yoctocolors-cjs": "^2.1.2"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/@inquirer/editor": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.0.tgz",
+            "integrity": "sha512-Z3LeGsD3WlItDqLxTPciZDbGtm0wrz7iJGS/uUxSiQxef33ZrBq7LhsXg30P7xrWz1kZX4iGzxxj5SKZmJ8W+w==",
+            "license": "MIT",
+            "dependencies": {
+                "@inquirer/core": "^10.1.1",
+                "@inquirer/type": "^3.0.1",
+                "external-editor": "^3.1.0"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "peerDependencies": {
+                "@types/node": ">=18"
+            }
+        },
+        "node_modules/@inquirer/expand": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.3.tgz",
+            "integrity": "sha512-MDszqW4HYBpVMmAoy/FA9laLrgo899UAga0itEjsYrBthKieDZNc0e16gdn7N3cQ0DSf/6zsTBZMuDYDQU4ktg==",
+            "license": "MIT",
+            "dependencies": {
+                "@inquirer/core": "^10.1.1",
+                "@inquirer/type": "^3.0.1",
+                "yoctocolors-cjs": "^2.1.2"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "peerDependencies": {
+                "@types/node": ">=18"
+            }
+        },
        "node_modules/@inquirer/figures": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.6.tgz",
-            "integrity": "sha512-yfZzps3Cso2UbM7WlxKwZQh2Hs6plrbjs1QnzQDZhK2DgyCo6D8AaHps9olkNcUFlcYERMqU3uJSp1gmy3s/qQ==",
+            "version": "1.0.8",
+            "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.8.tgz",
+            "integrity": "sha512-tKd+jsmhq21AP1LhexC0pPwsCxEhGgAkg28byjJAd+xhmIs8LUX8JbUc3vBf3PhLxWiB5EvyBE5X7JSPAqMAqg==",
            "license": "MIT",
            "engines": {
                "node": ">=18"
            }
        },
+        "node_modules/@inquirer/input": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.1.0.tgz",
+            "integrity": "sha512-16B8A9hY741yGXzd8UJ9R8su/fuuyO2e+idd7oVLYjP23wKJ6ILRIIHcnXe8/6AoYgwRS2zp4PNsW/u/iZ24yg==",
+            "license": "MIT",
+            "dependencies": {
+                "@inquirer/core": "^10.1.1",
+                "@inquirer/type": "^3.0.1"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "peerDependencies": {
+                "@types/node": ">=18"
+            }
+        },
+        "node_modules/@inquirer/number": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.3.tgz",
+            "integrity": "sha512-HA/W4YV+5deKCehIutfGBzNxWH1nhvUC67O4fC9ufSijn72yrYnRmzvC61dwFvlXIG1fQaYWi+cqNE9PaB9n6Q==",
+            "license": "MIT",
+            "dependencies": {
+                "@inquirer/core": "^10.1.1",
+                "@inquirer/type": "^3.0.1"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "peerDependencies": {
+                "@types/node": ">=18"
+            }
+        },
+        "node_modules/@inquirer/password": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.3.tgz",
+            "integrity": "sha512-3qWjk6hS0iabG9xx0U1plwQLDBc/HA/hWzLFFatADpR6XfE62LqPr9GpFXBkLU0KQUaIXZ996bNG+2yUvocH8w==",
+            "license": "MIT",
+            "dependencies": {
+                "@inquirer/core": "^10.1.1",
+                "@inquirer/type": "^3.0.1",
+                "ansi-escapes": "^4.3.2"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "peerDependencies": {
+                "@types/node": ">=18"
+            }
+        },
+        "node_modules/@inquirer/prompts": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.2.0.tgz",
+            "integrity": "sha512-ZXYZ5oGVrb+hCzcglPeVerJ5SFwennmDOPfXq1WyeZIrPGySLbl4W6GaSsBFvu3WII36AOK5yB8RMIEEkBjf8w==",
+            "license": "MIT",
+            "dependencies": {
+                "@inquirer/checkbox": "^4.0.3",
+                "@inquirer/confirm": "^5.1.0",
+                "@inquirer/editor": "^4.2.0",
+                "@inquirer/expand": "^4.0.3",
+                "@inquirer/input": "^4.1.0",
+                "@inquirer/number": "^3.0.3",
+                "@inquirer/password": "^4.0.3",
+                "@inquirer/rawlist": "^4.0.3",
+                "@inquirer/search": "^3.0.3",
+                "@inquirer/select": "^4.0.3"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "peerDependencies": {
+                "@types/node": ">=18"
+            }
+        },
+        "node_modules/@inquirer/rawlist": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.0.3.tgz",
+            "integrity": "sha512-5MhinSzfmOiZlRoPezfbJdfVCZikZs38ja3IOoWe7H1dxL0l3Z2jAUgbBldeyhhOkELdGvPlBfQaNbeLslib1w==",
+            "license": "MIT",
+            "dependencies": {
+                "@inquirer/core": "^10.1.1",
+                "@inquirer/type": "^3.0.1",
+                "yoctocolors-cjs": "^2.1.2"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "peerDependencies": {
+                "@types/node": ">=18"
+            }
+        },
+        "node_modules/@inquirer/search": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.0.3.tgz",
+            "integrity": "sha512-mQTCbdNolTGvGGVCJSI6afDwiSGTV+fMLPEIMDJgIV6L/s3+RYRpxt6t0DYnqMQmemnZ/Zq0vTIRwoHT1RgcTg==",
+            "license": "MIT",
+            "dependencies": {
+                "@inquirer/core": "^10.1.1",
+                "@inquirer/figures": "^1.0.8",
+                "@inquirer/type": "^3.0.1",
+                "yoctocolors-cjs": "^2.1.2"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "peerDependencies": {
+                "@types/node": ">=18"
+            }
+        },
+        "node_modules/@inquirer/select": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.0.3.tgz",
+            "integrity": "sha512-OZfKDtDE8+J54JYAFTUGZwvKNfC7W/gFCjDkcsO7HnTH/wljsZo9y/FJquOxMy++DY0+9l9o/MOZ8s5s1j5wmw==",
+            "license": "MIT",
+            "dependencies": {
+                "@inquirer/core": "^10.1.1",
+                "@inquirer/figures": "^1.0.8",
+                "@inquirer/type": "^3.0.1",
+                "ansi-escapes": "^4.3.2",
+                "yoctocolors-cjs": "^2.1.2"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "peerDependencies": {
+                "@types/node": ">=18"
+            }
+        },
+        "node_modules/@inquirer/type": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.1.tgz",
+            "integrity": "sha512-+ksJMIy92sOAiAccGpcKZUc3bYO07cADnscIxHBknEm3uNts3movSmBofc1908BNy5edKscxYeAdaX1NXkHS6A==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "peerDependencies": {
+                "@types/node": ">=18"
+            }
+        },
        "node_modules/@isaacs/cliui": {
            "version": "8.0.2",
            "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@ -225,20 +453,21 @@
            }
        },
        "node_modules/@ts-for-gir/cli": {
-            "version": "4.0.0-beta.16",
-            "resolved": "https://registry.npmjs.org/@ts-for-gir/cli/-/cli-4.0.0-beta.16.tgz",
-            "integrity": "sha512-E5T6NOdmrkRw3b7SyaZco5g7udMcg8kbCNnxgASLQj7VC0cxiwxLi/z7ALYjmbB1W5xhuensauq1yh5rLUWAXA==",
+            "version": "4.0.0-beta.19",
+            "resolved": "https://registry.npmjs.org/@ts-for-gir/cli/-/cli-4.0.0-beta.19.tgz",
+            "integrity": "sha512-27xIA3m8fo8QK5mRuK5ZLFnd30wUFGAj45qUjJuLqT8a9pkMUPPKfHBpH+rggvZn4syd80hAfYzJ9oCCxv/fCA==",
            "license": "Apache-2.0",
            "dependencies": {
                "@gi.ts/parser": "^2.0.0",
-                "@ts-for-gir/generator-base": "^4.0.0-beta.16",
-                "@ts-for-gir/generator-html-doc": "^4.0.0-beta.16",
-                "@ts-for-gir/generator-typescript": "^4.0.0-beta.16",
-                "@ts-for-gir/lib": "^4.0.0-beta.16",
+                "@inquirer/prompts": "^7.0.1",
+                "@ts-for-gir/generator-base": "^4.0.0-beta.19",
+                "@ts-for-gir/generator-html-doc": "^4.0.0-beta.19",
+                "@ts-for-gir/generator-typescript": "^4.0.0-beta.19",
+                "@ts-for-gir/lib": "^4.0.0-beta.19",
                "colorette": "^2.0.20",
                "cosmiconfig": "^9.0.0",
                "glob": "^11.0.0",
-                "inquirer": "^9.3.6",
+                "inquirer": "^12.0.1",
                "prettier": "^3.3.3",
                "yargs": "^17.7.2"
            },
@ -250,38 +479,38 @@
            }
        },
        "node_modules/@ts-for-gir/generator-base": {
-            "version": "4.0.0-beta.16",
-            "resolved": "https://registry.npmjs.org/@ts-for-gir/generator-base/-/generator-base-4.0.0-beta.16.tgz",
-            "integrity": "sha512-qNahOOm2aRC5w6gqk5xjb0MvyxtYwhTFDvHwuWXEUJ+EoFeWSi95ZYkvivvowsoAiQ5W805FMXzJtt4P72O0Hw==",
+            "version": "4.0.0-beta.19",
+            "resolved": "https://registry.npmjs.org/@ts-for-gir/generator-base/-/generator-base-4.0.0-beta.19.tgz",
+            "integrity": "sha512-q/LrZnxfaVe7iLTuCOsEeSjySxoBvG38FBAzsaHyQQ97N04lnW2j1fkjgStloYyIxnQrcy9lW9ntLBNagTBBHw==",
            "license": "Apache-2.0",
            "dependencies": {
-                "@ts-for-gir/lib": "^4.0.0-beta.16"
+                "@ts-for-gir/lib": "^4.0.0-beta.19"
            },
            "engines": {
                "node": ">=18"
            }
        },
        "node_modules/@ts-for-gir/generator-html-doc": {
-            "version": "4.0.0-beta.16",
-            "resolved": "https://registry.npmjs.org/@ts-for-gir/generator-html-doc/-/generator-html-doc-4.0.0-beta.16.tgz",
-            "integrity": "sha512-2gCEUuSsvbUEdcAcU1LKFWawC56TYg4CmHCswzDjwPeEpOrzq1tweoaW2muYTg3COcF58Jax5/TWnJ88TmFdyA==",
+            "version": "4.0.0-beta.19",
+            "resolved": "https://registry.npmjs.org/@ts-for-gir/generator-html-doc/-/generator-html-doc-4.0.0-beta.19.tgz",
+            "integrity": "sha512-alyXMQEmvTmQcyTAn8edUTyFcVlg7enm8Iw0XQpN7aK6KjupANGoz7/nQi2Z0hYbcNmOxYoLzUA7wy9Jqk56/w==",
            "license": "Apache-2.0",
            "dependencies": {
-                "@ts-for-gir/generator-base": "^4.0.0-beta.16",
-                "@ts-for-gir/lib": "^4.0.0-beta.16"
+                "@ts-for-gir/generator-base": "^4.0.0-beta.19",
+                "@ts-for-gir/lib": "^4.0.0-beta.19"
            },
            "engines": {
                "node": ">=18"
            }
        },
        "node_modules/@ts-for-gir/generator-typescript": {
-            "version": "4.0.0-beta.16",
-            "resolved": "https://registry.npmjs.org/@ts-for-gir/generator-typescript/-/generator-typescript-4.0.0-beta.16.tgz",
-            "integrity": "sha512-BHXqfaqH5yOXD9ckL6h8ZGn17U7SkajksS4/KuQCtAhURjpXT3xw7mKw5W3FObhvFSkiaonPkZwapRUgD8kZ6w==",
+            "version": "4.0.0-beta.19",
+            "resolved": "https://registry.npmjs.org/@ts-for-gir/generator-typescript/-/generator-typescript-4.0.0-beta.19.tgz",
+            "integrity": "sha512-YVWaTmvUjm9cq/6p7RItZc3+h5m3UsWAqqwDq158BJnFGGbKfjJL4+//MjgYJ3NXIQAPD+MF0kn4ESB1YsG1Zg==",
            "license": "Apache-2.0",
            "dependencies": {
-                "@ts-for-gir/generator-base": "^4.0.0-beta.16",
-                "@ts-for-gir/lib": "^4.0.0-beta.16",
+                "@ts-for-gir/generator-base": "^4.0.0-beta.19",
+                "@ts-for-gir/lib": "^4.0.0-beta.19",
                "ejs": "^3.1.10",
                "xml2js": "^0.6.2"
            },
@ -290,9 +519,9 @@
            }
        },
        "node_modules/@ts-for-gir/lib": {
-            "version": "4.0.0-beta.16",
-            "resolved": "https://registry.npmjs.org/@ts-for-gir/lib/-/lib-4.0.0-beta.16.tgz",
-            "integrity": "sha512-6sFr4mHKoX+/4WT+dMpJ1EXnXSbx7lG6inQ2j6riVY0DkQu5y3ebaL3oUtpHi5twA54YWaOrP8NfFr3eg3Z3fA==",
+            "version": "4.0.0-beta.19",
+            "resolved": "https://registry.npmjs.org/@ts-for-gir/lib/-/lib-4.0.0-beta.19.tgz",
+            "integrity": "sha512-vEXYHGKQl1/UGkzyu82UMoN2EUMQkEEvFnb1XdazAT2wxXRbku+mZ0hCN/hiql8ryPeCyYrsxib6eQ6NR1S6LQ==",
            "license": "Apache-2.0",
            "dependencies": {
                "@gi.ts/parser": "^2.0.0",
@ -305,6 +534,16 @@
                "node": ">=18"
            }
        },
+        "node_modules/@types/node": {
+            "version": "22.10.2",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.2.tgz",
+            "integrity": "sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==",
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "undici-types": "~6.20.0"
+            }
+        },
        "node_modules/ansi-escapes": {
            "version": "4.3.2",
            "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
@ -362,37 +601,6 @@
            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
            "license": "MIT"
        },
-        "node_modules/base64-js": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "MIT"
-        },
-        "node_modules/bl": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-            "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-            "license": "MIT",
-            "dependencies": {
-                "buffer": "^5.5.0",
-                "inherits": "^2.0.4",
-                "readable-stream": "^3.4.0"
-            }
-        },
        "node_modules/brace-expansion": {
            "version": "2.0.1",
            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
@ -402,30 +610,6 @@
                "balanced-match": "^1.0.0"
            }
        },
-        "node_modules/buffer": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-            "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "base64-js": "^1.3.1",
-                "ieee754": "^1.1.13"
-            }
-        },
        "node_modules/callsites": {
            "version": "3.1.0",
            "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@ -457,30 +641,6 @@
            "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
            "license": "MIT"
        },
-        "node_modules/cli-cursor": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-            "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-            "license": "MIT",
-            "dependencies": {
-                "restore-cursor": "^3.1.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/cli-spinners": {
-            "version": "2.9.2",
-            "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
-            "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
        "node_modules/cli-width": {
            "version": "4.1.0",
            "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
@ -521,15 +681,6 @@
                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
            }
        },
-        "node_modules/clone": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-            "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.8"
-            }
-        },
        "node_modules/color-convert": {
            "version": "2.0.1",
            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@ -587,9 +738,9 @@
            }
        },
        "node_modules/cross-spawn": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+            "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
            "license": "MIT",
            "dependencies": {
                "path-key": "^3.1.0",
@ -600,18 +751,6 @@
                "node": ">= 8"
            }
        },
-        "node_modules/defaults": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
-            "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
-            "license": "MIT",
-            "dependencies": {
-                "clone": "^1.0.2"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
        "node_modules/eastasianwidth": {
            "version": "0.2.0",
            "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
@ -690,9 +829,9 @@
            }
        },
        "node_modules/fast-xml-parser": {
-            "version": "4.5.0",
-            "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.0.tgz",
-            "integrity": "sha512-/PlTQCI96+fZMAOLMZK4CWG1ItCbfZ/0jx7UIJFChPNrx7tcEgerUgWbeieCM9MfHInUDyK8DWYZ+YrywDJuTg==",
+            "version": "4.5.1",
+            "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.1.tgz",
+            "integrity": "sha512-y655CeyUQ+jj7KBbYMc4FG01V8ZQqjN+gDYGJ50RtfsUB8iG9AmwmwoAgeKLJdmueKKMrH1RJ7yXHTSoczdv5w==",
            "funding": [
                {
                    "type": "github",
@ -801,26 +940,6 @@
                "node": ">=0.10.0"
            }
        },
-        "node_modules/ieee754": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-            "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "BSD-3-Clause"
-        },
        "node_modules/import-fresh": {
            "version": "3.3.0",
            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@ -837,33 +956,25 @@
                "url": "https://github.com/sponsors/sindresorhus"
            }
        },
-        "node_modules/inherits": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-            "license": "ISC"
-        },
        "node_modules/inquirer": {
-            "version": "9.3.7",
-            "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.3.7.tgz",
-            "integrity": "sha512-LJKFHCSeIRq9hanN14IlOtPSTe3lNES7TYDTE2xxdAy1LS5rYphajK1qtwvj3YmQXvvk0U2Vbmcni8P9EIQW9w==",
+            "version": "12.2.0",
+            "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-12.2.0.tgz",
+            "integrity": "sha512-CI0yGbyd5SS4vP7i180S9i95yI+M3ONaljfLBlNS1IIIZ7n+xbH76WzHkIHj253huRiXaKQZl8zijOl0Y0mjqg==",
            "license": "MIT",
            "dependencies": {
-                "@inquirer/figures": "^1.0.3",
+                "@inquirer/core": "^10.1.1",
+                "@inquirer/prompts": "^7.2.0",
+                "@inquirer/type": "^3.0.1",
                "ansi-escapes": "^4.3.2",
-                "cli-width": "^4.1.0",
-                "external-editor": "^3.1.0",
-                "mute-stream": "1.0.0",
-                "ora": "^5.4.1",
+                "mute-stream": "^2.0.0",
                "run-async": "^3.0.0",
-                "rxjs": "^7.8.1",
-                "string-width": "^4.2.3",
-                "strip-ansi": "^6.0.1",
-                "wrap-ansi": "^6.2.0",
-                "yoctocolors-cjs": "^2.1.2"
+                "rxjs": "^7.8.1"
            },
            "engines": {
                "node": ">=18"
+            },
+            "peerDependencies": {
+                "@types/node": ">=18"
            }
        },
        "node_modules/is-arrayish": {
@ -881,27 +992,6 @@
                "node": ">=8"
            }
        },
-        "node_modules/is-interactive": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-            "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/is-unicode-supported": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-            "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
        "node_modules/isexe": {
            "version": "2.0.0",
            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@ -999,40 +1089,15 @@
            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
            "license": "MIT"
        },
-        "node_modules/log-symbols": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-            "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-            "license": "MIT",
-            "dependencies": {
-                "chalk": "^4.1.0",
-                "is-unicode-supported": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
        "node_modules/lru-cache": {
-            "version": "11.0.1",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.1.tgz",
-            "integrity": "sha512-CgeuL5uom6j/ZVrg7G/+1IXqRY8JXX4Hghfy5YE0EhoYQWvndP1kufu58cmZLNIDKnRhZrXfdS9urVWx98AipQ==",
+            "version": "11.0.2",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.2.tgz",
+            "integrity": "sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==",
            "license": "ISC",
            "engines": {
                "node": "20 || >=22"
            }
        },
-        "node_modules/mimic-fn": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-            "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            }
-        },
        "node_modules/minimatch": {
            "version": "10.0.1",
            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz",
@ -1058,50 +1123,12 @@
            }
        },
        "node_modules/mute-stream": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz",
-            "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz",
+            "integrity": "sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==",
            "license": "ISC",
            "engines": {
-                "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-            }
-        },
-        "node_modules/onetime": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-            "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-            "license": "MIT",
-            "dependencies": {
-                "mimic-fn": "^2.1.0"
-            },
-            "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/ora": {
-            "version": "5.4.1",
-            "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-            "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-            "license": "MIT",
-            "dependencies": {
-                "bl": "^4.1.0",
-                "chalk": "^4.1.0",
-                "cli-cursor": "^3.1.0",
-                "cli-spinners": "^2.5.0",
-                "is-interactive": "^1.0.0",
-                "is-unicode-supported": "^0.1.0",
-                "log-symbols": "^4.1.0",
-                "strip-ansi": "^6.0.0",
-                "wcwidth": "^1.0.1"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+                "node": "^18.17.0 || >=20.5.0"
            }
        },
        "node_modules/os-tmpdir": {
@ -1195,20 +1222,6 @@
                "url": "https://github.com/prettier/prettier?sponsor=1"
            }
        },
-        "node_modules/readable-stream": {
-            "version": "3.6.2",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-            "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-            "license": "MIT",
-            "dependencies": {
-                "inherits": "^2.0.3",
-                "string_decoder": "^1.1.1",
-                "util-deprecate": "^1.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
        "node_modules/require-directory": {
            "version": "2.1.1",
            "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@ -1227,25 +1240,6 @@
                "node": ">=4"
            }
        },
-        "node_modules/restore-cursor": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-            "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-            "license": "MIT",
-            "dependencies": {
-                "onetime": "^5.1.0",
-                "signal-exit": "^3.0.2"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/restore-cursor/node_modules/signal-exit": {
-            "version": "3.0.7",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-            "license": "ISC"
-        },
        "node_modules/run-async": {
            "version": "3.0.0",
            "resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz",
@ -1264,26 +1258,6 @@
                "tslib": "^2.1.0"
            }
        },
-        "node_modules/safe-buffer": {
-            "version": "5.2.1",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "MIT"
-        },
        "node_modules/safer-buffer": {
            "version": "2.1.2",
            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@ -1329,15 +1303,6 @@
                "url": "https://github.com/sponsors/isaacs"
            }
        },
-        "node_modules/string_decoder": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-            "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-            "license": "MIT",
-            "dependencies": {
-                "safe-buffer": "~5.2.0"
-            }
-        },
        "node_modules/string-width": {
            "version": "4.2.3",
            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@ -1423,9 +1388,9 @@
            }
        },
        "node_modules/tslib": {
-            "version": "2.7.0",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
-            "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
+            "version": "2.8.1",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+            "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
            "license": "0BSD"
        },
        "node_modules/type-fest": {
@ -1440,20 +1405,12 @@
                "url": "https://github.com/sponsors/sindresorhus"
            }
        },
-        "node_modules/util-deprecate": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-            "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-            "license": "MIT"
-        },
-        "node_modules/wcwidth": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-            "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
+        "node_modules/undici-types": {
+            "version": "6.20.0",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+            "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
            "license": "MIT",
-            "dependencies": {
-                "defaults": "^1.0.3"
-            }
+            "peer": true
        },
        "node_modules/which": {
            "version": "2.0.2",
--- a/lib/pkgs/mk-types/package.json
+++ b/lib/pkgs/mk-types/package.json
@ -1,5 +1,5 @@
 {
    "dependencies": {
-        "@ts-for-gir/cli": "4.0.0-beta.16"
+        "@ts-for-gir/cli": "4.0.0-beta.19"
    }
 }