@bettercms-ai/convert 0.13.0 → 0.15.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @bettercms-ai/convert
 
+## 0.15.0
+
+### Minor Changes
+
+- 0ddfbdd: `--forms` now sees a form built from components. A component tag handed a `name` or `id` (`<TextInput name="firstName" />`) is the control; a tag handed neither (`<EmailFooterInput />`) is matched by the controls in its own imported file, which are never written. Before, such a form was reported `FORM_NOT_IN_SOURCE` although its fields were all there. A component's file is found by RESOLVING its import — a relative path, or one of the project's own tsconfig `paths` aliases — so a bare package specifier reads no local file that merely shares its last segment, and the receipt notes any field whose marker went unwritten because its control lives in an imported component.
+
+## 0.14.0
+
+### Minor Changes
+
+- df570ef: Receipt and brief shapes a consumer reads:
+  - `BriefPath.kind` is typed `BindingKind` rather than `BindingKind | ""` — the brief always names a kind, and the empty case only forced callers to handle a value it never sends.
+  - New `PendingReason` `"DOCUMENT_DECLARE_ONLY"`: a `document` path is never located and never rewritten, because its `original` is only the body's FIRST block and declaring the paragraph that renders it is what publish refuses. The row's fix names the wrapper to declare instead.
+  - `PendingFix.kind` (`"document" | "richtext"`, optional) accompanies a `declare-richtext` action to say WHICH container is meant.
+
 ## 0.13.0
 
 ### Minor Changes

package/dist/cli.js

@@ -2562,7 +2562,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",
@@ -5363,7 +5367,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) {
@@ -5414,6 +5418,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.` };
   }
@@ -5430,7 +5439,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) {
@@ -6379,9 +6391,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 = [];
@@ -6389,6 +6403,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);
     }
@@ -6400,10 +6425,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) {
@@ -6422,6 +6469,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");
@@ -6440,6 +6488,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);
@@ -6460,8 +6514,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;
@@ -6534,6 +6589,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: {
@@ -8771,10 +8834,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 = {
@@ -8823,6 +8904,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");
@@ -9607,7 +9689,7 @@ function emitStubs2(dialects, slugs, contents, out) {
 // package.json
 var package_default = {
   name: "@bettercms-ai/convert",
-  version: "0.13.0",
+  version: "0.15.0",
   type: "module",
   description: "Deterministic codemod that turns an imported site's text-matched bindings into declared ones \u2014 parser offsets in, one magic-string pass out, plus a receipt of everything it could not do.",
   bin: {