4.3.0

nullice · Apr 23, 2018 · cd6dd05 · cd6dd05
1 parent f0dcafb
commit cd6dd05
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -659,7 +659,7 @@ ArrayBuffer to Buffer
 | --- | --- | --- |
 | object | <code>object</code> |  |
 | eachFunc | <code>function</code> | 处理函数 |
-| [checkCycle] | <code>boolean</code> | 是否检查循环引用 |
+| [checkCycle] | <code>boolean</code> \| <code>function</code> | 是否检查循环引用，为 true 会跳过循环引用，还可以提供一个函数 checkCycleCallback(target,path) 来处理一些事 |
 
 <a name="StringSTR"></a>
 

diff --git a/dist/Richang.js b/dist/Richang.js
@@ -356,13 +356,15 @@ var ObjectOBJ = {
      *
      * @param {object} object
      * @param {function} eachFunc 处理函数
-     * @param {boolean} [checkCycle] 是否检查循环引用
+     * @param {boolean|function} [checkCycle] 是否检查循环引用，为 true 会跳过循环引用，还可以提供一个函数 checkCycleCallback(target, path, cyclePath) 来处理一些事
      */
     pathEach: function pathEach(object, eachFunc, checkCycle) {
 
         if (checkCycle) {
+            var useCycleCallback = typeof checkCycle === "function";
             var cycleCache = new WeakMap();
-            cycleCache.set(object, true);
+
+            cycleCache.set(object, useCycleCallback ? [] : true);
         }
 
         _each(object, [], 0);
@@ -377,9 +379,16 @@ var ObjectOBJ = {
                 // 检查循环引用
                 if (checkCycle && (typeof item === "undefined" ? "undefined" : _typeof(item)) === "object") {
                     if (cycleCache.get(item)) {
+                        if (useCycleCallback) {
+                            checkCycle(item, path, cycleCache.get(item));
+                        }
                         continue; // >_< 忽略循环引用
                     } else {
-                        cycleCache.set(item, true);
+                        if (useCycleCallback) {
+                            cycleCache.set(item, [].concat(toConsumableArray(path), [key]));
+                        } else {
+                            cycleCache.set(item, true);
+                        }
                     }
                 }
 

diff --git a/dist/Richang.min.js b/dist/Richang.min.js
diff --git a/dist/RichangEs.bundle.js b/dist/RichangEs.bundle.js
diff --git a/dist/RichangEs.js b/dist/RichangEs.js
@@ -350,13 +350,15 @@ var ObjectOBJ = {
      *
      * @param {object} object
      * @param {function} eachFunc 处理函数
-     * @param {boolean} [checkCycle] 是否检查循环引用
+     * @param {boolean|function} [checkCycle] 是否检查循环引用，为 true 会跳过循环引用，还可以提供一个函数 checkCycleCallback(target, path, cyclePath) 来处理一些事
      */
     pathEach: function pathEach(object, eachFunc, checkCycle) {
 
         if (checkCycle) {
+            var useCycleCallback = typeof checkCycle === "function";
             var cycleCache = new WeakMap();
-            cycleCache.set(object, true);
+
+            cycleCache.set(object, useCycleCallback ? [] : true);
         }
 
         _each(object, [], 0);
@@ -371,9 +373,16 @@ var ObjectOBJ = {
                 // 检查循环引用
                 if (checkCycle && (typeof item === "undefined" ? "undefined" : _typeof(item)) === "object") {
                     if (cycleCache.get(item)) {
+                        if (useCycleCallback) {
+                            checkCycle(item, path, cycleCache.get(item));
+                        }
                         continue; // >_< 忽略循环引用
                     } else {
-                        cycleCache.set(item, true);
+                        if (useCycleCallback) {
+                            cycleCache.set(item, [].concat(toConsumableArray(path), [key]));
+                        } else {
+                            cycleCache.set(item, true);
+                        }
                     }
                 }
 

diff --git a/dist/RichangNode.bundle.js b/dist/RichangNode.bundle.js
diff --git a/dist/RichangNode.js b/dist/RichangNode.js
@@ -1428,13 +1428,15 @@ var ObjectOBJ = {
      *
      * @param {object} object
      * @param {function} eachFunc 处理函数
-     * @param {boolean} [checkCycle] 是否检查循环引用
+     * @param {boolean|function} [checkCycle] 是否检查循环引用，为 true 会跳过循环引用，还可以提供一个函数 checkCycleCallback(target, path, cyclePath) 来处理一些事
      */
     pathEach: function pathEach(object, eachFunc, checkCycle) {
 
         if (checkCycle) {
+            var useCycleCallback = typeof checkCycle === "function";
             var cycleCache = new WeakMap();
-            cycleCache.set(object, true);
+
+            cycleCache.set(object, useCycleCallback ? [] : true);
         }
 
         _each(object, [], 0);
@@ -1449,9 +1451,16 @@ var ObjectOBJ = {
                 // 检查循环引用
                 if (checkCycle && (typeof item === "undefined" ? "undefined" : _typeof(item)) === "object") {
                     if (cycleCache.get(item)) {
+                        if (useCycleCallback) {
+                            checkCycle(item, path, cycleCache.get(item));
+                        }
                         continue; // >_< 忽略循环引用
                     } else {
-                        cycleCache.set(item, true);
+                        if (useCycleCallback) {
+                            cycleCache.set(item, [].concat(toConsumableArray(path), [key]));
+                        } else {
+                            cycleCache.set(item, true);
+                        }
                     }
                 }
 

diff --git a/dist/RichangNode.min.js b/dist/RichangNode.min.js
diff --git a/doc/RichangNode.md b/doc/RichangNode.md
@@ -577,7 +577,7 @@ ArrayBuffer to Buffer
 | --- | --- | --- |
 | object | <code>object</code> |  |
 | eachFunc | <code>function</code> | 处理函数 |
-| [checkCycle] | <code>boolean</code> | 是否检查循环引用 |
+| [checkCycle] | <code>boolean</code> \| <code>function</code> | 是否检查循环引用，为 true 会跳过循环引用，还可以提供一个函数 checkCycleCallback(target,path) 来处理一些事 |
 
 <a name="StringSTR"></a>
 

diff --git a/package.json b/package.json
@@ -1,14 +1,14 @@
 {
   "name": "richang.js",
-  "version": "4.1.1",
+  "version": "4.3.0",
   "description": "richang js code.",
   "main": "dist/Richang.js",
   "module": "dist/RichangEs.js",
   "jsnext:main": "dist/RichangEs.js",
   "scripts": {
     "test": "jest",
     "test-coveralls": "jest --coverage --coverageReporters=text-lcov | coveralls",
-    "build-and-publish": "npm run build  && npm run build-min && npm run build-node-bundle && npm run doc && npm run publish",
+    "build-and-publish": "npm run build-all && windows-gen-d.ts && npm run doc && npm run publish",
     "publish": "npm publish --registry=https://registry.npmjs.org/ --disturl=/",
     "watch": "rollup -c -w",
     "build": "rollup -c",