@ts-for-gir/lib 4.0.0-rc.7 → 4.0.0-rc.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-for-gir/lib",
-  "version": "4.0.0-rc.7",
+  "version": "4.0.0-rc.8",
   "description": "Typescript .d.ts generator from GIR for gjs",
   "main": "src/index.ts",
   "module": "src/index.ts",
@@ -41,7 +41,7 @@
     "type definitions"
   ],
   "devDependencies": {
-    "@ts-for-gir/tsconfig": "^4.0.0-rc.7",
+    "@ts-for-gir/tsconfig": "^4.0.0-rc.8",
     "@types/ejs": "^3.1.5",
     "@types/lodash": "^4.17.24",
     "@types/node": "^25.6.0",
@@ -49,9 +49,9 @@
     "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@gi.ts/parser": "^4.0.0-rc.7",
-    "@ts-for-gir/reporter": "^4.0.0-rc.7",
-    "@ts-for-gir/templates": "^4.0.0-rc.7",
+    "@gi.ts/parser": "^4.0.0-rc.8",
+    "@ts-for-gir/reporter": "^4.0.0-rc.8",
+    "@ts-for-gir/templates": "^4.0.0-rc.8",
     "colorette": "^2.0.20",
     "ejs": "^5.0.2",
     "glob": "^13.0.6",

package/src/constants.ts

@@ -18,11 +18,18 @@ function getPackageVersion(): string {
 	if (typeof __TS_FOR_GIR_VERSION__ !== "undefined") {
 		return __TS_FOR_GIR_VERSION__;
 	}
-	const currentModulePath = fileURLToPath(import.meta.url);
-	const currentDir = dirname(currentModulePath);
-	const packageJsonPath = join(currentDir, "..", "package.json");
-	const content = readFileSync(packageJsonPath, "utf-8");
-	return (JSON.parse(content) as { version: string }).version;
+	// Dev mode reads the sibling package.json relative to this source file.
+	// Wrapped in try/catch so a bundle missing the __TS_FOR_GIR_VERSION__ define
+	// degrades to a fallback string instead of throwing at module load.
+	try {
+		const currentModulePath = fileURLToPath(import.meta.url);
+		const currentDir = dirname(currentModulePath);
+		const packageJsonPath = join(currentDir, "..", "package.json");
+		const content = readFileSync(packageJsonPath, "utf-8");
+		return (JSON.parse(content) as { version: string }).version;
+	} catch {
+		return "0.0.0-unknown";
+	}
 }
 
 export const APP_NAME = "ts-for-gir";

package/src/utils/generation.ts

@@ -37,7 +37,9 @@ export function addTSDocCommentLines(lines: string[], indentCount = 0): string[]
 }
 
 /**
- * Adds an info comment, is used for debugging the generated types
+ * Adds an info comment, is used for debugging the generated types.
+ * One blank line before the comment, one after — readers see a single
+ * blank-line separator on each side without a double-blank gap.
  */
 export function addInfoComment(comment?: string, indentCount = 0): string[] {
 	const def: string[] = [];
@@ -45,7 +47,6 @@ export function addInfoComment(comment?: string, indentCount = 0): string[] {
 	if (comment) {
 		def.push("");
 		def.push(`${indent}// ${comment}`);
-		def.push("");
 	}
 	return def;
 }
@@ -58,7 +59,8 @@ export function mergeDescs(descs: string[], comment?: string, indentCount = 1):
 	const indent = generateIndent(indentCount);
 
 	for (const desc of descs) {
-		def.push(`${indent}${desc}`);
+		// Empty separator strings stay empty; only real content gets indented.
+		def.push(desc.length === 0 ? desc : `${indent}${desc}`);
 	}
 
 	if (def.length > 0) {

package/src/utils/path.ts

@@ -1,7 +1,15 @@
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
-// Get __filename on ESM
-const __filename = fileURLToPath(import.meta.url);
-// Get __dirname on ESM, resolve to the root directory of this package
-export const __dirname = resolve(dirname(__filename), "../.."); // TODO: Bundled this must be '..' but unbundled it must be '../..'
+// Resolves to the root directory of this package in dev mode.
+// Wrapped in try/catch so a bundled consumer that lacks `import.meta.url`
+// support degrades to "" instead of crashing at module load.
+function resolvePackageDir(): string {
+	try {
+		return resolve(dirname(fileURLToPath(import.meta.url)), "../..");
+	} catch {
+		return "";
+	}
+}
+
+export const __dirname = resolvePackageDir();