@ives_xxz/framework 2.0.4 → 2.0.5

package/entry/FWEntry.ts

@@ -1,22 +1,21 @@
-import FWUiManager from '../manager/FWUiManager';
-import FWAnimationManager from '../manager/FWAnimationManager';
-import FWAudioManager from '../manager/FWAudioManager';
-import FWComponentManager from '../manager/FWComponentManager';
-import FWEventManager from '../manager/FWEventManager';
-import FWLanguageManager from '../manager/FWLanguageManager';
-import { FWLayerManager } from '../manager/FWLayerManager';
-import FWObjectManager from '../manager/FWObjectManager';
-import { FWResManager } from '../manager/FWResManager';
-import FWSocketManager from '../manager/FWSocketManager';
-import { FWStateManager } from '../manager/FWStateManager';
-import { FWTimeManager } from '../manager/FWTimeManager';
-import FWScene from '../scene/FWScene';
-import { FWSocketAutoProcessPause } from '../expand/FWDecorator';
-import FWTaskManager from '../manager/FWTaskManager';
-import FWEngineManager from '../manager/FWEngineManager';
-import FWHotUpdateManager from '../manager/FWHotUpdateManager';
-import FWPromiseManager from '../manager/FWPromiseManager';
-import { FWPerformanceManager } from '../manager/FWPerformanceManager';
+import FWUiManager from "../manager/FWUiManager";
+import FWAnimationManager from "../manager/FWAnimationManager";
+import FWAudioManager from "../manager/FWAudioManager";
+import FWComponentManager from "../manager/FWComponentManager";
+import FWEventManager from "../manager/FWEventManager";
+import FWLanguageManager from "../manager/FWLanguageManager";
+import { FWLayerManager } from "../manager/FWLayerManager";
+import FWObjectManager from "../manager/FWObjectManager";
+import { FWResManager } from "../manager/FWResManager";
+import FWSocketManager from "../manager/FWSocketManager";
+import { FWStateManager } from "../manager/FWStateManager";
+import { FWTimeManager } from "../manager/FWTimeManager";
+import { FWSocketAutoProcessPause } from "../expand/FWDecorator";
+import FWTaskManager from "../manager/FWTaskManager";
+import FWEngineManager from "../manager/FWEngineManager";
+import FWHotUpdateManager from "../manager/FWHotUpdateManager";
+import FWPromiseManager from "../manager/FWPromiseManager";
+import { FWPerformanceManager } from "../manager/FWPerformanceManager";
 
 /**
  * 入口脚本
@@ -94,7 +93,7 @@ export class FWEntry implements FW.Entry {
   /**
    * 当前Scene
    */
-  scene: FWScene;
+  scene: FW.Scene;
   /**
    * bundle名字
    */
@@ -140,10 +139,10 @@ export class FWEntry implements FW.Entry {
     if (!this.hasSceneName(name)) {
       try {
         cc.director.loadScene(name);
-        this.bundleName = '';
+        this.bundleName = "";
         return;
       } catch (e) {
-        FW.Log.error('launchScene failed:', name);
+        FW.Log.error("launchScene failed:", name);
       }
     }
 
@@ -202,11 +201,13 @@ export class FWEntry implements FW.Entry {
     return this.map.get(this.bundleName)?.sceneName || undefined;
   }
 
-  getComponent: <T>(serviceIdentifier: FW.ServiceIdentifier<T>) => T = (serviceIdentifier) =>
-    FW.Framework.getComponent(serviceIdentifier);
+  getComponent: <T>(serviceIdentifier: FW.ServiceIdentifier<T>) => T = (
+    serviceIdentifier
+  ) => FW.Framework.getComponent(serviceIdentifier);
 
-  getComponents: <T>(serviceIdentifier?: FW.ServiceIdentifier<T>) => T[] = (serviceIdentifier) =>
-    FW.Framework.getComponents(serviceIdentifier);
+  getComponents: <T>(serviceIdentifier?: FW.ServiceIdentifier<T>) => T[] = (
+    serviceIdentifier
+  ) => FW.Framework.getComponents(serviceIdentifier);
 
   update(dt: number) {
     this.timeMgr?.onUpdate(dt);

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "@ives_xxz/framework",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
-  "keywords": ["123456"],
+  "keywords": [
+    "123456"
+  ],
   "author": "ives",
   "license": "ISC"
 }

package/types/FW.d.ts

@@ -8,13 +8,18 @@ declare namespace FW {
     prototype: T;
   };
 
-  type ServiceIdentifierData<TInstance = unknown> = string | symbol | Newable<TInstance> | Function;
-
-  type CommonNewable<TInstance = unknown, TArgs extends unknown[] = any[]> = Newable<
-    TInstance,
-    TArgs
-  >;
-  type CommonServiceIdentifier<TInstance = unknown> = ServiceIdentifierData<TInstance>;
+  type ServiceIdentifierData<TInstance = unknown> =
+    | string
+    | symbol
+    | Newable<TInstance>
+    | Function;
+
+  type CommonNewable<
+    TInstance = unknown,
+    TArgs extends unknown[] = any[]
+  > = Newable<TInstance, TArgs>;
+  type CommonServiceIdentifier<TInstance = unknown> =
+    ServiceIdentifierData<TInstance>;
 
   type ServiceIdentifier<T = unknown> = CommonServiceIdentifier<T>;
   /**
@@ -60,13 +65,13 @@ declare namespace FW {
         resolve: (value: T | PromiseLike<T>) => void,
         reject: (reason?: any) => void,
         signal?: AbortSignal,
-        reason?: any,
+        reason?: any
       ) => void = PromiseExcutor,
-      options: PromiseExecuteOptions = {},
+      options: PromiseExecuteOptions = {}
     ): PromiseProxy<T>;
     all<T = any>(
       promises: FW.PromiseProxy<T>[],
-      options: FW.PromiseExecuteOptions = {},
+      options: FW.PromiseExecuteOptions = {}
     ): FW.PromiseProxy<FW.PromiseResult<T>>;
   };
 
@@ -74,18 +79,22 @@ declare namespace FW {
     registerLanguagePackageEnum(
       bundleName: string,
       language: any,
-      getter: (key: string, language?: string) => string,
+      getter: (key: string, language?: string) => string
     ): void;
     getSupportedLanguages(): string[];
     setSupportedLanguages(languages: string[]): void;
     getBundles(): string[];
     getLanguage(): string;
     getLanguageIndex(): number;
-    getLanguagePackageValue(bundleName: string, key: string, language?: string): string;
+    getLanguagePackageValue(
+      bundleName: string,
+      key: string,
+      language?: string
+    ): string;
     getLanguagePackageEnumKeys(bundleName: string): string[];
     getLanguagePackageEnumValues(bundleName: string): string[];
     getLanguagePackageEnum<K extends keyof ILanguageBundleAccessor>(
-      bundleName: K,
+      bundleName: K
     ): ILanguageBundleAccessor[K];
     initializeLanguage(language: string);
   };
@@ -103,32 +112,32 @@ declare namespace FW {
     createObjectPool<T extends FWObject = FWObject>(
       node: cc.Node,
       parent: cc.Node,
-      tag?: string,
+      tag?: string
     ): Promise<ObjectPool<T>>;
     createObjectPool<T extends FWObject = FWObject>(
       prefab: cc.Prefab,
       parent: cc.Node,
-      tag?: string,
+      tag?: string
     ): Promise<ObjectPool<T>>;
     createObjectPool<T extends FWObject = FWObject>(
       assetProperty: FW.AssetProperty,
       parent: cc.Node,
-      tag?: string,
+      tag?: string
     ): Promise<ObjectPool<T>>;
     createObjectPool<T extends FWObject = FWObject>(
       node: cc.Node,
       parent: cc.Node,
-      type?: number,
+      type?: number
     ): Promise<ObjectPool<T>>;
     createObjectPool<T extends FWObject = FWObject>(
       prefab: cc.Prefab,
       parent: cc.Node,
-      type?: number,
+      type?: number
     ): Promise<ObjectPool<T>>;
     createObjectPool<T extends FWObject = FWObject>(
       assetProperty: FW.AssetProperty,
       parent: cc.Node,
-      type?: number,
+      type?: number
     ): Promise<ObjectPool<T>>;
     /** 获取已经创建的对象池 */
     getObjectPool(tag: string): ObjectPool;
@@ -161,7 +170,7 @@ declare namespace FW {
       address: string,
       sender: Sender,
       handle: Handle,
-      config: SocketConfig,
+      config: SocketConfig
     ): Promise<Socket>;
     /**
      * 获取socket
@@ -257,7 +266,7 @@ declare namespace FW {
       tag: string,
       sender: Sender,
       handle: SocketHandle,
-      config: SocketConfig,
+      config: SocketConfig
     ): SocketPromiseProxy;
   };
 
@@ -292,7 +301,7 @@ declare namespace FW {
       args7?: FW.EventManagerArgs,
       args8?: FW.EventManagerArgs,
       args9?: FW.EventManagerArgs,
-      args10?: FW.EventManagerArgs,
+      args10?: FW.EventManagerArgs
     );
     /**
      * 比较目标
@@ -353,19 +362,35 @@ declare namespace FW {
     /**
      * 一次性调度器
      */
-    scheduleOnce(cb?: () => void, time?: number, tag?: string): FW.TimerSchedule;
+    scheduleOnce(
+      cb?: () => void,
+      time?: number,
+      tag?: string
+    ): FW.TimerSchedule;
     /**
      * 一次性调度器
      */
-    scheduleOnce(time?: number, cb?: () => void, tag?: string): FW.TimerSchedule;
+    scheduleOnce(
+      time?: number,
+      cb?: () => void,
+      tag?: string
+    ): FW.TimerSchedule;
     /**
      * 一次性调度器
      */
-    scheduleOnce(time?: number, cb?: () => void, target?: any): FW.TimerSchedule;
+    scheduleOnce(
+      time?: number,
+      cb?: () => void,
+      target?: any
+    ): FW.TimerSchedule;
     /**
      * 一次性调度器
      */
-    scheduleOnce(cb?: () => void, time?: number, target?: any): FW.TimerSchedule;
+    scheduleOnce(
+      cb?: () => void,
+      time?: number,
+      target?: any
+    ): FW.TimerSchedule;
     /**
      * 自定义调度器
      * */
@@ -374,7 +399,7 @@ declare namespace FW {
       time?: number,
       repeat?: number,
       target?: TargetType,
-      tag?: string,
+      tag?: string
     ): TimerSchedule;
     /** 暂停调度器 */
     pauseSchedule(tag: string): void;
@@ -425,13 +450,13 @@ declare namespace FW {
         args7?: EventManagerArgs,
         args8?: EventManagerArgs,
         args9?: EventManagerArgs,
-        args10?: EventManagerArgs,
+        args10?: EventManagerArgs
       ) => void,
       target: TargetType,
       options?: {
         priority?: FW.SystemDefine.FWPriorityOrder;
         intercept?: boolean;
-      },
+      }
     );
 
     registerOnce(
@@ -446,13 +471,13 @@ declare namespace FW {
         args7?: EventManagerArgs,
         args8?: EventManagerArgs,
         args9?: EventManagerArgs,
-        args10?: EventManagerArgs,
+        args10?: EventManagerArgs
       ) => void,
       target: TargetType,
       options?: {
         priority?: number;
         intercept?: boolean;
-      },
+      }
     ): void;
 
     /**
@@ -486,7 +511,7 @@ declare namespace FW {
       args7?: FW.EventManagerArgs,
       args8?: FW.EventManagerArgs,
       args9?: FW.EventManagerArgs,
-      args10?: FW.EventManagerArgs,
+      args10?: FW.EventManagerArgs
     ): void;
     /**
      * 注销事件
@@ -632,29 +657,37 @@ declare namespace FW {
      * @param data
      */
     openAsync<Ctr extends FW.LayerController = FWLayerController>(
-      data: LayerOpenArgs<Ctr>,
+      data: LayerOpenArgs<Ctr>
     ): Promise<Ctr>;
 
     /**
      * 同步打开layer
      * @param data
      */
-    openSync<Ctr extends FW.LayerController = FWLayerController>(data: LayerOpenArgs<Ctr>): Ctr;
+    openSync<Ctr extends FW.LayerController = FWLayerController>(
+      data: LayerOpenArgs<Ctr>
+    ): Ctr;
     /**
      * 显示常驻layer
      * @param layer
      */
-    displayLayer<Ctr extends FW.LayerController = FWLayerController>(ctr: Ctr): Ctr;
+    displayLayer<Ctr extends FW.LayerController = FWLayerController>(
+      ctr: Ctr
+    ): Ctr;
     /**
      * 隐藏常驻layer
      * @param layer
      */
-    hideLayer<Ctr extends FW.LayerController = FWLayerController>(ctr: Ctr): Ctr;
+    hideLayer<Ctr extends FW.LayerController = FWLayerController>(
+      ctr: Ctr
+    ): Ctr;
     /**
      * 关闭layer
      * @param layer
      */
-    close<Ctr extends FW.LayerController = FWLayerController>(ctr: Ctr): FWLayerController;
+    close<Ctr extends FW.LayerController = FWLayerController>(
+      ctr: Ctr
+    ): FWLayerController;
 
     /**
      * 从栈关闭
@@ -760,7 +793,10 @@ declare namespace FW {
      * @param url
      * @param cb
      */
-    loadRemote<T extends cc.Asset = cc.Asset>(url: string, cb?: (asset: cc.Asset) => T): Promise<T>;
+    loadRemote<T extends cc.Asset = cc.Asset>(
+      url: string,
+      cb?: (asset: cc.Asset) => T
+    ): Promise<T>;
     /**
      * 从远程加载spine动画
      * @param data
@@ -776,13 +812,18 @@ declare namespace FW {
      * 加载资源返回数据
      * @param assetProperty
      */
-    loadAssetData<T extends cc.Asset>(assetProperty: AssetProperty): Promise<AssetData>;
+    loadAssetData<T extends cc.Asset>(
+      assetProperty: AssetProperty
+    ): Promise<AssetData>;
 
     /**
      * 加载资源
      * @param assetProperty
      */
-    loadAsset<T extends cc.Asset>(assetProperty: AssetProperty, cb?: () => void): Promise<T>;
+    loadAsset<T extends cc.Asset>(
+      assetProperty: AssetProperty,
+      cb?: () => void
+    ): Promise<T>;
 
     /**
      * 获取资源
@@ -930,7 +971,10 @@ declare namespace FW {
      * @param url
      * @param cb
      */
-    loadRemote<T extends cc.Asset = cc.Asset>(url: string, cb?: (asset: cc.Asset) => T): Promise<T>;
+    loadRemote<T extends cc.Asset = cc.Asset>(
+      url: string,
+      cb?: (asset: cc.Asset) => T
+    ): Promise<T>;
     /**
      * 从远程加载spine动画
      * @param data
@@ -1133,7 +1177,7 @@ declare namespace FW {
      */
     register(
       state: FW.StateMachineRegisterArgs | FW.StateMachineRegisterArgs[],
-      stateMachineName?: string,
+      stateMachineName?: string
     );
     /**
      * 注销指定状态机的某个状态
@@ -1189,22 +1233,22 @@ declare namespace FW {
         progress: Function;
         easing: Function | String;
         onUpdate: Function;
-      }>,
+      }>
     >(
       duration: number,
       props: ConstructorType<T>,
-      opts?: OPTS,
+      opts?: OPTS
     ): FW.Tween;
     by<
       OPTS extends Partial<{
         progress: Function;
         easing: Function | String;
         onUpdate: Function;
-      }>,
+      }>
     >(
       duration: number,
       props: ConstructorType<T>,
-      opts?: OPTS,
+      opts?: OPTS
     ): FW.Tween;
     set(props: ConstructorType<T>): FW.Tween;
   };
@@ -1444,7 +1488,11 @@ declare namespace FW {
      * @param volume
      * @param loop
      */
-    playMusic(assetProperty: AssetProperty, volume?: number, loop?: boolean): void;
+    playMusic(
+      assetProperty: AssetProperty,
+      volume?: number,
+      loop?: boolean
+    ): void;
     /**
      * 停止背景音乐
      */
@@ -1473,21 +1521,36 @@ declare namespace FW {
      * @param volume
      * @param loop
      */
-    play(path: string, cb?: (id: number) => void, volume?: number, loop?: boolean);
+    play(
+      path: string,
+      cb?: (id: number) => void,
+      volume?: number,
+      loop?: boolean
+    );
     /**
      * 播放音效
      * @param audio
      * @param volume
      * @param loop
      */
-    play(audio: cc.AudioClip, cb?: (id: number) => void, volume?: number, loop?: boolean);
+    play(
+      audio: cc.AudioClip,
+      cb?: (id: number) => void,
+      volume?: number,
+      loop?: boolean
+    );
     /**
      * 播放音效
      * @param assetProperty
      * @param volume
      * @param loop
      */
-    play(assetProperty: AssetProperty, cb?: (id: number) => void, volume?: number, loop?: boolean);
+    play(
+      assetProperty: AssetProperty,
+      cb?: (id: number) => void,
+      volume?: number,
+      loop?: boolean
+    );
     /**
      * 暂停所有
      */
@@ -1508,7 +1571,11 @@ declare namespace FW {
   };
 
   type PerformanceManager = {
-    recordOperationMetric(manager: string, operation: string, duration: number): void;
+    recordOperationMetric(
+      manager: string,
+      operation: string,
+      duration: number
+    ): void;
     getModuleReport(manager: string): PerformanceReport;
     getAllReports(): Map<string, FW.PerformanceReport>;
   };
@@ -1807,7 +1874,7 @@ declare namespace FW {
     abort?: (reason?: any) => void;
     addAbortEventListener?: (
       listener: (this: AbortSignal, ev: Event) => any,
-      options?: boolean | AddEventListenerOptions,
+      options?: boolean | AddEventListenerOptions
     ) => void;
   };
 
@@ -1815,7 +1882,7 @@ declare namespace FW {
     resolve: (value: T | PromiseLike<T>) => void,
     reject: (reason?: any) => void,
     signal: AbortSignal,
-    reason?: any,
+    reason?: any
   ) => void;
 
   type PromiseExecuteOptions = {
@@ -1826,7 +1893,10 @@ declare namespace FW {
     retryCondition?: (error: any, retryCount: number) => boolean;
   };
 
-  type Promise = (resolve: (value: any) => void, reject: (reason?: any) => void) => void;
+  type Promise = (
+    resolve: (value: any) => void,
+    reject: (reason?: any) => void
+  ) => void;
 
   type PromiseResult<T = any> = {
     success: PromiseProxy<T>[];
@@ -1834,7 +1904,7 @@ declare namespace FW {
     cancelled: number[];
   };
 
-  type PromiseStatus = 'pending' | 'fulfilled' | 'rejected' | 'cancelled';
+  type PromiseStatus = "pending" | "fulfilled" | "rejected" | "cancelled";
 
   /**
    * 性能管理器配置
@@ -1882,7 +1952,7 @@ declare namespace FW {
   type PropertyDecorator = (
     $class: Record<string, any>,
     $propertyKey: string | symbol,
-    $descriptorOrInitializer?: any,
+    $descriptorOrInitializer?: any
   ) => void;
 
   declare function timeScale(scale: number);
@@ -1930,7 +2000,10 @@ declare namespace FW {
     public config?: FW.AssetConfig;
     public sender?: FW.Sender;
     public handle?: FW.Handle;
-    public invoke<T>(operation: Promise<T>, operationName: string = 'unknown'): Promise<T>;
+    public invoke<T>(
+      operation: Promise<T>,
+      operationName: string = "unknown"
+    ): Promise<T>;
     public getLogic<T extends FW.Logic = FWLogic>();
     public getData<T extends FW.Data = FWData>();
     public getSender<T extends FW.Sender>();
@@ -1988,10 +2061,10 @@ declare namespace FW {
     }
 
     export class FWTaskStatus {
-      static IDLE = 'IDLE';
-      static RUNNING = 'RUNNING';
-      static PAUSED = 'PAUSED';
-      static COMPLETED = 'COMPLETED';
+      static IDLE = "IDLE";
+      static RUNNING = "RUNNING";
+      static PAUSED = "PAUSED";
+      static COMPLETED = "COMPLETED";
     }
 
     export class FWPriorityOrder {
@@ -2035,17 +2108,17 @@ declare namespace FW {
      * HTTP请求类型
      */
     export class FWHttpRequestType {
-      static GET = 'GET';
-      static POST = 'POST';
+      static GET = "GET";
+      static POST = "POST";
     }
 
     /**
      * 动画机类型
      */
     export class FWAnimationMachineType {
-      static TWEEN = 'TWEEN';
-      static SKELETON = 'SKELETON';
-      static ANIMATION = 'ANIMATION';
+      static TWEEN = "TWEEN";
+      static SKELETON = "SKELETON";
+      static ANIMATION = "ANIMATION";
     }
 
     export class FWScrollViewTemplateType {
@@ -2066,23 +2139,23 @@ declare namespace FW {
     }
 
     export class FWLanguageAssetType {
-      static LABEL = 'label';
-      static SPRITE = 'sprite';
-      static SKELETON = 'skeleton';
+      static LABEL = "label";
+      static SPRITE = "sprite";
+      static SKELETON = "skeleton";
     }
 
     export class FWPromiseStatus {
-      static PENDING = 'pending';
-      static FULFILLED = 'fulfilled';
-      static REJECTED = 'rejected';
-      static CANCELLED = 'cancelled';
+      static PENDING = "pending";
+      static FULFILLED = "fulfilled";
+      static REJECTED = "rejected";
+      static CANCELLED = "cancelled";
     }
 
     export class FWLayerState {
-      static CLOSED = 'closed';
-      static OPENING = 'opening';
-      static OPENED = 'opened';
-      static CLOSING = 'closing';
+      static CLOSED = "closed";
+      static OPENING = "opening";
+      static OPENED = "opened";
+      static CLOSING = "closing";
     }
 
     export class FWAudioType {
@@ -2093,21 +2166,21 @@ declare namespace FW {
   namespace EventDefine {
     export class LanguageEvent {
       /** 语言变更 */
-      static LANGUAGE_CHANGE = 'LANGUAGE_CHANGE';
+      static LANGUAGE_CHANGE = "LANGUAGE_CHANGE";
     }
 
     export class TaskEvent {
-      static START = 'START';
-      static PROGRESS = 'PROGRESS';
-      static COMPLETE = 'COMPLETE';
-      static YIELDED = 'YIELDED';
-      static PAUSE = 'PAUSE';
-      static RESUME = 'RESUME';
-      static FRAME_START = 'FRAME_START';
-      static FRAME_END = 'FRAME_END';
-      static QUEUE = 'QUEUE';
-      static ALL_COMPLETE = 'ALL_COMPLETE';
-      static ERROR = 'ERROR';
+      static START = "START";
+      static PROGRESS = "PROGRESS";
+      static COMPLETE = "COMPLETE";
+      static YIELDED = "YIELDED";
+      static PAUSE = "PAUSE";
+      static RESUME = "RESUME";
+      static FRAME_START = "FRAME_START";
+      static FRAME_END = "FRAME_END";
+      static QUEUE = "QUEUE";
+      static ALL_COMPLETE = "ALL_COMPLETE";
+      static ERROR = "ERROR";
     }
 
     export class SystemEvent {
@@ -2115,8 +2188,8 @@ declare namespace FW {
     }
 
     export class CCEvent {
-      static ON_SHOW = 'ON_SHOW';
-      static ON_HIDE = 'ON_HIDE';
+      static ON_SHOW = "ON_SHOW";
+      static ON_HIDE = "ON_HIDE";
     }
   }
   export const SystemDefine: SystemDefine;
@@ -2170,6 +2243,19 @@ declare namespace FW {
     onDisable?();
     onDestroy?();
     onClose?();
+    cc(
+      target: cc.Node,
+      cb: (event: cc.Event) => void,
+      responseInterval?: number,
+      eventName?: string
+    ): this;
+
+    fw(
+      eventName: string,
+      cb: (event: cc.Event) => void,
+      target?: cc.Node,
+      responseInterval?: number
+    ): this;
 
     /**
      * 查找节点
@@ -2190,7 +2276,7 @@ declare namespace FW {
       referenceNode: cc.Node,
       type?: {
         prototype: T;
-      },
+      }
     ): T;
     registerEvent(args: RegisterArgs): void;
     unRegisterEvent(args: RegisterArgs);