annil 1.12.7 → 1.13.0

package/CHANGELOG.md

@@ -4,6 +4,19 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.13.0](https://github.com/missannil/annil/compare/v1.12.7...v1.13.0) (2026-03-22)
+
+
+### Features
+
+* 去除store的对象写法 ([9f2d50c](https://github.com/missannil/annil/commit/9f2d50c68fadda1ef166fcbedb2890461650c687))
+
+
+### Bug Fixes
+
+* nonNullable.ts 增加第二个错误信息参数,第三方库和wm库类型中customEvents字段变为events ([a38e8c5](https://github.com/missannil/annil/commit/a38e8c5f14237884c338d57bb11fcee1538b57fe))
+* 使用Replace泛型解决实例和setData中使用data字段推导类型为字面量的问题 ([9a2cf3d](https://github.com/missannil/annil/commit/9a2cf3da30d2b0a5ade1e22800f34df97cce7896))
+
 ## [1.12.7](https://github.com/missannil/annil/compare/v1.12.7...v1.12.7) (2026-03-19)
 
 

package/dist/api/ChunkComponent/ChunkStore/ChunkStoreOption.d.ts

@@ -2,7 +2,8 @@ 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";
-export type ChunkStoreOption<TStore extends object, TDuplicateKeys extends PropertyKey, Prefix extends string> = {
+import type { ChunkStoreConstraint } from "./ChunkStoreConstraint";
+export type ChunkStoreOption<TStore extends ChunkStoreConstraint, TDuplicateKeys extends PropertyKey, Prefix extends string> = {
     store?: TStore & Validators<[
         G.DuplicateFieldValidator<TStore, TDuplicateKeys, "字段重复">,
         ValidatorPrefix<TStore, Prefix>,

package/dist/api/CustomComponent/CustomStore/CustomStoreConstraint.d.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";
 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/dist/api/CustomComponent/CustomStore/CustomStoreOption.d.ts

@@ -1,9 +1,7 @@
 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> = {
     store?: TStore & Validators<[
-        G.IllegalFieldValidator<TStore, legalKeys, 0, "", "与inherit和data字段重复或前缀错误">,
-        TypeValidator<TStore>
+        G.IllegalFieldValidator<TStore, legalKeys, 0, "", "与inherit和data字段重复或前缀错误">
     ]>;
 };

package/dist/api/CustomComponent/index.d.ts

@@ -5,6 +5,7 @@ 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";
@@ -38,7 +39,7 @@ type Options<RootDoc extends RootComponentDefinition, IsPage extends boolean, Cu
     [k in keyof NoInfer<TSubStore>]: k extends keyof (AllRootDataDoc & SubDataDoc) ? never : k extends Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc))> ? k : k extends InnerFields<Prefix> ? k : never;
 }[keyof NoInfer<TSubStore>]> & CustomComputedOption<TSubComputed, {
     [k in keyof NoInfer<TSubComputed>]: k extends keyof (AllRootDataDoc & SubDataDoc & SubStoreDoc) ? never : k extends Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc & SubStoreDoc))> ? k : k extends InnerFields<Prefix> ? k : never;
-}[keyof NoInfer<TSubComputed>]> & CustomEventsOption<TEvents, SubEventsDoc, keyof CustomEventsConstraint<CurrentCompDoc>> & CustomMethodsOption<TSubMethods, Prefix, keyof (CurrentCompDoc["events"] & SubEventsDoc)> & CustomPageLifetimesOption<IsPage, NonNullable<RootDoc["properties"]>> & CustomLifetimesOption & CustomWatchOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers" | "relations">> & CustomObserversOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & ThisType<CustomInstance<SubMethodsDoc & RootDoc["methods"], SubDataDoc, AllRootDataDoc & SubDataDoc & SubComputedDoc & SubStoreDoc, NonNullable<RootDoc["customEvents"]>, SubStoreDoc>>;
+}[keyof NoInfer<TSubComputed>]> & CustomEventsOption<TEvents, SubEventsDoc, keyof CustomEventsConstraint<CurrentCompDoc>> & CustomMethodsOption<TSubMethods, Prefix, keyof (CurrentCompDoc["events"] & SubEventsDoc)> & CustomPageLifetimesOption<IsPage, NonNullable<RootDoc["properties"]>> & CustomLifetimesOption & CustomWatchOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers" | "relations">> & CustomObserversOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & ThisType<CustomInstance<SubMethodsDoc & RootDoc["methods"], Replace<SubDataDoc, Required<CurrentCompDoc["properties"]>>, AllRootDataDoc & Replace<SubDataDoc & SubComputedDoc & SubStoreDoc, Required<CurrentCompDoc["properties"]>>, NonNullable<RootDoc["customEvents"]>, SubStoreDoc>>;
 type CustomComponentConstructor<TRootDoc extends RootComponentDefinition, TOriginalCompDoc extends ComponentDoc, TSupplementalPrefix extends string = "", IsPage extends boolean = TRootDoc["isPage"] extends true ? true : false, CurrentPrefix extends string = `${GetComponentPrefix<TOriginalCompDoc>}${Capitalize<TSupplementalPrefix>}`, CurrentCompDoc extends ComponentDoc = IfExtends<TSupplementalPrefix, "", TOriginalCompDoc & {
     properties: Extra<CurrentPrefix>;
 }, ReplacePrefix<TOriginalCompDoc & {

package/dist/api/CustomComponent/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/CustomComponent/index.ts"],"names":[],"mappings":"AA2SA,MAAM,UAAU,eAAe;IAW7B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAQ,CAAC;AAC5C,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/CustomComponent/index.ts"],"names":[],"mappings":"AA4SA,MAAM,UAAU,eAAe;IAW7B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAQ,CAAC;AAC5C,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/handleStore/reactionRegister.js

@@ -1,27 +1,12 @@
-function isGetter(value) {
-    return typeof value === "function";
-}
 export function reactionRegister(storeConfig) {
     const { comparer, reaction, toJS } = require("mobx");
     this.disposer = {};
     const peddingSetData = {};
     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(() => getter(this.data), (value) => {

package/dist/api/DefineComponent/normalizeOptions/handleStore/reactionRegister.js.map

@@ -1 +1 @@
-{"version":3,"file":"reactionRegister.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/handleStore/reactionRegister.ts"],"names":[],"mappings":"AAGA,SAAS,QAAQ,CAAC,KAA2B;IAC3C,OAAO,OAAO,KAAK,KAAK,UAAU,CAAC;AACrC,CAAC;AACD,MAAM,UAAU,gBAAgB,CAAiB,WAA4B;IAE3E,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAgB,CAAC;IAEpE,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;IACnB,MAAM,cAAc,GAA4B,EAAE,CAAC;IACnD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAC9B,IAAI,KAAK,CAAC;QACV,IAAI,MAAM,CAAC;QACX,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACzB,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,MAAM,IAAI,KAAK,CAAC,YAAY,GAAG,sBAAsB,CAAC,CAAC;YACzD,CAAC;YACD,MAAM,GAAG,UAAU,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;gBAC/C,MAAM,IAAI,KAAK,CAAC,aAAa,GAAG,8BAA8B,CAAC,CAAC;YAClE,CAAC;YACD,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;YAC3B,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC;QAC7B,CAAC;QAGD,cAAc,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;QAClC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAC3B,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EACvB,CAAC,KAAc,EAAE,EAAE;YACjB,IAAI,CAAC,OAAO,CAAC;gBACX,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC;aACnB,CAAC,CAAC;QACL,CAAC,EACD;YACE,MAAM,EAAE,QAAQ,CAAC,UAAU;SAC5B,CACF,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;AAC/B,CAAC"}
+{"version":3,"file":"reactionRegister.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/handleStore/reactionRegister.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,gBAAgB,CAAiB,WAA4B;IAE3E,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAgB,CAAC;IAEpE,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;IACnB,MAAM,cAAc,GAA4B,EAAE,CAAC;IACnD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;QAChC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,YAAY,GAAG,qBAAqB,CAAC,CAAC;QACxD,CAAC;QAED,cAAc,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;QAClC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAC3B,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EACvB,CAAC,KAAc,EAAE,EAAE;YACjB,IAAI,CAAC,OAAO,CAAC;gBACX,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC;aACnB,CAAC,CAAC;QACL,CAAC,EACD;YACE,MAAM,EAAE,QAAQ,CAAC,UAAU;SAC5B,CACF,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;AAC/B,CAAC"}

package/dist/api/RootComponent/Store/StoreConstraint.d.ts

@@ -1,6 +1,2 @@
 export type Getter<T extends object = object, R = unknown> = (data: T) => R;
-export type WithDefault<T extends object = object, R = unknown> = {
-    getter: Getter<T, R | undefined>;
-    default: unknown;
-};
-export type StoreConstraint<T extends object = object> = Record<string, Getter<T> | WithDefault<T>>;
+export type StoreConstraint<T extends object = object> = Record<string, Getter<T>>;

package/dist/api/RootComponent/Store/StoreOption.d.ts

@@ -1,8 +1,6 @@
 import type { G } from "hry-types";
 import type { As } from "hry-types/src/Any/As";
 import type { IfContains } from "hry-types/src/Any/IfContains";
-import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { IsPureObject } from "hry-types/src/Any/IsPureObject";
 import type { Func } from "hry-types/src/Misc/Func";
 import type { Validators } from "../../../types/Validators";
 import type { StoreConstraint } from "./StoreConstraint";
@@ -13,14 +11,5 @@ export type StoreOption<TStore extends StoreConstraint, TDuplicateKeys extends P
     ]>;
 };
 export type TypeValidator<TStore, Result = {
-    [k in keyof TStore]: TStore[k] extends {
-        getter: (...arg: unknown[]) => infer R;
-        default: infer D;
-    } ? IfContains<R, undefined, IfExtends<IsPureObject<Exclude<R, undefined>>, true, IfExtends<D, Exclude<R, undefined> | null, unknown, {
-        default: () => "⚠️类型错误⚠️";
-    }>, IfExtends<D, Exclude<R, undefined>, unknown, {
-        default: () => "⚠️类型错误⚠️";
-    }>>, {
-        getter: () => "⚠️类型不包含undefined⚠️ ";
-    }> : IfContains<ReturnType<As<TStore[k], Func>>, undefined, () => "⚠️类型包含undefined,应写成对象形式⚠️", unknown>;
+    [k in keyof TStore]: IfContains<ReturnType<As<TStore[k], Func>>, undefined, () => "⚠️返回类型中不可以包含undefined⚠️", unknown>;
 }> = Record<keyof TStore, unknown> extends Result ? unknown : Result;

package/dist/thirdLib/vant/Popup.d.ts

@@ -17,7 +17,7 @@ export type Popup = CreateComponentType<"popup", {
         safeAreaInsetTop?: boolean;
         lockScroll?: boolean;
     };
-    customEvents: {
+    events: {
         clickOverlay: null;
         close: null;
     };

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

@@ -24,7 +24,7 @@ export type Textarea = CreateComponentType<"textarea", {
         adjustKeyboardTo?: "cursor" | "bottom";
         showConfirmBar?: boolean;
     };
-    customEvents: {
+    events: {
         linechange: {
             height: number;
             heightRpx: number;

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/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/package.json

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

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/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/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,6 +5,7 @@ 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";
@@ -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
     >

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/RootComponent/Events/EventsOption.ts

@@ -15,14 +15,14 @@ export type EventsOption<TEvents extends object> = {
    * @example B
    * ```ts
    * type ComponentDocA = {
-   *  customEvents: {
+   *  events: {
    *    aaa_str: string;
    *    aaa_num: number | Bubbles;
    *  };
    * };
    *
    * type ComponentDocB = {
-   *  customEvents: {
+   *  events: {
    *    bbb_str: string;
    *    bbb_num: number | Capture;
    *  };

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

@@ -1,8 +1,2 @@
 export type Getter<T extends object = object, R = unknown> = (data: T) => R;
-
-export type WithDefault<T extends object = object, R = unknown> = {
-  getter: Getter<T, R | undefined>;
-  default: unknown;
-};
-
-export type StoreConstraint<T extends object = object> = Record<string, Getter<T> | WithDefault<T>>;
+export type StoreConstraint<T extends object = object> = Record<string, Getter<T>>;

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

@@ -1,8 +1,6 @@
 import type { G } from "hry-types";
 import type { As } from "hry-types/src/Any/As";
 import type { IfContains } from "hry-types/src/Any/IfContains";
-import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { IsPureObject } from "hry-types/src/Any/IsPureObject";
 import type { Func } from "hry-types/src/Misc/Func";
 import type { Validators } from "../../../types/Validators";
 import type { StoreConstraint } from "./StoreConstraint";
@@ -45,43 +43,11 @@ export type StoreOption<
 export type TypeValidator<
   TStore,
   Result = {
-    [k in keyof TStore]: TStore[k] extends {
-      getter: (...arg: unknown[]) => infer R;
-      default: infer D;
-    }
-      // 对象形式
-      ? IfContains<
-        R,
-        undefined,
-        // 如果包含undefined时
-        IfExtends<
-          // 是否为纯对象
-          IsPureObject<Exclude<R, undefined>>,
-          true,
-          // 如果是纯对象,则default可以为null
-          IfExtends<
-            D,
-            Exclude<R, undefined> | null,
-            unknown,
-            { default: () => "⚠️类型错误⚠️" }
-          >,
-          // 如果不是纯对象,则default只能为getter返回值
-          IfExtends<
-            D,
-            Exclude<R, undefined>,
-            unknown,
-            { default: () => "⚠️类型错误⚠️" }
-          >
-        >,
-        // 不包含undefined时,报错getter
-        { getter: () => "⚠️类型不包含undefined⚠️ " }
-      >
-      // 非对象形式
-      : IfContains<
-        ReturnType<As<TStore[k], Func>>,
-        undefined,
-        () => "⚠️类型包含undefined,应写成对象形式⚠️",
-        unknown
-      >;
+    [k in keyof TStore]: IfContains<
+      ReturnType<As<TStore[k], Func>>,
+      undefined,
+      () => "⚠️返回类型中不可以包含undefined⚠️",
+      unknown
+    >;
   },
 > = Record<keyof TStore, unknown> extends Result ? unknown : Result;

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

@@ -1,5 +1,4 @@
 import { observable } from "mobx";
-import type { DetailedType } from "../../../../types/DetailedType";
 import { RootComponent } from "../..";
 const user = observable({
   name: "zhao",
@@ -29,44 +28,10 @@ RootComponent()({
     userAge: () => user.age,
   },
 });
-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,
-});
-
-// store中getter函数第一个参数为properties的类型
+// 3. 返回类型错误
 RootComponent()({
-  properties: {
-    categoryId: String as DetailedType<keyof typeof M_User.allUser>,
-  },
-  data: {
-    // categoryList:[],
-  },
   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: [],
-    },
-    _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 默认值应该为null
-      default: 0,
-    },
+    // @ts-expect-error 3.1 返回类型中不可以包含undefined
+    xxx: () => "xxx" as string | undefined,
   },
 });

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

@@ -22,49 +22,3 @@ interface StoreDocExpected {
 
 // 返回类型为函数返回类型
 void Checking<typeof storeDoc, StoreDocExpected, Test.Pass>;
-
-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的类型
-RootComponent()({
-  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/thirdLib/vant/Popup.ts

@@ -63,7 +63,7 @@ export type Popup = CreateComponentType<"popup", {
      */
     lockScroll?: boolean;
   };
-  customEvents: {
+  events: {
     clickOverlay: null;
     close: null; // ddd
   };

package/src/thirdLib/wm/Textarea.ts

@@ -88,7 +88,7 @@ export type Textarea = CreateComponentType<"textarea", {
      */
     showConfirmBar?: boolean;
   };
-  customEvents: {
+  events: {
     /**
      * 输入框行数变化时调用 1.0.0
      */

package/src/thirdLib/wm/swiper.test.ts

@@ -0,0 +1,24 @@
+import { CustomComponent, typeEqual } from "../../index";
+import type { Wm } from "../index";
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const swiper = CustomComponent<{}, Wm.Swiper>()({
+  data: {
+    swiper_style: "16/9",
+  },
+  computed: {
+    swiper_class() {
+      return `w-full h-auto ${this.data.swiper_style}`;
+    },
+  },
+  events: {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    swiper_change(e) {
+      typeEqual<typeof e.detail.current, number>();
+    },
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    swiper_animationfinish(e) {
+      typeEqual<typeof e.detail.current, number>();
+    },
+  },
+});

package/src/thirdLib/wm/swiper.ts

@@ -94,7 +94,7 @@ export type Swiper = CreateComponentType<"swiper", {
      */
     easingFunction?: "defaultValue" | "linear" | "easeInCubic" | "easeOutCubic" | "easeInOutCubic";
   };
-  customEvents: {
+  events: {
     /**
      * current 改变时会触发 change 事件，event.detail = `{current, source}`
      */

package/src/types/CreateComponentType.ts

@@ -11,7 +11,7 @@ import type { AddPrefix } from "./AddPrefix";
  * ```ts
  * type $CustomA = CreateComponentType<"customA", {
  *   properties: { num: string };
- *   customEvents: { onTap: string }
+ *   events: { onTap: string }
  * }>;
  *
  * // 等同下面的类型
@@ -19,7 +19,7 @@ import type { AddPrefix } from "./AddPrefix";
  *    properties: {
  *      customA_num: string;
  *    };
- *    customEvents: {
+ *    events: {
  *      customA_onTap: string;
  *    };
  * ```

package/src/types/ExtendComponentType.ts

@@ -27,10 +27,10 @@ type Validator<
  * ```ts
  * type $CustomA = ExtendComponentType<
  *  { properties: { aaa_num: number };
- *   customEvents: { aaa_xxx: string }
+ *   events: { aaa_xxx: string }
  *  },
  *  { properties: { aaa_str: string };
- *   customEvents: { aaa_yyy: string }
+ *   events: { aaa_yyy: string }
  * }>;
  *
  * // 等同下面的类型
@@ -39,7 +39,7 @@ type Validator<
  *      aaa_num: number;
  *      aaa_str: string;
  *    };
- *    customEvents: {
+ *    events: {
  *      aaa_xxx: string;
  *      aaa_yyy: string;
  *    };
@@ -53,8 +53,8 @@ export type ExtendComponentType<
 
 // type test0 = ExtendComponentType<{ properties: { aaa_xxx: string } }, { properties: { aaa_xxx: string } }>; // => "aaa_xxx字段重复"
 
-// type test1 = ExtendComponentType<{ customEvents: { aaa_xxx: string } }, { customEvents: { aaa_xxx: string } }>; // => "aaa_xxx字段重复"
+// type test1 = ExtendComponentType<{ events: { aaa_xxx: string } }, { events: { aaa_xxx: string } }>; // => "aaa_xxx字段重复"
 
 // type test2 = ExtendComponentType<{ properties: { aaa_xxx: string } }, { properties: { ddd_xxx: string } }>; // => "前缀错误,应为aaa"
 
-// type test3 = ExtendComponentType<{ customEvents: { aaa_xxx: string } }, { customEvents: { ddd_xxx: string } }>; // => "前缀错误,应为aaa"
+// type test3 = ExtendComponentType<{ events: { aaa_xxx: string } }, { events: { ddd_xxx: string } }>; // => "前缀错误,应为aaa"

package/src/utils/nonNullable.ts

@@ -2,15 +2,18 @@ import type { IfContains } from "hry-types/src/Any/IfContains";
 
 /**
  * 使用此函数代替!断言
+ * 支持可选的第二个参数作为错误消息
  * @param value 类型中必须包含 null 或 undefined
+ * @param message 可选，抛出错误时的消息
  * @returns 去除 null 和 undefined 后的类型
  */
 export function nonNullable<T>(
   value: IfContains<T, null | undefined, T, "参数类型必须包含 null 或 undefined">,
+  message?: string,
 ): NonNullable<T> {
   /* istanbul ignore next  */
   if (value === null || value === undefined) {
-    throw new Error(`${value} should not be null or undefined`);
+    throw new Error(message ?? `${value} should not be null or undefined`);
   }
 
   return value as NonNullable<T>;