rman 2.18.0 → 2.18.2

package/commands/version.command.js

@@ -83,7 +83,8 @@ const config = {
         target: 'both',
         describe: 'Make the bump a prerelease with this identifier (e.g. "beta" -> 1.2.3-beta.0). ' +
             'Running again with the same --preid increments it (-> 1.2.3-beta.1); a different ' +
-            'identifier starts a fresh prerelease line. Ignored when bump is an explicit version. ' +
+            'identifier keeps the version when it already holds the change (2.19.0-alpha.1 -> ' +
+            '2.19.0-beta.0). Ignored when bump is an explicit version. ' +
             'Default: .rmanrc "version.preid", which every member of a group has to agree on.',
         type: 'string',
     },

package/constants.js

@@ -1 +1 @@
-export const version = '2.18.0';
+export const version = '2.18.2';

package/core/classes/version-scheme.d.ts

@@ -133,6 +133,12 @@ export declare class SemverScheme extends VersionScheme {
      * inventing one. Same answer for a release, which has no prerelease at all.
      */
     prereleaseId(version: string): string | undefined;
+    /**
+     * Whether the release a prerelease of `version` leads to already holds a change of size `bump` -
+     * `X.Y.0` a minor, `X.0.0` a major, and anything a patch. The rule `semver.inc` itself applies:
+     * `minor` on `2.19.0-alpha.1` is `2.19.0`, not `2.20.0`.
+     */
+    protected coversBump(version: string, bump: string): boolean;
 }
 /**
  * The default, and what every package gets unless something says otherwise - so nothing about

package/core/classes/version-scheme.js

@@ -128,8 +128,18 @@ export class SemverScheme extends VersionScheme {
          */
         const existing = semver.prerelease(current);
         const sameLine = existing && String(existing[0]) === preid;
-        const preType = sameLine ? 'prerelease' : `pre${releaseType}`;
-        return semver.inc(current, preType, preid) ?? current;
+        if (sameLine)
+            return semver.inc(current, 'prerelease', preid) ?? current;
+        /**
+         * **A prerelease moving to another identifier keeps its version when that version already
+         * holds the change** - `2.19.0-alpha.1` -> `2.19.0-beta.0` for a fix or a feature, since
+         * `2.19.0` is a minor's target already. It moves on only when the change needs more than the
+         * target gives: a breaking change on `2.19.0-alpha.1` is `3.0.0-beta.0`.
+         */
+        if (existing && this.coversBump(current, bump)) {
+            return `${semver.major(current)}.${semver.minor(current)}.${semver.patch(current)}-${preid}.0`;
+        }
+        return semver.inc(current, `pre${releaseType}`, preid) ?? current;
     }
     isPrerelease(version) {
         return !!semver.prerelease(version);
@@ -145,6 +155,22 @@ export class SemverScheme extends VersionScheme {
         const first = semver.prerelease(version)?.[0];
         return typeof first === 'string' ? first : undefined;
     }
+    /**
+     * Whether the release a prerelease of `version` leads to already holds a change of size `bump` -
+     * `X.Y.0` a minor, `X.0.0` a major, and anything a patch. The rule `semver.inc` itself applies:
+     * `minor` on `2.19.0-alpha.1` is `2.19.0`, not `2.20.0`.
+     */
+    /* **Only consulted when the identifier changes.** On the same identifier the counter advances
+     * whatever the size - a permanent `-rev.N` line (`version.preid: rev`) counts revisions of one
+     * upstream version, so a feature there is `rev.9`, not a new base. That is a statement about the
+     * line, and changing it would move `panates/browsery` off the version it wraps. */
+    coversBump(version, bump) {
+        if (bump === 'major')
+            return semver.minor(version) === 0 && semver.patch(version) === 0;
+        if (bump === 'minor')
+            return semver.patch(version) === 0;
+        return true;
+    }
 }
 /**
  * The default, and what every package gets unless something says otherwise - so nothing about

package/core/config/merge-config.js

@@ -114,6 +114,15 @@ origin) {
                 `\`${plain}: ({ value }) => [...value, 'x']\`, or \`"\${{ [...value, 'x'] }}"\` in YAML. ` +
                 `\`value\` is the layers below this one, and spreads as empty when there are none.`);
         }
+        /**
+         * **An empty key says nothing**, so what the layers below said stands. In YAML a key with
+         * nothing after it - `run:` - is `null`, and replacing with it erased the inherited value whole.
+         * Measured on `abisena/syncbridge-iomt`: an empty `run:` under `"[*]"` wiped the shared preset's
+         * entire `run` block, and `rman build` answered `No package defines a "build" script.`
+         * Nothing in rman uses `null` to unset a key, so there is no meaning to lose.
+         */
+        if (value === null || value === undefined)
+            continue;
         /** `plugins`/`commands`/`publishTargets`: additive at every layer, so the closer one adds
          *  rather than takes over. A glob among them is anchored to its own file on the way in - see
          *  `anchorContributions`. */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rman",
   "description": "Repository manager",
-  "version": "2.18.0",
+  "version": "2.18.2",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {