npm - annil - Versions diffs - 1.5.3 → 1.5.4 - Mend

annil 1.5.3 → 1.5.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (43) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -4,6 +4,13 @@
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
+## [1.5.4](https://github.com/missannil/annil/compare/v1.5.3...v1.5.4) (2023-12-25)
+### Bug Fixes
+* isPagecheck ([03f6452](https://github.com/missannil/annil/commit/03f64523dc5f7da32616ec5c0ecfc4f50d4d4b7d))
 ## [1.5.3](https://github.com/missannil/annil/compare/v1.5.2...v1.5.3) (2023-12-22)

package/README.md CHANGED Viewed

@@ -23,38 +23,40 @@
 ### 简介
-annil(安奈儿)是微信小程序原生开发插件。
+annil(安奈儿)是微信小程序原生开发插件,相较于原生API,使用annil会大大提高开发效率和代码质量。
 ### 特点
-- **新的组件构建API**
+- **组件构建API功能更强大**
   新的组件构建API加入了[computed](./doc/fields/computed.md)、[watch](./doc/fields/watch.md)、[store](./doc/fields/store.md)(基于mobx的全局响应式数据)`等功能,使开发更便捷。
 - **复杂组件解决方案**
-  新的组件构建方案(根组件 + 子组件(可选)),组件逻辑与wxml元素(标签)一一对应。解决书写复杂组件时代码逻辑耦合的问题。
+  新的组件构建方案(根组件 + 子组件(可选)),组件逻辑与wxml标签一一对应。解决书写复杂组件时不同组件代码耦合的问题。
+- **专为typescript开发设计**
+  annil是专为TS开发而设计的,通过类型提示、约束、检测,提升开发效率,避免运行时错误的发生。使用js开发时可忽略开发文档中的ts部分。
 - **组件类型概念**
-  在使用ts开发时,新的组件构建API返回的类型叫组件文档类型,好比传统组件(UI)库为每个组件书写的使用文档,在做为子组件构建新组件(页面)时,子组件API要求使用者输入组件类型,让使用者知道该定义哪些字段(类型提示)并确保字段值类型正确(类型约束和检测)。这样实现了一个页面中所有子组件之间的类型耦合,无论组件嵌套多少层,无论哪层组件数据类型发生改变,所有相关组件类型都会得到感知。当您修改、重构代码时,只要无类型报错(tsc --noEmit --watch)就不会有运行时报错的心智负担。
+  新的组件构建API(DefineComponent)返回的类型叫组件(文档)类型,好比传统组件(UI)库为每个组件书写的使用文档,在做为子组件构建新组件(页面)时,子组件API(SubComponent)要求使用者输入组件类型,在定义选项字段时,会得到类型提示、约束和检测。这样实现了一个页面中所有子组件之间的类型耦合,无论组件嵌套多少层,无论哪层组件数据类型发生改变,所有相关组件类型都会得到感知。当您增改、重构代码时,只要无类型报错(tsc --noEmit --watch)就不会有运行时报错的心智负担。
-- **类型约束代码规范**
+- **类型约束书写规范**
-  js开发时可以任意`setData`一个未声明变量或通过`this.triggerEvent('name',unknown)`触发组件自定义事件。这是js的特点,但易读性和易维护性差。(ts开发时)新API通过类型报错形式对[代码规范](./doc/standard.md)给了强制约束
+  annil通过类型来约束代码书写规范,例如在js开发时可以通过`this.setData({...})`新增一个未在data字段中定义的数据或修改properties中定义的数据,这显然是不对的。新API通过类型报错的形式约束[书写规范](./doc/designIdea.md),在特定情形下(例如测试)你可以通过 `//@ts-ignore`或`as any`关闭类型检测。
 - **高兼容性**
-  annil提供的API都是原生API的语法糖,不具有强制性和侵入性,开发者可在整个项目中使用,也可只在某处使用。
+  annil提供的API都是原生API的语法糖,不具有强制性和侵入性,可渐进性使用或重构代码。
 - **类型修补**
-  官方类型(miniprogram-api-typings)存在更新不及时等问题,annil提供了新的类型方便ts开发,同时会对官方类型库发起PR。
-  这些类型都采用ES模块化,不会污染全局类型。
+  官方类型(miniprogram-api-typings)存在更新不及时等问题,annil提供了新的类型方便开发,这些类型都采用ES模块化,不会污染全局类型。
-- **适配任何第三方库**
+- **适配第三方库类型**
-  通过插件提供的泛型[GenerateDoc](./src/types/GenerateDoc.ts)即可根据组件文档生成组件类型,插件也内置了原生和第三方组件库类型。
+  第三方组件库一般都是以文档的形式对组件说明,插件提供了泛型[GenerateDoc](./src/types/GenerateDoc.ts),可根据组件文档快速书写组件类型,使第三方组件融入组件构建模型,后续插件会陆续添加原生(Wm)和常用第三方组件库(Vant)类型。
 ### 安装
@@ -69,6 +71,7 @@ annil(安奈儿)是微信小程序原生开发插件。
 - 可选
   ```bash
+  # 使用ts开发
   npm typescript --save-dev
   ```
@@ -115,18 +118,18 @@ annil(安奈儿)是微信小程序原生开发插件。
 ### 使用文档
-1. 组件构建API
+- **组件构建API**
-   [DefineComponent](./doc/api/DefineComponent.md)
+  [DefineComponent](./doc/api/DefineComponent.md)
-   [RootComopnent](./doc/api/RootComopnent.md)
+  [RootComopnent](./doc/api/RootComopnent.md)
-   [SubComponent](./doc/api/SubComponent.md)
+  [SubComponent](./doc/api/SubComponent.md)
-### 更新日志
+- **navigateTo**
-[CHANGELOG](./CHANGELOG.md)
+  [navigateTo](./doc/api/navigateTo.md)
-### 协议
+### 更新日志
-[MIT](./LICENSE)
+[CHANGELOG](./CHANGELOG.md)

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

@@ -1,5 +1,5 @@
 import type { Func } from "hry-types/src/Misc/_api";
-import type { ComputedCache } from "../../behaviors/BComputedAndWatch/types";
+import type { ComputedCache, Instance } from "../../behaviors/BComputedAndWatch/types";
 import type { WMComponent } from "../../types/OfficialTypeAlias";
 import type { ComputedConstraint } from "../RootComponent/Computed/ComputedConstraint";
 import type { DataConstraint } from "../RootComponent/Data/DataConstraint";
@@ -27,4 +27,5 @@ export type FinalOptionsOfComponent = {
     lifetimes?: LifetimesConstraint;
     pageLifetimes?: PageLifetimesOption<false, object>["pageLifetimes"];
 };
+export declare function isPageCheck(isPage: boolean | undefined): (this: Instance) => void;
 export declare function collectOptionsForComponent(defineComponentOption: DefineComponentOption): FinalOptionsOfComponent;

package/dist/api/DefineComponent/collectOptionsForComponent.js CHANGED Viewed

@@ -4,6 +4,17 @@ import { BStore } from "../../behaviors/BStore";
 import { INNERMARKER } from "../../utils/InnerMarker";
 import { isEmptyObject } from "../../utils/isEmptyObject";
 import { instanceConfig } from "../InstanceInject/instanceConfig";
+export function isPageCheck(isPage) {
+    return function () {
+        const route = this.route;
+        if (route && isPage !== true) {
+            throw Error(`页面 /${route} 中, RootComponent构建页面时,isPage字段值应为 true`);
+        }
+        if (!route && isPage !== false && isPage !== undefined) {
+            throw Error(`组件 ${this.is} 中  RootComponent构建组件时,可不写isPage字段或值为 false`);
+        }
+    };
+}
 function onLoadReceivedDataHandle(option) {
     const innerData = option[INNERMARKER.url];
     if (innerData === undefined)
@@ -78,12 +89,15 @@ function funcFieldsCollect(options, funcOptions) {
 function otherFieldsHandle(finalOptions, rootComponentOptions) {
     for (const key in rootComponentOptions) {
         const config = rootComponentOptions[key];
-        if (key === "behaviors" || key === "externalClasses") {
+        if (Array.isArray(config) === true) {
             finalOptions[key].push(...config);
         }
-        else {
+        else if (typeof config === "object") {
             Object.assign(finalOptions[key] || (finalOptions[key] = {}), config);
         }
+        else {
+            finalOptions[key] = config;
+        }
     }
 }
 function eventsHandle(methods, eventsConfig) {
@@ -170,6 +184,7 @@ export function collectOptionsForComponent(defineComponentOption) {
     finalOptionsForComponent.isPage
         && hijack(finalOptionsForComponent.pageLifetimes || (finalOptionsForComponent.pageLifetimes = {}), "load", [loadReceivedDataHandle], []);
     hijack(finalOptionsForComponent.methods, "onLoad", [onLoadReceivedDataHandle], []);
+    hijack(finalOptionsForComponent.lifetimes, "attached", [isPageCheck(rootComponentOption === null || rootComponentOption === void 0 ? void 0 : rootComponentOption.isPage)], []);
     finalOptionsForComponent.isPage
         && finalOptionsForComponent.options && Reflect.deleteProperty(finalOptionsForComponent.options, "virtualHost");
     finalOptionsForComponent.behaviors.push(BBeforeCreate);

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

	@@ -1 +1 @@
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;AAEtE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;~~AAqDlE~~,SAAS,wBAAwB,CAE/B,MAA8C;IAE9C,MAAM,SAAS,GAAuB,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAG9D,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO;IACpC,IAAI,SAAS,KAAK,WAAW,CAAC,GAAG,EAAE,CAAC;QAElC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;QAC/D,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;YAC/B,MAAM,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAE/B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AACvB,CAAC;~~AA2BD~~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~~GAAG,~~KAAK,~~WAAW~~,~~IAAI~~,~~GAAG~~,KAAK,~~iBAAiB~~,EAAE,CAAC;~~YAErD~~,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;QACpC,CAAC;aAAM,CAAC;~~YAEN~~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~~CAAC~~,wBAAwB,CAAC,OAAO,~~EAAE~~,QAAQ,~~EAAE~~,CAAC,wBAAwB,CAAC,~~EAAE~~,EAAE,CAAC,CAAC;~~IAKnF~~,wBAAwB,CAAC,MAAM;WAE1B,wBAAwB,CAAC,OAAO,IAAI,OAAO,CAAC,cAAc,CAAC,wBAAwB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAGjH,wBAAwB,CAAC,SAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAExD,OAAO,wBAAwB,CAAC;AAClC,CAAC"}
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;AAEtE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAiDlE,MAAM,UAAU,WAAW,CAAC,MAA2B;IACrD,OAAO;QACL,MAAM,KAAK,GAAI,IAAqB,CAAC,KAA2B,CAAC;QACjE,IAAI,KAAK,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YAE7B,MAAM,KAAK,CACT,OAAO,KAAK,yCAAyC,CACtD,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,KAAK,IAAI,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YAEvD,MAAM,KAAK,CACT,MAAM,IAAI,CAAC,EAAE,6CAA6C,CAC3D,CAAC;QACJ,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAUD,SAAS,wBAAwB,CAE/B,MAA8C;IAE9C,MAAM,SAAS,GAAuB,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAG9D,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO;IACpC,IAAI,SAAS,KAAK,WAAW,CAAC,GAAG,EAAE,CAAC;QAElC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;QAC/D,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;YAC/B,MAAM,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAE/B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AACvB,CAAC;AAOD,SAAS,sBAAsB,CAE7B,MAA8C;IAE9C,MAAM,SAAS,GAAuB,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAE9D,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO;IAEpC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;IAE/D,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;QAC/B,MAAM,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC;AAC5C,CAAC;AAKD,SAAS,MAAM,CAAC,MAAc,EAAE,KAAa,EAAE,SAAiB,EAAE,EAAE,QAAgB,EAAE;IAEpF,MAAM,YAAY,GAAqB,MAAM,CAAC,KAAK,CAAC,CAAC;IAGrD,MAAM,CAAC,KAAK,CAAC,GAAG,UAAS,GAAG,IAAW;QACrC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;QAEjD,YAAY,IAAI,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAE/C,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC;IAEF,OAAO;AACT,CAAC;AAMD,SAAS,uBAAuB,CAAC,MAA0B,EAAE,IAAc;IACzE,IAAI,CAAC,MAAM;QAAE,OAAO;IACpB,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,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,kBAAkB,CAAC,MAAc,EAAE,UAAkC;IAC5E,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAE7B,MAAM,CAAC,GAAG,CAAC,GAAG,UAAS,GAAG,IAAe;YACvC,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;AAID,SAAS,iBAAiB,CACxB,wBAAiD,EACjD,MAA2B,EAC3B,WAAwB;IAGxB,IAAI,MAAM,EAAE,CAAC;QAEX,CAAC,CAAC,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;eACtC,kBAAkB,CAAC,wBAAwB,CAAC,OAAO,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IACvF,CAAC;SAAM,CAAC;QAEN,CAAC,CAAC,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;eACtC,kBAAkB,CAAC,wBAAwB,CAAC,aAAa,KAAtC,wBAAwB,CAAC,aAAa,GAAK,EAAE,GAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IACpG,CAAC;IACD,WAAW,CAAC,SAAS,IAAI,kBAAkB,CAAC,wBAAwB,CAAC,SAAS,KAAlC,wBAAwB,CAAC,SAAS,GAAK,EAAE,GAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAE9G,WAAW,CAAC,KAAK,IAAI,kBAAkB,CAAC,wBAAwB,CAAC,KAAK,KAA9B,wBAAwB,CAAC,KAAK,GAAK,EAAE,GAAE,WAAW,CAAC,KAAK,CAAC,CAAC;AACpG,CAAC;AAID,SAAS,iBAAiB,CACxB,OAA2D,EAC3D,WAAwB;;IAExB,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAG9B,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAEjB,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;gBAEhC,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;IACH,CAAC;AACH,CAAC;AAKD,SAAS,iBAAiB,CACxB,YAAqC,EACrC,oBAA8C;IAE9C,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE,CAAC;QAEvC,MAAM,MAAM,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;YAGnC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;QACpC,CAAC;aAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAEtC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,MAAhB,YAAY,CAAC,GAAG,IAAM,EAAE,GAAE,MAAM,CAAC,CAAC;QAClD,CAAC;aAAM,CAAC;YAGN,YAAY,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;QAC7B,CAAC;IACH,CAAC;AACH,CAAC;AAID,SAAS,YAAY,CAAC,OAA2C,EAAE,YAA8B;IAC/F,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;AACvC,CAAC;AACD,SAAS,mBAAmB,CAC1B,gBAAyC,EACzC,aAAwC,EACxC,WAAwB;IAExB,aAAa,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QAClC,SAAS,CAAC,MAAM,IAAI,YAAY,CAAC,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;QAE7E,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,OAA2C,EAC3C,kBAAyC;IAEzC,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,OAAO,CAAC,GAAG,CAAC,GAAG,UAAyB,MAAe;gBACrD,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;YAC7D,CAAC,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,GAAG,UAAyB,MAAe;gBACrD,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACjC,CAAC,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AAOD,SAAS,0BAA0B,CACjC,YAAqC,EACrC,WAAwB,EACxB,oBAA8C;IAE9C,oBAAoB,CAAC,YAAY,IAAI,kBAAkB,CAAC,YAAY,CAAC,OAAO,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAEjH,oBAAoB,CAAC,MAAM,IAAI,YAAY,CAAC,YAAY,CAAC,OAAO,EAAE,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAE/F,iBAAiB,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;IAErD,iBAAiB,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;AACxD,CAAC;AAWD,SAAS,KAAK,CAA+C,MAAc,EAAE,MAAc;IACzF,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QACzB,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,IAAI,MAAM,EAAE,CAAC;YAElB,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YAC9B,QAAQ,GAAG,EAAE,CAAC;gBACZ,KAAK,WAAW;oBACd,CAAC;wBAEC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,EAAE,GAAG,SAAS,CAAC,CAAC;oBAC7C,CAAC;oBACD,MAAM;gBAER;oBACE,CAAC;wBAEC,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;oBACpD,CAAC;oBACD,MAAM;YACV,CAAC;QACH,CAAC;aAAM,CAAC;YAEN,MAAM,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,OAAO,MAA2C,CAAC;AACrD,CAAC;AAOD,MAAM,UAAU,0BAA0B,CACxC,qBAA4C;IAE5C,MAAM,mBAAmB,GAAG,qBAAqB,CAAC,aAAa,CAAC;IAChE,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,aAAa,CAAC;IAE9D,MAAM,wBAAwB,GAA4B,KAAK,CAAC,cAAc,CAAC,UAAU,IAAI,EAAE,EAAE;QAC/F,SAAS,EAAE,EAAE;QACb,IAAI,EAAE,EAAE;QACR,OAAO,EAAE,EAAE;QACX,SAAS,EAAE,CAAC,MAAM,EAAE,iBAAiB,CAAC;QACtC,eAAe,EAAE,EAAE;KACpB,CAAC,CAAC;IAKH,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,iBAAiB,CAAC,wBAAwB,EAAE,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IAEtF,uBAAuB,CAAC,wBAAwB,CAAC,OAAO,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;IAIxE,wBAAwB,CAAC,MAAM;WAC1B,MAAM,CAAC,wBAAwB,CAAC,aAAa,KAAtC,wBAAwB,CAAC,aAAa,GAAK,EAAE,GAAE,MAAM,EAAE,CAAC,sBAAsB,CAAC,EAAE,EAAE,CAAC,CAAC;IAGjG,MAAM,CACJ,wBAAwB,CAAC,OAAO,EAChC,QAAQ,EACR,CAAC,wBAAwB,CAAC,EAC1B,EAAE,CACH,CAAC;IAEF,MAAM,CACJ,wBAAwB,CAAC,SAAU,EACnC,UAAU,EACV,CAAC,WAAW,CAAC,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,MAAM,CAAC,CAAC,EAC1C,EAAE,CACH,CAAC;IAGF,wBAAwB,CAAC,MAAM;WAE1B,wBAAwB,CAAC,OAAO,IAAI,OAAO,CAAC,cAAc,CAAC,wBAAwB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAGjH,wBAAwB,CAAC,SAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAExD,OAAO,wBAAwB,CAAC;AAClC,CAAC"}

package/dist/api/RootComponent/Lifetimes/LifetimesOption.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 import type { LifetimesConstraint } from "./LifetimesConstraint";
-export type LifetimesOption<TIsPage extends boolean> = TIsPage extends false ? {
+export type LifetimesOption = {
     lifetimes?: LifetimesConstraint;
-} : unknown;
+};

package/dist/api/RootComponent/PageLifetimes/PageLifetimesOption.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersecti
 import type { WMCompPageLifetimes, WMPageLifetimes } from "../../../types/OfficialTypeAlias";
 export type PageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends object> = IfExtends<TIsPage, false, {
     pageLifetimes?: ComputeIntersection<Partial<WMCompPageLifetimes> & {
-        load?: (props: object) => void;
+        load?: (props?: object) => void;
     }>;
 }, {
     pageLifetimes?: ComputeIntersection<Partial<Omit<WMPageLifetimes, "onLoad">> & {

package/dist/api/RootComponent/RootComponentDoc.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { Func } from "hry-types/src/Misc/Func";
+/// <reference types="miniprogram-api-typings" />
 import type { WMCompPageLifetimes, WMPageLifetimes } from "../../types/OfficialTypeAlias";
 import type { LifetimesConstraint } from "./Lifetimes/LifetimesConstraint";
 type _RootComponentDoc = {
@@ -10,27 +10,14 @@ type _RootComponentDoc = {
     methods?: object;
     events?: object;
     store?: object;
-    watch?: Record<string, Func>;
+    watch?: Record<string, AnyFunction>;
     lifetimes?: LifetimesConstraint;
     pageLifetimes?: Partial<WMCompPageLifetimes & {
-        load: Func;
-    }>;
+        load: AnyFunction;
+    }> | Partial<WMPageLifetimes>;
     externalClasses?: string[];
+    export?: () => void;
 };
 type _Validator<O, Doc, ErrKeys = Exclude<keyof O, keyof Doc>> = [ErrKeys] extends [never] ? Doc : `错误的字段${ErrKeys & string}`;
 export type RootComponentDoc<O extends _Validator<O, _RootComponentDoc> = _RootComponentDoc> = O;
-type _RootPageDoc = {
-    isPage?: boolean;
-    properties?: object;
-    data?: object;
-    computed?: object;
-    customEvents?: object;
-    methods?: object;
-    events?: object;
-    store?: object;
-    watch?: Record<string, Func>;
-    lifetimes?: LifetimesConstraint;
-    pageLifetimes?: Partial<WMPageLifetimes>;
-};
-export type RootPageDoc<O extends _Validator<O, _RootPageDoc> = _RootPageDoc> = O;
 export {};

package/dist/api/RootComponent/index.d.ts CHANGED Viewed

@@ -31,7 +31,7 @@ import type { GetStoreDoc } from "./Store/GeTStoreDoc";
 import type { StoreConstraint } from "./Store/StoreConstraint";
 import type { StoreOption } from "./Store/StoreOption";
 import type { WatchOption } from "./Watch/WatchOption";
-type RootComponentOptions<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> & EventsOption<TEvents> & CustomEventsOption<TCustomEvents, keyof EventsDoc> & DataOption<TData, keyof PropertiesDoc> & StoreOption<TStore, keyof (PropertiesDoc & DataDoc)> & ComputedOption<TComputed, keyof (PropertiesDoc & DataDoc & StoreDoc)> & PageLifetimesOption<TIsPage, PropertiesDoc> & LifetimesOption<TIsPage> & WatchOption<ComputedDoc & Required<PropertiesDoc> & DataDoc & StoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers">> & ObserversOption<ComputedDoc & Required<PropertiesDoc> & DataDoc & StoreDoc & IInjectStore> & ThisType<RootComponentInstance<TIsPage, TMethods, DataDoc, DataDoc & Required<PropertiesDoc> & StoreDoc & ComputedDoc, CustomEventsDoc, StoreDoc>>;
+type RootComponentOptions<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> & EventsOption<TEvents> & CustomEventsOption<TCustomEvents, keyof EventsDoc> & DataOption<TData, keyof PropertiesDoc> & StoreOption<TStore, keyof (PropertiesDoc & DataDoc)> & ComputedOption<TComputed, keyof (PropertiesDoc & DataDoc & StoreDoc)> & PageLifetimesOption<TIsPage, PropertiesDoc> & LifetimesOption & WatchOption<ComputedDoc & Required<PropertiesDoc> & DataDoc & StoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "observers">> & ObserversOption<ComputedDoc & Required<PropertiesDoc> & DataDoc & StoreDoc & IInjectStore> & ThisType<RootComponentInstance<TIsPage, TMethods, DataDoc, DataDoc & Required<PropertiesDoc> & StoreDoc & ComputedDoc, CustomEventsDoc, StoreDoc>>;
 type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = {
     <TEvents extends EventsConstraint<TComponentDocList>, TIsPage extends boolean = false, const TProperties extends PropertiesConstraint = {}, TData extends object = {}, TStore extends StoreConstraint = {}, TComputed extends ComputedConstraint = {}, TCustomEvents extends IfExtends<TIsPage, false, CustomEventConstraint, EmptyObject> = {}, TMethods extends MethodsConstraint = {}, EventsDoc extends object = IfExtends<EventsConstraint<TComponentDocList>, 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<TEvents, TIsPage, TCustomEvents, TMethods, TProperties, TData, TStore, TComputed, EventsDoc, CustomEventsDoc, PropertiesDoc, DataDoc, StoreDoc, ComputedDoc>): ComputeIntersection<IfExtends<TIsPage, false, {}, {
         isPage: true;

package/dist/api/SubComponent/SubLifetimes/SubLifetimesOption.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
-import type { WMCompLifetimes } from "../../../types/OfficialTypeAlias";
-export type SubLifetimesOption = Partial<WMCompLifetimes>;
+import type { LifetimesOption } from "../../RootComponent/Lifetimes/LifetimesOption";
+export type SubLifetimesOption = LifetimesOption;

package/dist/api/SubComponent/SubStore/SubStoreConstraint.js ADDED Viewed

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

package/dist/api/SubComponent/SubStore/SubStoreConstraint.js.map ADDED Viewed

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

package/dist/api/SubComponent/SubStore/SubStoreOption.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 import type { V } from "hry-types";
-export type SubStoreOption<TSubStore extends object, legalKeys extends PropertyKey, TPrefix extends string> = {
-    store?: TSubStore & V.IllegalFieldValidator<TSubStore, legalKeys | `_${TPrefix}_${string}`, 0, "", "与inherit和data字段重复或前缀错误">;
+export type SubStoreOption<TSubStore extends object, legalKeys extends PropertyKey> = {
+    store?: TSubStore & V.IllegalFieldValidator<TSubStore, legalKeys, 0, "", "与inherit和data字段重复或前缀错误">;
 };

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

@@ -31,10 +31,10 @@ import type { SubMethodsOption } from "./SubMethods/SubMethodsOption";
 import type { SubObserversOption } from "./SubObservers/SubObserversOption";
 import type { SubPageLifetimesOption } from "./SubPageLifetimes/SubPageLifetimesOption";
 import type { CreateSubComponentDoc } from "./SubReturnType/CreateSubComponentDoc";
-import type { SubStoreConstraint } from "./SubStore/SubDataConstraint";
+import type { SubStoreConstraint } from "./SubStore/SubStoreConstraint";
 import type { SubStoreOption } from "./SubStore/SubStoreOption";
 import type { SubWatchOption } from "./SubWatch/SubWatchOption";
-type Options<RootDoc extends RootComponentDoc, IsPage extends boolean, CurrentCompDoc extends ComponentDoc, Prefix extends string, AllRootDataDoc extends object, TInherit extends object, TSubData extends object, TSubStore extends object, TSubComputed extends object, TEvents extends object, TSubMethods extends SubMethodsConstraint, InheritDoc extends object, SubDataDoc extends object, SubStoreDoc extends object, SubComputedDoc extends object, SubEventsDoc extends object, SubMethodsDoc extends object> = SubInheritOption<TInherit> & SubDataOption<TSubData, Exclude<keyof CurrentCompDoc["properties"], (keyof InheritDoc)>, Prefix> & SubStoreOption<TSubStore, Exclude<keyof CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc))>, Prefix> & SubComputedOption<TSubComputed, Omit<CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc & SubStoreDoc))>> & SubEventsOption<TEvents, SubEventsDoc, keyof SubEventsConstraint<CurrentCompDoc>> & SubMethodsOption<TSubMethods, Prefix, keyof (CurrentCompDoc["customEvents"] & SubEventsDoc)> & SubPageLifetimesOption<IsPage, RootDoc["properties"] & {}> & SubLifetimesOption & SubWatchOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers">> & SubObserversOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & ThisType<SubInstance<SubMethodsDoc & RootDoc["methods"], TSubData, AllRootDataDoc & SubDataDoc & SubComputedDoc & SubStoreDoc, RootDoc["customEvents"] & {}, SubStoreDoc>>;
+type Options<RootDoc extends RootComponentDoc, IsPage extends boolean, CurrentCompDoc extends ComponentDoc, Prefix extends string, AllRootDataDoc extends object, TInherit extends object, TSubData extends object, TSubStore extends object, TSubComputed extends object, TEvents extends object, TSubMethods extends SubMethodsConstraint, InheritDoc extends object, SubDataDoc extends object, SubStoreDoc extends object, SubComputedDoc extends object, SubEventsDoc extends object, SubMethodsDoc extends object> = SubInheritOption<TInherit> & SubDataOption<TSubData, Exclude<keyof CurrentCompDoc["properties"], (keyof InheritDoc)>, Prefix> & SubStoreOption<TSubStore, Exclude<keyof CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc))>> & SubComputedOption<TSubComputed, Omit<CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc & SubStoreDoc))>> & SubEventsOption<TEvents, SubEventsDoc, keyof SubEventsConstraint<CurrentCompDoc>> & SubMethodsOption<TSubMethods, Prefix, keyof (CurrentCompDoc["customEvents"] & SubEventsDoc)> & SubPageLifetimesOption<IsPage, RootDoc["properties"] & {}> & SubLifetimesOption & SubWatchOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers" | "relations">> & SubObserversOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & ThisType<SubInstance<SubMethodsDoc & RootDoc["methods"], TSubData, AllRootDataDoc & SubDataDoc & SubComputedDoc & SubStoreDoc, RootDoc["customEvents"] & {}, SubStoreDoc>>;
 type SubComponentConstructor<TRootDoc extends RootComponentDoc, TOriginalCompDoc extends ComponentDoc, TSupplementalPrefix extends string = "", IsPage extends boolean = TRootDoc["isPage"] extends true ? true : false, CurrentPrefix extends string = `${GetComponentPrefix<TOriginalCompDoc>}${Capitalize<TSupplementalPrefix>}`, CurrentCompDoc extends ComponentDoc = IfExtends<TSupplementalPrefix, "", TOriginalCompDoc, ReplacePrefix<TOriginalCompDoc, CurrentPrefix>>, AllRootDataDoc extends object = Required<TRootDoc["properties"]> & TRootDoc["data"] & TRootDoc["computed"] & TRootDoc["store"]> = {
     <TInherit extends InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TSubData extends SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc>>, TSubStore extends SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)>>, TEvents extends SubEventsConstraint<CurrentCompDoc>, TSubComputed extends SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>> = {}, TSubMethods extends SubMethodsConstraint = {}, InheritDoc extends object = IfExtends<InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TInherit, {}, TInherit>, SubDataDoc extends object = IfExtends<SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc>>, TSubData, {}, TSubData>, SubStoreDoc extends object = IfExtends<SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)>>, TSubStore, {}, {
         [k in keyof TSubStore]: ReturnType<TSubStore[k] & {}>;

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

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

package/dist/behaviors/BComputedAndWatch/isEqual.js CHANGED Viewed

@@ -5,7 +5,7 @@ function isSameSize(a, b) {
     return Object.keys(a).length === Object.keys(b).length;
 }
 function isSameCode(a, b) {
-    return a.toString() === b.toString();
+    return a.toString().split(" ").join("") === b.toString().split(" ").join("");
 }
 function isSameTime(a, b) {
     return a.getTime() === b.getTime();

package/dist/behaviors/BComputedAndWatch/isEqual.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"isEqual.js","sourceRoot":"","sources":["../../../src/behaviors/BComputedAndWatch/isEqual.ts"],"names":[],"mappings":"AAEA,SAAS,UAAU,CAAC,CAAS,EAAE,CAAS;IACtC,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjF,CAAC;AAGD,SAAS,UAAU,CAAC,CAAS,EAAE,CAAS;IACtC,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AACzD,CAAC;AAGD,SAAS,UAAU,CAAC,CAAW,EAAE,CAAW;~~IAC1C~~,OAAO,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;~~AACvC~~,CAAC;AAGD,SAAS,UAAU,CAAC,CAAO,EAAE,CAAO;IAClC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;AACrC,CAAC;AAGD,SAAS,aAAa,CAAC,CAAS,EAAE,CAAS;IACzC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,KAAK,CAAC;AACtD,CAAC;AAQD,MAAM,UAAU,OAAO,CAAC,CAAU,EAAE,CAAU;IAE5C,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC/E,IAAI,OAAO,CAAC,KAAK,UAAU,IAAI,OAAO,CAAC,KAAK,UAAU,EAAE,CAAC;YACvD,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IAGD,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,WAAW,KAAK,CAAC,CAAC,WAAW,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QAC9E,OAAO,KAAK,CAAC;IACf,CAAC;IAGD,IAAI,OAAO,CAAC,KAAK,UAAU,EAAE,CAAC;QAC5B,OAAO,UAAU,CAAC,CAAC,EAAE,CAAa,CAAC,CAAC;IACtC,CAAC;IAGD,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;QACtB,OAAO,UAAU,CAAC,CAAC,EAAE,CAAS,CAAC,CAAC;IAClC,CAAC;IAGD,IAAI,CAAC,YAAY,MAAM,EAAE,CAAC;QACxB,OAAO,aAAa,CAAC,CAAC,EAAE,CAAW,CAAC,CAAC;IACvC,CAAC;IAGD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAE7B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAE7B,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAExB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;gBAC7B,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAGD,OAAO,IAAI,CAAC;AACd,CAAC"}
1	+ {"version":3,"file":"isEqual.js","sourceRoot":"","sources":["../../../src/behaviors/BComputedAndWatch/isEqual.ts"],"names":[],"mappings":"AAEA,SAAS,UAAU,CAAC,CAAS,EAAE,CAAS;IACtC,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjF,CAAC;AAGD,SAAS,UAAU,CAAC,CAAS,EAAE,CAAS;IACtC,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AACzD,CAAC;AAGD,SAAS,UAAU,CAAC,CAAW,EAAE,CAAW;IAE1C,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC/E,CAAC;AAGD,SAAS,UAAU,CAAC,CAAO,EAAE,CAAO;IAClC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;AACrC,CAAC;AAGD,SAAS,aAAa,CAAC,CAAS,EAAE,CAAS;IACzC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,KAAK,CAAC;AACtD,CAAC;AAQD,MAAM,UAAU,OAAO,CAAC,CAAU,EAAE,CAAU;IAE5C,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC/E,IAAI,OAAO,CAAC,KAAK,UAAU,IAAI,OAAO,CAAC,KAAK,UAAU,EAAE,CAAC;YACvD,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IAGD,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,WAAW,KAAK,CAAC,CAAC,WAAW,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QAC9E,OAAO,KAAK,CAAC;IACf,CAAC;IAGD,IAAI,OAAO,CAAC,KAAK,UAAU,EAAE,CAAC;QAC5B,OAAO,UAAU,CAAC,CAAC,EAAE,CAAa,CAAC,CAAC;IACtC,CAAC;IAGD,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;QACtB,OAAO,UAAU,CAAC,CAAC,EAAE,CAAS,CAAC,CAAC;IAClC,CAAC;IAGD,IAAI,CAAC,YAAY,MAAM,EAAE,CAAC;QACxB,OAAO,aAAa,CAAC,CAAC,EAAE,CAAW,CAAC,CAAC;IACvC,CAAC;IAGD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAE7B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAE7B,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAExB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;gBAC7B,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAGD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/package.json CHANGED Viewed

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

package/src/api/DefineComponent/collectOptionsForComponent.ts CHANGED Viewed

@@ -52,6 +52,28 @@ export type FinalOptionsOfComponent = {
   pageLifetimes?: PageLifetimesOption<false, object>["pageLifetimes"];
 };
+/**
+ * 劫持attached,根据this.route做判断 isPage值是否正确
+ */
+/* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
+export function isPageCheck(isPage: boolean | undefined) {
+  return function(this: Instance) {
+    const route = (this as PageInstance).route as string | undefined;
+    if (route && isPage !== true) {
+      // 页面isPage值错误
+      throw Error(
+        `页面 /${route} 中, RootComponent构建页面时,isPage字段值应为 true`,
+      );
+    }
+    if (!route && isPage !== false && isPage !== undefined) {
+      // 组件写了isPage = true
+      throw Error(
+        `组件 ${this.is} 中  RootComponent构建组件时,可不写isPage字段或值为 false`,
+      );
+    }
+  };
+}
 /**
  * 原生Component会对传入的对象字段匹配的properties字段setData赋值。不符合字段或Page时不会赋值。
  * 此函数为给实例setData赋值,默认传递值与properties相符(ts类型安全)。
@@ -80,27 +102,7 @@ function onLoadReceivedDataHandle(
   this.setData(option);
 }
-// 类型保护
-// function isPageInstance(ins: Instance): ins is PageInstance & InstanceCustomFields {
-//   return (ins as PageInstance).route !== undefined;
-// }
-/**
- * 验证path是否正确
- * @param path - 配置路径
- * @returns
- */
-// function pathCheck(path: string | undefined) {
-//   return function(this: Instance) {
-//     if (isPageInstance(this)) {
-//       const route = this.route;
-//       if (route !== path) {
-//         throw Error(
-//           `[ /${route} ] DefinedComponent的配置字段path值错误,应为: /${route}`,
-//         );
-//       }
-//     }
-//   };
-// }
 /**
  * 针对通过 navigateTo传过来的数据对组件load周期传入数据解析
  * @param option - option中的url是拼接了encodeURIComponent转码的data对象的,key为INNERMARKER.url
@@ -218,12 +220,17 @@ function otherFieldsHandle(
   for (const key in rootComponentOptions) {
     // @ts-ignore 隐式索引
     const config = rootComponentOptions[key];
-    if (key === "behaviors" || key === "externalClasses") {
-      // 是不是只有behaviors是数组
+    if (Array.isArray(config) === true) {
+      //  "behaviors" || "externalClasses"是数组
+      // @ts-ignore 只有 behaviors 和 externalClasses, 且都默认为[]
       finalOptions[key].push(...config);
-    } else {
+    } else if (typeof config === "object") {
       // @ts-ignore 隐式索引
       Object.assign(finalOptions[key] ||= {}, config);
+    } else {
+      // 函数字段有 根组件有 `export` 子组件无此字段
+      // @ts-ignore 隐式索引
+      finalOptions[key] = config;
     }
   }
 }
@@ -381,9 +388,19 @@ export function collectOptionsForComponent(
     && hijack(finalOptionsForComponent.pageLifetimes ||= {}, "load", [loadReceivedDataHandle], []);
   /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
-  hijack(finalOptionsForComponent.methods, "onLoad", [onLoadReceivedDataHandle], []);
-  // hijack(finalOptionsForComponent.lifetimes!, "attached", [pathCheck(defineComponentOption.path)], []);
+  hijack(
+    finalOptionsForComponent.methods,
+    "onLoad",
+    [onLoadReceivedDataHandle],
+    [],
+  );
+  hijack(
+    finalOptionsForComponent.lifetimes!,
+    "attached",
+    [isPageCheck(rootComponentOption?.isPage)],
+    [],
+  );
   /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
   finalOptionsForComponent.isPage

package/src/api/RootComponent/Data/test/normal.test.ts CHANGED Viewed

@@ -8,7 +8,7 @@ type Gender = "male" | "female";
 const RootDoc = RootComponent()({
   data: {
-    gender: <Gender> "male", // 联合字面量
+    gender: "male" as Gender, // 联合字面量
     num: 123,
     _innernalFields: 123, // 内部字段无法在wxml中使用
   },

package/src/api/RootComponent/Events/test/normal.test.ts CHANGED Viewed

@@ -24,7 +24,7 @@ RootComponent()({
 });
 /**
- * 2. 没有子组件时,事件参数e可通过WMBaseEvent和WMCustomEvent(多一个detail类型)定义内部类型。
+ * 2. 没有子组件时,事件参数e可通过WMBaseEvent、WMCustomEvent、Detail、Mark等插件提供的类型快速定义事件类型。
  */
 RootComponent()({
   events: {
@@ -122,7 +122,7 @@ type RootDocExpect = {
   };
 };
-// 4 返回EventsDoc正常
+// 4 返回EventsDoc
 Checking<typeof RootDoc, RootDocExpect, Test.Pass>;
 /**

package/src/api/RootComponent/Lifetimes/LifetimesOption.ts CHANGED Viewed

@@ -1,34 +1,31 @@
 import type { LifetimesConstraint } from "./LifetimesConstraint";
-export type LifetimesOption<TIsPage extends boolean> = TIsPage extends false // 组件开通lifetimes字段
-  ? {
-    /**
-     * 在原生类型上增加了beforeCreate周期
-     * @example
-     * ```ts
-     * RootComponent()({
-     *  lifetimes: {
-     *    beforeCreate(opitons) {
-     *      opitons;//为最终进入Component的配置对象
-     *    },
-     *    created() {
-     *    },
-     *    attached() {
-     *    },
-     *    ready() {
-     *    },
-     *    detached() {
-     *    },
-     *    error(err) {
-     *      err.cause;
-     *    },
-     *    moved() {
-     *    },
-     *  },
-     * });
-     * ```
-     */
-    lifetimes?: LifetimesConstraint;
-  }
-  // 页面关闭lifetimes字段(其实也可以开启)
-  : unknown;
+export type LifetimesOption = {
+  /**
+   * 在原生类型上增加了beforeCreate周期
+   * @example
+   * ```ts
+   * RootComponent()({
+   *  lifetimes: {
+   *    beforeCreate(opitons) {
+   *      opitons;//为最终进入Component的配置对象
+   *    },
+   *    created() {
+   *    },
+   *    attached() {
+   *    },
+   *    ready() {
+   *    },
+   *    detached() {
+   *    },
+   *    error(err) {
+   *      err.cause;
+   *    },
+   *    moved() {
+   *    },
+   *  },
+   * });
+   * ```
+   */
+  lifetimes?: LifetimesConstraint;
+};

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

@@ -11,13 +11,7 @@ RootComponent()({
       err.message;
     },
     moved() {},
-    // @ts-expect-error  1 错误的声明周期字段报错
+    // @ts-expect-error  1 错误的生命周期字段报错
     xxx() {},
   },
 });
-RootComponent()({
-  isPage: true,
-  // @ts-expect-error 2 页面时未开启此字段
-  lifetimes: {},
-});

package/src/api/RootComponent/Methods/test/mormal.test.ts CHANGED Viewed

@@ -9,7 +9,7 @@ const RootDoc = RootComponent()({
     num() {
       return 1;
     },
-    str(str: string): string {
+    str(str: string) {
       return str;
     },
   },

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

@@ -6,9 +6,6 @@ export type PageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends o
   TIsPage,
   false,
   {
-    /**
-     * 比官方定义新增load周期,发生在页面onLoad事件后
-     */
     pageLifetimes?: ComputeIntersection<
       // 官方组件页面生命周期
       & Partial<WMCompPageLifetimes>
@@ -17,7 +14,7 @@ export type PageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends o
          * 周期发生在组件attached之后,页面onLoad之前,要求组件为同步组件
          * 最低基础库： `3.0.2`
          */
-        load?: (props: object) => void;
+        load?: (props?: object) => void;
       }
     >;
   },

package/src/api/RootComponent/PageLifetimes/test/normal.test.ts CHANGED Viewed

@@ -7,16 +7,15 @@ import type { Mock_User } from "../../Properties/test/normalRequired.test";
  * 组件时
  */
 RootComponent()({
-  // 1  官方类型 加入load类型(同步组件时触发)
   pageLifetimes: {
     hide() {},
     resize(size) {
       Checking<typeof size, WechatMiniprogram.Page.IResizeOption, Test.Pass>;
     },
     show() {},
-    // 新增周期函数
+    // 1 glass-easel(最低版本库3.0.2)支持的周期函数
     load(obj) {
-      Checking<typeof obj, object, Test.Pass>;
+      Checking<typeof obj, object | undefined, Test.Pass>;
     },
   },
 });
@@ -40,7 +39,7 @@ RootComponent()({
   },
   // 2 官方是把事件写在methods字段中,更改为写在pageLifetimes字段下
   pageLifetimes: {
-    // 3 重写onLoad周期参数props的类型. (propertiesDoc中必传字段去除null后去除可选字段)
+    // 3 重写onLoad周期参数props的类型(同页面properties定义类型).
     onLoad(props) {
       Checking<
         typeof props,
@@ -56,5 +55,15 @@ RootComponent()({
     onHide() {
       console.log("onHide");
     },
+    // onReady
+    // onResize
+    // onUnload
+    // onPageScroll
+    // onPullDownRefresh
+    // onReachBottom
+    // onShareAppMessage
+    // onShareTimeline
+    // onTabItemTap
+    // ...
   },
 });

package/src/api/RootComponent/RootComponentDoc.ts CHANGED Viewed

@@ -1,4 +1,3 @@
-import type { Func } from "hry-types/src/Misc/Func";
 import type { WMCompPageLifetimes, WMPageLifetimes } from "../../types/OfficialTypeAlias";
 import type { LifetimesConstraint } from "./Lifetimes/LifetimesConstraint";
@@ -11,10 +10,11 @@ type _RootComponentDoc = {
   methods?: object;
   events?: object;
   store?: object;
-  watch?: Record<string, Func>;
+  watch?: Record<string, AnyFunction>;
   lifetimes?: LifetimesConstraint;
-  pageLifetimes?: Partial<WMCompPageLifetimes & { load: Func }>;
+  pageLifetimes?: Partial<WMCompPageLifetimes & { load: AnyFunction }> | Partial<WMPageLifetimes>;
   externalClasses?: string[];
+  export?: () => void; // behaviors 'wx://component-export' 使用
 };
 // 验证key是否合法
@@ -24,32 +24,20 @@ type _Validator<O, Doc, ErrKeys = Exclude<keyof O, keyof Doc>> = [ErrKeys] exten
 /**
  * RootComponent Api 返回的类型
  * ```ts
- * RootComponentDoc = {
- * isPage?: true;
+ * isPage?: boolean;
  * properties?: object;
  * data?: object;
- * store?:object;
  * computed?: object;
  * customEvents?: object;
  * methods?: object;
  * events?: object;
+ * store?: object;
+ * watch?: Record<string, AnyFunction>;
+ * lifetimes?: LifetimesConstraint;
+ * pageLifetimes?: Partial<WMCompPageLifetimes & { load: AnyFunction }> | Partial<WMPageLifetimes>;
+ * export?:AnyFunction
+ * externalClasses?: string[];
  * };
  * ```
  */
 export type RootComponentDoc<O extends _Validator<O, _RootComponentDoc> = _RootComponentDoc> = O;
-type _RootPageDoc = {
-  isPage?: boolean;
-  properties?: object;
-  data?: object;
-  computed?: object;
-  customEvents?: object;
-  methods?: object;
-  events?: object;
-  store?: object;
-  watch?: Record<string, Func>;
-  lifetimes?: LifetimesConstraint;
-  pageLifetimes?: Partial<WMPageLifetimes>;
-};
-export type RootPageDoc<O extends _Validator<O, _RootPageDoc> = _RootPageDoc> = O;

package/src/api/RootComponent/Watch/test/WtachInject.test.ts CHANGED Viewed

@@ -1,8 +1,8 @@
 import { Checking, type Test } from "hry-types";
 import { RootComponent } from "../..";
 /**
  * watch 只能监控 注入的store字段
+ * 注入文件 https://github.com/missannil/annil/blob/main/src/api/InstanceInject/inject.ts
  */
 RootComponent()({
   watch: {

package/src/api/RootComponent/index.ts CHANGED Viewed

@@ -57,7 +57,7 @@ type RootComponentOptions<
   & StoreOption<TStore, keyof (PropertiesDoc & DataDoc)>
   & ComputedOption<TComputed, keyof (PropertiesDoc & DataDoc & StoreDoc)>
   & PageLifetimesOption<TIsPage, PropertiesDoc>
-  & LifetimesOption<TIsPage>
+  & LifetimesOption
   & WatchOption<
     & ComputedDoc
     & Required<PropertiesDoc>
@@ -65,7 +65,7 @@ type RootComponentOptions<
     & StoreDoc
     & IInjectStore
   >
-  & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers">>
+  & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "observers">>
   & ObserversOption<
     & ComputedDoc
     & Required<PropertiesDoc>

package/src/api/SubComponent/SubData/SubDataConstraint.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 /**
  * 子组件Data字段约束
- * @returns 当剩余对象不为空对象,约束对象的key为剩余key,类型为剩余key对应的文档类型或函数返回类型。
+ * @returns 当剩余对象不为空对象,约束对象的key为剩余key,类型为剩余key对应的文档类型.
  */
 export type SubDataConstraint<
   TComponentDoc extends object,

package/src/api/SubComponent/SubInherit/SubInheritConstraint.ts CHANGED Viewed

@@ -5,7 +5,7 @@ import type { ComponentDoc } from "../../DefineComponent/ReturnType/ComponentDoc
 type WXMLSign = "wxml";
 /**
- * 子组件inherit字段约束,key为子组件所需key,根组件数据的key或`WXMLSign`。要求根数据类型为子数据类型的子类型。当key的值来自wxml(循环产生的子数据等情况)时用`WXMLSign`表示。
+ * 子组件inherit字段约束,key为构建组件所需的properties字段,类型为根组件数据的key或`WXMLSign`。要求根数据类型为子数据类型的子类型。当key的值来自wxml(循环产生的子数据等情况)时用`WXMLSign`表示。
  * @returns object
  */
 export type InheritConstraint<AllRootData extends object, TComponentDoc extends ComponentDoc> = {

package/src/api/SubComponent/SubInstance/test/normal.test.ts CHANGED Viewed

@@ -43,9 +43,6 @@ SubComponent<RootDoc, CompDoc>()({
   data: {
     aaa_str: "str",
   },
-  store: {
-    _aaa_SubReactive: () => 123,
-  },
   computed: {},
   methods: {
     aaa_SubM() {},
@@ -68,7 +65,6 @@ SubComponent<RootDoc, CompDoc>()({
             Cnum: number;
             // 自身Data
             aaa_str: "str";
-            _aaa_SubReactive: 123;
           } & IInjectData
         >,
         Test.Pass

package/src/api/SubComponent/SubLifetimes/SubLifetimesOption.ts CHANGED Viewed

@@ -1,3 +1,3 @@
-import type { WMCompLifetimes } from "../../../types/OfficialTypeAlias";
+import type { LifetimesOption } from "../../RootComponent/Lifetimes/LifetimesOption";
-export type SubLifetimesOption = Partial<WMCompLifetimes>;
+export type SubLifetimesOption = LifetimesOption;

package/src/api/SubComponent/SubStore/SubStoreOption.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import type { V } from "hry-types";
-export type SubStoreOption<TSubStore extends object, legalKeys extends PropertyKey, TPrefix extends string> = {
+export type SubStoreOption<TSubStore extends object, legalKeys extends PropertyKey> = {
   /**
    * 全局响应式数据字段,全局store对应数据变化实例对应数据自动setData。
    * 约束为组件properties字段去除inherit和data的剩余字段和内部字段
@@ -19,7 +19,8 @@ export type SubStoreOption<TSubStore extends object, legalKeys extends PropertyK
     & TSubStore
     & V.IllegalFieldValidator<
       TSubStore,
-      legalKeys | `_${TPrefix}_${string}`,
+      legalKeys,
+      // legalKeys | `_${TPrefix}_${string}`,
       0,
       "",
       "与inherit和data字段重复或前缀错误"

package/src/api/SubComponent/SubStore/test/error.test.ts CHANGED Viewed

@@ -31,9 +31,7 @@ SubComponent<{
     aaa_str: () => user.name,
     // @ts-expect-error 2 与 data 字段重复
     aaa_num: () => user.age,
-    // @ts-expect-error 3 内部字段前缀错误
-    _num: () => user.age,
-    // @ts-expect-error 4 超出约束字段
+    // @ts-expect-error 3 超出约束字段
     num: () => user.age,
   },
 });

package/src/api/SubComponent/SubStore/test/normal.test.ts CHANGED Viewed

@@ -19,7 +19,17 @@ SubComponent<{}, DocA>()({
     aaa_str: () => user.name,
     aaa_num: () => user.age,
-    // 运行内部字段(暂定)
-    _aaa_ddd: () => user.age,
+    // 内部字段
+    // _aaa_ddd: () => user.age,
+  },
+});
+SubComponent<{}, DocA, "a">()({
+  store: {
+    aaaA_str: () => user.name,
+    aaaA_num: () => user.age,
+    // 内部字段
+    // _aaaA_ddd: () => user.age,
   },
 });

package/src/api/SubComponent/SubWatch/test/WatchProperties.test.ts ADDED Viewed

@@ -0,0 +1,161 @@
+import { Checking, type Test } from "hry-types";
+import type { ReadonlyDeep } from "hry-types/src/Any/ReadonlyDeep";
+import { type DetailedType, RootComponent, SubComponent } from "../../../..";
+import type { OptionalType } from "../../../RootComponent/Properties/PropertiesConstraint";
+import {
+  type Mock_Cart,
+  mock_requiredTypes,
+  mock_requiredUnion,
+  type Mock_User,
+} from "../../../RootComponent/Properties/test/normalRequired.test";
+const mock_optional = {
+  optional_num: {
+    type: Number,
+    value: 123,
+  },
+  optional_gender: {
+    type: String as DetailedType<"male" | "female">,
+    value: "male" as const,
+  },
+  optional_obj: {
+    type: Object as DetailedType<Mock_User>,
+    value: {
+      id: "id",
+      name: "name",
+      age: 20,
+    },
+  },
+  optional_objOrNull: {
+    type: Object as DetailedType<Mock_User | null>, // 可选类型定义null默认值方可为null
+    value: null,
+  },
+} satisfies Record<string, OptionalType>;
+const rootComponent = RootComponent()({
+  properties: {
+    ...mock_requiredTypes,
+    ...mock_requiredUnion,
+    ...mock_optional,
+  },
+});
+type Root = typeof rootComponent;
+/**
+ * watch properties字段 深度只读, 必传对象字段newValue去除null
+ */
+SubComponent<Root, { properties: { aaa_num: number } }>()({
+  watch: {
+    // 必传单一字段
+    str(newValue, oldValue) {
+      Checking<string, typeof newValue, Test.Pass>;
+      Checking<string, typeof oldValue, Test.Pass>;
+    },
+    num(newValue, oldValue) {
+      Checking<number, typeof newValue, Test.Pass>;
+      Checking<number, typeof oldValue, Test.Pass>;
+    },
+    bool(newValue, oldValue) {
+      Checking<boolean, typeof newValue, Test.Pass>;
+      Checking<boolean, typeof oldValue, Test.Pass>;
+    },
+    arr(newValue, oldValue) {
+      newValue; // readonly ReadonlyDeep<unknown>[]
+      oldValue; // readonly ReadonlyDeep<unknown>[]
+      // ts中很多不是错误的错误,写 typeof newValue 结果是错误
+      Checking<unknown[], typeof newValue, Test.Fail>;
+      // ts中很多不是错误的错误,写 readonly ReadonlyDeep<unknown>[] 结果是正确的
+      Checking<readonly unknown[], readonly ReadonlyDeep<unknown>[], Test.Pass>;
+    },
+    obj(newValue, oldValue) {
+      Checking<object, typeof newValue, Test.Pass>;
+      Checking<object | null, typeof oldValue, Test.Pass>;
+    },
+    tuple(newValue, oldValue) {
+      Checking<readonly [string, number, boolean], typeof newValue, Test.Pass>;
+      Checking<readonly [string, number, boolean], typeof oldValue, Test.Pass>;
+    },
+    union_str(newValue, oldValue) {
+      Checking<"male" | "female", typeof newValue, Test.Pass>;
+      Checking<"male" | "female", typeof oldValue, Test.Pass>;
+    },
+    union_num(newValue, oldValue) {
+      Checking<0 | 1 | 2, typeof newValue, Test.Pass>;
+      Checking<0 | 1 | 2, typeof oldValue, Test.Pass>;
+    },
+    union_bool(newValue, oldValue) {
+      Checking<false | true, typeof newValue, Test.Pass>;
+      Checking<false | true, typeof oldValue, Test.Pass>;
+    },
+    union_arr(newValue, oldValue) {
+      Checking<readonly number[] | readonly string[], typeof newValue, Test.Pass>;
+      Checking<readonly number[] | readonly string[], typeof oldValue, Test.Pass>;
+    },
+    union_obj(newValue, oldValue) {
+      Checking<ReadonlyDeep<Mock_User | Mock_Cart>, typeof newValue, Test.Pass>;
+      Checking<ReadonlyDeep<Mock_User | Mock_Cart | null>, typeof oldValue, Test.Pass>;
+    },
+    // 必传多类型联合
+    union_str_num_bool(newValue, oldValue) {
+      Checking<string | number | boolean, typeof newValue, Test.Pass>;
+      Checking<string | number | boolean, typeof oldValue, Test.Pass>;
+    },
+    union_literalStr_Literalnum(newValue, oldValue) {
+      Checking<0 | 1 | 2 | "male" | "female", typeof newValue, Test.Pass>;
+      Checking<0 | 1 | 2 | "male" | "female", typeof oldValue, Test.Pass>;
+    },
+    union_mockUser_num(newValue, oldValue) {
+      Checking<ReadonlyDeep<number | Mock_User>, typeof newValue, Test.Pass>;
+      Checking<ReadonlyDeep<number | Mock_User | null>, typeof oldValue, Test.Pass>;
+    },
+    // 可选字段
+    optional_gender(newValue, oldValue) {
+      Checking<"male" | "female", typeof newValue, Test.Pass>;
+      Checking<"male" | "female", typeof oldValue, Test.Pass>;
+    },
+    optional_num(newValue, oldValue) {
+      Checking<number, typeof newValue, Test.Pass>;
+      Checking<number, typeof oldValue, Test.Pass>;
+    },
+    optional_obj(newValue, oldValue) {
+      Checking<ReadonlyDeep<Mock_User>, typeof newValue, Test.Pass>;
+      Checking<ReadonlyDeep<Mock_User | null>, typeof oldValue, Test.Pass>;
+    },
+    // 对象的二段key
+    "optional_obj.age"(newValue, oldValue) {
+      Checking<number, typeof newValue, Test.Pass>;
+      Checking<number | undefined, typeof oldValue, Test.Pass>;
+    },
+    "optional_obj.**"(newValue, oldValue) {
+      Checking<ReadonlyDeep<Mock_User>, typeof newValue, Test.Pass>;
+      Checking<ReadonlyDeep<Mock_User | null>, typeof oldValue, Test.Pass>;
+    },
+    "optional_obj.id"(newValue, oldValue) {
+      Checking<string, typeof newValue, Test.Pass>;
+      Checking<string, typeof oldValue, Test.Pass>;
+    },
+  },
+});

package/src/api/SubComponent/index.ts CHANGED Viewed

@@ -32,7 +32,7 @@ import type { SubMethodsOption } from "./SubMethods/SubMethodsOption";
 import type { SubObserversOption } from "./SubObservers/SubObserversOption";
 import type { SubPageLifetimesOption } from "./SubPageLifetimes/SubPageLifetimesOption";
 import type { CreateSubComponentDoc } from "./SubReturnType/CreateSubComponentDoc";
-import type { SubStoreConstraint } from "./SubStore/SubDataConstraint";
+import type { SubStoreConstraint } from "./SubStore/SubStoreConstraint";
 import type { SubStoreOption } from "./SubStore/SubStoreOption";
 import type { SubWatchOption } from "./SubWatch/SubWatchOption";
@@ -63,8 +63,7 @@ type Options<
   >
   & SubStoreOption<
     TSubStore,
-    Exclude<keyof CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc))>,
-    Prefix
+    Exclude<keyof CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc))>
   >
   & SubComputedOption<
     TSubComputed,
@@ -84,7 +83,7 @@ type Options<
     & SubStoreDoc
     & IInjectStore
   >
-  & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers">>
+  & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers" | "relations">>
   & SubObserversOption<
     & SubComputedDoc
     & SubDataDoc

package/src/behaviors/BComputedAndWatch/isEqual.ts CHANGED Viewed

@@ -11,7 +11,8 @@ function isSameSize(a: object, b: object) {
 // 定义一个辅助函数，用于判断两个函数的代码是否相同
 function isSameCode(a: Function, b: Function) {
-  return a.toString() === b.toString();
+  // 去除空格比较函数字符串
+  return a.toString().split(" ").join("") === b.toString().split(" ").join("");
 }
 // 定义一个辅助函数，用于判断两个日期的时间戳是否相同

package/dist/api/SubComponent/SubStore/SubDataConstraint.js DELETED Viewed

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

package/dist/api/SubComponent/SubStore/SubDataConstraint.js.map DELETED Viewed

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

/package/dist/api/SubComponent/SubStore/{SubDataConstraint.d.ts → SubStoreConstraint.d.ts} RENAMED Viewed

File without changes

/package/src/api/SubComponent/SubStore/{SubDataConstraint.ts → SubStoreConstraint.ts} RENAMED Viewed

File without changes