@storm-software/cloudflare-tools 0.71.95 → 0.71.97

package/dist/{chunk-L4HBUJPR.mjs → chunk-PEZ2T3XM.mjs}

@@ -1,10 +1,7 @@
-import {
-  generator_default
-} from "./chunk-DVMBIPBR.mjs";
 import {
   findWorkspaceRoot,
   getConfig
-} from "./chunk-536H3WK5.mjs";
+} from "./chunk-3LRZKOV5.mjs";
 import {
   brandIcon,
   getStopwatch,
@@ -13,10 +10,13 @@ import {
   writeFatal,
   writeInfo,
   writeTrace
-} from "./chunk-EXZP5MWY.mjs";
+} from "./chunk-ZDABHOZ2.mjs";
+import {
+  generator_default
+} from "./chunk-NZNIYQSG.mjs";
 import {
   __dirname
-} from "./chunk-FVRCPE3R.mjs";
+} from "./chunk-5GHEIPID.mjs";
 
 // src/generators/worker/generator.ts
 import {

package/dist/{chunk-URSIMVJI.js → chunk-QPHACFB6.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 _chunkH5RIERY3js = require('./chunk-H5RIERY3.js');
+var _chunkVXDMWPFNjs = require('./chunk-VXDMWPFN.js');
 
 
 
-var _chunkGBAVURC4js = require('./chunk-GBAVURC4.js');
+var _chunk3U6ZPFIVjs = require('./chunk-3U6ZPFIV.js');
 
 
 
@@ -13,7 +13,7 @@ var _chunkGBAVURC4js = require('./chunk-GBAVURC4.js');
 
 
 
-var _chunkPVCPJUY2js = require('./chunk-PVCPJUY2.js');
+var _chunkRIBK362Wjs = require('./chunk-RIBK362W.js');
 
 // src/generators/worker/generator.ts
 
@@ -46,23 +46,23 @@ var vitestScript = `"test": "vitest run"`;
 
 // src/generators/worker/generator.ts
 async function applicationGenerator(tree, schema) {
-  const stopwatch = _chunkPVCPJUY2js.getStopwatch.call(void 0, "Storm Worker generator");
+  const stopwatch = _chunkRIBK362Wjs.getStopwatch.call(void 0, "Storm Worker generator");
   let config;
   try {
-    const workspaceRoot = _chunkGBAVURC4js.findWorkspaceRoot.call(void 0, );
-    config = await _chunkGBAVURC4js.getConfig.call(void 0, workspaceRoot);
-    _chunkPVCPJUY2js.writeInfo.call(void 0, 
-      `${_chunkPVCPJUY2js.brandIcon.call(void 0, config)}  Running the Storm Worker generator...
+    const workspaceRoot = _chunk3U6ZPFIVjs.findWorkspaceRoot.call(void 0, );
+    config = await _chunk3U6ZPFIVjs.getConfig.call(void 0, workspaceRoot);
+    _chunkRIBK362Wjs.writeInfo.call(void 0, 
+      `${_chunkRIBK362Wjs.brandIcon.call(void 0, config)}  Running the Storm Worker generator...
 
 `,
       config
     );
-    _chunkPVCPJUY2js.writeDebug.call(void 0, 
+    _chunkRIBK362Wjs.writeDebug.call(void 0, 
       `Loading the Storm Config from environment variables and storm.json file...
 - workspaceRoot: ${workspaceRoot}`,
       config
     );
-    _chunkPVCPJUY2js.writeTrace.call(void 0, 
+    _chunkRIBK362Wjs.writeTrace.call(void 0, 
       `Loaded Storm config into env: 
 ${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[key])}`).join("\n")}`,
       config
@@ -70,7 +70,7 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[
     const options = await normalizeOptions(tree, schema, config);
     const tasks = [];
     tasks.push(
-      await _chunkH5RIERY3js.generator_default.call(void 0, tree, {
+      await _chunkVXDMWPFNjs.generator_default.call(void 0, tree, {
         ...options,
         skipFormat: true
       })
@@ -138,11 +138,11 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[
     return _devkit.runTasksInSerial.call(void 0, ...tasks);
   } catch (error) {
     return () => {
-      _chunkPVCPJUY2js.writeFatal.call(void 0, 
+      _chunkRIBK362Wjs.writeFatal.call(void 0, 
         "A fatal error occurred while running the generator - the process was forced to terminate",
         config
       );
-      _chunkPVCPJUY2js.writeError.call(void 0, 
+      _chunkRIBK362Wjs.writeError.call(void 0, 
         `An exception was thrown in the generator's process 
  - Details: ${error.message}
  - Stacktrace: ${error.stack}`,

package/dist/{chunk-PVCPJUY2.js → chunk-RIBK362W.js}

@@ -41,7 +41,7 @@ var DEFAULT_COLOR_CONFIG = {
     warning: "#e3b341",
     danger: "#D8314A",
     fatal: "#51070f",
-    performance: "#83ff83",
+    performance: "#13c302",
     link: "#3fa6ff",
     positive: "#22c55e",
     negative: "#dc2626",
@@ -59,7 +59,7 @@ var DEFAULT_COLOR_CONFIG = {
     warning: "#f3d371",
     danger: "#D8314A",
     fatal: "#a40e26",
-    performance: "#00ff00",
+    performance: "#80fd74",
     link: "#3fa6ff",
     positive: "#22c55e",
     negative: "#dc2626",

package/dist/{chunk-JCQYTCUM.js → chunk-SIS5VQAU.js}

@@ -3,15 +3,15 @@
 
 
 
-var _chunkPVCPJUY2js = require('./chunk-PVCPJUY2.js');
+var _chunkRIBK362Wjs = require('./chunk-RIBK362W.js');
 
 // src/utils/r2-bucket-helpers.ts
 var _libstorage = require('@aws-sdk/lib-storage');
 var _crypto = require('crypto');
 var _prettybytes = require('pretty-bytes'); var _prettybytes2 = _interopRequireDefault(_prettybytes);
 async function uploadFile(client, bucketName, bucketPath, fileName, version, fileContent, contentType = "application/octet-stream", isDryRun = false) {
-  const key = _optionalChain([(!_optionalChain([bucketPath, 'optionalAccess', _ => _.trim, 'call', _2 => _2()]) || _optionalChain([bucketPath, 'optionalAccess', _3 => _3.trim, 'call', _4 => _4()]) === "/" ? fileName : _chunkPVCPJUY2js.joinPaths.call(void 0, bucketPath.trim(), fileName)), 'optionalAccess', _5 => _5.replace, 'call', _6 => _6(/^\/+/g, "")]) || "";
-  _chunkPVCPJUY2js.writeDebug.call(void 0, 
+  const key = _optionalChain([(!_optionalChain([bucketPath, 'optionalAccess', _ => _.trim, 'call', _2 => _2()]) || _optionalChain([bucketPath, 'optionalAccess', _3 => _3.trim, 'call', _4 => _4()]) === "/" ? fileName : _chunkRIBK362Wjs.joinPaths.call(void 0, bucketPath.trim(), fileName)), 'optionalAccess', _5 => _5.replace, 'call', _6 => _6(/^\/+/g, "")]) || "";
+  _chunkRIBK362Wjs.writeDebug.call(void 0, 
     `Uploading ${key} (content-type: ${contentType}, size: ${_prettybytes2.default.call(void 0, 
       Buffer.byteLength(fileContent, getEncoding(contentType))
     )}) to the ${bucketName} R2 bucket`
@@ -33,10 +33,10 @@ async function uploadFile(client, bucketName, bucketPath, fileName, version, fil
       });
       await upload.done();
     } else {
-      _chunkPVCPJUY2js.writeWarning.call(void 0, "[Dry run]: Skipping upload to the R2 bucket.");
+      _chunkRIBK362Wjs.writeWarning.call(void 0, "[Dry run]: Skipping upload to the R2 bucket.");
     }
   } catch (error) {
-    _chunkPVCPJUY2js.writeError.call(void 0, `Failed to upload ${key} to the ${bucketName} R2 bucket.`);
+    _chunkRIBK362Wjs.writeError.call(void 0, `Failed to upload ${key} to the ${bucketName} R2 bucket.`);
     throw error;
   }
 }

package/dist/chunk-U6MGVRZE.mjs

@@ -0,0 +1,269 @@
+import {
+  generator_default
+} from "./chunk-NZNIYQSG.mjs";
+import {
+  findWorkspaceRoot,
+  getConfig
+} from "./chunk-3LRZKOV5.mjs";
+import {
+  brandIcon,
+  getStopwatch,
+  writeDebug,
+  writeError,
+  writeFatal,
+  writeInfo,
+  writeTrace
+} from "./chunk-ZDABHOZ2.mjs";
+import {
+  __dirname
+} from "./chunk-5GHEIPID.mjs";
+
+// src/generators/worker/generator.ts
+import {
+  convertNxGenerator,
+  ensurePackage,
+  formatFiles,
+  generateFiles,
+  joinPathFragments,
+  names,
+  readProjectConfiguration,
+  runTasksInSerial,
+  updateJson,
+  updateProjectConfiguration
+} from "@nx/devkit";
+import { determineProjectNameAndRootOptions } from "@nx/devkit/src/generators/project-name-and-root-utils";
+import { applicationGenerator as nodeApplicationGenerator } from "@nx/node";
+import { nxVersion } from "@nx/node/src/utils/versions";
+import { join } from "path";
+
+// src/generators/worker/libs/get-account-id.ts
+function getAccountId(accountId) {
+  return `account_id = "${accountId}"`;
+}
+
+// src/generators/worker/libs/vitest-imports.ts
+var vitestImports = `import { describe, expect, it, beforeAll, afterAll } from 'vitest';`;
+
+// src/generators/worker/libs/vitest-script.ts
+var vitestScript = `"test": "vitest run"`;
+
+// src/generators/worker/generator.ts
+async function applicationGenerator(tree, schema) {
+  const stopwatch = getStopwatch("Storm Worker generator");
+  let config;
+  try {
+    const workspaceRoot = findWorkspaceRoot();
+    config = await getConfig(workspaceRoot);
+    writeInfo(
+      `${brandIcon(config)}  Running the Storm Worker generator...
+
+`,
+      config
+    );
+    writeDebug(
+      `Loading the Storm Config from environment variables and storm.json file...
+- workspaceRoot: ${workspaceRoot}`,
+      config
+    );
+    writeTrace(
+      `Loaded Storm config into env: 
+${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[key])}`).join("\n")}`,
+      config
+    );
+    const options = await normalizeOptions(tree, schema, config);
+    const tasks = [];
+    tasks.push(
+      await generator_default(tree, {
+        ...options,
+        skipFormat: true
+      })
+    );
+    tasks.push(
+      await nodeApplicationGenerator(tree, {
+        ...options,
+        framework: "none",
+        skipFormat: true,
+        unitTestRunner: options.unitTestRunner == "vitest" ? "none" : options.unitTestRunner,
+        e2eTestRunner: "none",
+        name: schema.name
+      })
+    );
+    if (options.unitTestRunner === "vitest") {
+      const { vitestGenerator, createOrEditViteConfig } = ensurePackage(
+        "@nx/vite",
+        nxVersion
+      );
+      const vitestTask = await vitestGenerator(tree, {
+        project: options.name,
+        uiFramework: "none",
+        coverageProvider: "v8",
+        skipFormat: true,
+        testEnvironment: "node"
+      });
+      tasks.push(vitestTask);
+      createOrEditViteConfig(
+        tree,
+        {
+          project: options.name,
+          includeLib: false,
+          includeVitest: true,
+          testEnvironment: "node"
+        },
+        true
+      );
+    }
+    addCloudflareFiles(tree, options);
+    updateTsAppConfig(tree, options);
+    addTargets(tree, options);
+    if (options.unitTestRunner === "none") {
+      removeTestFiles(tree, options);
+    }
+    if (!options.skipFormat) {
+      await formatFiles(tree);
+    }
+    if (options.template === "hono") {
+      tasks.push(() => {
+        const packageJsonPath = joinPathFragments(
+          options.directory ?? "",
+          "package.json"
+        );
+        if (tree.exists(packageJsonPath)) {
+          updateJson(tree, packageJsonPath, (json) => ({
+            ...json,
+            dependencies: {
+              hono: "4.4.0",
+              ...json?.dependencies
+            }
+          }));
+        }
+      });
+    }
+    return runTasksInSerial(...tasks);
+  } catch (error) {
+    return () => {
+      writeFatal(
+        "A fatal error occurred while running the generator - the process was forced to terminate",
+        config
+      );
+      writeError(
+        `An exception was thrown in the generator's process 
+ - Details: ${error.message}
+ - Stacktrace: ${error.stack}`,
+        config
+      );
+    };
+  } finally {
+    stopwatch();
+  }
+}
+function updateTsAppConfig(tree, options) {
+  updateJson(tree, join(options.appProjectRoot, "tsconfig.app.json"), (json) => {
+    json.compilerOptions = {
+      ...json.compilerOptions,
+      esModuleInterop: true,
+      target: "es2021",
+      lib: ["es2021"],
+      module: "es2022",
+      moduleResolution: "node",
+      resolveJsonModule: true,
+      allowJs: true,
+      checkJs: false,
+      noEmit: true,
+      isolatedModules: true,
+      allowSyntheticDefaultImports: true,
+      forceConsistentCasingInFileNames: true,
+      strict: true,
+      skipLibCheck: true
+    };
+    json.compilerOptions.types = [
+      ...json.compilerOptions.types,
+      "@cloudflare/workers-types"
+    ];
+    return json;
+  });
+}
+function addCloudflareFiles(tree, options) {
+  tree.delete(join(options.appProjectRoot, "src/main.ts"));
+  generateFiles(
+    tree,
+    join(__dirname, "./files/common"),
+    options.appProjectRoot,
+    {
+      ...options,
+      tmpl: "",
+      name: options.name,
+      accountId: options.accountId ? getAccountId(options.accountId) : "",
+      vitestScript: options.unitTestRunner === "vitest" ? vitestScript : ""
+    }
+  );
+  if (options.template && options.template !== "none") {
+    generateFiles(
+      tree,
+      join(__dirname, `./files/${options.template}`),
+      join(options.appProjectRoot, "src"),
+      {
+        ...options,
+        tmpl: "",
+        name: options.name,
+        accountId: options.accountId ? getAccountId(options.accountId) : "",
+        vitestScript: options.unitTestRunner === "vitest" ? vitestScript : "",
+        vitestImports: options.unitTestRunner === "vitest" ? vitestImports : ""
+      }
+    );
+  }
+}
+function addTargets(tree, options) {
+  try {
+    const projectConfiguration = readProjectConfiguration(tree, options.name);
+    projectConfiguration.targets = {
+      ...projectConfiguration.targets ?? {},
+      serve: {
+        executor: "@storm-software/cloudflare-tools:serve",
+        options: {
+          port: options.port
+        }
+      },
+      "nx-release-publish": {
+        executor: "@storm-software/cloudflare-tools:cloudflare-publish"
+      }
+    };
+    if (projectConfiguration.targets.build) {
+      delete projectConfiguration.targets.build;
+    }
+    updateProjectConfiguration(tree, options.name, projectConfiguration);
+  } catch (e) {
+    console.error(e);
+  }
+}
+function removeTestFiles(tree, options) {
+  tree.delete(join(options.appProjectRoot, "src", "index.test.ts"));
+}
+async function normalizeOptions(host, options, config) {
+  const { projectName: appProjectName, projectRoot: appProjectRoot } = await determineProjectNameAndRootOptions(host, {
+    name: options.name,
+    projectType: "application",
+    directory: options.directory,
+    rootProject: options.rootProject
+  });
+  options.rootProject = appProjectRoot === ".";
+  return {
+    addPlugin: process.env.NX_ADD_PLUGINS !== "false",
+    accountId: process.env.STORM_BOT_CLOUDFLARE_ACCOUNT,
+    ...options,
+    name: names(appProjectName).fileName,
+    frontendProject: options.frontendProject ? names(options.frontendProject).fileName : void 0,
+    appProjectRoot,
+    unitTestRunner: options.unitTestRunner ?? "vitest",
+    rootProject: options.rootProject ?? false,
+    template: options.template ?? "fetch-handler",
+    port: options.port ?? 3e3
+  };
+}
+var generator_default2 = applicationGenerator;
+var applicationSchematic = convertNxGenerator(applicationGenerator);
+
+export {
+  applicationGenerator,
+  generator_default2 as generator_default,
+  applicationSchematic
+};

package/dist/{chunk-H5RIERY3.js → chunk-VXDMWPFN.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.94",
+      version: "0.71.96",
       private: false,
       description: "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
       keywords: [
@@ -132,8 +132,8 @@ var require_package = _chunkMCKGQKYUjs.__commonJS.call(void 0, {
       module: "dist/index.mjs",
       typings: "dist/index.d.ts",
       dependencies: {
-        "@aws-sdk/client-s3": "^3.1012.0",
-        "@aws-sdk/lib-storage": "^3.1012.0",
+        "@aws-sdk/client-s3": "^3.1016.0",
+        "@aws-sdk/lib-storage": "^3.1016.0",
         "@smithy/node-http-handler": "^4.5.0",
         defu: "catalog:",
         glob: "catalog:",
@@ -149,16 +149,16 @@ var require_package = _chunkMCKGQKYUjs.__commonJS.call(void 0, {
         nx: "catalog:",
         tsup: "catalog:",
         untyped: "catalog:",
-        wrangler: "^4.75.0"
+        wrangler: "^4.77.0"
       },
       peerDependencies: {
         "@nx/devkit": "catalog:",
         "@nx/js": "catalog:",
         "@nx/node": "catalog:",
         "@nx/web": "catalog:",
-        "@storm-software/config": "1.136.3",
-        "@storm-software/config-tools": "1.189.44",
-        "@storm-software/workspace-tools": "1.295.20",
+        "@storm-software/config": "1.137.0",
+        "@storm-software/config-tools": "1.189.46",
+        "@storm-software/workspace-tools": "1.295.22",
         nx: "catalog:",
         tsup: "catalog:",
         wrangler: ">=3.58.0"