@mptool/all 0.6.2 → 0.6.4

package/lib/index.d.mts

@@ -8,10 +8,10 @@ declare const isMp: boolean;
 type EventType = string | symbol;
 type Handler<T = unknown> = (event: T) => void | Promise<void>;
 type WildcardHandler<T = Record<string, unknown>> = (type: keyof T, event: T[keyof T]) => void | Promise<void>;
-type EventHandlerList<T = unknown> = Array<Handler<T>>;
-type WildCardEventHandlerList<T = Record<string, unknown>> = Array<WildcardHandler<T>>;
-type EventHandlerMap<Events extends Record<EventType, unknown>> = Map<keyof Events | "*", EventHandlerList<Events[keyof Events]> | WildCardEventHandlerList<Events>>;
-interface EmitterInstance<Events extends Record<EventType, unknown>> {
+type EventHandlerList<T = unknown> = Handler<T>[];
+type WildCardEventHandlerList<T = Record<string, unknown>> = WildcardHandler<T>[];
+type EventHandlerMap<Events> = Map<keyof Events | "*", EventHandlerList<Events[keyof Events]> | WildCardEventHandlerList<Events>>;
+interface EmitterInstance<Events> {
     all: EventHandlerMap<Events>;
     on<Key extends keyof Events>(type: Key, handler: Handler<Events[Key]>): void;
     on(type: "*", handler: WildcardHandler<Events>): void;
@@ -27,7 +27,7 @@ interface EmitterInstance<Events extends Record<EventType, unknown>> {
  * @name emitter
  * @returns Emitter
  */
-declare function Emitter<Events extends Record<EventType, unknown>>(all?: EventHandlerMap<Events>): EmitterInstance<Events>;
+declare function Emitter<Events>(all?: EventHandlerMap<Events>): EmitterInstance<Events>;
 
 /** 写入普通日志 */
 declare const debug: (...args: any[]) => void;
@@ -145,7 +145,7 @@ declare function wrapFunction<T>(original: ((this: T, ...args: any[]) => Promise
  * }, 15);
  * ```
  */
-declare const lock: <T, A extends unknown[], R>(fn: (this: T, release: () => void, ...args: A) => R, ctx?: T | undefined) => (this: T, ...args: A) => R | undefined;
+declare const lock: <T, A extends unknown[], R>(fn: (this: T, release: () => void, ...args: A) => R, ctx?: T) => ((this: T, ...args: A) => R | undefined);
 /**
  * 包装函数保证其之被调用一次
  *
@@ -163,7 +163,7 @@ declare const lock: <T, A extends unknown[], R>(fn: (this: T, release: () => voi
  * counter(); // count is still 1
  * ```
  */
-declare const once: <T, A extends unknown[], R>(func: (...args: A) => R, ctx?: T | undefined) => (this: T, ...args: A) => R | undefined;
+declare const once: <T, A extends unknown[], R>(func: (...args: A) => R, ctx?: T) => ((this: T, ...args: A) => R | undefined);
 interface Task<ArgType extends unknown[] = unknown[], This = unknown> {
     /** 函数本身 */
     func: (this: This, next: () => void, ...args: ArgType) => void;
@@ -182,7 +182,7 @@ declare class Queue {
     /** 允许同时并行的任务数 */
     capacity?: number);
     /** 回调队列 */
-    funcQueue: Task<any, any>[];
+    funcQueue: Task[];
     /** 正在运行的数量 */
     running: number;
     /** 执行下一个函数 */
@@ -193,7 +193,7 @@ declare class Queue {
      * @param ctx 函数运行上下文
      * @param args 函数参数
      */
-    add<A extends unknown[], T>(func: (next: () => void, ...args: A) => void, ctx?: T, ...args: A): void;
+    add<A extends any[], T>(func: (next: () => void, ...args: A) => void, ctx?: T, ...args: A): void;
     /** 清除队列，不再执行尚未执行的函数 */
     clear(): void;
 }
@@ -206,7 +206,7 @@ declare class Queue {
  * @returns 包装过的函数
  * @async
  */
-declare const funcQueue: <A extends unknown[], T = unknown>(fn: (next: () => void, ...args: A) => void, capacity?: number) => (this: T, ...args: A) => void;
+declare const funcQueue: <A extends unknown[], T = unknown>(fn: (next: () => void, ...args: A) => void, capacity?: number) => ((this: T, ...args: A) => void);
 
 type Props = Record<string, unknown>;
 type PropsOptions<Property = Props> = {
@@ -230,11 +230,7 @@ type PropMethod<Type, TypeConstructor = any> = Type extends (...args: any) => an
     (): Type;
     readonly prototype: TypeConstructor;
 } : never;
-type PropConstructor<Type = any> = {
-    new (...args: any[]): Type & {};
-} | {
-    (): Type;
-} | PropMethod<Type>;
+type PropConstructor<Type = any> = (new (...args: any[]) => Type & {}) | (() => Type) | PropMethod<Type>;
 type PropType<T> = PropConstructor<T> | PropConstructor<T>[];
 type RequiredKeys<T> = {
     [K in keyof T]: T[K] extends {
@@ -371,9 +367,7 @@ type ComponentOptions<Data extends WechatMiniprogram.Component.DataOption, Prope
     /** 组件属性 */
     properties: Property;
 }> & Partial<WechatMiniprogram.Component.Method<Method, IsPage>> & Partial<WechatMiniprogram.Component.OtherOption> & Partial<ComponentLifetimes> & ThisType<ComponentInstance<Data, Property, Method, CustomInstanceProperty, IsPage>>;
-interface ComponentConstructor {
-    <Data extends WechatMiniprogram.Component.DataOption, Property extends PropsOptions, Method extends WechatMiniprogram.Component.MethodOption, CustomInstanceProperty extends WechatMiniprogram.IAnyObject = {}, IsPage extends boolean = false>(options: ComponentOptions<Data, Property, Method, CustomInstanceProperty, IsPage>): string;
-}
+type ComponentConstructor = <Data extends WechatMiniprogram.Component.DataOption, Property extends PropsOptions, Method extends WechatMiniprogram.Component.MethodOption, CustomInstanceProperty extends WechatMiniprogram.IAnyObject = {}, IsPage extends boolean = false>(options: ComponentOptions<Data, Property, Method, CustomInstanceProperty, IsPage>) => string;
 type TrivialComponentInstance = ComponentInstance<WechatMiniprogram.IAnyObject, Record<string, null>, Record<string, (...args: unknown[]) => any>>;
 type TrivialComponentOptions = ComponentInstance<WechatMiniprogram.IAnyObject, Record<string, null>, Record<string, (...args: any[]) => any>>;
 type RefMap = Record<string, TrivialComponentInstance>;
@@ -571,9 +565,7 @@ interface NavigatorMethods {
     $bindBack(): Promise<void> | void;
 }
 
-interface PageQuery {
-    [props: string]: string;
-}
+type PageQuery = Record<string, string>;
 interface PageState {
     /** 是否是打开的第一个页面 */
     firstOpen: boolean;
@@ -666,9 +658,7 @@ type PageInstance<Data extends WechatMiniprogram.IAnyObject, Custom extends Wech
 type PageOptions<Data extends WechatMiniprogram.IAnyObject, Custom extends WechatMiniprogram.IAnyObject> = (Custom & Partial<WechatMiniprogram.Page.Data<Data>> & Partial<WechatMiniprogram.Page.ILifetime & ExtendedPageLifeCycles> & Partial<ExtendedPageProperties> & {
     options?: WechatMiniprogram.Component.ComponentOptions;
 }) & ThisType<PageInstance<Data, Custom>>;
-interface PageConstructor {
-    <Data extends WechatMiniprogram.IAnyObject, Custom extends WechatMiniprogram.IAnyObject>(name: string, options: PageOptions<Data, Custom>): void;
-}
+type PageConstructor = <Data extends WechatMiniprogram.IAnyObject, Custom extends WechatMiniprogram.IAnyObject>(name: string, options: PageOptions<Data, Custom>) => void;
 type TrivialPageInstance = PageInstance<WechatMiniprogram.IAnyObject, WechatMiniprogram.IAnyObject>;
 type TrivialPageOptions = PageOptions<WechatMiniprogram.IAnyObject, WechatMiniprogram.IAnyObject>;
 
@@ -740,9 +730,7 @@ interface ExtendsAppOptions {
 type ExtendedAppMethods = InstanceEmitterMethods;
 type AppOptions<Custom> = ExtendsAppOptions & Partial<WechatMiniprogram.App.Option> & Custom & Partial<ExtendedAppMethods> & ThisType<AppInstance<Custom>>;
 type AppInstance<Custom> = AppOptions<Custom> & Custom & ExtendedAppMethods;
-interface AppConstructor {
-    <Custom extends WechatMiniprogram.IAnyObject>(appOptions: AppOptions<Custom>): void;
-}
+type AppConstructor = <Custom extends WechatMiniprogram.IAnyObject>(appOptions: AppOptions<Custom>) => void;
 
 /**
  * Application wrapper
@@ -1107,49 +1095,6 @@ declare class Cookie {
     toJSON(): CookieType;
 }
 
-type HeadersInit = [string, string][] | Record<string, string> | Headers;
-declare class Headers {
-    private headers;
-    private headerNames;
-    constructor(init?: HeadersInit);
-    /**
-     * Appends a new value onto an existing header inside a `Headers` object, or adds the header if it does not already exist.
-     */
-    append(name: string, value: string): void;
-    /**
-     * Deletes a header from the `Headers` object.
-     */
-    delete(name: string): void;
-    /**
-     * Returns a `ByteString` sequence of all the values of a header with a given name.
-     */
-    get(name: string): string | null;
-    /**
-     * Returns an array containing the values
-     * of all Set-Cookie headers associated
-     * with a response
-     */
-    getSetCookie(): string[];
-    /**
-     * Returns a boolean stating whether a `Headers` object contains a certain header.
-     */
-    has(name: string): boolean;
-    /**
-     * Sets a new value for an existing header inside a `Headers` object, or adds the header if it does not already exist.
-     */
-    set(name: string, value: string): void;
-    /**
-     * Traverses the `Headers` object,
-     * calling the given callback for each header.
-     */
-    forEach<ThisArg = this>(callback: (this: ThisArg, value: string, name: string, parent: this) => void, thisArg?: ThisArg): void;
-    keys(): IterableIterator<string>;
-    values(): IterableIterator<string>;
-    entries(): IterableIterator<[string, string]>;
-    toObject(): Record<string, string>;
-    [Symbol.iterator](): IterableIterator<[string, string]>;
-}
-
 /**
  * @see RFC 6265
  */
@@ -1290,6 +1235,49 @@ declare class CookieStore {
     private save;
 }
 
+type HeadersInit = [string, string][] | Record<string, string> | Headers;
+declare class Headers {
+    private headers;
+    private headerNames;
+    constructor(init?: HeadersInit);
+    /**
+     * Appends a new value onto an existing header inside a `Headers` object, or adds the header if it does not already exist.
+     */
+    append(name: string, value: string): void;
+    /**
+     * Deletes a header from the `Headers` object.
+     */
+    delete(name: string): void;
+    /**
+     * Returns a `ByteString` sequence of all the values of a header with a given name.
+     */
+    get(name: string): string | null;
+    /**
+     * Returns an array containing the values
+     * of all Set-Cookie headers associated
+     * with a response
+     */
+    getSetCookie(): string[];
+    /**
+     * Returns a boolean stating whether a `Headers` object contains a certain header.
+     */
+    has(name: string): boolean;
+    /**
+     * Sets a new value for an existing header inside a `Headers` object, or adds the header if it does not already exist.
+     */
+    set(name: string, value: string): void;
+    /**
+     * Traverses the `Headers` object,
+     * calling the given callback for each header.
+     */
+    forEach<ThisArg = this>(callback: (this: ThisArg, value: string, name: string, parent: this) => void, thisArg?: ThisArg): void;
+    keys(): IterableIterator<string>;
+    values(): IterableIterator<string>;
+    entries(): IterableIterator<[string, string]>;
+    toObject(): Record<string, string>;
+    [Symbol.iterator](): IterableIterator<[string, string]>;
+}
+
 declare class URLSearchParams {
     private params;
     constructor(init?: URLSearchParams | string | Record<string, string | string[]> | Iterable<[string, string]>);

package/lib/index.d.ts

@@ -8,10 +8,10 @@ declare const isMp: boolean;
 type EventType = string | symbol;
 type Handler<T = unknown> = (event: T) => void | Promise<void>;
 type WildcardHandler<T = Record<string, unknown>> = (type: keyof T, event: T[keyof T]) => void | Promise<void>;
-type EventHandlerList<T = unknown> = Array<Handler<T>>;
-type WildCardEventHandlerList<T = Record<string, unknown>> = Array<WildcardHandler<T>>;
-type EventHandlerMap<Events extends Record<EventType, unknown>> = Map<keyof Events | "*", EventHandlerList<Events[keyof Events]> | WildCardEventHandlerList<Events>>;
-interface EmitterInstance<Events extends Record<EventType, unknown>> {
+type EventHandlerList<T = unknown> = Handler<T>[];
+type WildCardEventHandlerList<T = Record<string, unknown>> = WildcardHandler<T>[];
+type EventHandlerMap<Events> = Map<keyof Events | "*", EventHandlerList<Events[keyof Events]> | WildCardEventHandlerList<Events>>;
+interface EmitterInstance<Events> {
     all: EventHandlerMap<Events>;
     on<Key extends keyof Events>(type: Key, handler: Handler<Events[Key]>): void;
     on(type: "*", handler: WildcardHandler<Events>): void;
@@ -27,7 +27,7 @@ interface EmitterInstance<Events extends Record<EventType, unknown>> {
  * @name emitter
  * @returns Emitter
  */
-declare function Emitter<Events extends Record<EventType, unknown>>(all?: EventHandlerMap<Events>): EmitterInstance<Events>;
+declare function Emitter<Events>(all?: EventHandlerMap<Events>): EmitterInstance<Events>;
 
 /** 写入普通日志 */
 declare const debug: (...args: any[]) => void;
@@ -145,7 +145,7 @@ declare function wrapFunction<T>(original: ((this: T, ...args: any[]) => Promise
  * }, 15);
  * ```
  */
-declare const lock: <T, A extends unknown[], R>(fn: (this: T, release: () => void, ...args: A) => R, ctx?: T | undefined) => (this: T, ...args: A) => R | undefined;
+declare const lock: <T, A extends unknown[], R>(fn: (this: T, release: () => void, ...args: A) => R, ctx?: T) => ((this: T, ...args: A) => R | undefined);
 /**
  * 包装函数保证其之被调用一次
  *
@@ -163,7 +163,7 @@ declare const lock: <T, A extends unknown[], R>(fn: (this: T, release: () => voi
  * counter(); // count is still 1
  * ```
  */
-declare const once: <T, A extends unknown[], R>(func: (...args: A) => R, ctx?: T | undefined) => (this: T, ...args: A) => R | undefined;
+declare const once: <T, A extends unknown[], R>(func: (...args: A) => R, ctx?: T) => ((this: T, ...args: A) => R | undefined);
 interface Task<ArgType extends unknown[] = unknown[], This = unknown> {
     /** 函数本身 */
     func: (this: This, next: () => void, ...args: ArgType) => void;
@@ -182,7 +182,7 @@ declare class Queue {
     /** 允许同时并行的任务数 */
     capacity?: number);
     /** 回调队列 */
-    funcQueue: Task<any, any>[];
+    funcQueue: Task[];
     /** 正在运行的数量 */
     running: number;
     /** 执行下一个函数 */
@@ -193,7 +193,7 @@ declare class Queue {
      * @param ctx 函数运行上下文
      * @param args 函数参数
      */
-    add<A extends unknown[], T>(func: (next: () => void, ...args: A) => void, ctx?: T, ...args: A): void;
+    add<A extends any[], T>(func: (next: () => void, ...args: A) => void, ctx?: T, ...args: A): void;
     /** 清除队列，不再执行尚未执行的函数 */
     clear(): void;
 }
@@ -206,7 +206,7 @@ declare class Queue {
  * @returns 包装过的函数
  * @async
  */
-declare const funcQueue: <A extends unknown[], T = unknown>(fn: (next: () => void, ...args: A) => void, capacity?: number) => (this: T, ...args: A) => void;
+declare const funcQueue: <A extends unknown[], T = unknown>(fn: (next: () => void, ...args: A) => void, capacity?: number) => ((this: T, ...args: A) => void);
 
 type Props = Record<string, unknown>;
 type PropsOptions<Property = Props> = {
@@ -230,11 +230,7 @@ type PropMethod<Type, TypeConstructor = any> = Type extends (...args: any) => an
     (): Type;
     readonly prototype: TypeConstructor;
 } : never;
-type PropConstructor<Type = any> = {
-    new (...args: any[]): Type & {};
-} | {
-    (): Type;
-} | PropMethod<Type>;
+type PropConstructor<Type = any> = (new (...args: any[]) => Type & {}) | (() => Type) | PropMethod<Type>;
 type PropType<T> = PropConstructor<T> | PropConstructor<T>[];
 type RequiredKeys<T> = {
     [K in keyof T]: T[K] extends {
@@ -371,9 +367,7 @@ type ComponentOptions<Data extends WechatMiniprogram.Component.DataOption, Prope
     /** 组件属性 */
     properties: Property;
 }> & Partial<WechatMiniprogram.Component.Method<Method, IsPage>> & Partial<WechatMiniprogram.Component.OtherOption> & Partial<ComponentLifetimes> & ThisType<ComponentInstance<Data, Property, Method, CustomInstanceProperty, IsPage>>;
-interface ComponentConstructor {
-    <Data extends WechatMiniprogram.Component.DataOption, Property extends PropsOptions, Method extends WechatMiniprogram.Component.MethodOption, CustomInstanceProperty extends WechatMiniprogram.IAnyObject = {}, IsPage extends boolean = false>(options: ComponentOptions<Data, Property, Method, CustomInstanceProperty, IsPage>): string;
-}
+type ComponentConstructor = <Data extends WechatMiniprogram.Component.DataOption, Property extends PropsOptions, Method extends WechatMiniprogram.Component.MethodOption, CustomInstanceProperty extends WechatMiniprogram.IAnyObject = {}, IsPage extends boolean = false>(options: ComponentOptions<Data, Property, Method, CustomInstanceProperty, IsPage>) => string;
 type TrivialComponentInstance = ComponentInstance<WechatMiniprogram.IAnyObject, Record<string, null>, Record<string, (...args: unknown[]) => any>>;
 type TrivialComponentOptions = ComponentInstance<WechatMiniprogram.IAnyObject, Record<string, null>, Record<string, (...args: any[]) => any>>;
 type RefMap = Record<string, TrivialComponentInstance>;
@@ -571,9 +565,7 @@ interface NavigatorMethods {
     $bindBack(): Promise<void> | void;
 }
 
-interface PageQuery {
-    [props: string]: string;
-}
+type PageQuery = Record<string, string>;
 interface PageState {
     /** 是否是打开的第一个页面 */
     firstOpen: boolean;
@@ -666,9 +658,7 @@ type PageInstance<Data extends WechatMiniprogram.IAnyObject, Custom extends Wech
 type PageOptions<Data extends WechatMiniprogram.IAnyObject, Custom extends WechatMiniprogram.IAnyObject> = (Custom & Partial<WechatMiniprogram.Page.Data<Data>> & Partial<WechatMiniprogram.Page.ILifetime & ExtendedPageLifeCycles> & Partial<ExtendedPageProperties> & {
     options?: WechatMiniprogram.Component.ComponentOptions;
 }) & ThisType<PageInstance<Data, Custom>>;
-interface PageConstructor {
-    <Data extends WechatMiniprogram.IAnyObject, Custom extends WechatMiniprogram.IAnyObject>(name: string, options: PageOptions<Data, Custom>): void;
-}
+type PageConstructor = <Data extends WechatMiniprogram.IAnyObject, Custom extends WechatMiniprogram.IAnyObject>(name: string, options: PageOptions<Data, Custom>) => void;
 type TrivialPageInstance = PageInstance<WechatMiniprogram.IAnyObject, WechatMiniprogram.IAnyObject>;
 type TrivialPageOptions = PageOptions<WechatMiniprogram.IAnyObject, WechatMiniprogram.IAnyObject>;
 
@@ -740,9 +730,7 @@ interface ExtendsAppOptions {
 type ExtendedAppMethods = InstanceEmitterMethods;
 type AppOptions<Custom> = ExtendsAppOptions & Partial<WechatMiniprogram.App.Option> & Custom & Partial<ExtendedAppMethods> & ThisType<AppInstance<Custom>>;
 type AppInstance<Custom> = AppOptions<Custom> & Custom & ExtendedAppMethods;
-interface AppConstructor {
-    <Custom extends WechatMiniprogram.IAnyObject>(appOptions: AppOptions<Custom>): void;
-}
+type AppConstructor = <Custom extends WechatMiniprogram.IAnyObject>(appOptions: AppOptions<Custom>) => void;
 
 /**
  * Application wrapper
@@ -1107,49 +1095,6 @@ declare class Cookie {
     toJSON(): CookieType;
 }
 
-type HeadersInit = [string, string][] | Record<string, string> | Headers;
-declare class Headers {
-    private headers;
-    private headerNames;
-    constructor(init?: HeadersInit);
-    /**
-     * Appends a new value onto an existing header inside a `Headers` object, or adds the header if it does not already exist.
-     */
-    append(name: string, value: string): void;
-    /**
-     * Deletes a header from the `Headers` object.
-     */
-    delete(name: string): void;
-    /**
-     * Returns a `ByteString` sequence of all the values of a header with a given name.
-     */
-    get(name: string): string | null;
-    /**
-     * Returns an array containing the values
-     * of all Set-Cookie headers associated
-     * with a response
-     */
-    getSetCookie(): string[];
-    /**
-     * Returns a boolean stating whether a `Headers` object contains a certain header.
-     */
-    has(name: string): boolean;
-    /**
-     * Sets a new value for an existing header inside a `Headers` object, or adds the header if it does not already exist.
-     */
-    set(name: string, value: string): void;
-    /**
-     * Traverses the `Headers` object,
-     * calling the given callback for each header.
-     */
-    forEach<ThisArg = this>(callback: (this: ThisArg, value: string, name: string, parent: this) => void, thisArg?: ThisArg): void;
-    keys(): IterableIterator<string>;
-    values(): IterableIterator<string>;
-    entries(): IterableIterator<[string, string]>;
-    toObject(): Record<string, string>;
-    [Symbol.iterator](): IterableIterator<[string, string]>;
-}
-
 /**
  * @see RFC 6265
  */
@@ -1290,6 +1235,49 @@ declare class CookieStore {
     private save;
 }
 
+type HeadersInit = [string, string][] | Record<string, string> | Headers;
+declare class Headers {
+    private headers;
+    private headerNames;
+    constructor(init?: HeadersInit);
+    /**
+     * Appends a new value onto an existing header inside a `Headers` object, or adds the header if it does not already exist.
+     */
+    append(name: string, value: string): void;
+    /**
+     * Deletes a header from the `Headers` object.
+     */
+    delete(name: string): void;
+    /**
+     * Returns a `ByteString` sequence of all the values of a header with a given name.
+     */
+    get(name: string): string | null;
+    /**
+     * Returns an array containing the values
+     * of all Set-Cookie headers associated
+     * with a response
+     */
+    getSetCookie(): string[];
+    /**
+     * Returns a boolean stating whether a `Headers` object contains a certain header.
+     */
+    has(name: string): boolean;
+    /**
+     * Sets a new value for an existing header inside a `Headers` object, or adds the header if it does not already exist.
+     */
+    set(name: string, value: string): void;
+    /**
+     * Traverses the `Headers` object,
+     * calling the given callback for each header.
+     */
+    forEach<ThisArg = this>(callback: (this: ThisArg, value: string, name: string, parent: this) => void, thisArg?: ThisArg): void;
+    keys(): IterableIterator<string>;
+    values(): IterableIterator<string>;
+    entries(): IterableIterator<[string, string]>;
+    toObject(): Record<string, string>;
+    [Symbol.iterator](): IterableIterator<[string, string]>;
+}
+
 declare class URLSearchParams {
     private params;
     constructor(init?: URLSearchParams | string | Record<string, string | string[]> | Iterable<[string, string]>);