@marimo-team/marimo-export 0.0.5 → 0.0.7

package/dist/{export-DHoEAsST.mjs → export-I-cltoel.mjs}

@@ -820,4 +820,4 @@ function equalBytes(left, right) {
 	return left.byteLength === right.byteLength && left.every((byte, index) => byte === right[index]);
 }
 //#endregion
-export { normalizeBase as n, openExport as t };
+export { normalizeBase as n, isAbortError as r, openExport as t };

package/dist/{index-DXgOo60T.d.mts → index-BANdm_iS.d.mts}

@@ -1,4 +1,4 @@
-import { C as NotebookExport, I as ScalarValue, O as OpenExportOptions, b as MediaType, j as OutputLoader, k as OutputCodec, m as ExportOutput, o as BlobAssetLoadInput, s as BlobAssetLoader, t as AnyOutputLoader, x as MountableValue } from "./types-D52GHn1Q.mjs";
+import { C as NotebookExport, I as ScalarValue, O as OpenExportOptions, _ as LoadOptions, b as MediaType, h as ExportState, j as OutputLoader, k as OutputCodec, m as ExportOutput, o as BlobAssetLoadInput, s as BlobAssetLoader, t as AnyOutputLoader, x as MountableValue } from "./types-D52GHn1Q.mjs";
 import { h as MarimoReplayResources, m as MarimoOutputSnapshot, o as MarimoCellSnapshot } from "./marimo-snapshot-Df66Xan0.mjs";
 //#region src/loader.d.ts
 declare function defineOutputLoader<C extends OutputCodec, T>(loader: OutputLoader<C, T>): OutputLoader<C, T>;
@@ -13,8 +13,13 @@ declare function imageLoader(): BlobAssetLoader<MountableValue>;
 //#region src/export.d.ts
 declare function openExport(base: string | URL, options?: OpenExportOptions): Promise<NotebookExport>;
 //#endregion
+//#region src/load-outputs.d.ts
+type LoadedOutputs<Loaders extends Readonly<Record<string, AnyOutputLoader>>> = { readonly [Name in keyof Loaders]: Awaited<ReturnType<Loaders[Name]["load"]>>; };
+/** Load a state's selected outputs and settle sibling requests after a failure. */
+declare function loadOutputs<const Loaders extends Readonly<Record<string, AnyOutputLoader>>>(state: ExportState, loaders: Loaders, options?: LoadOptions): Promise<LoadedOutputs<Loaders>>;
+//#endregion
 //#region src/replay-resources.d.ts
 /** Compose snapshot resources while preserving every source's replay order. */
 declare function mergeMarimoReplayResources(snapshots: readonly (MarimoOutputSnapshot | MarimoCellSnapshot)[]): MarimoReplayResources;
 //#endregion
-export { imageLoader as a, defineOutputLoader as i, openExport as n, resolveOutputLoader as o, defineBlobAssetLoader as r, scalarLoader as s, mergeMarimoReplayResources as t };
+export { defineOutputLoader as a, scalarLoader as c, defineBlobAssetLoader as i, loadOutputs as n, imageLoader as o, openExport as r, resolveOutputLoader as s, mergeMarimoReplayResources as t };

package/dist/index.d.mts

@@ -1,4 +1,4 @@
 import { A as OutputDescriptor, B as JsonObject, C as NotebookExport, D as NumpyDescriptor, E as NotebookProvenance, F as ScalarDescriptor, H as JsonValue, I as ScalarValue, L as VerificationResult, M as OutputPayloadMap, N as ProducerProvenance, O as OpenExportOptions, P as Provenance, R as VerifyOptions, S as MountedView, T as NotebookExportErrorCode, V as JsonPrimitive, _ as LoadOptions, a as BlobAssetDescriptor, b as MediaType, c as ControlBinding, d as ControlKeyStep, f as ControlPathStep, g as JsonDescriptor, h as ExportState, i as BlobAsset, j as OutputLoader, k as OutputCodec, l as ControlElementStep, m as ExportOutput, n as ArrowDescriptor, o as BlobAssetLoadInput, p as DescriptorFor, r as AssetDescriptor, s as BlobAssetLoader, t as AnyOutputLoader, u as ControlIndexStep, v as MarimoCellDescriptor, w as NotebookExportError, x as MountableValue, y as MarimoOutputDescriptor, z as isNotebookExportError } from "./types-D52GHn1Q.mjs";
-import { a as imageLoader, i as defineOutputLoader, n as openExport, o as resolveOutputLoader, r as defineBlobAssetLoader, s as scalarLoader, t as mergeMarimoReplayResources } from "./index-DXgOo60T.mjs";
+import { a as defineOutputLoader, c as scalarLoader, i as defineBlobAssetLoader, n as loadOutputs, o as imageLoader, r as openExport, s as resolveOutputLoader, t as mergeMarimoReplayResources } from "./index-BANdm_iS.mjs";
 import { _ as parseMarimoOutputSnapshot, a as MarimoCellOutput, c as MarimoModelCloseMessage, d as MarimoModelLifecycleNotification, f as MarimoModelOpenMessage, g as parseMarimoCellSnapshot, h as MarimoReplayResources, i as MarimoCellIdentity, l as MarimoModelCustomMessage, m as MarimoOutputSnapshot, n as MarimoBufferPathToken, o as MarimoCellSnapshot, p as MarimoModelUpdateMessage, r as MarimoCellChannel, s as MarimoEsmSpec, t as MarimoBufferPath, u as MarimoModelLifecycleMessage } from "./marimo-snapshot-Df66Xan0.mjs";
-export { type AnyOutputLoader, type ArrowDescriptor, type AssetDescriptor, type BlobAsset, type BlobAssetDescriptor, type BlobAssetLoadInput, type BlobAssetLoader, type ControlBinding, type ControlElementStep, type ControlIndexStep, type ControlKeyStep, type ControlPathStep, type DescriptorFor, type ExportOutput, type ExportState, type JsonDescriptor, type JsonObject, type JsonPrimitive, type JsonValue, type LoadOptions, type MarimoBufferPath, type MarimoBufferPathToken, type MarimoCellChannel, type MarimoCellDescriptor, type MarimoCellIdentity, type MarimoCellOutput, type MarimoCellSnapshot, type MarimoEsmSpec, type MarimoModelCloseMessage, type MarimoModelCustomMessage, type MarimoModelLifecycleMessage, type MarimoModelLifecycleNotification, type MarimoModelOpenMessage, type MarimoModelUpdateMessage, type MarimoOutputDescriptor, type MarimoOutputSnapshot, type MarimoReplayResources, type MediaType, type MountableValue, type MountedView, type NotebookExport, NotebookExportError, type NotebookExportErrorCode, type NotebookProvenance, type NumpyDescriptor, type OpenExportOptions, type OutputCodec, type OutputDescriptor, type OutputLoader, type OutputPayloadMap, type ProducerProvenance, type Provenance, type ScalarDescriptor, type ScalarValue, type VerificationResult, type VerifyOptions, defineBlobAssetLoader, defineOutputLoader, imageLoader, isNotebookExportError, mergeMarimoReplayResources, openExport, parseMarimoCellSnapshot, parseMarimoOutputSnapshot, resolveOutputLoader, scalarLoader };
+export { type AnyOutputLoader, type ArrowDescriptor, type AssetDescriptor, type BlobAsset, type BlobAssetDescriptor, type BlobAssetLoadInput, type BlobAssetLoader, type ControlBinding, type ControlElementStep, type ControlIndexStep, type ControlKeyStep, type ControlPathStep, type DescriptorFor, type ExportOutput, type ExportState, type JsonDescriptor, type JsonObject, type JsonPrimitive, type JsonValue, type LoadOptions, type MarimoBufferPath, type MarimoBufferPathToken, type MarimoCellChannel, type MarimoCellDescriptor, type MarimoCellIdentity, type MarimoCellOutput, type MarimoCellSnapshot, type MarimoEsmSpec, type MarimoModelCloseMessage, type MarimoModelCustomMessage, type MarimoModelLifecycleMessage, type MarimoModelLifecycleNotification, type MarimoModelOpenMessage, type MarimoModelUpdateMessage, type MarimoOutputDescriptor, type MarimoOutputSnapshot, type MarimoReplayResources, type MediaType, type MountableValue, type MountedView, type NotebookExport, NotebookExportError, type NotebookExportErrorCode, type NotebookProvenance, type NumpyDescriptor, type OpenExportOptions, type OutputCodec, type OutputDescriptor, type OutputLoader, type OutputPayloadMap, type ProducerProvenance, type Provenance, type ScalarDescriptor, type ScalarValue, type VerificationResult, type VerifyOptions, defineBlobAssetLoader, defineOutputLoader, imageLoader, isNotebookExportError, loadOutputs, mergeMarimoReplayResources, openExport, parseMarimoCellSnapshot, parseMarimoOutputSnapshot, resolveOutputLoader, scalarLoader };

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { a as scalarLoader, c as isNotebookExportError, i as resolveOutputLoader, n as defineOutputLoader, r as imageLoader, s as NotebookExportError, t as defineBlobAssetLoader } from "./loader-BTeU85BE.mjs";
-import { t as openExport } from "./export-DHoEAsST.mjs";
+import { t as openExport } from "./export-I-cltoel.mjs";
+import { n as loadOutputs, t as mergeMarimoReplayResources } from "./src-KJppsrIe.mjs";
 import { n as parseMarimoOutputSnapshot, t as parseMarimoCellSnapshot } from "./marimo-snapshot-B2eNp-aW.mjs";
-import { t as mergeMarimoReplayResources } from "./src-BL2Hd1uM.mjs";
-export { NotebookExportError, defineBlobAssetLoader, defineOutputLoader, imageLoader, isNotebookExportError, mergeMarimoReplayResources, openExport, parseMarimoCellSnapshot, parseMarimoOutputSnapshot, resolveOutputLoader, scalarLoader };
+export { NotebookExportError, defineBlobAssetLoader, defineOutputLoader, imageLoader, isNotebookExportError, loadOutputs, mergeMarimoReplayResources, openExport, parseMarimoCellSnapshot, parseMarimoOutputSnapshot, resolveOutputLoader, scalarLoader };

package/dist/loader/anywidget.d.mts

@@ -12,51 +12,6 @@ interface AnyWidgetMountOptions {
   readonly signal?: AbortSignal;
 }
 //#endregion
-//#region ../loader-anywidget/src/runtime/prepared-graph.d.ts
-interface PreparedWidgetGraphSnapshot<Record> {
-  readonly files: Readonly<{
-    [path: string]: string;
-  }>;
-  readonly records: ReadonlyMap<string, Record>;
-}
-declare const preparedWidgetGraphCheckpoint: unique symbol;
-interface PreparedWidgetGraphCheckpoint<Record> {
-  readonly [preparedWidgetGraphCheckpoint]: Record;
-}
-interface PreparedWidgetGraphPort<Record, LiveState> {
-  id(record: Record): string;
-  active(record: Record): boolean;
-  same(left: Record, right: Record): boolean;
-  changesModule(previous: Record, next: Record): boolean;
-  capture(id: string): LiveState;
-  merge(record: Record, state: LiveState): Record;
-  replay(records: readonly Record[], signal?: AbortSignal): Promise<void>;
-  restore(id: string, state: LiveState): void | Promise<void>;
-  close(id: string): Promise<void>;
-  setFiles(files: Readonly<{
-    [path: string]: string;
-  }>): void;
-  validate?(record: Record, signal?: AbortSignal): Promise<void>;
-  preflight?(record: Record, signal?: AbortSignal): Promise<void>;
-}
-interface PreparedWidgetGraphReplacement<Record> {
-  readonly mutated: boolean;
-  readonly remount: boolean;
-  commit(): Promise<PreparedWidgetGraphSnapshot<Record> | undefined>;
-  rollback(): Promise<void>;
-}
-declare class PreparedWidgetGraphReplacementError extends Error {
-  readonly remount = true;
-  constructor(cause: Error);
-}
-declare class PreparedWidgetGraph<Record, LiveState> {
-  #private;
-  constructor(port: PreparedWidgetGraphPort<Record, LiveState>, initial?: PreparedWidgetGraphSnapshot<Record>);
-  checkpoint(): PreparedWidgetGraphCheckpoint<Record>;
-  replace(target: PreparedWidgetGraphSnapshot<Record> | PreparedWidgetGraphCheckpoint<Record>, signal?: AbortSignal): Promise<PreparedWidgetGraphReplacement<Record>>;
-  dispose(): Promise<void>;
-}
-//#endregion
 //#region ../loader-anywidget/src/index.d.ts
 type AnyWidgetStateShape<State> = ModelShape<State>;
 interface MountedAnyWidget<State extends AnyWidgetStateShape<State> = ModelState, Exports extends object | undefined = object | undefined> {
@@ -73,4 +28,4 @@ interface LoadedAnyWidget<State extends AnyWidgetStateShape<State> = ModelState,
 /** Decode an exported AnyWidget value and prepare it for browser mounting. */
 declare const anyWidgetLoader: <State extends AnyWidgetStateShape<State> = ModelState, Exports extends object | undefined = object | undefined>() => BlobAssetLoader<LoadedAnyWidget<State, Exports>>;
 //#endregion
-export { type AnyModel, type AnyWidgetMountOptions, type AnyWidgetStateShape, type LoadedAnyWidget, type ModelState, type MountedAnyWidget, PreparedWidgetGraph, type PreparedWidgetGraphCheckpoint, type PreparedWidgetGraphPort, type PreparedWidgetGraphReplacement, PreparedWidgetGraphReplacementError, type PreparedWidgetGraphSnapshot, anyWidgetLoader };
+export { type AnyModel, type AnyWidgetMountOptions, type AnyWidgetStateShape, type LoadedAnyWidget, type ModelState, type MountedAnyWidget, anyWidgetLoader };

package/dist/loader/anywidget.mjs

@@ -50,7 +50,7 @@ function parseAnyWidgetPayload(value) {
 		"files",
 		"modelNotifications"
 	], "payload");
-	if (payload.schema !== "marimo-export.anywidget.v1") throw new TypeError(`AnyWidget payload schema must be ${JSON.stringify(ANYWIDGET_SCHEMA)}.`);
+	if (payload.schema !== ANYWIDGET_SCHEMA) throw new TypeError(`AnyWidget payload schema must be ${JSON.stringify(ANYWIDGET_SCHEMA)}.`);
 	const rootModelId = nonEmptyString(payload.rootModelId, "rootModelId");
 	if (rootModelId !== "model-0") throw new TypeError("AnyWidget payload rootModelId must be \"model-0\".");
 	const files = parseFiles(payload.files);
@@ -1214,329 +1214,6 @@ function assertBrowserElement(element) {
 	if (globalThis.document === void 0 || globalThis.window === void 0 || !isPropertyOwner(element) || element.nodeType !== 1 || !("replaceChildren" in element)) throw new TypeError("AnyWidget mount requires a browser element.");
 }
 //#endregion
-//#region ../loader-anywidget/src/runtime/prepared-graph.ts
-var PreparedWidgetGraphReplacementError = class extends Error {
-	remount = true;
-	constructor(cause) {
-		super("Prepared AnyWidget graph replacement requires a full remount", { cause });
-		this.name = "PreparedWidgetGraphReplacementError";
-	}
-};
-const emptyGraph = () => ({
-	files: Object.freeze({}),
-	records: /* @__PURE__ */ new Map()
-});
-const graphFailure = (cause) => cause instanceof Error ? cause : new Error(String(cause));
-const sameFiles = (left, right) => {
-	const leftNames = Object.keys(left);
-	const rightNames = Object.keys(right);
-	return leftNames.length === rightNames.length && leftNames.every((name) => Object.hasOwn(right, name) && left[name] === right[name]);
-};
-const snapshotCopy = (snapshot, port) => {
-	const records = /* @__PURE__ */ new Map();
-	snapshot.records.forEach((record, key) => {
-		const id = port.id(record);
-		if (id !== key) throw new Error(`Prepared AnyWidget graph record ${JSON.stringify(key)} has identity ${JSON.stringify(id)}`);
-		records.set(id, record);
-	});
-	return Object.freeze({
-		files: Object.freeze({ ...snapshot.files }),
-		records
-	});
-};
-const changesFor = (previous, next, port) => {
-	const additions = [];
-	const stableUpdates = [];
-	const replacements = [];
-	next.records.forEach((record, id) => {
-		if (!port.active(record)) return;
-		const current = previous.records.get(id);
-		if (current === void 0 || !port.active(current)) {
-			additions.push(record);
-			return;
-		}
-		if (port.same(current, record)) return;
-		if (port.changesModule(current, record)) replacements.push(record);
-		else stableUpdates.push(record);
-	});
-	return {
-		additions,
-		stableUpdates,
-		replacements,
-		removals: []
-	};
-};
-const currentRecordActive = (next, id, port) => {
-	const record = next.records.get(id);
-	return record !== void 0 && port.active(record);
-};
-const plannedChanges = (previous, next, port) => {
-	return {
-		...changesFor(previous, next, port),
-		removals: [...previous.records.entries()].filter(([id, record]) => port.active(record) && !currentRecordActive(next, id, port)).map(([, record]) => record)
-	};
-};
-const captureStates = (changes, port) => {
-	const capture = (records) => new Map(records.map((record) => [port.id(record), port.capture(port.id(record))]));
-	return {
-		stable: capture(changes.stableUpdates),
-		replacements: capture(changes.replacements),
-		removals: capture(changes.removals)
-	};
-};
-const attempt = async (errors, action) => {
-	try {
-		await action();
-	} catch (error) {
-		errors.push(graphFailure(error));
-	}
-};
-const eachSequential = async (values, action) => {
-	for (const value of values) await action(value);
-};
-const throwCleanup = (errors, message) => {
-	if (errors.length === 1) throw errors[0];
-	if (errors.length > 1) throw new AggregateError(errors, message);
-};
-const settledReplacement = (mutated, remount, settle) => {
-	let committed = false;
-	let commitFailure;
-	let commitTask;
-	let rollbackTask;
-	return Object.freeze({
-		mutated,
-		remount,
-		commit() {
-			if (rollbackTask !== void 0) return rollbackTask.then(() => void 0);
-			commitTask ??= Promise.resolve().then(() => settle(true)).then((result) => {
-				committed = true;
-				return result;
-			}).catch((cause) => {
-				commitFailure = graphFailure(cause);
-				throw cause;
-			});
-			return commitTask;
-		},
-		rollback() {
-			rollbackTask ??= (commitTask ?? Promise.resolve()).catch(() => {}).then(async () => {
-				if (committed) return;
-				try {
-					await settle(false);
-				} catch (error) {
-					throw new PreparedWidgetGraphReplacementError(commitFailure === void 0 ? graphFailure(error) : new AggregateError([commitFailure, graphFailure(error)], "Prepared AnyWidget graph commit and rollback failed"));
-				}
-			});
-			return rollbackTask;
-		}
-	});
-};
-var PreparedWidgetGraph = class {
-	#checkpoints = /* @__PURE__ */ new WeakMap();
-	#port;
-	#current;
-	#active;
-	#operation;
-	#pending;
-	#disposed = false;
-	#disposal;
-	constructor(port, initial = emptyGraph()) {
-		this.#port = port;
-		this.#current = snapshotCopy(initial, port);
-		this.#port.setFiles(this.#current.files);
-	}
-	checkpoint() {
-		this.#requireIdle();
-		const records = new Map(this.#current.records);
-		this.#current.records.forEach((record, id) => {
-			if (this.#port.active(record)) records.set(id, this.#port.merge(record, this.#port.capture(id)));
-		});
-		const snapshot = snapshotCopy({
-			files: this.#current.files,
-			records
-		}, this.#port);
-		const checkpoint = Object.freeze({});
-		this.#checkpoints.set(checkpoint, {
-			snapshot,
-			source: this.#current
-		});
-		return checkpoint;
-	}
-	replace(target, signal) {
-		if (signal?.aborted) return Promise.reject(abortReason(signal, "Prepared AnyWidget graph replacement aborted"));
-		if (this.#disposed) return Promise.resolve(settledReplacement(false, false, () => void 0));
-		this.#requireIdle();
-		const controller = new AbortController();
-		const abort = () => {
-			if (signal !== void 0) controller.abort(abortReason(signal, "Prepared AnyWidget graph replacement aborted"));
-		};
-		signal?.addEventListener("abort", abort, { once: true });
-		if (signal?.aborted) abort();
-		this.#active = controller;
-		const operation = this.#replace(target, controller.signal);
-		this.#operation = operation;
-		return operation.finally(() => {
-			signal?.removeEventListener("abort", abort);
-			if (this.#active === controller) this.#active = void 0;
-			if (this.#operation === operation) this.#operation = void 0;
-		});
-	}
-	dispose() {
-		this.#disposal ??= this.#dispose();
-		return this.#disposal;
-	}
-	async #replace(target, signal) {
-		const checkpoint = this.#checkpoints.get(target);
-		const value = checkpoint === void 0 ? target : checkpoint.snapshot;
-		const next = snapshotCopy(value, this.#port);
-		const adopt = checkpoint?.source ?? next;
-		const previous = this.#current;
-		const changes = plannedChanges(previous, next, this.#port);
-		if (!(!sameFiles(previous.files, next.files) || changes.additions.length > 0 || changes.stableUpdates.length > 0 || changes.replacements.length > 0 || changes.removals.length > 0)) return this.#replacement(false, false, () => {
-			this.#current = adopt;
-			return adopt;
-		});
-		return this.#stage(previous, next, adopt, changes, signal);
-	}
-	async #stage(previous, next, adopt, changes, signal) {
-		this.#port.setFiles({
-			...previous.files,
-			...next.files
-		});
-		try {
-			await this.#preflight(changes, signal);
-		} catch (error) {
-			this.#port.setFiles(previous.files);
-			throw error;
-		}
-		let live;
-		try {
-			live = captureStates(changes, this.#port);
-		} catch (error) {
-			this.#port.setFiles(previous.files);
-			throw error;
-		}
-		const added = /* @__PURE__ */ new Set();
-		const replaced = /* @__PURE__ */ new Set();
-		const removed = /* @__PURE__ */ new Set();
-		const rollback = () => this.#rollback(previous, changes, live, added, replaced, removed);
-		let remount = false;
-		try {
-			const replay = /* @__PURE__ */ new Map();
-			await eachSequential(changes.replacements, async (record) => {
-				signal.throwIfAborted();
-				const id = this.#port.id(record);
-				const state = live.replacements.get(id);
-				replaced.add(id);
-				remount = true;
-				await this.#port.close(id);
-				replay.set(id, this.#port.merge(record, state));
-			});
-			changes.additions.forEach((record) => {
-				const id = this.#port.id(record);
-				added.add(id);
-				replay.set(id, record);
-			});
-			changes.stableUpdates.forEach((record) => replay.set(this.#port.id(record), record));
-			signal.throwIfAborted();
-			const records = [...next.records.keys()].flatMap((id) => {
-				const record = replay.get(id);
-				return record === void 0 ? [] : [record];
-			});
-			if (records.length > 0) await this.#port.replay(records, signal);
-			signal.throwIfAborted();
-		} catch (error) {
-			const failure = graphFailure(error);
-			try {
-				await rollback();
-			} catch (rollbackError) {
-				throw new PreparedWidgetGraphReplacementError(new AggregateError([failure, graphFailure(rollbackError)], "Prepared AnyWidget graph replacement and rollback failed"));
-			}
-			if (remount) throw new PreparedWidgetGraphReplacementError(failure);
-			throw failure;
-		}
-		return this.#replacement(true, changes.replacements.length > 0, async (commit) => {
-			if (!commit) {
-				await rollback();
-				return;
-			}
-			await eachSequential(changes.removals, async (record) => {
-				const id = this.#port.id(record);
-				removed.add(id);
-				await this.#port.close(id);
-			});
-			this.#port.setFiles(next.files);
-			this.#current = adopt;
-			return adopt;
-		});
-	}
-	async #preflight(changes, signal) {
-		await eachSequential([
-			...changes.additions,
-			...changes.stableUpdates,
-			...changes.replacements
-		], async (record) => {
-			signal.throwIfAborted();
-			await this.#port.validate?.(record, signal);
-		});
-		await eachSequential([...changes.additions, ...changes.replacements], async (record) => {
-			signal.throwIfAborted();
-			await this.#port.preflight?.(record, signal);
-		});
-		signal.throwIfAborted();
-	}
-	async #rollback(previous, changes, live, added, replaced, removed) {
-		this.#port.setFiles(previous.files);
-		const errors = [];
-		await eachSequential(added, (id) => attempt(errors, () => this.#port.close(id)));
-		await eachSequential(live.stable, ([id, state]) => attempt(errors, () => this.#port.restore(id, state)));
-		await this.#replayPrevious(errors, previous, new Map([...live.replacements, ...live.removals]), /* @__PURE__ */ new Set([...replaced, ...removed]));
-		throwCleanup(errors, "Prepared AnyWidget graph rollback failed");
-	}
-	async #replayPrevious(errors, previous, states, ids) {
-		await eachSequential(ids, (id) => attempt(errors, () => this.#port.close(id)));
-		const records = [];
-		previous.records.forEach((record, id) => {
-			const state = states.get(id);
-			if (!ids.has(id) || state === void 0) return;
-			try {
-				records.push(this.#port.merge(record, state));
-			} catch (error) {
-				errors.push(graphFailure(error));
-			}
-		});
-		if (records.length > 0) await attempt(errors, () => this.#port.replay(records));
-	}
-	#replacement(mutated, remount, settle) {
-		const replacement = settledReplacement(mutated, remount, async (commit) => {
-			let settled = false;
-			try {
-				const result = await settle(commit);
-				settled = true;
-				return result;
-			} finally {
-				if (settled && this.#pending === replacement) this.#pending = void 0;
-			}
-		});
-		this.#pending = replacement;
-		return replacement;
-	}
-	#requireIdle() {
-		if (this.#disposed) throw new Error("Prepared AnyWidget graph is disposed");
-		if (this.#operation !== void 0 || this.#pending !== void 0) throw new Error("A prepared AnyWidget graph replacement is already active");
-	}
-	async #dispose() {
-		this.#disposed = true;
-		this.#active?.abort(new DOMException("Prepared AnyWidget graph disposed", "AbortError"));
-		const errors = [];
-		if (this.#operation !== void 0) await attempt(errors, () => this.#operation?.then(() => {}));
-		if (this.#pending !== void 0) await attempt(errors, () => this.#pending?.rollback());
-		await eachSequential(this.#current.records, ([id, record]) => this.#port.active(record) ? attempt(errors, () => this.#port.close(id)) : void 0);
-		await attempt(errors, () => this.#port.setFiles({}));
-		this.#current = emptyGraph();
-		throwCleanup(errors, "Prepared AnyWidget graph disposal failed");
-	}
-};
-//#endregion
 //#region ../loader-anywidget/src/index.ts
 /** Decode exported AnyWidget bytes and prepare them for browser mounting. */
 async function loadAnyWidget(data, signal) {
@@ -1564,4 +1241,4 @@ const anyWidgetLoader = () => defineBlobAssetLoader({
 	load: ({ payload, signal }) => loadAnyWidget(payload.data, signal)
 });
 //#endregion
-export { PreparedWidgetGraph, PreparedWidgetGraphReplacementError, anyWidgetLoader };
+export { anyWidgetLoader };

package/dist/prepared/index.mjs

@@ -1,6 +1,6 @@
 import { _ as portableJsonValue, c as isNotebookExportError, d as isJsonNumber, f as isJsonString, g as portableJsonObject, h as isStringValue, m as isRecordValue, p as isPropertyOwner } from "../loader-BTeU85BE.mjs";
 import { i as parsePortableJson } from "../schema-BOtMEPzp.mjs";
-import { n as normalizeBase, t as openExport } from "../export-DHoEAsST.mjs";
+import { n as normalizeBase, t as openExport } from "../export-I-cltoel.mjs";
 //#region src/prepared/cancellation.ts
 const preparedAbortReason = (reason, message = "Prepared export operation aborted") => {
 	if (reason instanceof Error || reason instanceof DOMException) return reason;
@@ -399,12 +399,31 @@ var PreparedStateTransitions = class {
 	}
 	async restoreAfter(primary) {
 		try {
-			await this.restore();
+			await this.#restoreCurrent();
 		} catch (cleanup) {
 			throw new AggregateError([primary, cleanup], "Prepared state transition and restoration failed.");
 		}
 	}
-	async restore() {
+	reject(primary) {
+		const operation = this.#queueRestore(() => this.restoreAfter(primary)).then(() => {
+			throw primary;
+		});
+		this.#operation = operation;
+		return operation;
+	}
+	restore() {
+		return this.#queueRestore(() => this.#restoreCurrent());
+	}
+	#queueRestore(restore) {
+		this.cancel(new DOMException("Prepared state transition superseded", "AbortError"));
+		const generation = this.#generation;
+		const operation = this.#operation.catch(() => {}).then(async () => {
+			if (generation === this.#generation && !this.#closed) await restore();
+		});
+		this.#operation = operation;
+		return operation;
+	}
+	async #restoreCurrent() {
 		if (this.#current !== void 0) await this.port.restore?.(this.#current);
 	}
 	cancel(reason) {
@@ -507,8 +526,7 @@ var PreparedStateController = class {
 			next = withPreparedState(source, source.notebookExport.resolve(requested));
 		} catch (error) {
 			if (!isPreparedStateUnavailable(error)) this.#pendingInputs = void 0;
-			await this.#transitions.restoreAfter(error);
-			throw error;
+			return this.#transitions.reject(error);
 		}
 		try {
 			await this.#apply(next, "state", signal);

package/dist/{src-BL2Hd1uM.mjs → src-KJppsrIe.mjs}

@@ -1,5 +1,58 @@
+import { c as isNotebookExportError, l as isCallableValue, s as NotebookExportError } from "./loader-BTeU85BE.mjs";
 import { t as canonicalJson } from "./schema-BOtMEPzp.mjs";
+import { r as isAbortError } from "./export-I-cltoel.mjs";
 import { r as parseResources } from "./marimo-snapshot-B2eNp-aW.mjs";
+//#region src/load-outputs.ts
+/** Load a state's selected outputs and settle sibling requests after a failure. */
+async function loadOutputs(state, loaders, options = {}) {
+	const controller = new AbortController();
+	const abort = () => controller.abort(options.signal?.reason);
+	options.signal?.addEventListener("abort", abort, { once: true });
+	if (options.signal?.aborted) abort();
+	let failure;
+	try {
+		requireActive(controller.signal);
+		const outputs = Object.entries(loaders).map(([name, loader]) => ({
+			name,
+			output: state.output(name),
+			loader
+		}));
+		const results = await Promise.allSettled(outputs.map(async ({ name, output, loader }) => {
+			try {
+				return [name, await output.load(loader, {
+					...options,
+					signal: controller.signal
+				})];
+			} catch (cause) {
+				if (failure === void 0) {
+					failure = { cause };
+					controller.abort(cause);
+				}
+				throw cause;
+			}
+		}));
+		if (failure !== void 0) {
+			const primary = failure.cause;
+			const others = results.flatMap((result) => result.status === "rejected" && result.reason !== primary && !aborted(result.reason) ? [result.reason] : []);
+			if (others.length > 0) throw new AggregateError([primary, ...new Set(others)], "Export output loading failed.");
+			throw primary;
+		}
+		requireActive(controller.signal);
+		const entries = results.flatMap((result) => result.status === "fulfilled" ? [result.value] : []);
+		const loaded = Object.fromEntries(entries);
+		if (isCallableValue(loaded.then)) throw new NotebookExportError("decode_failed", "Output \"then\" is callable. Load it individually with ExportOutput.load().", { details: { output: "then" } });
+		return Object.freeze(loaded);
+	} finally {
+		options.signal?.removeEventListener("abort", abort);
+	}
+}
+function requireActive(signal) {
+	if (signal.aborted) throw new NotebookExportError("abort", "Export output loading was aborted.", { cause: signal.reason });
+}
+function aborted(cause) {
+	return isAbortError(cause) || isNotebookExportError(cause) && cause.code === "abort";
+}
+//#endregion
 //#region src/replay-resources.ts
 const notificationValue = (notification) => {
 	const message = notification.message;
@@ -88,4 +141,4 @@ function mergeMarimoReplayResources(snapshots) {
 	});
 }
 //#endregion
-export { mergeMarimoReplayResources as t };
+export { loadOutputs as n, mergeMarimoReplayResources as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/marimo-export",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "Open and load verified marimo notebook exports in browser applications",
   "homepage": "https://marimo-team.github.io/marimo-export/",
   "bugs": {
@@ -82,9 +82,11 @@
     "@uwdata/flechette": "^2.5.0",
     "hyparquet": "^1.29.2",
     "lz4js": "0.2.0",
+    "picomatch": "4.0.7",
     "typescript": "^6.0.3",
     "vega-embed": "^7.2.0",
-    "vite-plus": "0.3.0"
+    "vite-plus": "0.3.0",
+    "yaml": "2.9.0"
   },
   "peerDependencies": {
     "@anywidget/types": "^0.4.0",