@stryke/capnp 0.4.0 → 0.4.1

package/bin/capnpc.cjs

@@ -657,11 +657,21 @@ 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_fs2 = require("fs");
+var import_node_fs3 = require("fs");
 
 // ../path/src/join-paths.ts
 var _DRIVE_LETTER_START_RE = /^[A-Z]:\//i;
@@ -940,16 +950,6 @@ __name(findFilePath, "findFilePath");
 var import_commander = require("commander");
 var import_typescript = __toESM(require("typescript"), 1);
 
-// ../path/src/exists.ts
-var import_node_fs3 = require("fs");
-var import_promises2 = require("fs/promises");
-var existsSync2 = /* @__PURE__ */ __name((filePath) => {
-  return (0, import_node_fs3.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");
-
 // ../fs/src/helpers.ts
 var import_nanotar = require("nanotar");
 var import_node_fs4 = require("fs");
@@ -1011,17 +1011,17 @@ async function readStdin() {
 __name(readStdin, "readStdin");
 async function capnpc(options) {
   try {
-    const { outputPath, tsconfig, sourcePath = [] } = options;
+    const { output, tsconfig, schema = [] } = options;
     let dataBuf = await readStdin();
     if (dataBuf.byteLength === 0) {
       const opts = [];
-      if (outputPath) {
-        opts.push(`-o-:${outputPath}`);
+      if (output) {
+        opts.push(`-o-:${output}`);
       } else {
         opts.push("-o-");
       }
       dataBuf = await new Promise((resolve) => {
-        (0, import_node_child_process.exec)(`capnpc ${opts.join(" ")} ${sourcePath.join(" ")}`, {
+        (0, import_node_child_process.exec)(`capnpc ${opts.join(" ")} ${schema.join(" ")}`, {
           encoding: "buffer"
         }, (error, stdout, stderr) => {
           if (stderr.length > 0) {
@@ -1048,8 +1048,8 @@ async function capnpc(options) {
           filePath = fullPath;
         }
       }
-      if (outputPath) {
-        filePath = joinPaths(outputPath, fileName);
+      if (output) {
+        filePath = joinPaths(output, fileName);
       }
       if (!(0, import_node_fs6.existsSync)(findFilePath(filePath))) {
         await createDirectory(findFilePath(filePath));
@@ -1101,42 +1101,51 @@ 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 outputPathOption = new import_commander.Option("-o --output-path <path>", "The directory to output the generated files to").default(process.cwd());
-  const sourceOption = new import_commander.Option("--source-path <path...>", "The directories containing the Cap'n Proto schema files to compile (default: current working directory)").default([
+  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) => {
-    if (val.startsWith("--source") || val.startsWith("-s")) {
-      return val.split(",").map((dir) => dir.trim());
+    let result = [];
+    if (val.startsWith("--schema") || val.startsWith("-s")) {
+      result = val.split(",").map((dir) => dir.trim());
     }
-    return [
+    result = [
       val.trim()
     ];
+    return result.map((dir) => dir.endsWith(".capnp") ? dir : joinPaths(dir, "**/*.capnp"));
   });
-  const tsconfigPathOption = new import_commander.Option("--tsconfig-path <path>", "The path to the TypeScript configuration file to use for compilation").default(joinPaths(process.cwd(), "tsconfig.json"));
+  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"));
   program.command("compile", {
     isDefault: true
-  }).description("Run the Storm Cap'n Proto compiler").addOption(sourceOption).addOption(outputPathOption).addOption(importPathOption).addOption(tsconfigPathOption).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(schemaOption).addOption(outputOption).addOption(importPathOption).addOption(tsconfigOption).addOption(generateId).addOption(standardImportOption).addOption(tsOption).addOption(jsOption).addOption(dtsOption).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 to ${options.outputPath}...`, {
+  (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"
   });
-  const resolvedTsconfig = await readJsonFile(options.tsconfigPath);
-  const tsconfig = import_typescript.default.parseJsonConfigFileContent(resolvedTsconfig, import_typescript.default.sys, findFilePath(options.tsconfigPath));
-  const sourcefiles = [];
-  for (const sourcePath of options.sourcePath) {
-    if (!sourcePath) {
-      (0, import_console.writeFatal)(`\u274C The source path "${sourcePath}" is invalid. Please provide a valid path.`, {
+  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.", {
+      logLevel: "all"
+    });
+    return;
+  }
+  const resolvedTsconfig = await readJsonFile(options.tsconfig);
+  const tsconfig = import_typescript.default.parseJsonConfigFileContent(resolvedTsconfig, import_typescript.default.sys, findFilePath(options.tsconfig));
+  tsconfig.options.configFilePath = options.tsconfig;
+  const schema = [];
+  for (const schemaPath of options.schema) {
+    if (!schemaPath || !schemaPath.includes("*") && !existsSync2(schemaPath)) {
+      (0, import_console.writeFatal)(`\u274C The schema path "${schemaPath}" is invalid. Please provide a valid path.`, {
         logLevel: "all"
       });
       return;
     }
-    sourcefiles.push(...await listFiles(sourcePath));
+    schema.push(...await listFiles(schemaPath));
   }
-  if (sourcefiles.length === 0) {
-    (0, import_console.writeFatal)(`\u274C No Cap'n Proto schema files found in the specified source paths: ${options.sourcePath.join(", ")}. Please ensure that the paths are correct and contain .capnp files.`, {
+  if (schema.length === 0) {
+    (0, import_console.writeFatal)(`\u274C 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.`, {
       logLevel: "all"
     });
     return;
@@ -1144,7 +1153,8 @@ async function compileAction(options) {
   const result = await capnpc({
     ...options,
     tsconfig,
-    sourcePath: sourcefiles
+    schema,
+    output: options.output ? options.output : schema.length > 0 && schema[0] ? findFilePath(schema[0]) : process.cwd()
   });
   if (result.files.size === 0) {
     (0, import_console.writeInfo)("\u26A0\uFE0F No files were generated. Please check your schema files.", {

package/bin/capnpc.js

@@ -625,6 +625,16 @@ async function readJsonFile(path, options) {
 }
 __name(readJsonFile, "readJsonFile");
 
+// ../path/src/exists.ts
+import { existsSync as existsSyncFs } from "node:fs";
+import { access, constants } from "node:fs/promises";
+var existsSync2 = /* @__PURE__ */ __name((filePath) => {
+  return existsSyncFs(filePath);
+}, "existsSync");
+var exists = /* @__PURE__ */ __name(async (filePath) => {
+  return access(filePath, constants.F_OK).then(() => true).catch(() => false);
+}, "exists");
+
 // ../path/src/file-path-fns.ts
 import { relative } from "node:path";
 
@@ -908,16 +918,6 @@ __name(findFilePath, "findFilePath");
 import { Command, Option } from "commander";
 import ts from "typescript";
 
-// ../path/src/exists.ts
-import { existsSync as existsSyncFs } from "node:fs";
-import { access, constants } from "node:fs/promises";
-var existsSync2 = /* @__PURE__ */ __name((filePath) => {
-  return existsSyncFs(filePath);
-}, "existsSync");
-var exists = /* @__PURE__ */ __name(async (filePath) => {
-  return access(filePath, constants.F_OK).then(() => true).catch(() => false);
-}, "exists");
-
 // ../fs/src/helpers.ts
 import { parseTar, parseTarGzip } from "nanotar";
 import { createWriteStream, mkdirSync, rmSync } from "node:fs";
@@ -979,17 +979,17 @@ async function readStdin() {
 __name(readStdin, "readStdin");
 async function capnpc(options) {
   try {
-    const { outputPath, tsconfig, sourcePath = [] } = options;
+    const { output, tsconfig, schema = [] } = options;
     let dataBuf = await readStdin();
     if (dataBuf.byteLength === 0) {
       const opts = [];
-      if (outputPath) {
-        opts.push(`-o-:${outputPath}`);
+      if (output) {
+        opts.push(`-o-:${output}`);
       } else {
         opts.push("-o-");
       }
       dataBuf = await new Promise((resolve) => {
-        exec(`capnpc ${opts.join(" ")} ${sourcePath.join(" ")}`, {
+        exec(`capnpc ${opts.join(" ")} ${schema.join(" ")}`, {
           encoding: "buffer"
         }, (error, stdout, stderr) => {
           if (stderr.length > 0) {
@@ -1016,8 +1016,8 @@ async function capnpc(options) {
           filePath = fullPath;
         }
       }
-      if (outputPath) {
-        filePath = joinPaths(outputPath, fileName);
+      if (output) {
+        filePath = joinPaths(output, fileName);
       }
       if (!existsSync3(findFilePath(filePath))) {
         await createDirectory(findFilePath(filePath));
@@ -1069,42 +1069,51 @@ function createProgram() {
   });
   const generateId = new Option("-i --generate-id", "Generate a new 64-bit unique ID for use in a Cap'n Proto schema").default(true);
   const standardImportOption = new Option("--standard-import", "Add default import paths; use only those specified by -I").default(true);
-  const outputPathOption = new Option("-o --output-path <path>", "The directory to output the generated files to").default(process.cwd());
-  const sourceOption = new Option("--source-path <path...>", "The directories containing the Cap'n Proto schema files to compile (default: current working directory)").default([
+  const schemaOption = new 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) => {
-    if (val.startsWith("--source") || val.startsWith("-s")) {
-      return val.split(",").map((dir) => dir.trim());
+    let result = [];
+    if (val.startsWith("--schema") || val.startsWith("-s")) {
+      result = val.split(",").map((dir) => dir.trim());
     }
-    return [
+    result = [
       val.trim()
     ];
+    return result.map((dir) => dir.endsWith(".capnp") ? dir : joinPaths(dir, "**/*.capnp"));
   });
-  const tsconfigPathOption = new Option("--tsconfig-path <path>", "The path to the TypeScript configuration file to use for compilation").default(joinPaths(process.cwd(), "tsconfig.json"));
+  const outputOption = new Option("-o --output <path>", "The directory to output the generated files to");
+  const tsconfigOption = new Option("-p --tsconfig <path>", "The path to the TypeScript configuration file to use for compilation").default(joinPaths(process.cwd(), "tsconfig.json"));
   program.command("compile", {
     isDefault: true
-  }).description("Run the Storm Cap'n Proto compiler").addOption(sourceOption).addOption(outputPathOption).addOption(importPathOption).addOption(tsconfigPathOption).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(schemaOption).addOption(outputOption).addOption(importPathOption).addOption(tsconfigOption).addOption(generateId).addOption(standardImportOption).addOption(tsOption).addOption(jsOption).addOption(dtsOption).action(compileAction).showSuggestionAfterError(true).showHelpAfterError(true);
   return program;
 }
 __name(createProgram, "createProgram");
 async function compileAction(options) {
-  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 to ${options.outputPath}...`, {
+  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"
   });
-  const resolvedTsconfig = await readJsonFile(options.tsconfigPath);
-  const tsconfig = ts.parseJsonConfigFileContent(resolvedTsconfig, ts.sys, findFilePath(options.tsconfigPath));
-  const sourcefiles = [];
-  for (const sourcePath of options.sourcePath) {
-    if (!sourcePath) {
-      writeFatal(`\u274C The source path "${sourcePath}" is invalid. Please provide a valid path.`, {
+  if (!existsSync2(options.tsconfig)) {
+    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.", {
+      logLevel: "all"
+    });
+    return;
+  }
+  const resolvedTsconfig = await readJsonFile(options.tsconfig);
+  const tsconfig = ts.parseJsonConfigFileContent(resolvedTsconfig, ts.sys, findFilePath(options.tsconfig));
+  tsconfig.options.configFilePath = options.tsconfig;
+  const schema = [];
+  for (const schemaPath of options.schema) {
+    if (!schemaPath || !schemaPath.includes("*") && !existsSync2(schemaPath)) {
+      writeFatal(`\u274C The schema path "${schemaPath}" is invalid. Please provide a valid path.`, {
         logLevel: "all"
       });
       return;
     }
-    sourcefiles.push(...await listFiles(sourcePath));
+    schema.push(...await listFiles(schemaPath));
   }
-  if (sourcefiles.length === 0) {
-    writeFatal(`\u274C No Cap'n Proto schema files found in the specified source paths: ${options.sourcePath.join(", ")}. Please ensure that the paths are correct and contain .capnp files.`, {
+  if (schema.length === 0) {
+    writeFatal(`\u274C 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.`, {
       logLevel: "all"
     });
     return;
@@ -1112,7 +1121,8 @@ async function compileAction(options) {
   const result = await capnpc({
     ...options,
     tsconfig,
-    sourcePath: sourcefiles
+    schema,
+    output: options.output ? options.output : schema.length > 0 && schema[0] ? findFilePath(schema[0]) : process.cwd()
   });
   if (result.files.size === 0) {
     writeInfo("\u26A0\uFE0F No files were generated. Please check your schema files.", {

package/dist/{chunk-LY3GWW4E.js → chunk-3FC7SST2.js}

@@ -908,17 +908,17 @@ async function readStdin() {
 __name(readStdin, "readStdin");
 async function capnpc(options) {
   try {
-    const { outputPath, tsconfig, sourcePath = [] } = options;
+    const { output, tsconfig, schema = [] } = options;
     let dataBuf = await readStdin();
     if (dataBuf.byteLength === 0) {
       const opts = [];
-      if (outputPath) {
-        opts.push(`-o-:${outputPath}`);
+      if (output) {
+        opts.push(`-o-:${output}`);
       } else {
         opts.push("-o-");
       }
       dataBuf = await new Promise((resolve) => {
-        exec(`capnpc ${opts.join(" ")} ${sourcePath.join(" ")}`, {
+        exec(`capnpc ${opts.join(" ")} ${schema.join(" ")}`, {
           encoding: "buffer"
         }, (error, stdout, stderr) => {
           if (stderr.length > 0) {
@@ -945,8 +945,8 @@ async function capnpc(options) {
           filePath = fullPath;
         }
       }
-      if (outputPath) {
-        filePath = joinPaths(outputPath, fileName);
+      if (output) {
+        filePath = joinPaths(output, fileName);
       }
       if (!existsSync2(findFilePath(filePath))) {
         await createDirectory(findFilePath(filePath));

package/dist/{chunk-PV3OG5H3.cjs → chunk-GFNNH76I.cjs}

@@ -908,17 +908,17 @@ async function readStdin() {
 _chunkUSNT2KNTcjs.__name.call(void 0, readStdin, "readStdin");
 async function capnpc(options) {
   try {
-    const { outputPath, tsconfig, sourcePath = [] } = options;
+    const { output, tsconfig, schema = [] } = options;
     let dataBuf = await readStdin();
     if (dataBuf.byteLength === 0) {
       const opts = [];
-      if (outputPath) {
-        opts.push(`-o-:${outputPath}`);
+      if (output) {
+        opts.push(`-o-:${output}`);
       } else {
         opts.push("-o-");
       }
       dataBuf = await new Promise((resolve) => {
-        _child_process.exec.call(void 0, `capnpc ${opts.join(" ")} ${sourcePath.join(" ")}`, {
+        _child_process.exec.call(void 0, `capnpc ${opts.join(" ")} ${schema.join(" ")}`, {
           encoding: "buffer"
         }, (error, stdout, stderr) => {
           if (stderr.length > 0) {
@@ -945,8 +945,8 @@ async function capnpc(options) {
           filePath = fullPath;
         }
       }
-      if (outputPath) {
-        filePath = joinPaths(outputPath, fileName);
+      if (output) {
+        filePath = joinPaths(output, fileName);
       }
       if (!_fs.existsSync.call(void 0, findFilePath(filePath))) {
         await createDirectory(findFilePath(filePath));

package/dist/compile.cjs

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkPV3OG5H3cjs = require('./chunk-PV3OG5H3.cjs');
+var _chunkGFNNH76Icjs = require('./chunk-GFNNH76I.cjs');
 require('./chunk-USNT2KNT.cjs');
 
 
-exports.capnpc = _chunkPV3OG5H3cjs.capnpc;
+exports.capnpc = _chunkGFNNH76Icjs.capnpc;

package/dist/compile.js

@@ -1,6 +1,6 @@
 import {
   capnpc
-} from "./chunk-LY3GWW4E.js";
+} from "./chunk-3FC7SST2.js";
 import "./chunk-SHUYVCID.js";
 export {
   capnpc

package/dist/index.cjs

@@ -1,8 +1,8 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkPV3OG5H3cjs = require('./chunk-PV3OG5H3.cjs');
+var _chunkGFNNH76Icjs = require('./chunk-GFNNH76I.cjs');
 require('./chunk-USNT2KNT.cjs');
 require('./chunk-ORA4UQMU.cjs');
 
 
-exports.capnpc = _chunkPV3OG5H3cjs.capnpc;
+exports.capnpc = _chunkGFNNH76Icjs.capnpc;

package/dist/index.js

@@ -1,6 +1,6 @@
 import {
   capnpc
-} from "./chunk-LY3GWW4E.js";
+} from "./chunk-3FC7SST2.js";
 import "./chunk-SHUYVCID.js";
 import "./chunk-OULCUN6I.js";
 export {

package/dist/types.d.cts

@@ -16,18 +16,18 @@ interface CodeGeneratorContext {
     files: CodeGeneratorFileContext[];
 }
 interface CapnpcCLIOptions {
-    ts: boolean;
-    js: boolean;
-    dts: boolean;
-    sourcePath: string[];
-    outputPath: string;
-    importPath: string[];
-    tsconfigPath: string;
-    generateId: boolean;
-    standardImport: boolean;
+    ts?: boolean;
+    js?: boolean;
+    dts?: boolean;
+    schema: string[];
+    output?: string;
+    importPath?: string[];
+    tsconfig: string;
+    generateId?: boolean;
+    standardImport?: boolean;
 }
-type CapnpcOptions = Omit<CapnpcCLIOptions, "tsconfigPath"> & {
-    tsconfig?: ts.ParsedCommandLine;
+type CapnpcOptions = Omit<CapnpcCLIOptions, "tsconfig"> & {
+    tsconfig: ts.ParsedCommandLine;
 };
 interface CapnpcResult {
     ctx: CodeGeneratorContext;

package/dist/types.d.ts

@@ -16,18 +16,18 @@ interface CodeGeneratorContext {
     files: CodeGeneratorFileContext[];
 }
 interface CapnpcCLIOptions {
-    ts: boolean;
-    js: boolean;
-    dts: boolean;
-    sourcePath: string[];
-    outputPath: string;
-    importPath: string[];
-    tsconfigPath: string;
-    generateId: boolean;
-    standardImport: boolean;
+    ts?: boolean;
+    js?: boolean;
+    dts?: boolean;
+    schema: string[];
+    output?: string;
+    importPath?: string[];
+    tsconfig: string;
+    generateId?: boolean;
+    standardImport?: boolean;
 }
-type CapnpcOptions = Omit<CapnpcCLIOptions, "tsconfigPath"> & {
-    tsconfig?: ts.ParsedCommandLine;
+type CapnpcOptions = Omit<CapnpcCLIOptions, "tsconfig"> & {
+    tsconfig: ts.ParsedCommandLine;
 };
 interface CapnpcResult {
     ctx: CodeGeneratorContext;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stryke/capnp",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "type": "module",
   "description": "A package to assist in running the Cap'n Proto compiler and creating Cap'n Proto serialization protocol schemas.",
   "repository": {