annil 1.0.1 → 1.0.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+### Bug Fixes
+
+* 解决SpecificType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
+
+## [1.0.4](https://github.com/missannil/annil/compare/v1.0.3...v1.0.4) (2023-11-30)
+
+
+### Bug Fixes
+
+* release.yml ([c8b68b6](https://github.com/missannil/annil/commit/c8b68b66a50f5834756ab9f0d926bc7f1be2f90e))
+* yml ([e51c002](https://github.com/missannil/annil/commit/e51c00290d24d9372766e66e9c807e0c3d65429f))
+
 ## [1.0.1](https://github.com/missannil/annil/compare/v1.0.0...v1.0.1) (2023-11-27)
 
 

package/README.md

@@ -1,10 +1,40 @@
-## Annil
+<h1 align="center">Annil</h1>
 
-[![](https://img.shields.io/npm/v/annil?style=flat)](https://www.npmjs.com/package/annil)
+<p align="center">
+<a href="https://www.npmjs.com/package/annil" >
+ <img src="https://img.shields.io/npm/v/annil?style=flat"/>
+</a>
+<a href="https://github.com/missannil/annil/blob/main/.github/workflows/test.yml" >
+ <img src="https://github.com/missannil/annil/actions/workflows/test.yml/badge.svg?branch=miss"/>
+ </a>
+<a href="https://github.com/missannil/annil/blob/main/.github/workflows/release-please.yml" >
+ <img src="https://github.com/missannil/annil/actions/workflows/release-please.yml/badge.svg?branch=main"/>
+ </a>
+<a href="https://github.com/missannil/annil/blob/main/LICENSE" >
+ <img src="https://img.shields.io/github/license/missannil/annil"/>
+ </a>
+<a href="https://codecov.io/gh/missannil/annil" >
+ <img src="https://codecov.io/gh/missannil/annil/graph/badge.svg?token=4CFCHGST79"/>
+ </a>
+<a href="https://www.npmjs.com/package/annil" >
+<img src="https://img.shields.io/npm/dependency-version/annil/dev/typescript"/>
+</a>
+</p>
 
-[![](https://github.com/missannil/annil/actions/workflows/release-please.yml/badge.svg?branch=main)](https://github.com/missannil/annil/blob/main/.github/workflows/release-please.yml)
+### 简介
 
-[![](https://img.shields.io/github/license/missannil/annil)](https://github.com/missannil/annil/blob/main/LICENSE)
+annil(安奈儿)是微信小程序原生开发插件,她把组件的逻辑部分解耦为根组件和子组件,与wxml元素一一对应,提高了组件的可读性,更方便拓展和维护。另外annil的类型系统无与伦比,一个页面好比一个类型,无论嵌套多少层组件,无论哪层数据类型发生改变,所有相关类型都会得到感知。当您修改,拓展,重构代码时,只要无类型报错就不会有运行时报错。
 
-[![](https://codecov.io/github/vuejs/vue?branch=dev)]()
-annil(安奈儿)是为使用typescript原始开发微信小程序所写的插件,是您的小程序代码更易写、易读、易维护。
+### 特点
+
+- API功能更全面
+- 极致的类型约束
+- 更严格的书写规范
+- 子组件逻辑分离
+- 渐进式更新
+
+## 安装
+
+```bash
+npm i annil --save-dev
+```

package/dist/api/DefineComponent/collectOptionsForComponent.d.ts

@@ -0,0 +1,4 @@
+import type { RootComponentTrueOptions } from "../RootComponent";
+import type { SubComponentTrueOptions } from "../SubComponent";
+import type { FinalOptionsForComponent } from ".";
+export declare function collectOptionsForComponent(rootComponentOption: RootComponentTrueOptions | undefined, subComponentsList: SubComponentTrueOptions[] | undefined): FinalOptionsForComponent;

package/dist/api/DefineComponent/collectOptionsForComponent.js

@@ -0,0 +1,152 @@
+import { BBeforeCreate } from "../../behaviors/BbeforeCreated";
+import { BComputedAndWatch } from "../../behaviors/BComputedAndWatch";
+import { initComputed } from "../../behaviors/BComputedAndWatch/initComputed";
+import { BStore } from "../../behaviors/BStore";
+import { deepClone } from "../../utils/deepClone";
+import { INNERMARKER } from "../../utils/InnerMarker";
+import { isEmptyObject } from "../../utils/isEmptyObject";
+function onLoadReceivedDataHandle(option) {
+    const innerData = option[INNERMARKER.url];
+    if (innerData === undefined)
+        return;
+    const optionData = JSON.parse(decodeURIComponent(innerData));
+    for (const key in optionData) {
+        option[key] = optionData[key];
+    }
+    this.setData(option);
+    delete option[INNERMARKER.url];
+    Reflect.deleteProperty(this.data, INNERMARKER.url);
+}
+function onLoadHijack(options, before, after = []) {
+    options.methods || (options.methods = {});
+    const cloneOpt = deepClone(options);
+    const originalOnLoad = options.methods.onLoad;
+    options.methods.onLoad = function (props) {
+        before.forEach((func) => {
+            func.call(this, props, cloneOpt);
+        });
+        originalOnLoad === null || originalOnLoad === void 0 ? void 0 : originalOnLoad.call(this, props);
+        after.forEach((func) => {
+            func.call(this, props, cloneOpt);
+        });
+    };
+}
+const INNERFIELDS = ["disposer"];
+function InternalFieldProtection(methodsConfig) {
+    const methodsConfigKeys = Object.keys(methodsConfig);
+    for (const key of INNERFIELDS) {
+        if (methodsConfigKeys.includes(key)) {
+            throw Error(`${key}已被内部字段占用`);
+        }
+    }
+}
+function _funcConfigHandle(methodsConfig, configList) {
+    for (const key in configList) {
+        methodsConfig[key] = function (...args) {
+            configList[key].forEach(ele => ele.call(this, ...args));
+        };
+    }
+}
+function funcConfigHandle(finalOptionsForComponent, isPage, funcOptions) {
+    if (isPage) {
+        funcOptions.pageLifetimes && _funcConfigHandle(finalOptionsForComponent.methods || (finalOptionsForComponent.methods = {}), funcOptions.pageLifetimes);
+    }
+    else {
+        funcOptions.pageLifetimes
+            && _funcConfigHandle(finalOptionsForComponent.pageLifetimes || (finalOptionsForComponent.pageLifetimes = {}), funcOptions.pageLifetimes);
+    }
+    funcOptions.lifetimes && _funcConfigHandle(finalOptionsForComponent.lifetimes || (finalOptionsForComponent.lifetimes = {}), funcOptions.lifetimes);
+    funcOptions.watch && _funcConfigHandle(finalOptionsForComponent.watch || (finalOptionsForComponent.watch = {}), funcOptions.watch);
+}
+function funcFieldsCollect(options, funcOptions) {
+    var _a;
+    for (const key in funcOptions) {
+        if (options[key]) {
+            for (const _key in options[key]) {
+                ((_a = funcOptions[key])[_key] || (_a[_key] = [])).push(options[key][_key]);
+            }
+        }
+        Reflect.deleteProperty(options, key);
+    }
+}
+function otherFieldsHandle(finalOptions, rootComponentOptions) {
+    for (const key in rootComponentOptions) {
+        const config = rootComponentOptions[key];
+        if (Array.isArray(config)) {
+            (finalOptions[key] || (finalOptions[key] = [])).push(...config);
+        }
+        else {
+            Object.assign(finalOptions[key] || (finalOptions[key] = {}), config);
+        }
+    }
+}
+function eventsHandle(componentOptions, eventsConfig) {
+    componentOptions.methods || (componentOptions.methods = {});
+    Object.assign(componentOptions.methods, eventsConfig);
+}
+function subComponentsHandle(componentOptions, subComponents, funcOptions) {
+    subComponents.forEach((subOption) => {
+        subOption.events && eventsHandle(componentOptions, subOption.events);
+        funcFieldsCollect(subOption, funcOptions);
+        otherFieldsHandle(componentOptions, subOption);
+    });
+}
+function IsFullCustomEvents(customEventOptions) {
+    return Object.prototype.toString.call(customEventOptions) === "[object Object]";
+}
+function customEventsHandle(componentOptions, customEventsConfig) {
+    componentOptions.methods || (componentOptions.methods = {});
+    for (const key in customEventsConfig) {
+        const customEventOptions = customEventsConfig[key];
+        if (IsFullCustomEvents(customEventOptions)) {
+            componentOptions.methods[key] = function (detail) {
+                this.triggerEvent(key, detail, customEventOptions.options);
+            };
+        }
+        else {
+            componentOptions.methods[key] = function (detail) {
+                this.triggerEvent(key, detail);
+            };
+        }
+    }
+}
+function collectRootComponentOption(finalOptions, funcOptions, rootComponentOptions) {
+    rootComponentOptions.customEvents && customEventsHandle(finalOptions, rootComponentOptions.customEvents);
+    delete rootComponentOptions.customEvents;
+    rootComponentOptions.events && eventsHandle(finalOptions, rootComponentOptions.events);
+    delete rootComponentOptions.events;
+    funcFieldsCollect(rootComponentOptions, funcOptions);
+    otherFieldsHandle(finalOptions, rootComponentOptions);
+}
+export function collectOptionsForComponent(rootComponentOption, subComponentsList) {
+    const finalOptionsForComponent = {
+        options: {
+            multipleSlots: true,
+            pureDataPattern: /^_/,
+            virtualHost: true,
+        },
+        behaviors: [BStore, BComputedAndWatch],
+    };
+    const funcOptions = {
+        pageLifetimes: {},
+        lifetimes: {},
+        watch: {},
+    };
+    if (rootComponentOption && !isEmptyObject(rootComponentOption)) {
+        collectRootComponentOption(finalOptionsForComponent, funcOptions, rootComponentOption);
+    }
+    if (subComponentsList && !isEmptyObject(subComponentsList)) {
+        subComponentsHandle(finalOptionsForComponent, subComponentsList, funcOptions);
+    }
+    if (!isEmptyObject(funcOptions)) {
+        funcConfigHandle(finalOptionsForComponent, rootComponentOption === null || rootComponentOption === void 0 ? void 0 : rootComponentOption.isPage, funcOptions);
+    }
+    finalOptionsForComponent.methods && InternalFieldProtection(finalOptionsForComponent.methods);
+    finalOptionsForComponent.behaviors.push(BBeforeCreate);
+    onLoadHijack(finalOptionsForComponent, [onLoadReceivedDataHandle, initComputed], []);
+    if (finalOptionsForComponent.isPage) {
+        Reflect.deleteProperty(finalOptionsForComponent.options, "virtualHost");
+    }
+    return finalOptionsForComponent;
+}
+//# sourceMappingURL=collectOptionsForComponent.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"collectOptionsForComponent.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/collectOptionsForComponent.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,gDAAgD,CAAC;AAE9E,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAgB1D,SAAS,wBAAwB,CAE/B,MAA8C;IAE9C,MAAM,SAAS,GAAuB,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAE9D,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO;IACpC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;IAG7D,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAGD,IAAI,CAAC,OAAO,CAAC,MAAa,CAAC,CAAC;IAE5B,OAAO,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAE/B,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;AACrD,CAAC;AAMD,SAAS,YAAY,CACnB,OAAiC,EACjC,MAAc,EACd,QAAgB,EAAE;IAElB,OAAO,CAAC,OAAO,KAAf,OAAO,CAAC,OAAO,GAAK,EAAE,EAAC;IAEvB,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IACpC,MAAM,cAAc,GAAqB,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;IAEhE,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,UAAS,KAAc;QAC9C,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACtB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAElC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAID,MAAM,WAAW,GAAG,CAAC,UAAU,CAAC,CAAC;AAMjC,SAAS,uBAAuB,CAAC,aAAqB;IACpD,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACrD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAC9B,IAAI,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACpC,MAAM,KAAK,CAAC,GAAG,GAAG,UAAU,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;AACH,CAAC;AAID,SAAS,iBAAiB,CAAC,aAAqB,EAAE,UAAkC;IAClF,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,aAAa,CAAC,GAAG,CAAC,GAAG,UAAS,GAAG,IAAe;YAC9C,UAAU,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;QAC1D,CAAC,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CACvB,wBAAkD,EAClD,MAA2B,EAC3B,WAAwB;IAIxB,IAAI,MAAM,EAAE,CAAC;QAEX,WAAW,CAAC,aAAa,IAAI,iBAAiB,CAAC,wBAAwB,CAAC,OAAO,KAAhC,wBAAwB,CAAC,OAAO,GAAK,EAAE,GAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IACrH,CAAC;SAAM,CAAC;QAEN,WAAW,CAAC,aAAa;eACpB,iBAAiB,CAAC,wBAAwB,CAAC,aAAa,KAAtC,wBAAwB,CAAC,aAAa,GAAK,EAAE,GAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IACnG,CAAC;IACD,WAAW,CAAC,SAAS,IAAI,iBAAiB,CAAC,wBAAwB,CAAC,SAAS,KAAlC,wBAAwB,CAAC,SAAS,GAAK,EAAE,GAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAE7G,WAAW,CAAC,KAAK,IAAI,iBAAiB,CAAC,wBAAwB,CAAC,KAAK,KAA9B,wBAAwB,CAAC,KAAK,GAAK,EAAE,GAAE,WAAW,CAAC,KAAK,CAAC,CAAC;AACnG,CAAC;AAID,SAAS,iBAAiB,CACxB,OAA2D,EAC3D,WAAwB;;IAExB,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAE9B,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACjB,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;gBAChC,OAAC,WAAW,CAAC,GAAG,CAAC,EAAC,IAAI,SAAJ,IAAI,IAAM,EAAE,EAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;QAED,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACvC,CAAC;AACH,CAAC;AAGD,SAAS,iBAAiB,CACxB,YAAsC,EACtC,oBAA8C;IAE9C,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAG1B,CAAC,YAAY,CAAC,GAAG,MAAhB,YAAY,CAAC,GAAG,IAAM,EAAE,EAAC,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,MAAhB,YAAY,CAAC,GAAG,IAAM,EAAE,GAAE,MAAM,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;AACH,CAAC;AAID,SAAS,YAAY,CAAC,gBAA0C,EAAE,YAA8B;IAE9F,gBAAgB,CAAC,OAAO,KAAxB,gBAAgB,CAAC,OAAO,GAAK,EAAE,EAAC;IAEhC,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;AACxD,CAAC;AACD,SAAS,mBAAmB,CAC1B,gBAA0C,EAC1C,aAAwC,EACxC,WAAwB;IAExB,aAAa,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QAClC,SAAS,CAAC,MAAM,IAAI,YAAY,CAAC,gBAAgB,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;QAErE,iBAAiB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAE1C,iBAAiB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;AACL,CAAC;AAGD,SAAS,kBAAkB,CACzB,kBAAgC;IAEhC,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,iBAAiB,CAAC;AAClF,CAAC;AAKD,SAAS,kBAAkB,CACzB,gBAA0C,EAC1C,kBAAyC;IAGzC,gBAAgB,CAAC,OAAO,KAAxB,gBAAgB,CAAC,OAAO,GAAK,EAAE,EAAC;IAEhC,KAAK,MAAM,GAAG,IAAI,kBAAkB,EAAE,CAAC;QACrC,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAEnD,IAAI,kBAAkB,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAC3C,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,UAAyB,MAAe;gBACtE,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;YAC7D,CAAC,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,UAAyB,MAAe;gBACtE,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACjC,CAAC,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AAQD,SAAS,0BAA0B,CACjC,YAAsC,EACtC,WAAwB,EACxB,oBAA8C;IAE9C,oBAAoB,CAAC,YAAY,IAAI,kBAAkB,CAAC,YAAY,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAEzG,OAAO,oBAAoB,CAAC,YAAY,CAAC;IAEzC,oBAAoB,CAAC,MAAM,IAAI,YAAY,CAAC,YAAY,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAEvF,OAAO,oBAAoB,CAAC,MAAM,CAAC;IAEnC,iBAAiB,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;IAErD,iBAAiB,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;AACxD,CAAC;AAOD,MAAM,UAAU,0BAA0B,CACxC,mBAAyD,EACzD,iBAAwD;IAExD,MAAM,wBAAwB,GAA6B;QAEzD,OAAO,EAAE;YAEP,aAAa,EAAE,IAAI;YACnB,eAAe,EAAE,IAAI;YACrB,WAAW,EAAE,IAAI;SAClB;QAED,SAAS,EAAE,CAAC,MAAM,EAAE,iBAAiB,CAAC;KACvC,CAAC;IAIF,MAAM,WAAW,GAAgB;QAC/B,aAAa,EAAE,EAAE;QACjB,SAAS,EAAE,EAAE;QACb,KAAK,EAAE,EAAE;KACV,CAAC;IAEF,IAAI,mBAAmB,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,EAAE,CAAC;QAC/D,0BAA0B,CAAC,wBAAwB,EAAE,WAAW,EAAE,mBAAmB,CAAC,CAAC;IACzF,CAAC;IAED,IAAI,iBAAiB,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAC3D,mBAAmB,CAAC,wBAAwB,EAAE,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAChF,CAAC;IAGD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;QAChC,gBAAgB,CAAC,wBAAwB,EAAE,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IACvF,CAAC;IAED,wBAAwB,CAAC,OAAO,IAAI,uBAAuB,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAG9F,wBAAwB,CAAC,SAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAExD,YAAY,CAAC,wBAAwB,EAAE,CAAC,wBAAwB,EAAE,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;IAIrF,IAAI,wBAAwB,CAAC,MAAM,EAAE,CAAC;QACpC,OAAO,CAAC,cAAc,CAAC,wBAAwB,CAAC,OAAQ,EAAE,aAAa,CAAC,CAAC;IAC3E,CAAC;IAED,OAAO,wBAAwB,CAAC;AAClC,CAAC"}

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

@@ -9,19 +9,16 @@ import type { CreateComponentDoc } from "./ReturnType/CreateComponentDoc";
 import type { CreatePageDoc } from "./ReturnType/CreatePageDoc";
 import type { RootComponentOption } from "./RootComponent/RootComponentOption";
 import type { SubComponentsOption } from "./SubComponents/SubComponentsOption";
+type Path = `/${string}`;
 type RootOptions<TRootComponentDoc extends RootComponentDoc, TSubComponentTuple extends SubComponentDoc[], TName extends string, TPath extends Path> = NameOrPathOption<TName, TPath, TRootComponentDoc> & RootComponentOption<TRootComponentDoc> & SubComponentsOption<TSubComponentTuple>;
 interface DefineComponentConstructor {
     <TRootComponentDoc extends RootComponentDoc = {}, TSubComponentTuple extends SubComponentDoc[] = [], TName extends string = "", TPath extends Path = "/">(options: RootOptions<TRootComponentDoc, TSubComponentTuple, TName, TPath>): IfExtends<"", TName, CreatePageDoc<TRootComponentDoc, TPath, TSubComponentTuple>, CreateComponentDoc<TRootComponentDoc, TName, TSubComponentTuple>>;
 }
-export type FuncConfig = {
-    pageLifetimes?: Record<string, Func[]>;
-    lifetimes?: Record<string, Func[]>;
-    watch?: Record<string, Func[]>;
-};
-export type ComponentOptions = {
+export type FuncOptions = Record<"pageLifetimes" | "lifetimes" | "watch", Record<string, Func[]>>;
+export type FinalOptionsForComponent = {
     isPage?: boolean;
     options?: WMComponent.Options;
-    properties?: object;
+    properties?: Record<string, any>;
     data?: object;
     store?: object;
     computed?: Record<string, Func>;
@@ -36,26 +33,5 @@ export type ComponentOptions = {
         load: Func;
     } & WMPageLifetimes>;
 };
-export type Path = `/${string}`;
-export type DefineComponentOptions = {
-    path?: Path;
-    name?: string;
-    rootComponent?: RootComponentDoc;
-    subComponents?: SubComponentDoc[];
-};
 export declare const DefineComponent: DefineComponentConstructor;
-export type PageOptions = {
-    path: Path;
-    rootComponent: RootComponentDoc & {
-        isPage: true;
-    };
-    subComponents: SubComponentDoc[];
-};
-export type CompOptions = {
-    name: string;
-    rootComponent: RootComponentDoc & {
-        isPage: undefined;
-    };
-    subComponents: SubComponentDoc[];
-};
 export {};

package/dist/api/DefineComponent/index.js

@@ -1,40 +1,5 @@
-import { BBeforeCreate } from "../../behaviors/BbeforeCreated";
-import { BComputedAndWatch } from "../../behaviors/BComputedAndWatch";
-import { initComputed } from "../../behaviors/BComputedAndWatch/initComputed";
-import { BStore } from "../../behaviors/BStore";
-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 { InternalFieldProtection } from "../../utils/InternalFieldProtection";
-import { onLoadHijack } from "../../utils/onLoadHijack";
+import { collectOptionsForComponent } from "./collectOptionsForComponent";
 export const DefineComponent = function (options) {
-    var _a;
-    const finalOptions = {
-        options: {
-            multipleSlots: true,
-            pureDataPattern: /^_/,
-            virtualHost: true,
-        },
-        behaviors: [BStore, BComputedAndWatch],
-    };
-    const allFuncConfig = {};
-    if (options.rootComponent && !isEmptyObject(options.rootComponent)) {
-        rootComponentFieldHandle(options.rootComponent, finalOptions, allFuncConfig);
-    }
-    if (options.subComponents && !isEmptyObject(options.subComponents)) {
-        subComponentsHandle(finalOptions, options.subComponents, allFuncConfig);
-    }
-    if (!isEmptyObject(allFuncConfig)) {
-        funcConfigHandle(finalOptions, (_a = options.rootComponent) === null || _a === void 0 ? void 0 : _a.isPage, allFuncConfig);
-    }
-    finalOptions.methods && InternalFieldProtection(finalOptions.methods);
-    finalOptions.behaviors.push(BBeforeCreate);
-    onLoadHijack(finalOptions, [onLoadReceivedDataHandle, initComputed], []);
-    if (finalOptions.isPage) {
-        Reflect.deleteProperty(finalOptions.options, "virtualHost");
-    }
-    Component(finalOptions);
+    Component(collectOptionsForComponent(options.rootComponent, options.subComponents));
 };
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,gDAAgD,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAUtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAoExD,MAAM,CAAC,MAAM,eAAe,GAA+B,UAAS,OAAO;;IAIzE,MAAM,YAAY,GAAqB;QAErC,OAAO,EAAE;YAEP,aAAa,EAAE,IAAI;YACnB,eAAe,EAAE,IAAI;YACrB,WAAW,EAAE,IAAI;SAClB;QAED,SAAS,EAAE,CAAC,MAAM,EAAE,iBAAiB,CAAC;KACvC,CAAC;IAIF,MAAM,aAAa,GAAe,EAAE,CAAC;IAErC,IAAI,OAAO,CAAC,aAAa,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QACnE,wBAAwB,CAAC,OAAO,CAAC,aAAa,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;IAC/E,CAAC;IAED,IAAI,OAAO,CAAC,aAAa,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QACnE,mBAAmB,CAAC,YAAY,EAAE,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAC1E,CAAC;IAGD,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC;QAClC,gBAAgB,CAAC,YAAY,EAAE,MAAA,OAAO,CAAC,aAAa,0CAAE,MAAM,EAAE,aAAa,CAAC,CAAC;IAC/E,CAAC;IAED,YAAY,CAAC,OAAO,IAAI,uBAAuB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAEtE,YAAY,CAAC,SAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAE5C,YAAY,CAAC,YAAY,EAAE,CAAC,wBAAwB,EAAE,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;IAIzE,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;QACxB,OAAO,CAAC,cAAc,CAAC,YAAY,CAAC,OAAQ,EAAE,aAAa,CAAC,CAAC;IAC/D,CAAC;IAED,SAAS,CAAC,YAAmB,CAAC,CAAC;AACjC,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/index.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAyD1E,MAAM,CAAC,MAAM,eAAe,GAA+B,UAAS,OAAO;IACzE,SAAS,CACP,0BAA0B,CAAC,OAAO,CAAC,aAAqD,EAAE,OAAO,CAAC,aAAa,CAAC,CACjH,CAAC;AACJ,CAAC,CAAC"}

package/dist/api/RootComponent/CustomEvents/CustomEventConstraint.d.ts

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

package/dist/api/RootComponent/Data/DataConstraint.d.ts

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

package/dist/api/RootComponent/Data/DataConstraint.js

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

package/dist/api/RootComponent/Data/DataConstraint.js.map

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

package/dist/api/RootComponent/Lifetimes/LifetimesConstraint.d.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"] & {
-    beforeCreate?: (options: ComponentOptions) => void;
+    beforeCreate?: (options: FinalOptionsForComponent) => void;
 };

package/dist/api/RootComponent/Lifetimes/test/error.test.js

@@ -1,6 +1,7 @@
 import { RootComponent } from "../..";
 RootComponent()({
     lifetimes: {
+        beforeCreate() { },
         created() { },
         attached() { },
         ready() { },

package/dist/api/RootComponent/Lifetimes/test/error.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Lifetimes/test/error.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAItC,aAAa,EAAE,CAAC;IACd,SAAS,EAAE;QAGT,OAAO,KAAI,CAAC;QAEZ,QAAQ,KAAI,CAAC;QAEb,KAAK,KAAI,CAAC;QAEV,QAAQ,KAAI,CAAC;QAEb,KAAK,CAAC,GAAG;YACP,GAAG,CAAC,KAAK,CAAC;QACZ,CAAC;QACD,KAAK,KAAI,CAAC;QAEV,GAAG,KAAI,CAAC;KACT;CACF,CAAC,CAAC;AAKH,aAAa,EAAE,CAAC;IACd,MAAM,EAAE,IAAI;IAEZ,SAAS,EAAE,EAAE;CACd,CAAC,CAAC"}
+{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Lifetimes/test/error.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAItC,aAAa,EAAE,CAAC;IACd,SAAS,EAAE;QACT,YAAY,KAAI,CAAC;QAEjB,OAAO,KAAI,CAAC;QAEZ,QAAQ,KAAI,CAAC;QAEb,KAAK,KAAI,CAAC;QAEV,QAAQ,KAAI,CAAC;QAEb,KAAK,CAAC,GAAG;YACP,GAAG,CAAC,KAAK,CAAC;QACZ,CAAC;QACD,KAAK,KAAI,CAAC;QAEV,GAAG,KAAI,CAAC;KACT;CACF,CAAC,CAAC;AAKH,aAAa,EAAE,CAAC;IACd,MAAM,EAAE,IAAI;IAEZ,SAAS,EAAE,EAAE;CACd,CAAC,CAAC"}

package/dist/api/RootComponent/Lifetimes/test/normal.test.js

@@ -1,6 +1,9 @@
 import { RootComponent } from "../../../..";
 RootComponent()({
     lifetimes: {
+        beforeCreate(opitons) {
+            opitons;
+        },
         created() {
         },
         attached() {

package/dist/api/RootComponent/Lifetimes/test/normal.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Lifetimes/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAK5C,aAAa,EAAE,CAAC;IACd,SAAS,EAAE;QAKT,OAAO;QACP,CAAC;QACD,QAAQ;QACR,CAAC;QACD,KAAK;QACL,CAAC;QACD,QAAQ;QACR,CAAC;QACD,KAAK,CAAC,GAAG;YACP,GAAG,CAAC,KAAK,CAAC;QACZ,CAAC;QACD,KAAK;QACL,CAAC;KACF;CACF,CAAC,CAAC"}
+{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Lifetimes/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAK5C,aAAa,EAAE,CAAC;IACd,SAAS,EAAE;QAET,YAAY,CAAC,OAAO;YAClB,OAAO,CAAC;QACV,CAAC;QACD,OAAO;QACP,CAAC;QACD,QAAQ;QACR,CAAC;QACD,KAAK;QACL,CAAC;QACD,QAAQ;QACR,CAAC;QACD,KAAK,CAAC,GAAG;YACP,GAAG,CAAC,KAAK,CAAC;QACZ,CAAC;QACD,KAAK;QACL,CAAC;KACF;CACF,CAAC,CAAC"}

package/dist/api/RootComponent/Properties/test/normalOptional.test.js

@@ -38,4 +38,19 @@ const OptionalDoc = RootComponent()({
     },
 });
 Checking;
+RootComponent()({
+    properties: {
+        xxx: Object,
+        user: {
+            type: Object,
+            value: { name: "zhao" },
+        },
+    },
+    computed: {
+        ddd() {
+            var _a;
+            (_a = this.data.user) === null || _a === void 0 ? void 0 : _a.name;
+        },
+    },
+});
 //# sourceMappingURL=normalOptional.test.js.map

package/dist/api/RootComponent/Properties/test/normalOptional.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalOptional.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Properties/test/normalOptional.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAGhD,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAMtC,MAAM,WAAW,GAAG,aAAa,EAAE,CAAC;IAClC,UAAU,EAAE;QACV,YAAY,EAAE;YACZ,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,GAAG;SACX;QACD,eAAe,EAAE;YACf,IAAI,EAAE,MAAyC;YAC/C,KAAK,EAAE,MAAM;SACd;QACD,cAAc,EAAE;YACd,IAAI,EAAE,KAA2D;YACjE,KAAK,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAA8B;SACnD;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,MAAiC;YACvC,KAAK,EAAE;gBACL,EAAE,EAAE,IAAI;gBACR,GAAG,EAAE,EAAE;aACR;SACF;QACD,kBAAkB,EAAE;YAClB,IAAI,EAAE,MAAwC;YAC9C,KAAK,EAAE,IAAI;SACZ;QACD,cAAc,EAAE;YACd,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,QAAQ;YACf,aAAa,EAAE,CAAC,MAAM,CAAC;SACxB;KACF;IACD,OAAO,EAAE;QACP,GAAG;YAED,QAWC,CAAC;QACJ,CAAC;KACF;CACF,CAAC,CAAC;AAiBH,QAA4D,CAAC"}
+{"version":3,"file":"normalOptional.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Properties/test/normalOptional.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAGhD,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAMtC,MAAM,WAAW,GAAG,aAAa,EAAE,CAAC;IAClC,UAAU,EAAE;QACV,YAAY,EAAE;YACZ,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,GAAG;SACX;QACD,eAAe,EAAE;YACf,IAAI,EAAE,MAAyC;YAC/C,KAAK,EAAE,MAAM;SACd;QACD,cAAc,EAAE;YACd,IAAI,EAAE,KAA2D;YACjE,KAAK,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAA8B;SACnD;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,MAAiC;YACvC,KAAK,EAAE;gBACL,EAAE,EAAE,IAAI;gBACR,GAAG,EAAE,EAAE;aACR;SACF;QACD,kBAAkB,EAAE;YAClB,IAAI,EAAE,MAAwC;YAC9C,KAAK,EAAE,IAAI;SACZ;QACD,cAAc,EAAE;YACd,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,QAAQ;YACf,aAAa,EAAE,CAAC,MAAM,CAAC;SACxB;KACF;IACD,OAAO,EAAE;QACP,GAAG;YAED,QAWC,CAAC;QACJ,CAAC;KACF;CACF,CAAC,CAAC;AAiBH,QAA4D,CAAC;AAO7D,aAAa,EAAE,CAAC;IACd,UAAU,EAAE;QACV,GAAG,EAAE,MAAmC;QACxC,IAAI,EAAE;YACJ,IAAI,EAAE,MAA2B;YACjC,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;SACxB;KACF;IACD,QAAQ,EAAE;QACR,GAAG;;YACD,MAAA,IAAI,CAAC,IAAI,CAAC,IAAI,0CAAE,IAAI,CAAC;QACvB,CAAC;KACF;CACF,CAAC,CAAC"}

package/dist/api/RootComponent/index.d.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";
@@ -29,7 +31,7 @@ import type { StoreOption } from "./Store/StoreOption";
 import type { WatchOption } from "./Watch/WatchOption";
 type RootComponentOptions<TReceivedComponentDoc extends object, TEvents extends object, TIsPage extends boolean, TCustomEvents extends CustomEventConstraint, TMethods extends MethodsConstraint, TProperties extends PropertiesConstraint, TData extends object, TStore extends StoreConstraint, TComputed extends Record<string, Func>, EventsDoc extends object, CustomEventsDoc extends object, PropertiesDoc extends object, DataDoc extends object, StoreDoc extends object, ComputedDoc extends object> = MethodsOption<TMethods, keyof (EventsDoc & CustomEventsDoc)> & PropertiesOption<TProperties> & IsPageOption<TIsPage> & CustomEventsOption<TCustomEvents, EventsDoc> & EventsOption<TEvents, EventsConstraint<TReceivedComponentDoc>> & DataOption<TData, PropertiesDoc> & StoreOption<TStore, PropertiesDoc & DataDoc> & ComputedOption<TComputed, Required<PropertiesDoc> & DataDoc & StoreDoc> & PageLifetimesOption<TIsPage, NoInfer<PropertiesDoc>> & LifetimesOption<TIsPage> & WatchOption<ComputedDoc & Required<PropertiesDoc> & DataDoc & StoreDoc> & Partial<Omit<WMCompOtherOption, "pageLifetimes">> & ThisType<RootComponentInstance<TIsPage, TMethods, DataDoc, DataDoc & Required<PropertiesDoc> & StoreDoc & ComputedDoc, CustomEventsDoc, StoreDoc>>;
 type RootComponentConstructor<TReceivedComponentDoc extends ComponentDoc[] | ComponentDoc> = {
-    <Literal extends string | number | boolean | null | Literal[] | Record<string, Literal>, TEvents extends EventsConstraint<TReceivedComponentDoc>, TIsPage extends boolean = false, TProperties extends PropertiesConstraint<Literal> = {}, TData extends object = {}, TStore extends StoreConstraint = {}, TComputed extends ComputedConstraint = {}, TCustomEvents extends IfExtends<TIsPage, false, CustomEventConstraint, EmptyObject> = {}, TMethods extends MethodsConstraint = {}, EventsDoc extends object = IfExtends<EventsConstraint<TReceivedComponentDoc>, TEvents, {}, TEvents>, CustomEventsDoc extends object = GetCustomEventDoc<TCustomEvents>, PropertiesDoc extends object = GetPropertiesDoc<TProperties, TIsPage>, DataDoc extends object = TData, StoreDoc extends object = GeTStoreDoc<TStore>, ComputedDoc extends object = GetComputedDoc<TComputed>>(options: RootComponentOptions<TReceivedComponentDoc, TEvents, TIsPage, TCustomEvents, TMethods, TProperties, TData, TStore, TComputed, EventsDoc, CustomEventsDoc, PropertiesDoc, DataDoc, StoreDoc, ComputedDoc>): ComputeIntersectionDeep<IfExtends<TIsPage, false, {}, {
+    <Literal extends string | number | boolean | null | Literal[] | object, TEvents extends EventsConstraint<TReceivedComponentDoc>, TIsPage extends boolean = false, TProperties extends PropertiesConstraint<Literal> = {}, TData extends object = {}, TStore extends StoreConstraint = {}, TComputed extends ComputedConstraint = {}, TCustomEvents extends IfExtends<TIsPage, false, CustomEventConstraint, EmptyObject> = {}, TMethods extends MethodsConstraint = {}, EventsDoc extends object = IfExtends<EventsConstraint<TReceivedComponentDoc>, TEvents, {}, TEvents>, CustomEventsDoc extends object = GetCustomEventDoc<TCustomEvents>, PropertiesDoc extends object = GetPropertiesDoc<TProperties, TIsPage>, DataDoc extends object = TData, StoreDoc extends object = GeTStoreDoc<TStore>, ComputedDoc extends object = GetComputedDoc<TComputed>>(options: RootComponentOptions<TReceivedComponentDoc, TEvents, TIsPage, TCustomEvents, TMethods, TProperties, TData, TStore, TComputed, EventsDoc, CustomEventsDoc, PropertiesDoc, DataDoc, StoreDoc, ComputedDoc>): ComputeIntersectionDeep<IfExtends<TIsPage, false, {}, {
         isPage: true;
     }> & IfExtends<EmptyObject, PropertiesDoc, {}, {
         properties: PropertiesDoc;
@@ -48,4 +50,19 @@ type RootComponentConstructor<TReceivedComponentDoc extends ComponentDoc[] | Com
     }>>;
 };
 export declare function RootComponent<TReceivedComponentDoc extends ComponentDoc[] | ComponentDoc = {}>(): RootComponentConstructor<TReceivedComponentDoc>;
+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>;
+};
 export {};

package/dist/api/RootComponent/index.js

@@ -1,4 +1,4 @@
 export function RootComponent() {
-    return (options) => options;
+    return ((options) => options);
 }
 //# sourceMappingURL=index.js.map

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

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

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

@@ -33,7 +33,7 @@ type SubComponentConstructor<TRootDoc extends RootComponentDoc, TOriginalCompDoc
     }>, SubComputedDoc extends object = IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>>, TSubComputed, {}, GetSubComputedDoc<TSubComputed>>, SubEventsDoc extends object = IfExtends<SubEventsConstraint<CurrentCompDoc>, TEvents, {}, TEvents>, SubMethodsDoc extends object = TSubMethods, MissingRequiredField extends PropertyKey = Exclude<RequiredKeys<CurrentCompDoc["properties"] & {}>, keyof (InheritDoc & SubDataDoc & SubStoreDoc & IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>>, TSubComputed, {}, GetSubComputedDoc<TSubComputed>>)>>(options: Options<TRootDoc, IsPage, CurrentCompDoc, CurrentPrefix, AllRootDataDoc, TInherit, TSubData, TSubStore, TSubComputed, TEvents, TSubMethods, InheritDoc, SubDataDoc, SubStoreDoc, SubComputedDoc, SubEventsDoc, SubMethodsDoc>): CreateSubComponentDoc<TOriginalCompDoc["customEvents"] & {}, SubEventsDoc, MissingRequiredField>;
 };
 export declare function SubComponent<RootDoc extends RootComponentDoc, CompDoc extends ComponentDoc, Prefix extends string = "">(): IfExtends<EmptyObject, CompDoc, (opt: EmptyObject) => never, SubComponentConstructor<RootDoc, CompDoc, Prefix>>;
-export type SubComponentOptions = {
+export type SubComponentTrueOptions = {
     inhrit?: string;
     data?: Record<string, unknown>;
     computed?: Record<string, Func>;

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

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

package/dist/{utils → behaviors/BComputedAndWatch}/computedUpdater.d.ts

@@ -1,2 +1,2 @@
-import type { Instance } from "../behaviors/BComputedAndWatch/types";
+import type { Instance } from "./types";
 export declare function computedUpdater(this: Instance, isUpdated?: boolean): boolean;

package/dist/{utils → behaviors/BComputedAndWatch}/computedUpdater.js

@@ -1,6 +1,6 @@
-import { deepProxy, unwrap } from "../behaviors/BComputedAndWatch/data-tracer";
-import { isEqual } from "../behaviors/BComputedAndWatch/isEqual";
+import { deepProxy, unwrap } from "./data-tracer";
 import { getPathsValue } from "./getPathsValue";
+import { isEqual } from "./isEqual";
 export function computedUpdater(isUpdated = false) {
     for (const key in this.__computedCache__) {
         const itemCache = this.__computedCache__[key];

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

@@ -0,0 +1 @@
+{"version":3,"file":"computedUpdater.js","sourceRoot":"","sources":["../../../src/behaviors/BComputedAndWatch/computedUpdater.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,MAAM,UAAU,eAAe,CAAiB,SAAS,GAAG,KAAK;IAK/D,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAGzC,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAC9C,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;YACxC,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;YAGnD,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC9B,OAAO,GAAG,IAAI,CAAC;gBAEf,MAAM;YACR,CAAC;QACH,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,cAAc,GAAyB,EAAE,CAAC;YAEhD,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC;gBACrC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC;aAC3C,CAAC,CAAC;YAGH,IAAI,CAAC,OAAO,CAAC;gBACX,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;aACxB,CAAC,CAAC;YAEH,SAAS,GAAG,IAAI,CAAC;YAGjB,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,cAAc,CAAC;YAGzD,OAAO,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/{utils → behaviors/BComputedAndWatch}/getPathsValue.d.ts

@@ -1,2 +1,2 @@
-import type { Instance } from "../behaviors/BComputedAndWatch/types";
+import type { Instance } from "./types";
 export declare function getPathsValue(this: Instance, paths: string[]): any;

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

@@ -0,0 +1 @@
+{"version":3,"file":"getPathsValue.js","sourceRoot":"","sources":["../../../src/behaviors/BComputedAndWatch/getPathsValue.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,aAAa,CAAiB,KAAe;IAC3D,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,IAAI,EAAE,EAAE;QAErC,IAAI,CAAC;YACH,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC"}

package/dist/behaviors/BComputedAndWatch/index.js

@@ -1,10 +1,17 @@
 import { deepClone } from "../../utils/deepClone";
 import { deleteProtoField } from "../../utils/deleteProtoField";
-import { initWatchOldValue } from "../../utils/initWatchOldValue";
 import { isEmptyObject } from "../../utils/isEmptyObject";
+import { getPathsValue } from "./getPathsValue";
 import { initComputed } from "./initComputed";
 import { isEqual } from "./isEqual";
 import { isPage } from "./IsPage";
+function initWatchOldValue(watchConfig) {
+    const watchOldValue = {};
+    for (const key in watchConfig) {
+        watchOldValue[key] = deepClone(getPathsValue.call(this, key.split(".")));
+    }
+    return watchOldValue;
+}
 export const BComputedAndWatch = Behavior({
     definitionFilter(options) {
         const computedConfig = options.computed;

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

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

package/dist/behaviors/BComputedAndWatch/initComputed.js

@@ -1,5 +1,5 @@
-import { computedUpdater } from "../../utils/computedUpdater";
 import { deleteProtoField } from "../../utils/deleteProtoField";
+import { computedUpdater } from "./computedUpdater";
 import { deepProxy, unwrap } from "./data-tracer";
 function isValidDependences(dependences, computedKeys) {
     for (const { paths: path, val } of dependences) {

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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"}