@ts-for-gir/cli 4.0.0-rc.8 → 4.0.0

package/package.json

@@ -1,84 +1,195 @@
 {
-  "name": "@ts-for-gir/cli",
-  "version": "4.0.0-rc.8",
-  "description": "TypeScript type definition generator for GObject introspection GIR files",
-  "main": "src/index.ts",
-  "module": "src/index.ts",
-  "type": "module",
-  "bin": {
-    "cli": "bin/ts-for-gir",
-    "ts-for-gir": "bin/ts-for-gir",
-    "ts-for-gir-dev": "bin/ts-for-gir-dev"
-  },
-  "engines": {
-    "node": ">=18"
-  },
-  "scripts": {
-    "start": "node bin/ts-for-gir-dev",
-    "start:prod": "node bin/ts-for-gir",
-    "build": "node --experimental-specifier-resolution=node --experimental-strip-types --experimental-transform-types --no-warnings esbuild.ts && chmod +x bin/ts-for-gir-dev && chmod +x bin/ts-for-gir",
-    "build:templates": "node scripts/process-templates.mjs",
-    "prepack": "node scripts/process-templates.mjs",
-    "check:types": "tsc --noEmit",
-    "check": "yarn check:types"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/gjsify/ts-for-gir.git"
-  },
-  "author": "Pascal Garber <pascal@mailfreun.de>",
-  "files": [
-    "src",
-    "bin",
-    "dist-templates"
-  ],
-  "license": "Apache-2.0",
-  "bugs": {
-    "url": "https://github.com/gjsify/ts-for-gir/issues"
-  },
-  "homepage": "https://github.com/gjsify/ts-for-gir#readme",
-  "keywords": [
-    "gjs",
-    "typescript",
-    "generate",
-    "gir",
-    "gobject-introspection",
-    "gnome",
-    "gtk",
-    "glib",
-    "gobject",
-    "dts",
-    "type definitions",
-    "cli"
-  ],
-  "exports": {
-    ".": "./src/index.ts"
-  },
-  "devDependencies": {
-    "@gi.ts/parser": "^4.0.0-rc.8",
-    "@ts-for-gir/generator-base": "^4.0.0-rc.8",
-    "@ts-for-gir/generator-html-doc": "^4.0.0-rc.8",
-    "@ts-for-gir/generator-json": "^4.0.0-rc.8",
-    "@ts-for-gir/generator-typescript": "^4.0.0-rc.8",
-    "@ts-for-gir/lib": "^4.0.0-rc.8",
-    "@ts-for-gir/reporter": "^4.0.0-rc.8",
-    "@ts-for-gir/tsconfig": "^4.0.0-rc.8",
-    "@types/ejs": "^3.1.5",
-    "@types/inquirer": "^9.0.9",
-    "@types/node": "^25.6.0",
-    "@types/yargs": "^17.0.35",
-    "esbuild": "^0.28.0",
-    "typescript": "^6.0.3"
-  },
-  "dependencies": {
-    "@inquirer/prompts": "^8.4.2",
-    "@ts-for-gir/templates": "^4.0.0-rc.8",
-    "colorette": "^2.0.20",
-    "cosmiconfig": "^9.0.1",
-    "ejs": "^5.0.2",
-    "glob": "^13.0.6",
-    "inquirer": "^13.4.2",
-    "typedoc": "^0.28.19",
-    "yargs": "^18.0.0"
-  }
-}
+	"name": "@ts-for-gir/cli",
+	"version": "4.0.0",
+	"description": "TypeScript type definition generator for GObject introspection GIR files",
+	"main": "src/index.ts",
+	"module": "src/index.ts",
+	"type": "module",
+	"bin": {
+		"cli": "bin/ts-for-gir",
+		"ts-for-gir": "bin/ts-for-gir",
+		"ts-for-gir-dev": "bin/ts-for-gir-dev",
+		"ts-for-gir-gjs": "bin/ts-for-gir-gjs"
+	},
+	"gjsify": {
+		"bin": {
+			"ts-for-gir": "bin/ts-for-gir-gjs"
+		},
+		"shebang": true,
+		"bundler": {
+			"input": "src/start.ts",
+			"output": {
+				"file": "bin/ts-for-gir-gjs"
+			},
+			"transform": {
+				"define": {
+					"__GJS_BUNDLE__": "true"
+				}
+			}
+		},
+		"defineFromPackageJson": {
+			"__TS_FOR_GIR_VERSION__": {
+				"field": "version"
+			}
+		},
+		"excludeGlobals": [
+			"XMLHttpRequest",
+			"XMLHttpRequestUpload"
+		],
+		"flatpak": {
+			"appId": "io.github.gjsify.ts_for_gir",
+			"kind": "cli",
+			"name": "ts-for-gir",
+			"runtime": "gnome",
+			"runtimeVersion": "50",
+			"command": "ts-for-gir",
+			"finishArgs": [
+				"--share=network",
+				"--filesystem=host"
+			],
+			"developer": {
+				"id": "io.github.gjsify",
+				"name": "gjsify contributors",
+				"email": "pascal@artandcode.studio"
+			},
+			"summary": "TypeScript type definitions for GObject Introspection (GJS)",
+			"description": [
+				{
+					"p": "ts-for-gir reads GObject Introspection (GIR) XML files and emits strongly-typed TypeScript definitions for use in GJS (GNOME JavaScript) projects. Type-check your GTK / Adwaita / GLib / Gio / GStreamer / WebKit / etc. code, get full IDE completion, and catch missing properties / wrong-arity signal handlers at build time instead of runtime."
+				},
+				{
+					"p": "This Flatpak ships ts-for-gir as a self-contained CLI runnable on any modern Linux distro — no Node.js installation required. It reads from the system's installed GIR catalog (read-only mounts of /usr/share/gir-1.0 and /usr/share/gobject-introspection-1.0) and writes generated types under your project directory."
+				},
+				{
+					"ul": [
+						{
+							"item": "`ts-for-gir generate Gtk-4.0` — generate types for one or more GI namespaces"
+						},
+						{
+							"item": "`ts-for-gir generate --reporter` — write a JSON report alongside types for downstream analysis"
+						},
+						{
+							"item": "`ts-for-gir analyze report.json` — inspect type-resolution issues by severity / category / namespace"
+						},
+						{
+							"item": "`ts-for-gir create my-app` — scaffold a new GJS app from a template"
+						},
+						{
+							"item": "`ts-for-gir list` — list all GIR namespaces available on this system"
+						},
+						{
+							"item": "`ts-for-gir self-update` — refresh the global install in place"
+						}
+					]
+				}
+			],
+			"license": {
+				"metadata": "CC0-1.0",
+				"project": "Apache-2.0"
+			},
+			"categories": [
+				"Development"
+			],
+			"homepageUrl": "https://gjsify.github.io/gjsify/projects/ts-for-gir/",
+			"vcsBrowserUrl": "https://github.com/gjsify/ts-for-gir",
+			"issueTrackerUrl": "https://github.com/gjsify/ts-for-gir/issues",
+			"modules": [
+				{
+					"name": "ts-for-gir-cli",
+					"buildsystem": "simple",
+					"build-commands": [
+						"install -Dm755 package/bin/ts-for-gir-gjs /app/share/ts-for-gir/ts-for-gir.gjs.mjs",
+						"install -Dm755 launcher.sh /app/bin/ts-for-gir"
+					],
+					"sources": [
+						{
+							"type": "archive",
+							"url": "https://registry.npmjs.org/@ts-for-gir/cli/-/cli-4.0.0-rc.17.tgz",
+							"sha256": "6ca2c7c73bbc37259ebec621f1b24f8e9ca896426783114e80faa59cb4983afe",
+							"strip-components": 0,
+							"dest-filename": "tarball.tgz"
+						},
+						{
+							"type": "file",
+							"path": "launcher.sh"
+						}
+					]
+				}
+			]
+		}
+	},
+	"engines": {
+		"node": ">=18"
+	},
+	"scripts": {
+		"start": "node bin/ts-for-gir-dev",
+		"start:prod": "node bin/ts-for-gir",
+		"build": "node --experimental-specifier-resolution=node --experimental-strip-types --experimental-transform-types --no-warnings esbuild.ts && chmod +x bin/ts-for-gir-dev && chmod +x bin/ts-for-gir",
+		"build:gjs": "gjsify build",
+		"build:templates": "node scripts/process-templates.mjs",
+		"prepack": "node scripts/process-templates.mjs",
+		"check:types": "tsc --noEmit",
+		"check": "gjsify run check:types"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/gjsify/ts-for-gir.git"
+	},
+	"author": "Pascal Garber <pascal@mailfreun.de>",
+	"files": [
+		"src",
+		"bin",
+		"dist-templates"
+	],
+	"license": "Apache-2.0",
+	"bugs": {
+		"url": "https://github.com/gjsify/ts-for-gir/issues"
+	},
+	"homepage": "https://github.com/gjsify/ts-for-gir#readme",
+	"keywords": [
+		"gjs",
+		"typescript",
+		"generate",
+		"gir",
+		"gobject-introspection",
+		"gnome",
+		"gtk",
+		"glib",
+		"gobject",
+		"dts",
+		"type definitions",
+		"cli"
+	],
+	"exports": {
+		".": "./src/index.ts"
+	},
+	"devDependencies": {
+		"@gi.ts/parser": "^4.0.0",
+		"@gjsify/cli": "^0.4.19",
+		"@ts-for-gir/generator-base": "^4.0.0",
+		"@ts-for-gir/generator-html-doc": "^4.0.0",
+		"@ts-for-gir/generator-json": "^4.0.0",
+		"@ts-for-gir/generator-typescript": "^4.0.0",
+		"@ts-for-gir/lib": "^4.0.0",
+		"@ts-for-gir/reporter": "^4.0.0",
+		"@ts-for-gir/tsconfig": "^4.0.0",
+		"@types/ejs": "^3.1.5",
+		"@types/inquirer": "^9.0.9",
+		"@types/node": "^25.6.2",
+		"@types/yargs": "^17.0.35",
+		"esbuild": "^0.28.0",
+		"source-map-support": "^0.5.21",
+		"typescript": "^6.0.3"
+	},
+	"dependencies": {
+		"@inquirer/prompts": "^8.4.2",
+		"@ts-for-gir/templates": "^4.0.0",
+		"colorette": "^2.0.20",
+		"cosmiconfig": "^9.0.1",
+		"ejs": "^5.0.2",
+		"glob": "^13.0.6",
+		"inquirer": "^13.4.2",
+		"typedoc": "^0.28.19",
+		"yargs": "^18.0.0"
+	}
+}

package/src/commands/create.ts

@@ -3,7 +3,7 @@
  */
 
 import { spawnSync } from "node:child_process";
-import { cpSync, existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from "node:fs";
+import { cpSync, existsSync, mkdirSync, readdirSync, readFileSync, realpathSync, writeFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -19,7 +19,8 @@ const command = "create [name]";
 const description = "Scaffold a new GJS TypeScript project from a template";
 
 const examples: ReadonlyArray<[string, string?]> = [
-	[`${APP_NAME} create my-app --template types-npm`, "Scaffold using the @girs/* NPM types"],
+	[`${APP_NAME} create my-app --template types-gjsify`, "Scaffold a Node-free GJS app via gjsify (recommended)"],
+	[`${APP_NAME} create my-app --template types-npm`, "Scaffold using the @girs/* NPM types + node/esbuild"],
 	[`${APP_NAME} create my-app --template types-locally`, "Scaffold and generate types into ./@types/ locally"],
 	[
 		`${APP_NAME} create my-app --template types-workspace`,
@@ -30,15 +31,20 @@ const examples: ReadonlyArray<[string, string?]> = [
 
 const TEMPLATE_CHOICES: ReadonlyArray<{ value: CreateTemplateId; name: string; description: string }> = [
 	{
-		value: "types-locally",
-		name: "types-locally",
-		description: "Generate GIR types directly into ./@types/ (no package format, no @girs/* deps)",
+		value: "types-gjsify",
+		name: "types-gjsify",
+		description: "Node-free: @girs/* from NPM, all dev scripts (install/build/run/format) routed through gjsify",
 	},
 	{
 		value: "types-npm",
 		name: "types-npm",
 		description: "Use pre-generated types from the @girs/* NPM packages",
 	},
+	{
+		value: "types-locally",
+		name: "types-locally",
+		description: "Generate GIR types directly into ./@types/ (no package format, no @girs/* deps)",
+	},
 	{
 		value: "types-workspace",
 		name: "types-workspace",
@@ -55,18 +61,44 @@ const builder = createBuilder<CreateCommandArgs>(createOptions, examples);
 function findTemplatesRoot(): string {
 	const __filename = fileURLToPath(import.meta.url);
 	const __dirname = dirname(__filename);
+	// Resolve symlinks too. When the CLI is installed via `npm i -g`,
+	// `gjsify install -g`, or any tool that lands a symlink in the user's PATH
+	// (Yarn Berry's bin links, asdf shims, ...), `import.meta.url` resolves to
+	// the symlink path — `<dir>/../dist-templates` would then look for the
+	// templates next to the symlink (e.g. `~/.local/bin/../dist-templates`)
+	// instead of next to the real package. Resolving via realpath first lets
+	// the same `<dir>/../dist-templates` candidate hit the actual install dir.
+	let realDirname = __dirname;
+	try {
+		realDirname = dirname(realpathSync(__filename));
+	} catch {
+		// `realpathSync` can throw on bundled paths that don't exist on disk
+		// (e.g. virtual entries in a single-file binary). Fall through to the
+		// direct __dirname — the candidate list below is a superset and will
+		// still find templates when they live alongside the bundle.
+	}
 	const candidates = [
-		// Bundled production binary (bin/ts-for-gir): ../dist-templates
+		// Symlink-resolved binary (`npm i -g` / `gjsify install -g`): the
+		// realpath-aware candidate is required when the CLI is launched via a
+		// `~/.local/bin/<name>` symlink that points at the real package's
+		// `bin/<name>`. Try it first so the success path is symmetric across
+		// install modes.
+		resolve(realDirname, "..", "dist-templates"),
+		// Bundled production binary invoked at its real path (no symlink),
+		// or a tarball extracted into a flat `bin/` + `dist-templates/` layout.
 		resolve(__dirname, "..", "dist-templates"),
 		// Source layout (src/commands/create.ts): ../../dist-templates then ../../templates
 		resolve(__dirname, "..", "..", "dist-templates"),
 		resolve(__dirname, "..", "..", "templates"),
 	];
+	const seen = new Set<string>();
 	for (const path of candidates) {
+		if (seen.has(path)) continue;
+		seen.add(path);
 		if (existsSync(path)) return path;
 	}
 	throw new Error(
-		`Could not locate templates directory. Looked in:\n  ${candidates.join("\n  ")}\n` +
+		`Could not locate templates directory. Looked in:\n  ${[...seen].join("\n  ")}\n` +
 			"If you are running from source, make sure packages/cli/templates/ exists. " +
 			"If you are running the published CLI, make sure dist-templates/ was packed.",
 	);
@@ -119,11 +151,36 @@ function walkAndSubstitute(rootDir: string, projectName: string): void {
 	}
 }
 
+declare const __GJS_BUNDLE__: boolean | undefined;
+
 const handler = async (args: ConfigFlags) => {
 	const opts = args as unknown as CreateCommandArgs;
 	const log = new Logger(opts.verbose ?? false, "CreateCommand");
 
-	const templatesRoot = findTemplatesRoot();
+	let templatesRoot: string;
+	try {
+		templatesRoot = findTemplatesRoot();
+	} catch (err) {
+		// `dist-templates/` not next to the running file. Two known scenarios:
+		//   1. `install.js` (or any flow) deployed only the single-file GJS
+		//      binary without the package tree. We can't scaffold without
+		//      templates — point the user at the working install path.
+		//   2. Source-mode mis-checkout (no `packages/cli/templates/`). Surface
+		//      the original error so the developer can fix their layout.
+		// The `__GJS_BUNDLE__` define lets us discriminate at build time.
+		if (typeof __GJS_BUNDLE__ !== "undefined") {
+			process.stderr.write(
+				"The 'create' command needs templates that aren't shipped alongside this binary.\n" +
+					"Install the full package instead so `dist-templates/` lives next to the bin:\n" +
+					"  gjsify install -g @ts-for-gir/cli\n" +
+					"  npm  install -g @ts-for-gir/cli\n" +
+					"  npx  @ts-for-gir/cli create ...   # one-shot, no install\n",
+			);
+			process.exitCode = 1;
+			return;
+		}
+		throw err;
+	}
 	const available = listTemplates(templatesRoot);
 	if (available.length === 0) {
 		throw new Error(`No templates found in ${templatesRoot}`);
@@ -175,19 +232,30 @@ const handler = async (args: ConfigFlags) => {
 	log.success(`Scaffolded ${template} into ${targetDir}`);
 
 	if (opts.install) {
-		log.info("Running npm install...");
-		const result = spawnSync("npm", ["install", "--no-audit", "--no-fund"], {
+		// types-gjsify is Node-free at runtime — bootstrap deps via `gjsify install`
+		// so the user's first impression matches the rest of the template's scripts.
+		// Other templates remain on npm (matches the prior behavior + their README).
+		const installer = template === "types-gjsify" ? "gjsify" : "npm";
+		const installerArgs = template === "types-gjsify" ? ["install"] : ["install", "--no-audit", "--no-fund"];
+		log.info(`Running ${installer} install...`);
+		const result = spawnSync(installer, installerArgs, {
 			cwd: targetDir,
 			stdio: "inherit",
 		});
 		if (result.status !== 0) {
-			log.warn("npm install failed; you can re-run it manually in the project directory.");
+			log.warn(`${installer} install failed; you can re-run it manually in the project directory.`);
 		}
 	}
 
 	log.info("\nNext steps:");
 	log.white(`  cd ${projectName}`);
-	if (!opts.install) log.white("  npm install");
+	if (!opts.install) {
+		if (template === "types-gjsify") {
+			log.white("  gjsify install");
+		} else {
+			log.white("  npm install");
+		}
+	}
 	switch (template) {
 		case "types-locally":
 			log.white("  npm run generate");
@@ -202,6 +270,10 @@ const handler = async (args: ConfigFlags) => {
 			log.white("  npm run build:types && npm install");
 			log.white("  npm run build:app && npm start");
 			break;
+		case "types-gjsify":
+			log.white("  gjsify run check");
+			log.white("  gjsify run build && gjsify run start");
+			break;
 	}
 };
 

package/src/commands/index.ts

@@ -5,3 +5,4 @@ export * from "./doc.ts";
 export * from "./generate.ts";
 export * from "./json.ts";
 export * from "./list.ts";
+export * from "./self-update.ts";

package/src/commands/self-update.ts

@@ -0,0 +1,142 @@
+/**
+ * Everything you need for the `ts-for-gir self-update` command is located here
+ */
+
+import { chmodSync, existsSync, renameSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+import { APP_NAME, APP_VERSION } from "@ts-for-gir/lib";
+
+import type { SelfUpdateCommandArgs } from "../types/index.ts";
+
+const REPO = "gjsify/ts-for-gir";
+const GITHUB_API = "https://api.github.com";
+const GJS_ASSET_NAME = "ts-for-gir-gjs";
+
+function getCurrentBinaryPath(): string | null {
+	const p = process.argv[1] ?? null;
+	if (!p) return null;
+	// Refuse to update in dev mode (source file or node_modules path)
+	if (p.endsWith(".ts") || p.includes("node_modules")) return null;
+	return p;
+}
+
+async function fetchJson(url: string): Promise<unknown> {
+	const headers: Record<string, string> = {
+		Accept: "application/vnd.github.v3+json",
+		"User-Agent": `ts-for-gir/${APP_VERSION}`,
+	};
+	const token = process.env.GITHUB_TOKEN;
+	if (token) headers.Authorization = `token ${token}`;
+
+	const response = await fetch(url, { headers });
+	if (!response.ok) {
+		throw new Error(`HTTP ${response.status} from ${url}`);
+	}
+	return response.json();
+}
+
+async function downloadBinary(url: string, destPath: string): Promise<void> {
+	const response = await fetch(url, {
+		headers: { "User-Agent": `ts-for-gir/${APP_VERSION}` },
+	});
+	if (!response.ok) {
+		throw new Error(`HTTP ${response.status} downloading binary`);
+	}
+	const buffer = await response.arrayBuffer();
+	const tmpPath = join(tmpdir(), `ts-for-gir-update-${Date.now()}`);
+	writeFileSync(tmpPath, Buffer.from(buffer));
+	chmodSync(tmpPath, 0o755);
+	renameSync(tmpPath, destPath); // atomic on POSIX
+}
+
+const command = "self-update";
+const description = "Update ts-for-gir to the latest version from GitHub releases";
+const examples: ReadonlyArray<[string, string?]> = [
+	[`${APP_NAME} self-update`, "Check for updates and install the latest version"],
+	[`${APP_NAME} self-update --check`, "Only check for a newer version, do not install"],
+	[`${APP_NAME} self-update --force`, "Force reinstall even if already on the latest version"],
+];
+
+const builder = (yargs: import("yargs").Argv) =>
+	yargs
+		.option("check", {
+			description: "Only check for a newer version, do not install",
+			type: "boolean",
+			default: false,
+		})
+		.option("force", {
+			description: "Force reinstall even if already on the latest version",
+			type: "boolean",
+			default: false,
+		})
+		.example(examples as [string, string?][]);
+
+const handler = async (args: SelfUpdateCommandArgs): Promise<void> => {
+	console.log(`Checking for updates... (current: v${APP_VERSION})`);
+
+	let release: Record<string, unknown>;
+	try {
+		release = (await fetchJson(`${GITHUB_API}/repos/${REPO}/releases/latest`)) as Record<string, unknown>;
+	} catch (err) {
+		const msg = err instanceof Error ? err.message : String(err);
+		process.stderr.write(`Failed to fetch release information: ${msg}\n`);
+		process.exitCode = 1;
+		return;
+	}
+
+	const latestVersion = (release.tag_name as string).replace(/^v/, "");
+
+	if (latestVersion === APP_VERSION && !args.force) {
+		console.log(`Already up to date (v${APP_VERSION})`);
+		return;
+	}
+
+	if (args.check) {
+		console.log(`New version available: v${latestVersion} (current: v${APP_VERSION})`);
+		console.log(`Run \`${APP_NAME} self-update\` to install it.`);
+		return;
+	}
+
+	console.log(`Updating to v${latestVersion}...`);
+
+	const assets = release.assets as Array<Record<string, string>>;
+	const asset = assets.find((a) => a.name === GJS_ASSET_NAME);
+	if (!asset) {
+		process.stderr.write(
+			`No GJS binary found in release ${release.tag_name}.\n` +
+				"self-update requires the GJS bundle to be installed via install.js.\n" +
+				"For npm installations use: npm update -g @ts-for-gir/cli\n",
+		);
+		process.exitCode = 1;
+		return;
+	}
+
+	const currentPath = getCurrentBinaryPath();
+	if (!currentPath || !existsSync(currentPath)) {
+		process.stderr.write(
+			"Cannot determine current binary path for update.\n" +
+				"self-update only works when running the installed GJS binary.\n",
+		);
+		process.exitCode = 1;
+		return;
+	}
+
+	try {
+		await downloadBinary(asset.browser_download_url, currentPath);
+		console.log(`Successfully updated to v${latestVersion}`);
+	} catch (err) {
+		const msg = err instanceof Error ? err.message : String(err);
+		process.stderr.write(`Update failed: ${msg}\n`);
+		process.exitCode = 1;
+	}
+};
+
+export const selfUpdate = {
+	command,
+	description,
+	builder,
+	handler,
+	examples,
+};

package/src/config/config-loader.ts

@@ -3,6 +3,7 @@
  */
 
 import { dirname, resolve } from "node:path";
+import { pathToFileURL } from "node:url";
 import type { ConfigFlags, OptionsGeneration, UserConfig, UserConfigLoadResult } from "@ts-for-gir/lib";
 import { APP_NAME, isEqual } from "@ts-for-gir/lib";
 import { type Options as ConfigSearchOptions, cosmiconfig } from "cosmiconfig";
@@ -18,9 +19,12 @@ import { docOptions, options } from "./options.ts";
 export async function loadConfigFile(configName?: string): Promise<UserConfigLoadResult | null> {
 	const configSearchOptions: Partial<ConfigSearchOptions> = {
 		loaders: {
-			// ESM loader
+			// ESM loader. cosmiconfig hands us an absolute filesystem path; Node's import()
+			// tolerates that as a non-spec extension, but spec-compliant runtimes (GJS /
+			// SpiderMonkey) reject it with "Module not found: <abs-path>". Convert to a
+			// file:// URL so the loader works in both runtimes.
 			".js": async (filepath) => {
-				const file = await import(filepath);
+				const file = await import(pathToFileURL(filepath).href);
 
 				// Files with `exports.default = { ... }`
 				if (file?.default?.default) {

package/src/config/defaults.ts

@@ -53,6 +53,20 @@ function getDefaultGirDirectories(): string[] {
 		"/usr/lib/x86_64-linux-gnu/mutter-*",
 	];
 
+	// Flatpak: `--filesystem=host` exposes the host's filesystem under
+	// /run/host. The GNOME runtime ships GIR typelibs but not the XML, so
+	// inside the sandbox we must read from /run/host/usr/share/gir-1.0.
+	// Detected via FLATPAK_ID (set for every Flatpak-launched process) or
+	// the .flatpak-info marker file (always present in the sandbox).
+	if (process.env.FLATPAK_ID || existsSync("/.flatpak-info")) {
+		girDirectories.unshift(
+			"/run/host/usr/local/share/gir-1.0",
+			"/run/host/usr/share/gir-1.0",
+			"/run/host/usr/share/*/gir-1.0",
+			"/run/host/usr/lib/x86_64-linux-gnu/mutter-*",
+		);
+	}
+
 	// NixOS and other distributions does not have a /usr/local/share directory.
 	// Instead, the nix store paths with Gir files are set as XDG_DATA_DIRS.
 	// See https://github.com/NixOS/nixpkgs/blob/96e18717904dfedcd884541e5a92bf9ff632cf39/pkgs/development/libraries/gobject-introspection/setup-hook.sh#L7-L10

package/src/config/options.ts

@@ -257,8 +257,8 @@ export const createOptions = {
 	template: {
 		type: "string" as const,
 		alias: "t",
-		description: "Template to scaffold (types-locally, types-npm, types-workspace)",
-		choices: ["types-locally", "types-npm", "types-workspace"] as const,
+		description: "Template to scaffold (types-locally, types-npm, types-workspace, types-gjsify)",
+		choices: ["types-locally", "types-npm", "types-workspace", "types-gjsify"] as const,
 	},
 	install: {
 		type: "boolean" as const,