@bettercms-ai/convert 0.18.1 → 0.18.2

package/dist/index.js

@@ -6498,7 +6498,7 @@ function* formsIn(nodes, chain = []) {
   }
 }
 var isComponentTag = (dialect, tag) => dialect !== "html" && /^[A-Z]/.test(tag);
-function candidateOf(file, dialect, form, imported, landmark) {
+function candidateOf(file, dialect, form, imported, landmark, content) {
   const controls = /* @__PURE__ */ new Map();
   const wrapper = /* @__PURE__ */ new Map();
   const foreign = /* @__PURE__ */ new Set();
@@ -6535,7 +6535,11 @@ function candidateOf(file, dialect, form, imported, landmark) {
     const id = attrOf(control, "id")?.value;
     if (id && !controls.has(id)) controls.set(id, control);
   }
-  return { file, dialect, el: form, controls, wrapper, foreign, landmark };
+  const computed = (attr) => !!attr?.expression && !!attr.expressionRange && /[A-Za-z_$]/.test(
+    content.slice(attr.expressionRange.start, attr.expressionRange.end).replace(/\/\*[\s\S]*?\*\/|\/\/[^\n]*|"(?:[^"\\\n]|\\.)*"|'(?:[^'\\\n]|\\.)*'|`(?:[^`\\$]|\\.|\$(?!\{))*`/g, "")
+  );
+  const dynamic = all.some((control) => !foreign.has(control) && computed(attrOf(control, "name")));
+  return { file, dialect, el: form, controls, wrapper, foreign, landmark, dynamic };
 }
 async function importedControls(source, parsed, dialect, project, cache) {
   const out = /* @__PURE__ */ new Map();
@@ -6629,11 +6633,12 @@ async function wireForms(briefIn, sources, options_ = {}) {
     }
     const imported = dialect === "html" ? /* @__PURE__ */ new Map() : await importedControls(source, parsed, dialect, project, componentFiles);
     for (const { el, landmark } of formsIn(parsed.roots)) {
-      candidates.push(candidateOf(source.path, dialect, el, imported, landmark));
+      candidates.push(candidateOf(source.path, dialect, el, imported, landmark, source.content));
     }
   }
   const holds = (c, f) => f.fields.filter((field) => c.controls.has(field.key)).length;
-  const covers2 = (c, f) => f.fields.length > 0 && holds(c, f) === f.fields.length;
+  const wiredTo = (c, f) => attrOf(c.el, "data-bcms-form")?.value === f.id;
+  const covers2 = (c, f) => c.dynamic && wiredTo(c, f) || f.fields.length > 0 && holds(c, f) === f.fields.length;
   const samePath = (a, b) => a.replace(/\\/g, "/").replace(/^\.\//, "") === b.replace(/\\/g, "/").replace(/^\.\//, "");
   const options = new Map(forms.map((f) => [f.id, candidates.filter((c) => covers2(c, f))]));
   const pinned = /* @__PURE__ */ new Map();
@@ -6716,6 +6721,11 @@ async function wireForms(briefIn, sources, options_ = {}) {
       continue;
     }
     const candidate = list[0];
+    if (wiredTo(candidate, form)) {
+      alreadyWired++;
+      onSite.push({ form, file: candidate.file });
+      continue;
+    }
     if (attrOf(candidate.el, "action")?.expression) {
       pend2(form, "ACTION_IS_EXPRESSION", candidate.file, "its action is an expression, so this run will not replace it.");
       continue;
@@ -6728,11 +6738,6 @@ async function wireForms(briefIn, sources, options_ = {}) {
       pend2(form, "FIELD_UNMATCHED", candidate.file, `the control for ${misnamed.key} posts under an expression, so its name cannot be set to the CMS key.`);
       continue;
     }
-    if (attrOf(candidate.el, "data-bcms-form")?.value === form.id) {
-      alreadyWired++;
-      onSite.push({ form, file: candidate.file });
-      continue;
-    }
     matched.push({ form, candidate });
     onSite.push({ form, file: candidate.file });
   }
@@ -6853,7 +6858,8 @@ var TEMPLATE_DIRS = /* @__PURE__ */ new Set([
   "_includes",
   "_layouts"
 ]);
-var isAboutTheSite = (lower) => /\.(test|spec)\.[^./]+$/.test(lower) || /^[^/]*\.config\.[^./]+$/.test(lower);
+var READ_CONFIG = /^astro\.config\.[^./]+$/;
+var isAboutTheSite = (lower) => /\.(test|spec)\.[^./]+$/.test(lower) || /^[^/]*\.config\.[^./]+$/.test(lower) && !READ_CONFIG.test(lower);
 function isSourceCandidate(path) {
   const lower = path.toLowerCase();
   if (SKIP_DIRS.some((dir) => lower === dir.slice(0, -1) || lower.startsWith(dir) || lower.includes(`/${dir}`)))
@@ -6900,7 +6906,7 @@ function measureUnaddressable(html) {
   let visible = 0;
   let unaddressable = 0;
   const buckets = /* @__PURE__ */ new Map();
-  const visit = (node, tag, context, bound) => {
+  const visit = (node, tag, context, bound, inForm = false) => {
     if (node.type === "text") {
       const text = flat2(node.value);
       if (isDecorativeGlyph(text) || PLATFORM_BADGE.test(text)) return;
@@ -6920,9 +6926,10 @@ function measureUnaddressable(html) {
     if (attrs.has("hidden") || attrs.get("aria-hidden") === "true" || /display\s*:\s*none/i.test(attrs.get("style") ?? "") || isSkipLink(node, attrs)) {
       return;
     }
-    const owned = bound || BOUND_ATTRS.some((name) => attrs.has(name));
+    const form = inForm || attrs.has("data-bcms-form");
+    const owned = bound || BOUND_ATTRS.some((name) => attrs.has(name)) || form && attrs.has("data-bcms-form-part");
     const chain = CONTEXT_TAGS.has(node.tag) ? context === "body" ? node.tag : `${context}>${node.tag}` : context;
-    for (const child of node.children) visit(child, node.tag, chain, owned);
+    for (const child of node.children) visit(child, node.tag, chain, owned, form);
   };
   for (const root of parsed.roots) visit(root, "body", "body", false);
   return {
@@ -9420,7 +9427,23 @@ async function plan(file, content, dialect, targets, sites, importAt, outcomes,
       continue;
     }
     const resolved = sharing.length === 1 ? { assigned: /* @__PURE__ */ new Map([[sharing[0].key, forLiteral]]), ambiguous: /* @__PURE__ */ new Set() } : resolvePositionally(sharing, forLiteral);
+    const exactly = new Map(
+      sharing.length > 1 ? sharing.flatMap((target) => {
+        const own = forLiteral.filter(
+          (site) => site.where === "text" && !site.partial && !site.mixed && isIntrinsic(site.tag) && declarations.some((d) => d.scope === target.scope && d.path === target.path && d.at === site.attrInsertAt)
+        );
+        return own.length > 0 ? [[target.key, own]] : [];
+      }) : []
+    );
+    const unmarked = forLiteral.filter((site) => ![...exactly.values()].some((own) => own.includes(site)));
+    const settled = unmarked.length <= sharing.length - exactly.size ? exactly : /* @__PURE__ */ new Map();
     for (const target of sharing) {
+      const own = settled.get(target.key);
+      if (own) {
+        outcomes.set(target.key, "declared");
+        located += own.length;
+        continue;
+      }
       if (resolved.ambiguous.has(target.key)) {
         outcomes.set(target.key, "AMBIGUOUS_LITERAL");
         continue;