@fuman/build 0.0.10 → 0.0.11

package/cli/commands/bump-version.js

@@ -17,7 +17,11 @@ function formatBumpVersionResult(result, withReleaseType) {
   lines.push("");
   lines.push("list of changed packages:");
   for (const { package: pkg, because, prevVersion } of result.changedPackages) {
-    lines.push(`  ${pkg.json.name}${because ? ` (because of ${because.join(", ")})` : ""}: ${prevVersion} → ${pkg.json.version}`);
+    let versionStr = prevVersion;
+    if (!pkg.json.fuman?.ownVersioning) {
+      versionStr += ` → ${pkg.json.version}`;
+    }
+    lines.push(`  ${pkg.json.name}${because ? ` (because of ${because.join(", ")})` : ""}: ${versionStr}`);
   }
   return lines.join("\n");
 }

package/cli/commands/release.js

@@ -7,7 +7,7 @@ import { createGithubRelease } from "../../git/github.js";
 import { getLatestTag, getFirstCommit, gitTagExists } from "../../git/utils.js";
 import { jsrCreatePackages } from "../../jsr/create-packages.js";
 import { generateDenoWorkspace } from "../../jsr/generate-workspace.js";
-import { exec } from "../../misc/exec.js";
+import { exec, ExecError } from "../../misc/exec.js";
 import { collectPackageJsons } from "../../package-json/collect-package-jsons.js";
 import { bumpVersion } from "../../versioning/bump-version.js";
 import { generateChangelog } from "../../versioning/generate-changelog.js";
@@ -218,11 +218,19 @@ ${changelog}`;
             stdio: "inherit",
             throwOnError: true
           });
-          await exec(["git", "push", origin, "--force", "--tags"], {
-            cwd: root,
-            stdio: "inherit",
-            throwOnError: true
-          });
+          try {
+            await exec(["git", "push", origin, "--force", "--tags"], {
+              cwd: root,
+              throwOnError: true
+            });
+          } catch (e) {
+            if (!(e instanceof ExecError)) throw e;
+            if (e.result.stderr.includes(`cannot lock ref 'refs/tags/${tagName}': reference already exists`)) {
+              console.log(`❗ tag ${tagName} already exists on ${origin}, skipping`);
+            } else {
+              throw e;
+            }
+          }
         }
       }
     }

package/index.js

@@ -4,7 +4,7 @@ import { generateDocs } from "./cli/commands/docs.js";
 import { generateDepsGraph } from "./cli/commands/gen-deps-graph.js";
 import { validateWorkspaceDeps } from "./cli/commands/validate-workspace-deps.js";
 import { findChangedFiles, getCommitsBetween, getCurrentBranch, getCurrentCommit, getFirstCommit, getLatestTag, gitTagExists, parseConventionalCommit } from "./git/utils.js";
-import { exec } from "./misc/exec.js";
+import { ExecError, exec } from "./misc/exec.js";
 import { normalizeFilePath } from "./misc/path.js";
 import { determinePublishOrder, sortWorkspaceByPublishOrder } from "./misc/publish-order.js";
 import { getTsconfigFiles, getTsconfigFor } from "./misc/tsconfig.js";
@@ -18,6 +18,7 @@ import { bumpVersion } from "./versioning/bump-version.js";
 import { findProjectChangedFiles, findProjectChangedPackages } from "./versioning/collect-files.js";
 import { generateChangelog } from "./versioning/generate-changelog.js";
 export {
+  ExecError,
   NPM_PACKAGE_NAME_REGEX,
   PackageJsonSchema,
   buildPackage,

package/misc/exec.d.ts

@@ -8,12 +8,17 @@ export interface ExecResult {
     /** exit code of the command */
     exitCode: number;
 }
+export declare class ExecError extends Error {
+    readonly cmd: string[];
+    readonly result: ExecResult;
+    constructor(cmd: string[], result: ExecResult);
+}
 /**
  * execute a command and return its result
  *
  * **differences from node's `child_process.exec()`**:
  * - if `options.stdio` is set to `'inherit'`, the command will be printed to the console (unless `options.quiet` is set to `true`)
- * - on non-zero exit code, the promise will be rejected with an error if `options.throwOnError` is set to `true`
+ * - on non-zero exit code, the promise will be rejected with an {@link ExecError} if `options.throwOnError` is set to `true`
  *
  * @param cmd  command to execute (first element is the command itself, the rest are arguments to it)
  */

package/misc/exec.js

@@ -2,6 +2,15 @@ import path__default from "node:path";
 import process from "node:process";
 import { spawn } from "cross-spawn";
 import { normalizeFilePath } from "./path.js";
+class ExecError extends Error {
+  constructor(cmd, result) {
+    super(`Command exited with code ${result.exitCode}`, {
+      cause: result
+    });
+    this.cmd = cmd;
+    this.result = result;
+  }
+}
 function exec(cmd, options) {
   return new Promise((resolve, reject) => {
     if (options?.stdio === "inherit" && !options.quiet) {
@@ -29,12 +38,10 @@ function exec(cmd, options) {
     proc.on("error", reject);
     proc.on("close", (code) => {
       if (code !== 0 && options?.throwOnError) {
-        reject(new Error(`Command exited with code ${code}`, {
-          cause: {
-            stderr: Buffer.concat(stderr).toString(),
-            exitCode: code,
-            cmd
-          }
+        reject(new ExecError(cmd, {
+          stdout: Buffer.concat(stdout).toString(),
+          stderr: Buffer.concat(stderr).toString(),
+          exitCode: code ?? -1
         }));
       }
       resolve({
@@ -46,5 +53,6 @@ function exec(cmd, options) {
   });
 }
 export {
+  ExecError,
   exec
 };

package/package.json

@@ -1,16 +1,16 @@
 {
     "name": "@fuman/build",
     "type": "module",
-    "version": "0.0.10",
+    "version": "0.0.11",
     "description": "utils for building packages and managing monorepos",
     "license": "MIT",
     "scripts": {},
     "dependencies": {
         "@drizzle-team/brocli": "^0.10.2",
-        "@fuman/fetch": "^0.0.10",
-        "@fuman/io": "^0.0.10",
-        "@fuman/node": "^0.0.10",
-        "@fuman/utils": "^0.0.10",
+        "@fuman/fetch": "^0.0.11",
+        "@fuman/io": "^0.0.11",
+        "@fuman/node": "^0.0.11",
+        "@fuman/utils": "^0.0.11",
         "cross-spawn": "^7.0.5",
         "detect-indent": "^7.0.1",
         "js-yaml": "^4.1.0",