@storm-software/cloudflare-tools 0.69.7 → 0.69.9

package/dist/chunk-I3T42HZ4.js

@@ -0,0 +1,262 @@
+"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 _chunkESCAEH5Sjs = require('./chunk-ESCAEH5S.js');
+
+
+
+var _chunkACJLPNZQjs = require('./chunk-ACJLPNZQ.js');
+
+
+
+
+
+
+
+var _chunk2CDSXWFAjs = require('./chunk-2CDSXWFA.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 = _chunk2CDSXWFAjs.getStopwatch.call(void 0, "Storm Worker generator");
+  let config;
+  try {
+    _chunk2CDSXWFAjs.writeInfo.call(void 0, `\u26A1 Running the Storm Worker generator...
+
+`, config);
+    const workspaceRoot = _chunkACJLPNZQjs.findWorkspaceRoot.call(void 0, );
+    _chunk2CDSXWFAjs.writeDebug.call(void 0, 
+      `Loading the Storm Config from environment variables and storm.json file...
+- workspaceRoot: ${workspaceRoot}`,
+      config
+    );
+    config = await _chunkACJLPNZQjs.getConfig.call(void 0, workspaceRoot);
+    _chunk2CDSXWFAjs.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 _chunkESCAEH5Sjs.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 () => {
+      _chunk2CDSXWFAjs.writeFatal.call(void 0, 
+        "A fatal error occurred while running the generator - the process was forced to terminate",
+        config
+      );
+      _chunk2CDSXWFAjs.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-3D34OZXV.mjs → chunk-IQCKAFLI.mjs}

@@ -1,10 +1,10 @@
 import {
   generator_default
-} from "./chunk-DOKEDIHC.mjs";
+} from "./chunk-JPKUU56U.mjs";
 import {
   findWorkspaceRoot,
   getConfig
-} from "./chunk-6YI6SWWG.mjs";
+} from "./chunk-XTLKKAUD.mjs";
 import {
   getStopwatch,
   writeDebug,
@@ -15,7 +15,7 @@ import {
 } from "./chunk-V44DYGWX.mjs";
 import {
   __dirname
-} from "./chunk-4RMMRGT6.mjs";
+} from "./chunk-ZKRNXBH6.mjs";
 
 // src/generators/worker/generator.ts
 import {

package/dist/{chunk-DOKEDIHC.mjs → chunk-JPKUU56U.mjs}

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

package/dist/{chunk-DQ66YFHA.js → chunk-KAC75BBW.js}

@@ -1,15 +1,15 @@
 "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 _chunkNCQM44P3js = require('./chunk-NCQM44P3.js');
+var _chunkNU34IEWNjs = require('./chunk-NU34IEWN.js');
 
 
 
-var _chunkNU34IEWNjs = require('./chunk-NU34IEWN.js');
+var _chunkNCQM44P3js = require('./chunk-NCQM44P3.js');
 
 
 
-var _chunkAMJC7IYYjs = require('./chunk-AMJC7IYY.js');
+var _chunkACJLPNZQjs = require('./chunk-ACJLPNZQ.js');
 
 
 
@@ -39,8 +39,8 @@ async function runExecutor(options, context) {
     throw new Error("The executor requires projectsConfigurations.");
   }
   try {
-    const workspaceRoot = _chunkAMJC7IYYjs.findWorkspaceRoot.call(void 0, );
-    const config = await _chunkAMJC7IYYjs.getConfig.call(void 0, workspaceRoot);
+    const workspaceRoot = _chunkACJLPNZQjs.findWorkspaceRoot.call(void 0, );
+    const config = await _chunkACJLPNZQjs.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 = _chunkNU34IEWNjs.getPackageInfo.call(void 0, 

package/dist/{chunk-COOQTBNS.mjs → chunk-MAOGR4ZA.mjs}

@@ -1,15 +1,15 @@
-import {
-  getInternalDependencies,
-  r2UploadFile
-} from "./chunk-IANDAPQS.mjs";
 import {
   createCliOptions,
   getPackageInfo
 } from "./chunk-PH3DHY4Q.mjs";
+import {
+  getInternalDependencies,
+  r2UploadFile
+} from "./chunk-IANDAPQS.mjs";
 import {
   findWorkspaceRoot,
   getConfig
-} from "./chunk-6YI6SWWG.mjs";
+} from "./chunk-XTLKKAUD.mjs";
 import {
   writeDebug,
   writeInfo,

package/dist/chunk-MUN3IQVG.mjs

@@ -0,0 +1,265 @@
+import {
+  findWorkspaceRoot,
+  getConfig
+} from "./chunk-XTLKKAUD.mjs";
+import {
+  getStopwatch,
+  writeDebug,
+  writeError,
+  writeFatal,
+  writeInfo,
+  writeTrace
+} from "./chunk-V44DYGWX.mjs";
+import {
+  generator_default
+} from "./chunk-JPKUU56U.mjs";
+import {
+  __dirname
+} from "./chunk-ZKRNXBH6.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 {
+    writeInfo(`\u26A1 Running the Storm Worker generator...
+
+`, config);
+    const workspaceRoot = findWorkspaceRoot();
+    writeDebug(
+      `Loading the Storm Config from environment variables and storm.json file...
+- workspaceRoot: ${workspaceRoot}`,
+      config
+    );
+    config = await getConfig(workspaceRoot);
+    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
+};