@jxsuite/compiler 0.25.5 → 0.26.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jxsuite/compiler",
-  "version": "0.25.5",
+  "version": "0.26.0",
   "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.5",
-    "@jxsuite/runtime": "^0.25.5",
-    "@jxsuite/schema": "^0.25.5",
+    "@jxsuite/parser": "^0.26.0",
+    "@jxsuite/runtime": "^0.26.0",
+    "@jxsuite/schema": "^0.26.0",
     "remark-gfm": "^4.0.1",
     "remark-stringify": "^11.0.0",
     "sharp": "^0.34.5",

package/src/site/image-cache.ts

@@ -2,11 +2,14 @@
  * 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 .cache/images/.
+ * on subsequent builds. Cache lives in the npm global cache directory under jxsuite-images/ so that
+ * CI environments (e.g. Cloudflare Pages) can persist it via their npm cache layer.
  */
 
 import { readFileSync, writeFileSync, mkdirSync, existsSync } from "node:fs";
-import { resolve } from "node:path";
+import { resolve, basename } from "node:path";
+import { execSync } from "node:child_process";
+import { tmpdir } from "node:os";
 import { contentHash, configHash } from "./image-optimizer.ts";
 
 import type { ImageManifest } from "./image-optimizer.ts";
@@ -23,6 +26,56 @@ export interface CacheManifest {
   entries: Record<string, CacheEntry>; // Cached entries keyed by content+config hash
 }
 
+// ─── Cache directory resolution ──────────────────────────────────────────────
+
+let _npmCacheBase: string | null | undefined = undefined; // undefined = not yet resolved
+
+/** Reset the memoized npm cache base so the next call re-evaluates. Tests only. */
+export function _testResetNpmCacheBase() {
+  _npmCacheBase = undefined;
+}
+
+/**
+ * Directly set the memoized npm cache base. Pass null to force the project-local fallback. Tests
+ * only.
+ */
+export function _testSetNpmCacheBase(value: string | null) {
+  _npmCacheBase = value;
+}
+
+/**
+ * Return the image cache directory for a project.
+ *
+ * Prefers the npm global cache (`npm config get cache`) so CI environments that cache ~/.npm (e.g.
+ * Cloudflare Pages) automatically persist optimized images across builds. Falls back to
+ * .cache/images inside the project root when npm is unavailable.
+ *
+ * Result is memoized — `npm config get cache` is only spawned once per process.
+ *
+ * @param {string} projectRoot
+ * @returns {string}
+ */
+export function getImageCacheDir(projectRoot: string): string {
+  if (_npmCacheBase === undefined) {
+    try {
+      const result = execSync("npm config get cache", {
+        encoding: "utf-8",
+        stdio: ["ignore", "pipe", "ignore"],
+        cwd: tmpdir(), // avoid ENOWORKSPACES when cwd is inside an npm workspace
+      }).trim();
+      _npmCacheBase = result && result !== "undefined" ? result : null;
+    } catch {
+      _npmCacheBase = null;
+    }
+  }
+  if (_npmCacheBase) {
+    return resolve(_npmCacheBase, "jxsuite-images", basename(projectRoot));
+  }
+  return resolve(projectRoot, ".cache/images");
+}
+
+// ─── Cache key ───────────────────────────────────────────────────────────────
+
 /**
  * Build a cache key from source file content and config.
  *
@@ -34,6 +87,8 @@ export function cacheKey(srcPath: string, config: ImageConfig) {
   return `${contentHash(srcPath)}:${configHash(config)}`;
 }
 
+// ─── Load / save ─────────────────────────────────────────────────────────────
+
 /**
  * Load the cache manifest from disk, or return an empty one.
  *
@@ -41,7 +96,7 @@ export function cacheKey(srcPath: string, config: ImageConfig) {
  * @returns {CacheManifest}
  */
 export function loadCache(projectRoot: string) {
-  const manifestPath = resolve(projectRoot, ".cache/images/manifest.json");
+  const manifestPath = resolve(getImageCacheDir(projectRoot), "manifest.json");
   if (!existsSync(manifestPath)) {
     return { version: 1, entries: {} };
   }
@@ -59,11 +114,13 @@ export function loadCache(projectRoot: string) {
  * @param {CacheManifest} cache
  */
 export function saveCache(projectRoot: string, cache: CacheManifest) {
-  const cacheDir = resolve(projectRoot, ".cache/images");
+  const cacheDir = getImageCacheDir(projectRoot);
   mkdirSync(cacheDir, { recursive: true });
   writeFileSync(resolve(cacheDir, "manifest.json"), JSON.stringify(cache, null, 2), "utf8");
 }
 
+// ─── Entry access ─────────────────────────────────────────────────────────────
+
 /**
  * Check if a cache entry exists and its output files are still present.
  *

package/src/site/image-transform.ts

@@ -9,7 +9,7 @@
 import { existsSync } from "node:fs";
 import { resolve, extname, basename } from "node:path";
 import { processImage, buildSrcset, contentHash, configHash } from "./image-optimizer.ts";
-import { getCached, setCached } from "./image-cache.ts";
+import { getCached, setCached, getImageCacheDir } from "./image-cache.ts";
 
 import type { ImageConfig } from "./image-optimizer.ts";
 import type { ImageManifest } from "./image-optimizer.ts";
@@ -44,8 +44,7 @@ async function resolveManifest(
   }
 
   if (!cached) console.log(`    Optimizing ${basename(absoluteSrc)}...`);
-  const cacheImgDir = resolve(projectRoot, ".cache/images");
-  const manifest = await processImage(absoluteSrc, cacheImgDir, config);
+  const manifest = await processImage(absoluteSrc, getImageCacheDir(projectRoot), config);
   setCached(cache, key, src, manifest);
   return manifest;
 }

package/src/site/site-build.ts

@@ -44,7 +44,7 @@ import { loadContentTypes, loadContentConfig, resolveContentTypeRefs } from "./c
 import { resolvePrototypes } from "./prototype-resolver.ts";
 import { compileMarkdown } from "../targets/compile-markdown.ts";
 import { transformImageNodes } from "./image-transform.ts";
-import { loadCache, saveCache } from "./image-cache.ts";
+import { loadCache, saveCache, getImageCacheDir } from "./image-cache.ts";
 import type {
   JxElement,
   JxMutableNode,
@@ -257,7 +257,7 @@ export async function buildSite(
   // ── 6b. Save image cache and copy variants to dist ──────────────────────
   if (imageCache && projectConfig.images.optimize) {
     saveCache(projectRoot, imageCache);
-    const cacheOptimizedDir = resolve(projectRoot, ".cache/images/_optimized");
+    const cacheOptimizedDir = resolve(getImageCacheDir(projectRoot), "_optimized");
     if (existsSync(cacheOptimizedDir)) {
       const distOptimizedDir = resolve(outDir, "images/_optimized");
       mkdirSync(distOptimizedDir, { recursive: true });