annil 1.1.1 → 1.2.0-beta.0

package/CHANGELOG.md

@@ -4,6 +4,20 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.2.0-beta.0](https://github.com/missannil/annil/compare/v1.1.2...v1.2.0-beta.0) (2023-12-07)
+
+
+### Features
+
+* 页面onLoad和组件pageLifetimes.load周期参数使用encodeURI加密和解析 ([8b5cc6e](https://github.com/missannil/annil/commit/8b5cc6ee65abb0def005126c9382a07b8affc0ca))
+
+## [1.1.2](https://github.com/missannil/annil/compare/v1.1.1...v1.1.2) (2023-12-06)
+
+
+### Bug Fixes
+
+* 测试load功能 ([bb3f0fd](https://github.com/missannil/annil/commit/bb3f0fd2315f2429488478047109b07d16686741))
+
 ## [1.1.1](https://github.com/missannil/annil/compare/v1.1.0...v1.1.1) (2023-12-04)
 
 

package/dist/api/DefineComponent/collectOptionsForComponent.d.ts

@@ -1,4 +1,4 @@
 import type { RootComponentTrueOptions } from "../RootComponent";
 import type { SubComponentTrueOptions } from "../SubComponent";
-import type { FinalOptionsForComponent } from ".";
-export declare function collectOptionsForComponent(rootComponentOption: RootComponentTrueOptions | undefined, subComponentsList: SubComponentTrueOptions[] | undefined): FinalOptionsForComponent;
+import type { FinalOptionsOfComponent } from ".";
+export declare function collectOptionsForComponent(rootComponentOption: RootComponentTrueOptions | undefined, subComponentsList: SubComponentTrueOptions[] | undefined): FinalOptionsOfComponent;

package/dist/api/DefineComponent/collectOptionsForComponent.js

@@ -2,39 +2,32 @@ import { BBeforeCreate } from "../../behaviors/BbeforeCreated";
 import { BComputedAndWatch } from "../../behaviors/BComputedAndWatch";
 import { initComputed } from "../../behaviors/BComputedAndWatch/initComputed";
 import { BStore } from "../../behaviors/BStore";
-import { deepClone } from "../../utils/deepClone";
 import { INNERMARKER } from "../../utils/InnerMarker";
 import { isEmptyObject } from "../../utils/isEmptyObject";
 function onLoadReceivedDataHandle(option) {
     const innerData = option[INNERMARKER.url];
     if (innerData === undefined)
         return;
-    const optionData = JSON.parse(decodeURIComponent(innerData));
-    for (const key in optionData) {
-        option[key] = optionData[key];
+    const decodeOption = JSON.parse(decodeURIComponent(innerData));
+    for (const key in decodeOption) {
+        option[key] = decodeOption[key];
     }
-    this.setData(option);
     delete option[INNERMARKER.url];
-    Reflect.deleteProperty(this.data, INNERMARKER.url);
 }
-function onLoadHijack(options, before, after = []) {
-    options.methods || (options.methods = {});
-    const cloneOpt = deepClone(options);
-    const originalOnLoad = options.methods.onLoad;
-    options.methods.onLoad = function (props) {
-        before.forEach((func) => {
-            func.call(this, props, cloneOpt);
-        });
-        originalOnLoad === null || originalOnLoad === void 0 ? void 0 : originalOnLoad.call(this, props);
-        after.forEach((func) => {
-            func.call(this, props, cloneOpt);
-        });
+function hijack(config, field, before = [], after = []) {
+    const originalFunc = config[field];
+    config[field] = function (...args) {
+        before.forEach(func => func.call(this, ...args));
+        originalFunc && originalFunc.apply(this, args);
+        after.forEach(func => func.call(this, ...args));
     };
+    return;
 }
-const INNERFIELDS = ["disposer"];
-function InternalFieldProtection(methodsConfig) {
-    const methodsConfigKeys = Object.keys(methodsConfig);
-    for (const key of INNERFIELDS) {
+function InternalFieldProtection(config, keys) {
+    if (!config)
+        return;
+    const methodsConfigKeys = Object.keys(config);
+    for (const key of keys) {
         if (methodsConfigKeys.includes(key)) {
             throw Error(`${key}已被内部字段占用`);
         }
@@ -119,8 +112,10 @@ function collectRootComponentOption(finalOptions, funcOptions, rootComponentOpti
     otherFieldsHandle(finalOptions, rootComponentOptions);
 }
 export function collectOptionsForComponent(rootComponentOption, subComponentsList) {
+    var _a, _b;
     const finalOptionsForComponent = {
         options: {
+            addGlobalClass: true,
             multipleSlots: true,
             pureDataPattern: /^_/,
             virtualHost: true,
@@ -138,15 +133,16 @@ export function collectOptionsForComponent(rootComponentOption, subComponentsLis
     if (subComponentsList && !isEmptyObject(subComponentsList)) {
         subComponentsHandle(finalOptionsForComponent, subComponentsList, funcOptions);
     }
-    if (!isEmptyObject(funcOptions)) {
-        funcConfigHandle(finalOptionsForComponent, rootComponentOption === null || rootComponentOption === void 0 ? void 0 : rootComponentOption.isPage, funcOptions);
-    }
-    finalOptionsForComponent.methods && InternalFieldProtection(finalOptionsForComponent.methods);
-    finalOptionsForComponent.behaviors.push(BBeforeCreate);
-    onLoadHijack(finalOptionsForComponent, [onLoadReceivedDataHandle, initComputed], []);
+    funcConfigHandle(finalOptionsForComponent, rootComponentOption === null || rootComponentOption === void 0 ? void 0 : rootComponentOption.isPage, funcOptions);
+    finalOptionsForComponent.methods && InternalFieldProtection(finalOptionsForComponent.methods, ["disposer"]);
+    ((_a = finalOptionsForComponent.methods) === null || _a === void 0 ? void 0 : _a.onLoad)
+        && hijack(finalOptionsForComponent.methods, "onLoad", [onLoadReceivedDataHandle, initComputed], []);
+    ((_b = finalOptionsForComponent.pageLifetimes) === null || _b === void 0 ? void 0 : _b.load)
+        && hijack(finalOptionsForComponent.pageLifetimes, "load", [onLoadReceivedDataHandle], []);
     if (finalOptionsForComponent.isPage) {
         Reflect.deleteProperty(finalOptionsForComponent.options, "virtualHost");
     }
+    finalOptionsForComponent.behaviors.push(BBeforeCreate);
     return finalOptionsForComponent;
 }
 //# sourceMappingURL=collectOptionsForComponent.js.map

package/dist/api/DefineComponent/collectOptionsForComponent.js.map

@@ -1 +1 @@
-{"version":3,"file":"collectOptionsForComponent.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/collectOptionsForComponent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"collectOptionsForComponent.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/collectOptionsForComponent.ts"],"names":[],"mappings":"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"}

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

@@ -1,6 +1,6 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { Func } from "hry-types/src/Misc/Func";
-import type { WMComponent, WMCompPageLifetimes, WMPageLifetimes } from "../../types/OfficialTypeAlias";
+import type { WMComponent } from "../../types/OfficialTypeAlias";
 import type { LifetimesConstraint } from "../RootComponent/Lifetimes/LifetimesConstraint";
 import type { RootComponentDoc } from "../RootComponent/RootComponentDoc";
 import type { SubComponentDoc } from "../SubComponent/SubComponentDoc";
@@ -9,29 +9,29 @@ import type { CreateComponentDoc } from "./ReturnType/CreateComponentDoc";
 import type { CreatePageDoc } from "./ReturnType/CreatePageDoc";
 import type { RootComponentOption } from "./RootComponent/RootComponentOption";
 import type { SubComponentsOption } from "./SubComponents/SubComponentsOption";
+import type { ComputedConstraint } from "../RootComponent/Computed/ComputedConstraint";
+import type { DataConstraint } from "../RootComponent/Data/DataConstraint";
+import type { MethodsConstraint } from "../RootComponent/Methods/MethodsConstraint";
+import type { PageLifetimesOption } from "../RootComponent/PageLifetimes/PageLifetimesOption";
+import type { StoreConstraint } from "../RootComponent/Store/StoreConstraint";
 type Path = `/${string}`;
 type RootOptions<TRootComponentDoc extends RootComponentDoc, TSubComponentTuple extends SubComponentDoc[], TName extends string, TPath extends Path> = NameOrPathOption<TName, TPath, TRootComponentDoc["isPage"] & {}> & RootComponentOption<TRootComponentDoc> & SubComponentsOption<TSubComponentTuple>;
 interface DefineComponentConstructor {
     <TRootComponentDoc extends RootComponentDoc = {}, TSubComponentTuple extends SubComponentDoc[] = [], TName extends string = "", TPath extends Path = "/">(options: RootOptions<TRootComponentDoc, TSubComponentTuple, TName, TPath>): IfExtends<"", TName, CreatePageDoc<TRootComponentDoc, TPath>, CreateComponentDoc<TRootComponentDoc, TName, TSubComponentTuple>>;
 }
 export type FuncOptions = Record<"pageLifetimes" | "lifetimes" | "watch", Record<string, Func[]>>;
-export type FinalOptionsForComponent = {
+export type FinalOptionsOfComponent = {
     isPage?: boolean;
     options?: WMComponent.Options;
     properties?: Record<string, any>;
-    data?: object;
-    store?: object;
-    computed?: Record<string, Func>;
+    data?: DataConstraint;
+    store?: StoreConstraint;
+    computed?: ComputedConstraint;
     observers?: Record<string, Func>;
     behaviors?: string[];
-    methods?: Record<string, Func> & {
-        __storeConfig__?: Func;
-    };
+    methods?: MethodsConstraint;
     watch?: Record<string, Func>;
     lifetimes?: LifetimesConstraint;
-    pageLifetimes?: Partial<WMCompPageLifetimes & {
-        load: Func;
-    } & WMPageLifetimes>;
-};
+} & PageLifetimesOption<false, object>;
 export declare const DefineComponent: DefineComponentConstructor;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/index.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAyD1E,MAAM,CAAC,MAAM,eAAe,GAA+B,UAAS,OAAO;IACzE,SAAS,CACP,0BAA0B,CAAC,OAAO,CAAC,aAAqD,EAAE,OAAO,CAAC,aAAa,CAAC,CACjH,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/index.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAwD1E,MAAM,CAAC,MAAM,eAAe,GAA+B,UAAS,OAAO;IACzE,SAAS,CACP,0BAA0B,CAAC,OAAO,CAAC,aAAyC,EAAE,OAAO,CAAC,aAAa,CAAC,CACrG,CAAC;AACJ,CAAC,CAAC"}

package/dist/api/RootComponent/Computed/ComputedOption.d.ts

@@ -1,5 +1,5 @@
 import type { DuplicateFieldValidator } from "hry-types/src/Generic/DuplicateFieldValidator";
 import type { ComputedConstraint } from "./ComputedConstraint";
-export type ComputedOption<TComputed extends ComputedConstraint, OtherData extends object> = {
-    computed?: TComputed & DuplicateFieldValidator<TComputed, keyof OtherData>;
+export type ComputedOption<TComputed extends ComputedConstraint, CompareKeys extends PropertyKey> = {
+    computed?: TComputed & DuplicateFieldValidator<TComputed, CompareKeys>;
 };

package/dist/api/RootComponent/Computed/GetComputedDoc.d.ts

@@ -1,4 +1,4 @@
 import type { ComputedConstraint } from "./ComputedConstraint";
-export type GetComputedDoc<TComputed extends ComputedConstraint> = TComputed extends unknown ? {
+export type GetComputedDoc<TComputed extends ComputedConstraint> = {
     [k in keyof TComputed]: ReturnType<TComputed[k]>;
-} : never;
+};

package/dist/api/RootComponent/Computed/test/normal.test.js

@@ -7,9 +7,12 @@ const RootDoc = RootComponent()({
     data: {
         lastName: "lastName",
     },
+    store: {
+        prefix: () => "hry-",
+    },
     computed: {
         fullName() {
-            return this.data.firstName + this.data.lastName;
+            return this.data.prefix + this.data.firstName + this.data.lastName;
         },
         user() {
             return {};
@@ -19,6 +22,7 @@ const RootDoc = RootComponent()({
         },
         readOnly() {
             Checking;
+            this.data.user.id = "xxx";
             return "str";
         },
     },
@@ -41,15 +45,4 @@ const EmptyComputedFieldDoc = RootComponent()({
     },
 });
 Checking;
-RootComponent()({
-    isPage: true,
-    properties: {
-        obj: Object,
-    },
-    computed: {
-        age() {
-            return this.data.obj.age;
-        },
-    },
-});
 //# sourceMappingURL=normal.test.js.map

package/dist/api/RootComponent/Computed/test/normal.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Computed/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAGhD,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAMtC,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAC9B,UAAU,EAAE;QACV,SAAS,EAAE,MAAM;KAClB;IACD,IAAI,EAAE;QACJ,QAAQ,EAAE,UAAU;KACrB;IACD,QAAQ,EAAE;QACR,QAAQ;YAEN,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;QAClD,CAAC;QACD,IAAI;YACF,OAAO,EAAe,CAAC;QACzB,CAAC;QAED,WAAW;YACT,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;QAChD,CAAC;QACD,QAAQ;YAEN,QAWC,CAAC;YAEF,OAAO,KAAK,CAAC;QACf,CAAC;KACF;CACF,CAAC,CAAC;AAUH,QAAoE,CAAC;AAKrE,MAAM,kBAAkB,GAAG,aAAa,EAAE,CAAC;IACzC,OAAO,EAAE;QACP,EAAE;YAEA,QAAyC,CAAC;QAC5C,CAAC;KACF;CACF,CAAC,CAAC;AAEH,QAA+E,CAAC;AAKhF,MAAM,qBAAqB,GAAG,aAAa,EAAE,CAAC;IAC5C,QAAQ,EAAE,EAAE;IACZ,OAAO,EAAE;QACP,EAAE;YAEA,QAAyC,CAAC;QAC5C,CAAC;KACF;CACF,CAAC,CAAC;AAEH,QAAkF,CAAC;AAEnF,aAAa,EAAE,CAAC;IACd,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE;QACV,GAAG,EAAE,MAAqD;KAC3D;IACD,QAAQ,EAAE;QACR,GAAG;YAED,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;QAC3B,CAAC;KACF;CACF,CAAC,CAAC"}
+{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Computed/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAEhD,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAGtC,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAC9B,UAAU,EAAE;QACV,SAAS,EAAE,MAAM;KAClB;IACD,IAAI,EAAE;QACJ,QAAQ,EAAE,UAAU;KACrB;IACD,KAAK,EAAE;QACL,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM;KACrB;IACD,QAAQ,EAAE;QACR,QAAQ;YAEN,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;QACrE,CAAC;QACD,IAAI;YACF,OAAO,EAAe,CAAC;QACzB,CAAC;QAED,WAAW;YACT,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;QAChD,CAAC;QACD,QAAQ;YAEN,QAYC,CAAC;YAGF,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC;YAE1B,OAAO,KAAK,CAAC;QACf,CAAC;KACF;CACF,CAAC,CAAC;AAUH,QAAoE,CAAC;AAKrE,MAAM,kBAAkB,GAAG,aAAa,EAAE,CAAC;IACzC,OAAO,EAAE;QACP,EAAE;YAEA,QAAyC,CAAC;QAC5C,CAAC;KACF;CACF,CAAC,CAAC;AAEH,QAA+E,CAAC;AAKhF,MAAM,qBAAqB,GAAG,aAAa,EAAE,CAAC;IAC5C,QAAQ,EAAE,EAAE;IACZ,OAAO,EAAE;QACP,EAAE;YAEA,QAAyC,CAAC;QAC5C,CAAC;KACF;CACF,CAAC,CAAC;AAEH,QAAkF,CAAC"}

package/dist/api/RootComponent/CustomEvents/CustomEventsOption.d.ts

@@ -1,5 +1,5 @@
 import type { V } from "hry-types";
 import type { CustomEventConstraint } from "./CustomEventConstraint";
-export type CustomEventsOption<TCustomEvents extends CustomEventConstraint, DuplicateFieldCheck> = {
-    customEvents?: TCustomEvents & V.IllegalFieldValidator<TCustomEvents, "bubbles" | "composed" | "capturePhase", 1, "options"> & V.DuplicateFieldValidator<TCustomEvents, keyof DuplicateFieldCheck, "与events字段重复">;
+export type CustomEventsOption<TCustomEvents extends CustomEventConstraint, EventsKeys extends PropertyKey> = {
+    customEvents?: TCustomEvents & V.IllegalFieldValidator<TCustomEvents, "bubbles" | "composed" | "capturePhase", 1, "options"> & V.DuplicateFieldValidator<TCustomEvents, EventsKeys, "与events字段重复">;
 };

package/dist/api/RootComponent/Data/DataConstraint.d.ts

@@ -1 +1 @@
-export type DataConstraint = Record<string, any>;
+export type DataConstraint = Record<string, unknown>;

package/dist/api/RootComponent/Data/DataOption.d.ts

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

package/dist/api/RootComponent/Data/GetDataDoc.d.ts

@@ -1,4 +1 @@
-import type { O } from "hry-types";
-import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { Func } from "hry-types/src/Misc/Func";
-export type GetDataDoc<TData extends object, Type extends "去掉函数字段" | "返回函数字段" | "函数值类型变为函数返回类型" = "函数值类型变为函数返回类型"> = IfExtends<Type, "函数值类型变为函数返回类型", O.ReturnTypeInObject<TData>, IfExtends<Type, "去掉函数字段", O.Filter<TData, Func>, O.Select<TData, Func>>>;
+export type GetDataDoc<TData extends object> = TData;

package/dist/api/RootComponent/Data/test/GetDataDoc.test.d.ts

@@ -1,6 +1,7 @@
-import type { Mock_User } from "../../Properties/test/normalRequired.test";
 export declare const mock_data: {
-    reactiveUser: () => Mock_User;
+    func: {
+        foo(num: number): number;
+    };
     num: number;
     str: string;
 };

package/dist/api/RootComponent/Data/test/GetDataDoc.test.js

@@ -1,13 +1,13 @@
 import { Checking } from "hry-types";
 export const mock_data = {
-    reactiveUser: () => ({}),
+    func: {
+        foo(num) {
+            return num + 1;
+        },
+    },
     num: 2,
     str: "str",
 };
 Checking;
 Checking;
-Checking;
-Checking;
-Checking;
-Checking;
 //# sourceMappingURL=GetDataDoc.test.js.map

package/dist/api/RootComponent/Data/test/GetDataDoc.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"GetDataDoc.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Data/test/GetDataDoc.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAKhD,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC,EAAgB,CAAA;IACrC,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,KAAK;CACX,CAAC;AAMF,QAAyC,CAAC;AAM1C,QAAyC,CAAC;AAM1C,QAAyC,CAAC;AAO1C,QAAyC,CAAC;AAI1C,QAAyC,CAAC;AAI1C,QAAyC,CAAC"}
+{"version":3,"file":"GetDataDoc.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Data/test/GetDataDoc.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAIhD,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,IAAI,EAAE;QACJ,GAAG,CAAC,GAAW;YACb,OAAO,GAAG,GAAG,CAAC,CAAC;QACjB,CAAC;KACF;IACD,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,KAAK;CACX,CAAC;AAYF,QAAyC,CAAC;AAO1C,QAAyC,CAAC"}

package/dist/api/RootComponent/Data/test/normal.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Data/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAGhD,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAKtC,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAC9B,IAAI,EAAE;QACJ,MAAM,EAAsB,MAAM;QAClC,GAAG,EAAE,GAAG;QACR,eAAe,EAAE,GAAG;KACrB;IACD,OAAO,EAAE;QACP,GAAG;YAED,QAIC,CAAC;QACJ,CAAC;KACF;CACF,CAAC,CAAC;AASH,QAA4D,CAAC;AAG7D,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;IACvC,IAAI,EAAE,EAAE;IACR,OAAO,EAAE;QACP,EAAE;YAEA,QAAyC,CAAC;QAC5C,CAAC;KACF;CACF,CAAC,CAAC;AAGH,QAA6E,CAAC;AAK9E,MAAM,aAAa,GAAG,aAAa,EAAE,CAAC;IACpC,OAAO,EAAE;QACP,EAAE;YAEA,QAAyC,CAAC;QAC5C,CAAC;KACF;CACF,CAAC,CAAC;AAGH,QAA0E,CAAC"}
+{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Data/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAGhD,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAItC,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAC9B,IAAI,EAAE;QACJ,MAAM,EAAW,MAAM;QACvB,GAAG,EAAE,GAAG;QACR,eAAe,EAAE,GAAG;KACrB;IACD,OAAO,EAAE;QACP,GAAG;YACD,QAIC,CAAC;QACJ,CAAC;KACF;CACF,CAAC,CAAC;AAQH,QAA4D,CAAC;AAG7D,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;IACvC,IAAI,EAAE,EAAE;IACR,OAAO,EAAE;QACP,EAAE;YAEA,QAAyC,CAAC;QAC5C,CAAC;KACF;CACF,CAAC,CAAC;AAGH,QAA6E,CAAC;AAK9E,MAAM,aAAa,GAAG,aAAa,EAAE,CAAC;IACpC,OAAO,EAAE;QACP,EAAE;YAEA,QAAyC,CAAC;QAC5C,CAAC;KACF;CACF,CAAC,CAAC;AAGH,QAA0E,CAAC"}

package/dist/api/RootComponent/Events/EventsConstraint.d.ts

@@ -1,16 +1,17 @@
+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";
 import type { CustomEventsDoc } from "../CustomEvents/CustomEventsDoc";
 import type { Bubbles, BubblesCaptureComposed, BubblesComposed, Capture, CaptureComposed, CustomEventsTags } from "../CustomEvents/CustomEventsTag";
 type FilterNormalFields<O extends object> = Select<O, Bubbles | Capture, "contains->">;
-type GetBubblesOrCaptureEventsFromCompDoc<TComponentDocTuple extends ComponentDoc[], Result extends CustomEventsDoc = {}> = TComponentDocTuple extends [infer Head extends ComponentDoc, ...infer Rest extends ComponentDoc[]] ? GetBubblesOrCaptureEventsFromCompDoc<Rest, Result & (FilterNormalFields<Head["customEvents"] & {}>)> : Result;
+type GetBubblesOrCaptureEventsFromCompDoc<ComponentDocList extends ComponentDoc[], Result extends CustomEventsDoc = {}> = ComponentDocList extends [infer Head extends ComponentDoc, ...infer Rest extends ComponentDoc[]] ? GetBubblesOrCaptureEventsFromCompDoc<Rest, Result & (FilterNormalFields<Head["customEvents"] & {}>)> : Result;
 type _AddSuffixForKey<key extends string, Value extends CustomEventsTags> = Value extends BubblesComposed ? `${key}_bubbles` | `${key}_bubbles_catch` : Value extends CaptureComposed ? `${key}_capture` | `${key}_capture_catch` : Value extends BubblesCaptureComposed ? `${key}_bubbles&capture` | `${key}_bubbles&capture_catch` : never;
 type TransformCustomEventsDocTypeToFunctionTypeAndAddSuffix<T extends CustomEventsDoc> = {
     [k in keyof T as _AddSuffixForKey<k & string, Extract<T[k], CustomEventsTags>>]?: (detail: Detail<Exclude<T[k], CustomEventsTags>>) => void;
 };
-type GetAllSubCustomEventsConstraint<TReceivedComponentDoc extends ComponentDoc[] | ComponentDoc> = {} extends TReceivedComponentDoc ? {} : TReceivedComponentDoc extends ComponentDoc[] ? TransformCustomEventsDocTypeToFunctionTypeAndAddSuffix<GetBubblesOrCaptureEventsFromCompDoc<TReceivedComponentDoc>> : ComponentDoc["customEvents"] & {};
-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>;
+type GetAllSubCustomEventsConstraint<ComponentDocList extends ComponentDoc[], AllCustomEvents extends CustomEventsDoc = GetBubblesOrCaptureEventsFromCompDoc<ComponentDocList>> = IfExtends<{}, AllCustomEvents, BaseEvent, TransformCustomEventsDocTypeToFunctionTypeAndAddSuffix<AllCustomEvents>>;
+type BaseEvent = Record<string, (e: WMBaseEvent) => any>;
+export type EventsConstraint<ComponentDocList extends ComponentDoc[] = []> = IfExtends<[
+], ComponentDocList, BaseEvent, GetAllSubCustomEventsConstraint<ComponentDocList>>;
 export {};

package/dist/api/RootComponent/Events/EventsOption.d.ts

@@ -1,4 +1,3 @@
-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> = {
+    events?: TEvents;
 };

package/dist/api/RootComponent/Events/test/normal.test.js

@@ -2,7 +2,7 @@ import { Checking } from "hry-types";
 import { RootComponent } from "../..";
 RootComponent()({
     events: {
-        aaa(e) {
+        onTap(e) {
             Checking;
         },
     },

package/dist/api/RootComponent/Events/test/normal.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Events/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAWhD,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAMtC,aAAa,EAAE,CAAC;IACd,MAAM,EAAE;QACN,GAAG,CAAC,CAAC;YACH,QAA0C,CAAC;QAC7C,CAAC;KACF;CACF,CAAC,CAAC;AAKH,aAAa,EAAE,CAAC;IACd,MAAM,EAAE;QAEN,OAAO,CACL,CAKC;YAED,QAAuD,CAAC;YAExD,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAK,CAAC,QAAQ,CAAC;YAElC,QAAoD,CAAC;YAErD,QAAoF,CAAC;YAErF,QAAsE,CAAC;QACzE,CAAC;QAED,GAAG,CAAC,CAA0B;YAC5B,QAAgD,CAAC;QACnD,CAAC;QAED,GAAG,CAAC,CAAuB;YACzB,MAAM,MAAM,GAAG,CAAC,CAAC,IAAK,CAAC,EAAE,CAAC;YAE1B,QAA0C,CAAC;QAC7C,CAAC;QAED,GAAG,CAAC,CAAwC;YAC1C,QAA+D,CAAC;QAClE,CAAC;QAED,GAAG,CAAC,CAAiC;YACnC,QAAwD,CAAC;QAC3D,CAAC;KACF;CACF,CAAC,CAAC;AAsBH,MAAM,OAAO,GAAG,aAAa,EAAkC,CAAC;IAC9D,MAAM,EAAE;QAEN,eAAe,CAAC,CAAC;YACf,QAA4C,CAAC;QAC/C,CAAC;QAED,qBAAqB,CAAC,CAAC;YACrB,QAA4C,CAAC;QAC/C,CAAC;QAED,eAAe,CAAC,CAA+E;YAC7F,QAA4C,CAAC;YAE7C,QAAgF,CAAC;YAEjF,QAAkE,CAAC;QACrE,CAAC;QAED,qBAAqB,CAAC,CAAC;YACrB,QAA4C,CAAC;QAC/C,CAAC;KACF;CACF,CAAC,CAAC;AAYH,QAAkD,CAAC;AAKnD,MAAM,iBAAiB,GAAG,aAAa,EAAkC,CAAC;IACxE,MAAM,EAAE,EAAE;CACX,CAAC,CAAC;AAEH,QAAiD,CAAC;AAKlD,MAAM,cAAc,GAAG,aAAa,EAAkC,CAAC,EAAE,CAAC,CAAC;AAE3E,QAA8C,CAAC"}
+{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Events/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAWhD,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAMtC,aAAa,EAAE,CAAC;IACd,MAAM,EAAE;QACN,KAAK,CAAC,CAAC;YACL,QAA0C,CAAC;QAC7C,CAAC;KACF;CACF,CAAC,CAAC;AAKH,aAAa,EAAE,CAAC;IACd,MAAM,EAAE;QAEN,OAAO,CACL,CAKC;YAED,QAAuD,CAAC;YAExD,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAK,CAAC,QAAQ,CAAC;YAElC,QAAoD,CAAC;YAErD,QAAoF,CAAC;YAErF,QAAsE,CAAC;QACzE,CAAC;QAED,GAAG,CAAC,CAA0B;YAC5B,QAAgD,CAAC;QACnD,CAAC;QAED,GAAG,CAAC,CAAuB;YACzB,MAAM,MAAM,GAAG,CAAC,CAAC,IAAK,CAAC,EAAE,CAAC;YAE1B,QAA0C,CAAC;QAC7C,CAAC;QAED,GAAG,CAAC,CAAwC;YAC1C,QAA+D,CAAC;QAClE,CAAC;QAED,GAAG,CAAC,CAAiC;YACnC,QAAwD,CAAC;QAC3D,CAAC;KACF;CACF,CAAC,CAAC;AAsBH,MAAM,OAAO,GAAG,aAAa,EAAkC,CAAC;IAC9D,MAAM,EAAE;QAEN,eAAe,CAAC,CAAC;YACf,QAA4C,CAAC;QAC/C,CAAC;QAED,qBAAqB,CAAC,CAAC;YACrB,QAA4C,CAAC;QAC/C,CAAC;QAED,eAAe,CAAC,CAA+E;YAC7F,QAA4C,CAAC;YAE7C,QAAgF,CAAC;YAEjF,QAAkE,CAAC;QACrE,CAAC;QAED,qBAAqB,CAAC,CAAC;YACrB,QAA4C,CAAC;QAC/C,CAAC;KACF;CACF,CAAC,CAAC;AAYH,QAAkD,CAAC;AAKnD,MAAM,iBAAiB,GAAG,aAAa,EAAkC,CAAC;IACxE,MAAM,EAAE,EAAE;CACX,CAAC,CAAC;AAEH,QAAiD,CAAC;AAKlD,MAAM,cAAc,GAAG,aAAa,EAAkC,CAAC,EAAE,CAAC,CAAC;AAE3E,QAA8C,CAAC"}

package/dist/api/RootComponent/Lifetimes/LifetimesConstraint.d.ts

@@ -1,5 +1,6 @@
+import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { WMCompLifetimes } from "../../../types/OfficialTypeAlias";
-import type { FinalOptionsForComponent } from "../../DefineComponent";
-export type LifetimesConstraint = WMCompLifetimes["lifetimes"] & {
-    beforeCreate?: (options: FinalOptionsForComponent) => void;
-};
+import type { FinalOptionsOfComponent } from "../../DefineComponent";
+export type LifetimesConstraint = ComputeIntersection<WMCompLifetimes["lifetimes"] & {
+    beforeCreate?: (options: FinalOptionsOfComponent) => void;
+}>;

package/dist/api/RootComponent/Lifetimes/test/error.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Lifetimes/test/error.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAItC,aAAa,EAAE,CAAC;IACd,SAAS,EAAE;QACT,YAAY,KAAI,CAAC;QAEjB,OAAO,KAAI,CAAC;QAEZ,QAAQ,KAAI,CAAC;QAEb,KAAK,KAAI,CAAC;QAEV,QAAQ,KAAI,CAAC;QAEb,KAAK,CAAC,GAAG;YACP,GAAG,CAAC,KAAK,CAAC;QACZ,CAAC;QACD,KAAK,KAAI,CAAC;QAEV,GAAG,KAAI,CAAC;KACT;CACF,CAAC,CAAC;AAKH,aAAa,EAAE,CAAC;IACd,MAAM,EAAE,IAAI;IAEZ,SAAS,EAAE,EAAE;CACd,CAAC,CAAC"}
+{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Lifetimes/test/error.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,aAAa,EAAE,CAAC;IACd,SAAS,EAAE;QACT,YAAY,KAAI,CAAC;QACjB,OAAO,KAAI,CAAC;QACZ,QAAQ,KAAI,CAAC;QACb,KAAK,KAAI,CAAC;QACV,QAAQ,KAAI,CAAC;QACb,KAAK,CAAC,GAAG;YACP,GAAG,CAAC,KAAK,CAAC;QACZ,CAAC;QACD,KAAK,KAAI,CAAC;QAEV,GAAG,KAAI,CAAC;KACT;CACF,CAAC,CAAC;AAEH,aAAa,EAAE,CAAC;IACd,MAAM,EAAE,IAAI;IAEZ,SAAS,EAAE,EAAE;CACd,CAAC,CAAC"}

package/dist/api/RootComponent/PageLifetimes/PageLifetimesOption.d.ts

@@ -1,13 +1,12 @@
 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?: Partial<WMCompPageLifetimes> & {
-        load?: () => void;
-    };
+    pageLifetimes?: ComputeIntersection<Partial<WMCompPageLifetimes> & {
+        load?: (props: object) => void | Promise<void>;
+    }>;
 }, {
-    pageLifetimes?: Partial<Omit<WMPageLifetimes, "onLoad">> & {
-        onLoad?: (props: ComputeIntersection<Required<RemoveNullOfRequired<PropertiesDoc>>>) => void;
-    };
+    pageLifetimes?: ComputeIntersection<Partial<Omit<WMPageLifetimes, "onLoad">> & {
+        onLoad?: (props: PropertiesDoc) => void | Promise<void>;
+    }>;
 }>;

package/dist/api/RootComponent/PageLifetimes/test/error.test.js

@@ -4,7 +4,9 @@ RootComponent()({
         show() { },
         hide() { },
         resize() { },
-        load() { },
+        load(props) {
+            props;
+        },
         xxx() { },
     },
 });

package/dist/api/RootComponent/PageLifetimes/test/error.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/PageLifetimes/test/error.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAItC,aAAa,EAAE,CAAC;IACd,aAAa,EAAE;QACb,IAAI,KAAI,CAAC;QACT,IAAI,KAAI,CAAC;QACT,MAAM,KAAI,CAAC;QACX,IAAI,KAAI,CAAC;QAET,GAAG,KAAI,CAAC;KACT;CACF,CAAC,CAAC;AAKH,aAAa,EAAE,CAAC;IACd,MAAM,EAAE,IAAI;IACZ,aAAa,EAAE;QACb,MAAM,CAAC,KAAK;YACV,KAAK,CAAC;QACR,CAAC;QAED,GAAG,KAAI,CAAC;KACT;CACF,CAAC,CAAC"}
+{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/PageLifetimes/test/error.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAItC,aAAa,EAAE,CAAC;IACd,aAAa,EAAE;QACb,IAAI,KAAI,CAAC;QACT,IAAI,KAAI,CAAC;QACT,MAAM,KAAI,CAAC;QACX,IAAI,CAAC,KAAK;YACR,KAAK,CAAC;QACR,CAAC;QAED,GAAG,KAAI,CAAC;KACT;CACF,CAAC,CAAC;AAKH,aAAa,EAAE,CAAC;IACd,MAAM,EAAE,IAAI;IACZ,aAAa,EAAE;QACb,MAAM,CAAC,KAAK;YACV,KAAK,CAAC;QACR,CAAC;QAED,GAAG,KAAI,CAAC;KACT;CACF,CAAC,CAAC"}

package/dist/api/RootComponent/PageLifetimes/test/normal.test.js

@@ -7,7 +7,9 @@ RootComponent()({
             Checking;
         },
         show() { },
-        load() { },
+        load(obj) {
+            Checking;
+        },
     },
 });
 RootComponent()({

package/dist/api/RootComponent/PageLifetimes/test/normal.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/PageLifetimes/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAChD,OAAO,EAAqB,aAAa,EAAE,MAAM,aAAa,CAAC;AAQ/D,aAAa,EAAE,CAAC;IAEd,aAAa,EAAE;QACb,IAAI,KAAI,CAAC;QACT,MAAM,CAAC,IAAI;YACT,QAAsE,CAAC;QACzE,CAAC;QACD,IAAI,KAAI,CAAC;QAET,IAAI,KAAI,CAAC;KACV;CACF,CAAC,CAAC;AAKH,aAAa,EAAE,CAAC;IACd,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE;QACV,GAAG,EAAE,MAAM;QACX,GAAG,EAAE,MAAM;QACX,KAAK,EAAE;YACL,IAAI,EAAE,MAAiC;YACvC,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE;SACnC;QACD,cAAc,EAAE;YACd,IAAI,EAAE,MAAwC;YAC9C,KAAK,EAAE,IAAI;SACZ;KACF;IAED,aAAa,EAAE;QAEb,MAAM,CAAC,KAAK;YACV,QAWC,CAAC;QACJ,CAAC;QACD,MAAM;YACJ,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxB,CAAC;KACF;CACF,CAAC,CAAC"}
+{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/PageLifetimes/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAChD,OAAO,EAAqB,aAAa,EAAE,MAAM,aAAa,CAAC;AAO/D,aAAa,EAAE,CAAC;IAEd,aAAa,EAAE;QACb,IAAI,KAAI,CAAC;QACT,MAAM,CAAC,IAAI;YACT,QAAsE,CAAC;QACzE,CAAC;QACD,IAAI,KAAI,CAAC;QAET,IAAI,CAAC,GAAG;YACN,QAAuC,CAAC;QAC1C,CAAC;KACF;CACF,CAAC,CAAC;AAKH,aAAa,EAAE,CAAC;IACd,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE;QACV,GAAG,EAAE,MAAM;QACX,GAAG,EAAE,MAAM;QACX,KAAK,EAAE;YACL,IAAI,EAAE,MAAiC;YACvC,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE;SACnC;QACD,cAAc,EAAE;YACd,IAAI,EAAE,MAAwC;YAC9C,KAAK,EAAE,IAAI;SACZ;KACF;IAED,aAAa,EAAE;QAEb,MAAM,CAAC,KAAK;YACV,QASC,CAAC;QACJ,CAAC;QACD,MAAM;YACJ,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxB,CAAC;KACF;CACF,CAAC,CAAC"}

package/dist/api/RootComponent/RootComponentDoc.d.ts

@@ -14,8 +14,22 @@ type _RootComponentDoc = {
     lifetimes?: LifetimesConstraint;
     pageLifetimes?: Partial<WMCompPageLifetimes & {
         load: Func;
-    } & WMPageLifetimes>;
+    }>;
 };
-type _Validator<O, ErrKeys = Exclude<keyof O, keyof _RootComponentDoc>> = [ErrKeys] extends [never] ? _RootComponentDoc : `错误的字段${ErrKeys & string}`;
-export type RootComponentDoc<O extends _Validator<O> = _RootComponentDoc> = O;
+type _Validator<O, Doc, ErrKeys = Exclude<keyof O, keyof Doc>> = [ErrKeys] extends [never] ? Doc : `错误的字段${ErrKeys & string}`;
+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;
 export {};

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

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

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

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

package/dist/api/RootComponent/Store/test/normal.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Store/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,MAAM,IAAI,GAAG,UAAU,CAAC;IACtB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,EAAE;CACR,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAG,aAAa,EAAE,CAAC;IAC/B,KAAK,EAAE;QACL,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI;QACzB,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG;KACxB;CACF,CAAC,CAAC;AASH,QAAsD,CAAC"}
+{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Store/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,MAAM,IAAI,GAAG,UAAU,CAAC;IACtB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,EAAE;CACR,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAG,aAAa,EAAE,CAAC;IAC/B,KAAK,EAAE;QACL,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI;QACzB,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG;KACxB;CACF,CAAC,CAAC;AAUH,QAAsD,CAAC"}

package/dist/api/RootComponent/Watch/test/WatchProperties.test.js

@@ -104,8 +104,6 @@ RootComponent()({
             Checking;
             Checking;
         },
-        "optional_objOrNull.age"() {
-        },
     },
 });
 //# sourceMappingURL=WatchProperties.test.js.map

package/dist/api/RootComponent/Watch/test/WatchProperties.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"WatchProperties.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Watch/test/WatchProperties.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WatchProperties.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Watch/test/WatchProperties.test.ts"],"names":[],"mappings":"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"}