@vnejs/plugins.scenario.autoread 0.1.11 → 0.1.12

package/dist/modules/autoread.d.ts

@@ -4,7 +4,6 @@ import type { AutoreadPluginConstants, AutoreadPluginEvents, AutoreadPluginParam
 import type { SettingsChangedResult } from "@vnejs/module.core";
 export declare class Autoread extends ModuleCore<AutoreadPluginEvents, AutoreadPluginConstants, AutoreadPluginSettings, AutoreadPluginParams> {
     name: string;
-    disableSources: string[];
     autoreadTimeout: ReturnType<typeof setTimeout> | undefined;
     subscribe: () => void;
     init: () => Promise<[unknown[] | undefined, unknown[] | undefined]>;

package/dist/modules/autoread.js

@@ -1,7 +1,7 @@
 import { ModuleCore } from "@vnejs/module.core";
+import { SourcesSet } from "@vnejs/sources-set";
 export class Autoread extends ModuleCore {
     name = "autoread";
-    disableSources = [];
     autoreadTimeout;
     subscribe = () => {
         this.on(this.EVENTS.AUTOREAD.TRY, this.onTry);
@@ -11,13 +11,16 @@ export class Autoread extends ModuleCore {
         this.on(this.EVENTS.STATE.CLEAR, this.clearTimeout);
         this.on(this.EVENTS.STATE.SET, this.onStateSet);
     };
-    init = () => Promise.all([
-        this.emit(this.EVENTS.SETTINGS.INIT, { name: this.SETTINGS.AUTOREAD.ENABLED, value: this.PARAMS.AUTOREAD.DEFAULT_ENABLED }),
-        this.emit(this.EVENTS.SETTINGS.INIT, { name: this.SETTINGS.AUTOREAD.DELAY, value: this.PARAMS.AUTOREAD.DEFAULT_DELAY }),
-    ]);
+    init = () => {
+        this.shared.autoreadDisableSources = new SourcesSet();
+        return Promise.all([
+            this.emit(this.EVENTS.SETTINGS.INIT, { name: this.SETTINGS.AUTOREAD.ENABLED, value: this.PARAMS.AUTOREAD.DEFAULT_ENABLED }),
+            this.emit(this.EVENTS.SETTINGS.INIT, { name: this.SETTINGS.AUTOREAD.DELAY, value: this.PARAMS.AUTOREAD.DEFAULT_DELAY }),
+        ]);
+    };
     onTry = async () => {
         this.emitLog({ action: "try" });
-        if (!this.shared.settings[this.SETTINGS.AUTOREAD.ENABLED] || this.disableSources.length)
+        if (!this.shared.settings[this.SETTINGS.AUTOREAD.ENABLED] || this.shared.autoreadDisableSources.isNotEmpty())
             return;
         await this.waitRerender();
         const elements = document.elementsFromPoint(window.innerHeight / 2, window.innerHeight / 2);
@@ -30,17 +33,17 @@ export class Autoread extends ModuleCore {
         this.createTimeout();
     };
     onPush = ({ source = "" } = {}) => {
-        this.disableSources.push(source);
+        this.shared.autoreadDisableSources.add(source);
         this.clearTimeout();
     };
     onPop = ({ source = "" } = {}) => {
-        this.disableSources = this.disableSources.filter((s) => s !== source);
-        if (!this.disableSources.length)
+        this.shared.autoreadDisableSources.rm(source);
+        if (this.shared.autoreadDisableSources.isEmpty())
             this.createTimeout();
     };
     onSettingsChanged = ({ name, value }) => name === this.SETTINGS.AUTOREAD.ENABLED && this.emit(value ? this.EVENTS.AUTOREAD.POP : this.EVENTS.AUTOREAD.PUSH, { source: this.name });
     onStateSet = () => {
-        this.disableSources = [];
+        this.shared.autoreadDisableSources.clear();
         this.clearTimeout();
         this.createTimeout();
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/plugins.scenario.autoread",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -34,7 +34,8 @@
   },
   "peerDependencies": {
     "@vnejs/module.core": "~0.1.0",
-    "@vnejs/shared": "~0.1.0"
+    "@vnejs/shared": "~0.1.0",
+    "@vnejs/sources-set": "~0.1.0"
   },
   "devDependencies": {
     "@vnejs/configs.ts-common": "~0.1.0"

package/src/modules/autoread.ts

@@ -1,5 +1,6 @@
 import { ModuleCore } from "@vnejs/module.core";
 import type { AutoreadSourcePayload } from "@vnejs/contracts.scenario.autoread";
+import { SourcesSet } from "@vnejs/sources-set";
 
 import type { AutoreadPluginConstants, AutoreadPluginEvents, AutoreadPluginParams, AutoreadPluginSettings } from "../types.js";
 import type { SettingsChangedResult } from "@vnejs/module.core";
@@ -7,7 +8,6 @@ import type { SettingsChangedResult } from "@vnejs/module.core";
 export class Autoread extends ModuleCore<AutoreadPluginEvents, AutoreadPluginConstants, AutoreadPluginSettings, AutoreadPluginParams> {
   name = "autoread";
 
-  disableSources: string[] = [];
   autoreadTimeout: ReturnType<typeof setTimeout> | undefined;
 
   subscribe = () => {
@@ -21,16 +21,19 @@ export class Autoread extends ModuleCore<AutoreadPluginEvents, AutoreadPluginCon
     this.on(this.EVENTS.STATE.SET, this.onStateSet);
   };
 
-  init = () =>
-    Promise.all([
+  init = () => {
+    this.shared.autoreadDisableSources = new SourcesSet();
+
+    return Promise.all([
       this.emit(this.EVENTS.SETTINGS.INIT, { name: this.SETTINGS.AUTOREAD.ENABLED, value: this.PARAMS.AUTOREAD.DEFAULT_ENABLED }),
       this.emit(this.EVENTS.SETTINGS.INIT, { name: this.SETTINGS.AUTOREAD.DELAY, value: this.PARAMS.AUTOREAD.DEFAULT_DELAY }),
     ]);
+  };
 
   onTry = async () => {
     this.emitLog({ action: "try" });
 
-    if (!this.shared.settings[this.SETTINGS.AUTOREAD.ENABLED] || this.disableSources.length) return;
+    if (!this.shared.settings[this.SETTINGS.AUTOREAD.ENABLED] || this.shared.autoreadDisableSources.isNotEmpty()) return;
 
     await this.waitRerender();
 
@@ -45,21 +48,21 @@ export class Autoread extends ModuleCore<AutoreadPluginEvents, AutoreadPluginCon
   };
 
   onPush = ({ source = "" }: AutoreadSourcePayload = {}) => {
-    this.disableSources.push(source);
+    this.shared.autoreadDisableSources.add(source);
     this.clearTimeout();
   };
 
   onPop = ({ source = "" }: AutoreadSourcePayload = {}) => {
-    this.disableSources = this.disableSources.filter((s) => s !== source);
+    this.shared.autoreadDisableSources.rm(source);
 
-    if (!this.disableSources.length) this.createTimeout();
+    if (this.shared.autoreadDisableSources.isEmpty()) this.createTimeout();
   };
 
   onSettingsChanged = ({ name, value }: SettingsChangedResult) =>
     name === this.SETTINGS.AUTOREAD.ENABLED && this.emit(value ? this.EVENTS.AUTOREAD.POP : this.EVENTS.AUTOREAD.PUSH, { source: this.name });
 
   onStateSet = () => {
-    this.disableSources = [];
+    this.shared.autoreadDisableSources.clear();
 
     this.clearTimeout();
     this.createTimeout();