@storm-software/cloudflare-tools 0.71.117 → 0.71.118

package/dist/chunk-L2YMTHF2.js

@@ -0,0 +1,266 @@
+"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 _chunkQ3UOHXUVjs = require('./chunk-Q3UOHXUV.js');
+
+
+
+var _chunkOEP2XBU4js = require('./chunk-OEP2XBU4.js');
+
+
+
+
+
+
+
+
+var _chunkRIBK362Wjs = require('./chunk-RIBK362W.js');
+
+// src/generators/worker/generator.ts
+
+
+
+
+
+
+
+
+
+
+
+var _devkit = require('@nx/devkit');
+var _projectnameandrootutils = require('@nx/devkit/src/generators/project-name-and-root-utils');
+var _node = require('@nx/node');
+var _versions = require('@nx/node/src/utils/versions');
+var _path = require('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 = _chunkRIBK362Wjs.getStopwatch.call(void 0, "Storm Worker generator");
+  let config;
+  try {
+    const workspaceRoot = _chunkOEP2XBU4js.findWorkspaceRoot.call(void 0, );
+    config = await _chunkOEP2XBU4js.getConfig.call(void 0, workspaceRoot);
+    _chunkRIBK362Wjs.writeInfo.call(void 0, 
+      `${_chunkRIBK362Wjs.brandIcon.call(void 0, config)}  Running the Storm Worker generator...
+
+`,
+      config
+    );
+    _chunkRIBK362Wjs.writeDebug.call(void 0, 
+      `Loading the Storm Config from environment variables and storm.json file...
+- workspaceRoot: ${workspaceRoot}`,
+      config
+    );
+    _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
+    );
+    const options = await normalizeOptions(tree, schema, config);
+    const tasks = [];
+    tasks.push(
+      await _chunkQ3UOHXUVjs.generator_default.call(void 0, tree, {
+        ...options,
+        skipFormat: true
+      })
+    );
+    tasks.push(
+      await _node.applicationGenerator.call(void 0, 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 } = _devkit.ensurePackage.call(void 0, 
+        "@nx/vite",
+        _versions.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 _devkit.formatFiles.call(void 0, tree);
+    }
+    if (options.template === "hono") {
+      tasks.push(() => {
+        const packageJsonPath = _devkit.joinPathFragments.call(void 0, 
+          _nullishCoalesce(options.directory, () => ( "")),
+          "package.json"
+        );
+        if (tree.exists(packageJsonPath)) {
+          _devkit.updateJson.call(void 0, tree, packageJsonPath, (json) => ({
+            ...json,
+            dependencies: {
+              hono: "4.4.0",
+              ..._optionalChain([json, 'optionalAccess', _ => _.dependencies])
+            }
+          }));
+        }
+      });
+    }
+    return _devkit.runTasksInSerial.call(void 0, ...tasks);
+  } catch (error) {
+    return () => {
+      _chunkRIBK362Wjs.writeFatal.call(void 0, 
+        "A fatal error occurred while running the generator - the process was forced to terminate",
+        config
+      );
+      _chunkRIBK362Wjs.writeError.call(void 0, 
+        `An exception was thrown in the generator's process 
+ - Details: ${error.message}
+ - Stacktrace: ${error.stack}`,
+        config
+      );
+    };
+  } finally {
+    stopwatch();
+  }
+}
+function updateTsAppConfig(tree, options) {
+  _devkit.updateJson.call(void 0, tree, _path.join.call(void 0, 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(_path.join.call(void 0, options.appProjectRoot, "src/main.ts"));
+  _devkit.generateFiles.call(void 0, 
+    tree,
+    _path.join.call(void 0, __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") {
+    _devkit.generateFiles.call(void 0, 
+      tree,
+      _path.join.call(void 0, __dirname, `./files/${options.template}`),
+      _path.join.call(void 0, 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 = _devkit.readProjectConfiguration.call(void 0, tree, options.name);
+    projectConfiguration.targets = {
+      ..._nullishCoalesce(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;
+    }
+    _devkit.updateProjectConfiguration.call(void 0, tree, options.name, projectConfiguration);
+  } catch (e) {
+    console.error(e);
+  }
+}
+function removeTestFiles(tree, options) {
+  tree.delete(_path.join.call(void 0, options.appProjectRoot, "src", "index.test.ts"));
+}
+async function normalizeOptions(host, options, config) {
+  const { projectName: appProjectName, projectRoot: appProjectRoot } = await _projectnameandrootutils.determineProjectNameAndRootOptions.call(void 0, 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: _devkit.names.call(void 0, appProjectName).fileName,
+    frontendProject: options.frontendProject ? _devkit.names.call(void 0, options.frontendProject).fileName : void 0,
+    appProjectRoot,
+    unitTestRunner: _nullishCoalesce(options.unitTestRunner, () => ( "vitest")),
+    rootProject: _nullishCoalesce(options.rootProject, () => ( false)),
+    template: _nullishCoalesce(options.template, () => ( "fetch-handler")),
+    port: _nullishCoalesce(options.port, () => ( 3e3))
+  };
+}
+var generator_default2 = applicationGenerator;
+var applicationSchematic = _devkit.convertNxGenerator.call(void 0, applicationGenerator);
+
+
+
+
+
+exports.applicationGenerator = applicationGenerator; exports.generator_default = generator_default2; exports.applicationSchematic = applicationSchematic;

package/dist/{chunk-LHQFGCAV.mjs → chunk-LACL4JSA.mjs}

@@ -7,7 +7,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@storm-software/cloudflare-tools",
-      version: "0.71.116",
+      version: "0.71.117",
       private: false,
       description: "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
       keywords: [
@@ -156,9 +156,9 @@ var require_package = __commonJS({
         "@nx/js": "catalog:",
         "@nx/node": "catalog:",
         "@nx/web": "catalog:",
-        "@storm-software/config": "1.137.20",
-        "@storm-software/config-tools": "1.189.66",
-        "@storm-software/workspace-tools": "1.295.42",
+        "@storm-software/config": "1.137.21",
+        "@storm-software/config-tools": "1.189.67",
+        "@storm-software/workspace-tools": "1.295.43",
         nx: "catalog:",
         tsup: "catalog:",
         wrangler: ">=3.58.0"

package/dist/{chunk-PTALGFIO.mjs → chunk-LEATTEFI.mjs}

@@ -1,6 +1,3 @@
-import {
-  generator_default
-} from "./chunk-LHQFGCAV.mjs";
 import {
   findWorkspaceRoot,
   getConfig
@@ -14,6 +11,9 @@ import {
   writeInfo,
   writeTrace
 } from "./chunk-ZDABHOZ2.mjs";
+import {
+  generator_default
+} from "./chunk-LACL4JSA.mjs";
 import {
   __dirname
 } from "./chunk-FU2GBN2O.mjs";

package/dist/{chunk-L3VPGV3G.js → chunk-Q3UOHXUV.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.116",
+      version: "0.71.117",
       private: false,
       description: "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
       keywords: [
@@ -156,9 +156,9 @@ var require_package = _chunkMCKGQKYUjs.__commonJS.call(void 0, {
         "@nx/js": "catalog:",
         "@nx/node": "catalog:",
         "@nx/web": "catalog:",
-        "@storm-software/config": "1.137.20",
-        "@storm-software/config-tools": "1.189.66",
-        "@storm-software/workspace-tools": "1.295.42",
+        "@storm-software/config": "1.137.21",
+        "@storm-software/config-tools": "1.189.67",
+        "@storm-software/workspace-tools": "1.295.43",
         nx: "catalog:",
         tsup: "catalog:",
         wrangler: ">=3.58.0"

package/dist/chunk-YOYU3IRK.mjs

@@ -0,0 +1,269 @@
+import {
+  generator_default
+} from "./chunk-LACL4JSA.mjs";
+import {
+  findWorkspaceRoot,
+  getConfig
+} from "./chunk-5QM4JUN3.mjs";
+import {
+  brandIcon,
+  getStopwatch,
+  writeDebug,
+  writeError,
+  writeFatal,
+  writeInfo,
+  writeTrace
+} from "./chunk-ZDABHOZ2.mjs";
+import {
+  __dirname
+} from "./chunk-FU2GBN2O.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/executors.js

@@ -1,10 +1,10 @@
 "use strict";require('./chunk-XO66D74Z.js');
-require('./chunk-FKBCEMBX.js');
-require('./chunk-KUGEZPUO.js');
-require('./chunk-SIS5VQAU.js');
 require('./chunk-QBD2OGUY.js');
+require('./chunk-EBT36S6J.js');
 require('./chunk-ATSBU3S6.js');
 require('./chunk-N7FW365Q.js');
 require('./chunk-OEP2XBU4.js');
+require('./chunk-KUGEZPUO.js');
+require('./chunk-SIS5VQAU.js');
 require('./chunk-RIBK362W.js');
 require('./chunk-MCKGQKYU.js');

package/dist/executors.mjs

@@ -1,10 +1,10 @@
 import "./chunk-YSCEY447.mjs";
-import "./chunk-B6RWRHGX.mjs";
-import "./chunk-SWYYMID7.mjs";
-import "./chunk-M3VAGNJQ.mjs";
 import "./chunk-KAJQR5PF.mjs";
+import "./chunk-IIS253RT.mjs";
 import "./chunk-4GCN6FO5.mjs";
 import "./chunk-3MAI3FU2.mjs";
 import "./chunk-5QM4JUN3.mjs";
+import "./chunk-SWYYMID7.mjs";
+import "./chunk-M3VAGNJQ.mjs";
 import "./chunk-ZDABHOZ2.mjs";
 import "./chunk-FU2GBN2O.mjs";

package/dist/generators.js

@@ -2,17 +2,17 @@
 
 
 
-var _chunkD2FFTTZIjs = require('./chunk-D2FFTTZI.js');
+var _chunkBFZP3ZIEjs = require('./chunk-BFZP3ZIE.js');
+require('./chunk-OEP2XBU4.js');
+require('./chunk-RIBK362W.js');
 
 
 
-var _chunkL3VPGV3Gjs = require('./chunk-L3VPGV3G.js');
-require('./chunk-OEP2XBU4.js');
-require('./chunk-RIBK362W.js');
+var _chunkQ3UOHXUVjs = require('./chunk-Q3UOHXUV.js');
 require('./chunk-MCKGQKYU.js');
 
 
 
 
 
-exports.applicationGenerator = _chunkD2FFTTZIjs.applicationGenerator; exports.applicationSchematic = _chunkD2FFTTZIjs.applicationSchematic; exports.initGenerator = _chunkL3VPGV3Gjs.initGenerator; exports.initSchematic = _chunkL3VPGV3Gjs.initSchematic;
+exports.applicationGenerator = _chunkBFZP3ZIEjs.applicationGenerator; exports.applicationSchematic = _chunkBFZP3ZIEjs.applicationSchematic; exports.initGenerator = _chunkQ3UOHXUVjs.initGenerator; exports.initSchematic = _chunkQ3UOHXUVjs.initSchematic;

package/dist/generators.mjs

@@ -2,13 +2,13 @@ import "./chunk-3J7KBHMJ.mjs";
 import {
   applicationGenerator,
   applicationSchematic
-} from "./chunk-PTALGFIO.mjs";
+} from "./chunk-LEATTEFI.mjs";
+import "./chunk-5QM4JUN3.mjs";
+import "./chunk-ZDABHOZ2.mjs";
 import {
   initGenerator,
   initSchematic
-} from "./chunk-LHQFGCAV.mjs";
-import "./chunk-5QM4JUN3.mjs";
-import "./chunk-ZDABHOZ2.mjs";
+} from "./chunk-LACL4JSA.mjs";
 import "./chunk-FU2GBN2O.mjs";
 export {
   applicationGenerator,