@storm-software/cloudflare-tools 0.63.12 → 0.63.14

package/dist/chunk-WH4VPE6X.mjs

@@ -0,0 +1,265 @@
+import {
+  getConfig
+} from "./chunk-7H2K6PT4.mjs";
+import {
+  findWorkspaceRoot,
+  getStopwatch,
+  writeDebug,
+  writeError,
+  writeFatal,
+  writeInfo,
+  writeTrace
+} from "./chunk-GOL5LHR6.mjs";
+import {
+  generator_default
+} from "./chunk-ZLI4XREA.mjs";
+import {
+  __dirname
+} from "./chunk-2ET7ZYTU.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
+};

package/dist/{chunk-Q44FJY6W.mjs → chunk-ZLI4XREA.mjs}

@@ -7,7 +7,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@storm-software/cloudflare-tools",
-      version: "0.63.11",
+      version: "0.63.13",
       description: "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
       repository: {
         type: "github",

package/dist/executors.js

@@ -1,6 +1,6 @@
 "use strict";require('./chunk-XO66D74Z.js');
 require('./chunk-T2OGA6MB.js');
-require('./chunk-LRDYN7AR.js');
+require('./chunk-HYKWJFHA.js');
 require('./chunk-Q6WFFOSW.js');
 require('./chunk-2HJQOPBD.js');
 require('./chunk-KTFMIXUN.js');

package/dist/executors.mjs

@@ -1,6 +1,6 @@
 import "./chunk-YSCEY447.mjs";
 import "./chunk-DY4VZ7GU.mjs";
-import "./chunk-RWTT7VDO.mjs";
+import "./chunk-UDO5RHFZ.mjs";
 import "./chunk-5M3ADTI2.mjs";
 import "./chunk-JHXH6ZN3.mjs";
 import "./chunk-RH2IXKSC.mjs";

package/dist/generators.js

@@ -2,11 +2,11 @@
 
 
 
-var _chunkLRAWVWAEjs = require('./chunk-LRAWVWAE.js');
+var _chunkEDGMZMSIjs = require('./chunk-EDGMZMSI.js');
 
 
 
-var _chunk2MLHKN5Rjs = require('./chunk-2MLHKN5R.js');
+var _chunkN4ABVEWNjs = require('./chunk-N4ABVEWN.js');
 require('./chunk-OL65RB72.js');
 require('./chunk-SQUJ3SXL.js');
 require('./chunk-MCKGQKYU.js');
@@ -15,4 +15,4 @@ require('./chunk-MCKGQKYU.js');
 
 
 
-exports.applicationGenerator = _chunkLRAWVWAEjs.applicationGenerator; exports.applicationSchematic = _chunkLRAWVWAEjs.applicationSchematic; exports.initGenerator = _chunk2MLHKN5Rjs.initGenerator; exports.initSchematic = _chunk2MLHKN5Rjs.initSchematic;
+exports.applicationGenerator = _chunkEDGMZMSIjs.applicationGenerator; exports.applicationSchematic = _chunkEDGMZMSIjs.applicationSchematic; exports.initGenerator = _chunkN4ABVEWNjs.initGenerator; exports.initSchematic = _chunkN4ABVEWNjs.initSchematic;

package/dist/generators.mjs

@@ -2,11 +2,11 @@ import "./chunk-3J7KBHMJ.mjs";
 import {
   applicationGenerator,
   applicationSchematic
-} from "./chunk-NT7QQFG2.mjs";
+} from "./chunk-HIF5FI2F.mjs";
 import {
   initGenerator,
   initSchematic
-} from "./chunk-Q44FJY6W.mjs";
+} from "./chunk-ZLI4XREA.mjs";
 import "./chunk-7H2K6PT4.mjs";
 import "./chunk-GOL5LHR6.mjs";
 import "./chunk-2ET7ZYTU.mjs";

package/dist/index.js

@@ -3,14 +3,14 @@ require('./chunk-DHBG5ASJ.js');
 
 
 
-var _chunkLRAWVWAEjs = require('./chunk-LRAWVWAE.js');
+var _chunkEDGMZMSIjs = require('./chunk-EDGMZMSI.js');
 
 
 
-var _chunk2MLHKN5Rjs = require('./chunk-2MLHKN5R.js');
+var _chunkN4ABVEWNjs = require('./chunk-N4ABVEWN.js');
 require('./chunk-CVGPWUNP.js');
 require('./chunk-T2OGA6MB.js');
-require('./chunk-LRDYN7AR.js');
+require('./chunk-HYKWJFHA.js');
 require('./chunk-Q6WFFOSW.js');
 
 
@@ -162,4 +162,4 @@ function createPackageJson(projectJsonPath, workspaceRoot) {
 
 
 
-exports.applicationGenerator = _chunkLRAWVWAEjs.applicationGenerator; exports.applicationSchematic = _chunkLRAWVWAEjs.applicationSchematic; exports.createNodesV2 = createNodesV2; exports.getInternalDependencies = _chunk2HJQOPBDjs.getInternalDependencies; exports.initGenerator = _chunk2MLHKN5Rjs.initGenerator; exports.initSchematic = _chunk2MLHKN5Rjs.initSchematic; exports.name = name; exports.r2UploadFile = _chunk2HJQOPBDjs.r2UploadFile;
+exports.applicationGenerator = _chunkEDGMZMSIjs.applicationGenerator; exports.applicationSchematic = _chunkEDGMZMSIjs.applicationSchematic; exports.createNodesV2 = createNodesV2; exports.getInternalDependencies = _chunk2HJQOPBDjs.getInternalDependencies; exports.initGenerator = _chunkN4ABVEWNjs.initGenerator; exports.initSchematic = _chunkN4ABVEWNjs.initSchematic; exports.name = name; exports.r2UploadFile = _chunk2HJQOPBDjs.r2UploadFile;

package/dist/index.mjs

@@ -3,14 +3,14 @@ import "./chunk-3J7KBHMJ.mjs";
 import {
   applicationGenerator,
   applicationSchematic
-} from "./chunk-NT7QQFG2.mjs";
+} from "./chunk-HIF5FI2F.mjs";
 import {
   initGenerator,
   initSchematic
-} from "./chunk-Q44FJY6W.mjs";
+} from "./chunk-ZLI4XREA.mjs";
 import "./chunk-7Z5PILRU.mjs";
 import "./chunk-DY4VZ7GU.mjs";
-import "./chunk-RWTT7VDO.mjs";
+import "./chunk-UDO5RHFZ.mjs";
 import "./chunk-5M3ADTI2.mjs";
 import {
   getInternalDependencies,

package/dist/src/executors/cloudflare-publish/executor.js

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 var _chunkT2OGA6MBjs = require('../../../chunk-T2OGA6MB.js');
-require('../../../chunk-LRDYN7AR.js');
+require('../../../chunk-HYKWJFHA.js');
 require('../../../chunk-KTFMIXUN.js');
 require('../../../chunk-OL65RB72.js');
 require('../../../chunk-SQUJ3SXL.js');

package/dist/src/executors/cloudflare-publish/executor.mjs

@@ -1,7 +1,7 @@
 import {
   runExecutor
 } from "../../../chunk-DY4VZ7GU.mjs";
-import "../../../chunk-RWTT7VDO.mjs";
+import "../../../chunk-UDO5RHFZ.mjs";
 import "../../../chunk-RH2IXKSC.mjs";
 import "../../../chunk-7H2K6PT4.mjs";
 import "../../../chunk-GOL5LHR6.mjs";

package/dist/src/executors/serve/executor.js

@@ -1,6 +1,6 @@
 "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 _chunkLRDYN7ARjs = require('../../../chunk-LRDYN7AR.js');
+var _chunkHYKWJFHAjs = require('../../../chunk-HYKWJFHA.js');
 
 
 var _chunkKTFMIXUNjs = require('../../../chunk-KTFMIXUN.js');
@@ -55,7 +55,7 @@ async function* serveExecutor(options, context, config) {
     success: true
   };
 }
-var executor_default = _chunkLRDYN7ARjs.withRunExecutor.call(void 0, 
+var executor_default = _chunkHYKWJFHAjs.withRunExecutor.call(void 0, 
   "Cloudflare Serve executor",
   serveExecutor,
   {

package/dist/src/executors/serve/executor.mjs

@@ -1,6 +1,6 @@
 import {
   withRunExecutor
-} from "../../../chunk-RWTT7VDO.mjs";
+} from "../../../chunk-UDO5RHFZ.mjs";
 import {
   createCliOptions
 } from "../../../chunk-RH2IXKSC.mjs";

package/dist/src/generators/init/generator.js

@@ -2,10 +2,10 @@
 
 
 
-var _chunk2MLHKN5Rjs = require('../../../chunk-2MLHKN5R.js');
+var _chunkN4ABVEWNjs = require('../../../chunk-N4ABVEWN.js');
 require('../../../chunk-MCKGQKYU.js');
 
 
 
 
-exports.default = _chunk2MLHKN5Rjs.generator_default; exports.initGenerator = _chunk2MLHKN5Rjs.initGenerator; exports.initSchematic = _chunk2MLHKN5Rjs.initSchematic;
+exports.default = _chunkN4ABVEWNjs.generator_default; exports.initGenerator = _chunkN4ABVEWNjs.initGenerator; exports.initSchematic = _chunkN4ABVEWNjs.initSchematic;

package/dist/src/generators/init/generator.mjs

@@ -2,7 +2,7 @@ import {
   generator_default,
   initGenerator,
   initSchematic
-} from "../../../chunk-Q44FJY6W.mjs";
+} from "../../../chunk-ZLI4XREA.mjs";
 import "../../../chunk-2ET7ZYTU.mjs";
 export {
   generator_default as default,

package/dist/src/generators/worker/generator.js

@@ -2,8 +2,8 @@
 
 
 
-var _chunkLRAWVWAEjs = require('../../../chunk-LRAWVWAE.js');
-require('../../../chunk-2MLHKN5R.js');
+var _chunkEDGMZMSIjs = require('../../../chunk-EDGMZMSI.js');
+require('../../../chunk-N4ABVEWN.js');
 require('../../../chunk-OL65RB72.js');
 require('../../../chunk-SQUJ3SXL.js');
 require('../../../chunk-MCKGQKYU.js');
@@ -11,4 +11,4 @@ require('../../../chunk-MCKGQKYU.js');
 
 
 
-exports.applicationGenerator = _chunkLRAWVWAEjs.applicationGenerator; exports.applicationSchematic = _chunkLRAWVWAEjs.applicationSchematic; exports.default = _chunkLRAWVWAEjs.generator_default;
+exports.applicationGenerator = _chunkEDGMZMSIjs.applicationGenerator; exports.applicationSchematic = _chunkEDGMZMSIjs.applicationSchematic; exports.default = _chunkEDGMZMSIjs.generator_default;

package/dist/src/generators/worker/generator.mjs

@@ -2,8 +2,8 @@ import {
   applicationGenerator,
   applicationSchematic,
   generator_default
-} from "../../../chunk-NT7QQFG2.mjs";
-import "../../../chunk-Q44FJY6W.mjs";
+} from "../../../chunk-HIF5FI2F.mjs";
+import "../../../chunk-ZLI4XREA.mjs";
 import "../../../chunk-7H2K6PT4.mjs";
 import "../../../chunk-GOL5LHR6.mjs";
 import "../../../chunk-2ET7ZYTU.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/cloudflare-tools",
-  "version": "0.63.12",
+  "version": "0.63.14",
   "description": "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
   "repository": {
     "type": "github",