@prose-reader/core 1.203.0 → 1.204.0

package/dist/index.umd.cjs

@@ -1087,7 +1087,7 @@
       );
     }
     layout(params) {
-      return rxjs.defer(() => this.onLayout(params)).pipe();
+      return rxjs.defer(() => this.onLayout(params));
     }
     destroy() {
       this.unload();
@@ -3062,7 +3062,7 @@
         return;
       }
       this.reader.navigation.navigate({
-        spineItem: indexOrId,
+        spineItem: spineItem.index,
         ...rest
       });
     }
@@ -3336,91 +3336,118 @@
       }
     };
   };
-  const NAMESPACE$4 = `paginationEnhancer`;
-  const consolidate = (item, reader) => {
-    var _a;
-    let itemPageIndex = (_a = item.meta) == null ? void 0 : _a.itemPageIndex;
-    const { itemIndex } = reader.cfi.parseCfi(item.cfi);
-    const spineItem = reader.spineItemsManager.get(itemIndex);
-    if (!spineItem) return rxjs.of({ ...item, meta: { ...item.meta, itemIndex } });
-    if (spineItem.renditionLayout === `pre-paginated`) {
-      itemPageIndex = 0;
+  const getItemAnchor = (item) => `|[prose~anchor~${encodeURIComponent(item.index)}]`;
+  const getRootCfi = (spineItem) => {
+    const itemAnchor = getItemAnchor(spineItem.item);
+    return `epubcfi(/0${itemAnchor})`;
+  };
+  const toCfiLocatableResource = (reader, resource) => {
+    if ("cfi" in resource) {
+      return resource;
+    }
+    const item = reader.spineItemsManager.get(resource);
+    if (!item) {
+      throw new Error(`Spine item not found`);
     }
+    return {
+      cfi: getRootCfi(item)
+    };
+  };
+  const consolidate = (resource, reader) => {
+    let itemPageIndex = resource == null ? void 0 : resource.itemPageIndex;
+    const { itemIndex } = reader.cfi.parseCfi(resource.cfi);
+    const spineItem = reader.spineItemsManager.get(itemIndex);
+    if (!spineItem) return rxjs.of({ ...resource, itemIndex });
     return idle().pipe(
       rxjs.withLatestFrom(spineItem.isReady$),
       rxjs.map(([, isSpineItemReady]) => {
-        var _a2, _b, _c;
+        var _a;
         let range = void 0;
-        const { node: startNode, offset: startOffset } = reader.cfi.resolveCfi({ cfi: item.cfi }) ?? {};
-        if (spineItem.renditionLayout !== `pre-paginated` && startNode) {
+        const { node: startNode, offset: startOffset } = reader.cfi.resolveCfi({ cfi: resource.cfi }) ?? {};
+        const reflowableItemWithFoundNode = spineItem.renditionLayout !== `pre-paginated` && startNode;
+        if (reflowableItemWithFoundNode) {
           itemPageIndex = reader.spine.locator.spineItemLocator.getSpineItemPageIndexFromNode(
             startNode,
             startOffset ?? 0,
             spineItem
           ) ?? itemPageIndex;
         }
-        if (startNode && item.endCfi) {
-          const { node: endNode, offset: endOffset } = reader.cfi.resolveCfi({ cfi: item.cfi }) ?? {};
+        if (startNode && resource.endCfi) {
+          const { node: endNode, offset: endOffset } = reader.cfi.resolveCfi({ cfi: resource.cfi }) ?? {};
           if (endNode && isSpineItemReady) {
-            range = (_a2 = startNode == null ? void 0 : startNode.ownerDocument) == null ? void 0 : _a2.createRange();
+            range = (_a = startNode == null ? void 0 : startNode.ownerDocument) == null ? void 0 : _a.createRange();
             range == null ? void 0 : range.setStart(startNode, startOffset ?? 0);
             range == null ? void 0 : range.setEnd(endNode, endOffset ?? 0);
           }
         }
-        let absolutePageIndex = (_b = item.meta) == null ? void 0 : _b.absolutePageIndex;
-        if (itemPageIndex !== void 0) {
-          absolutePageIndex = reader.spine.locator.getAbsolutePageIndexFromPageIndex({
-            pageIndex: itemPageIndex,
-            spineItemOrId: spineItem
-          }) ?? ((_c = item.meta) == null ? void 0 : _c.absolutePageIndex);
+        let absolutePageIndex = resource == null ? void 0 : resource.absolutePageIndex;
+        if (itemPageIndex === void 0) {
+          itemPageIndex = 0;
         }
+        absolutePageIndex = reader.spine.locator.getAbsolutePageIndexFromPageIndex({
+          pageIndex: itemPageIndex,
+          spineItemOrId: spineItem
+        }) ?? (resource == null ? void 0 : resource.absolutePageIndex);
         return {
-          ...item,
-          meta: {
-            ...item.meta,
-            range,
-            itemIndex,
-            startNode,
-            startOffset,
-            absolutePageIndex,
-            itemPageIndex
-          }
+          ...resource,
+          range,
+          itemIndex,
+          startNode,
+          startOffset,
+          absolutePageIndex,
+          itemPageIndex
         };
       })
     );
   };
-  const createLocator = (reader) => (resources) => {
-    return deferIdle(() => {
-      if (!resources.length) return rxjs.of(resources);
-      const consolidate$ = reader.spine.spineLayout.layout$.pipe(
-        rxjs.debounceTime(10),
-        rxjs.startWith(null),
-        rxjs.switchScan((acc$) => {
-          return rxjs.forkJoin(
-            acc$.map(
-              (resource) => deferIdle(() => consolidate(resource, reader)).pipe(
-                rxjs.map((value) => value)
-              )
-            )
+  class ResourcesLocator {
+    constructor(reader) {
+      this.reader = reader;
+      this.locate = (resource, options = {}) => {
+        const cfiConsolidatedResource = {
+          resource,
+          meta: toCfiLocatableResource(this.reader, resource)
+        };
+        return deferIdle(() => {
+          var _a;
+          const consolidate$ = this.reader.spine.spineLayout.layout$.pipe(
+            rxjs.debounceTime(10),
+            rxjs.startWith(cfiConsolidatedResource),
+            rxjs.switchScan((acc) => {
+              return consolidate(acc.meta, this.reader).pipe(
+                rxjs.map((consolidatedResource) => ({
+                  ...acc,
+                  meta: consolidatedResource
+                }))
+              );
+            }, cfiConsolidatedResource)
           );
-        }, resources)
-      );
-      const reflowableItemIndexes = resources.map((item) => reader.cfi.parseCfi(item.cfi).itemIndex).filter(isDefined).filter((index) => {
-        var _a;
-        return ((_a = reader.spineItemsManager.get(index)) == null ? void 0 : _a.renditionLayout) === `reflowable`;
-      });
-      const release = reader.spine.spineItemsLoader.forceOpen(
-        reflowableItemIndexes
-      );
-      return consolidate$.pipe(
-        rxjs.finalize(() => {
-          setTimeout(() => {
-            release();
-          }, 1e3);
-        })
-      );
-    });
-  };
+          const itemIndex = (_a = this.reader.cfi.parseCfi(
+            cfiConsolidatedResource.meta.cfi
+          )) == null ? void 0 : _a.itemIndex;
+          const item = this.reader.spineItemsManager.get(itemIndex);
+          const isReflowable = (item == null ? void 0 : item.renditionLayout) === `reflowable`;
+          const release = options.mode === "shallow" || !isReflowable || !item ? () => {
+          } : this.reader.spine.spineItemsLoader.forceOpen([item.index]);
+          return consolidate$.pipe(
+            rxjs.finalize(() => {
+              setTimeout(() => {
+                release();
+              }, 1e3);
+            })
+          );
+        });
+      };
+      this.locateMultiple = (resources, options = {}) => {
+        return deferIdle(
+          () => rxjs.combineLatest(
+            resources.map((resource) => this.locate(resource, options))
+          )
+        );
+      };
+    }
+  }
+  const NAMESPACE$4 = `paginationEnhancer`;
   const buildChaptersInfo = (href, tocItem, manifest) => {
     const spineItemIndex = manifest.spineItems.findIndex(
       (item) => item.href === href
@@ -3696,14 +3723,15 @@
     const reader = next(options);
     const { paginationInfo$, getPaginationInfo } = trackPaginationInfo(reader);
     paginationInfo$.pipe(rxjs.takeUntil(reader.$.destroy$)).subscribe();
-    const locate = createLocator(reader);
+    const resourcesLocator = new ResourcesLocator(reader);
     return {
       ...reader,
+      locateResources: resourcesLocator.locateMultiple,
+      locateResource: resourcesLocator.locate,
       pagination: {
         ...reader.pagination,
         getState: () => getPaginationInfo(),
-        state$: paginationInfo$,
-        locate
+        state$: paginationInfo$
       }
     };
   };
@@ -4413,7 +4441,6 @@
       }
     };
   };
-  const getItemAnchor = (item) => `|[prose~anchor~${encodeURIComponent(item.index)}]`;
   const ELEMENT_NODE = Node.ELEMENT_NODE;
   const TEXT_NODE = Node.TEXT_NODE;
   const CDATA_SECTION_NODE = Node.CDATA_SECTION_NODE;
@@ -5306,10 +5333,6 @@
       `${getItemAnchor(item)}|${offsetAnchor}`
     );
   };
-  const getRootCfi = (spineItem) => {
-    const itemAnchor = getItemAnchor(spineItem.item);
-    return `epubcfi(/0${itemAnchor})`;
-  };
   const generateCfiForSpineItemPage = Report.measurePerformance(
     `getCfi`,
     10,