@bettercms-ai/convert 0.14.0 → 0.16.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @bettercms-ai/convert
 
+## 0.16.0
+
+### Minor Changes
+
+- 17aaccb: `--forms` breaks the ties that left ScrewFast's two forms `FORM_AMBIGUOUS`: a `<form>` two CMS forms both cover goes to the one it posts more fields of (a contact form is not the newsletter because it also posts `email`), and among several `<form>`s covering one CMS form the one posting nothing beyond its fields wins. For the tie nothing can break — two email-only forms, a footer newsletter and a "forgot password" dialog — the new `--pin "<form>=<file>"` names the file; the pending message says so.
+
+## 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");
@@ -6447,11 +6483,17 @@ function wire(source, candidate, form) {
     source.appendLeft(el.inner.end - tail.length, `${tail || "\n"}${messageFor(dialect)}`);
   }
 }
-async function wireForms(briefIn, sources) {
+async function wireForms(briefIn, sources, options_ = {}) {
   const brief = readBrief(briefIn);
   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,13 +6514,40 @@ 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;
   const covers2 = (c, f) => f.fields.length > 0 && holds(c, f) === f.fields.length;
+  const posts = (c) => new Set(c.controls.values()).size;
+  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();
+  for (const [ref, file] of Object.entries(options_.pins ?? {})) {
+    const form = forms.find((f) => f.id === ref || f.name === ref);
+    if (!form) throw new Error(`--pin ${ref}: the brief lists no form with that id or name.`);
+    pinned.set(form.id, file);
+    options.set(form.id, options.get(form.id).filter((c) => samePath(c.file, file)));
+    for (const other of forms) {
+      if (other.id !== form.id) options.set(other.id, options.get(other.id).filter((c) => !samePath(c.file, file)));
+    }
+  }
+  for (const c of candidates) {
+    const claimants = forms.filter((f) => options.get(f.id).includes(c));
+    if (claimants.length < 2) continue;
+    const top = Math.max(...claimants.map((f) => holds(c, f)));
+    const winners = claimants.filter((f) => holds(c, f) === top);
+    if (winners.length !== 1) continue;
+    for (const f of claimants) if (f !== winners[0]) options.set(f.id, options.get(f.id).filter((x) => x !== c));
+  }
+  for (const f of forms) {
+    const list = options.get(f.id);
+    if (list.length < 2) continue;
+    const exact = list.filter((c) => posts(c) === f.fields.length);
+    if (exact.length === 1) options.set(f.id, exact);
+  }
   const wanted = /* @__PURE__ */ new Map();
   for (const list of options.values()) for (const c of list) wanted.set(c, (wanted.get(c) ?? 0) + 1);
   const matched = [];
@@ -6489,7 +6558,12 @@ async function wireForms(briefIn, sources) {
   for (const form of forms) {
     const list = options.get(form.id) ?? [];
     if (list.length > 1) {
-      pend2(form, "FORM_AMBIGUOUS", void 0, `${list.length} forms post every field of "${form.name}": ${list.map((c) => c.file).join(", ")}.`);
+      pend2(
+        form,
+        "FORM_AMBIGUOUS",
+        void 0,
+        `${list.length} forms post every field of "${form.name}": ${list.map((c) => c.file).join(", ")}. Name the right one with --pin "${form.name}=<file>".`
+      );
       continue;
     }
     if (list.length === 1 && (wanted.get(list[0]) ?? 0) > 1) {
@@ -6498,7 +6572,13 @@ async function wireForms(briefIn, sources) {
     }
     if (list.length === 0) {
       const [best] = candidates.map((c) => ({ c, n: holds(c, form) })).filter((x) => x.n > 0).sort((a, b) => b.n - a.n);
-      if (best) {
+      const pin = pinned.get(form.id);
+      if (pin) {
+        pend2(form, "FORM_NOT_IN_SOURCE", pin, `the pinned file has no <form> posting ${form.fields.map((f) => f.key).join(", ")}.`);
+      } else if (best && best.n === form.fields.length) {
+        const owner = forms.find((f) => f !== form && options.get(f.id).includes(best.c));
+        pend2(form, "FORM_NOT_IN_SOURCE", best.c.file, `the only <form> posting ${form.fields.map((f) => f.key).join(", ")} is "${owner?.name ?? "another form"}"'s.`);
+      } else if (best) {
         const missing = form.fields.filter((f) => !best.c.controls.has(f.key)).map((f) => f.key);
         pend2(form, "FIELD_UNMATCHED", best.c.file, `no control posts ${missing.join(", ")} in the <form> that posts its other fields.`);
       } else if (unreadable[0]) {
@@ -6546,6 +6626,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 +9726,7 @@ function emitStubs2(dialects, slugs, contents, out) {
 // package.json
 var package_default = {
   name: "@bettercms-ai/convert",
-  version: "0.14.0",
+  version: "0.16.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: {
@@ -9699,6 +9787,7 @@ function parseArgs(argv) {
     brief: void 0,
     componentize: false,
     forms: false,
+    pins: {},
     xray: void 0,
     plan: void 0,
     copy: "bind",
@@ -9715,7 +9804,11 @@ function parseArgs(argv) {
     if (arg === "--brief") args.brief = argv[++i];
     else if (arg === "--componentize") args.componentize = true;
     else if (arg === "--forms") args.forms = true;
-    else if (arg === "--xray") args.xray = argv[++i];
+    else if (arg === "--pin") {
+      const at = (argv[++i] ?? "").indexOf("=");
+      if (at < 1) throw new CliError(`--pin takes <form>=<file>, e.g. --pin "Newsletter=src/components/FooterSection.astro". See --help.`);
+      args.pins[argv[i].slice(0, at)] = argv[i].slice(at + 1);
+    } else if (arg === "--xray") args.xray = argv[++i];
     else if (arg === "--plan") args.plan = argv[++i];
     else if (arg === "--copy") {
       const mode = argv[++i];
@@ -9751,6 +9844,9 @@ var HELP = `bettercms-convert ${VERSION}
                        endpoint, the id, a marker per field and the submit script. A form
                        the brief lists as a DRAFT is wired and receipted: publish it in the
                        Forms tab, or it rejects every submission with a 403.
+  --pin <form>=<file>  With --forms: the file a form's <form> is in, when the run reports
+                       FORM_AMBIGUOUS (two files post exactly its fields). Form by id or
+                       name. Repeatable.
   --xray <dist-dir>    Measure a LOCAL build instead of converting: how much of each page's
                        visible copy no binding owns, and the biggest buckets of it. Run it
                        after a build to see what the next conversion still has to reach,
@@ -9973,8 +10069,11 @@ async function main() {
     reportSections(files2, receipt2, args.dryRun);
     return args.strict && receipt2.sections.pending.length > 0 ? 2 : 0;
   }
+  if (Object.keys(args.pins).length > 0 && !args.forms) {
+    throw new CliError("--pin only means something with --forms. See --help.");
+  }
   if (args.forms) {
-    const { files: files2, receipt: receipt2 } = await wireForms(brief, sources);
+    const { files: files2, receipt: receipt2 } = await wireForms(brief, sources, { pins: args.pins });
     await written(files2);
     await saveReceipt(receipt2);
     reportForms(files2, receipt2, args.dryRun);