pubm 0.2.8 → 0.2.10

package/dist/index.cjs

@@ -4486,7 +4486,7 @@ var Listr = (_a23 = class {
 // src/tasks/runner.ts
 var import_semver3 = __toESM(require("semver"), 1);
 var import_std_env = require("std-env");
-var import_tinyexec8 = require("tinyexec");
+var import_tinyexec9 = require("tinyexec");
 
 // src/ecosystem/rust.ts
 var import_promises2 = require("fs/promises");
@@ -4608,6 +4608,7 @@ var RustEcosystem = class extends Ecosystem {
 };
 
 // src/error.ts
+var import_tinyexec2 = require("tinyexec");
 var AbstractError = class extends Error {
   constructor(message, { cause } = {}) {
     super(message, { cause });
@@ -4618,20 +4619,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 import_tinyexec2.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";
@@ -4648,7 +4678,7 @@ function consoleError(error) {
 
 // src/git.ts
 var import_semver = __toESM(require("semver"), 1);
-var import_tinyexec2 = require("tinyexec");
+var import_tinyexec3 = require("tinyexec");
 var GitError = class extends AbstractError {
   constructor() {
     super(...arguments);
@@ -4657,7 +4687,7 @@ var GitError = class extends AbstractError {
 };
 var Git = class {
   async git(args) {
-    const { stdout } = await (0, import_tinyexec2.exec)("git", args, { throwOnError: true });
+    const { stdout } = await (0, import_tinyexec3.exec)("git", args, { throwOnError: true });
     return stdout;
   }
   async userName() {
@@ -4911,7 +4941,7 @@ var Git = class {
   async push(options) {
     const args = ["push", options].filter((v) => v);
     try {
-      const { stderr } = await (0, import_tinyexec2.exec)("git", args, { throwOnError: true });
+      const { stderr } = await (0, import_tinyexec3.exec)("git", args, { throwOnError: true });
       if (`${stderr}`.includes("GH006")) {
         return false;
       }
@@ -4985,12 +5015,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))
   );
@@ -4999,15 +5036,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`);
   }
 }
 
@@ -5368,19 +5405,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) {
@@ -5394,6 +5437,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)) {
@@ -5401,6 +5445,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)) {
@@ -5415,7 +5463,7 @@ function injectTokensToEnv(tokens) {
 
 // src/registry/crates.ts
 var import_node_path5 = __toESM(require("path"), 1);
-var import_tinyexec3 = require("tinyexec");
+var import_tinyexec4 = require("tinyexec");
 
 // src/registry/registry.ts
 var Registry = class {
@@ -5435,6 +5483,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);
@@ -5455,7 +5511,7 @@ var CratesRegistry = class extends Registry {
   }
   async isInstalled() {
     try {
-      await (0, import_tinyexec3.exec)("cargo", ["--version"]);
+      await (0, import_tinyexec4.exec)("cargo", ["--version"]);
       return true;
     } catch {
       return false;
@@ -5496,12 +5552,12 @@ var CratesRegistry = class extends Registry {
       if (manifestDir) {
         args.push("--manifest-path", import_node_path5.default.join(manifestDir, "Cargo.toml"));
       }
-      await (0, import_tinyexec3.exec)("cargo", args, { throwOnError: true });
+      await (0, import_tinyexec4.exec)("cargo", args, { throwOnError: true });
       return true;
     } catch (error) {
-      const stderr = error instanceof import_tinyexec3.NonZeroExitError ? error.output?.stderr : void 0;
+      const stderr = error instanceof import_tinyexec4.NonZeroExitError ? 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 });
     }
   }
@@ -5511,11 +5567,11 @@ ${stderr}` : "Failed to run `cargo publish`";
       if (manifestDir) {
         args.push("--manifest-path", import_node_path5.default.join(manifestDir, "Cargo.toml"));
       }
-      await (0, import_tinyexec3.exec)("cargo", args, { throwOnError: true });
+      await (0, import_tinyexec4.exec)("cargo", args, { throwOnError: true });
     } catch (error) {
-      const stderr = error instanceof import_tinyexec3.NonZeroExitError ? error.output?.stderr : void 0;
+      const stderr = error instanceof import_tinyexec4.NonZeroExitError ? 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 });
     }
   }
@@ -5637,7 +5693,7 @@ var cratesPublishTasks = createCratesPublishTask();
 var import_prompt_adapter_enquirer = require("@listr2/prompt-adapter-enquirer");
 
 // src/registry/jsr.ts
-var import_tinyexec4 = require("tinyexec");
+var import_tinyexec5 = require("tinyexec");
 
 // src/utils/package-name.ts
 var import_node_module = require("module");
@@ -5648,7 +5704,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`
@@ -5694,7 +5750,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) {
@@ -5705,7 +5761,7 @@ var JsrRegisry = class extends Registry {
     this.client = new JsrClient(getApiEndpoint(this.registry));
   }
   async jsr(args) {
-    const { stdout } = await (0, import_tinyexec4.exec)("jsr", args, { throwOnError: true });
+    const { stdout } = await (0, import_tinyexec5.exec)("jsr", args, { throwOnError: true });
     return stdout;
   }
   async isInstalled() {
@@ -5721,7 +5777,7 @@ var JsrRegisry = class extends Registry {
   }
   async ping() {
     try {
-      const { stdout } = await (0, import_tinyexec4.exec)(
+      const { stdout } = await (0, import_tinyexec5.exec)(
         "ping",
         [new URL(this.registry).hostname, "-c", "1"],
         { throwOnError: true }
@@ -5736,7 +5792,7 @@ var JsrRegisry = class extends Registry {
   }
   async publish() {
     try {
-      await (0, import_tinyexec4.exec)(
+      await (0, import_tinyexec5.exec)(
         "jsr",
         ["publish", "--allow-dirty", "--token", `${JsrClient.token}`],
         {
@@ -5746,7 +5802,7 @@ var JsrRegisry = class extends Registry {
       this.packageCreationUrls = void 0;
       return true;
     } catch (error) {
-      const stderr = error instanceof import_tinyexec4.NonZeroExitError ? error.output?.stderr : void 0;
+      const stderr = error instanceof import_tinyexec5.NonZeroExitError ? 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]
@@ -5767,7 +5823,7 @@ ${stderr}` : ""}`,
   }
   async dryRunPublish() {
     try {
-      await (0, import_tinyexec4.exec)(
+      await (0, import_tinyexec5.exec)(
         "jsr",
         [
           "publish",
@@ -5779,9 +5835,14 @@ ${stderr}` : ""}`,
         { throwOnError: true }
       );
     } catch (error) {
-      throw new JsrError("Failed to run `jsr publish --dry-run`", {
-        cause: error
-      });
+      const stderr = error instanceof import_tinyexec5.NonZeroExitError ? error.output?.stderr : void 0;
+      throw new JsrError(
+        `Failed to run \`jsr publish --dry-run\`${stderr ? `
+${stderr}` : ""}`,
+        {
+          cause: error
+        }
+      );
     }
   }
   async version() {
@@ -5813,7 +5874,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);
@@ -6041,7 +6102,7 @@ async function jsrRegistry() {
 // src/registry/npm.ts
 var import_node_os = require("os");
 var import_node_path6 = require("path");
-var import_tinyexec5 = require("tinyexec");
+var import_tinyexec6 = require("tinyexec");
 var NpmError = class extends AbstractError {
   constructor() {
     super(...arguments);
@@ -6054,7 +6115,7 @@ var NpmRegistry = class extends Registry {
     __publicField(this, "registry", "https://registry.npmjs.org");
   }
   async npm(args) {
-    const { stdout } = await (0, import_tinyexec5.exec)("npm", args, { throwOnError: true });
+    const { stdout } = await (0, import_tinyexec6.exec)("npm", args, { throwOnError: true });
     return stdout;
   }
   async isInstalled() {
@@ -6111,7 +6172,7 @@ var NpmRegistry = class extends Registry {
       await this.npm(["whoami"]);
       return true;
     } catch (error) {
-      if (error instanceof import_tinyexec5.NonZeroExitError) {
+      if (error instanceof import_tinyexec6.NonZeroExitError) {
         return false;
       }
       throw new NpmError("Failed to run `npm whoami`", { cause: error });
@@ -6178,7 +6239,7 @@ var NpmRegistry = class extends Registry {
   }
   async ping() {
     try {
-      await (0, import_tinyexec5.exec)("npm", ["ping"], { throwOnError: true });
+      await (0, import_tinyexec6.exec)("npm", ["ping"], { throwOnError: true });
       return true;
     } catch (error) {
       throw new NpmError("Failed to run `npm ping`", { cause: error });
@@ -6189,7 +6250,7 @@ var NpmRegistry = class extends Registry {
       await this.npm(["publish", "--provenance", "--access", "public"]);
       return true;
     } catch (error) {
-      if (error instanceof import_tinyexec5.NonZeroExitError && error.output?.stderr.includes("EOTP")) {
+      if (error instanceof import_tinyexec6.NonZeroExitError && error.output?.stderr.includes("EOTP")) {
         return false;
       }
       throw this.classifyPublishError(error);
@@ -6201,7 +6262,7 @@ var NpmRegistry = class extends Registry {
       await this.npm(args);
       return true;
     } catch (error) {
-      if (error instanceof import_tinyexec5.NonZeroExitError && error.output?.stderr.includes("EOTP")) {
+      if (error instanceof import_tinyexec6.NonZeroExitError && error.output?.stderr.includes("EOTP")) {
         return false;
       }
       throw this.classifyPublishError(error);
@@ -6209,7 +6270,7 @@ var NpmRegistry = class extends Registry {
   }
   async dryRunPublish() {
     try {
-      await (0, import_tinyexec5.exec)("npm", ["publish", "--dry-run"], {
+      await (0, import_tinyexec6.exec)("npm", ["publish", "--dry-run"], {
         throwOnError: true,
         nodeOptions: {
           env: {
@@ -6219,7 +6280,7 @@ var NpmRegistry = class extends Registry {
         }
       });
     } catch (error) {
-      const stderr = error instanceof import_tinyexec5.NonZeroExitError ? error.output?.stderr : void 0;
+      const stderr = error instanceof import_tinyexec6.NonZeroExitError ? error.output?.stderr : void 0;
       throw new NpmError(
         `Failed to run \`npm publish --dry-run\`${stderr ? `
 ${stderr}` : ""}`,
@@ -6246,7 +6307,7 @@ ${stderr}` : ""}`,
     };
   }
   classifyPublishError(error) {
-    if (error instanceof import_tinyexec5.NonZeroExitError) {
+    if (error instanceof import_tinyexec6.NonZeroExitError) {
       const stderr = error.output?.stderr ?? "";
       if (stderr.includes("EOTP")) {
         return new NpmError("OTP required for publishing", { cause: error });
@@ -6783,7 +6844,7 @@ var npmPublishTasks = {
 // src/tasks/preflight.ts
 var import_node_crypto2 = require("crypto");
 var import_prompt_adapter_enquirer4 = require("@listr2/prompt-adapter-enquirer");
-var import_tinyexec6 = require("tinyexec");
+var import_tinyexec7 = require("tinyexec");
 var PreflightError = class extends AbstractError {
   constructor() {
     super(...arguments);
@@ -6796,10 +6857,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 (0, import_tinyexec7.exec)("npm", ["whoami"]);
+      const username = result.stdout.trim();
+      if (username) tokenUrl = tokenUrl.replace("~", username);
+    }
     task.output = `Enter ${config.promptLabel}`;
     const token = await task.prompt(import_prompt_adapter_enquirer4.ListrEnquirerPromptAdapter).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);
@@ -6810,7 +6879,7 @@ async function syncGhSecrets(tokens) {
   for (const [registry, token] of Object.entries(tokens)) {
     const config = TOKEN_CONFIG[registry];
     if (!config) continue;
-    const result = (0, import_tinyexec6.exec)("gh", ["secret", "set", config.ghSecretName], {
+    const result = (0, import_tinyexec7.exec)("gh", ["secret", "set", config.ghSecretName], {
       throwOnError: true
     });
     const proc = result.process;
@@ -7004,10 +7073,10 @@ var prerequisitesCheckTask = (options) => {
 var import_prompt_adapter_enquirer6 = require("@listr2/prompt-adapter-enquirer");
 
 // src/registry/custom-registry.ts
-var import_tinyexec7 = require("tinyexec");
+var import_tinyexec8 = require("tinyexec");
 var CustomRegistry = class extends NpmRegistry {
   async npm(args) {
-    const { stdout } = await (0, import_tinyexec7.exec)(
+    const { stdout } = await (0, import_tinyexec8.exec)(
       "npm",
       args.concat("--registry", this.registry),
       { throwOnError: true }
@@ -7288,6 +7357,12 @@ async function run(options) {
     promptEnabled: !import_std_env.isCI && import_node_process8.default.stdin.isTTY
   };
   let cleanupEnv;
+  const onSigint = async () => {
+    cleanupEnv?.();
+    await rollback();
+    import_node_process8.default.exit(130);
+  };
+  import_node_process8.default.on("SIGINT", onSigint);
   try {
     if (options.contents) import_node_process8.default.chdir(options.contents);
     if (options.preflight) {
@@ -7329,7 +7404,7 @@ async function run(options) {
           task: async (ctx2) => {
             const packageManager = await getPackageManager();
             try {
-              await (0, import_tinyexec8.exec)(packageManager, ["run", ctx2.testScript], {
+              await (0, import_tinyexec9.exec)(packageManager, ["run", ctx2.testScript], {
                 throwOnError: true
               });
             } catch (error) {
@@ -7346,7 +7421,7 @@ async function run(options) {
           task: async (ctx2) => {
             const packageManager = await getPackageManager();
             try {
-              await (0, import_tinyexec8.exec)(packageManager, ["run", ctx2.buildScript], {
+              await (0, import_tinyexec9.exec)(packageManager, ["run", ctx2.buildScript], {
                 throwOnError: true
               });
             } catch (error) {
@@ -7367,23 +7442,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}`
                   );
                 }
@@ -7478,6 +7558,7 @@ ${repositoryUrl}/compare/${lastRev}...${latestTag}`;
         parts.push(`${color.bold(name)} on ${color.red("crates.io")}`);
       }
     }
+    import_node_process8.default.removeListener("SIGINT", onSigint);
     if (options.preflight) {
       cleanupEnv?.();
       console.log(
@@ -7495,6 +7576,7 @@ ${repositoryUrl}/compare/${lastRev}...${latestTag}`;
       );
     }
   } catch (e2) {
+    import_node_process8.default.removeListener("SIGINT", onSigint);
     cleanupEnv?.();
     consoleError(e2);
     await rollback();