pubm 0.2.8 → 0.2.10

package/dist/index.js

@@ -4575,6 +4575,7 @@ var RustEcosystem = class extends Ecosystem {
 };
 
 // src/error.ts
+import { NonZeroExitError } from "tinyexec";
 var AbstractError = class extends Error {
   constructor(message, { cause } = {}) {
     super(message, { cause });
@@ -4585,20 +4586,49 @@ var AbstractError = class extends Error {
 function replaceCode(code) {
   return code.replace(/`([^`].+)`/g, color.bold(color.underline("$1")));
 }
+function formatStderr(stderr) {
+  return stderr.split("\n").map((line) => `  ${color.dim("\u2502")} ${line}`).join("\n");
+}
+function isNoisyCause(cause) {
+  if (cause instanceof NonZeroExitError) return true;
+  if (cause instanceof Error && /Process exited with non-zero status/i.test(cause.message))
+    return true;
+  return false;
+}
 function formatError(error) {
   if (!(error instanceof Error)) return `${error}`;
-  const message = typeof error.message === "string" ? replaceCode(error.message) : (
+  const rawMessage = typeof error.message === "string" ? error.message : (
     /* v8 ignore next */
-    formatError(error)
+    String(error)
   );
-  let stringifyError = `${color.bgRed(` ${error.name} `)}${color.reset("")} ${message}
+  const newlineIndex = rawMessage.indexOf("\n");
+  let summary;
+  let detail;
+  if (newlineIndex !== -1) {
+    summary = rawMessage.slice(0, newlineIndex);
+    detail = rawMessage.slice(newlineIndex + 1);
+  } else {
+    summary = rawMessage;
+  }
+  let result = `${color.bgRed(` ${error.name} `)}${color.reset("")} ${replaceCode(summary)}
 `;
-  stringifyError += error.stack?.split("\n").slice(1).join("\n").replace(/at/g, color.dim("at")).replace(/\(([^(].+)\)/g, `(${color.blue("$1")})`);
-  if (error.cause) {
-    stringifyError += "\n\nCaused: ";
-    stringifyError += formatError(error.cause);
+  if (detail) {
+    result += `
+${formatStderr(detail)}
+`;
+  }
+  if (process.env.DEBUG === "pubm" && error.stack) {
+    result += error.stack.split("\n").slice(1).join("\n").replace(/at/g, color.dim("at")).replace(/\(([^(].+)\)/g, `(${color.blue("$1")})`);
+  }
+  if (error.cause && !isNoisyCause(error.cause)) {
+    const causeMsg = error.cause instanceof Error ? error.cause.message : String(error.cause);
+    if (causeMsg !== summary) {
+      result += `
+${color.dim("Caused by:")} `;
+      result += formatError(error.cause);
+    }
   }
-  return stringifyError;
+  return result;
 }
 function consoleError(error) {
   let errorText = "\n";
@@ -4952,12 +4982,19 @@ var rollbacks = [];
 function addRollback(rollback2, context) {
   rollbacks.push({ fn: rollback2, ctx: context });
 }
+function rollbackLog(message) {
+  console.log(`  ${color.yellow("\u21A9")} ${message}`);
+}
+function rollbackError(message) {
+  console.error(`  ${color.red("\u2717")} ${message}`);
+}
 var called = false;
 async function rollback() {
   if (called) return void 0;
   called = true;
   if (rollbacks.length <= 0) return void 0;
-  console.log("Rollback...");
+  console.log(`
+${color.yellow("\u27F2")} ${color.yellow("Rolling back...")}`);
   const results = await Promise.allSettled(
     rollbacks.map(({ fn, ctx }) => fn(ctx))
   );
@@ -4966,15 +5003,15 @@ async function rollback() {
   );
   if (failures.length > 0) {
     for (const failure of failures) {
-      console.error(
-        `Rollback operation failed: ${failure.reason instanceof Error ? failure.reason.message : failure.reason}`
+      rollbackError(
+        failure.reason instanceof Error ? failure.reason.message : failure.reason
       );
     }
     console.log(
-      "Rollback completed with errors. Some operations may require manual recovery."
+      `${color.red("\u2717")} ${color.red("Rollback completed with errors.")} Some operations may require manual recovery.`
     );
   } else {
-    console.log("Rollback completed");
+    console.log(`${color.green("\u2713")} Rollback completed`);
   }
 }
 
@@ -5334,19 +5371,25 @@ var TOKEN_CONFIG = {
     envVar: "NODE_AUTH_TOKEN",
     dbKey: "npm-token",
     ghSecretName: "NODE_AUTH_TOKEN",
-    promptLabel: "npm access token"
+    promptLabel: "npm access token",
+    tokenUrl: "https://www.npmjs.com/settings/~/tokens/granular-access-tokens/new",
+    tokenUrlLabel: "npmjs.com"
   },
   jsr: {
     envVar: "JSR_TOKEN",
     dbKey: "jsr-token",
     ghSecretName: "JSR_TOKEN",
-    promptLabel: "jsr API token"
+    promptLabel: "jsr API token",
+    tokenUrl: "https://jsr.io/account/tokens/create",
+    tokenUrlLabel: "jsr.io"
   },
   crates: {
     envVar: "CARGO_REGISTRY_TOKEN",
     dbKey: "cargo-token",
     ghSecretName: "CARGO_REGISTRY_TOKEN",
-    promptLabel: "crates.io API token"
+    promptLabel: "crates.io API token",
+    tokenUrl: "https://crates.io/settings/tokens/new",
+    tokenUrlLabel: "crates.io"
   }
 };
 function loadTokensFromDb(registries) {
@@ -5360,6 +5403,7 @@ function loadTokensFromDb(registries) {
   }
   return tokens;
 }
+var NPM_AUTH_ENV_VAR = "npm_config_//registry.npmjs.org/:_authToken";
 function injectTokensToEnv(tokens) {
   const originals = {};
   for (const [registry, token] of Object.entries(tokens)) {
@@ -5367,6 +5411,10 @@ function injectTokensToEnv(tokens) {
     if (!config) continue;
     originals[config.envVar] = process.env[config.envVar];
     process.env[config.envVar] = token;
+    if (registry === "npm") {
+      originals[NPM_AUTH_ENV_VAR] = process.env[NPM_AUTH_ENV_VAR];
+      process.env[NPM_AUTH_ENV_VAR] = token;
+    }
   }
   return () => {
     for (const [envVar, original] of Object.entries(originals)) {
@@ -5381,7 +5429,7 @@ function injectTokensToEnv(tokens) {
 
 // src/registry/crates.ts
 import path5 from "node:path";
-import { exec as exec4, NonZeroExitError } from "tinyexec";
+import { exec as exec4, NonZeroExitError as NonZeroExitError2 } from "tinyexec";
 
 // src/registry/registry.ts
 var Registry = class {
@@ -5401,6 +5449,14 @@ var CratesError = class extends AbstractError {
   }
 };
 var USER_AGENT = "pubm (https://github.com/syi0808/pubm)";
+function cleanCargoStderr(stderr) {
+  return stderr.split("\n").filter((line) => {
+    const trimmed = line.trim();
+    if (trimmed === "Updating crates.io index") return false;
+    if (trimmed === "") return false;
+    return true;
+  }).join("\n");
+}
 var CratesRegistry = class extends Registry {
   constructor() {
     super(...arguments);
@@ -5465,9 +5521,9 @@ var CratesRegistry = class extends Registry {
       await exec4("cargo", args, { throwOnError: true });
       return true;
     } catch (error) {
-      const stderr = error instanceof NonZeroExitError ? error.output?.stderr : void 0;
+      const stderr = error instanceof NonZeroExitError2 ? error.output?.stderr : void 0;
       const message = stderr ? `Failed to run \`cargo publish\`:
-${stderr}` : "Failed to run `cargo publish`";
+${cleanCargoStderr(stderr)}` : "Failed to run `cargo publish`";
       throw new CratesError(message, { cause: error });
     }
   }
@@ -5479,9 +5535,9 @@ ${stderr}` : "Failed to run `cargo publish`";
       }
       await exec4("cargo", args, { throwOnError: true });
     } catch (error) {
-      const stderr = error instanceof NonZeroExitError ? error.output?.stderr : void 0;
+      const stderr = error instanceof NonZeroExitError2 ? error.output?.stderr : void 0;
       const message = stderr ? `Failed to run \`cargo publish --dry-run\`:
-${stderr}` : "Failed to run `cargo publish --dry-run`";
+${cleanCargoStderr(stderr)}` : "Failed to run `cargo publish --dry-run`";
       throw new CratesError(message, { cause: error });
     }
   }
@@ -5603,7 +5659,7 @@ var cratesPublishTasks = createCratesPublishTask();
 import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
 
 // src/registry/jsr.ts
-import { exec as exec5, NonZeroExitError as NonZeroExitError2 } from "tinyexec";
+import { exec as exec5, NonZeroExitError as NonZeroExitError3 } from "tinyexec";
 
 // src/utils/package-name.ts
 import { builtinModules } from "node:module";
@@ -5614,7 +5670,7 @@ function getScope(packageName) {
   return packageName.match(/^@([^/]+)/)?.[1] ?? null;
 }
 function getScopeAndName(packageName) {
-  const matches = packageName.match(/^@([a-zA-Z0-9]+)\/([a-zA-Z0-9]+)$/);
+  const matches = packageName.match(/^@([a-zA-Z0-9_-]+)\/([a-zA-Z0-9_.-]+)$/);
   if (!matches) {
     throw new Error(
       `Invalid scoped package name: '${packageName}'. Expected format: @scope/name`
@@ -5659,7 +5715,7 @@ var JsrError = class extends AbstractError {
 function getApiEndpoint(registry) {
   const url = new URL(registry);
   url.host = `api.${url.host}`;
-  return `${url}`;
+  return url.href.replace(/\/$/, "");
 }
 var JsrRegisry = class extends Registry {
   constructor(packageName, registry) {
@@ -5711,7 +5767,7 @@ var JsrRegisry = class extends Registry {
       this.packageCreationUrls = void 0;
       return true;
     } catch (error) {
-      const stderr = error instanceof NonZeroExitError2 ? error.output?.stderr : void 0;
+      const stderr = error instanceof NonZeroExitError3 ? error.output?.stderr : void 0;
       if (stderr?.includes("don't exist")) {
         const urls = [...stderr.matchAll(/https:\/\/jsr\.io\/new\S+/g)].map(
           (m) => m[0]
@@ -5744,9 +5800,14 @@ ${stderr}` : ""}`,
         { throwOnError: true }
       );
     } catch (error) {
-      throw new JsrError("Failed to run `jsr publish --dry-run`", {
-        cause: error
-      });
+      const stderr = error instanceof NonZeroExitError3 ? error.output?.stderr : void 0;
+      throw new JsrError(
+        `Failed to run \`jsr publish --dry-run\`${stderr ? `
+${stderr}` : ""}`,
+        {
+          cause: error
+        }
+      );
     }
   }
   async version() {
@@ -5778,7 +5839,7 @@ ${stderr}` : ""}`,
     }
   }
   async hasPermission() {
-    return this.client.scopePermission(`${getScope(this.packageName)}`) !== null;
+    return await this.client.scopePermission(`${getScope(this.packageName)}`) !== null;
   }
   async isPackageNameAvaliable() {
     return isValidPackageName(this.packageName);
@@ -6006,7 +6067,7 @@ async function jsrRegistry() {
 // src/registry/npm.ts
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { exec as exec6, NonZeroExitError as NonZeroExitError3 } from "tinyexec";
+import { exec as exec6, NonZeroExitError as NonZeroExitError4 } from "tinyexec";
 var NpmError = class extends AbstractError {
   constructor() {
     super(...arguments);
@@ -6076,7 +6137,7 @@ var NpmRegistry = class extends Registry {
       await this.npm(["whoami"]);
       return true;
     } catch (error) {
-      if (error instanceof NonZeroExitError3) {
+      if (error instanceof NonZeroExitError4) {
         return false;
       }
       throw new NpmError("Failed to run `npm whoami`", { cause: error });
@@ -6154,7 +6215,7 @@ var NpmRegistry = class extends Registry {
       await this.npm(["publish", "--provenance", "--access", "public"]);
       return true;
     } catch (error) {
-      if (error instanceof NonZeroExitError3 && error.output?.stderr.includes("EOTP")) {
+      if (error instanceof NonZeroExitError4 && error.output?.stderr.includes("EOTP")) {
         return false;
       }
       throw this.classifyPublishError(error);
@@ -6166,7 +6227,7 @@ var NpmRegistry = class extends Registry {
       await this.npm(args);
       return true;
     } catch (error) {
-      if (error instanceof NonZeroExitError3 && error.output?.stderr.includes("EOTP")) {
+      if (error instanceof NonZeroExitError4 && error.output?.stderr.includes("EOTP")) {
         return false;
       }
       throw this.classifyPublishError(error);
@@ -6184,7 +6245,7 @@ var NpmRegistry = class extends Registry {
         }
       });
     } catch (error) {
-      const stderr = error instanceof NonZeroExitError3 ? error.output?.stderr : void 0;
+      const stderr = error instanceof NonZeroExitError4 ? error.output?.stderr : void 0;
       throw new NpmError(
         `Failed to run \`npm publish --dry-run\`${stderr ? `
 ${stderr}` : ""}`,
@@ -6211,7 +6272,7 @@ ${stderr}` : ""}`,
     };
   }
   classifyPublishError(error) {
-    if (error instanceof NonZeroExitError3) {
+    if (error instanceof NonZeroExitError4) {
       const stderr = error.output?.stderr ?? "";
       if (stderr.includes("EOTP")) {
         return new NpmError("OTP required for publishing", { cause: error });
@@ -6761,10 +6822,18 @@ async function collectTokens(registries, task) {
   for (const registry of registries) {
     const config = TOKEN_CONFIG[registry];
     if (!config || tokens[registry]) continue;
+    let { tokenUrl } = config;
+    if (registry === "npm" && tokenUrl.includes("~")) {
+      const result = await exec7("npm", ["whoami"]);
+      const username = result.stdout.trim();
+      if (username) tokenUrl = tokenUrl.replace("~", username);
+    }
     task.output = `Enter ${config.promptLabel}`;
     const token = await task.prompt(ListrEnquirerPromptAdapter4).run({
       type: "password",
-      message: `Enter ${config.promptLabel}`
+      message: `Enter ${config.promptLabel}`,
+      footer: `
+Generate a token from ${color.bold(link2(config.tokenUrlLabel, tokenUrl))}`
     });
     tokens[registry] = token;
     new Db().set(config.dbKey, token);
@@ -7252,6 +7321,12 @@ async function run(options) {
     promptEnabled: !isCI2 && process10.stdin.isTTY
   };
   let cleanupEnv;
+  const onSigint = async () => {
+    cleanupEnv?.();
+    await rollback();
+    process10.exit(130);
+  };
+  process10.on("SIGINT", onSigint);
   try {
     if (options.contents) process10.chdir(options.contents);
     if (options.preflight) {
@@ -7331,23 +7406,28 @@ async function run(options) {
             addRollback(async () => {
               if (tagCreated) {
                 try {
-                  console.log("Deleting tag...");
+                  rollbackLog("Deleting tag");
                   await git.deleteTag(`${await git.latestTag()}`);
                 } catch (error) {
-                  console.error(
+                  rollbackError(
                     `Failed to delete tag: ${error instanceof Error ? error.message : error}`
                   );
                 }
               }
               if (commited) {
                 try {
-                  console.log("Reset commits...");
+                  rollbackLog("Resetting commits");
                   await git.reset();
-                  await git.stash();
+                  const dirty = await git.status() !== "";
+                  if (dirty) {
+                    await git.stash();
+                  }
                   await git.reset("HEAD^", "--hard");
-                  await git.popStash();
+                  if (dirty) {
+                    await git.popStash();
+                  }
                 } catch (error) {
-                  console.error(
+                  rollbackError(
                     `Failed to reset commits: ${error instanceof Error ? error.message : error}`
                   );
                 }
@@ -7442,6 +7522,7 @@ ${repositoryUrl}/compare/${lastRev}...${latestTag}`;
         parts.push(`${color.bold(name)} on ${color.red("crates.io")}`);
       }
     }
+    process10.removeListener("SIGINT", onSigint);
     if (options.preflight) {
       cleanupEnv?.();
       console.log(
@@ -7459,6 +7540,7 @@ ${repositoryUrl}/compare/${lastRev}...${latestTag}`;
       );
     }
   } catch (e2) {
+    process10.removeListener("SIGINT", onSigint);
     cleanupEnv?.();
     consoleError(e2);
     await rollback();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pubm",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "engines": {
     "node": ">=18",
     "git": ">=2.11.0"