@prose-reader/core 1.13.0 → 1.15.0

package/dist/settings.d.ts

@@ -1,5 +1,5 @@
 import { Manifest } from "./types";
-export declare type PublicSettings = {
+export type PublicSettings = {
     forceSinglePageMode: boolean;
     pageTurnAnimation: `none` | `fade` | `slide`;
     pageTurnAnimationDuration: undefined | number;
@@ -8,7 +8,7 @@ export declare type PublicSettings = {
     navigationSnapThreshold: number;
     numberOfAdjacentSpineItemToPreLoad: number;
 };
-declare type InnerSettings = PublicSettings & {
+type InnerSettings = PublicSettings & {
     computedPageTurnMode: PublicSettings[`pageTurnMode`];
     computedPageTurnDirection: PublicSettings[`pageTurnDirection`];
     computedPageTurnAnimation: PublicSettings[`pageTurnAnimation`];

package/dist/spine/locationResolver.d.ts

@@ -2,11 +2,11 @@ import { Context } from "../context";
 import { SpineItem } from "../spineItem/createSpineItem";
 import { createLocationResolver as createSpineItemLocator } from "../spineItem/locationResolver";
 import { SpineItemManager } from "../spineItemManager";
-declare type SpinePosition = {
+type SpinePosition = {
     x: number;
     y: number;
 };
-declare type SpineItemPosition = {
+type SpineItemPosition = {
     x: number;
     y: number;
     outsideOfBoundaries?: boolean;

package/dist/spine/navigationResolver.d.ts

@@ -3,16 +3,16 @@ import { SpineItemManager } from "../spineItemManager";
 import { SpineItem } from "../spineItem/createSpineItem";
 import { createLocationResolver } from "./locationResolver";
 import { createCfiLocator } from "./cfiLocator";
-export declare type ViewportNavigationEntry = {
+export type ViewportNavigationEntry = {
     x: number;
     y: number;
     spineItem?: SpineItem;
 };
-declare type ViewportPosition = {
+type ViewportPosition = {
     x: number;
     y: number;
 };
-declare type SpineItemPosition = {
+type SpineItemPosition = {
     x: number;
     y: number;
 };

package/dist/spineItem/createSpineItem.d.ts

@@ -178,4 +178,4 @@ export declare const createSpineItem: ({ item, context, containerElement, iframe
         isReady$: Observable<boolean>;
     };
 };
-export declare type SpineItem = ReturnType<typeof createSpineItem>;
+export type SpineItem = ReturnType<typeof createSpineItem>;

package/dist/spineItem/frameItem/frameItem.d.ts

@@ -2,6 +2,7 @@ import { Observable } from "rxjs";
 import { Manifest } from "../../types";
 import { Context } from "../../context";
 import { Hook } from "../../types/Hook";
+import { createFrameManipulator } from "./createFrameManipulator";
 export declare const createFrameItem: ({ item, parent, fetchResource, context, hooks$, viewportState$, }: {
     parent: HTMLElement;
     item: Manifest[`spineItems`][number];
@@ -24,11 +25,7 @@ export declare const createFrameItem: ({ item, parent, fetchResource, context, h
         width: number;
         height: number;
     }) => void;
-    getManipulableFrame: () => {
-        frame: HTMLIFrameElement;
-        removeStyle: (id: string) => void;
-        addStyle: (id: string, style: string, prepend?: boolean) => void;
-    } | undefined;
+    getManipulableFrame: () => ReturnType<typeof createFrameManipulator> | undefined;
     getReadingDirection: () => `ltr` | `rtl` | undefined;
     isUsingVerticalWriting: () => boolean;
     getWritingMode: () => "vertical-rl" | "horizontal-tb" | undefined;
@@ -46,4 +43,4 @@ export declare const createFrameItem: ({ item, parent, fetchResource, context, h
         }>;
     };
 };
-export declare type SpineItemFrame = ReturnType<typeof createFrameItem>;
+export type SpineItemFrame = ReturnType<typeof createFrameItem>;

package/dist/spineItem/locationResolver.d.ts

@@ -1,6 +1,6 @@
 import { Context } from "../context";
 import { SpineItem } from "./createSpineItem";
-declare type SpineItemPosition = {
+type SpineItemPosition = {
     x: number;
     y: number;
 };

package/dist/spineItem/navigationResolver.d.ts

@@ -1,6 +1,6 @@
 import { SpineItem } from "./createSpineItem";
 import { Context } from "../context";
-declare type SpineItemPosition = {
+type SpineItemPosition = {
     x: number;
     y: number;
 };

package/dist/spineItemManager.d.ts

@@ -1060,4 +1060,4 @@ export declare const createSpineItemManager: ({ context }: {
         }>;
     };
 };
-export declare type SpineItemManager = ReturnType<typeof createSpineItemManager>;
+export type SpineItemManager = ReturnType<typeof createSpineItemManager>;

package/dist/types/Hook.d.ts

@@ -1,6 +1,6 @@
 import { Manifest } from "@prose-reader/shared";
 import { Observable } from "rxjs";
-export declare type Hook = {
+export type Hook = {
     name: `item.onLoad`;
     fn: (manipulableFrame: {
         frame: HTMLIFrameElement;

package/dist/types/Spine.d.ts

@@ -6,17 +6,17 @@ import { createCfiLocator } from "../spine/cfiLocator";
 import { createLocationResolver } from "../spine/locationResolver";
 import { createLocationResolver as createSpineItemLocator } from "../spineItem/locationResolver";
 import { ViewportNavigationEntry } from "../spine/navigationResolver";
-declare type RequireLayout = boolean;
-declare type ManipulableSpineItemCallback = Parameters<SpineItem[`manipulateSpineItem`]>[0];
-declare type ManipulableSpineItemCallbackPayload = Parameters<ManipulableSpineItemCallback>[0];
-declare type CfiLocator = ReturnType<typeof createCfiLocator>;
-declare type SpineItemLocator = ReturnType<typeof createSpineItemLocator>;
-declare type Locator = ReturnType<typeof createLocationResolver>;
-declare type Event = {
+type RequireLayout = boolean;
+type ManipulableSpineItemCallback = Parameters<SpineItem[`manipulateSpineItem`]>[0];
+type ManipulableSpineItemCallbackPayload = Parameters<ManipulableSpineItemCallback>[0];
+type CfiLocator = ReturnType<typeof createCfiLocator>;
+type SpineItemLocator = ReturnType<typeof createSpineItemLocator>;
+type Locator = ReturnType<typeof createLocationResolver>;
+type Event = {
     type: `onSelectionChange`;
     data: ReturnType<typeof createSelection> | null;
 };
-export declare type Spine = {
+export type Spine = {
     element: HTMLElement;
     locator: Locator;
     spineItemLocator: SpineItemLocator;

package/dist/types/index.d.ts

@@ -1,9 +1,8 @@
 import type { Manifest } from "@prose-reader/shared";
-export declare type ViewportPosition = {
+export type ViewportPosition = {
     x: number;
     y: number;
 };
-export type { LoadOptions, Reader } from "./Reader";
 declare global {
     interface Window {
         __PROSE_READER_DEBUG?: boolean;

package/dist/utils/dom.d.ts

@@ -1,5 +1,5 @@
 export declare const isHtmlElement: (element?: Element | Node | null | EventTarget) => element is HTMLElement;
-declare type ViewPort = {
+type ViewPort = {
     left: number;
     right: number;
     top: number;

package/dist/viewportNavigator/manualViewportNavigator.d.ts

@@ -12,10 +12,7 @@ export declare const createManualViewportNavigator: ({ navigator, spineItemManag
     locator: ReturnType<typeof createLocationResolver>;
 }) => {
     destroy: () => void;
-    adjustReadingOffset: (_: {
-        x: number;
-        y: number;
-    }) => boolean;
+    adjustReadingOffset: () => boolean;
     turnLeft: ({ allowSpineItemChange }?: {
         allowSpineItemChange?: boolean | undefined;
     }) => void;

package/dist/viewportNavigator/panViewportNavigator.d.ts

@@ -27,10 +27,7 @@ export declare const createPanViewportNavigator: ({ getCurrentViewportPosition,
         final?: boolean | undefined;
     } | undefined) => void);
     destroy: () => void;
-    adjustReadingOffset: (_: {
-        x: number;
-        y: number;
-    }) => boolean;
+    adjustReadingOffset: () => boolean;
     $: {
         moveToSubject$: Subject<{
             position: ViewportNavigationEntry;

package/dist/viewportNavigator/scrollViewportNavigator.d.ts

@@ -4,7 +4,7 @@ import { Spine } from "../spine/createSpine";
 import { createNavigationResolver, ViewportNavigationEntry } from "../spine/navigationResolver";
 import { SpineItemManager } from "../spineItemManager";
 import { ViewportPosition } from "../types";
-declare type ScaledDownPosition = ViewportPosition;
+type ScaledDownPosition = ViewportPosition;
 export declare const createScrollViewportNavigator: ({ context, element, navigator, currentNavigationSubject$, spine, }: {
     context: Context;
     element: HTMLElement;

package/dist/viewportNavigator/types.d.ts

@@ -1,5 +1,5 @@
 import { SpineItem } from "../spineItem/createSpineItem";
-export declare type LastUserExpectedNavigation = undefined | {
+export type LastUserExpectedNavigation = undefined | {
     type: `navigate-from-previous-item`;
 } | {
     type: `navigate-from-next-item`;
@@ -10,7 +10,7 @@ export declare type LastUserExpectedNavigation = undefined | {
     type: `navigate-from-anchor`;
     data: string;
 };
-export declare type Navigation = {
+export type Navigation = {
     position: {
         x: number;
         y: number;
@@ -20,7 +20,7 @@ export declare type Navigation = {
     animation: false | `turn` | `snap`;
     lastUserExpectedNavigation: LastUserExpectedNavigation;
 };
-export declare type AdjustedNavigation = {
+export type AdjustedNavigation = {
     previousNavigationPosition: {
         x: number;
         y: number;

package/dist/viewportNavigator/viewportNavigator.d.ts

@@ -2,8 +2,8 @@ import { Context } from "../context";
 import { Pagination } from "../pagination";
 import { SpineItemManager } from "../spineItemManager";
 import { createLocationResolver } from "../spine/locationResolver";
+import { ViewportNavigationEntry } from "../spine/navigationResolver";
 import { BehaviorSubject, Observable } from "rxjs";
-import { SpineItem } from "../spineItem/createSpineItem";
 import { createCfiLocator } from "../spine/cfiLocator";
 import { Hook } from "../types/Hook";
 import { LastUserExpectedNavigation, Navigation } from "./types";
@@ -20,10 +20,7 @@ export declare const createViewportNavigator: ({ spineItemManager, context, pagi
 }) => {
     destroy: () => void;
     layout: () => void;
-    getCurrentNavigationPosition: () => {
-        x: number;
-        y: number;
-    };
+    getCurrentNavigationPosition: () => ViewportNavigationEntry;
     getCurrentViewportPosition: (() => {
         x: number;
         y: number;
@@ -46,17 +43,6 @@ export declare const createViewportNavigator: ({ spineItemManager, context, pagi
         animate: boolean;
     }) => void;
     goToPageOfCurrentChapter: (pageIndex: number) => void;
-    adjustNavigation: (spineItem: SpineItem) => Observable<{
-        previousNavigationPosition: {
-            x: number;
-            y: number;
-        };
-        adjustedSpinePosition: {
-            x: number;
-            y: number;
-        };
-        areDifferent: boolean;
-    }>;
     moveTo: ((delta: {
         x: number;
         y: number;
@@ -76,19 +62,10 @@ export declare const createViewportNavigator: ({ spineItemManager, context, pagi
         state$: Observable<"free" | "busy">;
         navigation$: Observable<Navigation>;
         navigationAdjustedAfterLayout$: Observable<{
-            previousNavigationPosition: {
-                x: number;
-                y: number;
-            };
-            adjustedSpinePosition: {
-                x: number;
-                y: number;
-            };
+            previousNavigationPosition: ViewportNavigationEntry;
+            adjustedSpinePosition: ViewportNavigationEntry;
             areDifferent: boolean;
         }>;
-        currentNavigationPosition$: Observable<{
-            x: number;
-            y: number;
-        }>;
+        currentNavigationPosition$: Observable<ViewportNavigationEntry>;
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prose-reader/core",
-  "version": "1.13.0",
+  "version": "1.15.0",
   "type": "module",
   "main": "./dist/prose.umd.cjs",
   "module": "./dist/prose.js",
@@ -21,10 +21,11 @@
     "lint:read": "prettier --check . && eslint .",
     "lint:write": "prettier --write . && eslint --fix .",
     "test": "vitest run --coverage",
+    "test:watch": "vitest watch",
     "tsc": "tsc"
   },
   "dependencies": {
-    "@prose-reader/shared": "^1.13.0"
+    "@prose-reader/shared": "^1.15.0"
   },
   "peerDependencies": {
     "rxjs": "*"
@@ -32,11 +33,12 @@
   "devDependencies": {
     "concurrently": "^7.4.0",
     "html-webpack-plugin": "^5.5.0",
+    "jsdom": "^21.1.0",
     "terser-webpack-plugin": "^5.3.0",
     "ts-loader": "^9.2.8",
     "webpack": "^5.65.0",
     "webpack-bundle-analyzer": "^4.5.0",
     "webpack-cli": "^4.9.1"
   },
-  "gitHead": "7e7c42735a696cb44ab2d945f03b5867b311bf45"
+  "gitHead": "d31fddf1134ea528cefdc680b02a1aa5adc5205d"
 }

package/dist/types/Reader.d.ts

@@ -1,68 +0,0 @@
-import { Context } from "../context";
-import { Spine } from "./Spine";
-import { SpineItemManager } from "../spineItemManager";
-import { RegisterHook } from "./Hook";
-import { Manifest } from "@prose-reader/shared";
-import { Pagination } from "../pagination";
-import { Observable } from "rxjs";
-import { createSelection } from "../selection";
-import { createViewportNavigator } from "../viewportNavigator/viewportNavigator";
-declare type ContextSettings = Parameters<Context[`setSettings`]>[0];
-declare type ViewportNavigator = ReturnType<typeof createViewportNavigator>;
-export declare type LoadOptions = {
-    cfi?: string;
-    fetchResource?: (item: Manifest[`spineItems`][number]) => Promise<Response>;
-};
-export declare type Reader = {
-    context: Context;
-    registerHook: RegisterHook;
-    spine: Spine;
-    viewportNavigator: ViewportNavigator;
-    manipulateSpineItems: Spine[`manipulateSpineItems`];
-    manipulateSpineItem: Spine[`manipulateSpineItem`];
-    manipulateContainer: (cb: (container: HTMLElement) => boolean) => void;
-    moveTo: ViewportNavigator[`moveTo`];
-    turnLeft: ViewportNavigator[`turnLeft`];
-    turnRight: ViewportNavigator[`turnRight`];
-    goToPageOfCurrentChapter: ViewportNavigator[`goToPageOfCurrentChapter`];
-    goToPage: ViewportNavigator[`goToPage`];
-    goToUrl: ViewportNavigator[`goToUrl`];
-    goToCfi: ViewportNavigator[`goToCfi`];
-    goToSpineItem: ViewportNavigator[`goToSpineItem`];
-    getFocusedSpineItemIndex: SpineItemManager[`getFocusedSpineItemIndex`];
-    getSpineItem: SpineItemManager[`get`];
-    getSpineItems: SpineItemManager[`getAll`];
-    getAbsolutePositionOf: SpineItemManager[`getAbsolutePositionOf`];
-    getSelection: Spine[`getSelection`];
-    isSelecting: Spine[`isSelecting`];
-    normalizeEventForViewport: Spine[`normalizeEventForViewport`];
-    getCfiMetaInformation: Spine[`cfiLocator`][`getCfiMetaInformation`];
-    resolveCfi: Spine[`cfiLocator`][`resolveCfi`];
-    generateCfi: Spine[`cfiLocator`][`generateFromRange`];
-    locator: Spine[`locator`];
-    getCurrentNavigationPosition: ViewportNavigator[`getCurrentNavigationPosition`];
-    getCurrentViewportPosition: ViewportNavigator[`getCurrentViewportPosition`];
-    layout: () => void;
-    load: (manifest: Manifest, loadOptions?: LoadOptions) => void;
-    destroy: () => void;
-    setSettings: Context[`setSettings`];
-    settings$: Context[`$`][`settings$`];
-    pagination$: Pagination[`$`][`info$`];
-    $: {
-        state$: Observable<{
-            supportedPageTurnAnimation: NonNullable<ContextSettings[`pageTurnAnimation`]>[];
-            supportedPageTurnMode: NonNullable<ContextSettings[`pageTurnMode`]>[];
-            supportedPageTurnDirection: NonNullable<ContextSettings[`pageTurnDirection`]>[];
-            supportedComputedPageTurnDirection: NonNullable<ContextSettings[`pageTurnDirection`]>[];
-        }>;
-        ready$: Observable<void>;
-        selection$: Observable<ReturnType<typeof createSelection> | null>;
-        viewportState$: ViewportNavigator[`$`][`state$`];
-        layout$: Spine[`$`][`layout$`];
-        itemsCreated$: Spine[`$`][`itemsCreated$`];
-        itemsBeforeDestroy$: Spine[`$`][`itemsBeforeDestroy$`];
-        itemIsReady$: SpineItemManager[`$`][`itemIsReady$`];
-        destroy$: Observable<void>;
-    };
-};
-export {};

package/dist/utils/compose.d.ts

@@ -1,8 +0,0 @@
-declare type Func<T extends any[], R> = (...a: T) => R;
-declare function compose<F extends Function>(f: F): F;
-declare function compose<A, T extends any[], R>(f1: (a: A) => R, f2: Func<T, A>): Func<T, R>;
-declare function compose<A, B, T extends any[], R>(f1: (b: B) => R, f2: (a: A) => B, f3: Func<T, A>): Func<T, R>;
-declare function compose<A, B, C, T extends any[], R>(f1: (c: C) => R, f2: (b: B) => C, f3: (a: A) => B, f4: Func<T, A>): Func<T, R>;
-declare function compose<R>(f1: (a: any) => R, ...funcs: Function[]): (...args: any[]) => R;
-declare function compose<R>(...funcs: Function[]): (...args: any[]) => R;
-export { compose };