annil 1.12.7 → 1.13.1

package/dist/thirdLib/wm/swiper.d.ts

@@ -26,7 +26,7 @@ export type Swiper = CreateComponentType<"swiper", {
         displayMultipleItems?: number;
         easingFunction?: "defaultValue" | "linear" | "easeInCubic" | "easeOutCubic" | "easeInOutCubic";
     };
-    customEvents: {
+    events: {
         change: ChangeEventDetail;
         transition: {
             dx: number;

package/dist/types/AddNullForObject.d.ts

@@ -0,0 +1,2 @@
+import type { IsPureObject } from "hry-types/src/Any/IsPureObject";
+export type AddNullForObject<O> = O extends unknown ? IsPureObject<O> extends true ? (O | null) : O : never;

package/dist/types/AddNullForObject.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=AddNullForObject.js.map

package/dist/types/AddNullForObject.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AddNullForObject.js","sourceRoot":"","sources":["../../src/types/AddNullForObject.ts"],"names":[],"mappings":""}

package/dist/types/ComputeObject.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ComputeObject.js.map

package/dist/types/ComputeObject.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ComputeObject.js","sourceRoot":"","sources":["../../src/types/ComputeObject.ts"],"names":[],"mappings":""}

package/dist/types/Replace.d.ts

@@ -0,0 +1,8 @@
+import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
+type _Replace<Target, Source, DifferentKeys extends keyof Target, SameKey extends keyof Source> = ComputeIntersection<{
+    [k in DifferentKeys]: Target[k];
+} & {
+    [k in SameKey]: Source[k];
+}>;
+export type Replace<Target extends object, Source extends object> = _Replace<Target, Source, Exclude<keyof Target, keyof Source>, Extract<keyof Target, keyof Source>>;
+export {};

package/dist/types/Replace.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=Replace.js.map

package/dist/types/Replace.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Replace.js","sourceRoot":"","sources":["../../src/types/Replace.ts"],"names":[],"mappings":""}

package/dist/utils/nonNullable.d.ts

@@ -1,2 +1,2 @@
 import type { IfContains } from "hry-types/src/Any/IfContains";
-export declare function nonNullable<T>(value: IfContains<T, null | undefined, T, "参数类型必须包含 null 或 undefined">): NonNullable<T>;
+export declare function nonNullable<T>(value: IfContains<T, null | undefined, T, "参数类型必须包含 null 或 undefined">, message?: string): NonNullable<T>;

package/dist/utils/nonNullable.js

@@ -1,6 +1,6 @@
-export function nonNullable(value) {
+export function nonNullable(value, message) {
     if (value === null || value === undefined) {
-        throw new Error(`${value} should not be null or undefined`);
+        throw new Error(message !== null && message !== void 0 ? message : `${value} should not be null or undefined`);
     }
     return value;
 }

package/dist/utils/nonNullable.js.map

@@ -1 +1 @@
-{"version":3,"file":"nonNullable.js","sourceRoot":"","sources":["../../src/utils/nonNullable.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,WAAW,CACzB,KAAsE;IAGtE,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,kCAAkC,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO,KAAuB,CAAC;AACjC,CAAC"}
+{"version":3,"file":"nonNullable.js","sourceRoot":"","sources":["../../src/utils/nonNullable.ts"],"names":[],"mappings":"AASA,MAAM,UAAU,WAAW,CACzB,KAAsE,EACtE,OAAgB;IAGhB,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,GAAG,KAAK,kCAAkC,CAAC,CAAC;IACzE,CAAC;IAED,OAAO,KAAuB,CAAC;AACjC,CAAC"}

package/dist/utils/typeEqual.d.ts

@@ -1,2 +1,2 @@
 import type { Equals } from "hry-types/src/Any/Equals";
-export declare function typeEqual<A, B extends Equals<A, B> extends true ? unknown : never>(): void;
+export declare function typeEqual<const A, const B extends Equals<A, B> extends true ? unknown : never = never>(a?: NoInfer<A>): void;

package/dist/utils/typeEqual.js

@@ -1,4 +1,4 @@
-export function typeEqual() {
-    void 0;
+export function typeEqual(a) {
+    void a;
 }
 //# sourceMappingURL=typeEqual.js.map

package/dist/utils/typeEqual.js.map

@@ -1 +1 @@
-{"version":3,"file":"typeEqual.js","sourceRoot":"","sources":["../../src/utils/typeEqual.ts"],"names":[],"mappings":"AAUA,MAAM,UAAU,SAAS;IAIvB,KAAK,CAAC,CAAC;AACT,CAAC"}
+{"version":3,"file":"typeEqual.js","sourceRoot":"","sources":["../../src/utils/typeEqual.ts"],"names":[],"mappings":"AAaA,MAAM,UAAU,SAAS,CAGvB,CAAc;IACd,KAAK,CAAC,CAAC;AACT,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "annil",
-  "version": "1.12.7",
+  "version": "1.13.1",
   "description": "微信小程序(原生开发)插件",
   "main": "dist/index.js",
   "types": "src/index.ts",

package/src/api/ChunkComponent/ChunkComputed/test/normal.test.ts

@@ -1,5 +1,5 @@
 import { Checking } from "hry-types";
-import type { ComputeObject } from "../../../../types/ComputeObj";
+import type { ComputeObject } from "../../../../types/ComputeObject";
 import type { IInjectAllData } from "../../../InstanceInject/instanceConfig";
 import { ChunkComponent } from "../..";
 import type { Mock_RootDoc } from "./mock";

package/src/api/ChunkComponent/ChunkStore/ChunkStoreOption.ts

@@ -2,9 +2,10 @@ import type { G } from "hry-types";
 import type { Validators } from "../../../types/Validators";
 import type { TypeValidator } from "../../RootComponent/Store/StoreOption";
 import type { ValidatorPrefix } from "../ChunkData/validatePrefix";
+import type { ChunkStoreConstraint } from "./ChunkStoreConstraint";
 
 export type ChunkStoreOption<
-  TStore extends object,
+  TStore extends ChunkStoreConstraint,
   TDuplicateKeys extends PropertyKey,
   Prefix extends string,
 > = {

package/src/api/ChunkComponent/ChunkStore/test/error.test.ts

@@ -1,4 +1,3 @@
-import { observable } from "mobx";
 import { ChunkComponent } from "../..";
 import type { Mock_RootDoc } from "./mock";
 
@@ -28,37 +27,10 @@ ChunkComponent<Mock_RootDoc, "slot">()({
   },
 });
 
-type User = {
-  name: string;
-  age?: number;
-};
-type AllGoods = Record<string, User[] | undefined>;
-const M_User = observable({
-  allUser: {
-    categoryA: [{ name: "zhao", age: 20 }],
-    categoryB: [{ name: "zhao" }],
-  } as AllGoods,
-});
-
+// 4. 返回类型错误
 ChunkComponent<{ properties: { categoryId: string } }>()({
   store: {
-    // @ts-expect-error 1 响应式包含undefined时 不可以写成getter函数形式
-    categoryList: (data) => M_User.allUser[data.categoryId],
-
-    _categoryList: {
-      // @ts-expect-error  2 响应式数据不包含undefined时 不可以写成对象形式
-      getter: (data) => M_User.allUser[data.categoryId] as User[],
-      default: 0,
-    },
-    _categoryList1: {
-      getter: (data) => M_User.allUser[data.categoryId],
-      // @ts-expect-error  3 默认值应该为[]
-      default: 0,
-    },
-    _categoryList2: {
-      getter: (data) => M_User.allUser[data.categoryId]?.[0],
-      // @ts-expect-error  3 对象类型错误  namesss
-      default: { namesss: "zhao", age: 20 },
-    },
+    // @ts-expect-error 4.1 返回类型中不可以包含undefined
+    categoryList: () => undefined,
   },
 });

package/src/api/ChunkComponent/ChunkStore/test/normal.test.ts

@@ -1,4 +1,3 @@
-import { observable } from "mobx";
 import { ChunkComponent } from "../..";
 import type { Mock_RootDoc } from "./mock";
 
@@ -10,44 +9,44 @@ ChunkComponent<Mock_RootDoc, "slot">()({
   },
 });
 
-type User = {
-  name: string;
-  age?: number;
-};
-type AllGoods = Record<string, User[]>;
-const M_User = observable({
-  allUser: {
-    categoryA: [{ name: "zhao", age: 20 }],
-    categoryB: [{ name: "zhao" }],
-  } as AllGoods,
-});
+// type User = {
+//   name: string;
+//   age?: number;
+// };
+// type AllGoods = Record<string, User[]>;
+// const M_User = observable({
+//   allUser: {
+//     categoryA: [{ name: "zhao", age: 20 }],
+//     categoryB: [{ name: "zhao" }],
+//   } as AllGoods,
+// });
 
-ChunkComponent<{ properties: { categoryId: string } }>()({
-  data: {
-    // categoryList:[],
-  },
-  store: {
-    // 1 响应式不包含undefined时 只能写成getter函数形式
-    categoryList: (data) => M_User.allUser[data.categoryId],
-    // 2 响应式数据包含undefined时 只能写成对象形式
-    _categoryList: {
-      getter: (data) => M_User.allUser[data.categoryId][0].age,
-      default: 0,
-    },
-    _categoryList1: {
-      getter: (data) => M_User.allUser[data.categoryId] as User[] | undefined,
-      // 默认值为[]
-      default: [],
-    },
-    _categoryList2: {
-      getter: (data) => M_User.allUser[data.categoryId][0] as User | undefined,
-      // 对象类型 默认值为User类型
-      default: { name: "zhao", age: 20 },
-    },
-    _categoryList3: {
-      getter: (data) => M_User.allUser[data.categoryId][0] as User | undefined,
-      // 对象类型 默认值可以为null
-      default: null,
-    },
-  },
-});
+// ChunkComponent<{ properties: { categoryId: string } }>()({
+//   data: {
+//     // categoryList:[],
+//   },
+//   store: {
+//     // 1 响应式不包含undefined时 只能写成getter函数形式
+//     categoryList: (data) => M_User.allUser[data.categoryId],
+//     // 2 响应式数据包含undefined时 只能写成对象形式
+//     _categoryList: {
+//       getter: (data) => M_User.allUser[data.categoryId][0].age,
+//       default: 0,
+//     },
+//     _categoryList1: {
+//       getter: (data) => M_User.allUser[data.categoryId] as User[] | undefined,
+//       // 默认值为[]
+//       default: [],
+//     },
+//     _categoryList2: {
+//       getter: (data) => M_User.allUser[data.categoryId][0] as User | undefined,
+//       // 对象类型 默认值为User类型
+//       default: { name: "zhao", age: 20 },
+//     },
+//     _categoryList3: {
+//       getter: (data) => M_User.allUser[data.categoryId][0] as User | undefined,
+//       // 对象类型 默认值可以为null
+//       default: null,
+//     },
+//   },
+// });

package/src/api/ChunkComponent/index.ts

@@ -1,14 +1,14 @@
 import type { IfExtends } from "hry-types/src/Any/_api";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
 import type { IInjectAllData, IInjectMethods, IInjectStore } from "../InstanceInject/instanceConfig";
-import type { GetComputedDoc } from "../RootComponent/Computed/GetComputedDoc";
+import type { GetComputedDef } from "../RootComponent/Computed/GetComputedDef";
 import type { RootComponentInstance } from "../RootComponent/Instance/RootComponentInstance";
 import type { LifetimesOption } from "../RootComponent/Lifetimes/LifetimesOption";
 import type { MethodsConstraint } from "../RootComponent/Methods/MethodsConstraint";
 import type { ObserversOption } from "../RootComponent/Observers/ObserversOption";
 import type { PageLifetimesOption } from "../RootComponent/PageLifetimes/PageLifetimesOption";
 import type { RootComponentDefinition } from "../RootComponent/returnType";
-import type { GetStoreDoc } from "../RootComponent/Store/GeTStoreDoc";
+import type { GetStoreDef } from "../RootComponent/Store/GetStoreDef";
 import type { WatchOption } from "../RootComponent/Watch/WatchOption";
 import type { ChunkComputedConstraint } from "./ChunkComputed/ChunkComputedConstraint";
 import type { ChunkComputedOption } from "./ChunkComputed/ChunkComputedOption";
@@ -99,9 +99,9 @@ type ChunkComponentConstructor<
   TMethods extends MethodsConstraint = {},
   TData extends object = {},
   StoreDoc extends object = ChunkStoreConstraint<Required<TRootComponentReturnType["properties"]>> extends TStore ? {}
-    : GetStoreDoc<TStore>,
+    : GetStoreDef<TStore>,
   TComputed extends ChunkComputedConstraint = {},
-  ComputedDoc extends object = GetComputedDoc<TComputed>,
+  ComputedDoc extends object = GetComputedDef<TComputed>,
   EventsDoc extends object = IfExtends<ChunkEventsConstraint, TEvents, {}, TEvents>,
   PropertiesDoc extends object = NonNullable<TRootComponentReturnType["properties"]>,
 >(

package/src/api/CustomComponent/CustomData/test/normal.test.ts

@@ -65,17 +65,20 @@ CustomComponent<{}, CompDoc>()({
   },
 });
 
-// data建立的类型在setData时为组件类型
+// 确保实例和setData中使用的data字段类型为文档中定义的类型而非data配置中的类型(data中配置的类型可能推导默认为字面量类型,通过加入Replace泛型替换为对应的文档类型。),
 CustomComponent<{ data: { _num: number } }, CompDoc>()({
   data: {
-    aaa_obj: null as Mock_User | null,
+    aaa_obj: null, // 类型为null 而非 Mock_User | null
+    aaa_str: "a", // 类型为"a" 而非string
+    aaa_num: 123, // 类型为123 而非number
   },
   lifetimes: {
     attached() {
+      // 实例中的aaa_obj类型为文档中定义的类型 Mock_User | null 而非data配置中的类型 null
       void Checking<typeof this.data.aaa_obj, Mock_User | null, Test.Pass>;
-
+      // setData中aaa_str类型为文档中定义的类型 "a" | "b" 而非data配置中的类型 "a"
       this.setData({
-        aaa_obj: {} as Mock_User, // aaa_obj 类型为 Mock_User | null 而非 null
+        aaa_str: "b",
       });
     },
   },

package/src/api/CustomComponent/CustomReturnType/CreateCustomComponentDoc.ts

@@ -1,7 +1,7 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { ComputeIntersection, Select } from "hry-types/src/Object/_api";
-import type { ComputeObject } from "../../../types/ComputeObj";
+import type { ComputeObject } from "../../../types/ComputeObject";
 import type { RemovePrefix } from "../../../types/RemovePrefix";
 import type { Composed } from "../../RootComponent/CustomEvents/CustomEventsTag";
 

package/src/api/CustomComponent/CustomStore/CustomStoreConstraint.ts

@@ -1,4 +1,5 @@
-import type { Getter, WithDefault } from "../../RootComponent/Store/StoreConstraint";
+import type { AddNullForObject } from "../../../types/AddNullForObject";
+import type { Getter } from "../../RootComponent/Store/StoreConstraint";
 
 /**
  * 子组件Data字段约束
@@ -8,5 +9,5 @@ export type CustomStoreConstraint<
   PropertyDoc extends object,
   legal extends object,
 > = {
-  [k in keyof legal]?: Getter<PropertyDoc, legal[k]> | WithDefault<PropertyDoc, legal[k]>;
+  [k in keyof legal]?: Getter<PropertyDoc, AddNullForObject<legal[k]>>;
 };

package/src/api/CustomComponent/CustomStore/CustomStoreOption.ts

@@ -1,6 +1,5 @@
 import type { G } from "hry-types";
 import type { Validators } from "../../../types/Validators";
-import type { TypeValidator } from "../../RootComponent/Store/StoreOption";
 
 export type CustomStoreOption<TStore extends object, legalKeys extends PropertyKey> = {
   /**
@@ -28,7 +27,6 @@ export type CustomStoreOption<TStore extends object, legalKeys extends PropertyK
           "",
           "与inherit和data字段重复或前缀错误"
         >,
-        TypeValidator<TStore>,
       ]
     >;
 };

package/src/api/CustomComponent/CustomStore/test/error.test.ts

@@ -47,54 +47,14 @@ CustomComponent<{
     aaa_num: () => 123,
   },
 });
-
-type DocText = ComponentDoc<{
+// 类型约束错误
+CustomComponent<{
   properties: {
-    aaa_useList: User[];
+    aaa_num: number;
   };
-}>;
-type User = {
-  name: string;
-  age?: number;
-};
-type AllGoods = Record<string, User[] | undefined>;
-const M_User = observable({
-  allUser: {
-    categoryA: [{ name: "zhao", age: 20 }],
-    categoryB: [{ name: "zhao" }],
-  } as AllGoods,
-});
-
-CustomComponent<{ properties: { categoryId: string } }, DocText>()({
-  store: {
-    // @ts-expect-error 1 响应式包含undefined时 不可以写成getter函数形式
-    aaa_useList: (data) => M_User.allUser[data.categoryId],
-  },
-});
-CustomComponent<{ properties: { categoryId: string } }, DocText>()({
-  store: {
-    _aaa_categoryList: {
-      // @ts-expect-error  2 响应式数据不包含undefined时 不可以写成对象形式
-      getter: (data) => M_User.allUser[data.categoryId] as User[],
-      default: 0,
-    },
-  },
-});
-CustomComponent<{ properties: { categoryId: string } }, DocText>()({
-  store: {
-    _aaa_categoryList1: {
-      getter: (data) => M_User.allUser[data.categoryId] as User[] | undefined,
-      // @ts-expect-error  3 默认值应该为[]
-      default: 0,
-    },
-  },
-});
-CustomComponent<{ properties: { categoryId: string } }, DocText>()({
+}, DocA>()({
   store: {
-    _aaa_categoryList2: {
-      getter: (data) => M_User.allUser[data.categoryId]?.[0],
-      // @ts-expect-error 对象类型 默认值为User类型或null namesss错误
-      default: { namesss: "zhao", age: 20 },
-    },
+    // @ts-expect-error 返回类型错误
+    aaa_num: () => undefined,
   },
 });

package/src/api/CustomComponent/CustomStore/test/normal.test.ts

@@ -34,48 +34,3 @@ CustomComponent<{ data: { _num: number } }, DocA, "a">()({
     aaaA_isReady: () => false,
   },
 });
-
-type DocText = ComponentDoc<{
-  properties: {
-    aaa_useList: User[];
-  };
-}>;
-type User = {
-  name: string;
-  age?: number;
-};
-type AllGoods = Record<string, User[]>;
-const M_User = observable({
-  allUser: {
-    categoryA: [{ name: "zhao", age: 20 }],
-    categoryB: [{ name: "zhao" }],
-  } as AllGoods,
-});
-
-// store中getter函数第一个参数为properties的类型
-CustomComponent<{ properties: { categoryId: string } }, DocText>()({
-  store: {
-    // 1 响应式不包含undefined时 只能写成getter函数形式
-    aaa_useList: (data) => M_User.allUser[data.categoryId],
-    // 2 响应式数据包含undefined时 只能写成对象形式
-    _aaa_categoryList: {
-      getter: (data) => M_User.allUser[data.categoryId][0].age,
-      default: 0,
-    },
-    _aaa_categoryList1: {
-      getter: (data) => M_User.allUser[data.categoryId] as User[] | undefined,
-      // 默认值为[]
-      default: [],
-    },
-    _aaa_categoryList2: {
-      getter: (data) => M_User.allUser[data.categoryId][0] as User | undefined,
-      // 对象类型 默认值为User类型
-      default: { name: "zhao", age: 20 },
-    },
-    _aaa_categoryList3: {
-      getter: (data) => M_User.allUser[data.categoryId][0] as User | undefined,
-      // 对象类型 默认值可以为null
-      default: null,
-    },
-  },
-});

package/src/api/CustomComponent/index.ts

@@ -5,12 +5,13 @@ import type { Extra } from "../../types/Extra";
 import type { GetComponentPrefix } from "../../types/GetComponentPrefix";
 import type { InnerFields } from "../../types/InnerData";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
+import type { Replace } from "../../types/Replace";
 import type { ReplacePrefix } from "../../types/ReplacePrefix";
 import type { UnionToComma } from "../../types/UnionToComma.test";
 import type { ComponentDoc } from "../DefineComponent/returnType/ComponentDoc";
 import type { IInjectStore } from "../InstanceInject/instanceConfig";
 import type { RootComponentDefinition } from "../RootComponent/returnType";
-import type { GetStoreDoc } from "../RootComponent/Store/GeTStoreDoc";
+import type { GetStoreDef } from "../RootComponent/Store/GetStoreDef";
 import type { CustomComputedConstraint } from "./CustomComputed/CustomComputedConstraint";
 import type { CustomComputedOption } from "./CustomComputed/CustomComputedOption";
 import type { GetCustomComputedDoc } from "./CustomComputed/GetCustomComputedDoc";
@@ -149,10 +150,10 @@ type Options<
   & ThisType<
     CustomInstance<
       SubMethodsDoc & RootDoc["methods"],
-      // Replace<SubDataDoc, Required<CurrentCompDoc["properties"]>>,// 解除Replace的约束
-      SubDataDoc,
-      // AllRootDataDoc & Replace<SubDataDoc & SubComputedDoc & SubStoreDoc, Required<CurrentCompDoc["properties"]>>, // 解除Replace的约束
-      AllRootDataDoc & SubDataDoc & SubComputedDoc & SubStoreDoc,
+      Replace<SubDataDoc, Required<CurrentCompDoc["properties"]>>, // Replace目的是让setData中的类型与文档中定义的类型一致
+      // SubDataDoc,
+      AllRootDataDoc & Replace<SubDataDoc & SubComputedDoc & SubStoreDoc, Required<CurrentCompDoc["properties"]>>, // Replace的目的是让实例中的类型与文档中定义的类型一致
+      // AllRootDataDoc & SubDataDoc & SubComputedDoc & SubStoreDoc,
       NonNullable<RootDoc["customEvents"]>,
       SubStoreDoc
     >
@@ -223,7 +224,7 @@ type CustomComponentConstructor<
     >,
     TStore,
     {},
-    GetStoreDoc<TStore>
+    GetStoreDef<TStore>
   >,
   // 无效的计算
   ComputedDoc extends object = IfExtends<

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

@@ -1,4 +1,4 @@
-import { Checking, type Test } from "hry-types";
+import { typeEqual } from "../../../../utils/typeEqual";
 import type { CustomComponentDefinition } from "../../../CustomComponent/returnType";
 import type { Bubbles, Composed } from "../../../RootComponent/CustomEvents/CustomEventsTag";
 import { DefineComponent } from "../..";
@@ -1039,11 +1039,11 @@ const aaa = DefineComponent({
     A,
   ],
 });
-void aaa;
-void Checking<typeof aaa, {
+type Epected = {
   events: {
     test_a: string | number | boolean | Composed;
     test_b: string | number | Composed;
     test_c: boolean | Composed;
   };
-}, Test.Pass>;
+};
+typeEqual<Epected>(aaa);

package/src/api/DefineComponent/index.ts

@@ -27,7 +27,7 @@ type Constructor = <
   TPath extends Path = "/",
 >(
   options: Options<TRootComponentDefinition, TCustomComponentDefinitionList, TName, TPath>,
-) => //  根据是否传入name字段来区分生成页面文档还是组件文档。
+) => //  根据是否传入name字段(当isPage不为true时,类型约束name不为空字符串)来区分生成页面文档还是组件文档。
 IfExtends<
   "",
   TName,
@@ -45,14 +45,14 @@ export type DefineComponentOptionRuntime = {
 };
 
 /**
- * DefineComponent是构建组件的核心API,在annil架构中,所有组件(页面组件和自定义组件)都通过它来构建的。
- * 它返回的类型可能是页面文档(`PageDoc`)或者自定义组件文档(`ComponentDoc`),具体取决于传入的选项中是否包含`name`字段。
+ * DefineComponent是构建组件的核心API,所有组件(页面组件和自定义组件)都通过它来构建的。
+ * 它返回的类型可能是页面文档(`PageDoc`)或者自定义组件文档(`ComponentDoc`),具体取决于传入rootComponent中isPage的值。
  * 它的作用是把根组件定义(`RootComponentDefinition`)和子组件定义(`CustomComponentDefinition`和`ChunkComponentDefinition`)整合成原生`Component`的选项配置,最终通过原生`Component`来构建组件。
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any -- 返回类型由Constructor定义,实现无需。
 export const DefineComponent: Constructor = function(options): any {
   Component(
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any -- Options泛型中properties字段类型与WechatMiniprogram.Component.Constructor中的properties字段类型不兼容,但运行时是兼容的,所以这里使用any断言。
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any -- Options泛型中properties字段类型与WechatMiniprogram.Component.Constructor中的properties字段类型不兼容,但运行时是兼容的,所以这里使用any。
     normalizeOptions(options as DefineComponentOptionRuntime) as any,
   );
 };

package/src/api/DefineComponent/normalizeOptions/handleStore/reactionRegister.ts

@@ -1,9 +1,6 @@
 import type mobx from "mobx";
 import type { Instance } from "../../../RootComponent/Instance/RootComponentInstance";
-import type { Getter, StoreConstraint, WithDefault } from "../../../RootComponent/Store/StoreConstraint";
-function isGetter(value: Getter | WithDefault): value is Getter {
-  return typeof value === "function";
-}
+import type { StoreConstraint } from "../../../RootComponent/Store/StoreConstraint";
 export function reactionRegister(this: Instance, storeConfig: StoreConstraint) {
   // eslint-disable-next-line @typescript-eslint/no-require-imports
   const { comparer, reaction, toJS } = require("mobx") as typeof mobx;
@@ -11,23 +8,11 @@ export function reactionRegister(this: Instance, storeConfig: StoreConstraint) {
   this.disposer = {};
   const peddingSetData: Record<string, unknown> = {};
   for (const key in storeConfig) {
-    let value;
-    let getter;
-    const itemConfig = storeConfig[key];
-    if (isGetter(itemConfig)) {
-      value = itemConfig(this.data);
-      if (value === undefined) {
-        throw new Error(`store配置中 ${key} 字段的 函数值不可为undefined`);
-      }
-      getter = itemConfig;
-    } else {
-      if (itemConfig.getter(this.data) !== undefined) {
-        throw new Error(`store配置中  ${key}字段的配置对象中getter函数值不为undefined`);
-      }
-      getter = itemConfig.getter;
-      value = itemConfig.default;
+    const getter = storeConfig[key];
+    const value = getter(this.data);
+    if (value === undefined) {
+      throw new Error(`store配置中 ${key} 字段的返回值不可为undefined`);
     }
-
     // 添加响应式逻辑
     peddingSetData[key] = toJS(value);
     this.disposer[key] = reaction(

package/src/api/DefineComponent/returnType/test/normalPageDoc.test.ts

@@ -19,7 +19,6 @@ const OnlyPropsRootDoc = RootComponent()({
       value: null,
     },
   },
-  customEvents: {}, // EmptyObject
 });
 
 const compDocOnlyProperties = DefineComponent({

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

@@ -5,10 +5,9 @@ import type { ComputedConstraint } from "./ComputedConstraint";
 export type ComputedOption<
   TComputed extends ComputedConstraint,
   CompareKeys extends PropertyKey,
-> // Instance extends object,
- = {
+> = {
   /**
-   * computed字段, [类型约束ComputedConstraint](ComputedConstraint.ts)
+   * computed字段
    * @remarks
    *
    * 函数体内,可通过this.data获取实例其他数据(依赖),setData发生时,若数据(依赖)发生变化则重新运行函数体并setData。

package/src/api/RootComponent/Computed/{GetComputedDoc.ts → GetComputedDef.ts}

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