web-doc 0.10.0 → 0.12.0

package/dist/edit/types.d.ts

@@ -214,6 +214,17 @@ export interface AssetOptions {
     readonly mimeType?: string;
     readonly signal?: AbortSignal;
 }
+/** A source text object incorporated into another logical text element. */
+export interface TextAnchorMigration {
+    /** Zero-based operation in the applied batch, before its text replacement. */
+    readonly operationIndex: number;
+    readonly sourceElementId: string;
+    readonly targetElementId: string;
+    /** UTF-16 length retained from the source, excluding generated trailing whitespace. */
+    readonly sourceLength: number;
+    /** UTF-16 start of the source text in the target before the operation. */
+    readonly targetOffset: number;
+}
 export interface EditReceipt {
     readonly sessionId: string;
     /** `state.revision` after the call; unchanged for a dry run or a no-op. */
@@ -226,6 +237,8 @@ export interface EditReceipt {
     readonly removedIds: readonly string[];
     /** Old id → new id, when a format has to rename an element; absent for formats that never do. */
     readonly remappedIds?: Readonly<Record<string, string>>;
+    /** Text anchors migrated by an apply (or preview); absent when none migrated. */
+    readonly textAnchorMigrations?: readonly TextAnchorMigration[];
     /** Page indexes in the resulting document whose content may have changed; a superset. */
     readonly changedPages: readonly number[];
     readonly pageCount: number;

package/dist/viewport.js

@@ -155,6 +155,15 @@ export class ViewerViewport {
         this.schedule();
     }
     replaceDocument(info, changedPages, revision) {
+        // The viewer retires the old adapter after this synchronous handoff.
+        // Unfinished paints still belong to that adapter, even on unchanged pages.
+        for (const slot of this.#slots.values()) {
+            if (!slot.controller)
+                continue;
+            slot.controller.abort();
+            delete slot.controller;
+            delete slot.renderKey;
+        }
         const previous = this.#info;
         const painted = this.#painted.get(this.#contentRevision);
         this.#painted.clear();
@@ -533,6 +542,8 @@ export class ViewerViewport {
             await rendering?.catch(() => undefined);
             canvas.width = 0;
             canvas.height = 0;
+            if (slot.controller === controller)
+                delete slot.controller;
         }
     }
     async #buildTextLayers(textLayer, highlightLayer, pageIndex, runs, zoom, signal) {

package/dist/worker-protocol.d.ts

@@ -2,7 +2,7 @@ import type { DocumentFormat, DocumentInfo, ResourceLimits, TextRun, ViewerError
 import type { EditableFormat } from "./edit/types.js";
 export type DocumentWorkerOperation = "init" | "open" | "get-info" | "render" | "get-text-map" | "close" | "destroy";
 /** Operations of an edit engine worker; payloads mirror the engine interface. */
-export type EditWorkerOperation = "edit-init" | "edit-open" | "edit-validate" | "edit-apply" | "edit-materialize" | "edit-restore" | "edit-put-asset" | "edit-elements" | "edit-element" | "edit-elements-at" | "edit-find-text" | "edit-text-layout" | "edit-text-font" | "edit-position-at" | "edit-range-rects" | "edit-render-without" | "edit-page-layout" | "edit-pptx-slides" | "edit-pptx-layouts" | "edit-docx-revisions" | "edit-dispose";
+export type EditWorkerOperation = "edit-init" | "edit-open" | "edit-validate" | "edit-apply" | "edit-materialize" | "edit-restore" | "edit-put-asset" | "edit-elements" | "edit-element" | "edit-elements-at" | "edit-find-text" | "edit-text-layout" | "edit-text-paragraph" | "edit-text-font" | "edit-position-at" | "edit-range-rects" | "edit-render-without" | "edit-page-layout" | "edit-pptx-slides" | "edit-pptx-layouts" | "edit-docx-revisions" | "edit-docx-text-style" | "edit-pptx-text-style" | "edit-dispose";
 export type WorkerOperation = DocumentWorkerOperation | EditWorkerOperation;
 export interface WorkerRequest {
     readonly kind: "request";

package/dist/workers/ooxml-edit-worker.js

@@ -2166,11 +2166,12 @@ var DocxStyles = class _DocxStyles {
         node.children.find((child) => child.local === "basedOn") ?? node,
         "w:val"
       );
+      const defaultAttribute = part.attribute(node, "w:default");
       const record = {
         id,
         type: part.attribute(node, "w:type") ?? "paragraph",
         ...basedOn && basedOn !== id ? { basedOn } : {},
-        isDefault: isOn(part.attribute(node, "w:default")),
+        isDefault: defaultAttribute !== void 0 && isOn(defaultAttribute),
         ...pick(node, "rPr", "pPr")
       };
       styles.set(id, record);
@@ -5329,6 +5330,31 @@ function issueCollector(operationIndex, issues) {
   return (path, code, message) => issues.push({ operationIndex, path, code, message });
 }
 
+// src/edit/range-style.ts
+function runsCovering(runs, span) {
+  if (span.start < span.end)
+    return runs.filter((run2) => run2.start < span.end && run2.end > span.start);
+  const before = runs.filter((run2) => run2.start < span.start && run2.end >= span.start).at(-1);
+  const at = before ?? runs.find((run2) => run2.start >= span.start);
+  return at ? [at] : [];
+}
+function sharedStyle(styles) {
+  const [first, ...rest] = styles;
+  if (!first) return void 0;
+  const shared = {};
+  for (const key of Object.keys(first)) {
+    const value = JSON.stringify(first[key]);
+    if (rest.every(
+      (style) => key in style && JSON.stringify(style[key]) === value
+    ))
+      shared[key] = first[key];
+  }
+  return shared;
+}
+function spanFits(span, length) {
+  return span.start >= 0 && span.start <= span.end && span.end <= length;
+}
+
 // src/edit/docx/engine.ts
 var UNAUTHORED_PART = "/webdoc/unauthored.xml";
 var UNAUTHORED_NS = "urn:web-doc:docx-edit";
@@ -5602,6 +5628,26 @@ var DocxEditEngine = class _DocxEditEngine {
     if (!record || record.kind !== "paragraph") return [];
     return revisionsOf(model.document, record.node);
   }
+  /**
+   * The style a span of a paragraph shows: what every run it covers shares;
+   * the paragraph mark's for an empty paragraph. None for another element,
+   * an unknown id or a span past the text.
+   */
+  async textStyle(id, span, signal) {
+    const model = await this.model(signal);
+    const record = model.byId.get(id);
+    if (!record || record.kind !== "paragraph") return void 0;
+    const { text, items } = record.text;
+    const range = span ?? { start: 0, end: text.length };
+    if (!spanFits(range, text.length)) return void 0;
+    const covered = runsCovering(items, range);
+    const mark = record.pPr?.children.find((child) => child.local === "rPr");
+    return sharedStyle(
+      covered.length > 0 ? covered.map(
+        (item) => resolveTextStyle(model.styles, record.pPr, item.rPr)
+      ) : [resolveTextStyle(model.styles, record.pPr, mark)]
+    );
+  }
   async materialize(purposeOrSignal = "show", options = {}, signal = new AbortController().signal) {
     return (await this.materializeDocument(purposeOrSignal, options, signal)).bytes;
   }
@@ -6469,7 +6515,10 @@ function readRecord(context, node, parents, parent, readOnly, walk) {
     ...spPr ? { spPr } : {},
     ...text ? { text } : {},
     readOnly,
-    ...parent ? { parent } : {}
+    ...parent ? { parent } : {},
+    ...text && txBody ? {
+      styleOf: (span) => rangeStyleOf(context, placeholder, txBody, text, span)
+    } : {}
   };
 }
 function operationsFor(kind, hasText) {
@@ -6513,6 +6562,29 @@ function listStylesOf(context, txBody, placeholder) {
   if (defaults) lists.push(defaults);
   return lists;
 }
+function rangeStyleOf(context, placeholder, txBody, text, span) {
+  const lists = listStylesOf(context, txBody, placeholder);
+  const styleOf = (paragraph2, rPr) => resolveTextStyle2({
+    ...rPr ? { rPr: { part: context.part, node: rPr } } : {},
+    ...paragraph2.pPr ? { pPr: { part: context.part, node: paragraph2.pPr } } : {},
+    level: paragraph2.level,
+    lists,
+    fonts: context.fonts
+  });
+  const runs = text.paragraphs.flatMap(
+    (paragraph2) => paragraph2.runs.map((run2) => ({
+      start: run2.start,
+      end: run2.end,
+      style: () => styleOf(paragraph2, run2.rPr)
+    }))
+  );
+  const covered = runsCovering(runs, span);
+  if (covered.length > 0) return sharedStyle(covered.map((run2) => run2.style()));
+  const paragraph = text.paragraphs.find(
+    (candidate) => candidate.start <= span.start && span.start <= candidate.end
+  ) ?? text.paragraphs[0];
+  return paragraph ? sharedStyle([styleOf(paragraph, paragraph.endParaRPr)]) : void 0;
+}
 function textStyleOf(context, placeholder, txBody, text) {
   const first = firstTextRun(text);
   const paragraph = first?.paragraph ?? text.paragraphs[0];
@@ -8918,6 +8990,14 @@ var PptxEditEngine = class _PptxEditEngine {
       });
     return out;
   }
+  /** The style a span of a shape's text shows; none for an element without text or a span past it. */
+  async textStyle(id, span, signal) {
+    const record = await this.#locate(id, signal);
+    if (!record?.styleOf || !record.text) return void 0;
+    const range = span ?? { start: 0, end: record.text.text.length };
+    if (!spanFits(range, record.text.text.length)) return void 0;
+    return record.styleOf(range);
+  }
   async layouts(signal) {
     const model = await this.model(signal);
     return model.layouts.map((layout) => ({
@@ -9136,6 +9216,14 @@ function createOoxmlEditHandler() {
           payload.id,
           signal
         );
+      case "edit-docx-text-style": {
+        const { id, span } = payload;
+        return docx().textStyle(id, span, signal);
+      }
+      case "edit-pptx-text-style": {
+        const { id, span } = payload;
+        return pptx().textStyle(id, span, signal);
+      }
       case "edit-dispose":
         await state?.dispose();
         state = void 0;