@laminapdf/viewer 0.2.0-alpha.4 → 0.2.0-alpha.6

package/dist/worker/session.js

@@ -0,0 +1,152 @@
+// The edit session's history (E1 plan §5, ADR 0006 §4 and §7): what the interface lists of the op
+// log the model keeps. The model holds the undo records; this holds a step per transaction, with
+// its label, pages and time, and where the document stands among them. edit.ts moves both
+// together, so the steps done are always the model's undo stack and the steps undone its redo
+// stack, up to the same depth.
+//
+// Positions are counted from the document as opened: position p (absolute) is the state after the
+// p-th step ever made. `saved` is the absolute position the last save wrote, so the semantic dirty
+// state is the distance from it, even once the depth limit has dropped the steps back to it (undo
+// can't reach it then, but every step since still counts). It is lost when the saved document is
+// on no path from here any more: a new edit cleared the steps that led to it, or one was skipped.
+import { HISTORY_DEPTH } from "../protocol.js";
+/** An empty history for a document just opened, keeping `depth` steps. */
+export function newSession(depth = HISTORY_DEPTH) {
+    return { steps: [], position: 0, dropped: 0, saved: 0, nextId: 1, depth };
+}
+/** The absolute position the document is at. */
+const at = (session) => session.dropped + session.position;
+/** What the interface reads of `session`. */
+export function historyOf(session, diverged) {
+    return {
+        steps: [...session.steps],
+        position: session.position,
+        dropped: session.dropped,
+        unsaved: unsaved(session),
+        diverged,
+    };
+}
+/**
+ * Transactions between the document now and the saved one: the distance between their positions,
+ * or, with the saved document on no path from here, every step done (at least one: it differs).
+ */
+function unsaved(session) {
+    if (session.saved === undefined)
+        return Math.max(1, session.position);
+    return Math.abs(at(session) - session.saved);
+}
+/**
+ * Forgets the steps undone: a new transaction cleared the model's redo stack. A save among them
+ * can no longer be reached.
+ */
+export function clearRedo(session) {
+    session.steps.length = session.position;
+    if (session.saved !== undefined && session.saved > at(session))
+        session.saved = undefined;
+}
+/** Records a transaction the model committed: the steps undone go, and the oldest past the depth. */
+export function record(session, label, pages, time) {
+    clearRedo(session);
+    const step = { id: session.nextId++, label, pages: [...pages], at: time };
+    session.steps.push(step);
+    session.position += 1;
+    while (session.steps.length > session.depth) {
+        session.steps.shift();
+        session.position -= 1;
+        session.dropped += 1;
+    }
+    return step;
+}
+/**
+ * Moves back over the newest done step, which the model just undid with `outcome`. A skipped
+ * undo restored nothing and left no redo entry: the step goes, and the document stays where it
+ * was, after it.
+ */
+export function stepBack(session, outcome) {
+    const index = session.position - 1;
+    const step = session.steps[index];
+    if (step === undefined)
+        throw new Error("there is no step to undo");
+    if (outcome === "skipped") {
+        // The state before the step can't be reached any more; the one after it is where we are.
+        removeStep(session, index, "undo");
+        return { step, way: "undo", outcome };
+    }
+    session.position -= 1;
+    return { step: mark(session, index, "undo", outcome), way: "undo", outcome };
+}
+/**
+ * Moves forward over the oldest undone step, which the model just redid with `outcome`. A skipped
+ * redo left no undo entry: the step goes, and the document stays where it was, before it.
+ */
+export function stepForward(session, outcome) {
+    const index = session.position;
+    const step = session.steps[index];
+    if (step === undefined)
+        throw new Error("there is no step to redo");
+    if (outcome === "skipped") {
+        removeStep(session, index, "redo");
+        return { step, way: "redo", outcome };
+    }
+    session.position += 1;
+    return { step: mark(session, index, "redo", outcome), way: "redo", outcome };
+}
+/** Marks step `index` partly restored by its `way`, or not, after an undo or redo that went `outcome`. */
+function mark(session, index, way, outcome) {
+    const { partial: _, ...step } = session.steps[index];
+    const next = outcome === "partial" ? { ...step, partial: way } : step;
+    session.steps[index] = next;
+    return next;
+}
+/**
+ * Takes out step `index`, which the model no longer has. Its two states become one: after it for
+ * an undo that restored nothing, before it for such a redo; the other can't be reached.
+ */
+export function removeStep(session, index, way) {
+    const before = session.dropped + index;
+    session.steps.splice(index, 1);
+    if (index < session.position)
+        session.position -= 1;
+    const { saved } = session;
+    if (saved === undefined)
+        return;
+    const lost = way === "undo" ? before : before + 1;
+    if (saved === lost)
+        session.saved = undefined;
+    else if (saved > before)
+        session.saved = saved - 1;
+}
+/**
+ * Undoes or redoes steps until `target` of them are done, calling `revert` for each move (which
+ * makes it in the model and says how it went); `done` collects each move as it is made, so a
+ * caller can take them back when one fails. A skipped redo takes its step out without moving the
+ * position, so the target, among the steps after it, is one lower.
+ */
+export async function walkTo(session, target, revert, done) {
+    let goal = Math.max(0, Math.min(session.steps.length, Math.trunc(target)));
+    while (session.position !== goal) {
+        const way = session.position > goal ? "undo" : "redo";
+        const outcome = await revert(way);
+        done.push(way === "undo" ? stepBack(session, outcome) : stepForward(session, outcome));
+        if (way === "redo" && outcome === "skipped")
+            goal -= 1;
+    }
+}
+/** Records the document now as the one saved, for a save that writes the file. */
+export function markSaved(session) {
+    session.saved = at(session);
+}
+/** A copy of `session` to go back to when a move fails half way. */
+export function snapshot(session) {
+    return { ...session, steps: [...session.steps] };
+}
+/** Puts `session` back as `kept` was. */
+export function restore(session, kept) {
+    session.steps.length = 0;
+    session.steps.push(...kept.steps);
+    session.position = kept.position;
+    session.dropped = kept.dropped;
+    session.saved = kept.saved;
+    session.nextId = kept.nextId;
+}
+//# sourceMappingURL=session.js.map

package/dist/worker/session.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/worker/session.ts"],"names":[],"mappings":"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"}

package/dist/worker/text.d.ts

@@ -1,5 +1,6 @@
+import type { Reflow } from "@laminapdf/sdk";
 import type { PageGlyphs } from "../find/page.js";
-import type { PageTextData, StructureData } from "../protocol.js";
+import type { PageTextData, ReadingBlock, StructureData } from "../protocol.js";
 /** Page `index`'s text runs and glyph quads (cached; `signal` stops a read of pending data). */
 export declare function pageText(index: number, signal: AbortSignal): Promise<PageTextData>;
 /**
@@ -12,6 +13,13 @@ export declare function pageGlyphs(index: number, signal: AbortSignal, keep?: bo
 export declare function replyText(data: PageTextData): [PageTextData, Transferable[]];
 /** Whether the document says it is tagged, and its structure tree when it has one. */
 export declare function structure(signal: AbortSignal): Promise<StructureData>;
-/** Forgets every page's text: the document closed. */
-export declare function forgetText(): void;
+/** The open document for reader mode (`doc.reflow()`): blocks in the structure tree's order, or why not. */
+export declare function reflow(signal: AbortSignal): Promise<Reflow>;
+/**
+ * Page `index`'s blocks in reading order (cached). Running headers and footers stay in, as
+ * blocks of their own: a selection that takes them in copies them.
+ */
+export declare function readingOrder(index: number, signal: AbortSignal): Promise<ReadingBlock[]>;
+/** Forgets `pages`' text (an edit changed them), or every page's (the document closed). */
+export declare function forgetText(pages?: Iterable<number>): void;
 //# sourceMappingURL=text.d.ts.map

package/dist/worker/text.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../../src/worker/text.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAe,MAAM,gBAAgB,CAAC;AAY/E,gGAAgG;AAChG,wBAAsB,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CAGxF;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,UAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAgCrG;AAED,mEAAmE;AACnE,wBAAgB,SAAS,CAAC,IAAI,EAAE,YAAY,GAAG,CAAC,YAAY,EAAE,YAAY,EAAE,CAAC,CAG5E;AAED,sFAAsF;AACtF,wBAAsB,SAAS,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAK3E;AAED,sDAAsD;AACtD,wBAAgB,UAAU,IAAI,IAAI,CAEjC"}
+{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../../src/worker/text.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAe,MAAM,gBAAgB,CAAC;AAO7F,gGAAgG;AAChG,wBAAsB,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CAGxF;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,UAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAqBrG;AAED,mEAAmE;AACnE,wBAAgB,SAAS,CAAC,IAAI,EAAE,YAAY,GAAG,CAAC,YAAY,EAAE,YAAY,EAAE,CAAC,CAG5E;AAED,sFAAsF;AACtF,wBAAsB,SAAS,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAK3E;AAED,4GAA4G;AAC5G,wBAAsB,MAAM,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAGjE;AAKD;;;GAGG;AACH,wBAAsB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAW9F;AAED,2FAA2F;AAC3F,wBAAgB,UAAU,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,CAIzD"}

package/dist/worker/text.js

@@ -3,14 +3,10 @@
 // every glyph's quad in one Float32Array, which each caller gets its own copy of to transfer, so a
 // page of thousands of glyphs is three objects, not thousands. The last pages read are kept, since
 // a page scrolled back into view asks again.
-import { current, textModel } from "./document.js";
-/** How many pages' text stay cached (a screenful of pages and the margin, at most zoom). */
-const CACHED_PAGES = 24;
-/**
- * The cache, by document ID and page: another document never reads one's pages, and the oldest
- * go. Each page keeps its glyphs' text too, for find; only the runs and quads reach the page.
- */
-const cache = new Map();
+import { textModel } from "./document.js";
+import { CACHED_PAGES, RecentPages } from "./recent-pages.js";
+/** The last pages' text. Each keeps its glyphs' text too, for find; only the runs and quads reach the page. */
+const cache = new RecentPages(CACHED_PAGES);
 /** Page `index`'s text runs and glyph quads (cached; `signal` stops a read of pending data). */
 export async function pageText(index, signal) {
     const { runs, quads } = await pageGlyphs(index, signal);
@@ -22,15 +18,9 @@ export async function pageText(index, signal) {
  * the pages in view.
  */
 export async function pageGlyphs(index, signal, keep = true) {
-    const { id } = current();
-    const key = `${id}:${index}`;
-    const cached = cache.get(key);
-    if (cached !== undefined) {
-        // Most recently used last, so the oldest goes first.
-        cache.delete(key);
-        cache.set(key, cached);
+    const cached = cache.get(index);
+    if (cached !== undefined)
         return cached;
-    }
     signal.throwIfAborted();
     const model = await textModel(signal);
     const text = await model.ensure(() => model.page(index).text(), { signal });
@@ -48,12 +38,7 @@ export async function pageGlyphs(index, signal, keep = true) {
     const data = { runs, quads, glyphText, glyphOffsets };
     if (!keep)
         return data;
-    cache.set(key, data);
-    for (const old of cache.keys()) {
-        if (cache.size <= CACHED_PAGES)
-            break;
-        cache.delete(old);
-    }
+    cache.set(index, data);
     return data;
 }
 /** One caller's answer: its own copy of the quads, transferred. */
@@ -68,8 +53,31 @@ export async function structure(signal) {
     const tree = await model.ensure(() => model.structureTree(), { signal });
     return tree === undefined ? { tagged } : { tagged, tree };
 }
-/** Forgets every page's text: the document closed. */
-export function forgetText() {
-    cache.clear();
+/** The open document for reader mode (`doc.reflow()`): blocks in the structure tree's order, or why not. */
+export async function reflow(signal) {
+    const model = await textModel(signal);
+    return model.ensure(() => model.reflow(), { signal });
+}
+/** The reading-order blocks of the last pages a selection reached. */
+const blocks = new RecentPages(CACHED_PAGES);
+/**
+ * Page `index`'s blocks in reading order (cached). Running headers and footers stay in, as
+ * blocks of their own: a selection that takes them in copies them.
+ */
+export async function readingOrder(index, signal) {
+    const cached = blocks.get(index);
+    if (cached !== undefined)
+        return cached;
+    const model = await textModel(signal);
+    const extraction = await model.ensure(() => model.extract({ format: "json", pages: [index], drop: { furniture: false } }), { signal });
+    const found = extraction.blocks.map((b) => ({ bbox: b.bbox, type: b.type }));
+    blocks.set(index, found);
+    return found;
+}
+/** Forgets `pages`' text (an edit changed them), or every page's (the document closed). */
+export function forgetText(pages) {
+    const list = pages === undefined ? undefined : [...pages];
+    cache.forget(list);
+    blocks.forget(list);
 }
 //# sourceMappingURL=text.js.map

package/dist/worker/text.js.map

@@ -1 +1 @@
-{"version":3,"file":"text.js","sourceRoot":"","sources":["../../src/worker/text.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"text.js","sourceRoot":"","sources":["../../src/worker/text.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@laminapdf/viewer",
-  "version": "0.2.0-alpha.4",
+  "version": "0.2.0-alpha.6",
   "description": "The web reader's framework-free viewer core (ADR 0009). Part 1 (C3a): one document worker per document, hosting @laminapdf/sdk and a RenderBackend, behind a typed RPC that extends @laminapdf/sdk/worker with priorities, coalescing, cancellation, timeouts and restart.",
   "license": "MIT OR Apache-2.0",
   "homepage": "https://laminapdf.com",
@@ -31,19 +31,19 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@laminapdf/render": "0.2.0-alpha.4",
-    "@laminapdf/sdk": "0.2.0-alpha.4",
-    "@laminapdf/render-hayro": "0.2.0-alpha.4",
-    "@laminapdf/render-pdfium": "0.2.0-alpha.4"
+    "@laminapdf/render": "0.2.0-alpha.6",
+    "@laminapdf/render-hayro": "0.2.0-alpha.6",
+    "@laminapdf/sdk": "0.2.0-alpha.6",
+    "@laminapdf/render-pdfium": "0.2.0-alpha.6"
   },
   "devDependencies": {
     "@embedpdf/pdfium": "2.15.1",
-    "@types/node": "26.6.5",
-    "@vitest/browser-playwright": "5.0.5",
+    "@types/node": "26.6.6",
+    "@vitest/browser-playwright": "5.1.0",
     "playwright": "1.64.1",
     "typescript": "7.0.2",
     "vite": "8.3.5",
-    "vitest": "5.0.5",
+    "vitest": "5.1.0",
     "@laminapdf/test-utils": "0.0.0"
   },
   "publishConfig": {
@@ -53,6 +53,7 @@
     "build:wasm": "pnpm --filter @laminapdf/render --filter @laminapdf/render-pdfium run build && pnpm --filter @laminapdf/render-hayro run build:wasm && tsc -p tsconfig.build.json",
     "typecheck:wasm": "pnpm --filter @laminapdf/render --filter @laminapdf/render-pdfium run build && pnpm --filter @laminapdf/render-hayro run build:wasm && tsc -p tsconfig.build.json && tsc --noEmit -p tsconfig.json",
     "perf": "node perf/run.ts",
+    "perf:gate": "node perf/gate.ts",
     "test:wasm": "pnpm --filter @laminapdf/render --filter @laminapdf/render-pdfium run build && pnpm --filter @laminapdf/render-hayro run build:wasm && tsc -p tsconfig.build.json && tsc --noEmit -p tsconfig.json && vitest run -c vitest.node.config.ts"
   }
 }