@bettercms-ai/convert 0.13.0 → 0.15.0

package/dist/index.d.ts

@@ -33,9 +33,12 @@ interface BriefPath {
      * what it said.
      */
     scope?: "page" | "layout";
-    /** `data-bcms-kind` — "text" | "richtext" | "image", as `kindOf` spells it. */
-    kind: string;
-    /** The declared field type, which `kind` deliberately loses (richtext vs document). */
+    /**
+     * `data-bcms-kind`, as `kindOf` spells it: text | richtext | image | document. The props-lane
+     * members of the union (url, number, array) never appear on a brief path.
+     */
+    kind: BindingKind;
+    /** The declared field type. It agrees with `kind` now; the injector reads it for LINK_TYPES. */
     type: string;
     /**
      * The richtext value IS the element's whole inline subtree — the field's `config.inline`.
@@ -229,6 +232,12 @@ interface PendingFix {
     /** The bytes at `line`, trimmed — so the agent can see it is looking at the right place. */
     snippet: string;
     action: FixAction;
+    /**
+     * `declare-richtext` only: WHICH container this is. A `document` is a whole Body — one element
+     * holds every block — and binding a paragraph of it instead publishes the entire article into
+     * that paragraph. The two are different instructions, not one with a longer value.
+     */
+    kind?: "richtext" | "document";
     /** One sentence, present whenever the action alone does not say enough. */
     why?: string;
 }
@@ -287,7 +296,14 @@ declare function routeCounts(pending: readonly PendingPath[]): Map<string, numbe
  * is only `rewritten` when EVERY located occurrence of it was.
  */
 
-type PendingReason = "NO_ORIGINAL" | "NOT_IN_SOURCE" | "DIALECT_UNSUPPORTED" | "IN_EXPRESSION" | "IN_SCRIPT_OR_COMMENT" | "IN_DATA_FILE" | "AMBIGUOUS_LITERAL" | "KIND_MISMATCH" | "SUBSTRING_ONLY"
+type PendingReason = 
+/**
+ * A Body the codemod refuses to touch, and the only pending reason that is a DECISION rather
+ * than a failure. Its value is a whole Portable Text array and its `original` is only the first
+ * block's text, so locating it lands on one paragraph — and publish then writes the entire
+ * article into that paragraph, or refuses it outright. The fix names the wrapper to declare.
+ */
+"DOCUMENT_DECLARE_ONLY" | "NO_ORIGINAL" | "NOT_IN_SOURCE" | "DIALECT_UNSUPPORTED" | "IN_EXPRESSION" | "IN_SCRIPT_OR_COMMENT" | "IN_DATA_FILE" | "AMBIGUOUS_LITERAL" | "KIND_MISMATCH" | "SUBSTRING_ONLY"
 /** An INLINE richtext value whose element holds a component, a `<slot>` or an expression. */
  | "SUBTREE_NOT_HTML" | "PROP_TARGET_NOT_FOUND" | "PROP_DRILLED_DEEP" | "REPEATER_FIXED_LENGTH"
 /** One array declaration, two loops over it: the row this leaf belongs to has two homes. */

package/dist/index.js

@@ -2560,7 +2560,11 @@ var IMAGE_SOURCES = {
   video: ["poster"]
 };
 var isImageSource = (site) => site.where === "attr" && (IMAGE_SOURCES[site.tag.toLowerCase()] ?? []).includes(site.attr ?? "");
-var ownsSubtree = (kind, site, inline) => kind === "richtext" && (inline === true ? !site.nonHtml : !(site.mixed && site.textRange !== null));
+var ownsSubtree = (kind, site, inline) => (
+  // A `document` is the same claim at article scale: the element renders EVERY block of the Body,
+  // so its children come from the stored value and nothing else may be bound inside it.
+  (kind === "richtext" || kind === "document") && (inline === true ? !site.nonHtml : !(site.mixed && site.textRange !== null))
+);
 var norm = (value) => decodeEntities(value.normalize("NFC")).replace(/\s+/g, " ").trim();
 var BCMS_ATTRS = [
   "data-bcms-field",
@@ -5369,7 +5373,7 @@ function actionFor(reason, input, file, inData) {
   return chosen;
 }
 function reasonAction(reason, input, file, inData) {
-  const richtext = input.kind === "richtext" || input.inline === true;
+  const richtext = input.kind === "richtext" || input.kind === "document" || input.inline === true;
   switch (reason) {
     case "AMBIGUOUS_LITERAL":
       if (input.routes > 1) {
@@ -5420,6 +5424,11 @@ function reasonAction(reason, input, file, inData) {
       return { action: "wrap-span", why: "Only part of the element's text is this value \u2014 give it its own span." };
     case "SUBTREE_NOT_HTML":
       return { action: "declare-richtext", why: "The value is the element's whole subtree \u2014 bind it as richtext." };
+    case "DOCUMENT_DECLARE_ONLY":
+      return {
+        action: "declare-richtext",
+        why: 'This is a Body: bind the ONE element that renders every block of it \u2014 an article, a main or a div \u2014 with the richtext helper and data-bcms-kind="document". Never the paragraph holding its first block: that is where the whole article would be published.'
+      };
     default:
       return { action: "manual", why: `${reason} \u2014 see the receipt's message for what blocked this path.` };
   }
@@ -5436,7 +5445,10 @@ function fixFor(row, input) {
     ...place.col !== void 0 ? { col: place.col } : {},
     snippet: place.snippet,
     action,
-    ...why ? { why } : {}
+    ...why ? { why } : {},
+    // Only `declare-richtext` carries it, and only to say WHICH container is meant: one element
+    // for a rich-text value, the whole Body's wrapper for a document.
+    ...action === "declare-richtext" && (input.kind === "document" || input.kind === "richtext") ? { kind: input.kind } : {}
   };
 }
 function routeCounts(pending) {
@@ -6389,9 +6401,11 @@ function* elementsIn(nodes) {
 var childElements = (node) => node.children.flatMap(
   (child) => child.type === "element" ? [child] : child.type === "expr" ? childElements(child) : []
 );
-function candidateOf(file, dialect, form) {
+var isComponentTag = (dialect, tag) => dialect !== "html" && /^[A-Z]/.test(tag);
+function candidateOf(file, dialect, form, imported) {
   const controls = /* @__PURE__ */ new Map();
   const wrapper = /* @__PURE__ */ new Map();
+  const foreign = /* @__PURE__ */ new Set();
   const all = [];
   const walk = (parent) => {
     const own = [];
@@ -6399,6 +6413,17 @@ function candidateOf(file, dialect, form) {
       if (CONTROLS.has(child.tag.toLowerCase())) {
         own.push(child);
         all.push(child);
+      } else if (isComponentTag(dialect, child.tag)) {
+        const inFile = attrOf(child, "name") ? [] : imported.get(child.tag) ?? [];
+        if (inFile.length) {
+          for (const control of inFile) {
+            all.push(control);
+            foreign.add(control);
+          }
+        } else if (attrOf(child, "name") ?? attrOf(child, "id")) {
+          own.push(child);
+          all.push(child);
+        }
       }
       walk(child);
     }
@@ -6410,10 +6435,32 @@ function candidateOf(file, dialect, form) {
     if (name && !controls.has(name)) controls.set(name, control);
   }
   for (const control of all) {
+    if (foreign.has(control)) continue;
     const id = attrOf(control, "id")?.value;
     if (id && !controls.has(id)) controls.set(id, control);
   }
-  return { file, dialect, el: form, controls, wrapper };
+  return { file, dialect, el: form, controls, wrapper, foreign };
+}
+async function importedControls(source, parsed, dialect, project, cache) {
+  const out = /* @__PURE__ */ new Map();
+  for (const [local, { specifier }] of importsIn(parsed, dialect)) {
+    const path = resolveSpecifier(source.path, specifier, project.files, project.aliases);
+    const child = path === null || path === source.path ? void 0 : project.byPath.get(path);
+    if (!child) continue;
+    let controls = cache.get(child.path);
+    if (!controls) {
+      controls = (async () => {
+        const own = dialectOf(child.path, child.content);
+        if (!own || !WIRABLE.includes(own)) return [];
+        const file = await parseFile4(own, child.content);
+        return file.error ? [] : [...elementsIn(file.roots)].filter((el) => CONTROLS.has(el.tag.toLowerCase()));
+      })();
+      cache.set(child.path, controls);
+    }
+    const found = await controls;
+    if (found.length) out.set(local, found);
+  }
+  return out;
 }
 var hasMessage = (form) => [...elementsIn([form])].some((el) => (attrOf(el, "class") ?? attrOf(el, "classname"))?.value.includes("bcms-form-msg") ?? false);
 function wire(source, candidate, form) {
@@ -6432,6 +6479,7 @@ function wire(source, candidate, form) {
   source.appendLeft(el.attrInsertAt, ` ${inserts.join(" ")}`);
   for (const field of form.fields) {
     const control = candidate.controls.get(field.key);
+    if (candidate.foreign.has(control)) continue;
     const host = candidate.wrapper.get(control) ?? control;
     source.appendLeft(host.attrInsertAt, ` data-bcms-form-field="${escapeAttr(field.key)}"`);
     const name = attrOf(control, "name");
@@ -6450,6 +6498,12 @@ async function wireForms(briefIn, sources) {
   const forms = brief.forms ?? [];
   const candidates = [];
   const unreadable = [];
+  const componentFiles = /* @__PURE__ */ new Map();
+  const project = {
+    byPath: new Map(sources.map((s) => [s.path, s])),
+    files: new Set(sources.map((s) => s.path)),
+    aliases: aliasesFrom(sources)
+  };
   for (const source of sources) {
     if (!/<form[\s/>]/i.test(source.content)) continue;
     const dialect = dialectOf(source.path, source.content);
@@ -6470,8 +6524,9 @@ async function wireForms(briefIn, sources) {
       });
       continue;
     }
+    const imported = dialect === "html" ? /* @__PURE__ */ new Map() : await importedControls(source, parsed, dialect, project, componentFiles);
     for (const el of elementsIn(parsed.roots)) {
-      if (el.tag.toLowerCase() === "form") candidates.push(candidateOf(source.path, dialect, el));
+      if (el.tag.toLowerCase() === "form") candidates.push(candidateOf(source.path, dialect, el, imported));
     }
   }
   const holds = (c, f) => f.fields.filter((field) => c.controls.has(field.key)).length;
@@ -6544,6 +6599,14 @@ ${indent}${scriptFor(last.candidate.dialect)}`);
     files.push({ path, operation: "modify", content: source.toString() });
   }
   const notes = onSite.filter(({ form }) => form.status === "draft").map(({ form }) => `publish form ${form.name} in the Forms tab \u2014 a draft form rejects every submission with 403.`);
+  for (const { form, candidate } of matched) {
+    const keys = form.fields.filter((field) => candidate.foreign.has(candidate.controls.get(field.key))).map((field) => field.key);
+    if (keys.length > 0) {
+      notes.push(
+        `form ${form.name}: ${keys.join(", ")} matched a control inside an imported component, so no data-bcms-form-field marker was written for ${keys.length === 1 ? "it" : "them"}.`
+      );
+    }
+  }
   return {
     files,
     receipt: {
@@ -8789,10 +8852,28 @@ async function convertSources(briefIn, sources, options) {
     }
     pend2(target, miss.reason === "no-original" ? "NO_ORIGINAL" : "NOT_IN_SOURCE");
   }
+  const documents = /* @__PURE__ */ new Set();
+  for (const [key, hit] of locatedByKey) {
+    const target = targets.get(key);
+    if (!target || target.kind !== "document") continue;
+    documents.add(key);
+    const byHand = declaredByHand(target, hit.files);
+    if (byHand !== null) {
+      declaredOnly++;
+      declaredRow(target, false, byHand);
+      continue;
+    }
+    pend2(
+      target,
+      "DOCUMENT_DECLARE_ONLY",
+      hit.files[0],
+      "A Body is bound by declaring the one element that renders every block of it, never the paragraph that happens to hold its first block."
+    );
+  }
   const byFile = /* @__PURE__ */ new Map();
   for (const [key, hit] of locatedByKey) {
     const target = targets.get(key);
-    if (!target) continue;
+    if (!target || documents.has(key)) continue;
     for (const file of hit.files) byFile.set(file, [...byFile.get(file) ?? [], target]);
   }
   const drill = {
@@ -8841,6 +8922,7 @@ async function convertSources(briefIn, sources, options) {
   let rewritten = 0;
   let alreadyDeclared = declaredOnly;
   for (const [key, hit] of locatedByKey) {
+    if (documents.has(key)) continue;
     const target = targets.get(key);
     const outcomes = hit.files.map((file) => results.get(file)?.get(target.key) ?? "NOT_IN_SOURCE");
     const worst = outcomes.find((o) => o !== "rewritten" && o !== "declared");