@storm-software/cloudflare-tools 0.71.30 → 0.71.32

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

@@ -2,7 +2,7 @@ import {
   generator_default,
   initGenerator,
   initSchematic
-} from "../../../chunk-FPJU3YOH.mjs";
+} from "../../../chunk-3WBFV3XF.mjs";
 import "../../../chunk-PALWHFOL.mjs";
 export {
   generator_default as default,

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

@@ -2,8 +2,8 @@
 
 
 
-var _chunkYPRUPZL3js = require('../../../chunk-YPRUPZL3.js');
-require('../../../chunk-OZ44M6HX.js');
+var _chunkQDAQB4EPjs = require('../../../chunk-QDAQB4EP.js');
+require('../../../chunk-AOAVYQNP.js');
 require('../../../chunk-5GILNZWS.js');
 require('../../../chunk-Z2WQB55R.js');
 require('../../../chunk-MCKGQKYU.js');
@@ -11,4 +11,4 @@ require('../../../chunk-MCKGQKYU.js');
 
 
 
-exports.applicationGenerator = _chunkYPRUPZL3js.applicationGenerator; exports.applicationSchematic = _chunkYPRUPZL3js.applicationSchematic; exports.default = _chunkYPRUPZL3js.generator_default;
+exports.applicationGenerator = _chunkQDAQB4EPjs.applicationGenerator; exports.applicationSchematic = _chunkQDAQB4EPjs.applicationSchematic; exports.default = _chunkQDAQB4EPjs.generator_default;

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

@@ -2,8 +2,8 @@ import {
   applicationGenerator,
   applicationSchematic,
   generator_default
-} from "../../../chunk-DEX6LTPV.mjs";
-import "../../../chunk-FPJU3YOH.mjs";
+} from "../../../chunk-ZWYDXLNA.mjs";
+import "../../../chunk-3WBFV3XF.mjs";
 import "../../../chunk-G4ZCI2MN.mjs";
 import "../../../chunk-TPNHSNNZ.mjs";
 import "../../../chunk-PALWHFOL.mjs";

package/dist/src/utils/index.d.mts

@@ -1,3 +1,3 @@
-export { getInternalDependencies, uploadFile } from './r2-bucket-helpers.mjs';
+export { getEncoding, getInternalDependencies, isTextFile, uploadFile } from './r2-bucket-helpers.mjs';
 import '@aws-sdk/client-s3';
 import '@nx/devkit';

package/dist/src/utils/index.d.ts

@@ -1,3 +1,3 @@
-export { getInternalDependencies, uploadFile } from './r2-bucket-helpers.js';
+export { getEncoding, getInternalDependencies, isTextFile, uploadFile } from './r2-bucket-helpers.js';
 import '@aws-sdk/client-s3';
 import '@nx/devkit';

package/dist/src/utils/index.js

@@ -2,10 +2,14 @@
 
 
 
-var _chunkZWHJ35F5js = require('../../chunk-ZWHJ35F5.js');
+
+
+var _chunkVZQDXTIPjs = require('../../chunk-VZQDXTIP.js');
 require('../../chunk-Z2WQB55R.js');
 require('../../chunk-MCKGQKYU.js');
 
 
 
-exports.getInternalDependencies = _chunkZWHJ35F5js.getInternalDependencies; exports.uploadFile = _chunkZWHJ35F5js.uploadFile;
+
+
+exports.getEncoding = _chunkVZQDXTIPjs.getEncoding; exports.getInternalDependencies = _chunkVZQDXTIPjs.getInternalDependencies; exports.isTextFile = _chunkVZQDXTIPjs.isTextFile; exports.uploadFile = _chunkVZQDXTIPjs.uploadFile;

package/dist/src/utils/index.mjs

@@ -1,11 +1,15 @@
 import "../../chunk-7Z5PILRU.mjs";
 import {
+  getEncoding,
   getInternalDependencies,
+  isTextFile,
   uploadFile
-} from "../../chunk-UI2F3MMU.mjs";
+} from "../../chunk-Z2D7AKMD.mjs";
 import "../../chunk-TPNHSNNZ.mjs";
 import "../../chunk-PALWHFOL.mjs";
 export {
+  getEncoding,
   getInternalDependencies,
+  isTextFile,
   uploadFile
 };

package/dist/src/utils/r2-bucket-helpers.d.mts

@@ -1,4 +1,4 @@
-import { S3 } from '@aws-sdk/client-s3';
+import { S3Client } from '@aws-sdk/client-s3';
 import { ProjectGraph, ProjectGraphProjectNode } from '@nx/devkit';
 
 /**
@@ -13,7 +13,7 @@ import { ProjectGraph, ProjectGraphProjectNode } from '@nx/devkit';
  * @param contentType - The MIME type of the file content
  * @param isDryRun - Whether to perform a dry run without actual upload
  */
-declare function uploadFile(client: S3, bucketName: string, bucketPath: string | undefined, fileName: string, version: string, fileContent: string, contentType?: string, isDryRun?: boolean): Promise<void>;
+declare function uploadFile(client: S3Client, bucketName: string, bucketPath: string | undefined, fileName: string, version: string, fileContent: string, contentType?: string, isDryRun?: boolean): Promise<void>;
 /**
  * Get internal dependencies of a project from the project graph
  *
@@ -22,5 +22,19 @@ declare function uploadFile(client: S3, bucketName: string, bucketPath: string |
  * @returns An array of internal project nodes that are dependencies of the specified project
  */
 declare function getInternalDependencies(projectName: string, graph: ProjectGraph): ProjectGraphProjectNode[];
+/**
+ * Determine if a MIME type represents a text file
+ *
+ * @param mimeType - The MIME type to check
+ * @returns True if the MIME type represents a text file, false otherwise
+ */
+declare function isTextFile(mimeType: string): boolean;
+/**
+ * Get the appropriate encoding for a given MIME type
+ *
+ * @param mimeType - The MIME type to evaluate
+ * @returns The encoding string ("utf8" for text files, "binary" for others)
+ */
+declare function getEncoding(mimeType: string): BufferEncoding;
 
-export { getInternalDependencies, uploadFile };
+export { getEncoding, getInternalDependencies, isTextFile, uploadFile };

package/dist/src/utils/r2-bucket-helpers.d.ts

@@ -1,4 +1,4 @@
-import { S3 } from '@aws-sdk/client-s3';
+import { S3Client } from '@aws-sdk/client-s3';
 import { ProjectGraph, ProjectGraphProjectNode } from '@nx/devkit';
 
 /**
@@ -13,7 +13,7 @@ import { ProjectGraph, ProjectGraphProjectNode } from '@nx/devkit';
  * @param contentType - The MIME type of the file content
  * @param isDryRun - Whether to perform a dry run without actual upload
  */
-declare function uploadFile(client: S3, bucketName: string, bucketPath: string | undefined, fileName: string, version: string, fileContent: string, contentType?: string, isDryRun?: boolean): Promise<void>;
+declare function uploadFile(client: S3Client, bucketName: string, bucketPath: string | undefined, fileName: string, version: string, fileContent: string, contentType?: string, isDryRun?: boolean): Promise<void>;
 /**
  * Get internal dependencies of a project from the project graph
  *
@@ -22,5 +22,19 @@ declare function uploadFile(client: S3, bucketName: string, bucketPath: string |
  * @returns An array of internal project nodes that are dependencies of the specified project
  */
 declare function getInternalDependencies(projectName: string, graph: ProjectGraph): ProjectGraphProjectNode[];
+/**
+ * Determine if a MIME type represents a text file
+ *
+ * @param mimeType - The MIME type to check
+ * @returns True if the MIME type represents a text file, false otherwise
+ */
+declare function isTextFile(mimeType: string): boolean;
+/**
+ * Get the appropriate encoding for a given MIME type
+ *
+ * @param mimeType - The MIME type to evaluate
+ * @returns The encoding string ("utf8" for text files, "binary" for others)
+ */
+declare function getEncoding(mimeType: string): BufferEncoding;
 
-export { getInternalDependencies, uploadFile };
+export { getEncoding, getInternalDependencies, isTextFile, uploadFile };

package/dist/src/utils/r2-bucket-helpers.js

@@ -1,10 +1,14 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunkZWHJ35F5js = require('../../chunk-ZWHJ35F5.js');
+
+
+var _chunkVZQDXTIPjs = require('../../chunk-VZQDXTIP.js');
 require('../../chunk-Z2WQB55R.js');
 require('../../chunk-MCKGQKYU.js');
 
 
 
-exports.getInternalDependencies = _chunkZWHJ35F5js.getInternalDependencies; exports.uploadFile = _chunkZWHJ35F5js.uploadFile;
+
+
+exports.getEncoding = _chunkVZQDXTIPjs.getEncoding; exports.getInternalDependencies = _chunkVZQDXTIPjs.getInternalDependencies; exports.isTextFile = _chunkVZQDXTIPjs.isTextFile; exports.uploadFile = _chunkVZQDXTIPjs.uploadFile;

package/dist/src/utils/r2-bucket-helpers.mjs

@@ -1,10 +1,14 @@
 import {
+  getEncoding,
   getInternalDependencies,
+  isTextFile,
   uploadFile
-} from "../../chunk-UI2F3MMU.mjs";
+} from "../../chunk-Z2D7AKMD.mjs";
 import "../../chunk-TPNHSNNZ.mjs";
 import "../../chunk-PALWHFOL.mjs";
 export {
+  getEncoding,
   getInternalDependencies,
+  isTextFile,
   uploadFile
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/cloudflare-tools",
-  "version": "0.71.30",
+  "version": "0.71.32",
   "description": "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
   "repository": {
     "type": "github",
@@ -117,9 +117,9 @@
     "@nx/js": "^22.2.3",
     "@nx/node": "^22.2.3",
     "@nx/web": "^22.2.3",
-    "@storm-software/config": "1.134.70",
-    "@storm-software/config-tools": "1.188.70",
-    "@storm-software/workspace-tools": "1.294.16",
+    "@storm-software/config": "1.134.71",
+    "@storm-software/config-tools": "1.188.71",
+    "@storm-software/workspace-tools": "1.294.17",
     "nx": "^22.2.3",
     "tsup": "8.4.0",
     "wrangler": ">=3.58.0"
@@ -134,10 +134,12 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.948.0",
+    "@aws-sdk/lib-storage": "^3.954.0",
     "@smithy/node-http-handler": "^4.4.5",
     "defu": "6.1.4",
     "glob": "^11.1.0",
-    "mime-types": "^3.0.2"
+    "mime-types": "^3.0.2",
+    "pretty-bytes": "^7.1.0"
   },
   "devDependencies": {
     "@nx/devkit": "^22.2.3",
@@ -153,5 +155,5 @@
   "publishConfig": { "access": "public" },
   "executors": "./executors.json",
   "generators": "./generators.json",
-  "gitHead": "f1a6c01c03133af11e541f3817836f0e231de26d"
+  "gitHead": "97a4855b1100e6e4481e5191ffcac01acf3f6017"
 }

package/dist/chunk-RGRCKWGN.mjs

@@ -1,225 +0,0 @@
-import {
-  createCliOptions,
-  getPackageInfo
-} from "./chunk-3MAI3FU2.mjs";
-import {
-  findWorkspaceRoot,
-  getConfig
-} from "./chunk-G4ZCI2MN.mjs";
-import {
-  createHttpHandler
-} from "./chunk-SWYYMID7.mjs";
-import {
-  getInternalDependencies,
-  uploadFile
-} from "./chunk-UI2F3MMU.mjs";
-import {
-  correctPaths,
-  joinPaths,
-  writeDebug,
-  writeSuccess,
-  writeTrace,
-  writeWarning
-} from "./chunk-TPNHSNNZ.mjs";
-
-// src/executors/r2-upload-publish/executor.ts
-import { S3 } from "@aws-sdk/client-s3";
-import {
-  createProjectGraphAsync,
-  readCachedProjectGraph
-} from "@nx/devkit";
-import { glob } from "glob";
-import mime from "mime-types";
-import { execSync } from "node:child_process";
-import { statSync } from "node:fs";
-import { readFile } from "node: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 || !context.projectsConfigurations?.projects || !context.projectsConfigurations.projects[context.projectName] || !context.projectsConfigurations.projects[context.projectName]?.root) {
-    throw new Error("The executor requires projectsConfigurations.");
-  }
-  try {
-    const workspaceRoot = findWorkspaceRoot();
-    const config = await getConfig(workspaceRoot);
-    const projectName = context.projectsConfigurations.projects[context.projectName]?.name ?? context.projectName;
-    const projectDetails = getPackageInfo(
-      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 = createCliOptions({ ...options });
-    if (isDryRun) {
-      args.push("--dry-run");
-    }
-    const cloudflareAccountId = process.env.CLOUDFLARE_ACCOUNT_ID || process.env.STORM_BOT_CLOUDFLARE_ACCOUNT;
-    if (!options?.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 = options?.registry ? options.registry : `https://${cloudflareAccountId}.r2.cloudflarestorage.com`;
-    let projectGraph;
-    try {
-      projectGraph = readCachedProjectGraph();
-    } catch {
-      await createProjectGraphAsync();
-      projectGraph = readCachedProjectGraph();
-    }
-    if (!projectGraph) {
-      throw new Error(
-        "The executor failed because the project graph is not available. Please run the build command again."
-      );
-    }
-    writeDebug(
-      `Publishing ${context.projectName} to the ${bucketId} R2 Bucket (at ${registry})`
-    );
-    const client = new S3({
-      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: createHttpHandler()
-    });
-    const version = projectDetails?.content?.version;
-    if (version) {
-      writeDebug(`Starting upload version ${version}`);
-    }
-    const basePath = options.path;
-    const files = await glob(joinPaths(basePath, "**/*"), {
-      ignore: "**/{*.stories.tsx,*.stories.ts,*.spec.tsx,*.spec.ts}"
-    });
-    const internalDependencies = await getInternalDependencies(
-      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;
-    }, projectDetails?.content.dependencies ?? {});
-    const release = options.tag ?? execSync("npm config get tag").toString().trim();
-    if (options.clean === true) {
-      writeDebug(`Clearing out existing items in ${bucketPath}`);
-      if (!isDryRun) {
-        const response = await client.listObjects({
-          Bucket: bucketId,
-          Prefix: !bucketPath || bucketPath === "/" ? void 0 : bucketPath
-        });
-        if (response?.Contents && response.Contents.length > 0) {
-          writeTrace(
-            `Deleting the following existing items from the R2 bucket path ${bucketPath}: ${response.Contents.map((item) => item.Key).join(", ")}`
-          );
-          await client.deleteObjects({
-            Bucket: bucketId,
-            Delete: {
-              Objects: response.Contents.map((item) => ({
-                Key: item.Key
-              })),
-              Quiet: false
-            }
-          });
-        } else {
-          writeDebug(
-            `No existing items to delete in the R2 bucket path ${bucketPath}`
-          );
-        }
-      } else {
-        writeWarning("[Dry run]: Skipping R2 bucket clean.");
-      }
-    }
-    if (options.writeMetaJson === true) {
-      const meta = {
-        name: context.projectName,
-        version,
-        release,
-        description: projectDetails?.content?.description,
-        tags: projectDetails?.content?.keywords,
-        dependencies,
-        devDependencies: null,
-        internalDependencies: internalDependencies.filter(
-          (projectNode) => projectNode.data.tags && projectNode.data.tags.some(
-            (tag) => tag.toLowerCase() === "component"
-          )
-        ).map((dep) => dep.name)
-      };
-      if (projectDetails?.type === "package.json") {
-        meta.devDependencies = projectDetails?.content?.devDependencies;
-      }
-      await uploadFile(
-        client,
-        bucketId,
-        bucketPath,
-        "meta.json",
-        version,
-        JSON.stringify(meta),
-        "application/json",
-        isDryRun
-      );
-    }
-    await Promise.all(
-      files.map(async (file) => {
-        if (statSync(file, {
-          throwIfNoEntry: false
-        })?.isFile()) {
-          const name = correctPaths(file).replace(correctPaths(basePath), "");
-          const type = mime.lookup(name) || "application/octet-stream";
-          await uploadFile(
-            client,
-            bucketId,
-            bucketPath,
-            name,
-            version,
-            type === "application/json" || type.includes("text") ? await readFile(file, "utf8") : `data:${type};base64,${Buffer.from(
-              await readFile(file, "binary"),
-              "binary"
-            ).toString("base64")}`,
-            type,
-            isDryRun
-          );
-        }
-      })
-    );
-    writeSuccess(
-      `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
-    };
-  }
-}
-
-export {
-  runExecutor
-};

package/dist/chunk-UI2F3MMU.mjs

@@ -1,52 +0,0 @@
-import {
-  joinPaths,
-  writeDebug,
-  writeWarning
-} from "./chunk-TPNHSNNZ.mjs";
-
-// src/utils/r2-bucket-helpers.ts
-import { createHash } from "node:crypto";
-async function uploadFile(client, bucketName, bucketPath, fileName, version, fileContent, contentType = "application/octet-stream", isDryRun = false) {
-  const key = (!bucketPath?.trim() || bucketPath?.trim() === "/" ? fileName : joinPaths(bucketPath.trim(), fileName))?.replace(/^\/+/g, "") || "";
-  writeDebug(
-    `Uploading ${key} (content-type: ${contentType}) to the ${bucketName} R2 bucket`
-  );
-  if (!isDryRun) {
-    await client.putObject(
-      {
-        Bucket: bucketName,
-        Key: key,
-        Body: fileContent,
-        ContentType: contentType,
-        Metadata: {
-          version,
-          checksum: createHash("sha256").update(fileContent).digest("base64")
-        }
-      },
-      {
-        requestTimeout: 15 * 60 * 1e3
-        // 15 minutes
-      }
-    );
-  } else {
-    writeWarning("[Dry run]: Skipping upload to the R2 bucket.");
-  }
-}
-function getInternalDependencies(projectName, graph) {
-  const allDeps = graph.dependencies[projectName] ?? [];
-  return Array.from(
-    allDeps.reduce(
-      (acc, node) => {
-        const found = graph.nodes[node.target];
-        if (found) acc.push(found);
-        return acc;
-      },
-      []
-    )
-  );
-}
-
-export {
-  uploadFile,
-  getInternalDependencies
-};