annil 1.13.0 → 1.13.2

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

@@ -1,4 +1,4 @@
-import { Checking, type Test } from "hry-types";
+import { typeEqual } from "../../../../utils/typeEqual";
 import type { CustomComponentDefinition } from "../../../CustomComponent/returnType";
 import type { Bubbles, Composed } from "../../../RootComponent/CustomEvents/CustomEventsTag";
 import { DefineComponent } from "../..";
@@ -1039,11 +1039,11 @@ const aaa = DefineComponent({
     A,
   ],
 });
-void aaa;
-void Checking<typeof aaa, {
+type Epected = {
   events: {
     test_a: string | number | boolean | Composed;
     test_b: string | number | Composed;
     test_c: boolean | Composed;
   };
-}, Test.Pass>;
+};
+typeEqual<Epected>()(aaa);

package/src/api/DefineComponent/index.ts

@@ -27,7 +27,7 @@ type Constructor = <
   TPath extends Path = "/",
 >(
   options: Options<TRootComponentDefinition, TCustomComponentDefinitionList, TName, TPath>,
-) => //  根据是否传入name字段来区分生成页面文档还是组件文档。
+) => //  根据是否传入name字段(当isPage不为true时,类型约束name不为空字符串)来区分生成页面文档还是组件文档。
 IfExtends<
   "",
   TName,
@@ -45,14 +45,14 @@ export type DefineComponentOptionRuntime = {
 };
 
 /**
- * DefineComponent是构建组件的核心API,在annil架构中,所有组件(页面组件和自定义组件)都通过它来构建的。
- * 它返回的类型可能是页面文档(`PageDoc`)或者自定义组件文档(`ComponentDoc`),具体取决于传入的选项中是否包含`name`字段。
+ * DefineComponent是构建组件的核心API,所有组件(页面组件和自定义组件)都通过它来构建的。
+ * 它返回的类型可能是页面文档(`PageDoc`)或者自定义组件文档(`ComponentDoc`),具体取决于传入rootComponent中isPage的值。
  * 它的作用是把根组件定义(`RootComponentDefinition`)和子组件定义(`CustomComponentDefinition`和`ChunkComponentDefinition`)整合成原生`Component`的选项配置,最终通过原生`Component`来构建组件。
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any -- 返回类型由Constructor定义,实现无需。
 export const DefineComponent: Constructor = function(options): any {
   Component(
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any -- Options泛型中properties字段类型与WechatMiniprogram.Component.Constructor中的properties字段类型不兼容,但运行时是兼容的,所以这里使用any断言。
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any -- Options泛型中properties字段类型与WechatMiniprogram.Component.Constructor中的properties字段类型不兼容,但运行时是兼容的,所以这里使用any。
     normalizeOptions(options as DefineComponentOptionRuntime) as any,
   );
 };

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

@@ -19,7 +19,6 @@ const OnlyPropsRootDoc = RootComponent()({
       value: null,
     },
   },
-  customEvents: {}, // EmptyObject
 });
 
 const compDocOnlyProperties = DefineComponent({

package/src/api/RootComponent/Computed/ComputedOption.ts

@@ -5,10 +5,9 @@ import type { ComputedConstraint } from "./ComputedConstraint";
 export type ComputedOption<
   TComputed extends ComputedConstraint,
   CompareKeys extends PropertyKey,
-> // Instance extends object,
- = {
+> = {
   /**
-   * computed字段, [类型约束ComputedConstraint](ComputedConstraint.ts)
+   * computed字段
    * @remarks
    *
    * 函数体内,可通过this.data获取实例其他数据(依赖),setData发生时,若数据(依赖)发生变化则重新运行函数体并setData。

package/src/api/RootComponent/Computed/{GetComputedDoc.ts → GetComputedDef.ts}

@@ -5,6 +5,6 @@ import type { ComputedConstraint } from "./ComputedConstraint";
  * @param T - ComputedConstraint
  * @returns object
  */
-export type GetComputedDoc<TComputed extends ComputedConstraint> = {
+export type GetComputedDef<TComputed extends ComputedConstraint> = {
   [k in keyof TComputed]: ReturnType<TComputed[k]>;
 };

package/src/api/RootComponent/Computed/test/GetComputedDoc.test.ts

@@ -1,10 +1,10 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions */
 import { Checking, type Test } from "hry-types";
-import type { GetComputedDoc } from "../GetComputedDoc";
+import type { GetComputedDef } from "../GetComputedDef";
 
 // test1 非空对象字段
 
-type Test1 = GetComputedDoc<{
+type Test1 = GetComputedDef<{
   a: () => number;
   b: () => string;
   c: () => "male" | "femal";
@@ -20,6 +20,6 @@ Checking<Test1, Test1Expected, Test.Pass>;
 
 // test2 空对象字段 返回空
 
-type Test2 = GetComputedDoc<{}>;
+type Test2 = GetComputedDef<{}>;
 
 Checking<Test2, {}, Test.Pass>;

package/src/api/RootComponent/CustomEvents/CustomEventConstraint.ts

@@ -42,33 +42,48 @@ export type OptionsFieldsConfigOfCustomEvents =
 /**
  * 带options的CustomEvents配置
  */
-export type FullCustomEvents = {
+export type FullCustomEventsOptions = {
   detail: ShortCustomeEvents;
   options: OptionsFieldsConfigOfCustomEvents;
   debounce?: never;
   throttle?: never;
-} | {
+};
+
+export type FullCustomEventsWithDebounce = {
   detail: ShortCustomeEvents;
   options?: never;
   debounce: number;
   throttle?: never;
-} | {
+};
+
+export type FullCustomEventsWithThrottle = {
   detail: ShortCustomeEvents;
   options?: never;
   debounce?: never;
   throttle: number;
-} | {
+};
+
+export type FullCustomEventsOptionsWithThrottle = {
   detail: ShortCustomeEvents;
   options: OptionsFieldsConfigOfCustomEvents;
   debounce?: never;
   throttle: number;
-} | {
+};
+
+export type FullCustomEventsOptionsWithDebounce = {
   detail: ShortCustomeEvents;
   options: OptionsFieldsConfigOfCustomEvents;
   debounce: number;
   throttle?: never;
 };
 
+export type FullCustomEvents =
+  | FullCustomEventsOptions
+  | FullCustomEventsWithDebounce
+  | FullCustomEventsWithThrottle
+  | FullCustomEventsOptionsWithThrottle
+  | FullCustomEventsOptionsWithDebounce;
+
 export type CustomEvents = FullCustomEvents | ShortCustomeEvents;
 
 export type CustomEventConstraint = Record<string, CustomEvents>;

package/src/api/RootComponent/CustomEvents/CustomEventsDef.ts

@@ -0,0 +1,4 @@
+import type { Primitive } from "hry-types/src/_internal/Primitive";
+import type { CustomEventsTags } from "./CustomEventsTag";
+
+export type CustomEventsDef = Record<string, Exclude<Primitive, undefined> | object | CustomEventsTags>;

package/src/api/RootComponent/CustomEvents/CustomEventsTag.ts

@@ -13,7 +13,7 @@ export type Bubbles = () => "bubbles";
 
 export type Capture = () => "capture";
 
-export type Composed = () => "Composed";
+export type Composed = () => "composed";
 
 export type BubblesCapture = Bubbles | Capture;
 
@@ -31,7 +31,7 @@ export type CustomEventsTags =
   | CaptureComposed
   | BubblesCaptureComposed;
 
-export type AddTagForCustomEventsDoc<Options extends OptionsFieldsConfigOfCustomEvents> = IfExtends<
+export type AddTagForCustomEventsDef<Options extends OptionsFieldsConfigOfCustomEvents> = IfExtends<
   BubblesOption,
   Options,
   Bubbles,

package/src/api/RootComponent/CustomEvents/GetCustomEventDef.ts

@@ -0,0 +1,29 @@
+import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { DetailedType } from "../../../types/DetailedType";
+import type { InferDetailedType } from "../../../types/InferDetailedType";
+import type {
+  CustomEventConstraint,
+  FullCustomEvents,
+  ShortCustomeEvents,
+  SimpleCustomeEventsList,
+} from "./CustomEventConstraint";
+import type { AddTagForCustomEventsDef } from "./CustomEventsTag";
+
+export type GetShortCustomEventsDef<T extends ShortCustomeEvents> = T extends DetailedType ? InferDetailedType<T>
+  : T extends null ? null
+  : T extends undefined ? undefined
+  : T extends SimpleCustomeEventsList ? GetShortCustomEventsDef<T[number]>
+  : never;
+
+export type GetFullCustomEventsDef<T extends FullCustomEvents> =
+  | GetShortCustomEventsDef<T["detail"]>
+  | IfExtends<unknown, T["options"], never, AddTagForCustomEventsDef<T["options"] & {}>>;
+
+export type GetCustomEventsDef<T extends CustomEventConstraint> = {
+  [k in keyof T]: T[k] extends ShortCustomeEvents ? GetShortCustomEventsDef<T[k]>
+    : T[k] extends FullCustomEvents ?
+        | GetShortCustomEventsDef<T[k]["detail"]>
+        // 为事件加上标签
+        | IfExtends<unknown, T[k]["options"], never, AddTagForCustomEventsDef<NonNullable<T[k]["options"]>>>
+    : never;
+};

package/src/api/RootComponent/CustomEvents/GetCustomEventDoc.ts

@@ -7,7 +7,7 @@ import type {
   ShortCustomeEvents,
   SimpleCustomeEventsList,
 } from "./CustomEventConstraint";
-import type { AddTagForCustomEventsDoc } from "./CustomEventsTag";
+import type { AddTagForCustomEventsDef } from "./CustomEventsTag";
 
 export type GetShortCustomEventsDoc<T extends ShortCustomeEvents> = T extends DetailedType ? InferDetailedType<T>
   : T extends null ? null
@@ -17,7 +17,7 @@ export type GetShortCustomEventsDoc<T extends ShortCustomeEvents> = T extends De
 
 export type GetFullCustomEventsDoc<T extends FullCustomEvents> =
   | GetShortCustomEventsDoc<T["detail"]>
-  | IfExtends<unknown, T["options"], never, AddTagForCustomEventsDoc<T["options"] & {}>>;
+  | IfExtends<unknown, T["options"], never, AddTagForCustomEventsDef<T["options"] & {}>>;
 
 /**
  * 获取自定义事件的文档
@@ -42,6 +42,6 @@ export type GetCustomEventDoc<T extends CustomEventConstraint> =
         // 为自定义事件模型加标记,方便识别
         // @ts-ignore T[k] 一定为 FullCustomEvents 类型
         // | AddTagForCustomEventsDoc<T[k]["options"]>;
-        | IfExtends<unknown, T[k]["options"], never, AddTagForCustomEventsDoc<T[k]["options"] & {}>>;
+        | IfExtends<unknown, T[k]["options"], never, AddTagForCustomEventsDef<T[k]["options"] & {}>>;
   }
 ;

package/src/api/RootComponent/CustomEvents/test/GetCustomEventDoc.test.ts

@@ -1,5 +1,5 @@
 import { Checking, type Test } from "hry-types";
-import type { GetCustomEventDoc } from "../GetCustomEventDoc";
+import type { GetCustomEventsDef } from "../GetCustomEventDef";
 
 import {
   type BubblesCapturePhaseComposedExpected,
@@ -18,7 +18,7 @@ import {
 } from "./GetShortEventDoc.test";
 import { type mock_customEvents } from "./normal.test";
 
-type Mock_CustomEventsDoc = GetCustomEventDoc<typeof mock_customEvents>;
+type Mock_CustomEventsDoc = GetCustomEventsDef<typeof mock_customEvents>;
 
 export type Mock_CustomEventsDocExpected = {
   str: StrExpected;

package/src/api/RootComponent/CustomEvents/test/GetShortEventDoc.test.ts

@@ -2,34 +2,34 @@
 import { Checking, type Test } from "hry-types";
 
 import type { Mock_User } from "../../Properties/test/normalRequired.test";
-import type { GetShortCustomEventsDoc } from "../GetCustomEventDoc";
+import type { GetShortCustomEventsDef } from "../GetCustomEventDef";
 import { type mock_shortCustomEvents } from "./normal.test";
 
-type StrResult = GetShortCustomEventsDoc<typeof mock_shortCustomEvents["str"]>;
+type StrResult = GetShortCustomEventsDef<typeof mock_shortCustomEvents["str"]>;
 
 export type StrExpected = string;
 
 Checking<StrResult, StrExpected, Test.Pass>;
 
-type NullResult = GetShortCustomEventsDoc<typeof mock_shortCustomEvents["null"]>;
+type NullResult = GetShortCustomEventsDef<typeof mock_shortCustomEvents["null"]>;
 
 export type NullExpected = null;
 
 Checking<NullResult, NullExpected, Test.Pass>;
 
-type UnionStrResult = GetShortCustomEventsDoc<typeof mock_shortCustomEvents["unionStr"]>;
+type UnionStrResult = GetShortCustomEventsDef<typeof mock_shortCustomEvents["unionStr"]>;
 
 export type UnionStrExpected = "male" | "female";
 
 Checking<UnionStrResult, UnionStrExpected, Test.Pass>;
 
-type ListResult = GetShortCustomEventsDoc<typeof mock_shortCustomEvents["union"]>;
+type ListResult = GetShortCustomEventsDef<typeof mock_shortCustomEvents["union"]>;
 
 export type ListExpected = string | 0 | 1 | 2 | null;
 
 Checking<ListResult, ListExpected, Test.Pass>;
 
-type ObjResult = GetShortCustomEventsDoc<typeof mock_shortCustomEvents["obj"]>;
+type ObjResult = GetShortCustomEventsDef<typeof mock_shortCustomEvents["obj"]>;
 
 export type ObjExpected = Mock_User;
 

package/src/api/RootComponent/CustomEvents/test/normal.test.ts

@@ -60,11 +60,11 @@ export const mock_customEvents = {
   ...mock_fullCustomEvents,
 } satisfies CustomEventConstraint;
 
-const rootDoc = RootComponent()({
+const rootDef = RootComponent()({
   customEvents: mock_customEvents,
 });
 
-type RootDoc = {
+type RootDef = {
   customEvents: {
     // 简写字段 值类型为事件参数e的detail类型
     str: string;
@@ -83,17 +83,17 @@ type RootDoc = {
   };
 };
 
-// 1 RootDoc中customEventsDoc 类型为事件参数e的detail类型和事件标记的联合(冒泡|穿透|捕获)
-Checking<typeof rootDoc, RootDoc, Test.Pass>;
+// 1 RootDef中customEventsDoc 类型为事件参数e的detail类型和事件标记的联合(冒泡|穿透|捕获)
+Checking<typeof rootDef, RootDef, Test.Pass>;
 
-const rootDocEmpty = RootComponent()({
+const rootDefEmpty = RootComponent()({
   customEvents: {},
 });
 
 // 2. customEvents字段配置为`{}`时,Doc中无customEvents字段
-Checking<typeof rootDocEmpty, {}, Test.Pass>;
+Checking<typeof rootDefEmpty, {}, Test.Pass>;
 
-const rootDocNoFields = RootComponent()({});
+const rootDefNoFields = RootComponent()({});
 
 // 3. 无customEvents字段时,Doc中无customEvents字段
-Checking<typeof rootDocNoFields, {}, Test.Pass>;
+Checking<typeof rootDefNoFields, {}, Test.Pass>;

package/src/api/RootComponent/Data/GetDataDef.ts

@@ -0,0 +1,8 @@
+/**
+ * 获取data字段文档类型
+ * @param TData - `DataConstraint`
+ * @returns object
+ */
+export type GetDataDef<
+  TData extends object,
+> = TData;

package/src/api/RootComponent/Data/test/GetDataDoc.test.ts

@@ -1,6 +1,6 @@
 import { Checking, type Test } from "hry-types";
 
-import type { GetDataDoc } from "../GetDataDoc";
+import type { GetDataDef } from "../GetDataDef";
 
 export const mock_data = {
   func: {
@@ -12,7 +12,7 @@ export const mock_data = {
   str: "str",
 };
 
-type Test1 = GetDataDoc<typeof mock_data>;
+type Test1 = GetDataDef<typeof mock_data>;
 
 type Test1Expected = {
   func: {
@@ -25,7 +25,7 @@ type Test1Expected = {
 void Checking<Test1, Test1Expected, Test.Pass>;
 
 // 测试空对象
-type Test4 = GetDataDoc<{}>;
+type Test4 = GetDataDef<{}>;
 
 type Test4Expected = {};
 

package/src/api/RootComponent/Events/EventsConstraint.ts

@@ -50,8 +50,8 @@ type TransformCustomEventsDocTypeToFunctionTypeAndAddSuffix<T extends CustomEven
 
 // 所有子组件自定义事件(过滤掉非冒泡或捕获)的key加入后缀并把值(detail)转换为函数类型
 type GetAllSubCustomEventsConstraint<
-  ComponentDocList extends ComponentDoc[],
-  AllCustomEvents extends CustomEventsDoc = GetBubblesOrCaptureEventsFromCompDoc<ComponentDocList>,
+  TComponentDocList extends ComponentDoc[],
+  AllCustomEvents extends CustomEventsDoc = GetBubblesOrCaptureEventsFromCompDoc<TComponentDocList>,
 > = IfExtends<
   {},
   AllCustomEvents,
@@ -70,5 +70,5 @@ export type EventsConstraint<ComponentDocList extends ComponentDoc[] = []> = IfE
   [],
   ComponentDocList,
   BaseEvent,
-  GetAllSubCustomEventsConstraint<ComponentDocList>
+  GetAllSubCustomEventsConstraint<ComponentDocList> & BaseEvent
 >;

package/src/api/RootComponent/Events/test/normal.test.ts

@@ -143,3 +143,19 @@ Checking<typeof EmptyEventsFields, {}, Test.Pass>;
 const NoEventsFields = RootComponent<[ComponentDocA, ComponentDocB]>()({});
 
 Checking<typeof NoEventsFields, {}, Test.Pass>;
+
+/**
+ * 7. 子事件可以与root事件共存。
+ */
+const RootDef = RootComponent<[ComponentDocA, ComponentDocB]>()({
+  events: {
+    // root事件
+    root_str(e) {
+      Checking<typeof e, WMBaseEvent, Test.Pass>;
+    },
+    // 子事件
+    aaa_num_bubbles(e) {
+      Checking<typeof e.detail, number, Test.Pass>;
+    },
+  },
+});

package/src/api/RootComponent/Instance/CustomEventMethods.ts

@@ -1,11 +1,11 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { CustomEventsTags } from "../CustomEvents/CustomEventsTag";
 
-export type CustomEventMethods<O extends object> = {
-  [k in keyof O]: IfExtends<
-    Exclude<O[k], CustomEventsTags>,
+export type generateCustomEventMethods<TCustomEventsDef extends object> = {
+  [k in keyof TCustomEventsDef]: IfExtends<
+    Exclude<TCustomEventsDef[k], CustomEventsTags>,
     undefined,
     () => void,
-    (detail: Exclude<O[k], CustomEventsTags>) => void
+    (detail: Exclude<TCustomEventsDef[k], CustomEventsTags>) => void
   >;
 };

package/src/api/RootComponent/Instance/RootComponentInstance.ts

@@ -5,18 +5,18 @@ import type { IReactionDisposer } from "mobx";
 import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { Func } from "hry-types/src/Misc/Func";
 import type { Assign } from "../../../types/Assign";
-import type { ComputeObject } from "../../../types/ComputeObj";
+import type { ComputeObject } from "../../../types/ComputeObject";
 import type { WMComponentInstance, WMInstanceMethods, WMPageInstance } from "../../../types/OfficialTypeAlias";
 import type { OptionsInnerFields } from "../../DefineComponent/normalizeOptions";
 import type { IInjectAllData, IInjectMethods } from "../../InstanceInject/instanceConfig";
-import type { CustomEventMethods } from "./CustomEventMethods";
+import type { generateCustomEventMethods } from "./CustomEventMethods";
 import type { CustomSetData } from "./CustomSetData";
 export type RootComponentInstance<
   TIsPage extends boolean,
   TMethods extends object,
   TDataForSetData extends object,
   AllData extends object,
-  CustomEventsDoc extends object,
+  CustomEventsDef extends object,
   StoreDoc extends object,
   instanceData = ComputeObject<Assign<IInjectAllData, ComputeIntersection<AllData>>>,
 > =
@@ -30,7 +30,7 @@ export type RootComponentInstance<
     disposer: { [k in keyof StoreDoc]: IReactionDisposer };
   }>
   // 自身methods覆盖注入的methods
-  & Assign<IInjectMethods, TMethods & CustomEventMethods<CustomEventsDoc>>
+  & Assign<IInjectMethods, TMethods & generateCustomEventMethods<CustomEventsDef>>
   & { data: instanceData };
 // & { cloneData: ComputeObject<Assign<IInjectData, ComputeIntersection<AllData>>> };
 

package/src/api/RootComponent/PageLifetimes/PageLifetimesOption.ts

@@ -1,6 +1,6 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
-import type { ComputeObject } from "../../../types/ComputeObj";
+import type { ComputeObject } from "../../../types/ComputeObject";
 import type { WMCompPageLifetimes, WMPageLifetimes } from "../../../types/OfficialTypeAlias";
 import type { RemoveNullOfRequired } from "../../../types/RemoveNullOfRequired";
 

package/src/api/RootComponent/Properties/{GetOptionalDoc.ts → GetOptionalDef.ts}

@@ -5,7 +5,7 @@ import type { OptionalType } from "./PropertiesConstraint";
 /**
  * 获取properties可传字段文档类型
  */
-export type GetOptionalDoc<
+export type GetOptionalDef<
   TOptionalProperties extends Record<string, OptionalType>,
 > = {
   -readonly [k in keyof TOptionalProperties]?: IfExtends<

package/src/api/RootComponent/Properties/GetPropertiesDef.ts

@@ -0,0 +1,25 @@
+import type { Select } from "hry-types/src/Object/Select";
+
+import type { ComputeIntersection } from "hry-types/src/Object/_api";
+import type { GetOptionalDef } from "./GetOptionalDef";
+
+import type { GetRequiredDef } from "./GetRequiredDef";
+import type { OptionalType, PropertiesConstraint } from "./PropertiesConstraint";
+
+type _GetPropertiesDef<
+  TProperties extends PropertiesConstraint,
+  OptionalDef extends object =
+    // @ts-expect-error ddd
+    GetOptionalDef<Select<TProperties, OptionalType>>,
+  RequiredDef extends object =
+    // @ts-expect-error dddf
+    GetRequiredDef<Omit<TProperties, keyof OptionalDef>>,
+> = ComputeIntersection<OptionalDef & RequiredDef>;
+
+/**
+ * properties字段的文档类型
+ * @remarks 必传的字段如果是object,要联合上null类型,选传的object根据是否是页面来决定是否加null
+ */
+export type GetPropertiesDef<
+  TProperties extends PropertiesConstraint,
+> = _GetPropertiesDef<TProperties>;

package/src/api/RootComponent/Properties/GetRequiredDef.ts

@@ -0,0 +1,16 @@
+import type { InferDetailedType } from "../../../types/InferDetailedType";
+import type { RequiredSingle, RequiredType, RequiredUnion } from "./PropertiesConstraint";
+
+/**
+ * 获取properties必传字段的文档类型
+ * @remarks 小程序中必传字段如果是object,默认类型为null,所以组件文档对象类型要联合上null类型
+ */
+export type GetRequiredDef<
+  TProperties extends Record<string, RequiredType>,
+> = {
+  -readonly [k in keyof TProperties]: TProperties[k] extends RequiredSingle ? InferDetailedType<TProperties[k]>
+    : TProperties[k] extends RequiredUnion ?
+        | InferDetailedType<TProperties[k]["type"]>
+        | InferDetailedType<TProperties[k]["optionalTypes"][number]>
+    : never;
+};

package/src/api/RootComponent/Store/{GeTStoreDoc.ts → GetStoreDef.ts}

@@ -1,8 +1,8 @@
-import type { ParamsEqual } from "../../../types/TwoParamsEqual";
+import { typeEqual } from "../../../utils/typeEqual";
 import type { Getter } from "./StoreConstraint";
 // 单独Getter类型返回值会把undefined转换为null
 // 但是WithDefault类型返回值为getter的返回值去除undefined和default的类型联合。
-export type GetStoreDoc<TStore extends object> = {
+export type GetStoreDef<TStore extends object> = {
   [k in keyof TStore]: TStore[k] extends Getter ? ReturnType<TStore[k]>
     : TStore[k] extends {
       getter: (...args: unknown[]) => infer R;
@@ -13,7 +13,7 @@ export type GetStoreDoc<TStore extends object> = {
 
 // test
 type User = { name: string; age: number };
-type test = GetStoreDoc<{
+type test = GetStoreDef<{
   userName: (data: { aaa: "string" }) => string;
   userAge: (data: { aaa: "string" }) => number;
   userInfo: {
@@ -25,14 +25,10 @@ type test = GetStoreDoc<{
     default: [];
   };
 }>;
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-type test1 = ParamsEqual<
-  test,
-  {
-    userName: string;
-    userAge: number;
-    userInfo: User | null;
-    list: User[];
-  }
->;
+type expected = {
+  userName: string;
+  userAge: number;
+  userInfo: User | null;
+  list: User[];
+};
+typeEqual<test, expected>();