@webpieces/pr-gate 0.3.214 → 0.3.216

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webpieces/pr-gate",
-  "version": "0.3.214",
+  "version": "0.3.216",
   "description": "Gated PR system: 3-point squash-merge, merge validation gate, and red/yellow/green PR dashboard. Standalone scripts, no Nx dependency required.",
   "type": "commonjs",
   "main": "./src/index.js",
@@ -24,7 +24,7 @@
     "directory": "packages/tooling/pr-gate"
   },
   "dependencies": {
-    "@webpieces/rules-config": "0.3.214"
+    "@webpieces/rules-config": "0.3.216"
   },
   "publishConfig": {
     "access": "public"

package/src/scripts/workflow/branch-naming.d.ts

@@ -1,8 +1,8 @@
 /** Stable base identity (remote / PR / feature-name slug source): trailing `Squash` and the
- *  generation number stripped. `base` → `base`, `base2` → `base`, `base2Squash` → `base`. */
+ *  generation marker stripped. `base` → `base`, `basewp2` → `base`, `basewp2Squash` → `base`. */
 export declare function baseBranchName(branch: string): string;
-/** The local branch you land on after this merge: base + (gen + 1). `base` → `base2`,
- *  `base2` → `base3`. */
+/** The local branch you land on after this merge: base + `wp` + (gen + 1). `base` → `basewp2`,
+ *  `basewp2` → `basewp3`. */
 export declare function nextBranchName(branch: string): string;
 /** Pre-merge safety snapshot of the given (current) branch. One overwritable slot per branch. */
 export declare function preMergeBackupName(branch: string): string;

package/src/scripts/workflow/branch-naming.js

@@ -1,23 +1,24 @@
 "use strict";
 // Branch-naming for the numbered-generation squash-merge scheme.
 //
-// A feature branch has a stable *base* identity plus a visible *generation* number that bumps
-// every time we re-sync from main:  base → base2 → base3 …  (gen 1 carries no suffix). The
-// remote branch — and therefore the single PR — always lives on `base`; only the LOCAL branch
-// numbers up, so you can see at a glance how many times you've re-merged main. The pre-merge
-// safety snapshot is `<currentBranch>PreMerge` (one overwritable slot per generation), replacing
-// the old ever-accumulating `<branch>Backup1/Backup2/…`.
+// A feature branch has a stable *base* identity plus a *generation* marker that bumps every time we
+// re-sync from main:  base → basewp2 → basewp3 …  (gen 1 carries no marker). The remote branch — and
+// therefore the single PR — always lives on `base`; only the LOCAL branch numbers up, so you can see
+// at a glance how many times you've re-merged main. The pre-merge safety snapshot is
+// `<currentBranch>PreMerge` (one overwritable slot per generation), replacing the old ever-accumulating
+// `<branch>Backup1/Backup2/…`.
 //
-// Parsing rule: strip a trailing `Squash` (the internal temp-branch suffix), then a trailing
-// run of digits (the generation). KNOWN LIMITATION: a branch whose name naturally ends in
-// digits (e.g. `feature/ONE-1917`) is misparsed — its trailing number is read as a generation.
-// The team's convention ends branch names in a word (`feature/ONE-1917-dual-mode-migration`),
-// so this is safe in practice; if that ever changes, switch the appended suffix to a separated
-// form (e.g. `X.v2`) so the boundary is unambiguous.
+// The generation marker is `wp<N>` (a literal `wp` prefix, NOT a bare number) so it is unambiguous
+// against branch names that naturally end in digits — most importantly version-upgrade branches like
+// `deanhiller/upgrade-webpieces-0.3.213`, which an earlier bare-digit scheme mangled by stripping the
+// `213`. Parsing keys off the `wp` marker: strip a trailing `Squash` (the internal temp-branch suffix),
+// then a trailing `wp<digits>`. The branch-creation-guard rejects human branches ending in `wp<digits>`
+// so the marker stays reserved for this tool.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.baseBranchName = baseBranchName;
 exports.nextBranchName = nextBranchName;
 exports.preMergeBackupName = preMergeBackupName;
+const GENERATION_RE = /^(.*)wp(\d+)$/;
 class Generation {
     base;
     gen;
@@ -28,22 +29,22 @@ class Generation {
 }
 function parseGeneration(branch) {
     const withoutSquash = branch.replace(/Squash$/, '');
-    const match = withoutSquash.match(/^(.*?)(\d+)$/);
+    const match = withoutSquash.match(GENERATION_RE);
     if (match && match[1] !== '') {
         return new Generation(match[1], parseInt(match[2], 10));
     }
     return new Generation(withoutSquash, 1);
 }
 /** Stable base identity (remote / PR / feature-name slug source): trailing `Squash` and the
- *  generation number stripped. `base` → `base`, `base2` → `base`, `base2Squash` → `base`. */
+ *  generation marker stripped. `base` → `base`, `basewp2` → `base`, `basewp2Squash` → `base`. */
 function baseBranchName(branch) {
     return parseGeneration(branch).base;
 }
-/** The local branch you land on after this merge: base + (gen + 1). `base` → `base2`,
- *  `base2` → `base3`. */
+/** The local branch you land on after this merge: base + `wp` + (gen + 1). `base` → `basewp2`,
+ *  `basewp2` → `basewp3`. */
 function nextBranchName(branch) {
     const generation = parseGeneration(branch);
-    return `${generation.base}${generation.gen + 1}`;
+    return `${generation.base}wp${generation.gen + 1}`;
 }
 /** Pre-merge safety snapshot of the given (current) branch. One overwritable slot per branch. */
 function preMergeBackupName(branch) {

package/src/scripts/workflow/branch-naming.js.map

@@ -1 +1 @@
-{"version":3,"file":"branch-naming.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/branch-naming.ts"],"names":[],"mappings":";AAAA,iEAAiE;AACjE,EAAE;AACF,8FAA8F;AAC9F,2FAA2F;AAC3F,8FAA8F;AAC9F,6FAA6F;AAC7F,iGAAiG;AACjG,yDAAyD;AACzD,EAAE;AACF,6FAA6F;AAC7F,0FAA0F;AAC1F,+FAA+F;AAC/F,8FAA8F;AAC9F,+FAA+F;AAC/F,qDAAqD;;AAuBrD,wCAEC;AAID,wCAGC;AAGD,gDAEC;AAnCD,MAAM,UAAU;IACZ,IAAI,CAAS;IACb,GAAG,CAAS;IAEZ,YAAY,IAAY,EAAE,GAAW;QACjC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACnB,CAAC;CACJ;AAED,SAAS,eAAe,CAAC,MAAc;IACnC,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IACpD,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAClD,IAAI,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;QAC3B,OAAO,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,IAAI,UAAU,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED;6FAC6F;AAC7F,SAAgB,cAAc,CAAC,MAAc;IACzC,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;AACxC,CAAC;AAED;yBACyB;AACzB,SAAgB,cAAc,CAAC,MAAc;IACzC,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IAC3C,OAAO,GAAG,UAAU,CAAC,IAAI,GAAG,UAAU,CAAC,GAAG,GAAG,CAAC,EAAE,CAAC;AACrD,CAAC;AAED,iGAAiG;AACjG,SAAgB,kBAAkB,CAAC,MAAc;IAC7C,OAAO,GAAG,MAAM,UAAU,CAAC;AAC/B,CAAC","sourcesContent":["// Branch-naming for the numbered-generation squash-merge scheme.\n//\n// A feature branch has a stable *base* identity plus a visible *generation* number that bumps\n// every time we re-sync from main:  base → base2 → base3 …  (gen 1 carries no suffix). The\n// remote branch — and therefore the single PR — always lives on `base`; only the LOCAL branch\n// numbers up, so you can see at a glance how many times you've re-merged main. The pre-merge\n// safety snapshot is `<currentBranch>PreMerge` (one overwritable slot per generation), replacing\n// the old ever-accumulating `<branch>Backup1/Backup2/…`.\n//\n// Parsing rule: strip a trailing `Squash` (the internal temp-branch suffix), then a trailing\n// run of digits (the generation). KNOWN LIMITATION: a branch whose name naturally ends in\n// digits (e.g. `feature/ONE-1917`) is misparsed — its trailing number is read as a generation.\n// The team's convention ends branch names in a word (`feature/ONE-1917-dual-mode-migration`),\n// so this is safe in practice; if that ever changes, switch the appended suffix to a separated\n// form (e.g. `X.v2`) so the boundary is unambiguous.\n\nclass Generation {\n    base: string;\n    gen: number;\n\n    constructor(base: string, gen: number) {\n        this.base = base;\n        this.gen = gen;\n    }\n}\n\nfunction parseGeneration(branch: string): Generation {\n    const withoutSquash = branch.replace(/Squash$/, '');\n    const match = withoutSquash.match(/^(.*?)(\\d+)$/);\n    if (match && match[1] !== '') {\n        return new Generation(match[1], parseInt(match[2], 10));\n    }\n    return new Generation(withoutSquash, 1);\n}\n\n/** Stable base identity (remote / PR / feature-name slug source): trailing `Squash` and the\n *  generation number stripped. `base` → `base`, `base2` → `base`, `base2Squash` → `base`. */\nexport function baseBranchName(branch: string): string {\n    return parseGeneration(branch).base;\n}\n\n/** The local branch you land on after this merge: base + (gen + 1). `base` → `base2`,\n *  `base2` → `base3`. */\nexport function nextBranchName(branch: string): string {\n    const generation = parseGeneration(branch);\n    return `${generation.base}${generation.gen + 1}`;\n}\n\n/** Pre-merge safety snapshot of the given (current) branch. One overwritable slot per branch. */\nexport function preMergeBackupName(branch: string): string {\n    return `${branch}PreMerge`;\n}\n"]}
+{"version":3,"file":"branch-naming.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/branch-naming.ts"],"names":[],"mappings":";AAAA,iEAAiE;AACjE,EAAE;AACF,oGAAoG;AACpG,qGAAqG;AACrG,qGAAqG;AACrG,qFAAqF;AACrF,wGAAwG;AACxG,+BAA+B;AAC/B,EAAE;AACF,mGAAmG;AACnG,qGAAqG;AACrG,sGAAsG;AACtG,wGAAwG;AACxG,wGAAwG;AACxG,8CAA8C;;AAyB9C,wCAEC;AAID,wCAGC;AAGD,gDAEC;AArCD,MAAM,aAAa,GAAG,eAAe,CAAC;AAEtC,MAAM,UAAU;IACZ,IAAI,CAAS;IACb,GAAG,CAAS;IAEZ,YAAY,IAAY,EAAE,GAAW;QACjC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACnB,CAAC;CACJ;AAED,SAAS,eAAe,CAAC,MAAc;IACnC,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IACpD,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACjD,IAAI,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;QAC3B,OAAO,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,IAAI,UAAU,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED;iGACiG;AACjG,SAAgB,cAAc,CAAC,MAAc;IACzC,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;AACxC,CAAC;AAED;6BAC6B;AAC7B,SAAgB,cAAc,CAAC,MAAc;IACzC,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IAC3C,OAAO,GAAG,UAAU,CAAC,IAAI,KAAK,UAAU,CAAC,GAAG,GAAG,CAAC,EAAE,CAAC;AACvD,CAAC;AAED,iGAAiG;AACjG,SAAgB,kBAAkB,CAAC,MAAc;IAC7C,OAAO,GAAG,MAAM,UAAU,CAAC;AAC/B,CAAC","sourcesContent":["// Branch-naming for the numbered-generation squash-merge scheme.\n//\n// A feature branch has a stable *base* identity plus a *generation* marker that bumps every time we\n// re-sync from main:  base → basewp2 → basewp3 …  (gen 1 carries no marker). The remote branch — and\n// therefore the single PR — always lives on `base`; only the LOCAL branch numbers up, so you can see\n// at a glance how many times you've re-merged main. The pre-merge safety snapshot is\n// `<currentBranch>PreMerge` (one overwritable slot per generation), replacing the old ever-accumulating\n// `<branch>Backup1/Backup2/…`.\n//\n// The generation marker is `wp<N>` (a literal `wp` prefix, NOT a bare number) so it is unambiguous\n// against branch names that naturally end in digits — most importantly version-upgrade branches like\n// `deanhiller/upgrade-webpieces-0.3.213`, which an earlier bare-digit scheme mangled by stripping the\n// `213`. Parsing keys off the `wp` marker: strip a trailing `Squash` (the internal temp-branch suffix),\n// then a trailing `wp<digits>`. The branch-creation-guard rejects human branches ending in `wp<digits>`\n// so the marker stays reserved for this tool.\n\nconst GENERATION_RE = /^(.*)wp(\\d+)$/;\n\nclass Generation {\n    base: string;\n    gen: number;\n\n    constructor(base: string, gen: number) {\n        this.base = base;\n        this.gen = gen;\n    }\n}\n\nfunction parseGeneration(branch: string): Generation {\n    const withoutSquash = branch.replace(/Squash$/, '');\n    const match = withoutSquash.match(GENERATION_RE);\n    if (match && match[1] !== '') {\n        return new Generation(match[1], parseInt(match[2], 10));\n    }\n    return new Generation(withoutSquash, 1);\n}\n\n/** Stable base identity (remote / PR / feature-name slug source): trailing `Squash` and the\n *  generation marker stripped. `base` → `base`, `basewp2` → `base`, `basewp2Squash` → `base`. */\nexport function baseBranchName(branch: string): string {\n    return parseGeneration(branch).base;\n}\n\n/** The local branch you land on after this merge: base + `wp` + (gen + 1). `base` → `basewp2`,\n *  `basewp2` → `basewp3`. */\nexport function nextBranchName(branch: string): string {\n    const generation = parseGeneration(branch);\n    return `${generation.base}wp${generation.gen + 1}`;\n}\n\n/** Pre-merge safety snapshot of the given (current) branch. One overwritable slot per branch. */\nexport function preMergeBackupName(branch: string): string {\n    return `${branch}PreMerge`;\n}\n"]}