pubm 0.2.9 → 0.2.10

package/bin/cli.js

@@ -4728,6 +4728,12 @@ import { createHash as createHash2 } from "node:crypto";
 import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
 import { exec as exec2 } from "tinyexec";
 
+// src/utils/cli.ts
+var warningBadge = color.bgYellow(" Warning ");
+function link2(text, url) {
+  return `\x1B]8;;${url}\x07${text}\x1B]8;;\x07`;
+}
+
 // src/utils/db.ts
 import { createCipheriv, createDecipheriv, createHash } from "node:crypto";
 import { mkdirSync as mkdirSync5, readFileSync as readFileSync2, statSync, writeFileSync as writeFileSync4 } from "node:fs";
@@ -4805,19 +4811,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) {
@@ -4831,6 +4843,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)) {
@@ -4838,6 +4851,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)) {
@@ -4863,10 +4880,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 exec2("npm", ["whoami"]);
+      const username = result.stdout.trim();
+      if (username) tokenUrl = tokenUrl.replace("~", username);
+    }
     task.output = `Enter ${config.promptLabel}`;
     const token = await task.prompt(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);
@@ -5617,12 +5642,6 @@ var RustEcosystem = class extends Ecosystem {
   }
 };
 
-// src/utils/cli.ts
-var warningBadge = color.bgYellow(" Warning ");
-function link2(text, url) {
-  return `\x1B]8;;${url}\x07${text}\x1B]8;;\x07`;
-}
-
 // src/utils/crate-graph.ts
 async function sortCratesByDependencyOrder(cratePaths) {
   if (cratePaths.length <= 1) return cratePaths;
@@ -6230,7 +6249,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`
@@ -6275,7 +6294,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) {
@@ -6360,9 +6379,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() {
@@ -6394,7 +6418,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);
@@ -7794,6 +7818,12 @@ async function run(options) {
     promptEnabled: !isCI2 && process14.stdin.isTTY
   };
   let cleanupEnv;
+  const onSigint = async () => {
+    cleanupEnv?.();
+    await rollback();
+    process14.exit(130);
+  };
+  process14.on("SIGINT", onSigint);
   try {
     if (options.contents) process14.chdir(options.contents);
     if (options.preflight) {
@@ -7885,9 +7915,14 @@ async function run(options) {
                 try {
                   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) {
                   rollbackError(
                     `Failed to reset commits: ${error instanceof Error ? error.message : error}`
@@ -7984,6 +8019,7 @@ ${repositoryUrl}/compare/${lastRev}...${latestTag}`;
         parts.push(`${color.bold(name)} on ${color.red("crates.io")}`);
       }
     }
+    process14.removeListener("SIGINT", onSigint);
     if (options.preflight) {
       cleanupEnv?.();
       console.log(
@@ -8001,6 +8037,7 @@ ${repositoryUrl}/compare/${lastRev}...${latestTag}`;
       );
     }
   } catch (e2) {
+    process14.removeListener("SIGINT", onSigint);
     cleanupEnv?.();
     consoleError(e2);
     await rollback();

package/dist/index.cjs

@@ -5405,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) {
@@ -5431,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)) {
@@ -5438,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)) {
@@ -5693,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`
@@ -5739,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) {
@@ -5824,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() {
@@ -5858,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);
@@ -6841,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);
@@ -7333,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) {
@@ -7424,9 +7454,14 @@ async function run(options) {
                 try {
                   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) {
                   rollbackError(
                     `Failed to reset commits: ${error instanceof Error ? error.message : error}`
@@ -7523,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(
@@ -7540,6 +7576,7 @@ ${repositoryUrl}/compare/${lastRev}...${latestTag}`;
       );
     }
   } catch (e2) {
+    import_node_process8.default.removeListener("SIGINT", onSigint);
     cleanupEnv?.();
     consoleError(e2);
     await rollback();

package/dist/index.js

@@ -5371,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) {
@@ -5397,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)) {
@@ -5404,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)) {
@@ -5659,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`
@@ -5704,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) {
@@ -5789,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() {
@@ -5823,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);
@@ -6806,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);
@@ -7297,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) {
@@ -7388,9 +7418,14 @@ async function run(options) {
                 try {
                   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) {
                   rollbackError(
                     `Failed to reset commits: ${error instanceof Error ? error.message : error}`
@@ -7487,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(
@@ -7504,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.9",
+  "version": "0.2.10",
   "engines": {
     "node": ">=18",
     "git": ">=2.11.0"