@onodocs/canvas 0.5.0 → 0.5.1

package/index.js

@@ -2546,7 +2546,11 @@ function createDocument(source, options = {}) {
   const lifetime = new AbortController();
   const views = /* @__PURE__ */ new Set();
   const faces = /* @__PURE__ */ new Map();
-  const ownedFaces = /* @__PURE__ */ new Set();
+  const fontCleanup = /* @__PURE__ */ new Set();
+  const fontFinalizer = new FinalizationRegistry((close) => {
+    close();
+    fontCleanup.delete(close);
+  });
   let pages = [];
   let disposed = false;
   let mounted;
@@ -2569,6 +2573,9 @@ function createDocument(source, options = {}) {
     },
     refresh() {
       checkOpen();
+      const fonts = createFontResources(faces, checkOpen);
+      fontCleanup.add(fonts.dispose);
+      fontFinalizer.register(fonts, fonts.dispose);
       pages = source.pages.map((page) => ({ index: page.index, size: page.size, get interaction() {
         return page.interaction;
       }, async render(canvas, options2 = {}) {
@@ -2579,7 +2586,7 @@ function createDocument(source, options = {}) {
         if (!Number.isFinite(dpi) || dpi <= 0) throw new RangeError("dpi must be positive and finite.");
         const data = await page.load(signal);
         signal.throwIfAborted();
-        await Promise.all((data.fonts ?? []).map(loadFont));
+        await Promise.all((data.fonts ?? []).map((resource) => fonts.load(resource)));
         signal.throwIfAborted();
         const images = data.images && await materializeImageResources(data.images, signal);
         try {
@@ -2608,10 +2615,9 @@ function createDocument(source, options = {}) {
       lifetime.abort();
       unsubscribe?.();
       for (const view of views) view.dispose();
-      for (const face of ownedFaces) document.fonts.delete(face);
+      for (const close of fontCleanup) close();
       views.clear();
-      ownedFaces.clear();
-      faces.clear();
+      fontCleanup.clear();
     }
   };
   unsubscribe = source.subscribe?.(() => source.disposed ? result.dispose() : result.refresh());
@@ -2627,24 +2633,52 @@ function createDocument(source, options = {}) {
     if (disposed || source.disposed) throw new Error("Canvas document is disposed.");
   }
   __name(checkOpen, "checkOpen");
-  function loadFont(resource) {
+}
+__name(createDocument, "createDocument");
+function createFontResources(faces, checkOpen) {
+  const acquired = /* @__PURE__ */ new Map();
+  let disposed = false;
+  function load(resource) {
+    checkOpen();
+    if (disposed) return Promise.reject(new Error("Canvas font resources are disposed."));
     const key = JSON.stringify([resource.family, resource.descriptors]);
-    let pending = faces.get(key);
-    if (!pending) {
+    let entry = faces.get(key);
+    if (!entry) {
       const face = new FontFace(resource.family, typeof resource.source === "string" ? resource.source : resource.source.slice().buffer, resource.descriptors);
-      pending = face.load().then(() => {
+      const pending = { face, users: 0, ready: face.load().then(() => {
         checkOpen();
-        document.fonts.add(face);
-        ownedFaces.add(face);
-      });
+        if (pending.users) document.fonts.add(face);
+      }) };
       faces.set(key, pending);
-      void pending.catch(() => faces.delete(key));
+      entry = pending;
+      void pending.ready.catch(() => {
+        if (faces.get(key) === pending) faces.delete(key);
+      });
+    }
+    const previous = acquired.get(key);
+    if (previous !== entry) {
+      if (previous) release(key, previous);
+      acquired.set(key, entry);
+      entry.users++;
     }
-    return pending;
+    return entry.ready;
   }
-  __name(loadFont, "loadFont");
+  __name(load, "load");
+  function release(key, entry) {
+    if (--entry.users === 0) {
+      document.fonts.delete(entry.face);
+      if (faces.get(key) === entry) faces.delete(key);
+    }
+  }
+  __name(release, "release");
+  return { load, dispose() {
+    if (disposed) return;
+    disposed = true;
+    for (const [key, entry] of acquired) release(key, entry);
+    acquired.clear();
+  } };
 }
-__name(createDocument, "createDocument");
+__name(createFontResources, "createFontResources");
 async function openDocument(url, options = {}) {
   const endpoint = new URL(url, document.baseURI);
   const manifest = await load(endpoint, options.signal);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onodocs/canvas",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "private": false,
   "description": "OnoDocs canvas viewer, selection and HTML attachments for prepared Word document pages.",
   "homepage": "https://onodocs.com/developers/",
@@ -49,5 +49,5 @@
     "type": "git",
     "url": "https://github.com/onodocs/onodocs.git"
   },
-  "gitHead": "9eab22dd958dbf90e88fe039a087684760034356"
+  "gitHead": "a4043b6b334e0090f9cc2439d74120357a59aa76"
 }