@storm-software/workspace-tools 1.66.7 → 1.66.9

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 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)
+
+
+### 🩹 Fixes
+
+- **workspace-tools:** Correctly handle all value types in error logging ([4b072154](https://github.com/storm-software/storm-ops/commit/4b072154))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
 ## 1.66.7 (2024-03-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.66.7",
+  "version": "1.66.9",
   "private": false,
   "description": "⚡ A Nx plugin package that contains various executors and generators used in a Storm workspaces.",
   "keywords": [

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

@@ -49,37 +49,30 @@ export default async function runExecutor(
     const command = cargoPublishCommandSegments.join(" ");
     output.logSingleLine(`Running "${command}"...`);
 
-    execSync(command, {
+    const result = execSync(command, {
       maxBuffer: LARGE_BUFFER,
       env: {
-        ...process.env
+        ...process.env,
+        FORCE_COLOR: "true"
       },
       cwd: packageRoot,
-      stdio: "inherit"
+      stdio: ["ignore", "pipe", "pipe"]
     });
     console.log("");
+    console.log(result ? result.toString() : "No Result");
 
-    if (isDryRun) {
-      console.log("Would publish to https://crates.io, but [dry-run] was set");
-    } else {
-      console.log("Published to https://crates.io");
-    }
-
-    return {
-      success: true
-    };
-  } catch (error: any) {
+    const resultJson = JSON.parse(result.toString());
     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"))
+      (resultJson?.message &&
+        typeof resultJson.message === "string" &&
+        resultJson.message.toLowerCase().includes("crate version") &&
+        resultJson.message.toLowerCase().includes("is already uploaded")) ||
+      (resultJson?.cause?.message &&
+        typeof resultJson.cause.message === "string" &&
+        resultJson.cause.message.toLowerCase().includes("crate version") &&
+        resultJson.cause.message.toLowerCase().includes("is already uploaded"))
     ) {
-      console.log(
+      console.warn(
         `Skipped package "${cargoToml.package.name}" from project "${cargoToml.package.name}" because v${cargoToml.package.version} already exists in https://crates.io with tag "latest"`
       );
 
@@ -88,10 +81,19 @@ export default async function runExecutor(
       };
     }
 
+    if (isDryRun) {
+      console.log("Would publish to https://crates.io, but [dry-run] was set");
+    } else {
+      console.log("Published to https://crates.io");
+    }
+
+    return {
+      success: true
+    };
+  } catch (error: any) {
     console.error("Failed to publish to https://crates.io");
     console.error(error);
     console.log("");
-    console.error(formatLog(error));
 
     return {
       success: false
@@ -99,9 +101,18 @@ export default async function runExecutor(
   }
 }
 
-const formatLog = (message: any): string =>
-  typeof message === "object"
-    ? Object.keys(message)
-        .map((key) => ` - ${key}=${formatLog(message[key])}`)
-        .join("\n")
-    : JSON.stringify(message);
+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], key)}`)
+                .join("\n")
+            : JSON.stringify(message);