meno-astro 0.1.9 → 0.1.11

package/dist/chunks/{chunk-54OHWVG3.js → chunk-D5DHUDKR.js}

@@ -3,7 +3,7 @@ import {
   extractLocaleFromPath,
   isI18nValue,
   resolveI18nValue
-} from "./chunk-I57UVB4P.js";
+} from "./chunk-V4SUAPTT.js";
 import {
   __require
 } from "./chunk-ZYQNHI3W.js";
@@ -88,4 +88,4 @@ export {
   deriveLocale,
   createLocaleMiddleware
 };
-//# sourceMappingURL=chunk-54OHWVG3.js.map
+//# sourceMappingURL=chunk-D5DHUDKR.js.map

package/dist/chunks/{chunk-BYV2GH6J.js → chunk-FTAXQYZ6.js}

@@ -2,7 +2,7 @@ import {
   isStyleMapping,
   responsiveStylesToClasses,
   shortHash
-} from "./chunk-I57UVB4P.js";
+} from "./chunk-V4SUAPTT.js";
 
 // lib/runtime/style.ts
 var collected = /* @__PURE__ */ new Map();
@@ -78,4 +78,4 @@ export {
   computeClassName,
   style
 };
-//# sourceMappingURL=chunk-BYV2GH6J.js.map
+//# sourceMappingURL=chunk-FTAXQYZ6.js.map

package/dist/chunks/{chunk-ND3XBJM6.js → chunk-RDEADJXD.js}

@@ -1,6 +1,10 @@
 import {
+  importedLibraryUrls
+} from "./chunk-WKW2JJ35.js";
+import {
+  isSupportedTemplateExpression,
   singularize
-} from "./chunk-I57UVB4P.js";
+} from "./chunk-V4SUAPTT.js";
 
 // lib/dialect/emit/emitContext.ts
 function createEmitContext(width = 80) {
@@ -105,6 +109,23 @@ function serializeLiteral(value, opts = {}) {
   return render(value, baseIndent, startCol);
 }
 
+// lib/dialect/richtext.ts
+var RICH_TEXT_TAG_RE = /<\/?(?:strong|em|u|s|code|a|span|sub|sup|mark|b|i|p|br|ul|ol|li|blockquote|h[1-6]|pre|hr|small|figure|figcaption|table|thead|tbody|tr|th|td)\b/i;
+function isRichTextHtml(s) {
+  return RICH_TEXT_TAG_RE.test(s);
+}
+function stripMenoSpanMarker(html) {
+  return html.replace(/<span\b[^>]*>/gi, (tag) => tag.replace(/\s+data-meno-span="[^"]*"/gi, ""));
+}
+function addMenoSpanMarker(html) {
+  return html.replace(/<span\b[^>]*>/gi, (tag) => {
+    if (/\bdata-meno-span=/i.test(tag)) return tag;
+    const m = tag.match(/\bclass="([^"]*)"/i);
+    if (!m) return tag;
+    return tag.replace(/(\bclass="[^"]*")/i, `$1 data-meno-span="${m[1]}"`);
+  });
+}
+
 // lib/dialect/emit/emitNode.ts
 var INDENT = 2;
 function pad(n) {
@@ -213,13 +234,34 @@ function collectItemBindings(root, declaredProps) {
 function isI18nValue(v) {
   return typeof v === "object" && v !== null && v._i18n === true;
 }
-function emitAttr(name, value, ctx) {
+function isCodeMarker(v) {
+  return typeof v === "object" && v !== null && v._code === true && typeof v.expr === "string";
+}
+function codeExpr(expr, ctx) {
+  if (expr.includes("\n")) {
+    const name = `__code${ctx.hoistCounter++}`;
+    ctx.frontmatterConsts.push(`const ${name} = ${expr};`);
+    return name;
+  }
+  return expr;
+}
+function emitAttr(name, value, ctx, dropEmptyTemplate = false) {
+  if (isCodeMarker(value)) {
+    return `${name}={${codeExpr(value.expr, ctx)}}`;
+  }
   if (isI18nValue(value)) {
     needRuntime(ctx, "i18n");
     return `${name}={i18n(${serializeLiteral(value, { indent: INDENT, width: ctx.width })})}`;
   }
   if (typeof value === "string") {
-    if (hasTemplate(value)) return `${name}={${templateToExpr(value)}}`;
+    if (isRichTextHtml(value)) return `${name}={${templateToExpr(stripMenoSpanMarker(value))}}`;
+    if (hasTemplate(value)) {
+      const expr = templateToExpr(value);
+      if (dropEmptyTemplate && expr[0] !== "`" && /^\{\{.+\}\}$/.test(value)) {
+        return `${name}={${expr} || undefined}`;
+      }
+      return `${name}={${expr}}`;
+    }
     if (!value.includes('"') && !value.includes("\n")) return `${name}="${value}"`;
     return `${name}={${JSON.stringify(value)}}`;
   }
@@ -305,7 +347,7 @@ function hasStyleContent(style) {
 }
 function emitAttributes(node, ctx) {
   if (!node.attributes || typeof node.attributes !== "object") return [];
-  return Object.entries(node.attributes).map(([k, v]) => emitAttr(k, v, ctx));
+  return Object.entries(node.attributes).map(([k, v]) => emitAttr(k, v, ctx, true));
 }
 var VOID_ELEMENTS = /* @__PURE__ */ new Set([
   "img",
@@ -339,7 +381,14 @@ var LOCALE_KNOWN_KEYS = /* @__PURE__ */ new Set([
   "label",
   "generateElementClass"
 ]);
-function emitTextChild(text, forceExpr = false) {
+function bareTemplateIdent(s) {
+  const m = s.match(/^\{\{\s*([A-Za-z_$][\w$]*)\s*\}\}$/);
+  return m ? m[1] : null;
+}
+function emitTextChild(text, ctx, forceExpr = false) {
+  const ident = bareTemplateIdent(text);
+  if (ident && ctx.richTextProps?.has(ident)) return `<Fragment set:html={${ident}} />`;
+  if (isRichTextHtml(text)) return `<Fragment set:html={${templateToExpr(stripMenoSpanMarker(text))}} />`;
   if (hasTemplate(text)) return `{${templateToExpr(text)}}`;
   const safeRaw = !forceExpr && text.length > 0 && text === text.trim() && !/[{}<>]/.test(text);
   return safeRaw ? text : `{${JSON.stringify(text)}}`;
@@ -347,12 +396,12 @@ function emitTextChild(text, forceExpr = false) {
 function emitChildrenList(children, ctx) {
   if (children === void 0 || children === null) return [];
   if (typeof children === "string") {
-    return children.length ? [emitTextChild(children)] : [];
+    return children.length ? [emitTextChild(children, ctx)] : [];
   }
   if (!Array.isArray(children)) return [];
   const multi = children.length > 1;
   return children.map(
-    (child) => typeof child === "string" ? emitTextChild(child, multi) : placeChild(renderNode(child, ctx), 0)
+    (child) => typeof child === "string" ? emitTextChild(child, ctx, multi) : placeChild(renderNode(child, ctx), 0)
   );
 }
 function composeElement(tag, attrs, childBlocks, forceVoid = false) {
@@ -537,6 +586,9 @@ function astroComponentName(name) {
   return cleaned.charAt(0).toUpperCase() + cleaned.slice(1);
 }
 function renderNode(node, ctx) {
+  if (isCodeMarker(node)) {
+    return { kind: "expr", expr: codeExpr(node.expr, ctx) };
+  }
   let rendered;
   switch (node.type) {
     case "node":
@@ -578,6 +630,7 @@ ${shift(rendered.markup, INDENT)}
 function ifConditionExpr(cond, ctx) {
   if (cond === false) return "false";
   if (cond === true) return "true";
+  if (isCodeMarker(cond)) return cond.expr;
   if (typeof cond === "string") return hasTemplate(cond) ? templateToExpr(cond) : cond;
   needRuntime(ctx, "when");
   const condLit = serializeLiteral(cond);
@@ -588,7 +641,7 @@ function placeChild(rendered, indent) {
   return shift(`{${rendered.expr}}`, indent);
 }
 function emitNode(node, ctx, indent) {
-  if (typeof node === "string") return shift(emitTextChild(node), indent);
+  if (typeof node === "string") return shift(emitTextChild(node, ctx), indent);
   return placeChild(renderNode(node, ctx), indent);
 }
 
@@ -679,6 +732,10 @@ function emitPage(page, opts) {
   const fm = [];
   if (isCms || ctx.needsContentApi) fm.push(`import { getCollection } from 'astro:content';`);
   fm.push(...importLines);
+  fm.push(`import '${"../".repeat(depth + 1)}styles/theme.css';`);
+  for (const url of importedLibraryUrls(page.meta?.libraries)) {
+    fm.push(`import '${"../".repeat(depth + 2)}${url.slice(1)}';`);
+  }
   fm.push("");
   if (isCms) {
     fm.push(buildGetStaticPaths(page.meta.cms));
@@ -699,6 +756,29 @@ ${wrapped}
 `;
 }
 
+// lib/dialect/scriptBind.ts
+var EL_BIND_EXPR = "(function(){var s=document.currentScript,e=s&&s.previousElementSibling;while(e&&(e.nodeName==='STYLE'||e.nodeName==='SCRIPT'))e=e.previousElementSibling;return e||null;})()";
+var WRAP_OPEN = "(function(el, props){\n";
+var CLOSE_HEAD = `
+})(${EL_BIND_EXPR}`;
+var OLD_OPEN = "(function(el){\n";
+var OLD_CLOSE = `
+})(${EL_BIND_EXPR});`;
+function wrapDefineVarsJs(js, names = []) {
+  const propsArg = names.length ? `{ ${names.join(", ")} }` : "{}";
+  return `${WRAP_OPEN}${js}${CLOSE_HEAD}, ${propsArg});`;
+}
+function unwrapDefineVarsJs(js) {
+  if (js.startsWith(WRAP_OPEN) && js.endsWith(");")) {
+    const idx = js.lastIndexOf(CLOSE_HEAD);
+    if (idx !== -1) return js.slice(WRAP_OPEN.length, idx);
+  }
+  if (js.startsWith(OLD_OPEN) && js.endsWith(OLD_CLOSE)) {
+    return js.slice(OLD_OPEN.length, js.length - OLD_CLOSE.length);
+  }
+  return js;
+}
+
 // lib/dialect/emit/emitComponent.ts
 var META_KEYS = ["category", "acceptsStyles", "libraries"];
 function defineVarNames(def) {
@@ -714,7 +794,7 @@ function buildScriptBlock(def) {
     return `
 
 <script define:vars={{ ${names.join(", ")} }}>
-${def.javascript}
+${wrapDefineVarsJs(def.javascript, names)}
 </script>`;
   }
   return `
@@ -734,6 +814,9 @@ function pickComponentMeta(def) {
 function emitComponent(def, opts) {
   const ctx = createEmitContext();
   ctx.propsVar = "__props";
+  ctx.richTextProps = new Set(
+    Object.entries(def.interface ?? {}).filter(([, d]) => d?.type === "rich-text").map(([name]) => name)
+  );
   const itemBindings = collectItemBindings(def.structure, Object.keys(def.interface ?? {}));
   if (itemBindings.includes("cms")) ctx.cmsInScope = true;
   const body = def.structure ? emitNode(def.structure, ctx, 0) : "<slot />";
@@ -745,9 +828,12 @@ function emitComponent(def, opts) {
   const componentImportPath = opts?.componentPaths ? (name) => `${relativeComponentImport(selfDir, opts.componentPaths[name] ?? name)}.astro` : void 0;
   const importLines = buildImportLines(ctx, { typeImports, componentPrefix: "./", componentImportPath });
   const propsBlock = buildPropsBlock(def.interface);
+  const libUpToRoot = "../".repeat(2 + (selfDir ? selfDir.split("/").length : 0));
+  const libraryImports = importedLibraryUrls(def.libraries).map((url) => `import '${libUpToRoot}${url.slice(1)}';`);
   const fm = [];
   if (ctx.needsContentApi) fm.push(`import { getCollection } from 'astro:content';`);
   fm.push(...importLines);
+  fm.push(...libraryImports);
   fm.push("");
   fm.push(...propsBlock);
   if (itemBindings.length) {
@@ -1072,6 +1158,9 @@ function callArgsOf(expr) {
 }
 
 // lib/dialect/parse/parseValue.ts
+function codeMarker(expr) {
+  return { _code: true, expr };
+}
 function reverseTemplate(content) {
   let out = "";
   let i = 0;
@@ -1097,17 +1186,21 @@ function reverseTemplate(content) {
 function interpretExprValue(expr, ctx) {
   const e = expr.trim();
   if (ctx.embedConsts.has(e)) return ctx.embedConsts.get(e);
+  if (ctx.codeConsts.has(e)) return codeMarker(ctx.codeConsts.get(e));
   if (e.startsWith("i18n(")) return parseLiteral(callArgsOf(e));
   if (e.startsWith("href(")) return parseLiteral(splitTopLevel(callArgsOf(e), ",")[0]);
   if (e.startsWith("embedHtml(")) return parseLiteral(splitTopLevel(callArgsOf(e), ",")[0]);
-  if (e[0] === "`") return reverseTemplate(e.slice(1, -1));
+  if (e[0] === "`") return addMenoSpanMarker(reverseTemplate(e.slice(1, -1)));
   if (e[0] === "{" || e[0] === "[") return parseLiteral(e);
   if (e[0] === '"') return parseLiteral(e);
   if (e === "true") return true;
   if (e === "false") return false;
   if (e === "null") return null;
   if (/^[-+]?(\d|\.\d)/.test(e) && !Number.isNaN(Number(e))) return Number(e);
-  return `{{${e}}}`;
+  const guard = e.match(/^(.+?)\s*\|\|\s*undefined$/);
+  if (guard && isSupportedTemplateExpression(guard[1].trim())) return `{{${guard[1].trim()}}}`;
+  if (isSupportedTemplateExpression(e)) return `{{${e}}}`;
+  return codeMarker(e);
 }
 function interpretStyleCall(expr) {
   const args = callArgsOf(expr);
@@ -1128,7 +1221,8 @@ function reverseCondition(cond) {
   if (c === "false") return false;
   if (c === "true") return true;
   if (c.startsWith("when(")) return parseLiteral(splitTopLevel(callArgsOf(c), ",")[0]);
-  return `{{${c}}}`;
+  if (isSupportedTemplateExpression(c)) return `{{${c}}}`;
+  return codeMarker(c);
 }
 
 // lib/dialect/parse/parseContext.ts
@@ -1136,12 +1230,34 @@ function createParseContext() {
   return {
     collectionBindings: /* @__PURE__ */ new Map(),
     embedConsts: /* @__PURE__ */ new Map(),
+    codeConsts: /* @__PURE__ */ new Map(),
     tagConsts: /* @__PURE__ */ new Map(),
     componentNames: /* @__PURE__ */ new Set()
   };
 }
 
 // lib/dialect/parse/parseFrontmatter.ts
+function scanExprToSemicolon(code, i) {
+  let j = i;
+  while (j < code.length) {
+    const c = code[j];
+    if (c === '"' || c === "'") {
+      j = scanString(code, j);
+      continue;
+    }
+    if (c === "`") {
+      j = scanTemplate(code, j);
+      continue;
+    }
+    if (c === "(" || c === "[" || c === "{") {
+      j = scanBalanced(code, j);
+      continue;
+    }
+    if (c === ";") return j;
+    j++;
+  }
+  return code.length;
+}
 function literalAfter(code, anchor) {
   const idx = code.indexOf(anchor);
   if (idx < 0) return void 0;
@@ -1158,6 +1274,11 @@ function parseFrontmatter(code) {
     const tickEnd = scanTemplate(code, tickStart);
     ctx.embedConsts.set(m[1], reverseTemplate(code.slice(tickStart + 1, tickEnd - 1)));
   }
+  for (const m of code.matchAll(/const\s+(__code\d+)\s*=\s*/g)) {
+    const start = m.index + m[0].length;
+    const end = scanExprToSemicolon(code, start);
+    ctx.codeConsts.set(m[1], code.slice(start, end).trim());
+  }
   for (const m of code.matchAll(/const\s+(Tag_\d+)\s*=\s*/g)) {
     const tickStart = code.indexOf("`", m.index + m[0].length);
     if (tickStart < 0) continue;
@@ -1198,6 +1319,11 @@ function readTagName(src, i) {
   while (j < src.length && /[A-Za-z0-9.\-_]/.test(src[j])) j++;
   return { name: src.slice(i, j), end: j };
 }
+function readAttrName(src, i) {
+  let j = i;
+  while (j < src.length && /[A-Za-z0-9.\-_:]/.test(src[j])) j++;
+  return { name: src.slice(i, j), end: j };
+}
 function parseAttributes(src, i) {
   const attrs = [];
   let j = i;
@@ -1205,7 +1331,7 @@ function parseAttributes(src, i) {
     j = skipWs2(src, j);
     if (src[j] === "/" && src[j + 1] === ">") return { attrs, end: j + 2, selfClose: true };
     if (src[j] === ">") return { attrs, end: j + 1, selfClose: false };
-    const { name, end } = readTagName(src, j);
+    const { name, end } = readAttrName(src, j);
     if (!name) throw new Error(`parseAttributes: expected attribute name at ${j} ("${src.slice(j, j + 15)}")`);
     j = end;
     if (src[j] === "=") {
@@ -1306,7 +1432,10 @@ function interpretChildExpr(inner, ctx, base = 0) {
       return node;
     }
     if (before.endsWith(".map")) {
-      return parseMapExpr(e, ctx, eBase);
+      const head = before.slice(0, -".map".length).trim();
+      if (head.startsWith("list(") || ctx.collectionBindings.has(head)) {
+        return parseMapExpr(e, ctx, eBase);
+      }
     }
   }
   const val = interpretExprValue(e, ctx);
@@ -1378,6 +1507,10 @@ function otherAttrs(attrs, ctx, skip) {
   return out;
 }
 function elementToNode(tag, attrs, children, ctx) {
+  if (tag === "Fragment") {
+    const setHtml = attrs.find((a) => a.name === "set:html");
+    if (setHtml) return attrValue(setHtml, ctx);
+  }
   if (ctx.tagConsts.has(tag)) {
     const node2 = { type: "node", tag: ctx.tagConsts.get(tag) };
     applyClass(node2, attrs);
@@ -1466,6 +1599,7 @@ function splitComponentBody(body, ctx, bodyStart) {
   if (scriptM) {
     javascript = scriptM[2];
     defineVars = parseDefineVars(scriptM[1]);
+    if (defineVars) javascript = unwrapDefineVarsJs(javascript);
     rest = rest.slice(0, scriptM.index);
   }
   const styleM = rest.match(/\n*<style>\n([\s\S]*?)\n<\/style>\s*$/);
@@ -1570,6 +1704,7 @@ function migrateLegacy(n) {
 function normalizeNode(node) {
   if (typeof node === "string") return node;
   if (!node || typeof node !== "object") return node;
+  if (node._code === true) return node;
   const out = migrateLegacy({ ...node });
   if ("style" in out && !hasStyleContent2(out.style)) delete out.style;
   if (out.type === "node" && out.props && typeof out.props === "object") {
@@ -1685,9 +1820,32 @@ function emit(model, opts) {
   }
   return emitPage(m, opts);
 }
+function collectVerbatimRegions(model, spans) {
+  const regions = [];
+  const seen = /* @__PURE__ */ new Set();
+  const walk = (node) => {
+    if (!node || typeof node !== "object") return;
+    if (seen.has(node)) return;
+    seen.add(node);
+    if (node._code === true) {
+      const span = spans.get(node);
+      if (span) regions.push({ kind: "verbatim", start: span.start, end: span.end });
+      return;
+    }
+    if (Array.isArray(node)) {
+      for (const child of node) walk(child);
+      return;
+    }
+    for (const value of Object.values(node)) walk(value);
+  };
+  walk(model);
+  regions.sort((a, b) => a.start - b.start);
+  return regions;
+}
 function parse(source) {
-  const { model } = parseFile(source);
-  return { model: normalizeModel(model), regions: [] };
+  const { model, spans } = parseFile(source, { collectSpans: true });
+  const regions = spans ? collectVerbatimRegions(model, spans) : [];
+  return { model: normalizeModel(model), regions };
 }
 
 export {
@@ -1696,4 +1854,4 @@ export {
   emit,
   parse
 };
-//# sourceMappingURL=chunk-ND3XBJM6.js.map
+//# sourceMappingURL=chunk-RDEADJXD.js.map