@storm-software/workspace-tools 1.66.9 → 1.66.11

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 1.66.11 (2024-03-28)
+
+
+### 🩹 Fixes
+
+- **workspace-tools:** Enhance code to check crates.io version through API ([1cec1ccd](https://github.com/storm-software/storm-ops/commit/1cec1ccd))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
+## 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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/workspace-tools",
-  "version": "1.66.9",
+  "version": "1.66.11",
   "private": false,
   "description": "⚡ A Nx plugin package that contains various executors and generators used in a Storm workspaces.",
   "keywords": [
@@ -52,6 +52,7 @@
     "@nx/devkit": "18.0.4",
     "@nx/esbuild": "18.0.4",
     "@rollup/plugin-json": "6.1.0",
+    "axios": "1.6.7",
     "bundle-require": "^4.0.2",
     "decky": "1.1.1",
     "esbuild-plugin-environment": "0.3.0",

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

@@ -1,12 +1,19 @@
-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 axios from "axios";
+import { encode } from "node:querystring";
 
 const LARGE_BUFFER = 1024 * 1000000;
 
-// biome-ignore lint/nursery/useAwait: <explanation>
+const REGISTRY = axios.create({
+  baseURL: "https://crates.io/api/v1/crates",
+  headers: { "Content-Type": "application/json", Authorization: process.env.CARGO_REGISTRY_TOKEN },
+  timeout: 8000
+});
+
 export default async function runExecutor(
   options: CargoPublishExecutorSchema,
   context: ExecutorContext
@@ -40,6 +47,21 @@ export default async function runExecutor(
     readFileSync(joinPathFragments(packageRoot, "Cargo.toml"), "utf-8")
   );
 
+  try {
+    const result = await REGISTRY.get(
+      `/${encode(cargoToml.package.name)}/${encode(cargoToml.package.version)}`
+    );
+    if (result?.data) {
+      console.warn(
+        `Skipped package "${cargoToml.package.name}" from project "${context.projectName}" because v${cargoToml.package.version} already exists in https://crates.io with tag "latest"`
+      );
+
+      return {
+        success: true
+      };
+    }
+  } catch (_: any) {}
+
   const cargoPublishCommandSegments = [`cargo publish --allow-dirty -p ${cargoToml.package.name}`];
   if (isDryRun) {
     cargoPublishCommandSegments.push("--dry-run");
@@ -47,9 +69,11 @@ export default async function runExecutor(
 
   try {
     const command = cargoPublishCommandSegments.join(" ");
-    output.logSingleLine(`Running "${command}"...`);
+    console.log("");
+    console.log(`Running "${command}"...`);
+    console.log("");
 
-    const result = execSync(command, {
+    execSync(command, {
       maxBuffer: LARGE_BUFFER,
       env: {
         ...process.env,
@@ -59,27 +83,6 @@ export default async function runExecutor(
       stdio: ["ignore", "pipe", "pipe"]
     });
     console.log("");
-    console.log(result ? result.toString() : "No Result");
-
-    const resultJson = JSON.parse(result.toString());
-    if (
-      (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.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"`
-      );
-
-      return {
-        success: true
-      };
-    }
 
     if (isDryRun) {
       console.log("Would publish to https://crates.io, but [dry-run] was set");
@@ -100,19 +103,3 @@ export default async function runExecutor(
     };
   }
 }
-
-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);