annil 1.0.1 → 1.0.4

package/dist/behaviors/BStore.js.map

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

package/dist/behaviors/BbeforeCreated.js

@@ -1,7 +1,6 @@
 export const BBeforeCreate = Behavior({
     definitionFilter(options) {
-        var _a;
-        const beforeCreateFunc = (_a = options.lifetimes) === null || _a === void 0 ? void 0 : _a.beforeCreate;
+        const beforeCreateFunc = options.lifetimes.beforeCreate;
         beforeCreateFunc && beforeCreateFunc(options);
     },
 });

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,OAAyB;;QAExC,MAAM,gBAAgB,GAAG,MAAA,OAAO,CAAC,SAAS,0CAAE,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,OAAiC;QAEhD,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAU,CAAC,YAAY,CAAC;QAEzD,gBAAgB,IAAI,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;CACF,CAAC,CAAC"}

package/dist/types/OfficialTypeAlias.d.ts

@@ -3,9 +3,9 @@
 /// <reference types="./node_modules/miniprogram-api-typings/" />
 /// <reference types="./node_modules/miniprogram-api-typings/" />
 export type WMTriggerEventOption = WechatMiniprogram.Component.TriggerEventOption;
-export type WMCustomEvent<Detail = object, Mark extends object = object, CurrentTargetDataset extends object = object, TargetDataset extends object = CurrentTargetDataset> = WechatMiniprogram.CustomEvent<Detail, Mark, CurrentTargetDataset, TargetDataset>;
+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 = {}> = WMCustomEvent<Detail, object, TCurrentTargetDataset, 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 Detail<T> = WMCustomEvent<T>;
 export type CurrentTargetDataset<T extends object> = WMCustomEvent<{}, {}, T>;

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "annil",
-  "version": "1.0.1",
+  "version": "1.0.4",
   "description": "微信小程序(原生开发)插件",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest --watch",
-    "coverage": "jest --collectCoverage",
+    "coverage": "jest --coverage",
     "prepare": "husky install",
     "lint": "eslint . --fix && npm run fmt",
     "fmt": "dprint fmt",
@@ -44,7 +44,7 @@
     "program",
     "wmp"
   ],
-  "author": "",
+  "author": "missannil",
   "license": "MIT",
   "dependencies": {
     "hry-types": "^0.16.12",

package/src/api/DefineComponent/collectOptionsForComponent.ts

@@ -0,0 +1,290 @@
+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 { BStore } from "../../behaviors/BStore";
+import { deepClone } from "../../utils/deepClone";
+import { INNERMARKER } from "../../utils/InnerMarker";
+import { isEmptyObject } from "../../utils/isEmptyObject";
+import type { RootComponentTrueOptions } from "../RootComponent";
+import type {
+  CustomEventConstraint,
+  CustomEvents,
+  FullCustomEvents,
+} from "../RootComponent/CustomEvents/CustomEventConstraint";
+import type { EventsConstraint } from "../RootComponent/Events/EventsConstraint";
+import type { PageInstance } from "../RootComponent/Instance/RootComponentInstance";
+import type { SubComponentTrueOptions } from "../SubComponent";
+import type { FinalOptionsForComponent, FuncOptions } from ".";
+/**
+ * 针对通过 navigateTo传过来的数据解析
+ * @param option - option中的url是拼接了encodeURIComponent转码的data对象的,key为INNERMARKER.url
+ */
+/* istanbul ignore next */
+function onLoadReceivedDataHandle(
+  this: PageInstance,
+  option: Record<typeof INNERMARKER.url, string>,
+) {
+  const innerData: string | undefined = option[INNERMARKER.url];
+  // 未使用自定义的navigateTo
+  if (innerData === undefined) return;
+  const optionData = JSON.parse(decodeURIComponent(innerData));
+
+  // 使用navigateTo
+  for (const key in optionData) {
+    option[key] = optionData[key];
+  }
+
+  // setData会触发计算属性 继承属性等 。
+  this.setData(option as any);
+
+  delete option[INNERMARKER.url];
+
+  Reflect.deleteProperty(this.data, INNERMARKER.url);
+}
+
+/**
+ * onLoad生命周期劫持函数
+ */
+/* istanbul ignore next */
+function onLoadHijack(
+  options: FinalOptionsForComponent,
+  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);
+    });
+  };
+}
+/**
+ * 内部保护字段 即不允许配置的字段名(所有方法下)
+ */
+const INNERFIELDS = ["disposer"];
+
+/**
+ * 报错的形式避免输入字段和内部字段冲突
+ */
+/* istanbul ignore next */
+function InternalFieldProtection(methodsConfig: object) {
+  const methodsConfigKeys = Object.keys(methodsConfig);
+  for (const key of INNERFIELDS) {
+    if (methodsConfigKeys.includes(key)) {
+      throw Error(`${key}已被内部字段占用`);
+    }
+  }
+}
+/**
+ * 把函数配置放入一个配置中依次运行
+ */
+function _funcConfigHandle(methodsConfig: object, configList: Record<string, Func[]>) {
+  for (const key in configList) {
+    methodsConfig[key] = function(...args: unknown[]) {
+      configList[key].forEach(ele => ele.call(this, ...args));
+    };
+  }
+}
+
+function funcConfigHandle(
+  finalOptionsForComponent: FinalOptionsForComponent,
+  isPage: boolean | undefined,
+  funcOptions: FuncOptions,
+) {
+  // 测试框架无法测试page情形
+  /* istanbul ignore next */
+  if (isPage) {
+    // 页面时 生命周期方法(即 on 开头的方法),(https://developers.weixin.qq.com/miniprogram/dev/framework/custom-component/component.html)
+    funcOptions.pageLifetimes && _funcConfigHandle(finalOptionsForComponent.methods ||= {}, funcOptions.pageLifetimes);
+  } else {
+    // 组件时
+    funcOptions.pageLifetimes
+      && _funcConfigHandle(finalOptionsForComponent.pageLifetimes ||= {}, funcOptions.pageLifetimes);
+  }
+  funcOptions.lifetimes && _funcConfigHandle(finalOptionsForComponent.lifetimes ||= {}, funcOptions.lifetimes);
+
+  funcOptions.watch && _funcConfigHandle(finalOptionsForComponent.watch ||= {}, funcOptions.watch);
+}
+/**
+ * 把配置为函数的字段方法收集到funcConfig中
+ */
+function funcFieldsCollect(
+  options: SubComponentTrueOptions | RootComponentTrueOptions,
+  funcOptions: FuncOptions,
+) {
+  for (const key in funcOptions) {
+    // key = "pageLifetimes" | "lifetimes" | "watch"
+    if (options[key]) {
+      for (const _key in options[key]) {
+        (funcOptions[key][_key] ||= []).push(options[key][_key]);
+      }
+    }
+
+    Reflect.deleteProperty(options, key);
+  }
+}
+
+// 其他字段加入到componentOptions对应字段配置中
+function otherFieldsHandle(
+  finalOptions: FinalOptionsForComponent,
+  rootComponentOptions: RootComponentTrueOptions,
+) {
+  for (const key in rootComponentOptions) {
+    const config = rootComponentOptions[key];
+    if (Array.isArray(config)) {
+      // 好像只有behaviors是数组吧.
+      /* istanbul ignore next */
+      (finalOptions[key] ||= []).push(...config);
+    } else {
+      Object.assign(finalOptions[key] ||= {}, config);
+    }
+  }
+}
+/**
+ * 把events字段配置变成函数放入到componentOptions.methods中
+ */
+function eventsHandle(componentOptions: FinalOptionsForComponent, eventsConfig: EventsConstraint) {
+  /* istanbul ignore next */
+  componentOptions.methods ||= {};
+
+  Object.assign(componentOptions.methods, eventsConfig);
+}
+function subComponentsHandle(
+  componentOptions: FinalOptionsForComponent,
+  subComponents: SubComponentTrueOptions[],
+  funcOptions: FuncOptions,
+) {
+  subComponents.forEach((subOption) => {
+    subOption.events && eventsHandle(componentOptions, subOption.events);
+
+    funcFieldsCollect(subOption, funcOptions);
+
+    otherFieldsHandle(componentOptions, subOption);
+  });
+}
+
+// 类型守卫
+function IsFullCustomEvents(
+  customEventOptions: CustomEvents,
+): customEventOptions is FullCustomEvents {
+  return Object.prototype.toString.call(customEventOptions) === "[object Object]";
+}
+
+/**
+ * 把customEvents字段配置变成函数放入到componentOptions.methods中
+ */
+function customEventsHandle(
+  componentOptions: FinalOptionsForComponent,
+  customEventsConfig: CustomEventConstraint,
+) {
+  /* istanbul ignore next */
+  componentOptions.methods ||= {};
+
+  for (const key in customEventsConfig) {
+    const customEventOptions = customEventsConfig[key];
+
+    if (IsFullCustomEvents(customEventOptions)) {
+      componentOptions.methods[key] = function(this: Instance, detail: unknown) {
+        this.triggerEvent(key, detail, customEventOptions.options);
+      };
+    } else {
+      componentOptions.methods[key] = function(this: Instance, detail: unknown) {
+        this.triggerEvent(key, detail);
+      };
+    }
+  }
+}
+
+/**
+ * 收集 rootComponentOptions 配置到 finalOptions 和 funcOptions 中
+ * @param finalOptions - 收集配置对象
+ * @param funcOptions  - 收集特殊配置对象字段
+ * @param rootComponentOptions - 被收集的源配置对象
+ */
+function collectRootComponentOption(
+  finalOptions: FinalOptionsForComponent,
+  funcOptions: FuncOptions,
+  rootComponentOptions: RootComponentTrueOptions,
+) {
+  rootComponentOptions.customEvents && customEventsHandle(finalOptions, rootComponentOptions.customEvents);
+
+  delete rootComponentOptions.customEvents;
+
+  rootComponentOptions.events && eventsHandle(finalOptions, rootComponentOptions.events);
+
+  delete rootComponentOptions.events;
+
+  funcFieldsCollect(rootComponentOptions, funcOptions);
+
+  otherFieldsHandle(finalOptions, rootComponentOptions);
+}
+/**
+ * 返回一个由rootComponentOption和subComponentsList配置整合的对象
+ * @param rootComponentOption -
+ * @param subComponentsList -
+ * @returns FinalOptionsForComponent
+ */
+export function collectOptionsForComponent(
+  rootComponentOption: RootComponentTrueOptions | undefined,
+  subComponentsList: SubComponentTrueOptions[] | undefined,
+): FinalOptionsForComponent {
+  const finalOptionsForComponent: FinalOptionsForComponent = {
+    // default options
+    options: {
+      // addGlobalClass: true,
+      multipleSlots: true,
+      pureDataPattern: /^_/,
+      virtualHost: true,
+    },
+    // default behaviors
+    behaviors: [BStore, BComputedAndWatch],
+  };
+  /**
+   * 有些字段配置同时存在根组件和子组件当中(如pageLifetimes，lifetimes,watch字段), 且key相同值类型为函数。funcConfig对象用于收集这些配置为数组形式,最终再一起整合进finalOptionsForComponent配置中。即funcConfig是一个临时中介对象。
+   */
+  const funcOptions: FuncOptions = {
+    pageLifetimes: {},
+    lifetimes: {},
+    watch: {},
+  };
+
+  if (rootComponentOption && !isEmptyObject(rootComponentOption)) {
+    collectRootComponentOption(finalOptionsForComponent, funcOptions, rootComponentOption);
+  }
+
+  if (subComponentsList && !isEmptyObject(subComponentsList)) {
+    subComponentsHandle(finalOptionsForComponent, subComponentsList, funcOptions);
+  }
+  // 框架无法测试页面
+  /* istanbul ignore next */
+  if (!isEmptyObject(funcOptions)) {
+    funcConfigHandle(finalOptionsForComponent, rootComponentOption?.isPage, funcOptions);
+  }
+
+  finalOptionsForComponent.methods && InternalFieldProtection(finalOptionsForComponent.methods);
+
+  // BBeforeCreate在最后面
+  finalOptionsForComponent.behaviors!.push(BBeforeCreate);
+
+  onLoadHijack(finalOptionsForComponent, [onLoadReceivedDataHandle, initComputed], []);
+
+  // 框架无法测试页面
+  /* istanbul ignore next */
+  if (finalOptionsForComponent.isPage) {
+    Reflect.deleteProperty(finalOptionsForComponent.options!, "virtualHost");
+  }
+
+  return finalOptionsForComponent;
+}

package/src/api/DefineComponent/index.ts

@@ -1,15 +1,7 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { Func } from "hry-types/src/Misc/Func";
-import { BBeforeCreate } from "../../behaviors/BbeforeCreated";
-import { BComputedAndWatch } from "../../behaviors/BComputedAndWatch";
-import { initComputed } from "../../behaviors/BComputedAndWatch/initComputed";
-import { BStore } from "../../behaviors/BStore";
 import type { WMComponent, WMCompPageLifetimes, WMPageLifetimes } from "../../types/OfficialTypeAlias";
-import { funcConfigHandle } from "../../utils/funcConfigHandle";
-import { isEmptyObject } from "../../utils/isEmptyObject";
-import { onLoadReceivedDataHandle } from "../../utils/onLoadReceivedDataHandle";
-import { rootComponentFieldHandle } from "../../utils/rootComponentFieldHandle";
-import { subComponentsHandle } from "../../utils/subComponentsHandle";
+
 import type { LifetimesConstraint } from "../RootComponent/Lifetimes/LifetimesConstraint";
 import type { RootComponentDoc } from "../RootComponent/RootComponentDoc";
 import type { SubComponentDoc } from "../SubComponent/SubComponentDoc";
@@ -19,8 +11,10 @@ import type { CreatePageDoc } from "./ReturnType/CreatePageDoc";
 import type { RootComponentOption } from "./RootComponent/RootComponentOption";
 import type { SubComponentsOption } from "./SubComponents/SubComponentsOption";
 
-import { InternalFieldProtection } from "../../utils/InternalFieldProtection";
-import { onLoadHijack } from "../../utils/onLoadHijack";
+import type { RootComponentTrueOptions } from "../RootComponent";
+import { collectOptionsForComponent } from "./collectOptionsForComponent";
+
+type Path = `/${string}`;
 
 type RootOptions<
   TRootComponentDoc extends RootComponentDoc,
@@ -55,19 +49,15 @@ interface DefineComponentConstructor {
  * 临时的函数配置项
  * 把根组件与子组件中配置类型为函数的相同字段配置收集在一起(数组)
  */
-export type FuncConfig = {
-  pageLifetimes?: Record<string, Func[]>;
-  lifetimes?: Record<string, Func[]>;
-  watch?: Record<string, Func[]>;
-};
+export type FuncOptions = Record<"pageLifetimes" | "lifetimes" | "watch", Record<string, Func[]>>;
 
 /**
- * 传入原生Component的配置项
+ * 最终传入原生Component的配置项
  */
-export type ComponentOptions = {
+export type FinalOptionsForComponent = {
   isPage?: boolean;
   options?: WMComponent.Options;
-  properties?: object;
+  properties?: Record<string, any>;
   data?: object;
   store?: object;
   computed?: Record<string, Func>;
@@ -79,71 +69,8 @@ export type ComponentOptions = {
   pageLifetimes?: Partial<WMCompPageLifetimes & { load: Func } & WMPageLifetimes>;
 };
 
-export type Path = `/${string}`;
-
-export type DefineComponentOptions = {
-  path?: Path;
-  name?: string;
-  rootComponent?: RootComponentDoc;
-  subComponents?: SubComponentDoc[];
-};
-
 export const DefineComponent: DefineComponentConstructor = function(options): any {
-  // console.log("------------------------------------------------分割线------------------------------------------------");
-
-  // 最终的配置,默认配置与根组件和子组件列表配置汇集而成。
-  const finalOptions: ComponentOptions = {
-    // default options
-    options: {
-      // addGlobalClass: true,
-      multipleSlots: true,
-      pureDataPattern: /^_/,
-      virtualHost: true,
-    },
-    // default behaviors
-    behaviors: [BStore, BComputedAndWatch],
-  };
-  /**
-   * 有些选项配置是函数,且可能分布在根组件和子组件中,funcConfig 用于收集这些配置,最终再一起整合进finalOptions配置。rootComponentHandle和subComponentsHandle都会收集函数配置到funcConfig中，再由funcConfigHandle整合配置到finalOptions中。
-   */
-  const allFuncConfig: FuncConfig = {};
-
-  if (options.rootComponent && !isEmptyObject(options.rootComponent)) {
-    rootComponentFieldHandle(options.rootComponent, finalOptions, allFuncConfig);
-  }
-
-  if (options.subComponents && !isEmptyObject(options.subComponents)) {
-    subComponentsHandle(finalOptions, options.subComponents, allFuncConfig);
-  }
-  // 框架无法测试页面
-  /* istanbul ignore next */
-  if (!isEmptyObject(allFuncConfig)) {
-    funcConfigHandle(finalOptions, options.rootComponent?.isPage, allFuncConfig);
-  }
-
-  finalOptions.methods && InternalFieldProtection(finalOptions.methods);
-
-  finalOptions.behaviors!.push(BBeforeCreate);
-
-  onLoadHijack(finalOptions, [onLoadReceivedDataHandle, initComputed], []);
-
-  // 框架无法测试页面
-  /* istanbul ignore next */
-  if (finalOptions.isPage) {
-    Reflect.deleteProperty(finalOptions.options!, "virtualHost");
-  }
-
-  Component(finalOptions as any);
-};
-
-export type PageOptions = {
-  path: Path;
-  rootComponent: RootComponentDoc & { isPage: true };
-  subComponents: SubComponentDoc[];
-};
-
-export type CompOptions = {
-  name: string;
-  rootComponent: RootComponentDoc & { isPage: undefined };
-  subComponents: SubComponentDoc[];
+  Component(
+    collectOptionsForComponent(options.rootComponent as RootComponentTrueOptions | undefined, options.subComponents),
+  );
 };

package/src/api/RootComponent/CustomEvents/CustomEventConstraint.ts

@@ -47,4 +47,6 @@ export type FullCustomEvents = {
   options: OptionsFieldsConfigOfCustomEvents;
 };
 
-export type CustomEventConstraint = Record<string, FullCustomEvents | ShortCustomeEvents>;
+export type CustomEvents = FullCustomEvents | ShortCustomeEvents;
+
+export type CustomEventConstraint = Record<string, CustomEvents>;

package/src/api/RootComponent/Data/DataConstraint.ts

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

package/src/api/RootComponent/IsPage/IsPageOption.ts

@@ -1 +1,6 @@
-export type IsPageOption<TIsPage extends boolean> = { isPage?: TIsPage };
+export type IsPageOption<TIsPage extends boolean> = {
+  /**
+   * 表示组件是否为页面,可选,默认false
+   */
+  isPage?: TIsPage;
+};

package/src/api/RootComponent/Lifetimes/LifetimesConstraint.ts

@@ -1,5 +1,5 @@
 import type { WMCompLifetimes } from "../../../types/OfficialTypeAlias";
-import type { ComponentOptions } from "../../DefineComponent";
+import type { FinalOptionsForComponent } from "../../DefineComponent";
 
 export type LifetimesConstraint = // 官方组件生命周期
   & WMCompLifetimes["lifetimes"]
@@ -7,5 +7,5 @@ export type LifetimesConstraint = // 官方组件生命周期
     /**
      * 建立组件时的真正配置对象
      */
-    beforeCreate?: (options: ComponentOptions) => void;
+    beforeCreate?: (options: FinalOptionsForComponent) => void;
   };

package/src/api/RootComponent/Lifetimes/test/error.test.ts

@@ -4,7 +4,7 @@ import { RootComponent } from "../..";
  */
 RootComponent()({
   lifetimes: {
-    // beforeCreate() {},
+    beforeCreate() {},
 
     created() {},
 

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

@@ -6,9 +6,9 @@ import { RootComponent } from "../../../..";
 RootComponent()({
   lifetimes: {
     // 新增声明周期用于查看实例初始化之前的配置文件
-    // beforeCreate(opitons) {
-    //   opitons;
-    // },
+    beforeCreate(opitons) {
+      opitons;
+    },
     created() {
     },
     attached() {

package/src/api/RootComponent/Properties/test/normalOptional.test.ts

@@ -73,3 +73,23 @@ type OptionalDocExpected = {
 };
 
 Checking<typeof OptionalDoc, OptionalDocExpected, Test.Pass>;
+
+// properties 使用SpecificType时,接受interface类型
+interface Foo {
+  name: string;
+}
+
+RootComponent()({
+  properties: {
+    xxx: Object as SpecificType<{ dd: Foo }>,
+    user: {
+      type: Object as SpecificType<Foo>,
+      value: { name: "zhao" },
+    },
+  },
+  computed: {
+    ddd() {
+      this.data.user?.name;
+    },
+  },
+});

package/src/api/RootComponent/index.ts

@@ -3,7 +3,7 @@ import type { NoInfer } from "hry-types/src/Generic/NoInfer";
 import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { Func } from "hry-types/src/Misc/Func";
 import type { ComputeIntersectionDeep } from "hry-types/src/Object/_api";
-import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
+import type { WMCompOtherOption, WMCompPageLifetimes, WMPageLifetimes } from "../../types/OfficialTypeAlias";
 import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
 import type { ComputedConstraint } from "./Computed/ComputedConstraint";
 import type { ComputedOption } from "./Computed/ComputedOption";
@@ -11,11 +11,13 @@ import type { GetComputedDoc } from "./Computed/GetComputedDoc";
 import type { CustomEventConstraint } from "./CustomEvents/CustomEventConstraint";
 import type { CustomEventsOption } from "./CustomEvents/CustomEventsOption";
 import type { GetCustomEventDoc } from "./CustomEvents/GetCustomEventDoc";
+import type { DataConstraint } from "./Data/DataConstraint";
 import type { DataOption } from "./Data/DataOption";
 import type { EventsConstraint } from "./Events/EventsConstraint";
 import type { EventsOption } from "./Events/EventsOption";
 import type { RootComponentInstance } from "./Instance/RootComponentInstance";
 import type { IsPageOption } from "./IsPage/IsPageOption";
+import type { LifetimesConstraint } from "./Lifetimes/LifetimesConstraint";
 import type { LifetimesOption } from "./Lifetimes/LifetimesOption";
 import type { MethodsConstraint } from "./Methods/MethodsConstraint";
 import type { MethodsOption } from "./Methods/MethodsOption";
@@ -81,7 +83,7 @@ type RootComponentConstructor<TReceivedComponentDoc extends ComponentDoc[] | Com
       | boolean
       | null
       | Literal[]
-      | Record<string, Literal>,
+      | object,
     // TEvents 不能有默认值 {} 会引起事件参数类型(e)失效
     TEvents extends EventsConstraint<TReceivedComponentDoc>,
     TIsPage extends boolean = false,
@@ -135,5 +137,19 @@ export function RootComponent<
 >(): RootComponentConstructor<
   TReceivedComponentDoc
 > {
-  return (options: any) => options;
+  return ((options: any) => options as RootComponentTrueOptions) as any;
 }
+
+export type RootComponentTrueOptions = {
+  isPage?: boolean;
+  properties?: PropertiesConstraint;
+  data?: DataConstraint;
+  computed?: ComputedConstraint;
+  customEvents?: CustomEventConstraint;
+  methods?: MethodsConstraint;
+  events?: EventsConstraint;
+  store?: StoreConstraint;
+  watch?: Record<string, Func>;
+  lifetimes?: LifetimesConstraint;
+  pageLifetimes?: Partial<WMCompPageLifetimes & { load: Func } & WMPageLifetimes>;
+};

package/src/api/SubComponent/index.ts

@@ -196,11 +196,10 @@ export function SubComponent<
   CompDoc extends ComponentDoc,
   Prefix extends string = "",
 >(): IfExtends<EmptyObject, CompDoc, (opt: EmptyObject) => never, SubComponentConstructor<RootDoc, CompDoc, Prefix>> {
-  return ((options: any) => options) as any;
+  return ((options: any) => options as SubComponentTrueOptions) as any;
 }
 
-// 相比与 export type TrivialOption = Options<{},...>,更直观字段和类型,但断耦合,注意类型是否正确.这是为最终生成官方Component API 的options参数而生。
-export type SubComponentOptions = {
+export type SubComponentTrueOptions = {
   inhrit?: string;
   data?: Record<string, unknown>;
   computed?: Record<string, Func>;

package/src/{utils → behaviors/BComputedAndWatch}/computedUpdater.ts

@@ -1,9 +1,10 @@
-import { deepProxy, unwrap } from "../behaviors/BComputedAndWatch/data-tracer";
-import type { ComputedDependence } from "../behaviors/BComputedAndWatch/initComputed";
-import { isEqual } from "../behaviors/BComputedAndWatch/isEqual";
-import type { Instance } from "../behaviors/BComputedAndWatch/types";
+import { deepProxy, unwrap } from "./data-tracer";
 import { getPathsValue } from "./getPathsValue";
 
+import type { ComputedDependence } from "./initComputed";
+import { isEqual } from "./isEqual";
+import type { Instance } from "./types";
+
 export function computedUpdater(this: Instance, isUpdated = false): boolean {
   // console.log("computedUpdater开始");
 

package/src/{utils → behaviors/BComputedAndWatch}/getPathsValue.ts

@@ -1,4 +1,4 @@
-import type { Instance } from "../behaviors/BComputedAndWatch/types";
+import type { Instance } from "./types";
 
 export function getPathsValue(this: Instance, paths: string[]) {
   return paths.reduce((pre: any, path) => {