#19: array (chore): refactor common methods

Author: kaelzhang

package.json

@@ -50,13 +50,13 @@
   },
   "devDependencies": {
     "@ostai/eslint-config": "^3.5.0",
-    "ava": "^3.12.1",
+    "ava": "^3.13.0",
     "codecov": "^3.7.2",
-    "eslint": "^7.8.0",
-    "eslint-plugin-import": "^2.22.0",
+    "eslint": "^7.10.0",
+    "eslint-plugin-import": "^2.22.1",
     "nyc": "^15.1.0",
     "test-fixture": "^2.4.1",
-    "typescript": "^4.0.2"
+    "typescript": "^4.0.3"
   },
   "dependencies": {
     "core-util-is": "^1.0.2",

src/array.js

@@ -8,7 +8,8 @@ const {
 
   symbol,
   define,
-  copy_comments
+  copy_comments,
+  copy_all_comments
 } = require('./common')
 
 
@@ -41,9 +42,7 @@ const reverse_comments = array => {
 }
 
 const move_comment = (target, source, i, offset, remove) => {
-  SYMBOL_PREFIXES.forEach(prefix => {
-    copy_comments(target, source, i + offset, i, prefix, remove)
-  })
+  copy_all_comments(target, source, i + offset, i, remove)
 }
 
 const move_comments = (

src/common.js

@@ -64,6 +64,14 @@ const copy_comments = (
   }
 }
 
+const copy_all_comments = (
+  target, source, target_key, source_key, remove_source
+) => {
+  SYMBOL_PREFIXES.forEach(prefix => {
+    copy_comments(target, source, target_key, source_key, prefix, remove_source)
+  })
+}
+
 const assign_non_prop_comments = (target, source) => {
   NON_PROP_SYMBOL_KEYS.forEach(key => {
     const comments = source[key]
@@ -82,9 +90,7 @@ const assign = (target, source, keys) => {
     }
 
     target[key] = source[key]
-    SYMBOL_PREFIXES.forEach(prefix => {
-      copy_comments(target, source, key, key, prefix)
-    })
+    copy_all_comments(target, source, key, key)
   })
 
   return target
@@ -118,6 +124,7 @@ module.exports = {
   symbol,
   define,
   copy_comments,
+  copy_all_comments,
   assign_non_prop_comments,
 
   assign (target, source, keys) {