@bettercms-ai/convert 0.17.0 → 0.17.2

package/dist/index.d.ts

@@ -409,7 +409,7 @@ interface ConversionReceipt {
      * reader must treat absent as unknown rather than as `"pending"`.
      */
     canvas?: {
-        lane: "bridge" | "pending";
+        lane: "bridge" | "draft-route" | "pending";
         files?: string[];
     };
     /**
@@ -1242,7 +1242,7 @@ interface CanvasSource {
     ast?: unknown;
 }
 interface CanvasResult {
-    lane: "bridge" | "pending";
+    lane: "bridge" | "draft-route" | "pending";
     /** Files the bridge was installed in. */
     files: string[];
     /** Rewritten contents, by path. Empty when the lane is pending. */
@@ -1257,8 +1257,8 @@ declare const ASTRO_LANE_PENDING: PendingPath;
  * Install the draft bridge, or say why not.
  *
  * `routes` maps a brief route (`/about`) to its slug, so a route written as a literal in the page
- * can name itself. An Astro project is refused wholesale: bridging it needs a server render, which
- * is a deploy-shaped decision and never a codemod's.
+ * can name itself. An Astro project is never bridged here: it either wired a lane itself (see
+ * {@link astroLane}) or it carries the SSR recipe.
  */
 declare function canvasBridge(sources: CanvasSource[], routes: Map<string, string>): CanvasResult;
 
@@ -1293,10 +1293,11 @@ declare function isSourceCandidate(path: string): boolean;
  * could lift — and the target is a number someone has to be able to reach. They are not copy an
  * author edits, so they are not copy this measures.
  *
- *  - a decorative glyph: two characters or fewer, a single non-letter symbol, or an ordinal
- *    (`01`, `2.`, `3 /`) that numbers a list rather than saying anything;
+ *  - a decorative glyph: no letter and no digit (`✓`, `→`), or an ordinal (`01`, `2.`, `3 /`)
+ *    that numbers a list rather than saying anything. Length decides nothing: `OK` and `$1,200`
+ *    are copy. The server's `extract-fields.ts` isDecorativeGlyph, verbatim;
  *  - the platform badge every free site renders;
- *  - a skip link, which exists for keyboards and is never edited.
+ *  - a skip link, which exists for keyboards and is never edited. @see isSkipLink
  */
 declare const isDecorativeGlyph: (text: string) => boolean;
 interface XrayBucket {

package/dist/index.js

@@ -6090,9 +6090,28 @@ var pend = (reason, hint, file, line) => ({
   hint
 });
 var ASTRO_LANE_PENDING = pend("SSR_DRAFT_ROUTE", SSR_DRAFT_RECIPE);
+function mounts(content, component) {
+  const from = new RegExp(
+    `import\\s+([A-Za-z_$][\\w$]*)\\s+from\\s+["']@bettercms-ai/astro/components/${component}\\.astro["']`
+  );
+  const local = content.match(from)?.[1];
+  return local !== void 0 && new RegExp(`<${local}[\\s/>]`).test(content);
+}
+var ASTRO_CONFIG = /(^|\/)astro\.config\.(mjs|cjs|js|ts|mts)$/;
+function astroLane(sources) {
+  const astro = sources.filter((s) => s.path.toLowerCase().endsWith(".astro"));
+  const server = sources.some(
+    (s) => ASTRO_CONFIG.test(s.path) && /\boutput\s*:\s*["']server["']/.test(s.content)
+  );
+  if (server && astro.some((s) => mounts(s.content, "BcmsLive"))) return "draft-route";
+  if (astro.some((s) => mounts(s.content, "BcmsLiveBlocks"))) return "bridge";
+  return null;
+}
 function canvasBridge(sources, routes) {
-  if (sources.some((s) => s.path.toLowerCase().endsWith(".astro")))
-    return { lane: "pending", files: [], edits: /* @__PURE__ */ new Map(), pending: [ASTRO_LANE_PENDING] };
+  if (sources.some((s) => s.path.toLowerCase().endsWith(".astro"))) {
+    const lane = astroLane(sources);
+    return lane ? { lane, files: [], edits: /* @__PURE__ */ new Map(), pending: [] } : { lane: "pending", files: [], edits: /* @__PURE__ */ new Map(), pending: [ASTRO_LANE_PENDING] };
+  }
   const files = [];
   const edits = /* @__PURE__ */ new Map();
   const pending = [];
@@ -6792,7 +6811,7 @@ function isSourceCandidate(path) {
 }
 
 // src/xray.ts
-var SKIP_TAGS = /* @__PURE__ */ new Set(["svg", "iframe", "head", "title"]);
+var SKIP_TAGS = /* @__PURE__ */ new Set(["svg", "math", "iframe", "head", "title", "object", "canvas", "select"]);
 var CONTEXT_TAGS = /* @__PURE__ */ new Set([
   "nav",
   "header",
@@ -6810,10 +6829,16 @@ var CONTEXT_TAGS = /* @__PURE__ */ new Set([
   "figure",
   "blockquote"
 ]);
-var BOUND_ATTRS = ["data-bcms-field", "data-bcms-layout-field", "data-bcms-path", "data-bcms-block"];
-var isDecorativeGlyph = (text) => text.length <= 2 || /^\d{1,2}\s*[/.)\-–]?$/.test(text) || !new RegExp("\\p{L}", "u").test(text) || /^made with\b/i.test(text) || /^skip to\b/i.test(text);
+var BOUND_ATTRS = ["data-bcms-field", "data-bcms-layout-field"];
+var isDecorativeGlyph = (text) => {
+  const t = flat2(text);
+  return t === "" || !/[\p{L}\p{N}]/u.test(t) || new RegExp("^\\p{Nd}{1,2}\\s*[/.)\\-\u2013\u2014]?$", "u").test(t);
+};
+var PLATFORM_BADGE = /^made with\b/iu;
 var MAX_BUCKETS = 12;
 var flat2 = (value) => value.replace(/\s+/g, " ").trim();
+var textOf = (node) => node.type === "text" ? node.value : node.type === "element" ? node.children.map(textOf).join("") : "";
+var isSkipLink = (node, attrs) => node.tag === "a" && (attrs.get("href") ?? "").startsWith("#") && (/^skip\b/iu.test(flat2(textOf(node))) || /\bskip[-_]?(link|nav|to|content)\b/iu.test(attrs.get("class") ?? ""));
 function measureUnaddressable(html) {
   const parsed = parse2(html);
   let visible = 0;
@@ -6822,7 +6847,7 @@ function measureUnaddressable(html) {
   const visit = (node, tag, context, bound) => {
     if (node.type === "text") {
       const text = flat2(node.value);
-      if (!text || isDecorativeGlyph(text)) return;
+      if (isDecorativeGlyph(text) || PLATFORM_BADGE.test(text)) return;
       visible += text.length;
       if (bound) return;
       unaddressable += text.length;
@@ -6836,7 +6861,7 @@ function measureUnaddressable(html) {
     }
     if (node.type !== "element" || node.raw || SKIP_TAGS.has(node.tag)) return;
     const attrs = new Map(node.attrs.map((a) => [a.name, a.value]));
-    if (attrs.has("hidden") || attrs.get("aria-hidden") === "true" || /display\s*:\s*none/.test(attrs.get("style") ?? "")) {
+    if (attrs.has("hidden") || attrs.get("aria-hidden") === "true" || /display\s*:\s*none/i.test(attrs.get("style") ?? "") || isSkipLink(node, attrs)) {
       return;
     }
     const owned = bound || BOUND_ATTRS.some((name) => attrs.has(name));
@@ -6847,7 +6872,7 @@ function measureUnaddressable(html) {
   return {
     visible,
     unaddressable,
-    buckets: [...buckets.values()].sort((a, b) => b.chars - a.chars).slice(0, MAX_BUCKETS)
+    buckets: [...buckets.values()].sort((a, b) => b.chars - a.chars || `${a.tag} @ ${a.context}`.localeCompare(`${b.tag} @ ${b.context}`)).slice(0, MAX_BUCKETS)
   };
 }