@ucdjs/release-scripts 0.1.0-beta.42 → 0.1.0-beta.43

package/dist/index.mjs

@@ -60,6 +60,51 @@ const args = mri(process.argv.slice(2));
 const isDryRun = !!args.dry;
 const isVerbose = !!args.verbose;
 const isForce = !!args.force;
+function toTrimmedString(value) {
+	if (typeof value === "string") {
+		const normalized = value.trim();
+		return normalized.length > 0 ? normalized : void 0;
+	}
+	if (value instanceof Uint8Array) {
+		const normalized = new TextDecoder().decode(value).trim();
+		return normalized.length > 0 ? normalized : void 0;
+	}
+	if (isRecord(value) && typeof value.toString === "function") {
+		const rendered = value.toString();
+		if (typeof rendered === "string" && rendered !== "[object Object]") {
+			const normalized = rendered.trim();
+			return normalized.length > 0 ? normalized : void 0;
+		}
+	}
+}
+function getNestedField(record, keys) {
+	let current = record;
+	for (const key of keys) {
+		if (!isRecord(current) || !(key in current)) return;
+		current = current[key];
+	}
+	return current;
+}
+function extractStderrLike(record) {
+	const candidates = [
+		record.stderr,
+		record.stdout,
+		record.shortMessage,
+		record.originalMessage,
+		getNestedField(record, ["result", "stderr"]),
+		getNestedField(record, ["result", "stdout"]),
+		getNestedField(record, ["output", "stderr"]),
+		getNestedField(record, ["output", "stdout"]),
+		getNestedField(record, ["cause", "stderr"]),
+		getNestedField(record, ["cause", "stdout"]),
+		getNestedField(record, ["cause", "shortMessage"]),
+		getNestedField(record, ["cause", "originalMessage"])
+	];
+	for (const candidate of candidates) {
+		const rendered = toTrimmedString(candidate);
+		if (rendered) return rendered;
+	}
+}
 const ucdjsReleaseOverridesPath = ".github/ucdjs-release.overrides.json";
 const isCI = typeof process.env.CI === "string" && process.env.CI !== "" && process.env.CI.toLowerCase() !== "false";
 const logger = {
@@ -135,7 +180,8 @@ function formatUnknownError(error) {
 		const maybeError = error;
 		if (typeof maybeError.code === "string") base.code = maybeError.code;
 		if (typeof maybeError.status === "number") base.status = maybeError.status;
-		if (typeof maybeError.stderr === "string" && maybeError.stderr.trim()) base.stderr = maybeError.stderr.trim();
+		base.stderr = extractStderrLike(maybeError);
+		if (typeof maybeError.shortMessage === "string" && maybeError.shortMessage.trim() && base.message.startsWith("Process exited with non-zero status")) base.message = maybeError.shortMessage.trim();
 		if (!base.stderr && typeof maybeError.cause === "string" && maybeError.cause.trim()) base.stderr = maybeError.cause.trim();
 		return base;
 	}
@@ -144,7 +190,7 @@ function formatUnknownError(error) {
 		const formatted = { message: typeof error.message === "string" ? error.message : typeof error.error === "string" ? error.error : JSON.stringify(error) };
 		if (typeof error.code === "string") formatted.code = error.code;
 		if (typeof error.status === "number") formatted.status = error.status;
-		if (typeof error.stderr === "string" && error.stderr.trim()) formatted.stderr = error.stderr.trim();
+		formatted.stderr = extractStderrLike(error);
 		return formatted;
 	}
 	return { message: String(error) };
@@ -645,7 +691,7 @@ async function pushBranch(branch, workspaceRoot, options) {
 			"origin",
 			branch
 		];
-		if (options?.forceWithLease) {
+		if (options?.forceWithLease) try {
 			await run("git", [
 				"fetch",
 				"origin",
@@ -656,7 +702,12 @@ async function pushBranch(branch, workspaceRoot, options) {
 			} });
 			args.push("--force-with-lease");
 			logger.info(`Pushing branch: ${farver.green(branch)} ${farver.dim("(with lease)")}`);
-		} else if (options?.force) {
+		} catch (error) {
+			const fetchError = toGitError("pushBranch.fetch", error);
+			if (fetchError.stderr?.includes("couldn't find remote ref") || fetchError.message.includes("couldn't find remote ref")) logger.verbose(`Remote branch origin/${branch} does not exist yet, falling back to regular push without --force-with-lease.`);
+			else return err(fetchError);
+		}
+		else if (options?.force) {
 			args.push("--force");
 			logger.info(`Force pushing branch: ${farver.green(branch)}`);
 		} else logger.info(`Pushing branch: ${farver.green(branch)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ucdjs/release-scripts",
-  "version": "0.1.0-beta.42",
+  "version": "0.1.0-beta.43",
   "description": "@ucdjs release scripts",
   "type": "module",
   "license": "MIT",