annil 1.6.0 → 1.6.2

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

@@ -1,5 +1,4 @@
 import { Checking, type Test } from "hry-types";
-import type { ReadonlyDeep } from "hry-types/src/Any/ReadonlyDeep";
 import { type DetailedType, RootComponent } from "../../../..";
 import type { Mock_User } from "../../Properties/test/normalRequired.test";
 import type { CustomEventConstraint, FullCustomEvents, ShortCustomeEvents } from "../CustomEventConstraint";
@@ -71,7 +70,7 @@ type RootDoc = {
     nothing: undefined;
     unionStr: "male" | "female";
     union: string | 0 | 1 | 2 | null;
-    obj: ReadonlyDeep<Mock_User>;
+    obj: Mock_User;
     // 带options字段 通过联合类型加入。
     bubbles: string | Bubbles;
     capturePhase: null | Capture;
@@ -96,22 +95,3 @@ const rootDocNoFields = RootComponent()({});
 
 // 3. 无customEvents字段时,Doc中无customEvents字段
 Checking<typeof rootDocNoFields, {}, Test.Pass>;
-
-// 4 实例中的对象数组都是readOnlyDeep类型,可以传递给自定义做参数
-RootComponent()({
-  properties: {
-    obj: Object as DetailedType<Mock_User>,
-  },
-  data: {
-    obj1: {} as Mock_User,
-    _ddd: {} as Mock_User,
-  },
-  customEvents: mock_customEvents,
-  events: {
-    ddd() {
-      this.obj(this.data.obj!);
-
-      this.obj(this.data.obj1);
-    },
-  },
-});

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

@@ -1,45 +1,14 @@
 import { Checking, type Test } from "hry-types";
-
-import type { ReadonlyDeep } from "hry-types/src/Any/_api";
-import type { IInjectData } from "../../../InstanceInject/instanceConfig";
+import type { IInjectAllData } from "../../../InstanceInject/instanceConfig";
 import { RootComponent } from "../..";
 
-type Gender = "male" | "female";
-
-const RootDoc = RootComponent()({
-  data: {
-    gender: "male" as Gender, // 联合字面量
-    num: 123,
-    _innernalFields: 123, // 内部字段无法在wxml中使用
-  },
-  methods: {
-    foo() {
-      this.cloneData.num = 123;
-
-      Checking<
-        typeof this.data,
-        ReadonlyDeep<{ gender: Gender; num: number; _innernalFields: number } & IInjectData>,
-        Test.Pass
-      >;
-    },
-  },
-});
-
-type RootDocExpected = {
-  gender: Gender;
-  num: number;
-  _innernalFields: number;
-};
-
-Checking<typeof RootDoc["data"], RootDocExpected, Test.Pass>;
-
 // data为空对象时
 const EmptyDataRootDoc = RootComponent()({
   data: {},
   methods: {
     M1() {
-      // 3.1 data为空对象时 this.data为{}类型
-      Checking<typeof this.data, ReadonlyDeep<IInjectData>, Test.Pass>;
+      // 3.1 data为空对象时 this.data为注入数据类型
+      Checking<typeof this.data, IInjectAllData, Test.Pass>;
     },
   },
 });
@@ -53,8 +22,8 @@ Checking<typeof EmptyDataRootDoc, { methods: { M1: () => void } }, Test.Pass>;
 const noDataRootDoc = RootComponent()({
   methods: {
     M1() {
-      // 4.1 data为空对象时 this.data为{}类型
-      Checking<typeof this.data, ReadonlyDeep<IInjectData>, Test.Pass>;
+      // 4.1 data为空对象时 this.data为注入数据类型
+      Checking<typeof this.data, IInjectAllData, Test.Pass>;
     },
   },
 });

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

@@ -1,4 +1,3 @@
-import type { ReadonlyDeep } from "hry-types/src/Any/_api";
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { IReactionDisposer } from "mobx";
@@ -6,7 +5,7 @@ import type { IReactionDisposer } from "mobx";
 import type { Assign } from "../../../types/Assign";
 import type { ComputeObject } from "../../../types/ComputeObj";
 import type { WMComponentInstance, WMInstanceMethods, WMPageInstance } from "../../../types/OfficialTypeAlias";
-import type { IInjectData, IInjectMethods } from "../../InstanceInject/instanceConfig";
+import type { IInjectAllData, IInjectMethods } from "../../InstanceInject/instanceConfig";
 import type { CustomEventMethods } from "./CustomEventMethods";
 import type { CustomSetData } from "./CustomSetData";
 export type RootComponentInstance<
@@ -16,7 +15,7 @@ export type RootComponentInstance<
   AllData extends object,
   CustomEventsDoc extends object,
   StoreDoc extends object,
-  instanceData = ComputeObject<Assign<IInjectData, ComputeIntersection<AllData>>>,
+  instanceData = ComputeObject<Assign<IInjectAllData, ComputeIntersection<AllData>>>,
 > =
   // 官方实例属性is  options  dataset等
   & IfExtends<false, TIsPage, WMComponentInstance, WMPageInstance>
@@ -28,8 +27,8 @@ export type RootComponentInstance<
     disposer: { [k in keyof StoreDoc]: IReactionDisposer };
   }>
   & Assign<IInjectMethods, TMethods & CustomEventMethods<CustomEventsDoc>>
-  & { data: ReadonlyDeep<instanceData> }
-  & { cloneData: ComputeObject<Assign<IInjectData, ComputeIntersection<AllData>>> };
+  & { data: instanceData };
+// & { cloneData: ComputeObject<Assign<IInjectData, ComputeIntersection<AllData>>> };
 
 export type ComponentInstance = RootComponentInstance<false, {}, {}, {}, {}, {}>;
 

package/src/api/RootComponent/Instance/test/properties/mormal.test.ts

@@ -1,7 +1,7 @@
 import { Checking, type Test } from "hry-types";
-import type { ReadonlyDeep } from "hry-types/src/Any/ReadonlyDeep";
+import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import { type DetailedType, RootComponent } from "../../../../..";
-import type { IInjectData } from "../../../../InstanceInject/instanceConfig";
+import type { IInjectAllData } from "../../../../InstanceInject/instanceConfig";
 
 // 组件时
 RootComponent()({
@@ -17,7 +17,12 @@ RootComponent()({
       // 组件实例对象格外添加null类型
       Checking<
         typeof this.data,
-        ReadonlyDeep<{ optionalObj: { name: string } | null; obj: object | null } & IInjectData>,
+        ComputeIntersection<
+          {
+            optionalObj: { name: string } | null;
+            obj: object | null;
+          } & IInjectAllData
+        >,
         Test.Pass
       >;
     },
@@ -44,7 +49,7 @@ RootComponent()({
       }, Test.Pass>;
 
       // 页面实例对象不额外添加null
-      Checking<typeof this.data.optionalObj, ReadonlyDeep<{ name: string }>, Test.Pass>;
+      Checking<typeof this.data.optionalObj, { name: string }, Test.Pass>;
 
       // 页面实例对象不额外添加null
       Checking<typeof this.data.obj, object, Test.Pass>;

package/src/api/RootComponent/Observers/ObserversOption.ts

@@ -1,4 +1,3 @@
-import type { ReadonlyDeep } from "hry-types/src/Any/_api";
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { IsPureObject } from "hry-types/src/Any/IsPureObject";
 import type { NoInfer } from "hry-types/src/Generic/NoInfer";
@@ -20,15 +19,13 @@ type AddFieldsOfObject<
 > = {
   [k in secondKeys]?: (
     // @ts-ignore
-    newValue: ReadonlyDeep<
-      IfExtends<
-        getLastKeys<k>,
-        "**",
-        // @ts-ignore
-        TWatchData[getFirstKeys<k>],
-        // @ts-ignore
-        NonNullable<(Exclude<TWatchData[getFirstKeys<k>], null>)[getLastKeys<k>]>
-      >
+    newValue: IfExtends<
+      getLastKeys<k>,
+      "**",
+      // @ts-ignore
+      TWatchData[getFirstKeys<k>],
+      // @ts-ignore
+      NonNullable<(Exclude<TWatchData[getFirstKeys<k>], null>)[getLastKeys<k>]>
     >,
   ) => void;
 };
@@ -46,7 +43,7 @@ export type ObserversOption<TWatchData extends object, _WatchKeys extends keyof
     NoInfer<
       & {
         [k in _WatchKeys | "**"]?: (
-          newValue: k extends keyof TWatchData ? ReadonlyDeep<TWatchData[k]> : unknown,
+          newValue: k extends keyof TWatchData ? TWatchData[k] : unknown,
         ) => void;
       }
       // 解决单独书写计算书写字段的报错(或许是:ts字面量约束检测提前计算属性key引起的错误提示)

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

@@ -1,5 +1,4 @@
 import { Checking, type Test } from "hry-types";
-import type { ReadonlyDeep } from "hry-types/src/Any/_api";
 
 import type { User } from "../../../../../jest/common";
 import { RootComponent } from "../..";
@@ -10,10 +9,10 @@ RootComponent()({
   },
   observers: {
     obj(a) {
-      Checking<typeof a, ReadonlyDeep<User> | null, Test.Pass>;
+      Checking<typeof a, User | null, Test.Pass>;
     },
     "obj.**"(a) {
-      Checking<typeof a, ReadonlyDeep<User> | null, Test.Pass>;
+      Checking<typeof a, User | null, Test.Pass>;
     },
     "obj.age"(a) {
       Checking<typeof a, number, Test.Pass>;

package/src/api/RootComponent/Properties/test/normalEmpty.test.ts

@@ -1,6 +1,5 @@
 import { Checking, type Test } from "hry-types";
-import type { ReadonlyDeep } from "hry-types/src/Any/_api";
-import type { IInjectData } from "../../../InstanceInject/instanceConfig";
+import type { IInjectAllData } from "../../../InstanceInject/instanceConfig";
 import { RootComponent } from "../..";
 
 /**
@@ -10,8 +9,8 @@ const emptyObj = RootComponent()({
   properties: {},
   methods: {
     foo() {
-      // 1 this.data 为空对象类型
-      Checking<typeof this.data, ReadonlyDeep<IInjectData>, Test.Pass>;
+      // 1 this.data 为注入数据类型
+      Checking<typeof this.data, IInjectAllData, Test.Pass>;
     },
   },
 });
@@ -29,8 +28,8 @@ Checking<typeof emptyObj, {
 const noProperties = RootComponent()({
   methods: {
     foo() {
-      // 3 this.data 为空对象类型
-      Checking<typeof this.data, ReadonlyDeep<IInjectData>, Test.Pass>;
+      // 3 this.data 为注入数据类型
+      Checking<typeof this.data, IInjectAllData, Test.Pass>;
     },
   },
 });

package/src/api/RootComponent/Properties/test/normalOptional.test.ts

@@ -1,7 +1,7 @@
 import { Checking, type Test } from "hry-types";
-import type { ReadonlyDeep } from "hry-types/src/Any/_api";
+import type { ComputeIntersection } from "hry-types/src/Object/_api";
 import type { DetailedType } from "../../../../types/DetailedType";
-import type { IInjectData } from "../../../InstanceInject/instanceConfig";
+import type { IInjectAllData } from "../../../InstanceInject/instanceConfig";
 import { RootComponent } from "../..";
 import { type Mock_User } from "./normalRequired.test";
 
@@ -48,7 +48,7 @@ const OptionalDoc = RootComponent()({
       // 1. 内部this.data中的类型(去除可选)
       Checking<
         typeof this.data,
-        ReadonlyDeep<
+        ComputeIntersection<
           {
             optional_num: number;
             optional_gender: "male" | "female";
@@ -57,7 +57,7 @@ const OptionalDoc = RootComponent()({
             optional_objOrNull: Mock_User | null;
             optional_union: string | number;
             optional_arr: string[];
-          } & IInjectData
+          } & IInjectAllData
         >,
         Test.Pass
       >;

package/src/api/RootComponent/Properties/test/normalRequired.test.ts

@@ -1,8 +1,7 @@
 import { Checking, type Test } from "hry-types";
+import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { DetailedType } from "../../../../types/DetailedType";
-
-import type { ReadonlyDeep } from "hry-types/src/Any/_api";
-import type { IInjectData } from "../../../InstanceInject/instanceConfig";
+import type { IInjectAllData } from "../../../InstanceInject/instanceConfig";
 import { RootComponent } from "../..";
 import type { RequiredSingle, RequiredType, RequiredUnion } from "../PropertiesConstraint";
 
@@ -92,10 +91,11 @@ const RequiredDoc = RootComponent()({
   methods: {
     foo() {
       // 1 this.data中的类型(对象类型加null)
-      Checking<typeof this.data, ReadonlyDeep<RequiredTypeExpected & IInjectData>, Test.Pass>;
+      Checking<typeof this.data, ComputeIntersection<RequiredTypeExpected & IInjectAllData>, Test.Pass>;
     },
   },
 });
+
 /**
  * 2 properties配置为必传类型时预期文档类型(与this.data一致)
  */

package/src/api/RootComponent/Watch/WatchOption.ts

@@ -1,4 +1,3 @@
-import type { ReadonlyDeep } from "hry-types/src/Any/_api";
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { IsPureObject } from "hry-types/src/Any/IsPureObject";
 import type { NoInfer } from "hry-types/src/Generic/NoInfer";
@@ -20,27 +19,22 @@ type AddFieldsOfObject<
 > = {
   [k in secondKeys]?: (
     // @ts-ignore
-    newValue: ReadonlyDeep<
-      IfExtends<
-        getLastKeys<k>,
-        "**",
-        // @ts-ignore
-        Exclude<TWatchData[getFirstKeys<k>], null>,
-        // @ts-ignore
-        NonNullable<(Exclude<TWatchData[getFirstKeys<k>], null>)[getLastKeys<k>]>
-      >
+    newValue: IfExtends<
+      getLastKeys<k>,
+      "**",
+      // @ts-ignore
+      Exclude<TWatchData[getFirstKeys<k>], null>,
+      // @ts-ignore
+      NonNullable<(Exclude<TWatchData[getFirstKeys<k>], null>)[getLastKeys<k>]>
     >,
-    oldValue: ReadonlyDeep<
-      IfExtends<
-        getLastKeys<k>,
-        "**",
-        // @ts-ignore
-        TWatchData[getFirstKeys<k>],
-        // @ts-ignore
-        (Exclude<TWatchData[getFirstKeys<k>], null>)[getLastKeys<k>]
-      >
+    oldValue: IfExtends<
+      getLastKeys<k>,
+      "**",
+      // @ts-ignore
+      TWatchData[getFirstKeys<k>],
+      // @ts-ignore
+      (Exclude<TWatchData[getFirstKeys<k>], null>)[getLastKeys<k>]
     >,
-    // ReadonlyDeep<(Exclude<TWatchData[getFirstKeys<k>], null>)[getLastKeys<k>]>,
   ) => void;
 };
 
@@ -57,9 +51,9 @@ export type WatchOption<TWatchData extends object, _WatchKeys extends keyof TWat
     NoInfer<
       & {
         [k in _WatchKeys]?: (
-          // newValue 去除null 深度只读
-          newValue: ReadonlyDeep<Exclude<TWatchData[k], null>>,
-          oldValue: ReadonlyDeep<TWatchData[k]>,
+          // newValue 去除null
+          newValue: Exclude<TWatchData[k], null>,
+          oldValue: TWatchData[k],
         ) => void;
       }
       // 解决单独书写计算书写字段的报错(猜测是:ts字面量约束检测提前计算属性key引起的错误提示)

package/src/api/RootComponent/Watch/test/WatchComputed.test.ts

@@ -1,5 +1,5 @@
 import { Checking, type Test } from "hry-types";
-import type { ReadonlyDeep } from "hry-types/src/Any/_api";
+
 import type { DetailedType } from "../../../../types/DetailedType";
 import { RootComponent } from "../..";
 import type { Mock_User } from "../../Properties/test/normalRequired.test";
@@ -29,10 +29,10 @@ RootComponent()({
 
       Checking<number, typeof oldValue, Test.Pass>;
     },
-    Cobj(newValue: ReadonlyDeep<Mock_User>, oldValue: ReadonlyDeep<Mock_User> | null) {
-      Checking<ReadonlyDeep<Mock_User>, typeof newValue, Test.Pass>;
+    Cobj(newValue: Mock_User, oldValue: Mock_User | null) {
+      Checking<Mock_User, typeof newValue, Test.Pass>;
 
-      Checking<ReadonlyDeep<Mock_User> | null, typeof oldValue, Test.Pass>;
+      Checking<Mock_User | null, typeof oldValue, Test.Pass>;
     },
   },
 });

package/src/api/RootComponent/Watch/test/WatchData.test.ts

@@ -1,6 +1,5 @@
 import { Checking, type Test } from "hry-types";
 
-import type { ReadonlyDeep } from "hry-types/src/Any/_api";
 import { observable } from "mobx";
 import { RootComponent } from "../..";
 import type { Mock_User } from "../../Properties/test/normalRequired.test";
@@ -29,9 +28,9 @@ RootComponent()({
       Checking<number, typeof oldValue, Test.Pass>;
     },
     obj(newValue, oldValue) {
-      Checking<ReadonlyDeep<Mock_User>, typeof newValue, Test.Pass>;
+      Checking<Mock_User, typeof newValue, Test.Pass>;
 
-      Checking<ReadonlyDeep<Mock_User>, typeof oldValue, Test.Pass>;
+      Checking<Mock_User, typeof oldValue, Test.Pass>;
     },
     reactiveNumber(newValue: number, oldValue) {
       Checking<number, typeof newValue, Test.Pass>;
@@ -44,9 +43,9 @@ RootComponent()({
       Checking<"male" | "female", typeof oldValue, Test.Pass>;
     },
     reactiveUser(newValue, oldValue) {
-      Checking<ReadonlyDeep<Mock_User>, typeof newValue, Test.Pass>;
+      Checking<Mock_User, typeof newValue, Test.Pass>;
 
-      Checking<ReadonlyDeep<Mock_User>, typeof oldValue, Test.Pass>;
+      Checking<Mock_User, typeof oldValue, Test.Pass>;
     },
   },
 });

package/src/api/RootComponent/Watch/test/WatchProperties.test.ts

@@ -1,5 +1,5 @@
 import { Checking, type Test } from "hry-types";
-import type { ReadonlyDeep } from "hry-types/src/Any/_api";
+
 import type { DetailedType } from "../../../..";
 import { RootComponent } from "../..";
 import type { OptionalType } from "../../Properties/PropertiesConstraint";
@@ -58,26 +58,16 @@ RootComponent()({
 
       Checking<boolean, typeof oldValue, Test.Pass>;
     },
-    arr(newValue, oldValue) {
-      newValue; // readonly ReadonlyDeep<unknown>[]
-
-      oldValue; // readonly ReadonlyDeep<unknown>[]
 
-      // ts中很多不是错误的错误,写 typeof newValue 结果是错误
-      Checking<unknown[], typeof newValue, Test.Fail>;
-
-      // ts中很多不是错误的错误,写 readonly ReadonlyDeep<unknown>[] 结果是正确的
-      Checking<readonly unknown[], readonly ReadonlyDeep<unknown>[], Test.Pass>;
-    },
     obj(newValue, oldValue) {
       Checking<object, typeof newValue, Test.Pass>;
 
       Checking<object | null, typeof oldValue, Test.Pass>;
     },
     tuple(newValue, oldValue) {
-      Checking<readonly [string, number, boolean], typeof newValue, Test.Pass>;
+      Checking<[string, number, boolean], typeof newValue, Test.Pass>;
 
-      Checking<readonly [string, number, boolean], typeof oldValue, Test.Pass>;
+      Checking<[string, number, boolean], typeof oldValue, Test.Pass>;
     },
     union_str(newValue, oldValue) {
       Checking<"male" | "female", typeof newValue, Test.Pass>;
@@ -95,14 +85,14 @@ RootComponent()({
       Checking<false | true, typeof oldValue, Test.Pass>;
     },
     union_arr(newValue, oldValue) {
-      Checking<readonly number[] | readonly string[], typeof newValue, Test.Pass>;
+      Checking<number[] | string[], typeof newValue, Test.Pass>;
 
-      Checking<readonly number[] | readonly string[], typeof oldValue, Test.Pass>;
+      Checking<number[] | string[], typeof oldValue, Test.Pass>;
     },
     union_obj(newValue, oldValue) {
-      Checking<ReadonlyDeep<Mock_User | Mock_Cart>, typeof newValue, Test.Pass>;
+      Checking<Mock_User | Mock_Cart, typeof newValue, Test.Pass>;
 
-      Checking<ReadonlyDeep<Mock_User | Mock_Cart | null>, typeof oldValue, Test.Pass>;
+      Checking<Mock_User | Mock_Cart | null, typeof oldValue, Test.Pass>;
     },
     // 必传多类型联合
     union_str_num_bool(newValue, oldValue) {
@@ -116,9 +106,9 @@ RootComponent()({
       Checking<0 | 1 | 2 | "male" | "female", typeof oldValue, Test.Pass>;
     },
     union_mockUser_num(newValue, oldValue) {
-      Checking<ReadonlyDeep<number | Mock_User>, typeof newValue, Test.Pass>;
+      Checking<number | Mock_User, typeof newValue, Test.Pass>;
 
-      Checking<ReadonlyDeep<number | Mock_User | null>, typeof oldValue, Test.Pass>;
+      Checking<number | Mock_User | null, typeof oldValue, Test.Pass>;
     },
     // 可选字段
     optional_gender(newValue, oldValue) {
@@ -132,9 +122,9 @@ RootComponent()({
       Checking<number, typeof oldValue, Test.Pass>;
     },
     optional_obj(newValue, oldValue) {
-      Checking<ReadonlyDeep<Mock_User>, typeof newValue, Test.Pass>;
+      Checking<Mock_User, typeof newValue, Test.Pass>;
 
-      Checking<ReadonlyDeep<Mock_User | null>, typeof oldValue, Test.Pass>;
+      Checking<Mock_User | null, typeof oldValue, Test.Pass>;
     },
     // 对象的二段key
     "optional_obj.age"(newValue, oldValue) {
@@ -143,9 +133,9 @@ RootComponent()({
       Checking<number | undefined, typeof oldValue, Test.Pass>;
     },
     "optional_obj.**"(newValue, oldValue) {
-      Checking<ReadonlyDeep<Mock_User>, typeof newValue, Test.Pass>;
+      Checking<Mock_User, typeof newValue, Test.Pass>;
 
-      Checking<ReadonlyDeep<Mock_User | null>, typeof oldValue, Test.Pass>;
+      Checking<Mock_User | null, typeof oldValue, Test.Pass>;
     },
     "optional_obj.id"(newValue, oldValue) {
       Checking<string, typeof newValue, Test.Pass>;

package/src/api/RootComponent/index.ts

@@ -5,7 +5,7 @@ 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 { IInjectData, IInjectStore } from "../InstanceInject/instanceConfig";
+import type { IInjectAllData, IInjectStore } from "../InstanceInject/instanceConfig";
 import type { ComputedConstraint } from "./Computed/ComputedConstraint";
 import type { ComputedOption } from "./Computed/ComputedOption";
 import type { GetComputedDoc } from "./Computed/GetComputedDoc";
@@ -58,7 +58,7 @@ type RootComponentOptions<
   & ComputedOption<
     TComputed,
     keyof (PropertiesDoc & DataDoc & StoreDoc),
-    { data: ComputeObject<DataDoc & Required<PropertiesDoc> & StoreDoc & ComputedDoc & IInjectData> }
+    { data: ComputeObject<DataDoc & Required<PropertiesDoc> & StoreDoc & ComputedDoc & IInjectAllData> }
   >
   & PageLifetimesOption<TIsPage, PropertiesDoc>
   & LifetimesOption

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

@@ -1,8 +1,8 @@
 import { Checking, type Test } from "hry-types";
-import type { ReadonlyDeep } from "hry-types/src/Any/_api";
 import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
 
-import type { IInjectData } from "../../../InstanceInject/instanceConfig";
+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 "../..";
 
@@ -81,7 +81,7 @@ SubComponent<Root, OnlyPropsCompDoc>()({
       // 5 this.data
       Checking<
         typeof this.data,
-        ReadonlyDeep<
+        ComputeIntersection<
           {
             num: number;
             user: User | null;
@@ -92,7 +92,7 @@ SubComponent<Root, OnlyPropsCompDoc>()({
             aaa_num123: 123;
             aaa_str: "a" | "b";
             aaa_obj: Mock_User | null;
-          } & IInjectData
+          } & IInjectAllData
         >,
         Test.Pass
       >;
@@ -105,7 +105,7 @@ SubComponent<Root, OnlyPropsCompDoc>()({
       // 5 this.data 深度只读
       Checking<
         typeof this.data,
-        ReadonlyDeep<
+        ComputeIntersection<
           {
             num: number;
             user: User | null;
@@ -116,7 +116,7 @@ SubComponent<Root, OnlyPropsCompDoc>()({
             aaa_num123: 123;
             aaa_str: "a" | "b";
             aaa_obj: Mock_User | null;
-          } & IInjectData
+          } & IInjectAllData
         >,
         Test.Pass
       >;

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

@@ -1,8 +1,8 @@
 import { Checking, type Test } from "hry-types";
-import type { ReadonlyDeep } from "hry-types/src/Any/_api";
 import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
 
-import type { IInjectData } from "../../../InstanceInject/instanceConfig";
+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 "../..";
 
@@ -51,13 +51,13 @@ SubComponent<{}, CompDoc>()({
       // 4 this.data中的data配置数据
       Checking<
         typeof this.data,
-        ReadonlyDeep<
+        ComputeIntersection<
           {
             _aaa_str: string;
             aaa_str: "a" | "b";
             aaa_num: number;
             aaa_obj: Mock_User | null;
-          } & IInjectData
+          } & IInjectAllData
         >,
         Test.Pass
       >;
@@ -72,7 +72,7 @@ SubComponent<{ data: { _num: number } }, CompDoc>()({
   },
   lifetimes: {
     attached() {
-      Checking<typeof this.data.aaa_obj, ReadonlyDeep<Mock_User | null>, Test.Pass>;
+      Checking<typeof this.data.aaa_obj, Mock_User | null, Test.Pass>;
 
       this.setData({
         aaa_obj: {} as Mock_User, // aaa_obj 类型为 Mock_User | null 而非 null

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

@@ -1,8 +1,8 @@
 import { Checking, type Test } from "hry-types";
-import type { ReadonlyDeep } from "hry-types/src/Any/_api";
 import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
 
-import type { IInjectData } from "../../../InstanceInject/instanceConfig";
+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 { SubComponent } from "../..";
@@ -55,7 +55,7 @@ SubComponent<RootDoc, CompDoc>()({
       // this.data
       Checking<
         typeof this.data,
-        ReadonlyDeep<
+        ComputeIntersection<
           {
             // RootData
             Pstr: string;
@@ -65,7 +65,7 @@ SubComponent<RootDoc, CompDoc>()({
             Cnum: number;
             // 自身Data类型与CompDoc类型相同
             aaa_str: string;
-          } & IInjectData
+          } & IInjectAllData
         >,
         Test.Pass
       >;