pubm 0.1.4 → 0.1.5

package/bin/cli.js

@@ -2416,15 +2416,15 @@ var isCompatibleTerminal = tty && tty.isatty && tty.isatty(1) && env.TERM && !is
 var isCI = "CI" in env && ("GITHUB_ACTIONS" in env || "GITLAB_CI" in env || "CIRCLECI" in env);
 var isColorSupported = !isDisabled && (isForced || isWindows && !isDumbTerminal || isCompatibleTerminal || isCI);
 var replaceClose = (index, string, close, replace, head = string.substring(0, index) + replace, tail = string.substring(index + close.length), next = tail.indexOf(close)) => head + (next < 0 ? tail : replaceClose(next, tail, close, replace));
-var clearBleed = (index, string, open3, close, replace) => index < 0 ? open3 + string + close : open3 + replaceClose(index, string, close, replace) + close;
-var filterEmpty = (open3, close, replace = open3, at = open3.length + 1) => (string) => string || !(string === "" || string === void 0) ? clearBleed(
+var clearBleed = (index, string, open4, close, replace) => index < 0 ? open4 + string + close : open4 + replaceClose(index, string, close, replace) + close;
+var filterEmpty = (open4, close, replace = open4, at = open4.length + 1) => (string) => string || !(string === "" || string === void 0) ? clearBleed(
   ("" + string).indexOf(close, at),
   string,
-  open3,
+  open4,
   close,
   replace
 ) : "";
-var init = (open3, close, replace) => filterEmpty(`\x1B[${open3}m`, `\x1B[${close}m`, replace);
+var init = (open4, close, replace) => filterEmpty(`\x1B[${open4}m`, `\x1B[${close}m`, replace);
 var colors = {
   reset: init(0, 0),
   bold: init(1, 22, "\x1B[22m\x1B[1m"),
@@ -4945,7 +4945,8 @@ var Git = class {
   async revisionDiffsCount() {
     try {
       return Number.parseInt(
-        await this.git(["rev-list", "@{u}...HEAD", "--count", "--left-only"])
+        await this.git(["rev-list", "@{u}...HEAD", "--count", "--left-only"]),
+        10
       );
     } catch (error) {
       throw new GitError(
@@ -5145,6 +5146,80 @@ var Git = class {
   }
 };
 
+// src/config/defaults.ts
+var defaultValidate = {
+  cleanInstall: true,
+  entryPoints: true,
+  extraneousFiles: true
+};
+var defaultSnapshot = {
+  useCalculatedVersion: false,
+  prereleaseTemplate: "{tag}-{timestamp}"
+};
+var defaultConfig = {
+  versioning: "independent",
+  branch: "main",
+  changelog: true,
+  changelogFormat: "default",
+  commit: false,
+  access: "public",
+  fixed: [],
+  linked: [],
+  updateInternalDependencies: "patch",
+  ignore: [],
+  tag: "latest",
+  contents: ".",
+  saveToken: true,
+  releaseDraft: true,
+  releaseNotes: true,
+  registries: ["npm", "jsr"],
+  rollbackStrategy: "individual"
+};
+function resolveConfig(config) {
+  const packages = config.packages ?? [
+    { path: ".", registries: ["npm", "jsr"] }
+  ];
+  return {
+    ...defaultConfig,
+    ...config,
+    packages,
+    validate: { ...defaultValidate, ...config.validate },
+    snapshot: { ...defaultSnapshot, ...config.snapshot }
+  };
+}
+
+// src/config/loader.ts
+import { stat } from "node:fs/promises";
+import path6 from "node:path";
+var CONFIG_FILES = [
+  "pubm.config.ts",
+  "pubm.config.mts",
+  "pubm.config.cts",
+  "pubm.config.js",
+  "pubm.config.mjs",
+  "pubm.config.cjs"
+];
+async function findConfigFile(cwd) {
+  for (const file of CONFIG_FILES) {
+    const filePath = path6.join(cwd, file);
+    try {
+      if ((await stat(filePath)).isFile()) {
+        return filePath;
+      }
+    } catch {
+    }
+  }
+  return null;
+}
+async function loadConfig(cwd = process.cwd()) {
+  const configPath = await findConfigFile(cwd);
+  if (!configPath) return null;
+  const { createJiti } = await import("jiti");
+  const jiti = createJiti(cwd, { interopDefault: true });
+  const mod = await jiti.import(configPath);
+  return mod.default ?? mod;
+}
+
 // src/options.ts
 var defaultOptions = {
   testScript: "test",
@@ -5154,13 +5229,16 @@ var defaultOptions = {
   registries: ["npm", "jsr"]
 };
 function resolveOptions(options) {
-  const nextOptions = { ...options, ...defaultOptions };
+  const defined = Object.fromEntries(
+    Object.entries(options).filter(([, v]) => v !== void 0)
+  );
+  const nextOptions = { ...defaultOptions, ...defined };
   return nextOptions;
 }
 
 // src/tasks/runner.ts
 import process14 from "node:process";
-import npmCli2 from "@npmcli/promise-spawn";
+import npmCli3 from "@npmcli/promise-spawn";
 import SemVer from "semver";
 import { isCI as isCI2 } from "std-env";
 import { exec as exec7 } from "tinyexec";
@@ -5211,8 +5289,8 @@ function createListr(...args) {
 }
 
 // src/utils/package.ts
-import { readFile, stat, writeFile } from "node:fs/promises";
-import path6 from "node:path";
+import { readFile, stat as stat2, writeFile } from "node:fs/promises";
+import path7 from "node:path";
 import process11 from "node:process";
 var cachedPackageJson = {};
 var cachedJsrJson = {};
@@ -5222,16 +5300,16 @@ function patchCachedJsrJson(contents, { cwd = process11.cwd() } = {}) {
 async function findOutFile(file, { cwd = process11.cwd() } = {}) {
   let directory = cwd;
   let filePath = "";
-  const { root } = path6.parse(cwd);
+  const { root } = path7.parse(cwd);
   while (directory) {
-    filePath = path6.join(directory, file);
+    filePath = path7.join(directory, file);
     try {
-      if ((await stat(filePath)).isFile()) {
+      if ((await stat2(filePath)).isFile()) {
         break;
       }
     } catch {
     }
-    directory = path6.dirname(directory);
+    directory = path7.dirname(directory);
     if (directory === root) return null;
   }
   return filePath;
@@ -5417,8 +5495,8 @@ async function getPackageManager() {
 }
 
 // src/ecosystem/rust.ts
-import { readFile as readFile2, stat as stat2, writeFile as writeFile2 } from "node:fs/promises";
-import path7 from "node:path";
+import { readFile as readFile2, stat as stat3, writeFile as writeFile2 } from "node:fs/promises";
+import path8 from "node:path";
 import { parse, stringify } from "smol-toml";
 
 // src/ecosystem/ecosystem.ts
@@ -5432,14 +5510,14 @@ var Ecosystem = class {
 var RustEcosystem = class extends Ecosystem {
   static async detect(packagePath) {
     try {
-      return (await stat2(path7.join(packagePath, "Cargo.toml"))).isFile();
+      return (await stat3(path8.join(packagePath, "Cargo.toml"))).isFile();
     } catch {
       return false;
     }
   }
   async readCargoToml() {
     const raw = await readFile2(
-      path7.join(this.packagePath, "Cargo.toml"),
+      path8.join(this.packagePath, "Cargo.toml"),
       "utf-8"
     );
     return parse(raw);
@@ -5455,7 +5533,7 @@ var RustEcosystem = class extends Ecosystem {
     return pkg.version;
   }
   async writeVersion(newVersion) {
-    const filePath = path7.join(this.packagePath, "Cargo.toml");
+    const filePath = path8.join(this.packagePath, "Cargo.toml");
     const raw = await readFile2(filePath, "utf-8");
     const cargo = parse(raw);
     const pkg = cargo.package;
@@ -5641,6 +5719,7 @@ var cratesPublishTasks = {
 // src/tasks/jsr.ts
 import process12 from "node:process";
 import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
+import npmCli from "@npmcli/promise-spawn";
 
 // src/registry/jsr.ts
 import { exec as exec4, NonZeroExitError } from "tinyexec";
@@ -5648,7 +5727,7 @@ import { exec as exec4, NonZeroExitError } from "tinyexec";
 // src/utils/db.ts
 import { createCipheriv, createDecipheriv, createHash } from "node:crypto";
 import { mkdirSync as mkdirSync5, readFileSync as readFileSync3, statSync, writeFileSync as writeFileSync4 } from "node:fs";
-import path8 from "node:path";
+import path9 from "node:path";
 var a = "aes-256-cbc";
 var n = statSync(import.meta.dirname);
 var k = `${n.rdev}${n.birthtimeMs}${n.nlink}${n.gid}`;
@@ -5663,7 +5742,7 @@ function d(g, h) {
 }
 var Db = class {
   constructor() {
-    __publicField(this, "path", path8.resolve(import.meta.dirname, ".pubm"));
+    __publicField(this, "path", path9.resolve(import.meta.dirname, ".pubm"));
     try {
       if (!statSync(this.path).isDirectory()) {
         mkdirSync5(this.path);
@@ -5681,7 +5760,7 @@ var Db = class {
   set(field, value) {
     try {
       writeFileSync4(
-        path8.resolve(
+        path9.resolve(
           this.path,
           Buffer.from(e(field, field)).toString("base64")
         ),
@@ -5695,7 +5774,7 @@ var Db = class {
     }
   }
   get(field) {
-    const filePath = path8.resolve(
+    const filePath = path9.resolve(
       this.path,
       Buffer.from(e(field, field)).toString("base64")
     );
@@ -5777,6 +5856,7 @@ var JsrRegisry = class extends Registry {
     super(packageName, registry);
     __publicField(this, "registry", "https://jsr.io");
     __publicField(this, "client");
+    __publicField(this, "packageCreationUrls");
     this.client = new JsrClient(getApiEndpoint(this.registry));
   }
   async jsr(args) {
@@ -5818,9 +5898,19 @@ var JsrRegisry = class extends Registry {
           throwOnError: true
         }
       );
+      this.packageCreationUrls = void 0;
       return true;
     } catch (error) {
       const stderr = error instanceof 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]
+        );
+        if (urls.length > 0) {
+          this.packageCreationUrls = urls;
+          return false;
+        }
+      }
       throw new JsrError(
         `Failed to run \`jsr publish --allow-dirty --token ***\`${stderr ? `
 ${stderr}` : ""}`,
@@ -6261,6 +6351,7 @@ async function npmRegistry() {
 }
 
 // src/tasks/jsr.ts
+var { open } = npmCli;
 var JsrAvailableError = class extends AbstractError {
   constructor(message, { cause } = {}) {
     super(message, { cause });
@@ -6441,7 +6532,39 @@ var jsrPublishTasks = {
       }
       JsrClient.token = jsrTokenEnv;
     }
-    await jsr.publish();
+    let result = await jsr.publish();
+    if (!result && jsr.packageCreationUrls) {
+      if (ctx.promptEnabled) {
+        task.title = "Running jsr publish (package creation needed)";
+        const urls = jsr.packageCreationUrls;
+        const maxAttempts = 3;
+        task.output = `Package doesn't exist on jsr. Create it at:
+${urls.map((url) => `  ${color.cyan(url)}`).join("\n")}`;
+        open(urls[0]);
+        for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+          await task.prompt(ListrEnquirerPromptAdapter).run({
+            type: "input",
+            message: `Press ${color.bold("enter")} after creating the package on jsr.io${attempt > 1 ? ` (attempt ${attempt}/${maxAttempts})` : ""}`
+          });
+          result = await jsr.publish();
+          if (result) break;
+          if (attempt < maxAttempts) {
+            task.output = "Package still doesn't exist. Please create it and try again.";
+          }
+        }
+        if (!result) {
+          throw new JsrAvailableError(
+            "Package creation not completed after 3 attempts."
+          );
+        }
+        task.title = "Running jsr publish (package created)";
+      } else {
+        throw new JsrAvailableError(
+          `Package doesn't exist on jsr. Create it at:
+${jsr.packageCreationUrls.join("\n")}`
+        );
+      }
+    }
   }
 };
 
@@ -6449,8 +6572,8 @@ var jsrPublishTasks = {
 import { spawn } from "node:child_process";
 import process13 from "node:process";
 import { ListrEnquirerPromptAdapter as ListrEnquirerPromptAdapter2 } from "@listr2/prompt-adapter-enquirer";
-import npmCli from "@npmcli/promise-spawn";
-var { open } = npmCli;
+import npmCli2 from "@npmcli/promise-spawn";
+var { open: open2 } = npmCli2;
 var NpmAvailableError = class extends AbstractError {
   constructor(message, { cause } = {}) {
     super(message, { cause });
@@ -6480,7 +6603,7 @@ var npmAvailableCheckTasks = {
               if (urlMatch && !opened) {
                 opened = true;
                 task.output = `Login at: ${color.cyan(urlMatch[0])}`;
-                open(urlMatch[0]);
+                open2(urlMatch[0]);
                 child.stdin?.write("\n");
               }
             };
@@ -6907,8 +7030,24 @@ var requiredConditionsCheckTask = (options) => createListr({
 });
 
 // src/tasks/runner.ts
-var { open: open2 } = npmCli2;
+var { open: open3 } = npmCli3;
 var { prerelease } = SemVer;
+function collectRegistries(ctx) {
+  if (ctx.packages?.length) {
+    const seen = /* @__PURE__ */ new Set();
+    const result = [];
+    for (const pkg of ctx.packages) {
+      for (const reg of pkg.registries) {
+        if (!seen.has(reg)) {
+          seen.add(reg);
+          result.push(reg);
+        }
+      }
+    }
+    return result;
+  }
+  return ctx.registries;
+}
 async function run(options) {
   const ctx = {
     ...options,
@@ -6928,7 +7067,7 @@ async function run(options) {
       options.publishOnly ? {
         title: "Publishing",
         task: (ctx2, parentTask) => parentTask.newListr(
-          ctx2.registries.map((registry) => {
+          collectRegistries(ctx2).map((registry) => {
             switch (registry) {
               case "npm":
                 return npmPublishTasks;
@@ -7026,7 +7165,7 @@ async function run(options) {
           skip: (ctx2) => options.skipPublish || !!ctx2.preview,
           title: "Publishing",
           task: (ctx2, parentTask) => parentTask.newListr(
-            ctx2.registries.map((registry) => {
+            collectRegistries(ctx2).map((registry) => {
               switch (registry) {
                 case "npm":
                   return npmPublishTasks;
@@ -7079,7 +7218,7 @@ ${repositoryUrl}/compare/${lastRev}...${latestTag}`;
             );
             const linkUrl = link2("Link", releaseDraftUrl.toString());
             task.title += ` ${linkUrl}`;
-            await open2(releaseDraftUrl.toString());
+            await open3(releaseDraftUrl.toString());
           }
         }
       ]
@@ -7103,10 +7242,6 @@ ${repositoryUrl}/compare/${lastRev}...${latestTag}`;
 import process15 from "node:process";
 import { inc } from "semver";
 
-// src/config/loader.ts
-import { stat as stat3 } from "node:fs/promises";
-import path9 from "node:path";
-
 // src/monorepo/discover.ts
 import { existsSync as existsSync6, readdirSync as readdirSync3, statSync as statSync2 } from "node:fs";
 import path10 from "node:path";
@@ -7129,7 +7264,18 @@ import micromatch3 from "micromatch";
 
 // src/index.ts
 async function pubm(options) {
-  const resolvedOptions = resolveOptions({ ...options });
+  const config = await loadConfig();
+  const configOptions = {};
+  if (config) {
+    const resolved = resolveConfig(config);
+    if (resolved.packages) {
+      configOptions.packages = resolved.packages;
+    }
+    if (!options.registries && resolved.registries) {
+      configOptions.registries = resolved.registries;
+    }
+  }
+  const resolvedOptions = resolveOptions({ ...configOptions, ...options });
   await run(resolvedOptions);
 }