@bettercms-ai/convert 0.26.0 → 0.26.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @bettercms-ai/convert
 
+## 0.26.1
+
+### Patch Changes
+
+- c83b686: The codemod routes an image through `bcmsImage` where a call site already declares its field in `bcmsBindings` and still passes the raw import (the element was stamped, and the page kept rendering the file its code imports), and names an image's asset from an optimizer url (`/_image?href=…`). The components skill gains "Read a published value where the app renders the page".
+- Updated dependencies [1a52ee6]
+  - @bettercms-ai/types@1.36.0
+
 ## 0.26.0
 
 ### Minor Changes

package/dist/cli.js

@@ -4090,6 +4090,13 @@ var IMAGE_EXTENSIONS = [".jpg", ".jpeg", ".png", ".webp", ".avif", ".gif", ".svg
 var ASSET_COMPONENTS = /* @__PURE__ */ new Set(["Image", "Picture"]);
 var ASSET_MODULE = "astro:assets";
 function baseName(url) {
+  const inner = /[?&](?:href|url)=([^&#]+)/.exec(url)?.[1];
+  if (inner) {
+    try {
+      url = decodeURIComponent(inner);
+    } catch {
+    }
+  }
   const file = url.split(/[?#]/)[0].split("/").pop() ?? "";
   const base = file.split(".")[0] ?? "";
   return base === "" ? null : base.toLowerCase();
@@ -4115,6 +4122,29 @@ function passedTo(content, parsed, binding) {
   for (const root of parsed.roots) visit(root);
   return out;
 }
+function declaredAt(content, parsed, binding, path) {
+  const out = [];
+  const names = [`"${path}"`, `'${path}'`];
+  const visit = (node) => {
+    if (node.type === "expr") {
+      for (const child of node.children) visit(child);
+      return;
+    }
+    if (node.type !== "element" || node.raw) return;
+    const bindings = node.attrs.find((a) => a.name === "bcmsBindings");
+    const declared = bindings?.expressionRange ? content.slice(bindings.expressionRange.start, bindings.expressionRange.end) : "";
+    if (/^[A-Z]/.test(node.tag) && !ASSET_COMPONENTS.has(node.tag) && names.some((name) => declared.includes(name))) {
+      for (const attr of node.attrs) {
+        if (!attr.expressionRange) continue;
+        const inner = content.slice(attr.expressionRange.start, attr.expressionRange.end).replace(/^\{|\}$/g, "").trim();
+        if (inner === binding) out.push({ node, prop: attr.name, attr });
+      }
+    }
+    for (const child of node.children) visit(child);
+  };
+  for (const root of parsed.roots) visit(root);
+  return out;
+}
 function assetCandidates(parsed, dialect, original) {
   const wanted = baseName(original);
   if (wanted === null || parsed.error) return [];
@@ -4162,6 +4192,18 @@ async function bindImages(ctx, targets) {
     const rendered = binding === null ? [] : renderedBy(ctx.content, ctx.parsed, ctx.dialect, binding);
     const free = rendered.filter((hit2) => !claimed.has(hit2.node.attrInsertAt));
     const args = (b) => [ctx.snapshotName(target.slug), JSON.stringify(target.path), b, ...ctx.slug ? [ctx.slug] : []];
+    if (free.length === 0 && binding !== null) {
+      const declared = declaredAt(ctx.content, ctx.parsed, binding, target.path).filter((c) => !claimed.has(c.attr.range.start));
+      if (declared.length === 1) {
+        const call = declared[0];
+        claimed.add(call.attr.range.start);
+        out.splices.push({ start: call.attr.range.start, end: call.attr.range.end, text: rule.attr(call.prop, `${ctx.image}(${args(binding).join(", ")})`) });
+        out.slugs.push(target.slug);
+        out.bound.push(target.key);
+        continue;
+      }
+    }
+    if (target.declared) continue;
     if (free.length === 0 && binding !== null && ctx.drill) {
       const calls = passedTo(ctx.content, ctx.parsed, binding).filter((c) => !claimed.has(c.node.attrInsertAt));
       const call = calls.length === 1 ? calls[0] : null;
@@ -10184,10 +10226,13 @@ async function convertSources(briefIn, sources, options) {
 async function convertFile(file, content, targets, parsed, declared, llmFallback, drill) {
   const outcomes = /* @__PURE__ */ new Map();
   const pendingTargets = [];
+  let unreadImages = false;
   const dialect = dialectOf(file, content);
   for (const target of targets) {
     if (parsed && dialect && convertedHere(content, parsed, dialect, target, file)) {
       outcomes.set(target.key, "declared");
+      if (target.kind === "image" && !content.includes("bcmsImage(")) unreadImages = true;
+      else if (target.kind === "image" && !new RegExp(`bcmsImage\\([^)]*["']${target.path.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}["']`).test(content)) unreadImages = true;
     } else pendingTargets.push(target);
   }
   const empty = {
@@ -10202,7 +10247,7 @@ async function convertFile(file, content, targets, parsed, declared, llmFallback
     snapshots: [],
     notes: []
   };
-  if (pendingTargets.length === 0) return empty;
+  if (pendingTargets.length === 0 && !unreadImages) return empty;
   if (!dialect) {
     if (isTolerantDialect(file)) {
       const already = declaredByScan(content);
@@ -10403,15 +10448,15 @@ async function plan(file, content, dialect, targets, sites, importAt, outcomes,
         continue;
       }
       const declares = (d) => d.scope === target.scope && (d.path === target.path || d.path === shapeOfPath(target.path));
-      const declaredAt = new Set(declarations.filter(declares).map((d) => d.at));
+      const declaredAt2 = new Set(declarations.filter(declares).map((d) => d.at));
       const claimedAt = new Set(declarations.filter((d) => !declares(d) && d.via === "field").map((d) => d.at));
       const writesField = (site) => site.where !== "attr" || target.kind === "image";
       const fresh = eligible.filter(
-        (site) => !declaredAt.has(site.attrInsertAt) && !(writesField(site) && claimedAt.has(site.attrInsertAt))
+        (site) => !declaredAt2.has(site.attrInsertAt) && !(writesField(site) && claimedAt.has(site.attrInsertAt))
       );
       located += eligible.length;
       const blocked = eligible.filter(
-        (site) => !declaredAt.has(site.attrInsertAt) && writesField(site) && claimedAt.has(site.attrInsertAt)
+        (site) => !declaredAt2.has(site.attrInsertAt) && writesField(site) && claimedAt.has(site.attrInsertAt)
       );
       if (blocked.length > 0) {
         outcomes.set(target.key, "AMBIGUOUS_LITERAL");
@@ -10420,7 +10465,7 @@ async function plan(file, content, dialect, targets, sites, importAt, outcomes,
       if (fresh.length === 0) {
         outcomes.set(
           target.key,
-          eligible.some((site) => declaredAt.has(site.attrInsertAt)) ? "declared" : "AMBIGUOUS_LITERAL"
+          eligible.some((site) => declaredAt2.has(site.attrInsertAt)) ? "declared" : "AMBIGUOUS_LITERAL"
         );
         continue;
       }
@@ -10606,8 +10651,8 @@ async function plan(file, content, dialect, targets, sites, importAt, outcomes,
     },
     targets.filter((t) => {
       const outcome = outcomes.get(t.key);
-      return t.kind === "image" && t.scope === "page" && (outcome === void 0 || UNPLACED.has(outcome));
-    }).map((t) => ({ key: t.key, path: t.path, kind: t.kind, original: t.fallback, slug: t.slug }))
+      return t.kind === "image" && t.scope === "page" && (outcome === void 0 || outcome === "declared" || UNPLACED.has(outcome));
+    }).map((t) => ({ key: t.key, path: t.path, kind: t.kind, original: t.fallback, slug: t.slug, declared: outcomes.get(t.key) === "declared" }))
   );
   for (const key of images.bound) outcomes.set(key, "rewritten");
   for (const refusal of images.refused) outcomes.set(refusal.key, refusal.reason);
@@ -10897,7 +10942,7 @@ function styleEdits(before, after) {
 // package.json
 var package_default = {
   name: "@bettercms-ai/convert",
-  version: "0.26.0",
+  version: "0.26.1",
   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: {
@@ -10930,7 +10975,7 @@ var package_default = {
   dependencies: {
     "@astrojs/compiler": "^2.13.1",
     "@babel/parser": "^7.29.2",
-    "@bettercms-ai/types": "^1.32.0",
+    "@bettercms-ai/types": "^1.36.0",
     "@vue/compiler-sfc": "^3.5.0",
     "magic-string": "^0.30.21",
     parse5: "^7.3.0",