@ts-for-gir/cli 4.0.0-rc.13 → 4.0.0-rc.14

package/dist-templates/types-locally/package.json

@@ -11,7 +11,7 @@
 		"clear": "rm -rf dist @types"
 	},
 	"devDependencies": {
-		"@ts-for-gir/cli": "^4.0.0-rc.13",
+		"@ts-for-gir/cli": "^4.0.0-rc.14",
 		"esbuild": "^0.28.0",
 		"typescript": "^6.0.2"
 	}

package/dist-templates/types-npm/package.json

@@ -14,10 +14,10 @@
 		"typescript": "^6.0.2"
 	},
 	"dependencies": {
-		"@girs/adw-1": "^1.10.0-4.0.0-rc.12",
-		"@girs/gio-2.0": "^2.88.0-4.0.0-rc.12",
-		"@girs/gjs": "^4.0.0-rc.12",
-		"@girs/glib-2.0": "^2.88.0-4.0.0-rc.12",
-		"@girs/gtk-4.0": "^4.23.0-4.0.0-rc.12"
+		"@girs/adw-1": "^1.10.0-4.0.0-rc.13",
+		"@girs/gio-2.0": "^2.88.0-4.0.0-rc.13",
+		"@girs/gjs": "^4.0.0-rc.13",
+		"@girs/glib-2.0": "^2.88.0-4.0.0-rc.13",
+		"@girs/gtk-4.0": "^4.23.0-4.0.0-rc.13"
 	}
 }

package/dist-templates/types-workspace/package.json

@@ -16,7 +16,7 @@
 		"clear": "rm -rf @girs packages/*/dist"
 	},
 	"devDependencies": {
-		"@ts-for-gir/cli": "^4.0.0-rc.13",
+		"@ts-for-gir/cli": "^4.0.0-rc.14",
 		"typescript": "^6.0.2"
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-for-gir/cli",
-  "version": "4.0.0-rc.13",
+  "version": "4.0.0-rc.14",
   "description": "TypeScript type definition generator for GObject introspection GIR files",
   "main": "src/index.ts",
   "module": "src/index.ts",
@@ -17,8 +17,19 @@
     },
     "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": [
@@ -33,7 +44,7 @@
     "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": "node scripts/build-gjs.mjs",
+    "build:gjs": "gjsify build",
     "build:templates": "node scripts/process-templates.mjs",
     "prepack": "node scripts/process-templates.mjs",
     "check:types": "tsc --noEmit",
@@ -72,18 +83,18 @@
     ".": "./src/index.ts"
   },
   "devDependencies": {
-    "@gi.ts/parser": "^4.0.0-rc.13",
-    "@gjsify/cli": "^0.3.14",
-    "@ts-for-gir/generator-base": "^4.0.0-rc.13",
-    "@ts-for-gir/generator-html-doc": "^4.0.0-rc.13",
-    "@ts-for-gir/generator-json": "^4.0.0-rc.13",
-    "@ts-for-gir/generator-typescript": "^4.0.0-rc.13",
-    "@ts-for-gir/lib": "^4.0.0-rc.13",
-    "@ts-for-gir/reporter": "^4.0.0-rc.13",
-    "@ts-for-gir/tsconfig": "^4.0.0-rc.13",
+    "@gi.ts/parser": "^4.0.0-rc.14",
+    "@gjsify/cli": "^0.3.16",
+    "@ts-for-gir/generator-base": "^4.0.0-rc.14",
+    "@ts-for-gir/generator-html-doc": "^4.0.0-rc.14",
+    "@ts-for-gir/generator-json": "^4.0.0-rc.14",
+    "@ts-for-gir/generator-typescript": "^4.0.0-rc.14",
+    "@ts-for-gir/lib": "^4.0.0-rc.14",
+    "@ts-for-gir/reporter": "^4.0.0-rc.14",
+    "@ts-for-gir/tsconfig": "^4.0.0-rc.14",
     "@types/ejs": "^3.1.5",
     "@types/inquirer": "^9.0.9",
-    "@types/node": "^25.6.0",
+    "@types/node": "^25.6.2",
     "@types/yargs": "^17.0.35",
     "esbuild": "^0.28.0",
     "source-map-support": "^0.5.21",
@@ -91,7 +102,7 @@
   },
   "dependencies": {
     "@inquirer/prompts": "^8.4.2",
-    "@ts-for-gir/templates": "^4.0.0-rc.13",
+    "@ts-for-gir/templates": "^4.0.0-rc.14",
     "colorette": "^2.0.20",
     "cosmiconfig": "^9.0.1",
     "ejs": "^5.0.2",

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";
 
@@ -55,18 +55,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.",
 	);
@@ -122,17 +148,33 @@ function walkAndSubstitute(rootDir: string, projectName: string): void {
 declare const __GJS_BUNDLE__: boolean | undefined;
 
 const handler = async (args: ConfigFlags) => {
-	if (typeof __GJS_BUNDLE__ !== "undefined") {
-		process.stderr.write(
-			"The 'create' command is not yet supported in the GJS bundle.\nUse Node.js instead: npx @ts-for-gir/cli create ...\n",
-		);
-		process.exitCode = 1;
-		return;
-	}
 	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}`);