annil 1.1.2 → 1.2.0-beta.1

package/CHANGELOG.md

@@ -4,6 +4,20 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.2.0-beta.1](https://github.com/missannil/annil/compare/v1.2.0-beta.0...v1.2.0-beta.1) (2023-12-07)
+
+
+### Bug Fixes
+
+* 组件/页面接受load和onLoad是参数解析的问题 ([d4b13f9](https://github.com/missannil/annil/commit/d4b13f95679dd5ea81f872991403fe4bb3cfd448))
+
+## [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)
 
 

package/dist/api/DefineComponent/collectOptionsForComponent.js

@@ -2,47 +2,33 @@ 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)
+    if (innerData !== INNERMARKER.url)
         return;
-    const optionData = JSON.parse(decodeURIComponent(innerData));
-    for (const key in optionData) {
-        option[key] = optionData[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);
-        });
-    };
+    this.setData(option);
 }
-function attachedHijack(options, before, after = []) {
-    options.lifetimes || (options.lifetimes = {});
-    const originalAttached = options.lifetimes.attached;
-    options.lifetimes.attached = function () {
-        before.forEach((func) => {
-            func.call(this, options);
-        });
-        originalAttached === null || originalAttached === void 0 ? void 0 : originalAttached.call(this);
-        after.forEach((func) => {
-            func.call(this, options);
-        });
+function loadReceivedDataHandle(option) {
+    const innerData = option[INNERMARKER.url];
+    if (innerData === undefined)
+        return;
+    const decodeOption = JSON.parse(decodeURIComponent(innerData));
+    for (const key in decodeOption) {
+        option[key] = decodeOption[key];
+    }
+    option[INNERMARKER.url] = INNERMARKER.url;
+}
+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;
 }
 function InternalFieldProtection(config, keys) {
     if (!config)
@@ -124,40 +110,7 @@ function customEventsHandle(componentOptions, customEventsConfig) {
         }
     }
 }
-function triggerCompLoad(props) {
-    if (!this.__compLoadList__)
-        return;
-    this.__compLoadList__.forEach((loadFunc) => {
-        loadFunc(props);
-    });
-}
-function getPageInstance(pageId) {
-    const pagestack = getCurrentPages();
-    let pageInstance;
-    pagestack.some((instance) => {
-        if (instance.getPageId() === pageId) {
-            pageInstance = instance;
-            return true;
-        }
-        return false;
-    });
-    return pageInstance;
-}
-function collectLoadLifetimesOfComponent(finalOptionsForComponent) {
-    var _a;
-    const loadFunc = (_a = finalOptionsForComponent.pageLifetimes) === null || _a === void 0 ? void 0 : _a.load;
-    console.log(loadFunc, finalOptionsForComponent);
-    if (!loadFunc)
-        return;
-    const pageInstance = getPageInstance(this.getPageId());
-    const __compLoadList__ = (pageInstance.__compLoadList__ || (pageInstance.__compLoadList__ = []));
-    __compLoadList__.push(loadFunc.bind(this));
-}
 function collectRootComponentOption(finalOptions, funcOptions, rootComponentOptions) {
-    console.log("-------------------------");
-    InternalFieldProtection(rootComponentOptions.customEvents, ["load"]);
-    InternalFieldProtection(rootComponentOptions.methods, ["load"]);
-    InternalFieldProtection(rootComponentOptions.events, ["load"]);
     rootComponentOptions.customEvents && customEventsHandle(finalOptions, rootComponentOptions.customEvents);
     delete rootComponentOptions.customEvents;
     rootComponentOptions.events && eventsHandle(finalOptions, rootComponentOptions.events);
@@ -166,8 +119,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,
@@ -185,17 +140,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);
-    }
+    funcConfigHandle(finalOptionsForComponent, rootComponentOption === null || rootComponentOption === void 0 ? void 0 : rootComponentOption.isPage, funcOptions);
     finalOptionsForComponent.methods && InternalFieldProtection(finalOptionsForComponent.methods, ["disposer"]);
-    finalOptionsForComponent.behaviors.push(BBeforeCreate);
-    console.log(finalOptionsForComponent, 999, funcOptions);
-    attachedHijack(finalOptionsForComponent, [collectLoadLifetimesOfComponent], []);
-    onLoadHijack(finalOptionsForComponent, [onLoadReceivedDataHandle, initComputed], [triggerCompLoad]);
+    ((_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", [loadReceivedDataHandle], []);
     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,6 +9,11 @@ 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 {
@@ -19,19 +24,14 @@ 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: (prop: unknown) => void;
-    } & 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/index.d.ts

@@ -1,10 +1,9 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { NoInfer } from "hry-types/src/Generic/NoInfer";
 import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { Func } from "hry-types/src/Misc/Func";
 import type { ComputeIntersection } from "hry-types/src/Object/_api";
 import type { ComputeObject } from "../../types/ComputeObj";
-import type { WMCompOtherOption, WMCompPageLifetimes, WMPageLifetimes } from "../../types/OfficialTypeAlias";
+import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
 import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
 import type { ComputedConstraint } from "./Computed/ComputedConstraint";
 import type { ComputedOption } from "./Computed/ComputedOption";
@@ -30,7 +29,7 @@ import type { GetStoreDoc } from "./Store/GeTStoreDoc";
 import type { StoreConstraint } from "./Store/StoreConstraint";
 import type { StoreOption } from "./Store/StoreOption";
 import type { WatchOption } from "./Watch/WatchOption";
-type RootComponentOptions<TEvents extends object, TIsPage extends boolean, TCustomEvents extends CustomEventConstraint, TMethods extends MethodsConstraint, TProperties extends PropertiesConstraint, TData extends object, TStore extends StoreConstraint, TComputed extends Record<string, Func>, EventsDoc extends object, CustomEventsDoc extends object, PropertiesDoc extends object, DataDoc extends object, StoreDoc extends object, ComputedDoc extends object> = MethodsOption<TMethods, keyof (EventsDoc & CustomEventsDoc)> & PropertiesOption<TProperties> & IsPageOption<TIsPage> & EventsOption<TEvents> & CustomEventsOption<TCustomEvents, keyof EventsDoc> & DataOption<TData, keyof PropertiesDoc> & StoreOption<TStore, keyof (PropertiesDoc & DataDoc)> & ComputedOption<TComputed, keyof (PropertiesDoc & DataDoc & StoreDoc)> & PageLifetimesOption<TIsPage, NoInfer<PropertiesDoc>> & LifetimesOption<TIsPage> & WatchOption<ComputedDoc & Required<PropertiesDoc> & DataDoc & StoreDoc> & Partial<Omit<WMCompOtherOption, "pageLifetimes">> & ThisType<RootComponentInstance<TIsPage, TMethods, DataDoc, DataDoc & Required<PropertiesDoc> & StoreDoc & ComputedDoc, CustomEventsDoc, StoreDoc>>;
+type RootComponentOptions<TEvents extends object, TIsPage extends boolean, TCustomEvents extends CustomEventConstraint, TMethods extends MethodsConstraint, TProperties extends PropertiesConstraint, TData extends object, TStore extends StoreConstraint, TComputed extends Record<string, Func>, EventsDoc extends object, CustomEventsDoc extends object, PropertiesDoc extends object, DataDoc extends object, StoreDoc extends object, ComputedDoc extends object> = MethodsOption<TMethods, keyof (EventsDoc & CustomEventsDoc)> & PropertiesOption<TProperties> & IsPageOption<TIsPage> & EventsOption<TEvents> & CustomEventsOption<TCustomEvents, keyof EventsDoc> & DataOption<TData, keyof PropertiesDoc> & StoreOption<TStore, keyof (PropertiesDoc & DataDoc)> & ComputedOption<TComputed, keyof (PropertiesDoc & DataDoc & StoreDoc)> & PageLifetimesOption<TIsPage, PropertiesDoc> & LifetimesOption<TIsPage> & WatchOption<ComputedDoc & Required<PropertiesDoc> & DataDoc & StoreDoc> & Partial<Omit<WMCompOtherOption, "pageLifetimes">> & ThisType<RootComponentInstance<TIsPage, TMethods, DataDoc, DataDoc & Required<PropertiesDoc> & StoreDoc & ComputedDoc, CustomEventsDoc, StoreDoc>>;
 type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = {
     <TEvents extends EventsConstraint<TComponentDocList>, TIsPage extends boolean = false, const TProperties extends PropertiesConstraint = {}, TData extends object = {}, TStore extends StoreConstraint = {}, TComputed extends ComputedConstraint = {}, TCustomEvents extends IfExtends<TIsPage, false, CustomEventConstraint, EmptyObject> = {}, TMethods extends MethodsConstraint = {}, EventsDoc extends object = IfExtends<EventsConstraint<TComponentDocList>, TEvents, {}, TEvents>, CustomEventsDoc extends object = GetCustomEventDoc<TCustomEvents>, PropertiesDoc extends object = GetPropertiesDoc<TProperties, TIsPage>, DataDoc extends object = TData, StoreDoc extends object = GetStoreDoc<TStore>, ComputedDoc extends object = GetComputedDoc<TComputed>>(options: RootComponentOptions<TEvents, TIsPage, TCustomEvents, TMethods, TProperties, TData, TStore, TComputed, EventsDoc, CustomEventsDoc, PropertiesDoc, DataDoc, StoreDoc, ComputedDoc>): ComputeIntersection<IfExtends<TIsPage, false, {}, {
         isPage: true;
@@ -57,13 +56,13 @@ export type RootComponentTrueOptions = {
     data?: DataConstraint;
     computed?: ComputedConstraint;
     customEvents?: CustomEventConstraint;
+    observers?: Record<string, Func>;
     methods?: MethodsConstraint;
+    behaviors?: string[];
     events?: EventsConstraint;
     store?: StoreConstraint;
     watch?: Record<string, Func>;
     lifetimes?: LifetimesConstraint;
-    pageLifetimes?: Partial<WMCompPageLifetimes & {
-        load: Func;
-    } & WMPageLifetimes>;
+    pageLifetimes?: PageLifetimesOption<false, object>["pageLifetimes"] | PageLifetimesOption<true, object>["pageLifetimes"];
 };
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/RootComponent/index.ts"],"names":[],"mappings":"AA6HA,MAAM,UAAU,aAAa;IAM3B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAmC,CAAQ,CAAC;AACxE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/RootComponent/index.ts"],"names":[],"mappings":"AA4HA,MAAM,UAAU,aAAa;IAM3B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAmC,CAAQ,CAAC;AACxE,CAAC"}

package/dist/api/SubComponent/SubPageLifetimes/SubPageLifetimesOption.d.ts

@@ -1,2 +1,2 @@
 import type { PageLifetimesOption } from "../../RootComponent/PageLifetimes/PageLifetimesOption";
-export type SubPageLifetimesOption<TIsPage extends boolean, AllPropertiesDoc extends object> = PageLifetimesOption<TIsPage, AllPropertiesDoc>;
+export type SubPageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends object> = PageLifetimesOption<TIsPage, PropertiesDoc>;

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

@@ -5,8 +5,15 @@ import type { GetComponentPrefix } from "../../types/GetComponentPrefix";
 import type { ReplacePrefix } from "../../types/ReplacePrefix";
 import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
 import type { Func } from "hry-types/src/Misc/Func";
-import type { WMCompLifetimes, WMCompOtherOption, WMCompPageLifetimes, WMPageLifetimes } from "../../types/OfficialTypeAlias";
+import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
+import type { ComputedConstraint } from "../RootComponent/Computed/ComputedConstraint";
+import type { DataConstraint } from "../RootComponent/Data/DataConstraint";
+import type { EventsConstraint } from "../RootComponent/Events/EventsConstraint";
+import type { LifetimesConstraint } from "../RootComponent/Lifetimes/LifetimesConstraint";
+import type { MethodsConstraint } from "../RootComponent/Methods/MethodsConstraint";
+import type { PageLifetimesOption } from "../RootComponent/PageLifetimes/PageLifetimesOption";
 import type { RootComponentDoc } from "../RootComponent/RootComponentDoc";
+import type { StoreConstraint } from "../RootComponent/Store/StoreConstraint";
 import type { GetSubComputedDoc } from "./SubComputed/GetSubComputedDoc";
 import type { SubComputedConstraint } from "./SubComputed/SubComputedConstraint";
 import type { SubComputedOption } from "./SubComputed/SubComputedOption";
@@ -34,14 +41,14 @@ type SubComponentConstructor<TRootDoc extends RootComponentDoc, TOriginalCompDoc
 export declare function SubComponent<RootDoc extends RootComponentDoc, CompDoc extends ComponentDoc, Prefix extends string = "">(): IfExtends<EmptyObject, CompDoc, (opt: EmptyObject) => never, SubComponentConstructor<RootDoc, CompDoc, Prefix>>;
 export type SubComponentTrueOptions = {
     inhrit?: string;
-    data?: Record<string, unknown>;
-    computed?: Record<string, Func>;
-    events?: Record<string, Func>;
-    methods?: Record<string, Func>;
+    data?: DataConstraint;
+    computed?: ComputedConstraint;
+    store?: StoreConstraint;
+    events?: EventsConstraint;
+    methods?: MethodsConstraint;
+    observers?: Record<string, Func>;
     watch?: Record<string, Func>;
-    lifetimes?: WMCompLifetimes["lifetimes"];
-    pageLifetimes?: Partial<WMCompPageLifetimes & {
-        load: Func;
-    } & WMPageLifetimes>;
+    lifetimes?: LifetimesConstraint;
+    pageLifetimes?: PageLifetimesOption<false, object>["pageLifetimes"] | PageLifetimesOption<true, object>["pageLifetimes"];
 };
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SubComponent/index.ts"],"names":[],"mappings":"AAsMA,MAAM,UAAU,YAAY;IAK1B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAkC,CAAQ,CAAC;AACvE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SubComponent/index.ts"],"names":[],"mappings":"AAwMA,MAAM,UAAU,YAAY;IAK1B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAkC,CAAQ,CAAC;AACvE,CAAC"}

package/dist/behaviors/BStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"BStore.js","sourceRoot":"","sources":["../../src/behaviors/BStore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAG7D,MAAM,CAAC,MAAM,MAAM,GAAG,QAAQ,CAAC;IAC7B,gBAAgB,CAAC,OAAgC;QAE/C,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC;QAClC,IAAI,CAAC,WAAW;YAAE,OAAO;QACzB,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAgB,CAAC;QAChD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,KAAZ,OAAO,CAAC,IAAI,GAAK,EAAE,EAAC;YAEpB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAI7C,OAAO,CAAC,OAAO,KAAf,OAAO,CAAC,OAAO,GAAK,EAAE,EAAC;YAEvB,OAAO,CAAC,OAAO,CAAC,eAAe,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC;YAEpD,OAAO,OAAO,CAAC,KAAK,CAAC;QACvB,CAAC;IACH,CAAC;IAED,SAAS,EAAE;QACT,OAAO;;YAEL,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,eAAe,oDAAI,CAAC;YAC7C,IAAI,CAAC,WAAW;gBAAE,OAAO;YACzB,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAgB,CAAC;YAEpE,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;YAEnB,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;gBAE9B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAC3B,WAAW,CAAC,GAAG,CAAC,EAChB,CAAC,KAAc,EAAE,EAAE;oBAEjB,IAAI,CAAC,OAAO,CAAC;wBACX,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC;qBACnB,CAAC,CAAC;gBACL,CAAC,EACD;oBACE,MAAM,EAAE,QAAQ,CAAC,UAAU;iBAC5B,CACF,CAAC;YACJ,CAAC;YACD,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAC5C,CAAC;QACD,QAAQ;YAGN,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,CAAC;QACH,CAAC;KACF;CACF,CAAC,CAAC"}
+{"version":3,"file":"BStore.js","sourceRoot":"","sources":["../../src/behaviors/BStore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAG7D,MAAM,CAAC,MAAM,MAAM,GAAG,QAAQ,CAAC;IAC7B,gBAAgB,CAAC,OAAgC;QAE/C,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC;QAClC,IAAI,CAAC,WAAW;YAAE,OAAO;QACzB,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAgB,CAAC;QAChD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,KAAZ,OAAO,CAAC,IAAI,GAAK,EAAE,EAAC;YAEpB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAG7C,OAAO,CAAC,OAAO,KAAf,OAAO,CAAC,OAAO,GAAK,EAAE,EAAC;YAEvB,OAAO,CAAC,OAAO,CAAC,eAAe,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC;YAEpD,OAAO,OAAO,CAAC,KAAK,CAAC;QACvB,CAAC;IACH,CAAC;IACD,SAAS,EAAE;QACT,OAAO;;YAEL,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,eAAe,oDAAI,CAAC;YAC7C,IAAI,CAAC,WAAW;gBAAE,OAAO;YACzB,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAgB,CAAC;YAEpE,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;YAEnB,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;gBAE9B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAC3B,WAAW,CAAC,GAAG,CAAC,EAChB,CAAC,KAAc,EAAE,EAAE;oBAEjB,IAAI,CAAC,OAAO,CAAC;wBACX,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC;qBACnB,CAAC,CAAC;gBACL,CAAC,EACD;oBACE,MAAM,EAAE,QAAQ,CAAC,UAAU;iBAC5B,CACF,CAAC;YACJ,CAAC;YACD,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAC5C,CAAC;QAED,QAAQ;YAEN,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,CAAC;QACH,CAAC;KACF;CACF,CAAC,CAAC"}

package/dist/index.d.ts

@@ -1,9 +1,9 @@
-import { navigateTo } from "./api/navigateTo";
 import { DefineComponent } from "./api/DefineComponent";
+import { navigateTo } from "./api/navigateTo";
 import { RootComponent } from "./api/RootComponent";
 import { SubComponent } from "./api/SubComponent";
-import type { DetailedType } from "./types/DetailedType";
 import type { ComponentDocExtension } from "./types/ComponentDocExtension";
+import type { DetailedType } from "./types/DetailedType";
 import type { GenerateDoc } from "./types/GenerateDoc";
 import type { ParamsEqual } from "./types/TwoParamsEqual";
 export type { Vant, Wm } from "./thirdLib";

package/dist/index.js

@@ -1,5 +1,5 @@
-import { navigateTo } from "./api/navigateTo";
 import { DefineComponent } from "./api/DefineComponent";
+import { navigateTo } from "./api/navigateTo";
 import { RootComponent } from "./api/RootComponent";
 import { SubComponent } from "./api/SubComponent";
 export { DefineComponent, navigateTo, RootComponent, SubComponent, };

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAmBlD,OAAO,EAEL,eAAe,EAGf,UAAU,EAEV,aAAa,EACb,YAAY,GACb,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAiBlD,OAAO,EAEL,eAAe,EAIf,UAAU,EAEV,aAAa,EACb,YAAY,GACb,CAAC"}

package/dist/utils/InnerMarker.js

@@ -1,4 +1,4 @@
 export const INNERMARKER = {
-    url: "__missannil__",
+    url: "__annil__",
 };
 //# sourceMappingURL=InnerMarker.js.map

package/dist/utils/InnerMarker.js.map

@@ -1 +1 @@
-{"version":3,"file":"InnerMarker.js","sourceRoot":"","sources":["../../src/utils/InnerMarker.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,GAAG,EAAE,eAAsC;CAE5C,CAAC"}
+{"version":3,"file":"InnerMarker.js","sourceRoot":"","sources":["../../src/utils/InnerMarker.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,GAAG,EAAE,WAAkC;CAExC,CAAC"}

package/dist/utils/deepClone.js.map

@@ -1 +1 @@
-{"version":3,"file":"deepClone.js","sourceRoot":"","sources":["../../src/utils/deepClone.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,SAAS,CAAI,KAAQ;IACnC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAM,CAAC;IAEpD,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IAE3D,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;YACrD,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"deepClone.js","sourceRoot":"","sources":["../../src/utils/deepClone.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,SAAS,CAAI,KAAQ;IACnC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAM,CAAC;IAEpD,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IAE3D,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;YACrD,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}

package/package.json

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

package/src/api/DefineComponent/collectOptionsForComponent.ts

@@ -4,7 +4,6 @@ import { BComputedAndWatch } from "../../behaviors/BComputedAndWatch";
 import { initComputed } from "../../behaviors/BComputedAndWatch/initComputed";
 import type { Instance } from "../../behaviors/BComputedAndWatch/types";
 import { BStore } from "../../behaviors/BStore";
-import { deepClone } from "../../utils/deepClone";
 import { INNERMARKER } from "../../utils/InnerMarker";
 import { isEmptyObject } from "../../utils/isEmptyObject";
 import type { RootComponentTrueOptions } from "../RootComponent";
@@ -18,95 +17,127 @@ import type { PageInstance } from "../RootComponent/Instance/RootComponentInstan
 import type { SubComponentTrueOptions } from "../SubComponent";
 import type { FinalOptionsOfComponent, FuncOptions } from ".";
 /**
- * 针对通过 navigateTo传过来的数据解析
- * @param option - option中的url是拼接了encodeURIComponent转码的data对象的,key为INNERMARKER.url
+ * 原生Component会对传入的对象字段匹配的properties字段setData赋值。不符合字段或Page时不会赋值。
+ * 此函数为给实例setData赋值,默认传递值与properties相符(ts类型安全)。
+ * @param option - 传入onLoad的参数 有以下两种可能
+ * 1. 使用wx.navigateTo传值的。这种情况无内置字段 option[INNERMARKER.url] 等于 undefined
+ * 2. 使用插件提供的navigateTo传值。这种情况 INNERMARKER.url被load周期劫持函数解码后赋值INNERMARKER.url字段为本身,即option[INNERMARKER.url] 等于 INNERMARKER.url
  */
-/* istanbul ignore next */
+/* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
 function onLoadReceivedDataHandle(
   this: PageInstance,
   option: Record<typeof INNERMARKER.url, string>,
 ) {
   const innerData: string | undefined = option[INNERMARKER.url];
-  // 未使用自定义的navigateTo
-  if (innerData === undefined) return;
-  const optionData = JSON.parse(decodeURIComponent(innerData));
 
-  // 使用navigateTo
-  for (const key in optionData) {
-    option[key] = optionData[key];
-  }
-
-  // setData会触发计算属性 继承属性等 。
-  this.setData(option as any);
+  // 情况1为undefined,2为INNERMARKER.url所以innerData !== INNERMARKER.url表示没有通过插件提供的API传值
+  if (innerData !== INNERMARKER.url) return;
 
   delete option[INNERMARKER.url];
 
-  Reflect.deleteProperty(this.data, INNERMARKER.url);
+  this.setData(option);
 }
-
 /**
- * onLoad生命周期劫持函数
+ * 针对通过 navigateTo传过来的数据对组件load周期传入数据解析
+ * @param option - option中的url是拼接了encodeURIComponent转码的data对象的,key为INNERMARKER.url
  */
-/* istanbul ignore next */
-function onLoadHijack(
-  options: FinalOptionsOfComponent,
-  before: Func[],
-  after: Func[] = [],
+/* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
+function loadReceivedDataHandle(
+  this: PageInstance,
+  option: Record<typeof INNERMARKER.url, string>,
 ) {
-  options.methods ||= {};
-
-  const cloneOpt = deepClone(options);
-  const originalOnLoad: Func | undefined = options.methods.onLoad;
-
-  options.methods.onLoad = function(props: unknown) {
-    before.forEach((func) => {
-      func.call(this, props, cloneOpt);
-    });
-
-    originalOnLoad?.call(this, props);
+  const innerData: string | undefined = option[INNERMARKER.url];
+  // 未使用自定义的navigateTo
+  if (innerData === undefined) return;
+  const decodeOption = JSON.parse(decodeURIComponent(innerData));
 
-    after.forEach((func) => {
-      func.call(this, props, cloneOpt);
-    });
-  };
+  // 使用navigateTo API
+  for (const key in decodeOption) {
+    option[key] = decodeOption[key];
+  }
+  // 给onLoad劫持函数一个标记,判断传值来自哪个API
+  option[INNERMARKER.url] = INNERMARKER.url;
 }
 /**
- * attached生命周期劫持函数
+ * 劫持指定配置字段
  */
-/* istanbul ignore next  */
-function attachedHijack(
-  options: FinalOptionsOfComponent,
-  before: Func[],
-  after: Func[] = [],
-) {
-  /* istanbul ignore next */
-  options.lifetimes ||= {};
+/* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
+function hijack(config: object, field: string, before: Func[] = [], after: Func[] = []) {
+  const originalFunc: Func | undefined = config[field];
 
-  const originalAttached: Func | undefined = options.lifetimes.attached;
+  config[field] = function(...args: any[]) {
+    before.forEach(func => func.call(this, ...args));
 
-  options.lifetimes.attached = function() {
-    before.forEach((func) => {
-      func.call(this, options);
-    });
+    originalFunc && originalFunc.apply(this, args);
 
-    originalAttached?.call(this);
-
-    /* istanbul ignore next  */
-    after.forEach((func) => {
-      func.call(this, options);
-    });
+    after.forEach(func => func.call(this, ...args));
   };
+
+  return;
 }
+
+/**
+ * onLoad生命周期劫持函数
+ */
+/* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
+// function onLoadHijack(
+//   options: FinalOptionsOfComponent,
+//   before: Func[],
+//   after: Func[] = [],
+// ) {
+//   options.methods ||= {};
+
+//   const cloneOpt = deepClone(options);
+//   const originalOnLoad: Func | undefined = options.methods.onLoad;
+
+//   options.methods.onLoad = function(props: unknown) {
+//     before.forEach((func) => {
+//       func.call(this, props, cloneOpt);
+//     });
+
+//     originalOnLoad?.call(this, props);
+
+//     after.forEach((func) => {
+//       func.call(this, props, cloneOpt);
+//     });
+//   };
+// }
+/**
+ * 劫持pageLifetimes中的load字段
+ */
+/* istanbul ignore next  */
+// function loadHijack(
+//   options: FinalOptionsOfComponent,
+//   before: Func[],
+//   after: Func[] = [],
+// ) {
+//    /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
+//   options.lifetimes ||= {};
+
+//   const originalAttached: Func | undefined = options.lifetimes.attached;
+
+//   options.lifetimes.attached = function() {
+//     before.forEach((func) => {
+//       func.call(this, options);
+//     });
+
+//     originalAttached?.call(this);
+
+//     /* istanbul ignore next  */
+//     after.forEach((func) => {
+//       func.call(this, options);
+//     });
+//   };
+// }
 /**
  * 内部保护字段 即不允许配置的字段名(所有方法下)
  */
 // const INNERFIELDS = ["disposer"];
 
 /**
- * 报错的形式避免输入字段和内部字段冲突
- * 保护config下不被配置keys包含的内部预定字段
+ * 报错的形式避免输入字段和内部字段冲突,保证config下不包含内部预定字段(列表)
  */
-/* istanbul ignore next */
+/* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
 function InternalFieldProtection(config: object | undefined, keys: string[]) {
   if (!config) return;
   const methodsConfigKeys = Object.keys(config);
@@ -126,14 +157,16 @@ function _funcConfigHandle(methodsConfig: object, configList: Record<string, Fun
     };
   }
 }
-
+/**
+ * 把函数列表配置放入一个配置中循环一次运行
+ */
 function funcConfigHandle(
   finalOptionsForComponent: FinalOptionsOfComponent,
   isPage: boolean | undefined,
   funcOptions: FuncOptions,
 ) {
   // 测试框架无法测试page情形
-  /* istanbul ignore next */
+  /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
   if (isPage) {
     // 页面时 生命周期方法(即 on 开头的方法),(https://developers.weixin.qq.com/miniprogram/dev/framework/custom-component/component.html)
     funcOptions.pageLifetimes && _funcConfigHandle(finalOptionsForComponent.methods ||= {}, funcOptions.pageLifetimes);
@@ -165,7 +198,9 @@ function funcFieldsCollect(
   }
 }
 
-// 其他字段加入到componentOptions对应字段配置中
+/**
+ * 其他字段加入到componentOptions对应字段配置中
+ */
 function otherFieldsHandle(
   finalOptions: FinalOptionsOfComponent,
   rootComponentOptions: RootComponentTrueOptions,
@@ -174,7 +209,7 @@ function otherFieldsHandle(
     const config = rootComponentOptions[key];
     if (Array.isArray(config)) {
       // 好像只有behaviors是数组吧.
-      /* istanbul ignore next */
+      /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
       (finalOptions[key] ||= []).push(...config);
     } else {
       Object.assign(finalOptions[key] ||= {}, config);
@@ -182,10 +217,10 @@ function otherFieldsHandle(
   }
 }
 /**
- * 把events字段配置变成函数放入到componentOptions.methods中
+ * 把events字段放入到componentOptions.methods中
  */
 function eventsHandle(componentOptions: FinalOptionsOfComponent, eventsConfig: EventsConstraint) {
-  /* istanbul ignore next */
+  /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
   componentOptions.methods ||= {};
 
   Object.assign(componentOptions.methods, eventsConfig);
@@ -218,7 +253,7 @@ function customEventsHandle(
   componentOptions: FinalOptionsOfComponent,
   customEventsConfig: CustomEventConstraint,
 ) {
-  /* istanbul ignore next */
+  /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
   componentOptions.methods ||= {};
 
   for (const key in customEventsConfig) {
@@ -239,45 +274,45 @@ function customEventsHandle(
  *  触发各个组件的页面load事件
  */
 /* istanbul ignore next  */
-function triggerCompLoad(this: Instance, props: object) {
-  if (!this.__compLoadList__) return;
-  this.__compLoadList__.forEach((loadFunc) => {
-    loadFunc(props);
-  });
-}
+// function triggerCompLoad(this: Instance, props: object) {
+//   if (!this.__compLoadList__) return;
+//   this.__compLoadList__.forEach((loadFunc) => {
+//     loadFunc(props);
+//   });
+// }
 /* istanbul ignore next  */
-function getPageInstance(pageId: string): Instance {
-  const pagestack = getCurrentPages() as unknown as Instance[];
-  let pageInstance: Instance;
-  pagestack.some((instance) => {
-    if (instance.getPageId() === pageId) {
-      pageInstance = instance;
-
-      return true;
-    }
-
-    return false;
-  });
-
-  // @ts-ignore pagestack中一定赋值了
-  return pageInstance;
-}
+// function getPageInstance(pageId: string): Instance {
+//   const pagestack = getCurrentPages() as unknown as Instance[];
+//   let pageInstance: Instance;
+//   pagestack.some((instance) => {
+//     if (instance.getPageId() === pageId) {
+//       pageInstance = instance;
+
+//       return true;
+//     }
+
+//     return false;
+//   });
+
+//   // @ts-ignore pagestack中一定赋值了
+//   return pageInstance;
+// }
 /**
  * 收集组件pageLifetimes下的load周期函数到页面实例的__loadFunList__
  */
 /* istanbul ignore next  */
-function collectLoadLifetimesOfComponent(this: Instance, finalOptionsForComponent: FinalOptionsOfComponent) {
-  const loadFunc = finalOptionsForComponent.pageLifetimes?.load;
+// function collectLoadLifetimesOfComponent(this: Instance, finalOptionsForComponent: FinalOptionsOfComponent) {
+//   const loadFunc = finalOptionsForComponent.pageLifetimes?.load;
 
-  console.log(loadFunc, finalOptionsForComponent);
+//   console.log(loadFunc, finalOptionsForComponent);
 
-  if (!loadFunc) return;
+//   if (!loadFunc) return;
 
-  const pageInstance = getPageInstance(this.getPageId());
-  const __compLoadList__: Function[] = (pageInstance.__compLoadList__ ||= []);
+//   const pageInstance = getPageInstance(this.getPageId());
+//   const __compLoadList__: Function[] = (pageInstance.__compLoadList__ ||= []);
 
-  __compLoadList__.push(loadFunc.bind(this));
-}
+//   __compLoadList__.push(loadFunc.bind(this));
+// }
 /**
  * 收集 rootComponentOptions 配置到 finalOptions 和 funcOptions 中
  * @param finalOptions - 收集配置对象
@@ -289,14 +324,6 @@ function collectRootComponentOption(
   funcOptions: FuncOptions,
   rootComponentOptions: RootComponentTrueOptions,
 ) {
-  console.log("-------------------------");
-
-  InternalFieldProtection(rootComponentOptions.customEvents, ["load"]);
-
-  InternalFieldProtection(rootComponentOptions.methods, ["load"]);
-
-  InternalFieldProtection(rootComponentOptions.events, ["load"]);
-
   rootComponentOptions.customEvents && customEventsHandle(finalOptions, rootComponentOptions.customEvents);
 
   delete rootComponentOptions.customEvents;
@@ -322,7 +349,7 @@ export function collectOptionsForComponent(
   const finalOptionsForComponent: FinalOptionsOfComponent = {
     // default options
     options: {
-      // addGlobalClass: true,
+      addGlobalClass: true, // "styleIsolation": "apply-shared"
       multipleSlots: true,
       pureDataPattern: /^_/,
       virtualHost: true,
@@ -346,28 +373,27 @@ export function collectOptionsForComponent(
   if (subComponentsList && !isEmptyObject(subComponentsList)) {
     subComponentsHandle(finalOptionsForComponent, subComponentsList, funcOptions);
   }
-  // 框架无法测试页面
-  /* istanbul ignore next */
-  if (!isEmptyObject(funcOptions)) {
-    funcConfigHandle(finalOptionsForComponent, rootComponentOption?.isPage, funcOptions);
-  }
+  // miniprogram-simulate(当前版本 1.6.1) 无法测试页面
+  /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
+  funcConfigHandle(finalOptionsForComponent, rootComponentOption?.isPage, funcOptions);
 
   finalOptionsForComponent.methods && InternalFieldProtection(finalOptionsForComponent.methods, ["disposer"]);
 
-  // BBeforeCreate在最后面
-  finalOptionsForComponent.behaviors!.push(BBeforeCreate);
-
-  console.log(finalOptionsForComponent, 999, funcOptions);
-
-  attachedHijack(finalOptionsForComponent, [collectLoadLifetimesOfComponent], []);
+  /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
+  finalOptionsForComponent.methods?.onLoad
+    && hijack(finalOptionsForComponent.methods, "onLoad", [onLoadReceivedDataHandle, initComputed], []);
 
-  onLoadHijack(finalOptionsForComponent, [onLoadReceivedDataHandle, initComputed], [triggerCompLoad]);
+  /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
+  finalOptionsForComponent.pageLifetimes?.load
+    && hijack(finalOptionsForComponent.pageLifetimes, "load", [loadReceivedDataHandle], []);
 
-  // 框架无法测试页面
-  /* istanbul ignore next */
+  /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
   if (finalOptionsForComponent.isPage) {
+    // 页面时删除预设的虚拟组件字段
     Reflect.deleteProperty(finalOptionsForComponent.options!, "virtualHost");
   }
+  // BBeforeCreate在最后面,让BeforeCreate生命周期运行在最终建立组件时。
+  finalOptionsForComponent.behaviors!.push(BBeforeCreate);
 
   return finalOptionsForComponent;
 }

package/src/api/DefineComponent/index.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";
@@ -12,6 +12,11 @@ import type { RootComponentOption } from "./RootComponent/RootComponentOption";
 import type { SubComponentsOption } from "./SubComponents/SubComponentsOption";
 
 import type { RootComponentTrueOptions } from "../RootComponent";
+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";
 import { collectOptionsForComponent } from "./collectOptionsForComponent";
 
 type Path = `/${string}`;
@@ -58,19 +63,18 @@ 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: (prop: unknown) => void } & WMPageLifetimes>;
-};
+} & PageLifetimesOption<false, object>;
 
 export const DefineComponent: DefineComponentConstructor = function(options): any {
   Component(
-    collectOptionsForComponent(options.rootComponent as RootComponentTrueOptions | undefined, options.subComponents),
+    collectOptionsForComponent(options.rootComponent as RootComponentTrueOptions, options.subComponents),
   );
 };

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

@@ -14,7 +14,8 @@ export type PageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends o
       & Partial<WMCompPageLifetimes>
       & {
         /**
-         * 事件发生在页面onLoad事件后,要求组件为同步组件
+         * 周期发生在组件attached之后,页面onLoad之前,要求组件为同步组件
+         * 最低基础库： `3.0.2`
          */
         load?: (props: object) => void | Promise<void>;
       }
@@ -33,7 +34,6 @@ export type PageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends o
          * 页面加载时触发。一个页面只会调用一次，可以在 onLoad 的参数中获取Properties定义的数据。
          */
         onLoad?: (
-          // 页面时PropertiesDoc对象字段是格外不加null的
           props: PropertiesDoc,
         ) => void | Promise<void>;
       }

package/src/api/RootComponent/index.ts

@@ -1,10 +1,9 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { NoInfer } from "hry-types/src/Generic/NoInfer";
 import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { Func } from "hry-types/src/Misc/Func";
 import type { ComputeIntersection } from "hry-types/src/Object/_api";
 import type { ComputeObject } from "../../types/ComputeObj";
-import type { WMCompOtherOption, WMCompPageLifetimes, WMPageLifetimes } from "../../types/OfficialTypeAlias";
+import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
 import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
 import type { ComputedConstraint } from "./Computed/ComputedConstraint";
 import type { ComputedOption } from "./Computed/ComputedOption";
@@ -55,7 +54,7 @@ type RootComponentOptions<
   & DataOption<TData, keyof PropertiesDoc>
   & StoreOption<TStore, keyof (PropertiesDoc & DataDoc)>
   & ComputedOption<TComputed, keyof (PropertiesDoc & DataDoc & StoreDoc)>
-  & PageLifetimesOption<TIsPage, NoInfer<PropertiesDoc>>
+  & PageLifetimesOption<TIsPage, PropertiesDoc>
   & LifetimesOption<TIsPage>
   & WatchOption<
     & ComputedDoc
@@ -138,10 +137,14 @@ export type RootComponentTrueOptions = {
   data?: DataConstraint;
   computed?: ComputedConstraint;
   customEvents?: CustomEventConstraint;
+  observers?: Record<string, Func>;
   methods?: MethodsConstraint;
+  behaviors?: string[];
   events?: EventsConstraint;
   store?: StoreConstraint;
   watch?: Record<string, Func>;
   lifetimes?: LifetimesConstraint;
-  pageLifetimes?: Partial<WMCompPageLifetimes & { load: Func } & WMPageLifetimes>;
+  pageLifetimes?:
+    | PageLifetimesOption<false, object>["pageLifetimes"]
+    | PageLifetimesOption<true, object>["pageLifetimes"];
 };

package/src/api/SubComponent/SubPageLifetimes/SubPageLifetimesOption.ts

@@ -1,6 +1,6 @@
 import type { PageLifetimesOption } from "../../RootComponent/PageLifetimes/PageLifetimesOption";
 
-export type SubPageLifetimesOption<TIsPage extends boolean, AllPropertiesDoc extends object> = PageLifetimesOption<
+export type SubPageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends object> = PageLifetimesOption<
   TIsPage,
-  AllPropertiesDoc
+  PropertiesDoc
 >;

package/src/api/SubComponent/index.ts

@@ -6,13 +6,15 @@ import type { ReplacePrefix } from "../../types/ReplacePrefix";
 import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
 
 import type { Func } from "hry-types/src/Misc/Func";
-import type {
-  WMCompLifetimes,
-  WMCompOtherOption,
-  WMCompPageLifetimes,
-  WMPageLifetimes,
-} from "../../types/OfficialTypeAlias";
+import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
+import type { ComputedConstraint } from "../RootComponent/Computed/ComputedConstraint";
+import type { DataConstraint } from "../RootComponent/Data/DataConstraint";
+import type { EventsConstraint } from "../RootComponent/Events/EventsConstraint";
+import type { LifetimesConstraint } from "../RootComponent/Lifetimes/LifetimesConstraint";
+import type { MethodsConstraint } from "../RootComponent/Methods/MethodsConstraint";
+import type { PageLifetimesOption } from "../RootComponent/PageLifetimes/PageLifetimesOption";
 import type { RootComponentDoc } from "../RootComponent/RootComponentDoc";
+import type { StoreConstraint } from "../RootComponent/Store/StoreConstraint";
 import type { GetSubComputedDoc } from "./SubComputed/GetSubComputedDoc";
 import type { SubComputedConstraint } from "./SubComputed/SubComputedConstraint";
 import type { SubComputedOption } from "./SubComputed/SubComputedOption";
@@ -206,11 +208,16 @@ export function SubComponent<
 
 export type SubComponentTrueOptions = {
   inhrit?: string;
-  data?: Record<string, unknown>;
-  computed?: Record<string, Func>;
-  events?: Record<string, Func>;
-  methods?: Record<string, Func>;
+  data?: DataConstraint;
+  computed?: ComputedConstraint;
+  store?: StoreConstraint;
+  events?: EventsConstraint;
+  methods?: MethodsConstraint;
+  // behaviors?: string[];
+  observers?: Record<string, Func>;
   watch?: Record<string, Func>;
-  lifetimes?: WMCompLifetimes["lifetimes"];
-  pageLifetimes?: Partial<WMCompPageLifetimes & { load: Func } & WMPageLifetimes>;
+  lifetimes?: LifetimesConstraint;
+  pageLifetimes?:
+    | PageLifetimesOption<false, object>["pageLifetimes"]
+    | PageLifetimesOption<true, object>["pageLifetimes"];
 };

package/src/behaviors/BStore.ts

@@ -15,7 +15,6 @@ export const BStore = Behavior({
       options.data[key] = toJS(storeConfig[key]());
 
       // 把响应式数据配置保留在methods的__storeConfig__字段下带入到组件实例中(不用函数返回方式也可以,但不符合methods字段类型),后续再从原型上删除。
-      /* istanbul ignore next */
       options.methods ||= {};
 
       options.methods.__storeConfig__ = () => storeConfig;
@@ -23,7 +22,6 @@ export const BStore = Behavior({
       delete options.store;
     }
   },
-
   lifetimes: {
     created(this: Instance) {
       // 取出通过addStoreConfigToMethods函数带入的storeConfig
@@ -50,9 +48,9 @@ export const BStore = Behavior({
       }
       deleteProtoField(this, "__storeConfig__");
     },
+    /* istanbul ignore next */
     detached(this: Instance) {
-      // 清除store数据 test中模拟了测试，所以忽略 框架不支持 issue {@link https://github.com/wechat-miniprogram/miniprogram-simulate/issues/110}
-      /* istanbul ignore next */
+      // 清除store数据 test中模拟了测试，所以忽略 框架(1.6.1)不支持 issue {@link https://github.com/wechat-miniprogram/miniprogram-simulate/issues/110}
       for (const key in this.disposer) {
         this.disposer[key]();
       }

package/src/index.ts

@@ -1,14 +1,9 @@
-import { navigateTo } from "./api/navigateTo";
-
 import { DefineComponent } from "./api/DefineComponent";
-
+import { navigateTo } from "./api/navigateTo";
 import { RootComponent } from "./api/RootComponent";
-
 import { SubComponent } from "./api/SubComponent";
-
-import type { DetailedType } from "./types/DetailedType";
-
 import type { ComponentDocExtension } from "./types/ComponentDocExtension";
+import type { DetailedType } from "./types/DetailedType";
 import type { GenerateDoc } from "./types/GenerateDoc";
 import type { ParamsEqual } from "./types/TwoParamsEqual";
 export type { Vant, Wm } from "./thirdLib";
@@ -28,6 +23,7 @@ export {
   DefineComponent,
   type DetailedType,
   type GenerateDoc,
+  /* istanbul ignore next */
   navigateTo,
   type ParamsEqual,
   RootComponent,

package/src/utils/InnerMarker.ts

@@ -1,4 +1,4 @@
 export const INNERMARKER = {
-  url: "__missannil__" satisfies `_${string}`, // url默认传值Data字段 必须是内部字段,因为会加入到实例的data下。
+  url: "__annil__" satisfies `_${string}`, // url默认传值Data字段 必须是内部字段,因为会加入到实例的data下。
   // defUrl: "/xx&xx", // 标记 组件默认的的url类型
 };

package/src/utils/deepClone.ts

@@ -5,6 +5,7 @@ export function deepClone<T>(value: T): T {
   if (typeof value !== "object" || value === null) {
     return value;
   }
+  /* istanbul ignore next */
   const clone = (Array.isArray(value) ? [] : {}) as T;
 
   Object.setPrototypeOf(clone, Object.getPrototypeOf(value));