@storm-software/cloudflare-tools 0.71.210 → 0.71.212

package/dist/chunk-T6GKRQUF.mjs

@@ -0,0 +1,77 @@
+import {
+  ProjectTagConstants,
+  isEqualProjectTag
+} from "./chunk-CSTZEHUP.mjs";
+
+// ../workspace-tools/src/utils/package-helpers.ts
+import {
+  joinPathFragments,
+  readJsonFile
+} from "@nx/devkit";
+
+// ../config-tools/src/utilities/toml.ts
+import TOML from "@ltd/j-toml";
+function parseCargoToml(cargoString) {
+  if (!cargoString) {
+    throw new Error("Cargo.toml is empty");
+  }
+  return TOML.parse(cargoString, {
+    x: { comment: true }
+  });
+}
+
+// ../workspace-tools/src/utils/package-helpers.ts
+import { execFileSync } from "child_process";
+import { existsSync } from "node:fs";
+import { readFile, writeFile } from "node:fs/promises";
+import { dirname, resolve } from "path";
+import { format } from "prettier";
+var getPackageInfo = (project) => {
+  if (isEqualProjectTag(
+    project,
+    ProjectTagConstants.Language.TAG_ID,
+    ProjectTagConstants.Language.RUST
+  ) && existsSync(joinPathFragments(project.root, "Cargo.toml"))) {
+    return {
+      type: "Cargo.toml",
+      content: parseCargoToml(joinPathFragments(project.root, "Cargo.toml"))
+    };
+  } else if (isEqualProjectTag(
+    project,
+    ProjectTagConstants.Language.TAG_ID,
+    ProjectTagConstants.Language.TYPESCRIPT
+  ) && existsSync(joinPathFragments(project.root, "package.json"))) {
+    return {
+      type: "package.json",
+      content: readJsonFile(
+        joinPathFragments(project.root, "package.json")
+      )
+    };
+  }
+  return null;
+};
+
+// ../workspace-tools/src/utils/create-cli-options.ts
+import { names } from "@nx/devkit";
+function createCliOptions(obj) {
+  const args = [];
+  for (const key in obj) {
+    const value = obj[key];
+    if (value) {
+      const arg = names(key).fileName;
+      if (Array.isArray(value)) {
+        args.push(
+          `--${arg.toLowerCase()}=${value.map((v) => v.trim()).join(",")}`
+        );
+      } else {
+        args.push(`--${arg.toLowerCase()}=${value}`);
+      }
+    }
+  }
+  return args;
+}
+
+export {
+  getPackageInfo,
+  createCliOptions
+};

package/dist/{chunk-TNVZ6KHS.mjs → chunk-U6OMVOFA.mjs}

@@ -9,7 +9,7 @@ import {
 import {
   createCliOptions,
   getPackageInfo
-} from "./chunk-F5RW4AZL.mjs";
+} from "./chunk-T6GKRQUF.mjs";
 import {
   findWorkspaceRoot,
   getConfig

package/dist/{chunk-5KJIDUNK.mjs → chunk-UUTVNCRX.mjs}

@@ -7,7 +7,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@storm-software/cloudflare-tools",
-      version: "0.71.209",
+      version: "0.71.211",
       private: false,
       description: "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
       keywords: [
@@ -82,6 +82,20 @@ var require_package = __commonJS({
             default: "./dist/executors.js"
           }
         },
+        "./executors/*": {
+          import: {
+            types: "./dist/src/executors/*.d.mts",
+            default: "./dist/src/executors/*.mjs"
+          },
+          require: {
+            types: "./dist/src/executors/*.d.ts",
+            default: "./dist/src/executors/*.js"
+          },
+          default: {
+            types: "./dist/src/executors/*.d.ts",
+            default: "./dist/src/executors/*.js"
+          }
+        },
         "./generators": {
           import: {
             types: "./dist/generators.d.mts",
@@ -96,6 +110,20 @@ var require_package = __commonJS({
             default: "./dist/generators.js"
           }
         },
+        "./generators/*": {
+          import: {
+            types: "./dist/src/generators/*.d.mts",
+            default: "./dist/src/generators/*.mjs"
+          },
+          require: {
+            types: "./dist/src/generators/*.d.ts",
+            default: "./dist/src/generators/*.js"
+          },
+          default: {
+            types: "./dist/src/generators/*.d.ts",
+            default: "./dist/src/generators/*.js"
+          }
+        },
         "./utils": {
           import: {
             types: "./dist/src/utils/index.d.mts",

package/dist/chunk-VJLWHQ5B.js

@@ -0,0 +1,132 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+
+var _chunkFBLD25X4js = require('./chunk-FBLD25X4.js');
+
+// src/plugins/index.ts
+
+
+var _devkit = require('@nx/devkit');
+var _defu = require('defu'); var _defu2 = _interopRequireDefault(_defu);
+var _fs = require('fs');
+var _path = require('path');
+var _fileutils = require('nx/src/utils/fileutils');
+var name = "storm-software/cloudflare-tools/cloudflare";
+var createNodesV2 = [
+  "{**/wrangler.toml}",
+  async (configFiles, options = { includeApps: true }, context) => {
+    return await _devkit.createNodesFromFiles.call(void 0, 
+      async (file, options2, context2) => {
+        try {
+          const packageJson = createPackageJson(file, context2.workspaceRoot);
+          if (!packageJson) {
+            return {};
+          }
+          const project = createProjectFromPackageJsonNextToProjectJson(
+            file,
+            packageJson
+          );
+          const targets = {};
+          targets["serve"] = {
+            cache: false,
+            inputs: ["typescript", "^production"],
+            dependsOn: ["build"],
+            executor: "@storm-software/cloudflare-tools:serve",
+            options: {
+              port: 4500
+            }
+          };
+          targets["clean-package"] = {
+            cache: true,
+            dependsOn: ["build"],
+            inputs: ["typescript", "^production"],
+            outputs: ["{workspaceRoot}/dist/{projectRoot}"],
+            executor: "@storm-software/workspace-tools:clean-package",
+            options: {
+              cleanReadMe: true,
+              cleanComments: true
+            }
+          };
+          targets["nx-release-publish"] = {
+            cache: false,
+            inputs: ["typescript", "^production"],
+            dependsOn: ["clean-package", "^nx-release-publish"],
+            executor: "@storm-software/cloudflare-tools:cloudflare-publish",
+            options: {}
+          };
+          _chunkFBLD25X4js.addProjectTag.call(void 0, 
+            project,
+            _chunkFBLD25X4js.ProjectTagConstants.ProjectType.TAG_ID,
+            project.projectType === "application" ? _chunkFBLD25X4js.ProjectTagConstants.ProjectType.APPLICATION : _chunkFBLD25X4js.ProjectTagConstants.ProjectType.LIBRARY,
+            { overwrite: true }
+          );
+          _chunkFBLD25X4js.addProjectTag.call(void 0, 
+            project,
+            _chunkFBLD25X4js.ProjectTagConstants.DistStyle.TAG_ID,
+            _chunkFBLD25X4js.ProjectTagConstants.DistStyle.CLEAN,
+            { overwrite: true }
+          );
+          _chunkFBLD25X4js.addProjectTag.call(void 0, 
+            project,
+            _chunkFBLD25X4js.ProjectTagConstants.Provider.TAG_ID,
+            "cloudflare",
+            {
+              overwrite: true
+            }
+          );
+          const projects = {};
+          const externalNodes = {};
+          projects[project.root] = _defu2.default.call(void 0, 
+            {
+              targets,
+              release: {
+                version: {
+                  versionActions: "@storm-software/workspace-tools/release/js-release-actions"
+                }
+              }
+            },
+            project
+          );
+          return {
+            projects,
+            externalNodes
+          };
+        } catch (e) {
+          console.error(e);
+          return {};
+        }
+      },
+      configFiles,
+      options,
+      context
+    );
+  }
+];
+function createProjectFromPackageJsonNextToProjectJson(projectJsonPath, packageJson) {
+  const { nx, name: name2 } = packageJson;
+  const root = _path.dirname.call(void 0, projectJsonPath);
+  return {
+    ...nx,
+    name: name2,
+    root,
+    targets: {}
+  };
+}
+function createPackageJson(projectJsonPath, workspaceRoot) {
+  try {
+    const root = _path.dirname.call(void 0, projectJsonPath);
+    const packageJsonPath = _path.join.call(void 0, workspaceRoot, root, "package.json");
+    if (!_fs.existsSync.call(void 0, packageJsonPath)) {
+      return null;
+    }
+    return _fileutils.readJsonFile.call(void 0, packageJsonPath);
+  } catch (e) {
+    console.log(e);
+    return null;
+  }
+}
+
+
+
+
+exports.name = name; exports.createNodesV2 = createNodesV2;

package/dist/{chunk-U7XMCD6Y.js → chunk-XB6S7S3C.js}

@@ -9,7 +9,7 @@ var _chunkCLCKX6UNjs = require('./chunk-CLCKX6UN.js');
 
 
 
-var _chunkXKQ3HGETjs = require('./chunk-XKQ3HGET.js');
+var _chunkE7ITICBKjs = require('./chunk-E7ITICBK.js');
 
 
 
@@ -56,7 +56,7 @@ async function runExecutor(options, context) {
     const workspaceRoot = _chunkPGTHXO6Mjs.findWorkspaceRoot.call(void 0, );
     const config = await _chunkPGTHXO6Mjs.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 = _chunkXKQ3HGETjs.getPackageInfo.call(void 0, 
+    const projectDetails = _chunkE7ITICBKjs.getPackageInfo.call(void 0, 
       context.projectsConfigurations.projects[context.projectName]
     );
     const bucketId = options.bucketId;
@@ -64,7 +64,7 @@ async function runExecutor(options, context) {
     if (!bucketId) {
       throw new Error("The executor requires a bucketId.");
     }
-    const args = _chunkXKQ3HGETjs.createCliOptions.call(void 0, { ...options });
+    const args = _chunkE7ITICBKjs.createCliOptions.call(void 0, { ...options });
     if (isDryRun) {
       args.push("--dry-run");
     }

package/dist/executors.js

@@ -1,10 +1,11 @@
 "use strict";require('./chunk-XO66D74Z.js');
-require('./chunk-U7XMCD6Y.js');
+require('./chunk-XB6S7S3C.js');
 require('./chunk-KUGEZPUO.js');
 require('./chunk-CLCKX6UN.js');
-require('./chunk-LBHXS7RE.js');
-require('./chunk-O7L7SGHE.js');
-require('./chunk-XKQ3HGET.js');
+require('./chunk-O327KKPU.js');
+require('./chunk-KUGKM6MY.js');
+require('./chunk-E7ITICBK.js');
 require('./chunk-PGTHXO6M.js');
+require('./chunk-FBLD25X4.js');
 require('./chunk-AWKQRM2H.js');
 require('./chunk-MCKGQKYU.js');

package/dist/executors.mjs

@@ -1,10 +1,11 @@
 import "./chunk-YSCEY447.mjs";
-import "./chunk-TNVZ6KHS.mjs";
+import "./chunk-U6OMVOFA.mjs";
 import "./chunk-SWYYMID7.mjs";
 import "./chunk-BY7MA3SM.mjs";
-import "./chunk-FEGLXQK4.mjs";
-import "./chunk-37JKGWKW.mjs";
-import "./chunk-F5RW4AZL.mjs";
+import "./chunk-OL24QIXM.mjs";
+import "./chunk-6Z2WUPYH.mjs";
+import "./chunk-T6GKRQUF.mjs";
 import "./chunk-5MAMLVMV.mjs";
+import "./chunk-CSTZEHUP.mjs";
 import "./chunk-K4H5ZMYA.mjs";
 import "./chunk-5RBVGYWH.mjs";

package/dist/generators.js

@@ -2,11 +2,11 @@
 
 
 
-var _chunk75CHHXTRjs = require('./chunk-75CHHXTR.js');
+var _chunkE5RARE7Ejs = require('./chunk-E5RARE7E.js');
 
 
 
-var _chunk2UW4WAHWjs = require('./chunk-2UW4WAHW.js');
+var _chunk6KDWHW2Gjs = require('./chunk-6KDWHW2G.js');
 require('./chunk-PGTHXO6M.js');
 require('./chunk-AWKQRM2H.js');
 require('./chunk-MCKGQKYU.js');
@@ -15,4 +15,4 @@ require('./chunk-MCKGQKYU.js');
 
 
 
-exports.applicationGenerator = _chunk75CHHXTRjs.applicationGenerator; exports.applicationSchematic = _chunk75CHHXTRjs.applicationSchematic; exports.initGenerator = _chunk2UW4WAHWjs.initGenerator; exports.initSchematic = _chunk2UW4WAHWjs.initSchematic;
+exports.applicationGenerator = _chunkE5RARE7Ejs.applicationGenerator; exports.applicationSchematic = _chunkE5RARE7Ejs.applicationSchematic; exports.initGenerator = _chunk6KDWHW2Gjs.initGenerator; exports.initSchematic = _chunk6KDWHW2Gjs.initSchematic;

package/dist/generators.mjs

@@ -2,11 +2,11 @@ import "./chunk-3J7KBHMJ.mjs";
 import {
   applicationGenerator,
   applicationSchematic
-} from "./chunk-MZFOPOSA.mjs";
+} from "./chunk-3Z2F7VN4.mjs";
 import {
   initGenerator,
   initSchematic
-} from "./chunk-5KJIDUNK.mjs";
+} from "./chunk-UUTVNCRX.mjs";
 import "./chunk-5MAMLVMV.mjs";
 import "./chunk-K4H5ZMYA.mjs";
 import "./chunk-5RBVGYWH.mjs";

package/dist/index.d.mts

@@ -2,12 +2,8 @@ export { C as CloudflarePublishExecutorSchema } from './schema.d-DgA16PUG.mjs';
 export { R as R2UploadPublishExecutorSchema } from './schema.d-Dcq3Apw7.mjs';
 export { I as InitGeneratorSchema, i as initGenerator, a as initSchematic } from './generator-DJ1RuHyR.mjs';
 export { W as WorkerGeneratorSchema, a as applicationGenerator, b as applicationSchematic } from './generator-DW-9W9Fk.mjs';
-import { CreateNodesV2 } from '@nx/devkit';
+export { createNodesV2, name } from './src/plugins/index.mjs';
 export { getEncoding, getInternalDependencies, isTextFile, uploadFile } from './src/utils/r2-bucket-helpers.mjs';
+import '@nx/devkit';
 import '@storm-software/workspace-tools';
 import '@aws-sdk/client-s3';
-
-declare const name = "storm-software/cloudflare-tools/cloudflare";
-declare const createNodesV2: CreateNodesV2;
-
-export { createNodesV2, name };

package/dist/index.d.ts

@@ -2,12 +2,8 @@ export { C as CloudflarePublishExecutorSchema } from './schema.d-DgA16PUG.js';
 export { R as R2UploadPublishExecutorSchema } from './schema.d-Dcq3Apw7.js';
 export { I as InitGeneratorSchema, i as initGenerator, a as initSchematic } from './generator-DJ1RuHyR.js';
 export { W as WorkerGeneratorSchema, a as applicationGenerator, b as applicationSchematic } from './generator-DW-9W9Fk.js';
-import { CreateNodesV2 } from '@nx/devkit';
+export { createNodesV2, name } from './src/plugins/index.js';
 export { getEncoding, getInternalDependencies, isTextFile, uploadFile } from './src/utils/r2-bucket-helpers.js';
+import '@nx/devkit';
 import '@storm-software/workspace-tools';
 import '@aws-sdk/client-s3';
-
-declare const name = "storm-software/cloudflare-tools/cloudflare";
-declare const createNodesV2: CreateNodesV2;
-
-export { createNodesV2, name };

package/dist/index.js

@@ -1,163 +1,42 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }require('./chunk-XO66D74Z.js');
-require('./chunk-U7XMCD6Y.js');
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});require('./chunk-XO66D74Z.js');
+require('./chunk-XB6S7S3C.js');
 require('./chunk-DHBG5ASJ.js');
 
 
 
-var _chunk75CHHXTRjs = require('./chunk-75CHHXTR.js');
+var _chunkE5RARE7Ejs = require('./chunk-E5RARE7E.js');
 
 
 
-var _chunk2UW4WAHWjs = require('./chunk-2UW4WAHW.js');
-require('./chunk-KUGEZPUO.js');
-require('./chunk-CVGPWUNP.js');
+var _chunk6KDWHW2Gjs = require('./chunk-6KDWHW2G.js');
 
 
 
+var _chunkVJLWHQ5Bjs = require('./chunk-VJLWHQ5B.js');
+require('./chunk-KUGEZPUO.js');
+require('./chunk-CVGPWUNP.js');
 
 
-var _chunkCLCKX6UNjs = require('./chunk-CLCKX6UN.js');
-require('./chunk-LBHXS7RE.js');
-require('./chunk-O7L7SGHE.js');
 
 
 
-var _chunkXKQ3HGETjs = require('./chunk-XKQ3HGET.js');
+var _chunkCLCKX6UNjs = require('./chunk-CLCKX6UN.js');
+require('./chunk-O327KKPU.js');
+require('./chunk-KUGKM6MY.js');
+require('./chunk-E7ITICBK.js');
 require('./chunk-PGTHXO6M.js');
+require('./chunk-FBLD25X4.js');
 require('./chunk-AWKQRM2H.js');
 require('./chunk-MCKGQKYU.js');
 
-// src/plugins/index.ts
-
-
-var _devkit = require('@nx/devkit');
-var _defu = require('defu'); var _defu2 = _interopRequireDefault(_defu);
-var _fs = require('fs');
-var _path = require('path');
-var _fileutils = require('nx/src/utils/fileutils');
-var name = "storm-software/cloudflare-tools/cloudflare";
-var createNodesV2 = [
-  "{**/wrangler.toml}",
-  async (configFiles, options = { includeApps: true }, context) => {
-    return await _devkit.createNodesFromFiles.call(void 0, 
-      async (file, options2, context2) => {
-        try {
-          const packageJson = createPackageJson(file, context2.workspaceRoot);
-          if (!packageJson) {
-            return {};
-          }
-          const project = createProjectFromPackageJsonNextToProjectJson(
-            file,
-            packageJson
-          );
-          const targets = {};
-          targets["serve"] = {
-            cache: false,
-            inputs: ["typescript", "^production"],
-            dependsOn: ["build"],
-            executor: "@storm-software/cloudflare-tools:serve",
-            options: {
-              port: 4500
-            }
-          };
-          targets["clean-package"] = {
-            cache: true,
-            dependsOn: ["build"],
-            inputs: ["typescript", "^production"],
-            outputs: ["{workspaceRoot}/dist/{projectRoot}"],
-            executor: "@storm-software/workspace-tools:clean-package",
-            options: {
-              cleanReadMe: true,
-              cleanComments: true
-            }
-          };
-          targets["nx-release-publish"] = {
-            cache: false,
-            inputs: ["typescript", "^production"],
-            dependsOn: ["clean-package", "^nx-release-publish"],
-            executor: "@storm-software/cloudflare-tools:cloudflare-publish",
-            options: {}
-          };
-          _chunkXKQ3HGETjs.addProjectTag.call(void 0, 
-            project,
-            _chunkXKQ3HGETjs.ProjectTagConstants.ProjectType.TAG_ID,
-            project.projectType === "application" ? _chunkXKQ3HGETjs.ProjectTagConstants.ProjectType.APPLICATION : _chunkXKQ3HGETjs.ProjectTagConstants.ProjectType.LIBRARY,
-            { overwrite: true }
-          );
-          _chunkXKQ3HGETjs.addProjectTag.call(void 0, 
-            project,
-            _chunkXKQ3HGETjs.ProjectTagConstants.DistStyle.TAG_ID,
-            _chunkXKQ3HGETjs.ProjectTagConstants.DistStyle.CLEAN,
-            { overwrite: true }
-          );
-          _chunkXKQ3HGETjs.addProjectTag.call(void 0, 
-            project,
-            _chunkXKQ3HGETjs.ProjectTagConstants.Provider.TAG_ID,
-            "cloudflare",
-            {
-              overwrite: true
-            }
-          );
-          const projects = {};
-          const externalNodes = {};
-          projects[project.root] = _defu2.default.call(void 0, 
-            {
-              targets,
-              release: {
-                version: {
-                  versionActions: "@storm-software/workspace-tools/release/js-release-actions"
-                }
-              }
-            },
-            project
-          );
-          return {
-            projects,
-            externalNodes
-          };
-        } catch (e) {
-          console.error(e);
-          return {};
-        }
-      },
-      configFiles,
-      options,
-      context
-    );
-  }
-];
-function createProjectFromPackageJsonNextToProjectJson(projectJsonPath, packageJson) {
-  const { nx, name: name2 } = packageJson;
-  const root = _path.dirname.call(void 0, projectJsonPath);
-  return {
-    ...nx,
-    name: name2,
-    root,
-    targets: {}
-  };
-}
-function createPackageJson(projectJsonPath, workspaceRoot) {
-  try {
-    const root = _path.dirname.call(void 0, projectJsonPath);
-    const packageJsonPath = _path.join.call(void 0, workspaceRoot, root, "package.json");
-    if (!_fs.existsSync.call(void 0, packageJsonPath)) {
-      return null;
-    }
-    return _fileutils.readJsonFile.call(void 0, packageJsonPath);
-  } catch (e) {
-    console.log(e);
-    return null;
-  }
-}
-
-
-
-
-
-
-
-
-
-
-
-exports.applicationGenerator = _chunk75CHHXTRjs.applicationGenerator; exports.applicationSchematic = _chunk75CHHXTRjs.applicationSchematic; exports.createNodesV2 = createNodesV2; exports.getEncoding = _chunkCLCKX6UNjs.getEncoding; exports.getInternalDependencies = _chunkCLCKX6UNjs.getInternalDependencies; exports.initGenerator = _chunk2UW4WAHWjs.initGenerator; exports.initSchematic = _chunk2UW4WAHWjs.initSchematic; exports.isTextFile = _chunkCLCKX6UNjs.isTextFile; exports.name = name; exports.uploadFile = _chunkCLCKX6UNjs.uploadFile;
+
+
+
+
+
+
+
+
+
+
+exports.applicationGenerator = _chunkE5RARE7Ejs.applicationGenerator; exports.applicationSchematic = _chunkE5RARE7Ejs.applicationSchematic; exports.createNodesV2 = _chunkVJLWHQ5Bjs.createNodesV2; exports.getEncoding = _chunkCLCKX6UNjs.getEncoding; exports.getInternalDependencies = _chunkCLCKX6UNjs.getInternalDependencies; exports.initGenerator = _chunk6KDWHW2Gjs.initGenerator; exports.initSchematic = _chunk6KDWHW2Gjs.initSchematic; exports.isTextFile = _chunkCLCKX6UNjs.isTextFile; exports.name = _chunkVJLWHQ5Bjs.name; exports.uploadFile = _chunkCLCKX6UNjs.uploadFile;