@stryke/capnp 0.6.2 → 0.7.0

package/bin/capnpc.cjs

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -38,6 +37,30 @@ module.exports = __toCommonJS(capnpc_exports);
 var import_console = require("@storm-software/config-tools/logger/console");
 var import_utilities = require("@storm-software/config-tools/utilities");
 
+// ../path/src/exists.ts
+var import_node_fs = require("fs");
+var import_promises = require("fs/promises");
+var existsSync = /* @__PURE__ */ __name((filePath) => {
+  return (0, import_node_fs.existsSync)(filePath);
+}, "existsSync");
+var exists = /* @__PURE__ */ __name(async (filePath) => {
+  return (0, import_promises.access)(filePath, import_promises.constants.F_OK).then(() => true).catch(() => false);
+}, "exists");
+
+// ../fs/src/helpers.ts
+var import_nanotar = require("nanotar");
+var import_node_fs2 = require("fs");
+var import_promises2 = require("fs/promises");
+async function createDirectory(path) {
+  if (await exists(path)) {
+    return;
+  }
+  return (0, import_promises2.mkdir)(path, {
+    recursive: true
+  });
+}
+__name(createDirectory, "createDirectory");
+
 // ../fs/src/list-files.ts
 var import_defu = __toESM(require("defu"), 1);
 var import_glob = require("glob");
@@ -626,14 +649,14 @@ var isError = /* @__PURE__ */ __name((obj) => {
 }, "isError");
 
 // ../fs/src/read-file.ts
-var import_node_fs = require("fs");
-var import_promises = require("fs/promises");
-var readFile = /* @__PURE__ */ __name(async (filePath) => {
+var import_node_fs3 = require("fs");
+var import_promises3 = require("fs/promises");
+var readFile2 = /* @__PURE__ */ __name(async (filePath) => {
   try {
     if (!filePath) {
       throw new Error("No file path provided to read data");
     }
-    return await (0, import_promises.readFile)(filePath, {
+    return await (0, import_promises3.readFile)(filePath, {
       encoding: "utf8"
     });
   } catch {
@@ -641,7 +664,7 @@ var readFile = /* @__PURE__ */ __name(async (filePath) => {
   }
 }, "readFile");
 async function readJsonFile(path, options) {
-  const content = await readFile(path);
+  const content = await readFile2(path);
   if (options) {
     options.endsWithNewline = content.codePointAt(content.length - 1) === 10;
   }
@@ -657,21 +680,11 @@ async function readJsonFile(path, options) {
 }
 __name(readJsonFile, "readJsonFile");
 
-// ../path/src/exists.ts
-var import_node_fs2 = require("fs");
-var import_promises2 = require("fs/promises");
-var existsSync2 = /* @__PURE__ */ __name((filePath) => {
-  return (0, import_node_fs2.existsSync)(filePath);
-}, "existsSync");
-var exists = /* @__PURE__ */ __name(async (filePath) => {
-  return (0, import_promises2.access)(filePath, import_promises2.constants.F_OK).then(() => true).catch(() => false);
-}, "exists");
-
 // ../path/src/file-path-fns.ts
 var import_node_path = require("path");
 
 // ../path/src/is-file.ts
-var import_node_fs3 = require("fs");
+var import_node_fs4 = require("fs");
 
 // ../path/src/join-paths.ts
 var _DRIVE_LETTER_START_RE = /^[A-Z]:\//i;
@@ -802,9 +815,6 @@ __name(normalizeString, "normalizeString");
 
 // ../path/src/regex.ts
 var DRIVE_LETTER_START_REGEX = /^[A-Z]:\//i;
-var DRIVE_LETTER_REGEX = /^[A-Z]:$/i;
-var UNC_REGEX = /^[/\\]{2}/;
-var ABSOLUTE_PATH_REGEX = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^~[/\\]|^[A-Z]:[/\\]/i;
 
 // ../path/src/slash.ts
 function slash(path) {
@@ -815,12 +825,6 @@ function slash(path) {
 }
 __name(slash, "slash");
 
-// ../path/src/is-file.ts
-function isAbsolutePath(path) {
-  return ABSOLUTE_PATH_REGEX.test(slash(path));
-}
-__name(isAbsolutePath, "isAbsolutePath");
-
 // ../path/src/correct-path.ts
 function normalizeWindowsPath2(input = "") {
   if (!input) {
@@ -829,97 +833,6 @@ function normalizeWindowsPath2(input = "") {
   return slash(input).replace(DRIVE_LETTER_START_REGEX, (r) => r.toUpperCase());
 }
 __name(normalizeWindowsPath2, "normalizeWindowsPath");
-function correctPath(path) {
-  if (!path || path.length === 0) {
-    return ".";
-  }
-  path = normalizeWindowsPath2(path);
-  const isUNCPath = path.match(UNC_REGEX);
-  const isPathAbsolute = isAbsolutePath(path);
-  const trailingSeparator = path.endsWith("/");
-  path = normalizeString2(path, !isPathAbsolute);
-  if (path.length === 0) {
-    if (isPathAbsolute) {
-      return "/";
-    }
-    return trailingSeparator ? "./" : ".";
-  }
-  if (trailingSeparator) {
-    path += "/";
-  }
-  if (DRIVE_LETTER_REGEX.test(path)) {
-    path += "/";
-  }
-  if (isUNCPath) {
-    if (!isPathAbsolute) {
-      return `//./${path}`;
-    }
-    return `//${path}`;
-  }
-  return !path.startsWith("/") && isPathAbsolute && !DRIVE_LETTER_REGEX.test(path) ? `/${path}` : path;
-}
-__name(correctPath, "correctPath");
-function normalizeString2(path, allowAboveRoot) {
-  let res = "";
-  let lastSegmentLength = 0;
-  let lastSlash = -1;
-  let dots = 0;
-  let char = null;
-  for (let index = 0; index <= path.length; ++index) {
-    if (index < path.length) {
-      char = path[index];
-    } else if (char === "/") {
-      break;
-    } else {
-      char = "/";
-    }
-    if (char === "/") {
-      if (lastSlash === index - 1 || dots === 1) {
-      } else if (dots === 2) {
-        if (res.length < 2 || lastSegmentLength !== 2 || res[res.length - 1] !== "." || res[res.length - 2] !== ".") {
-          if (res.length > 2) {
-            const lastSlashIndex = res.lastIndexOf("/");
-            if (lastSlashIndex === -1) {
-              res = "";
-              lastSegmentLength = 0;
-            } else {
-              res = res.slice(0, lastSlashIndex);
-              lastSegmentLength = res.length - 1 - res.lastIndexOf("/");
-            }
-            lastSlash = index;
-            dots = 0;
-            continue;
-          } else if (res.length > 0) {
-            res = "";
-            lastSegmentLength = 0;
-            lastSlash = index;
-            dots = 0;
-            continue;
-          }
-        }
-        if (allowAboveRoot) {
-          res += res.length > 0 ? "/.." : "..";
-          lastSegmentLength = 2;
-        }
-      } else {
-        if (res.length > 0) {
-          res += `/${path.slice(lastSlash + 1, index)}`;
-        } else {
-          res = path.slice(lastSlash + 1, index);
-        }
-        lastSegmentLength = index - lastSlash - 1;
-      }
-      lastSlash = index;
-      dots = 0;
-    } else if (char === "." && dots !== -1) {
-      ++dots;
-    } else {
-      dots = -1;
-    }
-  }
-  return res;
-}
-__name(normalizeString2, "normalizeString");
 
 // ../path/src/get-workspace-root.ts
 var import_config_tools = require("@storm-software/config-tools");
@@ -945,49 +858,20 @@ function findFilePath(filePath) {
   return result === "/" ? result : result.replace(/\/$/, "");
 }
 __name(findFilePath, "findFilePath");
+function relativePath(from, to, withEndSlash = false) {
+  return (0, import_node_path.relative)(withEndSlash !== true ? from.replace(/\/$/, "") : from, withEndSlash !== true ? to.replace(/\/$/, "") : to);
+}
+__name(relativePath, "relativePath");
 
 // bin/capnpc.ts
 var import_commander = require("commander");
-var import_typescript3 = __toESM(require("typescript"), 1);
-
-// ../fs/src/helpers.ts
-var import_nanotar = require("nanotar");
-var import_node_fs4 = require("fs");
-var import_promises3 = require("fs/promises");
-async function createDirectory(path) {
-  if (await exists(path)) {
-    return;
-  }
-  return (0, import_promises3.mkdir)(path, {
-    recursive: true
-  });
-}
-__name(createDirectory, "createDirectory");
-
-// ../fs/src/write-file.ts
-var import_j_toml2 = require("@ltd/j-toml");
-var import_defu2 = __toESM(require("defu"), 1);
-var import_node_fs5 = require("fs");
 var import_promises4 = require("fs/promises");
-var writeFile = /* @__PURE__ */ __name(async (filePath, content = "", options = {}) => {
-  if (!filePath) {
-    throw new Error("No file path provided to read data");
-  }
-  const directory = findFilePath(correctPath(filePath));
-  if (!existsSync2(directory)) {
-    if (options.createDirectory !== false) {
-      await createDirectory(directory);
-    } else {
-      throw new Error(`Directory ${directory} does not exist`);
-    }
-  }
-  return (0, import_promises4.writeFile)(filePath, content || "", options);
-}, "writeFile");
+var import_typescript3 = __toESM(require("typescript"), 1);
 
-// ../../node_modules/.pnpm/capnp-es@0.0.11_patch_hash=80802686e11e663486f933dfdd5c01c5f57e003c1be30d468e18dd25b995f95b_typescript@5.8.3/node_modules/capnp-es/dist/shared/capnp-es.CbTQkT9D.mjs
+// ../../node_modules/.pnpm/capnp-es@0.0.11_patch_hash=824b6bae5f47936633f815d4ffa9019910937dad06e41df5249655046cadee7a_typescript@5.8.3/node_modules/capnp-es/dist/shared/capnp-es.CbTQkT9D.mjs
 var import_typescript = __toESM(require("typescript"), 1);
 
-// ../../node_modules/.pnpm/capnp-es@0.0.11_patch_hash=80802686e11e663486f933dfdd5c01c5f57e003c1be30d468e18dd25b995f95b_typescript@5.8.3/node_modules/capnp-es/dist/shared/capnp-es.0-_cOx6D.mjs
+// ../../node_modules/.pnpm/capnp-es@0.0.11_patch_hash=824b6bae5f47936633f815d4ffa9019910937dad06e41df5249655046cadee7a_typescript@5.8.3/node_modules/capnp-es/dist/shared/capnp-es.0-_cOx6D.mjs
 var ListElementSize = /* @__PURE__ */ ((ListElementSize2) => {
   ListElementSize2[ListElementSize2["VOID"] = 0] = "VOID";
   ListElementSize2[ListElementSize2["BIT"] = 1] = "BIT";
@@ -2980,7 +2864,7 @@ function checkDataBounds(byteOffset, byteLength, s) {
 }
 __name(checkDataBounds, "checkDataBounds");
 
-// ../../node_modules/.pnpm/capnp-es@0.0.11_patch_hash=80802686e11e663486f933dfdd5c01c5f57e003c1be30d468e18dd25b995f95b_typescript@5.8.3/node_modules/capnp-es/dist/shared/capnp-es.BvfUH5E6.mjs
+// ../../node_modules/.pnpm/capnp-es@0.0.11_patch_hash=824b6bae5f47936633f815d4ffa9019910937dad06e41df5249655046cadee7a_typescript@5.8.3/node_modules/capnp-es/dist/shared/capnp-es.BvfUH5E6.mjs
 function CompositeList(CompositeClass) {
   return class extends List {
     static _capnp = {
@@ -3051,7 +2935,7 @@ var getUint8Mask = _makePrimitiveMaskFn(
   DataView.prototype.setUint8
 );
 
-// ../../node_modules/.pnpm/capnp-es@0.0.11_patch_hash=80802686e11e663486f933dfdd5c01c5f57e003c1be30d468e18dd25b995f95b_typescript@5.8.3/node_modules/capnp-es/dist/capnp/schema.mjs
+// ../../node_modules/.pnpm/capnp-es@0.0.11_patch_hash=824b6bae5f47936633f815d4ffa9019910937dad06e41df5249655046cadee7a_typescript@5.8.3/node_modules/capnp-es/dist/capnp/schema.mjs
 var _capnpFileId = BigInt("0xa93fc509624c72d9");
 var Node_Parameter = class extends Struct {
   static {
@@ -5711,7 +5595,7 @@ CodeGeneratorRequest._Nodes = CompositeList(Node);
 CodeGeneratorRequest._SourceInfo = CompositeList(Node_SourceInfo);
 CodeGeneratorRequest._RequestedFiles = CompositeList(CodeGeneratorRequest_RequestedFile);
 
-// ../../node_modules/.pnpm/capnp-es@0.0.11_patch_hash=80802686e11e663486f933dfdd5c01c5f57e003c1be30d468e18dd25b995f95b_typescript@5.8.3/node_modules/capnp-es/dist/shared/capnp-es.GpvEvMIK.mjs
+// ../../node_modules/.pnpm/capnp-es@0.0.11_patch_hash=824b6bae5f47936633f815d4ffa9019910937dad06e41df5249655046cadee7a_typescript@5.8.3/node_modules/capnp-es/dist/shared/capnp-es.GpvEvMIK.mjs
 var ArenaKind = /* @__PURE__ */ ((ArenaKind2) => {
   ArenaKind2[ArenaKind2["SINGLE_SEGMENT"] = 0] = "SINGLE_SEGMENT";
   ArenaKind2[ArenaKind2["MULTI_SEGMENT"] = 1] = "MULTI_SEGMENT";
@@ -6708,7 +6592,7 @@ function copy(m) {
 }
 __name(copy, "copy");
 
-// ../../node_modules/.pnpm/capnp-es@0.0.11_patch_hash=80802686e11e663486f933dfdd5c01c5f57e003c1be30d468e18dd25b995f95b_typescript@5.8.3/node_modules/capnp-es/dist/shared/capnp-es.CbTQkT9D.mjs
+// ../../node_modules/.pnpm/capnp-es@0.0.11_patch_hash=824b6bae5f47936633f815d4ffa9019910937dad06e41df5249655046cadee7a_typescript@5.8.3/node_modules/capnp-es/dist/shared/capnp-es.CbTQkT9D.mjs
 var GEN_EXPLICIT_DEFAULT_NON_PRIMITIVE = "CAPNP-ES000 Don't know how to generate a %s field with an explicit default value.";
 var GEN_FIELD_NON_INLINE_STRUCT_LIST = "CAPNP-ES001 Don't know how to generate non-inline struct lists.";
 var GEN_NODE_LOOKUP_FAIL = "CAPNP-ES002 Failed to look up node id %s.";
@@ -6820,10 +6704,11 @@ var Primitives = {
     setter: "setVoid"
   }
 };
-var SOURCE_COMMENT = `/* eslint-disable */
+var SOURCE_COMMENT = `
+/* eslint-disable */
 // biome-ignore lint: disable
 
-// Generated by Storm Stack
+// Generated by storm-capnpc
 // Note: Do not edit this file manually - it will be overwritten automatically
 
 `;
@@ -7857,7 +7742,7 @@ function generateCapnpImport(ctx) {
     (n) => n.name === "importPath"
   );
   const importAnnotation = tsImportPathAnnotation && fileNode.annotations.find((a) => a.id === tsImportPathAnnotation.id);
-  const importPath = importAnnotation === void 0 ? "capnp-es" : importAnnotation.value.text;
+  const importPath = importAnnotation === void 0 ? "@stryke/capnp" : importAnnotation.value.text;
   ctx.codeParts.push(`import * as $ from '${importPath}';`);
 }
 __name(generateCapnpImport, "generateCapnpImport");
@@ -7866,7 +7751,7 @@ function generateNestedImports(ctx) {
     const { name } = imp;
     let importPath;
     if (name.startsWith("/capnp/")) {
-      importPath = `capnp-es/capnp/${name.slice(7).replace(/\.capnp$/, "")}`;
+      importPath = `@stryke/capnp/schemas/${name.slice(7).replace(/\.capnp$/, "")}`;
     } else {
       importPath = name.replace(/\.capnp$/, ".js");
       if (importPath[0] !== ".") {
@@ -7902,12 +7787,35 @@ async function compileAll(codeGenRequest, opts) {
   const req = new Message(codeGenRequest, false).getRoot(
     CodeGeneratorRequest
   );
+  console.log(
+    `
+Running capnpc for ${req.requestedFiles.length} capnp schema files 
+`
+  );
   const ctx = new CodeGeneratorContext();
   ctx.files = req.requestedFiles.map((file) => loadRequestedFile(req, file));
+  if (ctx.files.length === 0) {
+    throw new Error(GEN_NO_FILES);
+  }
+  console.log(
+    `
+Compiling ${ctx.files.length} files: ${ctx.files.map((f) => f.tsPath).join(", ")}
+`
+  );
   const files = new Map(
     ctx.files.map((file) => [file.tsPath, compileFile(file)])
   );
-  tsCompile(files, opts?.dts === true, opts?.js === true, opts?.tsconfig);
+  if (files.size === 0) {
+    throw new Error(GEN_NO_FILES);
+  }
+  if (opts?.dts === true || opts?.js === true) {
+    console.log(
+      `
+TypeScript Compiling ${files.size} files: ${[...files.keys()].join(", ")}
+`
+    );
+    tsCompile(files, opts?.dts === true, opts?.js === true, opts?.tsconfig);
+  }
   if (!opts?.ts) {
     for (const [fileName] of files) {
       if (fileName.endsWith(".ts") && !fileName.endsWith(".d.ts")) {
@@ -7951,6 +7859,7 @@ function tsCompile(files, dts, js, tsconfig) {
   const compileOptions = {
     moduleResolution: import_typescript.default.ModuleResolutionKind.Bundler,
     target: import_typescript.default.ScriptTarget.ESNext,
+    strict: true,
     ...tsconfig,
     noEmitOnError: false,
     noFallthroughCasesInSwitch: true,
@@ -7961,7 +7870,6 @@ function tsCompile(files, dts, js, tsconfig) {
     removeComments: false,
     skipLibCheck: true,
     sourceMap: false,
-    strict: true,
     emitDeclarationOnly: dts && !js,
     declaration: dts
   };
@@ -8006,92 +7914,58 @@ function tsCompile(files, dts, js, tsconfig) {
 }
 __name(tsCompile, "tsCompile");
 
-// ../../node_modules/.pnpm/capnp-es@0.0.11_patch_hash=80802686e11e663486f933dfdd5c01c5f57e003c1be30d468e18dd25b995f95b_typescript@5.8.3/node_modules/capnp-es/dist/compiler/index.mjs
+// ../../node_modules/.pnpm/capnp-es@0.0.11_patch_hash=824b6bae5f47936633f815d4ffa9019910937dad06e41df5249655046cadee7a_typescript@5.8.3/node_modules/capnp-es/dist/compiler/index.mjs
 var import_typescript2 = require("typescript");
 
 // src/compile.ts
 var import_node_buffer2 = require("buffer");
 var import_node_child_process = require("child_process");
-var import_node_fs6 = require("fs");
 async function capnpc(options) {
-  try {
-    const { output, tsconfig, schema = [] } = options;
-    let dataBuf = import_node_buffer2.Buffer.alloc(0);
-    if (!process.stdin.isTTY) {
-      const chunks = [];
-      process.stdin.on("data", (chunk) => {
-        chunks.push(chunk);
-      });
-      await new Promise((resolve) => {
-        process.stdin.on("end", resolve);
-      });
-      const reqBuffer = import_node_buffer2.Buffer.alloc(chunks.reduce((l, chunk) => l + chunk.byteLength, 0));
-      let i = 0;
-      for (const chunk of chunks) {
-        chunk.copy(reqBuffer, i);
-        i += chunk.byteLength;
-      }
-      dataBuf = reqBuffer;
-    }
-    if (dataBuf.byteLength === 0) {
-      const opts = [];
-      if (output) {
-        opts.push(`-o-:${output}`);
-      } else {
-        opts.push("-o-");
-      }
-      dataBuf = await new Promise((resolve) => {
-        (0, import_node_child_process.exec)(`capnpc ${opts.join(" ")} ${schema.join(" ")}`, {
-          encoding: "buffer"
-        }, (error, stdout, stderr) => {
-          if (stderr.length > 0) {
-            process.stderr.write(stderr);
-          }
-          if (error) {
-            throw error;
-          }
-          resolve(stdout);
-        });
-      });
-    }
-    const result = await compileAll(dataBuf, {
-      ts: options.ts ?? true,
-      js: options.js ?? false,
-      dts: options.dts ?? true,
-      tsconfig: tsconfig?.options
+  const { output, tsconfig, schemas = [], tty } = options;
+  let dataBuf = import_node_buffer2.Buffer.alloc(0);
+  if (tty) {
+    const chunks = [];
+    process.stdin.on("data", (chunk) => {
+      chunks.push(chunk);
     });
-    for (const [fileName, content] of result.files) {
-      let filePath = fileName;
-      if (!(0, import_node_fs6.existsSync)(findFilePath(filePath))) {
-        const fullPath = `/${filePath}`;
-        if ((0, import_node_fs6.existsSync)(findFilePath(fullPath))) {
-          filePath = fullPath;
-        }
-      }
-      if (output) {
-        filePath = joinPaths(output, fileName);
-      }
-      if (!(0, import_node_fs6.existsSync)(findFilePath(filePath))) {
-        await createDirectory(findFilePath(filePath));
-      }
-      await writeFile(
-        filePath,
-        // https://github.com/microsoft/TypeScript/issues/54632
-        content.replace(/^\s+/gm, (match) => " ".repeat(match.length / 2))
-      );
+    await new Promise((resolve) => {
+      process.stdin.on("end", resolve);
+    });
+    const reqBuffer = import_node_buffer2.Buffer.alloc(chunks.reduce((l, chunk) => l + chunk.byteLength, 0));
+    let i = 0;
+    for (const chunk of chunks) {
+      chunk.copy(reqBuffer, i);
+      i += chunk.byteLength;
     }
-    return result;
-  } catch (error) {
-    if (error instanceof Error) {
-      console.error(`Error: ${error.message}`);
-      if (error.stack) {
-        console.error(error.stack);
-      }
+    dataBuf = reqBuffer;
+  }
+  if (dataBuf.byteLength === 0) {
+    const opts = [];
+    if (output) {
+      opts.push(`-o-:${output}`);
     } else {
-      console.error("An unknown error occurred:", error);
-    }
-    throw error;
+      opts.push("-o-");
+    }
+    dataBuf = await new Promise((resolve) => {
+      (0, import_node_child_process.exec)(`capnpc ${opts.join(" ")} ${schemas.join(" ")}`, {
+        encoding: "buffer"
+      }, (error, stdout, stderr) => {
+        if (stderr.length > 0) {
+          process.stderr.write(stderr);
+        }
+        if (error) {
+          throw error;
+        }
+        resolve(stdout);
+      });
+    });
   }
+  return compileAll(dataBuf, {
+    ts: options.ts ?? true,
+    js: false,
+    dts: false,
+    tsconfig: tsconfig?.options
+  });
 }
 __name(capnpc, "capnpc");
 
@@ -8108,9 +7982,13 @@ function createProgram() {
   }
   const program = new import_commander.Command("storm-capnpc");
   program.version("1.0.0", "-v --version", "display CLI version");
+  const projectRootOption = new import_commander.Option("-p --project-root <path>", "The path to the project root directory");
   const tsOption = new import_commander.Option("--ts", "An indicator to generate TypeScript files").default(true);
+  const noTsOption = new import_commander.Option("--no-ts", "An indicator to disable generation of TypeScript files");
   const jsOption = new import_commander.Option("--js", "An indicator to generate JavaScript files").default(false);
-  const dtsOption = new import_commander.Option("--dts", "An indicator to generate TypeScript declaration files").default(true);
+  const dtsOption = new import_commander.Option("--dts", "An indicator to generate TypeScript declaration files");
+  const noDtsOption = new import_commander.Option("--no-dts", "An indicator to disable generation of TypeScript declaration files");
+  const ttyOption = new import_commander.Option("--tty", "An indicator to enable TTY mode for the compiler");
   const importPathOption = new import_commander.Option("-I --import-path <dir...>", "Add <dir> to the list of directories searched for non-relative imports").default([]).argParser((val) => {
     if (val.startsWith("-I") || val.startsWith("--import-path")) {
       return val.split(",").map((dir) => dir.trim());
@@ -8121,52 +7999,47 @@ function createProgram() {
   });
   const generateId = new import_commander.Option("-i --generate-id", "Generate a new 64-bit unique ID for use in a Cap'n Proto schema").default(true);
   const standardImportOption = new import_commander.Option("--standard-import", "Add default import paths; use only those specified by -I").default(true);
-  const schemaOption = new import_commander.Option("-s --schema <path...>", "The directories containing the Cap'n Proto schema files to compile (default: current working directory)").default([
-    joinPaths(process.cwd(), "**/*.capnp")
-  ]).argParser((val) => {
-    let result = [];
-    if (val.startsWith("--schema") || val.startsWith("-s")) {
-      result = val.split(",").map((dir) => dir.trim());
-    }
-    result = [
-      val.trim()
-    ];
-    return result.map((dir) => dir.endsWith(".capnp") ? dir : joinPaths(dir, "**/*.capnp"));
-  });
+  const schemaOption = new import_commander.Option("-s --schema <path>", "The directory (or a glob to the directory) containing the Cap'n Proto schema files to compile (default: current working directory)").default(joinPaths("{projectRoot}", "**/*.capnp"));
   const outputOption = new import_commander.Option("-o --output <path>", "The directory to output the generated files to");
-  const tsconfigOption = new import_commander.Option("-p --tsconfig <path>", "The path to the TypeScript configuration file to use for compilation").default(joinPaths(process.cwd(), "tsconfig.json"));
+  const tsconfigOption = new import_commander.Option("--tsconfig <path>", "The path to the TypeScript configuration file to use for compilation").default(joinPaths("{projectRoot}", "tsconfig.json"));
+  const workspaceRootOption = new import_commander.Option("-w --workspace-root <path>", "The path to the workspace root directory").default(root);
   program.command("compile", {
     isDefault: true
-  }).description("Run the Storm Cap'n Proto compiler").addOption(schemaOption).addOption(outputOption).addOption(importPathOption).addOption(tsconfigOption).addOption(generateId).addOption(standardImportOption).addOption(tsOption).addOption(jsOption).addOption(dtsOption).action(compileAction).showSuggestionAfterError(true).showHelpAfterError(true);
+  }).description("Run the Storm Cap'n Proto compiler").addOption(projectRootOption).addOption(schemaOption).addOption(outputOption).addOption(importPathOption).addOption(tsconfigOption).addOption(generateId).addOption(standardImportOption).addOption(tsOption).addOption(noTsOption).addOption(jsOption).addOption(dtsOption).addOption(noDtsOption).addOption(workspaceRootOption).addOption(ttyOption).action(compileAction).showSuggestionAfterError(true).showHelpAfterError(true);
   return program;
 }
 __name(createProgram, "createProgram");
 async function compileAction(options) {
-  (0, import_console.writeInfo)(`\u{1F4E6} Storm Cap'n Proto Compiler will output ${options.ts ? "TypeScript code" : ""}${options.js ? options.ts ? ", JavaScript code" : "JavaScript code" : ""}${options.dts ? options.ts || options.js ? ", TypeScript declarations" : "TypeScript declarations" : ""} files ${options.output ? `to ${options.output}...` : ""}`, {
-    logLevel: "all"
-  });
-  if (!existsSync2(options.tsconfig)) {
-    (0, import_console.writeFatal)(options.tsconfig ? `\u2716 The specified TypeScript configuration file "${options.tsconfig}" does not exist. Please provide a valid path.` : "\u2716 The specified TypeScript configuration file does not exist. Please provide a valid path.", {
+  const tsconfigPath = options.tsconfig.replace("{projectRoot}", options.projectRoot);
+  const schema = options.schema ? options.schema.replace("{projectRoot}", options.projectRoot) : options.projectRoot;
+  if (!existsSync(tsconfigPath)) {
+    const errorMessage = options.tsconfig ? `\u2716 The specified TypeScript configuration file "${tsconfigPath}" does not exist. Please provide a valid path.` : "\u2716 The specified TypeScript configuration file does not exist. Please provide a valid path.";
+    (0, import_console.writeFatal)(errorMessage, {
       logLevel: "all"
     });
-    return;
+    throw new Error(errorMessage);
   }
-  const resolvedTsconfig = await readJsonFile(options.tsconfig);
-  const tsconfig = import_typescript3.default.parseJsonConfigFileContent(resolvedTsconfig, import_typescript3.default.sys, findFilePath(options.tsconfig));
-  tsconfig.options.configFilePath = options.tsconfig;
+  const resolvedTsconfig = await readJsonFile(tsconfigPath);
+  const tsconfig = import_typescript3.default.parseJsonConfigFileContent(resolvedTsconfig, import_typescript3.default.sys, findFilePath(tsconfigPath));
+  tsconfig.options.configFilePath = tsconfigPath;
   tsconfig.options.noImplicitOverride = false;
-  const schema = [];
-  for (const schemaPath of options.schema) {
-    if (!schemaPath || !schemaPath.includes("*") && !existsSync2(schemaPath)) {
-      (0, import_console.writeFatal)(`\u2716 The schema path "${schemaPath}" is invalid. Please provide a valid path.`, {
-        logLevel: "all"
-      });
-      return;
-    }
-    schema.push(...await listFiles(schemaPath));
+  tsconfig.options.noUnusedLocals = false;
+  tsconfig.options.noUnusedParameters = false;
+  tsconfig.options.outDir = joinPaths(options.projectRoot, relativePath(findFilePath(tsconfigPath), joinPaths(options.workspaceRoot, schema.endsWith(".capnp") ? findFilePath(schema) : schema)));
+  (0, import_console.writeInfo)(`\u{1F4E6} Storm Cap'n Proto Compiler will output ${options.ts ? "TypeScript code" : ""}${options.js ? options.ts ? ", JavaScript code" : "JavaScript code" : ""}${options.dts ? options.ts || options.js ? ", TypeScript declarations" : "TypeScript declarations" : ""} files from schemas at ${schema} to ${tsconfig.options.outDir}...`, {
+    logLevel: "all"
+  });
+  const schemas = [];
+  if (!schema || !schema.includes("*") && !existsSync(schema)) {
+    const errorMessage = `\u2716 The schema path "${schema}" is invalid. Please provide a valid path.`;
+    (0, import_console.writeFatal)(errorMessage, {
+      logLevel: "all"
+    });
+    throw new Error(errorMessage);
   }
-  if (schema.length === 0) {
-    (0, import_console.writeFatal)(`\u2716 No Cap'n Proto schema files found in the specified source paths: ${options.schema.join(", ")}. Please ensure that the paths are correct and contain .capnp files.`, {
+  schemas.push(...await listFiles(schema.includes("*") ? schema.endsWith(".capnp") ? schema : `${schema}.capnp` : joinPaths(schema, "**/*.capnp")));
+  if (schemas.length === 0) {
+    (0, import_console.writeFatal)(`\u2716 No Cap'n Proto schema files found in the specified source paths: ${schemas.join(", ")}. Please ensure that the paths are correct and contain .capnp files.`, {
       logLevel: "all"
     });
     return;
@@ -8174,14 +8047,39 @@ async function compileAction(options) {
   const result = await capnpc({
     ...options,
     tsconfig,
-    schema
+    schemas,
+    ts: options.ts ?? (options.noTs !== void 0 ? !options.noTs : true),
+    dts: options.dts ?? (options.noDts !== void 0 ? !options.noDts : true)
   });
   if (result.files.size === 0) {
-    (0, import_console.writeInfo)("\u26A0\uFE0F No files were generated. Please check your schema files.", {
+    (0, import_console.writeWarning)("\u26A0\uFE0F No files were generated. Please check your schema files.", {
       logLevel: "all"
     });
     return;
   }
+  (0, import_console.writeInfo)(`Writing ${result.files.size} generated files to disk...`, {
+    logLevel: "all"
+  });
+  for (const [fileName, content] of result.files) {
+    let filePath = fileName;
+    if (!existsSync(findFilePath(filePath))) {
+      const fullPath = `/${filePath}`;
+      if (existsSync(findFilePath(fullPath))) {
+        filePath = fullPath;
+      }
+    }
+    if (options.output) {
+      filePath = joinPaths(options.output, fileName);
+    }
+    if (!existsSync(findFilePath(filePath))) {
+      await createDirectory(findFilePath(filePath));
+    }
+    await (0, import_promises4.writeFile)(
+      filePath,
+      // https://github.com/microsoft/TypeScript/issues/54632
+      content.replace(/^\s+/gm, (match) => " ".repeat(match.length / 2))
+    );
+  }
   (0, import_console.writeSuccess)("\u26A1 Storm Cap'n Proto Compiler completed successfully.", {
     logLevel: "all"
   });

package/bin/capnpc.d.cts

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+import { Command } from 'commander';
+
+declare function createProgram(): Command;
+
+export { createProgram };

package/bin/capnpc.d.ts

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+import { Command } from 'commander';
+
+declare function createProgram(): Command;
+
+export { createProgram };