pervert-monkey 1.0.18 → 1.0.20

package/README.md

@@ -7,14 +7,14 @@
 
 ## Userscripts
 ```shell
-src/userscripts/scripts # dev
-dist/userscripts        # build
+src/userscripts/scripts  # dev
+dist/userscripts         # build
 ```
 
 ## Build
 ```shell
-npm run build             # build core
-npm run build:userscripts # build userscripts
+npm run build    # build core
+npm run build:u  # build userscripts
 ```
 
 ## Dev

package/dist/core/pervertmonkey.core.es.d.ts

@@ -7,7 +7,7 @@ import { Subject } from 'rxjs';
 
 declare type AnyFunction = (...args: any[]) => any;
 
-export declare function checkHomogenity<T extends HTMLElement>(a: T, b: T, options: {
+export declare function areElementsAlike<T extends HTMLElement>(a: T, b: T, options: {
     id?: boolean;
     className?: boolean;
 }): boolean;
@@ -28,7 +28,7 @@ export declare type DataElement = {
 export declare class DataFilter {
     private rules;
     filters: Map<string, () => DataFilterFnRendered>;
-    filterMapping: Record<string, string>;
+    filterDepsMapping: Record<string, string>;
     constructor(rules: Rules);
     static isFiltered(e: HTMLElement): boolean;
     createCssFilters(wrapper?: (cssRule: string) => string): void;
@@ -69,7 +69,7 @@ export declare class DataManager {
     data: Map<string, DataElement>;
     private lazyImgLoader;
     dataFilter: DataFilter;
-    constructor(rules: Rules, containerHomogenity?: Parameters<typeof checkHomogenity>[2] | undefined);
+    constructor(rules: Rules, containerHomogenity?: Parameters<typeof areElementsAlike>[2] | undefined);
     applyFilters(filters?: Record<string, boolean>, offset?: number): Promise<void>;
     filterAll(offset?: number): Promise<void>;
     parseData(html: HTMLElement, container?: HTMLElement, removeDuplicates?: boolean, shouldLazify?: boolean): Promise<void>;
@@ -223,8 +223,6 @@ export declare function fetchWith<T extends JSON | string | HTMLElement>(input:
 
 export declare function findNextSibling<T extends Element = HTMLElement>(e: T): Element | null;
 
-export declare function findSelfOrChild<T extends HTMLElement>(element: T, selector: string): T | null;
-
 /**
  * Converts a duration string (e.g., "1h 22min 3sec") to HH:MM:SS format.
  * @param timeStr - The duration string to format.
@@ -237,12 +235,11 @@ declare type GeneratorResult = {
     offset: number;
 };
 
-export declare function getCommonParents(elements: HTMLCollection | HTMLElement[]): HTMLElement[];
+export declare function getCommonParents<T extends HTMLElement>(elements: Iterable<T>): HTMLElement[];
 
 export declare function getPaginationStrategy(options: Partial<PaginationStrategy>): PaginationStrategy;
 
 export declare class InfiniteScroller {
-    enabled: boolean;
     paginationOffset: number;
     rules: Rules;
     private observer?;
@@ -381,7 +378,7 @@ export declare function parseHtml(html: string): HTMLElement;
 
 export declare function parseIntegerOr(n: string | number, or: number): number;
 
-export declare function parseNumberWithLetter(str: string): number;
+export declare function parseNumericAbbreviation(str: string): number;
 
 export declare function parseUrl(s: HTMLAnchorElement | Location | URL | string): URL;
 
@@ -391,6 +388,8 @@ export declare function querySelectorLast<T extends Element = HTMLElement>(root:
 
 export declare function querySelectorLastNumber(selector: string, e?: ParentNode): number;
 
+export declare function querySelectorOrSelf<T extends Element = HTMLElement>(element: T, selector: string): T | null;
+
 export declare function querySelectorText(e: ParentNode, selector?: string): string;
 
 export declare function range(size: number, start?: number, step?: number): number[];
@@ -408,17 +407,17 @@ export declare function removeClassesAndDataAttributes(element: HTMLElement, key
 export declare function replaceElementTag(e: HTMLElement, tagName: string): HTMLElement;
 
 export declare class Rules {
+    thumbs: Parameters<typeof ThumbsParser.create>[0];
+    thumbsParser: ThumbsParser;
     thumb: Parameters<typeof ThumbDataParser.create>[0];
     thumbDataParser: ThumbDataParser;
     thumbImg: Parameters<typeof ThumbImgParser.create>[0];
     thumbImgParser: ThumbImgParser;
-    thumbs: Parameters<typeof ThumbsParser.create>[0];
-    thumbsParser: ThumbsParser;
     containerSelector: string | (() => HTMLElement);
     containerSelectorLast?: string;
     get container(): HTMLElement;
     intersectionObservableSelector?: string;
-    get intersectionObservable(): "" | Element | null | undefined;
+    get intersectionObservable(): HTMLElement | null | undefined;
     get observable(): HTMLElement;
     paginationStrategyOptions: Partial<PaginationStrategy>;
     paginationStrategy: PaginationStrategy;
@@ -501,13 +500,11 @@ export declare class ThumbImgParser {
 }
 
 export declare class ThumbsParser {
-    containerSelector: string;
     selector: string;
     strategy: 'default' | 'auto';
     transform?: (thumb: HTMLElement) => void;
-    static create(options: Partial<Pick<ThumbsParser, "selector" | "strategy" | "transform">> | undefined, containerSelector: string): ThumbsParser & Partial<Pick<ThumbsParser, "selector" | "strategy" | "transform">>;
-    constructor(containerSelector: string);
-    getThumbs(html: HTMLElement): HTMLElement[];
+    static create(options?: Partial<Pick<ThumbsParser, 'selector' | 'strategy' | 'transform'>>): ThumbsParser & Partial<Pick<ThumbsParser, "selector" | "strategy" | "transform">>;
+    getThumbs(container: HTMLElement): HTMLElement[];
 }
 
 export declare class Tick {

package/dist/core/pervertmonkey.core.es.js

@@ -172,15 +172,19 @@ function watchDomChangesWithThrottle(element, callback, throttle = 1e3, times =
   observer.observe(element, options);
   return observer;
 }
-function findSelfOrChild(element, selector) {
-  if (element.matches(selector)) {
+function querySelectorOrSelf(element, selector) {
+  var _a3;
+  if ((_a3 = element.matches) == null ? void 0 : _a3.call(element, selector)) {
     return element;
   }
   return element.querySelector(selector);
 }
 function querySelectorLast(root = document, selector) {
   const nodes = root.querySelectorAll(selector);
-  return nodes.length > 0 ? nodes[nodes.length - 1] : void 0;
+  if (nodes.length < 1) {
+    return querySelectorOrSelf(root, selector) || void 0;
+  }
+  return nodes[nodes.length - 1];
 }
 function querySelectorLastNumber(selector, e = document) {
   var _a3;
@@ -190,7 +194,7 @@ function querySelectorLastNumber(selector, e = document) {
 function querySelectorText(e, selector) {
   var _a3;
   if (typeof selector !== "string") return "";
-  const text = ((_a3 = e.querySelector(selector)) == null ? void 0 : _a3.innerText) || "";
+  const text = ((_a3 = querySelectorOrSelf(e, selector)) == null ? void 0 : _a3.innerText) || "";
   return sanitizeStr(text);
 }
 function parseHtml(html) {
@@ -226,19 +230,16 @@ function removeClassesAndDataAttributes(element, keyword) {
   });
 }
 function getCommonParents(elements) {
-  const parents = Array.from(elements).map((e) => e.parentElement).filter((parent) => parent !== null);
-  return [...new Set(parents)];
+  return Map.groupBy(elements, (e) => e.parentElement).keys().filter((e) => e !== null).toArray();
 }
 function findNextSibling(e) {
   if (e.nextElementSibling) return e.nextElementSibling;
   if (e.parentElement) return findNextSibling(e.parentElement);
   return null;
 }
-function checkHomogenity(a2, b2, options) {
+function areElementsAlike(a2, b2, options) {
   if (!a2 || !b2) return false;
-  if (options.id) {
-    if (a2.id !== b2.id) return false;
-  }
+  if (options.id && a2.id !== b2.id) return false;
   if (options.className) {
     const ca2 = a2.className;
     const cb = b2.className;
@@ -437,7 +438,7 @@ function parseIntegerOr(n, or2) {
   const num = Number(n);
   return Number.isSafeInteger(num) ? num : or2;
 }
-function parseNumberWithLetter(str) {
+function parseNumericAbbreviation(str) {
   var _a3;
   const multipliers = { k: 1e3, m: 1e6 };
   const match = str.trim().match(/([\d., ]+)(\w)?/);
@@ -552,7 +553,7 @@ const defaultDataFilterFns = {
 class DataFilter {
   constructor(rules) {
     __publicField(this, "filters", /* @__PURE__ */ new Map());
-    __publicField(this, "filterMapping", {});
+    __publicField(this, "filterDepsMapping", {});
     __publicField(this, "customDataFilterFns", {});
     this.rules = rules;
     this.registerFilters(rules.customDataFilterFns);
@@ -583,12 +584,12 @@ class DataFilter {
     );
     dataFilterFn.deps.push(customSelectorName);
     dataFilterFn.deps.forEach((name) => {
-      Object.assign(this.filterMapping, { [name]: customSelectorName });
+      Object.assign(this.filterDepsMapping, { [name]: customSelectorName });
     });
     this.filters.set(customSelectorName, dataFilterFn.renderFn(this.rules.store.state));
   }
   selectFilters(filters) {
-    const selectedFilters = Object.keys(filters).filter((k2) => k2 in this.filterMapping).map((k2) => this.filterMapping[k2]).map((k2) => this.filters.get(k2));
+    const selectedFilters = Object.keys(filters).filter((k2) => k2 in this.filterDepsMapping).map((k2) => this.filterDepsMapping[k2]).map((k2) => this.filters.get(k2));
     return selectedFilters;
   }
 }
@@ -645,12 +646,12 @@ class DataManager {
     const homogenity = !!this.containerHomogenity;
     for (const thumbElement of thumbs) {
       const url = this.rules.thumbDataParser.getUrl(thumbElement);
-      const isHomogenic = homogenity && !checkHomogenity(
+      const isNotHomogenic = homogenity && !areElementsAlike(
         parent,
         thumbElement.parentElement,
         this.containerHomogenity
       );
-      if (!url || this.data.has(url) || parent !== container && (parent == null ? void 0 : parent.contains(thumbElement)) || isHomogenic) {
+      if (!url || this.data.has(url) || parent !== container && (parent == null ? void 0 : parent.contains(thumbElement)) || isNotHomogenic) {
         if (removeDuplicates) thumbElement.remove();
         continue;
       }
@@ -1954,14 +1955,13 @@ function takeUntil(notifier) {
 }
 class InfiniteScroller {
   constructor(options) {
-    __publicField(this, "enabled", true);
     __publicField(this, "paginationOffset", 1);
     __publicField(this, "rules");
     __publicField(this, "observer");
     __publicField(this, "paginationGenerator");
     __publicField(this, "subject", new Subject());
     __publicField(this, "generatorConsumer", async () => {
-      if (!this.enabled) return false;
+      if (!this.rules.store.state.infiniteScrollEnabled) return true;
       const { value, done } = await this.paginationGenerator.next();
       if (done) return false;
       const { url, offset } = value;
@@ -2027,9 +2027,8 @@ class InfiniteScroller {
     }
   }
   static create(rules) {
-    const enabled = rules.store.state.infiniteScrollEnabled;
     rules.store.state.$paginationLast = rules.paginationStrategy.getPaginationLast();
-    const infiniteScroller = new InfiniteScroller({ enabled, rules });
+    const infiniteScroller = new InfiniteScroller({ rules });
     rules.store.state.$paginationOffset = infiniteScroller.paginationOffset;
     infiniteScroller.subject.subscribe((x2) => {
       if (x2.type === "scroll") {
@@ -2040,9 +2039,6 @@ class InfiniteScroller {
         });
       }
     });
-    rules.store.stateSubject.subscribe(() => {
-      infiniteScroller.enabled = rules.store.state.infiniteScrollEnabled;
-    });
     return infiniteScroller;
   }
 }
@@ -3080,7 +3076,7 @@ class ThumbDataParser {
     return { title, duration };
   }
   getUrl(thumb) {
-    return (thumb.querySelector("a[href]") || thumb).href;
+    return querySelectorOrSelf(thumb, "a[href]").href;
   }
   preprocessCustomThumbDataSelectors() {
     if (!this.selectors) return;
@@ -3101,7 +3097,7 @@ class ThumbDataParser {
   getThumbDataWith(thumb, { type, selector }) {
     var _a3;
     if (type === "boolean") {
-      return !!thumb.querySelector(selector);
+      return !!querySelectorOrSelf(thumb, selector);
     }
     if (type === "string") {
       return sanitizeStr(((_a3 = querySelectorLast(thumb, selector)) == null ? void 0 : _a3.innerText) || "");
@@ -3111,7 +3107,7 @@ class ThumbDataParser {
     }
     if (type === "float") {
       const value = querySelectorText(thumb, selector);
-      return parseNumberWithLetter(value);
+      return parseNumericAbbreviation(value);
     }
     return Number.parseInt(querySelectorText(thumb, selector));
   }
@@ -3180,24 +3176,21 @@ class ThumbImgParser {
   }
 }
 class ThumbsParser {
-  constructor(containerSelector) {
+  constructor() {
     __publicField(this, "selector", ".thumb");
     __publicField(this, "strategy", "default");
     __publicField(this, "transform");
-    this.containerSelector = containerSelector;
   }
-  static create(options = {}, containerSelector) {
-    return Object.assign(new ThumbsParser(containerSelector), options);
+  static create(options = {}) {
+    return Object.assign(new ThumbsParser(), options);
   }
-  getThumbs(html) {
-    if (!html) return [];
-    let thumbs;
+  getThumbs(container) {
+    if (!container) return [];
     if (this.strategy === "auto") {
       if (typeof this.selector !== "string") return [];
-      const container = html.querySelector(this.containerSelector);
-      thumbs = [...(container == null ? void 0 : container.children) || []];
+      return [...(container == null ? void 0 : container.children) || []];
     }
-    thumbs = Array.from(html.querySelectorAll(this.selector));
+    const thumbs = Array.from(container.querySelectorAll(this.selector));
     if (typeof this.transform === "function") {
       thumbs.forEach(this.transform);
     }
@@ -9866,12 +9859,12 @@ function getSelectorFnsFromScheme(xs2) {
 }
 class Rules {
   constructor(options) {
+    __publicField(this, "thumbs", {});
+    __publicField(this, "thumbsParser");
     __publicField(this, "thumb", {});
     __publicField(this, "thumbDataParser");
     __publicField(this, "thumbImg", {});
     __publicField(this, "thumbImgParser");
-    __publicField(this, "thumbs", {});
-    __publicField(this, "thumbsParser");
     __publicField(this, "containerSelector", ".container");
     __publicField(this, "containerSelectorLast");
     __publicField(this, "intersectionObservableSelector");
@@ -9895,9 +9888,9 @@ class Rules {
     __publicField(this, "onResetCallback");
     if (this.isEmbedded) throw Error("Embedded is not supported");
     Object.assign(this, options);
+    this.thumbsParser = ThumbsParser.create(this.thumbs);
     this.thumbDataParser = ThumbDataParser.create(this.thumb);
     this.thumbImgParser = ThumbImgParser.create(this.thumbImg);
-    this.thumbsParser = ThumbsParser.create(this.thumbs, this.containerSelector);
     this.paginationStrategy = getPaginationStrategy(this.paginationStrategyOptions);
     this.store = this.createStore();
     this.gui = this.createGui();
@@ -9908,15 +9901,16 @@ class Rules {
   }
   get container() {
     if (typeof this.containerSelectorLast === "string") {
-      return querySelectorLast(document, this.containerSelectorLast);
+      return querySelectorLast(document.body, this.containerSelectorLast);
     }
     if (typeof this.containerSelector === "string") {
-      return document.querySelector(this.containerSelector);
+      return querySelectorOrSelf(document.body, this.containerSelector);
     }
     return this.containerSelector();
   }
   get intersectionObservable() {
-    return this.intersectionObservableSelector && document.querySelector(this.intersectionObservableSelector);
+    if (!this.intersectionObservableSelector) return void 0;
+    return document.querySelector(this.intersectionObservableSelector);
   }
   get observable() {
     return this.intersectionObservable || this.paginationStrategy.getPaginationElement();
@@ -10010,7 +10004,7 @@ export {
   ThumbImgParser,
   ThumbsParser,
   Tick,
-  checkHomogenity,
+  areElementsAlike,
   chunks,
   circularShift,
   containMutation,
@@ -10022,7 +10016,6 @@ export {
   fetchText,
   fetchWith,
   findNextSibling,
-  findSelfOrChild,
   formatTimeToHHMMSS,
   getCommonParents,
   getPaginationStrategy,
@@ -10034,10 +10027,11 @@ export {
   parseDataParams,
   parseHtml,
   parseIntegerOr,
-  parseNumberWithLetter,
+  parseNumericAbbreviation,
   parseUrl,
   querySelectorLast,
   querySelectorLastNumber,
+  querySelectorOrSelf,
   querySelectorText,
   range,
   removeClassesAndDataAttributes,