pubm 0.1.4 → 0.1.5

package/dist/index.js

@@ -1927,6 +1927,80 @@ var init_cli_truncate = __esm({
   }
 });
 
+// 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 path 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 = path.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",
@@ -1936,13 +2010,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 process10 from "node:process";
-import npmCli2 from "@npmcli/promise-spawn";
+import npmCli3 from "@npmcli/promise-spawn";
 
 // node_modules/.pnpm/eventemitter3@5.0.1/node_modules/eventemitter3/index.mjs
 var import_index = __toESM(require_eventemitter3(), 1);
@@ -1963,15 +2040,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"),
@@ -4497,7 +4574,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(
@@ -4743,8 +4821,8 @@ function createListr(...args) {
 }
 
 // src/utils/package.ts
-import { readFile, stat, writeFile } from "node:fs/promises";
-import path from "node:path";
+import { readFile, stat as stat2, writeFile } from "node:fs/promises";
+import path2 from "node:path";
 import process7 from "node:process";
 var cachedPackageJson = {};
 var cachedJsrJson = {};
@@ -4754,16 +4832,16 @@ function patchCachedJsrJson(contents, { cwd = process7.cwd() } = {}) {
 async function findOutFile(file, { cwd = process7.cwd() } = {}) {
   let directory = cwd;
   let filePath = "";
-  const { root } = path.parse(cwd);
+  const { root } = path2.parse(cwd);
   while (directory) {
-    filePath = path.join(directory, file);
+    filePath = path2.join(directory, file);
     try {
-      if ((await stat(filePath)).isFile()) {
+      if ((await stat2(filePath)).isFile()) {
         break;
       }
     } catch {
     }
-    directory = path.dirname(directory);
+    directory = path2.dirname(directory);
     if (directory === root) return null;
   }
   return filePath;
@@ -4949,8 +5027,8 @@ async function getPackageManager() {
 }
 
 // src/ecosystem/rust.ts
-import { readFile as readFile2, stat as stat2, writeFile as writeFile2 } from "node:fs/promises";
-import path2 from "node:path";
+import { readFile as readFile2, stat as stat3, writeFile as writeFile2 } from "node:fs/promises";
+import path3 from "node:path";
 import { parse, stringify } from "smol-toml";
 
 // src/ecosystem/ecosystem.ts
@@ -4964,14 +5042,14 @@ var Ecosystem = class {
 var RustEcosystem = class extends Ecosystem {
   static async detect(packagePath) {
     try {
-      return (await stat2(path2.join(packagePath, "Cargo.toml"))).isFile();
+      return (await stat3(path3.join(packagePath, "Cargo.toml"))).isFile();
     } catch {
       return false;
     }
   }
   async readCargoToml() {
     const raw = await readFile2(
-      path2.join(this.packagePath, "Cargo.toml"),
+      path3.join(this.packagePath, "Cargo.toml"),
       "utf-8"
     );
     return parse(raw);
@@ -4987,7 +5065,7 @@ var RustEcosystem = class extends Ecosystem {
     return pkg.version;
   }
   async writeVersion(newVersion) {
-    const filePath = path2.join(this.packagePath, "Cargo.toml");
+    const filePath = path3.join(this.packagePath, "Cargo.toml");
     const raw = await readFile2(filePath, "utf-8");
     const cargo = parse(raw);
     const pkg = cargo.package;
@@ -5173,6 +5251,7 @@ var cratesPublishTasks = {
 // src/tasks/jsr.ts
 import process8 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";
@@ -5180,7 +5259,7 @@ import { exec as exec4, NonZeroExitError } from "tinyexec";
 // src/utils/db.ts
 import { createCipheriv, createDecipheriv, createHash } from "node:crypto";
 import { mkdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
-import path3 from "node:path";
+import path4 from "node:path";
 var a = "aes-256-cbc";
 var n = statSync(import.meta.dirname);
 var k = `${n.rdev}${n.birthtimeMs}${n.nlink}${n.gid}`;
@@ -5195,7 +5274,7 @@ function d(g, h) {
 }
 var Db = class {
   constructor() {
-    __publicField(this, "path", path3.resolve(import.meta.dirname, ".pubm"));
+    __publicField(this, "path", path4.resolve(import.meta.dirname, ".pubm"));
     try {
       if (!statSync(this.path).isDirectory()) {
         mkdirSync(this.path);
@@ -5213,7 +5292,7 @@ var Db = class {
   set(field, value) {
     try {
       writeFileSync(
-        path3.resolve(
+        path4.resolve(
           this.path,
           Buffer.from(e(field, field)).toString("base64")
         ),
@@ -5227,7 +5306,7 @@ var Db = class {
     }
   }
   get(field) {
-    const filePath = path3.resolve(
+    const filePath = path4.resolve(
       this.path,
       Buffer.from(e(field, field)).toString("base64")
     );
@@ -5309,6 +5388,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) {
@@ -5350,9 +5430,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}` : ""}`,
@@ -5793,6 +5883,7 @@ async function npmRegistry() {
 }
 
 // src/tasks/jsr.ts
+var { open } = npmCli;
 var JsrAvailableError = class extends AbstractError {
   constructor(message, { cause } = {}) {
     super(message, { cause });
@@ -5973,7 +6064,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")}`
+        );
+      }
+    }
   }
 };
 
@@ -5981,8 +6104,8 @@ var jsrPublishTasks = {
 import { spawn } from "node:child_process";
 import process9 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 });
@@ -6012,7 +6135,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");
               }
             };
@@ -6439,8 +6562,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,
@@ -6460,7 +6599,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;
@@ -6558,7 +6697,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;
@@ -6611,7 +6750,7 @@ ${repositoryUrl}/compare/${lastRev}...${latestTag}`;
             );
             const linkUrl = link2("Link", releaseDraftUrl.toString());
             task.title += ` ${linkUrl}`;
-            await open2(releaseDraftUrl.toString());
+            await open3(releaseDraftUrl.toString());
           }
         }
       ]
@@ -6673,11 +6812,11 @@ function generateChangelog(version2, entries, depUpdates) {
 
 // src/changeset/migrate.ts
 import { copyFileSync, existsSync, mkdirSync as mkdirSync2, readdirSync } from "node:fs";
-import path4 from "node:path";
+import path5 from "node:path";
 import process11 from "node:process";
 var SKIPPED_FILES = /* @__PURE__ */ new Set(["config.json", "README.md"]);
 function migrateFromChangesets(cwd = process11.cwd()) {
-  const changesetDir = path4.join(cwd, ".changeset");
+  const changesetDir = path5.join(cwd, ".changeset");
   if (!existsSync(changesetDir)) {
     return {
       success: false,
@@ -6686,7 +6825,7 @@ function migrateFromChangesets(cwd = process11.cwd()) {
       configMigrated: false
     };
   }
-  const pubmDir = path4.join(cwd, ".pubm", "changesets");
+  const pubmDir = path5.join(cwd, ".pubm", "changesets");
   mkdirSync2(pubmDir, { recursive: true });
   const files = readdirSync(changesetDir);
   const migratedFiles = [];
@@ -6701,15 +6840,15 @@ function migrateFromChangesets(cwd = process11.cwd()) {
     }
     if (file === "pre.json") {
       copyFileSync(
-        path4.join(changesetDir, file),
-        path4.resolve(cwd, ".pubm", "pre.json")
+        path5.join(changesetDir, file),
+        path5.resolve(cwd, ".pubm", "pre.json")
       );
       migratedFiles.push(file);
       continue;
     }
     if (file.endsWith(".md")) {
-      const src = path4.join(changesetDir, file);
-      const dest = path4.join(pubmDir, file);
+      const src = path5.join(changesetDir, file);
+      const dest = path5.join(pubmDir, file);
       copyFileSync(src, dest);
       migratedFiles.push(file);
     }
@@ -6756,10 +6895,10 @@ function parseChangeset(content, fileName) {
 
 // src/changeset/reader.ts
 import { existsSync as existsSync2, readdirSync as readdirSync2, readFileSync as readFileSync2 } from "node:fs";
-import path5 from "node:path";
+import path6 from "node:path";
 import process12 from "node:process";
 function readChangesets(cwd = process12.cwd()) {
-  const changesetsDir = path5.join(cwd, ".pubm", "changesets");
+  const changesetsDir = path6.join(cwd, ".pubm", "changesets");
   if (!existsSync2(changesetsDir)) {
     return [];
   }
@@ -6769,7 +6908,7 @@ function readChangesets(cwd = process12.cwd()) {
     if (!file.endsWith(".md") || file === "README.md") {
       continue;
     }
-    const filePath = path5.join(changesetsDir, file);
+    const filePath = path6.join(changesetsDir, file);
     const content = readFileSync2(filePath, "utf-8");
     changesets.push(parseChangeset(content, file));
   }
@@ -6839,7 +6978,7 @@ function calculateVersionBumps(currentVersions, cwd = process14.cwd()) {
 
 // src/changeset/writer.ts
 import { mkdirSync as mkdirSync3, writeFileSync as writeFileSync2 } from "node:fs";
-import path6 from "node:path";
+import path7 from "node:path";
 import process15 from "node:process";
 import { stringify as stringifyYaml } from "yaml";
 var adjectives = [
@@ -6934,90 +7073,16 @@ ${summary}
   return content;
 }
 function writeChangeset(releases, summary, cwd = process15.cwd()) {
-  const changesetsDir = path6.join(cwd, ".pubm", "changesets");
+  const changesetsDir = path7.join(cwd, ".pubm", "changesets");
   mkdirSync3(changesetsDir, { recursive: true });
   const id = generateChangesetId();
   const fileName = `${id}.md`;
-  const filePath = path6.join(changesetsDir, fileName);
+  const filePath = path7.join(changesetsDir, fileName);
   const content = generateChangesetContent(releases, summary);
   writeFileSync2(filePath, content, "utf-8");
   return filePath;
 }
 
-// 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 as stat3 } from "node:fs/promises";
-import path7 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 = path7.join(cwd, file);
-    try {
-      if ((await stat3(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/config/types.ts
 function defineConfig(config) {
   return config;
@@ -7322,7 +7387,18 @@ function detectExtraneousFiles(files) {
 
 // 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);
 }
 export {

package/package.json

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