@storm-software/workspace-tools 1.292.15 → 1.292.18

package/dist/chunk-EYRX4NM6.mjs

@@ -0,0 +1,213 @@
+import {
+  getCrateRegistryVersion
+} from "./chunk-EGI64HQ2.mjs";
+import {
+  parseCargoToml,
+  parseCargoTomlWithTree,
+  stringifyCargoToml
+} from "./chunk-X2SLQ73Q.mjs";
+import {
+  getWorkspaceConfig
+} from "./chunk-NOTQLVZP.mjs";
+
+// src/release/rust-version-actions.ts
+import {
+  joinPathFragments
+} from "@nx/devkit";
+import { VersionActions } from "nx/release";
+var StormRustVersionActions = class extends VersionActions {
+  validManifestFilenames = ["Cargo.toml"];
+  /**
+   * The Storm workspace configuration object, which is loaded from the `storm-workspace.json` file.
+   *
+   * @remarks
+   * This member variable is populated during the {@link init} method.
+   */
+  workspaceConfig = null;
+  constructor(releaseGroup, projectGraphNode, finalConfigForProject) {
+    super(releaseGroup, projectGraphNode, finalConfigForProject);
+  }
+  /**
+   * Asynchronous initialization of the version actions and resolution of manifest paths.
+   *
+   * @remarks
+   * This does NOT validate that manifest files exist - that happens later in validate().
+   *
+   * @params tree - The file system tree to read from.
+   */
+  async init(tree) {
+    this.workspaceConfig = await getWorkspaceConfig();
+    return super.init(tree);
+  }
+  async readCurrentVersionFromSourceManifest(tree) {
+    const sourceCargoTomlPath = joinPathFragments(
+      this.projectGraphNode.data.root,
+      "Cargo.toml"
+    );
+    try {
+      const cargoToml = parseCargoTomlWithTree(
+        tree,
+        this.projectGraphNode.data.root,
+        this.projectGraphNode.name
+      );
+      return {
+        manifestPath: sourceCargoTomlPath,
+        currentVersion: cargoToml.package.version
+      };
+    } catch {
+      throw new Error(
+        `Unable to determine the current version for project "${this.projectGraphNode.name}" from ${sourceCargoTomlPath}, please ensure that the "version" field is set within the Cargo.toml file`
+      );
+    }
+  }
+  async readCurrentVersionFromRegistry(tree, currentVersionResolverMetadata) {
+    const cargoToml = parseCargoTomlWithTree(
+      tree,
+      this.projectGraphNode.data.root,
+      this.projectGraphNode.name
+    );
+    const crateName = cargoToml.package.name;
+    const metadata = currentVersionResolverMetadata;
+    const registryArg = typeof metadata?.registry === "string" ? metadata.registry : this.workspaceConfig?.registry?.cargo || "https://crates.io";
+    const tagArg = typeof metadata?.tag === "string" ? metadata.tag : "latest";
+    let currentVersion = null;
+    try {
+      currentVersion = await getCrateRegistryVersion(
+        crateName,
+        tagArg,
+        registryArg
+      );
+    } catch {
+    }
+    return {
+      currentVersion: currentVersion || "0.0.0",
+      // Make troubleshooting easier by including the registry and tag data in the log text
+      logText: `"cargoRegistry=${registryArg}" tag=${tagArg}`
+    };
+  }
+  async readCurrentVersionOfDependency(tree, projectGraph, dependencyProjectName) {
+    const cargoToml = parseCargoTomlWithTree(
+      tree,
+      this.projectGraphNode.data.root,
+      this.projectGraphNode.name
+    );
+    if (!projectGraph.nodes[dependencyProjectName]?.data?.root) {
+      return {
+        currentVersion: null,
+        dependencyCollection: null
+      };
+    }
+    const dependencyCargoToml = parseCargoTomlWithTree(
+      tree,
+      projectGraph.nodes[dependencyProjectName]?.data.root,
+      dependencyProjectName
+    );
+    if (!dependencyCargoToml?.package?.name) {
+      return {
+        currentVersion: null,
+        dependencyCollection: null
+      };
+    }
+    let currentVersion = null;
+    let dependencyCollection = null;
+    for (const depType of ["dependencies", "dev-dependencies"]) {
+      if (cargoToml[depType] && cargoToml[depType][dependencyCargoToml.package.name]) {
+        currentVersion = typeof cargoToml[depType][dependencyCargoToml.package.name] === "string" ? cargoToml[depType][dependencyCargoToml.package.name] : cargoToml[depType][dependencyCargoToml.package.name].version;
+        dependencyCollection = depType;
+        break;
+      }
+    }
+    return {
+      currentVersion,
+      dependencyCollection
+    };
+  }
+  async updateProjectVersion(tree, newVersion) {
+    const logMessages = [];
+    for (const manifestToUpdate of this.manifestsToUpdate) {
+      const cargoTomlString = tree.read(manifestToUpdate.manifestPath)?.toString();
+      if (!cargoTomlString) {
+        throw new Error(
+          `Unable to read Cargo.toml at path: ${manifestToUpdate.manifestPath}`
+        );
+      }
+      const cargoToml = parseCargoToml(cargoTomlString);
+      cargoToml.package.version = newVersion;
+      tree.write(manifestToUpdate.manifestPath, stringifyCargoToml(cargoToml));
+      logMessages.push(
+        `\u270D\uFE0F  New version ${newVersion} written to manifest: ${manifestToUpdate.manifestPath}`
+      );
+    }
+    return logMessages;
+  }
+  /**
+   * Updates the dependencies of the project in the specified Cargo.toml files.
+   *
+   * @param tree - The file system tree to read from and write to.
+   * @param projectGraph - The project graph to use for resolving dependencies.
+   * @param dependenciesToUpdate - A mapping of dependency names to their new versions.
+   * @returns An array of log messages indicating the results of the updates.
+   */
+  async updateProjectDependencies(tree, projectGraph, dependenciesToUpdate = {}) {
+    const numDependenciesToUpdate = Object.keys(dependenciesToUpdate).length;
+    if (numDependenciesToUpdate === 0) {
+      return [];
+    }
+    const logMessages = [];
+    for (const manifestToUpdate of this.manifestsToUpdate) {
+      const cargoTomlString = tree.read(manifestToUpdate.manifestPath)?.toString();
+      if (!cargoTomlString) {
+        throw new Error(
+          `Unable to read Cargo.toml at path: ${manifestToUpdate.manifestPath}`
+        );
+      }
+      const cargoToml = parseCargoToml(cargoTomlString);
+      for (const depType of ["dependencies", "dev-dependencies"]) {
+        if (cargoToml[depType]) {
+          for (const [dep, version] of Object.entries(dependenciesToUpdate)) {
+            try {
+              const projectRoot = projectGraph.nodes[dep]?.data.root;
+              if (!projectRoot) {
+                throw new Error(
+                  `Unable to determine the project root for "${dep}" from the project graph metadata, please ensure that the "@storm-software/workspace-tools" plugin is installed and the project graph has been built. If the issue persists, please report this issue on https://github.com/storm-software/storm-ops/issues`
+                );
+              }
+              const dependencyCargoTomlString = tree.read(manifestToUpdate.manifestPath)?.toString();
+              if (!dependencyCargoTomlString) {
+                throw new Error(
+                  `Unable to read Cargo.toml at path: ${manifestToUpdate.manifestPath}`
+                );
+              }
+              const dependencyCargoToml = parseCargoToml(
+                dependencyCargoTomlString
+              );
+              const dependencyCrateName = cargoToml[depType][dependencyCargoToml.package.name] ? dependencyCargoToml.package.name : dep;
+              if (typeof cargoToml[depType][dependencyCrateName] === "string") {
+                cargoToml[depType][dependencyCrateName] = version;
+              } else {
+                cargoToml[depType][dependencyCrateName].version = version;
+              }
+              tree.write(
+                manifestToUpdate.manifestPath,
+                stringifyCargoToml(cargoToml)
+              );
+            } catch (error) {
+              throw new Error(
+                `Unable to update ${depType === "dev-dependencies" ? "dev-dependency" : "dependency"} "${dep}" in manifest at path: ${manifestToUpdate.manifestPath}.`,
+                { cause: error }
+              );
+            }
+          }
+        }
+      }
+      logMessages.push(
+        `\u270D\uFE0F  Updated ${numDependenciesToUpdate} ${numDependenciesToUpdate === 1 ? "dependency" : "dependencies"} in manifest: ${manifestToUpdate.manifestPath}`
+      );
+    }
+    return logMessages;
+  }
+};
+
+export {
+  StormRustVersionActions
+};

package/dist/{chunk-LOFMB5G3.mjs → chunk-IPWUJVZZ.mjs}

@@ -1,4 +1,4 @@
-// ../../node_modules/.pnpm/tsup@8.4.0_patch_hash=751a554d775c3572381af4e7e5fa22eeda6dd6856012fb1cf521d6806eb2dc74__2f3cd688ba388d22c915010bc14d2fbe/node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@8.4.0_patch_hash=751a554d775c3572381af4e7e5fa22eeda6dd6856012fb1cf521d6806eb2dc74__ddff3f80acdb8654ef4815831fcbcdde/node_modules/tsup/assets/esm_shims.js
 import { fileURLToPath } from "url";
 import path from "path";
 var getFilename = () => fileURLToPath(import.meta.url);

package/dist/{chunk-YNLDYAEE.mjs → chunk-JHJLQ2O7.mjs}

@@ -7,7 +7,7 @@ import {
 } from "./chunk-JGFRV7ZL.mjs";
 import {
   __dirname
-} from "./chunk-LOFMB5G3.mjs";
+} from "./chunk-IPWUJVZZ.mjs";
 
 // src/generators/preset/generator.ts
 import {

package/dist/{chunk-452FQZ3B.js → chunk-JWFGGMYQ.js}

@@ -29,14 +29,9 @@ function stringifyCargoToml(cargoToml) {
   }
   return tomlString;
 }
-function modifyCargoTable(toml, section, key, value) {
-  toml[section] ??= _jtoml2.default.Section({});
-  toml[section][key] = typeof value === "object" && !Array.isArray(value) ? _jtoml2.default.inline(value) : typeof value === "function" ? value() : value;
-}
-
 
 
 
 
 
-exports.parseCargoTomlWithTree = parseCargoTomlWithTree; exports.parseCargoToml = parseCargoToml; exports.stringifyCargoToml = stringifyCargoToml; exports.modifyCargoTable = modifyCargoTable;
+exports.parseCargoTomlWithTree = parseCargoTomlWithTree; exports.parseCargoToml = parseCargoToml; exports.stringifyCargoToml = stringifyCargoToml;

package/dist/{chunk-Q57UD72U.mjs → chunk-KCVIHYZQ.mjs}

@@ -13,7 +13,7 @@ import {
 } from "./chunk-C26A6BXG.mjs";
 import {
   __dirname
-} from "./chunk-LOFMB5G3.mjs";
+} from "./chunk-IPWUJVZZ.mjs";
 
 // src/generators/node-library/generator.ts
 import {

package/dist/{chunk-7DLHAWLG.mjs → chunk-MU6OJDOC.mjs}

@@ -1,6 +1,6 @@
 import {
   parseCargoToml
-} from "./chunk-SVIG7SR3.mjs";
+} from "./chunk-X2SLQ73Q.mjs";
 
 // src/executors/cargo-publish/executor.ts
 import { joinPathFragments } from "@nx/devkit";

package/dist/{chunk-IBTPJDV6.js → chunk-N3YCERS6.js}

@@ -297,13 +297,16 @@ var RELEASE = {
       },
       version: {
         groupPreVersionCommand: "pnpm build",
-        generator: "@storm-software/workspace-tools:release-version",
         currentVersionResolver: "git-tag",
         specifierSource: "conventional-commits",
-        generatorOptions: {
+        versionActions: "@storm-software/workspace-tools:release-version",
+        versionActionsOptions: {
           currentVersionResolver: "git-tag",
           specifierSource: "conventional-commits"
         }
+      },
+      releaseTag: {
+        pattern: "{projectName}@{version}"
       }
     }
   }

package/dist/{chunk-WV5SNA37.js → chunk-O2FPRXPD.js}

@@ -1,4 +1,4 @@
-"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; }
+"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 _chunkJ6F3WHRBjs = require('./chunk-J6F3WHRB.js');
 
@@ -18,6 +18,7 @@ var _chunkAX3RSZT7js = require('./chunk-AX3RSZT7.js');
 
 
 var _devkit = require('@nx/devkit');
+var _defu = require('defu'); var _defu2 = _interopRequireDefault(_defu);
 var _fs = require('fs');
 var _path = require('path');
 
@@ -85,7 +86,7 @@ var createNodesV2 = [
               if (includeApps === false && project.projectType === "application") {
                 continue;
               }
-              project.targets = {
+              const targets = {
                 "lint-markdown": {
                   cache: true,
                   outputs: ["{projectRoot}/**/*.md", "{projectRoot}/**/*.mdx"],
@@ -234,7 +235,7 @@ var createNodesV2 = [
                 }
               };
               if (skipDocs != true) {
-                project.targets.docs = {
+                targets.docs = {
                   cache: true,
                   inputs: ["linting", "documentation", "^production"],
                   dependsOn: ["format-readme", "lint-docs", "^docs"],
@@ -254,7 +255,7 @@ var createNodesV2 = [
                   _chunkAX3RSZT7js.ProjectTagConstants.Registry.CARGO,
                   { overwrite: true }
                 );
-                project.targets["nx-release-publish"] = {
+                targets["nx-release-publish"] = {
                   cache: true,
                   inputs: [
                     "linting",
@@ -279,21 +280,22 @@ var createNodesV2 = [
                 { overwrite: true }
               );
               _chunkAX3RSZT7js.setDefaultProjectTags.call(void 0, project, name);
-              projects[root] = {
-                ...project,
-                release: {
-                  ...project.release,
-                  version: {
-                    ..._optionalChain([project, 'access', _6 => _6.release, 'optionalAccess', _7 => _7.version]),
-                    generator: "@storm-software/workspace-tools:release-version"
+              projects[root] = _defu2.default.call(void 0, 
+                {
+                  targets,
+                  release: {
+                    version: {
+                      versionActions: "@storm-software/workspace-tools/release/rust-version-actions"
+                    }
                   }
-                }
-              };
+                },
+                project
+              );
             }
             for (const dep of cargoPackage.dependencies) {
               if (_chunkLJDV7HFTjs.isExternal.call(void 0, dep, context2.workspaceRoot)) {
                 const externalDepName = `cargo:${dep.name}`;
-                if (!_optionalChain([externalNodes, 'optionalAccess', _8 => _8[externalDepName]])) {
+                if (!_optionalChain([externalNodes, 'optionalAccess', _6 => _6[externalDepName]])) {
                   externalNodes[externalDepName] = {
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     type: "cargo",
@@ -301,7 +303,7 @@ var createNodesV2 = [
                     name: externalDepName,
                     data: {
                       packageName: dep.name,
-                      version: _nullishCoalesce(_optionalChain([cargoPackageMap, 'access', _9 => _9.get, 'call', _10 => _10(dep.name), 'optionalAccess', _11 => _11.version]), () => ( "0.0.0"))
+                      version: _nullishCoalesce(_optionalChain([cargoPackageMap, 'access', _7 => _7.get, 'call', _8 => _8(dep.name), 'optionalAccess', _9 => _9.version]), () => ( "0.0.0"))
                     }
                   };
                 }

package/dist/{chunk-FQSIFEMR.mjs → chunk-OOR7HG4P.mjs}

@@ -1,10 +1,9 @@
 import {
   addPackageJsonGitHead
-} from "./chunk-UCXAD2SG.mjs";
+} from "./chunk-6PVCCKX4.mjs";
 import {
-  getNpmRegistry,
-  getRegistry
-} from "./chunk-JLXBL5BC.mjs";
+  getConfig
+} from "./chunk-NOTQLVZP.mjs";
 import {
   findWorkspaceRoot
 } from "./chunk-VGJEUOUN.mjs";
@@ -12,6 +11,37 @@ import {
   joinPaths
 } from "./chunk-C26A6BXG.mjs";
 
+// ../npm-tools/src/helpers/get-registry.ts
+import { exec } from "node:child_process";
+
+// ../npm-tools/src/constants.ts
+var DEFAULT_NPM_REGISTRY = "https://registry.npmjs.org";
+
+// ../npm-tools/src/helpers/get-registry.ts
+async function getRegistry() {
+  return new Promise((resolve, reject) => {
+    exec("npm config get registry", (error, stdout, stderr) => {
+      if (error) {
+        return reject(error);
+      }
+      if (stderr) {
+        return reject(stderr);
+      }
+      return resolve(stdout.trim());
+    });
+  });
+}
+async function getNpmRegistry() {
+  if (process.env.STORM_REGISTRY_NPM) {
+    return process.env.STORM_REGISTRY_NPM;
+  }
+  const workspaceConfig = await getConfig();
+  if (workspaceConfig?.registry?.npm) {
+    return workspaceConfig?.registry?.npm;
+  }
+  return DEFAULT_NPM_REGISTRY;
+}
+
 // ../pnpm-tools/src/helpers/replace-deps-aliases.ts
 import {
   createProjectGraphAsync,
@@ -21,6 +51,9 @@ import { existsSync as existsSync2 } from "node:fs";
 import { readFile as readFile2, writeFile as writeFile2 } from "node:fs/promises";
 import { format } from "prettier";
 
+// ../npm-tools/src/helpers/get-version.ts
+import { exec as exec2 } from "node:child_process";
+
 // ../pnpm-tools/src/helpers/catalog.ts
 import { coerce, gt, valid } from "semver";
 

package/dist/{chunk-2LY7DGBH.mjs → chunk-OV33RACH.mjs}

@@ -297,13 +297,16 @@ var RELEASE = {
       },
       version: {
         groupPreVersionCommand: "pnpm build",
-        generator: "@storm-software/workspace-tools:release-version",
         currentVersionResolver: "git-tag",
         specifierSource: "conventional-commits",
-        generatorOptions: {
+        versionActions: "@storm-software/workspace-tools:release-version",
+        versionActionsOptions: {
           currentVersionResolver: "git-tag",
           specifierSource: "conventional-commits"
         }
+      },
+      releaseTag: {
+        pattern: "{projectName}@{version}"
       }
     }
   }

package/dist/{chunk-WRXLSZ6I.js → chunk-POXELQII.js}

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } 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 _chunk452FQZ3Bjs = require('./chunk-452FQZ3B.js');
+var _chunkJWFGGMYQjs = require('./chunk-JWFGGMYQ.js');
 
 // src/executors/cargo-publish/executor.ts
 var _devkit = require('@nx/devkit');
@@ -25,7 +25,7 @@ async function runExecutor(options, context) {
     context.root,
     options.packageRoot ? options.packageRoot : root
   );
-  const cargoToml = _chunk452FQZ3Bjs.parseCargoToml.call(void 0, 
+  const cargoToml = _chunkJWFGGMYQjs.parseCargoToml.call(void 0, 
     _fs.readFileSync.call(void 0, _devkit.joinPathFragments.call(void 0, packageRoot, "Cargo.toml"), "utf-8")
   );
   try {

package/dist/{chunk-B4RJUBHW.mjs → chunk-QUHBEE5D.mjs}

@@ -10,7 +10,7 @@ import {
 } from "./chunk-C26A6BXG.mjs";
 import {
   __dirname
-} from "./chunk-LOFMB5G3.mjs";
+} from "./chunk-IPWUJVZZ.mjs";
 
 // src/generators/browser-library/generator.ts
 import {