@bettercms-ai/convert 0.24.0 → 0.25.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @bettercms-ai/convert
 
+## 0.25.0
+
+### Minor Changes
+
+- 832e08a: A converted repository whose `build` runs checks before the build (`astro check && astro build`, `tsc --noEmit && vite build`, `npm run lint && next build`) gets a `build:bcms` script beside it with the same build minus those checks, `prebuild`/`postbuild` folded in. BetterCMS builds with `build:bcms` when a project declares one, so a deploy no longer pays for the project's CI checks; `build` is left unchanged. Every writing run adds it once (a repository that already has one is never touched), and only for a plain `&&` chain. Exported as `bcmsBuildScript`.
+
+### Patch Changes
+
+- c6fd790: The codemod never walks into a directory holding its own `.git` (a git worktree, submodule or vendored clone), so a tool's worktree copy of the repo is no longer converted alongside the real source.
+
+## 0.24.1
+
+### Patch Changes
+
+- 15e446a: Helper v13: a repository image path (`@/images/blog/post-1.avif`, `~/…`, `../…`, `/src/…`) is never rendered as a value; the template's own imported picture shows instead. Converted sites get it on their next BetterCMS build through the helper upgrade.
+
 ## 0.24.0
 
 ### Minor Changes

package/dist/cli.js

@@ -2,6 +2,7 @@
 
 // src/cli.ts
 import { execFileSync } from "child_process";
+import { existsSync } from "fs";
 import { readdir, readFile, writeFile, mkdir, stat } from "fs/promises";
 import { dirname, join as join2, relative, resolve, sep } from "path";
 
@@ -4190,7 +4191,7 @@ async function bindImages(ctx, targets) {
 
 // src/helper.ts
 import { createHash as createHash2 } from "crypto";
-var HELPER_VERSION = 12;
+var HELPER_VERSION = 13;
 var HEADER = "// @bettercms-ai/convert helper v";
 var HELPER_PATH = Object.fromEntries(
   Object.keys(DIALECT_RULES).map((d) => [d, DIALECT_RULES[d].helper])
@@ -4236,9 +4237,16 @@ function readPath(root: unknown, path: string): unknown {
   return cursor;
 }
 
+/**
+ * A repository image path \u2014 \`@/images/x.avif\`, \`~/assets/x.png\`, \`../assets/x.jpg\`, \`/src/x.png\`.
+ * The bundler resolves one at build and nothing else can, so as a value it is never rendered: the
+ * template's own fallback (the picture the build already imported) shows instead of a broken image.
+ */
+const REPO_IMAGE_PATH = /^(?:@[\\w-]*|~|\\.{1,2}|\\/?src)\\/[^\\s?#"'<>]*\\.(?:avif|png|jpe?g|webp|gif|svg|bmp|ico|tiff?|jxl|heic)(?:[?#]\\S*)?$/i;
+
 /** A stored value as a template renders it: richtext is its html, an image is its url. */
 function render(value: unknown): string | undefined {
-  if (typeof value === "string") return value;
+  if (typeof value === "string") return REPO_IMAGE_PATH.test(value.trim()) ? undefined : value;
   if (typeof value === "number" || typeof value === "boolean") return String(value);
   if (isRecord(value)) {
     if (typeof value.html === "string") return value.html;
@@ -4732,7 +4740,8 @@ var HISTORICAL = {
     8: "484e72852d2b496e016a1f2a2b1a77bb993f8a163b290781522d6114b6519bb9",
     9: "d6441db2ff4578c3c5d4b7d461f3374b89247ef6ba9e0d535791e840d803e4f3",
     10: "ffcb59862972b15a67c5951e9f3b94ce5b8b50345e6aac2bfa5789cfc3136910",
-    11: "ceb2a932d4c2761a5045ff35032e0b45130a0b5034547ff37579c72c9ce3594e"
+    11: "ceb2a932d4c2761a5045ff35032e0b45130a0b5034547ff37579c72c9ce3594e",
+    12: "10f71724484c84af12aa3eb90db44bf6acbf71fcf8ddff5b6361c1190ba16528"
   },
   "src/lib/bcms-content.ts": {
     1: "ae72ae14d706943d481c880d70da5789b4816ba1ba319a10fbc63ded4d0b42f2",
@@ -4745,7 +4754,8 @@ var HISTORICAL = {
     8: "1a6f669d76d42effe77f082436e9d21c0efa6fc499e919e3d116bc3a27a7f3d5",
     9: "eee9fb1635ae7d6f8f33676a1f390600ca24a62ee992775252273c73a011c494",
     10: "35bb7c0e30f5c41fe68e52259ec4764de6de2734064fa0e1521f3338eef0a09e",
-    11: "818784f2088150d64d91b42eac944dc9503f104d32a0e7a18c753d2982a5adc0"
+    11: "818784f2088150d64d91b42eac944dc9503f104d32a0e7a18c753d2982a5adc0",
+    12: "79dafc525a541feae55ada5dbe2ea966cac82acd741a4b41d61fe9e0cdfaa208"
   },
   "composables/bcms-content.ts": {
     1: "c272412532efed7db64b6cf313b2bed4291f9951430412289c8a588b7f565407",
@@ -4758,7 +4768,8 @@ var HISTORICAL = {
     8: "484e72852d2b496e016a1f2a2b1a77bb993f8a163b290781522d6114b6519bb9",
     9: "d6441db2ff4578c3c5d4b7d461f3374b89247ef6ba9e0d535791e840d803e4f3",
     10: "ffcb59862972b15a67c5951e9f3b94ce5b8b50345e6aac2bfa5789cfc3136910",
-    11: "ceb2a932d4c2761a5045ff35032e0b45130a0b5034547ff37579c72c9ce3594e"
+    11: "ceb2a932d4c2761a5045ff35032e0b45130a0b5034547ff37579c72c9ce3594e",
+    12: "10f71724484c84af12aa3eb90db44bf6acbf71fcf8ddff5b6361c1190ba16528"
   }
 };
 var sha256 = (value) => createHash2("sha256").update(value, "utf8").digest("hex");
@@ -7654,6 +7665,54 @@ function moduleScope(parsed, content) {
   return out;
 }
 
+// src/build-script.ts
+var CHECK = /^(?:npx\s+|pnpm\s+(?:exec\s+)?|yarn\s+|bunx\s+)?(?:astro\s+check|svelte-check|vue-tsc|tsc(?:\s|$)|eslint|next\s+lint|biome\s+(?:check|lint|ci)|prettier\s+(?:--check|-c)\b|stylelint|oxlint)/;
+var RUN_CHECK = /^(?:npm\s+run|pnpm(?:\s+run)?|yarn(?:\s+run)?|bun\s+run)\s+(?:lint|typecheck|type-check|check|check:types|types|format:check|test)(?::[\w-]+)?\s*$/;
+var UNSAFE = /;|\|\||\||(?:^|[^&])&(?:[^&]|$)|\$\(|`|\n/;
+var isCheck = (step) => CHECK.test(step) || RUN_CHECK.test(step);
+function steps(script) {
+  if (UNSAFE.test(script)) return null;
+  const out = script.split("&&").map((s) => s.trim());
+  return out.some((s) => s === "") ? null : out;
+}
+function bcmsBuildScript(packageJson) {
+  let pkg;
+  try {
+    pkg = JSON.parse(packageJson);
+  } catch {
+    return null;
+  }
+  const scripts = pkg?.scripts;
+  if (!scripts || typeof scripts !== "object" || "build:bcms" in scripts) return null;
+  const build = scripts.build;
+  if (typeof build !== "string") return null;
+  const parts = [];
+  for (const name of ["prebuild", "build", "postbuild"]) {
+    const value = scripts[name];
+    if (value === void 0) continue;
+    if (typeof value !== "string") return null;
+    const s = steps(value);
+    if (!s) return null;
+    parts.push(s);
+  }
+  const all = parts.flat();
+  const dropped = all.filter(isCheck);
+  const kept = all.filter((s) => !isCheck(s));
+  if (dropped.length === 0 || kept.length === 0) return null;
+  const script = kept.join(" && ");
+  const next = {};
+  for (const [key, value] of Object.entries(scripts)) {
+    next[key] = value;
+    if (key === "build") next["build:bcms"] = script;
+  }
+  const indent = /^[ \t]+(?=")/m.exec(packageJson)?.[0] ?? "  ";
+  const eol = packageJson.includes("\r\n") ? "\r\n" : "\n";
+  let content = JSON.stringify({ ...pkg, scripts: next }, null, indent);
+  if (eol !== "\n") content = content.replace(/\n/g, eol);
+  if (/\r?\n$/.test(packageJson)) content += eol;
+  return { content, script, dropped };
+}
+
 // src/componentize.ts
 import MagicString5 from "magic-string";
 var SectionInvariantError = class extends Error {
@@ -10774,7 +10833,7 @@ function styleEdits(before, after) {
 // package.json
 var package_default = {
   name: "@bettercms-ai/convert",
-  version: "0.24.0",
+  version: "0.25.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: {
@@ -10951,7 +11010,7 @@ async function readTree(root, verbose) {
       const full = join2(dir, entry.name);
       const rel = relative(root, full).split(sep).join("/");
       if (entry.isDirectory()) {
-        if (isSourceCandidate(`${rel}/x.html`)) await walk(full);
+        if (isSourceCandidate(`${rel}/x.html`) && !existsSync(join2(full, ".git"))) await walk(full);
         continue;
       }
       if (!entry.isFile() || !isSourceCandidate(rel)) continue;
@@ -11132,6 +11191,21 @@ async function verifyStyles(root, base, verbose) {
   );
   return 1;
 }
+async function addBcmsBuild(root, dryRun) {
+  let packageJson;
+  try {
+    packageJson = await readFile(join2(root, "package.json"), "utf-8");
+  } catch {
+    return;
+  }
+  const added = bcmsBuildScript(packageJson);
+  if (!added) return;
+  if (!dryRun) await writeFile(join2(root, "package.json"), added.content, "utf-8");
+  process.stderr.write(
+    `package.json: ${dryRun ? "would add" : "added"} "build:bcms": "${added.script}" \u2014 BetterCMS builds with it, without ${added.dropped.join(", ")}; "build" is unchanged.
+`
+  );
+}
 async function main() {
   const args = parseArgs(process.argv.slice(2));
   if (args.help) {
@@ -11163,6 +11237,7 @@ async function main() {
         await writeFile(target, file.content, "utf-8");
       }
     }
+    await addBcmsBuild(root2, args.dryRun);
     if (args.receipt) await writeFile(resolve(args.receipt), `${JSON.stringify(receipt2, null, 2)}
 `, "utf-8");
     reportUpgrade(files2, receipt2, args.dryRun);
@@ -11190,12 +11265,14 @@ async function main() {
   if (args.verbose) process.stderr.write(`read ${sources.length} candidate files under ${root}
 `);
   const written = async (files2) => {
-    if (args.dryRun) return;
-    for (const file of files2) {
-      const target = under(root, file.path);
-      await mkdir(dirname(target), { recursive: true });
-      await writeFile(target, file.content, "utf-8");
+    if (!args.dryRun) {
+      for (const file of files2) {
+        const target = under(root, file.path);
+        await mkdir(dirname(target), { recursive: true });
+        await writeFile(target, file.content, "utf-8");
+      }
     }
+    await addBcmsBuild(root, args.dryRun);
   };
   const saveReceipt = async (receipt2) => {
     if (!args.receipt) return;