@storm-software/workspace-tools 1.66.8 → 1.66.10

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 1.66.10 (2024-03-28)
+
+
+### 🩹 Fixes
+
+- **workspace-tools:** Add logic to get current version from crates.io during publish ([0e70268c](https://github.com/storm-software/storm-ops/commit/0e70268c))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
+## 1.66.9 (2024-03-28)
+
+
+### 🩹 Fixes
+
+- **workspace-tools:** Resolve result handling in `cargo-publish` executor ([09a25a73](https://github.com/storm-software/storm-ops/commit/09a25a73))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
 ## 1.66.8 (2024-03-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.66.8",
+  "version": "1.66.10",
   "private": false,
   "description": "⚡ A Nx plugin package that contains various executors and generators used in a Storm workspaces.",
   "keywords": [
@@ -53,6 +53,7 @@
     "@nx/esbuild": "18.0.4",
     "@rollup/plugin-json": "6.1.0",
     "bundle-require": "^4.0.2",
+    "crates.io": "^2.2.7",
     "decky": "1.1.1",
     "esbuild-plugin-environment": "0.3.0",
     "esbuild-plugin-handlebars": "1.0.2",

package/src/executors/cargo-publish/executor.ts

@@ -1,12 +1,12 @@
-import { type ExecutorContext, joinPathFragments, output } from "@nx/devkit";
+import { type ExecutorContext, joinPathFragments } from "@nx/devkit";
 import { execSync } from "node:child_process";
 import { readFileSync } from "node:fs";
 import { parseCargoToml } from "../../utils/toml";
 import type { CargoPublishExecutorSchema } from "./schema.d";
+import { CratesIO } from "crates.io";
 
 const LARGE_BUFFER = 1024 * 1000000;
 
-// biome-ignore lint/nursery/useAwait: <explanation>
 export default async function runExecutor(
   options: CargoPublishExecutorSchema,
   context: ExecutorContext
@@ -40,6 +40,25 @@ export default async function runExecutor(
     readFileSync(joinPathFragments(packageRoot, "Cargo.toml"), "utf-8")
   );
 
+  try {
+    const currentVersion = cargoToml.package.version;
+    const packageName = cargoToml.package.name;
+
+    const result = await new CratesIO().api.crates.getVersion(packageName, currentVersion);
+    if (result) {
+      console.warn(
+        `Skipped package "${packageName}" from project "${context.projectName}" because v${currentVersion} already exists in https://crates.io with tag "latest"`
+      );
+
+      return {
+        success: true
+      };
+    }
+  } catch (error: any) {
+    console.log("No results returned while checking the crate version in https://crates.io");
+    console.warn(error);
+  }
+
   const cargoPublishCommandSegments = [`cargo publish --allow-dirty -p ${cargoToml.package.name}`];
   if (isDryRun) {
     cargoPublishCommandSegments.push("--dry-run");
@@ -47,15 +66,18 @@ export default async function runExecutor(
 
   try {
     const command = cargoPublishCommandSegments.join(" ");
-    output.logSingleLine(`Running "${command}"...`);
+    console.log("");
+    console.log(`Running "${command}"...`);
+    console.log("");
 
     execSync(command, {
       maxBuffer: LARGE_BUFFER,
       env: {
-        ...process.env
+        ...process.env,
+        FORCE_COLOR: "true"
       },
       cwd: packageRoot,
-      stdio: "inherit"
+      stdio: ["ignore", "pipe", "pipe"]
     });
     console.log("");
 
@@ -69,48 +91,12 @@ export default async function runExecutor(
       success: true
     };
   } catch (error: any) {
-    if (
-      (error?.message &&
-        typeof error.message === "string" &&
-        error.message.toLowerCase().includes("crate version") &&
-        error.message.toLowerCase().includes("is already uploaded")) ||
-      (error?.cause?.message &&
-        typeof error.cause.message === "string" &&
-        error.cause.message.toLowerCase().includes("crate version") &&
-        error.cause.message.toLowerCase().includes("is already uploaded"))
-    ) {
-      console.log(
-        `Skipped package "${cargoToml.package.name}" from project "${cargoToml.package.name}" because v${cargoToml.package.version} already exists in https://crates.io with tag "latest"`
-      );
-
-      return {
-        success: true
-      };
-    }
-
     console.error("Failed to publish to https://crates.io");
     console.error(error);
     console.log("");
-    console.error(formatLog(error));
 
     return {
       success: false
     };
   }
 }
-
-const formatLog = (message?: any, name?: string): string =>
-  typeof message === "boolean"
-    ? String(message)
-    : !message
-      ? "<None>"
-      : typeof message === "string"
-        ? `"${message}"`
-        : typeof message === "number"
-          ? message.toString()
-          : typeof message === "object"
-            ? (name ? ` --- ${name} ---\n` : "") +
-              Object.keys(message)
-                .map((key) => ` - ${key}=${formatLog(message[key])}`)
-                .join("\n")
-            : JSON.stringify(message);