@bettercms-ai/convert 0.12.1 → 0.14.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. */
@@ -429,6 +445,16 @@ interface FormsReceipt {
     pending: PendingForm[];
     /** Prose a human has to act on — a draft form still 403s every submission. */
     notes?: string[];
+    /**
+     * Every form on the site after this run, and the file its `<form>` is in — wired now, or by an
+     * earlier run. The server matches the file to the component recorded as that file's owner, so
+     * the Forms tab can say which component renders each form. OPTIONAL and ADDITIVE: `wired` stays
+     * a number, and a receipt without this list still adds up.
+     */
+    wiredForms?: {
+        id: string;
+        file: string;
+    }[];
 }
 /** Raised when the receipt does not account for every form. Never caught inside this package. */
 declare class FormInvariantError extends Error {

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) {
@@ -6521,11 +6533,11 @@ async function wireForms(briefIn, sources) {
     }
     if (attrOf(candidate.el, "data-bcms-form")) {
       alreadyWired++;
-      onSite.push(form);
+      onSite.push({ form, file: candidate.file });
       continue;
     }
     matched.push({ form, candidate });
-    onSite.push(form);
+    onSite.push({ form, file: candidate.file });
   }
   const contents = new Map(sources.map((s) => [s.path, s.content]));
   const byFile = /* @__PURE__ */ new Map();
@@ -6543,7 +6555,7 @@ ${indent}${scriptFor(last.candidate.dialect)}`);
     }
     files.push({ path, operation: "modify", content: source.toString() });
   }
-  const notes = onSite.filter((f) => f.status === "draft").map((f) => `publish form ${f.name} in the Forms tab \u2014 a draft form rejects every submission with 403.`);
+  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.`);
   return {
     files,
     receipt: {
@@ -6560,7 +6572,9 @@ ${indent}${scriptFor(last.candidate.dialect)}`);
         wired: matched.length,
         alreadyWired,
         pending,
-        ...notes.length > 0 ? { notes } : {}
+        ...notes.length > 0 ? { notes } : {},
+        // Always, even empty: a run where every form went pending must retire the files an earlier one named.
+        wiredForms: onSite.map(({ form, file }) => ({ id: form.id, file }))
       })
     }
   };
@@ -8787,10 +8801,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 = {
@@ -8839,6 +8871,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");