annil 1.1.0 → 1.1.2

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

@@ -1,3 +1,5 @@
+// import type { IfExtends } from "hry-types/src/Any/IfExtends";
+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";
@@ -16,9 +18,9 @@ type FilterNormalFields<O extends object> = Select<O, Bubbles | Capture, "contai
 
 // 获取冒泡或捕获的事件
 type GetBubblesOrCaptureEventsFromCompDoc<
-  TComponentDocTuple extends ComponentDoc[],
+  ComponentDocList extends ComponentDoc[],
   Result extends CustomEventsDoc = {},
-> = TComponentDocTuple extends [infer Head extends ComponentDoc, ...infer Rest extends ComponentDoc[]]
+> = ComponentDocList extends [infer Head extends ComponentDoc, ...infer Rest extends ComponentDoc[]]
   ? GetBubblesOrCaptureEventsFromCompDoc<
     Rest,
     Result & (FilterNormalFields<Head["customEvents"] & {}>)
@@ -47,23 +49,26 @@ type TransformCustomEventsDocTypeToFunctionTypeAndAddSuffix<T extends CustomEven
 };
 
 // 所有子组件自定义事件(过滤掉非冒泡或捕获)的key加入后缀并把值(detail)转换为函数类型
-type GetAllSubCustomEventsConstraint<TReceivedComponentDoc extends ComponentDoc[] | ComponentDoc> = {} extends
-  TReceivedComponentDoc ? {}
-  : TReceivedComponentDoc extends ComponentDoc[] ? TransformCustomEventsDocTypeToFunctionTypeAndAddSuffix<
-      GetBubblesOrCaptureEventsFromCompDoc<TReceivedComponentDoc>
-    >
-  : ComponentDoc["customEvents"] & {};
+type GetAllSubCustomEventsConstraint<
+  ComponentDocList extends ComponentDoc[],
+  AllCustomEvents extends CustomEventsDoc = GetBubblesOrCaptureEventsFromCompDoc<ComponentDocList>,
+> = IfExtends<
+  {},
+  AllCustomEvents,
+  BaseEvent,
+  TransformCustomEventsDocTypeToFunctionTypeAndAddSuffix<
+    AllCustomEvents
+  >
+>;
+
+type BaseEvent = Record<string, (e: WMBaseEvent) => any>;
 
 /**
- * events字段约束
+ * events字段约束 由自身事件和冒泡的子组件事件组成。带前缀是子组件事件,带后缀(_catch)表示阻止冒泡
  */
-export type EventsConstraint<TReceivedComponentDoc extends ComponentDoc[] | ComponentDoc = {}> = {} extends
-  TReceivedComponentDoc ? Record<string, (e: WMBaseEvent) => any>
-  : TReceivedComponentDoc extends ComponentDoc ? {
-      [k in keyof TReceivedComponentDoc["customEvents"]]?: (
-        e: Exclude<TReceivedComponentDoc["customEvents"][k], CustomEventsTags>,
-      ) => void;
-    }
-  : GetAllSubCustomEventsConstraint<TReceivedComponentDoc>;
-// // 一般事件字段约束
-// & Record<string, (e: WMBaseEvent) => any>;
+export type EventsConstraint<ComponentDocList extends ComponentDoc[] = []> = IfExtends<
+  [],
+  ComponentDocList,
+  BaseEvent,
+  GetAllSubCustomEventsConstraint<ComponentDocList>
+>;

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

@@ -1,7 +1,55 @@
-import type { V } from "hry-types";
-
-export type EventsOption<TEvents extends object, EventsDoc> = {
-  events?:
-    & TEvents
-    & V.IllegalFieldValidator<TEvents, keyof EventsDoc>;
+export type EventsOption<TEvents extends object> = {
+  /**
+   * 根组件事件字段,当RootComopnent传入组件泛型时,有子组件事件提示
+   *
+   * @example A 无子组件时
+   * ```ts
+   * RootComponent()({
+   *  events: {
+   *    onTap(e) {
+   *      Checking<typeof e, WMBaseEvent, Test.Pass>;
+   *    },
+   *  },
+   * });
+   * ```
+   * @example B
+   * ```ts
+   * type ComponentDocA = {
+   *  customEvents: {
+   *    aaa_str: string;
+   *    aaa_num: number | Bubbles;
+   *  };
+   * };
+   *
+   * type ComponentDocB = {
+   *  customEvents: {
+   *    bbb_str: string;
+   *    bbb_num: number | Capture;
+   *  };
+   * };
+   * RootComponent<[ComponentDocA, ComponentDocB]>()({
+   *  events: {
+   *    // 后缀bubbles表示为子组件的冒泡事件
+   *    aaa_num_bubbles(e) {
+   *      Checking<typeof e.detail, number, Test.Pass>;
+   *    },
+   *    // 后缀加catch表示阻止事件传递,当前组件类型将不会向上传递此事件类型。
+   *    aaa_num_bubbles_catch(e) {
+   *      Checking<typeof e.detail, number, Test.Pass>;
+   *    },
+   *    // 后缀capture表示是捕获事件
+   *    bbb_num_capture(e: Dataset<{ currentTargetDataset: number }, { targetDataset: string }, number>) {
+   *      Checking<typeof e.detail, number, Test.Pass>;
+   *      Checking<typeof e.currentTarget.dataset.currentTargetDataset, number, Test.Pass>;
+   *      Checking<typeof e.target.dataset.targetDataset, string, Test.Pass>;
+   *    },
+   *    // 后缀加catch表示阻止事件传递,由于捕获事件向下阻止,所以当发现捕获事件不触发时应查看上级组件是否有阻止事件。
+   *    bbb_num_capture_catch(e) {
+   *      Checking<typeof e.detail, number, Test.Pass>;
+   *    },
+   *  },
+   * });
+   * ```
+   */
+  events?: TEvents;
 };

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

@@ -13,22 +13,22 @@ import { RootComponent } from "../..";
 import type { Bubbles, Capture } from "../../CustomEvents/CustomEventsTag";
 
 /**
- * 1. 事件参数e的类型默认为官方基础类型
+ * 1. 没有子组件时,事件参数e的类型默认为官方基础类型
  */
 RootComponent()({
   events: {
-    aaa(e) {
+    onTap(e) {
       Checking<typeof e, WMBaseEvent, Test.Pass>;
     },
   },
 });
 
 /**
- * 2. 事件参数e可通过WMBaseEvent和WMCustomEvent(多一个detail类型)定义内部类型。
+ * 2. 没有子组件时,事件参数e可通过WMBaseEvent和WMCustomEvent(多一个detail类型)定义内部类型。
  */
 RootComponent()({
   events: {
-    // 通过WMCustomEvent定义detai,mark,CurrentTargetDataset,targetDataset数据类型
+    // 2.1 通过WMCustomEvent定义detai,mark,CurrentTargetDataset,targetDataset数据类型
     customA(
       e: WMCustomEvent<
         { detailData: string },
@@ -47,21 +47,21 @@ RootComponent()({
 
       Checking<typeof e.target.dataset.targetDatasetData, number, Test.Pass>;
     },
-    // 通过Detail定义detai类型
+    // 2.2 通过Detail定义detai类型
     bbb(e: Detail<{ str: string }>) {
       Checking<typeof e.detail.str, string, Test.Pass>;
     },
-    // 通过Mark定义mark类型
+    // 2.3 通过Mark定义mark类型
     ccc(e: Mark<{ id: string }>) {
       const markId = e.mark!.id;
 
       Checking<typeof markId, string, Test.Pass>;
     },
-    // 通过CurrentTargetDataset定义currentTarget.dataset类型
+    // 2.4 通过CurrentTargetDataset定义currentTarget.dataset类型
     ddd(e: CurrentTargetDataset<{ str: string }>) {
       Checking<typeof e.currentTarget.dataset.str, string, Test.Pass>;
     },
-    // 通过TargetDataset定义target.dateset类型
+    // 2.5 通过TargetDataset定义target.dateset类型
     eee(e: TargetDataset<{ str: string }>) {
       Checking<typeof e.target.dataset.str, string, Test.Pass>;
     },
@@ -86,19 +86,19 @@ type ComponentDocB = ComponentDoc<{
 }>;
 
 /**
- * 6. 当传入子组件文档列表时,提供子组件的冒泡和捕获事件的字段提示
+ * 3. 当传入子组件文档列表时,提供子组件的冒泡和捕获事件的字段提示
  */
 const RootDoc = RootComponent<[ComponentDocA, ComponentDocB]>()({
   events: {
-    // 后缀bubbles表示为子组件的冒泡事件
+    // 3.1 后缀bubbles表示为子组件的冒泡事件
     aaa_num_bubbles(e) {
       Checking<typeof e.detail, number, Test.Pass>;
     },
-    // 后缀加catch表示阻止事件传递,当前组件类型将不会向上传递此事件类型。
+    // 3.2 后缀加catch表示阻止事件传递,当前组件类型将不会向上传递此事件类型。
     aaa_num_bubbles_catch(e) {
       Checking<typeof e.detail, number, Test.Pass>;
     },
-    // 后缀capture表示是捕获事件
+    // 3.3 后缀capture表示是捕获事件
     bbb_num_capture(e: Dataset<{ currentTargetDataset: number }, { targetDataset: string }, number>) {
       Checking<typeof e.detail, number, Test.Pass>;
 
@@ -106,7 +106,7 @@ const RootDoc = RootComponent<[ComponentDocA, ComponentDocB]>()({
 
       Checking<typeof e.target.dataset.targetDataset, string, Test.Pass>;
     },
-    // 后缀加catch表示阻止事件传递,由于捕获事件向下阻止,所以当发现捕获事件不触发时应查看上级组件是否有阻止事件。
+    // 3.4 后缀加catch表示阻止事件传递,由于捕获事件向下阻止,所以当发现捕获事件不触发时应查看上级组件是否有阻止事件。
     bbb_num_capture_catch(e) {
       Checking<typeof e.detail, number, Test.Pass>;
     },
@@ -122,11 +122,11 @@ type RootDocExpect = {
   };
 };
 
-// 7 返回EventsDoc正常
+// 4 返回EventsDoc正常
 Checking<typeof RootDoc, RootDocExpect, Test.Pass>;
 
 /**
- * 8 events字段为`{}`时,返回类型中无events字段。
+ * 5 events字段为`{}`时,返回类型中无events字段。
  */
 const EmptyEventsFields = RootComponent<[ComponentDocA, ComponentDocB]>()({
   events: {},
@@ -135,7 +135,7 @@ const EmptyEventsFields = RootComponent<[ComponentDocA, ComponentDocB]>()({
 Checking<typeof EmptyEventsFields, {}, Test.Pass>;
 
 /**
- * 9 没有events字段时,返回类型中无events字段。
+ * 6 没有events字段时,返回类型中无events字段。
  */
 const NoEventsFields = RootComponent<[ComponentDocA, ComponentDocB]>()({});
 

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

@@ -32,7 +32,7 @@ RootComponent()({
   pageLifetimes: {
     onLoad(data) {
       Checking<typeof data, {
-        optionalObj: {
+        optionalObj?: {
           name: string;
         };
         obj: object;

package/src/api/RootComponent/IsPage/IsPageOption.ts

@@ -1,6 +1,6 @@
 export type IsPageOption<TIsPage extends boolean> = {
   /**
-   * 表示组件是否为页面,可选,默认false
+   * 表示组件是否为页面,默认false,会引起pageLifetimes类型变化
    */
   isPage?: TIsPage;
 };

package/src/api/RootComponent/Lifetimes/LifetimesConstraint.ts

@@ -1,11 +1,14 @@
+import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { WMCompLifetimes } from "../../../types/OfficialTypeAlias";
-import type { FinalOptionsForComponent } from "../../DefineComponent";
+import type { FinalOptionsOfComponent } from "../../DefineComponent";
 
 export type LifetimesConstraint = // 官方组件生命周期
-  & WMCompLifetimes["lifetimes"]
-  & {
-    /**
-     * 建立组件时的真正配置对象
-     */
-    beforeCreate?: (options: FinalOptionsForComponent) => void;
-  };
+  ComputeIntersection<
+    & WMCompLifetimes["lifetimes"]
+    & {
+      /**
+       * 建立组件时的真正配置对象
+       */
+      beforeCreate?: (options: FinalOptionsOfComponent) => void;
+    }
+  >;

package/src/api/RootComponent/Lifetimes/LifetimesOption.ts

@@ -2,6 +2,32 @@ import type { LifetimesConstraint } from "./LifetimesConstraint";
 
 export type LifetimesOption<TIsPage extends boolean> = TIsPage extends false // 组件开通lifetimes字段
   ? {
+    /**
+     * 在原生类型上增加了beforeCreate周期
+     * @example
+     * ```ts
+     * RootComponent()({
+     *  lifetimes: {
+     *    beforeCreate(opitons) {
+     *      opitons;//为最终进入Component的配置对象
+     *    },
+     *    created() {
+     *    },
+     *    attached() {
+     *    },
+     *    ready() {
+     *    },
+     *    detached() {
+     *    },
+     *    error(err) {
+     *      err.cause;
+     *    },
+     *    moved() {
+     *    },
+     *  },
+     * });
+     * ```
+     */
     lifetimes?: LifetimesConstraint;
   }
   // 页面关闭lifetimes字段(其实也可以开启)

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

@@ -1,33 +1,23 @@
 import { RootComponent } from "../..";
-/**
- *  1 组件时(无ispage字段或为false),
- */
+
 RootComponent()({
   lifetimes: {
     beforeCreate() {},
-
     created() {},
-
     attached() {},
-
     ready() {},
-
     detached() {},
-
     error(err) {
       err.cause;
     },
     moved() {},
-    // @ts-expect-error  错误的声明周期字段报错
+    // @ts-expect-error  1 错误的声明周期字段报错
     xxx() {},
   },
 });
 
-/**
- *  2. 页面时 不开启lifetimes字段
- */
 RootComponent()({
   isPage: true,
-  // @ts-expect-error 页面时未开启此字段
+  // @ts-expect-error 2 页面时未开启此字段
   lifetimes: {},
 });

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

@@ -5,7 +5,7 @@ import { RootComponent } from "../../../..";
  */
 RootComponent()({
   lifetimes: {
-    // 新增声明周期用于查看实例初始化之前的配置文件
+    // 新增声明周期可用于查看或拓展配置文件
     beforeCreate(opitons) {
       opitons;
     },

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

@@ -6,6 +6,9 @@ export type MethodsOption<
   TMethods extends MethodsConstraint,
   DuplicateField extends PropertyKey,
 > = {
+  /**
+   * 与customEvents和events字段重复检测
+   */
   methods?:
     & TMethods
     & V.DuplicateFieldValidator<TMethods, DuplicateField>;

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

@@ -1,31 +1,42 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { WMCompPageLifetimes, WMPageLifetimes } from "../../../types/OfficialTypeAlias";
-import type { RemoveNullOfRequired } from "../../../types/RemoveNullOfRequired";
 
 export type PageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends object> = IfExtends<
   TIsPage,
   false,
   {
-    pageLifetimes?:
+    /**
+     * 比官方定义新增load周期,发生在页面onLoad事件后
+     */
+    pageLifetimes?: ComputeIntersection<
       // 官方组件页面生命周期
       & Partial<WMCompPageLifetimes>
       & {
         /**
-         * 事件发生在页面load事件后,要求组件为同步组件
+         * 事件发生在页面onLoad事件后,要求组件为同步组件
          */
-        load?: () => void;
-      };
+        load?: (props: object) => void | Promise<void>;
+      }
+    >;
   },
   {
-    pageLifetimes?:
+    /**
+     * 官方要求写入methods中的页面生命周期
+     */
+    pageLifetimes?: ComputeIntersection<
       & Partial<Omit<WMPageLifetimes, "onLoad">>
       // 替换掉官方的 Parameters<WechatMiniprogram.Page.ILifetime['onLoad']>
       & {
+        /** 生命周期回调—监听页面加载
+         *
+         * 页面加载时触发。一个页面只会调用一次，可以在 onLoad 的参数中获取Properties定义的数据。
+         */
         onLoad?: (
-          // 必传字段去掉null
-          props: ComputeIntersection<Required<RemoveNullOfRequired<PropertiesDoc>>>,
-        ) => void;
-      };
+          // 页面时PropertiesDoc对象字段是格外不加null的
+          props: PropertiesDoc,
+        ) => void | Promise<void>;
+      }
+    >;
   }
 >;

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

@@ -1,20 +1,22 @@
 import { RootComponent } from "../..";
 /**
- *  1 组件时(无ispage字段或为false),
+ *   组件时 非法字段错误
  */
 RootComponent()({
   pageLifetimes: {
     show() {},
     hide() {},
     resize() {},
-    load() {},
-    // @ts-expect-error 错误的声明周期
+    load(props) {
+      props;
+    },
+    // @ts-expect-error 1 错误的声明周期
     xxx() {},
   },
 });
 
 /**
- *  2. 页面时
+ *  页面时
  */
 RootComponent()({
   isPage: true,
@@ -22,7 +24,7 @@ RootComponent()({
     onLoad(props) {
       props;
     },
-    // @ts-expect-error 错误的声明周期
+    // @ts-expect-error 2 错误的声明周期
     xxx() {},
   },
 });

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

@@ -1,7 +1,6 @@
 import { Checking, type Test } from "hry-types";
 import { type DetailedType, RootComponent } from "../../../..";
 
-import type { RemoveNullOfRequired } from "../../../../types/RemoveNullOfRequired";
 import type { Mock_User } from "../../Properties/test/normalRequired.test";
 
 /**
@@ -16,7 +15,9 @@ RootComponent()({
     },
     show() {},
     // 新增周期函数
-    load() {},
+    load(obj) {
+      Checking<typeof obj, object, Test.Pass>;
+    },
   },
 });
 
@@ -43,14 +44,12 @@ RootComponent()({
     onLoad(props) {
       Checking<
         typeof props,
-        Required<
-          RemoveNullOfRequired<{
-            union?: Mock_User;
-            optionalObject?: Mock_User | null;
-            str: string;
-            obj: object;
-          }>
-        >,
+        {
+          union?: Mock_User;
+          optionalObject?: Mock_User | null;
+          str: string;
+          obj: object;
+        },
         Test.Pass
       >;
     },

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

@@ -3,37 +3,24 @@ import type { Validators } from "../../../types/Validators";
 import type { PropertiesConstraint } from "./PropertiesConstraint";
 import type { PropertiesValueValidator } from "./PropertiesValueValidator";
 
-/**
- * properties 配置字段
- * @remarks 二参 三参为了让AnyPropertiesOption也可以复用这个泛型
- */
 export type PropertiesOption<
   TProperties extends PropertiesConstraint,
-> // Prefix extends string = "",
- = // DuplicateFieldCheck extends PropertyKey = "",
-  {
-    /**
-     * 可通过 as DetailedType<anyType> 书写任意类型
-     * @remarks 禁用observable字段,简写或对象写法无value字段时为必传属性(必传对象类型加入null类型),对象写法有value字段为可选属性.
-     */
-    properties?:
-      & TProperties
-      & Validators<[
-        // PrefixValidator<TProperties, Prefix>,
-        PropertiesValueValidator<TProperties>,
-        // V.DuplicateFieldValidator<TProperties, DuplicateFieldCheck>,
-        // 放在最后一个，正常返回不是unknown 而是Record<string,unknown>
-        V.IllegalFieldValidator<TProperties, "value" | "type" | "optionalTypes", 1>,
-      ]>;
-  };
-
-// export type PrefixValidator<
-//   G extends object,
-//   TPrefix extends string,
-//   Message extends string = "前缀错误",
-//   Result = TPrefix extends "" ? unknown : {
-//     [
-//       k in keyof G as k extends `${TPrefix}_${string}` ? never : k
-//     ]: G[k] extends object ? `⚠️${Message}` : () => `⚠️${Message}`;
-//   },
-// > = EmptyObject extends Result ? unknown : Result;
+> = {
+  /**
+   * 可通过 as DetailedType<anyType> 书写任意类型
+   * @remarks
+   *
+   * 禁用observable字段(watch代替)
+   *
+   * 简写或对象写法(无value字段)时为必传属性(组件时必传对象实际类型加入null,页面不加),对象写法有value字段为可选属性.
+   *
+   * 有value类型检测和非法字段检测(例如value写出values)
+   */
+  properties?:
+    & TProperties
+    & Validators<[
+      PropertiesValueValidator<TProperties>,
+      // 放在最后一个，正常返回不是unknown 而是Record<string,unknown>
+      V.IllegalFieldValidator<TProperties, "value" | "type" | "optionalTypes", 1>,
+    ]>;
+};

package/src/api/RootComponent/RootComponentDoc.ts

@@ -13,11 +13,11 @@ type _RootComponentDoc = {
   store?: object;
   watch?: Record<string, Func>;
   lifetimes?: LifetimesConstraint;
-  pageLifetimes?: Partial<WMCompPageLifetimes & { load: Func } & WMPageLifetimes>;
+  pageLifetimes?: Partial<WMCompPageLifetimes & { load: Func }>;
 };
 
 // 验证key是否合法
-type _Validator<O, ErrKeys = Exclude<keyof O, keyof _RootComponentDoc>> = [ErrKeys] extends [never] ? _RootComponentDoc
+type _Validator<O, Doc, ErrKeys = Exclude<keyof O, keyof Doc>> = [ErrKeys] extends [never] ? Doc
   : `错误的字段${ErrKeys & string}`;
 
 /**
@@ -35,4 +35,20 @@ type _Validator<O, ErrKeys = Exclude<keyof O, keyof _RootComponentDoc>> = [ErrKe
  * };
  * ```
  */
-export type RootComponentDoc<O extends _Validator<O> = _RootComponentDoc> = O;
+export type RootComponentDoc<O extends _Validator<O, _RootComponentDoc> = _RootComponentDoc> = O;
+
+type _RootPageDoc = {
+  isPage?: boolean;
+  properties?: object;
+  data?: object;
+  computed?: object;
+  customEvents?: object;
+  methods?: object;
+  events?: object;
+  store?: object;
+  watch?: Record<string, Func>;
+  lifetimes?: LifetimesConstraint;
+  pageLifetimes?: Partial<WMPageLifetimes>;
+};
+
+export type RootPageDoc<O extends _Validator<O, _RootPageDoc> = _RootPageDoc> = O;

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

@@ -1,3 +1,3 @@
 import type { StoreConstraint } from "./StoreConstraint";
 
-export type GeTStoreDoc<TStore extends StoreConstraint> = { [k in keyof TStore]: ReturnType<TStore[k]> };
+export type GetStoreDoc<TStore extends StoreConstraint> = { [k in keyof TStore]: ReturnType<TStore[k]> };

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

@@ -1,8 +1,20 @@
 import type { V } from "hry-types";
 import type { StoreConstraint } from "./StoreConstraint";
 
-export type StoreOption<TStore extends StoreConstraint, TDuplicate extends object> = {
+export type StoreOption<TStore extends StoreConstraint, TDuplicateKeys extends PropertyKey> = {
+  /**
+   * 全局响应式数据字段,全局store对应数据变化实例对应数据自动setData。与properties和data字段有重复检测
+   * @example
+   * ```ts
+   * {
+   *   //...
+   *   store: {
+   *     responsiveData: () => sroreX.str,
+   *   },
+   * }
+   * ```
+   */
   store?:
     & TStore
-    & V.DuplicateFieldValidator<TStore, keyof TDuplicate, "字段重复">;
+    & V.DuplicateFieldValidator<TStore, TDuplicateKeys, "字段重复">;
 };

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

@@ -5,15 +5,15 @@ const user = observable({
   age: 20,
 });
 
-// 约束错误
+// 1 约束错误
 RootComponent()({
   store: {
-    // @ts-expect-error 不能将类型“string”分配给类型“() => unknown”
+    // @ts-expect-error 1.1 不能将类型“string”分配给类型“() => unknown”
     userName: user.name,
   },
 });
 
-// 重复字段错误
+// 2 重复字段错误
 RootComponent()({
   properties: {
     userName: String,
@@ -22,9 +22,9 @@ RootComponent()({
     userAge: 20,
   },
   store: {
-    // @ts-expect-error 1 与properties字段重复
+    // @ts-expect-error 2.1 与properties字段重复
     userName: () => user.name,
-    // @ts-expect-error 2 与userAge字段重复
+    // @ts-expect-error 2.2 与userAge字段重复
     userAge: () => user.age,
   },
 });

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

@@ -20,4 +20,5 @@ type StoreDocExpected = {
   };
 };
 
+// 返回类型为函数返回类型
 Checking<typeof storeDoc, StoreDocExpected, Test.Pass>;