annil 1.5.15 → 1.6.1

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

@@ -1,6 +1,5 @@
 import type { Func } from "hry-types/src/Misc/_api";
 import { BBeforeCreate } from "../../../behaviors/BbeforeCreated";
-
 import type { Assign } from "../../../types/Assign";
 import type { WMComponent } from "../../../types/OfficialTypeAlias";
 import { deepClone } from "../../../utils/deepClone";
@@ -34,6 +33,7 @@ import { initStore } from "./initStore";
 type InstanceInnerFields = {
   data: OptionsInnerFields["data"];
   disposer: Record<string, Func>;
+  cloneData: OptionsInnerFields["data"];
 } & OptionsInnerFields["methods"];
 
 export type Instance =
@@ -101,6 +101,13 @@ export function isPageCheck(isPage: boolean | undefined) {
   };
 }
 
+function addCloneDataToInstance(this: Instance) {
+  this.cloneData = new Proxy(this.data, {
+    get: <T extends object>(target: T, key: keyof T) => {
+      return deepClone(target)[key];
+    },
+  });
+}
 /**
  * 原生Component会对传入的对象字段匹配的properties字段setData赋值。不符合字段或Page时不会赋值。
  * 此函数为给实例setData赋值,默认传递值与properties相符(ts类型安全)。
@@ -439,6 +446,12 @@ export function assignOptions(
     [isPageCheck(rootComponentOption?.isPage)],
   );
 
+  hijack(
+    finalOptionsForComponent.lifetimes!,
+    "created",
+    [addCloneDataToInstance],
+  );
+
   // 页面时删除预设的虚拟组件字段
   finalOptionsForComponent.isPage
     && finalOptionsForComponent.options && Reflect.deleteProperty(finalOptionsForComponent.options, "virtualHost");

package/src/api/RootComponent/Computed/ComputedOption.ts

@@ -2,7 +2,11 @@ import type { DuplicateFieldValidator } from "hry-types/src/Generic/DuplicateFie
 
 import type { ComputedConstraint } from "./ComputedConstraint";
 
-export type ComputedOption<TComputed extends ComputedConstraint, CompareKeys extends PropertyKey> = {
+export type ComputedOption<
+  TComputed extends ComputedConstraint,
+  CompareKeys extends PropertyKey,
+  Instance extends object,
+> = {
   /**
    * computed字段, [类型约束ComputedConstraint](ComputedConstraint.ts)
    * @remarks
@@ -28,5 +32,6 @@ export type ComputedOption<TComputed extends ComputedConstraint, CompareKeys ext
    */
   computed?:
     & TComputed
+    & ThisType<Instance>
     & DuplicateFieldValidator<TComputed, CompareKeys>;
 };

package/src/api/RootComponent/Computed/GetComputedDoc.ts

@@ -5,4 +5,6 @@ import type { ComputedConstraint } from "./ComputedConstraint";
  * @param T - ComputedConstraint
  * @returns object
  */
-export type GetComputedDoc<TComputed extends ComputedConstraint> = { [k in keyof TComputed]: ReturnType<TComputed[k]> };
+export type GetComputedDoc<TComputed extends ComputedConstraint> = {
+  [k in keyof TComputed]: ReturnType<TComputed[k]>;
+};

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

@@ -10,11 +10,11 @@ RootComponent()({
   },
   computed: {
     // @ts-expect-error '与properties字段重复'
-    str() {
+    str(): string {
       return "与properties字段重复";
     },
     // @ts-expect-error "与data字段重复"
-    num() {
+    num(): string {
       return "与data字段重复";
     },
   },

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

@@ -10,6 +10,7 @@ const RootDoc = RootComponent()({
   },
   data: {
     lastName: "lastName",
+    mock_User: {} as Mock_User,
   },
   store: {
     prefix: () => "hry-", // 模拟而已
@@ -30,17 +31,18 @@ const RootDoc = RootComponent()({
       // 3 this.data 类型是深度只读的
       Checking<
         typeof this.data,
-        ReadonlyDeep<
-          {
-            firstName: string;
-            lastName: string;
-            fullName: string;
-            user: Mock_User;
-            prefix: string;
-            id_fullName: string;
-            readOnly: "str";
-          } & IInjectData
-        >,
+        {
+          firstName: string;
+          lastName: string;
+          mock_User: Mock_User;
+          fullName: string;
+          user: Mock_User;
+          prefix: string;
+          id_fullName: string;
+          readOnly: "str";
+          injectStr: string;
+          injectTheme: "light" | "dark" | undefined;
+        },
         Test.Pass
       >;
 

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

@@ -1,4 +1,4 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 import type { CustomEventConstraint } from "./CustomEventConstraint";
 
 export type CustomEventsOption<
@@ -36,6 +36,6 @@ export type CustomEventsOption<
    */
   customEvents?:
     & TCustomEvents
-    & V.IllegalFieldValidator<TCustomEvents, "bubbles" | "composed" | "capturePhase", 1, "options">
-    & V.DuplicateFieldValidator<TCustomEvents, EventsKeys, "与events字段重复">;
+    & G.IllegalFieldValidator<TCustomEvents, "bubbles" | "composed" | "capturePhase", 1, "options">
+    & G.DuplicateFieldValidator<TCustomEvents, EventsKeys, "与events字段重复">;
 };

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

@@ -1,4 +1,3 @@
-import type { ReadonlyDeep } from "hry-types/src/Any/ReadonlyDeep";
 import type { DetailedType } from "../../../types/DetailedType";
 import type { InferDetailedType } from "../../../types/InferDetailedType";
 import type {
@@ -9,8 +8,7 @@ import type {
 } from "./CustomEventConstraint";
 import type { AddTagForCustomEventsDoc } from "./CustomEventsTag";
 
-export type GetShortCustomEventsDoc<T extends ShortCustomeEvents> = T extends DetailedType
-  ? ReadonlyDeep<InferDetailedType<T>>
+export type GetShortCustomEventsDoc<T extends ShortCustomeEvents> = T extends DetailedType ? InferDetailedType<T>
   : T extends null ? null
   : T extends undefined ? undefined
   : T extends SimpleCustomeEventsList ? GetShortCustomEventsDoc<T[number]>

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

@@ -1,6 +1,5 @@
 import { Checking, type Test } from "hry-types";
 
-import type { ReadonlyDeep } from "hry-types/src/Any/ReadonlyDeep";
 import type { Mock_User } from "../../Properties/test/normalRequired.test";
 import type { GetShortCustomEventsDoc } from "../GetCustomEventDoc";
 import { mock_shortCustomEvents } from "./normal.test";
@@ -31,6 +30,6 @@ Checking<ListResult, ListExpected, Test.Pass>;
 
 type ObjResult = GetShortCustomEventsDoc<typeof mock_shortCustomEvents["obj"]>;
 
-export type ObjExpected = ReadonlyDeep<Mock_User>;
+export type ObjExpected = Mock_User;
 
 Checking<ObjResult, ObjExpected, Test.Pass>;

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;

package/src/api/RootComponent/Data/DataOption.ts

@@ -1,4 +1,4 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 
 export type DataOption<TData extends object, PropertiesKeys extends PropertyKey> = {
   /**
@@ -17,5 +17,5 @@ export type DataOption<TData extends object, PropertiesKeys extends PropertyKey>
    */
   data?:
     & TData
-    & V.DuplicateFieldValidator<TData, PropertiesKeys, "与properties字段重复">;
+    & G.DuplicateFieldValidator<TData, PropertiesKeys, "与properties字段重复">;
 };

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

@@ -14,6 +14,8 @@ const RootDoc = RootComponent()({
   },
   methods: {
     foo() {
+      this.cloneData.num = 123;
+
       Checking<
         typeof this.data,
         ReadonlyDeep<{ gender: Gender; num: number; _innernalFields: number } & IInjectData>,

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

@@ -4,6 +4,7 @@ import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersecti
 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 { CustomEventMethods } from "./CustomEventMethods";
@@ -15,6 +16,7 @@ export type RootComponentInstance<
   AllData extends object,
   CustomEventsDoc extends object,
   StoreDoc extends object,
+  instanceData = ComputeObject<Assign<IInjectData, ComputeIntersection<AllData>>>,
 > =
   // 官方实例属性is  options  dataset等
   & IfExtends<false, TIsPage, WMComponentInstance, WMPageInstance>
@@ -26,7 +28,8 @@ export type RootComponentInstance<
     disposer: { [k in keyof StoreDoc]: IReactionDisposer };
   }>
   & Assign<IInjectMethods, TMethods & CustomEventMethods<CustomEventsDoc>>
-  & { data: ReadonlyDeep<Assign<IInjectData, ComputeIntersection<AllData>>> };
+  & { data: ReadonlyDeep<instanceData> }
+  & { cloneData: ComputeObject<Assign<IInjectData, ComputeIntersection<AllData>>> };
 
 export type ComponentInstance = RootComponentInstance<false, {}, {}, {}, {}, {}>;
 

package/src/api/RootComponent/Instance/test/cloneData/error.test.ts

@@ -0,0 +1,31 @@
+import type { DetailedType } from "../../../../..";
+import { RootComponent } from "../../..";
+
+interface User {
+  readonly id: number;
+  readonly name: string;
+  slected: boolean;
+}
+
+RootComponent()({
+  properties: {
+    num: Number,
+    user: Object as DetailedType<User>,
+  },
+  data: {
+    str: "123",
+    arr: [{}] as User[],
+  },
+
+  methods: {
+    M1() {
+      const cloneData = this.cloneData;
+
+      // @ts-expect-error 尽管cloneData去除了readonly，user.id属性依然是readonly
+      cloneData.user!.id = 1;
+
+      // @ts-expect-error arr[0].name属性依然是readonly
+      cloneData.arr[0].name = "zhao";
+    },
+  },
+});

package/src/api/RootComponent/Instance/test/cloneData/normal.test.ts

@@ -0,0 +1,53 @@
+import { Checking, type Test } from "hry-types";
+import type { _ReadonlyDeep } from "hry-types/src/Any/_api";
+import type { DetailedType } from "../../../../..";
+import { RootComponent } from "../../..";
+
+interface User {
+  readonly id: number;
+  readonly name: string;
+  slected: boolean;
+}
+
+RootComponent()({
+  properties: {
+    num: Number,
+    obj: Object as DetailedType<User>,
+  },
+  data: {
+    str: "123",
+    arr: [{}] as User[],
+  },
+
+  methods: {
+    M1() {
+      Checking<
+        typeof this.data,
+        _ReadonlyDeep<
+          {
+            injectTheme: "dark" | "light" | undefined;
+            injectStr: string;
+            str: string;
+            arr: User[];
+            num: number;
+            obj: User | null;
+          }
+        >,
+        Test.Pass
+      >;
+
+      Checking<
+        typeof this.cloneData,
+        {
+          injectTheme: "dark" | "light" | undefined;
+          injectStr: string;
+          str: string;
+          arr: User[];
+          num: number;
+          obj: User | null;
+        },
+        Test.Pass
+      >;
+    },
+  },
+});

package/src/api/RootComponent/Methods/MethodsOption.ts

@@ -1,4 +1,4 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 
 import type { MethodsConstraint } from "./MethodsConstraint";
 
@@ -11,5 +11,5 @@ export type MethodsOption<
    */
   methods?:
     & TMethods
-    & V.DuplicateFieldValidator<TMethods, DuplicateField>;
+    & G.DuplicateFieldValidator<TMethods, DuplicateField>;
 };

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

@@ -1,4 +1,4 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 import type { Validators } from "../../../types/Validators";
 import type { PropertiesConstraint } from "./PropertiesConstraint";
 import type { PropertiesValueValidator } from "./PropertiesValueValidator";
@@ -21,6 +21,6 @@ export type PropertiesOption<
     & Validators<[
       PropertiesValueValidator<TProperties>,
       // 放在最后一个，正常返回不是unknown 而是Record<string,unknown>
-      V.IllegalFieldValidator<TProperties, "value" | "type" | "optionalTypes", 1>,
+      G.IllegalFieldValidator<TProperties, "value" | "type" | "optionalTypes", 1>,
     ]>;
 };

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

@@ -9,10 +9,10 @@ import type { RequiredSingle, RequiredType, RequiredUnion } from "../PropertiesC
 /**
  * 共用测试对象类型
  */
-export type Mock_User = {
-  id: string;
+export interface Mock_User {
+  readonly id: string;
   age?: number;
-};
+}
 
 /**
  * 共用测试对象类型

package/src/api/RootComponent/Store/StoreOption.ts

@@ -1,4 +1,4 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 import type { StoreConstraint } from "./StoreConstraint";
 
 export type StoreOption<TStore extends StoreConstraint, TDuplicateKeys extends PropertyKey> = {
@@ -16,5 +16,5 @@ export type StoreOption<TStore extends StoreConstraint, TDuplicateKeys extends P
    */
   store?:
     & TStore
-    & V.DuplicateFieldValidator<TStore, TDuplicateKeys, "字段重复">;
+    & G.DuplicateFieldValidator<TStore, TDuplicateKeys, "字段重复">;
 };

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 { IInjectStore } from "../InstanceInject/instanceConfig";
+import type { IInjectData, IInjectStore } from "../InstanceInject/instanceConfig";
 import type { ComputedConstraint } from "./Computed/ComputedConstraint";
 import type { ComputedOption } from "./Computed/ComputedOption";
 import type { GetComputedDoc } from "./Computed/GetComputedDoc";
@@ -55,7 +55,11 @@ type RootComponentOptions<
   & CustomEventsOption<TCustomEvents, keyof EventsDoc>
   & DataOption<TData, keyof PropertiesDoc>
   & StoreOption<TStore, keyof (PropertiesDoc & DataDoc)>
-  & ComputedOption<TComputed, keyof (PropertiesDoc & DataDoc & StoreDoc)>
+  & ComputedOption<
+    TComputed,
+    keyof (PropertiesDoc & DataDoc & StoreDoc),
+    { data: ComputeObject<DataDoc & Required<PropertiesDoc> & StoreDoc & ComputedDoc & IInjectData> }
+  >
   & PageLifetimesOption<TIsPage, PropertiesDoc>
   & LifetimesOption
   & WatchOption<

package/src/api/SubComponent/SubComputed/SubComputedOption.ts

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

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

@@ -22,7 +22,7 @@ type OnlyPropsCompDoc = ComponentDoc<{
   };
 }>;
 
-// 2 去除inhrit和data字段后无组件字段约束时,写任何字段都报错
+// 2 去除inhrit和data字段后无组件字段约束时,只可写内部字段
 SubComponent<{}, OnlyPropsCompDoc>()({
   inherit: {
     aaa_str: "wxml",
@@ -31,8 +31,9 @@ SubComponent<{}, OnlyPropsCompDoc>()({
     aaa_num: 123,
   },
   computed: {
-    // @ts-expect-error ⚠️"重复或无效的字段"⚠️
     _aaa_xxx() {},
+    // @ts-expect-error 只可写内部字段
+    aaa_yyy() {},
   },
 });
 
@@ -48,16 +49,3 @@ SubComponent<{}, OnlyPropsCompDoc>()({
     },
   },
 });
-
-// 4 类型错误
-SubComponent<{}, OnlyPropsCompDoc>()({
-  data: {
-    aaa_isReady: false,
-  },
-  computed: {
-    // @ts-ignore 重复的字段
-    aaa_isReady() {
-      return true;
-    },
-  },
-});

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

@@ -140,18 +140,5 @@ SubComponent<Root, $aaa>()({
     aaa_str(): string {
       return this.data.str;
     },
-
-    aaa_isReady() {
-      return false;
-    },
-  },
-});
-
-SubComponent<Root, $aaa>()({
-  computed: {
-    // 可以写isReady字段 ExtraFields
-    aaa_isReady() {
-      return false;
-    },
   },
 });

package/src/api/SubComponent/SubData/SubDataOption.ts

@@ -1,16 +1,15 @@
-import type { V } from "hry-types";
-import type { InnerFields } from "../../../types/InnerData";
+import type { G } from "hry-types";
 
-export type SubDataOption<TSubData extends object, legalKeys extends PropertyKey, TPrefix extends string> = {
+export type SubDataOption<TSubData extends object, legalKeys extends PropertyKey> = {
   /**
    * 可写子组件所需数据和内部公共数据
    * 非法字段检测和与Inherit字段的重复检测
    */
   data?:
     & TSubData
-    & V.IllegalFieldValidator<
+    & G.IllegalFieldValidator<
       TSubData,
-      legalKeys | InnerFields<TPrefix>,
+      legalKeys,
       0,
       "",
       "子组件无需此字段或与Inherit字段重复"

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

@@ -39,17 +39,6 @@ SubComponent<{ data: { _num: number } }, CompDoc>()({
   },
 });
 
-//
-SubComponent<{ data: { _num: number } }, CompDoc>()({
-  inherit: {
-    aaa_str: "wxml",
-  },
-  data: {
-    // 4 可写isReady 特许字段 ExtraFields
-    aaa_isReady: false,
-  },
-});
-
 SubComponent<{}, CompDoc>()({
   data: {
     aaa_str: "a",

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

@@ -1,4 +1,4 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 
 export type SubEventsOption<TSubEvents, SubEventsDoc extends object, legalKeys extends PropertyKey> = {
   /**
@@ -8,5 +8,5 @@ export type SubEventsOption<TSubEvents, SubEventsDoc extends object, legalKeys e
    */
   events?:
     & TSubEvents
-    & V.IllegalFieldValidator<SubEventsDoc, legalKeys>;
+    & G.IllegalFieldValidator<SubEventsDoc, legalKeys>;
 };

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

@@ -1,4 +1,4 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 
 export type SubInheritOption<TInherit extends object, legalKeys extends PropertyKey> = {
   /**
@@ -8,7 +8,7 @@ export type SubInheritOption<TInherit extends object, legalKeys extends Property
    */
   inherit?:
     & TInherit
-    & V.IllegalFieldValidator<
+    & G.IllegalFieldValidator<
       TInherit,
       legalKeys,
       0,

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

@@ -0,0 +1,22 @@
+import type { View } from "../../../../../thirdLib/wm";
+import type { RootComponentDoc } from "../../../../RootComponent/RootComponentDoc";
+import { SubComponent } from "../../..";
+
+type RootDoc = RootComponentDoc<{
+  events: {
+    RootE1: () => string;
+  };
+}>;
+
+// 实例中只存在RootDoc和自身的methods字段
+SubComponent<RootDoc, View>()({
+  lifetimes: {
+    created() {
+      // @ts-expect-error 不存在的方法  (Root事件方法不可调用)
+      this.RootE1;
+
+      // @ts-expect-error 不存在的方法
+      this.otherMethods();
+    },
+  },
+});

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

@@ -0,0 +1,73 @@
+import { Checking, type Test } from "hry-types";
+import type { ComponentDoc } from "../../../../DefineComponent/ReturnType/ComponentDoc";
+import type { Mock_User } from "../../../../RootComponent/Properties/test/normalRequired.test";
+import type { RootComponentDoc } from "../../../../RootComponent/RootComponentDoc";
+import { SubComponent } from "../../..";
+
+type RootDoc = RootComponentDoc<{
+  properties: {
+    Pstr: string;
+    Pobj: Mock_User | null;
+    PoptionalObj?: Mock_User;
+  };
+  data: {
+    Dnum: number;
+  };
+  computed: {
+    Cnum: number;
+  };
+  methods: {
+    RootM: () => number;
+  };
+  customEvents: {
+    RootCus: string;
+  };
+  events: {
+    RootE1: () => string;
+  };
+}>;
+
+type CompDoc = ComponentDoc<{
+  properties: {
+    aaa_str: string;
+  };
+  customEvents: {
+    aaa_num: number;
+  };
+}>;
+
+SubComponent<RootDoc, CompDoc>()({
+  data: {
+    aaa_str: "str",
+    _aaa_num: 123,
+  },
+  computed: {
+    _aaa_isReady() {
+      return false;
+    },
+  },
+
+  lifetimes: {
+    created() {
+      Checking<
+        typeof this.cloneData,
+        {
+          // inheritData
+          injectTheme: "dark" | "light" | undefined;
+          injectStr: string;
+          // RootData
+          Pstr: string;
+          Pobj: Mock_User | null;
+          PoptionalObj: Mock_User;
+          Dnum: number;
+          Cnum: number;
+          // 自身Data类型与CompDoc类型相同
+          aaa_str: string;
+          _aaa_isReady: boolean;
+          _aaa_num: number;
+        },
+        Test.Pass
+      >;
+    },
+  },
+});

package/src/api/SubComponent/SubMethods/SubMethodsOption.ts

@@ -1,4 +1,4 @@
-import type { V } from "hry-types";
+import type { G } from "hry-types";
 import type { PrefixValidator } from "hry-types/src/Generic/PrefixValidator";
 import type { SubMethodsConstraint } from "./SubMethodsConstraint";
 
@@ -13,5 +13,5 @@ export type SubMethodsOption<
   methods?:
     & TSubMethods
     & PrefixValidator<TSubMethods, TPrefix>
-    & V.DuplicateFieldValidator<TSubMethods, ExcludedKeys>;
+    & G.DuplicateFieldValidator<TSubMethods, ExcludedKeys>;
 };