Add linter fixes

lib/index.js

@@ -4,8 +4,8 @@ const random = require('./random')
 const utils = require('./utils')
 
 module.exports = {
-    logger,
+  logger,
-    random,
+  random,
-    make,
+  make,
-    utils
+  utils
 }

lib/logging/console.js

@@ -19,7 +19,6 @@ if (utils.platform.name.isWindows) {
 }
 
 class logger {
-
   static console (msg) {
     if (websocket) {
       websocket.send(msg)
@@ -31,7 +30,7 @@ class logger {
         console.log(msg)
       }
     } else if (window.dump) {
-      dump(msg)
+      dump(msg) // eslint-disable-line no-undef
     } else if (window.console && window.console.log) {
       console.log(msg)
     } else {

lib/logging/index.js

@@ -3,13 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 class logging {
-	constructor () {
+  static get logger () {
-	}
+    // Or: const {logger} = require('./logging')
-
+    return require('./console')
-	static get logger () {
+  }
-        // Or: const {logger} = require('./logging')
-		return require('./console')
-    }
 }
 
 module.exports = logging

lib/make/alignment.js

@@ -6,17 +6,17 @@ const make = require('../make')
 const random = require('../random')
 
 class alignment extends make {
-	static horizontal () {
+  static horizontal () {
-		return random.item(['left', 'right', 'justify', 'center'])
+    return random.item(['left', 'right', 'justify', 'center'])
-	}
+  }
 
-	static vertical () {
+  static vertical () {
-		return random.item(['top', 'bottom', 'middle', 'baseline'])
+    return random.item(['top', 'bottom', 'middle', 'baseline'])
-	}
+  }
 
-	static any () {
+  static any () {
-		return random.pick([this.horizontal, this.vertical])
+    return random.pick([this.horizontal, this.vertical])
-	}
+  }
 }
 
 module.exports = alignment

lib/make/crypto.js

@@ -2,8 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const make = require('../make')
 const random = require('../random')
+const make = require('../make')
+const utils = require('../utils')
 
 class crypto extends make {
   static get keyFormats () {
@@ -54,8 +55,8 @@ class crypto extends make {
     ]
   }
 
-  static randomCurve (){
+  static randomCurve () {
-    return  random.item(this.curves)
+    return random.item(this.curves)
   }
 
   static get jwkUsages () {

lib/make/fonts.js

@@ -83,7 +83,7 @@ class font extends make {
     ])
   }
 
-  static font() {
+  static font () {
     let s = ''
     if (random.chance(4)) {
       s += random.pick(this.style) + ' '

lib/make/index.js

@@ -3,89 +3,89 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 class make {
-	static get number () {
+  static get number () {
-		return require('./numbers')
+    return require('./numbers')
-	}
+  }
 
-	static get alignment () {
+  static get alignment () {
-		return require('./alignment')
+    return require('./alignment')
-	}
+  }
 
-	static get arrays () {
+  static get arrays () {
-		return require('./arrays')
+    return require('./arrays')
-	}
+  }
 
-	static get colors () {
+  static get colors () {
-		return require('./colors')
+    return require('./colors')
-	}
+  }
 
-	static get command () {
+  static get command () {
-		return require('./command')
+    return require('./command')
-	}
+  }
 
-	static get crypto () {
+  static get crypto () {
-		return require('./crypto')
+    return require('./crypto')
-	}
+  }
 
-	static get datetime () {
+  static get datetime () {
-		return require('./datetime')
+    return require('./datetime')
-	}
+  }
 
-	static get files () {
+  static get files () {
-		return require('./files')
+    return require('./files')
-	}
+  }
 
-	static get font () {
+  static get font () {
-		return require('./fonts')
+    return require('./fonts')
-	}
+  }
 
-	static get html () {
+  static get html () {
-		return require('./html')
+    return require('./html')
-	}
+  }
 
-	static get mime () {
+  static get mime () {
-		return require('./mime')
+    return require('./mime')
-	}
+  }
 
-	static get network () {
+  static get network () {
-		return require('./network')
+    return require('./network')
-	}
+  }
 
-	static get shaders () {
+  static get shaders () {
-		return require('./shaders')
+    return require('./shaders')
-	}
+  }
 
-	static get style () {
+  static get style () {
-		return require('./style')
+    return require('./style')
-	}
+  }
 
-	static get text () {
+  static get text () {
-		return require('./text')
+    return require('./text')
-	}
+  }
 
-	static get time () {
+  static get time () {
-		return require('./time')
+    return require('./time')
-	}
+  }
 
-	static get typed () {
+  static get typed () {
-		return require('./typed')
+    return require('./typed')
-	}
+  }
 
-	static get types () {
+  static get types () {
-		return require('./types')
+    return require('./types')
-	}
+  }
 
-	static get unit () {
+  static get unit () {
-		return require('./units')
+    return require('./units')
-	}
+  }
 
-	static get uri () {
+  static get uri () {
-		return require('./uri')
+    return require('./uri')
-	}
+  }
 
-	static get webgl () {
+  static get webgl () {
-		return require('./webgl')
+    return require('./webgl')
-	}
+  }
 }
 
 module.exports = make

lib/make/numbers.js

@@ -60,7 +60,7 @@ class number extends make {
     return Math.pow(2, random.number(random.number(65))) + random.number(3) - 1
   }
 
-  static even(number) {
+  static even (number) {
     return number % 2 === 1 ? ++number : number
   }
 

lib/make/shaders.js

@@ -2,8 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const make = require('../make')
 const random = require('../random')
+const make = require('../make')
+const utils = require('../utils')
 
 class shaders extends make {
   static get fragment1 () {
@@ -29,7 +30,7 @@ class shaders extends make {
     ]
   }
 
-  static get vertex1() {
+  static get vertex1 () {
     return [
       [
         'attribute vec4 aVertex;',
@@ -63,7 +64,7 @@ class shaders extends make {
     ]
   }
 
-  static get fragment2() {
+  static get fragment2 () {
     return [
       [
         'varying highp vec2 vTextureCoord;',
@@ -96,7 +97,7 @@ class shaders extends make {
     ]
   }
 
-  static get vertex2() {
+  static get vertex2 () {
     return [
       [
         'attribute highp vec3 aVertexNormal;',

lib/make/text.js

@@ -2,8 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const make = require('../make')
 const random = require('../random')
+const make = require('../make')
+const utils = require('../utils')
 
 class text extends make {
   static lineEnd () {

lib/random/mersennetwister.js

@@ -28,28 +28,28 @@ class MersenneTwister {
     }
   }
 
-  export_state () {
+  export_state () { // eslint-disable-line camelcase
     return [this.mt, this.mti]
   }
 
-  import_state (s) {
+  import_state (s) { // eslint-disable-line camelcase
     this.mt = s[0]
     this.mti = s[1]
   }
 
-  export_mta () {
+  export_mta () { // eslint-disable-line camelcase
     return this.mt
   }
 
-  import_mta (_mta) {
+  import_mta (_mta) { // eslint-disable-line camelcase
     this.mt = _mta
   }
 
-  export_mti () {
+  export_mti () { // eslint-disable-line camelcase
     return this.mti
   }
 
-  import_mti (_mti) {
+  import_mti (_mti) { // eslint-disable-line camelcase
     this.mti = _mti
   }
 
@@ -58,8 +58,8 @@ class MersenneTwister {
 
     if (this.mti >= this.N) { /* generate N words at one time */
       for (kk = 0; kk < this.N - this.M; kk++) {
-      y = ((this.mt[kk] & this.UPPER_MASK) | (this.mt[kk + 1] & this.LOWER_MASK))
+        y = ((this.mt[kk] & this.UPPER_MASK) | (this.mt[kk + 1] & this.LOWER_MASK))
-      this.mt[kk] = (this.mt[kk + this.M] ^ (y >>> 1) ^ this.MAG01[y & 0x1])
+        this.mt[kk] = (this.mt[kk + this.M] ^ (y >>> 1) ^ this.MAG01[y & 0x1])
       }
       for (; kk < this.N - 1; kk++) {
         y = ((this.mt[kk] & this.UPPER_MASK) | (this.mt[kk + 1] & this.LOWER_MASK))

lib/random/random.js

@@ -6,7 +6,6 @@ const MersenneTwister = require('./mersennetwister')
 const {logger} = require('../logging')
 
 class random {
-
   /**
    * Must be called before any other methods can be called to initialize MersenneTwister.
    * @param {number|null|undefined} seed Value to initialize MersenneTwister.

lib/utils/block.js

@@ -2,6 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+const random = require('../random')
 const utils = require('../utils')
 
 class block extends utils {

lib/utils/common.js

@@ -1,7 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
+const utils = require('../utils')
 
 class common extends utils {
   static objToString (obj) {

lib/utils/index.js

@@ -1,27 +1,27 @@
 class utils {
-    static get common () {
+  static get common () {
-        return require('./common')
+    return require('./common')
-    }
+  }
 
-	static get block () {
+  static get block () {
-		return require('./block')
+    return require('./block')
-    }
+  }
 
-    static get mutate () {
+  static get mutate () {
-		return require('./mutate')
+    return require('./mutate')
-    }
+  }
 
-    static Objects () {
+  static Objects () {
-        return require('./objects')
+    return require('./objects')
-    }
+  }
 
-    static get platform () {
+  static get platform () {
-        return require('./platform')
+    return require('./platform')
-    }
+  }
 
-    static get script () {
+  static get script () {
-        return require('./script')
+    return require('./script')
-    }
+  }
 }
 
 module.exports = utils

lib/utils/objects.js

@@ -2,6 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+const random = require('../random')
 const utils = require('../utils')
 const {logger} = require('../logging')
 
@@ -113,4 +114,4 @@ class Objects {
   }
 }
 
-module.exports = Object
+module.exports = {Objects, o}

lib/utils/script.js

@@ -2,8 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const utils = require('../utils')
 const random = require('../random')
+const make = require('../make')
+const utils = require('../utils')
+const {o} = require('../objects')
 
 class script extends utils {
   static methodHead (list, numOptional) {

package.json

@@ -2,13 +2,7 @@
   "name": "octo",
   "version": "1.0.0",
   "description": "",
-  "keywords": [
+  "keywords": ["fuzzing", "browser", "javascript", "node", "library"],
-    "fuzzing",
-    "browsers",
-    "javascript",
-    "node",
-    "library"
-  ],
   "homepage": "https://github.com/mozillasecurity/octo",
   "repository": {
     "type": "git",
@@ -32,17 +26,7 @@
   "standard": {
     "ignore": [
       "tests/**",
-      "deploy/"
+      "dist/"
-    ],
-    "globals": [
-      "random",
-      "make",
-      "utils",
-      "logger",
-      "MersenneTwister",
-      "o",
-      "btoa",
-      "atob"
     ],
     "envs": [
       "browser"

webpack.config.js

@@ -1,14 +1,13 @@
 const path = require('path')
-const webpack = require("webpack")
 
 let config = {
-    entry: './lib/index.js',
+  entry: './lib/index.js',
-    output: {
+  output: {
-        filename: 'octo.js',
+    filename: 'octo.js',
-        library: 'octo',
+    library: 'octo',
-        path: path.resolve(__dirname, 'dist'),
+    path: path.resolve(__dirname, 'dist'),
-        libraryTarget: 'var'
+    libraryTarget: 'var'
-    }
+  }
 }
 
 module.exports = config