@forwardimpact/libcodegen 0.1.28 → 0.1.30

package/bin/fit-codegen.js

@@ -4,7 +4,7 @@ import fs from "node:fs";
 import fsAsync from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { execSync } from "node:child_process";
+import { execFileSync } from "node:child_process";
 import { parseArgs } from "node:util";
 
 import protoLoader from "@grpc/proto-loader";
@@ -42,12 +42,17 @@ async function createBundle(sourcePath) {
 
   // Create tar.gz archive using system tar command
   try {
-    const directoriesArg = directories.join(" ");
-    execSync(`tar -czf "${bundlePath}" -C "${sourcePath}" ${directoriesArg}`, {
-      stdio: "pipe",
-    });
+    execFileSync(
+      "tar",
+      ["-czf", bundlePath, "-C", sourcePath, ...directories],
+      {
+        stdio: "pipe",
+      },
+    );
   } catch (error) {
-    throw new Error(`Failed to create bundle: ${error.message}`);
+    throw new Error(`Failed to create bundle: ${error.message}`, {
+      cause: error,
+    });
   }
 }
 
@@ -122,8 +127,16 @@ function parseFlags() {
  */
 function createCodegen(projectRoot, path, mustache, protoLoader, fs) {
   const base = new CodegenBase(projectRoot, path, mustache, protoLoader, fs);
+  const pbjsPath = path.resolve(
+    __dirname,
+    "..",
+    "node_modules",
+    "protobufjs-cli",
+    "bin",
+    "pbjs",
+  );
   return {
-    types: new CodegenTypes(base),
+    types: new CodegenTypes(base, pbjsPath),
     services: new CodegenServices(base),
     definitions: new CodegenDefinitions(base),
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forwardimpact/libcodegen",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "description": "Protocol Buffer code generation utilities for Guide",
   "license": "Apache-2.0",
   "author": "D. Olsson <hi@senzilla.io>",
@@ -17,12 +17,12 @@
   },
   "dependencies": {
     "@grpc/proto-loader": "^0.8.0",
-    "mustache": "^4.2.0",
-    "protobufjs": "^7.5.4",
-    "protobufjs-cli": "^1.2.0"
+    "mustache": "^4.2.0"
   },
   "devDependencies": {
-    "@forwardimpact/libharness": "^0.1.5"
+    "@forwardimpact/libharness": "^0.1.5",
+    "protobufjs": "^7.5.4",
+    "protobufjs-cli": "^2.0.0"
   },
   "publishConfig": {
     "access": "public"

package/types.js

@@ -4,14 +4,17 @@
  */
 export class CodegenTypes {
   #base;
+  #pbjsPath;
 
   /**
    * Creates a new types generator with base functionality
    * @param {object} base - CodegenBase instance providing shared utilities
+   * @param {string} [pbjsPath] - Absolute path to the pbjs binary (resolved from protobufjs-cli)
    */
-  constructor(base) {
+  constructor(base, pbjsPath) {
     if (!base) throw new Error("CodegenBase instance is required");
     this.#base = base;
+    this.#pbjsPath = pbjsPath || null;
   }
 
   /**
@@ -85,8 +88,14 @@ export class CodegenTypes {
       ...protoFiles,
     ];
 
-    await this.#base.run("npx", ["pbjs", ...args], {
-      cwd: this.#base.projectRoot,
-    });
+    if (this.#pbjsPath) {
+      await this.#base.run(process.execPath, [this.#pbjsPath, ...args], {
+        cwd: this.#base.projectRoot,
+      });
+    } else {
+      await this.#base.run("npx", ["pbjs", ...args], {
+        cwd: this.#base.projectRoot,
+      });
+    }
   }
 }