@openpresentation/opf-editor 0.10.2 → 0.10.3

package/README.md

@@ -2,7 +2,7 @@
 
 Unfinished prepared shaping work is preserved in the [September 15 roadmap](docs/roadmap-shaping-20260915.md); it is not part of the published runtime.
 
-Version 0.10.2 adds pointer caret entry on the canvas (one click puts the caret where you click; new `textEntry` option; keyboard entry still selects all) and keeps the 0.10.1 and 0.10.0 requirements. Version 0.10.1 adds the opt-in font gate (`createFontGate`, FF-41) and keeps the 0.10.0 requirements; develop and test it against renderer 0.11.2 and PPTX 0.11.1. Version 0.10.0 requires `@openpresentation/opf` ^0.11.2, renderer ^0.11.0, and PPTX ^0.11.0 (install them together so cover centering resolves the same core everywhere; renderer 0.11.0 also activates the playground's automatic script fonts and lazy Intos fonts). Version 0.9.0 required `@openpresentation/opf` ^0.11.1, renderer ^0.10.0, and PPTX ^0.10.0. Composition and slide transfer fall back to the shared `aptos` font scheme and report unknown scheme ids through `onDiagnostic`; gallery apply keeps every font-scheme role.
+Version 0.10.3 passes the host's render options (`catalogs`) through the font gate to the registry, so layouts and font schemes that only the host's catalogs know load their faces, and asks the script and vendored-face loaders separately; it keeps the 0.10.2 requirements and gates nothing new on renderers before 0.11.5. Version 0.10.2 adds pointer caret entry on the canvas (one click puts the caret where you click; new `textEntry` option; keyboard entry still selects all) and keeps the 0.10.1 and 0.10.0 requirements. Version 0.10.1 adds the opt-in font gate (`createFontGate`, FF-41) and keeps the 0.10.0 requirements; develop and test it against renderer 0.11.2 and PPTX 0.11.1. Version 0.10.0 requires `@openpresentation/opf` ^0.11.2, renderer ^0.11.0, and PPTX ^0.11.0 (install them together so cover centering resolves the same core everywhere; renderer 0.11.0 also activates the playground's automatic script fonts and lazy Intos fonts). Version 0.9.0 required `@openpresentation/opf` ^0.11.1, renderer ^0.10.0, and PPTX ^0.10.0. Composition and slide transfer fall back to the shared `aptos` font scheme and report unknown scheme ids through `onDiagnostic`; gallery apply keeps every font-scheme role.
 
 Version 0.8.0 required `@openpresentation/opf` ^0.11.0, renderer ^0.9.0, and PPTX ^0.9.0. Named ColorRefs (scheme slots, roles, and `var:<id>`) paint through the published renderer and hex-resolve on export. Payload ids share the slide id namespace for pagination and transfer. Native `schemeClr`, theme write, and `p:hf` remain out of scope.
 
@@ -80,6 +80,9 @@ Fonts load before pixels (FF-41). A document can need faces the browser registry
 import { createCanvasEditor, createFontGate } from '@openpresentation/opf-editor/canvas';
 
 const fonts = createFontGate(fontRegistry); // a registry without the lazy loaders gates nothing
+// The canvas gives the gate its current renderOptions (catalogs, ...), so layouts and font schemes only your catalogs know
+// resolve in the registry too (renderer 0.11.5+). For your own gate calls: fonts.pending(document, renderOptions), or
+// createFontGate(fontRegistry, { renderOptions: () => currentRenderOptions }).
 const canvas = createCanvasEditor(container, { document, fonts, renderOptions: { textMeasurement: fontRegistry.textMeasurement } });
 // Other renders of your own: fonts.run(document, { ready: draw, failed: showError, loading: showSpinner })
 ```
@@ -274,7 +277,7 @@ Public npm package publication is handled by `.github/workflows/release.yml` thr
 
 The current checkout uses `@openpresentation/opf/composition` for portable geometry. Slides can select `auto`, `row`, `column`, or `grid`, set weighted tracks, and request path-specific overflow diagnostics. See the sibling OPF repo's `docs/dynamic-composition.md` for the complete contract.
 
-Version 0.10.2 requires `@openpresentation/opf@^0.11.2` (unchanged since 0.10.0). The optional renderer peer requires `@openpresentation/opf-render@^0.11.0` (the font gate gates nothing on a registry without the lazy loaders). Development and coordinated playground export use renderer 0.11.2 and `@openpresentation/opf-pptx@^0.11.1`. Clean registry installs support the composition APIs without sibling checkouts. For coordinated source development, build OPF and run `node scripts/link-ecosystem.mjs` there; `pnpm test:ecosystem` verifies shared geometry and import/export behavior.
+Version 0.10.3 requires `@openpresentation/opf@^0.11.2` (unchanged since 0.10.0). The optional renderer peer requires `@openpresentation/opf-render@^0.11.0` (the font gate gates nothing on a registry without the lazy loaders). Development and coordinated playground export use renderer 0.11.5 (face-level lazy fonts; the gate passes render options, which older renderers ignore) and `@openpresentation/opf-pptx@^0.11.1`. Clean registry installs support the composition APIs without sibling checkouts. For coordinated source development, build OPF and run `node scripts/link-ecosystem.mjs` there; `pnpm test:ecosystem` verifies shared geometry and import/export behavior.
 
 ## Local interactive demo
 

package/dist/canvas.d.ts

@@ -3,10 +3,10 @@ import type { RenderSvgOptions } from "@openpresentation/opf-render";
 import type { SlideComposition } from "@openpresentation/opf/composition";
 /** Faces a document needs (script packages and vendored files) that are not loaded yet, and the way to load them. */
 export interface FontGate {
-  /** Synchronous. Empty means the document can render now. Never throws. */
-  pending(document: unknown): string[];
+  /** Synchronous. Empty means the document can render now. Never throws. `renderOptions` are the options the host renders with (`catalogs`, ...); the canvas passes its current ones. */
+  pending(document: unknown, renderOptions?: RenderSvgOptions): string[];
   /** Load every pending face (vendored faces first, then script faces). Rejects with a `fonts-unavailable` error; never retries by itself. */
-  ensure(document: unknown, options?: { signal?: AbortSignal }): Promise<void>;
+  ensure(document: unknown, options?: { signal?: AbortSignal; renderOptions?: RenderSvgOptions }): Promise<void>;
   /** `whenFontsReady` on this gate. */
   run(document: unknown, handlers?: FontGateHandlers): Promise<void>;
 }
@@ -16,11 +16,17 @@ export interface FontGateHandlers {
   loading?: (pending: string[]) => void;
   ready?: () => void;
   failed?: (error: Error) => void;
+  /** The options the host renders with (`catalogs`, ...), passed to the gate. */
+  renderOptions?: RenderSvgOptions;
 }
 export declare const FONTS_PENDING: "fonts-pending";
 export declare const FONTS_UNAVAILABLE: "fonts-unavailable";
 /** Wrap a browser font registry (`loadBrowserFontRegistry`). Registries without the lazy loaders gate nothing. */
-export declare function createFontGate(registry: object): FontGate;
+/**
+ * `options.renderOptions` (an object, or a function called on every use) are the default render options passed to the registry
+ * (`catalogs`, ...), under a call's own; the canvas passes its current `renderOptions` itself, so a gate needs none.
+ */
+export declare function createFontGate(registry: object, options?: { renderOptions?: RenderSvgOptions | (() => RenderSvgOptions | undefined) }): FontGate;
 /**
  * Ensure fonts for a document, then run `ready` (synchronously when nothing is pending). The one
  * "ensure fonts, then render" helper: load failures and exceptions from `ready` go to `failed`.

package/dist/canvas.js

@@ -163,11 +163,11 @@ export function createCanvasEditor(container, options = {}) {
   // A synchronous render or validation of a document whose faces are still loading fails with a clear "fonts-pending"
   // error and starts the load, so the next attempt succeeds. It never draws glyphs the registry cannot provide.
   function requireFonts(document) {
-    const pending = fonts?.pending(document) ?? [];
+    const pending = fonts?.pending(document, renderOptions) ?? [];
     if (!pending.length) return;
     notice.hidden = false;
     notice.textContent = pendingMessage;
-    fonts.ensure(document).then(
+    fonts.ensure(document, { renderOptions }).then(
       () => { if (!disposed && notice.textContent === pendingMessage) clearNotice(); },
       (error) => { if (!disposed) report(error); },
     );
@@ -206,6 +206,7 @@ export function createCanvasEditor(container, options = {}) {
     if (disposed) return;
     const token = ++showToken;
     return whenFontsReady(fonts, target ?? editor.document, {
+      renderOptions,
       isCurrent: () => !disposed && token === showToken,
       loading: (pending) => fontsState("loading", pending),
       ready: () => {
@@ -221,7 +222,7 @@ export function createCanvasEditor(container, options = {}) {
   }
   // Renders now when the document's fonts are loaded (errors throw to the caller), otherwise after loading them.
   function renderFor(document) {
-    if (fonts?.pending(document ?? editor.document).length) show(document);
+    if (fonts?.pending(document ?? editor.document, renderOptions).length) show(document);
     else render(document);
   }
   function render(document = editor.document) {
@@ -341,11 +342,11 @@ export function createCanvasEditor(container, options = {}) {
   }
   // An in-progress edit whose text needs faces that are not loaded yet waits for them, then draws again.
   function deferDraft(draft) {
-    if (!fonts?.pending(draft).length) return false;
+    if (!fonts?.pending(draft, renderOptions).length) return false;
     active.valid = false;
     notice.hidden = false;
     notice.textContent = pendingMessage;
-    fonts.ensure(draft).then(
+    fonts.ensure(draft, { renderOptions }).then(
       () => {
         if (disposed) return;
         if (notice.textContent === pendingMessage) clearNotice();

package/dist/font-gate.js

@@ -16,39 +16,56 @@ const MAX_ROUNDS = 4;
  * Wrap a browser font registry (`loadBrowserFontRegistry` from `@openpresentation/opf-render/fonts-browser`).
  * Registries without the lazy loaders (renderer 0.10.0 and older) gate nothing and keep the fonts they have.
  *
- * - `pending(document)` lists the faces (script packages and vendored files) the document needs that are not loaded.
- *   Synchronous; empty means the document can render now. Never throws: a document the renderer rejects for other
- *   reasons reports nothing pending and fails with its own validation message when rendered.
- * - `ensure(document, { signal })` loads vendored faces first (script fallback depends on them), then script faces,
+ * - `pending(document, renderOptions?)` lists the faces (script packages and vendored files) the document needs that are
+ *   not loaded. Synchronous; empty means the document can render now. Never throws: a document the renderer rejects for
+ *   other reasons reports nothing pending and fails with its own validation message when rendered. Script faces and
+ *   vendored faces are asked separately, so one that cannot be answered does not hide the other.
+ * - `ensure(document, { signal, renderOptions })` loads vendored faces first (script fallback depends on them), then script faces,
  *   and repeats until nothing is pending. It makes a bounded number of rounds and rejects with a `fonts-unavailable`
  *   error (the registry's error is its `cause`); it never retries by itself, a later call is a new attempt.
  * - `run(document, handlers)` is `whenFontsReady` on this gate.
+ * - `renderOptions` (per call, or `createFontGate(registry, { renderOptions })` as an object or a getter) are the options the
+ *   host renders with (`catalogs`, ...). They are passed to the registry, so a layout or font scheme that only the host's
+ *   catalogs know resolves the same way there (renderer 0.11.5 and newer; older renderers ignore them).
  */
-export function createFontGate(registry) {
-  const pending = (document) => {
-    try {
-      const scripts = registry?.pendingScripts?.(document) ?? [];
-      const lazy = (registry?.pendingLazyFonts?.(document) ?? []).map((face) => face?.file ?? String(face));
-      return [...lazy, ...scripts];
-    } catch {
-      return [];
-    }
+export function createFontGate(registry, gateOptions = {}) {
+  // FF-41: the render options (`catalogs` above all) the document resolves with. The registry resolves a document the way the
+  // host renders it only when it gets the same options, so every call passes them: the gate's defaults (an object, or a
+  // function called each time, for options that change like `canvas.setRenderOptions`) under the call's own.
+  const defaults = () => (typeof gateOptions.renderOptions === "function" ? gateOptions.renderOptions() : gateOptions.renderOptions) ?? {};
+  const optionsFor = (renderOptions) => ({ ...defaults(), ...renderOptions });
+  // Each source answers on its own: a document one loader cannot resolve (an unresolvable layout throws in the renderer's
+  // lazy font loader) must not hide what the other still reports pending.
+  const sources = (document, renderOptions) => {
+    const options = optionsFor(renderOptions);
+    let scripts = [], lazy = [];
+    try { scripts = registry?.pendingScripts?.(document, options) ?? []; } catch { /* the renderer reports the document itself when it renders */ }
+    try { lazy = (registry?.pendingLazyFonts?.(document, options) ?? []).map((face) => face?.file ?? String(face)); } catch { /* likewise */ }
+    return { lazy, scripts };
+  };
+  const pending = (document, renderOptions) => {
+    const { lazy, scripts } = sources(document, renderOptions);
+    return [...lazy, ...scripts];
   };
   const gate = {
     pending,
     async ensure(document, options = {}) {
-      const { signal } = options;
+      const { signal, renderOptions } = options;
+      const call = { ...optionsFor(renderOptions), signal };
       try {
-        for (let round = 0; round < MAX_ROUNDS && pending(document).length; round++) {
+        for (let round = 0; round < MAX_ROUNDS; round++) {
+          const { lazy, scripts } = sources(document, renderOptions);
+          if (!lazy.length && !scripts.length) break;
           signal?.throwIfAborted?.();
-          await registry.ensureLazyFonts?.(document, { signal });
-          await registry.ensureScripts?.(document, { signal });
+          // Vendored faces first (script fallback depends on them). A source with nothing pending is not asked to load.
+          if (lazy.length) await registry.ensureLazyFonts?.(document, call);
+          if (scripts.length) await registry.ensureScripts?.(document, call);
         }
       } catch (cause) {
         if (signal?.aborted) throw cause;
         throw fontsUnavailable(cause?.message ?? String(cause), cause);
       }
-      const left = pending(document);
+      const left = pending(document, renderOptions);
       if (left.length) throw fontsUnavailable(`${left.join(", ")} did not finish loading.`);
     },
   };
@@ -75,10 +92,11 @@ export function fontsPendingError(pending) {
  * With nothing pending, `ready` runs synchronously, so documents in already-loaded fonts render at once. Otherwise
  * `loading(pending)` runs, the faces load and `ready` runs after them. `isCurrent()` is checked after the wait, so a
  * result for a superseded document is dropped. A load failure, and an exception thrown by `ready`, go to `failed(error)`
- * (they are rethrown when there is no `failed`). `gate` is any object with `pending(document)` and `ensure(document)`;
+ * (they are rethrown when there is no `failed`). `renderOptions` are passed to the gate. `gate` is any object with
+ * `pending(document, renderOptions)` and `ensure(document, { renderOptions })`;
  * without one the document is treated as ready. Resolves once `ready` or `failed` has run.
  */
-export function whenFontsReady(gate, document, { isCurrent = () => true, loading, ready, failed } = {}) {
+export function whenFontsReady(gate, document, { isCurrent = () => true, loading, ready, failed, renderOptions } = {}) {
   const finish = () => {
     try {
       ready?.();
@@ -87,13 +105,13 @@ export function whenFontsReady(gate, document, { isCurrent = () => true, loading
       failed(error);
     }
   };
-  const left = gate?.pending?.(document) ?? [];
+  const left = gate?.pending?.(document, renderOptions) ?? [];
   if (!left.length) {
     finish();
     return Promise.resolve();
   }
   loading?.(left);
-  return Promise.resolve(gate.ensure(document)).then(
+  return Promise.resolve(gate.ensure(document, { renderOptions })).then(
     () => {
       if (isCurrent()) finish();
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openpresentation/opf-editor",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "description": "Embeddable local OPF editor primitives built on the deterministic renderer.",
   "license": "MIT",
   "type": "module",
@@ -87,8 +87,8 @@
   "sideEffects": false,
   "scripts": {
     "build": "node scripts/build.mjs",
-    "typecheck": "node --check src/index.js && node --check src/react.js && node --check src/svelte.js && node --check scripts/build.mjs && node --check scripts/validate-package.mjs && node --check test/smoke.mjs && node --check test/component-smoke.mjs && node --check src/canvas.js && node --check src/canvas-fields.js && node --check test/canvas-fields.mjs && node --check test/browser-canvas.mjs && node --check src/transfer.js && node --check src/presentation-ids.js && node --check src/font-defaults.js && node --check src/color-authoring.js && node --check test/presentation-ids.mjs && node --check src/galleries.js && node --check examples/transfer-controls.js && node --check src/schema.js && node --check src/schema-inspector.js && node --check test/rich-table-browser.mjs && node --check test/styled-table.mjs && node --check test/styled-table-browser.mjs && node --check examples/pptx-controls.js && node --check scripts/build-playground.mjs && node --check test/playground-pptx.mjs && node --check test/playground-script-fonts.mjs && node --check test/playground-lazy-fonts.mjs && node --check src/text-input.js && node --check src/rich-text.js && node --check src/rich-text-input.js && node --check src/rich-text-toolbar.js && node --check test/rich-text.mjs && node --check test/rich-input-browser.mjs && node --check src/json-editor.js && node --check src/json-menu.js && node --check src/json-options.js && node --check src/json-source.js && node --check src/switches.js && node --check test/switches.mjs && node --check test/switches-export.mjs && node --check test/placeholder-selection.mjs && node --check test/selection-browser.mjs && node --check scripts/check-font-hotlinks.mjs && node --check scripts/check-font-hotlinks.test.mjs && node --check src/exact-source.js && node --check test/exact-source.mjs && node --check test/playground-source.mjs && node --check src/font-gate.js && node --check test/font-gate.mjs && node --check test/playground-ensure-fonts.mjs && node --check test/canvas-fonts-browser.mjs && node --check src/text-pointer.js && node --check test/click-entry-browser.mjs",
-    "test": "npm run build && npm run check:font-hotlinks && node test/accepted-text.mjs && node test/smoke.mjs && node test/component-smoke.mjs && node test/canvas-fields.mjs && node test/transfer.mjs && node test/gallery-font-roles.mjs && node test/default-font-scheme.mjs && node test/presentation-ids.mjs && node test/schema.mjs && node test/rich-text.mjs && node test/layout.mjs && node test/blocks.mjs && node test/styled-table.mjs && node test/json-source.mjs && node test/json-options.mjs && node test/switches.mjs && node test/switches-export.mjs && node test/placeholder-selection.mjs && node test/exact-source.mjs && node test/font-gate.mjs",
+    "typecheck": "node --check src/index.js && node --check src/react.js && node --check src/svelte.js && node --check scripts/build.mjs && node --check scripts/validate-package.mjs && node --check test/smoke.mjs && node --check test/component-smoke.mjs && node --check src/canvas.js && node --check src/canvas-fields.js && node --check test/canvas-fields.mjs && node --check test/browser-canvas.mjs && node --check src/transfer.js && node --check src/presentation-ids.js && node --check src/font-defaults.js && node --check src/color-authoring.js && node --check test/presentation-ids.mjs && node --check src/galleries.js && node --check examples/transfer-controls.js && node --check src/schema.js && node --check src/schema-inspector.js && node --check test/rich-table-browser.mjs && node --check test/styled-table.mjs && node --check test/styled-table-browser.mjs && node --check examples/pptx-controls.js && node --check scripts/build-playground.mjs && node --check test/playground-pptx.mjs && node --check test/playground-script-fonts.mjs && node --check test/playground-lazy-fonts.mjs && node --check src/text-input.js && node --check src/rich-text.js && node --check src/rich-text-input.js && node --check src/rich-text-toolbar.js && node --check test/rich-text.mjs && node --check test/rich-input-browser.mjs && node --check src/json-editor.js && node --check src/json-menu.js && node --check src/json-options.js && node --check src/json-source.js && node --check src/switches.js && node --check test/switches.mjs && node --check test/switches-export.mjs && node --check test/placeholder-selection.mjs && node --check test/selection-browser.mjs && node --check scripts/check-font-hotlinks.mjs && node --check scripts/check-font-hotlinks.test.mjs && node --check src/exact-source.js && node --check test/exact-source.mjs && node --check test/playground-source.mjs && node --check src/font-gate.js && node --check test/font-gate.mjs && node --check test/font-gate-registry.mjs && node --check test/playground-ensure-fonts.mjs && node --check test/canvas-fonts-browser.mjs && node --check src/text-pointer.js && node --check test/click-entry-browser.mjs",
+    "test": "npm run build && npm run check:font-hotlinks && node test/accepted-text.mjs && node test/smoke.mjs && node test/component-smoke.mjs && node test/canvas-fields.mjs && node test/transfer.mjs && node test/gallery-font-roles.mjs && node test/default-font-scheme.mjs && node test/presentation-ids.mjs && node test/schema.mjs && node test/rich-text.mjs && node test/layout.mjs && node test/blocks.mjs && node test/styled-table.mjs && node test/json-source.mjs && node test/json-options.mjs && node test/switches.mjs && node test/switches-export.mjs && node test/placeholder-selection.mjs && node test/exact-source.mjs && node test/font-gate.mjs && node test/font-gate-registry.mjs",
     "validate": "node scripts/validate-package.mjs",
     "test:packed": "node test/packed-install.mjs",
     "prepack": "npm run build",
@@ -158,7 +158,7 @@
     "@expo-google-fonts/noto-serif-hebrew": "0.4.2",
     "@expo-google-fonts/noto-serif-tibetan": "0.4.2",
     "@openpresentation/opf-pptx": "^0.11.1",
-    "@openpresentation/opf-render": "^0.11.2",
+    "@openpresentation/opf-render": "^0.11.5",
     "esbuild": "0.28.2",
     "playwright": "1.63.0"
   }