annil 1.7.5-beta.4 → 1.7.5

package/src/api/DefineComponent/normalizeOptions/index.ts

@@ -1,8 +1,8 @@
 import type { Func } from "hry-types/src/Misc/_api";
-import { instanceConfig } from "../../..";
 import { BBeforeCreate } from "../../../behaviors/BbeforeCreated";
 import { BStore } from "../../../behaviors/BStore";
 import { isEmptyObject } from "../../../utils/isEmptyObject";
+import { instanceConfig } from "../../InstanceInject/instanceConfig";
 import type { ComputedConstraint } from "../../RootComponent/Computed/ComputedConstraint";
 import type { DataConstraint } from "../../RootComponent/Data/DataConstraint";
 import type { LifetimesConstraint } from "../../RootComponent/Lifetimes/LifetimesConstraint";

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

@@ -2,7 +2,7 @@
 import type { IfExtends } from "hry-types/src/Any/_api";
 import type { Select } from "hry-types/src/Object/_api";
 import type { Detail, WMBaseEvent } from "../../../types/OfficialTypeAlias";
-import type { ComponentDoc } from "../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../DefineComponent/ReturnType/ComponentType";
 import type { CustomEventsDoc } from "../CustomEvents/CustomEventsDoc";
 import type {
   Bubbles,
@@ -18,9 +18,9 @@ type FilterNormalFields<O extends object> = Select<O, Bubbles | Capture, "contai
 
 // 获取冒泡或捕获的事件
 type GetBubblesOrCaptureEventsFromCompDoc<
-  ComponentDocList extends ComponentDoc[],
+  ComponentDocList extends ComponentType[],
   Result extends CustomEventsDoc = {},
-> = ComponentDocList extends [infer Head extends ComponentDoc, ...infer Rest extends ComponentDoc[]]
+> = ComponentDocList extends [infer Head extends ComponentType, ...infer Rest extends ComponentType[]]
   ? GetBubblesOrCaptureEventsFromCompDoc<
     Rest,
     Result & (FilterNormalFields<Head["customEvents"] & {}>)
@@ -50,7 +50,7 @@ type TransformCustomEventsDocTypeToFunctionTypeAndAddSuffix<T extends CustomEven
 
 // 所有子组件自定义事件(过滤掉非冒泡或捕获)的key加入后缀并把值(detail)转换为函数类型
 type GetAllSubCustomEventsConstraint<
-  ComponentDocList extends ComponentDoc[],
+  ComponentDocList extends ComponentType[],
   AllCustomEvents extends CustomEventsDoc = GetBubblesOrCaptureEventsFromCompDoc<ComponentDocList>,
 > = IfExtends<
   {},
@@ -66,7 +66,7 @@ type BaseEvent = Record<string, (e: WMBaseEvent) => unknown>;
 /**
  * events字段约束 由自身事件和冒泡的子组件事件组成。带前缀是子组件事件,带后缀(_catch)表示阻止冒泡
  */
-export type EventsConstraint<ComponentDocList extends ComponentDoc[] = []> = IfExtends<
+export type EventsConstraint<ComponentDocList extends ComponentType[] = []> = IfExtends<
   [],
   ComponentDocList,
   BaseEvent,

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

@@ -11,7 +11,7 @@ import type {
   WMCustomEvent,
 } from "../../../../types/OfficialTypeAlias";
 import { assertNonNullable } from "../../../../utils/assertNonNullable";
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import { RootComponent } from "../..";
 import type { Bubbles, Capture } from "../../CustomEvents/CustomEventsTag";
 
@@ -34,13 +34,13 @@ RootComponent()({
     // 2.1 通过WMCustomEvent定义detai,mark,CurrentTargetDataset,targetDataset数据类型
     customA(
       e: WMCustomEvent<
-        { detailData: string },
+        string,
         { markData: { id: string } },
         { currentTargetDatasetData: string },
         { targetDatasetData: number }
       >,
     ) {
-      Checking<typeof e.detail.detailData, string, Test.Pass>;
+      Checking<typeof e.detail, string, Test.Pass>;
 
       const markData = assertNonNullable(e.mark).markData;
 
@@ -71,7 +71,7 @@ RootComponent()({
   },
 });
 
-type ComponentDocA = ComponentDoc<{
+type ComponentDocA = ComponentType<{
   properties: {
     aaa_str: string;
   };
@@ -81,7 +81,7 @@ type ComponentDocA = ComponentDoc<{
   };
 }>;
 
-type ComponentDocB = ComponentDoc<{
+type ComponentDocB = ComponentType<{
   customEvents: {
     bbb_str: string;
     bbb_num: number | Capture;

package/src/api/RootComponent/{RootComponentDoc.ts → RootComponentType.ts}

@@ -1,7 +1,7 @@
 import type { WMCompPageLifetimes, WMPageLifetimes } from "../../types/OfficialTypeAlias";
 import type { LifetimesConstraint } from "./Lifetimes/LifetimesConstraint";
 
-type _RootComponentDoc = {
+type _RootComponentType = {
   isPage?: boolean;
   properties?: object;
   data?: object;
@@ -24,20 +24,21 @@ type _Validator<O, Doc, ErrKeys = Exclude<keyof O, keyof Doc>> = [ErrKeys] exten
 /**
  * RootComponent Api 返回的类型
  * ```ts
- * isPage?: boolean;
- * properties?: object;
- * data?: object;
- * computed?: object;
- * customEvents?: object;
- * methods?: object;
- * events?: object;
- * store?: object;
- * watch?: Record<string, AnyFunction>;
- * lifetimes?: LifetimesConstraint;
- * pageLifetimes?: Partial<WMCompPageLifetimes & { load: AnyFunction }> | Partial<WMPageLifetimes>;
- * export?:AnyFunction
- * externalClasses?: string[];
+ * {
+ *  isPage?: boolean;
+ *  properties?: object;
+ *  data?: object;
+ *  computed?: object;
+ *  customEvents?: object;
+ *  methods?: object;
+ *  events?: object;
+ *  store?: object;
+ *  watch?: Record<string, AnyFunction>;
+ *  lifetimes?: LifetimesConstraint;
+ *  pageLifetimes?: Partial<WMCompPageLifetimes & { load:AnyFunction }> | Partial<WMPageLifetimes>;
+ *  export?:AnyFunction
+ *  externalClasses?: string[];
  * };
  * ```
  */
-export type RootComponentDoc<O extends _Validator<O, _RootComponentDoc> = _RootComponentDoc> = O;
+export type RootComponentType<O extends _Validator<O, _RootComponentType> = _RootComponentType> = O;

package/src/api/RootComponent/index.ts

@@ -4,7 +4,7 @@ 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 { WMCompOtherOption } from "../../types/OfficialTypeAlias";
-import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../DefineComponent/ReturnType/ComponentType";
 import type { IInjectAllData, IInjectStore } from "../InstanceInject/instanceConfig";
 import type { ComputedConstraint } from "./Computed/ComputedConstraint";
 import type { ComputedOption } from "./Computed/ComputedOption";
@@ -88,7 +88,7 @@ type RootComponentOptions<
     >
   >;
 
-type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = <
+type RootComponentConstructor<TComponentDocList extends ComponentType[]> = <
   // TEvents 不能有默认值 {} 会引起事件参数类型(e)失效
   TEvents extends EventsConstraint<TComponentDocList>,
   TIsPage extends boolean = false,
@@ -137,7 +137,7 @@ ComputeIntersection<
 
 export function RootComponent<
   // TComponentDocList泛型为了给events字段提供类型约束
-  TComponentDocList extends ComponentDoc[] = [],
+  TComponentDocList extends ComponentType[] = [],
 >(): RootComponentConstructor<
   TComponentDocList
 > {

package/src/api/SubComponent/{SubComponentDoc.ts → SubComponentType.ts}

@@ -1,7 +1,7 @@
 import type { SelectKeys } from "hry-types/src/Object/_api";
 import type { Composed, CustomEventsTags } from "../RootComponent/CustomEvents/CustomEventsTag";
 
-type _SubComponentDoc = {
+type _SubComponentType = {
   [k in string]:
     | string
     | number
@@ -15,7 +15,7 @@ type _SubComponentDoc = {
 };
 
 type _Validator<O, ErrKeys = Exclude<keyof O, SelectKeys<O, Composed, "contains->">>> = [ErrKeys] extends [never]
-  ? _SubComponentDoc
+  ? _SubComponentType
   : `${ErrKeys & string} 不是穿透事件`;
 
 /**
@@ -27,4 +27,4 @@ type _Validator<O, ErrKeys = Exclude<keyof O, SelectKeys<O, Composed, "contains-
  * };
  * ```
  */
-export type SubComponentDoc<O extends _Validator<O> = _SubComponentDoc> = O;
+export type SubComponentType<O extends _Validator<O> = _SubComponentType> = O;

package/src/api/SubComponent/SubComputed/test/error.test.ts

@@ -1,7 +1,7 @@
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import { SubComponent } from "../..";
 
-type OnlyCustomCompDoc = ComponentDoc<{
+type OnlyCustomCompDoc = ComponentType<{
   customEvents: { aaa_str: string };
 }>;
 
@@ -15,7 +15,7 @@ SubComponent<{}, OnlyCustomCompDoc>()({
   },
 });
 
-type OnlyPropsCompDoc = ComponentDoc<{
+type OnlyPropsCompDoc = ComponentType<{
   properties: {
     aaa_str: "a" | "b";
     aaa_num?: number;

package/src/api/SubComponent/SubComputed/test/normal.test.ts

@@ -1,12 +1,12 @@
 import { Checking, type Test } from "hry-types";
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 
 import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { IInjectAllData } from "../../../InstanceInject/instanceConfig";
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import { SubComponent } from "../..";
 
-type OnlyCustomCompDoc = ComponentDoc<{
+type OnlyCustomCompDoc = ComponentType<{
   customEvents: { aaa_str: string };
 }>;
 
@@ -31,7 +31,7 @@ interface Root {
   };
 }
 
-type $aaa = ComponentDoc<
+type $aaa = ComponentType<
   { properties: { aaa_str: string; aaa_user: User | null; aaa_num: number; aaa_age: number } }
 >;
 
@@ -40,7 +40,7 @@ SubComponent<{}, OnlyCustomCompDoc>()({
   computed: {},
 });
 
-type OnlyPropsCompDoc = ComponentDoc<{
+type OnlyPropsCompDoc = ComponentType<{
   properties: {
     aaa_str: "a" | "b";
     aaa_num?: number;

package/src/api/SubComponent/SubData/test/error.test.ts

@@ -1,9 +1,9 @@
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import { SubComponent } from "../..";
 
-type OnlyCustomCompDoc = ComponentDoc<{
+type OnlyCustomCompDoc = ComponentType<{
   customEvents: { aaa_str: string };
 }>;
 
@@ -16,7 +16,7 @@ SubComponent<{}, OnlyCustomCompDoc>()({
   },
 });
 
-type OnlyPropsCompDoc = ComponentDoc<{
+type OnlyPropsCompDoc = ComponentType<{
   properties: {
     aaa_str: "a" | "b";
     aaa_num?: number;

package/src/api/SubComponent/SubData/test/normal.test.ts

@@ -1,12 +1,12 @@
 import { Checking, type Test } from "hry-types";
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 
 import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { IInjectAllData } from "../../../InstanceInject/instanceConfig";
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import { SubComponent } from "../..";
 
-type CompDoc = ComponentDoc<{
+type CompDoc = ComponentType<{
   properties: {
     aaa_str: "a" | "b";
     aaa_num?: number;

package/src/api/SubComponent/SubEvents/SubEventsConstraint.ts

@@ -1,14 +1,14 @@
 import type { Contains } from "hry-types/src/Any/Contains";
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { Detail, WMBaseEvent } from "../../../types/OfficialTypeAlias";
-import type { ComponentDoc } from "../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../DefineComponent/ReturnType/ComponentType";
 import type { Bubbles, Capture, CustomEventsTags } from "../../RootComponent/CustomEvents/CustomEventsTag";
 
 /**
  * 把组件事件类型转为函数类型,冒泡事件捕获事件会多一个加后缀(_catch)的key,表示阻止事件冒泡和捕获。
  */
 export type SubEventsConstraint<
-  CompDoc extends ComponentDoc,
+  CompDoc extends ComponentType,
 > = {
   [
     k in keyof CompDoc["customEvents"] as Contains<CompDoc["customEvents"][k], Bubbles | Capture> extends true

package/src/api/SubComponent/SubEvents/test/error.test.ts

@@ -1,8 +1,8 @@
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import type { Bubbles } from "../../../RootComponent/CustomEvents/CustomEventsTag";
 import { SubComponent } from "../..";
 
-type CompDoc = ComponentDoc<{
+type CompDoc = ComponentType<{
   properties: {
     aaa_str: string;
   };
@@ -16,7 +16,7 @@ SubComponent<{}, CompDoc>()({
   },
 });
 
-type CompDoc1 = ComponentDoc<{
+type CompDoc1 = ComponentType<{
   customEvents: {
     aaa_str: string | Bubbles;
   };

package/src/api/SubComponent/SubEvents/test/normal.test.ts

@@ -4,7 +4,7 @@ import { Checking, type Test } from "hry-types";
 import type { Wm } from "../../../../thirdLib";
 
 import type { Detail, Mark, WMBaseEvent } from "../../../..";
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import type {
   Bubbles,
   BubblesCapture,
@@ -16,7 +16,7 @@ import type {
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import { SubComponent } from "../..";
 
-type CompDoc = ComponentDoc<{
+type CompDoc = ComponentType<{
   customEvents: {
     aaa_str: string;
     aaa_bubbles: string | Bubbles;

package/src/api/SubComponent/SubInherit/SubInheritConstraint.ts

@@ -1,6 +1,6 @@
 import type { SelectKeys } from "hry-types/src/Object/_api";
 import type { RemoveInnerData } from "../../../types/RemoveInnerData";
-import type { ComponentDoc } from "../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../DefineComponent/ReturnType/ComponentType";
 
 type WXMLSign = "wxml";
 
@@ -10,7 +10,7 @@ type unionAddList<Keys extends string> = Keys | Keys[];
  * 子组件inherit字段约束,key为构建组件所需的properties字段,类型为根组件数据的key或key[]或`WXMLSign`。要求根数据类型为子数据类型的子类型。当key的值来自wxml(循环产生的子数据等情况)时用`WXMLSign`表示。
  * @returns object
  */
-export type InheritConstraint<AllRootData extends object, TComponentDoc extends ComponentDoc> = {
+export type InheritConstraint<AllRootData extends object, TComponentDoc extends ComponentType> = {
   [k in keyof TComponentDoc["properties"]]?:
     | unionAddList<RemoveInnerData<SelectKeys<AllRootData, TComponentDoc["properties"][k]> & string>>
     | WXMLSign;

package/src/api/SubComponent/SubInherit/test/error.test.ts

@@ -1,11 +1,11 @@
 import { Checking, type Test } from "hry-types";
 import { DefineComponent } from "../../../DefineComponent";
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
-import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
+import type { RootComponentType } from "../../../RootComponent/RootComponentType";
 import { SubComponent } from "../..";
-import type { SubComponentDoc } from "../../SubComponentDoc";
+import type { SubComponentType } from "../../SubComponentType";
 
-type Mock_RootDoc = RootComponentDoc<{
+type Mock_RootDoc = RootComponentType<{
   properties: {
     required_num: number;
     optional_literal_num?: 123 | 456 | 789;
@@ -25,7 +25,7 @@ type Mock_RootDoc = RootComponentDoc<{
   };
 }>;
 
-type Mock_CompDoc = ComponentDoc<{
+type Mock_CompDoc = ComponentType<{
   properties: {
     aaa_num: number;
     aaa_literal_num: 123 | 456;
@@ -55,7 +55,7 @@ const subDoc = SubComponent<Mock_RootDoc, Mock_CompDoc>()({
   },
 });
 
-void Checking<typeof subDoc, SubComponentDoc, Test.Fail>;
+void Checking<typeof subDoc, SubComponentType, Test.Fail>;
 
 DefineComponent({
   name: "xxx",

package/src/api/SubComponent/SubInherit/test/normal.test.ts

@@ -1,11 +1,11 @@
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
-import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
+import type { RootComponentType } from "../../../RootComponent/RootComponentType";
 import { SubComponent } from "../..";
 
 /**
  * inherit字段最终会在选项中删除,它用ts开发类型检测。
  */
-type Mock_RootDoc = RootComponentDoc<{
+type Mock_RootDoc = RootComponentType<{
   properties: {
     required_num: number;
     optional_literal_num?: 123 | 456 | 789;
@@ -23,7 +23,7 @@ type Mock_RootDoc = RootComponentDoc<{
   };
 }>;
 
-type Mock_CompDoc = ComponentDoc<{
+type Mock_CompDoc = ComponentType<{
   properties: {
     aaa_num: number;
     aaa_literal_num: 123 | 456;

package/src/api/SubComponent/SubInstance/test/error.test.ts

@@ -1,8 +1,8 @@
 import type { View } from "../../../../thirdLib/wm";
-import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
+import type { RootComponentType } from "../../../RootComponent/RootComponentType";
 import { SubComponent } from "../..";
 
-type RootDoc = RootComponentDoc<{
+type RootDoc = RootComponentType<{
   events: {
     RootE1: () => string;
   };

package/src/api/SubComponent/SubInstance/test/normal.test.ts

@@ -1,13 +1,13 @@
 import { Checking, type Test } from "hry-types";
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 
 import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { IInjectAllData } from "../../../InstanceInject/instanceConfig";
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
-import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
+import type { RootComponentType } from "../../../RootComponent/RootComponentType";
 import { SubComponent } from "../..";
 
-type RootDoc = RootComponentDoc<{
+type RootDoc = RootComponentType<{
   properties: {
     Pstr: string;
     Pobj: Mock_User | null;
@@ -30,7 +30,7 @@ type RootDoc = RootComponentDoc<{
   };
 }>;
 
-type CompDoc = ComponentDoc<{
+type CompDoc = ComponentType<{
   properties: {
     aaa_str: string;
   };

package/src/api/SubComponent/SubMethods/test/error.test.ts

@@ -1,9 +1,9 @@
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import type { Bubbles } from "../../../RootComponent/CustomEvents/CustomEventsTag";
-import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
+import type { RootComponentType } from "../../../RootComponent/RootComponentType";
 import { SubComponent } from "../..";
 
-type RootDoc = RootComponentDoc<{
+type RootDoc = RootComponentType<{
   methods: {
     Mstr: () => string;
   };
@@ -15,7 +15,7 @@ type RootDoc = RootComponentDoc<{
   };
 }>;
 
-type CompDoc = ComponentDoc<{
+type CompDoc = ComponentType<{
   customEvents: {
     aaa_str: string | Bubbles;
   };

package/src/api/SubComponent/SubMethods/test/normarl.test.ts

@@ -1,14 +1,14 @@
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
-import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
+import type { RootComponentType } from "../../../RootComponent/RootComponentType";
 import { SubComponent } from "../..";
 
-type RootDoc = RootComponentDoc<{
+type RootDoc = RootComponentType<{
   methods: {
     Mstr: () => string;
   };
 }>;
 
-type CompDoc = ComponentDoc<{
+type CompDoc = ComponentType<{
   customEvents: {
     aaa_str: string;
   };

package/src/api/SubComponent/SubReturnType/test/error.test.ts

@@ -1,8 +1,8 @@
 import { Checking, type Test } from "hry-types";
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import { SubComponent } from "../..";
 
-type CompDoc = ComponentDoc<{
+type CompDoc = ComponentType<{
   properties: {
     aaa_str: string;
     aaa_bool: boolean;

package/src/api/SubComponent/SubReturnType/test/normal.test.ts

@@ -1,5 +1,5 @@
 import { Checking, type Test } from "hry-types";
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import type {
   Bubbles,
   BubblesCaptureComposed,
@@ -9,7 +9,7 @@ import type {
 } from "../../../RootComponent/CustomEvents/CustomEventsTag";
 import { SubComponent } from "../..";
 
-type CompDoc = ComponentDoc<{
+type CompDoc = ComponentType<{
   properties: {
     aaa_str: string;
   };

package/src/api/SubComponent/SubStore/test/error.test.ts

@@ -1,13 +1,13 @@
 import { observable } from "mobx";
 
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import { SubComponent } from "../..";
 const user = observable({
   name: "zhao",
   age: 20,
 });
 
-type DocA = ComponentDoc<{
+type DocA = ComponentType<{
   properties: {
     aaa_str: string;
     aaa_num: number;

package/src/api/SubComponent/SubStore/test/normal.test.ts

@@ -1,13 +1,13 @@
 import { observable } from "mobx";
 
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import { SubComponent } from "../..";
 const user = observable({
   name: "zhao",
   age: 20,
 });
 
-type DocA = ComponentDoc<{
+type DocA = ComponentType<{
   properties: {
     aaa_str: string;
     aaa_num: number;

package/src/api/SubComponent/SubWatch/test/WatchComputed.test.ts

@@ -1,10 +1,10 @@
 import { Checking, type Test } from "hry-types";
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
-import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
+import type { RootComponentType } from "../../../RootComponent/RootComponentType";
 import { SubComponent } from "../..";
 
-type RootDoc = RootComponentDoc<{
+type RootDoc = RootComponentType<{
   properties: {
     obj: Mock_User | null;
   };
@@ -16,7 +16,7 @@ type RootDoc = RootComponentDoc<{
   };
 }>;
 
-type CompDoc = ComponentDoc<{
+type CompDoc = ComponentType<{
   properties: {
     aaa_obj: Mock_User | null;
     aaa_str: string;

package/src/api/SubComponent/SubWatch/test/WatchRootData.test.ts

@@ -1,6 +1,6 @@
 import { Checking, type Test } from "hry-types";
 
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import { SubComponent } from "../..";
@@ -9,7 +9,7 @@ interface TestObj {
   subObj: Mock_User;
 }
 
-type CompDoc = ComponentDoc<{
+type CompDoc = ComponentType<{
   properties: {
     aaa_str: string;
     aaa_num: number;

package/src/api/SubComponent/SubWatch/test/WatchSubData.test.ts

@@ -1,8 +1,8 @@
 import { Checking, type Test } from "hry-types";
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import { SubComponent } from "../..";
 
-type CompDoc = ComponentDoc<{
+type CompDoc = ComponentType<{
   properties: {
     aaa_str: string;
     aaa_num: number;