annil 1.1.1 → 1.2.0-beta.0

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,OAAiC;QAEhD,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;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"}

package/dist/index.d.ts

@@ -1,11 +1,11 @@
-import { navigateTo } from "./api/navigateTo";
 import { DefineComponent } from "./api/DefineComponent";
+import { navigateTo } from "./api/navigateTo";
 import { RootComponent } from "./api/RootComponent";
 import { SubComponent } from "./api/SubComponent";
-import type { DetailedType } from "./types/DetailedType";
 import type { ComponentDocExtension } from "./types/ComponentDocExtension";
+import type { DetailedType } from "./types/DetailedType";
 import type { GenerateDoc } from "./types/GenerateDoc";
 import type { ParamsEqual } from "./types/TwoParamsEqual";
 export type { Vant, Wm } from "./thirdLib";
-export type { Dataset, Detail, WMBaseEvent, WMCustomEvent } from "./types/OfficialTypeAlias";
+export type { CurrentTargetDataset, Dataset, Detail, Mark, TargetDataset, WMBaseEvent, WMCustomEvent, } from "./types/OfficialTypeAlias";
 export { type ComponentDocExtension, DefineComponent, type DetailedType, type GenerateDoc, navigateTo, type ParamsEqual, RootComponent, SubComponent, };

package/dist/index.js

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

package/dist/index.js.map

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

package/dist/types/OfficialTypeAlias.d.ts

@@ -6,7 +6,7 @@ export type WMTriggerEventOption = WechatMiniprogram.Component.TriggerEventOptio
 export type WMCustomEvent<Detail = undefined, Mark extends object = object, CurrentTargetDataset extends object = object, TargetDataset extends object = CurrentTargetDataset> = WechatMiniprogram.CustomEvent<Detail, Mark, CurrentTargetDataset, TargetDataset>;
 export type WMBaseEvent<Mark extends object = object, CurrentTargetDataset extends object = object, TargetDataset extends object = CurrentTargetDataset> = WechatMiniprogram.BaseEvent<Mark, CurrentTargetDataset, TargetDataset>;
 export type Dataset<TCurrentTargetDataset extends object, TargetDataset extends object = TCurrentTargetDataset, Detail = undefined> = WMCustomEvent<Detail, object, TCurrentTargetDataset, TargetDataset>;
-export type Mark<TMark extends object> = WechatMiniprogram.CustomEvent<{}, TMark, {}, {}>;
+export type Mark<TMark extends object> = Required<WechatMiniprogram.CustomEvent<object, TMark, object, object>>;
 export type Detail<T> = WMCustomEvent<T>;
 export type CurrentTargetDataset<T extends object> = WMCustomEvent<{}, {}, T>;
 export type TargetDataset<TargetDataset extends object> = WMCustomEvent<{}, {}, {}, TargetDataset>;

package/dist/types/RemoveInnerData.d.ts

@@ -0,0 +1 @@
+export type RemoveInnerData<S extends string> = S extends unknown ? S extends `_${string}` ? never : S : never;

package/dist/types/RemoveInnerData.js

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

package/dist/types/RemoveInnerData.js.map

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

package/dist/utils/InnerMarker.js

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

package/dist/utils/InnerMarker.js.map

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

package/dist/utils/deepClone.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "annil",
-  "version": "1.1.1",
+  "version": "1.2.0-beta.0",
   "description": "微信小程序(原生开发)插件",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -10,12 +10,14 @@
   },
   "homepage": "https://github.com/missannil/annil.git",
   "scripts": {
-    "test": "jest --watch",
     "coverage": "jest --coverage",
     "prepare": "husky install",
     "lint": "eslint . --fix && npm run fmt",
     "fmt": "dprint fmt",
+    "test:jest": "jest --watch",
     "test:type": "tsc --watch",
+    "type": "npm run test:type",
+    "jest": "npm run test:jest",
     "build": "tsc -p tsconfig.build.json"
   },
   "devDependencies": {

package/src/api/DefineComponent/collectOptionsForComponent.ts

@@ -4,7 +4,6 @@ import { BComputedAndWatch } from "../../behaviors/BComputedAndWatch";
 import { initComputed } from "../../behaviors/BComputedAndWatch/initComputed";
 import type { Instance } from "../../behaviors/BComputedAndWatch/types";
 import { BStore } from "../../behaviors/BStore";
-import { deepClone } from "../../utils/deepClone";
 import { INNERMARKER } from "../../utils/InnerMarker";
 import { isEmptyObject } from "../../utils/isEmptyObject";
 import type { RootComponentTrueOptions } from "../RootComponent";
@@ -16,72 +15,134 @@ import type {
 import type { EventsConstraint } from "../RootComponent/Events/EventsConstraint";
 import type { PageInstance } from "../RootComponent/Instance/RootComponentInstance";
 import type { SubComponentTrueOptions } from "../SubComponent";
-import type { FinalOptionsForComponent, FuncOptions } from ".";
+import type { FinalOptionsOfComponent, FuncOptions } from ".";
 /**
- * 针对通过 navigateTo传过来的数据解析
+ * 针对通过 navigateTo传过来的数据对页面onLoad周期传入数据解析
  * @param option - option中的url是拼接了encodeURIComponent转码的data对象的,key为INNERMARKER.url
  */
-/* istanbul ignore next */
+/* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
 function onLoadReceivedDataHandle(
   this: PageInstance,
   option: Record<typeof INNERMARKER.url, string>,
 ) {
   const innerData: string | undefined = option[INNERMARKER.url];
-  // 未使用自定义的navigateTo
+  // 未使用navigateTo API
   if (innerData === undefined) return;
-  const optionData = JSON.parse(decodeURIComponent(innerData));
+  const decodeOption = JSON.parse(decodeURIComponent(innerData));
 
   // 使用navigateTo
-  for (const key in optionData) {
-    option[key] = optionData[key];
+  for (const key in decodeOption) {
+    option[key] = decodeOption[key];
   }
-
-  // setData会触发计算属性 继承属性等 。
-  this.setData(option as any);
-
   delete option[INNERMARKER.url];
 
-  Reflect.deleteProperty(this.data, INNERMARKER.url);
+  // 默认生命周期不会把接收的数据setData,为了更方便setData.注: 此时计算属性还未初始化。
+  // this.setData(option);
 }
-
 /**
- * onLoad生命周期劫持函数
+ * 针对通过 navigateTo传过来的数据对组件load周期传入数据解析
+ * @param option - option中的url是拼接了encodeURIComponent转码的data对象的,key为INNERMARKER.url
  */
-/* istanbul ignore next */
-function onLoadHijack(
-  options: FinalOptionsForComponent,
-  before: Func[],
-  after: Func[] = [],
-) {
-  options.methods ||= {};
-
-  const cloneOpt = deepClone(options);
-  const originalOnLoad: Func | undefined = options.methods.onLoad;
+/* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
+// function loadReceivedDataHandle(
+//   this: PageInstance,
+//   option: Record<typeof INNERMARKER.url, string>,
+// ) {
+//   const innerData: string | undefined = option[INNERMARKER.url];
+//   // 未使用自定义的navigateTo
+//   if (innerData === undefined) return;
+//   const decodeOption = JSON.parse(decodeURIComponent(innerData));
+
+//   // 使用navigateTo
+//   for (const key in decodeOption) {
+//     option[key] = decodeOption[key];
+//   }
+//   delete option[INNERMARKER.url];
+// }
+/**
+ * 劫持指定配置字段
+ */
+/* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
+function hijack(config: object, field: string, before: Func[] = [], after: Func[] = []) {
+  const originalFunc: Func | undefined = config[field];
 
-  options.methods.onLoad = function(props: unknown) {
-    before.forEach((func) => {
-      func.call(this, props, cloneOpt);
-    });
+  config[field] = function(...args: any[]) {
+    before.forEach(func => func.call(this, ...args));
 
-    originalOnLoad?.call(this, props);
+    originalFunc && originalFunc.apply(this, args);
 
-    after.forEach((func) => {
-      func.call(this, props, cloneOpt);
-    });
+    after.forEach(func => func.call(this, ...args));
   };
+
+  return;
 }
+
+/**
+ * onLoad生命周期劫持函数
+ */
+/* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
+// function onLoadHijack(
+//   options: FinalOptionsOfComponent,
+//   before: Func[],
+//   after: Func[] = [],
+// ) {
+//   options.methods ||= {};
+
+//   const cloneOpt = deepClone(options);
+//   const originalOnLoad: Func | undefined = options.methods.onLoad;
+
+//   options.methods.onLoad = function(props: unknown) {
+//     before.forEach((func) => {
+//       func.call(this, props, cloneOpt);
+//     });
+
+//     originalOnLoad?.call(this, props);
+
+//     after.forEach((func) => {
+//       func.call(this, props, cloneOpt);
+//     });
+//   };
+// }
+/**
+ * 劫持pageLifetimes中的load字段
+ */
+/* istanbul ignore next  */
+// function loadHijack(
+//   options: FinalOptionsOfComponent,
+//   before: Func[],
+//   after: Func[] = [],
+// ) {
+//    /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
+//   options.lifetimes ||= {};
+
+//   const originalAttached: Func | undefined = options.lifetimes.attached;
+
+//   options.lifetimes.attached = function() {
+//     before.forEach((func) => {
+//       func.call(this, options);
+//     });
+
+//     originalAttached?.call(this);
+
+//     /* istanbul ignore next  */
+//     after.forEach((func) => {
+//       func.call(this, options);
+//     });
+//   };
+// }
 /**
  * 内部保护字段 即不允许配置的字段名(所有方法下)
  */
-const INNERFIELDS = ["disposer"];
+// const INNERFIELDS = ["disposer"];
 
 /**
- * 报错的形式避免输入字段和内部字段冲突
+ * 报错的形式避免输入字段和内部字段冲突,保证config下不包含内部预定字段(列表)
  */
-/* istanbul ignore next */
-function InternalFieldProtection(methodsConfig: object) {
-  const methodsConfigKeys = Object.keys(methodsConfig);
-  for (const key of INNERFIELDS) {
+/* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
+function InternalFieldProtection(config: object | undefined, keys: string[]) {
+  if (!config) return;
+  const methodsConfigKeys = Object.keys(config);
+  for (const key of keys) {
     if (methodsConfigKeys.includes(key)) {
       throw Error(`${key}已被内部字段占用`);
     }
@@ -97,14 +158,16 @@ function _funcConfigHandle(methodsConfig: object, configList: Record<string, Fun
     };
   }
 }
-
+/**
+ * 把函数列表配置放入一个配置中循环一次运行
+ */
 function funcConfigHandle(
-  finalOptionsForComponent: FinalOptionsForComponent,
+  finalOptionsForComponent: FinalOptionsOfComponent,
   isPage: boolean | undefined,
   funcOptions: FuncOptions,
 ) {
   // 测试框架无法测试page情形
-  /* istanbul ignore next */
+  /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
   if (isPage) {
     // 页面时 生命周期方法(即 on 开头的方法),(https://developers.weixin.qq.com/miniprogram/dev/framework/custom-component/component.html)
     funcOptions.pageLifetimes && _funcConfigHandle(finalOptionsForComponent.methods ||= {}, funcOptions.pageLifetimes);
@@ -136,16 +199,18 @@ function funcFieldsCollect(
   }
 }
 
-// 其他字段加入到componentOptions对应字段配置中
+/**
+ * 其他字段加入到componentOptions对应字段配置中
+ */
 function otherFieldsHandle(
-  finalOptions: FinalOptionsForComponent,
+  finalOptions: FinalOptionsOfComponent,
   rootComponentOptions: RootComponentTrueOptions,
 ) {
   for (const key in rootComponentOptions) {
     const config = rootComponentOptions[key];
     if (Array.isArray(config)) {
       // 好像只有behaviors是数组吧.
-      /* istanbul ignore next */
+      /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
       (finalOptions[key] ||= []).push(...config);
     } else {
       Object.assign(finalOptions[key] ||= {}, config);
@@ -153,16 +218,16 @@ function otherFieldsHandle(
   }
 }
 /**
- * 把events字段配置变成函数放入到componentOptions.methods中
+ * 把events字段放入到componentOptions.methods中
  */
-function eventsHandle(componentOptions: FinalOptionsForComponent, eventsConfig: EventsConstraint) {
-  /* istanbul ignore next */
+function eventsHandle(componentOptions: FinalOptionsOfComponent, eventsConfig: EventsConstraint) {
+  /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
   componentOptions.methods ||= {};
 
   Object.assign(componentOptions.methods, eventsConfig);
 }
 function subComponentsHandle(
-  componentOptions: FinalOptionsForComponent,
+  componentOptions: FinalOptionsOfComponent,
   subComponents: SubComponentTrueOptions[],
   funcOptions: FuncOptions,
 ) {
@@ -186,10 +251,10 @@ function IsFullCustomEvents(
  * 把customEvents字段配置变成函数放入到componentOptions.methods中
  */
 function customEventsHandle(
-  componentOptions: FinalOptionsForComponent,
+  componentOptions: FinalOptionsOfComponent,
   customEventsConfig: CustomEventConstraint,
 ) {
-  /* istanbul ignore next */
+  /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
   componentOptions.methods ||= {};
 
   for (const key in customEventsConfig) {
@@ -206,7 +271,49 @@ function customEventsHandle(
     }
   }
 }
+/**
+ *  触发各个组件的页面load事件
+ */
+/* istanbul ignore next  */
+// function triggerCompLoad(this: Instance, props: object) {
+//   if (!this.__compLoadList__) return;
+//   this.__compLoadList__.forEach((loadFunc) => {
+//     loadFunc(props);
+//   });
+// }
+/* istanbul ignore next  */
+// function getPageInstance(pageId: string): Instance {
+//   const pagestack = getCurrentPages() as unknown as Instance[];
+//   let pageInstance: Instance;
+//   pagestack.some((instance) => {
+//     if (instance.getPageId() === pageId) {
+//       pageInstance = instance;
+
+//       return true;
+//     }
+
+//     return false;
+//   });
+
+//   // @ts-ignore pagestack中一定赋值了
+//   return pageInstance;
+// }
+/**
+ * 收集组件pageLifetimes下的load周期函数到页面实例的__loadFunList__
+ */
+/* istanbul ignore next  */
+// function collectLoadLifetimesOfComponent(this: Instance, finalOptionsForComponent: FinalOptionsOfComponent) {
+//   const loadFunc = finalOptionsForComponent.pageLifetimes?.load;
+
+//   console.log(loadFunc, finalOptionsForComponent);
+
+//   if (!loadFunc) return;
+
+//   const pageInstance = getPageInstance(this.getPageId());
+//   const __compLoadList__: Function[] = (pageInstance.__compLoadList__ ||= []);
 
+//   __compLoadList__.push(loadFunc.bind(this));
+// }
 /**
  * 收集 rootComponentOptions 配置到 finalOptions 和 funcOptions 中
  * @param finalOptions - 收集配置对象
@@ -214,7 +321,7 @@ function customEventsHandle(
  * @param rootComponentOptions - 被收集的源配置对象
  */
 function collectRootComponentOption(
-  finalOptions: FinalOptionsForComponent,
+  finalOptions: FinalOptionsOfComponent,
   funcOptions: FuncOptions,
   rootComponentOptions: RootComponentTrueOptions,
 ) {
@@ -239,11 +346,11 @@ function collectRootComponentOption(
 export function collectOptionsForComponent(
   rootComponentOption: RootComponentTrueOptions | undefined,
   subComponentsList: SubComponentTrueOptions[] | undefined,
-): FinalOptionsForComponent {
-  const finalOptionsForComponent: FinalOptionsForComponent = {
+): FinalOptionsOfComponent {
+  const finalOptionsForComponent: FinalOptionsOfComponent = {
     // default options
     options: {
-      // addGlobalClass: true,
+      addGlobalClass: true, // "styleIsolation": "apply-shared"
       multipleSlots: true,
       pureDataPattern: /^_/,
       virtualHost: true,
@@ -267,24 +374,27 @@ export function collectOptionsForComponent(
   if (subComponentsList && !isEmptyObject(subComponentsList)) {
     subComponentsHandle(finalOptionsForComponent, subComponentsList, funcOptions);
   }
-  // 框架无法测试页面
-  /* istanbul ignore next */
-  if (!isEmptyObject(funcOptions)) {
-    funcConfigHandle(finalOptionsForComponent, rootComponentOption?.isPage, funcOptions);
-  }
+  // miniprogram-simulate(当前版本 1.6.1) 无法测试页面
+  /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
+  funcConfigHandle(finalOptionsForComponent, rootComponentOption?.isPage, funcOptions);
 
-  finalOptionsForComponent.methods && InternalFieldProtection(finalOptionsForComponent.methods);
+  finalOptionsForComponent.methods && InternalFieldProtection(finalOptionsForComponent.methods, ["disposer"]);
 
-  // BBeforeCreate在最后面
-  finalOptionsForComponent.behaviors!.push(BBeforeCreate);
+  /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
+  finalOptionsForComponent.methods?.onLoad
+    && hijack(finalOptionsForComponent.methods, "onLoad", [onLoadReceivedDataHandle, initComputed], []);
 
-  onLoadHijack(finalOptionsForComponent, [onLoadReceivedDataHandle, initComputed], []);
+  /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
+  finalOptionsForComponent.pageLifetimes?.load
+    && hijack(finalOptionsForComponent.pageLifetimes, "load", [onLoadReceivedDataHandle], []);
 
-  // 框架无法测试页面
-  /* istanbul ignore next */
+  /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
   if (finalOptionsForComponent.isPage) {
+    // 页面时删除预设的虚拟组件字段
     Reflect.deleteProperty(finalOptionsForComponent.options!, "virtualHost");
   }
+  // BBeforeCreate在最后面,让BeforeCreate生命周期运行在最终建立组件时。
+  finalOptionsForComponent.behaviors!.push(BBeforeCreate);
 
   return finalOptionsForComponent;
 }

package/src/api/DefineComponent/index.ts

@@ -1,6 +1,6 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { Func } from "hry-types/src/Misc/Func";
-import type { WMComponent, WMCompPageLifetimes, WMPageLifetimes } from "../../types/OfficialTypeAlias";
+import type { WMComponent } from "../../types/OfficialTypeAlias";
 
 import type { LifetimesConstraint } from "../RootComponent/Lifetimes/LifetimesConstraint";
 import type { RootComponentDoc } from "../RootComponent/RootComponentDoc";
@@ -12,6 +12,11 @@ import type { RootComponentOption } from "./RootComponent/RootComponentOption";
 import type { SubComponentsOption } from "./SubComponents/SubComponentsOption";
 
 import type { RootComponentTrueOptions } from "../RootComponent";
+import type { ComputedConstraint } from "../RootComponent/Computed/ComputedConstraint";
+import type { DataConstraint } from "../RootComponent/Data/DataConstraint";
+import type { MethodsConstraint } from "../RootComponent/Methods/MethodsConstraint";
+import type { PageLifetimesOption } from "../RootComponent/PageLifetimes/PageLifetimesOption";
+import type { StoreConstraint } from "../RootComponent/Store/StoreConstraint";
 import { collectOptionsForComponent } from "./collectOptionsForComponent";
 
 type Path = `/${string}`;
@@ -54,23 +59,22 @@ export type FuncOptions = Record<"pageLifetimes" | "lifetimes" | "watch", Record
 /**
  * 最终传入原生Component的配置项
  */
-export type FinalOptionsForComponent = {
+export type FinalOptionsOfComponent = {
   isPage?: boolean;
   options?: WMComponent.Options;
   properties?: Record<string, any>;
-  data?: object;
-  store?: object;
-  computed?: Record<string, Func>;
+  data?: DataConstraint;
+  store?: StoreConstraint;
+  computed?: ComputedConstraint;
   observers?: Record<string, Func>;
   behaviors?: string[];
-  methods?: Record<string, Func> & { __storeConfig__?: Func };
+  methods?: MethodsConstraint;
   watch?: Record<string, Func>;
   lifetimes?: LifetimesConstraint;
-  pageLifetimes?: Partial<WMCompPageLifetimes & { load: Func } & WMPageLifetimes>;
-};
+} & PageLifetimesOption<false, object>;
 
 export const DefineComponent: DefineComponentConstructor = function(options): any {
   Component(
-    collectOptionsForComponent(options.rootComponent as RootComponentTrueOptions | undefined, options.subComponents),
+    collectOptionsForComponent(options.rootComponent as RootComponentTrueOptions, options.subComponents),
   );
 };

package/src/api/RootComponent/Computed/ComputedOption.ts

@@ -2,11 +2,31 @@ import type { DuplicateFieldValidator } from "hry-types/src/Generic/DuplicateFie
 
 import type { ComputedConstraint } from "./ComputedConstraint";
 
-export type ComputedOption<TComputed extends ComputedConstraint, OtherData extends object> = {
+export type ComputedOption<TComputed extends ComputedConstraint, CompareKeys extends PropertyKey> = {
   /**
-   * 计算属性字段,可通过this.data获取其他数据
+   * computed字段, [类型约束ComputedConstraint](ComputedConstraint.ts)
+   * @remarks
+   *
+   * 函数体内,可通过this.data获取实例其他数据(依赖),setData发生时,若数据(依赖)发生变化则重新运行函数体并setData。
+   *
+   * 带重复字段检测(与properties、data、store字段比较)
+   *
+   * @example
+   *
+   * ```ts
+   * {
+   *  data:{
+   *     count:1
+   *  },
+   *  computed:{
+   *     return this.data.count + 1
+   *  }
+
+   * }
+   *
+   * ```
    */
   computed?:
     & TComputed
-    & DuplicateFieldValidator<TComputed, keyof OtherData>;
+    & DuplicateFieldValidator<TComputed, CompareKeys>;
 };

package/src/api/RootComponent/Computed/GetComputedDoc.ts

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

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

@@ -1,12 +1,8 @@
 import { Checking, type Test } from "hry-types";
 import type { ReadonlyDeep } from "hry-types/src/Any/_api";
-import type { DetailedType } from "../../../../types/DetailedType";
 import { RootComponent } from "../..";
 import type { Mock_User } from "../../Properties/test/normalRequired.test";
 
-/**
- * computed字段约束为 [ComputedConstraint](../ComputedConstraint.ts)
- */
 const RootDoc = RootComponent()({
   properties: {
     firstName: String,
@@ -14,10 +10,13 @@ const RootDoc = RootComponent()({
   data: {
     lastName: "lastName",
   },
+  store: {
+    prefix: () => "hry-", // 模拟而已
+  },
   computed: {
     fullName() {
-      // 1 计算属性字段可以通过this.data 引用properties、data
-      return this.data.firstName + this.data.lastName;
+      // 1 计算属性字段可以通过this.data 引用properties、data、store字段
+      return this.data.prefix + this.data.firstName + this.data.lastName;
     },
     user() {
       return {} as Mock_User;
@@ -35,12 +34,16 @@ const RootDoc = RootComponent()({
           lastName: string;
           fullName: string;
           user: Mock_User;
+          prefix: string;
           id_fullName: string;
           readOnly: "str";
         }>,
         Test.Pass
       >;
 
+      // @ts-expect-error  深度只读 不可赋值
+      this.data.user.id = "xxx";
+
       return "str";
     },
   },
@@ -84,16 +87,3 @@ const EmptyComputedFieldDoc = RootComponent()({
 });
 
 Checking<typeof EmptyComputedFieldDoc, { methods: { M1: () => void } }, Test.Pass>;
-
-RootComponent()({
-  isPage: true,
-  properties: {
-    obj: Object as DetailedType<{ name: string; age: number }>,
-  },
-  computed: {
-    age() {
-      // 页面实例对象不添加Null,因为计算属性初始化在onLoad之后(即properties已传入时,且不会传入Null)
-      return this.data.obj.age;
-    },
-  },
-});