@godxjp/ui 32.1.1 → 32.1.2

package/agent/START-HERE.md

@@ -3,7 +3,7 @@
 You are about to write code against a design system you did not author. This file is the whole
 contract. Read it before you write JSX.
 
-**This catalog describes `@godxjp/ui` 32.1.1.** If the project you are editing has a different
+**This catalog describes `@godxjp/ui` 32.1.2.** If the project you are editing has a different
 version in its `package.json`, read the pinned catalog for THAT version instead
 (`…/v<their-version>/agent/…`). A catalog newer than the installed package describes props that do
 not exist yet; older, and it hides props that do. Neither failure announces itself.

package/agent/index.json

@@ -48,7 +48,7 @@
   "note": "Pin to the tag that matches the @godxjp/ui version you installed. A catalog newer than your package describes props you do not have; older, and it hides props you do.",
   "read": {
     "live": "https://raw.githubusercontent.com/godx-jp/godxjp-ui/main/agent/index.json",
-    "pinned": "https://raw.githubusercontent.com/godx-jp/godxjp-ui/v32.1.1/agent/index.json"
+    "pinned": "https://raw.githubusercontent.com/godx-jp/godxjp-ui/v32.1.2/agent/index.json"
   },
   "source": "mcp/src/data — the same data @godxjp/ui-mcp serves — plus the foundation and semantic token tiers, read from src/tokens/*.css",
   "start": "https://raw.githubusercontent.com/godx-jp/godxjp-ui/main/agent/START-HERE.md",
@@ -62,5 +62,5 @@
     "foundation": "the seeds a consumer is invited to set — --primary, --background, --radius",
     "semantic": "named roles that follow the seeds — --ring, --text-link, --overlay-background"
   },
-  "version": "32.1.1"
+  "version": "32.1.2"
 }

package/agent/llms.txt

@@ -1,10 +1,10 @@
 # @godxjp/ui
 
 > A Japanese-enterprise React design system: 161 components, 2193 design tokens,
-> 43 cardinal rules. This file is the entry point for AI agents. Catalog version 32.1.1.
+> 43 cardinal rules. This file is the entry point for AI agents. Catalog version 32.1.2.
 
 If your client can run a process, do not read these files — run the MCP server instead
-(`npx @godxjp/ui-mcp@32.1.1`). It is searchable and version-locked. These files exist for agents
+(`npx @godxjp/ui-mcp@32.1.2`). It is searchable and version-locked. These files exist for agents
 that can only fetch URLs.
 
 ## Start
@@ -26,7 +26,7 @@ that can only fetch URLs.
 ## Pinning
 
 Every URL above tracks `main`. To pin to the release a project actually installed, swap `main` for
-the tag: `.../godx-jp/godxjp-ui/v32.1.1/agent/...`. A catalog that does not match the installed
+the tag: `.../godx-jp/godxjp-ui/v32.1.2/agent/...`. A catalog that does not match the installed
 package describes props that are absent, or hides props that are present, and says nothing either way.
 
 Pinned catalogs only exist for releases whose tag actually contains `agent/`. If `…/v<version>/agent/index.json` returns 404, that release predates this catalog: read `…/main/…` instead and compare `index.json` → `version` against the package you have, so you at least know which way it drifted.

package/dist/contracts/measurement.json

@@ -1,6 +1,6 @@
 {
   "$comment": "AUTO-GENERATED by scripts/gen-measurement-contract.mjs — do not edit. Read this instead of guessing: docs/MEASUREMENT-CONTRACT.md.",
-  "version": "32.1.1",
+  "version": "32.1.2",
   "targetSize": {
     "standard": "WCAG 2.2 SC 2.5.8 Target Size (Minimum), level AA — 24×24 CSS px",
     "min": 24,

package/dist/styles/layers.json

@@ -1,5 +1,5 @@
 {
-  "version": "32.1.1",
+  "version": "32.1.2",
   "generatedBy": "scripts/gen-style-layers.mjs — do not edit by hand; run `pnpm gen:style-layers`",
   "base": "base.css",
   "fonts": "fonts.css",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@godxjp/ui",
-  "version": "32.1.1",
-  "godxUiMcp": "32.1.1",
+  "version": "32.1.2",
+  "godxUiMcp": "32.1.2",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

package/scripts/ui-audit.mjs

@@ -1829,6 +1829,8 @@ function staleOwnedRules() {
 const FORM_TAGS = new Set(["Form", "FormRoot"]);
 const formOpenTag = new RegExp(`<(${[...FORM_TAGS].join("|")})(?=[\\s>])([^>]*)>`, "g");
 function formTagWalk(scanContent) {
+  const formSpans = [];
+  const formOpens = [];
   const stack = [];
   const bareByParent = new Map();
   const underForm = new Set();
@@ -1846,11 +1848,18 @@ function formTagWalk(scanContent) {
           break;
         }
       }
-      if (FORM_TAGS.has(tag)) formDepth = Math.max(0, formDepth - 1);
+      if (FORM_TAGS.has(tag)) {
+        formDepth = Math.max(0, formDepth - 1);
+        const open = formOpens.pop();
+        if (open !== undefined) formSpans.push([open, m.index]);
+      }
       continue;
     }
     if (tag === "FormField" && formDepth === 0) {
-      const parent = stack.at(-1)?.index ?? -1;
+      // A field at the TOP of a return has no parent tag; key it by its component, or two
+      // one-field components in one file (`Field`, `Choice`) read as "Field renders 2 FormFields"
+      // (gh#1260). A lone field is not flagged, so each is now judged on its own.
+      const parent = stack.at(-1)?.index ?? `top:${enclosingComponent(scanContent, m.index)}`;
       (bareByParent.get(parent) ?? bareByParent.set(parent, []).get(parent)).push(m.index);
     }
     if (/^[A-Z]/.test(tag)) {
@@ -1859,11 +1868,78 @@ function formTagWalk(scanContent) {
     }
     if (selfClose) continue;
     stack.push({ tag, index: m.index });
-    if (FORM_TAGS.has(tag)) formDepth += 1;
+    if (FORM_TAGS.has(tag)) {
+      formDepth += 1;
+      formOpens.push(m.index);
+    }
+  }
+  // gh#1260: JSX inside a RENDER HELPER (`const legFields = (leg) => (…)`) has no Form above it in
+  // the source, but it renders wherever the helper is CALLED. When every call of that helper is
+  // under a Form — directly, or inside another such helper — the JSX is under that Form too.
+  const covered = renderHelperCoverage(scanContent, formSpans);
+  if (covered) {
+    for (const [parent, indexes] of bareByParent) {
+      const kept = indexes.filter((i) => !covered(i));
+      if (kept.length) bareByParent.set(parent, kept);
+      else bareByParent.delete(parent);
+    }
+    for (const [tag, indexes] of outsideForm) {
+      const kept = indexes.filter((i) => !covered(i));
+      if (kept.length < indexes.length) underForm.add(tag);
+      if (kept.length) outsideForm.set(tag, kept);
+      else outsideForm.delete(tag);
+    }
   }
   return { bareByParent, underForm, outsideForm };
 }
 
+/**
+ * `index → true` when `index` sits in a same-file render helper whose every call is under a Form
+ * (gh#1260). Helpers are lowercase `function name(` / `const name = (…) =>` declarations; their
+ * body is found by bracket matching, and a helper never called is NOT covered (it might be
+ * exported or passed as a render prop). Returns null when the file declares no helper.
+ */
+function renderHelperCoverage(scanContent, formSpans) {
+  const helpers = [];
+  for (const m of scanContent.matchAll(
+    /(?<![\w$.])(?:function\s+([a-z]\w*)\s*(?:<[^>]*>)?\s*\(|(?:const|let)\s+([a-z]\w*)\s*(?::[^=]+)?=\s*(?:async\s*)?(?:\([^()]*(?:\([^()]*\)[^()]*)*\)|[a-z]\w*)\s*(?::[^=]+?)?=>\s*)/g,
+  )) {
+    const name = m[1] ?? m[2];
+    let open;
+    if (m[1]) {
+      const params = matchBracket(scanContent, m.index + m[0].length - 1);
+      if (params < 0) continue;
+      open = scanContent.indexOf("{", params);
+    } else {
+      open = m.index + m[0].length;
+      if (scanContent[open] !== "{" && scanContent[open] !== "(") continue;
+    }
+    const close = open < 0 ? -1 : matchBracket(scanContent, open);
+    if (close < 0) continue;
+    helpers.push({ name, from: open, to: close, decl: m.index });
+  }
+  if (!helpers.length) return null;
+  const inForm = (i) => formSpans.some(([a, b]) => i > a && i < b);
+  /** The innermost helper whose body holds `i`. */
+  const helperAt = (i) =>
+    helpers
+      .filter((h) => i > h.from && i < h.to)
+      .reduce((inner, h) => (!inner || h.from > inner.from ? h : inner), null);
+  const callsOf = (name) =>
+    [...scanContent.matchAll(new RegExp(`(?<![\\w$.])${name}\\s*\\(`, "g"))]
+      .map((c) => c.index)
+      .filter((i) => !helpers.some((h) => h.name === name && i >= h.decl && i < h.from));
+  const covered = (i, depth = 0) => {
+    if (inForm(i)) return true;
+    if (depth > 4) return false;
+    const helper = helperAt(i);
+    if (!helper) return false;
+    const calls = callsOf(helper.name);
+    return calls.length > 0 && calls.every((c) => covered(c, depth + 1));
+  };
+  return (i) => covered(i);
+}
+
 /** The PascalCase component declared last before `index` — the one a FormField group sits in. */
 function enclosingComponent(scanContent, index) {
   let name = null;