annil 1.12.0-alpha.6 → 1.12.0-alpha.7

package/CHANGELOG.md

@@ -4,6 +4,15 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.12.0-alpha.7](https://github.com/missannil/annil/compare/v1.12.0-alpha.6...v1.12.0-alpha.7) (2025-04-12)
+
+
+### Features
+
+* 去除DefineComponent中针对对象类型加入null ([#241](https://github.com/missannil/annil/issues/241)) ([091485e](https://github.com/missannil/annil/commit/091485e7327c3c94600d61c679e056df845f6222))
+* 在attached周期结束后,如果实例的data字段没有attached字段,则加入attached:true,用于表明组件启动完毕. ([091485e](https://github.com/missannil/annil/commit/091485e7327c3c94600d61c679e056df845f6222))
+* 计算属性初始化在attached周期,之前可能在attach周期会引发计算属性传值时,出现null导致错误的问题 ([091485e](https://github.com/missannil/annil/commit/091485e7327c3c94600d61c679e056df845f6222))
+
 ## [1.12.0-alpha.6](https://github.com/missannil/annil/compare/v1.12.0-alpha.5...v1.12.0-alpha.6) (2025-04-09)
 
 

package/dist/api/DefineComponent/ReturnType/CreateComponentDoc.d.ts

@@ -1,6 +1,5 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
-import type { AddNullForObject } from "../../../types/AddNullForObject";
 import type { CustomComponentType } from "../../CustomComponent/CustomComponentType";
 import type { RootComponentType } from "../../RootComponent/RootComponentType";
 import type { GetCustomEventDocOfSubDoc } from "./GetCustomEventDocOfSubDoc";
@@ -9,7 +8,7 @@ type GetStopKeys<O> = {
 }[keyof O];
 export type CreateComponentDoc<TRootDoc extends RootComponentType, TName extends string, TSubComponentTuple extends CustomComponentType[], AllPropertiesDoc extends unknown | object = TRootDoc["properties"], AllCustomEventsDoc extends unknown | object = TRootDoc["customEvents"] & GetCustomEventDocOfSubDoc<TSubComponentTuple[number]>, StopKeys extends string = GetStopKeys<TRootDoc["events"]>, FinalCustomEventDoc extends object = Omit<AllCustomEventsDoc, StopKeys>> = ComputeIntersection<IfExtends<unknown, AllPropertiesDoc, {}, {
     properties: {
-        [k in keyof AllPropertiesDoc as `${TName}_${k & string}`]: AddNullForObject<AllPropertiesDoc[k]>;
+        [k in keyof AllPropertiesDoc as `${TName}_${k & string}`]: AllPropertiesDoc[k];
     };
 }> & IfExtends<{}, FinalCustomEventDoc, {}, {
     customEvents: {

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AA+CtD,MAAM,CAAC,MAAM,eAAe,GAA+B,UAAS,OAAO;IACzE,SAAS,CAEP,gBAAgB,CAAC,OAAgC,CAAQ,CAC1D,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AA6CtD,MAAM,CAAC,MAAM,eAAe,GAA+B,UAAS,OAAO;IACzE,SAAS,CAEP,gBAAgB,CAAC,OAAgC,CAAQ,CAC1D,CAAC;AACJ,CAAC,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/handleRootComponent.d.ts

@@ -0,0 +1,3 @@
+import type { RootComponentTrueOptions } from "../../RootComponent";
+import type { FinalOptionsOfComponent, SameFuncOptions } from ".";
+export declare function handleRootComponent(finalOptions: FinalOptionsOfComponent, rootComponent: RootComponentTrueOptions | undefined, funcOptions: SameFuncOptions): void;

package/dist/api/DefineComponent/normalizeOptions/handleRootComponent.js

@@ -0,0 +1,19 @@
+import { isEmptyObject } from "../../../utils/isEmptyObject";
+import { __throttleDebounce__FieldCheck } from "./__throttleDebounce__FieldCheck";
+import { customEventsHandle } from "./customEventsHandle";
+import { otherFieldsHandle } from "./otherFieldsHandle";
+import { sameFuncFieldsCollect } from "./sameFuncFieldsCollect";
+export function handleRootComponent(finalOptions, rootComponent, funcOptions) {
+    if (rootComponent && !isEmptyObject(rootComponent)) {
+        __throttleDebounce__FieldCheck(rootComponent);
+        if (rootComponent.customEvents)
+            customEventsHandle(finalOptions, rootComponent.customEvents);
+        delete rootComponent.customEvents;
+        if (rootComponent.events)
+            Object.assign(finalOptions.methods, rootComponent.events);
+        delete rootComponent.events;
+        sameFuncFieldsCollect(rootComponent, funcOptions);
+        otherFieldsHandle(finalOptions, rootComponent);
+    }
+}
+//# sourceMappingURL=handleRootComponent.js.map

package/dist/api/DefineComponent/normalizeOptions/handleRootComponent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handleRootComponent.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/handleRootComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAG7D,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAQhE,MAAM,UAAU,mBAAmB,CACjC,YAAqC,EACrC,aAAmD,EACnD,WAA4B;IAE5B,IAAI,aAAa,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC;QAEnD,8BAA8B,CAAC,aAAa,CAAC,CAAC;QAE9C,IAAI,aAAa,CAAC,YAAY;YAAE,kBAAkB,CAAC,YAAY,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;QAC7F,OAAO,aAAa,CAAC,YAAY,CAAC;QAClC,IAAI,aAAa,CAAC,MAAM;YAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;QACpF,OAAO,aAAa,CAAC,MAAM,CAAC;QAC5B,qBAAqB,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QAElD,iBAAiB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IACjD,CAAC;AACH,CAAC"}

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

@@ -1,9 +1,8 @@
 import { reactionRegister } from "./reactionRegister";
 export function initStore(storeConfig) {
     return function () {
-        if (!storeConfig || this.data.__storeInited__)
+        if (!storeConfig)
             return;
-        this.data.__storeInited__ = true;
         reactionRegister.call(this, storeConfig);
     };
 }

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

@@ -1 +1 @@
-{"version":3,"file":"initStore.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/handleStore/initStore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,MAAM,UAAU,SAAS,CAAC,WAAyD;IACjF,OAAO;QACL,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,CAAC,eAAe;YAAE,OAAO;QACtD,IAAI,CAAC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QACjC,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAE3C,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"initStore.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/handleStore/initStore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,MAAM,UAAU,SAAS,CAAC,WAAyD;IACjF,OAAO;QACL,IAAI,CAAC,WAAW;YAAE,OAAO;QACzB,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAC3C,CAAC,CAAC;AACJ,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/handleSubComponents.d.ts

@@ -0,0 +1,3 @@
+import type { CustomComponentTrueOptions } from "../../CustomComponent";
+import type { FinalOptionsOfComponent, SameFuncOptions } from ".";
+export declare function handleSubComponents(componentOptions: FinalOptionsOfComponent, subComponents: CustomComponentTrueOptions[] | undefined, funcOptions: SameFuncOptions): void;

package/dist/api/DefineComponent/normalizeOptions/handleSubComponents.js

@@ -0,0 +1,15 @@
+import { __throttleDebounce__FieldCheck } from "./__throttleDebounce__FieldCheck";
+import { otherFieldsHandle } from "./otherFieldsHandle";
+import { sameFuncFieldsCollect } from "./sameFuncFieldsCollect";
+export function handleSubComponents(componentOptions, subComponents, funcOptions) {
+    if (subComponents && subComponents.length !== 0) {
+        __throttleDebounce__FieldCheck(subComponents);
+        subComponents.forEach((subOption) => {
+            if (subOption.events)
+                Object.assign(componentOptions.methods, subOption.events);
+            sameFuncFieldsCollect(subOption, funcOptions);
+            otherFieldsHandle(componentOptions, subOption);
+        });
+    }
+}
+//# sourceMappingURL=handleSubComponents.js.map

package/dist/api/DefineComponent/normalizeOptions/handleSubComponents.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handleSubComponents.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/handleSubComponents.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,UAAU,mBAAmB,CACjC,gBAAyC,EACzC,aAAuD,EACvD,WAA4B;IAE5B,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAEhD,8BAA8B,CAAC,aAAa,CAAC,CAAC;QAC9C,aAAa,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAClC,IAAI,SAAS,CAAC,MAAM;gBAAE,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;YAEhF,qBAAqB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;YAE9C,iBAAiB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/addDetachedData.d.ts

@@ -0,0 +1,2 @@
+import type { Instance } from "../../../RootComponent/Instance/RootComponentInstance";
+export declare function addDetachedData(this: Instance): void;

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/addDetachedData.js

@@ -0,0 +1,10 @@
+export function addDetachedData() {
+    if (this.data.attached !== undefined)
+        return;
+    this.data.__notUpdateComputed__ = true;
+    this.setData({
+        attached: true,
+    });
+    this.data.__notUpdateComputed__ = false;
+}
+//# sourceMappingURL=addDetachedData.js.map

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/addDetachedData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"addDetachedData.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/hijackHandle/addDetachedData.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,eAAe;IAE7B,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,KAAK,SAAS;QAAE,OAAO;IAC7C,IAAI,CAAC,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;IACvC,IAAI,CAAC,OAAO,CAAC;QAEX,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,CAAC,qBAAqB,GAAG,KAAK,CAAC;AAC1C,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/hijack.d.ts

@@ -0,0 +1,3 @@
+import type { Func } from "hry-types/src/Misc/Func";
+import type { FinalOptionsOfComponent } from "..";
+export declare function hijack<T extends FinalOptionsOfComponent[keyof FinalOptionsOfComponent]>(config: T, field: keyof T, before: Func[], after?: Func[]): void;

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/hijack.js

@@ -0,0 +1,11 @@
+export function hijack(config, field, before, after = []) {
+    const originalFunc = config[field];
+    config[field] = function (...args) {
+        before.forEach(func => func.call(this, ...args));
+        if (originalFunc)
+            originalFunc.apply(this, args);
+        after.forEach(func => func.call(this, ...args));
+    };
+    return;
+}
+//# sourceMappingURL=hijack.js.map

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/hijack.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hijack.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/hijackHandle/hijack.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,MAAM,CACpB,MAAS,EACT,KAAc,EACd,MAAc,EACd,QAAgB,EAAE;IAGlB,MAAM,YAAY,GAAqB,MAAM,CAAC,KAAK,CAAC,CAAC;IAGrD,MAAM,CAAC,KAAK,CAAC,GAAG,UAAS,GAAG,IAAe;QACzC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;QAEjD,IAAI,YAAY;YAAE,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAEjD,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC;IAEF,OAAO;AACT,CAAC"}

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

@@ -1,3 +1,2 @@
-import type { Func } from "hry-types/src/Misc/Func";
 import type { FinalOptionsOfComponent } from "..";
-export declare function hijack<T extends FinalOptionsOfComponent[keyof FinalOptionsOfComponent]>(config: T, field: keyof T, before: Func[]): void;
+export declare function hijackHandle(finalOptionsForComponent: FinalOptionsOfComponent, isPage: boolean | undefined, path: string | undefined): void;

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/index.js

@@ -1,10 +1,27 @@
-export function hijack(config, field, before) {
-    const originalFunc = config[field];
-    config[field] = function (...args) {
-        before.forEach(func => func.call(this, ...args));
-        if (originalFunc)
-            originalFunc.apply(this, args);
-    };
-    return;
+import { disposeStore } from "../handleStore/disposeStore";
+import { initStore } from "../handleStore/initStore";
+import { initComputed } from "../initComputed";
+import { computedUpdater } from "../initComputed/computedUpdater";
+import { addDetachedData } from "./addDetachedData";
+import { hijack } from "./hijack";
+import { isPageCheck } from "./isPageCheck";
+import { loadReceivedDataHandle } from "./loadReceivedDataHandle";
+import { onLoadReceivedDataHandle } from "./onLoadReceivedDataHandle";
+import { pagePathCheck } from "./pagePathCheck";
+export function hijackHandle(finalOptionsForComponent, isPage, path) {
+    if (finalOptionsForComponent.isPage) {
+        hijack(finalOptionsForComponent.pageLifetimes, "load", [loadReceivedDataHandle]);
+    }
+    hijack(finalOptionsForComponent.methods, "onLoad", [onLoadReceivedDataHandle]);
+    hijack(finalOptionsForComponent.observers, "**", [
+        computedUpdater,
+    ]);
+    hijack(finalOptionsForComponent.lifetimes, "attached", [
+        isPageCheck(isPage),
+        pagePathCheck(path),
+        initStore(finalOptionsForComponent.store),
+        initComputed(finalOptionsForComponent.computed, finalOptionsForComponent.watch),
+    ], [addDetachedData]);
+    hijack(finalOptionsForComponent.lifetimes, "detached", [disposeStore]);
 }
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/hijackHandle/index.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,MAAM,CACpB,MAAS,EACT,KAAc,EACd,MAAc;IAId,MAAM,YAAY,GAAqB,MAAM,CAAC,KAAK,CAAC,CAAC;IAGrD,MAAM,CAAC,KAAK,CAAC,GAAG,UAAS,GAAG,IAAe;QACzC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;QAEjD,IAAI,YAAY;YAAE,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAGnD,CAAC,CAAC;IAEF,OAAO;AACT,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/hijackHandle/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,UAAU,YAAY,CAC1B,wBAAiD,EACjD,MAA2B,EAC3B,IAAwB;IAGxB,IAAI,wBAAwB,CAAC,MAAM,EAAE,CAAC;QACpC,MAAM,CAAC,wBAAwB,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC,sBAAsB,CAAC,CAAC,CAAC;IACnF,CAAC;IAED,MAAM,CAAC,wBAAwB,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAC/E,MAAM,CAAC,wBAAwB,CAAC,SAAS,EAAE,IAAI,EAAE;QAC/C,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,CACJ,wBAAwB,CAAC,SAAS,EAClC,UAAU,EACV;QAEE,WAAW,CAAC,MAAM,CAAC;QAEnB,aAAa,CAAC,IAAI,CAAC;QACnB,SAAS,CAAC,wBAAwB,CAAC,KAAK,CAAC;QACzC,YAAY,CAAC,wBAAwB,CAAC,QAAQ,EAAE,wBAAwB,CAAC,KAAK,CAAC;KAChF,EACD,CAAC,eAAe,CAAC,CAClB,CAAC;IACF,MAAM,CACJ,wBAAwB,CAAC,SAAS,EAClC,UAAU,EACV,CAAC,YAAY,CAAC,CACf,CAAC;AACJ,CAAC"}

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

@@ -13,16 +13,13 @@ export type ThrottleDebounce = Partial<Record<"throttle" | "debounce", Record<st
 export type OptionsInnerFields = {
     data: {
         __storeInited__?: boolean;
-        __computed__?: boolean;
-        __computedInitializing__?: boolean;
+        attached?: boolean;
+        __notUpdateComputed__?: boolean;
         __computedInited__?: boolean;
         __computedCache__?: ComputedCache;
         __watchOldValue__?: WatchOldValue;
         __throttleDebounce__?: ThrottleDebounce;
     };
-    methods: {
-        __computedUpdater__?: Func;
-    };
 };
 export type SameFuncOptions = Record<"pageLifetimes" | "lifetimes" | "watch" | "observers", Record<string, Func[]>>;
 export type FinalOptionsOfComponent = {

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

@@ -1,82 +1,50 @@
 import { BBeforeCreate } from "../../../behaviors/BbeforeCreated";
 import { BthrottleDebounce } from "../../../behaviors/BthrottleDebounce";
 import { applyDebounceAndThrottle } from "../../../utils/applyDebounceAndThrottle";
-import { isEmptyObject } from "../../../utils/isEmptyObject";
 import { instanceConfig } from "../../InstanceInject/instanceConfig";
-import { __throttleDebounce__FieldCheck } from "./__throttleDebounce__FieldCheck";
-import { initStore } from "./handleStore/initStore";
-import { hijack } from "./hijackHandle";
-import { isPageCheck } from "./hijackHandle/isPageCheck";
-import { loadReceivedDataHandle } from "./hijackHandle/loadReceivedDataHandle";
-import { onLoadReceivedDataHandle } from "./hijackHandle/onLoadReceivedDataHandle";
-import { pagePathCheck } from "./hijackHandle/pagePathCheck";
+import { handleRootComponent } from "./handleRootComponent";
+import { handleSubComponents } from "./handleSubComponents";
+import { hijackHandle } from "./hijackHandle";
 import { injectInfoHandler } from "./injectInfoHandler";
 import { InternalFieldProtection } from "./internalFieldProtection";
-import { rootComponentOptionHandle } from "./rootComponentOptionHandle";
 import { sameFuncOptionsHandle } from "./sameFuncOptionsHandle";
-import { disposeStore } from "./handleStore/disposeStore";
-import { initComputed } from "./initComputed";
-import { computedUpdater } from "./initComputed/computedUpdater";
-import { subComponentsOptionHandle } from "./subComponentsOptionHandle";
 import { watchHandler } from "./watchHandler";
 export function normalizeOptions(defineComponentOption) {
-    const rootComponentOption = defineComponentOption.rootComponent;
-    const subComponentsOptions = defineComponentOption.subComponents;
-    const finalOptionsForComponent = injectInfoHandler({
+    var _a;
+    const { rootComponent, subComponents, path } = defineComponentOption;
+    const isPage = (_a = rootComponent === null || rootComponent === void 0 ? void 0 : rootComponent.isPage) !== null && _a !== void 0 ? _a : false;
+    const finalOptionsForComponent = {
         observers: {},
         data: {},
         methods: {},
         behaviors: [BthrottleDebounce],
         externalClasses: [],
         pageLifetimes: {},
-        isPage: false,
+        isPage,
         properties: {},
         computed: {},
         watch: {},
         lifetimes: {},
         options: {},
-    }, instanceConfig.injectInfo);
+    };
+    injectInfoHandler(finalOptionsForComponent, instanceConfig.injectInfo);
     const sameFuncOptions = {
         pageLifetimes: {},
         lifetimes: {},
         watch: {},
         observers: {},
     };
-    if (rootComponentOption && !isEmptyObject(rootComponentOption)) {
-        __throttleDebounce__FieldCheck(rootComponentOption);
-        rootComponentOptionHandle(finalOptionsForComponent, rootComponentOption, sameFuncOptions);
-    }
-    if (subComponentsOptions && subComponentsOptions.length !== 0) {
-        __throttleDebounce__FieldCheck(subComponentsOptions);
-        subComponentsOptionHandle(finalOptionsForComponent, subComponentsOptions, sameFuncOptions);
-    }
-    sameFuncOptionsHandle(finalOptionsForComponent, rootComponentOption === null || rootComponentOption === void 0 ? void 0 : rootComponentOption.isPage, sameFuncOptions);
+    handleRootComponent(finalOptionsForComponent, rootComponent, sameFuncOptions);
+    handleSubComponents(finalOptionsForComponent, subComponents, sameFuncOptions);
+    sameFuncOptionsHandle(finalOptionsForComponent, isPage, sameFuncOptions);
     InternalFieldProtection(finalOptionsForComponent);
-    if (finalOptionsForComponent.isPage) {
-        hijack(finalOptionsForComponent.pageLifetimes, "load", [loadReceivedDataHandle]);
-    }
-    hijack(finalOptionsForComponent.methods, "onLoad", [onLoadReceivedDataHandle]);
-    hijack(finalOptionsForComponent.observers, "**", [
-        initStore(finalOptionsForComponent.store),
-        initComputed(finalOptionsForComponent.computed, finalOptionsForComponent.watch),
-        computedUpdater,
-    ]);
-    hijack(finalOptionsForComponent.lifetimes, "attached", [
-        isPageCheck(rootComponentOption === null || rootComponentOption === void 0 ? void 0 : rootComponentOption.isPage),
-        pagePathCheck(defineComponentOption.path),
-        initStore(finalOptionsForComponent.store),
-        initComputed(finalOptionsForComponent.computed, finalOptionsForComponent.watch),
-        function () {
-            this.data.__attached__ = true;
-        },
-    ]);
-    hijack(finalOptionsForComponent.lifetimes, "detached", [disposeStore]);
-    if (finalOptionsForComponent.isPage && finalOptionsForComponent.options) {
+    if (isPage && finalOptionsForComponent.options) {
         Reflect.deleteProperty(finalOptionsForComponent.options, "virtualHost");
     }
     applyDebounceAndThrottle(finalOptionsForComponent.methods);
     watchHandler(finalOptionsForComponent);
     finalOptionsForComponent.behaviors.push(BBeforeCreate);
+    hijackHandle(finalOptionsForComponent, isPage, path);
     return finalOptionsForComponent;
 }
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AACnF,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AASrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAgD9C,MAAM,UAAU,gBAAgB,CAC9B,qBAA4C;;IAE5C,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG,qBAAqB,CAAC;IACrE,MAAM,MAAM,GAAG,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,mCAAI,KAAK,CAAC;IAC9C,MAAM,wBAAwB,GAA4B;QACxD,SAAS,EAAE,EAAE;QACb,IAAI,EAAE,EAAE;QACR,OAAO,EAAE,EAAE;QACX,SAAS,EAAE,CAAC,iBAAiB,CAAC;QAC9B,eAAe,EAAE,EAAE;QACnB,aAAa,EAAE,EAAE;QACjB,MAAM;QACN,UAAU,EAAE,EAAE;QACd,QAAQ,EAAE,EAAE;QACZ,KAAK,EAAE,EAAE;QACT,SAAS,EAAE,EAAE;QACb,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,iBAAiB,CAAC,wBAAwB,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;IAKvE,MAAM,eAAe,GAAoB;QACvC,aAAa,EAAE,EAAE;QACjB,SAAS,EAAE,EAAE;QACb,KAAK,EAAE,EAAE;QACT,SAAS,EAAE,EAAE;KACd,CAAC;IAEF,mBAAmB,CAAC,wBAAwB,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;IAE9E,mBAAmB,CAAC,wBAAwB,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;IAE9E,qBAAqB,CAAC,wBAAwB,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;IAGzE,uBAAuB,CAAC,wBAAwB,CAAC,CAAC;IAGlD,IAAI,MAAM,IAAI,wBAAwB,CAAC,OAAO,EAAE,CAAC;QAC/C,OAAO,CAAC,cAAc,CAAC,wBAAwB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC1E,CAAC;IAGD,wBAAwB,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAG3D,YAAY,CAAC,wBAAwB,CAAC,CAAC;IAGvC,wBAAwB,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAGvD,YAAY,CAAC,wBAAwB,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAErD,OAAO,wBAAwB,CAAC;AAClC,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/initComputed/computedUpdater.js

@@ -2,6 +2,8 @@ import { deepEqual } from "../../../../utils/deepEqual";
 import { deepProxy, getOriginalValue } from "./data-tracer";
 import { removeSubDependences } from "./dependencesOptimize";
 export function computedUpdater() {
+    if (this.data.__notUpdateComputed__)
+        return;
     for (const key in this.data.__computedCache__) {
         const itemCache = this.data.__computedCache__[key];
         let changed = false;

package/dist/api/DefineComponent/normalizeOptions/initComputed/computedUpdater.js.map

@@ -1 +1 @@
-{"version":3,"file":"computedUpdater.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/initComputed/computedUpdater.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAExD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAG7D,MAAM,UAAU,eAAe;IAC7B,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACnD,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;YACxC,IAAI,SAAS,GAAY,IAAI,CAAC,IAAI,CAAC;YACnC,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;gBAM7B,SAAS,GAAI,SAAqC,CAAC,IAAI,CAAC,CAAC;YAC3D,CAAC;YAED,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBACnC,OAAO,GAAG,IAAI,CAAC;gBACf,MAAM;YACR,CAAC;QACH,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,cAAc,GAAyB,EAAE,CAAC;YAChD,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC;YAEvF,IAAI,CAAC,OAAO,CAAC;gBACX,CAAC,GAAG,CAAC,EAAE,gBAAgB,CAAC,QAAQ,CAAC;aAClC,CAAC,CAAC;YAEH,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC;YAEpF,OAAO,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"computedUpdater.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/initComputed/computedUpdater.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAExD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAG7D,MAAM,UAAU,eAAe;IAC7B,IAAI,IAAI,CAAC,IAAI,CAAC,qBAAqB;QAAE,OAAO;IAC5C,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACnD,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;YACxC,IAAI,SAAS,GAAY,IAAI,CAAC,IAAI,CAAC;YACnC,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;gBAM7B,SAAS,GAAI,SAAqC,CAAC,IAAI,CAAC,CAAC;YAC3D,CAAC;YAED,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBACnC,OAAO,GAAG,IAAI,CAAC;gBACf,MAAM;YACR,CAAC;QACH,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,cAAc,GAAyB,EAAE,CAAC;YAChD,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC;YAEvF,IAAI,CAAC,OAAO,CAAC;gBACX,CAAC,GAAG,CAAC,EAAE,gBAAgB,CAAC,QAAQ,CAAC;aAClC,CAAC,CAAC;YAEH,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC;YAEpF,OAAO,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;AACH,CAAC"}

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

@@ -1,4 +1,4 @@
 import type { Func } from "hry-types/src/Misc/Func";
 import type { ComputedConstraint } from "../../../RootComponent/Computed/ComputedConstraint";
 import type { Instance } from "../../../RootComponent/Instance/RootComponentInstance";
-export declare function initComputed(computedConfig: ComputedConstraint | undefined, watchConfig: Record<string, Func>): (this: Instance) => void;
+export declare function initComputed(computedConfig: ComputedConstraint, watchConfig: Record<string, Func>): (this: Instance) => void;

package/dist/api/DefineComponent/normalizeOptions/initComputed/index.js

@@ -1,3 +1,4 @@
+import { deepClone } from "../../../../utils/deepClone";
 import { isEmptyObject } from "../../../../utils/isEmptyObject";
 import { nonNullable } from "../../../../utils/nonNullable";
 import { getPathsValue } from "../watchHandler/getPathsValue";
@@ -5,16 +6,13 @@ import { hasComputedPath } from "../watchHandler/hasComputedPath";
 import { initComputedAndGetCache } from "./initComputedAndGetCache";
 export function initComputed(computedConfig, watchConfig) {
     return function () {
-        if (!computedConfig || this.data.__computedInitializing__ === true)
-            return;
-        this.data.__computedInitializing__ = true;
         const __computedInitCache__ = initComputedAndGetCache.call(this, computedConfig);
         this.data.__computedCache__ = __computedInitCache__;
         if (!isEmptyObject(watchConfig)) {
             const watchOldValue = nonNullable(this.data.__watchOldValue__);
             for (const path in watchConfig) {
                 if (hasComputedPath(path, Object.keys(computedConfig))) {
-                    watchOldValue[path] = getPathsValue(this.data, path);
+                    watchOldValue[path] = deepClone(getPathsValue(this.data, path));
                 }
             }
         }

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/initComputed/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAG5D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAiBpE,MAAM,UAAU,YAAY,CAC1B,cAA8C,EAC9C,WAAiC;IAGjC,OAAO;QAEL,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,IAAI,CAAC,wBAAwB,KAAK,IAAI;YAAE,OAAO;QAC3E,IAAI,CAAC,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC;QAE1C,MAAM,qBAAqB,GAAG,uBAAuB,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAEjF,IAAI,CAAC,IAAI,CAAC,iBAAiB,GAAG,qBAAqB,CAAC;QAGpD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;YAEhC,MAAM,aAAa,GAA8B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAC1F,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;gBAE/B,IAAI,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;oBAEvD,aAAa,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACvD,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;IACtC,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/initComputed/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAG5D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAiBpE,MAAM,UAAU,YAAY,CAC1B,cAAkC,EAClC,WAAiC;IAGjC,OAAO;QAGL,MAAM,qBAAqB,GAAG,uBAAuB,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAEjF,IAAI,CAAC,IAAI,CAAC,iBAAiB,GAAG,qBAAqB,CAAC;QAEpD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;YAEhC,MAAM,aAAa,GAA8B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAC1F,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;gBAE/B,IAAI,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;oBACvD,aAAa,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;gBAClE,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;IACtC,CAAC,CAAC;AACJ,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/internalFieldProtection.js

@@ -1,5 +1,5 @@
 const internalFiled = {
-    methods: ["disposer", "__computedUpdater__"],
+    methods: ["disposer"],
     data: ["__computedCache__", "__watchOldValue__"],
 };
 export function InternalFieldProtection(finalOptionsForComponent) {

package/dist/api/DefineComponent/normalizeOptions/internalFieldProtection.js.map

@@ -1 +1 @@
-{"version":3,"file":"internalFieldProtection.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/internalFieldProtection.ts"],"names":[],"mappings":"AAGA,MAAM,aAAa,GAAG;IACpB,OAAO,EAAE,CAAC,UAAU,EAAE,qBAAqB,CAAC;IAC5C,IAAI,EAAE,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;CACjD,CAAC;AAKF,MAAM,UAAU,uBAAuB,CAAC,wBAAiD;IACvF,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;IACvE,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;IAEjE,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;QACnC,IAAI,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACxC,MAAM,KAAK,CAAC,cAAc,GAAG,YAAY,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;QAChC,IAAI,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAErC,MAAM,KAAK,CAAC,WAAW,GAAG,YAAY,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"internalFieldProtection.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/internalFieldProtection.ts"],"names":[],"mappings":"AAGA,MAAM,aAAa,GAAG;IACpB,OAAO,EAAE,CAAC,UAAU,CAAC;IACrB,IAAI,EAAE,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;CACjD,CAAC;AAKF,MAAM,UAAU,uBAAuB,CAAC,wBAAiD;IACvF,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;IACvE,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;IAEjE,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;QACnC,IAAI,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACxC,MAAM,KAAK,CAAC,cAAc,GAAG,YAAY,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;QAChC,IAAI,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAErC,MAAM,KAAK,CAAC,WAAW,GAAG,YAAY,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/otherFieldsHandle.js

@@ -2,6 +2,7 @@ export function otherFieldsHandle(finalOptions, rootComponentOptions) {
     let key;
     for (key in rootComponentOptions) {
         const config = rootComponentOptions[key];
+        console.log("hry 1", key, config);
         if (config === undefined)
             continue;
         if (key === "behaviors") {

package/dist/api/DefineComponent/normalizeOptions/otherFieldsHandle.js.map

@@ -1 +1 @@
-{"version":3,"file":"otherFieldsHandle.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/otherFieldsHandle.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,iBAAiB,CAC/B,YAAqC,EACrC,oBAA+E;IAE/E,IAAI,GAAoE,CAAC;IACzE,KAAK,GAAG,IAAI,oBAAoB,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,MAAM,KAAK,SAAS;YAAE,SAAS;QACnC,IAAI,GAAG,KAAK,WAAW,EAAE,CAAC;YACxB,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,MAAkB,CAAC,CAAC;QAChD,CAAC;aAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAEtC,YAAY,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YAE5C,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;QAC3C,CAAC;aAAM,IAAI,OAAO,MAAM,KAAK,SAAS,EAAE,CAAC;YACvC,YAAY,CAAC,GAAe,CAAC,GAAG,MAAM,CAAC;QACzC,CAAC;aAAM,CAAC;YAEN,YAAY,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;QAC7B,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"otherFieldsHandle.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/otherFieldsHandle.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,iBAAiB,CAC/B,YAAqC,EACrC,oBAA+E;IAE/E,IAAI,GAAoE,CAAC;IACzE,KAAK,GAAG,IAAI,oBAAoB,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACzC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAClC,IAAI,MAAM,KAAK,SAAS;YAAE,SAAS;QACnC,IAAI,GAAG,KAAK,WAAW,EAAE,CAAC;YACxB,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,MAAkB,CAAC,CAAC;QAChD,CAAC;aAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAEtC,YAAY,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YAE5C,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;QAC3C,CAAC;aAAM,IAAI,OAAO,MAAM,KAAK,SAAS,EAAE,CAAC;YACvC,YAAY,CAAC,GAAe,CAAC,GAAG,MAAM,CAAC;QACzC,CAAC;aAAM,CAAC;YAEN,YAAY,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;QAC7B,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/watchHandler/index.js

@@ -12,10 +12,10 @@ function initWatchOldValue(data, watchConfig, computedKeys) {
     return watchOldValue;
 }
 export function watchHandler(finalOptionsForComponent) {
-    const { observers: observersConfig, watch: watchConfig, data, properties, computed } = finalOptionsForComponent;
+    const { observers: observersConfig, watch: watchConfig, data, properties, computed: computedConfig } = finalOptionsForComponent;
     if (!isEmptyObject(watchConfig)) {
         const rawPropertiesValue = getPropertiesValue(properties);
-        const computedKeys = Object.keys(computed);
+        const computedKeys = Object.keys(computedConfig);
         data.__watchOldValue__ = initWatchOldValue(Object.assign(Object.assign({}, data), rawPropertiesValue), watchConfig, computedKeys);
         for (const key in watchConfig) {
             const watchHadle = watchConfig[key];

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/watchHandler/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAG5F,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,SAAS,iBAAiB,CACxB,IAAqC,EACrC,WAAmB,EACnB,YAAsB;IAEtB,MAAM,aAAa,GAAkB,EAAE,CAAC;IACxC,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;QAC/B,IAAI,eAAe,CAAC,IAAI,EAAE,YAAY,CAAC;YAAE,SAAS;QAClD,aAAa,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AACD,MAAM,UAAU,YAAY,CAC1B,wBAAiD;IAEjD,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,wBAAwB,CAAC;IAChH,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;QAChC,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAC1D,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,iCAAM,IAAI,GAAK,kBAAkB,GAAI,WAAW,EAAE,YAAY,CAAC,CAAC;QAC1G,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;YACpC,MAAM,qBAAqB,GAAG,eAAe,CAAC,GAAG,CAAqB,CAAC;YAEvE,eAAe,CAAC,GAAG,CAAC,GAAG,UAAyB,GAAG,QAAmB;gBACpE,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,CAAC;gBAE/C,IAAI,eAAe,CAAC,GAAG,EAAE,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB;oBAAE,OAAO;gBAChF,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;gBAE/D,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;gBAEpC,IAAI,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;oBAAE,OAAO;gBAC1C,aAAa,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;gBAEzC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC;YAClD,CAAC,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/watchHandler/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAG5F,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,SAAS,iBAAiB,CACxB,IAAqC,EACrC,WAAmB,EACnB,YAAsB;IAEtB,MAAM,aAAa,GAAkB,EAAE,CAAC;IACxC,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;QAE/B,IAAI,eAAe,CAAC,IAAI,EAAE,YAAY,CAAC;YAAE,SAAS;QAClD,aAAa,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AACD,MAAM,UAAU,YAAY,CAC1B,wBAAiD;IAEjD,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,GAClG,wBAAwB,CAAC;IAC3B,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;QAChC,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAC1D,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACjD,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,iCAAM,IAAI,GAAK,kBAAkB,GAAI,WAAW,EAAE,YAAY,CAAC,CAAC;QAC1G,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;YACpC,MAAM,qBAAqB,GAAG,eAAe,CAAC,GAAG,CAAqB,CAAC;YAEvE,eAAe,CAAC,GAAG,CAAC,GAAG,UAAyB,GAAG,QAAmB;gBACpE,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,CAAC;gBAE/C,IAAI,eAAe,CAAC,GAAG,EAAE,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB;oBAAE,OAAO;gBAChF,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;gBAC/D,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;gBACpC,IAAI,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;oBAAE,OAAO;gBAC1C,aAAa,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;gBACzC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC;YAClD,CAAC,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/api/RootComponent/Instance/RootComponentInstance.d.ts

@@ -22,6 +22,6 @@ type InstanceInnerFields = {
     data: OptionsInnerFields["data"];
     disposer: Record<string, Func>;
     cloneData: OptionsInnerFields["data"];
-} & OptionsInnerFields["methods"];
+};
 export type Instance = (ComponentInstance | PageInstance) & InstanceInnerFields;
 export {};

package/package.json

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

package/src/api/DefineComponent/ReturnType/CreateComponentDoc.ts

@@ -1,6 +1,5 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
-import type { AddNullForObject } from "../../../types/AddNullForObject";
 import type { CustomComponentType } from "../../CustomComponent/CustomComponentType";
 import type { RootComponentType } from "../../RootComponent/RootComponentType";
 import type { GetCustomEventDocOfSubDoc } from "./GetCustomEventDocOfSubDoc";
@@ -27,9 +26,7 @@ export type CreateComponentDoc<
     {
       properties: {
         // AddNullForObject 为了给子组件传值时,可以让异步对象数据初始值为null。
-        [k in keyof AllPropertiesDoc as `${TName}_${k & string}`]: AddNullForObject<
-          AllPropertiesDoc[k]
-        >;
+        [k in keyof AllPropertiesDoc as `${TName}_${k & string}`]: AllPropertiesDoc[k];
       };
     }
   >

package/src/api/DefineComponent/ReturnType/test/normalComponentDoc.test.ts

@@ -75,10 +75,10 @@ const onlyProperties = DefineComponent({
 // 1. 类型为typeof OnlyPropsRootDoc加前缀(组件名)
 type OnlyPropertiesExpected = {
   properties: {
-    test_optionalObj?: Mock_User | null;
+    test_optionalObj?: Mock_User;
     test_optionalObjOrNull?: Mock_User | null;
     test_str: string;
-    test_obj: Mock_User | null;
+    test_obj: Mock_User;
   };
 };
 

package/src/api/DefineComponent/index.ts

@@ -14,12 +14,10 @@ export type Path = `/${string}`;
 type RootOptions<
   TRootComponentDoc extends RootComponentType,
   TSubComponentTuple extends CustomComponentType[],
-  // TSlotComponents extends unknown[],
   TName extends string,
   TPath extends Path,
 > =
   & NameOrPathOption<TName, TPath, TRootComponentDoc["isPage"] & {}>
-  // & { slotComponents?: TSlotComponents }
   & RootComponentOption<TRootComponentDoc>
   & SubComponentsOption<TSubComponentTuple>;
 

package/src/api/DefineComponent/normalizeOptions/handleRootComponent.ts

@@ -0,0 +1,32 @@
+import { isEmptyObject } from "../../../utils/isEmptyObject";
+import type { RootComponentTrueOptions } from "../../RootComponent";
+import type { FinalOptionsOfComponent, SameFuncOptions } from ".";
+import { __throttleDebounce__FieldCheck } from "./__throttleDebounce__FieldCheck";
+import { customEventsHandle } from "./customEventsHandle";
+import { otherFieldsHandle } from "./otherFieldsHandle";
+import { sameFuncFieldsCollect } from "./sameFuncFieldsCollect";
+
+/**
+ * 收集 rootComponentOptions 配置到 finalOptions 和 funcOptions 中
+ * @param finalOptions - 收集配置对象`
+ * @param rootComponent - 被收集的源配置对象
+ * @param funcOptions  - 收集特殊配置对象字段
+ */
+export function handleRootComponent(
+  finalOptions: FinalOptionsOfComponent,
+  rootComponent: RootComponentTrueOptions | undefined,
+  funcOptions: SameFuncOptions,
+) {
+  if (rootComponent && !isEmptyObject(rootComponent)) {
+    // 验证配置中是否有内部字段__throttleDebounce__,有则报错,因为在rootComponentOptionHandle中会加入__throttleDebounce__字段到data中
+    __throttleDebounce__FieldCheck(rootComponent);
+    // 自定义事件处理时,如果配置了防抖节流,则需要在data.__throttleDebounce__保留配置信息,以便后续使用
+    if (rootComponent.customEvents) customEventsHandle(finalOptions, rootComponent.customEvents);
+    delete rootComponent.customEvents;
+    if (rootComponent.events) Object.assign(finalOptions.methods, rootComponent.events);
+    delete rootComponent.events;
+    sameFuncFieldsCollect(rootComponent, funcOptions);
+
+    otherFieldsHandle(finalOptions, rootComponent);
+  }
+}

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

@@ -3,9 +3,7 @@ import type { FinalOptionsOfComponent } from "..";
 import { reactionRegister } from "./reactionRegister";
 export function initStore(storeConfig: FinalOptionsOfComponent["store"] | undefined) {
   return function(this: Instance) {
-    if (!storeConfig || this.data.__storeInited__) return;
-    this.data.__storeInited__ = true; // 切记一定要在这里设置,不能放最下面,因为initStore可能多次触发,导致重复初始化，从而引起dispose无效的问题.
+    if (!storeConfig) return;
     reactionRegister.call(this, storeConfig);
-    // this.data.__storeInited__ = true; 之前放在这里,导致dispose无效的问题。
   };
 }

package/src/api/DefineComponent/normalizeOptions/handleSubComponents.ts

@@ -0,0 +1,23 @@
+import type { CustomComponentTrueOptions } from "../../CustomComponent";
+import type { FinalOptionsOfComponent, SameFuncOptions } from ".";
+import { __throttleDebounce__FieldCheck } from "./__throttleDebounce__FieldCheck";
+import { otherFieldsHandle } from "./otherFieldsHandle";
+import { sameFuncFieldsCollect } from "./sameFuncFieldsCollect";
+
+export function handleSubComponents(
+  componentOptions: FinalOptionsOfComponent,
+  subComponents: CustomComponentTrueOptions[] | undefined,
+  funcOptions: SameFuncOptions,
+) {
+  if (subComponents && subComponents.length !== 0) {
+    // 验证配置中是否有内部字段__throttleDebounce__,有则报错,因为在rootComponentOptionHandle中会加入__throttleDebounce__字段到data中
+    __throttleDebounce__FieldCheck(subComponents);
+    subComponents.forEach((subOption) => {
+      if (subOption.events) Object.assign(componentOptions.methods, subOption.events);
+
+      sameFuncFieldsCollect(subOption, funcOptions);
+
+      otherFieldsHandle(componentOptions, subOption);
+    });
+  }
+}

package/src/api/DefineComponent/normalizeOptions/hijackHandle/addDetachedData.ts

@@ -0,0 +1,12 @@
+import type { Instance } from "../../../RootComponent/Instance/RootComponentInstance";
+
+export function addDetachedData(this: Instance) {
+  // 如果 attached字段被占用,就不添加了
+  if (this.data.attached !== undefined) return;
+  this.data.__notUpdateComputed__ = true;
+  this.setData({
+    // @ts-ignore
+    attached: true,
+  });
+  this.data.__notUpdateComputed__ = false;
+}

package/src/api/DefineComponent/normalizeOptions/hijackHandle/hijack.ts

@@ -0,0 +1,26 @@
+import type { Func } from "hry-types/src/Misc/Func";
+import type { FinalOptionsOfComponent } from "..";
+
+/**
+ * 劫持指定配置字段,在原有配置前执行指定函数
+ */
+export function hijack<T extends FinalOptionsOfComponent[keyof FinalOptionsOfComponent]>(
+  config: T,
+  field: keyof T,
+  before: Func[],
+  after: Func[] = [],
+) {
+  // @ts-ignore 隐式索引
+  const originalFunc: Func | undefined = config[field];
+
+  // @ts-ignore 隐式索引
+  config[field] = function(...args: unknown[]) {
+    before.forEach(func => func.call(this, ...args));
+
+    if (originalFunc) originalFunc.apply(this, args);
+
+    after.forEach(func => func.call(this, ...args));
+  };
+
+  return;
+}

package/src/api/DefineComponent/normalizeOptions/hijackHandle/index.ts

@@ -1,26 +1,46 @@
-import type { Func } from "hry-types/src/Misc/Func";
 import type { FinalOptionsOfComponent } from "..";
+import { disposeStore } from "../handleStore/disposeStore";
+import { initStore } from "../handleStore/initStore";
+import { initComputed } from "../initComputed";
+import { computedUpdater } from "../initComputed/computedUpdater";
+import { addDetachedData } from "./addDetachedData";
+import { hijack } from "./hijack";
+import { isPageCheck } from "./isPageCheck";
+import { loadReceivedDataHandle } from "./loadReceivedDataHandle";
+import { onLoadReceivedDataHandle } from "./onLoadReceivedDataHandle";
+import { pagePathCheck } from "./pagePathCheck";
 
-/**
- * 劫持指定配置字段,在原有配置前执行指定函数
- */
-export function hijack<T extends FinalOptionsOfComponent[keyof FinalOptionsOfComponent]>(
-  config: T,
-  field: keyof T,
-  before: Func[],
-  // after: Func[] = [],
+export function hijackHandle(
+  finalOptionsForComponent: FinalOptionsOfComponent,
+  isPage: boolean | undefined,
+  path: string | undefined,
 ) {
-  // @ts-ignore 隐式索引
-  const originalFunc: Func | undefined = config[field];
+  // 对页面传入参数进行处理 老框架劫持页面methods.onLoad,新框架劫持页面pageLifetimes.load
+  if (finalOptionsForComponent.isPage) {
+    hijack(finalOptionsForComponent.pageLifetimes, "load", [loadReceivedDataHandle]);
+  }
 
-  // @ts-ignore 隐式索引
-  config[field] = function(...args: unknown[]) {
-    before.forEach(func => func.call(this, ...args));
+  hijack(finalOptionsForComponent.methods, "onLoad", [onLoadReceivedDataHandle]);
+  hijack(finalOptionsForComponent.observers, "**", [
+    computedUpdater,
+  ]);
 
-    if (originalFunc) originalFunc.apply(this, args);
-
-    // after.forEach(func => func.call(this, ...args));
-  };
-
-  return;
+  hijack(
+    finalOptionsForComponent.lifetimes,
+    "attached",
+    [
+      // 验证isPage字段是否配置正确
+      isPageCheck(isPage),
+      // 验证页面的Path字段是否配置正确
+      pagePathCheck(path),
+      initStore(finalOptionsForComponent.store),
+      initComputed(finalOptionsForComponent.computed, finalOptionsForComponent.watch),
+    ],
+    [addDetachedData],
+  );
+  hijack(
+    finalOptionsForComponent.lifetimes,
+    "detached",
+    [disposeStore],
+  );
 }

package/src/api/DefineComponent/normalizeOptions/index.ts

@@ -1,9 +1,7 @@
 import type { Func } from "hry-types/src/Misc/_api";
 import { BBeforeCreate } from "../../../behaviors/BbeforeCreated";
-
 import { BthrottleDebounce } from "../../../behaviors/BthrottleDebounce";
 import { applyDebounceAndThrottle } from "../../../utils/applyDebounceAndThrottle";
-import { isEmptyObject } from "../../../utils/isEmptyObject";
 import { instanceConfig } from "../../InstanceInject/instanceConfig";
 import type { ComputedConstraint } from "../../RootComponent/Computed/ComputedConstraint";
 import type { DataConstraint } from "../../RootComponent/Data/DataConstraint";
@@ -13,24 +11,13 @@ import type { PageLifetimesOption } from "../../RootComponent/PageLifetimes/Page
 import type { PropertiesConstraint } from "../../RootComponent/Properties/PropertiesConstraint";
 import type { StoreConstraint } from "../../RootComponent/Store/StoreConstraint";
 import type { DefineComponentOption } from "..";
-import { __throttleDebounce__FieldCheck } from "./__throttleDebounce__FieldCheck";
-
-import { initStore } from "./handleStore/initStore";
-import { hijack } from "./hijackHandle";
-import { isPageCheck } from "./hijackHandle/isPageCheck";
-import { loadReceivedDataHandle } from "./hijackHandle/loadReceivedDataHandle";
-import { onLoadReceivedDataHandle } from "./hijackHandle/onLoadReceivedDataHandle";
-import { pagePathCheck } from "./hijackHandle/pagePathCheck";
+import { handleRootComponent } from "./handleRootComponent";
+import { handleSubComponents } from "./handleSubComponents";
+import { hijackHandle } from "./hijackHandle";
+import type { ComputedCache } from "./initComputed/initComputedAndGetCache";
 import { injectInfoHandler } from "./injectInfoHandler";
 import { InternalFieldProtection } from "./internalFieldProtection";
-import { rootComponentOptionHandle } from "./rootComponentOptionHandle";
 import { sameFuncOptionsHandle } from "./sameFuncOptionsHandle";
-// import { slotComponentOptionHandle } from "./slotComponentsOptionHandle";
-import { disposeStore } from "./handleStore/disposeStore";
-import { initComputed } from "./initComputed";
-import { computedUpdater } from "./initComputed/computedUpdater";
-import type { ComputedCache } from "./initComputed/initComputedAndGetCache";
-import { subComponentsOptionHandle } from "./subComponentsOptionHandle";
 import { watchHandler } from "./watchHandler";
 // 因为watch字段可能有多个变量,所以在这里定义的value是一个数组
 export type WatchOldValue = Record<string, unknown[]>;
@@ -38,16 +25,15 @@ export type ThrottleDebounce = Partial<Record<"throttle" | "debounce", Record<st
 export type OptionsInnerFields = {
   data: {
     __storeInited__?: boolean;
-    __computed__?: boolean;
-    __computedInitializing__?: boolean;
+    // 在attach周期结束后,为data.attached赋值为true
+    attached?: boolean;
+    // 为data.attached赋值为true时会触发Observers["**"]的回调函数,进而运行computedUpdater,所以要设置一个标志位来避免触发computedUpdater。因为这是无意义的。
+    __notUpdateComputed__?: boolean;
     __computedInited__?: boolean;
     __computedCache__?: ComputedCache;
     __watchOldValue__?: WatchOldValue;
     __throttleDebounce__?: ThrottleDebounce;
   };
-  methods: {
-    __computedUpdater__?: Func;
-  };
 };
 
 /**
@@ -83,24 +69,24 @@ export type FinalOptionsOfComponent = {
 export function normalizeOptions(
   defineComponentOption: DefineComponentOption,
 ): FinalOptionsOfComponent {
-  const rootComponentOption = defineComponentOption.rootComponent;
-  const subComponentsOptions = defineComponentOption.subComponents;
-  // const slotComponentOptions = defineComponentOption.slotComponents;
-  const finalOptionsForComponent: FinalOptionsOfComponent = injectInfoHandler({
+  const { rootComponent, subComponents, path } = defineComponentOption;
+  const isPage = rootComponent?.isPage ?? false;
+  const finalOptionsForComponent: FinalOptionsOfComponent = {
     observers: {},
     data: {},
     methods: {},
     behaviors: [BthrottleDebounce],
     externalClasses: [],
     pageLifetimes: {},
-    isPage: false,
+    isPage,
     properties: {},
     computed: {},
     watch: {},
     lifetimes: {},
     options: {},
-  }, instanceConfig.injectInfo);
-
+  };
+  // 处理注入的实例配置项
+  injectInfoHandler(finalOptionsForComponent, instanceConfig.injectInfo);
   /**
    * 为了更高的效率,在处理rootComponentOption和subComponentsOption数据时,把相同字段配置(pageLifetimes，lifetimes,watch,observers)收集到funcOptions中。
    * 后续再一起处理这些字段,整合进finalOptionsForComponent配置中。即funcConfig是一个临时中介对象。
@@ -112,73 +98,32 @@ export function normalizeOptions(
     observers: {},
   };
 
-  if (rootComponentOption && !isEmptyObject(rootComponentOption)) {
-    // 验证配置中是否有内部字段__throttleDebounce__,有则报错,因为在rootComponentOptionHandle中会加入__throttleDebounce__字段到data中
-    __throttleDebounce__FieldCheck(rootComponentOption);
-    rootComponentOptionHandle(finalOptionsForComponent, rootComponentOption, sameFuncOptions);
-  }
-  if (subComponentsOptions && subComponentsOptions.length !== 0) {
-    // 验证配置中是否有内部字段__throttleDebounce__,有则报错,因为在rootComponentOptionHandle中会加入__throttleDebounce__字段到data中
-    __throttleDebounce__FieldCheck(subComponentsOptions);
-    subComponentsOptionHandle(finalOptionsForComponent, subComponentsOptions, sameFuncOptions);
-  }
+  handleRootComponent(finalOptionsForComponent, rootComponent, sameFuncOptions);
+
+  handleSubComponents(finalOptionsForComponent, subComponents, sameFuncOptions);
 
-  sameFuncOptionsHandle(finalOptionsForComponent, rootComponentOption?.isPage, sameFuncOptions);
+  sameFuncOptionsHandle(finalOptionsForComponent, isPage, sameFuncOptions);
 
   // 配置与内部字段冲突验证
   InternalFieldProtection(finalOptionsForComponent);
 
-  // 对页面传入参数进行处理 老框架劫持页面methods.onLoad,新框架劫持页面pageLifetimes.load
-  if (finalOptionsForComponent.isPage) {
-    hijack(finalOptionsForComponent.pageLifetimes, "load", [loadReceivedDataHandle]);
-  }
-
-  hijack(finalOptionsForComponent.methods, "onLoad", [onLoadReceivedDataHandle]);
-  // 只要properties不为空且传入的字段在properties中,就会在attached周期之前先触发observers["**"]事件一次
-  hijack(finalOptionsForComponent.observers, "**", [
-    initStore(finalOptionsForComponent.store),
-    initComputed(finalOptionsForComponent.computed, finalOptionsForComponent.watch),
-    computedUpdater,
-  ]);
-
-  hijack(
-    finalOptionsForComponent.lifetimes,
-    "attached",
-    [
-      // 验证isPage字段是否配置正确
-      isPageCheck(rootComponentOption?.isPage),
-      pagePathCheck(defineComponentOption.path),
-      initStore(finalOptionsForComponent.store),
-      initComputed(finalOptionsForComponent.computed, finalOptionsForComponent.watch),
-      function() {
-        // @ts-ignore
-        this.data.__attached__ = true;
-      },
-    ],
-  );
-  hijack(
-    finalOptionsForComponent.lifetimes,
-    "detached",
-    [disposeStore],
-  );
   // 页面时删除预设的虚拟组件字段
-  if (finalOptionsForComponent.isPage && finalOptionsForComponent.options) {
+  if (isPage && finalOptionsForComponent.options) {
     Reflect.deleteProperty(finalOptionsForComponent.options, "virtualHost");
   }
 
   // 处理debounce和throttle前缀的方法(事件)配置
   applyDebounceAndThrottle(finalOptionsForComponent.methods);
 
-  // 初始化store数据到data并把store配置放入到data的__storeConfig__下为后续使用
-  // initStore(finalOptionsForComponent);
-
-  // 处理watch配置,注意的是 oldValue中的计算属性初始赋值在计算属性初始化完毕后。
+  // 处理watch配置,注意的是 oldValue中的计算属性初始赋值在计算属性初始化完毕后,即计算属性初始化后,再变化时才会被watch到。
   watchHandler(finalOptionsForComponent);
-  // 在rootComponentOptionHandle中保留了防抖节流配置,这里处理后,删除data.__throttleDebounce__字段
 
-  // BBeforeCreate在最后面,让BeforeCreate生命周期运行在最终建立组件时。
+  // BBeforeCreate在最后面,让BeforeCreate生命周期运行在最终建立组件时。用于测试。
   finalOptionsForComponent.behaviors.push(BBeforeCreate);
 
+  // 劫持函数的处理
+  hijackHandle(finalOptionsForComponent, isPage, path);
+
   return finalOptionsForComponent;
 }
 

package/src/api/DefineComponent/normalizeOptions/initComputed/computedUpdater.ts

@@ -5,6 +5,7 @@ import { removeSubDependences } from "./dependencesOptimize";
 import type { ComputedDependence } from "./initComputedAndGetCache";
 
 export function computedUpdater(this: Instance): void {
+  if (this.data.__notUpdateComputed__) return;
   for (const key in this.data.__computedCache__) {
     const itemCache = this.data.__computedCache__[key];
     let changed = false;

package/src/api/DefineComponent/normalizeOptions/initComputed/index.ts

@@ -1,4 +1,5 @@
 import type { Func } from "hry-types/src/Misc/Func";
+import { deepClone } from "../../../../utils/deepClone";
 import { isEmptyObject } from "../../../../utils/isEmptyObject";
 import { nonNullable } from "../../../../utils/nonNullable";
 import type { ComputedConstraint } from "../../../RootComponent/Computed/ComputedConstraint";
@@ -23,28 +24,24 @@ import { initComputedAndGetCache } from "./initComputedAndGetCache";
  * @returns
  */
 export function initComputed(
-  computedConfig: ComputedConstraint | undefined,
+  computedConfig: ComputedConstraint,
   watchConfig: Record<string, Func>,
   // mark?: string,
 ) {
   return function(this: Instance) {
     // __computedCache__ 用来避免重复初始化。
-    if (!computedConfig || this.data.__computedInitializing__ === true) return;
-    this.data.__computedInitializing__ = true;
 
     const __computedInitCache__ = initComputedAndGetCache.call(this, computedConfig);
     // 缓存放入data中
     this.data.__computedCache__ = __computedInitCache__;
     // 为__watchOldValue__赋值(watchPath中包含计算属性的值的key)
-
     if (!isEmptyObject(watchConfig)) {
       // 有watchConfig配置时,watchOldValue已经初始过了,所以必有__watchOldValue__
       const watchOldValue: Record<string, unknown[]> = nonNullable(this.data.__watchOldValue__);
       for (const path in watchConfig) {
         // 只针对watchPath中包含计算属性的值的key进行赋值
         if (hasComputedPath(path, Object.keys(computedConfig))) {
-          // @ts-ignore
-          watchOldValue[path] = getPathsValue(this.data, path);
+          watchOldValue[path] = deepClone(getPathsValue(this.data, path));
         }
       }
     }

package/src/api/DefineComponent/normalizeOptions/internalFieldProtection.ts

@@ -2,7 +2,7 @@ import type { FinalOptionsOfComponent } from ".";
 
 // 内部字段
 const internalFiled = {
-  methods: ["disposer", "__computedUpdater__"],
+  methods: ["disposer"],
   data: ["__computedCache__", "__watchOldValue__"], // "__throttleDebounce__" 放在之前的位置验证
 };
 

package/src/api/DefineComponent/normalizeOptions/otherFieldsHandle.ts

@@ -11,6 +11,7 @@ export function otherFieldsHandle(
   let key: keyof Omit<RootComponentTrueOptions, "customEvents" | "events">;
   for (key in rootComponentOptions) {
     const config = rootComponentOptions[key];
+    console.log("hry 1", key, config);
     if (config === undefined) continue;
     if (key === "behaviors") {
       finalOptions[key].push(...config as string[]);

package/src/api/DefineComponent/normalizeOptions/watchHandler/index.ts

@@ -1,5 +1,4 @@
 import type { Func } from "hry-types/src/Misc/Func";
-
 import { deepClone, deepEqual, isEmptyObject, nonNullable } from "../../../../utils/_utils";
 import type { Instance } from "../../../RootComponent/Instance/RootComponentInstance";
 import type { FinalOptionsOfComponent, WatchOldValue } from "..";
@@ -14,6 +13,7 @@ function initWatchOldValue(
 ): WatchOldValue {
   const watchOldValue: WatchOldValue = {};
   for (const path in watchConfig) {
+    // 有计算属性的路径,跳过会在计算属性初始化后赋值
     if (hasComputedPath(path, computedKeys)) continue;
     watchOldValue[path] = deepClone(getPathsValue(data, path));
   }
@@ -23,10 +23,11 @@ function initWatchOldValue(
 export function watchHandler(
   finalOptionsForComponent: FinalOptionsOfComponent,
 ) {
-  const { observers: observersConfig, watch: watchConfig, data, properties, computed } = finalOptionsForComponent;
+  const { observers: observersConfig, watch: watchConfig, data, properties, computed: computedConfig } =
+    finalOptionsForComponent;
   if (!isEmptyObject(watchConfig)) {
     const rawPropertiesValue = getPropertiesValue(properties);
-    const computedKeys = Object.keys(computed);
+    const computedKeys = Object.keys(computedConfig);
     data.__watchOldValue__ = initWatchOldValue({ ...data, ...rawPropertiesValue }, watchConfig, computedKeys);
     for (const key in watchConfig) {
       const watchHadle = watchConfig[key];
@@ -37,12 +38,9 @@ export function watchHandler(
         // 包含计算属性的路径,只会在计算属性初始化后才会触发watch函数
         if (hasComputedPath(key, computedKeys) && !this.data.__computedInited__) return;
         const watchOldValue = nonNullable(this.data.__watchOldValue__);
-        // 判断watch路径中是否有计算属性字段,有且值为undefined时,则不执行watch,因为计算属性未初始化时值为undefined
         const oldValue = watchOldValue[key];
-
         if (deepEqual(newValue, oldValue)) return;
         watchOldValue[key] = deepClone(newValue);
-
         watchHadle.call(this, ...newValue, ...oldValue);
       };
     }

package/src/api/RootComponent/Instance/RootComponentInstance.ts

@@ -41,5 +41,5 @@ type InstanceInnerFields = {
   data: OptionsInnerFields["data"];
   disposer: Record<string, Func>;
   cloneData: OptionsInnerFields["data"];
-} & OptionsInnerFields["methods"];
+};
 export type Instance = (ComponentInstance | PageInstance) & InstanceInnerFields;

package/dist/api/DefineComponent/normalizeOptions/rootComponentOptionHandle.d.ts

@@ -1,3 +0,0 @@
-import type { RootComponentTrueOptions } from "../../RootComponent";
-import type { FinalOptionsOfComponent, SameFuncOptions } from ".";
-export declare function rootComponentOptionHandle(finalOptions: FinalOptionsOfComponent, rootComponentOptions: RootComponentTrueOptions, funcOptions: SameFuncOptions): void;

package/dist/api/DefineComponent/normalizeOptions/rootComponentOptionHandle.js

@@ -1,14 +0,0 @@
-import { customEventsHandle } from "./customEventsHandle";
-import { otherFieldsHandle } from "./otherFieldsHandle";
-import { sameFuncFieldsCollect } from "./sameFuncFieldsCollect";
-export function rootComponentOptionHandle(finalOptions, rootComponentOptions, funcOptions) {
-    if (rootComponentOptions.customEvents)
-        customEventsHandle(finalOptions, rootComponentOptions.customEvents);
-    delete rootComponentOptions.customEvents;
-    if (rootComponentOptions.events)
-        Object.assign(finalOptions.methods, rootComponentOptions.events);
-    delete rootComponentOptions.events;
-    sameFuncFieldsCollect(rootComponentOptions, funcOptions);
-    otherFieldsHandle(finalOptions, rootComponentOptions);
-}
-//# sourceMappingURL=rootComponentOptionHandle.js.map

package/dist/api/DefineComponent/normalizeOptions/rootComponentOptionHandle.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"rootComponentOptionHandle.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/rootComponentOptionHandle.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAQhE,MAAM,UAAU,yBAAyB,CACvC,YAAqC,EACrC,oBAA8C,EAC9C,WAA4B;IAG5B,IAAI,oBAAoB,CAAC,YAAY;QAAE,kBAAkB,CAAC,YAAY,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAC3G,OAAO,oBAAoB,CAAC,YAAY,CAAC;IACzC,IAAI,oBAAoB,CAAC,MAAM;QAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAClG,OAAO,oBAAoB,CAAC,MAAM,CAAC;IACnC,qBAAqB,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;IAEzD,iBAAiB,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;AACxD,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/subComponentsOptionHandle.d.ts

@@ -1,3 +0,0 @@
-import type { CustomComponentTrueOptions } from "../../CustomComponent";
-import type { FinalOptionsOfComponent, SameFuncOptions } from ".";
-export declare function subComponentsOptionHandle(componentOptions: FinalOptionsOfComponent, subComponents: CustomComponentTrueOptions[], funcOptions: SameFuncOptions): void;

package/dist/api/DefineComponent/normalizeOptions/subComponentsOptionHandle.js

@@ -1,11 +0,0 @@
-import { otherFieldsHandle } from "./otherFieldsHandle";
-import { sameFuncFieldsCollect } from "./sameFuncFieldsCollect";
-export function subComponentsOptionHandle(componentOptions, subComponents, funcOptions) {
-    subComponents.forEach((subOption) => {
-        if (subOption.events)
-            Object.assign(componentOptions.methods, subOption.events);
-        sameFuncFieldsCollect(subOption, funcOptions);
-        otherFieldsHandle(componentOptions, subOption);
-    });
-}
-//# sourceMappingURL=subComponentsOptionHandle.js.map

package/dist/api/DefineComponent/normalizeOptions/subComponentsOptionHandle.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"subComponentsOptionHandle.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/subComponentsOptionHandle.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,UAAU,yBAAyB,CACvC,gBAAyC,EACzC,aAA2C,EAC3C,WAA4B;IAE5B,aAAa,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QAClC,IAAI,SAAS,CAAC,MAAM;YAAE,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;QAEhF,qBAAqB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAE9C,iBAAiB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/types/AddNullForObject.d.ts

@@ -1,2 +0,0 @@
-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

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

package/dist/types/AddNullForObject.js.map

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

package/src/api/DefineComponent/normalizeOptions/rootComponentOptionHandle.ts

@@ -1,26 +0,0 @@
-import type { RootComponentTrueOptions } from "../../RootComponent";
-import type { FinalOptionsOfComponent, SameFuncOptions } from ".";
-import { customEventsHandle } from "./customEventsHandle";
-import { otherFieldsHandle } from "./otherFieldsHandle";
-import { sameFuncFieldsCollect } from "./sameFuncFieldsCollect";
-
-/**
- * 收集 rootComponentOptions 配置到 finalOptions 和 funcOptions 中
- * @param finalOptions - 收集配置对象`
- * @param rootComponentOptions - 被收集的源配置对象
- * @param funcOptions  - 收集特殊配置对象字段
- */
-export function rootComponentOptionHandle(
-  finalOptions: FinalOptionsOfComponent,
-  rootComponentOptions: RootComponentTrueOptions,
-  funcOptions: SameFuncOptions,
-) {
-  // 自定义事件处理时,如果配置了防抖节流,则需要在data.__throttleDebounce__保留配置信息,以便后续使用
-  if (rootComponentOptions.customEvents) customEventsHandle(finalOptions, rootComponentOptions.customEvents);
-  delete rootComponentOptions.customEvents;
-  if (rootComponentOptions.events) Object.assign(finalOptions.methods, rootComponentOptions.events);
-  delete rootComponentOptions.events;
-  sameFuncFieldsCollect(rootComponentOptions, funcOptions);
-
-  otherFieldsHandle(finalOptions, rootComponentOptions);
-}

package/src/api/DefineComponent/normalizeOptions/slotComponentsOptionHandle.ts

@@ -1,22 +0,0 @@
-// import type { SlotComponentReturnType } from "../../ChunkComponent/SlotComponentReturnType";
-// import type { FinalOptionsOfComponent, SameFuncOptions } from ".";
-// import { otherFieldsHandle } from "./otherFieldsHandle";
-// import { sameFuncFieldsCollect } from "./sameFuncFieldsCollect";
-
-// /**
-//  * 收集 rootComponentOptions 配置到 finalOptions 和 funcOptions 中
-//  * @param finalOptions - 收集配置对象
-//  * @param funcOptions  - 收集特殊配置对象字段
-//  * @param slotComponentOptions - 被收集的源配置对象
-//  */
-// export function slotComponentOptionHandle(
-//   finalOptions: FinalOptionsOfComponent,
-//   slotComponentOptions: SlotComponentReturnType,
-//   funcOptions: SameFuncOptions,
-// ) {
-//   if (slotComponentOptions.events) Object.assign(finalOptions.methods, slotComponentOptions.events);
-
-//   sameFuncFieldsCollect(slotComponentOptions, funcOptions);
-
-//   otherFieldsHandle(finalOptions, slotComponentOptions);
-// }

package/src/api/DefineComponent/normalizeOptions/subComponentsOptionHandle.ts

@@ -1,18 +0,0 @@
-import type { CustomComponentTrueOptions } from "../../CustomComponent";
-import type { FinalOptionsOfComponent, SameFuncOptions } from ".";
-import { otherFieldsHandle } from "./otherFieldsHandle";
-import { sameFuncFieldsCollect } from "./sameFuncFieldsCollect";
-
-export function subComponentsOptionHandle(
-  componentOptions: FinalOptionsOfComponent,
-  subComponents: CustomComponentTrueOptions[],
-  funcOptions: SameFuncOptions,
-) {
-  subComponents.forEach((subOption) => {
-    if (subOption.events) Object.assign(componentOptions.methods, subOption.events);
-
-    sameFuncFieldsCollect(subOption, funcOptions);
-
-    otherFieldsHandle(componentOptions, subOption);
-  });
-}