@vnejs/plugins.scenario.fastforward 0.1.13 → 0.1.15

package/dist/index.d.ts

@@ -1 +1 @@
-import "@vnejs/plugins.scenario.fastforward.contract";
+import "@vnejs/contracts.scenario.fastforward";

package/dist/index.js

@@ -1,6 +1,6 @@
-import "@vnejs/plugins.scenario.fastforward.contract";
+import "@vnejs/contracts.scenario.fastforward";
 import { regPlugin } from "@vnejs/shared";
-import { CONSTANTS, PARAMS, PLUGIN_NAME, SETTINGS_KEYS, SUBSCRIBE_EVENTS } from "@vnejs/plugins.scenario.fastforward.contract";
+import { CONSTANTS, PARAMS, PLUGIN_NAME, SETTINGS_KEYS, SUBSCRIBE_EVENTS } from "@vnejs/contracts.scenario.fastforward";
 import { Fastforward } from "./modules/fastforward.js";
 import { FastforwardVisits } from "./modules/visits.js";
 regPlugin(PLUGIN_NAME, { events: SUBSCRIBE_EVENTS, settings: SETTINGS_KEYS, params: PARAMS, constants: CONSTANTS }, [Fastforward, FastforwardVisits]);

package/dist/modules/fastforward.d.ts

@@ -3,10 +3,8 @@ import type { FastforwardPluginConstants, FastforwardPluginEvents, FastforwardPl
 export declare class Fastforward extends ModuleCore<FastforwardPluginEvents, FastforwardPluginConstants, FastforwardPluginSettings, FastforwardPluginParams> {
     name: string;
     emitStop: () => Promise<unknown[]> | undefined;
-    emitFastforwardEmit: () => Promise<unknown[]> | undefined;
-    emitFastforwardEmitCheck: () => Promise<unknown[]> | undefined;
     subscribe: () => void;
-    init: () => Promise<[unknown[] | undefined, unknown[] | undefined, unknown[] | undefined]>;
+    init: () => Promise<[unknown[] | undefined, unknown[] | undefined]>;
     onToggle: () => void;
     onCheck: () => {
         isAllowed: boolean;
@@ -15,8 +13,7 @@ export declare class Fastforward extends ModuleCore<FastforwardPluginEvents, Fas
     onStart: () => void;
     onStop: () => void;
     onFastforwardEmit: () => Promise<void>;
-    onFastforwardEmitCheck: () => number | false;
+    onFastforwardEmitCheck: () => number;
     setValue: (value: boolean) => void;
-    check: () => Promise<void>;
     notFastForward: (s: string) => boolean;
 }

package/dist/modules/fastforward.js

@@ -2,8 +2,6 @@ import { ModuleCore } from "@vnejs/module.core";
 export class Fastforward extends ModuleCore {
     name = "fastforward";
     emitStop = () => this.emit(this.EVENTS.FASTFORWARD.STOP);
-    emitFastforwardEmit = () => this.emit(this.EVENTS.FASTFORWARD.EMIT);
-    emitFastforwardEmitCheck = () => this.emit(this.EVENTS.FASTFORWARD.EMIT_CHECK);
     subscribe = () => {
         this.on(this.EVENTS.FASTFORWARD.STOP, this.onStop);
         this.on(this.EVENTS.FASTFORWARD.START, this.onStart);
@@ -11,12 +9,10 @@ export class Fastforward extends ModuleCore {
         this.on(this.EVENTS.FASTFORWARD.TOGGLE, this.onToggle);
         this.on(this.EVENTS.FASTFORWARD.EMIT, this.onFastforwardEmit);
         this.on(this.EVENTS.FASTFORWARD.EMIT_CHECK, this.onFastforwardEmitCheck);
-        this.on(this.EVENTS.INTERACT.ENDED, this.emitFastforwardEmitCheck);
         this.on(this.EVENTS.SYSTEM.STARTED, this.emitStop);
         this.on(this.EVENTS.STATE.CLEAR, this.emitStop);
     };
     init = () => Promise.all([
-        this.emit(this.EVENTS.SETTINGS.INIT, { name: this.SETTINGS.FASTFORWARD.CHECK, value: this.PARAMS.FASTFORWARD.DEFAULT_CHECK }),
         this.emit(this.EVENTS.SETTINGS.INIT, { name: this.SETTINGS.FASTFORWARD.DELAY, value: this.PARAMS.FASTFORWARD.DEFAULT_DELAY }),
         this.emit(this.EVENTS.SETTINGS.INIT, { name: this.SETTINGS.FASTFORWARD.ENABLED, value: this.PARAMS.FASTFORWARD.DEFAULT_ENABLED }),
     ]);
@@ -27,12 +23,13 @@ export class Fastforward extends ModuleCore {
     onFastforwardEmit = async () => {
         if (!this.shared.settings[this.SETTINGS.FASTFORWARD.ENABLED])
             return;
-        if (this.shared.settings[this.SETTINGS.FASTFORWARD.CHECK])
-            await this.check();
+        const checkResults = ((await this.emit(this.EVENTS.FASTFORWARD.CHECK)) ?? []);
+        if (!checkResults.every((r) => r.isAllowed))
+            this.setValue(false);
         await this.emit(this.EVENTS.INTERACT.EMIT);
         await this.emit(this.EVENTS.FASTFORWARD.EMIT_CHECK);
     };
-    onFastforwardEmitCheck = () => this.shared.isFastforwardOn && setTimeout(this.emitFastforwardEmit, this.shared.settings[this.SETTINGS.FASTFORWARD.DELAY]);
+    onFastforwardEmitCheck = () => setTimeout(() => this.shared.isFastforwardOn && this.emit(this.EVENTS.FASTFORWARD.EMIT), this.shared.settings[this.SETTINGS.FASTFORWARD.DELAY]);
     setValue = (value) => {
         this.shared.isFastforwardOn = value;
         if (value) {
@@ -45,12 +42,7 @@ export class Fastforward extends ModuleCore {
         }
         this.emit(this.EVENTS.FASTFORWARD.CHANGED, { value });
         if (value)
-            this.emitFastforwardEmit();
-    };
-    check = async () => {
-        const results = ((await this.emit(this.EVENTS.FASTFORWARD.CHECK)) ?? []);
-        if (!results.every((r) => r.isAllowed))
-            this.setValue(false);
+            this.emit(this.EVENTS.FASTFORWARD.EMIT);
     };
     notFastForward = (s) => s !== this.name;
 }

package/dist/modules/visits.d.ts

@@ -1,14 +1,14 @@
-import "@vnejs/plugins.text.contract";
+import "@vnejs/contracts.core.scenario";
 import { ModuleCore } from "@vnejs/module.core";
-import type { TextEmitPayload } from "@vnejs/plugins.text.contract";
-import type { ModuleGlobalStateFastforwardVisits } from "@vnejs/plugins.scenario.fastforward.contract";
+import type { ScenarioExecPayload } from "@vnejs/contracts.core.scenario";
+import type { ModuleGlobalStateFastforwardVisits } from "@vnejs/contracts.scenario.fastforward";
 import type { FastforwardPluginConstants, FastforwardPluginEvents, FastforwardPluginParams, FastforwardPluginSettings } from "../types.js";
 export declare class FastforwardVisits extends ModuleCore<FastforwardPluginEvents, FastforwardPluginConstants, FastforwardPluginSettings, FastforwardPluginParams, ModuleGlobalStateFastforwardVisits> {
     name: string;
     visits: Record<string, number>;
     subscribe: () => void;
     init: () => Promise<void>;
-    onText: ({ text, speaker }?: TextEmitPayload) => Promise<void>;
+    onExec: ({ module, block, line, args, keywords }?: ScenarioExecPayload) => Promise<void>;
     onVisitCheck: () => Promise<{
         isAllowed: boolean;
         source: string;

package/dist/modules/visits.js

@@ -1,28 +1,30 @@
-import "@vnejs/plugins.text.contract";
+import "@vnejs/contracts.core.scenario";
 import { ModuleCore } from "@vnejs/module.core";
 export class FastforwardVisits extends ModuleCore {
     name = "fastforward.visits";
     visits = {};
     subscribe = () => {
-        this.on(this.EVENTS.TEXT.EMIT, this.onText);
+        this.on(this.EVENTS.SCENARIO.EXEC, this.onExec);
         this.on(this.EVENTS.FASTFORWARD.CHECK, this.onVisitCheck);
         this.on(this.EVENTS.FASTFORWARD.CLEAR, this.onClear);
         this.on(this.EVENTS.STATE.CLEAR, this.setDefaultState);
         this.on(this.EVENTS.STATE.SET, this.onSetStateClone);
     };
     init = async () => {
+        await this.emit(this.EVENTS.SETTINGS.INIT, { name: this.SETTINGS.FASTFORWARD.CHECK_VISITED, value: this.PARAMS.FASTFORWARD.DEFAULT_CHECK_VISITED });
         this.visits = (await this.emitOne(this.EVENTS.STORAGE.GET_ALL, { module: this.name }));
     };
-    onText = async ({ text = "", speaker = "" } = {}) => {
+    onExec = async ({ module, block, line, args = {}, keywords = [] } = {}) => {
         const key = (await this.emitOne(this.EVENTS.VENDORS.HASH, this.state));
         this.visits[key] = 1;
         this.emit(this.EVENTS.STORAGE.SET, { module: this.name, key, value: 1 });
-        const { label } = this.globalState.scenario;
-        const meet = speaker ? (this.globalState["text.meet"]?.[speaker] ?? 0) : 0;
-        this.setState({ text, label, speaker, meet });
+        this.setState({ module, block, line, args, keywords, label: this.globalState.scenario.label });
+    };
+    onVisitCheck = async () => {
+        const isAllowed = !this.shared.settings[this.SETTINGS.FASTFORWARD.CHECK_VISITED] || Boolean(this.visits[(await this.getHash())]);
+        return { isAllowed, source: this.name };
     };
-    onVisitCheck = async () => ({ isAllowed: Boolean(this.visits[(await this.getHash())]), source: this.name });
     onClear = () => this.emit(this.EVENTS.STORAGE.RM_ALL, { module: this.name });
     getHash = () => this.emitOne(this.EVENTS.VENDORS.HASH, this.state);
-    getDefaultState = () => ({ text: "", label: "", speaker: "", meet: 0 });
+    getDefaultState = () => ({ label: "", args: {}, keywords: [] });
 }

package/dist/types.d.ts

@@ -1,7 +1,6 @@
 import type { ModuleCoreConstants, ModuleCoreEvents, ModuleCoreParams, ModuleCoreSettings } from "@vnejs/module.core";
-import type { PluginName as TextPluginName, SubscribeEvents as TextSubscribeEvents } from "@vnejs/plugins.text.contract";
-import type { Constants, Params, PluginName, SettingsKeys, SubscribeEvents } from "@vnejs/plugins.scenario.fastforward.contract";
-export type FastforwardPluginEvents = ModuleCoreEvents & Record<PluginName, SubscribeEvents> & Record<TextPluginName, TextSubscribeEvents>;
+import type { Constants, Params, PluginName, SettingsKeys, SubscribeEvents } from "@vnejs/contracts.scenario.fastforward";
+export type FastforwardPluginEvents = ModuleCoreEvents & Record<PluginName, SubscribeEvents>;
 export type FastforwardPluginConstants = ModuleCoreConstants & Record<PluginName, Constants>;
 export type FastforwardPluginSettings = ModuleCoreSettings & Record<PluginName, SettingsKeys>;
 export type FastforwardPluginParams = ModuleCoreParams & Record<PluginName, Params>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/plugins.scenario.fastforward",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,12 +30,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@vnejs/plugins.scenario.fastforward.contract": "~0.1.0"
+    "@vnejs/contracts.scenario.fastforward": "~0.1.0"
   },
   "peerDependencies": {
     "@vnejs/module.core": "~0.1.0",
-    "@vnejs/shared": "~0.1.0",
-    "@vnejs/plugins.text.contract": "~0.1.0"
+    "@vnejs/shared": "~0.1.0"
   },
   "devDependencies": {
     "@vnejs/configs.ts-common": "~0.1.0"

package/src/index.ts

@@ -1,8 +1,8 @@
 
-import "@vnejs/plugins.scenario.fastforward.contract";
+import "@vnejs/contracts.scenario.fastforward";
 
 import { regPlugin } from "@vnejs/shared";
-import { CONSTANTS, PARAMS, PLUGIN_NAME, SETTINGS_KEYS, SUBSCRIBE_EVENTS } from "@vnejs/plugins.scenario.fastforward.contract";
+import { CONSTANTS, PARAMS, PLUGIN_NAME, SETTINGS_KEYS, SUBSCRIBE_EVENTS } from "@vnejs/contracts.scenario.fastforward";
 
 import { Fastforward } from "./modules/fastforward.js";
 import { FastforwardVisits } from "./modules/visits.js";

package/src/modules/fastforward.ts

@@ -1,6 +1,6 @@
 import { ModuleCore } from "@vnejs/module.core";
 
-import type { FastforwardChangedPayload, FastforwardCheckResult } from "@vnejs/plugins.scenario.fastforward.contract";
+import type { FastforwardChangedPayload, FastforwardCheckResult } from "@vnejs/contracts.scenario.fastforward";
 
 import type { FastforwardPluginConstants, FastforwardPluginEvents, FastforwardPluginParams, FastforwardPluginSettings } from "../types.js";
 
@@ -8,8 +8,6 @@ export class Fastforward extends ModuleCore<FastforwardPluginEvents, Fastforward
   name = "fastforward";
 
   emitStop = () => this.emit(this.EVENTS.FASTFORWARD.STOP);
-  emitFastforwardEmit = () => this.emit(this.EVENTS.FASTFORWARD.EMIT);
-  emitFastforwardEmitCheck = () => this.emit(this.EVENTS.FASTFORWARD.EMIT_CHECK);
 
   subscribe = () => {
     this.on(this.EVENTS.FASTFORWARD.STOP, this.onStop);
@@ -20,34 +18,35 @@ export class Fastforward extends ModuleCore<FastforwardPluginEvents, Fastforward
     this.on(this.EVENTS.FASTFORWARD.EMIT, this.onFastforwardEmit);
     this.on(this.EVENTS.FASTFORWARD.EMIT_CHECK, this.onFastforwardEmitCheck);
 
-    this.on(this.EVENTS.INTERACT.ENDED, this.emitFastforwardEmitCheck);
-
     this.on(this.EVENTS.SYSTEM.STARTED, this.emitStop);
     this.on(this.EVENTS.STATE.CLEAR, this.emitStop);
   };
 
   init = () =>
     Promise.all([
-      this.emit(this.EVENTS.SETTINGS.INIT, { name: this.SETTINGS.FASTFORWARD.CHECK, value: this.PARAMS.FASTFORWARD.DEFAULT_CHECK }),
       this.emit(this.EVENTS.SETTINGS.INIT, { name: this.SETTINGS.FASTFORWARD.DELAY, value: this.PARAMS.FASTFORWARD.DEFAULT_DELAY }),
       this.emit(this.EVENTS.SETTINGS.INIT, { name: this.SETTINGS.FASTFORWARD.ENABLED, value: this.PARAMS.FASTFORWARD.DEFAULT_ENABLED }),
     ]);
 
   onToggle = () => this.setValue(!this.shared.isFastforwardOn);
-  onCheck = () => ({ isAllowed: this.shared.settings[this.SETTINGS.FASTFORWARD.ENABLED], source: this.name } satisfies FastforwardCheckResult);
+  onCheck = () => ({ isAllowed: this.shared.settings[this.SETTINGS.FASTFORWARD.ENABLED], source: this.name }) satisfies FastforwardCheckResult;
   onStart = () => this.setValue(true);
   onStop = () => this.setValue(false);
 
   onFastforwardEmit = async () => {
     if (!this.shared.settings[this.SETTINGS.FASTFORWARD.ENABLED]) return;
-    if (this.shared.settings[this.SETTINGS.FASTFORWARD.CHECK]) await this.check();
+
+    const checkResults = ((await this.emit(this.EVENTS.FASTFORWARD.CHECK)) ?? []) as FastforwardCheckResult[];
+
+    if (!checkResults.every((r) => r.isAllowed)) this.setValue(false);
 
     await this.emit(this.EVENTS.INTERACT.EMIT);
 
     await this.emit(this.EVENTS.FASTFORWARD.EMIT_CHECK);
   };
 
-  onFastforwardEmitCheck = () => this.shared.isFastforwardOn && setTimeout(this.emitFastforwardEmit, this.shared.settings[this.SETTINGS.FASTFORWARD.DELAY]);
+  onFastforwardEmitCheck = () =>
+    setTimeout(() => this.shared.isFastforwardOn && this.emit(this.EVENTS.FASTFORWARD.EMIT), this.shared.settings[this.SETTINGS.FASTFORWARD.DELAY]);
 
   setValue = (value: boolean) => {
     this.shared.isFastforwardOn = value;
@@ -62,13 +61,7 @@ export class Fastforward extends ModuleCore<FastforwardPluginEvents, Fastforward
 
     this.emit(this.EVENTS.FASTFORWARD.CHANGED, { value } satisfies FastforwardChangedPayload);
 
-    if (value) this.emitFastforwardEmit();
-  };
-
-  check = async () => {
-    const results = ((await this.emit(this.EVENTS.FASTFORWARD.CHECK)) ?? []) as FastforwardCheckResult[];
-
-    if (!results.every((r) => r.isAllowed)) this.setValue(false);
+    if (value) this.emit(this.EVENTS.FASTFORWARD.EMIT);
   };
 
   notFastForward = (s: string) => s !== this.name;

package/src/modules/visits.ts

@@ -1,8 +1,8 @@
-import "@vnejs/plugins.text.contract";
+import "@vnejs/contracts.core.scenario";
 
 import { ModuleCore } from "@vnejs/module.core";
-import type { TextEmitPayload } from "@vnejs/plugins.text.contract";
-import type { FastforwardCheckResult, ModuleGlobalStateFastforwardVisits } from "@vnejs/plugins.scenario.fastforward.contract";
+import type { ScenarioExecPayload } from "@vnejs/contracts.core.scenario";
+import type { FastforwardCheckResult, ModuleGlobalStateFastforwardVisits } from "@vnejs/contracts.scenario.fastforward";
 
 import type { FastforwardPluginConstants, FastforwardPluginEvents, FastforwardPluginParams, FastforwardPluginSettings } from "../types.js";
 
@@ -18,7 +18,7 @@ export class FastforwardVisits extends ModuleCore<
   visits: Record<string, number> = {};
 
   subscribe = () => {
-    this.on(this.EVENTS.TEXT.EMIT, this.onText);
+    this.on(this.EVENTS.SCENARIO.EXEC, this.onExec);
 
     this.on(this.EVENTS.FASTFORWARD.CHECK, this.onVisitCheck);
     this.on(this.EVENTS.FASTFORWARD.CLEAR, this.onClear);
@@ -28,27 +28,29 @@ export class FastforwardVisits extends ModuleCore<
   };
 
   init = async () => {
+    await this.emit(this.EVENTS.SETTINGS.INIT, { name: this.SETTINGS.FASTFORWARD.CHECK_VISITED, value: this.PARAMS.FASTFORWARD.DEFAULT_CHECK_VISITED });
+
     this.visits = (await this.emitOne(this.EVENTS.STORAGE.GET_ALL, { module: this.name })) as Record<string, number>;
   };
 
-  onText = async ({ text = "", speaker = "" }: TextEmitPayload = {}) => {
+  onExec = async ({ module, block, line, args = {}, keywords = [] }: ScenarioExecPayload = {}) => {
     const key = (await this.emitOne(this.EVENTS.VENDORS.HASH, this.state)) as string;
 
     this.visits[key] = 1;
     this.emit(this.EVENTS.STORAGE.SET, { module: this.name, key, value: 1 });
 
-    const { label } = this.globalState.scenario;
-    const meet = speaker ? (this.globalState["text.meet"]?.[speaker] ?? 0) : 0;
-
-    this.setState({ text, label, speaker, meet });
+    this.setState({ module, block, line, args, keywords, label: this.globalState.scenario.label });
   };
 
-  onVisitCheck = async () =>
-    ({ isAllowed: Boolean(this.visits[(await this.getHash()) as string]), source: this.name } satisfies FastforwardCheckResult);
+  onVisitCheck = async () => {
+    const isAllowed = !this.shared.settings[this.SETTINGS.FASTFORWARD.CHECK_VISITED] || Boolean(this.visits[(await this.getHash()) as string]);
+
+    return { isAllowed, source: this.name } satisfies FastforwardCheckResult;
+  };
 
   onClear = () => this.emit(this.EVENTS.STORAGE.RM_ALL, { module: this.name });
 
   getHash = () => this.emitOne(this.EVENTS.VENDORS.HASH, this.state);
 
-  getDefaultState = (): ModuleGlobalStateFastforwardVisits => ({ text: "", label: "", speaker: "", meet: 0 });
+  getDefaultState = (): ModuleGlobalStateFastforwardVisits => ({ label: "", args: {}, keywords: [] });
 }

package/src/types.ts

@@ -1,8 +1,7 @@
 import type { ModuleCoreConstants, ModuleCoreEvents, ModuleCoreParams, ModuleCoreSettings } from "@vnejs/module.core";
-import type { PluginName as TextPluginName, SubscribeEvents as TextSubscribeEvents } from "@vnejs/plugins.text.contract";
-import type { Constants, Params, PluginName, SettingsKeys, SubscribeEvents } from "@vnejs/plugins.scenario.fastforward.contract";
+import type { Constants, Params, PluginName, SettingsKeys, SubscribeEvents } from "@vnejs/contracts.scenario.fastforward";
 
-export type FastforwardPluginEvents = ModuleCoreEvents & Record<PluginName, SubscribeEvents> & Record<TextPluginName, TextSubscribeEvents>;
+export type FastforwardPluginEvents = ModuleCoreEvents & Record<PluginName, SubscribeEvents>;
 
 export type FastforwardPluginConstants = ModuleCoreConstants & Record<PluginName, Constants>;
 

package/dist/utils/fastforward.d.ts

@@ -1,2 +0,0 @@
-import type { FastforwardChangedPayload, FastforwardTextPayload, ModuleGlobalStateFastforwardVisits } from "@vnejs/plugins.scenario.fastforward.contract";
-export type { FastforwardChangedPayload, FastforwardTextPayload, ModuleGlobalStateFastforwardVisits };

package/dist/utils/fastforward.js

@@ -1 +0,0 @@
-export {};

package/src/utils/fastforward.ts

@@ -1,3 +0,0 @@
-import type { FastforwardChangedPayload, FastforwardTextPayload, ModuleGlobalStateFastforwardVisits } from "@vnejs/plugins.scenario.fastforward.contract";
-
-export type { FastforwardChangedPayload, FastforwardTextPayload, ModuleGlobalStateFastforwardVisits };