@vnejs/plugins.views.screens.loading 0.2.4 → 0.2.6

package/dist/index.js

@@ -1,8 +1,8 @@
 import "@vnejs/contracts.views.screens.loading";
 import { regPlugin } from "@vnejs/shared";
-import { PARAMS, PLUGIN_NAME, SUBSCRIBE_EVENTS } from "@vnejs/contracts.views.screens.loading";
+import { CONSTANTS, PARAMS, PLUGIN_NAME, SUBSCRIBE_EVENTS } from "@vnejs/contracts.views.screens.loading";
 import { LoadingController } from "./modules/controller.js";
 import { LoadingControllerBg } from "./modules/controller.bg.js";
 import { Loading } from "./modules/loading.js";
 import { LoadingView } from "./modules/view.js";
-regPlugin(PLUGIN_NAME, { events: SUBSCRIBE_EVENTS, params: PARAMS }, [LoadingController, LoadingControllerBg, Loading, LoadingView]);
+regPlugin(PLUGIN_NAME, { constants: CONSTANTS, events: SUBSCRIBE_EVENTS, params: PARAMS }, [LoadingController, LoadingControllerBg, Loading, LoadingView]);

package/dist/modules/controller.bg.d.ts

@@ -1,6 +1,6 @@
 import { ModuleControllerBg } from "@vnejs/module.controller.bg";
 import type { LoadingPluginConstants, LoadingPluginEvents, LoadingPluginParams, LoadingPluginSettings } from "../types.js";
-import type { LoadingPluginState } from "../utils/loading.js";
+import type { LoadingPluginState } from "../types.js";
 export declare class LoadingControllerBg extends ModuleControllerBg<LoadingPluginEvents, LoadingPluginConstants, LoadingPluginSettings, LoadingPluginParams, LoadingPluginState> {
     name: string;
     EVENT_SHOW: "vne:loading:show";

package/dist/modules/controller.d.ts

@@ -1,6 +1,6 @@
 import { ModuleController } from "@vnejs/module.components";
 import type { LoadingPluginConstants, LoadingPluginEvents, LoadingPluginParams, LoadingPluginSettings } from "../types.js";
-import type { LoadingPluginState } from "../utils/loading.js";
+import type { LoadingPluginState } from "../types.js";
 export declare class LoadingController extends ModuleController<LoadingPluginEvents, LoadingPluginConstants, LoadingPluginSettings, LoadingPluginParams, LoadingPluginState> {
     name: string;
     EVENT_UPDATE_VIEW: "vne:loading:update";

package/dist/modules/loading.d.ts

@@ -1,6 +1,7 @@
 import { ModuleCore } from "@vnejs/module.core";
 import type { LoadingPluginConstants, LoadingPluginEvents, LoadingPluginParams, LoadingPluginSettings } from "../types.js";
-import type { LoadingEmitPayload, LoadingPluginState } from "../utils/loading.js";
+import type { LoadingPluginState } from "../types.js";
+import type { LoadingEmitPayload } from "@vnejs/contracts.views.screens.loading";
 export declare class Loading extends ModuleCore<LoadingPluginEvents, LoadingPluginConstants, LoadingPluginSettings, LoadingPluginParams, LoadingPluginState> {
     name: string;
     subscribe: () => void;

package/dist/modules/loading.js

@@ -5,10 +5,10 @@ export class Loading extends ModuleCore {
         this.on(this.EVENTS.LOADING.EMIT, this.onLoadingEmit);
     };
     onLoadingEmit = async ({ promiseFunc } = {}) => {
-        this.emitLog({ action: "start" });
+        this.emit(this.EVENTS.LOGS.EMIT, { action: this.CONST.LOADING.LOGS_ACTIONS.START });
         await this.emit(this.EVENTS.LOADING.SHOW);
         await Promise.all([promiseFunc?.(), this.waitTimeout(this.PARAMS.LOADING.MIN_SHOW_TIME)]);
         await this.emit(this.EVENTS.LOADING.HIDE);
-        this.emitLog({ action: "finish" });
+        this.emit(this.EVENTS.LOGS.EMIT, { action: this.CONST.LOADING.LOGS_ACTIONS.FINISH });
     };
 }

package/dist/modules/view.d.ts

@@ -1,6 +1,6 @@
 import { ModuleView } from "@vnejs/module.components";
 import type { LoadingPluginConstants, LoadingPluginEvents, LoadingPluginParams, LoadingPluginSettings } from "../types.js";
-import type { LoadingPluginState } from "../utils/loading.js";
+import type { LoadingPluginState } from "../types.js";
 export declare class LoadingView extends ModuleView<LoadingPluginEvents, LoadingPluginConstants, LoadingPluginSettings, LoadingPluginParams, LoadingPluginState> {
     name: string;
     EVENT_UPDATE_VIEW: "vne:loading:update";

package/dist/types.d.ts

@@ -3,8 +3,14 @@ import type { PluginName as LogsPluginName, SubscribeEvents as LogsSubscribeEven
 import type { PluginName as MemoryPluginName, SubscribeEvents as MemorySubscribeEvents } from "@vnejs/contracts.core.memory";
 import type { PluginName as SystemPluginName, SubscribeEvents as SystemSubscribeEvents } from "@vnejs/contracts.core.system";
 import type { PluginName as LocsPluginName, SubscribeEvents as LocsSubscribeEvents } from "@vnejs/contracts.text.locs";
-import type { Params, PluginName, SubscribeEvents } from "@vnejs/contracts.views.screens.loading";
+import type { Constants, Params, PluginName, SubscribeEvents } from "@vnejs/contracts.views.screens.loading";
 export type LoadingPluginEvents = ModuleComponentsEvents & Record<PluginName, SubscribeEvents> & Record<LogsPluginName, LogsSubscribeEvents> & Record<MemoryPluginName, MemorySubscribeEvents> & Record<SystemPluginName, SystemSubscribeEvents> & Record<LocsPluginName, LocsSubscribeEvents>;
-export type LoadingPluginConstants = ModuleComponentsConstants;
+export type LoadingPluginConstants = ModuleComponentsConstants & Record<PluginName, Constants>;
 export type LoadingPluginSettings = ModuleComponentsSettings;
 export type LoadingPluginParams = ModuleComponentsParams & Record<PluginName, Params>;
+export type LoadingPluginState = {
+    isShow: boolean;
+    isForce: boolean;
+    bgSrc?: string;
+    locs?: Record<string, string>;
+};

package/dist/utils/loading.d.ts

@@ -1,15 +1,5 @@
 import type { Module } from "@vnejs/module";
-import type { LoadingPluginConstants, LoadingPluginEvents, LoadingPluginParams, LoadingPluginSettings } from "../types.js";
-export type LoadingPluginState = {
-    isShow: boolean;
-    isForce: boolean;
-    bgSrc?: string;
-    locs?: Record<string, string>;
-};
-export type LoadingEmitPayload = {
-    promiseFunc?: () => void | Promise<void>;
-    source?: string;
-};
+import type { LoadingPluginConstants, LoadingPluginEvents, LoadingPluginParams, LoadingPluginSettings, LoadingPluginState } from "../types.js";
 export type LoadingViewContext = {
     emit: Module<LoadingPluginEvents, LoadingPluginConstants, LoadingPluginSettings, LoadingPluginParams, LoadingPluginState>["emit"];
     EVENTS: LoadingPluginEvents;

package/dist/view/index.d.ts

@@ -1,3 +1,3 @@
 import type { ViewRenderFunc } from "@vnejs/module.components";
-import type { LoadingPluginState } from "../utils/loading.js";
+import type { LoadingPluginState } from "../types.js";
 export declare const render: ViewRenderFunc<LoadingPluginState>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/plugins.views.screens.loading",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -1,11 +1,11 @@
 import "@vnejs/contracts.views.screens.loading";
 
 import { regPlugin } from "@vnejs/shared";
-import { PARAMS, PLUGIN_NAME, SUBSCRIBE_EVENTS } from "@vnejs/contracts.views.screens.loading";
+import { CONSTANTS, PARAMS, PLUGIN_NAME, SUBSCRIBE_EVENTS } from "@vnejs/contracts.views.screens.loading";
 
 import { LoadingController } from "./modules/controller.js";
 import { LoadingControllerBg } from "./modules/controller.bg.js";
 import { Loading } from "./modules/loading.js";
 import { LoadingView } from "./modules/view.js";
 
-regPlugin(PLUGIN_NAME, { events: SUBSCRIBE_EVENTS, params: PARAMS }, [LoadingController, LoadingControllerBg, Loading, LoadingView]);
+regPlugin(PLUGIN_NAME, { constants: CONSTANTS, events: SUBSCRIBE_EVENTS, params: PARAMS }, [LoadingController, LoadingControllerBg, Loading, LoadingView]);

package/src/modules/controller.bg.ts

@@ -1,8 +1,7 @@
 import { ModuleControllerBg } from "@vnejs/module.controller.bg";
 
 import type { LoadingPluginConstants, LoadingPluginEvents, LoadingPluginParams, LoadingPluginSettings } from "../types.js";
-import type { LoadingPluginState } from "../utils/loading.js";
-
+import type { LoadingPluginState } from "../types.js";
 export class LoadingControllerBg extends ModuleControllerBg<
   LoadingPluginEvents,
   LoadingPluginConstants,

package/src/modules/controller.ts

@@ -1,8 +1,7 @@
 import { ModuleController } from "@vnejs/module.components";
 
 import type { LoadingPluginConstants, LoadingPluginEvents, LoadingPluginParams, LoadingPluginSettings } from "../types.js";
-import type { LoadingPluginState } from "../utils/loading.js";
-
+import type { LoadingPluginState } from "../types.js";
 export class LoadingController extends ModuleController<
   LoadingPluginEvents,
   LoadingPluginConstants,

package/src/modules/loading.ts

@@ -1,7 +1,8 @@
 import { ModuleCore } from "@vnejs/module.core";
 
 import type { LoadingPluginConstants, LoadingPluginEvents, LoadingPluginParams, LoadingPluginSettings } from "../types.js";
-import type { LoadingEmitPayload, LoadingPluginState } from "../utils/loading.js";
+import type { LoadingPluginState } from "../types.js";
+import type { LoadingEmitPayload } from "@vnejs/contracts.views.screens.loading";
 
 export class Loading extends ModuleCore<LoadingPluginEvents, LoadingPluginConstants, LoadingPluginSettings, LoadingPluginParams, LoadingPluginState> {
   name = "loading";
@@ -11,10 +12,10 @@ export class Loading extends ModuleCore<LoadingPluginEvents, LoadingPluginConsta
   };
 
   onLoadingEmit = async ({ promiseFunc }: LoadingEmitPayload = {}) => {
-    this.emitLog({ action: "start" });
+    this.emit(this.EVENTS.LOGS.EMIT, { action: this.CONST.LOADING.LOGS_ACTIONS.START });
     await this.emit(this.EVENTS.LOADING.SHOW);
     await Promise.all([promiseFunc?.(), this.waitTimeout(this.PARAMS.LOADING.MIN_SHOW_TIME)]);
     await this.emit(this.EVENTS.LOADING.HIDE);
-    this.emitLog({ action: "finish" });
+    this.emit(this.EVENTS.LOGS.EMIT, { action: this.CONST.LOADING.LOGS_ACTIONS.FINISH });
   };
 }

package/src/modules/view.ts

@@ -2,8 +2,7 @@ import { ModuleView } from "@vnejs/module.components";
 
 import { render } from "../view/index.js";
 import type { LoadingPluginConstants, LoadingPluginEvents, LoadingPluginParams, LoadingPluginSettings } from "../types.js";
-import type { LoadingPluginState } from "../utils/loading.js";
-
+import type { LoadingPluginState } from "../types.js";
 export class LoadingView extends ModuleView<LoadingPluginEvents, LoadingPluginConstants, LoadingPluginSettings, LoadingPluginParams, LoadingPluginState> {
   name = "loading.view";
 

package/src/tests/setup.ts

@@ -1,12 +1,12 @@
 import { CONSTANTS as LAYER_CONST, PLUGIN_NAME as LAYER, SETTINGS_KEYS as LAYER_SETTINGS } from "@vnejs/contracts.canvas.layer";
 import { SUBSCRIBE_EVENTS as MEDIA_EVENTS } from "@vnejs/contracts.core.media";
-import { PARAMS, PLUGIN_NAME, SUBSCRIBE_EVENTS } from "@vnejs/contracts.views.screens.loading";
+import { CONSTANTS, PARAMS, PLUGIN_NAME, SUBSCRIBE_EVENTS } from "@vnejs/contracts.views.screens.loading";
 import { createTestModule as baseCreateTestModule, registerCoreVne, registerVnePlugin, stubEvent, stubSilentEvent } from "@vnejs/test-utils";
 
 export const registerLoadingPluginVne = () => {
   registerCoreVne();
   registerVnePlugin(LAYER, { constants: LAYER_CONST, settings: LAYER_SETTINGS });
-  registerVnePlugin(PLUGIN_NAME, { events: SUBSCRIBE_EVENTS, params: PARAMS });
+  registerVnePlugin(PLUGIN_NAME, { constants: CONSTANTS, events: SUBSCRIBE_EVENTS, params: PARAMS });
 };
 
 export const createLoadingTestModule = <T extends Parameters<typeof baseCreateTestModule>[0]>(

package/src/types.ts

@@ -3,7 +3,7 @@ import type { PluginName as LogsPluginName, SubscribeEvents as LogsSubscribeEven
 import type { PluginName as MemoryPluginName, SubscribeEvents as MemorySubscribeEvents } from "@vnejs/contracts.core.memory";
 import type { PluginName as SystemPluginName, SubscribeEvents as SystemSubscribeEvents } from "@vnejs/contracts.core.system";
 import type { PluginName as LocsPluginName, SubscribeEvents as LocsSubscribeEvents } from "@vnejs/contracts.text.locs";
-import type { Params, PluginName, SubscribeEvents } from "@vnejs/contracts.views.screens.loading";
+import type { Constants, Params, PluginName, SubscribeEvents } from "@vnejs/contracts.views.screens.loading";
 
 export type LoadingPluginEvents = ModuleComponentsEvents &
   Record<PluginName, SubscribeEvents> &
@@ -12,8 +12,15 @@ export type LoadingPluginEvents = ModuleComponentsEvents &
   Record<SystemPluginName, SystemSubscribeEvents> &
   Record<LocsPluginName, LocsSubscribeEvents>;
 
-export type LoadingPluginConstants = ModuleComponentsConstants;
+export type LoadingPluginConstants = ModuleComponentsConstants & Record<PluginName, Constants>;
 
 export type LoadingPluginSettings = ModuleComponentsSettings;
 
 export type LoadingPluginParams = ModuleComponentsParams & Record<PluginName, Params>;
+
+export type LoadingPluginState = {
+  isShow: boolean;
+  isForce: boolean;
+  bgSrc?: string;
+  locs?: Record<string, string>;
+};

package/src/utils/loading.ts

@@ -1,18 +1,6 @@
 import type { Module } from "@vnejs/module";
 
-import type { LoadingPluginConstants, LoadingPluginEvents, LoadingPluginParams, LoadingPluginSettings } from "../types.js";
-
-export type LoadingPluginState = {
-  isShow: boolean;
-  isForce: boolean;
-  bgSrc?: string;
-  locs?: Record<string, string>;
-};
-
-export type LoadingEmitPayload = {
-  promiseFunc?: () => void | Promise<void>;
-  source?: string;
-};
+import type { LoadingPluginConstants, LoadingPluginEvents, LoadingPluginParams, LoadingPluginSettings, LoadingPluginState } from "../types.js";
 
 export type LoadingViewContext = {
   emit: Module<LoadingPluginEvents, LoadingPluginConstants, LoadingPluginSettings, LoadingPluginParams, LoadingPluginState>["emit"];

package/src/view/index.tsx

@@ -3,8 +3,7 @@ import type { ReactComponentProps } from "@vnejs/uis.react";
 import { PositionBox, Screen, Text, createRenderFunc, useMemo, useStoreState } from "@vnejs/uis.react";
 
 import type { LoadingPluginConstants, LoadingPluginEvents, LoadingPluginParams, LoadingPluginSettings } from "../types.js";
-import type { LoadingPluginState } from "../utils/loading.js";
-
+import type { LoadingPluginState } from "../types.js";
 type LoadingComponentProps = ReactComponentProps<LoadingPluginEvents, LoadingPluginConstants, LoadingPluginSettings, LoadingPluginParams, LoadingPluginState>;
 
 const Loading = ({ store, onMount, PARAMS }: LoadingComponentProps) => {