@storm-software/cloudflare-tools 0.48.0 → 0.49.0

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.49.0 (2025-01-20)
+
+### Features
+
+- **untyped:** Standard file name changes to avoid collisions ([71acf100](https://github.com/storm-software/storm-ops/commit/71acf100))
+
+### Bug Fixes
+
+- **terraform-tools:** Resolve issue with invalid import path ([7a8ee2cf](https://github.com/storm-software/storm-ops/commit/7a8ee2cf))
+
 ## 0.48.0 (2025-01-20)
 
 ### Features

package/dist/chunk-A4ZIZ2JU.mjs

@@ -0,0 +1,228 @@
+import {
+  generator_default
+} from "./chunk-MTM5OTKD.mjs";
+import {
+  loadStormConfig
+} from "./chunk-OARYMVO7.mjs";
+import {
+  findWorkspaceRoot,
+  getStopwatch,
+  writeDebug,
+  writeError,
+  writeFatal,
+  writeInfo,
+  writeTrace
+} from "./chunk-NSLK6ZDO.mjs";
+import {
+  __dirname,
+  __name
+} from "./chunk-A7FFSBE6.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}"`;
+}
+__name(getAccountId, "getAccountId");
+
+// 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 loadStormConfig(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();
+  }
+}
+__name(applicationGenerator, "applicationGenerator");
+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;
+  });
+}
+__name(updateTsAppConfig, "updateTsAppConfig");
+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 : ""
+    });
+  }
+}
+__name(addCloudflareFiles, "addCloudflareFiles");
+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);
+  }
+}
+__name(addTargets, "addTargets");
+function removeTestFiles(tree, options) {
+  tree.delete(join(options.appProjectRoot, "src", "index.test.ts"));
+}
+__name(removeTestFiles, "removeTestFiles");
+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
+  };
+}
+__name(normalizeOptions, "normalizeOptions");
+var generator_default2 = applicationGenerator;
+var applicationSchematic = convertNxGenerator(applicationGenerator);
+
+export {
+  applicationGenerator,
+  generator_default2 as generator_default,
+  applicationSchematic
+};

package/dist/chunk-A7FFSBE6.mjs

@@ -0,0 +1,26 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+var __commonJS = (cb, mod) => function __require2() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+
+// ../../node_modules/.pnpm/tsup@8.3.5_@microsoft+api-extractor@7.49.1_@types+node@22.10.7__@swc+core@1.7.26_@swc+helpers_ekim6y52mwpq6ssxiprcp44dam/node_modules/tsup/assets/esm_shims.js
+import { fileURLToPath } from "url";
+import path from "path";
+var getFilename = /* @__PURE__ */ __name(() => fileURLToPath(import.meta.url), "getFilename");
+var getDirname = /* @__PURE__ */ __name(() => path.dirname(getFilename()), "getDirname");
+var __dirname = /* @__PURE__ */ getDirname();
+
+export {
+  __name,
+  __require,
+  __commonJS,
+  __dirname
+};

package/dist/chunk-CVGPWUNP.js

@@ -0,0 +1 @@
+"use strict";

package/dist/chunk-DHBG5ASJ.js

@@ -0,0 +1 @@
+"use strict";

package/dist/chunk-I4XNMV5U.js

@@ -0,0 +1,227 @@
+"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 _chunkKKOHB7JHjs = require('./chunk-KKOHB7JH.js');
+
+
+var _chunkYE4FHRXJjs = require('./chunk-YE4FHRXJ.js');
+
+
+
+
+
+
+
+
+var _chunkRCE3CC76js = require('./chunk-RCE3CC76.js');
+
+
+var _chunkJ5SB6L2Ljs = require('./chunk-J5SB6L2L.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}"`;
+}
+_chunkJ5SB6L2Ljs.__name.call(void 0, getAccountId, "getAccountId");
+
+// 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 = _chunkRCE3CC76js.getStopwatch.call(void 0, "Storm Worker generator");
+  let config;
+  try {
+    _chunkRCE3CC76js.writeInfo.call(void 0, `\u26A1 Running the Storm Worker generator...
+
+`, config);
+    const workspaceRoot = _chunkRCE3CC76js.findWorkspaceRoot.call(void 0, );
+    _chunkRCE3CC76js.writeDebug.call(void 0, `Loading the Storm Config from environment variables and storm.json file...
+- workspaceRoot: ${workspaceRoot}`, config);
+    config = await _chunkYE4FHRXJjs.loadStormConfig.call(void 0, workspaceRoot);
+    _chunkRCE3CC76js.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 _chunkKKOHB7JHjs.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 () => {
+      _chunkRCE3CC76js.writeFatal.call(void 0, "A fatal error occurred while running the generator - the process was forced to terminate", config);
+      _chunkRCE3CC76js.writeError.call(void 0, `An exception was thrown in the generator's process 
+ - Details: ${error.message}
+ - Stacktrace: ${error.stack}`, config);
+    };
+  } finally {
+    stopwatch();
+  }
+}
+_chunkJ5SB6L2Ljs.__name.call(void 0, applicationGenerator, "applicationGenerator");
+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;
+  });
+}
+_chunkJ5SB6L2Ljs.__name.call(void 0, updateTsAppConfig, "updateTsAppConfig");
+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 : ""
+    });
+  }
+}
+_chunkJ5SB6L2Ljs.__name.call(void 0, addCloudflareFiles, "addCloudflareFiles");
+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);
+  }
+}
+_chunkJ5SB6L2Ljs.__name.call(void 0, addTargets, "addTargets");
+function removeTestFiles(tree, options) {
+  tree.delete(_path.join.call(void 0, options.appProjectRoot, "src", "index.test.ts"));
+}
+_chunkJ5SB6L2Ljs.__name.call(void 0, removeTestFiles, "removeTestFiles");
+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))
+  };
+}
+_chunkJ5SB6L2Ljs.__name.call(void 0, normalizeOptions, "normalizeOptions");
+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-J5SB6L2L.js

@@ -0,0 +1,18 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});var __defProp = Object.defineProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+var __commonJS = (cb, mod) => function __require2() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+
+
+
+
+
+exports.__name = __name; exports.__require = __require; exports.__commonJS = __commonJS;

package/dist/chunk-JCB2DTP6.js

@@ -0,0 +1,42 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }
+
+
+var _chunkRCE3CC76js = require('./chunk-RCE3CC76.js');
+
+
+var _chunkJ5SB6L2Ljs = require('./chunk-J5SB6L2L.js');
+
+// src/utils/r2-bucket-helpers.ts
+var _crypto = require('crypto');
+var r2UploadFile = /* @__PURE__ */ _chunkJ5SB6L2Ljs.__name.call(void 0, async (client, bucketName, projectPath, fileName, version, fileContent, contentType = "text/plain", isDryRun = false) => {
+  const checksum = _crypto.createHash.call(void 0, "sha256").update(fileContent).digest("base64");
+  const fileKey = `${projectPath}/${fileName.startsWith("/") ? fileName.substring(1) : fileName}`;
+  _chunkRCE3CC76js.writeDebug.call(void 0, `Uploading file: ${fileKey}`);
+  if (!isDryRun) {
+    await client.putObject({
+      Bucket: bucketName,
+      Key: fileKey,
+      Body: fileContent.replaceAll(' from "@cyclone-ui/', ' from "../'),
+      ContentType: contentType,
+      Metadata: {
+        version,
+        checksum
+      }
+    });
+  } else {
+    _chunkRCE3CC76js.writeWarning.call(void 0, "[Dry run]: skipping upload to the Cyclone Registry.");
+  }
+}, "r2UploadFile");
+var getInternalDependencies = /* @__PURE__ */ _chunkJ5SB6L2Ljs.__name.call(void 0, (projectName, graph) => {
+  const allDeps = _nullishCoalesce(graph.dependencies[projectName], () => ( []));
+  return Array.from(allDeps.reduce((acc, node) => {
+    const found = graph.nodes[node.target];
+    if (found) acc.push(found);
+    return acc;
+  }, []));
+}, "getInternalDependencies");
+
+
+
+
+exports.r2UploadFile = r2UploadFile; exports.getInternalDependencies = getInternalDependencies;