pubm 0.1.5 → 0.1.7

package/bin/cli.js

@@ -5289,9 +5289,71 @@ function createListr(...args) {
 }
 
 // src/utils/package.ts
+import { readFile as readFile2, stat as stat3, writeFile as writeFile2 } from "node:fs/promises";
+import path8 from "node:path";
+import process11 from "node:process";
+
+// src/ecosystem/rust.ts
 import { readFile, stat as stat2, writeFile } from "node:fs/promises";
 import path7 from "node:path";
-import process11 from "node:process";
+import { parse, stringify } from "smol-toml";
+
+// src/ecosystem/ecosystem.ts
+var Ecosystem = class {
+  constructor(packagePath) {
+    this.packagePath = packagePath;
+  }
+};
+
+// src/ecosystem/rust.ts
+var RustEcosystem = class extends Ecosystem {
+  static async detect(packagePath) {
+    try {
+      return (await stat2(path7.join(packagePath, "Cargo.toml"))).isFile();
+    } catch {
+      return false;
+    }
+  }
+  async readCargoToml() {
+    const raw = await readFile(
+      path7.join(this.packagePath, "Cargo.toml"),
+      "utf-8"
+    );
+    return parse(raw);
+  }
+  async packageName() {
+    const cargo = await this.readCargoToml();
+    const pkg = cargo.package;
+    return pkg.name;
+  }
+  async readVersion() {
+    const cargo = await this.readCargoToml();
+    const pkg = cargo.package;
+    return pkg.version;
+  }
+  async writeVersion(newVersion) {
+    const filePath = path7.join(this.packagePath, "Cargo.toml");
+    const raw = await readFile(filePath, "utf-8");
+    const cargo = parse(raw);
+    const pkg = cargo.package;
+    pkg.version = newVersion;
+    await writeFile(filePath, stringify(cargo));
+  }
+  manifestFiles() {
+    return ["Cargo.toml"];
+  }
+  defaultTestCommand() {
+    return "cargo test";
+  }
+  defaultBuildCommand() {
+    return "cargo build --release";
+  }
+  supportedRegistries() {
+    return ["crates"];
+  }
+};
+
+// src/utils/package.ts
 var cachedPackageJson = {};
 var cachedJsrJson = {};
 function patchCachedJsrJson(contents, { cwd = process11.cwd() } = {}) {
@@ -5300,16 +5362,16 @@ function patchCachedJsrJson(contents, { cwd = process11.cwd() } = {}) {
 async function findOutFile(file, { cwd = process11.cwd() } = {}) {
   let directory = cwd;
   let filePath = "";
-  const { root } = path7.parse(cwd);
+  const { root } = path8.parse(cwd);
   while (directory) {
-    filePath = path7.join(directory, file);
+    filePath = path8.join(directory, file);
     try {
-      if ((await stat2(filePath)).isFile()) {
+      if ((await stat3(filePath)).isFile()) {
         break;
       }
     } catch {
     }
-    directory = path7.dirname(directory);
+    directory = path8.dirname(directory);
     if (directory === root) return null;
   }
   return filePath;
@@ -5321,7 +5383,7 @@ async function getPackageJson({
   if (cachedPackageJson[cwd]) return cachedPackageJson[cwd];
   try {
     const packageJsonPath = await findOutFile("package.json");
-    const raw = packageJsonPath && (await readFile(packageJsonPath)).toString();
+    const raw = packageJsonPath && (await readFile2(packageJsonPath)).toString();
     if (!raw) {
       if (!fallbackJsr) {
         throw new Error(
@@ -5354,7 +5416,7 @@ async function getJsrJson({
   if (cachedJsrJson[cwd]) return cachedJsrJson[cwd];
   try {
     const jsrJsonPath = await findOutFile("jsr.json");
-    const raw = jsrJsonPath && (await readFile(jsrJsonPath)).toString();
+    const raw = jsrJsonPath && (await readFile2(jsrJsonPath)).toString();
     if (!raw) {
       if (!fallbackPackage) {
         throw new Error(
@@ -5438,14 +5500,14 @@ async function version({ cwd = process11.cwd() } = {}) {
   return version2;
 }
 var versionRegex = /("version"\s*:\s*")[^"]*(")/;
-async function replaceVersion(version2) {
+async function replaceVersion(version2, packages) {
   const results = await Promise.all([
     (async () => {
       const packageJsonPath = await findOutFile("package.json");
       if (!packageJsonPath) return void 0;
-      const packageJson = (await readFile(packageJsonPath)).toString();
+      const packageJson = (await readFile2(packageJsonPath)).toString();
       try {
-        await writeFile(
+        await writeFile2(
           packageJsonPath,
           packageJson.replace(versionRegex, `$1${version2}$2`)
         );
@@ -5460,9 +5522,9 @@ async function replaceVersion(version2) {
     (async () => {
       const jsrJsonPath = await findOutFile("jsr.json");
       if (!jsrJsonPath) return void 0;
-      const jsrJson = (await readFile(jsrJsonPath)).toString();
+      const jsrJson = (await readFile2(jsrJsonPath)).toString();
       try {
-        await writeFile(
+        await writeFile2(
           jsrJsonPath,
           jsrJson.replace(versionRegex, `$1${version2}$2`)
         );
@@ -5473,7 +5535,19 @@ async function replaceVersion(version2) {
         );
       }
       return "jsr.json";
-    })()
+    })(),
+    ...(packages ?? []).filter((pkg) => pkg.registries.includes("crates")).map(async (pkg) => {
+      const eco = new RustEcosystem(path8.resolve(pkg.path));
+      try {
+        await eco.writeVersion(version2);
+      } catch (error) {
+        throw new AbstractError(
+          `Failed to write version to Cargo.toml at ${pkg.path}: ${error instanceof Error ? error.message : error}`,
+          { cause: error }
+        );
+      }
+      return path8.join(pkg.path, "Cargo.toml");
+    })
   ]);
   return results.filter((v) => v);
 }
@@ -5494,67 +5568,26 @@ async function getPackageManager() {
   return "npm";
 }
 
-// src/ecosystem/rust.ts
-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
-var Ecosystem = class {
-  constructor(packagePath) {
-    this.packagePath = packagePath;
-  }
-};
-
-// src/ecosystem/rust.ts
-var RustEcosystem = class extends Ecosystem {
-  static async detect(packagePath) {
-    try {
-      return (await stat3(path8.join(packagePath, "Cargo.toml"))).isFile();
-    } catch {
-      return false;
+// src/utils/registries.ts
+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;
   }
-  async readCargoToml() {
-    const raw = await readFile2(
-      path8.join(this.packagePath, "Cargo.toml"),
-      "utf-8"
-    );
-    return parse(raw);
-  }
-  async packageName() {
-    const cargo = await this.readCargoToml();
-    const pkg = cargo.package;
-    return pkg.name;
-  }
-  async readVersion() {
-    const cargo = await this.readCargoToml();
-    const pkg = cargo.package;
-    return pkg.version;
-  }
-  async writeVersion(newVersion) {
-    const filePath = path8.join(this.packagePath, "Cargo.toml");
-    const raw = await readFile2(filePath, "utf-8");
-    const cargo = parse(raw);
-    const pkg = cargo.package;
-    pkg.version = newVersion;
-    await writeFile2(filePath, stringify(cargo));
-  }
-  manifestFiles() {
-    return ["Cargo.toml"];
-  }
-  defaultTestCommand() {
-    return "cargo test";
-  }
-  defaultBuildCommand() {
-    return "cargo build --release";
-  }
-  supportedRegistries() {
-    return ["crates"];
-  }
-};
+  return ctx.registries;
+}
 
 // src/registry/crates.ts
+import path9 from "node:path";
 import { exec as exec3 } from "tinyexec";
 
 // src/registry/registry.ts
@@ -5628,9 +5661,13 @@ var CratesRegistry = class extends Registry {
       );
     }
   }
-  async publish() {
+  async publish(manifestDir) {
     try {
-      await exec3("cargo", ["publish"], { throwOnError: true });
+      const args = ["publish"];
+      if (manifestDir) {
+        args.push("--manifest-path", path9.join(manifestDir, "Cargo.toml"));
+      }
+      await exec3("cargo", args, { throwOnError: true });
       return true;
     } catch (error) {
       throw new CratesError("Failed to run `cargo publish`", {
@@ -5686,35 +5723,43 @@ var CratesError2 = class extends AbstractError {
     this.stack = "";
   }
 };
-async function getCrateName() {
-  const eco = new RustEcosystem(process.cwd());
+async function getCrateName(packagePath) {
+  const eco = new RustEcosystem(packagePath ?? process.cwd());
   return await eco.packageName();
 }
-var cratesAvailableCheckTasks = {
-  title: "Checking crates.io availability",
-  task: async () => {
-    const packageName = await getCrateName();
-    const registry = new CratesRegistry(packageName);
-    if (!await registry.isInstalled()) {
-      throw new CratesError2(
-        "cargo is not installed. Please install Rust toolchain to proceed."
-      );
+function createCratesAvailableCheckTask(packagePath) {
+  const label = packagePath ? ` (${packagePath})` : "";
+  return {
+    title: `Checking crates.io availability${label}`,
+    task: async () => {
+      const packageName = await getCrateName(packagePath);
+      const registry = new CratesRegistry(packageName);
+      if (!await registry.isInstalled()) {
+        throw new CratesError2(
+          "cargo is not installed. Please install Rust toolchain to proceed."
+        );
+      }
+      if (!await registry.hasPermission()) {
+        throw new CratesError2(
+          "No crates.io credentials found. Run `cargo login` or set CARGO_REGISTRY_TOKEN."
+        );
+      }
     }
-    if (!await registry.hasPermission()) {
-      throw new CratesError2(
-        "No crates.io credentials found. Run `cargo login` or set CARGO_REGISTRY_TOKEN."
-      );
+  };
+}
+function createCratesPublishTask(packagePath) {
+  const label = packagePath ? ` (${packagePath})` : "";
+  return {
+    title: `Publishing to crates.io${label}`,
+    task: async () => {
+      const packageName = await getCrateName(packagePath);
+      const registry = new CratesRegistry(packageName);
+      await registry.publish(packagePath);
     }
-  }
-};
-var cratesPublishTasks = {
-  title: "Publishing to crates.io",
-  task: async () => {
-    const packageName = await getCrateName();
-    const registry = new CratesRegistry(packageName);
-    await registry.publish();
-  }
-};
+  };
+}
+var cratesAvailableCheckTasks = createCratesAvailableCheckTask();
+var cratesPublishTasks = createCratesPublishTask();
 
 // src/tasks/jsr.ts
 import process12 from "node:process";
@@ -5727,7 +5772,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 path9 from "node:path";
+import path10 from "node:path";
 var a = "aes-256-cbc";
 var n = statSync(import.meta.dirname);
 var k = `${n.rdev}${n.birthtimeMs}${n.nlink}${n.gid}`;
@@ -5742,7 +5787,7 @@ function d(g, h) {
 }
 var Db = class {
   constructor() {
-    __publicField(this, "path", path9.resolve(import.meta.dirname, ".pubm"));
+    __publicField(this, "path", path10.resolve(import.meta.dirname, ".pubm"));
     try {
       if (!statSync(this.path).isDirectory()) {
         mkdirSync5(this.path);
@@ -5760,7 +5805,7 @@ var Db = class {
   set(field, value) {
     try {
       writeFileSync4(
-        path9.resolve(
+        path10.resolve(
           this.path,
           Buffer.from(e(field, field)).toString("base64")
         ),
@@ -5774,7 +5819,7 @@ var Db = class {
     }
   }
   get(field) {
-    const filePath = path9.resolve(
+    const filePath = path10.resolve(
       this.path,
       Buffer.from(e(field, field)).toString("base64")
     );
@@ -6611,9 +6656,7 @@ var npmAvailableCheckTasks = {
             child.stderr?.on("data", onData);
             child.on(
               "close",
-              (code) => code === 0 ? resolve() : reject(
-                new Error(`npm login exited with code ${code}`)
-              )
+              (code) => code === 0 ? resolve() : reject(new Error(`npm login exited with code ${code}`))
             );
             child.on("error", reject);
           });
@@ -6916,7 +6959,7 @@ var requiredConditionsCheckTask = (options) => createListr({
       {
         title: "Ping registries",
         task: (ctx, parentTask2) => parentTask2.newListr(
-          ctx.registries.map((registryKey) => ({
+          collectRegistries(ctx).map((registryKey) => ({
             title: `Ping to ${registryKey}`,
             task: async () => {
               const registry = await getRegistry(registryKey);
@@ -6933,8 +6976,8 @@ var requiredConditionsCheckTask = (options) => createListr({
         task: async (_2, parentTask2) => parentTask2.newListr(
           [
             {
-              enabled: (ctx) => ctx.registries.some((registry) => registry !== "jsr"),
-              title: "Verifying if npm are installed",
+              enabled: (ctx) => collectRegistries(ctx).includes("npm"),
+              title: "Verifying if npm is installed",
               task: async () => {
                 const npm = await npmRegistry();
                 if (!await npm.isInstalled()) {
@@ -6945,7 +6988,9 @@ var requiredConditionsCheckTask = (options) => createListr({
               }
             },
             {
-              enabled: (ctx) => ctx.registries.some((registry) => registry === "jsr"),
+              enabled: (ctx) => collectRegistries(ctx).some(
+                (registry) => registry === "jsr"
+              ),
               title: "Verifying if jsr are installed",
               task: async (_3, task) => {
                 const jsr = await jsrRegistry();
@@ -6976,7 +7021,7 @@ var requiredConditionsCheckTask = (options) => createListr({
       },
       {
         title: "Checking if test and build scripts exist",
-        skip: (ctx) => !needsPackageScripts(ctx.registries),
+        skip: (ctx) => !needsPackageScripts(collectRegistries(ctx)),
         task: async (ctx) => {
           const { scripts } = await getPackageJson();
           const errors = [];
@@ -7004,23 +7049,42 @@ var requiredConditionsCheckTask = (options) => createListr({
       },
       {
         title: "Checking available registries for publishing",
-        task: (ctx, parentTask2) => parentTask2.newListr(
-          ctx.registries.map((registryKey) => {
-            switch (registryKey) {
-              case "npm":
-                return npmAvailableCheckTasks;
-              case "jsr":
-                return jsrAvailableCheckTasks;
-              case "crates":
-                return cratesAvailableCheckTasks;
-              default:
-                return npmAvailableCheckTasks;
-            }
-          }),
-          {
-            concurrent: true
+        task: (ctx, parentTask2) => {
+          if (ctx.packages?.length) {
+            const tasks = ctx.packages.flatMap(
+              (pkg) => pkg.registries.map((registryKey) => {
+                switch (registryKey) {
+                  case "npm":
+                    return npmAvailableCheckTasks;
+                  case "jsr":
+                    return jsrAvailableCheckTasks;
+                  case "crates":
+                    return createCratesAvailableCheckTask(pkg.path);
+                  default:
+                    return npmAvailableCheckTasks;
+                }
+              })
+            );
+            return parentTask2.newListr(tasks, { concurrent: true });
           }
-        )
+          return parentTask2.newListr(
+            collectRegistries(ctx).map((registryKey) => {
+              switch (registryKey) {
+                case "npm":
+                  return npmAvailableCheckTasks;
+                case "jsr":
+                  return jsrAvailableCheckTasks;
+                case "crates":
+                  return cratesAvailableCheckTasks;
+                default:
+                  return npmAvailableCheckTasks;
+              }
+            }),
+            {
+              concurrent: true
+            }
+          );
+        }
       }
     ],
     {
@@ -7032,21 +7096,27 @@ var requiredConditionsCheckTask = (options) => createListr({
 // src/tasks/runner.ts
 var { open: open3 } = npmCli3;
 var { prerelease } = SemVer;
-function collectRegistries(ctx) {
+function registryTask(registry) {
+  switch (registry) {
+    case "npm":
+      return npmPublishTasks;
+    case "jsr":
+      return jsrPublishTasks;
+    case "crates":
+      return cratesPublishTasks;
+    default:
+      return npmPublishTasks;
+  }
+}
+function collectPublishTasks(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.packages.flatMap(
+      (pkg) => pkg.registries.map(
+        (reg) => reg === "crates" ? createCratesPublishTask(pkg.path) : registryTask(reg)
+      )
+    );
   }
-  return ctx.registries;
+  return collectRegistries(ctx).map(registryTask);
 }
 async function run(options) {
   const ctx = {
@@ -7066,21 +7136,9 @@ async function run(options) {
     await createListr(
       options.publishOnly ? {
         title: "Publishing",
-        task: (ctx2, parentTask) => parentTask.newListr(
-          collectRegistries(ctx2).map((registry) => {
-            switch (registry) {
-              case "npm":
-                return npmPublishTasks;
-              case "jsr":
-                return jsrPublishTasks;
-              case "crates":
-                return cratesPublishTasks;
-              default:
-                return npmPublishTasks;
-            }
-          }),
-          { concurrent: true }
-        )
+        task: (ctx2, parentTask) => parentTask.newListr(collectPublishTasks(ctx2), {
+          concurrent: true
+        })
       } : [
         {
           skip: options.skipTests,
@@ -7149,7 +7207,10 @@ async function run(options) {
               }
             }, ctx2);
             await git.reset();
-            const replaced = await replaceVersion(ctx2.version);
+            const replaced = await replaceVersion(
+              ctx2.version,
+              ctx2.packages
+            );
             for (const replacedFile of replaced) {
               await git.stage(replacedFile);
             }
@@ -7164,21 +7225,9 @@ async function run(options) {
         {
           skip: (ctx2) => options.skipPublish || !!ctx2.preview,
           title: "Publishing",
-          task: (ctx2, parentTask) => parentTask.newListr(
-            collectRegistries(ctx2).map((registry) => {
-              switch (registry) {
-                case "npm":
-                  return npmPublishTasks;
-                case "jsr":
-                  return jsrPublishTasks;
-                case "crates":
-                  return cratesPublishTasks;
-                default:
-                  return npmPublishTasks;
-              }
-            }),
-            { concurrent: true }
-          )
+          task: (ctx2, parentTask) => parentTask.newListr(collectPublishTasks(ctx2), {
+            concurrent: true
+          })
         },
         {
           title: "Pushing tags to GitHub",
@@ -7223,12 +7272,26 @@ ${repositoryUrl}/compare/${lastRev}...${latestTag}`;
         }
       ]
     ).run(ctx);
-    const npmPackageName = (await getPackageJson()).name;
-    const jsrPackageName = (await getJsrJson()).name;
+    const registries = collectRegistries(ctx);
+    const parts = [];
+    if (registries.includes("npm")) {
+      const npmPackageName = (await getPackageJson()).name;
+      parts.push(`${color.bold(npmPackageName)} on ${color.green("npm")}`);
+    }
+    if (registries.includes("jsr")) {
+      const jsrPackageName = (await getJsrJson()).name;
+      parts.push(`${color.bold(jsrPackageName)} on ${color.yellow("jsr")}`);
+    }
+    if (registries.includes("crates")) {
+      const crateNames = ctx.packages?.filter((pkg) => pkg.registries.includes("crates")).map((pkg) => pkg.path) ?? ["crate"];
+      for (const name of crateNames) {
+        parts.push(`${color.bold(name)} on ${color.red("crates.io")}`);
+      }
+    }
     console.log(
       `
 
-\u{1F680} Successfully published ${color.bold(npmPackageName)} on ${color.green("npm")} and ${color.bold(jsrPackageName)} on ${color.yellow("jsr")} ${color.blueBright(`v${ctx.version}`)} \u{1F680}
+\u{1F680} Successfully published ${parts.join(", ")} ${color.blueBright(`v${ctx.version}`)} \u{1F680}
 `
     );
   } catch (e2) {
@@ -7244,7 +7307,7 @@ import { inc } from "semver";
 
 // src/monorepo/discover.ts
 import { existsSync as existsSync6, readdirSync as readdirSync3, statSync as statSync2 } from "node:fs";
-import path10 from "node:path";
+import path11 from "node:path";
 import micromatch from "micromatch";
 
 // src/monorepo/workspace.ts
@@ -7257,7 +7320,7 @@ import micromatch2 from "micromatch";
 
 // src/validate/entry-points.ts
 import { existsSync as existsSync7 } from "node:fs";
-import path11 from "node:path";
+import path12 from "node:path";
 
 // src/validate/extraneous-files.ts
 import micromatch3 from "micromatch";