Replace "each" to forEach, find, filter, map...

Author: tohosaku

src/core.js

@@ -5,7 +5,7 @@ import { editors } from './editors/index.js'
 import { templates } from './templates/index.js'
 import { iconlibs } from './iconlibs/index.js'
 import { themes } from './themes/index.js'
-import { extend, each, getShadowParent } from './utilities.js'
+import { extend, getShadowParent } from './utilities.js'
 
 export class JSONEditor {
   constructor (element, options = {}) {
@@ -191,24 +191,18 @@ export class JSONEditor {
   }
 
   getEditorsRules () {
-    const rules = {}
-
-    each(JSONEditor.defaults.editors, (i, editorClass) => editorClass.rules && extend(rules, editorClass.rules))
-
-    return rules
+    const extendRule = (rules, editorClass) => editorClass.rules ? extend(rules, editorClass.rules) : rules
+    return Object.values(JSONEditor.defaults.editors).reduce(extendRule, {})
   }
 
   getEditorClass (schema) {
     let classname
 
     schema = this.expandSchema(schema)
 
-    each(JSONEditor.defaults.resolvers, (i, resolver) => {
-      const tmp = resolver(schema)
-      if (tmp && JSONEditor.defaults.editors[tmp]) {
-        classname = tmp
-        return false
-      }
+    JSONEditor.defaults.resolvers.find(resolver => {
+      classname = resolver(schema)
+      return classname && JSONEditor.defaults.editors[classname]
     })
 
     if (!classname) throw new Error(`Unknown editor for schema ${JSON.stringify(schema)}`)

src/defaults.js

@@ -1,4 +1,3 @@
-import { each } from './utilities.js'
 import { resolvers } from './resolvers.js'
 
 /* default theme */
@@ -252,7 +251,7 @@ languages.en = {
 }
 
 /* Default per-editor options */
-each(editors, (i, editor) => { editors[i].options = editor.options || {} })
+Object.entries(editors).forEach(([i, editor]) => { editors[i].options = editor.options || {} })
 
 /* Default upload handler */
 function upload (type, file, cbs) {

src/editor.js

@@ -1,4 +1,4 @@
-import { extend, each } from './utilities.js'
+import { extend } from './utilities.js'
 
 /**
  * All editors should extend from this class
@@ -506,9 +506,9 @@ export class AbstractEditor {
   destroy () {
     const self = this
     this.unregister(this)
-    each(this.watched, (name, adjustedPath) => {
-      self.jsoneditor.unwatch(adjustedPath, self.watch_listener)
-    })
+    if (this.watched) {
+      Object.values(this.watched).forEach(adjustedPath => self.jsoneditor.unwatch(adjustedPath, self.watch_listener))
+    }
 
     this.watched = null
     this.watched_values = null
@@ -580,7 +580,7 @@ export class AbstractEditor {
 
     /* Determine how many times each attribute name is used. */
     /* This helps us pick the most distinct display text for the schemas. */
-    each(arr, (i, el) => {
+    arr.forEach(el => {
       if (el.title) {
         used[el.title] = used[el.title] || 0
         used[el.title]++
@@ -600,7 +600,7 @@ export class AbstractEditor {
     })
 
     /* Determine display text for each element of the array */
-    each(arr, (i, el) => {
+    arr.forEach(el => {
       let name
 
       /* If it's a simple string */
@@ -622,7 +622,7 @@ export class AbstractEditor {
 
     /* Replace identical display text with "text 1", "text 2", etc. */
     const inc = {}
-    each(disp, (i, name) => {
+    disp.forEach((name, i) => {
       inc[name] = inc[name] || 0
       inc[name]++
 

src/editors/array.js

@@ -1,5 +1,5 @@
 import { AbstractEditor } from '../editor.js'
-import { extend, each, trigger } from '../utilities.js'
+import { extend, trigger } from '../utilities.js'
 
 export class ArrayEditor extends AbstractEditor {
   askConfirmation () {
@@ -292,7 +292,7 @@ export class ArrayEditor extends AbstractEditor {
   empty (hard) {
     if (!this.rows) return
     const self = this
-    each(this.rows, (i, row) => {
+    this.rows.forEach((row, i) => {
       if (hard) {
         if (row.tab && row.tab.parentNode) row.tab.parentNode.removeChild(row.tab)
         self.destroyRow(row, true)
@@ -326,7 +326,7 @@ export class ArrayEditor extends AbstractEditor {
 
   refreshTabs (refreshHeaders) {
     const self = this
-    each(this.rows, (i, row) => {
+    this.rows.forEach(row => {
       if (!row.tab) return
 
       if (refreshHeaders) {
@@ -356,7 +356,7 @@ export class ArrayEditor extends AbstractEditor {
     }
 
     const self = this
-    each(value, (i, val) => {
+    value.forEach((val, i) => {
       if (self.rows[i]) {
         /* TODO: don't set the row's value if it hasn't changed */
         self.rows[i].setValue(val, initial)
@@ -380,13 +380,8 @@ export class ArrayEditor extends AbstractEditor {
     self.rows = self.rows.slice(0, value.length)
 
     /* Set the active tab */
-    let newActiveTab = null
-    each(self.rows, (i, row) => {
-      if (row.tab === self.active_tab) {
-        newActiveTab = row.tab
-        return false
-      }
-    })
+    const row = self.rows.find(row => row.tab === self.active_tab)
+    let newActiveTab = typeof row !== 'undefined' ? row.tab : null
     if (!newActiveTab && self.rows.length) newActiveTab = self.rows[0].tab
 
     self.active_tab = newActiveTab
@@ -403,18 +398,14 @@ export class ArrayEditor extends AbstractEditor {
   refreshValue (force) {
     const self = this
     const oldi = this.value ? this.value.length : 0
-    this.value = []
-
-    each(this.rows, (i, editor) => {
-      /* Get the value for this editor */
-      self.value[i] = editor.getValue()
-    })
+    /* Get the value for this editor */
+    this.value = this.rows.map(editor => editor.getValue())
 
     if (oldi !== this.value.length || force) {
       /* If we currently have minItems items in the array */
       const minItems = this.schema.minItems && this.schema.minItems >= this.rows.length
 
-      each(this.rows, (i, editor) => {
+      this.rows.forEach((editor, i) => {
         /* Hide the move down button for the last row */
         if (editor.movedown_button) {
           if (i === self.rows.length - 1) {
@@ -525,16 +516,9 @@ export class ArrayEditor extends AbstractEditor {
         }
 
         const i = this.getAttribute('data-i') * 1
-        const value = self.getValue()
-        const newval = []
+        const newval = self.getValue().filter((row, j) => j !== i)
         let newActiveTab = null
 
-        each(value, (j, row) => {
-          if (j !== i) {
-            newval.push(row)
-          }
-        })
-
         const editor = self.rows[i]
 
         self.setValue(newval)
@@ -570,7 +554,7 @@ export class ArrayEditor extends AbstractEditor {
         e.stopPropagation()
         const i = this.getAttribute('data-i') * 1
 
-        each(value, (j, row) => {
+        value.forEach((row, j) => {
           if (j === i) {
             value.push(row)
           }
@@ -784,7 +768,7 @@ export class ArrayEditor extends AbstractEditor {
     /* Get all the errors that pertain to this editor */
     const myErrors = []
     const otherErrors = []
-    each(errors, (i, error) => {
+    errors.forEach(error => {
       if (error.path === self.path) {
         myErrors.push(error)
       } else {
@@ -797,7 +781,7 @@ export class ArrayEditor extends AbstractEditor {
       if (myErrors.length) {
         this.error_holder.innerHTML = ''
         this.error_holder.style.display = ''
-        each(myErrors, (i, error) => {
+        myErrors.forEach(error => {
           self.error_holder.appendChild(self.theme.getErrorMessage(error.message))
         })
         /* Hide error area */
@@ -807,8 +791,8 @@ export class ArrayEditor extends AbstractEditor {
     }
 
     /* Show errors for child editors */
-    each(this.rows, (i, row) => {
+    this.rows.forEach(row =>
       row.showValidationErrors(otherErrors)
-    })
+    )
   }
 }

src/editors/checkbox.js

@@ -1,5 +1,4 @@
 import { AbstractEditor } from '../editor.js'
-import { each } from '../utilities.js'
 
 export class CheckboxEditor extends AbstractEditor {
   setValue (value, initial) {
@@ -80,13 +79,13 @@ export class CheckboxEditor extends AbstractEditor {
 
     this.previous_error_setting = this.jsoneditor.options.show_errors
 
-    const messages = []
-    each(errors, (i, error) => {
+    const addMessage = (messages, error) => {
       if (error.path === self.path) {
         messages.push(error.message)
       }
-    })
-
+      return messages
+    }
+    const messages = errors.reduce(addMessage, [])
     this.input.controlgroup = this.control
 
     if (messages.length) {

src/editors/describedby.js

@@ -1,6 +1,6 @@
 /* hyper-link describeBy Editor */
 import { AbstractEditor } from '../editor.js'
-import { extend, each } from '../utilities.js'
+import { extend } from '../utilities.js'
 
 export class DescribedByEditor extends AbstractEditor {
   register () {
@@ -72,7 +72,7 @@ export class DescribedByEditor extends AbstractEditor {
 
     this.register()
 
-    each(this.editors, (ref, editor) => {
+    this.editors.forEach((editor, ref) => {
       if (!editor) return
       if (self.currentEditor === ref) {
         editor.container.style.display = ''
@@ -169,7 +169,7 @@ export class DescribedByEditor extends AbstractEditor {
   }
 
   destroy () {
-    each(this.editors, (i, editor) => {
+    this.editors.forEach(editor => {
       if (editor) editor.destroy()
     })
 
@@ -181,7 +181,7 @@ export class DescribedByEditor extends AbstractEditor {
   }
 
   showValidationErrors (errors) {
-    each(this.editors, (i, editor) => {
+    this.editors.forEach(editor => {
       if (!editor) return
       editor.showValidationErrors(errors)
     })

src/editors/enum.js

@@ -1,6 +1,5 @@
 /* Enum Editor (used for objects and arrays with enumerated values) */
 import { AbstractEditor } from '../editor.js'
-import { each } from '../utilities.js'
 
 export class EnumEditor extends AbstractEditor {
   getNumColumns () {
@@ -50,7 +49,7 @@ export class EnumEditor extends AbstractEditor {
     const self = this
     self.selected = -1
     const stringified = JSON.stringify(this.value)
-    each(this.enum, (i, el) => {
+    this.enum.forEach((el, i) => {
       if (stringified === JSON.stringify(el)) {
         self.selected = i
         return false
@@ -81,26 +80,31 @@ export class EnumEditor extends AbstractEditor {
 
   getHTML (el) {
     const self = this
+    const each = (obj, callback) => {
+      if (Array.isArray(obj) || (typeof obj.length === 'number' && obj.length > 0 && (obj.length - 1) in obj)) {
+        Array.from(obj).forEach((e, i) => callback(i, e))
+      } else {
+        Object.entries(obj).forEach(([key, value]) => callback(key, value))
+      }
+    }
 
     if (el === null) {
       return '<em>null</em>'
       /* Array or Object */
     } else if (typeof el === 'object') {
       /* TODO: use theme */
       let ret = ''
-
-      each(el, (i, child) => {
+      const callback = (i, child) => {
         let html = self.getHTML(child)
-
         /* Add the keys to object children */
         if (!(Array.isArray(el))) {
           /* TODO: use theme */
           html = `<div><em>${i}</em>: ${html}</div>`
         }
-
         /* TODO: use theme */
         ret += `<li>${html}</li>`
-      })
+      }
+      each(el, callback)
 
       if (Array.isArray(el)) ret = `<ol>${ret}</ol>`
       else ret = `<ul style='margin-top:0;margin-bottom:0;padding-top:0;padding-bottom:0;'>${ret}</ul>`