annil 1.6.2 → 1.6.4

package/CHANGELOG.md

@@ -4,6 +4,20 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [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)
+
+
+### Bug Fixes
+
+* 计算属性优化 ([2479d08](https://github.com/missannil/annil/commit/2479d08720b2e69782c063b5fde394f0fa35d28a))
+
 ## [1.6.2](https://github.com/missannil/annil/compare/v1.6.1...v1.6.2) (2024-02-03)
 
 

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

@@ -1,7 +1,7 @@
-import { deepClone } from "../../../../utils/deepClone";
-import { deepProxy } from "./data-tracer";
+import { deepProxy, getProxyOriginalValue } from "./data-tracer";
 import { getPathsValue } from "./getPathsValue";
 import { isEqual } from "./isEqual";
+import { uniqueDependences } from "./uniqueDependences";
 export function computedUpdater(isUpdated = false) {
     for (const key in this.data.__computedCache__) {
         const itemCache = this.data.__computedCache__[key];
@@ -15,12 +15,13 @@ export function computedUpdater(isUpdated = false) {
         }
         if (changed) {
             const newDependences = [];
-            const newValue = itemCache.method.call({ data: deepProxy(this.data, newDependences) });
+            let newValue = itemCache.method.call({ data: deepProxy(this.data, newDependences) });
+            newValue = getProxyOriginalValue(newValue);
             this.setData({
-                [key]: deepClone(newValue),
+                [key]: newValue,
             });
             isUpdated = true;
-            this.data.__computedCache__[key].dependences = newDependences;
+            this.data.__computedCache__[key].dependences = uniqueDependences(newDependences);
             return computedUpdater.call(this, isUpdated);
         }
     }

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

@@ -1 +1 @@
-{"version":3,"file":"computedUpdater.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/assignOptions/computedWatchHandle/computedUpdater.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAExD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,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;YAExC,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAGhE,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;YAGvF,IAAI,CAAC,OAAO,CAAC;gBACX,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC;aAC3B,CAAC,CAAC;YAEH,SAAS,GAAG,IAAI,CAAC;YAGjB,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,cAAc,CAAC;YAG9D,OAAO,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}
+{"version":3,"file":"computedUpdater.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/assignOptions/computedWatchHandle/computedUpdater.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAGxD,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;YAExC,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAGhE,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,IAAI,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC;YAGrF,QAAQ,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC;YAE3C,IAAI,CAAC,OAAO,CAAC;gBACX,CAAC,GAAG,CAAC,EAAE,QAAQ;aAChB,CAAC,CAAC;YAEH,SAAS,GAAG,IAAI,CAAC;YAGjB,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,iBAAiB,CAAC,cAAc,CAAC,CAAC;YAGjF,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/computedWatchHandle/data-tracer.d.ts

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

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

@@ -2,18 +2,18 @@ import { deepClone } from "../../../../utils/deepClone";
 export function deepProxy(data, dependences, basePath = []) {
     const handler = {
         get(target, prop) {
+            if (prop === "__original__") {
+                return target;
+            }
             const val = target[prop];
-            if (basePath.length !== 0) {
-                const lastDependences = dependences[dependences.length - 1];
-                if (lastDependences.paths.toString() === basePath.toString()) {
-                    dependences.pop();
-                }
+            if ((val !== undefined) && (!Object.prototype.hasOwnProperty.call(target, prop) || typeof val === "function")) {
+                return val.bind(target);
             }
-            const curPath = basePath.concat(prop);
-            dependences.push({ paths: curPath, val: deepClone(val) });
-            if (!Object.prototype.hasOwnProperty.call(target, prop) || typeof val === "function") {
-                return typeof val === "function" ? val.bind(target) : val;
+            if (basePath.length !== 0 && dependences[dependences.length - 1].paths.toString() === basePath.toString()) {
+                dependences.pop();
             }
+            const curPath = basePath.concat(prop);
+            dependences.push({ paths: curPath, val });
             if (typeof val !== "object" || val === null)
                 return val;
             return deepProxy(val, dependences, curPath);
@@ -24,4 +24,12 @@ export function deepProxy(data, dependences, basePath = []) {
     };
     return new Proxy(data, handler);
 }
+export function getProxyOriginalValue(value) {
+    if (typeof value !== "object" || value === null || !value.__original__) {
+        return value;
+    }
+    else {
+        return deepClone(value.__original__);
+    }
+}
 //# sourceMappingURL=data-tracer.js.map

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,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YAEzB,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAE1B,MAAM,eAAe,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBAE5D,IAAI,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC;oBAE7D,WAAW,CAAC,GAAG,EAAE,CAAC;gBACpB,CAAC;YACH,CAAC;YACD,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAItC,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAG1D,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE,CAAC;gBAErF,OAAO,OAAO,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;YAC5D,CAAC;YAED,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"}
+{"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,IAAI,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC;gBAC1G,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"}

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

@@ -1,7 +1,7 @@
 import { computedUpdater } from "./computedUpdater";
 import { getPathsValue } from "./getPathsValue";
 import { getPropertiesValue } from "./getPropertiesValue";
-import { initComputed } from "./initComputed";
+import { initComputedAndGetCache } from "./initComputedAndGetCache";
 import { isEqual } from "./isEqual";
 import { deepClone } from "../../../../utils/deepClone";
 import { isEmptyObject } from "../../../../utils/isEmptyObject";
@@ -16,7 +16,7 @@ export function computedWatchHandle(options) {
     const computedConfig = options.computed;
     const rawPropertiesValue = getPropertiesValue(options.properties);
     if (computedConfig && !isEmptyObject(computedConfig)) {
-        const __computedInitCache__ = initComputed(options, computedConfig, Object.assign(Object.assign({}, options.data), rawPropertiesValue));
+        const __computedInitCache__ = initComputedAndGetCache(options, computedConfig, Object.assign(Object.assign({}, options.data), rawPropertiesValue));
         options.data.__computedCache__ = __computedInitCache__;
         options.methods.__computedUpdater__ = computedUpdater;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/assignOptions/computedWatchHandle/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAKhE,SAAS,iBAAiB,CAAC,IAAqC,EAAE,WAAmB;IACnF,MAAM,aAAa,GAAG,EAAE,CAAC;IACzB,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAM9B,aAAa,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AACD,MAAM,UAAU,mBAAmB,CAAC,OAAgC;IAElE,MAAM,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC;IACxC,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAClE,IAAI,cAAc,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE,CAAC;QAGrD,MAAM,qBAAqB,GAAG,YAAY,CAAC,OAAO,EAAE,cAAc,kCAAO,OAAO,CAAC,IAAI,GAAK,kBAAkB,EAAG,CAAC;QAEhH,OAAO,CAAC,IAAI,CAAC,iBAAiB,GAAG,qBAAqB,CAAC;QAEvD,OAAO,CAAC,OAAO,CAAC,mBAAmB,GAAG,eAAe,CAAC;IAGxD,CAAC;IACD,MAAM,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC;IAE1C,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CAAqB,CAAC;IAE/D,eAAe,CAAC,IAAI,CAAC,GAAG;;QACtB,MAAA,IAAI,CAAC,mBAAmB,oDAAI,CAAC;QAE7B,YAAY,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC,CAAC;IAGF,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC;IAElC,IAAI,WAAW,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;QAC/C,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QAE1B,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,iCAAM,IAAI,GAAK,kBAAkB,GAAI,WAAW,CAAC,CAAC;QAE5F,MAAM,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC;QAC1C,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;YACpC,MAAM,qBAAqB,GAAG,eAAe,CAAC,GAAG,CAAqB,CAAC;YAGvE,eAAe,CAAC,GAAG,CAAC,GAAG,UAAyB,GAAG,QAAmB;gBACpE,qBAAqB,IAAI,qBAAqB,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,CAAC;gBAEvE,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAkB,CAAC;gBACnD,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;gBAEpC,IAAI,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC;oBAAE,OAAO;gBACxC,aAAa,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;gBAEzC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC;YAClD,CAAC,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/assignOptions/computedWatchHandle/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAKhE,SAAS,iBAAiB,CAAC,IAAqC,EAAE,WAAmB;IACnF,MAAM,aAAa,GAAG,EAAE,CAAC;IACzB,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAM9B,aAAa,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AACD,MAAM,UAAU,mBAAmB,CAAC,OAAgC;IAElE,MAAM,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC;IACxC,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAClE,IAAI,cAAc,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE,CAAC;QAGrD,MAAM,qBAAqB,GAAG,uBAAuB,CAAC,OAAO,EAAE,cAAc,kCACxE,OAAO,CAAC,IAAI,GACZ,kBAAkB,EACrB,CAAC;QAGH,OAAO,CAAC,IAAI,CAAC,iBAAiB,GAAG,qBAAqB,CAAC;QAGvD,OAAO,CAAC,OAAO,CAAC,mBAAmB,GAAG,eAAe,CAAC;IACxD,CAAC;IACD,MAAM,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC;IAE1C,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CAAqB,CAAC;IAE/D,eAAe,CAAC,IAAI,CAAC,GAAG;;QAEtB,MAAA,IAAI,CAAC,mBAAmB,oDAAI,CAAC;QAE7B,YAAY,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC,CAAC;IAGF,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC;IAElC,IAAI,WAAW,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;QAC/C,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QAE1B,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,iCAAM,IAAI,GAAK,kBAAkB,GAAI,WAAW,CAAC,CAAC;QAE5F,MAAM,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC;QAC1C,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;YACpC,MAAM,qBAAqB,GAAG,eAAe,CAAC,GAAG,CAAqB,CAAC;YAGvE,eAAe,CAAC,GAAG,CAAC,GAAG,UAAyB,GAAG,QAAmB;gBACpE,qBAAqB,IAAI,qBAAqB,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,CAAC;gBAEvE,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAkB,CAAC;gBACnD,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;gBAEpC,IAAI,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC;oBAAE,OAAO;gBACxC,aAAa,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;gBAEzC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC;YAClD,CAAC,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC"}

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

@@ -0,0 +1,12 @@
+import type { Func } from "hry-types/src/Misc/Func";
+import type { FinalOptionsOfComponent } from "..";
+import type { ComputedDependence } from "./computedUpdater";
+type ItemCache = {
+    dependences: ComputedDependence[];
+    method: Func;
+    value: unknown;
+};
+type ComputedId = string;
+export type ComputedCache = Record<ComputedId, ItemCache>;
+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/computedWatchHandle/initComputedAndGetCache.js

@@ -0,0 +1,36 @@
+import { deepProxy, getProxyOriginalValue } from "./data-tracer";
+import { uniqueDependences } from "./uniqueDependences";
+function isValidDependences(dependences, computedKeys) {
+    for (const { paths: path, val } of dependences) {
+        if ((val === undefined) && computedKeys.includes(path[0])) {
+            return false;
+        }
+    }
+    return true;
+}
+export function initComputedAndGetCache(options, computedConfig, initAllData, uninitedkeys = Object.keys(computedConfig), computedCache = {}) {
+    for (const key of uninitedkeys) {
+        const computedFunc = computedConfig[key];
+        const dependences = [];
+        let initValue = computedFunc.call({ data: deepProxy(initAllData, dependences) });
+        uninitedkeys = uninitedkeys.filter(ele => ele !== key);
+        if (isValidDependences(dependences, uninitedkeys)) {
+            initValue = getProxyOriginalValue(initValue);
+            options.data[key] = initValue;
+            initAllData[key] = initValue;
+            computedCache[key] = {
+                dependences: uniqueDependences(dependences),
+                method: computedFunc,
+                value: initValue,
+            };
+        }
+        else {
+            uninitedkeys.push(key);
+        }
+    }
+    if (uninitedkeys.length === 0) {
+        return computedCache;
+    }
+    return initComputedAndGetCache(options, computedConfig, initAllData, uninitedkeys, computedCache);
+}
+//# sourceMappingURL=initComputedAndGetCache.js.map

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

@@ -0,0 +1 @@
+{"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;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAexD,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,EAAE,iBAAiB,CAAC,WAAW,CAAC;gBAC3C,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[]): ComputedDependence[];

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

@@ -0,0 +1,20 @@
+export 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;
+}
+//# 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,MAAM,UASG,iBAAiB,CAAC,WAAiC;IAC1D,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,WAAW,CAAC;IACjD,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,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;QACvD,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,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;YACrD,IAAI,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;gBAElC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAEzB,OAAO,iBAAiB,CAAC,WAAW,CAAC,CAAC;YACxC,CAAC;YACD,IAAI,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBAElC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAEzB,OAAO,iBAAiB,CAAC,WAAW,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC"}

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

@@ -9,7 +9,7 @@ import type { PageLifetimesOption } from "../../RootComponent/PageLifetimes/Page
 import type { PropertiesConstraint } from "../../RootComponent/Properties/PropertiesConstraint";
 import type { StoreConstraint } from "../../RootComponent/Store/StoreConstraint";
 import type { DefineComponentOption } from "..";
-import type { ComputedCache } from "./computedWatchHandle/initComputed";
+import type { ComputedCache } from "./computedWatchHandle/initComputedAndGetCache";
 type InstanceInnerFields = {
     data: OptionsInnerFields["data"];
     disposer: Record<string, Func>;

package/package.json

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

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

@@ -1,9 +1,9 @@
-import { deepClone } from "../../../../utils/deepClone";
 import type { Instance } from "..";
-import { deepProxy } from "./data-tracer";
+import { deepProxy, getProxyOriginalValue } from "./data-tracer";
 import { getPathsValue } from "./getPathsValue";
 
 import { isEqual } from "./isEqual";
+import { uniqueDependences } from "./uniqueDependences";
 export type ComputedDependence = { paths: string[]; val: unknown };
 
 export function computedUpdater(this: Instance, isUpdated = false): boolean {
@@ -23,17 +23,19 @@ export function computedUpdater(this: Instance, isUpdated = false): boolean {
     }
     if (changed) {
       const newDependences: ComputedDependence[] = [];
-      const newValue = itemCache.method.call({ data: deepProxy(this.data, newDependences) });
+      let newValue = itemCache.method.call({ data: deepProxy(this.data, newDependences) });
 
       // 更新值不会立即再次进入**函数,而是当前**函数运行完毕后触发**函数,
+      newValue = getProxyOriginalValue(newValue);
+
       this.setData({
-        [key]: deepClone(newValue),
+        [key]: newValue,
       });
 
       isUpdated = true;
 
-      // 更新依赖
-      this.data.__computedCache__[key].dependences = newDependences;
+      // 更新依赖,去重
+      this.data.__computedCache__[key].dependences = uniqueDependences(newDependences);
 
       // 有一个计算属性更新就重新更新所有计算互相,避免后置依赖导致前置依赖错误
       return computedUpdater.call(this, isUpdated);

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

@@ -8,28 +8,24 @@ export function deepProxy(
 ): object {
   const handler = {
     get<T extends object>(target: T, prop: keyof T & string) {
+      if (prop === "__original__") {
+        return target;
+      }
       const val = target[prop];
-      // 依赖长度不为0时 去重
-      if (basePath.length !== 0) {
-        // 依赖去重
-        const lastDependences = dependences[dependences.length - 1]; // 倒数第一个是当前依赖。2022 at(-1)
-        // 只留最后一个路径。比如  return this.data.obj.user.name  得到的是最后1个路径 ['obj','user','name'] 减少无效依赖,提高性能。 而非3个  ['obj'], ['obj','user'],['obj','user','name']
-        if (lastDependences.paths.toString() === basePath.toString()) {
-          // console.log('删除', lastDependences)
-          dependences.pop();
-        }
+
+      // val不为undefined(依赖还为初始化的其他计算属性)且非自身属性或函数不再返回代理。 (如 this.data.arr.slice(),slice不属于自身属性,小程序允许data子字段为函数的情况,也不代理)
+      if ((val !== undefined) && (!Object.prototype.hasOwnProperty.call(target, prop) || typeof val === "function")) {
+        // 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'],在这里去重效率高些,外部去重时还要再次遍历,加"dependences[dependences.length - 1].paths.toString() === basePath.toString()"这判断是有可能遇到` this.data.obj[this.data.id].list`的情况,这种情况下,第一个依赖是obj,第二个依赖是id,因为依赖不是一个路径连续向下的,所以不能去重。
+      if (basePath.length !== 0 && dependences[dependences.length - 1].paths.toString() === basePath.toString()) {
+        dependences.pop();
       }
       const curPath = basePath.concat(prop);
 
-      // console.log(prop, val,'in');
-
-      dependences.push({ paths: curPath, val: deepClone(val) });
+      dependences.push({ paths: curPath, val });
 
-      // 自身方法或原型属性不代理
-      if (!Object.prototype.hasOwnProperty.call(target, prop) || typeof val === "function") {
-        // 原型链上的属性不代理,函数加bind。如 this.data.arr.slice()  this.data.arr.forEach(...)
-        return typeof val === "function" ? val.bind(target) : val;
-      }
       // 非对象不代理
       if (typeof val !== "object" || val === null) return val;
 
@@ -42,3 +38,11 @@ export function deepProxy(
 
   return new Proxy(data, handler);
 }
+
+export function getProxyOriginalValue<T extends { __original__?: string }>(value: T): unknown {
+  if (typeof value !== "object" || value === null || !value.__original__) {
+    return value;
+  } else {
+    return deepClone(value.__original__);
+  }
+}

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

@@ -2,7 +2,7 @@ import type { Func } from "hry-types/src/Misc/Func";
 import { computedUpdater } from "./computedUpdater";
 import { getPathsValue } from "./getPathsValue";
 import { getPropertiesValue } from "./getPropertiesValue";
-import { initComputed } from "./initComputed";
+import { initComputedAndGetCache } from "./initComputedAndGetCache";
 import { isEqual } from "./isEqual";
 
 import { deepClone } from "../../../../utils/deepClone";
@@ -25,25 +25,29 @@ function initWatchOldValue(data: FinalOptionsOfComponent["data"], watchConfig: o
   return watchOldValue;
 }
 export function computedWatchHandle(options: FinalOptionsOfComponent) {
-  // 计算属性初始化
+  // 计算属性初始化和首次依赖收集
   const computedConfig = options.computed;
   const rawPropertiesValue = getPropertiesValue(options.properties);
   if (computedConfig && !isEmptyObject(computedConfig)) {
     // 此时store已经初始化数据到data了
 
-    const __computedInitCache__ = initComputed(options, computedConfig, { ...options.data, ...rawPropertiesValue });
+    const __computedInitCache__ = initComputedAndGetCache(options, computedConfig, {
+      ...options.data,
+      ...rawPropertiesValue,
+    });
 
+    // 缓存放入data中
     options.data.__computedCache__ = __computedInitCache__;
 
+    // 计算属性更新函数放入methods中 要做冲突判断,避免用户定义了同名methods字段
     options.methods.__computedUpdater__ = computedUpdater;
-    //    // 把计算属性缓存从方法中带入到实例中,在created周期加入实例后删除
-    //    methodOpt.__computedInitCache__ = () => computedCache;
   }
   const observersConfig = options.observers;
   // 通过observers加入`**`字段来触发计算属性更新
   const originalFunc = observersConfig["**"] as Func | undefined;
 
   observersConfig["**"] = function(this: Instance): undefined {
+    // 任何setData都会触发计算属性更新(可能依赖数据并没变化)
     this.__computedUpdater__?.();
 
     originalFunc && originalFunc.call(this);

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

@@ -0,0 +1,84 @@
+import type { Func } from "hry-types/src/Misc/Func";
+import type { FinalOptionsOfComponent } from "..";
+
+import type { ComputedDependence } from "./computedUpdater";
+import { deepProxy, getProxyOriginalValue } from "./data-tracer";
+import { uniqueDependences } from "./uniqueDependences";
+
+type ItemCache = {
+  dependences: ComputedDependence[];
+  method: Func;
+  value: unknown;
+};
+
+type ComputedId = string;
+
+export type ComputedCache = Record<ComputedId, ItemCache>;
+
+/**
+ * 如果依赖列表某项的首个字段值为undefined并且字段为其他计算属性字段 返回false(即被依赖的计算字段写在了依赖他的计算字段后面), 否则返回true表示依赖有效。
+ */
+function isValidDependences(dependences: ComputedDependence[], computedKeys: string[]): boolean {
+  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: FinalOptionsOfComponent,
+  computedConfig: Record<string, Func>,
+  initAllData: Record<string, unknown>,
+  uninitedkeys: string[] = Object.keys(computedConfig),
+  computedCache: ComputedCache = {},
+): ComputedCache {
+  for (const key of uninitedkeys) {
+    const computedFunc = computedConfig[key];
+    const dependences: ComputedDependence[] = [];
+    // 通过代理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: uniqueDependences(dependences),
+        method: computedFunc,
+        value: initValue,
+      };
+    } else {
+      // 把当前依赖不正确的key放到后面去
+      uninitedkeys.push(key);
+    }
+  }
+  // 看uninitedkey是否未空，空表示所有依赖收集完毕直接返回
+  if (uninitedkeys.length === 0) {
+    return computedCache;
+  }
+
+  // uninitedkey不为空,递归
+  return initComputedAndGetCache(options, computedConfig, initAllData, uninitedkeys, computedCache);
+}

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

@@ -0,0 +1,34 @@
+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;
+  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;
+}

package/src/api/DefineComponent/assignOptions/index.ts

@@ -27,7 +27,7 @@ import type { DefineComponentOption } from "..";
 import { BStore } from "../../../behaviors/BStore";
 import { computedWatchHandle } from "./computedWatchHandle";
 
-import type { ComputedCache } from "./computedWatchHandle/initComputed";
+import type { ComputedCache } from "./computedWatchHandle/initComputedAndGetCache";
 import { initStore } from "./initStore";
 
 type InstanceInnerFields = {

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

@@ -1,12 +0,0 @@
-import type { Func } from "hry-types/src/Misc/Func";
-import type { FinalOptionsOfComponent } from "..";
-import type { ComputedDependence } from "./computedUpdater";
-type ItemCache = {
-    dependences: ComputedDependence[];
-    method: Func;
-    value: unknown;
-};
-export type ComputedCache = Record<string, ItemCache>;
-export declare function getItemCache(initAllData: object, computedKeys: string[], computedFunc: Func): false | ItemCache;
-export declare function initComputed(options: FinalOptionsOfComponent, computedConfig: Record<string, Func>, initAllData: object, uninitedkeys?: string[], computedCache?: ComputedCache): ComputedCache;
-export {};

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

@@ -1,63 +0,0 @@
-import { deepClone } from "../../../../utils/deepClone";
-import { deepProxy } from "./data-tracer";
-function isValidDependences(dependences, computedKeys) {
-    for (const { paths: path, val } of dependences) {
-        if ((val === undefined) && computedKeys.includes(path[0])) {
-            return false;
-        }
-    }
-    return true;
-}
-export function getItemCache(initAllData, computedKeys, computedFunc) {
-    const dependences = [];
-    const initValue = computedFunc.call({ data: deepProxy(initAllData, dependences) });
-    if (isValidDependences(dependences, computedKeys)) {
-        return {
-            dependences: uniqueDependences(dependences),
-            method: computedFunc,
-            value: deepClone(initValue),
-        };
-    }
-    else {
-        return false;
-    }
-}
-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 initComputed(options, computedConfig, initAllData, uninitedkeys = Object.keys(computedConfig), computedCache = {}) {
-    for (const key of uninitedkeys) {
-        const itemCache = getItemCache(initAllData, uninitedkeys, computedConfig[key]);
-        uninitedkeys = uninitedkeys.filter(ele => ele !== key);
-        if (itemCache === false) {
-            uninitedkeys.push(key);
-        }
-        else {
-            const dataOpt = options.data;
-            dataOpt[key] = itemCache.value;
-            initAllData[key] = itemCache.value;
-            computedCache[key] = itemCache;
-        }
-    }
-    if (uninitedkeys.length === 0) {
-        return computedCache;
-    }
-    return initComputed(options, computedConfig, initAllData, uninitedkeys, computedCache);
-}
-//# sourceMappingURL=initComputed.js.map

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

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

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

@@ -1,135 +0,0 @@
-import type { Func } from "hry-types/src/Misc/Func";
-import type { FinalOptionsOfComponent } from "..";
-
-import { deepClone } from "../../../../utils/deepClone";
-import type { ComputedDependence } from "./computedUpdater";
-import { deepProxy } from "./data-tracer";
-
-type ItemCache = {
-  dependences: ComputedDependence[];
-  method: Func;
-  value: unknown;
-};
-
-export type ComputedCache = Record<string, ItemCache>;
-
-/**
- * 如果依赖列表某项的首个字段值为undefined并且字段为其他计算属性字段 返回false(即被依赖的计算字段写在了依赖他的计算字段后面), 否则返回ComputedInfo。
- */
-function isValidDependences(dependences: ComputedDependence[], computedKeys: string[]): boolean {
-  for (const { paths: path, val } of dependences) {
-    // 引用值为undefined时
-    // console.log(path[0]);
-    if ((val === undefined) && computedKeys.includes(path[0])) {
-      return false;
-    }
-  }
-
-  return true; // 依赖有效
-}
-
-export function getItemCache(
-  initAllData: object,
-  computedKeys: string[],
-  computedFunc: Func,
-): false | ItemCache {
-  // 当前计算字段的依赖列表
-  const dependences: ComputedDependence[] = [];
-  const initValue = computedFunc.call({ data: deepProxy(initAllData, dependences) });
-
-  if (isValidDependences(dependences, computedKeys)) {
-    return {
-      // 去重 避免 如: ` age(){ return this.data.xxx.num + this.data.xxx.str + this.data.xxx} ` 造成的多个依赖相同情况。应就要一个 xxx
-      dependences: uniqueDependences(dependences),
-      method: computedFunc,
-      value: deepClone(initValue),
-    };
-  } else {
-    /**
-     * 情形1 依赖了其他未初始化的计算属性(不报错) 对应测试文件[NoOptionalProperties.ts](../../../jest/computed/NoOptionalProperties/NoOptionalProperties.test.ts)的copyPropUser字段
-     */
-    return false;
-  }
-}
-
-/**
- * 依赖去重
- * @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(".") + ".";
-      // console.log(firstPath,curPath)
-      if (firstPath.startsWith(curPath)) {
-        // console.log("删除:", curPath, f);
-
-        // 例如 path[0] = 'a.b.c.',curPath = 'a.b.'
-        dependences.splice(f, 1);
-
-        return uniqueDependences(dependences);
-      }
-      if (curPath.startsWith(firstPath)) {
-        // console.log("删除:", firstPath, i);
-
-        // 例如 curPath = 'a.b.' path[0] = 'a.b.c.',
-        dependences.splice(i, 1);
-
-        return uniqueDependences(dependences);
-      }
-    }
-  }
-
-  return dependences;
-}
-
-/**
- * 把计算属性初始值加入到options.data中返回缓存
- */
-export function initComputed(
-  options: FinalOptionsOfComponent,
-  computedConfig: Record<string, Func>,
-  initAllData: object,
-  uninitedkeys: string[] = Object.keys(computedConfig),
-  computedCache: ComputedCache = {},
-): ComputedCache {
-  // 收集依赖 uninitedkeys不受内部2处重新赋值的影响
-
-  for (const key of uninitedkeys) {
-    // uninitedkeys 受2处重新赋值的影响
-    const itemCache = getItemCache(initAllData, uninitedkeys, computedConfig[key]);
-
-    // 去除当前的key 2
-    uninitedkeys = uninitedkeys.filter(ele => ele !== key);
-
-    if (itemCache === false) {
-      // 把当前依赖不正确的key放到后面去
-      uninitedkeys.push(key);
-    } else {
-      const dataOpt = options.data;
-
-      dataOpt[key] = itemCache.value;
-
-      // @ts-ignore 隐式索引
-      initAllData[key] = itemCache.value;
-
-      computedCache[key] = itemCache;
-    }
-  }
-  // 看uninitedkey(2处的新值)是否未空，空表示所有依赖收集完毕直接返回
-  if (uninitedkeys.length === 0) {
-    return computedCache;
-  }
-
-  // uninitedkey不为空,递归
-  return initComputed(options, computedConfig, initAllData, uninitedkeys, computedCache);
-}