fabricjs-document-engine 1.0.0 → 1.0.1

package/dist/engine/create-document-engine.cjs

@@ -167,12 +167,16 @@ function createDocumentEngine(options) {
 		if (!storage || discardUnsavedChanges || !saving.state().isDirty) return;
 		throw new require_errors.DocumentEngineError("UNSAVED_CHANGES", "The current document has unsaved changes. Save first, or pass { discardUnsavedChanges: true } to replace it anyway.");
 	}
-	async function loadMigratedDocument(input, loadOptions, importDetails) {
-		ensureUsable();
-		protectUnsavedChanges(loadOptions.discardUnsavedChanges);
+	function startLoad() {
 		activeLoad?.abort();
 		const controller = new AbortController();
 		activeLoad = controller;
+		return controller;
+	}
+	async function loadMigratedDocument(input, loadOptions, importDetails, startedLoad) {
+		ensureUsable();
+		protectUnsavedChanges(loadOptions.discardUnsavedChanges);
+		const controller = startedLoad ?? startLoad();
 		const documentId = describeDocumentId(input);
 		events.emit("load:start", { documentId });
 		try {
@@ -318,16 +322,24 @@ function createDocumentEngine(options) {
 		ensureUsable();
 		const source = requireStorage();
 		protectUnsavedChanges(loadOptions?.discardUnsavedChanges);
+		const controller = startLoad();
 		let stored;
 		try {
 			stored = await source.loadDocument(documentId);
+			if (controller.signal.aborted) throw new Error("aborted");
 		} catch (error) {
+			if (activeLoad === controller) activeLoad = null;
+			if (controller.signal.aborted) {
+				const aborted = toLoadError(error, controller.signal);
+				events.emit("load:error", { error: aborted });
+				throw aborted;
+			}
 			const reason = error instanceof Error ? error.message : String(error);
 			const engineError = require_errors.isDocumentEngineError(error) ? error : new require_errors.DocumentEngineError("LOAD_FAILED", `Storage could not load "${documentId}": ${reason}`, { cause: error });
 			events.emit("load:error", { error: engineError });
 			throw engineError;
 		}
-		return loadMigratedDocument(stored, loadOptions ?? {}, { id: documentId });
+		return loadMigratedDocument(stored, loadOptions ?? {}, { id: documentId }, controller);
 	}
 	function save(saveOptions) {
 		try {
@@ -335,6 +347,7 @@ function createDocumentEngine(options) {
 		} catch (error) {
 			return Promise.reject(error);
 		}
+		history.flush();
 		return saving.save(saveOptions);
 	}
 	function newDocument(newOptions = {}) {
@@ -495,7 +508,8 @@ function createDocumentEngine(options) {
 	}
 	function destroy() {
 		if (destroyed) return;
-		if (recovery && saving.state().isDirty) recovery.writeNow();
+		const { disposed } = canvas;
+		if (recovery && saving.state().isDirty && !disposed) recovery.writeNow();
 		destroyed = true;
 		activeLoad?.abort();
 		history.destroy();
@@ -569,6 +583,7 @@ function createDocumentEngine(options) {
 		getHistory: () => history.labels(),
 		clearHistory() {
 			ensureUsable();
+			history.flush();
 			history.reset();
 		},
 		on: (name, handler) => events.on(name, handler),

package/dist/engine/create-document-engine.js

@@ -167,12 +167,16 @@ function createDocumentEngine(options) {
 		if (!storage || discardUnsavedChanges || !saving.state().isDirty) return;
 		throw new DocumentEngineError("UNSAVED_CHANGES", "The current document has unsaved changes. Save first, or pass { discardUnsavedChanges: true } to replace it anyway.");
 	}
-	async function loadMigratedDocument(input, loadOptions, importDetails) {
-		ensureUsable();
-		protectUnsavedChanges(loadOptions.discardUnsavedChanges);
+	function startLoad() {
 		activeLoad?.abort();
 		const controller = new AbortController();
 		activeLoad = controller;
+		return controller;
+	}
+	async function loadMigratedDocument(input, loadOptions, importDetails, startedLoad) {
+		ensureUsable();
+		protectUnsavedChanges(loadOptions.discardUnsavedChanges);
+		const controller = startedLoad ?? startLoad();
 		const documentId = describeDocumentId(input);
 		events.emit("load:start", { documentId });
 		try {
@@ -318,16 +322,24 @@ function createDocumentEngine(options) {
 		ensureUsable();
 		const source = requireStorage();
 		protectUnsavedChanges(loadOptions?.discardUnsavedChanges);
+		const controller = startLoad();
 		let stored;
 		try {
 			stored = await source.loadDocument(documentId);
+			if (controller.signal.aborted) throw new Error("aborted");
 		} catch (error) {
+			if (activeLoad === controller) activeLoad = null;
+			if (controller.signal.aborted) {
+				const aborted = toLoadError(error, controller.signal);
+				events.emit("load:error", { error: aborted });
+				throw aborted;
+			}
 			const reason = error instanceof Error ? error.message : String(error);
 			const engineError = isDocumentEngineError(error) ? error : new DocumentEngineError("LOAD_FAILED", `Storage could not load "${documentId}": ${reason}`, { cause: error });
 			events.emit("load:error", { error: engineError });
 			throw engineError;
 		}
-		return loadMigratedDocument(stored, loadOptions ?? {}, { id: documentId });
+		return loadMigratedDocument(stored, loadOptions ?? {}, { id: documentId }, controller);
 	}
 	function save(saveOptions) {
 		try {
@@ -335,6 +347,7 @@ function createDocumentEngine(options) {
 		} catch (error) {
 			return Promise.reject(error);
 		}
+		history.flush();
 		return saving.save(saveOptions);
 	}
 	function newDocument(newOptions = {}) {
@@ -495,7 +508,8 @@ function createDocumentEngine(options) {
 	}
 	function destroy() {
 		if (destroyed) return;
-		if (recovery && saving.state().isDirty) recovery.writeNow();
+		const { disposed } = canvas;
+		if (recovery && saving.state().isDirty && !disposed) recovery.writeNow();
 		destroyed = true;
 		activeLoad?.abort();
 		history.destroy();
@@ -569,6 +583,7 @@ function createDocumentEngine(options) {
 		getHistory: () => history.labels(),
 		clearHistory() {
 			ensureUsable();
+			history.flush();
 			history.reset();
 		},
 		on: (name, handler) => events.on(name, handler),

package/dist/history/create-history.cjs

@@ -178,6 +178,7 @@ function createHistory(options) {
 			redo: stack.redoLabels()
 		}),
 		withoutRecording,
+		flush: commitPendingChanges,
 		reset() {
 			pendingChanges = [];
 			stack.clear();

package/dist/history/create-history.js

@@ -178,6 +178,7 @@ function createHistory(options) {
 			redo: stack.redoLabels()
 		}),
 		withoutRecording,
+		flush: commitPendingChanges,
 		reset() {
 			pendingChanges = [];
 			stack.clear();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fabricjs-document-engine",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Turn an existing Fabric.js canvas into a dependable editable document: stable object ids, versioned save and load, undo and redo, safe autosave with conflict protection, custom objects and clear errors.",
   "keywords": [
     "fabric",