@fieldnotes/core 0.50.8 → 0.51.0

package/dist/index.cjs

@@ -5443,6 +5443,9 @@ function renderTextOnCanvas(ctx, text) {
 }
 
 // src/canvas/export-image.ts
+var DEFAULT_IMAGE_TIMEOUT_MS = 1e4;
+var DEFAULT_MAX_DIMENSION = 16384;
+var DEFAULT_MAX_PIXELS = 67108864;
 var center = (b) => ({ x: b.x + b.w / 2, y: b.y + b.h / 2 });
 function getStrokeBounds(el) {
   if (el.type !== "stroke") return null;
@@ -5552,12 +5555,53 @@ function renderGridForBounds(ctx, grid, bounds) {
     );
   }
 }
-function loadImages(elements) {
+function positiveOption(value, fallback, name) {
+  const resolved = value ?? fallback;
+  if (!Number.isFinite(resolved) || resolved <= 0) {
+    throw new RangeError(`${name} must be a finite number greater than 0`);
+  }
+  return resolved;
+}
+function nonNegativeOption(value, fallback, name) {
+  const resolved = value ?? fallback;
+  if (!Number.isFinite(resolved) || resolved < 0) {
+    throw new RangeError(`${name} must be a finite number greater than or equal to 0`);
+  }
+  return resolved;
+}
+function assertExportSize(width, height, options) {
+  const maxDimension = positiveOption(options.maxDimension, DEFAULT_MAX_DIMENSION, "maxDimension");
+  const maxPixels = positiveOption(options.maxPixels, DEFAULT_MAX_PIXELS, "maxPixels");
+  if (!Number.isFinite(width) || !Number.isFinite(height) || width <= 0 || height <= 0) {
+    throw new RangeError("Export dimensions must be finite numbers greater than 0");
+  }
+  if (width > maxDimension || height > maxDimension) {
+    throw new RangeError(
+      `Export dimensions ${width}x${height} exceed the maximum dimension of ${maxDimension}`
+    );
+  }
+  if (width * height > maxPixels) {
+    throw new RangeError(
+      `Export size ${width}x${height} exceeds the maximum of ${maxPixels} pixels`
+    );
+  }
+}
+function validateExportResourceOptions(options) {
+  positiveOption(options.imageTimeoutMs, DEFAULT_IMAGE_TIMEOUT_MS, "imageTimeoutMs");
+  positiveOption(options.maxDimension, DEFAULT_MAX_DIMENSION, "maxDimension");
+  positiveOption(options.maxPixels, DEFAULT_MAX_PIXELS, "maxPixels");
+}
+function loadImages(elements, options = {}) {
   const imageElements = elements.filter(
     (el) => el.type === "image" && "src" in el
   );
   const cache3 = /* @__PURE__ */ new Map();
   if (imageElements.length === 0) return Promise.resolve(cache3);
+  const timeoutMs = positiveOption(
+    options.imageTimeoutMs,
+    DEFAULT_IMAGE_TIMEOUT_MS,
+    "imageTimeoutMs"
+  );
   return new Promise((resolve) => {
     let remaining = imageElements.length;
     const done = () => {
@@ -5567,19 +5611,41 @@ function loadImages(elements) {
     for (const el of imageElements) {
       const img = new Image();
       img.crossOrigin = "anonymous";
+      let settled = false;
+      const timer = setTimeout(() => {
+        if (settled) return;
+        settled = true;
+        img.onload = null;
+        img.onerror = null;
+        options.onAssetError?.({ elementId: el.id, src: el.src, reason: "timeout" });
+        done();
+      }, timeoutMs);
+      const settle = () => {
+        if (settled) return false;
+        settled = true;
+        clearTimeout(timer);
+        img.onload = null;
+        img.onerror = null;
+        return true;
+      };
       img.onload = () => {
+        if (!settle()) return;
         cache3.set(el.id, img);
         done();
       };
-      img.onerror = done;
-      const sep = el.src.includes("?") ? "&" : "?";
-      img.src = `${el.src}${sep}_cors=1`;
+      img.onerror = (cause) => {
+        if (!settle()) return;
+        options.onAssetError?.({ elementId: el.id, src: el.src, reason: "load", cause });
+        done();
+      };
+      img.src = el.src;
     }
   });
 }
 async function exportImage(store, options = {}, layerManager) {
-  const scale = options.scale ?? 2;
-  const padding = options.padding ?? 0;
+  const scale = positiveOption(options.scale, 2, "scale");
+  const padding = nonNegativeOption(options.padding, 0, "padding");
+  validateExportResourceOptions(options);
   const background = options.background ?? "#ffffff";
   const filter = options.filter;
   const allElements = store.getAll();
@@ -5589,10 +5655,13 @@ async function exportImage(store, options = {}, layerManager) {
   }
   const bounds = computeBounds(visibleElements, padding);
   if (!bounds) return null;
-  const imageCache = await loadImages(visibleElements);
+  const width = Math.ceil(bounds.w * scale);
+  const height = Math.ceil(bounds.h * scale);
+  assertExportSize(width, height, options);
+  const imageCache = await loadImages(visibleElements, options);
   const canvas = document.createElement("canvas");
-  canvas.width = Math.ceil(bounds.w * scale);
-  canvas.height = Math.ceil(bounds.h * scale);
+  canvas.width = width;
+  canvas.height = height;
   const ctx = canvas.getContext("2d");
   if (!ctx) return null;
   ctx.scale(scale, scale);
@@ -5775,14 +5844,17 @@ function emitImage(image, dataUri) {
   const { w, h } = image.size;
   return `<image href="${esc(href)}" x="${n(x)}" y="${n(y)}" width="${n(w)}" height="${n(h)}" />`;
 }
-function emitText(text, rasterScale) {
+function emitText(text, rasterScale, resourceOptions) {
   if (!text.text) return "";
   const { x, y } = text.position;
   const { w, h } = text.size;
   if (typeof document === "undefined") return "";
+  const width = Math.max(1, Math.ceil(w * rasterScale));
+  const height = Math.max(1, Math.ceil(h * rasterScale));
+  assertExportSize(width, height, resourceOptions);
   const canvas = document.createElement("canvas");
-  canvas.width = Math.max(1, Math.ceil(w * rasterScale));
-  canvas.height = Math.max(1, Math.ceil(h * rasterScale));
+  canvas.width = width;
+  canvas.height = height;
   const ctx = canvas.getContext("2d");
   if (!ctx) return "";
   ctx.scale(rasterScale, rasterScale);
@@ -5797,13 +5869,16 @@ function emitText(text, rasterScale) {
   if (!dataUri || !dataUri.startsWith("data:")) return "";
   return `<image href="${esc(dataUri)}" x="${n(x)}" y="${n(y)}" width="${n(w)}" height="${n(h)}" />`;
 }
-function emitNote(note, rasterScale) {
+function emitNote(note, rasterScale, resourceOptions) {
   const { x, y } = note.position;
   const { w, h } = note.size;
   if (typeof document === "undefined") return emitNotePlaceholder(note);
+  const width = Math.max(1, Math.ceil(w * rasterScale));
+  const height = Math.max(1, Math.ceil(h * rasterScale));
+  assertExportSize(width, height, resourceOptions);
   const canvas = document.createElement("canvas");
-  canvas.width = Math.max(1, Math.ceil(w * rasterScale));
-  canvas.height = Math.max(1, Math.ceil(h * rasterScale));
+  canvas.width = width;
+  canvas.height = height;
   const ctx = canvas.getContext("2d");
   if (!ctx) return emitNotePlaceholder(note);
   ctx.scale(rasterScale, rasterScale);
@@ -5964,8 +6039,9 @@ function emitHexTemplate(t, grid) {
   return `<path d="${d}" fill="${esc(t.fillColor)}" stroke="${esc(t.strokeColor)}" stroke-width="${n(t.strokeWidth)}" opacity="${n(t.opacity)}" />`;
 }
 async function exportSvg(store, options = {}, layerManager) {
-  const padding = options.padding ?? 0;
-  const rasterScale = options.rasterScale ?? 2;
+  const padding = nonNegativeOption(options.padding, 0, "padding");
+  const rasterScale = positiveOption(options.rasterScale, 2, "rasterScale");
+  validateExportResourceOptions(options);
   const filter = options.filter;
   const allElements = store.getAll();
   let visibleElements = layerManager ? allElements.filter((el) => layerManager.isLayerVisible(el.layerId)) : allElements;
@@ -5974,11 +6050,12 @@ async function exportSvg(store, options = {}, layerManager) {
   if (!bounds) {
     return `<svg xmlns="http://www.w3.org/2000/svg" width="0" height="0" viewBox="0 0 0 0"></svg>`;
   }
+  assertExportSize(Math.ceil(bounds.w), Math.ceil(bounds.h), options);
   const remoteImages = visibleElements.filter(
     (el) => el.type === "image" && !el.src.startsWith("data:")
   );
-  const imageCache = await loadImages(remoteImages);
-  const imageDataUris = encodeImages(visibleElements, imageCache, rasterScale);
+  const imageCache = await loadImages(remoteImages, options);
+  const imageDataUris = encodeImages(visibleElements, imageCache, rasterScale, options);
   const grids = visibleElements.filter((el) => el.type === "grid");
   const firstGrid = grids[0];
   let body = "";
@@ -5987,7 +6064,7 @@ async function exportSvg(store, options = {}, layerManager) {
   }
   const layerBodies = /* @__PURE__ */ new Map();
   for (const el of visibleElements) {
-    const emitted = emitElement(el, imageDataUris, rasterScale, firstGrid, store);
+    const emitted = emitElement(el, imageDataUris, rasterScale, firstGrid, store, options);
     layerBodies.set(el.layerId, (layerBodies.get(el.layerId) ?? "") + emitted);
   }
   for (const [layerId, emitted] of layerBodies) {
@@ -6001,7 +6078,7 @@ async function exportSvg(store, options = {}, layerManager) {
   }
   return `<svg xmlns="http://www.w3.org/2000/svg" width="${n(bounds.w)}" height="${n(bounds.h)}" viewBox="${n(bounds.x)} ${n(bounds.y)} ${n(bounds.w)} ${n(bounds.h)}">${body}</svg>`;
 }
-function emitElement(el, imageDataUris, rasterScale, firstGrid, store) {
+function emitElement(el, imageDataUris, rasterScale, firstGrid, store, resourceOptions) {
   switch (el.type) {
     case "stroke":
       return withRotationSvg(el, emitStroke(el));
@@ -6012,9 +6089,9 @@ function emitElement(el, imageDataUris, rasterScale, firstGrid, store) {
     case "image":
       return withRotationSvg(el, emitImage(el, imageDataUris.get(el.id)));
     case "text":
-      return withRotationSvg(el, emitText(el, rasterScale));
+      return withRotationSvg(el, emitText(el, rasterScale, resourceOptions));
     case "note":
-      return withRotationSvg(el, emitNote(el, rasterScale));
+      return withRotationSvg(el, emitNote(el, rasterScale, resourceOptions));
     case "template":
       return emitTemplate(el, firstGrid);
     case "grid":
@@ -6025,7 +6102,7 @@ function emitElement(el, imageDataUris, rasterScale, firstGrid, store) {
       return "";
   }
 }
-function encodeImages(elements, imageCache, rasterScale) {
+function encodeImages(elements, imageCache, rasterScale, resourceOptions) {
   const out = /* @__PURE__ */ new Map();
   for (const el of elements) {
     if (el.type !== "image") continue;
@@ -6035,16 +6112,24 @@ function encodeImages(elements, imageCache, rasterScale) {
     }
     const img = imageCache.get(el.id);
     if (!img || typeof document === "undefined") continue;
+    const width = Math.max(1, Math.ceil(el.size.w * rasterScale));
+    const height = Math.max(1, Math.ceil(el.size.h * rasterScale));
+    assertExportSize(width, height, resourceOptions);
     const canvas = document.createElement("canvas");
-    canvas.width = Math.max(1, Math.ceil(el.size.w * rasterScale));
-    canvas.height = Math.max(1, Math.ceil(el.size.h * rasterScale));
+    canvas.width = width;
+    canvas.height = height;
     const ctx = canvas.getContext("2d");
-    if (!ctx) continue;
+    if (!ctx) {
+      resourceOptions.onAssetError?.({ elementId: el.id, src: el.src, reason: "encode" });
+      continue;
+    }
     try {
       ctx.drawImage(img, 0, 0, canvas.width, canvas.height);
       const uri = canvas.toDataURL();
       if (uri.startsWith("data:")) out.set(el.id, uri);
-    } catch {
+      else resourceOptions.onAssetError?.({ elementId: el.id, src: el.src, reason: "encode" });
+    } catch (cause) {
+      resourceOptions.onAssetError?.({ elementId: el.id, src: el.src, reason: "encode", cause });
     }
   }
   return out;
@@ -6593,7 +6678,7 @@ var RenderLoop = class {
   layerGroups = /* @__PURE__ */ new Map();
   gridCacheCanvas = null;
   gridCacheCtx = null;
-  lastGridRef = null;
+  lastGridRefs = [];
   constructor(deps) {
     this.canvasEl = deps.canvasEl;
     this.camera = deps.camera;
@@ -6793,8 +6878,8 @@ var RenderLoop = class {
     }
     if (gridElements.length > 0) {
       const gridT0 = performance.now();
-      const gridRef = gridElements[0];
-      const gridDirty = this.gridCacheDirty || gridRef !== this.lastGridRef;
+      const gridsChanged = gridElements.length !== this.lastGridRefs.length || gridElements.some((grid, index) => grid !== this.lastGridRefs[index]);
+      const gridDirty = this.gridCacheDirty || gridsChanged;
       if (gridDirty) {
         this.ensureGridCache();
         if (this.gridCacheCtx && this.gridCacheCanvas) {
@@ -6822,7 +6907,7 @@ var RenderLoop = class {
           }
         }
         this.gridCacheDirty = false;
-        this.lastGridRef = gridRef;
+        this.lastGridRefs = [...gridElements];
       }
       if (this.gridCacheCanvas) {
         const offset = this.marginViewport.compositeOffset(
@@ -6842,6 +6927,8 @@ var RenderLoop = class {
         }
       }
       gridMs = performance.now() - gridT0;
+    } else {
+      this.lastGridRefs = [];
     }
     const overlayT0 = performance.now();
     const activeTool = this.toolManager.activeTool;
@@ -10815,7 +10902,7 @@ var LaserTool = class {
 };
 
 // src/index.ts
-var VERSION = "0.50.8";
+var VERSION = "0.51.0";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ArrowTool,