annil 1.7.1 → 1.7.3

package/CHANGELOG.md

@@ -4,6 +4,20 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.7.3](https://github.com/missannil/annil/compare/v1.7.2...v1.7.3) (2024-05-03)
+
+
+### Bug Fixes
+
+* 优化计算属性依赖 ([017ad55](https://github.com/missannil/annil/commit/017ad55d0bc3edcc2cdeec68474adba766da57b7))
+
+## [1.7.2](https://github.com/missannil/annil/compare/v1.7.1...v1.7.2) (2024-04-30)
+
+
+### Bug Fixes
+
+* 1. 计算属性依赖优化和返回值为代理的问题 ([6f28738](https://github.com/missannil/annil/commit/6f28738256c1884334b440271741ee1efb9e5519))
+
 ## [1.7.1](https://github.com/missannil/annil/compare/v1.7.0...v1.7.1) (2024-04-12)
 
 

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

@@ -1,4 +1,5 @@
 import { deepProxy, getProxyOriginalValue } from "./data-tracer";
+import { removeSubDependences } from "./dependencesOptimize";
 import { getPathsValue } from "./getPathsValue";
 import { isEqual } from "./isEqual";
 export function computedUpdater(isUpdated = false) {
@@ -14,13 +15,12 @@ export function computedUpdater(isUpdated = false) {
         }
         if (changed) {
             const newDependences = [];
-            let newValue = itemCache.method.call({ data: deepProxy(this.data, newDependences) });
-            newValue = getProxyOriginalValue(newValue);
+            const newValue = itemCache.method.call({ data: deepProxy(this.data, newDependences) });
             this.setData({
-                [key]: newValue,
+                [key]: getProxyOriginalValue(newValue),
             });
             isUpdated = true;
-            this.data.__computedCache__[key].dependences = newDependences;
+            this.data.__computedCache__[key].dependences = removeSubDependences(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":"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;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,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,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,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;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,qBAAqB,CAAC,QAAQ,CAAC;aACvC,CAAC,CAAC;YAEH,SAAS,GAAG,IAAI,CAAC;YAGjB,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC;YAGpF,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,5 +1,3 @@
 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;
+export declare function getProxyOriginalValue(value: any): any;

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

@@ -1,5 +1,4 @@
-import { deepClone } from "../../../../utils/deepClone";
-import { uniqueDependences } from "./uniqueDependences";
+import { removePreviousDependence } from "./dependencesOptimize";
 export function deepProxy(data, dependences, basePath = []) {
     const handler = {
         get(target, prop) {
@@ -7,10 +6,10 @@ export function deepProxy(data, dependences, basePath = []) {
                 return target;
             }
             const val = target[prop];
-            if (typeof val === "function" && (!Object.prototype.hasOwnProperty.call(target, prop))) {
-                return val.bind(target);
+            if (prop in target && !target.hasOwnProperty(prop)) {
+                return typeof val === "function" ? val.bind(target) : val;
             }
-            dependences = uniqueDependences(dependences, basePath, prop);
+            removePreviousDependence(dependences, basePath);
             const curPath = basePath.concat(prop);
             dependences.push({ paths: curPath, val });
             if (typeof val !== "object" || val === null)
@@ -24,11 +23,15 @@ export function deepProxy(data, dependences, basePath = []) {
     return new Proxy(data, handler);
 }
 export function getProxyOriginalValue(value) {
-    if (typeof value !== "object" || value === null || !value.__original__) {
+    if (typeof value !== "object" || value === null) {
         return value;
     }
-    else {
-        return deepClone(value.__original__);
+    if (value.__original__)
+        return value.__original__;
+    const ret = Array.isArray(value) ? [] : {};
+    for (const key in value) {
+        ret[key] = getProxyOriginalValue(value[key]);
     }
+    return ret;
 }
 //# 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":"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"}
+{"version":3,"file":"data-tracer.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/assignOptions/computedWatchHandle/data-tracer.ts"],"names":[],"mappings":"AAEA,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;YAGzB,IAAI,IAAI,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnD,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;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,CAAC,KAAU;IAC9C,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;QAExB,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/computedWatchHandle/dependencesOptimize.d.ts

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

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

@@ -0,0 +1,23 @@
+export function removeSubDependences(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)) {
+                dependences.splice(i, 1);
+            }
+        }
+    }
+    return dependences;
+}
+export function removePreviousDependence(dependences, basePath) {
+    if (dependences.length === 0 || basePath.length === 0)
+        return dependences;
+    const lastDependence = dependences[dependences.length - 1];
+    if (lastDependence.paths.toString() === basePath.toString()) {
+        dependences.pop();
+    }
+    return dependences;
+}
+//# sourceMappingURL=dependencesOptimize.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"dependencesOptimize.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/assignOptions/computedWatchHandle/dependencesOptimize.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,oBAAoB,CAAC,WAAiC;IAEpE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAG5D,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;QAEjD,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;AAGD,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/assignOptions/computedWatchHandle/initComputedAndGetCache.js

@@ -1,4 +1,5 @@
 import { deepProxy, getProxyOriginalValue } from "./data-tracer";
+import { removeSubDependences } from "./dependencesOptimize";
 function isValidDependences(dependences, computedKeys) {
     for (const { paths: path, val } of dependences) {
         if ((val === undefined) && computedKeys.includes(path[0])) {
@@ -18,7 +19,7 @@ export function initComputedAndGetCache(options, computedConfig, initAllData, un
             options.data[key] = initValue;
             initAllData[key] = initValue;
             computedCache[key] = {
-                dependences,
+                dependences: removeSubDependences(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":"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"}
+{"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,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAe7D,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,oBAAoB,CAAC,WAAW,CAAC;gBAC9C,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/thirdLib/wm/scrollView.d.ts

@@ -2,8 +2,6 @@ import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { CreateComponentDoc } from "../../types/CreateComponentDoc";
 export type ScrollView = CreateComponentDoc<"scrollView", {
     properties: {
-        class?: string;
-        style?: string;
         scroll_x?: boolean;
         scroll_y?: boolean;
         upper_threshold?: number | string;

package/dist/thirdLib/wm/swiper.d.ts

@@ -12,7 +12,7 @@ export type Swiper = CreateComponentDoc<"swiper", {
         list: unknown[];
         class?: string;
         style?: string;
-        indicator_dots?: boolean;
+        indicatorDots?: boolean;
         indicatorColor?: Color;
         indicatorActiveColor?: Color;
         autoplay?: boolean;

package/dist/thirdLib/wm/view.d.ts

@@ -1,11 +1,9 @@
 import type { CreateComponentDoc } from "../../types/CreateComponentDoc";
 export type View = CreateComponentDoc<"view", {
     properties: {
-        class?: string;
-        style?: string;
-        hover_class?: string;
-        hover_stop_propagation?: boolean;
-        hover_start_time?: number;
-        hover_stay_time?: number;
+        hoverClass?: string;
+        hoverStopPropagation?: boolean;
+        hoverStartTime?: number;
+        hoverStayTime?: number;
     };
 }>;

package/package.json

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

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

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

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

@@ -1,7 +1,6 @@
 /* eslint-disable complexity */
-import { deepClone } from "../../../../utils/deepClone";
 import type { ComputedDependence } from "./computedUpdater";
-import { uniqueDependences } from "./uniqueDependences";
+import { removePreviousDependence } from "./dependencesOptimize";
 
 export function deepProxy(
   data: object,
@@ -15,13 +14,11 @@ export function deepProxy(
       }
       const val = target[prop];
 
-      // 如 this.data.arr.slice(),`slice`不属于自身属性不代理,不加入依赖。但不包含小程序data子字段为函数的情况)
-      if (typeof val === "function" && (!Object.prototype.hasOwnProperty.call(target, prop))) {
-        // val有不是函数的情况么？
-        return (val as Function).bind(target);
+      // 自身没有但原型链上有的属性不收集依赖
+      if (prop in target && !target.hasOwnProperty(prop)) {
+        return typeof val === "function" ? val.bind(target) : val;
       }
-
-      dependences = uniqueDependences(dependences, basePath, prop);
+      removePreviousDependence(dependences, basePath);
 
       const curPath = basePath.concat(prop);
 
@@ -40,10 +37,17 @@ 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__) {
+export function getProxyOriginalValue(value: any): any {
+  if (typeof value !== "object" || value === null) {
     return value;
-  } else {
-    return deepClone(value.__original__);
   }
+  if (value.__original__) return value.__original__;
+
+  const ret = Array.isArray(value) ? [] : {};
+  for (const key in value) {
+    // @ts-ignore 隐式索引
+    ret[key] = getProxyOriginalValue(value[key]);
+  }
+
+  return ret;
 }

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

@@ -0,0 +1,33 @@
+import type { ComputedDependence } from "./computedUpdater";
+// 去除子依赖
+export function removeSubDependences(dependences: ComputedDependence[]) {
+  // 把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)) {
+        dependences.splice(i, 1);
+      }
+    }
+  }
+
+  return dependences;
+}
+
+// 当前依赖是上一个依赖的子依赖时,去除上一个依赖
+export function removePreviousDependence(dependences: ComputedDependence[], basePath: string[]) {
+  if (dependences.length === 0 || basePath.length === 0) return dependences;
+
+  const lastDependence = dependences[dependences.length - 1];
+
+  if (lastDependence.paths.toString() === basePath.toString()) {
+    dependences.pop();
+  }
+
+  return dependences;
+}

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

@@ -3,6 +3,7 @@ import type { FinalOptionsOfComponent } from "..";
 
 import type { ComputedDependence } from "./computedUpdater";
 import { deepProxy, getProxyOriginalValue } from "./data-tracer";
+import { removeSubDependences } from "./dependencesOptimize";
 
 type ItemCache = {
   dependences: ComputedDependence[];
@@ -15,7 +16,7 @@ type ComputedId = string;
 export type ComputedCache = Record<ComputedId, ItemCache>;
 
 /**
- * 如果依赖列表某项的首个字段值为undefined并且字段为其他计算属性字段 返回false(即被依赖的计算字段写在了依赖他的计算字段后面), 否则返回true表示依赖有效。
+ * 如果依赖列表某项的首个字段值为undefined并且字段为其他计算属性字段(即被依赖的计算字段写在了依赖他的计算字段后面) 返回false, 否则返回true表示依赖有效。
  */
 function isValidDependences(dependences: ComputedDependence[], computedKeys: string[]): boolean {
   for (const { paths: path, val } of dependences) {
@@ -64,7 +65,7 @@ export function initComputedAndGetCache(
       initAllData[key] = initValue;
 
       computedCache[key] = {
-        dependences,
+        dependences: removeSubDependences(dependences),
         method: computedFunc,
         value: initValue,
       };

package/src/api/SubComponent/SubWatch/test/error.test.ts

@@ -14,16 +14,16 @@ SubComponent<{ events: { a: string } }, Wm.View>()({
  */
 SubComponent<{ events: { a: string } }, Wm.View>()({
   data: {
-    view_style: "",
+    view_hoverClass: " h-100",
   },
   watch: {
-    view_style(newValue, oldValue) { // ok
+    view_hoverClass(newValue, oldValue) { // ok
       newValue;
 
       oldValue;
     },
     // @ts-expect-error 超出约束字段错误
-    view_XXstyle() {
+    view_xxxhoverClass() {
     },
   },
 });

package/src/thirdLib/wm/scrollView.ts

@@ -3,8 +3,6 @@ import type { CreateComponentDoc } from "../../types/CreateComponentDoc";
 
 export type ScrollView = CreateComponentDoc<"scrollView", {
   properties: {
-    class?: string;
-    style?: string;
     // 允许横向滚动
     scroll_x?: boolean;
     // 允许纵向滚动

package/src/thirdLib/wm/swiper.ts

@@ -21,7 +21,7 @@ export type Swiper = CreateComponentDoc<"swiper", {
      * 是否显示面板指示点
      * @defaultValue false
      */
-    indicator_dots?: boolean;
+    indicatorDots?: boolean;
 
     /**
      * 指示点颜色

package/src/thirdLib/wm/view.ts

@@ -2,27 +2,25 @@ import type { CreateComponentDoc } from "../../types/CreateComponentDoc";
 
 export type View = CreateComponentDoc<"view", {
   properties: {
-    class?: string;
-    style?: string;
     /**
      * 指定按下去的样式类。当 hover-class="none" 时，没有点击态效果
      * @defaultValue 'none'
      */
-    hover_class?: string;
+    hoverClass?: string;
     /**
      * 指定是否阻止本节点的祖先节点出现点击态
      * @defaultValue false
      */
-    hover_stop_propagation?: boolean;
+    hoverStopPropagation?: boolean;
     /**
      * 按住后多久出现点击态，单位毫秒
      * @defaultValue 50
      */
-    hover_start_time?: number;
+    hoverStartTime?: number;
     /**
      * 手指松开后点击态保留时间，单位毫秒
      * @defaultValue 400
      */
-    hover_stay_time?: number;
+    hoverStayTime?: number;
   };
 }>;

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

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

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

@@ -1,40 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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/src/api/DefineComponent/assignOptions/computedWatchHandle/uniqueDependences.ts

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