uidex 0.5.0 → 0.5.2

package/dist/cli/cli.cjs

@@ -739,17 +739,38 @@ function audit(opts) {
     }
   }
   if (lint) {
+    const dynamicAttrRe = /\bdata-uidex(?:-(region|widget|primitive))?\s*=\s*\{/g;
     for (const f of files) {
-      const lines = f.content.split("\n");
-      const candidateRe = /<(button|a|input|select|textarea)(?=[\s/>])([^>]*)>/g;
       let m;
-      while ((m = candidateRe.exec(f.content)) !== null) {
-        const attrs = m[2];
-        if (attrs && attrs.includes("data-uidex")) continue;
-        const idx = m.index;
+      dynamicAttrRe.lastIndex = 0;
+      while ((m = dynamicAttrRe.exec(f.content)) !== null) {
+        const kind = m[1] ?? "element";
         let line = 1;
-        for (let i = 0; i < idx; i++) if (f.content[i] === "\n") line++;
-        void lines;
+        for (let i = 0; i < m.index; i++) if (f.content[i] === "\n") line++;
+        const attrName = m[1] ? `data-uidex-${m[1]}` : "data-uidex";
+        diagnostics.push({
+          code: "dynamic-attr",
+          severity: "warning",
+          message: `\`${attrName}={\u2026}\` uses a dynamic expression; the scanner cannot resolve the ${kind} id statically`,
+          file: f.displayPath,
+          line,
+          hint: dynamicAttrHint(kind)
+        });
+      }
+    }
+  }
+  if (lint) {
+    for (const f of files) {
+      const tagRe = /<(button|a|input|select|textarea)(?=[\s/>])/g;
+      let m;
+      while ((m = tagRe.exec(f.content)) !== null) {
+        const afterTag = m.index + m[0].length;
+        const closeIdx = findJsxOpeningEnd(f.content, afterTag);
+        if (closeIdx === -1) continue;
+        const attrs = f.content.slice(afterTag, closeIdx);
+        if (attrs.includes("data-uidex")) continue;
+        let line = 1;
+        for (let i = 0; i < m.index; i++) if (f.content[i] === "\n") line++;
         diagnostics.push({
           code: "missing-element-annotation",
           severity: "info",
@@ -959,6 +980,63 @@ function extractEntitiesArray(source) {
   }
   return null;
 }
+function findJsxOpeningEnd(src, start) {
+  let i = start;
+  while (i < src.length) {
+    const ch = src[i];
+    if (ch === ">" || ch === "/" && src[i + 1] === ">") return i;
+    if (ch === '"' || ch === "'" || ch === "`") {
+      i = skipString(src, i);
+    } else if (ch === "{") {
+      i = skipBraces(src, i);
+    } else {
+      i++;
+    }
+  }
+  return -1;
+}
+function skipString(src, start) {
+  const quote = src[start];
+  let i = start + 1;
+  while (i < src.length) {
+    if (src[i] === "\\" && quote !== "`") {
+      i += 2;
+      continue;
+    }
+    if (quote === "`" && src[i] === "$" && src[i + 1] === "{") {
+      i = skipBraces(src, i + 1);
+      continue;
+    }
+    if (src[i] === quote) return i + 1;
+    i++;
+  }
+  return i;
+}
+function skipBraces(src, start) {
+  let depth = 1;
+  let i = start + 1;
+  while (i < src.length && depth > 0) {
+    const ch = src[i];
+    if (ch === "{") {
+      depth++;
+      i++;
+    } else if (ch === "}") {
+      depth--;
+      i++;
+    } else if (ch === '"' || ch === "'" || ch === "`") {
+      i = skipString(src, i);
+    } else {
+      i++;
+    }
+  }
+  return i;
+}
+function dynamicAttrHint(kind) {
+  if (kind === "region") {
+    return `Use a string literal: \`data-uidex-region="id"\`, or declare the region via \`export const uidex = { region: "id" } as const satisfies Uidex.Region\` on the file that passes the region value`;
+  }
+  return `The scanner requires string-literal attribute values. If this component forwards the annotation via a prop, restructure so the caller provides the annotated element directly (e.g. via a slot or render prop) with a string-literal \`data-uidex\` attribute`;
+}
 function stableStringify(value) {
   return JSON.stringify(value, stableReplacer);
 }
@@ -1112,6 +1190,11 @@ function emit(opts) {
   lines.push("    acceptance?: readonly string[]");
   lines.push("    description?: string");
   lines.push("  }");
+  lines.push("  export interface Region {");
+  lines.push("    region: RegionId | false");
+  lines.push("    name?: string");
+  lines.push("    description?: string");
+  lines.push("  }");
   lines.push("  export interface Flow {");
   lines.push("    flow: FlowId");
   lines.push("    name?: string");
@@ -1160,6 +1243,7 @@ var KIND_DISCRIMINATORS = [
   "feature",
   "primitive",
   "widget",
+  "region",
   "flow",
   "notFlow"
 ];
@@ -1181,12 +1265,14 @@ var ALLOWED_FIELDS = {
   ]),
   primitive: /* @__PURE__ */ new Set(["primitive", "name", "description"]),
   widget: /* @__PURE__ */ new Set(["widget", "name", "acceptance", "description"]),
+  region: /* @__PURE__ */ new Set(["region", "name", "description"]),
   flow: /* @__PURE__ */ new Set(["flow", "notFlow", "name", "description"])
 };
 var FALSEABLE = /* @__PURE__ */ new Set([
   "page",
   "feature",
-  "primitive"
+  "primitive",
+  "region"
 ]);
 var ExtractError = class extends Error {
   code;
@@ -2053,7 +2139,7 @@ function collectJSXAncestry(content) {
       continue;
     }
     if (c === '"' || c === "'") {
-      const next = skipString(content, i, c);
+      const next = skipString2(content, i, c);
       advanceLines(i, next);
       i = next;
       continue;
@@ -2113,7 +2199,7 @@ function collectJSXAncestry(content) {
   }
   return out2;
 }
-function skipString(content, start, quote) {
+function skipString2(content, start, quote) {
   const N = content.length;
   let i = start + 1;
   while (i < N) {
@@ -2143,7 +2229,7 @@ function skipTemplate(content, start) {
       while (i < N && depth > 0) {
         const cj = content[i];
         if (cj === '"' || cj === "'") {
-          i = skipString(content, i, cj);
+          i = skipString2(content, i, cj);
           continue;
         }
         if (cj === "`") {
@@ -2166,7 +2252,7 @@ function findTagEnd(content, start) {
   while (i < N) {
     const c = content[i];
     if (c === '"' || c === "'") {
-      i = skipString(content, i, c);
+      i = skipString2(content, i, c);
       continue;
     }
     if (c === "`") {
@@ -2179,7 +2265,7 @@ function findTagEnd(content, start) {
       while (i < N && depth > 0) {
         const cj = content[i];
         if (cj === '"' || cj === "'") {
-          i = skipString(content, i, cj);
+          i = skipString2(content, i, cj);
           continue;
         }
         if (cj === "`") {
@@ -2834,6 +2920,21 @@ function resolve3(ctx) {
     };
     registry.add(region);
   }
+  for (const ef of ctx.extracted) {
+    const exp = exportFor(ef.file.displayPath, "region");
+    if (!exp) continue;
+    if (exp.id === false) continue;
+    if (typeof exp.id === "string" && !registry.get("region", exp.id)) {
+      const meta = buildMetaFromExport(exp);
+      const region = {
+        kind: "region",
+        id: exp.id,
+        loc: { file: ef.file.displayPath, line: exp.loc.line },
+        ...meta ? { meta } : {}
+      };
+      registry.add(region);
+    }
+  }
   const primitiveConventions = conventions.primitives;
   for (const ef of ctx.extracted) {
     const file = ef.file.displayPath;