visio-solid-viewer 0.2.0 → 0.3.0

package/dist/index.js

@@ -1,4 +1,4 @@
-import { VISIO_RASTER_IMAGE_LIMITS, VISIO_VISIBILITY_LIMITS, getVisioPageLayers, inspectVisioRasterImage, parseVsdx, resolveVisioPageVisibility, validateVisioForeignVector } from "ooxml-core/visio";
+import { VISIO_RASTER_IMAGE_LIMITS, VISIO_VISIBILITY_LIMITS, getVisioPageLayers, inspectVisioRasterImage, loadVisio, resolveVisioPageVisibility, validateVisioForeignVector } from "ooxml-core/visio";
 import { registerControls } from "ooxml-ui/controls";
 import { getIcon, registerIcon } from "ooxml-ui/icons";
 import { className, effect, style, template, use } from "solid-js/web";
@@ -273,7 +273,7 @@ function member(value, choices, label) {
 }
 /** Defensive display limits also protect callers supplying their own typed scenes. */
 function assertViewableDocument(model) {
-	if (model.format !== "vsdx" || !Array.isArray(model.pages) || model.pages.length > 256 || !Array.isArray(model.diagnostics) || model.diagnostics.length > 2e3) throw new Error("The scene has an invalid page list.");
+	if (model.format !== "vsdx" && model.format !== "vsd" || !Array.isArray(model.pages) || model.pages.length > 256 || !Array.isArray(model.diagnostics) || model.diagnostics.length > 2e3) throw new Error("The scene has an invalid page list.");
 	const seen = /* @__PURE__ */ new Set();
 	let pathBytes = 0, textBytes = 0, runCount = 0, imageBytes = 0, geometryCount = 0, uniquePixels = 0, drawnPixels = 0, layerCount = 0, paragraphCount = 0, gradientStops = 0;
 	const imageResources = /* @__PURE__ */ new Map();
@@ -535,7 +535,7 @@ function createWorkerEditor(factory, timeoutMs = 2e4) {
 		if (typeof Worker === "undefined") throw new Error("Editing requires browser worker support.");
 		return new Worker(new URL(
 			/* @vite-ignore */
-			new URL("assets/edit-worker-BcXrV_St.js", import.meta.url).href,
+			new URL("assets/edit-worker-CZbtTOr4.js", import.meta.url).href,
 			"" + import.meta.url
 		), { type: "module" });
 	});
@@ -791,9 +791,10 @@ var ViewerController = class {
 	#sourceGeneration = 0;
 	#searchIndex = null;
 	#history = null;
+	#sourceFormat = null;
 	#editId = 0;
 	#visible = documentVisibility(null);
-	constructor(parser = parseVsdx, listenerError = (error) => {
+	constructor(parser = loadVisio, listenerError = (error) => {
 		if (typeof globalThis.reportError === "function") globalThis.reportError(error);
 		else console.error("Visio viewer listener failed:", error);
 	}, editor = createWorkerEditor()) {
@@ -833,6 +834,7 @@ var ViewerController = class {
 		++this.#sourceGeneration;
 		this.#invalidateEdit();
 		this.#history = null;
+		this.#sourceFormat = null;
 		this.#loadId++;
 		this.parser.cancel?.();
 		this.#searchIndex = null;
@@ -975,7 +977,7 @@ var ViewerController = class {
 		this.#change({
 			loading: true,
 			error: null,
-			edit: this.#history?.state ?? EMPTY_EDIT_STATE
+			edit: this.#sourceEditState()
 		});
 		if (this.#destroyed || id !== this.#loadId) return;
 		let document;
@@ -986,10 +988,10 @@ var ViewerController = class {
 			if (this.#destroyed || id !== this.#loadId) return;
 			if (bytes.byteLength > 33554432) throw new Error("This viewer accepts files up to 32 MiB.");
 			const owned = bytes instanceof Uint8Array ? Uint8Array.from(bytes) : new Uint8Array(bytes.slice(0));
-			history = new DocumentHistory(owned);
 			document = await this.parser(Uint8Array.from(owned));
 			if (this.#destroyed || id !== this.#loadId) return;
 			assertViewableDocument(document);
+			history = new DocumentHistory(owned);
 			visible = documentVisibility(document);
 		} catch (cause) {
 			if (this.#destroyed || id !== this.#loadId) return;
@@ -1002,13 +1004,14 @@ var ViewerController = class {
 			throw error;
 		}
 		this.#history = history;
+		this.#sourceFormat = document.format;
 		this.#searchIndex = null;
 		this.#visible = visible;
 		++this.#documentGeneration;
 		++this.#sourceGeneration;
 		this.#change({
 			document,
-			edit: history.state,
+			edit: document.format === "vsdx" ? history.state : EMPTY_EDIT_STATE,
 			pageIndex: 0,
 			loading: false,
 			error: null,
@@ -1025,7 +1028,7 @@ var ViewerController = class {
 		this.#invalidateEdit();
 		this.#change({
 			loading: false,
-			edit: this.#history?.state ?? EMPTY_EDIT_STATE
+			edit: this.#sourceEditState()
 		});
 	}
 	destroy() {
@@ -1033,6 +1036,7 @@ var ViewerController = class {
 		this.#destroyed = true;
 		this.#invalidateEdit();
 		this.#history = null;
+		this.#sourceFormat = null;
 		++this.#documentGeneration;
 		++this.#sourceGeneration;
 		++this.#loadId;
@@ -1077,11 +1081,11 @@ var ViewerController = class {
 		if (!this.#state.edit.busy) return;
 		this.#invalidateEdit();
 		this.parser.cancel?.();
-		this.#change({ edit: this.#history?.state ?? EMPTY_EDIT_STATE });
+		this.#change({ edit: this.#sourceEditState() });
 	}
 	exportVsdx() {
 		this.#assertAlive();
-		if (!this.#history) throw new Error("Load a VSDX file before downloading a source-backed copy.");
+		if (!this.#history || this.#sourceFormat !== "vsdx" || this.#state.document?.format !== "vsdx") throw new Error("Load a VSDX file before downloading a source-backed copy.");
 		if (this.#state.edit.busy || this.#state.loading) throw new Error("Wait for the current document operation before downloading.");
 		return this.#history.export();
 	}
@@ -1089,10 +1093,13 @@ var ViewerController = class {
 		++this.#editId;
 		this.editor.cancel?.();
 	}
+	#sourceEditState() {
+		return this.#sourceFormat === "vsdx" && this.#state.document?.format === "vsdx" ? this.#history?.state ?? EMPTY_EDIT_STATE : EMPTY_EDIT_STATE;
+	}
 	async #mutate(kind, commands) {
 		this.#assertAlive();
 		const history = this.#history;
-		if (!history) throw new Error("Load a VSDX file before editing. Model-only documents are read only.");
+		if (!history || this.#sourceFormat !== "vsdx" || this.#state.document?.format !== "vsdx") throw new Error("Load a VSDX file before editing. Model-only documents are read only.");
 		if (this.#state.loading || this.#state.edit.busy) throw new Error("Another document operation is in progress.");
 		const target = kind === "undo" ? history.undoTarget : kind === "redo" ? history.redoTarget : void 0;
 		if (kind !== "edit" && !target) return;
@@ -1118,6 +1125,7 @@ var ViewerController = class {
 			} else document = await this.parser(Uint8Array.from(target.bytes));
 			assertCurrent();
 			assertViewableDocument(document);
+			if (document.format !== "vsdx") throw new Error("A VSDX edit or history operation cannot change the source format.");
 			if (edited && !edited.changedParts.length) {
 				this.#change({ edit: history.state });
 				return;
@@ -1207,10 +1215,10 @@ var eventKeys = [
 //#region src/worker-parser.ts
 /** One disposable worker per document prevents old parses and long CPU tasks from occupying the UI. */
 function createWorkerParser(factory, timeoutMs = 15e3) {
-	if (!factory && typeof Worker === "undefined") return parseVsdx;
+	if (!factory && typeof Worker === "undefined") return loadVisio;
 	const create = factory ?? (() => new Worker(new URL(
 		/* @vite-ignore */
-		new URL("assets/parse-worker-B8EBQQpD.js", import.meta.url).href,
+		new URL("assets/parse-worker-BEaLqUCJ.js", import.meta.url).href,
 		"" + import.meta.url
 	), { type: "module" }));
 	let cancel;
@@ -4622,7 +4630,7 @@ var VisioViewerElement = class extends BaseElement {
 				empty.className = "empty";
 				const heading = document.createElement("strong");
 				heading.textContent = "Open a Visio drawing";
-				empty.append(heading, "Open a .vsdx file to start. Files stay in this browser.");
+				empty.append(heading, "Open a .vsdx or supported .vsd file to start. Files stay in this browser.");
 				this.#viewport.replaceChildren(empty);
 			}
 			const notes = compatibilityNotes(state.document?.diagnostics ?? [], this.#renderWarnings);

package/dist/index.server.js

@@ -1,4 +1,4 @@
-import { VISIO_RASTER_IMAGE_LIMITS, VISIO_VISIBILITY_LIMITS, getVisioPageLayers, inspectVisioRasterImage, parseVsdx, resolveVisioPageVisibility, validateVisioForeignVector } from "ooxml-core/visio";
+import { VISIO_RASTER_IMAGE_LIMITS, VISIO_VISIBILITY_LIMITS, getVisioPageLayers, inspectVisioRasterImage, loadVisio, resolveVisioPageVisibility, validateVisioForeignVector } from "ooxml-core/visio";
 import { registerControls } from "ooxml-ui/controls";
 import { getIcon, registerIcon } from "ooxml-ui/icons";
 import { escape, ssr, ssrAttribute, ssrHydrationKey, ssrStyle } from "solid-js/web";
@@ -273,7 +273,7 @@ function member(value, choices, label) {
 }
 /** Defensive display limits also protect callers supplying their own typed scenes. */
 function assertViewableDocument(model) {
-	if (model.format !== "vsdx" || !Array.isArray(model.pages) || model.pages.length > 256 || !Array.isArray(model.diagnostics) || model.diagnostics.length > 2e3) throw new Error("The scene has an invalid page list.");
+	if (model.format !== "vsdx" && model.format !== "vsd" || !Array.isArray(model.pages) || model.pages.length > 256 || !Array.isArray(model.diagnostics) || model.diagnostics.length > 2e3) throw new Error("The scene has an invalid page list.");
 	const seen = /* @__PURE__ */ new Set();
 	let pathBytes = 0, textBytes = 0, runCount = 0, imageBytes = 0, geometryCount = 0, uniquePixels = 0, drawnPixels = 0, layerCount = 0, paragraphCount = 0, gradientStops = 0;
 	const imageResources = /* @__PURE__ */ new Map();
@@ -787,9 +787,10 @@ var ViewerController = class {
 	#sourceGeneration = 0;
 	#searchIndex = null;
 	#history = null;
+	#sourceFormat = null;
 	#editId = 0;
 	#visible = documentVisibility(null);
-	constructor(parser = parseVsdx, listenerError = (error) => {
+	constructor(parser = loadVisio, listenerError = (error) => {
 		if (typeof globalThis.reportError === "function") globalThis.reportError(error);
 		else console.error("Visio viewer listener failed:", error);
 	}, editor = createWorkerEditor()) {
@@ -829,6 +830,7 @@ var ViewerController = class {
 		++this.#sourceGeneration;
 		this.#invalidateEdit();
 		this.#history = null;
+		this.#sourceFormat = null;
 		this.#loadId++;
 		this.parser.cancel?.();
 		this.#searchIndex = null;
@@ -971,7 +973,7 @@ var ViewerController = class {
 		this.#change({
 			loading: true,
 			error: null,
-			edit: this.#history?.state ?? EMPTY_EDIT_STATE
+			edit: this.#sourceEditState()
 		});
 		if (this.#destroyed || id !== this.#loadId) return;
 		let document;
@@ -982,10 +984,10 @@ var ViewerController = class {
 			if (this.#destroyed || id !== this.#loadId) return;
 			if (bytes.byteLength > 33554432) throw new Error("This viewer accepts files up to 32 MiB.");
 			const owned = bytes instanceof Uint8Array ? Uint8Array.from(bytes) : new Uint8Array(bytes.slice(0));
-			history = new DocumentHistory(owned);
 			document = await this.parser(Uint8Array.from(owned));
 			if (this.#destroyed || id !== this.#loadId) return;
 			assertViewableDocument(document);
+			history = new DocumentHistory(owned);
 			visible = documentVisibility(document);
 		} catch (cause) {
 			if (this.#destroyed || id !== this.#loadId) return;
@@ -998,13 +1000,14 @@ var ViewerController = class {
 			throw error;
 		}
 		this.#history = history;
+		this.#sourceFormat = document.format;
 		this.#searchIndex = null;
 		this.#visible = visible;
 		++this.#documentGeneration;
 		++this.#sourceGeneration;
 		this.#change({
 			document,
-			edit: history.state,
+			edit: document.format === "vsdx" ? history.state : EMPTY_EDIT_STATE,
 			pageIndex: 0,
 			loading: false,
 			error: null,
@@ -1021,7 +1024,7 @@ var ViewerController = class {
 		this.#invalidateEdit();
 		this.#change({
 			loading: false,
-			edit: this.#history?.state ?? EMPTY_EDIT_STATE
+			edit: this.#sourceEditState()
 		});
 	}
 	destroy() {
@@ -1029,6 +1032,7 @@ var ViewerController = class {
 		this.#destroyed = true;
 		this.#invalidateEdit();
 		this.#history = null;
+		this.#sourceFormat = null;
 		++this.#documentGeneration;
 		++this.#sourceGeneration;
 		++this.#loadId;
@@ -1073,11 +1077,11 @@ var ViewerController = class {
 		if (!this.#state.edit.busy) return;
 		this.#invalidateEdit();
 		this.parser.cancel?.();
-		this.#change({ edit: this.#history?.state ?? EMPTY_EDIT_STATE });
+		this.#change({ edit: this.#sourceEditState() });
 	}
 	exportVsdx() {
 		this.#assertAlive();
-		if (!this.#history) throw new Error("Load a VSDX file before downloading a source-backed copy.");
+		if (!this.#history || this.#sourceFormat !== "vsdx" || this.#state.document?.format !== "vsdx") throw new Error("Load a VSDX file before downloading a source-backed copy.");
 		if (this.#state.edit.busy || this.#state.loading) throw new Error("Wait for the current document operation before downloading.");
 		return this.#history.export();
 	}
@@ -1085,10 +1089,13 @@ var ViewerController = class {
 		++this.#editId;
 		this.editor.cancel?.();
 	}
+	#sourceEditState() {
+		return this.#sourceFormat === "vsdx" && this.#state.document?.format === "vsdx" ? this.#history?.state ?? EMPTY_EDIT_STATE : EMPTY_EDIT_STATE;
+	}
 	async #mutate(kind, commands) {
 		this.#assertAlive();
 		const history = this.#history;
-		if (!history) throw new Error("Load a VSDX file before editing. Model-only documents are read only.");
+		if (!history || this.#sourceFormat !== "vsdx" || this.#state.document?.format !== "vsdx") throw new Error("Load a VSDX file before editing. Model-only documents are read only.");
 		if (this.#state.loading || this.#state.edit.busy) throw new Error("Another document operation is in progress.");
 		const target = kind === "undo" ? history.undoTarget : kind === "redo" ? history.redoTarget : void 0;
 		if (kind !== "edit" && !target) return;
@@ -1114,6 +1121,7 @@ var ViewerController = class {
 			} else document = await this.parser(Uint8Array.from(target.bytes));
 			assertCurrent();
 			assertViewableDocument(document);
+			if (document.format !== "vsdx") throw new Error("A VSDX edit or history operation cannot change the source format.");
 			if (edited && !edited.changedParts.length) {
 				this.#change({ edit: history.state });
 				return;
@@ -1203,7 +1211,7 @@ var eventKeys = [
 //#region src/worker-parser.ts
 /** One disposable worker per document prevents old parses and long CPU tasks from occupying the UI. */
 function createWorkerParser(factory, timeoutMs = 15e3) {
-	if (!factory && typeof Worker === "undefined") return parseVsdx;
+	if (!factory && typeof Worker === "undefined") return loadVisio;
 	const create = factory ?? (() => new Worker(new URL("./parse-worker.js", import.meta.url), { type: "module" }));
 	let cancel;
 	const parse = (bytes) => {
@@ -4614,7 +4622,7 @@ var VisioViewerElement = class extends BaseElement {
 				empty.className = "empty";
 				const heading = document.createElement("strong");
 				heading.textContent = "Open a Visio drawing";
-				empty.append(heading, "Open a .vsdx file to start. Files stay in this browser.");
+				empty.append(heading, "Open a .vsdx or supported .vsd file to start. Files stay in this browser.");
 				this.#viewport.replaceChildren(empty);
 			}
 			const notes = compatibilityNotes(state.document?.diagnostics ?? [], this.#renderWarnings);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "visio-solid-viewer",
-	"version": "0.2.0",
+	"version": "0.3.0",
 	"description": "Local-first Visio viewer for solid",
 	"homepage": "https://christophervr.github.io/visio-viewer/",
 	"license": "Apache-2.0",
@@ -29,9 +29,9 @@
 	},
 	"dependencies": {
 		"emf-converter": "4.8.9",
-		"ooxml-core": "^0.12.0",
-		"ooxml-ui": "^0.2.0",
-		"visio-core": "^0.2.0"
+		"ooxml-core": "^0.13.0",
+		"ooxml-ui": "^0.4.1",
+		"visio-core": "^0.2.1"
 	},
 	"peerDependencies": {
 		"solid-js": "^1.9.0"