annil 1.7.4 → 1.7.5-beta.4

package/dist/thirdLib/wm/view.d.ts

@@ -1,9 +1,27 @@
-import type { CreateComponentDoc } from "../../types/CreateComponentDoc";
-export type View = CreateComponentDoc<"view", {
+import type { CreateComponentType } from "../../types/CreateComponentType";
+import type { BaseEvents } from "./baseEvents";
+export type View = CreateComponentType<"view", {
     properties: {
+        /**
+         * 指定按下去的样式类。当 hover-class="none" 时，没有点击态效果
+         * @defaultValue 'none'
+         */
         hoverClass?: string;
+        /**
+         * 指定是否阻止本节点的祖先节点出现点击态
+         * @defaultValue false
+         */
         hoverStopPropagation?: boolean;
+        /**
+         * 按住后多久出现点击态，单位毫秒
+         * @defaultValue 50
+         */
         hoverStartTime?: number;
+        /**
+         * 手指松开后点击态保留时间，单位毫秒
+         * @defaultValue 400
+         */
         hoverStayTime?: number;
     };
+    customEvents: BaseEvents;
 }>;

package/dist/types/AddNullForObject.d.ts

@@ -1,2 +1,5 @@
 import type { IsPureObject } from "hry-types/src/Any/IsPureObject";
+/**
+ * 为对象类型加入null类型。
+ */
 export type AddNullForObject<O> = O extends unknown ? IsPureObject<O> extends true ? (O | null) : O : never;

package/dist/types/AddPrefix.d.ts

@@ -1,3 +1,10 @@
+/**
+ * 将对象 T 的所有属性名添加前缀 TPrefix。
+ * 如果 TPrefix 为空字符串，则返回原对象 T。
+ * @param T - 要添加前缀的对象。
+ * @param TPrefix - 要添加的前缀。
+ * @returns  添加前缀后的新对象或原对象。
+ */
 export type AddPrefix<T extends object, TPrefix extends string> = "" extends TPrefix ? T : {
     [k in keyof T as `${TPrefix}_${k & string}`]: T[k];
 };

package/dist/types/{GenerateDoc.d.ts → CreateComponentType.d.ts}

@@ -1,8 +1,8 @@
-import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
+import type { IfExtends } from "hry-types/src/Any/_api";
+import type { ComputeIntersection } from "hry-types/src/Object/_api";
 import type { ComponentDoc } from "../api/DefineComponent/ReturnType/ComponentDoc";
 import type { AddPrefix } from "./AddPrefix";
-export type GenerateDoc<TName extends string, T extends ComponentDoc> = ComputeIntersection<IfExtends<unknown, T["properties"], {}, {
+export type CreateComponentType<TName extends string, T extends ComponentDoc> = ComputeIntersection<IfExtends<unknown, T["properties"], {}, {
     properties: AddPrefix<T["properties"] & {}, TName>;
 }> & IfExtends<unknown, T["customEvents"], {}, {
     customEvents: AddPrefix<T["customEvents"] & {}, TName>;

package/dist/types/CreateComponentType.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=CreateComponentType.js.map

package/dist/types/CreateComponentType.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CreateComponentType.js","sourceRoot":"","sources":["../../src/types/CreateComponentType.ts"],"names":[],"mappings":""}

package/dist/types/DetailedType.d.ts

@@ -1,5 +1,15 @@
-export type DetailedType<T = unknown> = {
-    (): T;
-} | {
-    new (...arg: any[]): T;
-};
+/**
+ * 通过as DetailedType 指定具体类型。
+ * @remarks
+ * 在js中使用构造函数(Object,Array等)表示类型时,无法给出明确的类型,DetailedType为此而生
+ * @example
+ * ``` ts
+ * RootComponent()({
+ *   properties: {
+ *     gender: String as DetailedType<"male" | "female">,
+ *     unionArr: Array as DetailedType<string[] | number[]>,
+ *   },
+ * });
+ * ```
+ */
+export type DetailedType<T = unknown> = (() => T) | (new (...arg: unknown[]) => T);

package/dist/types/DocAssign.d.ts

@@ -3,5 +3,8 @@ import type { ComputeIntersectionDeep } from "hry-types/src/Object/ComputeInters
 import type { ComponentDoc } from "../api/DefineComponent/ReturnType/ComponentDoc";
 import type { GetComponentPrefix } from "./GetComponentPrefix";
 type Validator<TOriginalComponentDoc extends ComponentDoc, TExtensionDoc extends ComponentDoc, TOriginalPrefix extends PropertyKey = GetComponentPrefix<TOriginalComponentDoc>, TExtenstionPrefix extends PropertyKey = GetComponentPrefix<TExtensionDoc>, DuplicateKeys extends PropertyKey = Extract<keyof TExtensionDoc["properties"], keyof TOriginalComponentDoc["properties"]> | Extract<keyof TExtensionDoc["customEvents"], keyof TOriginalComponentDoc["customEvents"]>> = IfExtends<TOriginalPrefix, TExtenstionPrefix, IfExtends<DuplicateKeys, never, ComponentDoc, `${DuplicateKeys & string}字段重复`>, `前缀错误,应为${TOriginalPrefix & string}`>;
+/**
+ * 有时组件文档内部包含一些slot或基本组件,可通过CompDocExtends泛型拓展组件文档,使得类型更安全
+ */
 export type DocAssign<TOriginalComponentDoc extends ComponentDoc, TExtensionDoc extends Validator<TOriginalComponentDoc, TExtensionDoc>> = ComputeIntersectionDeep<TOriginalComponentDoc & TExtensionDoc>;
 export {};

package/dist/types/DocAssign.js

@@ -1,2 +1,6 @@
 export {};
+// type test0 = DocAssign<{ properties: { aaa_xxx: string } }, { properties: { aaa_xxx: string } }>; // => "aaa_xxx字段重复"
+// type test1 = DocAssign<{ customEvents: { aaa_xxx: string } }, { customEvents: { aaa_xxx: string } }>; // => "aaa_xxx字段重复"
+// type test2 = DocAssign<{ properties: { aaa_xxx: string } }, { properties: { ddd_xxx: string } }>; // => "前缀错误,应为aaa"
+// type test3 = DocAssign<{ customEvents: { aaa_xxx: string } }, { customEvents: { ddd_xxx: string } }>; // => "前缀错误,应为aaa"
 //# sourceMappingURL=DocAssign.js.map

package/dist/types/DocAssign.js.map

@@ -1 +1 @@
-{"version":3,"file":"DocAssign.js","sourceRoot":"","sources":["../../src/types/DocAssign.ts"],"names":[],"mappings":""}
+{"version":3,"file":"DocAssign.js","sourceRoot":"","sources":["../../src/types/DocAssign.ts"],"names":[],"mappings":";AA6BA,wHAAwH;AAExH,4HAA4H;AAE5H,uHAAuH;AAEvH,2HAA2H"}

package/dist/types/GetComponentPrefix.d.ts

@@ -1,4 +1,7 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { ComponentDoc } from "../api/DefineComponent/ReturnType/ComponentDoc";
+/**
+ * 提取文档前缀名
+ */
 export type GetComponentPrefix<TComponentDoc extends ComponentDoc> = EmptyObject extends TComponentDoc ? never : keyof IfExtends<unknown, TComponentDoc["properties"], TComponentDoc["customEvents"], TComponentDoc["properties"]> extends `${infer P}_${string}` ? P : never;

package/dist/types/GetComponentPrefix.js

@@ -1,2 +1,12 @@
 export {};
+// type Test1 = GetComponentPrefix<{ properties: { xxx_name: string } }>;
+// type Test1Expect = "xxx";
+// Checking<Test1, Test1Expect, Test.Pass>;
+// type Test2 = GetComponentPrefix<{ customEvents: { xxx_name: string } }>;
+// type Test2Expect = "xxx";
+// Checking<Test2, Test2Expect, Test.Pass>;
+// type demo = never extends `${infer P}_${string}` ? P : ""; // => string why?
+// type Test3 = GetComponentPrefix<{}>;
+// type Test3Expect = never;
+// Checking<Test3, Test3Expect, Test.Pass>;
 //# sourceMappingURL=GetComponentPrefix.js.map

package/dist/types/GetComponentPrefix.js.map

@@ -1 +1 @@
-{"version":3,"file":"GetComponentPrefix.js","sourceRoot":"","sources":["../../src/types/GetComponentPrefix.ts"],"names":[],"mappings":""}
+{"version":3,"file":"GetComponentPrefix.js","sourceRoot":"","sources":["../../src/types/GetComponentPrefix.ts"],"names":[],"mappings":";AAiBA,yEAAyE;AAEzE,4BAA4B;AAE5B,2CAA2C;AAE3C,2EAA2E;AAE3E,4BAA4B;AAE5B,2CAA2C;AAE3C,+EAA+E;AAE/E,uCAAuC;AAEvC,4BAA4B;AAE5B,2CAA2C"}

package/dist/types/InferDetailedType.d.ts

@@ -1,2 +1,5 @@
 import type { DetailedType } from "./DetailedType";
+/**
+ * 解析DetailedType的类型
+ */
 export type InferDetailedType<T> = T extends StringConstructor ? string : T extends NumberConstructor ? number : T extends BooleanConstructor ? boolean : T extends ArrayConstructor ? unknown[] : T extends ObjectConstructor ? object : T extends DetailedType<infer R> ? R : never;

package/dist/types/OfficialTypeAlias.d.ts

@@ -1,10 +1,25 @@
 export type WMTriggerEventOption = WechatMiniprogram.Component.TriggerEventOption;
 export type WMCustomEvent<Detail = undefined, Mark extends object = object, CurrentTargetDataset extends object = object, TargetDataset extends object = CurrentTargetDataset> = WechatMiniprogram.CustomEvent<Detail, Mark, CurrentTargetDataset, TargetDataset>;
 export type WMBaseEvent<Mark extends object = object, CurrentTargetDataset extends object = object, TargetDataset extends object = CurrentTargetDataset> = WechatMiniprogram.BaseEvent<Mark, CurrentTargetDataset, TargetDataset>;
+/**
+ * 事件触发组件的Dataset类型
+ */
 export type Dataset<TCurrentTargetDataset extends object, TargetDataset extends object = TCurrentTargetDataset, Detail = undefined> = WMCustomEvent<Detail, object, TCurrentTargetDataset, TargetDataset>;
+/**
+ * 自定义事件Detail类型
+ */
 export type Mark<TMark extends object> = Required<WechatMiniprogram.CustomEvent<object, TMark, object, object>>;
+/**
+ * 自定义事件Detail类型
+ */
 export type Detail<T> = WMCustomEvent<T>;
+/**
+ * 当前事件组件Dataset
+ */
 export type CurrentTargetDataset<T extends object> = WMCustomEvent<{}, {}, T>;
+/**
+ * 触发事件组件Dataset
+ */
 export type TargetDataset<TargetDataset extends object> = WMCustomEvent<{}, {}, {}, TargetDataset>;
 export type WMComponentOption = WechatMiniprogram.Component.ComponentOptions;
 export type WMNavigateToSuccessCallbackResult = WechatMiniprogram.NavigateToSuccessCallbackResult;
@@ -16,12 +31,3 @@ export type WMInstanceMethods<T extends object> = WechatMiniprogram.Component.In
 export type WMCompLifetimes = WechatMiniprogram.Component.Lifetimes;
 export type WMCompOtherOption = WechatMiniprogram.Component.OtherOption;
 export type WMPageLifetimes = WechatMiniprogram.Page.ILifetime;
-export declare namespace WMComponent {
-    interface Options {
-        multipleSlots?: boolean;
-        addGlobalClass?: boolean;
-        styleIsolation?: "isolated" | "apply-shared" | "shared" | "page-isolated" | "page-apply-shared" | "page-shared";
-        pureDataPattern?: RegExp;
-        virtualHost?: boolean;
-    }
-}

package/dist/types/OfficialTypeAlias.js

@@ -1,2 +1,32 @@
 export {};
+// export declare namespace WMComponent {
+//   interface Options {
+//     /**
+//      * [启用多slot支持](https://developers.weixin.qq.com/miniprogram/dev/framework/custom-component/wxml-wxss.html#组件wxml的slot)
+//      */
+//     multipleSlots?: boolean;
+//     /**
+//      * 原始文档 [组件样式隔离](https://developers.weixin.qq.com/miniprogram/dev/framework/custom-component/wxml-wxss.html#组件样式隔离)
+//      * @deprecated glass-easel框架下被废弃  [兼容文档](https://developers.weixin.qq.com/miniprogram/dev/framework/custom-component/glass-easel/migration.html#JSON-%E9%85%8D%E7%BD%AE)
+//      */
+//     addGlobalClass?: boolean;
+//     /**
+//      * [组件样式隔离](https://developers.weixin.qq.com/miniprogram/dev/framework/custom-component/wxml-wxss.html#组件样式隔离)
+//      */
+//     styleIsolation?:
+//       | "isolated"
+//       | "apply-shared"
+//       | "shared"
+//       | "page-isolated"
+//       | "page-apply-shared"
+//       | "page-shared";
+//     /**
+//      * [纯数据字段](https://developers.weixin.qq.com/miniprogram/dev/framework/custom-component/pure-data.html) 是一些不用于界面渲染的 data 字段，可以用于提升页面更新性能。从小程序基础库版本 2.8.2 开始支持。
+//      */
+//     pureDataPattern?: RegExp;
+//     /**
+//      * [虚拟化组件节点](https://developers.weixin.qq.com/miniprogram/dev/framework/custom-component/wxml-wxss.html#%E8%99%9A%E6%8B%9F%E5%8C%96%E7%BB%84%E4%BB%B6%E8%8A%82%E7%82%B9) 使自定义组件内部的第一层节点由自定义组件本身完全决定。从小程序基础库版本 [`2.11.2`](https://developers.weixin.qq.com/miniprogram/dev/framework/compatibility.html) 开始支持 */
+//     virtualHost?: boolean;
+//   }
+// }
 //# sourceMappingURL=OfficialTypeAlias.js.map

package/dist/types/OfficialTypeAlias.js.map

@@ -1 +1 @@
-{"version":3,"file":"OfficialTypeAlias.js","sourceRoot":"","sources":["../../src/types/OfficialTypeAlias.ts"],"names":[],"mappings":""}
+{"version":3,"file":"OfficialTypeAlias.js","sourceRoot":"","sources":["../../src/types/OfficialTypeAlias.ts"],"names":[],"mappings":";AA6EA,yCAAyC;AACzC,wBAAwB;AACxB,UAAU;AACV,6HAA6H;AAC7H,UAAU;AACV,+BAA+B;AAC/B,UAAU;AACV,0HAA0H;AAC1H,+KAA+K;AAC/K,UAAU;AACV,gCAAgC;AAChC,UAAU;AACV,qHAAqH;AACrH,UAAU;AACV,uBAAuB;AACvB,qBAAqB;AACrB,yBAAyB;AACzB,mBAAmB;AACnB,0BAA0B;AAC1B,8BAA8B;AAC9B,yBAAyB;AACzB,UAAU;AACV,oKAAoK;AACpK,UAAU;AACV,gCAAgC;AAChC,UAAU;AACV,sTAAsT;AACtT,6BAA6B;AAC7B,MAAM;AACN,IAAI"}

package/dist/types/RemoveInnerData.d.ts

@@ -1 +1,4 @@
+/**
+ * 去除前缀为`_`的字符串
+ */
 export type RemoveInnerData<S extends string> = S extends unknown ? S extends `_${string}` ? never : S : never;

package/dist/types/Replace.d.ts

@@ -4,5 +4,16 @@ type _Replace<Target, Source, DifferentKeys extends keyof Target, SameKey extend
 } & {
     [k in SameKey]: Source[k];
 }>;
+/**
+ * Target与Source相同的key类型替换为Source的类型
+ * @example
+ * ```ts
+ * type obj = { a: "a"; b: "b"; c: boolean };
+ * type obj2 = { a: number; b: string; d: number };
+ * type test = Replace<obj, obj2>;
+ * //  test = { a: number; b: string; c: boolean}
+ * type test1 = Replace<{}, obj2>; // {}
+ * ```
+ */
 export type Replace<Target extends object, Source extends object> = _Replace<Target, Source, Exclude<keyof Target, keyof Source>, Extract<keyof Target, keyof Source>>;
 export {};

package/dist/types/ReplacePrefix.d.ts

@@ -3,6 +3,11 @@ import type { ComponentDoc } from "../api/DefineComponent/ReturnType/ComponentDo
 type _ReplacePrefix<O, TPrefix extends string> = {
     [k in keyof O as k extends `${string}_${infer L}` ? `${TPrefix}_${L}` : k]: O[k];
 };
+/**
+ * 更改文档前缀
+ * @param TComponentDoc - ComponentDoc
+ * @returns ComponentDoc
+ */
 export type ReplacePrefix<TComponentDoc extends ComponentDoc, TPrefix extends string = ""> = IfExtends<unknown, TComponentDoc["properties"], {}, {
     properties: _ReplacePrefix<TComponentDoc["properties"], TPrefix>;
 }> & IfExtends<unknown, TComponentDoc["customEvents"], {}, {

package/dist/types/ReplacePrefix.js

@@ -1,2 +1,11 @@
 export {};
+// type Test1 = ReplacePrefix<{ properties: { xxx_name: string } }, "xxxDaa">;
+// type Test1Expect = { properties: { xxxDaa_name: string } };
+// Checking<Test1, Test1Expect, Test.Pass>;
+// type Test2 = ReplacePrefix<{ customEvents: { xxx_name: string } }, "xxxDaa">;
+// type Test2Expect = { customEvents: { xxxDaa_name: string } };
+// Checking<Test2, Test2Expect, Test.Pass>;
+// type Test3 = ReplacePrefix<{}, "xxxDaa">;
+// type Test3Expect = {};
+// Checking<Test3, Test3Expect, Test.Pass>;
 //# sourceMappingURL=ReplacePrefix.js.map

package/dist/types/ReplacePrefix.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReplacePrefix.js","sourceRoot":"","sources":["../../src/types/ReplacePrefix.ts"],"names":[],"mappings":""}
+{"version":3,"file":"ReplacePrefix.js","sourceRoot":"","sources":["../../src/types/ReplacePrefix.ts"],"names":[],"mappings":";AA6BA,8EAA8E;AAE9E,8DAA8D;AAE9D,2CAA2C;AAE3C,gFAAgF;AAEhF,gEAAgE;AAEhE,2CAA2C;AAE3C,4CAA4C;AAE5C,yBAAyB;AAEzB,2CAA2C"}

package/dist/types/RequiredKeys.d.ts

@@ -1,3 +1,7 @@
+/**
+ * 获取对象(联合对象)的必选属性
+ * @remarks 利用 `{} extends { x?:string }` 为true的特性
+ */
 export type RequiredKeys<O extends object> = O extends unknown ? {
     [K in keyof O]-?: {} extends Pick<O, K> ? never : K;
 }[keyof O] : never;

package/dist/types/Validators.js

@@ -1,2 +1,9 @@
+// import { Checking, type Test } from "hry-types";
 export {};
+// type list = [1, 2, 3];
+// type list2 = [unknown, 1, 2];
+// type lll = Validators<list>;
+// Checking<lll, 1, Test.Pass>;
+// type lll2 = Validators<list2>;
+// Checking<lll2, 1, Test.Pass>;
 //# sourceMappingURL=Validators.js.map

package/dist/types/Validators.js.map

@@ -1 +1 @@
-{"version":3,"file":"Validators.js","sourceRoot":"","sources":["../../src/types/Validators.ts"],"names":[],"mappings":""}
+{"version":3,"file":"Validators.js","sourceRoot":"","sources":["../../src/types/Validators.ts"],"names":[],"mappings":"AAAA,mDAAmD;;AAMnD,yBAAyB;AAEzB,gCAAgC;AAEhC,+BAA+B;AAE/B,+BAA+B;AAE/B,iCAAiC;AAEjC,gCAAgC"}

package/dist/utils/InnerMarker.js

@@ -1,4 +1,4 @@
 export const INNERMARKER = {
-    url: "__annil__",
+    url: "__annil__", // url默认传值Data字段
 };
 //# sourceMappingURL=InnerMarker.js.map

package/dist/utils/InnerMarker.js.map

@@ -1 +1 @@
-{"version":3,"file":"InnerMarker.js","sourceRoot":"","sources":["../../src/utils/InnerMarker.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,GAAG,EAAE,WAAW;CACjB,CAAC"}
+{"version":3,"file":"InnerMarker.js","sourceRoot":"","sources":["../../src/utils/InnerMarker.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,GAAG,EAAE,WAAW,EAAE,gBAAgB;CACnC,CAAC"}

package/dist/utils/assertNonNullable.d.ts

@@ -0,0 +1,2 @@
+import type { IfContains } from "hry-types/src/Any/IfContains";
+export declare function assertNonNullable<T>(value: IfContains<T, null | undefined, T, "参数类型必须包含 null 或 undefined">): NonNullable<T>;

package/dist/utils/assertNonNullable.js

@@ -0,0 +1,7 @@
+export function assertNonNullable(value) {
+    if (value === null || value === undefined) {
+        throw new Error(`${value} should not be null or undefined`);
+    }
+    return value;
+}
+//# sourceMappingURL=assertNonNullable.js.map

package/dist/utils/assertNonNullable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"assertNonNullable.js","sourceRoot":"","sources":["../../src/utils/assertNonNullable.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,iBAAiB,CAC/B,KAAsE;IAEtE,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,kCAAkC,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO,KAAuB,CAAC;AACjC,CAAC"}

package/dist/utils/deepClone.d.ts

@@ -1 +1,4 @@
+/**
+ * 深度克隆 函数相同 原型一致
+ */
 export declare function deepClone<T>(value: T): T;

package/dist/utils/deepClone.js

@@ -1,3 +1,6 @@
+/**
+ * 深度克隆 函数相同 原型一致
+ */
 export function deepClone(value) {
     if (typeof value !== "object" || value === null || value instanceof RegExp) {
         return value;

package/dist/utils/deepClone.js.map

@@ -1 +1 @@
-{"version":3,"file":"deepClone.js","sourceRoot":"","sources":["../../src/utils/deepClone.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,SAAS,CAAI,KAAQ;IACnC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,YAAY,MAAM,EAAE,CAAC;QAC3E,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAM,CAAC;IAEpD,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IAE3D,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;YACrD,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"deepClone.js","sourceRoot":"","sources":["../../src/utils/deepClone.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,UAAU,SAAS,CAAI,KAAQ;IACnC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,YAAY,MAAM,EAAE,CAAC;QAC3E,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAM,CAAC;IAEpD,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IAE3D,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;YACrD,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/utils/isEmptyObject.d.ts

@@ -1 +1,4 @@
+/**
+ * 判断一个值是否为空对象 `{}`
+ */
 export declare function isEmptyObject(obj: object): boolean;

package/dist/utils/isEmptyObject.js

@@ -1,3 +1,6 @@
+/**
+ * 判断一个值是否为空对象 `{}`
+ */
 export function isEmptyObject(obj) {
     if (typeof obj !== "object" || obj === null || Array.isArray(obj) || obj instanceof Set || obj instanceof Map
         || obj instanceof WeakSet || obj instanceof WeakMap) {

package/dist/utils/isEmptyObject.js.map

@@ -1 +1 @@
-{"version":3,"file":"isEmptyObject.js","sourceRoot":"","sources":["../../src/utils/isEmptyObject.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,aAAa,CAAC,GAAW;IACvC,IACE,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,YAAY,GAAG,IAAI,GAAG,YAAY,GAAG;WACtG,GAAG,YAAY,OAAO,IAAI,GAAG,YAAY,OAAO,EACnD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AAC3C,CAAC"}
+{"version":3,"file":"isEmptyObject.js","sourceRoot":"","sources":["../../src/utils/isEmptyObject.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,GAAW;IACvC,IACE,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,YAAY,GAAG,IAAI,GAAG,YAAY,GAAG;WACtG,GAAG,YAAY,OAAO,IAAI,GAAG,YAAY,OAAO,EACnD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AAC3C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "annil",
-  "version": "1.7.4",
+  "version": "1.7.5-beta.4",
   "description": "微信小程序(原生开发)插件",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -20,12 +20,11 @@
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^17.6.5",
+    "@eslint/js": "^9.8.0",
+    "@types/eslint__js": "^8.42.3",
     "@types/jest": "^29.5.5",
-    "@typescript-eslint/eslint-plugin": "^6.12.0",
-    "@typescript-eslint/parser": "^6.12.0",
     "commitlint": "^17.6.5",
-    "eslint": "^8.54.0",
-    "eslint-plugin-tsdoc": "^0.2.17",
+    "eslint": "^9.8.0",
     "husky": "^8.0.3",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
@@ -33,7 +32,8 @@
     "mobx": "^6.9.0",
     "prettier": "^2.8.8",
     "ts-jest": "^29.1.1",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.4",
+    "typescript-eslint": "^8.0.0"
   },
   "files": [
     "LICENSE",

package/src/api/DefineComponent/ReturnType/ComponentDoc.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 type PrefixKeys = `${string}_${string}`;
 
 type _ComponentDoc = {

package/src/api/DefineComponent/ReturnType/test/normalComponentDoc.test.ts

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions */
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import { Checking, type Test } from "hry-types";
 import { type DetailedType, RootComponent } from "../../../..";
 import type { CustomEventConstraint } from "../../../RootComponent/CustomEvents/CustomEventConstraint";

package/src/api/DefineComponent/ReturnType/test/normalPageDoc.test.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import { Checking, type Test } from "hry-types";
 import { type DetailedType, RootComponent } from "../../../..";
 
@@ -37,7 +38,7 @@ type CompDocOnlyPropertiesExpected = {
   };
 };
 
-Checking<typeof compDocOnlyProperties, CompDocOnlyPropertiesExpected, Test.Pass>;
+void Checking<typeof compDocOnlyProperties, CompDocOnlyPropertiesExpected, Test.Pass>;
 
 // 2 页面类型不受subComponents是[never,never]时影响
 const whenSubIsAllNever = DefineComponent({
@@ -46,4 +47,4 @@ const whenSubIsAllNever = DefineComponent({
   subComponents: [{} as never, {} as never],
 });
 
-Checking<typeof whenSubIsAllNever, CompDocOnlyPropertiesExpected, Test.Pass>;
+void Checking<typeof whenSubIsAllNever, CompDocOnlyPropertiesExpected, Test.Pass>;

package/src/api/DefineComponent/SubComponents/SubComponentsOption.ts

@@ -1,8 +1,3 @@
-// import type { Extends } from "hry-types/src/Any/Extends";
-// import type { IfExtends } from "hry-types/src/Any/IfExtends";
-// import type { GetPropertiesDuplicatedKeys } from "../../../types/GetPropertiesDuplicatedKeys";
-// import type { Shift } from "../../../types/Shift";
-// import type { UnionToComma } from "../../../types/UnionToComma.test";
 import type { SubComponentDoc } from "../../SubComponent/SubComponentDoc";
 
 /**

package/src/api/DefineComponent/SubComponents/test/normal.test.ts

@@ -1035,8 +1035,8 @@ const aaa = DefineComponent({
     A,
   ],
 });
-
-Checking<typeof aaa, {
+void aaa;
+void Checking<typeof aaa, {
   customEvents: {
     test_a: string | number | boolean | Composed;
     test_b: string | number | Composed;

package/src/api/DefineComponent/index.ts

@@ -1,15 +1,13 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-
+import type { RootComponentTrueOptions } from "../RootComponent";
 import type { RootComponentDoc } from "../RootComponent/RootComponentDoc";
 import type { SubComponentDoc } from "../SubComponent/SubComponentDoc";
 import type { NameOrPathOption } from "./NameOrPage/NameOrPathOption";
+import { normalizeOptions } from "./normalizeOptions";
 import type { CreateComponentDoc } from "./ReturnType/CreateComponentDoc";
 import type { CreatePageDoc } from "./ReturnType/CreatePageDoc";
 import type { RootComponentOption } from "./RootComponent/RootComponentOption";
 import type { SubComponentsOption } from "./SubComponents/SubComponentsOption";
-
-import type { RootComponentTrueOptions } from "../RootComponent";
-import { assignOptions } from "./assignOptions";
 export type Path = `/${string}`;
 
 type RootOptions<
@@ -22,24 +20,22 @@ type RootOptions<
   & RootComponentOption<TRootComponentDoc>
   & SubComponentsOption<TSubComponentTuple>;
 
-interface DefineComponentConstructor {
-  <
-    TRootComponentDoc extends RootComponentDoc = {},
-    TSubComponentTuple extends SubComponentDoc[] = [],
-    TName extends string = "",
-    TPath extends Path = "/",
-  >(
-    options: RootOptions<TRootComponentDoc, TSubComponentTuple, TName, TPath>,
-  ): // ReturnType 为  PageDoc or ComponentDoc
-  IfExtends<
-    "",
-    TName,
-    // 生成页面文档
-    CreatePageDoc<TRootComponentDoc, TPath>,
-    // 生成组件文档
-    CreateComponentDoc<TRootComponentDoc, TName, TSubComponentTuple>
-  >;
-}
+type DefineComponentConstructor = <
+  TRootComponentDoc extends RootComponentDoc = {},
+  TSubComponentTuple extends SubComponentDoc[] = [],
+  TName extends string = "",
+  TPath extends Path = "/",
+>(
+  options: RootOptions<TRootComponentDoc, TSubComponentTuple, TName, TPath>,
+) => // ReturnType 为  PageDoc or ComponentDoc
+IfExtends<
+  "",
+  TName,
+  // 生成页面文档
+  CreatePageDoc<TRootComponentDoc, TPath>,
+  // 生成组件文档
+  CreateComponentDoc<TRootComponentDoc, TName, TSubComponentTuple>
+>;
 
 export type DefineComponentOption = {
   name?: string;
@@ -51,8 +47,10 @@ export type DefineComponentOption = {
 /**
  * 把根组件选项和子组件选项转化为原生Component API选项并执行
  */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const DefineComponent: DefineComponentConstructor = function(options): any {
   Component(
-    assignOptions(options as DefineComponentOption) as any,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    normalizeOptions(options as DefineComponentOption) as any,
   );
 };

package/src/api/DefineComponent/{assignOptions → normalizeOptions}/computedWatchHandle/computedUpdater.ts

@@ -1,4 +1,4 @@
-import type { Instance } from "..";
+import type { Instance } from "../../../RootComponent/Instance/RootComponentInstance";
 import { deepProxy, getProxyOriginalValue } from "./data-tracer";
 import { removeSubDependences } from "./dependencesOptimize";
 import { getPathsValue } from "./getPathsValue";

package/src/api/DefineComponent/{assignOptions → normalizeOptions}/computedWatchHandle/data-tracer.ts

@@ -1,4 +1,3 @@
-/* eslint-disable complexity */
 import type { ComputedDependence } from "./computedUpdater";
 import { removePreviousDependence } from "./dependencesOptimize";
 
@@ -15,7 +14,7 @@ export function deepProxy(
       const val = target[prop];
 
       // 自身没有但原型链上有的属性不收集依赖
-      if (prop in target && !target.hasOwnProperty(prop)) {
+      if (prop in target && !Object.prototype.hasOwnProperty.call(target, prop)) {
         return typeof val === "function" ? val.bind(target) : val;
       }
       removePreviousDependence(dependences, basePath);
@@ -37,7 +36,7 @@ export function deepProxy(
   return new Proxy(data, handler);
 }
 
-export function getProxyOriginalValue(value: any): any {
+export function getProxyOriginalValue(value: { __original__?: unknown }): unknown {
   if (typeof value !== "object" || value === null) {
     return value;
   }

package/src/api/DefineComponent/{assignOptions → normalizeOptions}/computedWatchHandle/getPathsValue.ts

@@ -14,11 +14,12 @@ export function getPathsValue(data: object, paths: string) {
       // "b.**" => 'b'
       path = path.slice(0, -3);
     }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const value = path.split(".").reduce((pre: any, path) => {
       // pre有可能为undefined|null,比如obj是未初始化的计算属性(undefined),还有可能是properties的对象类型(默认为null)
       try {
         return pre[path];
-      } catch (error) {
+      } catch {
         return undefined;
       }
     }, data);