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

package/bin/ts-for-gir

@@ -3333,7 +3333,7 @@ var require_lodash = __commonJS({
           }
           return mapped.length && mapped[0] === arrays[0] ? baseIntersection(mapped, undefined2, comparator) : [];
         });
-        function join10(array, separator) {
+        function join8(array, separator) {
           return array == null ? "" : nativeJoin.call(array, separator);
         }
         function last(array) {
@@ -5252,7 +5252,7 @@ var require_lodash = __commonJS({
         lodash2.isUndefined = isUndefined;
         lodash2.isWeakMap = isWeakMap;
         lodash2.isWeakSet = isWeakSet;
-        lodash2.join = join10;
+        lodash2.join = join8;
         lodash2.kebabCase = kebabCase;
         lodash2.last = last;
         lodash2.lastIndexOf = lastIndexOf;
@@ -5516,34 +5516,34 @@ 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";
+import { dirname, resolve } from "node:path";
 var require2 = createRequire(import.meta.url);
-function resolveWorkspacePackageJson() {
+function resolvePackageJson() {
   try {
-    return require2.resolve("../../../package.json");
+    return require2.resolve("@ts-for-gir/reporter/package.json");
   } catch {
     try {
-      const currentPackageJson = require2.resolve("@ts-for-gir/reporter/package.json");
-      return join(dirname(dirname(currentPackageJson)), "package.json");
+      const currentModule = require2.resolve("@ts-for-gir/reporter");
+      return resolve(dirname(currentModule), "..", "package.json");
     } catch {
-      throw new Error("Unable to resolve workspace package.json path");
+      throw new Error("Unable to resolve package.json path");
     }
   }
 }
-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;
+var PACKAGE_NAME = PACKAGE.name;
+var PACKAGE_DESCRIPTION = PACKAGE.description;
 
 // ../reporter/src/types/problem.ts
 var ProblemSeverity = /* @__PURE__ */ ((ProblemSeverity2) => {
@@ -6044,7 +6044,7 @@ var ConsoleReporter = class _ConsoleReporter extends ReporterBase {
     }
     return {
       metadata: {
-        version: REPORTER_VERSION,
+        version: PACKAGE_VERSION,
         generatedAt: /* @__PURE__ */ new Date()
       },
       statistics,
@@ -6184,7 +6184,7 @@ ${"=".repeat(50)}`);
 
 // ../reporter/src/reporter-service.ts
 import { writeFile as writeFile2 } from "node:fs/promises";
-import { resolve } from "node:path";
+import { resolve as resolve2 } from "node:path";
 import { blue as blue2, green as green2, red as red2, yellow as yellow2 } from "colorette";
 var ReporterService = class _ReporterService {
   static instance = null;
@@ -6428,7 +6428,7 @@ var ReporterService = class _ReporterService {
     }
     return {
       metadata: {
-        version: REPORTER_VERSION,
+        version: PACKAGE_VERSION,
         generatedAt: /* @__PURE__ */ new Date()
       },
       statistics,
@@ -6451,7 +6451,7 @@ var ReporterService = class _ReporterService {
     const report = this.generateComprehensiveReport();
     const filePath = outputPath || this.config.outputPath;
     try {
-      const fullPath = resolve(process.cwd(), filePath);
+      const fullPath = resolve2(process.cwd(), filePath);
       await writeFile2(fullPath, JSON.stringify(report, null, 2), "utf-8");
       console.log(`\u{1F4CA} Comprehensive report saved to: ${fullPath}`);
     } catch (error) {
@@ -6535,37 +6535,37 @@ ${"=".repeat(60)}`);
 
 // ../lib/src/constants.ts
 import { createRequire as createRequire2 } from "node:module";
-import { dirname as dirname2, join as join2 } from "node:path";
+import { dirname as dirname2, resolve as resolve3 } from "node:path";
 var require3 = createRequire2(import.meta.url);
 var NEW_LINE_REG_EXP = /[\n\r]+/g;
-function resolveWorkspacePackageJson2() {
+function resolvePackageJson2() {
   try {
-    return require3.resolve("../../../package.json");
+    return require3.resolve("@ts-for-gir/lib/package.json");
   } catch {
     try {
-      const currentPackageJson = require3.resolve("@ts-for-gir/lib/package.json");
-      return join2(dirname2(dirname2(currentPackageJson)), "package.json");
+      const currentModule = require3.resolve("@ts-for-gir/lib");
+      return resolve3(dirname2(currentModule), "..", "package.json");
     } catch {
-      throw new Error("Unable to resolve workspace package.json path");
+      throw new Error("Unable to resolve package.json path");
     }
   }
 }
-function readWorkspacePackageSync() {
+function readPackageSync() {
   try {
-    const packagePath = resolveWorkspacePackageJson2();
+    const packagePath = resolvePackageJson2();
     const { readFileSync: readFileSync3 } = require3("node:fs");
     const content = readFileSync3(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()}`;
@@ -8175,7 +8175,7 @@ var Logger = class _Logger {
 // ../lib/src/utils/files.ts
 import { constants } from "node:fs";
 import { access, readFile } from "node:fs/promises";
-import { join as join3 } from "node:path";
+import { join } from "node:path";
 import { glob } from "glob";
 var fileExists = async (filePath) => {
   try {
@@ -8187,7 +8187,7 @@ var fileExists = async (filePath) => {
 };
 var findFilesInDirs = async (dirs, filename) => {
   const filesInfo = [];
-  const pattern = dirs.map((dir) => join3(dir, filename));
+  const pattern = dirs.map((dir) => join(dir, filename));
   const _files = await glob(pattern);
   const files = [...new Set(_files)];
   for (const filePath of files) {
@@ -15946,7 +15946,7 @@ 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 { dirname as dirname3, extname, join as join4, resolve as resolve2 } from "node:path";
+import { dirname as dirname3, extname, join as join2, resolve as resolve4 } from "node:path";
 import ejs from "ejs";
 var require4 = createRequire3(import.meta.url);
 var TemplateEngine = class {
@@ -15962,9 +15962,9 @@ var TemplateEngine = class {
    */
   resolveTemplateDirectory() {
     try {
-      return join4(dirname3(require4.resolve("@ts-for-gir/templates/package.json")), "templates");
+      return join2(dirname3(require4.resolve("@ts-for-gir/templates/package.json")), "templates");
     } catch (_error) {
-      return resolve2(process.cwd(), "../../templates/templates");
+      return resolve4(process.cwd(), "../../templates/templates");
     }
   }
   /**
@@ -15986,7 +15986,7 @@ var TemplateEngine = class {
    * Checks if the template file or directory exists and returns the path if found
    */
   async exists(templateFilename) {
-    const fullTemplatePath = join4(this.templateDir, templateFilename);
+    const fullTemplatePath = join2(this.templateDir, templateFilename);
     if (await fileExists(fullTemplatePath)) {
       return fullTemplatePath;
     }
@@ -16026,7 +16026,7 @@ var TemplateEngine = class {
       }
       const results = {};
       for (const file of files) {
-        const content = await readFile3(join4(path, file), "utf8");
+        const content = await readFile3(join2(path, file), "utf8");
         results[file] = this.removeTypeScriptDirectives(content);
       }
       return results;
@@ -16397,10 +16397,10 @@ function mergeDescs(descs, comment, indentCount = 1) {
 }
 
 // ../lib/src/utils/path.ts
-import { dirname as dirname4, resolve as resolve3 } from "node:path";
+import { dirname as dirname4, resolve as resolve5 } from "node:path";
 import { fileURLToPath } from "node:url";
 var __filename = fileURLToPath(import.meta.url);
-var __dirname = resolve3(dirname4(__filename), "../..");
+var __dirname = resolve5(dirname4(__filename), "../..");
 
 // src/start.ts
 import yargs from "yargs";
@@ -16410,16 +16410,16 @@ import { hideBin } from "yargs/helpers";
 import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync } from "node:fs";
 
 // src/config/config-loader.ts
-import { dirname as dirname5, resolve as resolve4 } from "node:path";
+import { dirname as dirname5, resolve as resolve6 } from "node:path";
 import { cosmiconfig } from "cosmiconfig";
 
 // src/config/config-writer.ts
 import { writeFile as writeFile4 } from "node:fs/promises";
-import { extname as extname2, join as join6 } from "node:path";
+import { extname as extname2, join as join4 } from "node:path";
 
 // src/config/defaults.ts
 import { existsSync } from "node:fs";
-import { join as join5 } from "node:path";
+import { join as join3 } from "node:path";
 var defaults = {
   print: false,
   configName: ".ts-for-girrc.js",
@@ -16455,7 +16455,7 @@ function getDefaultGirDirectories() {
   ];
   const dataDirs = process.env.XDG_DATA_DIRS?.split(":") || [];
   for (let dataDir of dataDirs) {
-    dataDir = join5(dataDir, "gir-1.0");
+    dataDir = join3(dataDir, "gir-1.0");
     if (!girDirectories.includes(dataDir) && existsSync(dataDir)) {
       girDirectories.push(dataDir);
     }
@@ -16465,7 +16465,7 @@ function getDefaultGirDirectories() {
 
 // src/config/config-writer.ts
 var logger2 = new Logger(false, "ConfigWriter");
-var configFilePath = join6(process.cwd(), defaults.configName);
+var configFilePath = join4(process.cwd(), defaults.configName);
 function setConfigFilePath(path) {
   configFilePath = path;
 }
@@ -16879,12 +16879,12 @@ async function load(cliOptions) {
     }
   }
   if (userConfig.outdir && !userConfig.outdir.startsWith("/")) {
-    userConfig.outdir = resolve4(userConfig.root, userConfig.outdir);
+    userConfig.outdir = resolve6(userConfig.root, userConfig.outdir);
   }
   if (userConfig.girDirectories) {
     userConfig.girDirectories = userConfig.girDirectories.map((dir) => {
       if (!dir.startsWith("/")) {
-        return resolve4(userConfig.root, dir);
+        return resolve6(userConfig.root, dir);
       }
       return dir;
     });
@@ -17160,7 +17160,7 @@ var analyze = {
 
 // src/commands/copy.ts
 import { copyFile, mkdir as mkdir2 } from "node:fs/promises";
-import { basename as basename2, join as join8 } from "node:path";
+import { basename as basename2, join as join6 } from "node:path";
 
 // src/module-loader/dependency-resolver.ts
 var DependencyResolver = class {
@@ -17238,7 +17238,7 @@ var DependencyResolver = class {
 };
 
 // src/module-loader/file-finder.ts
-import { basename, join as join7 } from "node:path";
+import { basename, join as join5 } from "node:path";
 import { glob as glob2 } from "glob";
 var FileFinder = class {
   constructor(girDirectories, dependencyManager) {
@@ -17257,7 +17257,7 @@ var FileFinder = class {
         continue;
       }
       const filename = `${globPackageNames[i]}.gir`;
-      const pattern = this.girDirectories.map((girDirectory) => join7(girDirectory, filename));
+      const pattern = this.girDirectories.map((girDirectory) => join5(girDirectory, filename));
       const ignoreGirs = ignore.map((girDirectory) => `${girDirectory}.gir`);
       const files = await glob2(pattern, { ignore: ignoreGirs });
       for (const file of files) {
@@ -17660,7 +17660,7 @@ var copyGirFile = async (config, depModule) => {
     return;
   }
   const filename = basename2(depModule.path);
-  const dest = join8(config.outdir, filename);
+  const dest = join6(config.outdir, filename);
   if (depModule.path === dest) {
     logger3.yellow(`Skip ${depModule.path}`);
     return;
@@ -17921,7 +17921,7 @@ var JsonDefinitionGenerator = class _JsonDefinitionGenerator {
 };
 
 // ../generator-typescript/src/template-processor.ts
-import { dirname as dirname6, join as join9, relative } from "node:path";
+import { dirname as dirname6, join as join7, relative } from "node:path";
 var TemplateProcessor = class extends TemplateEngine {
   data;
   packageName;
@@ -17951,7 +17951,7 @@ var TemplateProcessor = class extends TemplateEngine {
       dep,
       deps,
       typeDir,
-      join: join9,
+      join: join7,
       dirname: dirname6,
       ...this.config,
       packageName: this.packageName
@@ -18022,10 +18022,10 @@ ${append}`;
     const rendered = await this.loadAll(templateDirname, fileExtension, ejsOptions, overrideTemplateData);
     const result = {};
     for (const filename of Object.keys(rendered)) {
-      const destPath = join9(baseOutputPath, outputDirname, filename);
+      const destPath = join7(baseOutputPath, outputDirname, filename);
       result[destPath] = `${rendered[filename]}
 ${append}`;
-      await this.write(result[destPath], baseOutputPath, join9(outputDirname, filename));
+      await this.write(result[destPath], baseOutputPath, join7(outputDirname, filename));
     }
     return result;
   }
@@ -18034,8 +18034,8 @@ ${append}`;
    * This is TypeScript-specific logic for handling package.json mode
    */
   getOutputPath(baseOutputPath, outputFilename) {
-    const filePath = this.config.package ? join9(this.data?.importName || this.packageName, outputFilename) : outputFilename;
-    const outputPath = join9(baseOutputPath, filePath);
+    const filePath = this.config.package ? join7(this.data?.importName || this.packageName, outputFilename) : outputFilename;
+    const outputPath = join7(baseOutputPath, filePath);
     return outputPath;
   }
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-for-gir/cli",
-  "version": "4.0.0-beta.30",
+  "version": "4.0.0-beta.31",
   "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.31",
+    "@ts-for-gir/generator-base": "^4.0.0-beta.31",
+    "@ts-for-gir/generator-html-doc": "^4.0.0-beta.31",
+    "@ts-for-gir/generator-json": "^4.0.0-beta.31",
+    "@ts-for-gir/generator-typescript": "^4.0.0-beta.31",
+    "@ts-for-gir/lib": "^4.0.0-beta.31",
+    "@ts-for-gir/reporter": "^4.0.0-beta.31",
     "@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.31",
     "colorette": "^2.0.20",
     "cosmiconfig": "^9.0.0",
     "ejs": "^3.1.10",