@forwardimpact/libcodegen 0.1.66 → 0.1.67

package/bin/fit-codegen.js

@@ -17,7 +17,11 @@ import { execFileSync } from "node:child_process";
 import protoLoader from "@grpc/proto-loader";
 import mustache from "mustache";
 
-import { createCli, SummaryRenderer } from "@forwardimpact/libcli";
+import {
+  createCli,
+  SummaryRenderer,
+  withEmbeddedAssets,
+} from "@forwardimpact/libcli";
 import { createDefaultRuntime } from "@forwardimpact/libutil/runtime";
 import { Logger } from "@forwardimpact/libtelemetry";
 import {
@@ -345,13 +349,18 @@ async function runCodegen(protoDirs, projectRoot, finder, parsedFlags) {
     );
   }
 
+  // Inject the embedded-overlay sync fs so loadTemplate's reads of the virtual
+  // template mount hit the inlined registry in a compiled binary. In
+  // source/npx execution withEmbeddedAssets is a no-op and this is the full
+  // node:fs sync surface, identical to the bare `fs` used elsewhere in this bin.
+  const codegenFs = withEmbeddedAssets(runtime).fsSync;
   const codegens = createCodegen(
     protoDirs,
     projectRoot,
     path,
     mustache,
     protoLoader,
-    fs,
+    codegenFs,
     runtime,
   );
   await executeGeneration(codegens, sourcePath, parsedFlags);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forwardimpact/libcodegen",
-  "version": "0.1.66",
+  "version": "0.1.67",
   "description": "Protobuf code generation — keep types in sync with proto definitions without hand-writing.",
   "keywords": [
     "codegen",

package/src/base.js

@@ -1,4 +1,5 @@
 import { fileURLToPath } from "node:url";
+import { embeddedAssetsActive, embeddedDir } from "@forwardimpact/libcli";
 import protobuf from "protobufjs";
 import "./long-init.js";
 
@@ -165,14 +166,22 @@ export class CodegenBase {
    * @returns {string} Template content
    */
   loadTemplate(kind) {
-    const __filename = fileURLToPath(import.meta.url);
-    const __dirname = this.#path.dirname(__filename);
-    const templatePath = this.#path.join(
-      __dirname,
-      "..",
-      "templates",
-      `${kind}.js.mustache`,
-    );
+    // A `bun build --compile` binary inlines the templates and registers them
+    // under the "libcodegen/templates" mount (see the CLI's assets block in
+    // build/cli-manifest.json), which flips embeddedAssetsActive() true. In
+    // that case resolve through the virtual mount the embedded-fs overlay
+    // serves. The on-disk path would not work there: import.meta.url points
+    // into the /$bunfs root, which carries no templates directory. In
+    // source/npx/test execution nothing registers, so resolve the on-disk path
+    // relative to this module.
+    const templatesDir = embeddedAssetsActive()
+      ? embeddedDir("libcodegen/templates")
+      : this.#path.join(
+          this.#path.dirname(fileURLToPath(import.meta.url)),
+          "..",
+          "templates",
+        );
+    const templatePath = this.#path.join(templatesDir, `${kind}.js.mustache`);
 
     if (!this.#fs.existsSync(templatePath)) {
       throw new Error(`Missing ${kind}.js.mustache template`);

package/src/definitions.js

@@ -59,7 +59,7 @@ export class CodegenDefinitions {
     const definitions = [];
 
     if (this.#base.fs.existsSync(definitionsDir)) {
-      for (const file of this.#base.fs.readdirSync(definitionsDir)) {
+      for (const file of this.#base.fs.readdirSync(definitionsDir).sort()) {
         if (!file.endsWith(".js") || file === "exports.js") continue;
 
         const serviceName = this.#base.path.basename(file, ".js");

package/src/services.js

@@ -52,7 +52,7 @@ export class CodegenServices {
     const clients = [];
 
     if (this.#base.fs.existsSync(serviceDir)) {
-      for (const dir of this.#base.fs.readdirSync(serviceDir)) {
+      for (const dir of this.#base.fs.readdirSync(serviceDir).sort()) {
         const servicePath = this.#base.path.join(serviceDir, dir);
         if (!this.#base.fs.statSync(servicePath).isDirectory()) continue;