@storm-software/cloudflare-tools 0.62.7 → 0.63.0

package/dist/{chunk-FUSFC5AM.js → chunk-Q6WFFOSW.js}

@@ -1,21 +1,21 @@
 "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 _chunkRIUVF72Kjs = require('./chunk-RIUVF72K.js');
+var _chunk2HJQOPBDjs = require('./chunk-2HJQOPBD.js');
 
 
 
 var _chunkKTFMIXUNjs = require('./chunk-KTFMIXUN.js');
 
 
-var _chunkHBASMEU5js = require('./chunk-HBASMEU5.js');
+var _chunkOL65RB72js = require('./chunk-OL65RB72.js');
 
 
 
 
 
 
-var _chunkPZ5CI56Fjs = require('./chunk-PZ5CI56F.js');
+var _chunkSQUJ3SXLjs = require('./chunk-SQUJ3SXL.js');
 
 // src/executors/r2-upload-publish/executor.ts
 var _clients3 = require('@aws-sdk/client-s3');
@@ -39,8 +39,8 @@ async function runExecutor(options, context) {
     throw new Error("The executor requires projectsConfigurations.");
   }
   try {
-    const workspaceRoot = _chunkPZ5CI56Fjs.findWorkspaceRoot.call(void 0, );
-    const config = await _chunkHBASMEU5js.getConfig.call(void 0, workspaceRoot);
+    const workspaceRoot = _chunkSQUJ3SXLjs.findWorkspaceRoot.call(void 0, );
+    const config = await _chunkOL65RB72js.getConfig.call(void 0, workspaceRoot);
     const sourceRoot = _nullishCoalesce(_optionalChain([context, 'access', _7 => _7.projectsConfigurations, 'access', _8 => _8.projects, 'access', _9 => _9[context.projectName], 'optionalAccess', _10 => _10.sourceRoot]), () => ( workspaceRoot));
     const projectName = _nullishCoalesce(_optionalChain([context, 'access', _11 => _11.projectsConfigurations, 'access', _12 => _12.projects, 'access', _13 => _13[context.projectName], 'optionalAccess', _14 => _14.name]), () => ( context.projectName));
     const projectDetails = _chunkKTFMIXUNjs.getPackageInfo.call(void 0, 
@@ -79,7 +79,7 @@ async function runExecutor(options, context) {
         "The executor failed because the project graph is not available. Please run the build command again."
       );
     }
-    _chunkPZ5CI56Fjs.writeInfo.call(void 0, 
+    _chunkSQUJ3SXLjs.writeInfo.call(void 0, 
       `Publishing ${context.projectName} to the Storm Registry at ${endpoint}`
     );
     const s3Client = new (0, _clients3.S3)({
@@ -91,12 +91,12 @@ async function runExecutor(options, context) {
       }
     });
     const version = _optionalChain([projectDetails, 'access', _18 => _18.content, 'optionalAccess', _19 => _19.version]);
-    _chunkPZ5CI56Fjs.writeInfo.call(void 0, `Generated component version: ${version}`);
+    _chunkSQUJ3SXLjs.writeInfo.call(void 0, `Generated component version: ${version}`);
     const files = await _glob.glob.call(void 0, _devkit.joinPathFragments.call(void 0, sourceRoot, "**/*"), {
       ignore: "**/{*.stories.tsx,*.stories.ts,*.spec.tsx,*.spec.ts}"
     });
     const projectPath = `registry/${context.projectName}`;
-    const internalDependencies = await _chunkRIUVF72Kjs.getInternalDependencies.call(void 0, 
+    const internalDependencies = await _chunk2HJQOPBDjs.getInternalDependencies.call(void 0, 
       context.projectName,
       projectGraph
     );
@@ -109,14 +109,14 @@ async function runExecutor(options, context) {
       return ret;
     }, _nullishCoalesce(projectDetails.content.dependencies, () => ( {})));
     const release = _nullishCoalesce(options.tag, () => ( _child_process.execSync.call(void 0, "npm config get tag").toString().trim()));
-    _chunkPZ5CI56Fjs.writeInfo.call(void 0, `Clearing out existing items in ${projectPath}`);
+    _chunkSQUJ3SXLjs.writeInfo.call(void 0, `Clearing out existing items in ${projectPath}`);
     if (!isDryRun) {
       const response = await s3Client.listObjects({
         Bucket: options.bucketId,
         Prefix: projectPath
       });
       if (_optionalChain([response, 'optionalAccess', _20 => _20.Contents]) && response.Contents.length > 0) {
-        _chunkPZ5CI56Fjs.writeDebug.call(void 0, 
+        _chunkSQUJ3SXLjs.writeDebug.call(void 0, 
           `Deleting the following existing items from the component registry: ${response.Contents.map((item) => item.Key).join(", ")}`
         );
         await Promise.all(
@@ -135,12 +135,12 @@ async function runExecutor(options, context) {
           )
         );
       } else {
-        _chunkPZ5CI56Fjs.writeDebug.call(void 0, 
+        _chunkSQUJ3SXLjs.writeDebug.call(void 0, 
           `No existing items to delete in the component registry path ${projectPath}`
         );
       }
     } else {
-      _chunkPZ5CI56Fjs.writeWarning.call(void 0, "[Dry run]: skipping upload to the Cyclone Registry.");
+      _chunkSQUJ3SXLjs.writeWarning.call(void 0, "[Dry run]: skipping upload to the Cyclone Registry.");
     }
     const meta = {
       name: context.projectName,
@@ -158,9 +158,9 @@ async function runExecutor(options, context) {
       meta.devDependencies = projectDetails.content.devDependencies;
     }
     const metaJson = JSON.stringify(meta);
-    _chunkPZ5CI56Fjs.writeInfo.call(void 0, `Generating meta.json file: 
+    _chunkSQUJ3SXLjs.writeInfo.call(void 0, `Generating meta.json file: 
 ${metaJson}`);
-    await _chunkRIUVF72Kjs.r2UploadFile.call(void 0, 
+    await _chunk2HJQOPBDjs.r2UploadFile.call(void 0, 
       s3Client,
       options.bucketId,
       projectPath,
@@ -174,7 +174,7 @@ ${metaJson}`);
       files.map((file) => {
         const fileName = file.replaceAll("\\", "/").replace(sourceRoot.replaceAll("\\", "/"), "");
         return _promises.readFile.call(void 0, file, { encoding: "utf8" }).then(
-          (fileContent) => _chunkRIUVF72Kjs.r2UploadFile.call(void 0, 
+          (fileContent) => _chunk2HJQOPBDjs.r2UploadFile.call(void 0, 
             s3Client,
             options.bucketId,
             projectPath,
@@ -187,7 +187,7 @@ ${metaJson}`);
         );
       })
     );
-    _chunkPZ5CI56Fjs.writeSuccess.call(void 0, 
+    _chunkSQUJ3SXLjs.writeSuccess.call(void 0, 
       `Successfully uploaded the ${projectName} component to the Cyclone Registry`,
       config
     );

package/dist/{chunk-FL2QPQC4.mjs → chunk-QFLZSWVY.mjs}

@@ -5,7 +5,7 @@ import {
 import {
   getConfig,
   getWorkspaceConfig
-} from "./chunk-GPAI4NHQ.mjs";
+} from "./chunk-7H2K6PT4.mjs";
 import {
   findWorkspaceRoot,
   formatLogMessage,
@@ -19,11 +19,11 @@ import {
   writeSuccess,
   writeTrace,
   writeWarning
-} from "./chunk-MV24QW26.mjs";
+} from "./chunk-GOL5LHR6.mjs";
 import {
   __dirname,
   __require
-} from "./chunk-DPAEOWHQ.mjs";
+} from "./chunk-OJTXF2HH.mjs";
 
 // ../config-tools/src/utilities/apply-workspace-tokens.ts
 var applyWorkspaceBaseTokens = async (option, tokenParams) => {
@@ -2766,7 +2766,7 @@ var typescript_build_executor_untyped_default = defineUntypedSchema4({
       ]
     },
     $default: "esnext",
-    $resolve: (val = "esnext") => val.toLowerCase()
+    $resolve: (val = "esnext") => typeof val === "string" ? val.toLowerCase() : val
   },
   format: {
     $schema: {

package/dist/{chunk-JZJDF2HT.mjs → chunk-QKV3MDW3.mjs}

@@ -1,13 +1,13 @@
 import {
   __commonJS
-} from "./chunk-DPAEOWHQ.mjs";
+} from "./chunk-OJTXF2HH.mjs";
 
 // package.json
 var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@storm-software/cloudflare-tools",
-      version: "0.62.6",
+      version: "0.62.8",
       description: "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
       repository: {
         type: "github",
@@ -175,7 +175,7 @@ var require_package = __commonJS({
         nx: "catalog:",
         tsup: "catalog:",
         untyped: "catalog:",
-        wrangler: "^4.14.4"
+        wrangler: "^4.16.1"
       },
       publishConfig: {
         access: "public"

package/dist/{chunk-PZ5CI56F.js → chunk-SQUJ3SXL.js}

@@ -243,10 +243,10 @@ var LogLevelLabel = {
 };
 
 // ../config/src/constants.ts
-var STORM_DEFAULT_DOCS = "https://docs.stormsoftware.com";
+var STORM_DEFAULT_DOCS = "https://stormsoftware.com/docs";
 var STORM_DEFAULT_HOMEPAGE = "https://stormsoftware.com";
 var STORM_DEFAULT_CONTACT = "https://stormsoftware.com/contact";
-var STORM_DEFAULT_LICENSING = "https://license.stormsoftware.com";
+var STORM_DEFAULT_LICENSING = "https://stormsoftware.com/license";
 var STORM_DEFAULT_LICENSE = "Apache-2.0";
 var STORM_DEFAULT_RELEASE_BANNER = "https://public.storm-cdn.com/brand-banner.png";
 var STORM_DEFAULT_ACCOUNT_TWITTER = "StormSoftwareHQ";
@@ -420,10 +420,13 @@ var stormWorkspaceConfigSchema = _zod2.default.object({
   organization: _zod2.default.string().trim().default("storm-software").describe("The organization of the workspace"),
   repository: _zod2.default.string().trim().optional().describe("The repo URL of the workspace (i.e. GitHub)"),
   license: _zod2.default.string().trim().default("Apache-2.0").describe("The license type of the package"),
-  homepage: _zod2.default.string().trim().url().default(STORM_DEFAULT_HOMEPAGE).describe("The homepage of the workspace"),
-  docs: _zod2.default.string().trim().url().default(STORM_DEFAULT_DOCS).describe("The base documentation site for the workspace"),
-  licensing: _zod2.default.string().trim().url().default(STORM_DEFAULT_LICENSING).describe("The base licensing site for the workspace"),
-  contact: _zod2.default.string().trim().url().default(STORM_DEFAULT_CONTACT).describe("The base contact site for the workspace"),
+  homepage: _zod2.default.string().trim().url().optional().describe("The homepage of the workspace"),
+  docs: _zod2.default.string().trim().url().optional().describe("The documentation site for the workspace"),
+  licensing: _zod2.default.string().trim().url().optional().describe("The licensing site for the workspace"),
+  contact: _zod2.default.string().trim().url().optional().describe("The contact site for the workspace"),
+  support: _zod2.default.string().trim().url().optional().describe(
+    "The support site for the workspace. If not provided, this is defaulted to the `contact` config value"
+  ),
   branch: _zod2.default.string().trim().default("main").describe("The branch of the workspace"),
   preid: _zod2.default.string().optional().describe("A tag specifying the version pre-release identifier"),
   owner: _zod2.default.string().trim().default("@storm-software/admin").describe("The owner of the package"),
@@ -522,9 +525,10 @@ var DEFAULT_COLOR_CONFIG = {
     negative: "#dc2626"
   }
 };
-var getDefaultConfig = async (root) => {
+async function getPackageJsonConfig(root) {
   let license = STORM_DEFAULT_LICENSE;
-  let homepage = STORM_DEFAULT_HOMEPAGE;
+  let homepage = void 0;
+  let support = void 0;
   let name = void 0;
   let namespace = void 0;
   let repository = void 0;
@@ -555,6 +559,13 @@ var getDefaultConfig = async (root) => {
       if (packageJson.homepage) {
         homepage = packageJson.homepage;
       }
+      if (packageJson.bugs) {
+        if (typeof packageJson.bugs === "string") {
+          support = packageJson.bugs;
+        } else if (packageJson.bugs.url) {
+          support = packageJson.bugs.url;
+        }
+      }
     }
   }
   return {
@@ -564,13 +575,38 @@ var getDefaultConfig = async (root) => {
     repository,
     license,
     homepage,
-    docs: `${homepage || STORM_DEFAULT_HOMEPAGE}/docs`,
-    licensing: `${homepage || STORM_DEFAULT_HOMEPAGE}/license`,
-    error: {
-      url: `${homepage || STORM_DEFAULT_HOMEPAGE}/errors`
-    }
+    support
   };
-};
+}
+function applyDefaultConfig(config) {
+  if (!config.support && config.contact) {
+    config.support = config.contact;
+  }
+  if (!config.contact && config.support) {
+    config.contact = config.support;
+  }
+  if (config.homepage) {
+    if (!config.docs) {
+      config.docs = `${config.homepage}/docs`;
+    }
+    if (!config.license) {
+      config.license = `${config.homepage}/license`;
+    }
+    if (!config.support) {
+      config.support = `${config.homepage}/support`;
+    }
+    if (!config.contact) {
+      config.contact = `${config.homepage}/contact`;
+    }
+    if (!_optionalChain([config, 'access', _2 => _2.error, 'optionalAccess', _3 => _3.codesFile]) || !_optionalChain([config, 'optionalAccess', _4 => _4.error, 'optionalAccess', _5 => _5.url])) {
+      config.error ??= { codesFile: STORM_DEFAULT_ERROR_CODES_FILE };
+      if (config.homepage) {
+        config.error.url ??= `${config.homepage}/errors`;
+      }
+    }
+  }
+  return config;
+}
 
 // ../config-tools/src/logger/chalk.ts
 var _chalk2 = require('chalk'); var _chalk3 = _interopRequireDefault(_chalk2);
@@ -595,7 +631,7 @@ var chalkDefault = {
 };
 var getChalk = () => {
   let _chalk = _chalk3.default;
-  if (!_optionalChain([_chalk, 'optionalAccess', _2 => _2.hex]) || !_optionalChain([_chalk, 'optionalAccess', _3 => _3.bold, 'optionalAccess', _4 => _4.hex]) || !_optionalChain([_chalk, 'optionalAccess', _5 => _5.bgHex]) || !_optionalChain([_chalk, 'optionalAccess', _6 => _6.whiteBright])) {
+  if (!_optionalChain([_chalk, 'optionalAccess', _6 => _6.hex]) || !_optionalChain([_chalk, 'optionalAccess', _7 => _7.bold, 'optionalAccess', _8 => _8.hex]) || !_optionalChain([_chalk, 'optionalAccess', _9 => _9.bgHex]) || !_optionalChain([_chalk, 'optionalAccess', _10 => _10.whiteBright])) {
     _chalk = chalkDefault;
   }
   return _chalk;
@@ -683,7 +719,7 @@ var getLogLevelLabel = (logLevel = LogLevel.INFO) => {
 
 // ../config-tools/src/logger/console.ts
 var getLogFn = (logLevel = LogLevel.INFO, config = {}, _chalk = getChalk()) => {
-  const colors = !_optionalChain([config, 'access', _7 => _7.colors, 'optionalAccess', _8 => _8.dark]) && !_optionalChain([config, 'access', _9 => _9.colors, 'optionalAccess', _10 => _10["base"]]) && !_optionalChain([config, 'access', _11 => _11.colors, 'optionalAccess', _12 => _12["base"], 'optionalAccess', _13 => _13.dark]) ? DEFAULT_COLOR_CONFIG : _optionalChain([config, 'access', _14 => _14.colors, 'optionalAccess', _15 => _15.dark]) && typeof config.colors.dark === "string" ? config.colors : _optionalChain([config, 'access', _16 => _16.colors, 'optionalAccess', _17 => _17["base"], 'optionalAccess', _18 => _18.dark]) && typeof config.colors["base"].dark === "string" ? config.colors["base"].dark : _optionalChain([config, 'access', _19 => _19.colors, 'optionalAccess', _20 => _20["base"]]) ? _optionalChain([config, 'access', _21 => _21.colors, 'optionalAccess', _22 => _22["base"]]) : DEFAULT_COLOR_CONFIG;
+  const colors = !_optionalChain([config, 'access', _11 => _11.colors, 'optionalAccess', _12 => _12.dark]) && !_optionalChain([config, 'access', _13 => _13.colors, 'optionalAccess', _14 => _14["base"]]) && !_optionalChain([config, 'access', _15 => _15.colors, 'optionalAccess', _16 => _16["base"], 'optionalAccess', _17 => _17.dark]) ? DEFAULT_COLOR_CONFIG : _optionalChain([config, 'access', _18 => _18.colors, 'optionalAccess', _19 => _19.dark]) && typeof config.colors.dark === "string" ? config.colors : _optionalChain([config, 'access', _20 => _20.colors, 'optionalAccess', _21 => _21["base"], 'optionalAccess', _22 => _22.dark]) && typeof config.colors["base"].dark === "string" ? config.colors["base"].dark : _optionalChain([config, 'access', _23 => _23.colors, 'optionalAccess', _24 => _24["base"]]) ? _optionalChain([config, 'access', _25 => _25.colors, 'optionalAccess', _26 => _26["base"]]) : DEFAULT_COLOR_CONFIG;
   const configLogLevel = config.logLevel || process.env.STORM_LOG_LEVEL || LogLevelLabel.INFO;
   if (logLevel > getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT || getLogLevel(configLogLevel) <= LogLevel.SILENT) {
     return (_) => {
@@ -799,7 +835,7 @@ ${Object.keys(message).filter((key) => !skip.includes(key)).map(
 };
 var _isFunction = (value) => {
   try {
-    return value instanceof Function || typeof value === "function" || !!(_optionalChain([value, 'optionalAccess', _23 => _23.constructor]) && _optionalChain([value, 'optionalAccess', _24 => _24.call]) && _optionalChain([value, 'optionalAccess', _25 => _25.apply]));
+    return value instanceof Function || typeof value === "function" || !!(_optionalChain([value, 'optionalAccess', _27 => _27.constructor]) && _optionalChain([value, 'optionalAccess', _28 => _28.call]) && _optionalChain([value, 'optionalAccess', _29 => _29.apply]));
   } catch (e) {
     return false;
   }
@@ -827,4 +863,5 @@ var _isFunction = (value) => {
 
 
 
-exports.LogLevel = LogLevel; exports.STORM_DEFAULT_DOCS = STORM_DEFAULT_DOCS; exports.STORM_DEFAULT_HOMEPAGE = STORM_DEFAULT_HOMEPAGE; exports.STORM_DEFAULT_LICENSING = STORM_DEFAULT_LICENSING; exports.stormWorkspaceConfigSchema = stormWorkspaceConfigSchema; exports.COLOR_KEYS = COLOR_KEYS; exports.correctPaths = correctPaths; exports.joinPaths = joinPaths; exports.findWorkspaceRoot = findWorkspaceRoot; exports.getDefaultConfig = getDefaultConfig; exports.getLogLevel = getLogLevel; exports.getLogLevelLabel = getLogLevelLabel; exports.writeFatal = writeFatal; exports.writeError = writeError; exports.writeWarning = writeWarning; exports.writeInfo = writeInfo; exports.writeSuccess = writeSuccess; exports.writeDebug = writeDebug; exports.writeTrace = writeTrace; exports.getStopwatch = getStopwatch; exports.formatLogMessage = formatLogMessage;
+
+exports.LogLevel = LogLevel; exports.STORM_DEFAULT_DOCS = STORM_DEFAULT_DOCS; exports.STORM_DEFAULT_HOMEPAGE = STORM_DEFAULT_HOMEPAGE; exports.STORM_DEFAULT_LICENSING = STORM_DEFAULT_LICENSING; exports.stormWorkspaceConfigSchema = stormWorkspaceConfigSchema; exports.COLOR_KEYS = COLOR_KEYS; exports.correctPaths = correctPaths; exports.joinPaths = joinPaths; exports.findWorkspaceRoot = findWorkspaceRoot; exports.getPackageJsonConfig = getPackageJsonConfig; exports.applyDefaultConfig = applyDefaultConfig; exports.getLogLevel = getLogLevel; exports.getLogLevelLabel = getLogLevelLabel; exports.writeFatal = writeFatal; exports.writeError = writeError; exports.writeWarning = writeWarning; exports.writeInfo = writeInfo; exports.writeSuccess = writeSuccess; exports.writeDebug = writeDebug; exports.writeTrace = writeTrace; exports.getStopwatch = getStopwatch; exports.formatLogMessage = formatLogMessage;