annil 1.6.3 → 1.6.5

package/CHANGELOG.md

@@ -4,6 +4,20 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.6.5](https://github.com/missannil/annil/compare/v1.6.4...v1.6.5) (2024-02-13)
+
+
+### Bug Fixes
+
+* computed 依赖优化 ([cff7833](https://github.com/missannil/annil/commit/cff7833196fc2df52ae769211a3c5893f67aa2ab))
+
+## [1.6.4](https://github.com/missannil/annil/compare/v1.6.3...v1.6.4) (2024-02-12)
+
+
+### Bug Fixes
+
+* comouted属性初始化依赖去重bug,并添加更新时去重 ([f228e55](https://github.com/missannil/annil/commit/f228e551dce65d97450b9a1aa3c7b3d3eb3e8199))
+
 ## [1.6.3](https://github.com/missannil/annil/compare/v1.6.2...v1.6.3) (2024-02-05)
 
 

package/dist/api/DefineComponent/assignOptions/computedWatchHandle/data-tracer.js

@@ -1,4 +1,5 @@
 import { deepClone } from "../../../../utils/deepClone";
+import { uniqueDependences } from "./uniqueDependences";
 export function deepProxy(data, dependences, basePath = []) {
     const handler = {
         get(target, prop) {
@@ -6,12 +7,10 @@ export function deepProxy(data, dependences, basePath = []) {
                 return target;
             }
             const val = target[prop];
-            if ((val !== undefined) && (!Object.prototype.hasOwnProperty.call(target, prop) || typeof val === "function")) {
+            if (typeof val === "function" && (!Object.prototype.hasOwnProperty.call(target, prop))) {
                 return val.bind(target);
             }
-            if (basePath.length !== 0) {
-                dependences.pop();
-            }
+            dependences = uniqueDependences(dependences, basePath, prop);
             const curPath = basePath.concat(prop);
             dependences.push({ paths: curPath, val });
             if (typeof val !== "object" || val === null)

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

@@ -1 +1 @@
-{"version":3,"file":"data-tracer.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/assignOptions/computedWatchHandle/data-tracer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAGxD,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;YAGzB,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,OAAO,GAAG,KAAK,UAAU,CAAC,EAAE,CAAC;gBAE9G,OAAQ,GAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACxC,CAAC;YAED,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC1B,WAAW,CAAC,GAAG,EAAE,CAAC;YACpB,CAAC;YACD,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAEtC,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;YAG1C,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,CAAsC,KAAQ;IACjF,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;QACvE,OAAO,KAAK,CAAC;IACf,CAAC;SAAM,CAAC;QACN,OAAO,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;AACH,CAAC"}
+{"version":3,"file":"data-tracer.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/assignOptions/computedWatchHandle/data-tracer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAExD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,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;YAGzB,IAAI,OAAO,GAAG,KAAK,UAAU,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC;gBAEvF,OAAQ,GAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACxC,CAAC;YAED,WAAW,GAAG,iBAAiB,CAAC,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;YAE7D,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAEtC,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;YAG1C,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,CAAsC,KAAQ;IACjF,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;QACvE,OAAO,KAAK,CAAC;IACf,CAAC;SAAM,CAAC;QACN,OAAO,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;AACH,CAAC"}

package/dist/api/DefineComponent/assignOptions/computedWatchHandle/initComputedAndGetCache.js

@@ -7,25 +7,6 @@ function isValidDependences(dependences, computedKeys) {
     }
     return true;
 }
-function uniqueDependences(dependences) {
-    if (dependences.length === 1)
-        return dependences;
-    for (let f = 0; f < dependences.length; f++) {
-        const firstPath = dependences[f].paths.join(".") + ".";
-        for (let i = f + 1; i < dependences.length; i++) {
-            const curPath = dependences[i].paths.join(".") + ".";
-            if (firstPath.startsWith(curPath)) {
-                dependences.splice(f, 1);
-                return uniqueDependences(dependences);
-            }
-            if (curPath.startsWith(firstPath)) {
-                dependences.splice(i, 1);
-                return uniqueDependences(dependences);
-            }
-        }
-    }
-    return dependences;
-}
 export function initComputedAndGetCache(options, computedConfig, initAllData, uninitedkeys = Object.keys(computedConfig), computedCache = {}) {
     for (const key of uninitedkeys) {
         const computedFunc = computedConfig[key];
@@ -37,7 +18,7 @@ export function initComputedAndGetCache(options, computedConfig, initAllData, un
             options.data[key] = initValue;
             initAllData[key] = initValue;
             computedCache[key] = {
-                dependences: uniqueDependences(dependences),
+                dependences,
                 method: computedFunc,
                 value: initValue,
             };

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

@@ -1 +1 @@
-{"version":3,"file":"initComputedAndGetCache.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/assignOptions/computedWatchHandle/initComputedAndGetCache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"initComputedAndGetCache.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/assignOptions/computedWatchHandle/initComputedAndGetCache.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAejE,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;IAGD,OAAO,IAAI,CAAC;AACd,CAAC;AAWD,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;QAE7C,IAAI,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;QAGjF,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;QAGvD,IAAI,kBAAkB,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC;YAClD,SAAS,GAAG,qBAAqB,CAAC,SAAS,CAAC,CAAC;YAG7C,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;YAG9B,WAAW,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;YAE7B,aAAa,CAAC,GAAG,CAAC,GAAG;gBACnB,WAAW;gBACX,MAAM,EAAE,YAAY;gBACpB,KAAK,EAAE,SAAS;aACjB,CAAC;QACJ,CAAC;aAAM,CAAC;YAEN,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IAED,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,aAAa,CAAC;IACvB,CAAC;IAGD,OAAO,uBAAuB,CAAC,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;AACpG,CAAC"}

package/dist/api/DefineComponent/assignOptions/computedWatchHandle/uniqueDependences.d.ts

@@ -0,0 +1,2 @@
+import type { ComputedDependence } from "./computedUpdater";
+export declare function uniqueDependences(dependences: ComputedDependence[], basePath: string[], prop: string): ComputedDependence[];

package/dist/api/DefineComponent/assignOptions/computedWatchHandle/uniqueDependences.js

@@ -0,0 +1,40 @@
+function sameDependences(dependences) {
+    for (let f = 0; f < dependences.length; f++) {
+        const firstPath = dependences[f].paths.toString();
+        for (let i = f + 1; i < dependences.length; i++) {
+            const curPath = dependences[i].paths.toString();
+            if (firstPath === curPath) {
+                dependences.splice(f, 1);
+                return sameDependences(dependences);
+            }
+        }
+    }
+    return dependences;
+}
+function serialDependences(dependences, basePath) {
+    const lastDependence = dependences[dependences.length - 1];
+    if (lastDependence.paths.toString() === basePath.toString()) {
+        dependences.pop();
+    }
+    return dependences;
+}
+function separatedDependences(dependences, basePath, prop) {
+    const lastDependence = dependences[dependences.length - 1].val;
+    if (typeof lastDependence === "string"
+        && dependences[dependences.length - 2].paths.concat(lastDependence).toString()
+            === basePath.concat(prop).toString()) {
+        dependences.splice(dependences.length - 2, 1);
+    }
+    return dependences;
+}
+export function uniqueDependences(dependences, basePath, prop) {
+    if (dependences.length === 0)
+        return dependences;
+    dependences = sameDependences(dependences);
+    dependences = serialDependences(dependences, basePath);
+    if (dependences.length >= 2) {
+        dependences = separatedDependences(dependences, basePath, prop);
+    }
+    return dependences;
+}
+//# sourceMappingURL=uniqueDependences.js.map

package/dist/api/DefineComponent/assignOptions/computedWatchHandle/uniqueDependences.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"uniqueDependences.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/assignOptions/computedWatchHandle/uniqueDependences.ts"],"names":[],"mappings":"AAEA,SAAS,eAAe,CAAC,WAAiC;IACxD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5C,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QAClD,KAAK,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChD,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YAChD,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;gBAC1B,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAEzB,OAAO,eAAe,CAAC,WAAW,CAAC,CAAC;YACtC,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAS,iBAAiB,CAAC,WAAiC,EAAE,QAAkB;IAC9E,MAAM,cAAc,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC3D,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;AAED,SAAS,oBAAoB,CAAC,WAAiC,EAAE,QAAkB,EAAE,IAAY;IAC/F,MAAM,cAAc,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAC/D,IACE,OAAO,cAAc,KAAK,QAAQ;WAC/B,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE;gBACxE,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EACtC,CAAC;QACD,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAKD,MAAM,UAAU,iBAAiB,CAC/B,WAAiC,EACjC,QAAkB,EAClB,IAAY;IAEZ,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,WAAW,CAAC;IAEjD,WAAW,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;IAG3C,WAAW,GAAG,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAGvD,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QAC5B,WAAW,GAAG,oBAAoB,CAAC,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IAClE,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC"}

package/package.json

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

package/src/api/DefineComponent/assignOptions/computedWatchHandle/computedUpdater.ts

@@ -33,7 +33,7 @@ export function computedUpdater(this: Instance, isUpdated = false): boolean {
 
       isUpdated = true;
 
-      // 更新依赖
+      // 更新依赖,去重
       this.data.__computedCache__[key].dependences = newDependences;
 
       // 有一个计算属性更新就重新更新所有计算互相,避免后置依赖导致前置依赖错误

package/src/api/DefineComponent/assignOptions/computedWatchHandle/data-tracer.ts

@@ -1,5 +1,7 @@
+/* eslint-disable complexity */
 import { deepClone } from "../../../../utils/deepClone";
 import type { ComputedDependence } from "./computedUpdater";
+import { uniqueDependences } from "./uniqueDependences";
 
 export function deepProxy(
   data: object,
@@ -13,15 +15,14 @@ export function deepProxy(
       }
       const val = target[prop];
 
-      // val不为undefined(依赖还为初始化的其他计算属性)且非自身属性或函数不再返回代理。 (如 this.data.arr.slice(),slice不属于自身属性,小程序允许data子字段为函数的情况,也不代理)
-      if ((val !== undefined) && (!Object.prototype.hasOwnProperty.call(target, prop) || typeof val === "function")) {
+      // 如 this.data.arr.slice(),`slice`不属于自身属性不代理,不加入依赖。但不包含小程序data子字段为函数的情况)
+      if (typeof val === "function" && (!Object.prototype.hasOwnProperty.call(target, prop))) {
         // val有不是函数的情况么？
         return (val as Function).bind(target);
       }
-      // 依赖长度不为0时径依赖去重(只留最后一个路径),比如 return this.data.obj.user.name  去重得到的是最后1个路径 ['obj','user','name'] , 不去重则3个依赖路径了 ['obj'], ['obj','user'],['obj','user','name'],在这里去重效率高些,外部去重时还要再次遍历
-      if (basePath.length !== 0) {
-        dependences.pop();
-      }
+
+      dependences = uniqueDependences(dependences, basePath, prop);
+
       const curPath = basePath.concat(prop);
 
       dependences.push({ paths: curPath, val });

package/src/api/DefineComponent/assignOptions/computedWatchHandle/initComputedAndGetCache.ts

@@ -28,39 +28,6 @@ function isValidDependences(dependences: ComputedDependence[], computedKeys: str
   return true;
 }
 
-/**
- * 依赖去重
- * @example
- * ```ts
- *  const dependences = [{path:['a','b']}, {path:['a','b','c']}, {path:['d','e']}, {path:['d']}]
- *  const result = uniqueDependences(dependences)
- *  // result = [{path:['a','b'] } ,{ path:['d'] }]
- * ```
- */
-function uniqueDependences(dependences: ComputedDependence[]): ComputedDependence[] {
-  if (dependences.length === 1) return dependences;
-  for (let f = 0; f < dependences.length; f++) {
-    const firstPath = dependences[f].paths.join(".") + ".";
-    for (let i = f + 1; i < dependences.length; i++) {
-      const curPath = dependences[i].paths.join(".") + ".";
-      if (firstPath.startsWith(curPath)) {
-        // 例如 path[0] = 'a.b.c.',curPath = 'a.b.'
-        dependences.splice(f, 1);
-
-        return uniqueDependences(dependences);
-      }
-      if (curPath.startsWith(firstPath)) {
-        // 例如 curPath = 'a.b.' path[0] = 'a.b.c.',
-        dependences.splice(i, 1);
-
-        return uniqueDependences(dependences);
-      }
-    }
-  }
-
-  return dependences;
-}
-
 /**
  * 把计算属性初始值加入到options.data中并返回缓存(递归函数)
  * @param options - 配置选项
@@ -97,7 +64,7 @@ export function initComputedAndGetCache(
       initAllData[key] = initValue;
 
       computedCache[key] = {
-        dependences: uniqueDependences(dependences),
+        dependences,
         method: computedFunc,
         value: initValue,
       };

package/src/api/DefineComponent/assignOptions/computedWatchHandle/uniqueDependences.ts

@@ -0,0 +1,98 @@
+import type { ComputedDependence } from "./computedUpdater";
+// 相同依赖去重
+function sameDependences(dependences: ComputedDependence[]) {
+  for (let f = 0; f < dependences.length; f++) {
+    const firstPath = dependences[f].paths.toString();
+    for (let i = f + 1; i < dependences.length; i++) {
+      const curPath = dependences[i].paths.toString();
+      if (firstPath === curPath) {
+        dependences.splice(f, 1);
+
+        return sameDependences(dependences);
+      }
+    }
+  }
+
+  return dependences;
+}
+// 当前依赖是上一个依赖的子依赖时,去除上一个依赖
+function serialDependences(dependences: ComputedDependence[], basePath: string[]) {
+  const lastDependence = dependences[dependences.length - 1];
+  if (lastDependence.paths.toString() === basePath.toString()) {
+    dependences.pop();
+  }
+
+  return dependences;
+}
+// -2依赖 + -1val === 当前依赖  去除-2依赖
+function separatedDependences(dependences: ComputedDependence[], basePath: string[], prop: string) {
+  const lastDependence = dependences[dependences.length - 1].val;
+  if (
+    typeof lastDependence === "string"
+    && dependences[dependences.length - 2].paths.concat(lastDependence).toString()
+      === basePath.concat(prop).toString()
+  ) {
+    dependences.splice(dependences.length - 2, 1);
+  }
+
+  return dependences;
+}
+
+/**
+ * 依赖去重
+ */
+export function uniqueDependences(
+  dependences: ComputedDependence[],
+  basePath: string[],
+  prop: string,
+): ComputedDependence[] {
+  if (dependences.length === 0) return dependences;
+  // 相同依赖去重   例如 [{path:['a','b']}, {path:['a','b']}]  => [{path:['a','b'] }]
+  dependences = sameDependences(dependences);
+
+  // 连续依赖去除  当前依赖是上一个依赖的子依赖时,去除上一个依赖
+  dependences = serialDependences(dependences, basePath);
+
+  // -2依赖 + -1依赖 === 当前依赖  去除-2依赖
+  if (dependences.length >= 2) {
+    dependences = separatedDependences(dependences, basePath, prop);
+  }
+
+  return dependences;
+}
+// import type { ComputedDependence } from "./computedUpdater";
+// export /**
+//  * 依赖去重
+//  * @example
+//  * ```ts
+//  *  const dependences = [{path:['a','b']}, {path:['a','b','c']}, {path:['d','e']}, {path:['d']}]
+//  *  const result = uniqueDependences(dependences)
+//  *  // result = [{path:['a','b'] } ,{ path:['d'] }]
+//  * ```
+//  */
+// function uniqueDependences(dependences: ComputedDependence[]): ComputedDependence[] {
+//   if (dependences.length === 1) return dependences;
+//   console.log("外部去重前", dependences);
+
+//   for (let f = 0; f < dependences.length; f++) {
+//     const firstPath = dependences[f].paths.join(".") + ".";
+//     for (let i = f + 1; i < dependences.length; i++) {
+//       const curPath = dependences[i].paths.join(".") + ".";
+//       if (firstPath.startsWith(curPath)) {
+//         // 例如 path[0] = 'a.b.c.',curPath = 'a.b.'
+//         dependences.splice(f, 1);
+
+//         return uniqueDependences(dependences);
+//       }
+//       if (curPath.startsWith(firstPath)) {
+//         // 例如 curPath = 'a.b.' path[0] = 'a.b.c.',
+//         dependences.splice(i, 1);
+
+//         return uniqueDependences(dependences);
+//       }
+//     }
+//   }
+//   console.log("外部去重后", dependences);
+
+//   return dependences;
+// }