Update "standard" to 14.3.3

tohosaku · tohosaku · commit 9d08c120224f · 2020-03-18T23:28:30.000+09:00
* fix eslint errors
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -86,7 +86,7 @@
     "remove-strict-webpack-plugin": "^0.1.2",
     "sceditor": "^2.1.3",
     "sinon": "^8.1.1",
-    "standard": "^11.0.1",
+    "standard": "^14.3.3",
     "style-loader": "^1.1.3",
     "webpack": "^4.41.6",
     "webpack-cli": "^3.3.11",
diff --git a/src/core.js b/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, getShadowParent } from './utilities.js'
+import { extend, getShadowParent, hasOwnProperty } from './utilities.js'
 
 export class JSONEditor {
   constructor (element, options = {}) {
@@ -74,7 +74,7 @@ export class JSONEditor {
       this.root.postBuild()
 
       /* Starting data */
-      if (this.options.hasOwnProperty('startval')) this.root.setValue(this.options.startval)
+      if (hasOwnProperty(this.options, 'startval')) this.root.setValue(this.options.startval)
 
       this.validation_results = this.validator.validate(this.root.getValue())
       this.root.showValidationErrors(this.validation_results)
diff --git a/src/editor.js b/src/editor.js
@@ -1,4 +1,4 @@
-import { extend } from './utilities.js'
+import { extend, hasOwnProperty } from './utilities.js'
 
 /**
  * All editors should extend from this class
@@ -130,10 +130,10 @@ export class AbstractEditor {
         this.dependenciesFulfilled = choices === value
       } else {
         Object.keys(choices).some(key => {
-          if (!choices.hasOwnProperty(key)) {
+          if (!hasOwnProperty(choices, key)) {
             return false
           }
-          if (!value.hasOwnProperty(key) || choices[key] !== value[key]) {
+          if (!hasOwnProperty(value, key) || choices[key] !== value[key]) {
             self.dependenciesFulfilled = false
             return true
           }
@@ -223,7 +223,7 @@ export class AbstractEditor {
       }
     }
 
-    if (this.schema.hasOwnProperty('watch')) {
+    if (hasOwnProperty(this.schema, 'watch')) {
       let path; let pathParts; let first; let root; let adjustedPath
       const myPath = self.container.getAttribute('data-schemapath')
 
@@ -526,12 +526,12 @@ export class AbstractEditor {
   }
 
   getDefault () {
-    if (typeof this.schema['default'] !== 'undefined') {
-      return this.schema['default']
+    if (typeof this.schema.default !== 'undefined') {
+      return this.schema.default
     }
 
-    if (typeof this.schema['enum'] !== 'undefined') {
-      return this.schema['enum'][0]
+    if (typeof this.schema.enum !== 'undefined') {
+      return this.schema.enum[0]
     }
 
     let type = this.schema.type || this.schema.oneOf
diff --git a/src/editors/array/choices.js b/src/editors/array/choices.js
@@ -18,10 +18,10 @@ export class ArrayChoicesEditor extends MultiSelectEditor {
 
   afterInputReady () {
     if (window.Choices && !this.choices_instance) {
-      let options; const self = this
+      const self = this
       /* Get options, either global options from "this.defaults.options.choices" or */
       /* single property options from schema "options.choices" */
-      options = this.expandCallbacks('choices', extend({}, {
+      const options = this.expandCallbacks('choices', extend({}, {
         removeItems: true,
         removeItemButton: true
       }, this.defaults.options.choices || {}, this.options.choices || {}, {
diff --git a/src/editors/array/select2.js b/src/editors/array/select2.js
@@ -1,5 +1,5 @@
 import { MultiSelectEditor } from '../multiselect.js'
-import { extend } from '../../utilities.js'
+import { extend, hasOwnProperty } from '../../utilities.js'
 
 export class ArraySelect2Editor extends MultiSelectEditor {
   setValue (value, initial) {
@@ -31,7 +31,7 @@ export class ArraySelect2Editor extends MultiSelectEditor {
       this.newEnumAllowed = options.tags = !!options.tags && this.schema.items && this.schema.items.type === 'string'
 
       this.select2_instance = window.jQuery(this.input).select2(options)
-      this.select2v4 = this.select2_instance.select2.hasOwnProperty('amd')
+      this.select2v4 = hasOwnProperty(this.select2_instance.select2, 'amd')
 
       this.selectChangeHandler = () => {
         const value = self.select2v4 ? self.select2_instance.val() : self.select2_instance.select2('val')
diff --git a/src/editors/choices.js b/src/editors/choices.js
@@ -26,10 +26,9 @@ export class ChoicesEditor extends SelectEditor {
 
   afterInputReady () {
     if (window.Choices && !this.choices_instance) {
-      let options
       /* Get options, either global options from "this.defaults.options.choices" or */
       /* single property options from schema "options.choices" */
-      options = this.expandCallbacks('choices', extend({}, this.defaults.options.choices || {}, this.options.choices || {}))
+      const options = this.expandCallbacks('choices', extend({}, this.defaults.options.choices || {}, this.options.choices || {}))
 
       this.choices_instance = new window.Choices(this.input, options)
     }
diff --git a/src/editors/object.js b/src/editors/object.js
@@ -1,5 +1,5 @@
 import { AbstractEditor } from '../editor.js'
-import { extend, trigger } from '../utilities.js'
+import { extend, trigger, hasOwnProperty } from '../utilities.js'
 
 export class ObjectEditor extends AbstractEditor {
   getDefault () {
@@ -891,19 +891,16 @@ export class ObjectEditor extends AbstractEditor {
 
   addPropertyCheckbox (key) {
     const self = this
-    let checkbox
-    let label
     let labelText
-    let control
 
-    checkbox = self.theme.getCheckbox()
+    const checkbox = self.theme.getCheckbox()
     checkbox.style.width = 'auto'
 
     if (this.schema.properties[key] && this.schema.properties[key].title) { labelText = this.schema.properties[key].title } else { labelText = key }
 
-    label = self.theme.getCheckboxLabel(labelText)
+    const label = self.theme.getCheckboxLabel(labelText)
 
-    control = self.theme.getFormControl(label, checkbox)
+    const control = self.theme.getFormControl(label, checkbox)
     control.style.paddingBottom = control.style.marginBottom = control.style.paddingTop = control.style.marginTop = 0
     control.style.height = 'auto'
     /* control.style.overflowY = 'hidden'; */
@@ -1121,7 +1118,7 @@ export class ObjectEditor extends AbstractEditor {
         this.addproperty_checkboxes[i].disabled = this.addproperty_checkboxes[i].checked
         if (!this.addproperty_checkboxes[i].checked) showModal = true
       } else if (!(i in this.editors)) {
-        if (!canAdd && !this.schema.properties.hasOwnProperty(i)) {
+        if (!canAdd && !hasOwnProperty(this.schema.properties, i)) {
           this.addproperty_checkboxes[i].disabled = true
         } else {
           this.addproperty_checkboxes[i].disabled = false
diff --git a/src/editors/select2.js b/src/editors/select2.js
@@ -1,5 +1,5 @@
 import { SelectEditor } from './select.js'
-import { extend } from '../utilities.js'
+import { extend, hasOwnProperty } from '../utilities.js'
 
 export class Select2Editor extends SelectEditor {
   setValue (value, initial) {
@@ -28,7 +28,7 @@ export class Select2Editor extends SelectEditor {
       this.newEnumAllowed = options.tags = !!options.tags && this.schema.type === 'string'
 
       this.select2_instance = window.jQuery(this.input).select2(options)
-      this.select2v4 = this.select2_instance.select2.hasOwnProperty('amd')
+      this.select2v4 = hasOwnProperty(this.select2_instance.select2, 'amd')
 
       /* Create change handler */
       this.selectChangeHandler = () => {
diff --git a/src/iconlib.js b/src/iconlib.js
@@ -1,5 +1,5 @@
 
-const defaultMapping = { collapse: '', expand: '', 'delete': '', edit: '', add: '', cancel: '', save: '', moveup: '', movedown: '' }
+const defaultMapping = { collapse: '', expand: '', delete: '', edit: '', add: '', cancel: '', save: '', moveup: '', movedown: '' }
 
 export class AbstractIconLib {
   constructor (iconPrefix = '', mapping = defaultMapping) {
diff --git a/src/resolvers.js b/src/resolvers.js
@@ -48,7 +48,7 @@ const enumSource = schema => {
 
 /* Use the `enum` or `select` editors for schemas with enumerated properties */
 const enumeratedProperties = schema => {
-  if (schema['enum']) {
+  if (schema.enum) {
     if (schema.type === 'array' || schema.type === 'object') return 'enum'
     if (schema.type === 'number' || schema.type === 'integer' || schema.type === 'string') {
       if (schema.format === 'radio') return 'radio'
diff --git a/src/schemaloader.js b/src/schemaloader.js
@@ -1,4 +1,4 @@
-import { extend } from './utilities.js'
+import { extend, hasOwnProperty } from './utilities.js'
 
 export class SchemaLoader {
   constructor (options) {
@@ -99,7 +99,7 @@ export class SchemaLoader {
     const ref = this._getRef(fetchUrl, refObj)
     if (!this.refs[ref]) { /* if reference not found */
       console.warn(`reference:'${ref}' not found!`)
-    } else if (recurseAllOf && this.refs[ref].hasOwnProperty('allOf')) {
+    } else if (recurseAllOf && hasOwnProperty(this.refs[ref], 'allOf')) {
       const allOf = this.refs[ref].allOf
       Object.keys(allOf).forEach(key => {
         allOf[key] = this.expandRefs(allOf[key], true)
diff --git a/src/theme.js b/src/theme.js
@@ -6,7 +6,7 @@ const matchKey = [
   'oMatchesSelector'].find(key => key in document.documentElement)
 
 export class AbstractTheme {
-  constructor (jsoneditor, options = { 'disable_theme_rules': false }) {
+  constructor (jsoneditor, options = { disable_theme_rules: false }) {
     this.jsoneditor = jsoneditor
 
     /* Theme config options that allows changing various aspects of the output */
@@ -343,6 +343,7 @@ export class AbstractTheme {
   getCheckboxDescription (text) {
     return this.getDescription(text)
   }
+
   getFormInputDescription (text) {
     return this.getDescription(text)
   }
diff --git a/src/themes/bootstrap4.js b/src/themes/bootstrap4.js
@@ -338,6 +338,7 @@ export class bootstrap4Theme extends AbstractTheme {
 
     return el
   }
+
   getButtonHolder () {
     const el = document.createElement('span')
     el.classList.add('btn-group')
@@ -401,6 +402,7 @@ export class bootstrap4Theme extends AbstractTheme {
 
     input.errmsg.textContent = text
   }
+
   removeInputError (input) {
     if (!input.errmsg) return
     input.errmsg.style.display = 'none'
@@ -529,6 +531,7 @@ export class bootstrap4Theme extends AbstractTheme {
 
     return container
   }
+
   updateProgressBar (progressBar, progress) {
     if (!progressBar) return
 
diff --git a/src/themes/materialize.js b/src/themes/materialize.js
@@ -323,15 +323,14 @@ export class materializeTheme extends AbstractTheme {
   addInputError (input, text) {
     /* Get the parent element. Should most likely be a <div class="input-field" ... />. */
     const parent = input.parentNode
-    let el
 
     if (!parent) return
 
     /* Remove any previous error. */
     this.removeInputError(input)
 
     /* Append an error message div. */
-    el = document.createElement('div')
+    const el = document.createElement('div')
     el.classList.add('error-text', 'red-text')
     el.textContent = text
     parent.appendChild(el)
@@ -345,12 +344,11 @@ export class materializeTheme extends AbstractTheme {
   removeInputError (input) {
     /* Get the parent element. Should most likely be a <div class="input-field" ... />. */
     const parent = input.parentElement
-    let els
 
     if (!parent) return
 
     /* Remove all elements having class .error-text. */
-    els = parent.getElementsByClassName('error-text')
+    const els = parent.getElementsByClassName('error-text')
     for (let i = 0; i < els.length; i++) { parent.removeChild(els[i]) }
   }
 
diff --git a/src/utilities.js b/src/utilities.js
@@ -15,7 +15,7 @@ export function isPlainObject (obj) {
 
   if (typeof obj !== 'object' || obj.nodeType || (obj === obj.window)) return false
 
-  if (obj.constructor && !Object.prototype.hasOwnProperty.call(obj.constructor.prototype, 'isPrototypeOf')) return false
+  if (obj.constructor && !hasOwnProperty(obj.constructor.prototype, 'isPrototypeOf')) return false
 
   /* Most likely |obj| is a plain object, created by {} or constructed with new Object */
   return true
@@ -29,7 +29,7 @@ export function extend (destination, ...args) {
   args.forEach(source => {
     Object.keys(source).forEach(property => {
       if (source[property] && isPlainObject(source[property])) {
-        if (!destination.hasOwnProperty(property)) destination[property] = {}
+        if (!hasOwnProperty(destination, property)) destination[property] = {}
         extend(destination[property], source[property])
       } else if (Array.isArray(source[property])) {
         destination[property] = deepCopy(source[property])
@@ -56,3 +56,12 @@ export function trigger (el, event) {
 export function getShadowParent (node) {
   return node && (node.toString() === '[object ShadowRoot]' ? node : getShadowParent(node.parentNode))
 }
+
+/**
+ * Helper function to check own property key
+ *
+ * @see https://eslint.org/docs/rules/no-prototype-builtins
+ */
+export function hasOwnProperty (obj, key) {
+  return obj && Object.prototype.hasOwnProperty.call(obj, key)
+}
diff --git a/src/validator.js b/src/validator.js
@@ -1,5 +1,5 @@
 import { ipValidator } from './validators/ip-validator.js'
-import { extend } from './utilities.js'
+import { extend, hasOwnProperty } from './utilities.js'
 
 export class Validator {
   constructor (jsoneditor, schema, options, defaults) {
@@ -434,7 +434,7 @@ export class Validator {
       const properties = this._getSchema(givenSchema).properties
 
       for (const i in properties) {
-        if (!properties.hasOwnProperty(i)) {
+        if (!hasOwnProperty(properties, i)) {
           fit.extra += weight
           continue
         }
@@ -667,13 +667,13 @@ export class Validator {
     }
 
     const validatorRx = {
-      'date': /^(\d{4}\D\d{2}\D\d{2})?$/,
-      'time': /^(\d{2}:\d{2}(?::\d{2})?)?$/,
+      date: /^(\d{4}\D\d{2}\D\d{2})?$/,
+      time: /^(\d{2}:\d{2}(?::\d{2})?)?$/,
       'datetime-local': /^(\d{4}\D\d{2}\D\d{2}[ T]\d{2}:\d{2}(?::\d{2})?)?$/
     }
     const format = {
-      'date': '"YYYY-MM-DD"',
-      'time': '"HH:MM"',
+      date: '"YYYY-MM-DD"',
+      time: '"HH:MM"',
       'datetime-local': '"YYYY-MM-DD HH:MM"'
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { extend } from './utilities.js'`
	`1`	`+import { extend, hasOwnProperty } from './utilities.js'`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* All editors should extend from this class`
`@@ -130,10 +130,10 @@ export class AbstractEditor {`
`130`	`130`	`this.dependenciesFulfilled = choices === value`
`131`	`131`	`} else {`
`132`	`132`	`Object.keys(choices).some(key => {`
`133`		`- if (!choices.hasOwnProperty(key)) {`
	`133`	`+ if (!hasOwnProperty(choices, key)) {`
`134`	`134`	`return false`
`135`	`135`	`}`
`136`		`- if (!value.hasOwnProperty(key) \|\| choices[key] !== value[key]) {`
	`136`	`+ if (!hasOwnProperty(value, key) \|\| choices[key] !== value[key]) {`
`137`	`137`	`self.dependenciesFulfilled = false`
`138`	`138`	`return true`
`139`	`139`	`}`
`@@ -223,7 +223,7 @@ export class AbstractEditor {`
`223`	`223`	`}`
`224`	`224`	`}`
`225`	`225`
`226`		`- if (this.schema.hasOwnProperty('watch')) {`
	`226`	`+ if (hasOwnProperty(this.schema, 'watch')) {`
`227`	`227`	`let path; let pathParts; let first; let root; let adjustedPath`
`228`	`228`	`const myPath = self.container.getAttribute('data-schemapath')`
`229`	`229`
`@@ -526,12 +526,12 @@ export class AbstractEditor {`
`526`	`526`	`}`
`527`	`527`
`528`	`528`	`getDefault () {`
`529`		`- if (typeof this.schema['default'] !== 'undefined') {`
`530`		`- return this.schema['default']`
	`529`	`+ if (typeof this.schema.default !== 'undefined') {`
	`530`	`+ return this.schema.default`
`531`	`531`	`}`
`532`	`532`
`533`		`- if (typeof this.schema['enum'] !== 'undefined') {`
`534`		`- return this.schema['enum'][0]`
	`533`	`+ if (typeof this.schema.enum !== 'undefined') {`
	`534`	`+ return this.schema.enum[0]`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`let type = this.schema.type \|\| this.schema.oneOf`