@storm-software/cloudflare-tools 0.71.128 → 0.71.130

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/cloudflare-tools",
-  "version": "0.71.128",
+  "version": "0.71.130",
   "private": false,
   "description": "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
   "keywords": [
@@ -113,9 +113,9 @@
   "module": "dist/index.mjs",
   "typings": "dist/index.d.ts",
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.1030.0",
-    "@aws-sdk/lib-storage": "^3.1030.0",
-    "@smithy/node-http-handler": "^4.5.2",
+    "@aws-sdk/client-s3": "^3.1037.0",
+    "@aws-sdk/lib-storage": "^3.1037.0",
+    "@smithy/node-http-handler": "^4.6.1",
     "defu": "6.1.4",
     "glob": "^11.1.0",
     "mime-types": "^3.0.2",
@@ -126,11 +126,11 @@
     "@nx/node": "22.5.1",
     "@nx/web": "22.5.1",
     "@nx/webpack": "22.5.1",
-    "@smithy/protocol-http": "^5.3.13",
+    "@smithy/protocol-http": "^5.3.14",
     "nx": "22.6.0",
     "tsup": "8.4.0",
     "untyped": "^2.0.0",
-    "wrangler": "^4.82.2"
+    "wrangler": "^4.85.0"
   },
   "peerDependencies": {
     "@nx/devkit": "22.6.0",
@@ -139,7 +139,7 @@
     "@nx/web": "22.5.1",
     "@storm-software/config": "1.137.31",
     "@storm-software/config-tools": "1.189.77",
-    "@storm-software/workspace-tools": "1.295.53",
+    "@storm-software/workspace-tools": "1.295.55",
     "nx": "22.6.0",
     "tsup": "8.4.0",
     "wrangler": ">=3.58.0"
@@ -155,5 +155,5 @@
   "publishConfig": { "access": "public" },
   "executors": "./executors.json",
   "generators": "./generators.json",
-  "gitHead": "7369ee9b0807eea8d57a8c7f2a4d797c3cbd711c"
+  "gitHead": "53d2ed234e902be71b97a3f927d2613f1a15731f"
 }

package/dist/chunk-AVYOABJJ.js

@@ -1,266 +0,0 @@
-"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 _chunkR4V44O2Fjs = require('./chunk-R4V44O2F.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 _chunkR4V44O2Fjs.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-EBT36S6J.js

@@ -1,231 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } 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 _chunkN7FW365Qjs = require('./chunk-N7FW365Q.js');
-
-
-
-var _chunkOEP2XBU4js = require('./chunk-OEP2XBU4.js');
-
-
-var _chunkKUGEZPUOjs = require('./chunk-KUGEZPUO.js');
-
-
-
-
-var _chunkSIS5VQAUjs = require('./chunk-SIS5VQAU.js');
-
-
-
-
-
-
-
-var _chunkRIBK362Wjs = require('./chunk-RIBK362W.js');
-
-// src/executors/r2-upload-publish/executor.ts
-
-
-
-
-var _clients3 = require('@aws-sdk/client-s3');
-
-
-
-var _devkit = require('@nx/devkit');
-var _glob = require('glob');
-var _mimetypes = require('mime-types'); var _mimetypes2 = _interopRequireDefault(_mimetypes);
-var _child_process = require('child_process');
-var _fs = require('fs');
-var _promises = require('fs/promises');
-async function runExecutor(options, context) {
-  const isDryRun = process.env.NX_DRY_RUN === "true" || options.dryRun || false;
-  if (!context.projectName) {
-    throw new Error("The executor requires a projectName.");
-  }
-  if (!options.path) {
-    throw new Error("The executor requires the `path` option to upload.");
-  }
-  console.info(
-    `\u{1F680}  Running Storm Cloudflare Publish executor on the ${context.projectName} worker`
-  );
-  if (!context.projectName || !_optionalChain([context, 'access', _ => _.projectsConfigurations, 'optionalAccess', _2 => _2.projects]) || !context.projectsConfigurations.projects[context.projectName] || !_optionalChain([context, 'access', _3 => _3.projectsConfigurations, 'access', _4 => _4.projects, 'access', _5 => _5[context.projectName], 'optionalAccess', _6 => _6.root])) {
-    throw new Error("The executor requires projectsConfigurations.");
-  }
-  try {
-    const workspaceRoot = _chunkOEP2XBU4js.findWorkspaceRoot.call(void 0, );
-    const config = await _chunkOEP2XBU4js.getConfig.call(void 0, workspaceRoot);
-    const projectName = _nullishCoalesce(_optionalChain([context, 'access', _7 => _7.projectsConfigurations, 'access', _8 => _8.projects, 'access', _9 => _9[context.projectName], 'optionalAccess', _10 => _10.name]), () => ( context.projectName));
-    const projectDetails = _chunkN7FW365Qjs.getPackageInfo.call(void 0, 
-      context.projectsConfigurations.projects[context.projectName]
-    );
-    const bucketId = options.bucketId;
-    const bucketPath = options.bucketPath || "/";
-    if (!bucketId) {
-      throw new Error("The executor requires a bucketId.");
-    }
-    const args = _chunkN7FW365Qjs.createCliOptions.call(void 0, { ...options });
-    if (isDryRun) {
-      args.push("--dry-run");
-    }
-    const cloudflareAccountId = process.env.CLOUDFLARE_ACCOUNT_ID || process.env.STORM_BOT_CLOUDFLARE_ACCOUNT;
-    if (!_optionalChain([options, 'optionalAccess', _11 => _11.registry]) && !cloudflareAccountId) {
-      throw new Error(
-        "The registry option and `CLOUDFLARE_ACCOUNT_ID` (or `STORM_BOT_CLOUDFLARE_ACCOUNT`) environment variable are not set. Please set one of these values to upload to the Cloudflare R2 bucket."
-      );
-    }
-    if (!process.env.STORM_BOT_ACCESS_KEY_ID && !process.env.ACCESS_KEY_ID && !process.env.CLOUDFLARE_ACCESS_KEY_ID && !process.env.AWS_ACCESS_KEY_ID || !process.env.STORM_BOT_SECRET_ACCESS_KEY && !process.env.CLOUDFLARE_SECRET_ACCESS_KEY && !process.env.SECRET_ACCESS_KEY && !process.env.AWS_SECRET_ACCESS_KEY) {
-      throw new Error(
-        "The `ACCESS_KEY_ID` (or `STORM_BOT_ACCESS_KEY_ID`) and `SECRET_ACCESS_KEY` (or `STORM_BOT_SECRET_ACCESS_KEY`) environment variables are not set. Please set these environment variables to upload to the Cloudflare R2 bucket."
-      );
-    }
-    const registry = _optionalChain([options, 'optionalAccess', _12 => _12.registry]) ? options.registry : `https://${cloudflareAccountId}.r2.cloudflarestorage.com`;
-    let projectGraph;
-    try {
-      projectGraph = _devkit.readCachedProjectGraph.call(void 0, );
-    } catch (e) {
-      await _devkit.createProjectGraphAsync.call(void 0, );
-      projectGraph = _devkit.readCachedProjectGraph.call(void 0, );
-    }
-    if (!projectGraph) {
-      throw new Error(
-        "The executor failed because the project graph is not available. Please run the build command again."
-      );
-    }
-    _chunkRIBK362Wjs.writeDebug.call(void 0, 
-      `Publishing ${context.projectName} to the ${bucketId} R2 Bucket (at ${registry})`
-    );
-    const client = new (0, _clients3.S3Client)({
-      region: "auto",
-      endpoint: registry,
-      credentials: {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        accessKeyId: process.env.STORM_BOT_ACCESS_KEY_ID || process.env.CLOUDFLARE_ACCESS_KEY_ID || process.env.AWS_ACCESS_KEY_ID || process.env.ACCESS_KEY_ID,
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        secretAccessKey: process.env.STORM_BOT_SECRET_ACCESS_KEY || process.env.CLOUDFLARE_SECRET_ACCESS_KEY || process.env.AWS_SECRET_ACCESS_KEY || process.env.SECRET_ACCESS_KEY
-      },
-      requestHandler: _chunkKUGEZPUOjs.createHttpHandler.call(void 0, )
-    });
-    const version = _optionalChain([projectDetails, 'optionalAccess', _13 => _13.content, 'optionalAccess', _14 => _14.version]);
-    if (version) {
-      _chunkRIBK362Wjs.writeDebug.call(void 0, `Starting upload version ${version}`);
-    }
-    const basePath = options.path;
-    const files = await _glob.glob.call(void 0, _chunkRIBK362Wjs.joinPaths.call(void 0, basePath, "**/*"), {
-      ignore: "**/{*.stories.tsx,*.stories.ts,*.spec.tsx,*.spec.ts}"
-    });
-    const internalDependencies = await _chunkSIS5VQAUjs.getInternalDependencies.call(void 0, 
-      context.projectName,
-      projectGraph
-    );
-    const dependencies = internalDependencies.filter(
-      (projectNode) => !projectNode.data.tags || projectNode.data.tags.every((tag) => tag.toLowerCase() !== "component")
-    ).reduce((ret, dep) => {
-      if (!ret[dep.name]) {
-        ret[dep.name] = "latest";
-      }
-      return ret;
-    }, _nullishCoalesce(_optionalChain([projectDetails, 'optionalAccess', _15 => _15.content, 'access', _16 => _16.dependencies]), () => ( {})));
-    const release = _nullishCoalesce(options.tag, () => ( _child_process.execSync.call(void 0, "npm config get tag").toString().trim()));
-    if (options.clean === true) {
-      _chunkRIBK362Wjs.writeDebug.call(void 0, `Clearing out existing items in ${bucketPath}`);
-      if (!isDryRun) {
-        const response = await client.send(
-          new (0, _clients3.ListObjectsCommand)({
-            Bucket: bucketId,
-            Prefix: !bucketPath || bucketPath === "/" ? void 0 : bucketPath
-          })
-        );
-        if (_optionalChain([response, 'optionalAccess', _17 => _17.Contents]) && response.Contents.length > 0) {
-          _chunkRIBK362Wjs.writeTrace.call(void 0, 
-            `Deleting the following existing items from the R2 bucket path ${bucketPath}: ${response.Contents.map((item) => item.Key).join(", ")}`
-          );
-          await client.send(
-            new (0, _clients3.DeleteObjectsCommand)({
-              Bucket: bucketId,
-              Delete: {
-                Objects: response.Contents.map((item) => ({
-                  Key: item.Key
-                })),
-                Quiet: false
-              }
-            })
-          );
-        } else {
-          _chunkRIBK362Wjs.writeDebug.call(void 0, 
-            `No existing items to delete in the R2 bucket path ${bucketPath}`
-          );
-        }
-      } else {
-        _chunkRIBK362Wjs.writeWarning.call(void 0, "[Dry run]: Skipping R2 bucket clean.");
-      }
-    }
-    if (options.writeMetaJson === true) {
-      const meta = {
-        name: context.projectName,
-        version,
-        release,
-        description: _optionalChain([projectDetails, 'optionalAccess', _18 => _18.content, 'optionalAccess', _19 => _19.description]),
-        tags: _optionalChain([projectDetails, 'optionalAccess', _20 => _20.content, 'optionalAccess', _21 => _21.keywords]),
-        dependencies,
-        devDependencies: null,
-        internalDependencies: internalDependencies.filter(
-          (projectNode) => projectNode.data.tags && projectNode.data.tags.some(
-            (tag) => tag.toLowerCase() === "component"
-          )
-        ).map((dep) => dep.name)
-      };
-      if (_optionalChain([projectDetails, 'optionalAccess', _22 => _22.type]) === "package.json") {
-        meta.devDependencies = _optionalChain([projectDetails, 'optionalAccess', _23 => _23.content, 'optionalAccess', _24 => _24.devDependencies]);
-      }
-      await _chunkSIS5VQAUjs.uploadFile.call(void 0, 
-        client,
-        bucketId,
-        bucketPath,
-        "meta.json",
-        version,
-        JSON.stringify(meta),
-        "application/json",
-        isDryRun
-      );
-    }
-    await Promise.all(
-      files.map(async (file) => {
-        if (_optionalChain([_fs.statSync.call(void 0, file, {
-          throwIfNoEntry: false
-        }), 'optionalAccess', _25 => _25.isFile, 'call', _26 => _26()])) {
-          const name = _chunkRIBK362Wjs.correctPaths.call(void 0, file).replace(_chunkRIBK362Wjs.correctPaths.call(void 0, basePath), "");
-          const type = _mimetypes2.default.lookup(name) || "application/octet-stream";
-          await _chunkSIS5VQAUjs.uploadFile.call(void 0, 
-            client,
-            bucketId,
-            bucketPath,
-            name,
-            version,
-            await _promises.readFile.call(void 0, file, _chunkSIS5VQAUjs.getEncoding.call(void 0, type)),
-            type,
-            isDryRun
-          );
-        }
-      })
-    );
-    _chunkRIBK362Wjs.writeSuccess.call(void 0, 
-      `Successfully uploaded the ${projectName} project to the Cloudflare R2 bucket.`,
-      config
-    );
-    return {
-      success: true
-    };
-  } catch (error) {
-    console.error("Failed to publish to Cloudflare R2 bucket");
-    console.error(error);
-    console.log("");
-    return {
-      success: false
-    };
-  }
-}
-
-
-
-exports.runExecutor = runExecutor;