Updated formatting

Author: roll

.eslintrc

@@ -1,86 +1,17 @@
-extends:
-  airbnb
-
-env:
-  es6: true
-  node: true
-  mocha: true
-  browser: true
-
-parserOptions:
-  sourceType: module
-
-rules:
-  quotes:
-    - error
-    - single
-    - avoid-escape
-  semi:
-    - error
-    - never
-  no-empty:
-    - error
-    - allowEmptyCatch: true
-  no-use-before-define:
-    - off
-    - nofunc
-  one-var:
-    - off
-  eqeqeq:
-    - error
-    - smart
-  no-unused-vars:
-    - error
-  no-param-reassign:
-    - off
-  no-cond-assign:
-    - error
-    - except-parens
-  arrow-parens:
-    - error
-    - as-needed
-  object-curly-spacing:
-    - off
-  no-underscore-dangle:
-    - off
-  class-methods-use-this:
-    - off
-  arrow-body-style:
-    - off
-  padded-blocks:
-    - off
-  global-require:
-    - off
-  no-restricted-syntax:
-    - error
-    - WithStatement
-  no-unused-expressions:
-    - off
-  func-names:
-    - off
-  space-before-function-paren:
-    - off
-  block-spacing:
-    - off
-  space-infix-ops:
-    - off
-  consistent-return:
-    - off
-  no-shadow:
-    - off
-  no-console:
-    - off
-  no-continue:
-    - off
-  no-prototype-builtins:
-    - off
-  no-lonely-if:
-    - off
-  no-confusing-arrow:
-    - off
-  import/no-dynamic-require:
-    - off
-  import/newline-after-import:
-    - off
-  import/prefer-default-export:
-    - off
+{
+  "parser": "babel-eslint",
+  "extends": [
+    "standard",
+  ],
+  "env": {
+    "mocha": true
+  },
+  "rules": {
+    "no-prototype-builtins": "off",
+    "space-before-function-paren": "off",
+    "comma-dangle": ["error", {
+      "arrays": "always-multiline",
+      "objects": "always-multiline"
+    }]
+  }
+}

.huskyrc

@@ -0,0 +1,5 @@
+{
+  "hooks": {
+    "pre-commit": "npm run test"
+  }
+}

.prettierrc

@@ -0,0 +1,6 @@
+{
+  "semi": false,
+  "singleQuote": true,
+  "trailingComma": "es5",
+  "printWidth": 100
+}

package.json

@@ -18,9 +18,9 @@
     "build:dist": "webpack --progress --hide-modules",
     "build:dist-min": "NODE_ENV=production webpack --progress --hide-modules",
     "coveralls": "cat ./coverage/lcov.info | coveralls",
-    "lint": "eslint src test",
+    "format": "prettier --write '{src,test}/**/*.js' && eslint --fix '{src,test}/**/*.js'",
+    "lint": "prettier --check '{src,test}/**/*.js' && eslint '{src,test}/**/*.js'",
     "prepublish": "npm run build",
-    "prepush": "npm run test",
     "pretest": "npm run lint",
     "profiles": "npm run profiles:registry && npm run profiles:data-package && npm run profiles:tabular-data-package && npm run profiles:fiscal-data-package && npm run profiles:data-resource && npm run profiles:tabular-data-resource",
     "profiles:registry": "wget -O src/profiles/registry.json https://specs.frictionlessdata.io/schemas/registry.json",
@@ -51,6 +51,7 @@
     "axios-mock-adapter": "^1.8.1",
     "babel": "^6.5.2",
     "babel-cli": "^6.24.1",
+    "babel-eslint": "^10.1.0",
     "babel-istanbul": "^0.12.2",
     "babel-loader": "^6.2.1",
     "babel-plugin-istanbul": "^3.1.2",
@@ -65,11 +66,13 @@
     "chai": "^3.5.0",
     "coveralls": "^3.0.6",
     "doctoc": "^1.4.0",
-    "eslint": "^4.19.1",
-    "eslint-config-airbnb": "^13.0.0",
-    "eslint-plugin-import": "^2.2.0",
-    "eslint-plugin-jsx-a11y": "2.2.3",
-    "eslint-plugin-react": "^6.8.0",
+    "eslint": "^6.8.0",
+    "eslint-config-standard": "^14.1.0",
+    "eslint-plugin-import": "^2.20.0",
+    "eslint-plugin-node": "^11.0.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-react": "^7.18.3",
+    "eslint-plugin-standard": "^4.0.1",
     "husky": "^3.0.8",
     "jsdom": "^15.1.1",
     "json-loader": "^0.5.4",
@@ -82,6 +85,7 @@
     "mocha": "^6.2.1",
     "mocha-lcov-reporter": "^1.2.0",
     "nyc": "^14.1.1",
+    "prettier": "^2.0.2",
     "referencer": "^0.2.5",
     "sinon": "^2.1.0",
     "sinon-chai": "^2.9.0",

src/config.js

@@ -1,6 +1,6 @@
 // Module API
 
-const IS_BROWSER = (typeof window !== 'undefined')
+const IS_BROWSER = typeof window !== 'undefined'
 const TABULAR_FORMATS = ['csv', 'tsv', 'xls', 'xlsx']
 const DEFAULT_DATA_PACKAGE_PROFILE = 'data-package'
 const DEFAULT_RESOURCE_PROFILE = 'data-resource'
@@ -18,7 +18,6 @@ const DEFAULT_DIALECT = {
   caseSensitiveHeader: false,
 }
 
-
 // System
 
 module.exports = {

src/errors.js

@@ -1,6 +1,5 @@
 const tableschema = require('tableschema')
 
-
 // Module API
 
 /**
@@ -13,7 +12,6 @@ const DataPackageError = tableschema.errors.DataPackageError
  */
 const TableSchemaError = tableschema.errors.TableSchemaError
 
-
 // System
 
 module.exports = {

src/helpers.js

@@ -5,11 +5,10 @@ const isString = require('lodash/isString')
 const cloneDeep = require('lodash/cloneDeep')
 const isPlainObject = require('lodash/isPlainObject')
 const jsonpointer = require('json-pointer')
-const {DataPackageError} = require('./errors')
+const { DataPackageError } = require('./errors')
 const config = require('./config')
 const omit = require('lodash/omit')
 
-
 // Locate descriptor
 
 function locateDescriptor(descriptor) {
@@ -19,23 +18,21 @@ function locateDescriptor(descriptor) {
   if (isString(descriptor)) {
     basePath = descriptor.split('/').slice(0, -1).join('/') || '.'
 
-  // Current dir by default
+    // Current dir by default
   } else {
     basePath = '.'
   }
 
   return basePath
 }
 
-
 // Retrieve descriptor
 
 async function retrieveDescriptor(descriptor) {
   if (isPlainObject(descriptor)) {
     return cloneDeep(descriptor)
   }
   if (isString(descriptor)) {
-
     // Remote
     if (isRemotePath(descriptor)) {
       try {
@@ -46,7 +43,7 @@ async function retrieveDescriptor(descriptor) {
         throw new DataPackageError(message)
       }
 
-    // Local
+      // Local
     } else {
       if (config.IS_BROWSER) {
         const message = `Local descriptor "${descriptor}" in browser is not supported`
@@ -61,25 +58,25 @@ async function retrieveDescriptor(descriptor) {
         throw new DataPackageError(message)
       }
     }
-
   }
   throw new DataPackageError('Descriptor must be String or Object')
 }
 
-
 // Dereference descriptor
 
 async function dereferencePackageDescriptor(descriptor, basePath) {
   descriptor = cloneDeep(descriptor)
   for (const [index, resource] of (descriptor.resources || []).entries()) {
     // TODO: May be we should use Promise.all here
     descriptor.resources[index] = await dereferenceResourceDescriptor(
-      resource, basePath, descriptor)
+      resource,
+      basePath,
+      descriptor
+    )
   }
   return descriptor
 }
 
-
 async function dereferenceResourceDescriptor(descriptor, basePath, baseDescriptor) {
   descriptor = cloneDeep(descriptor)
   baseDescriptor = baseDescriptor || descriptor
@@ -91,7 +88,7 @@ async function dereferenceResourceDescriptor(descriptor, basePath, baseDescripto
     if (!isString(value)) {
       continue
 
-    // URI -> Pointer
+      // URI -> Pointer
     } else if (value.startsWith('#')) {
       try {
         descriptor[property] = jsonpointer.get(baseDescriptor, value.slice(1))
@@ -100,7 +97,7 @@ async function dereferenceResourceDescriptor(descriptor, basePath, baseDescripto
         throw new DataPackageError(message)
       }
 
-    // URI -> Remote
+      // URI -> Remote
     } else {
       if (basePath && isRemotePath(basePath)) {
         // TODO: support other that Unix OS
@@ -115,7 +112,7 @@ async function dereferenceResourceDescriptor(descriptor, basePath, baseDescripto
           throw new DataPackageError(message)
         }
 
-      // URI -> Local
+        // URI -> Local
       } else {
         if (config.IS_BROWSER) {
           const message = 'Local URI dereferencing in browser is not supported'
@@ -146,7 +143,6 @@ async function dereferenceResourceDescriptor(descriptor, basePath, baseDescripto
   return descriptor
 }
 
-
 // Expand descriptor
 
 function expandPackageDescriptor(descriptor) {
@@ -158,17 +154,15 @@ function expandPackageDescriptor(descriptor) {
   return descriptor
 }
 
-
 function expandResourceDescriptor(descriptor) {
   descriptor = cloneDeep(descriptor)
   descriptor.profile = descriptor.profile || config.DEFAULT_RESOURCE_PROFILE
   descriptor.encoding = descriptor.encoding || config.DEFAULT_RESOURCE_ENCODING
   if (descriptor.profile === 'tabular-data-resource') {
-
     // Schema
     const schema = descriptor.schema
     if (schema !== undefined) {
-      for (const field of (schema.fields || [])) {
+      for (const field of schema.fields || []) {
         field.type = field.type || config.DEFAULT_FIELD_TYPE
         field.format = field.format || config.DEFAULT_FIELD_FORMAT
       }
@@ -192,14 +186,18 @@ function expandResourceDescriptor(descriptor) {
 
 // quoteChar and escapeChar are mutually exclusive: https://frictionlessdata.io/specs/csv-dialect/#specification
 function filterDefaultDialect(dialect = {}) {
-  const defaultDialects = dialect.hasOwnProperty('escapeChar') ? omit(config.DEFAULT_DIALECT, 'quoteChar') : config.DEFAULT_DIALECT
+  const defaultDialects = dialect.hasOwnProperty('escapeChar')
+    ? omit(config.DEFAULT_DIALECT, 'quoteChar')
+    : config.DEFAULT_DIALECT
   return defaultDialects
 }
 
 // quoteChar and escapeChar are mutually exclusive: https://frictionlessdata.io/specs/csv-dialect/#specification
 function validateDialect(dialect = {}) {
   if (dialect.hasOwnProperty('escapeChar') && dialect.hasOwnProperty('quoteChar')) {
-    throw new DataPackageError('Resource.table dialect options quoteChar and escapeChar are mutually exclusive.')
+    throw new DataPackageError(
+      'Resource.table dialect options quoteChar and escapeChar are mutually exclusive.'
+    )
   }
   return dialect
 }
@@ -209,10 +207,9 @@ function isRemotePath(path) {
   return path.startsWith('http')
 }
 
-
 function isSafePath(path) {
-  const containsWindowsVar = path => path.match(/%.+%/)
-  const containsPosixVar = path => path.match(/\$.+/)
+  const containsWindowsVar = (path) => path.match(/%.+%/)
+  const containsPosixVar = (path) => path.match(/\$.+/)
 
   // Safety checks
   const unsafenessConditions = [
@@ -226,7 +223,6 @@ function isSafePath(path) {
   return !unsafenessConditions.some(Boolean)
 }
 
-
 // System
 
 module.exports = {

src/index.js

@@ -5,8 +5,7 @@ const { Profile } = require('./profile')
 const { validate } = require('./validate')
 const { infer } = require('./infer')
 const { DataPackageError } = require('./errors')
-const {TableSchemaError} = require('./errors')
-
+const { TableSchemaError } = require('./errors')
 
 // Module API