@saastro/studio 0.5.1 → 0.7.0

package/dist/{chunk-C2QUBB5U.js → chunk-DKDGF6IQ.js}

@@ -3,7 +3,13 @@ import {
   injectVersionMetaTag,
   injectVisibilityStyle,
   readVisibilityConfigSync
-} from "./chunk-VH3YYJEZ.js";
+} from "./chunk-MN3J6PBW.js";
+import {
+  hasFrontmatterFieldPrefix,
+  resolvePageKey,
+  transformAstroPage,
+  transformAstroSource
+} from "./chunk-PKDMKMD6.js";
 
 // src/vite/index.ts
 import { promises as fs } from "node:fs";
@@ -507,192 +513,6 @@ function parseLiteral(rhs) {
   return trimmed;
 }
 
-// ../studio-core/dist/auto-wrap-core.js
-var FRONTMATTER_RE2 = /^\s*---\s*\n([\s\S]*?)\n---\s*\n/;
-var SAASTRO_ATTR_RE = /data-saastro/;
-var FIELD_PREFIX_REFERENCE_RE = /\bfieldPrefix\b/;
-function stripCommentsAndStrings(s) {
-  return s.replace(/\/\*[\s\S]*?\*\//g, " ").replace(/`(?:[^`\\]|\\.)*`/g, "``").replace(/'(?:[^'\\]|\\.)*'/g, "''").replace(/"(?:[^"\\]|\\.)*"/g, '""').replace(/\/\/[^\n]*/g, " ");
-}
-function frontmatterDeclaresFieldPrefix(fmBody) {
-  return FIELD_PREFIX_REFERENCE_RE.test(stripCommentsAndStrings(fmBody));
-}
-function hasFrontmatterFieldPrefix(source) {
-  const fm = FRONTMATTER_RE2.exec(source);
-  return fm ? frontmatterDeclaresFieldPrefix(fm[1]) : false;
-}
-var OPEN_TAG_NAME_RE = /^<([a-zA-Z][a-zA-Z0-9]*)/;
-var INJECTION = ' {...(fieldPrefix ? { "data-saastro": `sec:${fieldPrefix}`, draggable: "true" } : {})}';
-function findTagEnd(s, start) {
-  let i = start + 1;
-  let quote = "";
-  let brace = 0;
-  while (i < s.length) {
-    const c = s[i];
-    if (quote) {
-      if (c === quote) quote = "";
-    } else if (c === '"' || c === "'" || c === "`") {
-      quote = c;
-    } else if (c === "{") {
-      brace++;
-    } else if (c === "}") {
-      if (brace > 0) brace--;
-    } else if (c === ">" && brace === 0) {
-      return i;
-    }
-    i++;
-  }
-  return -1;
-}
-function injectIntoTag(template, tagStart, tagName, tagEnd, injection) {
-  const between = template.slice(tagStart + 1 + tagName.length, tagEnd);
-  const selfCloseMatch = /\s*\/\s*$/.exec(between);
-  let attrs = between;
-  let selfClose = false;
-  if (selfCloseMatch) {
-    selfClose = true;
-    attrs = between.slice(0, selfCloseMatch.index);
-  }
-  attrs = attrs.replace(/\s+$/, "");
-  const rebuilt = `<${tagName}${attrs}${injection}${selfClose ? " />" : ">"}`;
-  return template.slice(0, tagStart) + rebuilt + template.slice(tagEnd + 1);
-}
-function firstTagStart(template) {
-  return template.search(/<[a-zA-Z]/);
-}
-function transformAstroSource(source) {
-  const fm = FRONTMATTER_RE2.exec(source);
-  if (!fm) return source;
-  if (!frontmatterDeclaresFieldPrefix(fm[1])) return source;
-  const fmLen = fm[0].length;
-  const template = source.slice(fmLen);
-  const start = firstTagStart(template);
-  if (start === -1) return source;
-  const nameMatch = OPEN_TAG_NAME_RE.exec(template.slice(start));
-  if (!nameMatch) return source;
-  const tagName = nameMatch[1];
-  if (tagName[0] !== tagName[0].toLowerCase()) return source;
-  const tagEnd = findTagEnd(template, start);
-  if (tagEnd === -1) return source;
-  const between = template.slice(start + 1 + tagName.length, tagEnd);
-  if (SAASTRO_ATTR_RE.test(between)) return source;
-  return source.slice(0, fmLen) + injectIntoTag(template, start, tagName, tagEnd, INJECTION);
-}
-var SKIP_BODY_TAGS = /* @__PURE__ */ new Set(["script", "style", "noscript", "template", "title"]);
-var SKIP_STRUCTURAL_TAGS = /* @__PURE__ */ new Set(["html", "head", "body", "link", "meta", "base", "slot"]);
-var PAGE_MARKER_RE = /data-saastro\s*=|["']data-saastro["']\s*:/;
-var T_USAGE_RE = /(?:Astro\.locals\.)?\bt\.([A-Za-z_$][\w$]*)/g;
-function indexAfterCloseTag(s, lower, from) {
-  const re = new RegExp(`</\\s*${lower}\\s*>`, "i");
-  const m = re.exec(s.slice(from));
-  return m ? from + m.index + m[0].length : -1;
-}
-function findFirstContentTag(template) {
-  const n = template.length;
-  let i = 0;
-  let brace = 0;
-  while (i < n) {
-    const c = template[i];
-    if (c === "{") {
-      brace++;
-      i++;
-      continue;
-    }
-    if (c === "}") {
-      if (brace > 0) brace--;
-      i++;
-      continue;
-    }
-    if (c !== "<") {
-      i++;
-      continue;
-    }
-    if (template.startsWith("<!--", i)) {
-      const end = template.indexOf("-->", i + 4);
-      i = end === -1 ? n : end + 3;
-      continue;
-    }
-    const nameMatch = OPEN_TAG_NAME_RE.exec(template.slice(i));
-    if (!nameMatch) {
-      i++;
-      continue;
-    }
-    const tagName = nameMatch[1];
-    const tagEnd = findTagEnd(template, i);
-    if (tagEnd === -1) return null;
-    const lower = tagName.toLowerCase();
-    if (SKIP_BODY_TAGS.has(lower)) {
-      const after = indexAfterCloseTag(template, lower, tagEnd + 1);
-      i = after === -1 ? n : after;
-      continue;
-    }
-    const isComponent = tagName[0] !== tagName[0].toLowerCase();
-    if (isComponent || SKIP_STRUCTURAL_TAGS.has(lower) || brace > 0) {
-      i = tagEnd + 1;
-      continue;
-    }
-    return { tagStart: i, tagName, tagEnd };
-  }
-  return null;
-}
-function normalizeKey(s) {
-  return s.toLowerCase().replace(/[-_\s.]/g, "");
-}
-function routeBaseName(path) {
-  const m = /(?:^|\/)src\/pages\/(.+\.astro)$/.exec(path);
-  if (!m) return null;
-  const rel = m[1].replace(/\.astro$/, "");
-  const segments = rel.split("/").filter(Boolean);
-  const isDynamic = (s) => s.includes("[") || s.includes("]");
-  const isLocale = (s) => /^[a-z]{2}(-[a-z]{2})?$/i.test(s);
-  let last = segments.pop();
-  if (!last || isDynamic(last)) return null;
-  if (last === "index") {
-    let parent;
-    while (segments.length) {
-      const s = segments.pop();
-      if (!isDynamic(s) && !isLocale(s)) {
-        parent = s;
-        break;
-      }
-    }
-    last = parent ?? "home";
-  }
-  return last;
-}
-function scanTUsage(source) {
-  const out = /* @__PURE__ */ new Set();
-  T_USAGE_RE.lastIndex = 0;
-  let m;
-  while ((m = T_USAGE_RE.exec(source)) !== null) out.add(m[1]);
-  return out;
-}
-function resolvePageKey(source, path) {
-  const base = routeBaseName(path);
-  if (!base) return null;
-  const target = normalizeKey(base);
-  for (const ns of scanTUsage(source)) {
-    if (normalizeKey(ns) === target) return ns;
-  }
-  return null;
-}
-function transformAstroPage(source, key) {
-  const fm = FRONTMATTER_RE2.exec(source);
-  const fmLen = fm ? fm[0].length : 0;
-  const template = source.slice(fmLen);
-  if (PAGE_MARKER_RE.test(template)) return source;
-  const hit = findFirstContentTag(template);
-  if (!hit) return source;
-  const injected = injectIntoTag(
-    template,
-    hit.tagStart,
-    hit.tagName,
-    hit.tagEnd,
-    ` data-saastro="sec:${key}"`
-  );
-  return source.slice(0, fmLen) + injected;
-}
-
 // src/vite/extract-props-schema.ts
 var CACHE_MAX = 500;
 var cache = /* @__PURE__ */ new Map();
@@ -723,7 +543,7 @@ function extractPropsSchema(source, options = {}) {
 }
 
 // src/vite/inject-schema.ts
-var FRONTMATTER_RE3 = /^\s*---\s*\n([\s\S]*?)\n---\s*\n/;
+var FRONTMATTER_RE2 = /^\s*---\s*\n([\s\S]*?)\n---\s*\n/;
 var SCHEMA_SCRIPT_MARKER = 'type="application/saastro-schema"';
 var FIRST_OPEN_TAG_RE = /<([a-zA-Z][a-zA-Z0-9]*)\b([^<>]*?)\s*(\/?)>/;
 function extractFieldPrefixDefault(frontmatter) {
@@ -765,7 +585,7 @@ function encodeSchemaBody(schema) {
 }
 function injectSchema(source, schema, options = {}) {
   if (source.includes(SCHEMA_SCRIPT_MARKER)) return source;
-  const fm = FRONTMATTER_RE3.exec(source);
+  const fm = FRONTMATTER_RE2.exec(source);
   if (!fm) return source;
   const frontmatter = fm[1] ?? "";
   const templateStart = fm[0].length;
@@ -787,11 +607,11 @@ function injectSchema(source, schema, options = {}) {
 }
 
 // src/vite/instrument-fields.ts
-var FRONTMATTER_RE4 = /^\s*---\s*\n[\s\S]*?\n---\s*\n/;
+var FRONTMATTER_RE3 = /^\s*---\s*\n[\s\S]*?\n---\s*\n/;
 function instrumentFields(source, schema, options = {}) {
   if (!schema.fields.length) return source;
   if (!source.includes("data-saastro=")) return source;
-  const fmMatch = FRONTMATTER_RE4.exec(source);
+  const fmMatch = FRONTMATTER_RE3.exec(source);
   if (!fmMatch) return source;
   const templateStart = fmMatch[0].length;
   const template = source.slice(templateStart);
@@ -824,7 +644,7 @@ function transformTemplate(template, fields, componentPath, source = template) {
   let out = template;
   for (const field of fields) {
     if (field.kind !== "array") continue;
-    const res = transformArrayField(out, field);
+    const res = transformArrayField(out, field, componentPath);
     out = res.out;
     if (!res.matched && hasMapReference(source, field.name) && !hasHandWrittenFieldMarker(template, field.name)) {
       warnUninstrumentedArray(componentPath, field.name);
@@ -842,22 +662,61 @@ function hasHandWrittenFieldMarker(template, name) {
     "data-saastro(?:-field)?\\s*=\\s*\\{\\s*`[^`]*\\b" + n + "[[.]"
   ).test(template);
 }
-function warnUninstrumentedArray(componentPath, name) {
+function warnUninstrumentedArray(componentPath, name, mapExpr = name) {
   const where = componentPath ? ` in ${componentPath}` : "";
   console.warn(
-    `[saastro/studio] array prop "${name}"${where} was not auto-instrumented: no \`${name}.map(...)\` found in the template (it may be iterated via a derived variable, a chained method, or a destructured param). Its items won't be editable in the Studio until you hand-write data-saastro-field markers \u2014 e.g. <img src={item.image} data-saastro-field={\`${name}[\${i}].image\`} />.`
+    `[saastro/studio] array prop "${name}"${where} was not auto-instrumented: no \`${mapExpr}.map(...)\` found in the template (it may be iterated via a derived variable, a chained method, or a destructured param). Its items won't be editable in the Studio until you hand-write data-saastro-field markers \u2014 e.g. <img src={item.image} data-saastro-field={\`${name}[\${i}].image\`} />.`
   );
 }
 function hasMapReference(source, name) {
   return new RegExp("\\b" + escapeReg(name) + "\\s*\\.\\s*map\\s*\\(").test(source);
 }
-function transformArrayField(template, field) {
+function transformArrayField(template, field, componentPath) {
   const name = field.name;
-  const subFields = field.items?.fields ?? [];
-  const re = new RegExp(
-    `\\b${escapeReg(name)}\\s*\\.\\s*map\\s*\\(\\s*\\(\\s*([A-Za-z_$][\\w$]*)\\s*(?:,\\s*([A-Za-z_$][\\w$]*)\\s*)?\\)\\s*=>\\s*`,
+  const re = mapCallAnchor(escapeReg(name));
+  return rewriteMapCalls(
+    template,
+    re,
+    "__i",
+    (paramName) => `${name}.map((${paramName}, __i) => `,
+    (innerJsx, paramName) => stampArrayItem(
+      innerJsx,
+      `${name}[\${__i}]`,
+      paramName,
+      field.items,
+      1,
+      componentPath
+    )
+  );
+}
+function transformNestedArrayField(template, parentParam, field, parentPathPrefix, depth, componentPath) {
+  const indexVar = `__i${depth + 1}`;
+  const callee = `${parentParam}.${field.name}`;
+  const re = mapCallAnchor(
+    `${escapeReg(parentParam)}\\s*\\.\\s*${escapeReg(field.name)}`
+  );
+  return rewriteMapCalls(
+    template,
+    re,
+    indexVar,
+    (paramName) => `${callee}.map((${paramName}, ${indexVar}) => `,
+    (innerJsx, paramName) => stampArrayItem(
+      innerJsx,
+      `${parentPathPrefix}.${field.name}[\${${indexVar}}]`,
+      paramName,
+      field.items,
+      depth + 1,
+      componentPath
+    )
+  );
+}
+function mapCallAnchor(calleePattern) {
+  return new RegExp(
+    `\\b${calleePattern}\\s*\\.\\s*map\\s*\\(\\s*\\(\\s*([A-Za-z_$][\\w$]*)\\s*(?:,\\s*([A-Za-z_$][\\w$]*)\\s*)?\\)\\s*=>\\s*`,
     "g"
   );
+}
+function rewriteMapCalls(template, re, indexVar, makeHeader, transformBody) {
   let result = "";
   let cursor = 0;
   let matchCount = 0;
@@ -871,13 +730,12 @@ function transformArrayField(template, field) {
     const body = readArrowBody(template, arrowEnd);
     if (!body) continue;
     let innerJsx = body.bodyText;
-    if (existingIdx && existingIdx !== "__i") {
+    if (existingIdx && existingIdx !== indexVar) {
       const renameRe = new RegExp(`\\b${escapeReg(existingIdx)}\\b`, "g");
-      innerJsx = innerJsx.replace(renameRe, "__i");
+      innerJsx = innerJsx.replace(renameRe, indexVar);
     }
-    const transformedJsx = stampArrayItem(innerJsx, name, paramName, subFields);
-    const headerNew = `${name}.map((${paramName}, __i) => `;
-    result += template.slice(cursor, headerStart) + headerNew;
+    const transformedJsx = transformBody(innerJsx, paramName);
+    result += template.slice(cursor, headerStart) + makeHeader(paramName);
     if (body.parens) {
       result += "(" + transformedJsx + ")";
     } else {
@@ -1088,13 +946,29 @@ function readJsxElement(s, start) {
   }
   return null;
 }
-function stampArrayItem(jsx, fieldName, paramName, subFields) {
-  let out = stampOuterElement(
-    jsx,
-    `{\`${fieldName}[\${__i}]\`}`
-  );
+function stampArrayItem(jsx, pathPrefix, paramName, itemField, depth, componentPath) {
+  let out = stampOuterElement(jsx, `{\`${pathPrefix}\`}`);
+  const subFields = itemField?.fields ?? [];
+  for (const sub of subFields) {
+    if (sub.kind !== "array") continue;
+    const res = transformNestedArrayField(
+      out,
+      paramName,
+      sub,
+      pathPrefix,
+      depth,
+      componentPath
+    );
+    out = res.out;
+    const mapExpr = `${paramName}.${sub.name}`;
+    if (!res.matched && hasMapReference(out, mapExpr) && !hasHandWrittenFieldMarker(out, sub.name)) {
+      const displayPath = `${pathPrefix.replace(/\[\$\{__i\d*\}\]/g, "[]")}.${sub.name}`;
+      warnUninstrumentedArray(componentPath, displayPath, mapExpr);
+    }
+  }
   for (const sub of subFields) {
-    const propPath = `{\`${fieldName}[\${__i}].${sub.name}\`}`;
+    if (sub.kind === "array") continue;
+    const propPath = `{\`${pathPrefix}.${sub.name}\`}`;
     out = transformDottedReference(out, paramName, sub.name, propPath);
   }
   return out;
@@ -1471,4 +1345,4 @@ async function loadTsx(path) {
 export {
   studioAutoWrap
 };
-//# sourceMappingURL=chunk-C2QUBB5U.js.map
+//# sourceMappingURL=chunk-DKDGF6IQ.js.map