billy-herrington-utils 2.0.0 → 2.0.2

package/dist/index.d.ts

@@ -216,6 +216,7 @@ export declare class RulesGlobal {
     thumbsSelector: string;
     getThumbsStrategy: 'default' | 'auto';
     getThumbs(html: HTMLElement): HTMLElement[];
+    paginationStrategyOptions: Parameters<typeof getPaginationStrategy>[0];
     paginationStrategy: PaginationStrategy;
     get observable(): HTMLElement;
     mutationObservers: MutationObserver[];
@@ -231,7 +232,7 @@ export declare class RulesGlobal {
     scheme: JabroniTypes.SchemeInput;
     gui: JabronioGUI;
     dataManager: DataManager;
-    infiniteScroller: InfiniteScroller;
+    infiniteScroller?: InfiniteScroller;
     private resetInfiniteScroller;
     initialGrope: 'all-in-one' | 'all-in-all' | undefined;
     gropeInit(): void;

package/package.json

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

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

@@ -39,6 +39,7 @@ export class PaginationStrategyPathnameParams extends PaginationStrategy {
     const links = getPaginationLinks(
       (this.getPaginationElement() || document) as HTMLElement,
       this.url.href,
+      true,
       this.pathnameSelector,
     );
     const pages = Array.from(links, this.extractPage);

package/src/userscripts/pagination-parsing/pagination-utils/index.ts

@@ -6,6 +6,7 @@ export function parseURL(s: HTMLAnchorElement | Location | URL | string): URL {
 export function getPaginationLinks(
   doc: Element | HTMLElement | Document = document,
   url: Location | URL | string = location.href,
+  pathnameStrict = true,
   pathnameSelector = /\/(page\/)?\d+\/?$/,
 ): string[] {
   const currentUrl = parseURL(url);
@@ -20,7 +21,7 @@ export function getPaginationLinks(
       return (
         // in case of origin sometimes it's protocols problem cause some links can be not https but http
         linkUrl.hostname === currentUrl.hostname &&
-        linkUrl.pathname.startsWith(currentUrl.pathname)
+        (pathnameStrict ? linkUrl.pathname.startsWith(currentUrl.pathname) : true)
       );
     } catch {
       return false;

package/src/userscripts/rules/index.ts

@@ -131,7 +131,8 @@ export class RulesGlobal {
     return thumbs;
   }
 
-  paginationStrategy = getPaginationStrategy({});
+  paginationStrategyOptions: Parameters<typeof getPaginationStrategy>[0] = {};
+  paginationStrategy = getPaginationStrategy(this.paginationStrategyOptions);
 
   // get paginationElement() {
   //   return this.paginationStrategy.getPaginationElement();
@@ -160,7 +161,7 @@ export class RulesGlobal {
     this.mutationObservers.forEach((o) => {
       o.disconnect();
     });
-    this.infiniteScroller = this.resetInfiniteScroller();
+    this.resetInfiniteScroller();
     this.resetOn();
   }
 
@@ -194,17 +195,17 @@ export class RulesGlobal {
   public scheme = setupScheme(this.defaultSchemeOptions, this.customScheme);
   public gui = new JabronioGUI(this.scheme, this.store);
   public dataManager = new DataManager(this, this.store.state);
-  public infiniteScroller: InfiniteScroller;
+  public infiniteScroller?: InfiniteScroller;
 
-  private resetInfiniteScroller = () => {
+  private resetInfiniteScroller() {
     this.infiniteScroller?.dispose();
-    const infiniteScroller = InfiniteScroller.create(
+    if (!this.paginationStrategy.hasPagination) return;
+    this.infiniteScroller = InfiniteScroller.create(
       this.store,
       this,
       this.dataManager.parseData,
     );
-    return infiniteScroller;
-  };
+  }
 
   public initialGrope: 'all-in-one' | 'all-in-all' | undefined;
 
@@ -222,7 +223,7 @@ export class RulesGlobal {
 
   constructor() {
     this.store.subscribe(() => this.dataManager.applyFilters());
-    this.infiniteScroller = this.resetInfiniteScroller();
+    this.resetInfiniteScroller();
     this.resetOn();
     this.animatePreview?.();
     this.gropeInit();