billy-herrington-utils 1.4.5 → 1.4.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "billy-herrington-utils",
   "description": "daddy told us not to be ashamed of our utils",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "license": "MIT",
   "keywords": [
     "utils",

package/src/index.ts

@@ -1,6 +1,13 @@
 export { DataManager } from './userscripts/data-manager';
 export { InfiniteScroller } from './userscripts/infinite-scroll';
 export { createInfiniteScroller } from './userscripts/jabroni-outfit-wrap';
+export { getPaginationStrategy } from './userscripts/pagination-parsing';
+export {
+  PaginationStrategy,
+  PaginationStrategyDataParams,
+  PaginationStrategyPathnameParams,
+  PaginationStrategySearchParams,
+} from './userscripts/pagination-parsing/pagination-strategies';
 export { chunks, range } from './utils/arrays';
 export { AsyncPool, computeAsyncOneAtTime, wait } from './utils/async';
 export { isMob } from './utils/device';

package/src/userscripts/infinite-scroll/index.ts

@@ -9,7 +9,7 @@ interface IInfiniteScroller {
   paginationLast: number;
   paginationElement: HTMLElement;
   paginationUrlGenerator: (offset: number) => string;
-  handleHtmlCallback: (document: HTMLElement) => void;
+  parseData: (document: HTMLElement) => void;
   intersectionObservable?: HTMLElement;
   alternativeGenerator?: () => OffsetGenerator;
 }
@@ -28,17 +28,17 @@ export class InfiniteScroller {
   public paginationOffset: number;
   public paginationLast: number;
   public writeHistory: boolean;
-  private handleHtmlCallback: (document: HTMLElement) => void;
+  private parseData: (document: HTMLElement) => void;
 
   constructor({
     enabled = true,
-    delay = 350,
+    delay = 300,
     writeHistory = false,
     paginationOffset,
     paginationLast,
     paginationElement,
     paginationUrlGenerator,
-    handleHtmlCallback,
+    parseData,
     alternativeGenerator,
     intersectionObservable,
   }: IInfiniteScroller) {
@@ -47,7 +47,7 @@ export class InfiniteScroller {
     this.writeHistory = writeHistory;
     this.paginationOffset = paginationOffset;
     this.paginationLast = paginationLast;
-    this.handleHtmlCallback = handleHtmlCallback;
+    this.parseData = parseData;
 
     this.paginationGenerator =
       alternativeGenerator?.() ??
@@ -82,7 +82,7 @@ export class InfiniteScroller {
       const nextPageHTML = await fetchHtml(url);
       const prevScrollPos = document.documentElement.scrollTop;
       this.paginationOffset = offset;
-      this.handleHtmlCallback(nextPageHTML);
+      this.parseData(nextPageHTML);
       this._onScroll();
       window.scrollTo(0, prevScrollPos);
       if (this.writeHistory) {

package/src/userscripts/jabroni-outfit-wrap/index.ts

@@ -18,14 +18,16 @@ export interface JabroniStore {
 
 export function createInfiniteScroller(
   store: JabroniStore,
-  handleHtmlCallback: (document: HTMLElement) => void,
+  parseData: (document: HTMLElement) => void,
   rules: IRules,
 ) {
   const enabled = store.state.infiniteScrollEnabled as boolean;
+
   const iscroller = new InfiniteScroller({
     enabled,
-    handleHtmlCallback,
+    parseData,
     ...rules,
+    ...rules.paginationStrategy,
   }).onScroll(({ paginationLast, paginationOffset }) => {
     store.localState.pagIndexLast = paginationLast;
     store.localState.pagIndexCur = paginationOffset;

package/src/userscripts/pagination-parsing/pagination-strategies/PaginationStrategy.ts

@@ -30,4 +30,15 @@ export class PaginationStrategy {
   getPaginationElement() {
     return (this.doc.querySelector(this.paginationSelector) || this.doc) as HTMLElement;
   }
+
+  getPaginationOffset() {
+    return this.offsetMin;
+  }
+  getPaginationLast() {
+    return this.offsetMin;
+  }
+
+  getPaginationUrlGenerator() {
+    return (_: number) => this.url.href;
+  }
 }

package/src/userscripts/pagination-parsing/pagination-strategies/PaginationStrategyTrash.ts

@@ -26,9 +26,9 @@ export class PaginationStrategyTrash extends PaginationStrategy {
   };
 
   getPaginationUrlGenerator() {
-    const paginationUrlGenerator = () => {
+    const paginationUrlGenerator = (_: number) => {
       this.eHentaiNext();
-      return unsafeWindow.PAGINATION_NEXT;
+      return unsafeWindow.PAGINATION_NEXT as string;
     };
 
     return paginationUrlGenerator;