@jxsuite/compiler 0.25.2 → 0.25.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jxsuite/compiler",
-  "version": "0.25.2",
+  "version": "0.25.4",
   "description": "Jx static HTML compiler, island detector, and site builder",
   "license": "MIT",
   "repository": {
@@ -41,9 +41,9 @@
   },
   "dependencies": {
     "@apidevtools/json-schema-ref-parser": "^15.3.5",
-    "@jxsuite/parser": "^0.25.2",
-    "@jxsuite/runtime": "^0.25.2",
-    "@jxsuite/schema": "^0.25.1",
+    "@jxsuite/parser": "^0.25.4",
+    "@jxsuite/runtime": "^0.25.4",
+    "@jxsuite/schema": "^0.25.4",
     "remark-gfm": "^4.0.1",
     "remark-stringify": "^11.0.0",
     "sharp": "^0.34.5",

package/src/site/image-cache.ts

@@ -2,7 +2,7 @@
  * Image-cache.js — Content-hash based cache for processed image variants.
  *
  * Stores a manifest of previously processed images so that unchanged sources can skip re-encoding
- * on subsequent builds. Cache lives in .jx-cache/images/.
+ * on subsequent builds. Cache lives in .cache/images/.
  */
 
 import { readFileSync, writeFileSync, mkdirSync, existsSync } from "node:fs";
@@ -41,7 +41,7 @@ export function cacheKey(srcPath: string, config: ImageConfig) {
  * @returns {CacheManifest}
  */
 export function loadCache(projectRoot: string) {
-  const manifestPath = resolve(projectRoot, ".jx-cache/images/manifest.json");
+  const manifestPath = resolve(projectRoot, ".cache/images/manifest.json");
   if (!existsSync(manifestPath)) {
     return { version: 1, entries: {} };
   }
@@ -59,7 +59,7 @@ export function loadCache(projectRoot: string) {
  * @param {CacheManifest} cache
  */
 export function saveCache(projectRoot: string, cache: CacheManifest) {
-  const cacheDir = resolve(projectRoot, ".jx-cache/images");
+  const cacheDir = resolve(projectRoot, ".cache/images");
   mkdirSync(cacheDir, { recursive: true });
   writeFileSync(resolve(cacheDir, "manifest.json"), JSON.stringify(cache, null, 2), "utf8");
 }

package/src/site/image-optimizer.ts

@@ -8,6 +8,7 @@
 import { createHash } from "node:crypto";
 import { readFileSync, mkdirSync, existsSync } from "node:fs";
 import { resolve, basename, extname } from "node:path";
+import { createRequire } from "node:module";
 
 export interface ImageVariant {
   width: number; // Pixel width of the variant
@@ -35,9 +36,22 @@ let _sharp: typeof import("sharp") | null = null;
 
 async function getSharp() {
   if (_sharp) return _sharp;
+  // Primary: dynamic import — works in tests (mock.module intercepts it) and in
+  // production installs where @img/sharp-* native packages are adjacent to cli.js.
   try {
     const sharpMod = await import("sharp");
-    _sharp = sharpMod.default;
+    _sharp = sharpMod.default as typeof import("sharp");
+    return _sharp;
+  } catch {
+    // Fall through to CJS fallback below.
+  }
+  // Fallback: resolve from the project being compiled. This covers symlinked
+  // monorepo dev environments (e.g. NixOS) where Node.js resolves import.meta.url
+  // to the compiler package's real path, making the @img/sharp-* packages
+  // unreachable via the primary import path.
+  try {
+    const req = createRequire(resolve(process.cwd(), "package.json"));
+    _sharp = req("sharp") as typeof import("sharp");
     return _sharp;
   } catch (e) {
     throw new Error(

package/src/site/site-build.ts

@@ -93,7 +93,8 @@ export async function buildSite(
     const hasOptimized = existsSync(optimizedDir);
     let tmpOptimized = "";
     if (hasOptimized) {
-      tmpOptimized = resolve(projectRoot, ".jx-cache/_optimized_tmp");
+      tmpOptimized = resolve(projectRoot, ".cache/_optimized_tmp");
+      mkdirSync(resolve(projectRoot, ".cache"), { recursive: true });
       renameSync(optimizedDir, tmpOptimized);
     }
     rmSync(outDir, { recursive: true, force: true });
@@ -624,6 +625,16 @@ function expandMapTemplate(template: JxMutableNode, scope: Record<string, unknow
         }
       }
       node.attributes = attrs;
+    } else if (k === "$props" && v && typeof v === "object") {
+      const props = { ...v } as Record<string, unknown>;
+      for (const [pk, pv] of Object.entries(props)) {
+        if (typeof pv === "string" && isTemplateString(pv)) {
+          const resolved = evaluateMapTemplate(pv, scope);
+          // null = evaluation error → keep template string; undefined = missing data → use null
+          props[pk] = resolved !== null ? (resolved ?? null) : pv;
+        }
+      }
+      node.$props = props;
     } else if (typeof v === "string" && isTemplateString(v)) {
       node[k] = evaluateMapTemplate(v, scope) ?? v;
     } else {
@@ -694,6 +705,13 @@ function resolveDocTemplates(node: JxElement | string, scope: Record<string, unk
       }
     }
   }
+  if (node.$props && typeof node.$props === "object") {
+    for (const [k, v] of Object.entries(node.$props)) {
+      if (typeof v === "string" && isTemplateString(v)) {
+        node.$props[k] = evaluateStaticTemplate(v, scope) ?? v;
+      }
+    }
+  }
   const rawChildren = node.children as unknown;
   if (
     rawChildren &&