versionary 1.1.0 → 1.3.0

package/dist/action/index.js

@@ -48,6 +48,24 @@ function getRemoteRefSha(cwd, ref) {
         return null;
     }
 }
+function hasVersionaryReleaseMarker(cwd, sha) {
+    try {
+        const message = runGit(cwd, ["show", "-s", "--format=%B", sha]);
+        return /^Versionary-Release:\s*true$/imu.test(message);
+    }
+    catch {
+        return false;
+    }
+}
+function isAncestor(cwd, ancestor, descendant) {
+    try {
+        runGit(cwd, ["merge-base", "--is-ancestor", ancestor, descendant]);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 function setOutput(name, value) {
     const outputPath = process.env.GITHUB_OUTPUT;
     if (!outputPath) {
@@ -98,26 +116,31 @@ function main() {
         hasOriginRemote(cwd)) {
         const remoteSha = getRemoteRefSha(cwd, ref);
         if (remoteSha && remoteSha !== sha) {
-            const staleMessage = `Skipping stale push run for ${sha.slice(0, 7)}; ` +
-                `${ref} now points to ${remoteSha.slice(0, 7)}.`;
-            const stalePayload = {
-                action: "stale-run-skipped",
-                message: staleMessage,
-                releaseCreated: false,
-                tagNames: [],
-            };
-            process.stdout.write(`${JSON.stringify(stalePayload)}\n`);
-            setOutput("action", stalePayload.action);
-            setOutput("message", stalePayload.message);
-            setOutput("release_created", "false");
-            setOutput("tag_name", "");
-            setOutput("tag_names", "[]");
-            setOutput("release_targets", "[]");
-            setOutput("review_url", "");
-            setOutput("review_requests", "[]");
-            setOutput("branch", "");
-            setOutput("title", "");
-            return;
+            // Descendant pushes must not turn an otherwise valid release into a
+            // recovery cycle.
+            const releaseCanPublish = hasVersionaryReleaseMarker(cwd, sha) && isAncestor(cwd, sha, remoteSha);
+            if (!releaseCanPublish) {
+                const staleMessage = `Skipping stale push run for ${sha.slice(0, 7)}; ` +
+                    `${ref} now points to ${remoteSha.slice(0, 7)}.`;
+                const stalePayload = {
+                    action: "stale-run-skipped",
+                    message: staleMessage,
+                    releaseCreated: false,
+                    tagNames: [],
+                };
+                process.stdout.write(`${JSON.stringify(stalePayload)}\n`);
+                setOutput("action", stalePayload.action);
+                setOutput("message", stalePayload.message);
+                setOutput("release_created", "false");
+                setOutput("tag_name", "");
+                setOutput("tag_names", "[]");
+                setOutput("release_targets", "[]");
+                setOutput("review_url", "");
+                setOutput("review_requests", "[]");
+                setOutput("branch", "");
+                setOutput("title", "");
+                return;
+            }
         }
     }
     const raw = execFileSync("npx", ["--yes", `versionary@${versionaryVersion}`, "run", "--json"], {

package/dist/config/schema.d.ts

@@ -39,6 +39,7 @@ export declare const configSchema: z.ZodObject<{
             "markdown-changelog": "markdown-changelog";
             "r-news": "r-news";
         }>>;
+        "bump-minor-pre-major": z.ZodOptional<z.ZodBoolean>;
         "allow-stable-major": z.ZodOptional<z.ZodBoolean>;
         "exclude-paths": z.ZodOptional<z.ZodArray<z.ZodString>>;
         "extra-files": z.ZodOptional<z.ZodArray<z.ZodObject<{

package/dist/config/schema.js

@@ -64,12 +64,23 @@ const packageSchema = z
     "package-name": z.string().optional(),
     "changelog-file": z.string().optional(),
     "changelog-format": z.enum(["markdown-changelog", "r-news"]).optional(),
+    "bump-minor-pre-major": z.boolean().optional(),
     "allow-stable-major": z.boolean().optional(),
     "exclude-paths": z.array(z.string()).optional(),
     "extra-files": z.array(artifactRuleSchema).optional(),
     follows: z.array(z.string().min(1)).optional(),
 })
-    .strict();
+    .strict()
+    .superRefine((value, ctx) => {
+    if (value["bump-minor-pre-major"] !== undefined &&
+        value["allow-stable-major"] !== undefined) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: '"bump-minor-pre-major" and "allow-stable-major" are inverse aliases; configure only one.',
+            path: ["bump-minor-pre-major"],
+        });
+    }
+});
 export const configSchema = z
     .object({
     $schema: z.string().optional(),
@@ -98,6 +109,14 @@ export const configSchema = z
 })
     .strict()
     .superRefine((value, ctx) => {
+    if (value["bump-minor-pre-major"] !== undefined &&
+        value["allow-stable-major"] !== undefined) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: '"bump-minor-pre-major" and "allow-stable-major" are inverse aliases; configure only one.',
+            path: ["bump-minor-pre-major"],
+        });
+    }
     const packages = value.packages;
     if (value["separate-release-prs"]) {
         if (!packages || Object.keys(packages).length === 0) {

package/dist/release/changelog.js

@@ -291,7 +291,6 @@ export function prependChangelog(cwd, changelogFile, section, format = "markdown
 export function renderRNewsReleaseNotes(input) {
     const repoUrl = resolveRepositoryWebBaseUrl(input.cwd ?? process.cwd());
     const grouped = groupCommitLines(input.commits, repoUrl);
-    const normalizedVersion = input.nextVersion.replace(/\.\d+$/u, "");
     const sections = [];
     const trimmedHighlights = input.highlights?.trim() ?? "";
     if (trimmedHighlights.length > 0) {
@@ -315,7 +314,7 @@ export function renderRNewsReleaseNotes(input) {
     if (needsOtherChangesFallback(grouped, trimmedHighlights.length > 0, 0)) {
         sections.push("## Other changes", "", ...grouped.other, "");
     }
-    return [`# ${input.packageName} ${normalizedVersion}`, "", ...sections]
+    return [`# ${input.packageName} ${input.nextVersion}`, "", ...sections]
         .join("\n")
         .trimEnd();
 }

package/dist/release/plan.js

@@ -10,6 +10,21 @@ import { readBaselineSha, readReleaseTargets } from "./state.js";
 function getMode(configMode) {
     return configMode ?? "independent";
 }
+function resolveBumpMinorPreMajor(config, packageConfig) {
+    if (packageConfig?.["bump-minor-pre-major"] !== undefined) {
+        return packageConfig["bump-minor-pre-major"];
+    }
+    if (packageConfig?.["allow-stable-major"] !== undefined) {
+        return !packageConfig["allow-stable-major"];
+    }
+    if (config["bump-minor-pre-major"] !== undefined) {
+        return config["bump-minor-pre-major"];
+    }
+    if (config["allow-stable-major"] !== undefined) {
+        return !config["allow-stable-major"];
+    }
+    return true;
+}
 export function getChangelogDefaults(config) {
     const changelogFormat = config["changelog-format"] ??
         config.defaultChangelogFormat ??
@@ -50,9 +65,8 @@ export function createReleasePlan(cwd = process.cwd()) {
     const releaseBranchPrefix = loaded.config["release-branch"] ?? "versionary/release";
     const baselineSha = readBaselineSha(cwd) ?? loaded.config["bootstrap-sha"] ?? null;
     const releaseTargetByPath = new Map(readReleaseTargets(cwd).map((target) => [target.path, target]));
-    const allowStableMajor = loaded.config["allow-stable-major"] ?? false;
-    const allowStableMajorForPath = (packagePath) => loaded.config.packages?.[packagePath]?.["allow-stable-major"] ??
-        allowStableMajor;
+    const bumpMinorPreMajor = resolveBumpMinorPreMajor(loaded.config);
+    const bumpMinorPreMajorForPath = (packagePath) => resolveBumpMinorPreMajor(loaded.config, loaded.config.packages?.[packagePath]);
     const monorepoMode = getMode(loaded.config["monorepo-mode"]);
     const buildPackagePlan = (pkg) => {
         const packageContext = resolvePackageStrategyContext(loaded.config, pkg.path, pkg.config);
@@ -95,7 +109,7 @@ export function createReleasePlan(cwd = process.cwd()) {
             releaseType = analyzedType;
             nextVersion = releaseType
                 ? bumpVersion(packageCurrentVersion, releaseType, {
-                    allowStableMajor: allowStableMajorForPath(pkg.path),
+                    bumpMinorPreMajor: bumpMinorPreMajorForPath(pkg.path),
                 })
                 : null;
             bumpReason = nextVersion ? "direct" : undefined;
@@ -170,7 +184,7 @@ export function createReleasePlan(cwd = process.cwd()) {
         const current = packageCurrentVersionByPath[target.path] ?? target.currentVersion;
         target.releaseType = "patch";
         target.nextVersion = bumpVersion(current, "patch", {
-            allowStableMajor: allowStableMajorForPath(target.path),
+            bumpMinorPreMajor: bumpMinorPreMajorForPath(target.path),
         });
         target.bumpReason = reason;
         const strategyContext = strategyContextByPath.get(target.path);
@@ -203,7 +217,7 @@ export function createReleasePlan(cwd = process.cwd()) {
         }
         const hypotheticalVersion = strategyContext.nextVersion ??
             bumpVersion(packageCurrentVersionByPath[sourcePath] ??
-                strategyContext.currentVersion, "patch", { allowStableMajor: allowStableMajorForPath(sourcePath) });
+                strategyContext.currentVersion, "patch", { bumpMinorPreMajor: bumpMinorPreMajorForPath(sourcePath) });
         return strategyGroup.strategy.propagateDependentPatchImpacts(cwd, strategyGroup.packages.map((pkg) => ({
             ...pkg,
             nextVersion: pkg.packagePath === sourcePath ? hypotheticalVersion : null,
@@ -387,7 +401,7 @@ export function createReleasePlan(cwd = process.cwd()) {
         const baseVersion = packageCurrentVersionByPath[pkgPlan.path] ?? pkgPlan.currentVersion;
         const nextVersion = combinedReleaseType
             ? bumpVersion(baseVersion, combinedReleaseType, {
-                allowStableMajor: allowStableMajorForPath(pkgPlan.path),
+                bumpMinorPreMajor: bumpMinorPreMajorForPath(pkgPlan.path),
             })
             : null;
         return {
@@ -429,7 +443,9 @@ export function createReleasePlan(cwd = process.cwd()) {
         const fixedNextVersion = rootOverridden
             ? rootPackagePlan.nextVersion
             : analyzedFixedType
-                ? bumpVersion(fixedBaseVersion, analyzedFixedType, { allowStableMajor })
+                ? bumpVersion(fixedBaseVersion, analyzedFixedType, {
+                    bumpMinorPreMajor,
+                })
                 : null;
         // Fixed mode can promote unchanged dependencies into the release, so the
         // final shared version set must drive dependency attribution.
@@ -466,7 +482,7 @@ export function createReleasePlan(cwd = process.cwd()) {
         ? rootPackagePlan.nextVersion
         : analyzedOverallType
             ? bumpVersion(overallBaseVersion, analyzedOverallType, {
-                allowStableMajor,
+                bumpMinorPreMajor,
             })
             : null;
     return {

package/dist/release/semver.d.ts

@@ -8,7 +8,7 @@ export interface ParsedVersion {
     build: string[];
 }
 export interface BumpVersionOptions {
-    allowStableMajor?: boolean;
+    bumpMinorPreMajor?: boolean;
 }
 export declare function parseVersion(version: string): ParsedVersion;
 export declare function isValidVersion(version: string): boolean;

package/dist/release/semver.js

@@ -137,14 +137,11 @@ export function compareVersions(leftRaw, rightRaw) {
 }
 export function bumpVersion(current, releaseType, options = {}) {
     const parsed = parseVersion(current);
-    const allowStableMajor = options.allowStableMajor ?? false;
+    const bumpMinorPreMajor = options.bumpMinorPreMajor ?? true;
     if (releaseType === "major") {
-        if (parsed.major === 0 && !allowStableMajor) {
+        if (parsed.major === 0 && bumpMinorPreMajor) {
             return `0.${parsed.minor + 1}.0`;
         }
-        if (parsed.major === 0 && allowStableMajor) {
-            return "1.0.0";
-        }
         return `${parsed.major + 1}.0.0`;
     }
     if (releaseType === "minor") {

package/dist/types/config.d.ts

@@ -14,6 +14,7 @@ export interface VersionaryPackage {
     "package-name"?: string;
     "changelog-file"?: string;
     "changelog-format"?: VersionaryChangelogFormat;
+    "bump-minor-pre-major"?: boolean;
     "allow-stable-major"?: boolean;
     "exclude-paths"?: string[];
     "extra-files"?: VersionaryArtifactRule[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "versionary",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "description": "Automatic release framework based on conventional commits and semantic versioning",
   "keywords": [
     "releasing",