@bendyline/squisq 2.0.1 → 2.2.0

package/dist/{chunk-5DKBFXPY.js → chunk-6ECMNUIP.js}

@@ -6,11 +6,12 @@ import {
   pruneSnapshots,
   readTextSnapshot,
   saveTextSnapshot
-} from "./chunk-S7A5D7ZJ.js";
+} from "./chunk-OPO5K4DZ.js";
 import {
+  bytesToBase64,
   markerPath,
   shapePath
-} from "./chunk-TUWMK62B.js";
+} from "./chunk-PUS54YU6.js";
 
 // src/imageEdit/state.ts
 var IMAGE_EDIT_STATE_FILENAME = "state.json";
@@ -99,21 +100,21 @@ async function writeImageEditDoc(container, doc, filename = IMAGE_EDIT_STATE_FIL
   const text = JSON.stringify(doc, null, 2);
   await container.writeFile(filename, encoder.encode(text), "application/json");
 }
-function assertImageEditDoc(value, filename) {
+function assertImageEditDoc(value, filename, context = "readImageEditDoc") {
   if (!value || typeof value !== "object") {
-    throw new Error(`readImageEditDoc: ${filename} root must be an object`);
+    throw new Error(`${context}: ${filename} root must be an object`);
   }
   const v = value;
   if (v.version !== 1) {
     throw new Error(
-      `readImageEditDoc: ${filename} has unsupported schema version ${String(v.version)} (expected 1)`
+      `${context}: ${filename} has unsupported schema version ${String(v.version)} (expected 1)`
     );
   }
   if (!v.canvas || typeof v.canvas.width !== "number" || typeof v.canvas.height !== "number") {
-    throw new Error(`readImageEditDoc: ${filename} canvas.width/height must be numbers`);
+    throw new Error(`${context}: ${filename} canvas.width/height must be numbers`);
   }
   if (!Array.isArray(v.layers)) {
-    throw new Error(`readImageEditDoc: ${filename} layers must be an array`);
+    throw new Error(`${context}: ${filename} layers must be an array`);
   }
   v.layers.forEach((layer, i) => assertLayer(layer, i, filename));
 }
@@ -179,7 +180,16 @@ async function readImageEditVersionText(container, version) {
 async function readImageEditVersion(container, version) {
   const text = await readImageEditVersionText(container, version);
   if (text === null) return null;
-  return JSON.parse(text);
+  const path = typeof version === "string" ? version : version.path;
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    throw new Error(`readImageEditVersion: ${path} is not valid JSON: ${msg}`);
+  }
+  assertImageEditDoc(parsed, path, "readImageEditVersion");
+  return parsed;
 }
 async function saveImageEditVersion(container, options = {}) {
   const stateFilename = options.stateFilename ?? IMAGE_EDIT_STATE_FILENAME;
@@ -200,11 +210,16 @@ async function saveImageEditVersion(container, options = {}) {
 async function revertToImageEditVersion(container, version, options = {}) {
   const doc = await readImageEditVersion(container, version);
   if (!doc) {
-    return { reverted: false, snapshotted: null };
+    return { reverted: false, snapshotted: null, reason: "missing-snapshot" };
   }
   let snapshotted = null;
   if (options.snapshotCurrent !== false) {
-    const result = await saveImageEditVersion(container, { stateFilename: options.stateFilename });
+    const saveOptions = { stateFilename: options.stateFilename };
+    if (options.doc !== void 0) saveOptions.doc = options.doc;
+    const result = await saveImageEditVersion(container, saveOptions);
+    if (!result.saved && result.reason !== "unchanged") {
+      return { reverted: false, snapshotted: null, reason: "snapshot-failed" };
+    }
     snapshotted = result.version;
   }
   await writeImageEditDoc(container, doc, options.stateFilename);
@@ -401,13 +416,7 @@ async function loadAssetAsDataUrl(container, src) {
 }
 function arrayBufferToDataUrl(data, mime) {
   const bytes = new Uint8Array(data);
-  let binary = "";
-  const CHUNK = 32768;
-  for (let i = 0; i < bytes.length; i += CHUNK) {
-    binary += String.fromCharCode.apply(null, Array.from(bytes.subarray(i, i + CHUNK)));
-  }
-  const b64 = typeof btoa === "function" ? btoa(binary) : Buffer.from(bytes).toString("base64");
-  return `data:${mime};base64,${b64}`;
+  return `data:${mime};base64,${bytesToBase64(bytes)}`;
 }
 function guessMime(path) {
   const dot = path.lastIndexOf(".");
@@ -500,4 +509,3 @@ export {
   exportImageEditDoc,
   buildSvgString
 };
-//# sourceMappingURL=chunk-5DKBFXPY.js.map