annil 1.7.3 → 1.7.5-beta-3

package/CHANGELOG.md

@@ -4,6 +4,36 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.7.5-beta-3](https://github.com/missannil/annil/compare/v1.7.5-beta.0...v1.7.5-beta-3) (2024-08-06)
+
+
+### Miscellaneous Chores
+
+* 测试 ([#185](https://github.com/missannil/annil/issues/185)) ([7da9fc8](https://github.com/missannil/annil/commit/7da9fc8d0f84167554f95a856da71310207a77fa))
+* 测试自定义3 ([b25df03](https://github.com/missannil/annil/commit/b25df0368785499537405415072e48ea842893c7))
+* 自定义发布 ([8fd8020](https://github.com/missannil/annil/commit/8fd802092f4d2f8d784c1530d0cd6ffdd178790a))
+
+## [1.7.5-beta.0](https://github.com/missannil/annil/compare/v1.7.5-beta.0...v1.7.5-beta.0) (2024-08-06)
+
+
+### Miscellaneous Chores
+
+* 测试自定义3 ([b25df03](https://github.com/missannil/annil/commit/b25df0368785499537405415072e48ea842893c7))
+
+## [1.7.5-beta.0](https://github.com/missannil/annil/compare/v1.7.4...v1.7.5-beta.0) (2024-08-06)
+
+
+### Miscellaneous Chores
+
+* 测试自定义发布 ([d179ebd](https://github.com/missannil/annil/commit/d179ebd36219bec5c92864fd3e2989913ade33a2))
+
+## [1.7.4](https://github.com/missannil/annil/compare/v1.7.3...v1.7.4) (2024-06-30)
+
+
+### Bug Fixes
+
+* jest.config.ts的transform项修复,update typescript version from 5.3.2 to 5.5.2 ([00e221c](https://github.com/missannil/annil/commit/00e221ca37b042f042715b26dd5d158c0671a30e))
+
 ## [1.7.3](https://github.com/missannil/annil/compare/v1.7.2...v1.7.3) (2024-05-03)
 
 

package/README.md

@@ -23,7 +23,7 @@
 
 ### 简介
 
-annil(安奈儿)是微信小程序原生开发插件。
+annil(安奈儿)是微信小程序原生开发插件。她会让你获得新的开发体验,提高开发效率和代码质量。
 
 ### 特点
 
@@ -34,13 +34,13 @@ annil(安奈儿)是微信小程序原生开发插件。
 - **复杂组件解决方案**
 
   新的组件构建方案(根组件 + 子组件(可选)),组件逻辑与wxml标签一一对应。解决书写复杂组件时不同组件代码耦合的问题。
-- **专为typescript开发设计**
+- **基于typescript设计**
 
-  annil是专为TS开发而设计的,通过类型提示、约束、检测,提升开发效率,避免运行时错误的发生。使用js开发时可忽略开发文档中的ts部分。
+  annil中的api基于原生ts设计,js开发者只需懂得定义对象类型便可。
 
 - **组件类型概念**
 
-  新的组件构建API(DefineComponent)返回的类型叫组件(文档)类型,好比传统组件(UI)库为每个组件书写的使用文档,在做为子组件构建新组件(页面)时,子组件API(SubComponent)要求使用者输入组件类型,在定义选项字段时,会得到类型提示、约束和检测。这样实现了一个页面中所有子组件之间的类型耦合,无论组件嵌套多少层,无论哪层组件数据类型发生改变,所有相关组件类型都会得到感知。当您增改、重构代码时,只要无类型报错(tsc --noEmit --watch)就不会有运行时报错的心智负担。
+  新的组件构建API(DefineComponent)返回的类型叫组件类型,好比传统组件(UI)库为每个组件书写的使用文档,在做为子组件构建新组件(页面)时,子组件API(SubComponent)要求使用者传入组件类型,在定义选项字段时,会得到类型提示、约束和检测。这样实现了一个页面中所有子组件之间的类型耦合,无论组件嵌套多少层,无论哪层组件数据类型发生改变,所有相关组件类型都会得到感知。当您增改、重构代码时,只要无类型报错(tsc --noEmit --watch)就不会有运行时报错的心智负担。
 
 - **高兼容性**
 
@@ -48,13 +48,13 @@ annil(安奈儿)是微信小程序原生开发插件。
 
 - **类型修补**
 
-  官方类型(miniprogram-api-typings)存在更新不及时等问题,annil提供了新的类型方便开发,这些类型都采用ES模块化,不会污染全局类型。
+  官方类型(miniprogram-api-typings)存在更新不及时等问题,annil提供了新的类型(补全官方类型)方便开发,这些类型都采用ES模块化,不会污染全局类型。
 
 - **适配第三方库类型**
 
-  第三方组件库一般都是以文档的形式对组件说明,插件提供了泛型[GenerateDoc](./src/types/GenerateDoc.ts),可根据组件文档快速书写组件类型,使第三方组件融入组件构建模型,后续插件会陆续添加原生(Wm)和常用第三方组件库(Vant)类型。
+  第三方组件库一般都是以文档的形式对组件说明,插件提供了泛型[CreateComponentType](./src/types/CreateComponentType.ts),可根据组件文档快速书写组件类型,使第三方组件融入组件构建模型,后续会陆续添加原生(Wm)和常用第三方组件库(Vant)类型。
 
-- **设计思想**
+- **示例Demo及设计思想**
 
   请参考[设计思想](./doc/designIdea.md)
 
@@ -135,3 +135,7 @@ annil(安奈儿)是微信小程序原生开发插件。
 ### 更新日志
 
 [CHANGELOG](./CHANGELOG.md)
+
+测试1
+测试2
+测试3

package/dist/api/DefineComponent/NameOrPage/NameOrPathOption.d.ts

@@ -1,7 +1,16 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { Includes } from "../../../types/includes";
+/**
+ * 根据IsPage,生成name或path字段
+ */
 export type NameOrPathOption<TName extends string, TPath extends `/${string}`, IsPage extends boolean> = IsPage extends true ? {
+    /**
+     * 页面路径已'/'开头
+     */
     path: TPath;
 } : {
+    /**
+     * 组件名不可为空串和含有下划线
+     */
     name: TName & IfExtends<TName, "", () => "⚠️组件名不可为空⚠️", IfExtends<Includes<TName, "_">, true, () => "⚠️组件名不可包含下划线 _ ⚠️", unknown>>;
 };

package/dist/api/DefineComponent/ReturnType/ComponentDoc.d.ts

@@ -5,5 +5,14 @@ type _ComponentDoc = {
 };
 type Error = "{ properties?: Record<PrefixKeys, any>; customEvents?: Record<PrefixKeys, any>;}";
 type _Validator<O> = keyof O extends keyof _ComponentDoc ? keyof (O["properties"] & O["customEvents"]) extends PrefixKeys ? _ComponentDoc : Error : Error;
+/**
+ * RootComponent Api 返回的类型
+ * ```ts
+ * RootComponentDoc = {
+ * properties?: Record<PrefixKeys, any>;
+ * customEvents?: Record<PrefixKeys, any>;
+ * };
+ * ```
+ */
 export type ComponentDoc<O extends _Validator<O> = _ComponentDoc> = O;
 export {};

package/dist/api/DefineComponent/ReturnType/GetCustomEventDocOfSubDoc.d.ts

@@ -2,6 +2,14 @@ import type { IsNever, IsUnion } from "hry-types/src/Any/_api";
 import type { UnionTwoObject } from "hry-types/src/Object/UnionTwoObject";
 import type { Last } from "hry-types/src/Union/Last";
 import type { SubComponentDoc } from "../../SubComponent/SubComponentDoc";
+/**
+ * 因为子组件文档customEvents字段有可能相同(无前缀),所以使用UnionTwoObject
+ * 由于SubComponentDoc为空时返回never而不`{}`,所以`Exclude<U, TLast>`不影响结果。
+ */
 type _GetCustomEventDocOfSubDoc<U extends SubComponentDoc, Result = {}, TLast = Last<U>> = IsNever<U> extends true ? Result : _GetCustomEventDocOfSubDoc<Exclude<U, TLast>, UnionTwoObject<Result, TLast>>;
+/**
+ * 获取子组件自定义事件文档
+ * @remarks U 中 相同字段类型联合,所以使用元组推导不如Last性能好。
+ */
 export type GetCustomEventDocOfSubDoc<UnionSubDoc extends SubComponentDoc> = IsUnion<UnionSubDoc> extends true ? _GetCustomEventDocOfSubDoc<UnionSubDoc> : UnionSubDoc;
 export {};

package/dist/api/DefineComponent/ReturnType/PageDoc.d.ts

@@ -4,5 +4,14 @@ type _PageDoc = {
 };
 type Error = "{ path: `/${string}`; properties?: object;}";
 type _Validator<O> = keyof O extends keyof _PageDoc ? _PageDoc : Error;
+/**
+ * 页面文档类型
+ * ```ts
+ * PageDoc = {
+ *   path: `/${string}`;
+ *   properties?: object;
+ * };
+ * ```
+ */
 export type PageDoc<O extends _Validator<O> = _PageDoc> = O;
 export {};

package/dist/api/DefineComponent/RootComponent/RootComponentOption.d.ts

@@ -1,4 +1,10 @@
 import type { RootComponentDoc } from "../../RootComponent/RootComponentDoc";
+/**
+ * DefineComponent API`rootComponent`字段配置
+ */
 export type RootComponentOption<TRootComponent extends RootComponentDoc> = {
+    /**
+     * 根组件配置
+     */
     rootComponent?: TRootComponent;
 };

package/dist/api/DefineComponent/SubComponents/SubComponentsOption.d.ts

@@ -1,4 +1,10 @@
 import type { SubComponentDoc } from "../../SubComponent/SubComponentDoc";
+/**
+ * RootComponent API 的`subComponents`字段配置
+ */
 export type SubComponentsOption<TSubComponentTuple extends SubComponentDoc[]> = {
+    /**
+     * 子组件列表
+     */
     subComponents?: [...TSubComponentTuple];
 };

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

@@ -1,4 +1,5 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { RootComponentTrueOptions } from "../RootComponent";
 import type { RootComponentDoc } from "../RootComponent/RootComponentDoc";
 import type { SubComponentDoc } from "../SubComponent/SubComponentDoc";
 import type { NameOrPathOption } from "./NameOrPage/NameOrPathOption";
@@ -6,17 +7,17 @@ import type { CreateComponentDoc } from "./ReturnType/CreateComponentDoc";
 import type { CreatePageDoc } from "./ReturnType/CreatePageDoc";
 import type { RootComponentOption } from "./RootComponent/RootComponentOption";
 import type { SubComponentsOption } from "./SubComponents/SubComponentsOption";
-import type { RootComponentTrueOptions } from "../RootComponent";
 export type Path = `/${string}`;
 type RootOptions<TRootComponentDoc extends RootComponentDoc, TSubComponentTuple extends SubComponentDoc[], TName extends string, TPath extends Path> = NameOrPathOption<TName, TPath, TRootComponentDoc["isPage"] & {}> & 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>, CreateComponentDoc<TRootComponentDoc, TName, TSubComponentTuple>>;
-}
+type DefineComponentConstructor = <TRootComponentDoc extends RootComponentDoc = {}, TSubComponentTuple extends SubComponentDoc[] = [], TName extends string = "", TPath extends Path = "/">(options: RootOptions<TRootComponentDoc, TSubComponentTuple, TName, TPath>) => IfExtends<"", TName, CreatePageDoc<TRootComponentDoc, TPath>, CreateComponentDoc<TRootComponentDoc, TName, TSubComponentTuple>>;
 export type DefineComponentOption = {
     name?: string;
     path?: string;
     rootComponent?: RootComponentTrueOptions;
     subComponents?: SubComponentDoc[];
 };
+/**
+ * 把根组件选项和子组件选项转化为原生Component API选项并执行
+ */
 export declare const DefineComponent: DefineComponentConstructor;
 export {};

package/dist/api/DefineComponent/index.js

@@ -1,5 +1,11 @@
-import { assignOptions } from "./assignOptions";
+import { normalizeOptions } from "./normalizeOptions";
+/**
+ * 把根组件选项和子组件选项转化为原生Component API选项并执行
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const DefineComponent = function (options) {
-    Component(assignOptions(options));
+    Component(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    normalizeOptions(options));
 };
 //# 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":"AAWA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AA0ChD,MAAM,CAAC,MAAM,eAAe,GAA+B,UAAS,OAAO;IACzE,SAAS,CACP,aAAa,CAAC,OAAgC,CAAQ,CACvD,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAyCtD;;GAEG;AACH,8DAA8D;AAC9D,MAAM,CAAC,MAAM,eAAe,GAA+B,UAAS,OAAO;IACzE,SAAS;IACP,8DAA8D;IAC9D,gBAAgB,CAAC,OAAgC,CAAQ,CAC1D,CAAC;AACJ,CAAC,CAAC"}

package/dist/api/DefineComponent/{assignOptions → normalizeOptions}/computedWatchHandle/computedUpdater.d.ts

@@ -1,4 +1,4 @@
-import type { Instance } from "..";
+import type { Instance } from "../../../RootComponent/Instance/RootComponentInstance";
 export type ComputedDependence = {
     paths: string[];
     val: unknown;

package/dist/api/DefineComponent/{assignOptions → normalizeOptions}/computedWatchHandle/computedUpdater.js

@@ -7,7 +7,9 @@ export function computedUpdater(isUpdated = false) {
         const itemCache = this.data.__computedCache__[key];
         let changed = false;
         for (const dep of itemCache.dependences) {
+            // getPathsValue返回的是数组
             const curVal = getPathsValue(this.data, dep.paths.join("."))[0];
+            // 检查依赖是否更新
             if (!isEqual(curVal, dep.val)) {
                 changed = true;
                 break;
@@ -16,11 +18,14 @@ export function computedUpdater(isUpdated = false) {
         if (changed) {
             const newDependences = [];
             const newValue = itemCache.method.call({ data: deepProxy(this.data, newDependences) });
+            // 更新值不会立即再次进入**函数,而是当前**函数运行完毕后触发**函数,
             this.setData({
                 [key]: getProxyOriginalValue(newValue),
             });
             isUpdated = true;
+            // 更新依赖(优化)
             this.data.__computedCache__[key].dependences = removeSubDependences(newDependences);
+            // 有一个计算属性更新就重新更新所有计算互相,避免后置依赖导致前置依赖错误
             return computedUpdater.call(this, isUpdated);
         }
     }

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/computedUpdater.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"computedUpdater.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/computedWatchHandle/computedUpdater.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,MAAM,UAAU,eAAe,CAAiB,SAAS,GAAG,KAAK;IAC/D,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACnD,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;YACxC,sBAAsB;YACtB,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEhE,WAAW;YACX,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC9B,OAAO,GAAG,IAAI,CAAC;gBAEf,MAAM;YACR,CAAC;QACH,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,cAAc,GAAyB,EAAE,CAAC;YAChD,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC;YAEvF,uCAAuC;YACvC,IAAI,CAAC,OAAO,CAAC;gBACX,CAAC,GAAG,CAAC,EAAE,qBAAqB,CAAC,QAAQ,CAAC;aACvC,CAAC,CAAC;YAEH,SAAS,GAAG,IAAI,CAAC;YAEjB,WAAW;YACX,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC;YAEpF,sCAAsC;YACtC,OAAO,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/api/DefineComponent/{assignOptions → normalizeOptions}/computedWatchHandle/data-tracer.d.ts

@@ -1,3 +1,5 @@
 import type { ComputedDependence } from "./computedUpdater";
 export declare function deepProxy(data: object, dependences: ComputedDependence[], basePath?: string[]): object;
-export declare function getProxyOriginalValue(value: any): any;
+export declare function getProxyOriginalValue(value: {
+    __original__?: unknown;
+}): unknown;

package/dist/api/DefineComponent/{assignOptions → normalizeOptions}/computedWatchHandle/data-tracer.js

@@ -6,12 +6,14 @@ export function deepProxy(data, dependences, basePath = []) {
                 return target;
             }
             const val = target[prop];
-            if (prop in target && !target.hasOwnProperty(prop)) {
+            // 自身没有但原型链上有的属性不收集依赖
+            if (prop in target && !Object.prototype.hasOwnProperty.call(target, prop)) {
                 return typeof val === "function" ? val.bind(target) : val;
             }
             removePreviousDependence(dependences, basePath);
             const curPath = basePath.concat(prop);
             dependences.push({ paths: curPath, val });
+            // 非对象不代理
             if (typeof val !== "object" || val === null)
                 return val;
             return deepProxy(val, dependences, curPath);
@@ -30,6 +32,7 @@ export function getProxyOriginalValue(value) {
         return value.__original__;
     const ret = Array.isArray(value) ? [] : {};
     for (const key in value) {
+        // @ts-ignore 隐式索引
         ret[key] = getProxyOriginalValue(value[key]);
     }
     return ret;

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/data-tracer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-tracer.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/computedWatchHandle/data-tracer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,MAAM,UAAU,SAAS,CACvB,IAAY,EACZ,WAAiC,EACjC,WAAqB,EAAE;IAEvB,MAAM,OAAO,GAAG;QACd,GAAG,CAAmB,MAAS,EAAE,IAAsB;YACrD,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;gBAC5B,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YAEzB,qBAAqB;YACrB,IAAI,IAAI,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC;gBAC1E,OAAO,OAAO,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;YAC5D,CAAC;YACD,wBAAwB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YAEhD,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAEtC,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;YAE1C,SAAS;YACT,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI;gBAAE,OAAO,GAAG,CAAC;YAExD,OAAO,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAC9C,CAAC;QACD,GAAG,CAAC,OAAe,EAAE,IAAY;YAC/B,MAAM,KAAK,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC;QAC/B,CAAC;KACF,CAAC;IAEF,OAAO,IAAI,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAiC;IACrE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,KAAK,CAAC,YAAY;QAAE,OAAO,KAAK,CAAC,YAAY,CAAC;IAElD,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3C,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,kBAAkB;QAClB,GAAG,CAAC,GAAG,CAAC,GAAG,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}

package/dist/api/DefineComponent/{assignOptions → normalizeOptions}/computedWatchHandle/dependencesOptimize.js

@@ -1,7 +1,11 @@
+// 去除子依赖
 export function removeSubDependences(dependences) {
+    // 把dependences按照路径长度排序
     dependences.sort((a, b) => a.paths.length - b.paths.length);
+    // 从最长的路径开始遍历,如果当前路径是上一个路径的子路径,则删除当前路径
     for (let f = 0; f < dependences.length; f++) {
         const sortPath = dependences[f].paths.toString();
+        // 从后往前遍历,删除子依赖,保留父依赖
         for (let i = dependences.length - 1; i > f; i--) {
             const curPath = dependences[i].paths.toString();
             if (curPath.startsWith(sortPath)) {
@@ -11,6 +15,7 @@ export function removeSubDependences(dependences) {
     }
     return dependences;
 }
+// 当前依赖是上一个依赖的子依赖时,去除上一个依赖
 export function removePreviousDependence(dependences, basePath) {
     if (dependences.length === 0 || basePath.length === 0)
         return dependences;

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/dependencesOptimize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dependencesOptimize.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/computedWatchHandle/dependencesOptimize.ts"],"names":[],"mappings":"AACA,QAAQ;AACR,MAAM,UAAU,oBAAoB,CAAC,WAAiC;IACpE,uBAAuB;IACvB,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAE5D,sCAAsC;IACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QACjD,qBAAqB;QACrB,KAAK,IAAI,CAAC,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAChD,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YAChD,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACjC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,0BAA0B;AAC1B,MAAM,UAAU,wBAAwB,CAAC,WAAiC,EAAE,QAAkB;IAC5F,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,WAAW,CAAC;IAE1E,MAAM,cAAc,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAE3D,IAAI,cAAc,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC;QAC5D,WAAW,CAAC,GAAG,EAAE,CAAC;IACpB,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/getPathsValue.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 获取指定paths的值
+ * @param this  - 组件实例 Instance
+ * @param paths - 支持多字段(用`,`分开) 例如 'obj.xxx,a,b.**' 监控了3个字段
+ * @returns unknown[] 每项对应paths每项的值
+ */
+export declare function getPathsValue(data: object, paths: string): unknown[];

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/getPathsValue.js

@@ -0,0 +1,30 @@
+/**
+ * 获取指定paths的值
+ * @param this  - 组件实例 Instance
+ * @param paths - 支持多字段(用`,`分开) 例如 'obj.xxx,a,b.**' 监控了3个字段
+ * @returns unknown[] 每项对应paths每项的值
+ */
+export function getPathsValue(data, paths) {
+    const valueList = [];
+    // ['obj.xxx','a','b.**'].forEach
+    paths.split(",").forEach(path => {
+        // path : 'obj.xxx' | 'a' | 'b.**'
+        if (path.includes(".**")) {
+            // "b.**" => 'b'
+            path = path.slice(0, -3);
+        }
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const value = path.split(".").reduce((pre, path) => {
+            // pre有可能为undefined|null,比如obj是未初始化的计算属性(undefined),还有可能是properties的对象类型(默认为null)
+            try {
+                return pre[path];
+            }
+            catch {
+                return undefined;
+            }
+        }, data);
+        valueList.push(value);
+    });
+    return valueList;
+}
+//# sourceMappingURL=getPathsValue.js.map

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/getPathsValue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getPathsValue.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/computedWatchHandle/getPathsValue.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAC,IAAY,EAAE,KAAa;IACvD,MAAM,SAAS,GAAc,EAAE,CAAC;IAEhC,iCAAiC;IACjC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC9B,kCAAkC;QAClC,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,gBAAgB;YAChB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC;QACD,8DAA8D;QAC9D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,IAAI,EAAE,EAAE;YACtD,iFAAiF;YACjF,IAAI,CAAC;gBACH,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC;YACnB,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,SAAS,CAAC;YACnB,CAAC;QACH,CAAC,EAAE,IAAI,CAAC,CAAC;QAET,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/api/DefineComponent/{assignOptions → normalizeOptions}/computedWatchHandle/getPropertiesValue.js

@@ -27,12 +27,15 @@ export function getPropertiesValue(propertiesOpt) {
     for (const key in propertiesOpt) {
         const config = propertiesOpt[key];
         if (IsRequiredSingle(config)) {
+            // @ts-ignore 隐式索引
             result[key] = getRequiredSingleValue(config);
         }
         else if (IsRequiredUnion(config)) {
+            // @ts-ignore 隐式索引
             result[key] = getRequiredSingleValue(config.type);
         }
         else {
+            // @ts-ignore 隐式索引
             result[key] = config.value;
         }
     }

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/getPropertiesValue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getPropertiesValue.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/computedWatchHandle/getPropertiesValue.ts"],"names":[],"mappings":"AASA,SAAS,sBAAsB,CAC7B,QAAwB;IAExB,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,MAAM;YACT,OAAO,EAAE,CAAC;QACZ,KAAK,MAAM;YACT,OAAO,CAAC,CAAC;QACX,KAAK,KAAK;YACR,OAAO,EAAE,CAAC;QACZ,KAAK,MAAM;YACT,OAAO,IAAI,CAAC;QACd,KAAK,OAAO;YACV,OAAO,KAAK,CAAC;QACf;YACE,MAAM,KAAK,CACT,+DAA+D,CAChE,CAAC;IACN,CAAC;AACH,CAAC;AACD,SAAS,gBAAgB,CAAC,MAAuB;IAC/C,OAAO,MAAM,YAAY,QAAQ,CAAC;AACpC,CAAC;AACD,SAAS,eAAe,CAAC,MAAuB;IAC9C,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACvC,CAAC;AACD,MAAM,UAAU,kBAAkB,CAAC,aAA+C;IAChF,IAAI,aAAa,KAAK,SAAS;QAAE,OAAO;IACxC,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;QAElC,IAAI,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,kBAAkB;YAClB,MAAM,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAC/C,CAAC;aAAM,IAAI,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;YACnC,kBAAkB;YAClB,MAAM,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,kBAAkB;YAClB,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/api/DefineComponent/{assignOptions → normalizeOptions}/computedWatchHandle/index.js

@@ -3,41 +3,53 @@ import { getPathsValue } from "./getPathsValue";
 import { getPropertiesValue } from "./getPropertiesValue";
 import { initComputedAndGetCache } from "./initComputedAndGetCache";
 import { isEqual } from "./isEqual";
+import { assertNonNullable } from "../../../../utils/assertNonNullable";
 import { deepClone } from "../../../../utils/deepClone";
 import { isEmptyObject } from "../../../../utils/isEmptyObject";
 function initWatchOldValue(data, watchConfig) {
     const watchOldValue = {};
     for (const key in watchConfig) {
+        // @ts-ignore 隐式索引
         watchOldValue[key] = deepClone(getPathsValue(data, key));
     }
     return watchOldValue;
 }
 export function computedWatchHandle(options) {
+    // 计算属性初始化和首次依赖收集
     const computedConfig = options.computed;
     const rawPropertiesValue = getPropertiesValue(options.properties);
     if (computedConfig && !isEmptyObject(computedConfig)) {
-        const __computedInitCache__ = initComputedAndGetCache(options, computedConfig, Object.assign(Object.assign({}, options.data), rawPropertiesValue));
+        // 此时store已经初始化数据到data了(__storeConfig__)
+        const __computedInitCache__ = initComputedAndGetCache(options, computedConfig, {
+            ...options.data,
+            ...rawPropertiesValue,
+        });
+        // 缓存放入data中
         options.data.__computedCache__ = __computedInitCache__;
+        // 计算属性更新函数放入methods中 要做冲突判断,避免用户定义了同名methods字段
         options.methods.__computedUpdater__ = computedUpdater;
     }
     const observersConfig = options.observers;
+    // 通过observers加入`**`字段来触发计算属性更新
     const originalFunc = observersConfig["**"];
     observersConfig["**"] = function () {
-        var _a;
-        (_a = this.__computedUpdater__) === null || _a === void 0 ? void 0 : _a.call(this);
-        originalFunc && originalFunc.call(this);
+        // 任何setData都会触发计算属性更新(可能依赖数据并没变化)
+        this.__computedUpdater__?.();
+        originalFunc?.call(this);
     };
+    // watch handle
     const watchConfig = options.watch;
     if (watchConfig && !isEmptyObject(watchConfig)) {
         const data = options.data;
-        data.__watchOldValue__ = initWatchOldValue(Object.assign(Object.assign({}, data), rawPropertiesValue), watchConfig);
+        data.__watchOldValue__ = initWatchOldValue({ ...data, ...rawPropertiesValue }, watchConfig);
         const observersConfig = options.observers;
         for (const key in watchConfig) {
             const watchHadle = watchConfig[key];
             const originObserversHandle = observersConfig[key];
+            // 在监控多个数据时,参数是多个值
             observersConfig[key] = function (...newValue) {
-                originObserversHandle && originObserversHandle.call(this, ...newValue);
-                const watchOldValue = this.data.__watchOldValue__;
+                originObserversHandle?.call(this, ...newValue);
+                const watchOldValue = assertNonNullable(this.data.__watchOldValue__);
                 const oldValue = watchOldValue[key];
                 if (isEqual(newValue, oldValue))
                     return;

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

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

package/dist/api/DefineComponent/{assignOptions → normalizeOptions}/computedWatchHandle/initComputedAndGetCache.d.ts

@@ -8,5 +8,14 @@ type ItemCache = {
 };
 type ComputedId = string;
 export type ComputedCache = Record<ComputedId, ItemCache>;
+/**
+ * 把计算属性初始值加入到options.data中并返回缓存(递归函数)
+ * @param options - 配置选项
+ * @param computedConfig - 计算字段配置
+ * @param initAllData - 初始化时全部的data包含(properties,data,和已经初始化后的computed字段)
+ * @param uninitedkeys - 未初始化的key (默认为所有computedConfig的key)
+ * @param computedCache - 返回的所有计算字段缓存(默认为空对象)
+ * @returns  `computedCache` 计算字段缓存
+ */
 export declare function initComputedAndGetCache(options: FinalOptionsOfComponent, computedConfig: Record<string, Func>, initAllData: Record<string, unknown>, uninitedkeys?: string[], computedCache?: ComputedCache): ComputedCache;
 export {};

package/dist/api/DefineComponent/{assignOptions → normalizeOptions}/computedWatchHandle/initComputedAndGetCache.js

@@ -1,22 +1,40 @@
 import { deepProxy, getProxyOriginalValue } from "./data-tracer";
 import { removeSubDependences } from "./dependencesOptimize";
+/**
+ * 如果依赖列表某项的首个字段值为undefined并且字段为其他计算属性字段(即被依赖的计算字段写在了依赖他的计算字段后面) 返回false, 否则返回true表示依赖有效。
+ */
 function isValidDependences(dependences, computedKeys) {
     for (const { paths: path, val } of dependences) {
         if ((val === undefined) && computedKeys.includes(path[0])) {
             return false;
         }
     }
+    // 依赖有效
     return true;
 }
+/**
+ * 把计算属性初始值加入到options.data中并返回缓存(递归函数)
+ * @param options - 配置选项
+ * @param computedConfig - 计算字段配置
+ * @param initAllData - 初始化时全部的data包含(properties,data,和已经初始化后的computed字段)
+ * @param uninitedkeys - 未初始化的key (默认为所有computedConfig的key)
+ * @param computedCache - 返回的所有计算字段缓存(默认为空对象)
+ * @returns  `computedCache` 计算字段缓存
+ */
 export function initComputedAndGetCache(options, computedConfig, initAllData, uninitedkeys = Object.keys(computedConfig), computedCache = {}) {
     for (const key of uninitedkeys) {
         const computedFunc = computedConfig[key];
         const dependences = [];
+        // 通过代理data获取计算字段的初始值和依赖
         let initValue = computedFunc.call({ data: deepProxy(initAllData, dependences) });
+        // 去除当前已初始的计算属性key
         uninitedkeys = uninitedkeys.filter(ele => ele !== key);
+        // 验证依赖是否有效
         if (isValidDependences(dependences, uninitedkeys)) {
             initValue = getProxyOriginalValue(initValue);
+            // 把计算属性初始值加入到options.data中
             options.data[key] = initValue;
+            // 把计算属性初始值加入到initAllData中,后续其他计算属性依赖时会可能会用到
             initAllData[key] = initValue;
             computedCache[key] = {
                 dependences: removeSubDependences(dependences),
@@ -25,12 +43,15 @@ export function initComputedAndGetCache(options, computedConfig, initAllData, un
             };
         }
         else {
+            // 把当前依赖不正确的key放到后面去
             uninitedkeys.push(key);
         }
     }
+    // 看uninitedkey是否未空，空表示所有依赖收集完毕直接返回
     if (uninitedkeys.length === 0) {
         return computedCache;
     }
+    // uninitedkey不为空,递归
     return initComputedAndGetCache(options, computedConfig, initAllData, uninitedkeys, computedCache);
 }
 //# sourceMappingURL=initComputedAndGetCache.js.map

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/initComputedAndGetCache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"initComputedAndGetCache.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/computedWatchHandle/initComputedAndGetCache.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAY7D;;GAEG;AACH,SAAS,kBAAkB,CAAC,WAAiC,EAAE,YAAsB;IACnF,KAAK,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,WAAW,EAAE,CAAC;QAC/C,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1D,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,OAAO;IACP,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,uBAAuB,CACrC,OAAgC,EAChC,cAAoC,EACpC,WAAoC,EACpC,eAAyB,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,EACpD,gBAA+B,EAAE;IAEjC,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;QAC/B,MAAM,YAAY,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,WAAW,GAAyB,EAAE,CAAC;QAC7C,wBAAwB;QACxB,IAAI,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;QAEjF,kBAAkB;QAClB,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;QAEvD,WAAW;QACX,IAAI,kBAAkB,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC;YAClD,SAAS,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAC;YAE7C,2BAA2B;YAC3B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;YAE9B,4CAA4C;YAC5C,WAAW,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;YAE7B,aAAa,CAAC,GAAG,CAAC,GAAG;gBACnB,WAAW,EAAE,oBAAoB,CAAC,WAAW,CAAC;gBAC9C,MAAM,EAAE,YAAY;gBACpB,KAAK,EAAE,SAAS;aACjB,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,oBAAoB;YACpB,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IACD,mCAAmC;IACnC,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,oBAAoB;IACpB,OAAO,uBAAuB,CAAC,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;AACpG,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/isEqual.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 深度判断两个值是否相等,有一个值为非对象类型即使用Object.is判断。
+ * 不支持原型上的属性
+ * 两个函数使用toString()比较
+ * 支持Date,RegExp
+ */
+export declare function isEqual(a: unknown, b: unknown): boolean;

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/isEqual.js

@@ -0,0 +1,69 @@
+function isSameType(a, b) {
+    return Object.prototype.toString.call(a) === Object.prototype.toString.call(b);
+}
+// 定义一个辅助函数，用于判断两个对象的属性数量是否相同
+function isSameSize(a, b) {
+    return Object.keys(a).length === Object.keys(b).length;
+}
+// 定义一个辅助函数，用于判断两个函数的代码是否相同
+// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
+function isSameCode(a, b) {
+    // 去除空格比较函数字符串
+    return a.toString().split(" ").join("") === b.toString().split(" ").join("");
+}
+// 定义一个辅助函数，用于判断两个日期的时间戳是否相同
+function isSameTime(a, b) {
+    return a.getTime() === b.getTime();
+}
+// 定义一个辅助函数，用于判断两个正则表达式的模式和标志是否相同
+function isSamePattern(a, b) {
+    return a.source === b.source && a.flags === b.flags;
+}
+/**
+ * 深度判断两个值是否相等,有一个值为非对象类型即使用Object.is判断。
+ * 不支持原型上的属性
+ * 两个函数使用toString()比较
+ * 支持Date,RegExp
+ */
+export function isEqual(a, b) {
+    // 如果两个值是原始类型或null，直接用Object.is比较
+    if (a === null || b === null || typeof a !== "object" || typeof b !== "object") {
+        if (typeof a !== "function" || typeof b !== "function") {
+            return Object.is(a, b);
+        }
+    }
+    // 如果两个值是对象类型，先判断它们的类型、构造函数和属性数量是否相同
+    if (!isSameType(a, b) || a.constructor !== b.constructor || !isSameSize(a, b)) {
+        return false;
+    }
+    // 如果两个值是函数类型，再判断它们的代码是否相同
+    if (typeof a === "function") {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
+        return isSameCode(a, b);
+    }
+    // 如果两个值是日期类型，再判断它们的时间戳是否相同
+    if (a instanceof Date) {
+        return isSameTime(a, b);
+    }
+    // // 如果两个值是正则表达式类型，再判断它们的模式和标志是否相同
+    if (a instanceof RegExp) {
+        return isSamePattern(a, b);
+    }
+    // 对于其他对象类型，递归地比较它们的每个属性和值是否深度相等
+    const keysA = Object.keys(a);
+    const keysB = Object.keys(b);
+    for (const key of keysA) {
+        if (keysB.includes(key)) {
+            // @ts-ignore
+            if (!isEqual(a[key], b[key])) {
+                return false;
+            }
+        }
+        else {
+            return false;
+        }
+    }
+    // 如果以上的条件都满足，说明两个值是深度相等的
+    return true;
+}
+//# sourceMappingURL=isEqual.js.map