@fieldnotes/core 0.50.7 → 0.50.8

package/dist/index.cjs

@@ -239,6 +239,17 @@ function sanitizeAttributes(el, tag) {
 
 // src/core/state-serializer.ts
 var CURRENT_VERSION = 2;
+var ELEMENT_TYPES = [
+  "stroke",
+  "note",
+  "arrow",
+  "image",
+  "html",
+  "text",
+  "shape",
+  "grid",
+  "template"
+];
 function exportState(elements, camera, layers = [], activeLayerId) {
   const state = {
     version: CURRENT_VERSION,
@@ -264,37 +275,42 @@ function parseState(json) {
   return data;
 }
 function validateState(data) {
-  if (!data || typeof data !== "object") {
+  if (!isRecord(data)) {
     throw new Error("Invalid state: expected an object");
   }
   const obj = data;
-  if (typeof obj["version"] !== "number") {
+  if (!Number.isInteger(obj["version"]) || obj["version"] < 1) {
     throw new Error("Invalid state: missing or invalid version");
   }
-  if (!obj["camera"] || typeof obj["camera"] !== "object") {
+  if (obj["version"] > CURRENT_VERSION) {
+    throw new Error(`Invalid state: unsupported version ${String(obj["version"])}`);
+  }
+  if (!isRecord(obj["camera"])) {
     throw new Error("Invalid state: missing camera");
   }
   const cam = obj["camera"];
-  if (!cam["position"] || typeof cam["position"] !== "object") {
+  if (!isRecord(cam["position"])) {
     throw new Error("Invalid state: missing camera.position");
   }
-  const pos = cam["position"];
-  if (typeof pos["x"] !== "number" || typeof pos["y"] !== "number") {
-    throw new Error("Invalid state: camera.position must have x and y numbers");
+  if (!isPoint(cam["position"])) {
+    throw new Error("Invalid state: camera.position must have finite x and y numbers");
   }
-  if (typeof cam["zoom"] !== "number") {
-    throw new Error("Invalid state: missing camera.zoom");
+  if (!isFiniteNumber(cam["zoom"]) || cam["zoom"] <= 0) {
+    throw new Error("Invalid state: camera.zoom must be a positive finite number");
   }
   if (!Array.isArray(obj["elements"])) {
     throw new Error("Invalid state: elements must be an array");
   }
-  for (const el of obj["elements"]) {
-    validateElement(el);
-    migrateElement(el);
+  if (obj["layers"] !== void 0 && !Array.isArray(obj["layers"])) {
+    throw new Error("Invalid state: layers must be an array");
   }
-  cleanBindings(obj["elements"]);
-  const layers = obj["layers"];
-  if (!Array.isArray(layers) || layers.length === 0) {
+  const elements = obj["elements"];
+  const hasLayers = Array.isArray(obj["layers"]) && obj["layers"].length > 0;
+  for (const el of elements) {
+    if (!isRecord(el)) throw new Error("Invalid element: expected an object");
+    migrateElement(el, !hasLayers);
+  }
+  if (!hasLayers) {
     obj["layers"] = [
       {
         id: "default-layer",
@@ -306,31 +322,73 @@ function validateState(data) {
       }
     ];
   }
+  const layers = obj["layers"];
+  const layerIds = /* @__PURE__ */ new Set();
+  for (const layer of layers) {
+    validateLayer(layer);
+    if (layerIds.has(layer.id)) throw new Error(`Invalid state: duplicate layer id "${layer.id}"`);
+    layerIds.add(layer.id);
+  }
+  const elementIds = /* @__PURE__ */ new Set();
+  for (const el of elements) {
+    validateElement(el);
+    if (elementIds.has(el.id)) throw new Error(`Invalid state: duplicate element id "${el.id}"`);
+    elementIds.add(el.id);
+    if (!layerIds.has(el.layerId)) {
+      throw new Error(`Invalid element "${el.id}": unknown layerId "${el.layerId}"`);
+    }
+  }
+  if (obj["activeLayerId"] !== void 0) {
+    if (typeof obj["activeLayerId"] !== "string" || !layerIds.has(obj["activeLayerId"])) {
+      throw new Error("Invalid state: activeLayerId must reference an existing layer");
+    }
+  }
+  cleanBindings(elements);
 }
-var VALID_TYPES = /* @__PURE__ */ new Set([
-  "stroke",
-  "note",
-  "arrow",
-  "image",
-  "html",
-  "text",
-  "shape",
-  "grid",
-  "template"
-]);
 function validateElement(el) {
-  if (!el || typeof el !== "object") {
+  if (!isRecord(el)) {
     throw new Error("Invalid element: expected an object");
   }
-  const obj = el;
-  if (typeof obj["id"] !== "string") {
+  if (typeof el["id"] !== "string" || el["id"].length === 0) {
     throw new Error("Invalid element: missing id");
   }
-  if (typeof obj["type"] !== "string" || !VALID_TYPES.has(obj["type"])) {
-    throw new Error(`Invalid element: unknown type "${String(obj["type"])}"`);
+  if (!isEnum(el["type"], ELEMENT_TYPES)) {
+    throw new Error(`Invalid element: unknown type "${String(el["type"])}"`);
+  }
+  if (!isFiniteNumber(el["zIndex"])) {
+    throw new Error(`Invalid element "${el["id"]}": missing or invalid zIndex`);
   }
-  if (typeof obj["zIndex"] !== "number") {
-    throw new Error("Invalid element: missing zIndex");
+  if (!isPoint(el["position"]) || typeof el["locked"] !== "boolean" || typeof el["layerId"] !== "string" || !isOptional(el["groupId"], isString) || !isOptional(el["rotation"], isFiniteNumber)) {
+    throw new Error(`Invalid element "${el["id"]}": invalid base fields or geometry`);
+  }
+  const valid = validateTypeFields(el, el["type"]);
+  if (!valid) throw new Error(`Invalid element "${el["id"]}": malformed ${el["type"]} data`);
+}
+function validateTypeFields(el, type) {
+  switch (type) {
+    case "stroke":
+      return Array.isArray(el["points"]) && el["points"].every(isStrokePoint) && isString(el["color"]) && isFiniteNumber(el["width"]) && isFiniteNumber(el["opacity"]) && isOptionalEnum(el["blendMode"], ["multiply"]);
+    case "note":
+      return isSize(el["size"]) && isString(el["text"]) && isString(el["backgroundColor"]) && isString(el["textColor"]) && isOptional(el["fontSize"], isFiniteNumber);
+    case "arrow":
+      return isPoint(el["from"]) && isPoint(el["to"]) && isFiniteNumber(el["bend"]) && isString(el["color"]) && isFiniteNumber(el["width"]) && isOptional(el["fromBinding"], isBinding) && isOptional(el["toBinding"], isBinding) && isOptional(el["cachedControlPoint"], isPoint) && isOptional(el["label"], isString) && isOptionalEnum(el["strokeStyle"], ["solid", "dashed", "dotted"]);
+    case "image":
+      return isSize(el["size"]) && isString(el["src"]);
+    case "html":
+      return isSize(el["size"]) && isOptional(el["domId"], isString) && isOptional(el["interactive"], isBoolean) && isOptional(el["htmlType"], isString) && isOptional(el["data"], isRecord);
+    case "text":
+      return isSize(el["size"]) && isString(el["text"]) && isFiniteNumber(el["fontSize"]) && isString(el["color"]) && isEnum(el["textAlign"], ["left", "center", "right"]);
+    case "shape":
+      return isEnum(el["shape"], ["rectangle", "ellipse", "line"]) && isSize(el["size"]) && isString(el["strokeColor"]) && isFiniteNumber(el["strokeWidth"]) && isString(el["fillColor"]) && isOptional(el["flip"], isBoolean);
+    case "grid":
+      return isEnum(el["gridType"], ["square", "hex"]) && isEnum(el["hexOrientation"], ["pointy", "flat"]) && isFiniteNumber(el["cellSize"]) && isString(el["strokeColor"]) && isFiniteNumber(el["strokeWidth"]) && isFiniteNumber(el["opacity"]);
+    case "template":
+      return isEnum(el["templateShape"], ["circle", "cone", "line", "square", "rectangle"]) && isFiniteNumber(el["radius"]) && isFiniteNumber(el["angle"]) && isOptional(el["width"], isFiniteNumber) && isString(el["fillColor"]) && isString(el["strokeColor"]) && isFiniteNumber(el["strokeWidth"]) && isFiniteNumber(el["opacity"]) && isOptional(el["feetPerCell"], isFiniteNumber) && isOptional(el["radiusFeet"], isFiniteNumber) && isOptionalEnum(el["renderStyle"], ["cells", "geometric"]);
+  }
+}
+function validateLayer(layer) {
+  if (!isRecord(layer) || typeof layer["id"] !== "string" || layer["id"].length === 0 || typeof layer["name"] !== "string" || typeof layer["visible"] !== "boolean" || typeof layer["locked"] !== "boolean" || !isFiniteNumber(layer["order"]) || !isFiniteNumber(layer["opacity"]) || layer["opacity"] < 0 || layer["opacity"] > 1) {
+    throw new Error("Invalid state: malformed layer");
   }
 }
 function cleanBindings(elements) {
@@ -347,30 +405,63 @@ function cleanBindings(elements) {
     }
   }
 }
-function migrateElement(obj) {
-  if (typeof obj["layerId"] !== "string") {
+function migrateElement(obj, useDefaultLayer) {
+  if (obj["layerId"] === void 0 || useDefaultLayer && obj["layerId"] === "") {
     obj["layerId"] = "default-layer";
   }
-  if (obj["type"] === "arrow" && typeof obj["bend"] !== "number") {
+  if (obj["type"] === "arrow" && obj["bend"] === void 0) {
     obj["bend"] = 0;
   }
   if (obj["type"] === "stroke" && Array.isArray(obj["points"])) {
     for (const pt of obj["points"]) {
-      if (typeof pt["pressure"] !== "number") {
+      if (pt["pressure"] === void 0) {
         pt["pressure"] = 0.5;
       }
     }
   }
-  if (obj["type"] === "shape" && typeof obj["shape"] !== "string") {
+  if (obj["type"] === "shape" && obj["shape"] === void 0) {
     obj["shape"] = "rectangle";
   }
-  if (obj["type"] === "note" && typeof obj["textColor"] !== "string") {
+  if (obj["type"] === "note" && obj["textColor"] === void 0) {
     obj["textColor"] = "#000000";
   }
   if ((obj["type"] === "note" || obj["type"] === "text") && typeof obj["text"] === "string") {
     obj["text"] = sanitizeNoteHtml(obj["text"]);
   }
 }
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isFiniteNumber(value) {
+  return typeof value === "number" && Number.isFinite(value);
+}
+function isString(value) {
+  return typeof value === "string";
+}
+function isBoolean(value) {
+  return typeof value === "boolean";
+}
+function isOptional(value, validate) {
+  return value === void 0 || validate(value);
+}
+function isEnum(value, values) {
+  return typeof value === "string" && values.includes(value);
+}
+function isOptionalEnum(value, values) {
+  return value === void 0 || isEnum(value, values);
+}
+function isPoint(value) {
+  return isRecord(value) && isFiniteNumber(value["x"]) && isFiniteNumber(value["y"]);
+}
+function isSize(value) {
+  return isRecord(value) && isFiniteNumber(value["w"]) && isFiniteNumber(value["h"]);
+}
+function isStrokePoint(value) {
+  return isRecord(value) && isPoint(value) && isFiniteNumber(value["pressure"]);
+}
+function isBinding(value) {
+  return isRecord(value) && typeof value["elementId"] === "string";
+}
 
 // src/core/storage/local-storage-adapter.ts
 var LocalStorageAdapter = class {
@@ -6502,7 +6593,7 @@ var RenderLoop = class {
   layerGroups = /* @__PURE__ */ new Map();
   gridCacheCanvas = null;
   gridCacheCtx = null;
-  lastGridRefs = [];
+  lastGridRef = null;
   constructor(deps) {
     this.canvasEl = deps.canvasEl;
     this.camera = deps.camera;
@@ -6702,8 +6793,8 @@ var RenderLoop = class {
     }
     if (gridElements.length > 0) {
       const gridT0 = performance.now();
-      const gridsChanged = gridElements.length !== this.lastGridRefs.length || gridElements.some((grid, index) => grid !== this.lastGridRefs[index]);
-      const gridDirty = this.gridCacheDirty || gridsChanged;
+      const gridRef = gridElements[0];
+      const gridDirty = this.gridCacheDirty || gridRef !== this.lastGridRef;
       if (gridDirty) {
         this.ensureGridCache();
         if (this.gridCacheCtx && this.gridCacheCanvas) {
@@ -6731,7 +6822,7 @@ var RenderLoop = class {
           }
         }
         this.gridCacheDirty = false;
-        this.lastGridRefs = [...gridElements];
+        this.lastGridRef = gridRef;
       }
       if (this.gridCacheCanvas) {
         const offset = this.marginViewport.compositeOffset(
@@ -6751,8 +6842,6 @@ var RenderLoop = class {
         }
       }
       gridMs = performance.now() - gridT0;
-    } else {
-      this.lastGridRefs = [];
     }
     const overlayT0 = performance.now();
     const activeTool = this.toolManager.activeTool;
@@ -10726,7 +10815,7 @@ var LaserTool = class {
 };
 
 // src/index.ts
-var VERSION = "0.50.7";
+var VERSION = "0.50.8";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ArrowTool,