@nuasite/cli 0.64.1 → 0.64.2

package/dist/index.js

@@ -39590,6 +39590,311 @@ var init_snippet_utils = __esm(() => {
   CMS_PLACEHOLDER_PATTERN = /\{\{cms:[^}]+\}\}/;
 });
 
+// ../cms/src/handlers/element-span.ts
+function tagEnd(text, start) {
+  let quote = null;
+  let braces = 0;
+  for (let i2 = start + 1;i2 < text.length; i2++) {
+    const ch = text[i2];
+    if (quote) {
+      if (ch === quote)
+        quote = null;
+      continue;
+    }
+    if (braces > 0) {
+      if (ch === "{")
+        braces++;
+      else if (ch === "}")
+        braces--;
+      else if (ch === '"' || ch === "'" || ch === "`")
+        quote = ch;
+      continue;
+    }
+    if (ch === '"' || ch === "'")
+      quote = ch;
+    else if (ch === "{")
+      braces++;
+    else if (ch === ">")
+      return i2 + 1;
+  }
+  return -1;
+}
+function lineStart(text, line) {
+  let offset = 0;
+  for (let current2 = 1;current2 < line; current2++) {
+    const next = text.indexOf(`
+`, offset);
+    if (next < 0)
+      return -1;
+    offset = next + 1;
+  }
+  return offset;
+}
+function lineEnd(text, offset) {
+  const next = text.indexOf(`
+`, offset);
+  return next < 0 ? text.length : next;
+}
+function locateSnippet(content, snippet, line) {
+  const first = content.indexOf(snippet);
+  if (first < 0 || !line || line < 1)
+    return first;
+  const span = snippet.match(/\n/g)?.length ?? 0;
+  let best = first;
+  let bestDistance = Number.POSITIVE_INFINITY;
+  let countedTo = 0;
+  let startLine = 1;
+  for (let at = first;at >= 0; at = content.indexOf(snippet, at + 1)) {
+    for (let i2 = content.indexOf(`
+`, countedTo);i2 >= 0 && i2 < at; i2 = content.indexOf(`
+`, i2 + 1))
+      startLine++;
+    countedTo = at;
+    const endLine = startLine + span;
+    const distance = line < startLine ? startLine - line : line > endLine ? line - endLine : 0;
+    if (distance < bestDistance) {
+      best = at;
+      bestDistance = distance;
+    }
+    if (distance === 0 || startLine > line)
+      break;
+  }
+  return best;
+}
+function selfClosingSlash(text, start, end) {
+  const slash = end - 2;
+  if (slash <= start || text[slash] !== "/")
+    return -1;
+  const before = text[slash - 1];
+  if (/[\s"'}]/.test(before))
+    return slash;
+  const head = text.slice(start, slash);
+  const run = head.slice(Math.max(head.lastIndexOf(" "), head.lastIndexOf("\t"), head.lastIndexOf(`
+`)) + 1);
+  return run.includes("=") ? -1 : slash;
+}
+function tokenize(text) {
+  const tokens = [];
+  const tagName = /^<(\/?)([a-zA-Z][\w:.-]*)/;
+  let lower;
+  const skipped = [];
+  const fence = /^(?:\uFEFF)?---\r?\n[\s\S]*?\r?\n---(?=\r?\n|$)/.exec(text);
+  if (fence)
+    skipped.push([0, fence[0].length]);
+  for (const comment of text.matchAll(/\{\s*\/\*[\s\S]*?\*\/\s*\}/g))
+    skipped.push([comment.index, comment.index + comment[0].length]);
+  let nextSkip = 0;
+  let i2 = text.indexOf("<");
+  while (i2 >= 0 && i2 < text.length) {
+    while (nextSkip < skipped.length && skipped[nextSkip][1] <= i2)
+      nextSkip++;
+    const region = skipped[nextSkip];
+    if (region && region[0] <= i2) {
+      i2 = text.indexOf("<", region[1]);
+      continue;
+    }
+    if (text.startsWith("<!--", i2)) {
+      const close = text.indexOf("-->", i2 + 4);
+      if (close < 0)
+        break;
+      i2 = text.indexOf("<", close + 3);
+      continue;
+    }
+    const match = tagName.exec(text.slice(i2, i2 + 64));
+    if (!match) {
+      i2 = text.indexOf("<", i2 + 1);
+      continue;
+    }
+    const end = tagEnd(text, i2);
+    if (end < 0)
+      break;
+    const name = match[2];
+    const closing = match[1] === "/";
+    tokens.push({ start: i2, end, name, closing, selfClosing: !closing && selfClosingSlash(text, i2, end) >= 0 });
+    i2 = end;
+    if (!closing && RAW_TEXT_ELEMENTS.has(name)) {
+      lower ??= text.toLowerCase();
+      const close = lower.indexOf(`</${name.toLowerCase()}`, end);
+      if (close < 0)
+        break;
+      i2 = close;
+      continue;
+    }
+    i2 = text.indexOf("<", i2);
+  }
+  return tokens;
+}
+function findElements(text, from, to, tag) {
+  const wanted = tag?.toLowerCase();
+  return allElements(text).filter((e) => e.start >= from && e.start < to && (!wanted || e.tag === wanted));
+}
+function allElements(text) {
+  if (text === lastText)
+    return lastElements;
+  const open = new Map;
+  const found2 = [];
+  for (const token of tokenize(text)) {
+    const lower = token.name.toLowerCase();
+    const key = token.name === lower ? lower : token.name;
+    if (token.closing) {
+      const opener = open.get(key)?.pop();
+      if (opener) {
+        found2.push({ start: opener.start, openEnd: opener.end, closeStart: token.start, end: token.end, tag: lower, name: opener.name, void: false });
+      }
+      continue;
+    }
+    if (token.selfClosing || token.name === lower && VOID_ELEMENTS.has(lower)) {
+      found2.push({ start: token.start, openEnd: token.end, closeStart: token.end, end: token.end, tag: lower, name: token.name, void: true });
+      continue;
+    }
+    if (!open.has(key))
+      open.set(key, []);
+    open.get(key).push(token);
+  }
+  lastText = text;
+  lastElements = found2.sort((a, b2) => a.start - b2.start);
+  return lastElements;
+}
+function decodeEntities(text) {
+  return text.replace(/&(?:#x([0-9a-f]+)|#(\d+)|([a-z]+));/gi, (whole, hex, dec, name) => {
+    const code = hex ? parseInt(hex, 16) : dec ? parseInt(dec, 10) : -1;
+    if (code >= 0)
+      return code <= 1114111 ? String.fromCodePoint(code) : whole;
+    return NAMED_ENTITIES[name.toLowerCase()] ?? whole;
+  });
+}
+function renderedCased(markup) {
+  return decodeEntities(markup.replace(/<br\b[^>]*>/gi, " ").replace(/<!--[\s\S]*?-->/g, "").replace(/<[^>]+>/g, "").replace(/\\(['"])/g, "$1")).replace(/\u00AD/g, "").replace(/\s+/g, " ").trim();
+}
+function renderedText(innerMarkup) {
+  return renderedCased(innerMarkup).toLowerCase();
+}
+function withHoles(text) {
+  return renderedCased(text.replace(PLACEHOLDER, HOLE).replace(EXPRESSION, HOLE)).replace(new RegExp(`\\s*${HOLE}\\s*`, "g"), HOLE);
+}
+function matchesWithHoles(pattern, text) {
+  if (!pattern.includes(HOLE))
+    return pattern === text;
+  const parts = pattern.split(HOLE);
+  const first = parts[0];
+  const last = parts[parts.length - 1];
+  if (first.length + last.length > text.length || !text.startsWith(first) || !text.endsWith(last))
+    return false;
+  let at = first.length;
+  const limit = text.length - last.length;
+  for (const middle of parts.slice(1, -1)) {
+    const found2 = text.indexOf(middle, at);
+    if (found2 < 0 || found2 + middle.length > limit)
+      return false;
+    at = found2 + middle.length;
+  }
+  return true;
+}
+function textFit(innerMarkup, elementText) {
+  const source = withHoles(innerMarkup);
+  const wanted = withHoles(elementText);
+  const fits = (a, b2) => matchesWithHoles(a, b2) || matchesWithHoles(b2, a);
+  if (!fits(source.toLowerCase(), wanted.toLowerCase()))
+    return 0;
+  if (!source.replaceAll(HOLE, "").trim())
+    return 1;
+  return fits(source, wanted) ? 3 : 2;
+}
+function attributeValues(openingTag) {
+  return [...openingTag.matchAll(/\s[\w:-]+\s*=\s*(?:"([^"]*)"|'([^']*)')/g)].map((m2) => decodeEntities(m2[1] ?? m2[2] ?? ""));
+}
+function candidateFit(text, candidate, elementText) {
+  if (candidate.void)
+    return attributeValues(text.slice(candidate.start, candidate.openEnd)).includes(elementText.trim()) ? 3 : 0;
+  return textFit(text.slice(candidate.openEnd, candidate.closeStart), elementText);
+}
+function pickElement(text, candidates, elementText, rivals) {
+  const known = !!elementText && !!renderedText(elementText.replace(PLACEHOLDER, ""));
+  if (!known)
+    return candidates.length === 1 ? candidates[0] : null;
+  const fits = candidates.map((c) => ({ candidate: c, fit: candidateFit(text, c, elementText) }));
+  const best = Math.max(0, ...fits.map((f2) => f2.fit));
+  const matching = fits.filter((f2) => f2.fit === best && best > 0);
+  if (matching.length !== 1)
+    return null;
+  const picked = matching[0].candidate;
+  const from = rivals?.from ?? 0;
+  const to = rivals?.to ?? text.length;
+  const components = findElements(text, from, to).filter((c) => c.name !== c.tag && c.start !== picked.start);
+  if (components.some((c) => candidateFit(text, c, elementText) >= best))
+    return null;
+  const wanted = withHoles(elementText).toLowerCase();
+  for (const link of text.slice(from, to).matchAll(/\[([^\]\n]+)\]\(/g)) {
+    if (withHoles(link[1]).toLowerCase() === wanted)
+      return null;
+  }
+  return picked;
+}
+function elementOnLine(content, line, tag, elementText) {
+  if (!tag)
+    return null;
+  const from = lineStart(content, line);
+  if (from < 0)
+    return null;
+  const to = lineEnd(content, from);
+  const candidates = findElements(content, from, to, tag);
+  const texts = Array.isArray(elementText) ? elementText : [elementText];
+  for (const text of texts) {
+    const picked = pickElement(content, candidates, text, { from, to });
+    if (picked)
+      return picked;
+  }
+  return null;
+}
+var VOID_ELEMENTS, RAW_TEXT_ELEMENTS, lastText, lastElements, NAMED_ENTITIES, PLACEHOLDER, EXPRESSION, HOLE = "\x00";
+var init_element_span = __esm(() => {
+  VOID_ELEMENTS = new Set([
+    "area",
+    "base",
+    "br",
+    "col",
+    "embed",
+    "hr",
+    "img",
+    "input",
+    "link",
+    "meta",
+    "param",
+    "source",
+    "track",
+    "wbr"
+  ]);
+  RAW_TEXT_ELEMENTS = new Set(["script", "style", "textarea", "title"]);
+  lastElements = [];
+  NAMED_ENTITIES = {
+    amp: "&",
+    lt: "<",
+    gt: ">",
+    quot: '"',
+    apos: "'",
+    nbsp: "\xA0",
+    ndash: "\u2013",
+    mdash: "\u2014",
+    hellip: "\u2026",
+    laquo: "\xAB",
+    raquo: "\xBB",
+    lsquo: "\u2018",
+    rsquo: "\u2019",
+    ldquo: "\u201C",
+    rdquo: "\u201D",
+    bdquo: "\u201E",
+    sbquo: "\u201A",
+    shy: "\xAD",
+    copy: "\xA9",
+    reg: "\xAE",
+    trade: "\u2122",
+    times: "\xD7",
+    euro: "\u20AC"
+  };
+  PLACEHOLDER = /\{\{cms:[^}]+\}\}/g;
+  EXPRESSION = /\{[^{}]*\}/g;
+});
+
 // ../cms/src/handlers/source-writer.ts
 import path21 from "path";
 async function handleUpdate(request, manifestWriter) {
@@ -39651,7 +39956,16 @@ async function applyChanges(content, changes, manifest, absFilePath, originUrl)
   let appliedCount = 0;
   const failedChanges = [];
   const fileOps = [];
-  const sortedChanges = [...changes].sort((a, b2) => (b2.sourceLine ?? 0) - (a.sourceLine ?? 0));
+  const isText = (change) => !change.imageChange && !change.styleChange && !change.attributeChanges?.length;
+  const sortedChanges = [...changes].sort((a, b2) => (b2.sourceLine ?? 0) - (a.sourceLine ?? 0) || Number(isText(b2)) - Number(isText(a)));
+  const newTextOf = new Map(changes.filter(isText).map((change) => [change.cmsId, change.newValue]));
+  const identityOf = (cmsId) => {
+    const entry = manifest.entries[cmsId];
+    if (!entry)
+      return;
+    const edited = newTextOf.get(cmsId);
+    return { tag: entry.tag, text: edited !== undefined ? [entry.text, edited] : entry.text };
+  };
   for (const change of sortedChanges) {
     if (change.imageChange) {
       const result2 = await applyImageChange(newContent, change, absFilePath, originUrl);
@@ -39666,7 +39980,7 @@ async function applyChanges(content, changes, manifest, absFilePath, originUrl)
       continue;
     }
     if (change.styleChange) {
-      const result2 = applyColorChange(newContent, change);
+      const result2 = applyColorChange(newContent, change, identityOf(change.cmsId));
       if (result2.success) {
         newContent = result2.content;
         appliedCount++;
@@ -39676,7 +39990,7 @@ async function applyChanges(content, changes, manifest, absFilePath, originUrl)
       continue;
     }
     if (change.attributeChanges && change.attributeChanges.length > 0) {
-      const result2 = applyAttributeChanges(newContent, change);
+      const result2 = applyAttributeChanges(newContent, change, identityOf(change.cmsId));
       if (result2.appliedCount > 0) {
         newContent = result2.content;
         appliedCount++;
@@ -39736,19 +40050,12 @@ async function applyImageChange(content, change, absFilePath, originUrl) {
   let newContent = content;
   let replacedIndex = -1;
   for (const srcToFind of srcCandidates) {
-    const srcPatternDouble = new RegExp(`src="${escapeRegex(srcToFind)}"`);
-    const srcPatternSingle = new RegExp(`src='${escapeRegex(srcToFind)}'`);
-    const escapedNewSrc = escapeReplacement(newSrc);
-    const doubleMatch = newContent.match(srcPatternDouble);
-    if (doubleMatch && doubleMatch.index !== undefined) {
-      replacedIndex = doubleMatch.index;
-      newContent = newContent.slice(0, replacedIndex) + newContent.slice(replacedIndex).replace(srcPatternDouble, `src="${escapedNewSrc}"`);
-      break;
-    }
-    const singleMatch = newContent.match(srcPatternSingle);
-    if (singleMatch && singleMatch.index !== undefined) {
-      replacedIndex = singleMatch.index;
-      newContent = newContent.slice(0, replacedIndex) + newContent.slice(replacedIndex).replace(srcPatternSingle, `src='${escapedNewSrc}'`);
+    const escaped = escapeRegex(srcToFind);
+    const match = nearestMatch(newContent, new RegExp(`(?<![\\w:-])(src\\s*=\\s*)(["'])${escaped}\\2`, "g"), change.sourceLine) ?? nearestMatch(newContent, new RegExp(`(src\\s*=\\s*)(["'])${escaped}\\2`, "g"), change.sourceLine);
+    if (match) {
+      const quote = match[2];
+      replacedIndex = match.index;
+      newContent = newContent.slice(0, replacedIndex) + `${match[1]}${quote}${newSrc}${quote}` + newContent.slice(replacedIndex + match[0].length);
       break;
     }
   }
@@ -39791,13 +40098,16 @@ async function applyImageChange(content, change, absFilePath, originUrl) {
     const lines = newContent.split(`
 `);
     const targetLineIdx = change.sourceLine - 1;
-    const regionStart = Math.max(0, targetLineIdx - 3);
     const regionEnd = Math.min(lines.length, targetLineIdx + 10);
-    const regionLines = lines.slice(regionStart, regionEnd);
-    const regionText = regionLines.join(`
+    const regionAt = (start) => {
+      const text = lines.slice(start, regionEnd).join(`
 `);
-    if (/<img\b/i.test(regionText) || /<Image\b/.test(regionText)) {
-      const exprMatch = findExpressionSrcAttribute(regionText);
+      return { start, text, expr: findExpressionSrcAttribute(text) };
+    };
+    const wide = regionAt(Math.max(0, targetLineIdx - 3));
+    const tight = regionAt(Math.max(0, targetLineIdx));
+    const { start: regionStart, text: regionText, expr: exprMatch } = tight.expr ? tight : wide;
+    if (/<img\b/i.test(wide.text) || /<Image\b/.test(wide.text)) {
       if (exprMatch) {
         const exprContent = regionText.slice(exprMatch.index + regionText.slice(exprMatch.index).indexOf("{") + 1, exprMatch.index + exprMatch.length - 1).trim();
         const importInfo = /^\w+$/.test(exprContent) ? findFrontmatterAssetImport(content, exprContent) : null;
@@ -39821,14 +40131,16 @@ async function applyImageChange(content, change, absFilePath, originUrl) {
     return { success: false, error: `Image src not found in source file: ${originalSrc}` };
   }
   if (newAlt !== undefined) {
-    const searchStart = Math.max(0, replacedIndex - 200);
-    const searchEnd = Math.min(newContent.length, replacedIndex + 300);
+    const srcInTag = /^src\s*=/.test(newContent.slice(replacedIndex, replacedIndex + 8));
+    const ownTag = (srcInTag ? enclosingTag(newContent, replacedIndex) : null) ?? imageTagOnLine(newContent, change.sourceLine);
+    const searchStart = ownTag ? ownTag.start : Math.max(0, replacedIndex - 200);
+    const searchEnd = ownTag ? ownTag.end : Math.min(newContent.length, replacedIndex + 300);
     const region = newContent.slice(searchStart, searchEnd);
     let altIndex = -1;
     let altLength = 0;
     let altQuote = '"';
-    const altPatternDouble = /alt="[^"]*"/;
-    const altPatternSingle = /alt='[^']*'/;
+    const altPatternDouble = /(?<![\w:-])alt="[^"]*"/;
+    const altPatternSingle = /(?<![\w:-])alt='[^']*'/;
     const altDoubleMatch = region.match(altPatternDouble);
     const altSingleMatch = region.match(altPatternSingle);
     if (altDoubleMatch && altDoubleMatch.index !== undefined) {
@@ -39847,14 +40159,53 @@ async function applyImageChange(content, change, absFilePath, originUrl) {
         altQuote = '"';
       }
     }
+    const escapedAlt = altQuote === '"' ? newAlt.replace(/"/g, "&quot;") : newAlt.replace(/'/g, "&#39;");
     if (altIndex >= 0) {
       const altAbsoluteIndex = searchStart + altIndex;
-      const escapedAlt = altQuote === '"' ? newAlt.replace(/"/g, "&quot;") : newAlt.replace(/'/g, "&#39;");
       newContent = newContent.slice(0, altAbsoluteIndex) + `alt=${altQuote}${escapedAlt}${altQuote}` + newContent.slice(altAbsoluteIndex + altLength);
+    } else if (ownTag && newAlt && IMAGE_TAG.test(ownTag.name)) {
+      newContent = insertAttribute(newContent, ownTag.start, ownTag.end, `alt="${escapedAlt}"`);
     }
   }
   return { success: true, content: newContent, fileOp: pendingFileOp };
 }
+function nearestMatch(content, pattern, line) {
+  pattern.lastIndex = 0;
+  let best = null;
+  let bestDistance = Number.POSITIVE_INFINITY;
+  let matchLine = 1;
+  let countedTo = 0;
+  for (let match = pattern.exec(content);match; match = pattern.exec(content)) {
+    if (!line || line < 1)
+      return match;
+    for (let i2 = content.indexOf(`
+`, countedTo);i2 >= 0 && i2 < match.index; i2 = content.indexOf(`
+`, i2 + 1))
+      matchLine++;
+    countedTo = match.index;
+    const distance = Math.abs(matchLine - line);
+    if (distance < bestDistance) {
+      best = match;
+      bestDistance = distance;
+    }
+    if (distance === 0 || matchLine > line)
+      break;
+  }
+  return best;
+}
+function enclosingTag(content, offset) {
+  const element = findElements(content, 0, offset + 1).filter((e) => e.start <= offset && offset < e.openEnd).pop();
+  return element ? { start: element.start, end: element.openEnd, name: element.name } : null;
+}
+function imageTagOnLine(content, line) {
+  if (!line || line < 1)
+    return null;
+  const from = lineStart(content, line);
+  if (from < 0)
+    return null;
+  const images = findElements(content, from, lineEnd(content, from)).filter((e) => IMAGE_TAG.test(e.name));
+  return images.length === 1 ? { start: images[0].start, end: images[0].openEnd, name: images[0].name } : null;
+}
 function findFrontmatterAssetImport(content, varName) {
   const fmMatch = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
   if (!fmMatch)
@@ -39885,7 +40236,7 @@ function inlineJsxLiteralReplace(content, lines, regionStart, exprMatch, newSrc)
     regionStartOffset += lines[i2].length + 1;
   const absIndex = regionStartOffset + exprMatch.index;
   return {
-    content: content.slice(0, absIndex) + `src="${escapeReplacement(newSrc)}"` + content.slice(absIndex + exprMatch.length),
+    content: content.slice(0, absIndex) + `src="${newSrc}"` + content.slice(absIndex + exprMatch.length),
     replacedIndex: absIndex
   };
 }
@@ -39949,103 +40300,93 @@ async function readBoundedBody(res, maxBytes) {
   }
   return Buffer.concat(chunks, total);
 }
-function applyColorChange(content, change) {
+function applyColorChange(content, change, entry) {
   const { oldClass, newClass } = change.styleChange;
   const sourceLine = change.styleChange.sourceLine ?? change.sourceLine;
   if (!oldClass) {
-    return appendClassToAttribute(content, newClass, sourceLine);
-  }
-  return replaceClassInAttribute(content, oldClass, newClass, sourceLine);
-}
-function replaceClassInAttribute(content, oldClass, newClass, sourceLine) {
-  const replaceOnLine = (line) => {
-    const dqMatch = line.match(/(class\s*=\s*)(")([^"]*)"/);
-    const sqMatch = line.match(/(class\s*=\s*)(')([^']*)'/);
-    const match = dqMatch || sqMatch;
-    if (!match)
-      return null;
-    const prefix = match[1];
-    const quote = match[2];
-    const classContent = match[3];
-    const classes = classContent.split(/\s+/).filter(Boolean);
-    const idx = classes.indexOf(oldClass);
-    if (idx === -1)
-      return null;
-    if (newClass) {
-      classes[idx] = newClass;
-    } else {
-      classes.splice(idx, 1);
+    return appendClassToAttribute(content, newClass, sourceLine, entry);
+  }
+  return replaceClassInAttribute(content, oldClass, newClass, sourceLine, entry);
+}
+function classAttributes(text, from, to) {
+  const found2 = [];
+  const pattern = /(?<![\w:-])(class\s*=\s*)(?:"([^"]*)"|'([^']*)')/g;
+  const region = text.slice(from, to);
+  for (let match = pattern.exec(region);match; match = pattern.exec(region)) {
+    const quote = match[2] !== undefined ? '"' : "'";
+    found2.push({ index: from + match.index, prefix: match[1], quote, value: match[2] ?? match[3], length: match[0].length });
+  }
+  return found2;
+}
+function rewriteClassAttribute(content, attr, classes) {
+  return content.slice(0, attr.index) + `${attr.prefix}${attr.quote}${classes.join(" ")}${attr.quote}` + content.slice(attr.index + attr.length);
+}
+function insertAttribute(content, tagStart, openEnd, attribute) {
+  const slash = selfClosingSlash(content, tagStart, openEnd);
+  let at = slash >= 0 ? slash : openEnd - 1;
+  while (at > tagStart && /\s/.test(content[at - 1]))
+    at--;
+  return content.slice(0, at) + ` ${attribute}` + content.slice(at);
+}
+function replaceClassInAttribute(content, oldClass, newClass, sourceLine, entry) {
+  const replaceIn = (from, to) => {
+    for (const attr of classAttributes(content, from, to)) {
+      const classes = attr.value.split(/\s+/).filter(Boolean);
+      const idx = classes.indexOf(oldClass);
+      if (idx === -1)
+        continue;
+      if (newClass) {
+        classes[idx] = newClass;
+      } else {
+        classes.splice(idx, 1);
+      }
+      return rewriteClassAttribute(content, attr, classes);
     }
-    return line.replace(match[0], `${prefix}${quote}${classes.join(" ")}${quote}`);
+    return null;
   };
   if (sourceLine) {
-    const lines2 = content.split(`
-`);
-    const lineIndex = sourceLine - 1;
-    if (lineIndex >= 0 && lineIndex < lines2.length) {
-      const result = replaceOnLine(lines2[lineIndex]);
-      if (result !== null) {
-        lines2[lineIndex] = result;
-        return { success: true, content: lines2.join(`
-`) };
-      }
-      return { success: false, error: `Color class '${oldClass}' not found on line ${sourceLine}` };
-    }
-    return { success: false, error: `Invalid source line ${sourceLine}` };
-  }
-  const lines = content.split(`
-`);
-  for (let i2 = 0;i2 < lines.length; i2++) {
-    const result = replaceOnLine(lines[i2]);
-    if (result !== null) {
-      lines[i2] = result;
-      return { success: true, content: lines.join(`
-`) };
-    }
-  }
+    const from = lineStart(content, sourceLine);
+    if (from < 0)
+      return { success: false, error: `Invalid source line ${sourceLine}` };
+    const element = elementOnLine(content, sourceLine, entry?.tag, entry?.text);
+    const result2 = element ? replaceIn(element.start, element.openEnd) : replaceIn(from, lineEnd(content, from));
+    if (result2 !== null)
+      return { success: true, content: result2 };
+    return { success: false, error: `Color class '${oldClass}' not found on line ${sourceLine}` };
+  }
+  const result = replaceIn(0, content.length);
+  if (result !== null)
+    return { success: true, content: result };
   return { success: false, error: `Color class '${oldClass}' not found in source file` };
 }
-function appendClassToAttribute(content, newClass, sourceLine) {
-  const matchClassAttr = (line) => {
-    return line.match(/(class\s*=\s*")(([^"]*))(")/) || line.match(/(class\s*=\s*')(([^']*))(')/);
-  };
-  const doAppendOnLine = (line) => {
-    const match = matchClassAttr(line);
-    if (!match)
-      return null;
-    const open = match[1];
-    const classes = match[2];
-    const close = match[4];
-    const trimmed = classes.trimEnd();
-    const separator = trimmed ? " " : "";
-    const replacement = `${open}${trimmed}${separator}${escapeReplacement(newClass)}${close}`;
-    return line.replace(match[0], replacement);
+function appendClassToAttribute(content, newClass, sourceLine, entry) {
+  const appendTo = (attr) => {
+    const kept = attr.value.trimEnd();
+    return rewriteClassAttribute(content, attr, kept ? [kept, newClass] : [newClass]);
   };
   if (sourceLine) {
-    const lines2 = content.split(`
-`);
-    const lineIndex = sourceLine - 1;
-    if (lineIndex >= 0 && lineIndex < lines2.length) {
-      const result = doAppendOnLine(lines2[lineIndex]);
-      if (result !== null) {
-        lines2[lineIndex] = result;
-        return { success: true, content: lines2.join(`
-`) };
-      }
-      return { success: false, error: `No class attribute found on line ${sourceLine}` };
-    }
-    return { success: false, error: `Invalid source line ${sourceLine}` };
-  }
-  const lines = content.split(`
-`);
-  for (let i2 = 0;i2 < lines.length; i2++) {
-    const result = doAppendOnLine(lines[i2]);
-    if (result !== null) {
-      lines[i2] = result;
-      return { success: true, content: lines.join(`
-`) };
-    }
-  }
+    const from = lineStart(content, sourceLine);
+    if (from < 0)
+      return { success: false, error: `Invalid source line ${sourceLine}` };
+    const element = elementOnLine(content, sourceLine, entry?.tag, entry?.text);
+    if (element) {
+      const [own] = classAttributes(content, element.start, element.openEnd);
+      if (own)
+        return { success: true, content: appendTo(own) };
+      const openingTag = content.slice(element.start, element.openEnd);
+      if (/(?<![\w-])class(?::list)?\s*=/.test(openingTag)) {
+        return { success: false, error: `The class of this element is an expression on line ${sourceLine}; edit it in the source` };
+      }
+      return { success: true, content: insertAttribute(content, element.start, element.openEnd, `class="${newClass}"`) };
+    }
+    const [first2] = classAttributes(content, from, lineEnd(content, from));
+    if (first2)
+      return { success: true, content: appendTo(first2) };
+    return { success: false, error: `No class attribute found on line ${sourceLine}` };
+  }
+  const [first] = classAttributes(content, 0, content.length);
+  if (first)
+    return { success: true, content: appendTo(first) };
   return { success: false, error: "No class attribute found in source file" };
 }
 function replaceLiteralInSnippet(content, snippet, oldValue, newValue) {
@@ -40063,7 +40404,7 @@ function replaceLiteralInSnippet(content, snippet, oldValue, newValue) {
   }
   return;
 }
-function applyAttributeChanges(content, change) {
+function applyAttributeChanges(content, change, entry) {
   let newContent = content;
   let attrApplied = 0;
   const failedChanges = [];
@@ -40083,15 +40424,22 @@ function applyAttributeChanges(content, change) {
       const lineIndex = targetLine - 1;
       if (lineIndex >= 0 && lineIndex < lines.length) {
         const line = lines[lineIndex];
-        const doubleQuotePattern = new RegExp(`(${escapeRegex(attributeName)}\\s*=\\s*)"(${escapeRegex(attrOldValue)})"`);
-        const singleQuotePattern = new RegExp(`(${escapeRegex(attributeName)}\\s*=\\s*)'(${escapeRegex(attrOldValue)})'`);
+        const doubleQuotePattern = new RegExp(`(?<![\\w:-])(${escapeRegex(attributeName)}\\s*=\\s*)"(${escapeRegex(attrOldValue)})"`);
+        const singleQuotePattern = new RegExp(`(?<![\\w:-])(${escapeRegex(attributeName)}\\s*=\\s*)'(${escapeRegex(attrOldValue)})'`);
         const safeNewValue = escapeReplacement(attrNewValue);
-        if (doubleQuotePattern.test(line)) {
+        const element = elementOnLine(newContent, targetLine, entry?.tag, entry?.text);
+        const openingTag = element ? newContent.slice(element.start, element.openEnd) : "";
+        const ownPattern = doubleQuotePattern.test(openingTag) ? doubleQuotePattern : singleQuotePattern.test(openingTag) ? singleQuotePattern : null;
+        if (element && ownPattern) {
+          const quote = ownPattern === doubleQuotePattern ? '"' : "'";
+          newContent = newContent.slice(0, element.start) + openingTag.replace(ownPattern, `$1${quote}${safeNewValue}${quote}`) + newContent.slice(element.openEnd);
+          attrApplied++;
+        } else if (!element && doubleQuotePattern.test(line)) {
           lines[lineIndex] = line.replace(doubleQuotePattern, `$1"${safeNewValue}"`);
           newContent = lines.join(`
 `);
           attrApplied++;
-        } else if (singleQuotePattern.test(line)) {
+        } else if (!element && singleQuotePattern.test(line)) {
           lines[lineIndex] = line.replace(singleQuotePattern, `$1'${safeNewValue}'`);
           newContent = lines.join(`
 `);
@@ -40123,8 +40471,8 @@ function applyAttributeChanges(content, change) {
         });
       }
     } else {
-      const doubleQuotePattern = new RegExp(`(${escapeRegex(attributeName)}\\s*=\\s*)"(${escapeRegex(attrOldValue)})"`);
-      const singleQuotePattern = new RegExp(`(${escapeRegex(attributeName)}\\s*=\\s*)'(${escapeRegex(attrOldValue)})'`);
+      const doubleQuotePattern = new RegExp(`(?<![\\w:-])(${escapeRegex(attributeName)}\\s*=\\s*)"(${escapeRegex(attrOldValue)})"`);
+      const singleQuotePattern = new RegExp(`(?<![\\w:-])(${escapeRegex(attributeName)}\\s*=\\s*)'(${escapeRegex(attrOldValue)})'`);
       const safeNewValue = escapeReplacement(attrNewValue);
       if (doubleQuotePattern.test(newContent)) {
         newContent = newContent.replace(doubleQuotePattern, `$1"${safeNewValue}"`);
@@ -40143,28 +40491,49 @@ function applyAttributeChanges(content, change) {
   return { content: newContent, appliedCount: attrApplied, failedChanges };
 }
 function applyTextChange(content, change, manifest) {
-  const { sourceSnippet, originalValue, newValue, htmlValue } = change;
-  if (!sourceSnippet || !originalValue) {
+  const { sourceSnippet: recordedSnippet, originalValue, newValue, htmlValue } = change;
+  if (!recordedSnippet || !originalValue) {
     if (change.attributeChanges && change.attributeChanges.length > 0) {
       return { success: true, content };
     }
     return { success: false, error: "Missing sourceSnippet or originalValue in change payload" };
   }
-  if (!content.includes(sourceSnippet)) {
-    return { success: false, error: "Source snippet not found in file" };
-  }
   const entry = manifest.entries[change.cmsId];
-  const insideYaml = isYamlValueSource(content, sourceSnippet, change.sourcePath);
+  const pickIn = (snippet) => entry?.tag ? pickElement(snippet, findElements(snippet, 0, snippet.length, entry.tag), entry.text) : null;
+  let lineSnippet = recordedSnippet;
+  let lineSnippetAt = locateSnippet(content, lineSnippet, change.sourceLine);
+  if (lineSnippetAt < 0) {
+    const stale = pickIn(lineSnippet);
+    const elementSource = stale ? lineSnippet.slice(stale.start, stale.end) : "";
+    const at = elementSource ? locateSnippet(content, elementSource, change.sourceLine) : -1;
+    if (at < 0) {
+      return { success: false, error: "Source snippet not found in file" };
+    }
+    lineSnippet = elementSource;
+    lineSnippetAt = at;
+  }
+  const insideYaml = isYamlValueSource(content, lineSnippet, change.sourcePath, lineSnippetAt);
+  const snippetIsJavaScript = isJavaScriptSource(change.sourcePath) && (!!entry?.variableName || !looksLikeMarkup(lineSnippet));
+  const element = !insideYaml && !snippetIsJavaScript ? pickIn(lineSnippet) : null;
+  const sourceSnippet = element ? lineSnippet.slice(element.start, element.end) : lineSnippet;
+  const snippetAt = lineSnippetAt + (element?.start ?? 0);
+  const innerFrom = element && !element.void ? element.openEnd - element.start : 0;
+  const innerTo = element && !element.void ? element.closeStart - element.start : sourceSnippet.length;
+  const replaceInText = (search, replacement) => {
+    const at = sourceSnippet.indexOf(search, innerFrom);
+    if (at < 0 || at + search.length > innerTo)
+      return sourceSnippet;
+    return sourceSnippet.slice(0, at) + replacement + sourceSnippet.slice(at + search.length);
+  };
   const stylingAllowed = entry?.allowStyling !== false && !insideYaml;
   const newText = stylingAllowed ? htmlValue ?? newValue : newValue;
   const placeholderPattern = /\{\{cms:[^}]+\}\}/g;
   if (placeholderPattern.test(originalValue)) {
-    return applyTextChangeWithPlaceholders(insideYaml, content, sourceSnippet, originalValue, newText);
+    return applyTextChangeWithPlaceholders(insideYaml, content, snippetAt, sourceSnippet, originalValue, newText, innerFrom, innerTo);
   }
   const resolvedNewText = resolveCmsPlaceholders(newText, manifest);
   const resolvedOriginal = resolveCmsPlaceholders(originalValue, manifest);
-  const write = (updatedSnippet2) => writeSnippet(content, sourceSnippet, updatedSnippet2, insideYaml, resolvedNewText);
-  const snippetIsJavaScript = isJavaScriptSource(change.sourcePath) && (!!entry?.variableName || !looksLikeMarkup(sourceSnippet));
+  const write = (updatedSnippet2) => writeSnippet(content, snippetAt, sourceSnippet, updatedSnippet2, insideYaml, resolvedNewText);
   if (snippetIsJavaScript) {
     const literalResult = tryJsStringLiteralChange(sourceSnippet, resolvedOriginal, resolvedNewText);
     if (literalResult !== null) {
@@ -40177,7 +40546,7 @@ function applyTextChange(content, change, manifest) {
       return write(frontmatterResult);
     }
   }
-  const updatedSnippet = sourceSnippet.replace(resolvedOriginal, escapeReplacement(resolvedNewText));
+  const updatedSnippet = replaceInText(resolvedOriginal, resolvedNewText);
   if (updatedSnippet === sourceSnippet) {
     const brResult = tryBrNormalizedChange(sourceSnippet, resolvedOriginal, resolvedNewText);
     if (brResult !== null) {
@@ -40189,31 +40558,30 @@ function applyTextChange(content, change, manifest) {
         return write(literalResult);
       }
     }
-    const matchedText = findTextInSnippet(sourceSnippet, resolvedOriginal);
+    const matchedText = findTextInSnippet(sourceSnippet.slice(innerFrom, innerTo), resolvedOriginal);
     if (matchedText) {
       const spliced = /<[^>]+>/.test(resolvedNewText) ? null : spliceIntoEntitySource(matchedText, resolvedOriginal, resolvedNewText);
       const replacement = spliced ?? (/<[^>]+>/.test(resolvedNewText) ? encodeNbspLike(resolvedNewText, matchedText) : encodeEntitiesLike(resolvedNewText, matchedText));
-      const updatedWithEntity = sourceSnippet.replace(matchedText, escapeReplacement(replacement));
+      const updatedWithEntity = replaceInText(matchedText, replacement);
       return write(updatedWithEntity);
     }
-    const innerMatch = sourceSnippet.match(/^(\s*<(\w+)\b[^>]*>)([\s\S]*)(<\/\2>\s*)$/);
-    if (innerMatch) {
-      const [, openTag, , innerContent, closeTag] = innerMatch;
-      const textOnly = innerContent.replace(/<[^>]+>/g, "");
-      if (textOnly === resolvedOriginal) {
-        const isHtmlReplacement = /<[^>]+>/.test(resolvedNewText);
-        if (isHtmlReplacement || !/<[^>]+>/.test(innerContent)) {
-          return write(openTag + resolvedNewText + closeTag);
-        }
-        const splicedInner = spliceTextAcrossInlineMarkup(innerContent, resolvedOriginal, resolvedNewText);
-        if (splicedInner !== null) {
-          return write(openTag + splicedInner + closeTag);
-        }
-        return {
-          success: false,
-          error: "Cannot apply this edit without dropping the inline markup inside the element " + "\u2014 edit the styled part separately"
-        };
+    const element2 = findElementByText(sourceSnippet, resolvedOriginal, entry?.tag);
+    if (element2) {
+      const { before, openTag, innerContent, closeTag, after } = element2;
+      const writeElement = (updatedElement) => write(before + updatedElement + after);
+      const isHtmlReplacement = /<[^>]+>/.test(resolvedNewText);
+      if (isHtmlReplacement || !/<[^>]+>/.test(innerContent)) {
+        const spliced = isHtmlReplacement ? null : spliceIntoEntitySource(innerContent, resolvedOriginal, resolvedNewText);
+        return writeElement(openTag + (spliced ?? resolvedNewText) + closeTag);
       }
+      const splicedInner = spliceTextAcrossInlineMarkup(innerContent, resolvedOriginal, resolvedNewText);
+      if (splicedInner !== null) {
+        return writeElement(openTag + splicedInner + closeTag);
+      }
+      return {
+        success: false,
+        error: "Cannot apply this edit without dropping the inline markup inside the element. " + "Edit the styled part separately"
+      };
     }
     return {
       success: false,
@@ -40222,14 +40590,14 @@ function applyTextChange(content, change, manifest) {
   }
   return write(updatedSnippet);
 }
-function applyTextChangeWithPlaceholders(insideYaml, content, sourceSnippet, originalValue, newText) {
+function applyTextChangeWithPlaceholders(insideYaml, content, snippetAt, sourceSnippet, originalValue, newText, innerFrom = 0, innerTo = sourceSnippet.length) {
   const placeholderPattern = /\{\{cms:[^}]+\}\}/g;
   const originalParts = originalValue.split(placeholderPattern);
   const newParts = newText.split(placeholderPattern);
   if (originalParts.length !== newParts.length) {
     return { success: false, error: "Placeholder structure mismatch between original and new values" };
   }
-  let updatedSnippet = sourceSnippet;
+  let updatedInner = sourceSnippet.slice(innerFrom, innerTo);
   let anyChange = false;
   for (let i2 = 0;i2 < originalParts.length; i2++) {
     const oldPart = originalParts[i2];
@@ -40237,12 +40605,12 @@ function applyTextChangeWithPlaceholders(insideYaml, content, sourceSnippet, ori
     if (oldPart === newPart || oldPart.length === 0) {
       continue;
     }
-    const matchedText = findTextInSnippet(updatedSnippet, oldPart);
+    const matchedText = findTextInSnippet(updatedInner, oldPart);
     if (matchedText) {
       if (matchedText !== oldPart) {
         newPart = encodeEntitiesLike(newPart, matchedText);
       }
-      updatedSnippet = updatedSnippet.replace(matchedText, escapeReplacement(newPart));
+      updatedInner = updatedInner.replace(matchedText, escapeReplacement(newPart));
       anyChange = true;
     } else {
       return {
@@ -40254,12 +40622,13 @@ function applyTextChangeWithPlaceholders(insideYaml, content, sourceSnippet, ori
   if (!anyChange) {
     return { success: false, error: "No text changes detected between original and new values" };
   }
-  return writeSnippet(content, sourceSnippet, updatedSnippet, insideYaml, newText);
+  const updatedSnippet = sourceSnippet.slice(0, innerFrom) + updatedInner + sourceSnippet.slice(innerTo);
+  return writeSnippet(content, snippetAt, sourceSnippet, updatedSnippet, insideYaml, newText);
 }
 function isJavaScriptSource(sourcePath) {
   return !!sourcePath && JAVASCRIPT_SOURCE.test(sourcePath);
 }
-function isYamlValueSource(content, sourceSnippet, sourcePath) {
+function isYamlValueSource(content, sourceSnippet, sourcePath, snippetAt) {
   if (!sourcePath)
     return false;
   if (YAML_DOCUMENT_SOURCE.test(sourcePath))
@@ -40269,7 +40638,7 @@ function isYamlValueSource(content, sourceSnippet, sourcePath) {
   const block = frontmatterBlock(content);
   if (!block)
     return false;
-  const snippetStart = content.indexOf(sourceSnippet);
+  const snippetStart = snippetAt ?? content.indexOf(sourceSnippet);
   return snippetStart >= block.start && snippetStart + sourceSnippet.length <= block.end;
 }
 function frontmatterBlock(content) {
@@ -40299,7 +40668,7 @@ function decodeJsString(raw) {
         const close = raw.indexOf("}", i2 + 2);
         if (close !== -1) {
           const code2 = parseInt(raw.slice(i2 + 2, close), 16);
-          if (!Number.isNaN(code2)) {
+          if (!Number.isNaN(code2) && code2 <= 1114111) {
             out += String.fromCodePoint(code2);
             i2 = close;
             continue;
@@ -40402,8 +40771,9 @@ function spliceTextAcrossInlineMarkup(innerContent, originalText, newText) {
     const token2 = tokens[i2];
     if (isTag(token2) || !token2)
       continue;
-    runs.push({ index: i2, start: plain.length, end: plain.length + token2.length });
-    plain += token2;
+    const { text, offsets } = decodeEntitiesWithOffsets(token2);
+    runs.push({ index: i2, start: plain.length, end: plain.length + text.length, offsets });
+    plain += text;
   }
   if (plain !== originalText)
     return null;
@@ -40429,9 +40799,29 @@ function spliceTextAcrossInlineMarkup(innerContent, originalText, newText) {
   if (!run)
     return null;
   const token = tokens[run.index];
-  tokens[run.index] = token.slice(0, start - run.start) + newText.slice(start, newEnd) + token.slice(originalEnd - run.start);
+  tokens[run.index] = token.slice(0, run.offsets[start - run.start]) + newText.slice(start, newEnd) + token.slice(run.offsets[originalEnd - run.start]);
   return tokens.join("");
 }
+function findElementByText(snippet, text, tag) {
+  const whole = snippet.match(/^(\s*<(\w+)\b[^>]*>)([\s\S]*)(<\/\2>\s*)$/);
+  if (whole && plainTextOf(whole[3]) === text) {
+    return { before: "", openTag: whole[1], innerContent: whole[3], closeTag: whole[4], after: "" };
+  }
+  const exact = findElements(snippet, 0, snippet.length, tag).filter((span) => !span.void && plainTextOf(snippet.slice(span.openEnd, span.closeStart)) === text);
+  const match = pickElement(snippet, exact, text);
+  if (!match)
+    return null;
+  return {
+    before: snippet.slice(0, match.start),
+    openTag: snippet.slice(match.start, match.openEnd),
+    innerContent: snippet.slice(match.openEnd, match.closeStart),
+    closeTag: snippet.slice(match.closeStart, match.end),
+    after: snippet.slice(match.end)
+  };
+}
+function plainTextOf(markup) {
+  return decodeEntitiesWithOffsets(markup.replace(/<[^>]+>/g, "")).text;
+}
 function findTextInSnippet(snippet, decodedText) {
   if (snippet.includes(decodedText)) {
     return decodedText;
@@ -40480,10 +40870,9 @@ function decodeEntitiesWithOffsets(source) {
 }
 function decodeEntityMatch(match) {
   const [, hex, dec, name] = match;
-  if (hex)
-    return String.fromCodePoint(parseInt(hex, 16));
-  if (dec)
-    return String.fromCodePoint(parseInt(dec, 10));
+  const code = hex ? parseInt(hex, 16) : dec ? parseInt(dec, 10) : -1;
+  if (code >= 0)
+    return code <= 1114111 ? String.fromCodePoint(code) : undefined;
   return name ? NAMED_ENTITIES[name.toLowerCase()] : undefined;
 }
 function spliceIntoEntitySource(source, original, replacement) {
@@ -40550,7 +40939,7 @@ function resolveCmsPlaceholders(text, manifest) {
   });
 }
 function findExpressionAttribute(text, attr) {
-  const exprStart = new RegExp(`${attr}\\s*=\\s*\\{`);
+  const exprStart = new RegExp(`(?<![\\w:-])${attr}\\s*=\\s*\\{`);
   const match = text.match(exprStart);
   if (!match || match.index === undefined)
     return null;
@@ -40663,14 +41052,14 @@ function scalarSays(actual, expected) {
   const parsed = tryParseYaml(expected);
   return typeof parsed === "number" && parsed === actual;
 }
-function writeSnippet(content, sourceSnippet, updatedSnippet, insideYaml, expected) {
+function writeSnippet(content, snippetAt, sourceSnippet, updatedSnippet, insideYaml, expected) {
   if (insideYaml && !yamlSnippetSurvives(sourceSnippet, updatedSnippet, expected)) {
     return {
       success: false,
       error: `"${expected.substring(0, 50)}" cannot be written into this frontmatter field without breaking it`
     };
   }
-  return { success: true, content: content.replace(sourceSnippet, escapeReplacement(updatedSnippet)) };
+  return { success: true, content: content.slice(0, snippetAt) + updatedSnippet + content.slice(snippetAt + sourceSnippet.length) };
 }
 function yamlSnippetSurvives(sourceSnippet, updatedSnippet, expected) {
   const before = yamlScalars(sourceSnippet);
@@ -40841,15 +41230,17 @@ function tryBrNormalizedChange(sourceSnippet, resolvedOriginal, resolvedNewText)
   }
   return result !== sourceSnippet ? result : null;
 }
-var import_node_html_parser, import_yaml6, ASSET_IMPORT_EXT_RE, REMOTE_FETCH_TIMEOUT_MS = 15000, REMOTE_FETCH_MAX_BYTES, QUOTED_LITERAL_DELIMITERS, JAVASCRIPT_SOURCE, YAML_DOCUMENT_SOURCE, YAML_FRONTMATTER_SOURCE, JS_ESCAPES, ENTITY_ALTERNATIVES, NAMED_ENTITIES, YAML_PLAIN_NUMBER;
+var import_node_html_parser, import_yaml6, IMAGE_TAG, ASSET_IMPORT_EXT_RE, REMOTE_FETCH_TIMEOUT_MS = 15000, REMOTE_FETCH_MAX_BYTES, QUOTED_LITERAL_DELIMITERS, JAVASCRIPT_SOURCE, YAML_DOCUMENT_SOURCE, YAML_FRONTMATTER_SOURCE, JS_ESCAPES, ENTITY_ALTERNATIVES, YAML_PLAIN_NUMBER;
 var init_source_writer = __esm(() => {
   init_astro_image_paths();
   init_config();
   init_context();
   init_snippet_utils();
   init_utils2();
+  init_element_span();
   import_node_html_parser = __toESM(require_dist2(), 1);
   import_yaml6 = __toESM(require_dist(), 1);
+  IMAGE_TAG = /^(img|Image|Picture)$/;
   ASSET_IMPORT_EXT_RE = /\.(jpe?g|png|gif|webp|avif|svg|ico|bmp|tiff?)$/i;
   REMOTE_FETCH_MAX_BYTES = 50 * 1024 * 1024;
   QUOTED_LITERAL_DELIMITERS = [`'`, `"`, "`"];
@@ -40875,14 +41266,6 @@ var init_source_writer = __esm(() => {
     ['"', ["&quot;"]],
     ["'", ["&#39;", "&apos;"]]
   ]);
-  NAMED_ENTITIES = {
-    amp: "&",
-    lt: "<",
-    gt: ">",
-    quot: '"',
-    apos: "'",
-    nbsp: "\xA0"
-  };
   YAML_PLAIN_NUMBER = /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?$/;
 });
 
@@ -42565,7 +42948,7 @@ async function processHtml(html, fileId, options, getNextId, sourcePath) {
   let markdownWrapperNode = null;
   const markdownWrapperNodes = new Set;
   if (collectionInfo) {
-    const allElements = root.querySelectorAll("*");
+    const allElements2 = root.querySelectorAll("*");
     let foundWrapper = false;
     const markerEls = root.querySelectorAll("[data-cms-markdown-content]");
     for (const markerEl of markerEls) {
@@ -42590,7 +42973,7 @@ async function processHtml(html, fileId, options, getNextId, sourcePath) {
     }
     if (!foundWrapper) {
       const SKIP_WRAPPER_TAGS = new Set(["html", "head", "body", "script", "style", "meta", "link"]);
-      for (const node of allElements) {
+      for (const node of allElements2) {
         const tag = node.tagName?.toLowerCase?.() ?? "";
         if (SKIP_WRAPPER_TAGS.has(tag))
           continue;
@@ -42637,7 +43020,7 @@ async function processHtml(html, fileId, options, getNextId, sourcePath) {
           }
           return depth;
         };
-        for (const node of allElements) {
+        for (const node of allElements2) {
           const tag = node.tagName?.toLowerCase?.() ?? "";
           if (["script", "style", "head", "meta", "link", "html"].includes(tag))
             continue;
@@ -42668,7 +43051,7 @@ async function processHtml(html, fileId, options, getNextId, sourcePath) {
       const bodyStart = collectionInfo.bodyFirstLine.replace(/^\*\*|\*\*$/g, "").replace(/\*\*/g, "").replace(/\*/g, "").replace(/^#+ /, "").replace(/^\s*[-*+]\s+/, "").replace(/\[([^\]]+)\]\([^)]+\)/g, "$1").trim().substring(0, 50);
       if (bodyStart.length > 3) {
         const candidates = [];
-        for (const node of allElements) {
+        for (const node of allElements2) {
           const tag = node.tagName?.toLowerCase?.() ?? "";
           if (["script", "style", "head", "meta", "link"].includes(tag))
             continue;
@@ -47584,9 +47967,9 @@ function factoryLabel(effects, ok3, nok, type, markerType, stringType, disallowE
       return ok3;
     }
     effects.enter(stringType);
-    return lineStart(code);
+    return lineStart2(code);
   }
-  function lineStart(code) {
+  function lineStart2(code) {
     if (code === codes.rightSquareBracket && !balance) {
       return atClosingBrace(code);
     }
@@ -47616,7 +47999,7 @@ function factoryLabel(effects, ok3, nok, type, markerType, stringType, disallowE
       }
       effects.consume(code);
       effects.exit(types.chunkText);
-      return lineStart;
+      return lineStart2;
     }
     effects.consume(code);
     return code === codes.backslash ? dataEscape : data;
@@ -47727,9 +48110,9 @@ function tokenizeDirectiveContainer(effects, ok3, nok) {
       return effects.check(nonLazyLine, emptyContentNonLazyLineAfter, after)(code);
     }
     effects.enter("directiveContainerContent");
-    return lineStart(code);
+    return lineStart2(code);
   }
-  function lineStart(code) {
+  function lineStart2(code) {
     return effects.attempt({ tokenize: tokenizeClosingFence, partial: true }, afterContent, initialSize ? factorySpace(effects, chunkStart, types.linePrefix, initialSize + 1) : chunkStart)(code);
   }
   function chunkStart(code) {
@@ -47765,13 +48148,13 @@ function tokenizeDirectiveContainer(effects, ok3, nok) {
   }
   function emptyContentNonLazyLineAfter(code) {
     effects.enter("directiveContainerContent");
-    return lineStart(code);
+    return lineStart2(code);
   }
   function nonLazyLineAfter(code) {
     effects.consume(code);
     const t = effects.exit(types.chunkDocument);
     self2.parser.lazy[t.start.line] = false;
-    return lineStart;
+    return lineStart2;
   }
   function lineAfter(code) {
     const t = effects.exit(types.chunkDocument);
@@ -47829,9 +48212,9 @@ function tokenizeNonLazyLine(effects, ok3, nok) {
     effects.enter(types.lineEnding);
     effects.consume(code);
     effects.exit(types.lineEnding);
-    return lineStart;
+    return lineStart2;
   }
-  function lineStart(code) {
+  function lineStart2(code) {
     return self2.parser.lazy[self2.now().line] ? nok(code) : ok3(code);
   }
 }
@@ -85547,7 +85930,7 @@ var init_build = __esm(() => {
     var _b;
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.FIELDS = undefined;
-    exports.default = tokenize;
+    exports.default = tokenize2;
     var t4 = __importStar(require_tokenTypes());
     var unescapable = (_a3 = {}, _a3[t4.tab] = true, _a3[t4.newline] = true, _a3[t4.cr] = true, _a3[t4.feed] = true, _a3);
     var wordDelimiters = (_b = {}, _b[t4.space] = true, _b[t4.tab] = true, _b[t4.newline] = true, _b[t4.cr] = true, _b[t4.feed] = true, _b[t4.ampersand] = true, _b[t4.asterisk] = true, _b[t4.bang] = true, _b[t4.comma] = true, _b[t4.colon] = true, _b[t4.semicolon] = true, _b[t4.openParenthesis] = true, _b[t4.closeParenthesis] = true, _b[t4.openSquare] = true, _b[t4.closeSquare] = true, _b[t4.singleQuote] = true, _b[t4.doubleQuote] = true, _b[t4.plus] = true, _b[t4.pipe] = true, _b[t4.tilde] = true, _b[t4.greaterThan] = true, _b[t4.equals] = true, _b[t4.dollar] = true, _b[t4.caret] = true, _b[t4.slash] = true, _b);
@@ -85594,7 +85977,7 @@ var init_build = __esm(() => {
       START_POS: 5,
       END_POS: 6
     };
-    function tokenize(input) {
+    function tokenize2(input) {
       var tokens = [];
       var css = input.css.valueOf();
       var length = css.length;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuasite/cli",
-  "version": "0.64.1",
+  "version": "0.64.2",
   "license": "Apache-2.0",
   "type": "module",
   "files": [
@@ -25,8 +25,8 @@
   "dependencies": {
     "@astrojs/compiler": "^4.0.0",
     "@jridgewell/trace-mapping": "^0.3.31",
-    "@nuasite/cms": "0.64.1",
-    "@nuasite/cms-core": "0.64.1"
+    "@nuasite/cms": "0.64.2",
+    "@nuasite/cms-core": "0.64.2"
   },
   "devDependencies": {
     "@types/bun": "1.3.11"