annil 1.7.5-beta.4 → 1.7.6

package/src/api/DefineComponent/RootComponent/RootComponentOption.ts

@@ -1,9 +1,9 @@
-import type { RootComponentDoc } from "../../RootComponent/RootComponentDoc";
+import type { RootComponentType } from "../../RootComponent/RootComponentType";
 
 /**
  * DefineComponent API`rootComponent`字段配置
  */
-export type RootComponentOption<TRootComponent extends RootComponentDoc> = {
+export type RootComponentOption<TRootComponent extends RootComponentType> = {
   /**
    * 根组件配置
    */

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

@@ -1,10 +1,10 @@
-import type { SubComponentDoc } from "../../SubComponent/SubComponentDoc";
+import type { SubComponentType } from "../../SubComponent/SubComponentType";
 
 /**
  * RootComponent API 的`subComponents`字段配置
  */
 export type SubComponentsOption<
-  TSubComponentTuple extends SubComponentDoc[],
+  TSubComponentTuple extends SubComponentType[],
 > = {
   /**
    * 子组件列表

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

@@ -1,13 +1,13 @@
 import { Checking, type Test } from "hry-types";
 import type { Bubbles, Composed } from "../../../RootComponent/CustomEvents/CustomEventsTag";
-import type { SubComponentDoc } from "../../../SubComponent/SubComponentDoc";
+import type { SubComponentType } from "../../../SubComponent/SubComponentType";
 import { DefineComponent } from "../..";
 
-const SubDocIsAny = {} as SubComponentDoc<{
+const SubDocIsAny = {} as SubComponentType<{
   a: number | Composed;
 }>;
 
-const NonEmptyRootDoc = {} as SubComponentDoc<{
+const NonEmptyRootDoc = {} as SubComponentType<{
   a: string | Bubbles | Composed;
 }>;
 

package/src/api/DefineComponent/index.ts

@@ -1,7 +1,7 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { RootComponentTrueOptions } from "../RootComponent";
-import type { RootComponentDoc } from "../RootComponent/RootComponentDoc";
-import type { SubComponentDoc } from "../SubComponent/SubComponentDoc";
+import type { RootComponentType } from "../RootComponent/RootComponentType";
+import type { SubComponentType } from "../SubComponent/SubComponentType";
 import type { NameOrPathOption } from "./NameOrPage/NameOrPathOption";
 import { normalizeOptions } from "./normalizeOptions";
 import type { CreateComponentDoc } from "./ReturnType/CreateComponentDoc";
@@ -11,8 +11,8 @@ import type { SubComponentsOption } from "./SubComponents/SubComponentsOption";
 export type Path = `/${string}`;
 
 type RootOptions<
-  TRootComponentDoc extends RootComponentDoc,
-  TSubComponentTuple extends SubComponentDoc[],
+  TRootComponentDoc extends RootComponentType,
+  TSubComponentTuple extends SubComponentType[],
   TName extends string,
   TPath extends Path,
 > =
@@ -21,8 +21,8 @@ type RootOptions<
   & SubComponentsOption<TSubComponentTuple>;
 
 type DefineComponentConstructor = <
-  TRootComponentDoc extends RootComponentDoc = {},
-  TSubComponentTuple extends SubComponentDoc[] = [],
+  TRootComponentDoc extends RootComponentType = {},
+  TSubComponentTuple extends SubComponentType[] = [],
   TName extends string = "",
   TPath extends Path = "/",
 >(
@@ -41,7 +41,7 @@ export type DefineComponentOption = {
   name?: string;
   path?: string;
   rootComponent?: RootComponentTrueOptions;
-  subComponents?: SubComponentDoc[];
+  subComponents?: SubComponentType[];
 };
 
 /**

package/src/api/DefineComponent/normalizeOptions/computedWatchHandle/computedUpdater.ts

@@ -1,9 +1,9 @@
+import { deepEqual } from "../../../../utils/deepEqual";
 import type { Instance } from "../../../RootComponent/Instance/RootComponentInstance";
 import { deepProxy, getProxyOriginalValue } from "./data-tracer";
 import { removeSubDependences } from "./dependencesOptimize";
 import { getPathsValue } from "./getPathsValue";
 
-import { isEqual } from "./isEqual";
 export type ComputedDependence = { paths: string[]; val: unknown };
 
 export function computedUpdater(this: Instance, isUpdated = false): boolean {
@@ -15,7 +15,7 @@ export function computedUpdater(this: Instance, isUpdated = false): boolean {
       const curVal = getPathsValue(this.data, dep.paths.join("."))[0];
 
       // 检查依赖是否更新
-      if (!isEqual(curVal, dep.val)) {
+      if (!deepEqual(curVal, dep.val)) {
         changed = true;
 
         break;

package/src/api/DefineComponent/normalizeOptions/computedWatchHandle/getPropertiesValue.ts

@@ -22,6 +22,7 @@ function getRequiredSingleValue(
     case Boolean:
       return false;
     default:
+      /* istanbul ignore next */
       throw Error(
         "properties字段类型只能为 String | Number | Array | Object | Boolean ",
       );

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

@@ -1,9 +1,9 @@
 import type { Func } from "hry-types/src/Misc/Func";
+import { deepEqual } from "../../../../utils/deepEqual";
 import { computedUpdater } from "./computedUpdater";
 import { getPathsValue } from "./getPathsValue";
 import { getPropertiesValue } from "./getPropertiesValue";
 import { initComputedAndGetCache } from "./initComputedAndGetCache";
-import { isEqual } from "./isEqual";
 
 import { assertNonNullable } from "../../../../utils/assertNonNullable";
 import { deepClone } from "../../../../utils/deepClone";
@@ -71,7 +71,7 @@ export function computedWatchHandle(options: FinalOptionsOfComponent) {
         const watchOldValue = assertNonNullable(this.data.__watchOldValue__);
         const oldValue = watchOldValue[key];
 
-        if (isEqual(newValue, oldValue)) return;
+        if (deepEqual(newValue, oldValue)) return;
         watchOldValue[key] = deepClone(newValue);
 
         watchHadle.call(this, ...newValue, ...oldValue);

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/DefineComponent/normalizeOptions/internalFieldProtection.ts

@@ -20,6 +20,7 @@ export function InternalFieldProtection(finalOptionsForComponent: FinalOptionsOf
   }
   for (const key of dataFieldKeys) {
     if (internalFiled.data.includes(key)) {
+      /* istanbul ignore next 同上*/
       throw Error(`data配置中的${key}字段已被内部字段占用`);
     }
   }

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

@@ -2,6 +2,8 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { Checking, type Test } from "hry-types";
 import type { ComputeIntersection } from "hry-types/src/Object/_api";
+import type { User } from "../../../../../jest/common";
+import type { DetailedType } from "../../../../types/DetailedType";
 import type { IInjectAllData } from "../../../InstanceInject/instanceConfig";
 import { RootComponent } from "../..";
 import type { Mock_User } from "../../Properties/test/normalRequired.test";
@@ -94,3 +96,21 @@ const EmptyComputedFieldDoc = RootComponent()({
 });
 
 Checking<typeof EmptyComputedFieldDoc, { methods: { M1: () => void } }, Test.Pass>;
+RootComponent()({
+  isPage: true,
+  properties: {
+    optionalObj: {
+      type: Object,
+      value: {},
+    },
+    requiredObj: Object as DetailedType<User>,
+  },
+
+  pageLifetimes: {
+    onLoad(prop) {
+      Checking<typeof prop.optionalObj, object | undefined, true>;
+      Checking<typeof prop.requiredObj, User, true>;
+      Checking<typeof this.data.optionalObj, object, true>;
+    },
+  },
+});

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/Instance/test/properties/mormal.test.ts

@@ -49,11 +49,9 @@ RootComponent()({
         };
         obj: object;
       }, Test.Pass>;
-
-      // 页面实例对象不额外添加null
+      // 页面可选对象不额外添加null
       Checking<typeof this.data.optionalObj, { name: string }, Test.Pass>;
-
-      // 页面实例对象不额外添加null
+      // 页面必传对象没有null
       Checking<typeof this.data.obj, object, Test.Pass>;
     },
   },

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

@@ -1,6 +1,8 @@
 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 { WMCompPageLifetimes, WMPageLifetimes } from "../../../types/OfficialTypeAlias";
+import type { RemoveNullOfRequired } from "../../../types/RemoveNullOfRequired";
 
 export type PageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends object> = IfExtends<
   TIsPage,
@@ -31,7 +33,8 @@ export type PageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends o
          * 页面加载时触发。一个页面只会调用一次，可以在 onLoad 的参数中获取Properties定义的数据。
          */
         onLoad?: (
-          props: PropertiesDoc,
+          // 默认PropertiesDoc
+          props: ComputeObject<RemoveNullOfRequired<PropertiesDoc>>,
         ) => void | Promise<void>;
       }
     >;

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

@@ -1,6 +1,7 @@
 import { Checking, type Test } from "hry-types";
 import { type DetailedType, RootComponent } from "../../../..";
 
+import type { User } from "../../../../../jest/common";
 import type { Mock_User } from "../../Properties/test/normalRequired.test";
 
 /**
@@ -74,3 +75,28 @@ RootComponent()({
     // ...
   },
 });
+// prop中必传对象没有null,但在实例中却需要有null
+RootComponent()({
+  isPage: true,
+  properties: {
+    optionalObj: {
+      type: Object,
+      value: {},
+    },
+    requiredObj: Object as DetailedType<User>,
+  },
+
+  pageLifetimes: {
+    onLoad(prop) {
+      void prop;
+      // 页面外部传值时没必要传null,组件时有需要的。
+      void Checking<typeof prop.requiredObj, User, true>;
+      // 虽然传值不应该是null,但由于实例建立时默认为null,所以实例类型加上null
+      void Checking<typeof this.data.requiredObj, User, true>;
+      // 页面传入的可选对象不需要null,有undefined
+      void Checking<typeof prop.optionalObj, object | undefined, true>;
+      // 实例中的可选对象不需要null,有默认值。
+      void Checking<typeof this.data.optionalObj, object, true>;
+    },
+  },
+});

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

@@ -16,20 +16,20 @@ export type GetOptionalDoc<
     IfExtends<
       false,
       TIsPage,
-      // 组件时 对象加null
+      // 组件时 对象加null 只所以加是为了异步组件传值时,方便传初始值null,这导致实例中可选对象类型包含null
       AddNullForObject<InferDetailedType<TOptionalProperties[k]["type"]>>,
-      // 页面时 对象不加
+      // 页面时 对象不加, 因为页面不存在异步传值。
       InferDetailedType<TOptionalProperties[k]["type"]>
     >,
     IfExtends<
       false,
       TIsPage,
-      // 组件时 对象加null
+      // 组件时 对象加null 同上
       AddNullForObject<
         | InferDetailedType<TOptionalProperties[k]["type"]>
         | InferDetailedType<(TOptionalProperties[k]["optionalTypes"] & {})[number]>
       >,
-      // 页面时 对象不加
+      // 页面时 对象不加 同上
       | InferDetailedType<TOptionalProperties[k]["type"]>
       | InferDetailedType<(TOptionalProperties[k]["optionalTypes"] & {})[number]>
     >

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

@@ -11,11 +11,12 @@ type _GetPropertiesDoc<
   // @ts-ignore
   OptionalDoc extends object = GetOptionalDoc<Select<TProperties, OptionalType>, TIsPage>,
   // @ts-ignore
-  RequiredDoc extends object = GetRequiredDoc<Omit<TProperties, keyof OptionalDoc>, TIsPage>,
+  RequiredDoc extends object = GetRequiredDoc<Omit<TProperties, keyof OptionalDoc>>,
 > = ComputeIntersection<OptionalDoc & RequiredDoc>;
 
 /**
  * properties字段的文档类型
+ * @remarks 必传的字段如果是object,要联合上null类型,选传的object根据是否是页面来决定是否加null
  */
 export type GetPropertiesDoc<
   TProperties extends PropertiesConstraint,

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

@@ -9,34 +9,20 @@ import type { RequiredSingle, RequiredType } from "./PropertiesConstraint";
  */
 export type GetRequiredDoc<
   TProperties extends Record<string, RequiredType>,
-  TIsPage extends boolean,
-> = {
+> // TIsPage extends boolean,
+ = {
   -readonly [k in keyof TProperties]: IfExtends<
     TProperties[k],
     // 非对象写法
     RequiredSingle,
-    IfExtends<
-      false,
-      TIsPage,
-      // 组件的对象类型加null
-      AddNullForObject<InferDetailedType<TProperties[k]>>,
-      // 页面的对象类型不加null
-      InferDetailedType<TProperties[k]>
-    >,
-    // 对象写法 RequiredUnion
-    IfExtends<
-      false,
-      TIsPage,
-      // 组件的对象类型加null
-      AddNullForObject<
-        // @ts-ignore TProperties[k] 必为 RequiredUnion
-        | InferDetailedType<TProperties[k]["type"]>
-        // @ts-ignore TProperties[k] 必为 RequiredUnion
-        | InferDetailedType<TProperties[k]["optionalTypes"][number]>
-      >,
-      // 页面的对象类型不加null
+    // 组件的对象类型加null
+    AddNullForObject<InferDetailedType<TProperties[k]>>,
+    // 组件的对象类型加null
+    AddNullForObject<
       // @ts-ignore TProperties[k] 必为 RequiredUnion
-      InferDetailedType<TProperties[k]["type"]> | InferDetailedType<TProperties[k]["optionalTypes"][number]>
+      | InferDetailedType<TProperties[k]["type"]>
+      // @ts-ignore TProperties[k] 必为 RequiredUnion
+      | InferDetailedType<TProperties[k]["optionalTypes"][number]>
     >
   >;
 };

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,8 @@ 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 { RemoveNullOfRequired } from "../../types/RemoveNullOfRequired";
+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 +89,7 @@ type RootComponentOptions<
     >
   >;
 
-type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = <
+type RootComponentConstructor<TComponentDocList extends ComponentType[]> = <
   // TEvents 不能有默认值 {} 会引起事件参数类型(e)失效
   TEvents extends EventsConstraint<TComponentDocList>,
   TIsPage extends boolean = false,
@@ -126,7 +127,12 @@ type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = <
 ) => // 返回类型 satisfies RootComponentDoc
 ComputeIntersection<
   & IfExtends<TIsPage, false, {}, { isPage: true }>
-  & IfExtends<EmptyObject, PropertiesDoc, {}, { properties: PropertiesDoc }>
+  & 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 }>
@@ -137,7 +143,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/SubComputedOption.ts

@@ -2,8 +2,10 @@ import type { G } from "hry-types";
 export type SubComputedOption<
   TComputed extends object,
   legal extends PropertyKey,
+  Instance extends object,
 > = {
   computed?:
     & TComputed
+    & ThisType<Instance>
     & G.IllegalFieldValidator<TComputed, legal, 0, "", "重复或无效的字段">;
 };

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;
@@ -75,7 +75,7 @@ SubComponent<Root, OnlyPropsCompDoc>()({
     aaa_num123(): 123 {
       return 123;
     },
-    aaa_str(): "a" {
+    aaa_str() {
       return "a";
     },
     aaa_obj() {

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;