annil 1.13.0 → 1.13.1

package/CHANGELOG.md

@@ -4,6 +4,15 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.13.1](https://github.com/missannil/annil/compare/v1.13.0...v1.13.1) (2026-03-26)
+
+
+### Bug Fixes
+
+* root事件无法与子事件共存的问题 ([13ceb70](https://github.com/missannil/annil/commit/13ceb704add0e31c75dbff65a5818f9b5e13e0da))
+* typeEqual增加参数验证方式 ([08e4cf6](https://github.com/missannil/annil/commit/08e4cf634c919018bd7aab4279637016a40b2274))
+* 去除api类型 ParamsEqual ([a57b0ac](https://github.com/missannil/annil/commit/a57b0acc0199c1e022bb3784f35e1fc95733d52b))
+
 ## [1.13.0](https://github.com/missannil/annil/compare/v1.12.7...v1.13.0) (2026-03-22)
 
 

package/dist/api/ChunkComponent/index.d.ts

@@ -1,14 +1,14 @@
 import type { IfExtends } from "hry-types/src/Any/_api";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
 import type { IInjectAllData, IInjectMethods, IInjectStore } from "../InstanceInject/instanceConfig";
-import type { GetComputedDoc } from "../RootComponent/Computed/GetComputedDoc";
+import type { GetComputedDef } from "../RootComponent/Computed/GetComputedDef";
 import type { RootComponentInstance } from "../RootComponent/Instance/RootComponentInstance";
 import type { LifetimesOption } from "../RootComponent/Lifetimes/LifetimesOption";
 import type { MethodsConstraint } from "../RootComponent/Methods/MethodsConstraint";
 import type { ObserversOption } from "../RootComponent/Observers/ObserversOption";
 import type { PageLifetimesOption } from "../RootComponent/PageLifetimes/PageLifetimesOption";
 import type { RootComponentDefinition } from "../RootComponent/returnType";
-import type { GetStoreDoc } from "../RootComponent/Store/GeTStoreDoc";
+import type { GetStoreDef } from "../RootComponent/Store/GetStoreDef";
 import type { WatchOption } from "../RootComponent/Watch/WatchOption";
 import type { ChunkComputedConstraint } from "./ChunkComputed/ChunkComputedConstraint";
 import type { ChunkComputedOption } from "./ChunkComputed/ChunkComputedOption";
@@ -19,6 +19,6 @@ import type { ChunkMethodsOption } from "./ChunkMethods/ChunkMethodsOption";
 import type { ChunkStoreConstraint } from "./ChunkStore/ChunkStoreConstraint";
 import type { ChunkStoreOption } from "./ChunkStore/ChunkStoreOption";
 type ChunkComponentOptions<TIsPage extends boolean, Prefix extends string, RootDatas extends object, TEvents extends ChunkEventsConstraint, TData extends object, TStore extends ChunkStoreConstraint, StoreDoc extends object, TComputed extends ChunkComputedConstraint, ComputedDoc extends object, RootMethods extends object, RootEvents extends object, TMethods extends MethodsConstraint, EventsDoc extends object, PropertiesDoc extends object> = ChunkDataOption<TData, keyof (RootDatas & IInjectAllData), Prefix> & ChunkStoreOption<TStore, keyof (TData & RootDatas & IInjectAllData), Prefix> & ChunkComputedOption<TComputed, keyof (TData & StoreDoc & RootDatas & IInjectAllData), Prefix> & ChunkEventsOption<TEvents, keyof (RootMethods & RootEvents & IInjectMethods), Prefix> & ChunkMethodsOption<TMethods, keyof (RootMethods & RootEvents & EventsDoc & IInjectMethods), Prefix> & ThisType<RootComponentInstance<TIsPage, TMethods & RootMethods, TData, TData & StoreDoc & ComputedDoc & RootDatas & IInjectAllData, {}, StoreDoc>> & PageLifetimesOption<TIsPage, PropertiesDoc> & LifetimesOption & WatchOption<ComputedDoc & Required<RootDatas> & TData & StoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "observers">> & ObserversOption<ComputedDoc & Required<RootDatas> & TData & StoreDoc & IInjectStore>;
-type ChunkComponentConstructor<TRootComponentReturnType extends RootComponentDefinition, TPrefix extends string, IsPage extends boolean = TRootComponentReturnType["isPage"] extends true ? true : false, RootDatas extends object = Required<TRootComponentReturnType["properties"]> & TRootComponentReturnType["data"] & TRootComponentReturnType["computed"] & TRootComponentReturnType["store"], RootMethods extends object = TRootComponentReturnType["methods"] & {}, RootEvents extends object = TRootComponentReturnType["events"] & {}> = <TEvents extends ChunkEventsConstraint, TStore extends ChunkStoreConstraint<Required<TRootComponentReturnType["properties"]>>, TMethods extends MethodsConstraint = {}, TData extends object = {}, StoreDoc extends object = ChunkStoreConstraint<Required<TRootComponentReturnType["properties"]>> extends TStore ? {} : GetStoreDoc<TStore>, TComputed extends ChunkComputedConstraint = {}, ComputedDoc extends object = GetComputedDoc<TComputed>, EventsDoc extends object = IfExtends<ChunkEventsConstraint, TEvents, {}, TEvents>, PropertiesDoc extends object = NonNullable<TRootComponentReturnType["properties"]>>(options: ChunkComponentOptions<IsPage, TPrefix, RootDatas, TEvents, TData, TStore, StoreDoc, TComputed, ComputedDoc, RootMethods, RootEvents, TMethods, EventsDoc, PropertiesDoc>) => never;
+type ChunkComponentConstructor<TRootComponentReturnType extends RootComponentDefinition, TPrefix extends string, IsPage extends boolean = TRootComponentReturnType["isPage"] extends true ? true : false, RootDatas extends object = Required<TRootComponentReturnType["properties"]> & TRootComponentReturnType["data"] & TRootComponentReturnType["computed"] & TRootComponentReturnType["store"], RootMethods extends object = TRootComponentReturnType["methods"] & {}, RootEvents extends object = TRootComponentReturnType["events"] & {}> = <TEvents extends ChunkEventsConstraint, TStore extends ChunkStoreConstraint<Required<TRootComponentReturnType["properties"]>>, TMethods extends MethodsConstraint = {}, TData extends object = {}, StoreDoc extends object = ChunkStoreConstraint<Required<TRootComponentReturnType["properties"]>> extends TStore ? {} : GetStoreDef<TStore>, TComputed extends ChunkComputedConstraint = {}, ComputedDoc extends object = GetComputedDef<TComputed>, EventsDoc extends object = IfExtends<ChunkEventsConstraint, TEvents, {}, TEvents>, PropertiesDoc extends object = NonNullable<TRootComponentReturnType["properties"]>>(options: ChunkComponentOptions<IsPage, TPrefix, RootDatas, TEvents, TData, TStore, StoreDoc, TComputed, ComputedDoc, RootMethods, RootEvents, TMethods, EventsDoc, PropertiesDoc>) => never;
 export declare function ChunkComponent<TRootComponentReturnType extends RootComponentDefinition, TPrefix extends string = "">(): ChunkComponentConstructor<TRootComponentReturnType, TPrefix>;
 export {};

package/dist/api/CustomComponent/CustomReturnType/CreateCustomComponentDoc.d.ts

@@ -1,7 +1,7 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { ComputeIntersection, Select } from "hry-types/src/Object/_api";
-import type { ComputeObject } from "../../../types/ComputeObj";
+import type { ComputeObject } from "../../../types/ComputeObject";
 import type { RemovePrefix } from "../../../types/RemovePrefix";
 import type { Composed } from "../../RootComponent/CustomEvents/CustomEventsTag";
 type SelectStopEvents<T extends object> = {

package/dist/api/CustomComponent/index.d.ts

@@ -11,7 +11,7 @@ import type { UnionToComma } from "../../types/UnionToComma.test";
 import type { ComponentDoc } from "../DefineComponent/returnType/ComponentDoc";
 import type { IInjectStore } from "../InstanceInject/instanceConfig";
 import type { RootComponentDefinition } from "../RootComponent/returnType";
-import type { GetStoreDoc } from "../RootComponent/Store/GeTStoreDoc";
+import type { GetStoreDef } from "../RootComponent/Store/GetStoreDef";
 import type { CustomComputedConstraint } from "./CustomComputed/CustomComputedConstraint";
 import type { CustomComputedOption } from "./CustomComputed/CustomComputedOption";
 import type { GetCustomComputedDoc } from "./CustomComputed/GetCustomComputedDoc";
@@ -44,6 +44,6 @@ type CustomComponentConstructor<TRootDoc extends RootComponentDefinition, TOrigi
     properties: Extra<CurrentPrefix>;
 }, ReplacePrefix<TOriginalCompDoc & {
     properties: Extra<CurrentPrefix>;
-}, CurrentPrefix>>, AllRootDataDoc extends object = Required<TRootDoc["properties"]> & TRootDoc["data"] & TRootDoc["computed"] & TRootDoc["store"]> = <TInherit extends CustomInheritConstraint<AllRootDataDoc, CurrentCompDoc>, TData extends CustomDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc> & Record<InnerFields<CurrentPrefix>, unknown>>, TStore extends CustomStoreConstraint<Required<TRootDoc["properties"]>, Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TEvents extends CustomEventsConstraint<CurrentCompDoc>, TComputed extends CustomComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc & StoreDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TMethods extends CustomMethodsConstraint = {}, InheritDoc extends object = IfExtends<CustomInheritConstraint<AllRootDataDoc, CurrentCompDoc>, TInherit, {}, TInherit>, DataDoc extends object = IfExtends<CustomDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc> & Record<InnerFields<CurrentPrefix>, unknown>>, TData, {}, TData>, StoreDoc extends object = IfExtends<CustomStoreConstraint<Required<TRootDoc["properties"]>, Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TStore, {}, GetStoreDoc<TStore>>, ComputedDoc extends object = IfExtends<CustomComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc & StoreDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TComputed, {}, GetCustomComputedDoc<TComputed>>, EventsDoc extends object = IfExtends<CustomEventsConstraint<CurrentCompDoc>, TEvents, {}, TEvents>, MethodsDoc extends object = TMethods, MissingRequiredField extends PropertyKey = Exclude<RequiredKeys<NonNullable<CurrentCompDoc["properties"]>>, keyof (InheritDoc & DataDoc & StoreDoc & IfExtends<CustomComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc & StoreDoc)>>, TComputed, {}, GetCustomComputedDoc<TComputed>>)>>(options: Options<TRootDoc, IsPage, CurrentCompDoc, CurrentPrefix, AllRootDataDoc, TInherit, TData, TStore, TComputed, TEvents, TMethods, InheritDoc, DataDoc, StoreDoc, ComputedDoc, EventsDoc, MethodsDoc>) => IfExtends<MissingRequiredField, never, CreatCustomComponentDoc<NonNullable<CurrentCompDoc["events"]>, EventsDoc>, `缺少必传的字段${UnionToComma<MissingRequiredField & string>}`>;
+}, CurrentPrefix>>, AllRootDataDoc extends object = Required<TRootDoc["properties"]> & TRootDoc["data"] & TRootDoc["computed"] & TRootDoc["store"]> = <TInherit extends CustomInheritConstraint<AllRootDataDoc, CurrentCompDoc>, TData extends CustomDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc> & Record<InnerFields<CurrentPrefix>, unknown>>, TStore extends CustomStoreConstraint<Required<TRootDoc["properties"]>, Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TEvents extends CustomEventsConstraint<CurrentCompDoc>, TComputed extends CustomComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc & StoreDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TMethods extends CustomMethodsConstraint = {}, InheritDoc extends object = IfExtends<CustomInheritConstraint<AllRootDataDoc, CurrentCompDoc>, TInherit, {}, TInherit>, DataDoc extends object = IfExtends<CustomDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc> & Record<InnerFields<CurrentPrefix>, unknown>>, TData, {}, TData>, StoreDoc extends object = IfExtends<CustomStoreConstraint<Required<TRootDoc["properties"]>, Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TStore, {}, GetStoreDef<TStore>>, ComputedDoc extends object = IfExtends<CustomComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc & StoreDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TComputed, {}, GetCustomComputedDoc<TComputed>>, EventsDoc extends object = IfExtends<CustomEventsConstraint<CurrentCompDoc>, TEvents, {}, TEvents>, MethodsDoc extends object = TMethods, MissingRequiredField extends PropertyKey = Exclude<RequiredKeys<NonNullable<CurrentCompDoc["properties"]>>, keyof (InheritDoc & DataDoc & StoreDoc & IfExtends<CustomComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc & StoreDoc)>>, TComputed, {}, GetCustomComputedDoc<TComputed>>)>>(options: Options<TRootDoc, IsPage, CurrentCompDoc, CurrentPrefix, AllRootDataDoc, TInherit, TData, TStore, TComputed, TEvents, TMethods, InheritDoc, DataDoc, StoreDoc, ComputedDoc, EventsDoc, MethodsDoc>) => IfExtends<MissingRequiredField, never, CreatCustomComponentDoc<NonNullable<CurrentCompDoc["events"]>, EventsDoc>, `缺少必传的字段${UnionToComma<MissingRequiredField & string>}`>;
 export declare function CustomComponent<TRootComponentDefinition extends RootComponentDefinition, TCompDoc extends ComponentDoc, Prefix extends string = "">(): IfExtends<EmptyObject, TCompDoc, (opt: EmptyObject) => never, CustomComponentConstructor<TRootComponentDefinition, TCompDoc, Prefix>>;
 export {};

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

@@ -1,4 +1,4 @@
 import type { ComputedConstraint } from "./ComputedConstraint";
-export type GetComputedDoc<TComputed extends ComputedConstraint> = {
+export type GetComputedDef<TComputed extends ComputedConstraint> = {
     [k in keyof TComputed]: ReturnType<TComputed[k]>;
 };

package/dist/api/RootComponent/Computed/GetComputedDef.js

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

package/dist/api/RootComponent/Computed/GetComputedDef.js.map

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

package/dist/api/RootComponent/CustomEvents/CustomEventConstraint.d.ts

@@ -27,32 +27,37 @@ export type BubblesComposedOption = BubblesConfig & ComposedCongifg & NonCapture
 export type CaptureComposedOption = CaptureConfig & ComposedCongifg & NonBubblesConfig;
 export type BubblesCaptureComposedOption = BubblesConfig & ComposedCongifg & CaptureConfig;
 export type OptionsFieldsConfigOfCustomEvents = BubblesOption | CaptureOption | BubblesCaptureOption | BubblesComposedOption | CaptureComposedOption | BubblesCaptureComposedOption;
-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>;
 export {};

package/dist/api/RootComponent/CustomEvents/CustomEventsTag.d.ts

@@ -2,10 +2,10 @@ import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { BubblesCaptureComposedOption, BubblesCaptureOption, BubblesComposedOption, BubblesOption, CaptureComposedOption, CaptureOption, OptionsFieldsConfigOfCustomEvents } from "./CustomEventConstraint";
 export type Bubbles = () => "bubbles";
 export type Capture = () => "capture";
-export type Composed = () => "Composed";
+export type Composed = () => "composed";
 export type BubblesCapture = Bubbles | Capture;
 export type BubblesComposed = Bubbles | Composed;
 export type CaptureComposed = Capture | Composed;
 export type BubblesCaptureComposed = Bubbles | Capture | Composed;
 export type CustomEventsTags = Bubbles | Capture | BubblesCapture | BubblesComposed | CaptureComposed | BubblesCaptureComposed;
-export type AddTagForCustomEventsDoc<Options extends OptionsFieldsConfigOfCustomEvents> = IfExtends<BubblesOption, Options, Bubbles, IfExtends<CaptureOption, Options, Capture, IfExtends<BubblesCaptureOption, Options, BubblesCapture, IfExtends<BubblesComposedOption, Options, BubblesComposed, IfExtends<CaptureComposedOption, Options, CaptureComposed, IfExtends<BubblesCaptureComposedOption, Options, BubblesCaptureComposed>>>>>>;
+export type AddTagForCustomEventsDef<Options extends OptionsFieldsConfigOfCustomEvents> = IfExtends<BubblesOption, Options, Bubbles, IfExtends<CaptureOption, Options, Capture, IfExtends<BubblesCaptureOption, Options, BubblesCapture, IfExtends<BubblesComposedOption, Options, BubblesComposed, IfExtends<CaptureComposedOption, Options, CaptureComposed, IfExtends<BubblesCaptureComposedOption, Options, BubblesCaptureComposed>>>>>>;

package/dist/api/RootComponent/CustomEvents/GetCustomEventDef.d.ts

@@ -0,0 +1,10 @@
+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/dist/api/RootComponent/CustomEvents/GetCustomEventDef.js

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

package/dist/api/RootComponent/CustomEvents/GetCustomEventDef.js.map

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

package/dist/api/RootComponent/Events/EventsConstraint.d.ts

@@ -10,8 +10,8 @@ type _AddSuffixForKey<key extends string, Value extends CustomEventsTags> = Valu
 type TransformCustomEventsDocTypeToFunctionTypeAndAddSuffix<T extends CustomEventsDoc> = {
     [k in keyof T as _AddSuffixForKey<k & string, Extract<T[k], CustomEventsTags>>]?: (detail: Detail<Exclude<T[k], CustomEventsTags>>) => void;
 };
-type GetAllSubCustomEventsConstraint<ComponentDocList extends ComponentDoc[], AllCustomEvents extends CustomEventsDoc = GetBubblesOrCaptureEventsFromCompDoc<ComponentDocList>> = IfExtends<{}, AllCustomEvents, BaseEvent, TransformCustomEventsDocTypeToFunctionTypeAndAddSuffix<AllCustomEvents>>;
+type GetAllSubCustomEventsConstraint<TComponentDocList extends ComponentDoc[], AllCustomEvents extends CustomEventsDoc = GetBubblesOrCaptureEventsFromCompDoc<TComponentDocList>> = IfExtends<{}, AllCustomEvents, BaseEvent, TransformCustomEventsDocTypeToFunctionTypeAndAddSuffix<AllCustomEvents>>;
 type BaseEvent = Record<string, (e: WMBaseEvent) => unknown>;
 export type EventsConstraint<ComponentDocList extends ComponentDoc[] = []> = IfExtends<[
-], ComponentDocList, BaseEvent, GetAllSubCustomEventsConstraint<ComponentDocList>>;
+], ComponentDocList, BaseEvent, GetAllSubCustomEventsConstraint<ComponentDocList> & BaseEvent>;
 export {};

package/dist/api/RootComponent/Instance/CustomEventMethods.d.ts

@@ -1,5 +1,5 @@
 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>, undefined, () => void, (detail: Exclude<O[k], CustomEventsTags>) => void>;
+export type generateCustomEventMethods<TCustomEventsDef extends object> = {
+    [k in keyof TCustomEventsDef]: IfExtends<Exclude<TCustomEventsDef[k], CustomEventsTags>, undefined, () => void, (detail: Exclude<TCustomEventsDef[k], CustomEventsTags>) => void>;
 };

package/dist/api/RootComponent/Instance/RootComponentInstance.d.ts

@@ -4,17 +4,17 @@ 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, StoreDoc extends object, instanceData = ComputeObject<Assign<IInjectAllData, ComputeIntersection<AllData>>>> = IfExtends<false, TIsPage, WMComponentInstance, WMPageInstance> & Omit<WMInstanceMethods<{}>, "setData"> & CustomSetData<TDataForSetData> & IfExtends<EmptyObject, StoreDoc, unknown, {
+export type RootComponentInstance<TIsPage extends boolean, TMethods extends object, TDataForSetData extends object, AllData extends object, CustomEventsDef extends object, StoreDoc extends object, instanceData = ComputeObject<Assign<IInjectAllData, ComputeIntersection<AllData>>>> = IfExtends<false, TIsPage, WMComponentInstance, WMPageInstance> & Omit<WMInstanceMethods<{}>, "setData"> & CustomSetData<TDataForSetData> & IfExtends<EmptyObject, StoreDoc, unknown, {
     disposer: {
         [k in keyof StoreDoc]: IReactionDisposer;
     };
-}> & Assign<IInjectMethods, TMethods & CustomEventMethods<CustomEventsDoc>> & {
+}> & Assign<IInjectMethods, TMethods & generateCustomEventMethods<CustomEventsDef>> & {
     data: instanceData;
 };
 export type ComponentInstance = RootComponentInstance<false, {}, {}, {}, {}, {}>;

package/dist/api/RootComponent/PageLifetimes/PageLifetimesOption.d.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";
 export type PageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends object> = IfExtends<TIsPage, false, {

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

@@ -1,6 +1,6 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { InferDetailedType } from "../../../types/InferDetailedType";
 import type { OptionalType } from "./PropertiesConstraint";
-export type GetOptionalDoc<TOptionalProperties extends Record<string, OptionalType>> = {
+export type GetOptionalDef<TOptionalProperties extends Record<string, OptionalType>> = {
     -readonly [k in keyof TOptionalProperties]?: IfExtends<unknown, TOptionalProperties[k]["optionalTypes"], InferDetailedType<TOptionalProperties[k]["type"]>, InferDetailedType<TOptionalProperties[k]["type"]> | InferDetailedType<(TOptionalProperties[k]["optionalTypes"] & {})[number]>>;
 };

package/dist/api/RootComponent/Properties/GetOptionalDef.js

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

package/dist/api/RootComponent/Properties/GetOptionalDef.js.map

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

package/dist/api/RootComponent/Properties/GetPropertiesDef.d.ts

@@ -0,0 +1,8 @@
+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 = GetOptionalDef<Select<TProperties, OptionalType>>, RequiredDef extends object = GetRequiredDef<Omit<TProperties, keyof OptionalDef>>> = ComputeIntersection<OptionalDef & RequiredDef>;
+export type GetPropertiesDef<TProperties extends PropertiesConstraint> = _GetPropertiesDef<TProperties>;
+export {};

package/dist/api/RootComponent/Properties/GetPropertiesDef.js

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

package/dist/api/RootComponent/Properties/GetPropertiesDef.js.map

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

package/dist/api/RootComponent/Properties/GetRequiredDef.d.ts

@@ -0,0 +1,5 @@
+import type { InferDetailedType } from "../../../types/InferDetailedType";
+import type { RequiredSingle, RequiredType, RequiredUnion } from "./PropertiesConstraint";
+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/dist/api/RootComponent/Properties/GetRequiredDef.js

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

package/dist/api/RootComponent/Properties/GetRequiredDef.js.map

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

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

@@ -1,5 +1,5 @@
 import type { Getter } from "./StoreConstraint";
-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;
         default: infer D;

package/dist/api/RootComponent/Store/GetStoreDef.js

@@ -0,0 +1,3 @@
+import { typeEqual } from "../../../utils/typeEqual";
+typeEqual();
+//# sourceMappingURL=GetStoreDef.js.map

package/dist/api/RootComponent/Store/GetStoreDef.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GetStoreDef.js","sourceRoot":"","sources":["../../../../src/api/RootComponent/Store/GetStoreDef.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAiCrD,SAAS,EAAkB,CAAC"}

package/dist/api/RootComponent/index.d.ts

@@ -2,17 +2,17 @@ import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { Func } from "hry-types/src/Misc/Func";
 import type { ComputeIntersection } from "hry-types/src/Object/_api";
-import type { ComputeObject } from "../../types/ComputeObj";
+import type { ComputeObject } from "../../types/ComputeObject";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
 import type { RemoveNullOfRequired } from "../../types/RemoveNullOfRequired";
 import type { ComponentDoc } from "../DefineComponent/returnType/ComponentDoc";
 import type { IInjectStore } from "../InstanceInject/instanceConfig";
 import type { ComputedConstraint } from "./Computed/ComputedConstraint";
 import type { ComputedOption } from "./Computed/ComputedOption";
-import type { GetComputedDoc } from "./Computed/GetComputedDoc";
+import type { GetComputedDef } from "./Computed/GetComputedDef";
 import type { CustomEventConstraint } from "./CustomEvents/CustomEventConstraint";
 import type { CustomEventsOption } from "./CustomEvents/CustomEventsOption";
-import type { GetCustomEventDoc } from "./CustomEvents/GetCustomEventDoc";
+import type { GetCustomEventsDef } from "./CustomEvents/GetCustomEventDef";
 import type { DataOption } from "./Data/DataOption";
 import type { EventsConstraint } from "./Events/EventsConstraint";
 import type { EventsOption } from "./Events/EventsOption";
@@ -23,30 +23,30 @@ import type { MethodsConstraint } from "./Methods/MethodsConstraint";
 import type { MethodsOption } from "./Methods/MethodsOption";
 import type { ObserversOption } from "./Observers/ObserversOption";
 import type { PageLifetimesOption } from "./PageLifetimes/PageLifetimesOption";
-import type { GetPropertiesDoc } from "./Properties/GetPropertiesDoc";
+import type { GetPropertiesDef } from "./Properties/GetPropertiesDef";
 import type { PropertiesConstraint } from "./Properties/PropertiesConstraint";
 import type { PropertiesOption } from "./Properties/PropertiesOption";
-import type { GetStoreDoc } from "./Store/GeTStoreDoc";
+import type { GetStoreDef } from "./Store/GetStoreDef";
 import type { StoreConstraint } from "./Store/StoreConstraint";
 import type { StoreOption } from "./Store/StoreOption";
 import type { WatchOption } from "./Watch/WatchOption";
-type RootComponentOptions<TEvents extends object, TIsPage extends boolean, TCustomEvents extends CustomEventConstraint, TMethods extends MethodsConstraint, TProperties extends PropertiesConstraint, TData extends object, TStore extends StoreConstraint, TComputed extends Record<string, Func>, EventsDoc extends object, CustomEventsDoc extends object, PropertiesDoc extends object, DataDoc extends object, StoreDoc extends object, ComputedDoc extends object> = MethodsOption<TMethods, keyof (EventsDoc & CustomEventsDoc)> & PropertiesOption<TProperties> & IsPageOption<TIsPage> & EventsOption<TEvents> & CustomEventsOption<TCustomEvents, keyof EventsDoc> & DataOption<TData, keyof PropertiesDoc> & StoreOption<TStore, keyof (PropertiesDoc & DataDoc)> & ComputedOption<TComputed, keyof (PropertiesDoc & DataDoc & StoreDoc)> & PageLifetimesOption<TIsPage, PropertiesDoc> & LifetimesOption & WatchOption<ComputedDoc & Required<PropertiesDoc> & DataDoc & StoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "observers">> & ObserversOption<ComputedDoc & Required<PropertiesDoc> & DataDoc & StoreDoc & IInjectStore> & ThisType<RootComponentInstance<TIsPage, TMethods, DataDoc, DataDoc & Required<PropertiesDoc> & StoreDoc & ComputedDoc, CustomEventsDoc, StoreDoc>>;
-type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = <TEvents extends EventsConstraint<TComponentDocList>, TStore extends StoreConstraint<PropertiesDoc>, TIsPage extends boolean = false, const TProperties extends PropertiesConstraint = {}, TData extends object = {}, TComputed extends ComputedConstraint = {}, TCustomEvents extends IfExtends<TIsPage, false, CustomEventConstraint, EmptyObject> = {}, TMethods extends MethodsConstraint = {}, EventsDoc extends object = IfExtends<EventsConstraint<TComponentDocList>, TEvents, {}, TEvents>, CustomEventsDoc extends object = GetCustomEventDoc<TCustomEvents>, PropertiesDoc extends object = GetPropertiesDoc<TProperties>, DataDoc extends object = TData, StoreDoc extends object = StoreConstraint<PropertiesDoc> extends TStore ? {} : GetStoreDoc<TStore>, ComputedDoc extends object = GetComputedDoc<TComputed>>(options: RootComponentOptions<TEvents, TIsPage, TCustomEvents, TMethods, TProperties, TData, TStore, TComputed, EventsDoc, CustomEventsDoc, PropertiesDoc, DataDoc, StoreDoc, ComputedDoc>) => ComputeIntersection<IfExtends<TIsPage, false, {}, {
+type RootComponentOptions<TEvents extends object, TIsPage extends boolean, TCustomEvents extends CustomEventConstraint, TMethods extends MethodsConstraint, TProperties extends PropertiesConstraint, TData extends object, TStore extends StoreConstraint, TComputed extends Record<string, Func>, EventsDef extends object, CustomEventsDef extends object, PropertiesDef extends object, DataDef extends object, StoreDef extends object, ComputedDef extends object> = MethodsOption<TMethods, keyof (EventsDef & CustomEventsDef)> & PropertiesOption<TProperties> & IsPageOption<TIsPage> & EventsOption<TEvents> & IfExtends<TIsPage, false, CustomEventsOption<TCustomEvents, keyof EventsDef>, {}> & DataOption<TData, keyof PropertiesDef> & StoreOption<TStore, keyof (PropertiesDef & DataDef)> & ComputedOption<TComputed, keyof (PropertiesDef & DataDef & StoreDef)> & PageLifetimesOption<TIsPage, PropertiesDef> & LifetimesOption & WatchOption<ComputedDef & Required<PropertiesDef> & DataDef & StoreDef & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "observers">> & ObserversOption<ComputedDef & Required<PropertiesDef> & DataDef & StoreDef & IInjectStore> & ThisType<RootComponentInstance<TIsPage, TMethods, DataDef, DataDef & Required<PropertiesDef> & StoreDef & ComputedDef, CustomEventsDef, StoreDef>>;
+type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = <TEvents extends EventsConstraint<TComponentDocList>, TStore extends StoreConstraint<PropertiesDef>, TIsPage extends boolean = false, const TProperties extends PropertiesConstraint = {}, TData extends object = {}, TComputed extends ComputedConstraint = {}, TCustomEvents extends IfExtends<TIsPage, false, CustomEventConstraint, EmptyObject> = {}, TMethods extends MethodsConstraint = {}, EventsDef extends object = IfExtends<EventsConstraint<TComponentDocList>, TEvents, {}, TEvents>, CustomEventsDef extends object = GetCustomEventsDef<TCustomEvents>, PropertiesDef extends object = GetPropertiesDef<TProperties>, DataDef extends object = TData, StoreDef extends object = StoreConstraint<PropertiesDef> extends TStore ? {} : GetStoreDef<TStore>, ComputedDef extends object = GetComputedDef<TComputed>>(options: RootComponentOptions<TEvents, TIsPage, TCustomEvents, TMethods, TProperties, TData, TStore, TComputed, EventsDef, CustomEventsDef, PropertiesDef, DataDef, StoreDef, ComputedDef>) => ComputeIntersection<IfExtends<TIsPage, false, {}, {
     isPage: true;
-}> & IfExtends<EmptyObject, PropertiesDoc, {}, {
-    properties: IfExtends<false, TIsPage, PropertiesDoc, RemoveNullOfRequired<PropertiesDoc>>;
-}> & IfExtends<EmptyObject, DataDoc, {}, {
-    data: DataDoc;
-}> & IfExtends<EmptyObject, StoreDoc, {}, {
-    store: ComputeObject<StoreDoc>;
-}> & IfExtends<EmptyObject, ComputedDoc, {}, {
-    computed: ComputedDoc;
+}> & IfExtends<EmptyObject, PropertiesDef, {}, {
+    properties: IfExtends<false, TIsPage, PropertiesDef, RemoveNullOfRequired<PropertiesDef>>;
+}> & IfExtends<EmptyObject, DataDef, {}, {
+    data: DataDef;
+}> & IfExtends<EmptyObject, StoreDef, {}, {
+    store: ComputeObject<StoreDef>;
+}> & IfExtends<EmptyObject, ComputedDef, {}, {
+    computed: ComputedDef;
 }> & IfExtends<EmptyObject, TMethods, {}, {
     methods: TMethods;
-}> & IfExtends<EmptyObject, EventsDoc, {}, {
-    events: EventsDoc;
-}> & IfExtends<EmptyObject, CustomEventsDoc, {}, {
-    customEvents: ComputeObject<CustomEventsDoc>;
+}> & IfExtends<EmptyObject, EventsDef, {}, {
+    events: EventsDef;
+}> & IfExtends<EmptyObject, CustomEventsDef, {}, {
+    customEvents: ComputeObject<CustomEventsDef>;
 }>>;
 export declare function RootComponent<TComponentDocList extends ComponentDoc[] = []>(): RootComponentConstructor<TComponentDocList>;
 export {};

package/dist/api/wxSugar.d.ts

@@ -1,7 +1,7 @@
 import type { IfEquals } from "hry-types/src/Any/IfEquals";
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { NoInfer } from "hry-types/src/Generic/NoInfer";
-import type { ComputeObject } from "../types/ComputeObj";
+import type { ComputeObject } from "../types/ComputeObject";
 import type { WMNavigateToOption } from "../types/OfficialTypeAlias";
 import type { RequiredKeys } from "../types/RequiredKeys";
 import type { PageDoc } from "./DefineComponent/returnType/PageDoc";

package/dist/index.d.ts

@@ -7,9 +7,8 @@ import { navigateBack, navigateTo, redirectTo } from "./api/wxSugar";
 import type { CreateComponentType } from "./types/CreateComponentType";
 import type { DetailedType } from "./types/DetailedType";
 import type { ExtendComponentType } from "./types/ExtendComponentType";
-import type { ParamsEqual } from "./types/TwoParamsEqual";
 export * from "./utils/_utils";
 export type { Bubbles, BubblesCapture, BubblesCaptureComposed, BubblesComposed, Capture, CaptureComposed, Composed, CustomEventsTags, } from "./api/RootComponent/CustomEvents/CustomEventsTag";
 export type { Vant, Wm } from "./thirdLib";
 export type { CurrentTargetDataset, Dataset, Detail, Mark, TargetDataset, WMBaseEvent, WMCustomEvent, } from "./types/OfficialTypeAlias";
-export { ChunkComponent, type CreateComponentType, CustomComponent, DefineComponent, type DetailedType, type ExtendComponentType, type IInjectInfo, instanceConfig, navigateBack, navigateTo, type ParamsEqual, redirectTo, RootComponent, };
+export { ChunkComponent, type CreateComponentType, CustomComponent, DefineComponent, type DetailedType, type ExtendComponentType, type IInjectInfo, instanceConfig, navigateBack, navigateTo, redirectTo, RootComponent, };

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAoB,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACvF,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAKrE,cAAc,gBAAgB,CAAC;AAwB/B,OAAO,EACL,cAAc,EAEd,eAAe,EACf,eAAe,EAIf,cAAc,EACd,YAAY,EACZ,UAAU,EAEV,UAAU,EACV,aAAa,GACd,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAoB,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACvF,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAKrE,cAAc,gBAAgB,CAAC;AAwB/B,OAAO,EACL,cAAc,EAEd,eAAe,EACf,eAAe,EAIf,cAAc,EACd,YAAY,EACZ,UAAU,EACV,UAAU,EACV,aAAa,GACd,CAAC"}

package/dist/types/ComputeObject.js

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

package/dist/types/ComputeObject.js.map

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

package/dist/utils/typeEqual.d.ts

@@ -1,2 +1,2 @@
 import type { Equals } from "hry-types/src/Any/Equals";
-export declare function typeEqual<A, B extends Equals<A, B> extends true ? unknown : never>(): void;
+export declare function typeEqual<const A, const B extends Equals<A, B> extends true ? unknown : never = never>(a?: NoInfer<A>): void;

package/dist/utils/typeEqual.js

@@ -1,4 +1,4 @@
-export function typeEqual() {
-    void 0;
+export function typeEqual(a) {
+    void a;
 }
 //# sourceMappingURL=typeEqual.js.map

package/dist/utils/typeEqual.js.map

@@ -1 +1 @@
-{"version":3,"file":"typeEqual.js","sourceRoot":"","sources":["../../src/utils/typeEqual.ts"],"names":[],"mappings":"AAUA,MAAM,UAAU,SAAS;IAIvB,KAAK,CAAC,CAAC;AACT,CAAC"}
+{"version":3,"file":"typeEqual.js","sourceRoot":"","sources":["../../src/utils/typeEqual.ts"],"names":[],"mappings":"AAaA,MAAM,UAAU,SAAS,CAGvB,CAAc;IACd,KAAK,CAAC,CAAC;AACT,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "annil",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "微信小程序(原生开发)插件",
   "main": "dist/index.js",
   "types": "src/index.ts",

package/src/api/ChunkComponent/ChunkComputed/test/normal.test.ts

@@ -1,5 +1,5 @@
 import { Checking } from "hry-types";
-import type { ComputeObject } from "../../../../types/ComputeObj";
+import type { ComputeObject } from "../../../../types/ComputeObject";
 import type { IInjectAllData } from "../../../InstanceInject/instanceConfig";
 import { ChunkComponent } from "../..";
 import type { Mock_RootDoc } from "./mock";

package/src/api/ChunkComponent/index.ts

@@ -1,14 +1,14 @@
 import type { IfExtends } from "hry-types/src/Any/_api";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
 import type { IInjectAllData, IInjectMethods, IInjectStore } from "../InstanceInject/instanceConfig";
-import type { GetComputedDoc } from "../RootComponent/Computed/GetComputedDoc";
+import type { GetComputedDef } from "../RootComponent/Computed/GetComputedDef";
 import type { RootComponentInstance } from "../RootComponent/Instance/RootComponentInstance";
 import type { LifetimesOption } from "../RootComponent/Lifetimes/LifetimesOption";
 import type { MethodsConstraint } from "../RootComponent/Methods/MethodsConstraint";
 import type { ObserversOption } from "../RootComponent/Observers/ObserversOption";
 import type { PageLifetimesOption } from "../RootComponent/PageLifetimes/PageLifetimesOption";
 import type { RootComponentDefinition } from "../RootComponent/returnType";
-import type { GetStoreDoc } from "../RootComponent/Store/GeTStoreDoc";
+import type { GetStoreDef } from "../RootComponent/Store/GetStoreDef";
 import type { WatchOption } from "../RootComponent/Watch/WatchOption";
 import type { ChunkComputedConstraint } from "./ChunkComputed/ChunkComputedConstraint";
 import type { ChunkComputedOption } from "./ChunkComputed/ChunkComputedOption";
@@ -99,9 +99,9 @@ type ChunkComponentConstructor<
   TMethods extends MethodsConstraint = {},
   TData extends object = {},
   StoreDoc extends object = ChunkStoreConstraint<Required<TRootComponentReturnType["properties"]>> extends TStore ? {}
-    : GetStoreDoc<TStore>,
+    : GetStoreDef<TStore>,
   TComputed extends ChunkComputedConstraint = {},
-  ComputedDoc extends object = GetComputedDoc<TComputed>,
+  ComputedDoc extends object = GetComputedDef<TComputed>,
   EventsDoc extends object = IfExtends<ChunkEventsConstraint, TEvents, {}, TEvents>,
   PropertiesDoc extends object = NonNullable<TRootComponentReturnType["properties"]>,
 >(

package/src/api/CustomComponent/CustomReturnType/CreateCustomComponentDoc.ts

@@ -1,7 +1,7 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { ComputeIntersection, Select } from "hry-types/src/Object/_api";
-import type { ComputeObject } from "../../../types/ComputeObj";
+import type { ComputeObject } from "../../../types/ComputeObject";
 import type { RemovePrefix } from "../../../types/RemovePrefix";
 import type { Composed } from "../../RootComponent/CustomEvents/CustomEventsTag";
 

package/src/api/CustomComponent/index.ts

@@ -11,7 +11,7 @@ import type { UnionToComma } from "../../types/UnionToComma.test";
 import type { ComponentDoc } from "../DefineComponent/returnType/ComponentDoc";
 import type { IInjectStore } from "../InstanceInject/instanceConfig";
 import type { RootComponentDefinition } from "../RootComponent/returnType";
-import type { GetStoreDoc } from "../RootComponent/Store/GeTStoreDoc";
+import type { GetStoreDef } from "../RootComponent/Store/GetStoreDef";
 import type { CustomComputedConstraint } from "./CustomComputed/CustomComputedConstraint";
 import type { CustomComputedOption } from "./CustomComputed/CustomComputedOption";
 import type { GetCustomComputedDoc } from "./CustomComputed/GetCustomComputedDoc";
@@ -224,7 +224,7 @@ type CustomComponentConstructor<
     >,
     TStore,
     {},
-    GetStoreDoc<TStore>
+    GetStoreDef<TStore>
   >,
   // 无效的计算
   ComputedDoc extends object = IfExtends<

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({