@stryke/capnp 0.10.3 → 0.10.4

package/bin/capnpc.cjs

@@ -7928,7 +7928,7 @@ __name(listFiles, "listFiles");
 var import_typescript3 = require("typescript");
 async function resolveOptions(options) {
   const tsconfigPath = options.tsconfigPath ? options.tsconfigPath.replace("{projectRoot}", options.projectRoot).replace("{workspaceRoot}", options.workspaceRoot) : void 0;
-  const schemas = toArray(options.schemas ? Array.isArray(options.schemas) ? options.schemas.map((schema) => schema.replace("{projectRoot}", options.projectRoot).replace("{workspaceRoot}", options.workspaceRoot)) : options.schemas : joinPaths(options.projectRoot, "schemas/**/*.capnp"));
+  const schemas = toArray(options.schemas ? options.schemas : joinPaths(options.projectRoot, "schemas/**/*.capnp")).filter(Boolean).map((schema) => schema.replace("{projectRoot}", options.projectRoot).replace("{workspaceRoot}", options.workspaceRoot));
   let resolvedTsconfig;
   if (options.tsconfig) {
     resolvedTsconfig = options.tsconfig;
@@ -7956,13 +7956,11 @@ async function resolveOptions(options) {
   }
   const resolvedSchemas = [];
   for (const schema of schemas) {
-    if (!schema || !schema.includes("*") && !existsSync(schema)) {
-      if (schemas.length <= 1) {
-        throw new Error(`\u2716 The schema path "${schema}" is invalid. Please provide a valid path.`);
-      }
-    } else {
-      resolvedSchemas.push(...await listFiles(schema.includes("*") ? schema.endsWith(".capnp") ? schema : `${schema}.capnp` : joinPaths(schema, "**/*.capnp")));
+    let formattedSchema = schema;
+    if (!schema.endsWith(".capnp") && !schema.includes("*")) {
+      formattedSchema = `${schema.replace(/\/$/g, "")}/*.capnp`;
     }
+    resolvedSchemas.push(...await listFiles(formattedSchema));
   }
   if (resolvedSchemas.length === 0 || !resolvedSchemas[0]) {
     (0, import_console.writeWarning)(`\u2716 No Cap'n Proto schema files found in the specified source paths: ${schemas.join(", ")}. As a result, the Cap'n Proto compiler will not be able to generate any output files. Please ensure that the paths are correct and contain .capnp files.`, {

package/bin/capnpc.js

@@ -7897,7 +7897,7 @@ __name(listFiles, "listFiles");
 import { parseJsonConfigFileContent, sys } from "typescript";
 async function resolveOptions(options) {
   const tsconfigPath = options.tsconfigPath ? options.tsconfigPath.replace("{projectRoot}", options.projectRoot).replace("{workspaceRoot}", options.workspaceRoot) : void 0;
-  const schemas = toArray(options.schemas ? Array.isArray(options.schemas) ? options.schemas.map((schema) => schema.replace("{projectRoot}", options.projectRoot).replace("{workspaceRoot}", options.workspaceRoot)) : options.schemas : joinPaths(options.projectRoot, "schemas/**/*.capnp"));
+  const schemas = toArray(options.schemas ? options.schemas : joinPaths(options.projectRoot, "schemas/**/*.capnp")).filter(Boolean).map((schema) => schema.replace("{projectRoot}", options.projectRoot).replace("{workspaceRoot}", options.workspaceRoot));
   let resolvedTsconfig;
   if (options.tsconfig) {
     resolvedTsconfig = options.tsconfig;
@@ -7925,13 +7925,11 @@ async function resolveOptions(options) {
   }
   const resolvedSchemas = [];
   for (const schema of schemas) {
-    if (!schema || !schema.includes("*") && !existsSync(schema)) {
-      if (schemas.length <= 1) {
-        throw new Error(`\u2716 The schema path "${schema}" is invalid. Please provide a valid path.`);
-      }
-    } else {
-      resolvedSchemas.push(...await listFiles(schema.includes("*") ? schema.endsWith(".capnp") ? schema : `${schema}.capnp` : joinPaths(schema, "**/*.capnp")));
+    let formattedSchema = schema;
+    if (!schema.endsWith(".capnp") && !schema.includes("*")) {
+      formattedSchema = `${schema.replace(/\/$/g, "")}/*.capnp`;
     }
+    resolvedSchemas.push(...await listFiles(formattedSchema));
   }
   if (resolvedSchemas.length === 0 || !resolvedSchemas[0]) {
     writeWarning(`\u2716 No Cap'n Proto schema files found in the specified source paths: ${schemas.join(", ")}. As a result, the Cap'n Proto compiler will not be able to generate any output files. Please ensure that the paths are correct and contain .capnp files.`, {

package/dist/{chunk-XU7T5EQG.js → chunk-4CXBQVXH.js}

@@ -847,7 +847,7 @@ __name(listFiles, "listFiles");
 import { parseJsonConfigFileContent, sys } from "typescript";
 async function resolveOptions(options) {
   const tsconfigPath = options.tsconfigPath ? options.tsconfigPath.replace("{projectRoot}", options.projectRoot).replace("{workspaceRoot}", options.workspaceRoot) : void 0;
-  const schemas = toArray(options.schemas ? Array.isArray(options.schemas) ? options.schemas.map((schema) => schema.replace("{projectRoot}", options.projectRoot).replace("{workspaceRoot}", options.workspaceRoot)) : options.schemas : joinPaths(options.projectRoot, "schemas/**/*.capnp"));
+  const schemas = toArray(options.schemas ? options.schemas : joinPaths(options.projectRoot, "schemas/**/*.capnp")).filter(Boolean).map((schema) => schema.replace("{projectRoot}", options.projectRoot).replace("{workspaceRoot}", options.workspaceRoot));
   let resolvedTsconfig;
   if (options.tsconfig) {
     resolvedTsconfig = options.tsconfig;
@@ -875,13 +875,11 @@ async function resolveOptions(options) {
   }
   const resolvedSchemas = [];
   for (const schema of schemas) {
-    if (!schema || !schema.includes("*") && !existsSync2(schema)) {
-      if (schemas.length <= 1) {
-        throw new Error(`\u2716 The schema path "${schema}" is invalid. Please provide a valid path.`);
-      }
-    } else {
-      resolvedSchemas.push(...await listFiles(schema.includes("*") ? schema.endsWith(".capnp") ? schema : `${schema}.capnp` : joinPaths(schema, "**/*.capnp")));
+    let formattedSchema = schema;
+    if (!schema.endsWith(".capnp") && !schema.includes("*")) {
+      formattedSchema = `${schema.replace(/\/$/g, "")}/*.capnp`;
     }
+    resolvedSchemas.push(...await listFiles(formattedSchema));
   }
   if (resolvedSchemas.length === 0 || !resolvedSchemas[0]) {
     writeWarning(`\u2716 No Cap'n Proto schema files found in the specified source paths: ${schemas.join(", ")}. As a result, the Cap'n Proto compiler will not be able to generate any output files. Please ensure that the paths are correct and contain .capnp files.`, {

package/dist/{chunk-I7MRPN6I.cjs → chunk-IRIBPNFP.cjs}

@@ -2,7 +2,7 @@
 
 
 
-var _chunkL3LVFSZKcjs = require('./chunk-L3LVFSZK.cjs');
+var _chunkZU4BKCAMcjs = require('./chunk-ZU4BKCAM.cjs');
 
 
 
@@ -4055,9 +4055,9 @@ async function capnpc(options) {
   if (dataBuf.byteLength === 0) {
     const opts = [];
     if (output) {
-      if (!_chunkL3LVFSZKcjs.existsSync.call(void 0, output)) {
+      if (!_chunkZU4BKCAMcjs.existsSync.call(void 0, output)) {
         _console.writeWarning.call(void 0, `Output directory "${output}" does not exist, it will be created...`);
-        await _chunkL3LVFSZKcjs.createDirectory.call(void 0, output);
+        await _chunkZU4BKCAMcjs.createDirectory.call(void 0, output);
       }
       opts.push(`-o-:${output}`);
     } else {
@@ -4086,7 +4086,7 @@ async function capnpc(options) {
 }
 _chunkUSNT2KNTcjs.__name.call(void 0, capnpc, "capnpc");
 async function compile(dataBuf, options) {
-  const resolvedOptions = await _chunkL3LVFSZKcjs.resolveOptions.call(void 0, options);
+  const resolvedOptions = await _chunkZU4BKCAMcjs.resolveOptions.call(void 0, options);
   if (!resolvedOptions) {
     _console.writeWarning.call(void 0, "\u2716 Unable to resolve Cap'n Proto compiler options - the program will terminate", {
       logLevel: "all"

package/dist/{chunk-SW7GJVYC.js → chunk-MLCARVMF.js}

@@ -2,7 +2,7 @@ import {
   createDirectory,
   existsSync,
   resolveOptions
-} from "./chunk-XU7T5EQG.js";
+} from "./chunk-4CXBQVXH.js";
 import {
   CompositeList,
   Message,

package/dist/{chunk-L3LVFSZK.cjs → chunk-ZU4BKCAM.cjs}

@@ -847,7 +847,7 @@ _chunkUSNT2KNTcjs.__name.call(void 0, listFiles, "listFiles");
 var _typescript = require('typescript');
 async function resolveOptions(options) {
   const tsconfigPath = options.tsconfigPath ? options.tsconfigPath.replace("{projectRoot}", options.projectRoot).replace("{workspaceRoot}", options.workspaceRoot) : void 0;
-  const schemas = toArray(options.schemas ? Array.isArray(options.schemas) ? options.schemas.map((schema) => schema.replace("{projectRoot}", options.projectRoot).replace("{workspaceRoot}", options.workspaceRoot)) : options.schemas : joinPaths(options.projectRoot, "schemas/**/*.capnp"));
+  const schemas = toArray(options.schemas ? options.schemas : joinPaths(options.projectRoot, "schemas/**/*.capnp")).filter(Boolean).map((schema) => schema.replace("{projectRoot}", options.projectRoot).replace("{workspaceRoot}", options.workspaceRoot));
   let resolvedTsconfig;
   if (options.tsconfig) {
     resolvedTsconfig = options.tsconfig;
@@ -875,13 +875,11 @@ async function resolveOptions(options) {
   }
   const resolvedSchemas = [];
   for (const schema of schemas) {
-    if (!schema || !schema.includes("*") && !existsSync2(schema)) {
-      if (schemas.length <= 1) {
-        throw new Error(`\u2716 The schema path "${schema}" is invalid. Please provide a valid path.`);
-      }
-    } else {
-      resolvedSchemas.push(...await listFiles(schema.includes("*") ? schema.endsWith(".capnp") ? schema : `${schema}.capnp` : joinPaths(schema, "**/*.capnp")));
+    let formattedSchema = schema;
+    if (!schema.endsWith(".capnp") && !schema.includes("*")) {
+      formattedSchema = `${schema.replace(/\/$/g, "")}/*.capnp`;
     }
+    resolvedSchemas.push(...await listFiles(formattedSchema));
   }
   if (resolvedSchemas.length === 0 || !resolvedSchemas[0]) {
     _console.writeWarning.call(void 0, `\u2716 No Cap'n Proto schema files found in the specified source paths: ${schemas.join(", ")}. As a result, the Cap'n Proto compiler will not be able to generate any output files. Please ensure that the paths are correct and contain .capnp files.`, {

package/dist/compile.cjs

@@ -1,11 +1,11 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunkI7MRPN6Icjs = require('./chunk-I7MRPN6I.cjs');
-require('./chunk-L3LVFSZK.cjs');
+var _chunkIRIBPNFPcjs = require('./chunk-IRIBPNFP.cjs');
+require('./chunk-ZU4BKCAM.cjs');
 require('./chunk-KXWOF6H4.cjs');
 require('./chunk-USNT2KNT.cjs');
 
 
 
-exports.capnpc = _chunkI7MRPN6Icjs.capnpc; exports.compile = _chunkI7MRPN6Icjs.compile;
+exports.capnpc = _chunkIRIBPNFPcjs.capnpc; exports.compile = _chunkIRIBPNFPcjs.compile;

package/dist/compile.js

@@ -1,8 +1,8 @@
 import {
   capnpc,
   compile
-} from "./chunk-SW7GJVYC.js";
-import "./chunk-XU7T5EQG.js";
+} from "./chunk-MLCARVMF.js";
+import "./chunk-4CXBQVXH.js";
 import "./chunk-5VHN3KGS.js";
 import "./chunk-SHUYVCID.js";
 export {

package/dist/helpers.cjs

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkL3LVFSZKcjs = require('./chunk-L3LVFSZK.cjs');
+var _chunkZU4BKCAMcjs = require('./chunk-ZU4BKCAM.cjs');
 require('./chunk-USNT2KNT.cjs');
 
 
-exports.resolveOptions = _chunkL3LVFSZKcjs.resolveOptions;
+exports.resolveOptions = _chunkZU4BKCAMcjs.resolveOptions;

package/dist/helpers.js

@@ -1,6 +1,6 @@
 import {
   resolveOptions
-} from "./chunk-XU7T5EQG.js";
+} from "./chunk-4CXBQVXH.js";
 import "./chunk-SHUYVCID.js";
 export {
   resolveOptions

package/dist/index.cjs

@@ -1,8 +1,8 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunkI7MRPN6Icjs = require('./chunk-I7MRPN6I.cjs');
-require('./chunk-L3LVFSZK.cjs');
+var _chunkIRIBPNFPcjs = require('./chunk-IRIBPNFP.cjs');
+require('./chunk-ZU4BKCAM.cjs');
 
 
 
@@ -135,4 +135,4 @@ require('./chunk-USNT2KNT.cjs');
 
 
 
-exports.AnyPointerList = _chunkIBMXNAOTcjs.AnyPointerList; exports.BoolList = _chunkIBMXNAOTcjs.BoolList; exports.CapnpRPC = _chunkIBMXNAOTcjs.CapnpRPC; exports.CodeGeneratorContext = _chunkR2JXWA7Qcjs.CodeGeneratorContext; exports.CompositeList = _chunkKXWOF6H4cjs.CompositeList; exports.Conn = _chunkIBMXNAOTcjs.Conn; exports.Data = _chunkKXWOF6H4cjs.Data; exports.DataList = _chunkIBMXNAOTcjs.DataList; exports.Deferred = _chunkIBMXNAOTcjs.Deferred; exports.DeferredTransport = _chunkIBMXNAOTcjs.DeferredTransport; exports.ErrorClient = _chunkKXWOF6H4cjs.ErrorClient; exports.Float32List = _chunkIBMXNAOTcjs.Float32List; exports.Float64List = _chunkIBMXNAOTcjs.Float64List; exports.Int16List = _chunkIBMXNAOTcjs.Int16List; exports.Int32List = _chunkIBMXNAOTcjs.Int32List; exports.Int64List = _chunkIBMXNAOTcjs.Int64List; exports.Int8List = _chunkIBMXNAOTcjs.Int8List; exports.Interface = _chunkIBMXNAOTcjs.Interface; exports.InterfaceList = _chunkIBMXNAOTcjs.InterfaceList; exports.List = _chunkKXWOF6H4cjs.List; exports.ListElementSize = _chunkKXWOF6H4cjs.ListElementSize; exports.Message = _chunkKXWOF6H4cjs.Message; exports.MessageChannelTransport = _chunkIBMXNAOTcjs.MessageChannelTransport; exports.ObjectSize = _chunkKXWOF6H4cjs.ObjectSize; exports.Orphan = _chunkKXWOF6H4cjs.Orphan; exports.Pipeline = _chunkIBMXNAOTcjs.Pipeline; exports.Pointer = _chunkKXWOF6H4cjs.Pointer; exports.PointerList = _chunkIBMXNAOTcjs.PointerList; exports.PointerType = _chunkKXWOF6H4cjs.PointerType; exports.Registry = _chunkIBMXNAOTcjs.Registry; exports.Server = _chunkIBMXNAOTcjs.Server; exports.Struct = _chunkKXWOF6H4cjs.Struct; exports.Text = _chunkKXWOF6H4cjs.Text; exports.TextList = _chunkIBMXNAOTcjs.TextList; exports.Uint16List = _chunkIBMXNAOTcjs.Uint16List; exports.Uint32List = _chunkIBMXNAOTcjs.Uint32List; exports.Uint64List = _chunkIBMXNAOTcjs.Uint64List; exports.Uint8List = _chunkIBMXNAOTcjs.Uint8List; exports.Void = _chunkIBMXNAOTcjs.Void; exports.VoidList = _chunkIBMXNAOTcjs.VoidList; exports.answerPipelineClient = _chunkIBMXNAOTcjs.answerPipelineClient; exports.capnpc = _chunkI7MRPN6Icjs.capnpc; exports.clientFromResolution = _chunkIBMXNAOTcjs.clientFromResolution; exports.clientOrNull = _chunkKXWOF6H4cjs.clientOrNull; exports.compile = _chunkI7MRPN6Icjs.compile; exports.copyCall = _chunkIBMXNAOTcjs.copyCall; exports.getBitMask = _chunkKXWOF6H4cjs.getBitMask; exports.getFloat32Mask = _chunkKXWOF6H4cjs.getFloat32Mask; exports.getFloat64Mask = _chunkKXWOF6H4cjs.getFloat64Mask; exports.getInt16Mask = _chunkKXWOF6H4cjs.getInt16Mask; exports.getInt32Mask = _chunkKXWOF6H4cjs.getInt32Mask; exports.getInt64Mask = _chunkKXWOF6H4cjs.getInt64Mask; exports.getInt8Mask = _chunkKXWOF6H4cjs.getInt8Mask; exports.getUint16Mask = _chunkKXWOF6H4cjs.getUint16Mask; exports.getUint32Mask = _chunkKXWOF6H4cjs.getUint32Mask; exports.getUint64Mask = _chunkKXWOF6H4cjs.getUint64Mask; exports.getUint8Mask = _chunkKXWOF6H4cjs.getUint8Mask; exports.isDataCall = _chunkIBMXNAOTcjs.isDataCall; exports.isFuncCall = _chunkIBMXNAOTcjs.isFuncCall; exports.isSameClient = _chunkIBMXNAOTcjs.isSameClient; exports.placeParams = _chunkIBMXNAOTcjs.placeParams; exports.readRawPointer = _chunkKXWOF6H4cjs.readRawPointer; exports.utils = _chunkIBMXNAOTcjs.utils;
+exports.AnyPointerList = _chunkIBMXNAOTcjs.AnyPointerList; exports.BoolList = _chunkIBMXNAOTcjs.BoolList; exports.CapnpRPC = _chunkIBMXNAOTcjs.CapnpRPC; exports.CodeGeneratorContext = _chunkR2JXWA7Qcjs.CodeGeneratorContext; exports.CompositeList = _chunkKXWOF6H4cjs.CompositeList; exports.Conn = _chunkIBMXNAOTcjs.Conn; exports.Data = _chunkKXWOF6H4cjs.Data; exports.DataList = _chunkIBMXNAOTcjs.DataList; exports.Deferred = _chunkIBMXNAOTcjs.Deferred; exports.DeferredTransport = _chunkIBMXNAOTcjs.DeferredTransport; exports.ErrorClient = _chunkKXWOF6H4cjs.ErrorClient; exports.Float32List = _chunkIBMXNAOTcjs.Float32List; exports.Float64List = _chunkIBMXNAOTcjs.Float64List; exports.Int16List = _chunkIBMXNAOTcjs.Int16List; exports.Int32List = _chunkIBMXNAOTcjs.Int32List; exports.Int64List = _chunkIBMXNAOTcjs.Int64List; exports.Int8List = _chunkIBMXNAOTcjs.Int8List; exports.Interface = _chunkIBMXNAOTcjs.Interface; exports.InterfaceList = _chunkIBMXNAOTcjs.InterfaceList; exports.List = _chunkKXWOF6H4cjs.List; exports.ListElementSize = _chunkKXWOF6H4cjs.ListElementSize; exports.Message = _chunkKXWOF6H4cjs.Message; exports.MessageChannelTransport = _chunkIBMXNAOTcjs.MessageChannelTransport; exports.ObjectSize = _chunkKXWOF6H4cjs.ObjectSize; exports.Orphan = _chunkKXWOF6H4cjs.Orphan; exports.Pipeline = _chunkIBMXNAOTcjs.Pipeline; exports.Pointer = _chunkKXWOF6H4cjs.Pointer; exports.PointerList = _chunkIBMXNAOTcjs.PointerList; exports.PointerType = _chunkKXWOF6H4cjs.PointerType; exports.Registry = _chunkIBMXNAOTcjs.Registry; exports.Server = _chunkIBMXNAOTcjs.Server; exports.Struct = _chunkKXWOF6H4cjs.Struct; exports.Text = _chunkKXWOF6H4cjs.Text; exports.TextList = _chunkIBMXNAOTcjs.TextList; exports.Uint16List = _chunkIBMXNAOTcjs.Uint16List; exports.Uint32List = _chunkIBMXNAOTcjs.Uint32List; exports.Uint64List = _chunkIBMXNAOTcjs.Uint64List; exports.Uint8List = _chunkIBMXNAOTcjs.Uint8List; exports.Void = _chunkIBMXNAOTcjs.Void; exports.VoidList = _chunkIBMXNAOTcjs.VoidList; exports.answerPipelineClient = _chunkIBMXNAOTcjs.answerPipelineClient; exports.capnpc = _chunkIRIBPNFPcjs.capnpc; exports.clientFromResolution = _chunkIBMXNAOTcjs.clientFromResolution; exports.clientOrNull = _chunkKXWOF6H4cjs.clientOrNull; exports.compile = _chunkIRIBPNFPcjs.compile; exports.copyCall = _chunkIBMXNAOTcjs.copyCall; exports.getBitMask = _chunkKXWOF6H4cjs.getBitMask; exports.getFloat32Mask = _chunkKXWOF6H4cjs.getFloat32Mask; exports.getFloat64Mask = _chunkKXWOF6H4cjs.getFloat64Mask; exports.getInt16Mask = _chunkKXWOF6H4cjs.getInt16Mask; exports.getInt32Mask = _chunkKXWOF6H4cjs.getInt32Mask; exports.getInt64Mask = _chunkKXWOF6H4cjs.getInt64Mask; exports.getInt8Mask = _chunkKXWOF6H4cjs.getInt8Mask; exports.getUint16Mask = _chunkKXWOF6H4cjs.getUint16Mask; exports.getUint32Mask = _chunkKXWOF6H4cjs.getUint32Mask; exports.getUint64Mask = _chunkKXWOF6H4cjs.getUint64Mask; exports.getUint8Mask = _chunkKXWOF6H4cjs.getUint8Mask; exports.isDataCall = _chunkIBMXNAOTcjs.isDataCall; exports.isFuncCall = _chunkIBMXNAOTcjs.isFuncCall; exports.isSameClient = _chunkIBMXNAOTcjs.isSameClient; exports.placeParams = _chunkIBMXNAOTcjs.placeParams; exports.readRawPointer = _chunkKXWOF6H4cjs.readRawPointer; exports.utils = _chunkIBMXNAOTcjs.utils;

package/dist/index.js

@@ -1,8 +1,8 @@
 import {
   capnpc,
   compile
-} from "./chunk-SW7GJVYC.js";
-import "./chunk-XU7T5EQG.js";
+} from "./chunk-MLCARVMF.js";
+import "./chunk-4CXBQVXH.js";
 import {
   AnyPointerList,
   BoolList,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stryke/capnp",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "type": "module",
   "description": "A package to assist in running the Cap'n Proto compiler and creating Cap'n Proto serialization protocol schemas.",
   "repository": {
@@ -148,5 +148,5 @@
     "tsx": "^4.20.1"
   },
   "publishConfig": { "access": "public" },
-  "gitHead": "f54ef4923dcd93cc234959b706369f90f0f6dc24"
+  "gitHead": "decf26bd6cd11555f3229e0bcd9a5ca1754c7d5b"
 }