@ts-for-gir/cli 4.0.0-beta.30 → 4.0.0-beta.32

package/bin/ts-for-gir

@@ -5515,35 +5515,31 @@ import { blue, gray, green, red, yellow, yellowBright } from "colorette";
 
 // ../reporter/src/constants.ts
 import { readFileSync } from "node:fs";
-import { createRequire } from "node:module";
 import { dirname, join } from "node:path";
-var require2 = createRequire(import.meta.url);
-function resolveWorkspacePackageJson() {
+import { fileURLToPath } from "node:url";
+function resolvePackageJson() {
   try {
-    return require2.resolve("../../../package.json");
-  } catch {
-    try {
-      const currentPackageJson = require2.resolve("@ts-for-gir/reporter/package.json");
-      return join(dirname(dirname(currentPackageJson)), "package.json");
-    } catch {
-      throw new Error("Unable to resolve workspace package.json path");
-    }
+    const currentModulePath = fileURLToPath(import.meta.url);
+    const currentDir = dirname(currentModulePath);
+    const packageRoot = join(currentDir, "..");
+    const packageJsonPath = join(packageRoot, "package.json");
+    return packageJsonPath;
+  } catch (error) {
+    throw new Error(`Unable to resolve package.json path: ${error instanceof Error ? error.message : "Unknown error"}`);
   }
 }
-function readWorkspacePackage() {
+function readPackage() {
   try {
-    const packagePath = resolveWorkspacePackageJson();
+    const packagePath = resolvePackageJson();
     const content = readFileSync(packagePath, "utf-8");
     return JSON.parse(content);
   } catch (error) {
     const message = error instanceof Error ? error.message : "Unknown error";
-    throw new Error(`Failed to read workspace package.json: ${message}`);
+    throw new Error(`Failed to read package.json: ${message}`);
   }
 }
-var WORKSPACE_PACKAGE = readWorkspacePackage();
-var REPORTER_VERSION = WORKSPACE_PACKAGE.version;
-var PACKAGE_NAME = WORKSPACE_PACKAGE.name;
-var PACKAGE_DESCRIPTION = WORKSPACE_PACKAGE.description;
+var PACKAGE = readPackage();
+var PACKAGE_VERSION = PACKAGE.version;
 
 // ../reporter/src/types/problem.ts
 var ProblemSeverity = /* @__PURE__ */ ((ProblemSeverity2) => {
@@ -6044,7 +6040,7 @@ var ConsoleReporter = class _ConsoleReporter extends ReporterBase {
     }
     return {
       metadata: {
-        version: REPORTER_VERSION,
+        version: PACKAGE_VERSION,
         generatedAt: /* @__PURE__ */ new Date()
       },
       statistics,
@@ -6428,7 +6424,7 @@ var ReporterService = class _ReporterService {
     }
     return {
       metadata: {
-        version: REPORTER_VERSION,
+        version: PACKAGE_VERSION,
         generatedAt: /* @__PURE__ */ new Date()
       },
       statistics,
@@ -6534,38 +6530,36 @@ ${"=".repeat(60)}`);
 };
 
 // ../lib/src/constants.ts
-import { createRequire as createRequire2 } from "node:module";
+import { readFileSync as readFileSync2 } from "node:fs";
 import { dirname as dirname2, join as join2 } from "node:path";
-var require3 = createRequire2(import.meta.url);
+import { fileURLToPath as fileURLToPath2 } from "node:url";
 var NEW_LINE_REG_EXP = /[\n\r]+/g;
-function resolveWorkspacePackageJson2() {
+function resolvePackageJson2() {
   try {
-    return require3.resolve("../../../package.json");
-  } catch {
-    try {
-      const currentPackageJson = require3.resolve("@ts-for-gir/lib/package.json");
-      return join2(dirname2(dirname2(currentPackageJson)), "package.json");
-    } catch {
-      throw new Error("Unable to resolve workspace package.json path");
-    }
+    const currentModulePath = fileURLToPath2(import.meta.url);
+    const currentDir = dirname2(currentModulePath);
+    const packageRoot = join2(currentDir, "..");
+    const packageJsonPath = join2(packageRoot, "package.json");
+    return packageJsonPath;
+  } catch (error) {
+    throw new Error(`Unable to resolve package.json path: ${error instanceof Error ? error.message : "Unknown error"}`);
   }
 }
-function readWorkspacePackageSync() {
+function readPackageSync() {
   try {
-    const packagePath = resolveWorkspacePackageJson2();
-    const { readFileSync: readFileSync3 } = require3("node:fs");
-    const content = readFileSync3(packagePath, "utf-8");
+    const packagePath = resolvePackageJson2();
+    const content = readFileSync2(packagePath, "utf-8");
     return JSON.parse(content);
   } catch (error) {
     const message = error instanceof Error ? error.message : "Unknown error";
-    throw new Error(`Failed to read workspace package.json: ${message}`);
+    throw new Error(`Failed to read package.json: ${message}`);
   }
 }
-var PACKAGE = readWorkspacePackageSync();
+var PACKAGE2 = readPackageSync();
 var APP_NAME = "ts-for-gir";
 var APP_USAGE = "TypeScript type definition generator for GObject introspection GIR files";
 var APP_SOURCE = "https://github.com/gjsify/ts-for-gir";
-var APP_VERSION = PACKAGE.version;
+var APP_VERSION = PACKAGE2.version;
 var PACKAGE_DESC = (packageName, libraryVersion) => {
   if (libraryVersion) {
     return `GJS TypeScript type definitions for ${packageName}, generated from library version ${libraryVersion.toString()}`;
@@ -15945,10 +15939,10 @@ var GENERATING_TYPES_DONE = "Done.";
 
 // ../lib/src/templates/template-engine.ts
 import { mkdir, readdir, readFile as readFile3, writeFile as writeFile3 } from "node:fs/promises";
-import { createRequire as createRequire3 } from "node:module";
+import { createRequire } from "node:module";
 import { dirname as dirname3, extname, join as join4, resolve as resolve2 } from "node:path";
 import ejs from "ejs";
-var require4 = createRequire3(import.meta.url);
+var require2 = createRequire(import.meta.url);
 var TemplateEngine = class {
   log;
   templateDir;
@@ -15962,7 +15956,7 @@ var TemplateEngine = class {
    */
   resolveTemplateDirectory() {
     try {
-      return join4(dirname3(require4.resolve("@ts-for-gir/templates/package.json")), "templates");
+      return join4(dirname3(require2.resolve("@ts-for-gir/templates/package.json")), "templates");
     } catch (_error) {
       return resolve2(process.cwd(), "../../templates/templates");
     }
@@ -16398,8 +16392,8 @@ function mergeDescs(descs, comment, indentCount = 1) {
 
 // ../lib/src/utils/path.ts
 import { dirname as dirname4, resolve as resolve3 } from "node:path";
-import { fileURLToPath } from "node:url";
-var __filename = fileURLToPath(import.meta.url);
+import { fileURLToPath as fileURLToPath3 } from "node:url";
+var __filename = fileURLToPath3(import.meta.url);
 var __dirname = resolve3(dirname4(__filename), "../..");
 
 // src/start.ts
@@ -16407,7 +16401,7 @@ import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 
 // src/commands/analyze.ts
-import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync } from "node:fs";
+import { existsSync as existsSync2, readFileSync as readFileSync3, writeFileSync } from "node:fs";
 
 // src/config/config-loader.ts
 import { dirname as dirname5, resolve as resolve4 } from "node:path";
@@ -16933,7 +16927,7 @@ var loadReportFile = (filePath) => {
     throw new Error(`Report file not found: ${filePath}`);
   }
   try {
-    const content = readFileSync2(filePath, "utf-8");
+    const content = readFileSync3(filePath, "utf-8");
     const report = JSON.parse(content);
     report.metadata.generatedAt = parseReportDate(report.metadata.generatedAt);
     report.statistics.startTime = parseReportDate(report.statistics.startTime);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-for-gir/cli",
-  "version": "4.0.0-beta.30",
+  "version": "4.0.0-beta.32",
   "description": "TypeScript type definition generator for GObject introspection GIR files",
   "main": "src/index.ts",
   "module": "src/index.ts",
@@ -53,13 +53,13 @@
     ".": "./src/index.ts"
   },
   "devDependencies": {
-    "@gi.ts/parser": "^4.0.0-beta.30",
-    "@ts-for-gir/generator-base": "^4.0.0-beta.30",
-    "@ts-for-gir/generator-html-doc": "^4.0.0-beta.30",
-    "@ts-for-gir/generator-json": "^4.0.0-beta.30",
-    "@ts-for-gir/generator-typescript": "^4.0.0-beta.30",
-    "@ts-for-gir/lib": "^4.0.0-beta.30",
-    "@ts-for-gir/reporter": "^4.0.0-beta.30",
+    "@gi.ts/parser": "^4.0.0-beta.32",
+    "@ts-for-gir/generator-base": "^4.0.0-beta.32",
+    "@ts-for-gir/generator-html-doc": "^4.0.0-beta.32",
+    "@ts-for-gir/generator-json": "^4.0.0-beta.32",
+    "@ts-for-gir/generator-typescript": "^4.0.0-beta.32",
+    "@ts-for-gir/lib": "^4.0.0-beta.32",
+    "@ts-for-gir/reporter": "^4.0.0-beta.32",
     "@types/ejs": "^3.1.5",
     "@types/inquirer": "^9.0.9",
     "@types/node": "^24.2.1",
@@ -70,7 +70,7 @@
   },
   "dependencies": {
     "@inquirer/prompts": "^7.8.2",
-    "@ts-for-gir/templates": "^4.0.0-beta.30",
+    "@ts-for-gir/templates": "^4.0.0-beta.32",
     "colorette": "^2.0.20",
     "cosmiconfig": "^9.0.0",
     "ejs": "^3.1.10",