@bettercms-ai/convert 0.14.0 → 0.15.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @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

package/dist/cli.js

@@ -6391,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 = [];
@@ -6401,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);
     }
@@ -6412,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) {
@@ -6434,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");
@@ -6452,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);
@@ -6472,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;
@@ -6546,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: {
@@ -9638,7 +9689,7 @@ function emitStubs2(dialects, slugs, contents, out) {
 // package.json
 var package_default = {
   name: "@bettercms-ai/convert",
-  version: "0.14.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: {