pervert-monkey 1.0.17 → 1.0.18

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

@@ -16,6 +16,8 @@ export declare function chunks<T>(arr: T[], size: number): T[][];
 
 export declare function circularShift(n: number, c?: number, s?: number): number;
 
+export declare function containMutation(container: HTMLElement, callback: () => void): void;
+
 export declare function copyAttributes<T extends Element = HTMLElement>(target: T, source: T): void;
 
 export declare type DataElement = {
@@ -68,11 +70,9 @@ export declare class DataManager {
     private lazyImgLoader;
     dataFilter: DataFilter;
     constructor(rules: Rules, containerHomogenity?: Parameters<typeof checkHomogenity>[2] | undefined);
-    applyFilters: (filters?: Record<string, boolean>, offset?: number) => Promise<void>;
-    layoutStylePaintEnabled: boolean;
-    private layoutStylePaint;
-    filterAll: (offset?: number) => Promise<void>;
-    parseData: (html: HTMLElement, container?: HTMLElement, removeDuplicates?: boolean, shouldLazify?: boolean) => void;
+    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>;
     sortBy<K extends keyof DataElement>(key: K, direction?: boolean): void;
 }
 
@@ -200,11 +200,11 @@ declare const DefaultScheme: [{
     }];
 }];
 
-export declare function downloader(options?: {
-    append: string;
-    after: string;
-    button: string;
-    cbBefore: () => void;
+export declare function downloader(options: {
+    append?: string;
+    after?: string;
+    buttonHtml: string;
+    doBefore?: () => void;
 }): void;
 
 export declare function exterminateVideo(video: HTMLVideoElement): void;
@@ -223,6 +223,8 @@ 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.
@@ -261,6 +263,8 @@ declare type InfiniteScrollerOptions = Pick<InfiniteScroller, 'rules'> & Partial
 
 export declare function instantiateTemplate(sourceSelector: string, attributeUpdates: Record<string, string>, contentUpdates: Record<string, string>): string;
 
+export declare function irange(start?: number, step?: number): Generator<number, void, unknown>;
+
 declare type IScrollerSubject = {
     type: 'scroll';
     scroller: InfiniteScroller;
@@ -445,6 +449,8 @@ export declare class Rules {
     constructor(options: Partial<Rules>);
 }
 
+export declare function runIdleJob<T>(iterator: Iterator<T>, job: (v: T) => void): Promise<unknown>;
+
 export declare function sanitizeStr(s: string): string;
 
 declare type SchemeKeys = JabroniTypes.ExtractValuesByKey<typeof DefaultScheme, 'title'>;

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

@@ -172,6 +172,12 @@ function watchDomChangesWithThrottle(element, callback, throttle = 1e3, times =
   observer.observe(element, options);
   return observer;
 }
+function findSelfOrChild(element, selector) {
+  if (element.matches(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;
@@ -264,15 +270,15 @@ function exterminateVideo(video) {
   video.load();
   video.remove();
 }
-function downloader(options = { append: "", after: "", button: "", cbBefore: () => {
-} }) {
+function downloader(options) {
   var _a3, _b2;
-  const btn = parseHtml(options.button);
+  const btn = parseHtml(options.buttonHtml);
   if (options.append) (_a3 = document.querySelector(options.append)) == null ? void 0 : _a3.append(btn);
   if (options.after) (_b2 = document.querySelector(options.after)) == null ? void 0 : _b2.after(btn);
-  btn.addEventListener("click", (e) => {
+  btn == null ? void 0 : btn.addEventListener("click", (e) => {
+    var _a4;
     e.preventDefault();
-    if (options.cbBefore) options.cbBefore();
+    (_a4 = options.doBefore) == null ? void 0 : _a4.call(options);
     waitForElementToAppear(document.body, "video", (video) => {
       window.location.href = video.getAttribute("src");
     });
@@ -466,6 +472,42 @@ function parseDataParams(str) {
 function parseCssUrl(s) {
   return s.replace(/url\("|"\).*/g, "");
 }
+function runIdleJob(iterator2, job) {
+  return new Promise((resolve) => {
+    const scheduler = window.requestIdleCallback || ((cb) => {
+      return setTimeout(() => {
+        cb({
+          didTimeout: true,
+          timeRemaining: () => 50
+        });
+      }, 1);
+    });
+    function runBatch(deadline) {
+      while (deadline.timeRemaining() > 0) {
+        const { value, done } = iterator2.next();
+        if (done) {
+          resolve(true);
+          return;
+        }
+        job(value);
+      }
+      scheduler(runBatch);
+    }
+    scheduler(runBatch);
+  });
+}
+function containMutation(container, callback) {
+  container.style.contain = "content";
+  try {
+    callback();
+  } finally {
+    requestAnimationFrame(() => {
+      requestAnimationFrame(() => {
+        container.style.contain = "none";
+      });
+    });
+  }
+}
 function createTextFilter(filterName, dataPropName, positive) {
   const filterNameValue = `${filterName}Words`;
   return {
@@ -557,136 +599,82 @@ class DataManager {
       (target) => !DataFilter.isFiltered(target)
     ));
     __publicField(this, "dataFilter");
-    __publicField(this, "applyFilters", async (filters = {}, offset = 0) => {
-      const filtersToApply = this.dataFilter.selectFilters(filters);
-      if (filtersToApply.length === 0) return;
-      const iterator2 = this.data.values().drop(offset);
-      let finished = false;
-      const updates = [];
-      await new Promise((resolve) => {
-        function runBatch(deadline) {
-          while (deadline.timeRemaining() > 0) {
-            const { value, done } = iterator2.next();
-            finished = !!done;
-            if (done) break;
-            for (const f of filtersToApply) {
-              const { name, condition } = f()(value);
-              updates.push({ e: value.element, name, condition });
-            }
-          }
-          if (!finished) {
-            requestIdleCallback(runBatch);
-          } else {
-            resolve(true);
-          }
-        }
-        requestIdleCallback(runBatch);
-      });
-      const parents = [...new Set(updates.map((u) => u.e.parentElement))].filter(
-        (_2) => _2 !== null
-      );
-      requestAnimationFrame(() => {
-        const revertDisplayStyle = parents.map((p) => {
-          const display = p.style.display;
-          p.style.display = "none";
-          this.layoutStylePaint(p);
-          p.style.willChange = "contents";
-          return () => {
-            p.style.display = display;
-            requestAnimationFrame(() => {
-              p.style.willChange = "auto";
-            });
-          };
-        });
-        updates.forEach((u) => {
+    this.rules = rules;
+    this.containerHomogenity = containerHomogenity;
+    this.dataFilter = new DataFilter(this.rules);
+  }
+  async applyFilters(filters = {}, offset = 0) {
+    const filtersToApply = this.dataFilter.selectFilters(filters);
+    if (filtersToApply.length === 0) return;
+    const iterator2 = this.data.values().drop(offset);
+    const updates = [];
+    await runIdleJob(iterator2, (v2) => {
+      for (const f of filtersToApply) {
+        const { name, condition } = f()(v2);
+        updates.push({ e: v2.element, name, condition });
+      }
+    });
+    const parents = Map.groupBy(updates, (u) => u.e.parentElement);
+    parents.forEach((v2, parent) => {
+      const f = () => {
+        v2.forEach((u) => {
           u.e.classList.toggle(u.name, u.condition);
         });
-        revertDisplayStyle.forEach((f) => {
-          f == null ? void 0 : f();
-        });
-      });
-    });
-    __publicField(this, "layoutStylePaintEnabled", false);
-    __publicField(this, "filterAll", async (offset) => {
-      const keys = Array.from(this.dataFilter.filters.keys());
-      const filters = Object.fromEntries(
-        keys.map((k2) => [k2, this.rules.store.state[k2]])
-      );
-      await this.applyFilters(filters, offset);
-    });
-    __publicField(this, "parseData", (html, container, removeDuplicates = false, shouldLazify = true) => {
-      const thumbs = this.rules.thumbsParser.getThumbs(html);
-      const dataOffset = this.data.size;
-      const fragment = document.createDocumentFragment();
-      const parent = container || this.rules.container;
-      const homogenity = !!this.containerHomogenity;
-      for (const thumbElement of thumbs) {
-        const url = this.rules.thumbDataParser.getUrl(thumbElement);
-        if (!url || this.data.has(url) || parent !== container && (parent == null ? void 0 : parent.contains(thumbElement)) || homogenity && !checkHomogenity(
-          parent,
-          thumbElement.parentElement,
-          this.containerHomogenity
-        )) {
-          if (removeDuplicates) thumbElement.remove();
-          continue;
-        }
-        const data = this.rules.thumbDataParser.getThumbData(thumbElement);
-        this.data.set(url, { element: thumbElement, ...data });
-        if (shouldLazify) {
-          const { img, imgSrc } = this.rules.thumbImgParser.getImgData(thumbElement);
-          this.lazyImgLoader.lazify(thumbElement, img, imgSrc);
-        }
-        fragment.append(thumbElement);
-      }
-      this.filterAll(dataOffset).then(() => {
-        if (!parent) return;
-        parent.style.willChange = "contents";
+      };
+      if (!parent) {
+        f();
+      } else {
         requestAnimationFrame(() => {
-          parent == null ? void 0 : parent.appendChild(fragment);
-          requestAnimationFrame(() => {
-            parent.style.willChange = "auto";
-          });
+          containMutation(parent, f);
         });
-      });
+      }
     });
-    this.rules = rules;
-    this.containerHomogenity = containerHomogenity;
-    this.dataFilter = new DataFilter(this.rules);
   }
-  layoutStylePaint(e) {
-    if (!this.layoutStylePaintEnabled) return;
-    e.style.contain = "layout style paint";
+  async filterAll(offset) {
+    const keys = Array.from(this.dataFilter.filters.keys());
+    const filters = Object.fromEntries(
+      keys.map((k2) => [k2, this.rules.store.state[k2]])
+    );
+    await this.applyFilters(filters, offset);
+  }
+  async parseData(html, container, removeDuplicates = false, shouldLazify = true) {
+    const thumbs = this.rules.thumbsParser.getThumbs(html);
+    const dataOffset = this.data.size;
+    const fragment = document.createDocumentFragment();
+    const parent = container || this.rules.container;
+    const homogenity = !!this.containerHomogenity;
+    for (const thumbElement of thumbs) {
+      const url = this.rules.thumbDataParser.getUrl(thumbElement);
+      const isHomogenic = homogenity && !checkHomogenity(
+        parent,
+        thumbElement.parentElement,
+        this.containerHomogenity
+      );
+      if (!url || this.data.has(url) || parent !== container && (parent == null ? void 0 : parent.contains(thumbElement)) || isHomogenic) {
+        if (removeDuplicates) thumbElement.remove();
+        continue;
+      }
+      const data = this.rules.thumbDataParser.getThumbData(thumbElement);
+      this.data.set(url, { element: thumbElement, ...data });
+      if (shouldLazify) {
+        const { img, imgSrc } = this.rules.thumbImgParser.getImgData(thumbElement);
+        this.lazyImgLoader.lazify(thumbElement, img, imgSrc);
+      }
+      fragment.append(thumbElement);
+    }
+    await this.filterAll(dataOffset);
+    if (!parent) return;
+    containMutation(parent, () => parent == null ? void 0 : parent.appendChild(fragment));
   }
   sortBy(key, direction = true) {
     if (this.data.size < 2) return;
-    const elements = this.data.values().toArray().filter((e) => e.element.parentElement !== null).map((e) => e);
-    const containers = new Set(elements.map((e) => e.element.parentElement));
-    containers.forEach((c) => {
-      this.layoutStylePaint(c);
-      c.style.willChange = "contents";
-    });
-    const elementsByContainers = /* @__PURE__ */ new Map();
-    containers.forEach((c) => {
-      elementsByContainers.set(c, []);
-    });
-    elements.forEach((e) => {
-      const parent = e.element.parentElement;
-      const container = elementsByContainers.get(parent);
-      container == null ? void 0 : container.push(e);
-    });
+    const ds2 = this.data.values().toArray().filter((e) => e.element.parentElement !== null);
+    const byContainers = Map.groupBy(ds2, (e) => e.element.parentElement);
     const dir = direction ? -1 : 1;
-    for (const [container, items] of elementsByContainers) {
+    for (const [container, items] of byContainers) {
       items.sort((a2, b2) => (a2[key] - b2[key]) * dir);
-      const domNodes = items.map((e) => e.element);
-      const display = container.style.display;
-      container.style.display = "none";
-      container.replaceChildren(...domNodes);
-      requestAnimationFrame(() => {
-        container.style.display = display;
-        requestAnimationFrame(() => {
-          container.style.willChange = "auto";
-        });
-      });
+      const children = items.map((e) => e.element);
+      containMutation(container, () => container.replaceChildren(...children));
     }
   }
 }
@@ -2023,10 +2011,8 @@ class InfiniteScroller {
   }
   async doScroll(url, offset) {
     const page = await this.getPaginationData(url);
-    const prevScrollPos = document.documentElement.scrollTop;
     this.paginationOffset = Math.max(this.paginationOffset, offset);
     this.subject.next({ type: "scroll", scroller: this, page });
-    window.scrollTo(0, prevScrollPos);
     if (this.rules.store.state.writeHistory) {
       history.replaceState({}, "", url);
     }
@@ -2048,7 +2034,10 @@ class InfiniteScroller {
     infiniteScroller.subject.subscribe((x2) => {
       if (x2.type === "scroll") {
         rules.store.state.$paginationOffset = x2.scroller.paginationOffset;
-        rules.dataManager.parseData(x2.page);
+        const prevScrollPos = document.documentElement.scrollTop;
+        rules.dataManager.parseData(x2.page).then(() => {
+          window.scrollTo(0, prevScrollPos);
+        });
       }
     });
     rules.store.stateSubject.subscribe(() => {
@@ -10024,6 +10013,7 @@ export {
   checkHomogenity,
   chunks,
   circularShift,
+  containMutation,
   copyAttributes,
   downloader,
   exterminateVideo,
@@ -10032,10 +10022,12 @@ export {
   fetchText,
   fetchWith,
   findNextSibling,
+  findSelfOrChild,
   formatTimeToHHMMSS,
   getCommonParents,
   getPaginationStrategy,
   instantiateTemplate,
+  irange,
   memoize,
   objectToFormData,
   parseCssUrl,
@@ -10050,6 +10042,7 @@ export {
   range,
   removeClassesAndDataAttributes,
   replaceElementTag,
+  runIdleJob,
   sanitizeStr,
   splitWith,
   timeToSeconds,