@stryke/capnp 0.11.0 → 0.11.1

package/bin/capnpc.cjs

@@ -37,44 +37,58 @@ module.exports = __toCommonJS(capnpc_exports);
 var import_console3 = require("@storm-software/config-tools/logger/console");
 var import_utilities = require("@storm-software/config-tools/utilities");
 
-// ../path/src/exists.ts
+// ../fs/src/exists.ts
 var import_node_fs = require("fs");
 var import_promises = require("fs/promises");
-var existsSync = /* @__PURE__ */ __name((filePath) => {
+function existsSync(filePath) {
   return (0, import_node_fs.existsSync)(filePath);
-}, "existsSync");
+}
+__name(existsSync, "existsSync");
 
 // ../types/src/base.ts
 var EMPTY_STRING = "";
 var $NestedValue = Symbol("NestedValue");
 
-// ../path/src/file-path-fns.ts
-var import_node_path = require("path");
+// ../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;
+var ROOT_FOLDER_REGEX = /^\/([A-Z]:)?$/i;
 
-// ../path/src/is-file.ts
-var import_node_fs2 = require("fs");
+// ../path/src/slash.ts
+function slash(path) {
+  if (path.startsWith("\\\\?\\")) {
+    return path;
+  }
+  return path.replace(/\\/g, "/");
+}
+__name(slash, "slash");
+
+// ../path/src/is-type.ts
+function isAbsolutePath(path) {
+  return ABSOLUTE_PATH_REGEX.test(slash(path));
+}
+__name(isAbsolutePath, "isAbsolutePath");
+function isAbsolute(path) {
+  return isAbsolutePath(path);
+}
+__name(isAbsolute, "isAbsolute");
 
 // ../path/src/join-paths.ts
-var _DRIVE_LETTER_START_RE = /^[A-Z]:\//i;
 function normalizeWindowsPath(input = "") {
   if (!input) {
     return input;
   }
-  return input.replace(/\\/g, "/").replace(_DRIVE_LETTER_START_RE, (r) => r.toUpperCase());
+  return input.replace(/\\/g, "/").replace(DRIVE_LETTER_START_REGEX, (r) => r.toUpperCase());
 }
 __name(normalizeWindowsPath, "normalizeWindowsPath");
-var _UNC_REGEX = /^[/\\]{2}/;
-var _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Z]:[/\\]/i;
-var _DRIVE_LETTER_RE = /^[A-Z]:$/i;
-var isAbsolute = /* @__PURE__ */ __name(function(p) {
-  return _IS_ABSOLUTE_RE.test(p);
-}, "isAbsolute");
-var correctPaths = /* @__PURE__ */ __name(function(path) {
+function correctPaths(path) {
   if (!path || path.length === 0) {
     return ".";
   }
   path = normalizeWindowsPath(path);
-  const isUNCPath = path.match(_UNC_REGEX);
+  const isUNCPath = path.match(UNC_REGEX);
   const isPathAbsolute = isAbsolute(path);
   const trailingSeparator = path[path.length - 1] === "/";
   path = normalizeString(path, !isPathAbsolute);
@@ -87,7 +101,7 @@ var correctPaths = /* @__PURE__ */ __name(function(path) {
   if (trailingSeparator) {
     path += "/";
   }
-  if (_DRIVE_LETTER_RE.test(path)) {
+  if (DRIVE_LETTER_REGEX.test(path)) {
     path += "/";
   }
   if (isUNCPath) {
@@ -97,8 +111,9 @@ var correctPaths = /* @__PURE__ */ __name(function(path) {
     return `//${path}`;
   }
   return isPathAbsolute && !isAbsolute(path) ? `/${path}` : path;
-}, "correctPaths");
-var joinPaths = /* @__PURE__ */ __name(function(...segments) {
+}
+__name(correctPaths, "correctPaths");
+function joinPaths(...segments) {
   let path = "";
   for (const seg of segments) {
     if (!seg) {
@@ -118,7 +133,8 @@ var joinPaths = /* @__PURE__ */ __name(function(...segments) {
     }
   }
   return correctPaths(path);
-}, "joinPaths");
+}
+__name(joinPaths, "joinPaths");
 function normalizeString(path, allowAboveRoot) {
   let res = "";
   let lastSegmentLength = 0;
@@ -181,18 +197,6 @@ function normalizeString(path, allowAboveRoot) {
 }
 __name(normalizeString, "normalizeString");
 
-// ../path/src/regex.ts
-var DRIVE_LETTER_START_REGEX = /^[A-Z]:\//i;
-
-// ../path/src/slash.ts
-function slash(path) {
-  if (path.startsWith("\\\\?\\")) {
-    return path;
-  }
-  return path.replace(/\\/g, "/");
-}
-__name(slash, "slash");
-
 // ../path/src/correct-path.ts
 function normalizeWindowsPath2(input = "") {
   if (!input) {
@@ -201,9 +205,67 @@ function normalizeWindowsPath2(input = "") {
   return slash(input).replace(DRIVE_LETTER_START_REGEX, (r) => r.toUpperCase());
 }
 __name(normalizeWindowsPath2, "normalizeWindowsPath");
-
-// ../path/src/get-workspace-root.ts
-var import_config_tools = require("@storm-software/config-tools");
+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/file-path-fns.ts
 function findFileName(filePath, options = {}) {
@@ -226,8 +288,56 @@ function findFilePath(filePath) {
   return result === "/" ? result : result.replace(/\/$/, "");
 }
 __name(findFilePath, "findFilePath");
+function resolve(...paths) {
+  paths = paths.map((argument) => normalizeWindowsPath2(argument));
+  let resolvedPath = "";
+  let resolvedAbsolute = false;
+  for (let index = paths.length - 1; index >= -1 && !resolvedAbsolute; index--) {
+    const path = index >= 0 ? paths[index] : currentDir();
+    if (!path || path.length === 0) {
+      continue;
+    }
+    resolvedPath = `${path}/${resolvedPath}`;
+    resolvedAbsolute = isAbsolute(path);
+  }
+  resolvedPath = normalizeString2(resolvedPath, !resolvedAbsolute);
+  if (resolvedAbsolute && !isAbsolute(resolvedPath)) {
+    return `/${resolvedPath}`;
+  }
+  return resolvedPath.length > 0 ? resolvedPath : ".";
+}
+__name(resolve, "resolve");
+function currentDir() {
+  if (typeof process !== "undefined" && typeof process.cwd === "function") {
+    return process.cwd().replace(/\\/g, "/");
+  }
+  return "/";
+}
+__name(currentDir, "currentDir");
+function relative(from, to) {
+  const _from = resolve(from).replace(ROOT_FOLDER_REGEX, "$1").split("/");
+  const _to = resolve(to).replace(ROOT_FOLDER_REGEX, "$1").split("/");
+  if (_to[0][1] === ":" && _from[0][1] === ":" && _from[0] !== _to[0]) {
+    return _to.join("/");
+  }
+  const _fromCopy = [
+    ..._from
+  ];
+  for (const segment of _fromCopy) {
+    if (_to[0] !== segment) {
+      break;
+    }
+    _from.shift();
+    _to.shift();
+  }
+  return [
+    ..._from.map(() => ".."),
+    ..._to
+  ].join("/");
+}
+__name(relative, "relative");
 function relativePath(from, to, withEndSlash = false) {
-  return (0, import_node_path.relative)(withEndSlash !== true ? from.replace(/\/$/, "") : from, withEndSlash !== true ? to.replace(/\/$/, "") : to);
+  return relative(withEndSlash !== true ? from.replace(/\/$/, "") : from, withEndSlash !== true ? to.replace(/\/$/, "") : to);
 }
 __name(relativePath, "relativePath");
 
@@ -7849,7 +7959,7 @@ var isError = /* @__PURE__ */ __name((obj) => {
 }, "isError");
 
 // ../fs/src/read-file.ts
-var import_node_fs3 = require("fs");
+var import_node_fs2 = require("fs");
 var import_promises2 = require("fs/promises");
 var readFile = /* @__PURE__ */ __name(async (filePath) => {
   try {
@@ -7865,12 +7975,12 @@ var readFile = /* @__PURE__ */ __name(async (filePath) => {
 }, "readFile");
 
 // ../fs/src/write-file.ts
-var import_node_fs5 = require("fs");
+var import_node_fs4 = require("fs");
 var import_promises4 = require("fs/promises");
 
 // ../fs/src/helpers.ts
 var import_nanotar = require("nanotar");
-var import_node_fs4 = require("fs");
+var import_node_fs3 = require("fs");
 var import_promises3 = require("fs/promises");
 
 // ../fs/src/json.ts
@@ -7980,8 +8090,8 @@ async function capnpc(options) {
     process.stdin.on("data", (chunk) => {
       chunks.push(chunk);
     });
-    await new Promise((resolve) => {
-      process.stdin.on("end", resolve);
+    await new Promise((resolve2) => {
+      process.stdin.on("end", resolve2);
     });
     const reqBuffer = import_node_buffer2.Buffer.alloc(chunks.reduce((l, chunk) => l + chunk.byteLength, 0));
     let i = 0;
@@ -8001,7 +8111,7 @@ async function capnpc(options) {
       }
       opts.push("-o-");
     }
-    dataBuf = await new Promise((resolve) => {
+    dataBuf = await new Promise((resolve2) => {
       (0, import_node_child_process.exec)(`capnpc ${opts.join(" ")} ${schemas.join(" ")}`, {
         encoding: "buffer"
       }, (error, stdout, stderr) => {
@@ -8011,7 +8121,7 @@ async function capnpc(options) {
         if (error) {
           throw error;
         }
-        resolve(stdout);
+        resolve2(stdout);
       });
     });
   }

package/bin/capnpc.js

@@ -4,46 +4,60 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 
 // bin/capnpc.ts
 import { writeFatal as writeFatal2, writeInfo, writeSuccess, writeWarning as writeWarning3 } from "@storm-software/config-tools/logger/console";
-import { exitWithError, exitWithSuccess, findWorkspaceRootSafe as findWorkspaceRootSafe2, handleProcess } from "@storm-software/config-tools/utilities";
+import { exitWithError, exitWithSuccess, findWorkspaceRootSafe, handleProcess } from "@storm-software/config-tools/utilities";
 
-// ../path/src/exists.ts
+// ../fs/src/exists.ts
 import { existsSync as existsSyncFs } from "node:fs";
 import { access, constants } from "node:fs/promises";
-var existsSync = /* @__PURE__ */ __name((filePath) => {
+function existsSync(filePath) {
   return existsSyncFs(filePath);
-}, "existsSync");
+}
+__name(existsSync, "existsSync");
 
 // ../types/src/base.ts
 var EMPTY_STRING = "";
 var $NestedValue = Symbol("NestedValue");
 
-// ../path/src/file-path-fns.ts
-import { relative } from "node:path";
+// ../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;
+var ROOT_FOLDER_REGEX = /^\/([A-Z]:)?$/i;
+
+// ../path/src/slash.ts
+function slash(path) {
+  if (path.startsWith("\\\\?\\")) {
+    return path;
+  }
+  return path.replace(/\\/g, "/");
+}
+__name(slash, "slash");
 
-// ../path/src/is-file.ts
-import { lstatSync, statSync } from "node:fs";
+// ../path/src/is-type.ts
+function isAbsolutePath(path) {
+  return ABSOLUTE_PATH_REGEX.test(slash(path));
+}
+__name(isAbsolutePath, "isAbsolutePath");
+function isAbsolute(path) {
+  return isAbsolutePath(path);
+}
+__name(isAbsolute, "isAbsolute");
 
 // ../path/src/join-paths.ts
-var _DRIVE_LETTER_START_RE = /^[A-Z]:\//i;
 function normalizeWindowsPath(input = "") {
   if (!input) {
     return input;
   }
-  return input.replace(/\\/g, "/").replace(_DRIVE_LETTER_START_RE, (r) => r.toUpperCase());
+  return input.replace(/\\/g, "/").replace(DRIVE_LETTER_START_REGEX, (r) => r.toUpperCase());
 }
 __name(normalizeWindowsPath, "normalizeWindowsPath");
-var _UNC_REGEX = /^[/\\]{2}/;
-var _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Z]:[/\\]/i;
-var _DRIVE_LETTER_RE = /^[A-Z]:$/i;
-var isAbsolute = /* @__PURE__ */ __name(function(p) {
-  return _IS_ABSOLUTE_RE.test(p);
-}, "isAbsolute");
-var correctPaths = /* @__PURE__ */ __name(function(path) {
+function correctPaths(path) {
   if (!path || path.length === 0) {
     return ".";
   }
   path = normalizeWindowsPath(path);
-  const isUNCPath = path.match(_UNC_REGEX);
+  const isUNCPath = path.match(UNC_REGEX);
   const isPathAbsolute = isAbsolute(path);
   const trailingSeparator = path[path.length - 1] === "/";
   path = normalizeString(path, !isPathAbsolute);
@@ -56,7 +70,7 @@ var correctPaths = /* @__PURE__ */ __name(function(path) {
   if (trailingSeparator) {
     path += "/";
   }
-  if (_DRIVE_LETTER_RE.test(path)) {
+  if (DRIVE_LETTER_REGEX.test(path)) {
     path += "/";
   }
   if (isUNCPath) {
@@ -66,8 +80,9 @@ var correctPaths = /* @__PURE__ */ __name(function(path) {
     return `//${path}`;
   }
   return isPathAbsolute && !isAbsolute(path) ? `/${path}` : path;
-}, "correctPaths");
-var joinPaths = /* @__PURE__ */ __name(function(...segments) {
+}
+__name(correctPaths, "correctPaths");
+function joinPaths(...segments) {
   let path = "";
   for (const seg of segments) {
     if (!seg) {
@@ -87,7 +102,8 @@ var joinPaths = /* @__PURE__ */ __name(function(...segments) {
     }
   }
   return correctPaths(path);
-}, "joinPaths");
+}
+__name(joinPaths, "joinPaths");
 function normalizeString(path, allowAboveRoot) {
   let res = "";
   let lastSegmentLength = 0;
@@ -150,18 +166,6 @@ function normalizeString(path, allowAboveRoot) {
 }
 __name(normalizeString, "normalizeString");
 
-// ../path/src/regex.ts
-var DRIVE_LETTER_START_REGEX = /^[A-Z]:\//i;
-
-// ../path/src/slash.ts
-function slash(path) {
-  if (path.startsWith("\\\\?\\")) {
-    return path;
-  }
-  return path.replace(/\\/g, "/");
-}
-__name(slash, "slash");
-
 // ../path/src/correct-path.ts
 function normalizeWindowsPath2(input = "") {
   if (!input) {
@@ -170,9 +174,67 @@ function normalizeWindowsPath2(input = "") {
   return slash(input).replace(DRIVE_LETTER_START_REGEX, (r) => r.toUpperCase());
 }
 __name(normalizeWindowsPath2, "normalizeWindowsPath");
-
-// ../path/src/get-workspace-root.ts
-import { findWorkspaceRootSafe } from "@storm-software/config-tools";
+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/file-path-fns.ts
 function findFileName(filePath, options = {}) {
@@ -195,6 +257,54 @@ function findFilePath(filePath) {
   return result === "/" ? result : result.replace(/\/$/, "");
 }
 __name(findFilePath, "findFilePath");
+function resolve(...paths) {
+  paths = paths.map((argument) => normalizeWindowsPath2(argument));
+  let resolvedPath = "";
+  let resolvedAbsolute = false;
+  for (let index = paths.length - 1; index >= -1 && !resolvedAbsolute; index--) {
+    const path = index >= 0 ? paths[index] : currentDir();
+    if (!path || path.length === 0) {
+      continue;
+    }
+    resolvedPath = `${path}/${resolvedPath}`;
+    resolvedAbsolute = isAbsolute(path);
+  }
+  resolvedPath = normalizeString2(resolvedPath, !resolvedAbsolute);
+  if (resolvedAbsolute && !isAbsolute(resolvedPath)) {
+    return `/${resolvedPath}`;
+  }
+  return resolvedPath.length > 0 ? resolvedPath : ".";
+}
+__name(resolve, "resolve");
+function currentDir() {
+  if (typeof process !== "undefined" && typeof process.cwd === "function") {
+    return process.cwd().replace(/\\/g, "/");
+  }
+  return "/";
+}
+__name(currentDir, "currentDir");
+function relative(from, to) {
+  const _from = resolve(from).replace(ROOT_FOLDER_REGEX, "$1").split("/");
+  const _to = resolve(to).replace(ROOT_FOLDER_REGEX, "$1").split("/");
+  if (_to[0][1] === ":" && _from[0][1] === ":" && _from[0] !== _to[0]) {
+    return _to.join("/");
+  }
+  const _fromCopy = [
+    ..._from
+  ];
+  for (const segment of _fromCopy) {
+    if (_to[0] !== segment) {
+      break;
+    }
+    _from.shift();
+    _to.shift();
+  }
+  return [
+    ..._from.map(() => ".."),
+    ..._to
+  ].join("/");
+}
+__name(relative, "relative");
 function relativePath(from, to, withEndSlash = false) {
   return relative(withEndSlash !== true ? from.replace(/\/$/, "") : from, withEndSlash !== true ? to.replace(/\/$/, "") : to);
 }
@@ -7949,8 +8059,8 @@ async function capnpc(options) {
     process.stdin.on("data", (chunk) => {
       chunks.push(chunk);
     });
-    await new Promise((resolve) => {
-      process.stdin.on("end", resolve);
+    await new Promise((resolve2) => {
+      process.stdin.on("end", resolve2);
     });
     const reqBuffer = Buffer3.alloc(chunks.reduce((l, chunk) => l + chunk.byteLength, 0));
     let i = 0;
@@ -7970,7 +8080,7 @@ async function capnpc(options) {
       }
       opts.push("-o-");
     }
-    dataBuf = await new Promise((resolve) => {
+    dataBuf = await new Promise((resolve2) => {
       exec(`capnpc ${opts.join(" ")} ${schemas.join(" ")}`, {
         encoding: "buffer"
       }, (error, stdout, stderr) => {
@@ -7980,7 +8090,7 @@ async function capnpc(options) {
         if (error) {
           throw error;
         }
-        resolve(stdout);
+        resolve2(stdout);
       });
     });
   }
@@ -7998,7 +8108,7 @@ function createProgram() {
   writeInfo("\u26A1 Running Storm Cap'n Proto Compiler Tools", {
     logLevel: "all"
   });
-  const root = findWorkspaceRootSafe2(process.cwd());
+  const root = findWorkspaceRootSafe(process.cwd());
   process.env.STORM_WORKSPACE_ROOT ??= root;
   process.env.NX_WORKSPACE_ROOT_PATH ??= root;
   if (root) {