pervert-monkey 1.0.19 → 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;
@@ -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>;
@@ -407,12 +407,12 @@ 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;

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

@@ -237,11 +237,9 @@ function findNextSibling(e) {
   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;
@@ -648,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;
       }
@@ -3078,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;
@@ -9861,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");
@@ -9890,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.paginationStrategy = getPaginationStrategy(this.paginationStrategyOptions);
     this.store = this.createStore();
     this.gui = this.createGui();
@@ -10006,7 +10004,7 @@ export {
   ThumbImgParser,
   ThumbsParser,
   Tick,
-  checkHomogenity,
+  areElementsAlike,
   chunks,
   circularShift,
   containMutation,