@nuasite/cli 0.34.0 → 0.36.0

package/dist/index.js

@@ -24558,18 +24558,30 @@ async function pickAstroImageTarget(args) {
   if (await isFreeOrMatching(baseAbs, args.compareBuffer)) {
     return { absPath: baseAbs, relPath: `./${baseName}` };
   }
-  const hash = shortContentHash(args.compareBuffer);
-  const ext = path8.extname(safeFilename);
+  const candidateAbs = await pickHashedSibling(entryDir, baseName, args.compareBuffer);
+  return { absPath: candidateAbs, relPath: `./${path8.basename(candidateAbs)}` };
+}
+async function pickSiblingTarget(dir, filename, buf) {
+  const safe = path8.basename(filename);
+  if (!safe || safe === "." || safe === "..") {
+    throw new Error(`Invalid filename: ${filename}`);
+  }
+  const baseAbs = path8.join(dir, safe);
+  if (await isFreeOrMatching(baseAbs, buf))
+    return baseAbs;
+  return pickHashedSibling(dir, safe, buf);
+}
+async function pickHashedSibling(dir, baseName, buf) {
+  const hash = shortContentHash(buf);
+  const ext = path8.extname(baseName);
   const stem = path8.basename(baseName, ext);
   for (let attempt = 0;attempt < 5; attempt++) {
     const suffix = attempt === 0 ? hash : `${hash}-${attempt}`;
-    const candidateName = `${stem}-${suffix}${ext}`;
-    const candidateAbs = path8.join(entryDir, candidateName);
-    if (await isFreeOrMatching(candidateAbs, args.compareBuffer)) {
-      return { absPath: candidateAbs, relPath: `./${candidateName}` };
-    }
+    const candidateAbs = path8.join(dir, `${stem}-${suffix}${ext}`);
+    if (await isFreeOrMatching(candidateAbs, buf))
+      return candidateAbs;
   }
-  throw new Error(`Could not pick a unique filename for ${safeFilename} in ${entryDir}`);
+  throw new Error(`Could not pick a unique filename for ${baseName} in ${dir}`);
 }
 async function isFreeOrMatching(absPath, compareBuffer) {
   try {
@@ -30939,9 +30951,14 @@ function extractAstroImageOriginalUrl(src) {
     const url = new URL(src, "http://localhost");
     if (url.pathname === "/_image" || url.pathname.startsWith("/_image/")) {
       const href = url.searchParams.get("href");
-      if (href && href !== src)
+      if (href)
         return href;
     }
+    if (url.pathname.startsWith("/@image/")) {
+      const f = url.searchParams.get("f");
+      if (f)
+        return f;
+    }
   } catch {}
   return;
 }
@@ -30960,6 +30977,7 @@ var init_snippet_utils = __esm(() => {
 
 // ../cms/src/handlers/source-writer.ts
 import fs14 from "fs/promises";
+import path13 from "path";
 async function handleUpdate(request, manifestWriter) {
   const { changes, meta } = request;
   const errors = [];
@@ -30990,11 +31008,15 @@ async function handleUpdate(request, manifestWriter) {
       const release = await acquireFileLock(fullPath);
       try {
         const currentContent = await fs14.readFile(fullPath, "utf-8");
-        const { newContent, appliedCount, failedChanges } = applyChanges(currentContent, fileChanges, manifest);
+        const { newContent, appliedCount, failedChanges, fileOps } = await applyChanges(currentContent, fileChanges, manifest, fullPath, meta.url);
         if (failedChanges.length > 0) {
           errors.push(...failedChanges);
         }
         if (appliedCount > 0 && newContent !== currentContent) {
+          for (const op of fileOps) {
+            await fs14.mkdir(path13.dirname(op.target), { recursive: true });
+            await fs14.writeFile(op.target, op.bytes);
+          }
           await fs14.writeFile(fullPath, newContent, "utf-8");
           updated += appliedCount;
         }
@@ -31011,16 +31033,19 @@ async function handleUpdate(request, manifestWriter) {
     errors: errors.length > 0 ? errors : undefined
   };
 }
-function applyChanges(content, changes, manifest) {
+async function applyChanges(content, changes, manifest, absFilePath, originUrl) {
   let newContent = content;
   let appliedCount = 0;
   const failedChanges = [];
+  const fileOps = [];
   const sortedChanges = [...changes].sort((a, b2) => (b2.sourceLine ?? 0) - (a.sourceLine ?? 0));
   for (const change of sortedChanges) {
     if (change.imageChange) {
-      const result2 = applyImageChange(newContent, change);
+      const result2 = await applyImageChange(newContent, change, absFilePath, originUrl);
       if (result2.success) {
         newContent = result2.content;
+        if (result2.fileOp)
+          fileOps.push(result2.fileOp);
         appliedCount++;
       } else {
         failedChanges.push({ cmsId: change.cmsId, error: result2.error });
@@ -31054,9 +31079,9 @@ function applyChanges(content, changes, manifest) {
       failedChanges.push({ cmsId: change.cmsId, error: result.error });
     }
   }
-  return { newContent, appliedCount, failedChanges };
+  return { newContent, appliedCount, failedChanges, fileOps };
 }
-function applyImageChange(content, change) {
+async function applyImageChange(content, change, absFilePath, originUrl) {
   const { newSrc, newAlt } = change.imageChange;
   const originalSrc = change.originalValue;
   if (!originalSrc) {
@@ -31148,6 +31173,7 @@ function applyImageChange(content, change) {
       }
     }
   }
+  let pendingFileOp;
   if (replacedIndex < 0 && change.sourceLine > 0) {
     const lines = newContent.split(`
 `);
@@ -31161,7 +31187,20 @@ function applyImageChange(content, change) {
       const exprMatch = findExpressionSrcAttribute(regionText);
       if (exprMatch) {
         const exprContent = regionText.slice(exprMatch.index + regionText.slice(exprMatch.index).indexOf("{") + 1, exprMatch.index + exprMatch.length - 1).trim();
-        return { success: false, error: `Image src uses a dynamic expression (src={${exprContent}}) \u2014 edit the data source directly` };
+        const importInfo = /^\w+$/.test(exprContent) ? findFrontmatterAssetImport(content, exprContent) : null;
+        if (!importInfo) {
+          return { success: false, error: `Image src uses a dynamic expression (src={${exprContent}}) \u2014 edit the data source directly` };
+        }
+        const rewrite = absFilePath ? await tryRewriteAssetImport(content, importInfo, newSrc, absFilePath, originUrl) : null;
+        if (rewrite) {
+          newContent = rewrite.content;
+          pendingFileOp = rewrite.fileOp;
+          replacedIndex = rewrite.importSourceIndex;
+        } else {
+          const literalResult = inlineJsxLiteralReplace(newContent, lines, regionStart, exprMatch, newSrc);
+          newContent = literalResult.content;
+          replacedIndex = literalResult.replacedIndex;
+        }
       }
     }
   }
@@ -31201,7 +31240,101 @@ function applyImageChange(content, change) {
       newContent = newContent.slice(0, altAbsoluteIndex) + `alt=${altQuote}${escapedAlt}${altQuote}` + newContent.slice(altAbsoluteIndex + altLength);
     }
   }
-  return { success: true, content: newContent };
+  return { success: true, content: newContent, fileOp: pendingFileOp };
+}
+function findFrontmatterAssetImport(content, varName) {
+  const fmMatch = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
+  if (!fmMatch)
+    return null;
+  const fmStart = fmMatch[0].indexOf(fmMatch[1]);
+  const importRe = /^\s*import\s+(?!type\b)([\s\S]+?)\s+from\s+(['"])([^'"]+)\2/gm;
+  let m;
+  while ((m = importRe.exec(fmMatch[1])) !== null) {
+    const source = m[3];
+    if (!source.startsWith(".") || !ASSET_IMPORT_EXT_RE.test(source))
+      continue;
+    const tokens = m[1].replace(/[{}]/g, ",").split(",").map((s) => s.trim()).filter((t) => t && !t.startsWith("type "));
+    const matches = tokens.some((tok) => {
+      const aliasMatch = tok.match(/^\S+\s+as\s+(\S+)$/);
+      return (aliasMatch ? aliasMatch[1] : tok) === varName;
+    });
+    if (!matches)
+      continue;
+    const matchStart = fmStart + m.index;
+    const sourceStart = matchStart + m[0].indexOf(m[2]) + 1;
+    return { localName: varName, source, sourceStart, sourceEnd: sourceStart + source.length };
+  }
+  return null;
+}
+function inlineJsxLiteralReplace(content, lines, regionStart, exprMatch, newSrc) {
+  let regionStartOffset = 0;
+  for (let i = 0;i < regionStart; i++)
+    regionStartOffset += lines[i].length + 1;
+  const absIndex = regionStartOffset + exprMatch.index;
+  return {
+    content: content.slice(0, absIndex) + `src="${escapeReplacement(newSrc)}"` + content.slice(absIndex + exprMatch.length),
+    replacedIndex: absIndex
+  };
+}
+async function tryRewriteAssetImport(content, importInfo, newSrc, absFilePath, originUrl) {
+  const resolved = await resolveNewSrcBytes(newSrc, originUrl);
+  if (!resolved)
+    return null;
+  const originalAssetAbs = path13.resolve(path13.dirname(absFilePath), importInfo.source);
+  const targetAbs = await pickSiblingTarget(path13.dirname(originalAssetAbs), resolved.filename, resolved.bytes);
+  const newRelImport = relativeImportPath(absFilePath, targetAbs);
+  const newContent = content.slice(0, importInfo.sourceStart) + newRelImport + content.slice(importInfo.sourceEnd);
+  return {
+    content: newContent,
+    fileOp: { target: targetAbs, bytes: resolved.bytes },
+    importSourceIndex: importInfo.sourceStart
+  };
+}
+async function resolveNewSrcBytes(newSrc, originUrl) {
+  const filenameFromPath = (p) => path13.basename(p.split("?")[0] ?? p);
+  const diskPath = newSrc.startsWith("/src/") ? path13.join(getProjectRoot(), newSrc.slice(1)) : newSrc.startsWith("/") && !newSrc.startsWith("//") ? path13.join(getProjectRoot(), "public", newSrc.replace(/^\/+/, "")) : null;
+  if (diskPath) {
+    try {
+      return { bytes: await fs14.readFile(diskPath), filename: filenameFromPath(newSrc) };
+    } catch {}
+  }
+  try {
+    const isAbsolute = /^https?:\/\//.test(newSrc);
+    if (!isAbsolute && !originUrl)
+      return null;
+    const fetchUrl = isAbsolute ? newSrc : new URL(newSrc, originUrl).toString();
+    const res = await fetch(fetchUrl, { signal: AbortSignal.timeout(REMOTE_FETCH_TIMEOUT_MS) });
+    if (!res.ok)
+      return null;
+    const bytes = await readBoundedBody(res, REMOTE_FETCH_MAX_BYTES);
+    if (!bytes)
+      return null;
+    return { bytes, filename: filenameFromPath(new URL(fetchUrl).pathname) };
+  } catch {
+    return null;
+  }
+}
+async function readBoundedBody(res, maxBytes) {
+  const declared = Number(res.headers.get("content-length"));
+  if (declared > maxBytes)
+    return null;
+  if (!res.body)
+    return null;
+  const reader = res.body.getReader();
+  const chunks = [];
+  let total = 0;
+  while (true) {
+    const { done, value } = await reader.read();
+    if (done)
+      break;
+    total += value.byteLength;
+    if (total > maxBytes) {
+      await reader.cancel();
+      return null;
+    }
+    chunks.push(value);
+  }
+  return Buffer.concat(chunks, total);
 }
 function applyColorChange(content, change) {
   const { oldClass, newClass } = change.styleChange;
@@ -31693,18 +31826,21 @@ function tryBrNormalizedChange(sourceSnippet, resolvedOriginal, resolvedNewText)
   }
   return result !== sourceSnippet ? result : null;
 }
-var import_node_html_parser, import_yaml5, QUOTED_LITERAL_DELIMITERS;
+var import_node_html_parser, import_yaml5, ASSET_IMPORT_EXT_RE, REMOTE_FETCH_TIMEOUT_MS = 15000, REMOTE_FETCH_MAX_BYTES, QUOTED_LITERAL_DELIMITERS;
 var init_source_writer = __esm(() => {
+  init_astro_image_paths();
   init_config();
   init_snippet_utils();
   init_utils2();
   import_node_html_parser = __toESM(require_dist2(), 1);
   import_yaml5 = __toESM(require_dist(), 1);
+  ASSET_IMPORT_EXT_RE = /\.(jpe?g|png|gif|webp|avif|svg|ico|bmp|tiff?)$/i;
+  REMOTE_FETCH_MAX_BYTES = 50 * 1024 * 1024;
   QUOTED_LITERAL_DELIMITERS = [`'`, `"`, "`"];
 });
 
 // ../cms/src/handlers/api-routes.ts
-import path13 from "path";
+import path14 from "path";
 function requireMedia(ctx) {
   if (!ctx.mediaAdapter) {
     sendError(ctx.res, "Media storage not configured", 501);
@@ -31796,7 +31932,7 @@ var init_api_routes = __esm(() => {
     }),
     custom("POST", "markdown/delete", async ({ req, res, manifestWriter, contentDir }) => {
       const body = await parseJsonBody(req);
-      const fullPath = path13.resolve(getProjectRoot(), body.filePath?.replace(/^\//, "") ?? "");
+      const fullPath = path14.resolve(getProjectRoot(), body.filePath?.replace(/^\//, "") ?? "");
       expectedDeletions.add(fullPath);
       const result = await handleDeleteMarkdown(body);
       if (result.success) {
@@ -31888,7 +32024,7 @@ var init_api_routes = __esm(() => {
       const body = await parseJsonBody(req);
       const result = await handleDeletePage(body);
       if (result.success && result.filePath) {
-        expectedDeletions.add(path13.resolve(getProjectRoot(), result.filePath));
+        expectedDeletions.add(path14.resolve(getProjectRoot(), result.filePath));
       }
       if (result.success && body.createRedirect && body.redirectTo) {
         await handleAddRedirect({ source: body.pagePath, destination: body.redirectTo, statusCode: 307 });
@@ -31993,7 +32129,7 @@ var init_color_patterns = __esm(() => {
 
 // ../cms/src/tailwind-colors.ts
 import fs15 from "fs/promises";
-import path14 from "path";
+import path15 from "path";
 async function parseTailwindConfig(projectRoot = getProjectRoot()) {
   const cssFiles = [
     "src/styles/global.css",
@@ -32007,7 +32143,7 @@ async function parseTailwindConfig(projectRoot = getProjectRoot()) {
   ];
   let customColors = [];
   for (const cssFile of cssFiles) {
-    const fullPath = path14.join(projectRoot, cssFile);
+    const fullPath = path15.join(projectRoot, cssFile);
     try {
       const content = await fs15.readFile(fullPath, "utf-8");
       customColors = extractColorsFromCss(content);
@@ -32080,7 +32216,7 @@ async function parseTextStyles(projectRoot = getProjectRoot()) {
   ];
   let customTextStyles = {};
   for (const cssFile of cssFiles) {
-    const fullPath = path14.join(projectRoot, cssFile);
+    const fullPath = path15.join(projectRoot, cssFile);
     try {
       const content = await fs15.readFile(fullPath, "utf-8");
       customTextStyles = extractTextStylesFromCss(content);
@@ -32537,7 +32673,7 @@ var init_dev_middleware = __esm(() => {
 
 // ../cms/src/manifest-writer.ts
 import fs16 from "fs/promises";
-import path15 from "path";
+import path16 from "path";
 
 class ManifestWriter {
   globalManifest;
@@ -32608,10 +32744,10 @@ class ManifestWriter {
   }
   getPageManifestPath(pagePath) {
     if (pagePath === "/" || pagePath === "") {
-      return path15.join(this.outDir, "index.json");
+      return path16.join(this.outDir, "index.json");
     }
     const cleanPath = pagePath.replace(/^\//, "");
-    return path15.join(this.outDir, `${cleanPath}.json`);
+    return path16.join(this.outDir, `${cleanPath}.json`);
   }
   addPage(pagePath, entries, components, collection, seo) {
     this.pageManifests.set(pagePath, { entries, components, collection, seo });
@@ -32637,7 +32773,7 @@ class ManifestWriter {
   }
   async writePageManifest(pagePath, entries, components, collection, seo) {
     const manifestPath = this.getPageManifestPath(pagePath);
-    const manifestDir = path15.dirname(manifestPath);
+    const manifestDir = path16.dirname(manifestPath);
     await fs16.mkdir(manifestDir, { recursive: true });
     const metadata = {
       version: MANIFEST_VERSION,
@@ -32688,7 +32824,7 @@ class ManifestWriter {
       }
     }
     if (this.outDir) {
-      const globalManifestPath = path15.join(this.outDir, this.manifestFile);
+      const globalManifestPath = path16.join(this.outDir, this.manifestFile);
       const globalSettings = {
         componentDefinitions: this.componentDefinitions,
         pages
@@ -32778,7 +32914,7 @@ var init_s3 = __esm(() => {
 
 // ../cms/src/migrate-astro-image.ts
 import fs17 from "fs/promises";
-import path16 from "path";
+import path17 from "path";
 async function migrateAstroImages(options = {}) {
   const projectRoot = options.projectRoot ?? getProjectRoot();
   const dryRun = options.dryRun ?? false;
@@ -32790,7 +32926,7 @@ async function migrateAstroImages(options = {}) {
     if (astroFields.length === 0 || !def.entries)
       continue;
     for (const entry of def.entries) {
-      const entryAbs = path16.isAbsolute(entry.sourcePath) ? entry.sourcePath : path16.join(projectRoot, entry.sourcePath);
+      const entryAbs = path17.isAbsolute(entry.sourcePath) ? entry.sourcePath : path17.join(projectRoot, entry.sourcePath);
       let raw;
       try {
         raw = await fs17.readFile(entryAbs, "utf-8");
@@ -32815,7 +32951,7 @@ async function migrateAstroImages(options = {}) {
         }
         if (!current.startsWith("/") || current.startsWith("//"))
           continue;
-        const sourceAbs = path16.join(projectRoot, "public", current.replace(/^\/+/, ""));
+        const sourceAbs = path17.join(projectRoot, "public", current.replace(/^\/+/, ""));
         let sourceBuf;
         try {
           sourceBuf = await fs17.readFile(sourceAbs);
@@ -32826,11 +32962,11 @@ async function migrateAstroImages(options = {}) {
         const target = await pickAstroImageTarget({
           entryAbsPath: entryAbs,
           slug: entry.slug,
-          originalFilename: path16.basename(current),
+          originalFilename: path17.basename(current),
           compareBuffer: sourceBuf
         });
         if (!dryRun) {
-          await fs17.mkdir(path16.dirname(target.absPath), { recursive: true });
+          await fs17.mkdir(path17.dirname(target.absPath), { recursive: true });
           await fs17.writeFile(target.absPath, sourceBuf);
         }
         doc.set(field.name, target.relPath);
@@ -32885,7 +33021,7 @@ var exports_migrate = {};
 __export(exports_migrate, {
   migrate: () => migrate
 });
-import path17 from "path";
+import path18 from "path";
 async function migrate(args) {
   if (args.target !== "astro-image") {
     console.error(`Unknown migrate target: ${args.target}`);
@@ -32904,7 +33040,7 @@ async function migrate(args) {
     for (const m of result.migrations) {
       console.log(`  ${m.entrySourcePath}`);
       console.log(`    ${m.fieldName}: ${m.originalValue} \u2192 ${m.newValue}`);
-      console.log(`      copy: ${path17.relative(process.cwd(), m.copiedFrom)} \u2192 ${path17.relative(process.cwd(), m.copiedTo)}`);
+      console.log(`      copy: ${path18.relative(process.cwd(), m.copiedFrom)} \u2192 ${path18.relative(process.cwd(), m.copiedTo)}`);
     }
   }
   if (result.skipped.length > 0) {