annil 1.3.0-dev.202312100 → 1.3.0

package/dist/behaviors/BComputedAndWatch/initComputed.js.map

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

package/dist/behaviors/BComputedAndWatch/types.d.ts

@@ -4,19 +4,22 @@ import type { ComputedDependence } from "./initComputed";
 export type InstanceCustomFields = {
     __pendingSetData__?: object | null;
     __storeConfig__?: () => Record<string, () => unknown>;
-    __computedStatus__?: "初始化中" | "待更新" | "更新完毕";
+    __computedStatus__?: "待更新" | "更新完毕";
     __computedUpdater__: Func;
-    __computedConfig__?: () => Record<string, Func>;
-    __computedCache__?: ComputedCache;
+    __computedInitCache__?: () => ComputedCache;
+    __computedCache__: ComputedCache | undefined;
     __watchOldValue__?: WatchOldValue;
     __watchConfig__?: () => Record<string, Func>;
     __compLoadList__?: Func[];
+    __prePropertiesValue__: object | undefined;
+    __setDataFromInner__?: boolean;
     disposer: Record<string, Func>;
 };
 export type Instance = (ComponentInstance | PageInstance) & InstanceCustomFields;
-export type ComputedCache = Record<string, {
+export type ItemCache = {
     dependences: ComputedDependence[];
     method: Func;
     value: unknown;
-}>;
+};
+export type ComputedCache = Record<string, ItemCache>;
 export type WatchOldValue = Record<string, unknown[]>;

package/dist/behaviors/BStore.js

@@ -6,11 +6,8 @@ export const BStore = Behavior({
             return;
         const { toJS } = require("mobx");
         for (const key in storeConfig) {
-            options.data || (options.data = {});
             options.data[key] = toJS(storeConfig[key]());
-            options.methods || (options.methods = {});
             options.methods.__storeConfig__ = () => storeConfig;
-            delete options.store;
         }
     },
     lifetimes: {
@@ -19,6 +16,7 @@ export const BStore = Behavior({
             const storeConfig = (_a = this.__storeConfig__) === null || _a === void 0 ? void 0 : _a.call(this);
             if (!storeConfig)
                 return;
+            deleteProtoField(this, "__storeConfig__");
             const { comparer, reaction, toJS } = require("mobx");
             this.disposer = {};
             for (const key in storeConfig) {
@@ -30,7 +28,6 @@ export const BStore = Behavior({
                     equals: comparer.structural,
                 });
             }
-            deleteProtoField(this, "__storeConfig__");
         },
         detached() {
             for (const key in this.disposer) {

package/dist/behaviors/BStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"BStore.js","sourceRoot":"","sources":["../../src/behaviors/BStore.ts"],"names":[],"mappings":"AAGA,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"}
+{"version":3,"file":"BStore.js","sourceRoot":"","sources":["../../src/behaviors/BStore.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAG7D,MAAM,CAAC,MAAM,MAAM,GAAG,QAAQ,CAAC;IAE7B,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,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAG7C,OAAO,CAAC,OAAO,CAAC,eAAe,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC;QACtD,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,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;YAE1C,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;QACH,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/behaviors/BbeforeCreated.js.map

@@ -1 +1 @@
-{"version":3,"file":"BbeforeCreated.js","sourceRoot":"","sources":["../../src/behaviors/BbeforeCreated.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,aAAa,GAAG,QAAQ,CAAC;IACpC,gBAAgB,CAAC,OAAgC;QAE/C,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAU,CAAC,YAAY,CAAC;QAEzD,gBAAgB,IAAI,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"BbeforeCreated.js","sourceRoot":"","sources":["../../src/behaviors/BbeforeCreated.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,aAAa,GAAG,QAAQ,CAAC;IAEpC,gBAAgB,CACd,OAAwF;QAGxF,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAU,CAAC,YAAY,CAAC;QAEzD,gBAAgB,IAAI,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;CACF,CAAC,CAAC"}

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,WAAkC;CAExC,CAAC"}
+{"version":3,"file":"InnerMarker.js","sourceRoot":"","sources":["../../src/utils/InnerMarker.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,GAAG,EAAE,WAAW;CACjB,CAAC"}

package/dist/utils/isEmptyObject.d.ts

@@ -1 +1 @@
-export declare function isEmptyObject(obj: unknown): boolean;
+export declare function isEmptyObject(obj: object): boolean;

package/dist/utils/isEmptyObject.js.map

@@ -1 +1 @@
-{"version":3,"file":"isEmptyObject.js","sourceRoot":"","sources":["../../src/utils/isEmptyObject.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,aAAa,CAAC,GAAY;IACxC,IACE,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,YAAY,GAAG,IAAI,GAAG,YAAY,GAAG;WACtG,GAAG,YAAY,OAAO,IAAI,GAAG,YAAY,OAAO,EACnD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AAC3C,CAAC"}
+{"version":3,"file":"isEmptyObject.js","sourceRoot":"","sources":["../../src/utils/isEmptyObject.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,aAAa,CAAC,GAAW;IACvC,IACE,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,YAAY,GAAG,IAAI,GAAG,YAAY,GAAG;WACtG,GAAG,YAAY,OAAO,IAAI,GAAG,YAAY,OAAO,EACnD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AAC3C,CAAC"}

package/package.json

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

package/src/api/DefineComponent/collectOptionsForComponent.ts

@@ -1,8 +1,7 @@
 import type { Func } from "hry-types/src/Misc/_api";
 import { BBeforeCreate } from "../../behaviors/BbeforeCreated";
 import { BComputedAndWatch } from "../../behaviors/BComputedAndWatch";
-import { initComputed } from "../../behaviors/BComputedAndWatch/initComputed";
-import type { Instance } from "../../behaviors/BComputedAndWatch/types";
+import type { ComputedCache, Instance } from "../../behaviors/BComputedAndWatch/types";
 import { BStore } from "../../behaviors/BStore";
 import type { WMComponent } from "../../types/OfficialTypeAlias";
 import { INNERMARKER } from "../../utils/InnerMarker";
@@ -20,6 +19,7 @@ import type { PageInstance } from "../RootComponent/Instance/RootComponentInstan
 import type { LifetimesConstraint } from "../RootComponent/Lifetimes/LifetimesConstraint";
 import type { MethodsConstraint } from "../RootComponent/Methods/MethodsConstraint";
 import type { PageLifetimesOption } from "../RootComponent/PageLifetimes/PageLifetimesOption";
+import type { PropertiesConstraint } from "../RootComponent/Properties/PropertiesConstraint";
 import type { StoreConstraint } from "../RootComponent/Store/StoreConstraint";
 import type { SubComponentTrueOptions } from "../SubComponent";
 import type { DefineComponentOption } from ".";
@@ -33,18 +33,21 @@ export type FuncOptions = Record<"pageLifetimes" | "lifetimes" | "watch", Record
  * 最终传入原生Component的配置项
  */
 export type FinalOptionsOfComponent = {
+  data: DataConstraint;
+  observers: Record<string, Func>;
+  behaviors: string[];
+  methods: MethodsConstraint & {
+    __computedInitCache__?: () => ComputedCache;
+  };
   isPage?: boolean;
   options?: WMComponent.Options;
-  properties?: Record<string, any>;
-  data?: DataConstraint;
+  properties?: PropertiesConstraint;
   store?: StoreConstraint;
   computed?: ComputedConstraint;
-  observers?: Record<string, Func>;
-  behaviors?: string[];
-  methods?: MethodsConstraint;
   watch?: Record<string, Func>;
   lifetimes?: LifetimesConstraint;
-} & PageLifetimesOption<false, object>;
+  pageLifetimes?: PageLifetimesOption<false, object>["pageLifetimes"];
+};
 
 /**
  * 原生Component会对传入的对象字段匹配的properties字段setData赋值。不符合字段或Page时不会赋值。
@@ -60,7 +63,7 @@ function onLoadReceivedDataHandle(
 ) {
   const innerData: string | undefined = option[INNERMARKER.url];
 
-  // 情况1为undefined,2为INNERMARKER.url有值但不是本身,说明没有组件中的写了load(因为组件的load提前解析这个参数),3所以innerData等于 INNERMARKER.url即有组件配置了load(提前解析了)
+  // 情况1为undefined,2为INNERMARKER.url有值但不是本身,说明是老框架。3所以innerData等于 INNERMARKER.url即有组件配置了load(新框架在pageLifetimes.load中提前解析了)
   if (innerData === undefined) return;
   if (innerData !== INNERMARKER.url) {
     // 需要情况2 需要解析
@@ -105,15 +108,15 @@ function loadReceivedDataHandle(
   option: Record<typeof INNERMARKER.url, string>,
 ) {
   const innerData: string | undefined = option[INNERMARKER.url];
-  // 未使用自定义的navigateTo 或者在之前的load中已经被解析过了
-  if (innerData === undefined || innerData == INNERMARKER.url) return;
+  // 未使用自定义的navigateTo
+  if (innerData === undefined) return;
+  // 使用navigateTo API
   const decodeOption = JSON.parse(decodeURIComponent(innerData));
 
-  // 使用navigateTo API
   for (const key in decodeOption) {
     option[key] = decodeOption[key];
   }
-  // 给onLoad劫持函数一个标记,判断传值来自哪个API
+  // 给onLoad劫持函数一个标记,判断在新框架下已经被解析过了
   option[INNERMARKER.url] = INNERMARKER.url;
 }
 /**
@@ -150,9 +153,9 @@ function InternalFieldProtection(config: object | undefined, keys: string[]) {
 /**
  * 把函数配置放入一个配置中依次运行
  */
-function _funcConfigHandle(methodsConfig: object, configList: Record<string, Func[]>) {
+function _funcOptionsHandle(config: object, configList: Record<string, Func[]>) {
   for (const key in configList) {
-    methodsConfig[key] = function(...args: unknown[]) {
+    config[key] = function(...args: unknown[]) {
       configList[key].forEach(ele => ele.call(this, ...args));
     };
   }
@@ -160,27 +163,27 @@ function _funcConfigHandle(methodsConfig: object, configList: Record<string, Fun
 /**
  * 把函数列表配置放入一个配置中循环一次运行
  */
-function funcConfigHandle(
+function funcOptionsHandle(
   finalOptionsForComponent: FinalOptionsOfComponent,
   isPage: boolean | undefined,
   funcOptions: FuncOptions,
 ) {
-  // 测试框架无法测试page情形
   /* 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);
+    !(isEmptyObject(funcOptions.pageLifetimes))
+      && _funcOptionsHandle(finalOptionsForComponent.methods, funcOptions.pageLifetimes);
   } else {
     // 组件时
-    funcOptions.pageLifetimes
-      && _funcConfigHandle(finalOptionsForComponent.pageLifetimes ||= {}, funcOptions.pageLifetimes);
+    !(isEmptyObject(funcOptions.pageLifetimes))
+      && _funcOptionsHandle(finalOptionsForComponent.pageLifetimes ||= {}, funcOptions.pageLifetimes);
   }
-  funcOptions.lifetimes && _funcConfigHandle(finalOptionsForComponent.lifetimes ||= {}, funcOptions.lifetimes);
+  funcOptions.lifetimes && _funcOptionsHandle(finalOptionsForComponent.lifetimes ||= {}, funcOptions.lifetimes);
 
-  funcOptions.watch && _funcConfigHandle(finalOptionsForComponent.watch ||= {}, funcOptions.watch);
+  funcOptions.watch && _funcOptionsHandle(finalOptionsForComponent.watch ||= {}, funcOptions.watch);
 }
 /**
- * 把配置为函数的字段方法收集到funcConfig中
+ * 把配置为函数的字段方法收集到funcOptions中
  */
 function funcFieldsCollect(
   options: SubComponentTrueOptions | RootComponentTrueOptions,
@@ -193,8 +196,6 @@ function funcFieldsCollect(
         (funcOptions[key][_key] ||= []).push(options[key][_key]);
       }
     }
-
-    Reflect.deleteProperty(options, key);
   }
 }
 
@@ -207,10 +208,9 @@ function otherFieldsHandle(
 ) {
   for (const key in rootComponentOptions) {
     const config = rootComponentOptions[key];
-    if (Array.isArray(config)) {
-      // 好像只有behaviors是数组吧.
-      /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
-      (finalOptions[key] ||= []).push(...config);
+    if (key === "behaviors") {
+      // 是不是只有behaviors是数组
+      finalOptions[key].push(...config);
     } else {
       Object.assign(finalOptions[key] ||= {}, config);
     }
@@ -219,11 +219,8 @@ function otherFieldsHandle(
 /**
  * 把events字段放入到componentOptions.methods中
  */
-function eventsHandle(componentOptions: FinalOptionsOfComponent, eventsConfig: EventsConstraint) {
-  /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
-  componentOptions.methods ||= {};
-
-  Object.assign(componentOptions.methods, eventsConfig);
+function eventsHandle(methods: FinalOptionsOfComponent["methods"], eventsConfig: EventsConstraint) {
+  Object.assign(methods, eventsConfig);
 }
 function subComponentsHandle(
   componentOptions: FinalOptionsOfComponent,
@@ -231,7 +228,7 @@ function subComponentsHandle(
   funcOptions: FuncOptions,
 ) {
   subComponents.forEach((subOption) => {
-    subOption.events && eventsHandle(componentOptions, subOption.events);
+    subOption.events && eventsHandle(componentOptions.methods, subOption.events);
 
     funcFieldsCollect(subOption, funcOptions);
 
@@ -250,21 +247,18 @@ function IsFullCustomEvents(
  * 把customEvents字段配置变成函数放入到componentOptions.methods中
  */
 function customEventsHandle(
-  componentOptions: FinalOptionsOfComponent,
+  methods: FinalOptionsOfComponent["methods"],
   customEventsConfig: CustomEventConstraint,
 ) {
-  /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
-  componentOptions.methods ||= {};
-
   for (const key in customEventsConfig) {
     const customEventOptions = customEventsConfig[key];
 
     if (IsFullCustomEvents(customEventOptions)) {
-      componentOptions.methods[key] = function(this: Instance, detail: unknown) {
+      methods[key] = function(this: Instance, detail: unknown) {
         this.triggerEvent(key, detail, customEventOptions.options);
       };
     } else {
-      componentOptions.methods[key] = function(this: Instance, detail: unknown) {
+      methods[key] = function(this: Instance, detail: unknown) {
         this.triggerEvent(key, detail);
       };
     }
@@ -281,13 +275,9 @@ function collectRootComponentOption(
   funcOptions: FuncOptions,
   rootComponentOptions: RootComponentTrueOptions,
 ) {
-  rootComponentOptions.customEvents && customEventsHandle(finalOptions, rootComponentOptions.customEvents);
-
-  delete rootComponentOptions.customEvents;
+  rootComponentOptions.customEvents && customEventsHandle(finalOptions.methods, rootComponentOptions.customEvents);
 
-  rootComponentOptions.events && eventsHandle(finalOptions, rootComponentOptions.events);
-
-  delete rootComponentOptions.events;
+  rootComponentOptions.events && eventsHandle(finalOptions.methods, rootComponentOptions.events);
 
   funcFieldsCollect(rootComponentOptions, funcOptions);
 
@@ -306,15 +296,16 @@ export function collectOptionsForComponent(
   const rootComponentOption = defineComponentOption.rootComponent;
   const subComponentsList = defineComponentOption.subComponents;
   const finalOptionsForComponent: FinalOptionsOfComponent = {
-    // default options
     options: {
       addGlobalClass: true, // "styleIsolation": "apply-shared"
       multipleSlots: true,
       pureDataPattern: /^_/,
       virtualHost: true,
     },
-    // default behaviors
     behaviors: [BStore, BComputedAndWatch],
+    methods: {},
+    observers: {},
+    data: {},
   };
   /**
    * 有些字段配置同时存在根组件和子组件当中(如pageLifetimes，lifetimes,watch字段), 且key相同值类型为函数。funcConfig对象用于收集这些配置为数组形式,最终再一起整合进finalOptionsForComponent配置中。即funcConfig是一个临时中介对象。
@@ -334,25 +325,25 @@ export function collectOptionsForComponent(
   }
   // miniprogram-simulate(当前版本 1.6.1) 无法测试页面
   /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
-  funcConfigHandle(finalOptionsForComponent, rootComponentOption?.isPage, funcOptions);
+  funcOptionsHandle(finalOptionsForComponent, rootComponentOption?.isPage, funcOptions);
 
-  finalOptionsForComponent.methods && InternalFieldProtection(finalOptionsForComponent.methods, ["disposer"]);
+  InternalFieldProtection(finalOptionsForComponent.methods, ["disposer"]);
 
+  // 对页面传入参数进行处理 老框架劫持页面methods.onLoad,新框架劫持页面pageLifetimes.load
   /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
-  finalOptionsForComponent.methods?.onLoad
-    && hijack(finalOptionsForComponent.methods, "onLoad", [onLoadReceivedDataHandle, initComputed], []);
+  finalOptionsForComponent.isPage
+    && hijack(finalOptionsForComponent.pageLifetimes ||= {}, "load", [loadReceivedDataHandle], []);
 
   /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
-  finalOptionsForComponent.pageLifetimes?.load
-    && hijack(finalOptionsForComponent.pageLifetimes, "load", [loadReceivedDataHandle], []);
+  hijack(finalOptionsForComponent.methods, "onLoad", [onLoadReceivedDataHandle], []);
 
   // hijack(finalOptionsForComponent.lifetimes!, "attached", [pathCheck(defineComponentOption.path)], []);
 
   /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
-  if (finalOptionsForComponent.isPage) {
+  finalOptionsForComponent.isPage
     // 页面时删除预设的虚拟组件字段
-    Reflect.deleteProperty(finalOptionsForComponent.options!, "virtualHost");
-  }
+    && Reflect.deleteProperty(finalOptionsForComponent.options!, "virtualHost");
+
   // BBeforeCreate在最后面,让BeforeCreate生命周期运行在最终建立组件时。
   finalOptionsForComponent.behaviors!.push(BBeforeCreate);
 

package/src/api/DefineComponent/index.ts

@@ -55,6 +55,6 @@ export type DefineComponentOption = {
 export const DefineComponent: DefineComponentConstructor = function(options): any {
   // console.log("---------------------------");
   Component(
-    collectOptionsForComponent(options as DefineComponentOption),
+    collectOptionsForComponent(options as DefineComponentOption) as any,
   );
 };

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

@@ -17,7 +17,7 @@ export type PageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends o
          * 周期发生在组件attached之后,页面onLoad之前,要求组件为同步组件
          * 最低基础库： `3.0.2`
          */
-        load?: (props: object) => void | Promise<void>;
+        load?: (props: object) => void;
       }
     >;
   },

package/src/api/RootComponent/Watch/test/WatchProperties.test.ts

@@ -134,7 +134,7 @@ RootComponent()({
     optional_obj(newValue, oldValue) {
       Checking<ReadonlyDeep<Mock_User>, typeof newValue, Test.Pass>;
 
-      Checking<ReadonlyDeep<Mock_User> | null, typeof oldValue, Test.Pass>;
+      Checking<ReadonlyDeep<Mock_User | null>, typeof oldValue, Test.Pass>;
     },
     // 对象的二段key
     "optional_obj.age"(newValue, oldValue) {

package/src/api/RootComponent/index.ts

@@ -128,7 +128,7 @@ export function RootComponent<
 >(): RootComponentConstructor<
   TComponentDocList
 > {
-  return ((options: any) => options as RootComponentTrueOptions) as any;
+  return (options: any) => options;
 }
 
 export type RootComponentTrueOptions = {

package/src/behaviors/BComputedAndWatch/computedUpdater.ts

@@ -6,18 +6,12 @@ import { isEqual } from "./isEqual";
 import type { Instance } from "./types";
 
 export function computedUpdater(this: Instance, isUpdated = false): boolean {
-  // console.log("computedUpdater开始");
-
-  // console.log("循环判断缓存中每个计算属性依赖是否有变化");
-
   for (const key in this.__computedCache__) {
-    // console.log("当前计算属性为:", key);
-
     const itemCache = this.__computedCache__[key];
     let changed = false;
     for (const dep of itemCache.dependences) {
       // getPathsValue返回的是数组
-      const curVal = getPathsValue.call(this, dep.paths.join("."))[0];
+      const curVal = getPathsValue(this.data, dep.paths.join("."))[0];
 
       // 检查依赖是否更新
       if (!isEqual(curVal, dep.val)) {
@@ -28,19 +22,7 @@ export function computedUpdater(this: Instance, isUpdated = false): boolean {
     }
     if (changed) {
       const newDependences: ComputedDependence[] = [];
-      // eslint-disable-next-line @typescript-eslint/no-this-alias
-      const _this = this;
-      const computedThis = new Proxy({ data: deepProxy(this.data, newDependences) }, {
-        get(target, key) {
-          if (key === "data") {
-            return Reflect.get(target, key);
-          }
-
-          return Reflect.get(_this, key);
-        },
-      });
-
-      const newValue = itemCache.method.call(computedThis);
+      const newValue = itemCache.method.call({ data: deepProxy(this.data, newDependences) });
 
       // 更新值不会立即再次进入**函数,而是当前**函数运行完毕后触发**函数,
       this.setData({

package/src/behaviors/BComputedAndWatch/data-tracer.ts

@@ -28,6 +28,8 @@ export function deepProxy(
       }
       const curPath = basePath.concat(prop);
 
+      // console.log(prop, val,'in');
+
       dependences.push({ paths: curPath, val: unwrap(val) });
 
       // 自身方法或原型属性不代理

package/src/behaviors/BComputedAndWatch/getPathsValue.ts

@@ -1,12 +1,10 @@
-import type { Instance } from "./types";
-
 /**
  * 获取指定paths的值
  * @param this  - 组件实例 Instance
  * @param paths - 支持多字段(用`,`分开) 例如 'obj.xxx,a,b' 监控了3个字段
  * @returns unknown[] 每项对应paths每项的值
  */
-export function getPathsValue(this: Instance, paths: string) {
+export function getPathsValue(data: object, paths: string) {
   const valueList: unknown[] = [];
 
   // ['obj.xxx','a','b'].forEach
@@ -19,7 +17,7 @@ export function getPathsValue(this: Instance, paths: string) {
       } catch (error) {
         return undefined;
       }
-    }, this.data);
+    }, data);
 
     valueList.push(value);
   });

package/src/behaviors/BComputedAndWatch/getPropertiesValue.ts

@@ -0,0 +1,54 @@
+import type {
+  PropertiesConstraint,
+  PropertiesTypes,
+  RequiredSingle,
+  RequiredUnion,
+} from "../../api/RootComponent/Properties/PropertiesConstraint";
+
+type PropertiesDefaultValue = "" | 0 | [] | null | false;
+
+/* istanbul ignore next */
+function getRequiredSingleValue(
+  PropType: RequiredSingle,
+): PropertiesDefaultValue {
+  switch (PropType) {
+    case String:
+      return "";
+    case Number:
+      return 0;
+    case Array:
+      return [];
+    case Object:
+      return null;
+    case Boolean:
+      return false;
+    default:
+      /* istanbul ignore next */
+      throw Error(
+        "properties字段类型只能为 String | Number | Array | Object | Boolean",
+      );
+  }
+}
+function IsRequiredSingle(config: PropertiesTypes): config is RequiredSingle {
+  return config instanceof Function;
+}
+function IsRequiredUnion(config: PropertiesTypes): config is RequiredUnion {
+  return !Reflect.has(config, "value");
+}
+export function getPropertiesValue(propertiesOpt: PropertiesConstraint | undefined): object | undefined {
+  if (propertiesOpt === undefined) return;
+  const result = {};
+  for (const key in propertiesOpt) {
+    const config = propertiesOpt[key];
+    /* istanbul ignore next */
+    if (IsRequiredSingle(config)) {
+      result[key] = getRequiredSingleValue(config);
+    } else if (IsRequiredUnion(config)) {
+      result[key] = getRequiredSingleValue(config.type);
+    } else {
+      result[key] = config.value;
+    }
+  }
+
+  return result;
+}