@storm-software/cloudflare-tools 0.71.2 → 0.71.3

package/dist/{chunk-NEODNLL5.js → chunk-GPR55JRG.js}

@@ -7,7 +7,7 @@ var require_package = _chunkMCKGQKYUjs.__commonJS.call(void 0, {
   "package.json"(exports, module) {
     module.exports = {
       name: "@storm-software/cloudflare-tools",
-      version: "0.71.1",
+      version: "0.71.2",
       description: "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
       repository: {
         type: "github",
@@ -136,9 +136,9 @@ var require_package = _chunkMCKGQKYUjs.__commonJS.call(void 0, {
         "@nx/js": "catalog:",
         "@nx/node": "catalog:",
         "@nx/web": "catalog:",
-        "@storm-software/config": "1.134.52",
-        "@storm-software/config-tools": "1.188.52",
-        "@storm-software/workspace-tools": "1.293.22",
+        "@storm-software/config": "1.134.53",
+        "@storm-software/config-tools": "1.188.53",
+        "@storm-software/workspace-tools": "1.293.23",
         nx: "catalog:",
         tsup: "catalog:",
         wrangler: ">=3.58.0"

package/dist/{chunk-HQWL5NAU.js → chunk-I7SRDPE3.js}

@@ -1,10 +1,10 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
-var _chunkNEODNLL5js = require('./chunk-NEODNLL5.js');
+var _chunkGPR55JRGjs = require('./chunk-GPR55JRG.js');
 
 
 
-var _chunkEQXEFXCVjs = require('./chunk-EQXEFXCV.js');
+var _chunkVKMAYBQXjs = require('./chunk-VKMAYBQX.js');
 
 
 
@@ -12,7 +12,7 @@ var _chunkEQXEFXCVjs = require('./chunk-EQXEFXCV.js');
 
 
 
-var _chunk4BWM53AAjs = require('./chunk-4BWM53AA.js');
+var _chunkZ2WQB55Rjs = require('./chunk-Z2WQB55R.js');
 
 // src/generators/worker/generator.ts
 
@@ -45,20 +45,20 @@ var vitestScript = `"test": "vitest run"`;
 
 // src/generators/worker/generator.ts
 async function applicationGenerator(tree, schema) {
-  const stopwatch = _chunk4BWM53AAjs.getStopwatch.call(void 0, "Storm Worker generator");
+  const stopwatch = _chunkZ2WQB55Rjs.getStopwatch.call(void 0, "Storm Worker generator");
   let config;
   try {
-    _chunk4BWM53AAjs.writeInfo.call(void 0, `\u26A1 Running the Storm Worker generator...
+    _chunkZ2WQB55Rjs.writeInfo.call(void 0, `\u26A1 Running the Storm Worker generator...
 
 `, config);
-    const workspaceRoot = _chunkEQXEFXCVjs.findWorkspaceRoot.call(void 0, );
-    _chunk4BWM53AAjs.writeDebug.call(void 0, 
+    const workspaceRoot = _chunkVKMAYBQXjs.findWorkspaceRoot.call(void 0, );
+    _chunkZ2WQB55Rjs.writeDebug.call(void 0, 
       `Loading the Storm Config from environment variables and storm.json file...
 - workspaceRoot: ${workspaceRoot}`,
       config
     );
-    config = await _chunkEQXEFXCVjs.getConfig.call(void 0, workspaceRoot);
-    _chunk4BWM53AAjs.writeTrace.call(void 0, 
+    config = await _chunkVKMAYBQXjs.getConfig.call(void 0, workspaceRoot);
+    _chunkZ2WQB55Rjs.writeTrace.call(void 0, 
       `Loaded Storm config into env: 
 ${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[key])}`).join("\n")}`,
       config
@@ -66,7 +66,7 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[
     const options = await normalizeOptions(tree, schema, config);
     const tasks = [];
     tasks.push(
-      await _chunkNEODNLL5js.generator_default.call(void 0, tree, {
+      await _chunkGPR55JRGjs.generator_default.call(void 0, tree, {
         ...options,
         skipFormat: true
       })
@@ -134,11 +134,11 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[
     return _devkit.runTasksInSerial.call(void 0, ...tasks);
   } catch (error) {
     return () => {
-      _chunk4BWM53AAjs.writeFatal.call(void 0, 
+      _chunkZ2WQB55Rjs.writeFatal.call(void 0, 
         "A fatal error occurred while running the generator - the process was forced to terminate",
         config
       );
-      _chunk4BWM53AAjs.writeError.call(void 0, 
+      _chunkZ2WQB55Rjs.writeError.call(void 0, 
         `An exception was thrown in the generator's process 
  - Details: ${error.message}
  - Stacktrace: ${error.stack}`,

package/dist/{chunk-C6B32MBV.mjs → chunk-NYGOCQMG.mjs}

@@ -3,19 +3,19 @@ import {
   addProjectTag
 } from "./chunk-PH3DHY4Q.mjs";
 import {
-  correctPaths,
   findWorkspaceRoot,
   getConfig,
   getWorkspaceConfig,
-  isAbsolute,
-  joinPaths,
-  relative,
   schemaRegistry,
   workspaceConfigSchema
-} from "./chunk-PTTJW7MW.mjs";
+} from "./chunk-SGTAZO2Q.mjs";
 import {
+  correctPaths,
   formatLogMessage,
   getStopwatch,
+  isAbsolute,
+  joinPaths,
+  relative,
   writeDebug,
   writeError,
   writeFatal,
@@ -23,7 +23,7 @@ import {
   writeSuccess,
   writeTrace,
   writeWarning
-} from "./chunk-6MATO2MJ.mjs";
+} from "./chunk-TPNHSNNZ.mjs";
 import {
   __dirname
 } from "./chunk-QN6OKPMU.mjs";

package/dist/{chunk-PTTJW7MW.mjs → chunk-SGTAZO2Q.mjs}

@@ -1,177 +1,13 @@
 import {
   LogLevel,
+  correctPaths,
   formatLogMessage,
   getLogLevel,
   getLogLevelLabel,
+  joinPaths,
   writeTrace,
   writeWarning
-} from "./chunk-6MATO2MJ.mjs";
-
-// ../config-tools/src/utilities/correct-paths.ts
-var _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
-function normalizeWindowsPath(input = "") {
-  if (!input) {
-    return input;
-  }
-  return input.replace(/\\/g, "/").replace(_DRIVE_LETTER_START_RE, (r) => r.toUpperCase());
-}
-var _UNC_REGEX = /^[/\\]{2}/;
-var _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
-var _DRIVE_LETTER_RE = /^[A-Za-z]:$/;
-var _ROOT_FOLDER_RE = /^\/([A-Za-z]:)?$/;
-var correctPaths = function(path) {
-  if (!path || path.length === 0) {
-    return ".";
-  }
-  path = normalizeWindowsPath(path);
-  const isUNCPath = path?.match(_UNC_REGEX);
-  const isPathAbsolute = isAbsolute(path);
-  const trailingSeparator = path[path.length - 1] === "/";
-  path = normalizeString(path, !isPathAbsolute);
-  if (path.length === 0) {
-    if (isPathAbsolute) {
-      return "/";
-    }
-    return trailingSeparator ? "./" : ".";
-  }
-  if (trailingSeparator) {
-    path += "/";
-  }
-  if (_DRIVE_LETTER_RE.test(path)) {
-    path += "/";
-  }
-  if (isUNCPath) {
-    if (!isPathAbsolute) {
-      return `//./${path}`;
-    }
-    return `//${path}`;
-  }
-  return isPathAbsolute && !isAbsolute(path) ? `/${path}` : path;
-};
-var joinPaths = function(...segments) {
-  let path = "";
-  for (const seg of segments) {
-    if (!seg) {
-      continue;
-    }
-    if (path.length > 0) {
-      const pathTrailing = path[path.length - 1] === "/";
-      const segLeading = seg[0] === "/";
-      const both = pathTrailing && segLeading;
-      if (both) {
-        path += seg.slice(1);
-      } else {
-        path += pathTrailing || segLeading ? seg : `/${seg}`;
-      }
-    } else {
-      path += seg;
-    }
-  }
-  return correctPaths(path);
-};
-function cwd() {
-  if (typeof process !== "undefined" && typeof process.cwd === "function") {
-    return process.cwd().replace(/\\/g, "/");
-  }
-  return "/";
-}
-var resolve = function(...arguments_) {
-  arguments_ = arguments_.map((argument) => normalizeWindowsPath(argument));
-  let resolvedPath = "";
-  let resolvedAbsolute = false;
-  for (let index = arguments_.length - 1; index >= -1 && !resolvedAbsolute; index--) {
-    const path = index >= 0 ? arguments_[index] : cwd();
-    if (!path || path.length === 0) {
-      continue;
-    }
-    resolvedPath = `${path}/${resolvedPath}`;
-    resolvedAbsolute = isAbsolute(path);
-  }
-  resolvedPath = normalizeString(resolvedPath, !resolvedAbsolute);
-  if (resolvedAbsolute && !isAbsolute(resolvedPath)) {
-    return `/${resolvedPath}`;
-  }
-  return resolvedPath.length > 0 ? resolvedPath : ".";
-};
-function normalizeString(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;
-}
-var isAbsolute = function(p) {
-  return _IS_ABSOLUTE_RE.test(p);
-};
-var relative = function(from, to) {
-  const _from = resolve(from).replace(_ROOT_FOLDER_RE, "$1").split("/");
-  const _to = resolve(to).replace(_ROOT_FOLDER_RE, "$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("/");
-};
+} from "./chunk-TPNHSNNZ.mjs";
 
 // ../config-tools/src/utilities/find-up.ts
 import { existsSync } from "node:fs";
@@ -1721,10 +1557,6 @@ function getWorkspaceConfig(skipLogs = true, options = {}) {
 }
 
 export {
-  correctPaths,
-  joinPaths,
-  isAbsolute,
-  relative,
   findWorkspaceRoot,
   schemaRegistry,
   workspaceConfigSchema,

package/dist/{chunk-6MATO2MJ.mjs → chunk-TPNHSNNZ.mjs}

@@ -297,6 +297,172 @@ var _isFunction = (value) => {
   }
 };
 
+// ../config-tools/src/utilities/correct-paths.ts
+var _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
+function normalizeWindowsPath(input = "") {
+  if (!input) {
+    return input;
+  }
+  return input.replace(/\\/g, "/").replace(_DRIVE_LETTER_START_RE, (r) => r.toUpperCase());
+}
+var _UNC_REGEX = /^[/\\]{2}/;
+var _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
+var _DRIVE_LETTER_RE = /^[A-Za-z]:$/;
+var _ROOT_FOLDER_RE = /^\/([A-Za-z]:)?$/;
+var correctPaths = function(path) {
+  if (!path || path.length === 0) {
+    return ".";
+  }
+  path = normalizeWindowsPath(path);
+  const isUNCPath = path?.match(_UNC_REGEX);
+  const isPathAbsolute = isAbsolute(path);
+  const trailingSeparator = path[path.length - 1] === "/";
+  path = normalizeString(path, !isPathAbsolute);
+  if (path.length === 0) {
+    if (isPathAbsolute) {
+      return "/";
+    }
+    return trailingSeparator ? "./" : ".";
+  }
+  if (trailingSeparator) {
+    path += "/";
+  }
+  if (_DRIVE_LETTER_RE.test(path)) {
+    path += "/";
+  }
+  if (isUNCPath) {
+    if (!isPathAbsolute) {
+      return `//./${path}`;
+    }
+    return `//${path}`;
+  }
+  return isPathAbsolute && !isAbsolute(path) ? `/${path}` : path;
+};
+var joinPaths = function(...segments) {
+  let path = "";
+  for (const seg of segments) {
+    if (!seg) {
+      continue;
+    }
+    if (path.length > 0) {
+      const pathTrailing = path[path.length - 1] === "/";
+      const segLeading = seg[0] === "/";
+      const both = pathTrailing && segLeading;
+      if (both) {
+        path += seg.slice(1);
+      } else {
+        path += pathTrailing || segLeading ? seg : `/${seg}`;
+      }
+    } else {
+      path += seg;
+    }
+  }
+  return correctPaths(path);
+};
+function cwd() {
+  if (typeof process !== "undefined" && typeof process.cwd === "function") {
+    return process.cwd().replace(/\\/g, "/");
+  }
+  return "/";
+}
+var resolve = function(...arguments_) {
+  arguments_ = arguments_.map((argument) => normalizeWindowsPath(argument));
+  let resolvedPath = "";
+  let resolvedAbsolute = false;
+  for (let index = arguments_.length - 1; index >= -1 && !resolvedAbsolute; index--) {
+    const path = index >= 0 ? arguments_[index] : cwd();
+    if (!path || path.length === 0) {
+      continue;
+    }
+    resolvedPath = `${path}/${resolvedPath}`;
+    resolvedAbsolute = isAbsolute(path);
+  }
+  resolvedPath = normalizeString(resolvedPath, !resolvedAbsolute);
+  if (resolvedAbsolute && !isAbsolute(resolvedPath)) {
+    return `/${resolvedPath}`;
+  }
+  return resolvedPath.length > 0 ? resolvedPath : ".";
+};
+function normalizeString(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;
+}
+var isAbsolute = function(p) {
+  return _IS_ABSOLUTE_RE.test(p);
+};
+var relative = function(from, to) {
+  const _from = resolve(from).replace(_ROOT_FOLDER_RE, "$1").split("/");
+  const _to = resolve(to).replace(_ROOT_FOLDER_RE, "$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("/");
+};
+
 export {
   LogLevel,
   getLogLevel,
@@ -309,5 +475,9 @@ export {
   writeDebug,
   writeTrace,
   getStopwatch,
-  formatLogMessage
+  formatLogMessage,
+  correctPaths,
+  joinPaths,
+  isAbsolute,
+  relative
 };

package/dist/{chunk-FFOLWRMA.js → chunk-UAKLE2QO.js}

@@ -1,30 +1,29 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }
 
 
-var _chunk4BWM53AAjs = require('./chunk-4BWM53AA.js');
+
+var _chunkZ2WQB55Rjs = require('./chunk-Z2WQB55R.js');
 
 // src/utils/r2-bucket-helpers.ts
 var _crypto = require('crypto');
-var r2UploadFile = async (client, bucketName, projectPath, fileName, version, fileContent, contentType = "text/plain", isDryRun = false) => {
-  const checksum = _crypto.createHash.call(void 0, "sha256").update(fileContent).digest("base64");
-  const fileKey = `${projectPath}/${fileName.startsWith("/") ? fileName.substring(1) : fileName}`;
-  _chunk4BWM53AAjs.writeDebug.call(void 0, `Uploading file: ${fileKey}`);
+async function r2UploadFile(client, bucketName, bucketPath, fileName, version, fileContent, contentType = "application/octet-stream", isDryRun = false) {
+  _chunkZ2WQB55Rjs.writeDebug.call(void 0, `Uploading file: ${_chunkZ2WQB55Rjs.joinPaths.call(void 0, bucketPath, fileName)}`);
   if (!isDryRun) {
     await client.putObject({
       Bucket: bucketName,
-      Key: fileKey,
-      Body: fileContent.replaceAll(' from "@cyclone-ui/', ' from "../'),
+      Key: _chunkZ2WQB55Rjs.joinPaths.call(void 0, bucketPath, fileName),
+      Body: fileContent,
       ContentType: contentType,
       Metadata: {
         version,
-        checksum
+        checksum: _crypto.createHash.call(void 0, "sha256").update(fileContent).digest("base64")
       }
     });
   } else {
-    _chunk4BWM53AAjs.writeWarning.call(void 0, "[Dry run]: skipping upload to the Cyclone Registry.");
+    _chunkZ2WQB55Rjs.writeWarning.call(void 0, "[Dry run]: Skipping upload to the R2 bucket.");
   }
-};
-var getInternalDependencies = (projectName, graph) => {
+}
+function getInternalDependencies(projectName, graph) {
   const allDeps = _nullishCoalesce(graph.dependencies[projectName], () => ( []));
   return Array.from(
     allDeps.reduce(
@@ -36,7 +35,7 @@ var getInternalDependencies = (projectName, graph) => {
       []
     )
   );
-};
+}
 
 
 

package/dist/{chunk-5YJKWRBZ.mjs → chunk-UXRPB254.mjs}

@@ -1,10 +1,10 @@
 import {
   generator_default
-} from "./chunk-TUJUSMGX.mjs";
+} from "./chunk-AOKOPGTD.mjs";
 import {
   findWorkspaceRoot,
   getConfig
-} from "./chunk-PTTJW7MW.mjs";
+} from "./chunk-SGTAZO2Q.mjs";
 import {
   getStopwatch,
   writeDebug,
@@ -12,7 +12,7 @@ import {
   writeFatal,
   writeInfo,
   writeTrace
-} from "./chunk-6MATO2MJ.mjs";
+} from "./chunk-TPNHSNNZ.mjs";
 import {
   __dirname
 } from "./chunk-QN6OKPMU.mjs";