cursedbelt 5.103.0 → 5.103.1

package/dist/scripts/guardrailsEnforce.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"guardrailsEnforce.d.ts","sourceRoot":"","sources":["../../scripts/guardrailsEnforce.ts"],"names":[],"mappings":";AAsQA,UAAU,SAAS;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB;;;sEAGkE;IAClE,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,IAAI;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,SAAS,EAAE,CAAC;CACzD;AAED,wBAAgB,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,EAAO,GAAG,MAAM,EAAE,CA6B9D;AA2yCD,iGAAiG;AACjG,wBAAgB,WAAW,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAE3D;AAoHD,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAIpE;AA+6BD,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,GAAG,IAAI,CAEpF;AAID,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,CAoBhE;AAyKD,kGAAkG;AAClG,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAatE;AAqDD,UAAU,MAAM;IACf,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACb;AA0BD,+FAA+F;AAC/F,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAgBpD;AAID,wEAAwE;AACxE,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAO5E;AAiJD,eAAO,MAAM,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAoCtC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,mBAAmB,EAAE,WAAW,CAAC,MAAM,CAAiE,CAAC;AAEtH,0EAA0E;AAC1E,eAAO,MAAM,SAAS,EAAE,SAAS,MAAM,EAAwE,CAAC;AAShH,eAAO,MAAM,uBAAuB,aAAkD,CAAC;AAGvF,MAAM,WAAW,SAAS;IACzB,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACb;AAED;2FAC2F;AAC3F,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CA+C3F;AAED,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;AAgHhC,wBAAgB,0BAA0B,CAAC,SAAS,GAAE,MAAwB,GAAG,MAAM,EAAE,CAyBxF"}
+{"version":3,"file":"guardrailsEnforce.d.ts","sourceRoot":"","sources":["../../scripts/guardrailsEnforce.ts"],"names":[],"mappings":";AAsQA,UAAU,SAAS;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB;;;sEAGkE;IAClE,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,IAAI;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,SAAS,EAAE,CAAC;CACzD;AAED,wBAAgB,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,EAAO,GAAG,MAAM,EAAE,CA6B9D;AAm1CD,iGAAiG;AACjG,wBAAgB,WAAW,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAE3D;AAoHD,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAIpE;AA+6BD,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,GAAG,IAAI,CAEpF;AAID,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,CAoBhE;AAyKD,kGAAkG;AAClG,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAatE;AAqDD,UAAU,MAAM;IACf,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACb;AA0BD,+FAA+F;AAC/F,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAgBpD;AAID,wEAAwE;AACxE,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAO5E;AAiJD,eAAO,MAAM,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAoCtC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,mBAAmB,EAAE,WAAW,CAAC,MAAM,CAAiE,CAAC;AAEtH,0EAA0E;AAC1E,eAAO,MAAM,SAAS,EAAE,SAAS,MAAM,EAAwE,CAAC;AAShH,eAAO,MAAM,uBAAuB,aAAkD,CAAC;AAGvF,MAAM,WAAW,SAAS;IACzB,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACb;AAED;2FAC2F;AAC3F,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CA+C3F;AAED,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;AAgHhC,wBAAgB,0BAA0B,CAAC,SAAS,GAAE,MAAwB,GAAG,MAAM,EAAE,CAyBxF"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cursedbelt",
-	"version": "5.103.0",
+	"version": "5.103.1",
 	"license": "ISC",
 	"type": "module",
 	"description": "The React design system of the cursedbelt split — components, styles, theme. cursedbelt-core below it; server tier in cursedbelt-server.",

package/scripts/guardrailsEnforce.spec.ts

@@ -77,9 +77,41 @@ describe('no-raw-action-button', () => {
   test('a CLOSED or self-closing group earlier in the file exempts nothing after it', () => {
     const closed = `<Tabs value={t}><TabsList /></Tabs>\n<button role="tab">Loose</button>`;
     expect(check('no-raw-action-button', closed)).toHaveLength(1);
-    const selfClosed = `<RadioGroup options={o} />\n<button role="radio">Loose</button>`;
+    const selfClosed = `<SegmentedControl options={o} />\n<button role="radio">Loose</button>`;
     expect(check('no-raw-action-button', selfClosed)).toHaveLength(1);
   });
+
+  // Task 4098: the type argument's `>` ended the tag, so the real `/>` went unread and the
+  // control stayed open for the rest of the file. Desk's rewind list passed on exactly this.
+  test('🔴 a self-closing GENERIC group exempts nothing after it', () => {
+    const union = `<SegmentedControl<"a" | "b"> value={v} onChange={set} options={o} />
+      <button role="radio">Loose</button>`;
+    expect(check('no-raw-action-button', union)).toHaveLength(1);
+    const multiline = `<SegmentedControl<
+        Record<string, "a" | "b">
+      >
+        value={v}
+        onChange={(next) => set(next)}
+      />
+      <button role="tab">Loose</button>`;
+    expect(check('no-raw-action-button', multiline)).toHaveLength(1);
+    const functionType = `<Tabs<(next: string) => void> value={t} />\n<button role="switch">Loose</button>`;
+    expect(check('no-raw-action-button', functionType)).toHaveLength(1);
+  });
+
+  test('a group the belt does not ship exempts nothing, whatever an app names it', () => {
+    const source = `<RadioGroup value={v}>
+      <button role="radio">A</button>
+    </RadioGroup>`;
+    expect(check('no-raw-action-button', source)).toHaveLength(1);
+  });
+
+  test('a generic group left OPEN still exempts its own part', () => {
+    const source = `<SegmentedControl<"a" | "b"> value={v}>
+      <button role="radio" aria-checked={v === 'a'}>A</button>
+    </SegmentedControl>`;
+    expect(check('no-raw-action-button', source)).toHaveLength(0);
+  });
 });
 
 // Filed 2026-09-15 after three false positives in three repos, all one defect: the tag
@@ -122,11 +154,11 @@ describe('opening-tag extraction (comment-aware)', () => {
   });
 
   test('a prose angle bracket does not hide a role="radio" below it', () => {
-    const source = `<RadioGroup value={v}><button
+    const source = `<SegmentedControl value={v}><button
       /* A radio-like list rather than a <select>. */
       role="radio"
       aria-checked={selected}
-    >Move here</button></RadioGroup>`;
+    >Move here</button></SegmentedControl>`;
     expect(check('no-raw-action-button', source)).toHaveLength(0);
   });
 
@@ -206,12 +238,12 @@ describe('a presentational marker must be an ATTRIBUTE, not prose about one', ()
   });
 
   test('the REAL attributes still pass silently, prose and all', () => {
-    const source = `<RadioGroup value={v}><button
+    const source = `<SegmentedControl value={v}><button
       // A radio-like list: \`role="radio"\` + \`aria-checked\` says so to a screen reader.
       role="radio"
       aria-checked={selected}
       type="button"
-    >Move here</button></RadioGroup>`;
+    >Move here</button></SegmentedControl>`;
     expect(check('no-raw-action-button', source)).toHaveLength(0);
   });
 

package/scripts/guardrailsEnforce.ts

@@ -210,8 +210,8 @@
 //
 // A presentational ARIA role/attribute on the tag (role="tab" | "switch" | "radio" |
 // "menuitemradio" | "presentation", or aria-selected) exempts a `<button>` from
-// `no-raw-action-button` ONLY inside a belt `Tabs`/`TabsList`/`SegmentedControl`/
-// `RadioGroup`/`ToggleGroup` (task 2381 — a bare marker was the loophole; see the rule).
+// `no-raw-action-button` ONLY inside a belt `Tabs`/`TabsList`/`SegmentedControl`
+// (task 2381 — a bare marker was the loophole; see the rule).
 //
 // 🔴 Every opt-out is COUNTED (`opt-out-count`) and must lead with its cause
 // (`opt-out-needs-cause`): `guardrails-ignore <rule>: <cause> — <six+ words of why>`, the
@@ -356,6 +356,38 @@ interface OpeningTag {
 	readonly code: string;
 }
 
+function endOfTagName(source: string, startIndex: number): number {
+	const name = /<[\w$.:-]+/y;
+	name.lastIndex = startIndex;
+	return name.test(source) ? name.lastIndex : startIndex;
+}
+
+/** The index past a JSX type argument at `index` (`<SegmentedControl<"a" | "b"> …`), or
+ *  `index` when none opens there or it never closes. Its `>` is not the end of the tag: read
+ *  as one, a self-closing generic control looked OPEN, and with no `</SegmentedControl>` to
+ *  shut it every role-marked button below it passed `no-raw-action-button` (forge task 4098).
+ *  The `>` of a `=>` inside a function type closes nothing. */
+function endOfTypeArguments(source: string, index: number): number {
+	if (source[index] !== "<") return index;
+	let depth = 0;
+	let i = index;
+	while (i < source.length) {
+		const ch = source[i];
+		if (ch === '"' || ch === "'" || ch === "`") {
+			i = skipQuoted(source, i);
+			continue;
+		}
+		if (source.slice(i, i + 2) === "=>") {
+			i += 2;
+			continue;
+		}
+		if (ch === "<") depth++;
+		else if (ch === ">" && --depth === 0) return i + 1;
+		i++;
+	}
+	return index;
+}
+
 /** Read from a `<button` (or similar) match to the end of its opening tag, tolerating
  *  `{...}` JS expressions in attribute values that may themselves contain `>`
  *  (`onClick={() => …}`, which works because that `>` sits inside braces).
@@ -372,6 +404,12 @@ function readOpeningTag(source: string, startIndex: number): OpeningTag {
 	let i = startIndex;
 	let braceDepth = 0;
 	let code = "";
+	const nameEnd = endOfTagName(source, startIndex);
+	const typeEnd = endOfTypeArguments(source, nameEnd);
+	if (typeEnd > nameEnd) {
+		code = source.slice(startIndex, nameEnd) + blank(source.slice(nameEnd, typeEnd));
+		i = typeEnd;
+	}
 	while (i < source.length) {
 		const two = source.slice(i, i + 2);
 		if (two === "//") {
@@ -754,14 +792,16 @@ const PRESENTATIONAL_MARKER_RE =
 // Task 2381: a role marker used to exempt ANY raw button, so the cheapest way past this rule
 // was `role="switch"` — `apps/family/src/App.tsx:1786-1800` (`EditModeToggle`) says in its
 // own comment the marker is there to satisfy it, beside the belt's `Switch`. A marker now
-// exempts only a button INSIDE a belt group that owns that role (`Tabs`, `SegmentedControl`,
-// `RadioGroup`, `ToggleGroup`) — the one place a raw button with it is the group's own part.
-// Anywhere else it is `Switch` / `Tabs` / `SegmentedControl` / `RadioGroup`, or an opt-out
+// exempts only a button INSIDE a belt group that owns that role (`Tabs`, `SegmentedControl`)
+// — the one place a raw button with it is the group's own part. `ChoiceGroup` takes no
+// children, so nothing can sit inside it, and a `RadioGroup` or `ToggleGroup` is no belt
+// component: naming them only exempted whatever an app happened to call that (forge task 4098).
+// Anywhere else it is `Switch` / `Tabs` / `SegmentedControl` / `ChoiceGroup`, or an opt-out
 // with its cause.
 const BELT_OWN_SRC = `${join(import.meta.dir, "..", "src")}/`;
 const isBeltOwnSource = (filePath: string) =>
 	resolve(filePath).startsWith(BELT_OWN_SRC) || /(^|\/)(?:packages|libs)\/cursedbelt\/src\//.test(filePath.replace(/\\/g, "/"));
-const BELT_CHOICE_GROUPS = ["Tabs", "TabsList", "SegmentedControl", "RadioGroup", "ToggleGroup"];
+const BELT_CHOICE_GROUPS = ["Tabs", "TabsList", "SegmentedControl"];
 
 /** Is `index` inside an open (not yet closed) belt choice-group element in this file? */
 function insideBeltChoiceGroup(scannable: string, index: number): boolean {
@@ -778,7 +818,7 @@ function insideBeltChoiceGroup(scannable: string, index: number): boolean {
 const noRawActionButton: Rule = {
 	name: "no-raw-action-button",
 	description:
-		'DESIGN.md §2 (Component Architecture): no hand-rolled <button> — use the cursedbelt Button family; a toggle is `Switch`, a tab `Tabs`, a choice `SegmentedControl`/`RadioGroup`. A role marker exempts a button only inside one of those groups.',
+		'DESIGN.md §2 (Component Architecture): no hand-rolled <button> — use the cursedbelt Button family; a toggle is `Switch`, a tab `Tabs`, a choice `SegmentedControl`/`ChoiceGroup`. A role marker exempts a button only inside `Tabs` or `SegmentedControl`.',
 	check(filePath, source) {
 		const violations: Violation[] = [];
 		const scannable = blankNonMarkupText(source, filePath);