annil 1.0.4 → 1.0.5

package/dist/api/RootComponent/Properties/test/normalRequired.test.d.ts

@@ -1,4 +1,4 @@
-import type { SpecificType } from "../../../../types/SpecificType";
+import type { DetailedType } from "../../../../types/DetailedType";
 export type Mock_User = {
     id: string;
     age?: number;
@@ -13,12 +13,12 @@ export declare const mock_requiredSingle: {
     bool: BooleanConstructor;
     arr: ArrayConstructor;
     obj: ObjectConstructor;
-    tuple: SpecificType<[string, number, boolean]>;
-    union_str: SpecificType<"male" | "female">;
-    union_num: SpecificType<0 | 1 | 2>;
-    union_bool: SpecificType<boolean>;
-    union_arr: SpecificType<string[] | number[]>;
-    union_obj: SpecificType<Mock_User | Mock_Cart>;
+    tuple: DetailedType<[string, number, boolean]>;
+    union_str: DetailedType<"male" | "female">;
+    union_num: DetailedType<0 | 1 | 2>;
+    union_bool: DetailedType<boolean>;
+    union_arr: DetailedType<string[] | number[]>;
+    union_obj: DetailedType<Mock_User | Mock_Cart>;
 };
 export declare const mock_requiredUnion: {
     union_str_num_bool: {
@@ -26,16 +26,16 @@ export declare const mock_requiredUnion: {
         optionalTypes: (NumberConstructor | BooleanConstructor)[];
     };
     union_literalStr_Literalnum: {
-        type: SpecificType<"male" | "female">;
-        optionalTypes: SpecificType<0 | 1 | 2>[];
+        type: DetailedType<"male" | "female">;
+        optionalTypes: DetailedType<0 | 1 | 2>[];
     };
     union_mockUser_num: {
-        type: SpecificType<Mock_User>;
+        type: DetailedType<Mock_User>;
         optionalTypes: NumberConstructor[];
     };
     union_num_mockUser: {
         type: NumberConstructor;
-        optionalTypes: SpecificType<Mock_User>[];
+        optionalTypes: DetailedType<Mock_User>[];
     };
 };
 export declare const mock_requiredTypes: {
@@ -44,28 +44,28 @@ export declare const mock_requiredTypes: {
         optionalTypes: (NumberConstructor | BooleanConstructor)[];
     };
     union_literalStr_Literalnum: {
-        type: SpecificType<"male" | "female">;
-        optionalTypes: SpecificType<0 | 1 | 2>[];
+        type: DetailedType<"male" | "female">;
+        optionalTypes: DetailedType<0 | 1 | 2>[];
     };
     union_mockUser_num: {
-        type: SpecificType<Mock_User>;
+        type: DetailedType<Mock_User>;
         optionalTypes: NumberConstructor[];
     };
     union_num_mockUser: {
         type: NumberConstructor;
-        optionalTypes: SpecificType<Mock_User>[];
+        optionalTypes: DetailedType<Mock_User>[];
     };
     str: StringConstructor;
     num: NumberConstructor;
     bool: BooleanConstructor;
     arr: ArrayConstructor;
     obj: ObjectConstructor;
-    tuple: SpecificType<[string, number, boolean]>;
-    union_str: SpecificType<"male" | "female">;
-    union_num: SpecificType<0 | 1 | 2>;
-    union_bool: SpecificType<boolean>;
-    union_arr: SpecificType<string[] | number[]>;
-    union_obj: SpecificType<Mock_User | Mock_Cart>;
+    tuple: DetailedType<[string, number, boolean]>;
+    union_str: DetailedType<"male" | "female">;
+    union_num: DetailedType<0 | 1 | 2>;
+    union_bool: DetailedType<boolean>;
+    union_arr: DetailedType<string[] | number[]>;
+    union_obj: DetailedType<Mock_User | Mock_Cart>;
 };
 type RequiredTypeExpected = {
     str: string;

package/dist/api/SubComponent/SubComputed/GetSubComputedDoc.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="./node_modules/miniprogram-api-typings/" />
+/// <reference types="miniprogram-api-typings" />
 export type GetSubComputedDoc<TComputed extends AnyObject> = {
     [k in keyof TComputed]: ReturnType<TComputed[k]>;
 };

package/dist/api/SubComponent/SubComputed/test/normal.test.js

@@ -43,12 +43,9 @@ SubComponent()({
     },
 });
 SubComponent()({
-    data: {
-        aaa_xxx: 123,
-    },
     computed: {
         aaa_num() {
-            return this.data.aaa_xxx;
+            return this.data.SNum;
         },
         aaa_user() {
             return this.data.user;
@@ -56,6 +53,9 @@ SubComponent()({
         aaa_age() {
             return this.data.aaa_num;
         },
+        aaa_str() {
+            return this.data.str;
+        },
     },
 });
 //# sourceMappingURL=normal.test.js.map

package/dist/api/SubComponent/SubComputed/test/normal.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubComputed/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAKhD,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAqBrC,YAAY,EAAyB,CAAC;IAEpC,QAAQ,EAAE,EAAE;CACb,CAAC,CAAC;AAWH,YAAY,EAA0B,CAAC;IACrC,OAAO,EAAE;QACP,OAAO,EAAE,KAAK;KACf;IACD,IAAI,EAAE;QACJ,OAAO,EAAE,GAAG;KACb;IAED,QAAQ,EAAE;QACR,OAAO;YACL,OAAO,EAAsB,CAAC;QAChC,CAAC;QACD,UAAU;YACR,OAAO,GAAG,CAAC;QACb,CAAC;KACF;CACF,CAAC,CAAC;AAEH,YAAY,EAA0B,CAAC;IACrC,QAAQ,EAAE;QACR,OAAO;YACL,OAAO,GAAa,CAAC;QACvB,CAAC;QACD,UAAU;YACR,OAAO,GAAG,CAAC;QACb,CAAC;QACD,OAAO;YACL,OAAO,GAAG,CAAC;QACb,CAAC;QACD,OAAO;YACL,IAAI,CAAC,IAAI,CAAC;YAGV,QAaC,CAAC;YAEF,OAAO,EAAe,CAAC;QACzB,CAAC;KACF;IACD,SAAS,EAAE;QACT,QAAQ;YAEN,QAaC,CAAC;QACJ,CAAC;KACF;CACF,CAAC,CAAC;AAOH,YAAY,EAAiB,CAAC;IAC5B,IAAI,EAAE;QACJ,OAAO,EAAE,GAAG;KACb;IACD,QAAQ,EAAE;QACR,OAAO;YACL,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;QAC3B,CAAC;QACD,QAAQ;YACN,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QACxB,CAAC;QACD,OAAO;YACL,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;QAC3B,CAAC;KACF;CACF,CAAC,CAAC"}
+{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubComputed/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAKhD,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AA4BrC,YAAY,EAAyB,CAAC;IAEpC,QAAQ,EAAE,EAAE;CACb,CAAC,CAAC;AAWH,YAAY,EAA0B,CAAC;IACrC,OAAO,EAAE;QACP,OAAO,EAAE,KAAK;KACf;IACD,IAAI,EAAE;QACJ,OAAO,EAAE,GAAG;KACb;IAED,QAAQ,EAAE;QACR,OAAO;YACL,OAAO,EAAsB,CAAC;QAChC,CAAC;QACD,UAAU;YACR,OAAO,GAAG,CAAC;QACb,CAAC;KACF;CACF,CAAC,CAAC;AAEH,YAAY,EAA0B,CAAC;IACrC,QAAQ,EAAE;QACR,OAAO;YACL,OAAO,GAAa,CAAC;QACvB,CAAC;QACD,UAAU;YACR,OAAO,GAAG,CAAC;QACb,CAAC;QACD,OAAO;YACL,OAAO,GAAG,CAAC;QACb,CAAC;QACD,OAAO;YACL,IAAI,CAAC,IAAI,CAAC;YAGV,QAcC,CAAC;YAEF,OAAO,EAAe,CAAC;QACzB,CAAC;KACF;IACD,SAAS,EAAE;QACT,QAAQ;YAEN,QAcC,CAAC;QACJ,CAAC;KACF;CACF,CAAC,CAAC;AAIH,YAAY,EAAc,CAAC;IACzB,QAAQ,EAAE;QACR,OAAO;YACL,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QACxB,CAAC;QACD,QAAQ;YACN,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QACxB,CAAC;QACD,OAAO;YACL,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;QAC3B,CAAC;QACD,OAAO;YACL,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QACvB,CAAC;KACF;CACF,CAAC,CAAC"}

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

@@ -27,7 +27,7 @@ import type { SubWatchOption } from "./SubWatch/SubWatchOption";
 type Options<RootDoc extends RootComponentDoc, IsPage extends boolean, CurrentCompDoc extends ComponentDoc, Prefix extends string, AllRootDataDoc extends object, TInherit extends object, TSubData extends object, TSubStore extends object, TSubComputed extends object, TEvents extends object, TSubMethods extends object, InheritDoc extends object, SubDataDoc extends object, SubStoreDoc extends object, SubComputedDoc extends object, SubEventsDoc extends object, SubMethodsDoc extends object> = {
     inherit?: TInherit;
 } & SubDataOption<TSubData, Exclude<keyof CurrentCompDoc["properties"], (keyof InheritDoc)>, Prefix> & SubStoreOption<TSubStore, Exclude<keyof CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc))>, Prefix> & SubComputedOption<TSubComputed, Omit<CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc & SubStoreDoc))>> & SubEventsOption<TEvents, SubEventsDoc, keyof SubEventsConstraint<CurrentCompDoc>> & SubMethodsOption<TSubMethods, Prefix, keyof CurrentCompDoc["customEvents"]> & SubPageLifetimesOption<IsPage, RootDoc["properties"] & {}> & SubLifetimesOption & SubWatchOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc> & Partial<Omit<WMCompOtherOption, "pageLifetimes">> & ThisType<SubInstance<SubMethodsDoc & RootDoc["methods"], TSubData, AllRootDataDoc & SubDataDoc & SubComputedDoc & SubStoreDoc, RootDoc["customEvents"] & {}, SubStoreDoc>>;
-type SubComponentConstructor<TRootDoc extends RootComponentDoc, TOriginalCompDoc extends ComponentDoc, TSupplementalPrefix extends string = "", IsPage extends boolean = TRootDoc["isPage"] extends true ? true : false, CurrentPrefix extends string = `${ExtractDocPrefix<TOriginalCompDoc>}${Capitalize<TSupplementalPrefix>}`, CurrentCompDoc extends ComponentDoc = IfExtends<TSupplementalPrefix, "", TOriginalCompDoc, ReplacePrefix<TOriginalCompDoc, CurrentPrefix>>, AllRootDataDoc extends object = Required<TRootDoc["properties"]> & TRootDoc["data"] & TRootDoc["computed"]> = {
+type SubComponentConstructor<TRootDoc extends RootComponentDoc, TOriginalCompDoc extends ComponentDoc, TSupplementalPrefix extends string = "", IsPage extends boolean = TRootDoc["isPage"] extends true ? true : false, CurrentPrefix extends string = `${ExtractDocPrefix<TOriginalCompDoc>}${Capitalize<TSupplementalPrefix>}`, CurrentCompDoc extends ComponentDoc = IfExtends<TSupplementalPrefix, "", TOriginalCompDoc, ReplacePrefix<TOriginalCompDoc, CurrentPrefix>>, AllRootDataDoc extends object = Required<TRootDoc["properties"]> & TRootDoc["data"] & TRootDoc["computed"] & TRootDoc["store"]> = {
     <TInherit extends InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TSubData extends SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc>>, TSubStore extends SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)>>, TEvents extends SubEventsConstraint<CurrentCompDoc>, TSubComputed extends SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>>, TSubMethods extends SubMethodsConstraint = {}, InheritDoc extends object = IfExtends<InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TInherit, {}, TInherit>, SubDataDoc extends object = IfExtends<SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc>>, TSubData, {}, TSubData>, SubStoreDoc extends object = IfExtends<SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)>>, TSubStore, {}, {
         [k in keyof TSubStore]: ReturnType<TSubStore[k] & {}>;
     }>, SubComputedDoc extends object = IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>>, TSubComputed, {}, GetSubComputedDoc<TSubComputed>>, SubEventsDoc extends object = IfExtends<SubEventsConstraint<CurrentCompDoc>, TEvents, {}, TEvents>, SubMethodsDoc extends object = TSubMethods, MissingRequiredField extends PropertyKey = Exclude<RequiredKeys<CurrentCompDoc["properties"] & {}>, keyof (InheritDoc & SubDataDoc & SubStoreDoc & IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>>, TSubComputed, {}, GetSubComputedDoc<TSubComputed>>)>>(options: Options<TRootDoc, IsPage, CurrentCompDoc, CurrentPrefix, AllRootDataDoc, TInherit, TSubData, TSubStore, TSubComputed, TEvents, TSubMethods, InheritDoc, SubDataDoc, SubStoreDoc, SubComputedDoc, SubEventsDoc, SubMethodsDoc>): CreateSubComponentDoc<TOriginalCompDoc["customEvents"] & {}, SubEventsDoc, MissingRequiredField>;

package/dist/api/SubComponent/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SubComponent/index.ts"],"names":[],"mappings":"AAiMA,MAAM,UAAU,YAAY;IAK1B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAkC,CAAQ,CAAC;AACvE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SubComponent/index.ts"],"names":[],"mappings":"AAkMA,MAAM,UAAU,YAAY;IAK1B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAkC,CAAQ,CAAC;AACvE,CAAC"}

package/dist/api/navigateTo.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="./node_modules/miniprogram-api-typings/" />
+/// <reference types="miniprogram-api-typings" />
 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";

package/dist/index.d.ts

@@ -4,6 +4,7 @@ import { navigateTo } from "./api/navigateTo";
 import { DefineComponent } from "./api/DefineComponent";
 import { RootComponent } from "./api/RootComponent";
 import { SubComponent } from "./api/SubComponent";
-import type { SpecificType } from "./types/SpecificType";
+import type { DetailedType } from "./types/DetailedType";
+import type { GenerateDoc } from "./types/GenerateDoc";
 import type { ParamsEqual } from "./types/TwoParamsEqual";
-export { DefineComponent, navigateTo, type ParamsEqual, RootComponent, type SpecificType, SubComponent };
+export { DefineComponent, type DetailedType, type GenerateDoc, navigateTo, type ParamsEqual, RootComponent, SubComponent, };

package/dist/index.js

@@ -2,5 +2,5 @@ import { navigateTo } from "./api/navigateTo";
 import { DefineComponent } from "./api/DefineComponent";
 import { RootComponent } from "./api/RootComponent";
 import { SubComponent } from "./api/SubComponent";
-export { DefineComponent, navigateTo, RootComponent, SubComponent };
+export { DefineComponent, navigateTo, RootComponent, SubComponent, };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAMlD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAoB,aAAa,EAAqB,YAAY,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAOlD,OAAO,EACL,eAAe,EAGf,UAAU,EAEV,aAAa,EACb,YAAY,GACb,CAAC"}

package/dist/types/{SpecificType.d.ts → DetailedType.d.ts}

@@ -1,4 +1,4 @@
-export type SpecificType<T = unknown> = {
+export type DetailedType<T = unknown> = {
     (): T;
 } | {
     new (...arg: any[]): T;

package/dist/types/DetailedType.js

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

package/dist/types/DetailedType.js.map

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

package/dist/types/GenerateDoc.d.ts

@@ -0,0 +1,9 @@
+import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
+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"], {}, {
+    properties: AddPrefix<T["properties"] & {}, TName>;
+}> & IfExtends<unknown, T["customEvents"], {}, {
+    customEvents: AddPrefix<T["customEvents"] & {}, TName>;
+}>>;

package/dist/types/GenerateDoc.js

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

package/dist/types/GenerateDoc.js.map

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

package/dist/types/InferDetailedType.d.ts

@@ -0,0 +1,2 @@
+import type { DetailedType } from "./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/InferDetailedType.js

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

package/dist/types/InferDetailedType.js.map

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

package/dist/types/{InferSpecificType.test.js → InferDetailedType.test.js}

@@ -6,4 +6,4 @@ Checking;
 Checking;
 Checking;
 Checking;
-//# sourceMappingURL=InferSpecificType.test.js.map
+//# sourceMappingURL=InferDetailedType.test.js.map

package/dist/types/InferDetailedType.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"InferDetailedType.test.js","sourceRoot":"","sources":["../../src/types/InferDetailedType.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAKhD,QAAiE,CAAC;AAElE,QAAiE,CAAC;AAElE,QAAmE,CAAC;AAEpE,QAAmE,CAAC;AAEpE,QAAiE,CAAC;AAElE,QAA0E,CAAC;AAE3E,QAA0G,CAAC"}

package/dist/types/OfficialTypeAlias.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="./node_modules/miniprogram-api-typings/" />
-/// <reference types="./node_modules/miniprogram-api-typings/" />
-/// <reference types="./node_modules/miniprogram-api-typings/" />
-/// <reference types="./node_modules/miniprogram-api-typings/" />
+/// <reference types="miniprogram-api-typings" />
+/// <reference types="miniprogram-api-typings" />
+/// <reference types="miniprogram-api-typings" />
+/// <reference types="miniprogram-api-typings" />
 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>;

package/package.json

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

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

@@ -1,6 +1,6 @@
 import { Checking, type Test } from "hry-types";
 import { type ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
-import { RootComponent, type SpecificType } from "../../../..";
+import { type DetailedType, RootComponent } from "../../../..";
 import type { CustomEventConstraint } from "../../../RootComponent/CustomEvents/CustomEventConstraint";
 import type {
   Bubbles,
@@ -20,43 +20,43 @@ import { DefineComponent } from "../..";
 
 const properties = {
   str: String,
-  obj: Object as SpecificType<Mock_User>,
+  obj: Object as DetailedType<Mock_User>,
   optionalObj: {
-    type: Object as SpecificType<Mock_User>,
+    type: Object as DetailedType<Mock_User>,
     value: {} as Mock_User,
   },
   optionalObjOrNull: {
-    type: Object as SpecificType<Mock_User | null>,
+    type: Object as DetailedType<Mock_User | null>,
     value: null,
   },
 } satisfies PropertiesConstraint;
 const customEvents = {
   str: String,
   null: null,
-  unionStr: String as SpecificType<"male" | "female">,
-  list: [String, Number as SpecificType<0 | 1 | 2>, null],
+  unionStr: String as DetailedType<"male" | "female">,
+  list: [String, Number as DetailedType<0 | 1 | 2>, null],
   bubbles: {
-    detailType: String,
+    detail: String,
     options: { bubbles: true },
   },
   capturePhase: {
-    detailType: null,
+    detail: null,
     options: { capturePhase: true },
   },
   bubbles_capturePhase: {
-    detailType: [String, Number],
+    detail: [String, Number],
     options: { bubbles: true, capturePhase: true },
   },
   bubbles_composed: {
-    detailType: String as SpecificType<"male" | "female">,
+    detail: String as DetailedType<"male" | "female">,
     options: { bubbles: true, composed: true },
   },
   capturePhase_composed: {
-    detailType: [String, Number as SpecificType<0 | 1 | 2>, null],
+    detail: [String, Number as DetailedType<0 | 1 | 2>, null],
     options: { capturePhase: true, composed: true },
   },
   bubbles_capturePhase_composed: {
-    detailType: Boolean,
+    detail: Boolean,
     options: { bubbles: true, capturePhase: true, composed: true },
   },
 } satisfies CustomEventConstraint;

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

@@ -1,5 +1,5 @@
 import { Checking, type Test } from "hry-types";
-import { RootComponent, type SpecificType } from "../../../..";
+import { type DetailedType, RootComponent } from "../../../..";
 
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import { DefineComponent } from "../..";
@@ -8,13 +8,13 @@ const OnlyPropsRootDoc = RootComponent()({
   isPage: true,
   properties: {
     str: String,
-    obj: Object as SpecificType<Mock_User>,
+    obj: Object as DetailedType<Mock_User>,
     optionalObj: {
-      type: Object as SpecificType<Mock_User>,
+      type: Object as DetailedType<Mock_User>,
       value: {} as Mock_User,
     },
     optionalObjOrNull: {
-      type: Object as SpecificType<Mock_User | null>,
+      type: Object as DetailedType<Mock_User | null>,
       value: null,
     },
   },

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

@@ -1,6 +1,6 @@
 import { Checking, type Test } from "hry-types";
 import type { ReadonlyDeep } from "hry-types/src/Any/_api";
-import type { SpecificType } from "../../../../types/SpecificType";
+import type { DetailedType } from "../../../../types/DetailedType";
 import { RootComponent } from "../..";
 import type { Mock_User } from "../../Properties/test/normalRequired.test";
 
@@ -88,7 +88,7 @@ Checking<typeof EmptyComputedFieldDoc, { methods: { M1: () => void } }, Test.Pas
 RootComponent()({
   isPage: true,
   properties: {
-    obj: Object as SpecificType<{ name: string; age: number }>,
+    obj: Object as DetailedType<{ name: string; age: number }>,
   },
   computed: {
     age() {

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

@@ -1,6 +1,6 @@
-import type { SpecificType } from "../../../types/SpecificType";
+import type { DetailedType } from "../../../types/DetailedType";
 
-type SimpleCustomeEvents = SpecificType | null;
+type SimpleCustomeEvents = DetailedType | null;
 
 export type SimpleCustomeEventsList = SimpleCustomeEvents[];
 
@@ -43,7 +43,7 @@ export type OptionsFieldsConfigOfCustomEvents =
  * 带options的CustomEvents配置
  */
 export type FullCustomEvents = {
-  detailType: ShortCustomeEvents;
+  detail: ShortCustomeEvents;
   options: OptionsFieldsConfigOfCustomEvents;
 };
 

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

@@ -17,9 +17,9 @@ export type CustomEventsOption<
    *   // ...
    *   customEvents: {
    *     A: Number, // number
-   *     B: [String as SpecificType<"male" | "femal">, Number], // "male" | "femal" | number
+   *     B: [String as DetailedType<"male" | "femal">, Number], // "male" | "femal" | number
    *     C: {
-   *       detailType: String,
+   *       detail: String,
    *       options: {
    *         bubbles: true,
    *         composed: true,

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

@@ -1,5 +1,5 @@
-import type { InferSpecificType } from "../../../types/InferSpecificType";
-import type { SpecificType } from "../../../types/SpecificType";
+import type { DetailedType } from "../../../types/DetailedType";
+import type { InferDetailedType } from "../../../types/InferDetailedType";
 import type {
   CustomEventConstraint,
   FullCustomEvents,
@@ -8,13 +8,13 @@ import type {
 } from "./CustomEventConstraint";
 import type { AddTagForCustomEventsDoc } from "./CustomEventsTag";
 
-export type GetShortCustomEventsDoc<T extends ShortCustomeEvents> = T extends SpecificType ? InferSpecificType<T>
+export type GetShortCustomEventsDoc<T extends ShortCustomeEvents> = T extends DetailedType ? InferDetailedType<T>
   : T extends null ? null
   : T extends SimpleCustomeEventsList ? GetShortCustomEventsDoc<T[number]>
   : never;
 
 export type GetFullCustomEventsDoc<T extends FullCustomEvents> =
-  | GetShortCustomEventsDoc<T["detailType"]>
+  | GetShortCustomEventsDoc<T["detail"]>
   | AddTagForCustomEventsDoc<T["options"]>;
 
 /**
@@ -23,8 +23,8 @@ export type GetFullCustomEventsDoc<T extends FullCustomEvents> =
  * ```ts
  * customEvents:{
  *   a:Number,
- *   b:{ detailType: String,options:{ bubbles:true } }
- *   c:{ detailType: Number,options:{ bubbles:true, composed:true } }
+ *   b:{ detail: String,options:{ bubbles:true } }
+ *   c:{ detail: Number,options:{ bubbles:true, composed:true } }
  * }
  * //result => {a:number,b:string|()=>'bubbles',c:number | ()=>'composed' }
  * ```
@@ -36,7 +36,7 @@ export type GetCustomEventDoc<T extends CustomEventConstraint> =
     [k in keyof T]: T[k] extends ShortCustomeEvents ? GetShortCustomEventsDoc<T[k]>  
     // 应该写GetFullCustomEventsDoc<T[k]>带鼠标悬停时不是计算结果。所以代码重复了。
       : // @ts-ignore T[k] 一定为 FullCustomEvents 类型
-        | GetShortCustomEventsDoc<T[k]["detailType"]>
+        | GetShortCustomEventsDoc<T[k]["detail"]>
         // 为自定义事件模型加标记,方便识别
         // @ts-ignore T[k] 一定为 FullCustomEvents 类型
         | AddTagForCustomEventsDoc<T[k]["options"]>;

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

@@ -7,26 +7,26 @@ RootComponent()({
   customEvents: {
     // @ts-expect-error options 没有options字段时无需写对象形式,应简写`error1:Boolean`。
     error1: {
-      detailType: Boolean,
+      detail: Boolean,
     },
     // @ts-expect-error options 不可以为空对象 无意义
     error2: {
-      detailType: Boolean,
+      detail: Boolean,
       options: {},
     },
     // @ts-expect-error false字段不要写 默认就为false
     error3: {
-      detailType: Boolean,
+      detail: Boolean,
       options: { bubbles: false },
     },
     // @ts-expect-error false 字段不要写 默认false
     error4: {
-      detailType: Boolean,
+      detail: Boolean,
       options: { capturePhase: false },
     },
     // @ts-expect-error composed字段不可以单独开启,必须存在 bubbles或capturePhase字段为true时
     error5: {
-      detailType: Boolean,
+      detail: Boolean,
       options: { composed: true },
     },
   },
@@ -53,7 +53,7 @@ RootComponent()({
 RootComponent()({
   customEvents: {
     error1: {
-      detailType: String,
+      detail: String,
       options: {
         bubbles: true,
         // @ts-expect-error 非法字段  composed 少了d
@@ -69,7 +69,7 @@ RootComponent()({
 RootComponent()({
   customEvents: {
     error2: {
-      detailType: String,
+      detail: String,
       options: {
         bubbles: true,
         // @ts-expect-error 非法字段  capturePhases 多了 s
@@ -90,7 +90,7 @@ RootComponent()({
   },
   customEvents: {
     bbb: {
-      detailType: null,
+      detail: null,
       options: {
         // @ts-expect-error 非法字段
         bubbleds: false,

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

@@ -1,5 +1,5 @@
 import { Checking, type Test } from "hry-types";
-import { RootComponent, type SpecificType } from "../../../..";
+import { type DetailedType, RootComponent } from "../../../..";
 import type { CustomEventConstraint, FullCustomEvents, ShortCustomeEvents } from "../CustomEventConstraint";
 import type {
   Bubbles,
@@ -16,8 +16,8 @@ import type {
 export const mock_shortCustomEvents = {
   str: String,
   null: null,
-  unionStr: String as SpecificType<"male" | "female">,
-  union: [String, Number as SpecificType<0 | 1 | 2>, null],
+  unionStr: String as DetailedType<"male" | "female">,
+  union: [String, Number as DetailedType<0 | 1 | 2>, null],
 } satisfies Record<string, ShortCustomeEvents>;
 
 /**
@@ -25,27 +25,27 @@ export const mock_shortCustomEvents = {
  */
 export const mock_fullCustomEvents = {
   bubbles: {
-    detailType: String,
+    detail: String,
     options: { bubbles: true },
   },
   capturePhase: {
-    detailType: null,
+    detail: null,
     options: { capturePhase: true },
   },
   bubbles_capturePhase: {
-    detailType: [String, Number],
+    detail: [String, Number],
     options: { bubbles: true, capturePhase: true },
   },
   bubbles_composed: {
-    detailType: String as SpecificType<"male" | "female">,
+    detail: String as DetailedType<"male" | "female">,
     options: { bubbles: true, composed: true },
   },
   capturePhase_composed: {
-    detailType: [String, Number as SpecificType<0 | 1 | 2>, null],
+    detail: [String, Number as DetailedType<0 | 1 | 2>, null],
     options: { capturePhase: true, composed: true },
   },
   bubbles_capturePhase_composed: {
-    detailType: Boolean,
+    detail: Boolean,
     options: { bubbles: true, capturePhase: true, composed: true },
   },
 } satisfies Record<string, FullCustomEvents>;

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

@@ -46,7 +46,7 @@ type TransformCustomEventsDocTypeToFunctionTypeAndAddSuffix<T extends CustomEven
   ) => void;
 };
 
-// 所有子组件自定义事件(过滤掉非冒泡或捕获)的key加入后缀并把值(detailType)转换为函数类型
+// 所有子组件自定义事件(过滤掉非冒泡或捕获)的key加入后缀并把值(detail)转换为函数类型
 type GetAllSubCustomEventsConstraint<TReceivedComponentDoc extends ComponentDoc[] | ComponentDoc> = {} extends
   TReceivedComponentDoc ? {}
   : TReceivedComponentDoc extends ComponentDoc[] ? TransformCustomEventsDocTypeToFunctionTypeAndAddSuffix<

package/src/api/RootComponent/Instance/test/CustomEventsDoc.test.ts

@@ -1,40 +1,40 @@
 import { Checking, type Test } from "hry-types";
-import type { SpecificType } from "../../../..";
+import type { DetailedType } from "../../../..";
 import { RootComponent } from "../..";
 RootComponent()({
   customEvents: {
     str: String,
-    num: Number as SpecificType<1 | 2>,
-    union: [String as SpecificType<"male" | "femal">, Number],
+    num: Number as DetailedType<1 | 2>,
+    union: [String as DetailedType<"male" | "femal">, Number],
     null: null,
     bubbles: {
-      detailType: String,
+      detail: String,
       options: {
         bubbles: true,
       },
     },
     capturePhase: {
-      detailType: Number,
+      detail: Number,
       options: {
         capturePhase: true,
       },
     },
     bubblesComposed: {
-      detailType: Number,
+      detail: Number,
       options: {
         bubbles: true,
         composed: true,
       },
     },
     capturePhaseComposed: {
-      detailType: Number,
+      detail: Number,
       options: {
         capturePhase: true,
         composed: true,
       },
     },
     bubblesCapturePhaseComposed: {
-      detailType: null,
+      detail: null,
       options: {
         bubbles: true,
         capturePhase: true,