fix: remove node globals

This PR remove node globals, updates deps and fixes lint problems.

related to this ipfs/js-ipfs#2924

Author: hugomrdias

benchmarks/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 'use strict'
 
 console.log('PID: %s', process.pid)
@@ -24,7 +25,7 @@ const buffers = vectors
 
 const suite = new Benchmark.Suite('cbor')
 
-let vecLength = vectors.length
+const vecLength = vectors.length
 let res = []
 
 suite.add(`encode - node-cbor - ${vecLength}`, () => {
@@ -40,9 +41,11 @@ suite.add(`encode - borc - ${vecLength}`, () => {
 })
 
 suite.add(`encode - stream - borc - ${vecLength}`, () => {
-  const enc = new fastCbor.Encoder({ stream (chunk) {
-    res.push(chunk)
-  } })
+  const enc = new fastCbor.Encoder({
+    stream (chunk) {
+      res.push(chunk)
+    }
+  })
   for (let i = 0; i < vecLength; i++) {
     enc.write(vectors[i].decoded)
   }

bin/cbor2json

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+/* eslint-disable no-console */
 'use strict'
 
 const cbor = require('../src/cbor')

package.json

@@ -38,7 +38,7 @@
     "email": "[email protected]"
   },
   "devDependencies": {
-    "aegir": "^18.0.1",
+    "aegir": "^21.4.5",
     "benchmark": "^2.1.0",
     "budo": "^11.2.0",
     "cbor": "^4.0.0",
@@ -50,10 +50,12 @@
   "readmeFilename": "README.md",
   "dependencies": {
     "bignumber.js": "^9.0.0",
+    "buffer": "^5.5.0",
     "commander": "^2.15.0",
-    "ieee754": "^1.1.8",
-    "iso-url": "~0.4.4",
-    "json-text-sequence": "~0.1.0"
+    "ieee754": "^1.1.13",
+    "iso-url": "~0.4.7",
+    "json-text-sequence": "~0.1.0",
+    "readable-stream": "^3.6.0"
   },
   "engines": {
     "node": ">=4"

src/commented.js

@@ -1,9 +1,7 @@
 'use strict'
 
-const stream = require('stream')
-const util = require('util')
-const utils = require('./utils')
-const Simple = require('./simple')
+const { Buffer } = require('buffer')
+const stream = require('readable-stream')
 const Decoder = require('./decoder')
 const constants = require('./constants')
 const bignumber = require('bignumber.js').BigNumber
@@ -308,7 +306,7 @@ class Commented extends stream.Transform {
       this.push(val.toString())
       this.push('\n')
     } else {
-      this.push(util.inspect(val))
+      this.push(JSON.stringify(val))
       this.push('\n')
     }
 

src/decoder.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { Buffer } = require('buffer')
 const ieee754 = require('ieee754')
 const Bignumber = require('bignumber.js').BigNumber
 
@@ -55,6 +56,7 @@ class Decoder {
 
     // Initialize asm based parser
     this.parser = parser(global, {
+      // eslint-disable-next-line no-console
       log: console.log.bind(console),
       pushInt: this.pushInt.bind(this),
       pushInt32: this.pushInt32.bind(this),
@@ -327,7 +329,7 @@ class Decoder {
   }
 
   createUndefined () {
-    return void 0
+    return undefined
   }
 
   createInfinity () {

src/diagnose.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { Buffer } = require('buffer')
 const Decoder = require('./decoder')
 const utils = require('./utils')
 

src/encoder.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { Buffer } = require('buffer')
 const { URL } = require('iso-url')
 const Bignumber = require('bignumber.js').BigNumber
 
@@ -254,7 +255,7 @@ class Encoder {
     if (!gen._pushInt(obj.size, MT.ARRAY)) {
       return false
     }
-    for (let x of obj) {
+    for (const x of obj) {
       if (!gen.pushAny(x)) {
         return false
       }
@@ -425,7 +426,7 @@ class Encoder {
           case SYMS.NULL:
             return this._pushObject(null)
           case SYMS.UNDEFINED:
-            return this._pushUndefined(void 0)
+            return this._pushUndefined(undefined)
           // TODO: Add pluggable support for other symbols
           default:
             throw new Error('Unknown symbol: ' + obj.toString())

src/simple.js

@@ -89,7 +89,7 @@ class Simple {
         }
       case SIMPLE.UNDEFINED:
         if (hasParent) {
-          return void 0
+          return undefined
         } else {
           return SYMS.UNDEFINED
         }

src/tagged.js

@@ -58,7 +58,7 @@ class Tagged {
    */
   convert (converters) {
     var er, f
-    f = converters != null ? converters[this.tag] : void 0
+    f = converters != null ? converters[this.tag] : undefined
     if (typeof f !== 'function') {
       f = Tagged['_tag' + this.tag]
       if (typeof f !== 'function') {

src/utils.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { Buffer } = require('buffer')
 const Bignumber = require('bignumber.js').BigNumber
 
 const constants = require('./constants')

test/decoder.spec.js

@@ -1,6 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
+const { Buffer } = require('buffer')
 const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect

test/encoder.spec.js

@@ -1,7 +1,7 @@
 /* eslint max-nested-callbacks: ["error", 8] */
 /* eslint-env mocha */
 'use strict'
-
+const { Buffer } = require('buffer')
 const expect = require('chai').expect
 const Bignum = require('bignumber.js').BigNumber
 
@@ -61,7 +61,7 @@ describe('encoder', () => {
     it('addSemanticType', () => {
       // before the tag, this is an innocuous object:
       // {"value": "foo"}
-      let tc = new cases.TempClass('foo')
+      const tc = new cases.TempClass('foo')
       delete (cases.TempClass.prototype.encodeCBOR)
       expect(
         cbor.Encoder.encode(tc).toString('hex')
@@ -161,7 +161,7 @@ describe('encoder', () => {
     })
 
     describe('numbers', () => {
-      for (let numEnc of cases.canonNums) {
+      for (const numEnc of cases.canonNums) {
         it(`${numEnc[0]} -> ${numEnc[1]}`, () => {
           expect(
             cbor.Encoder.encode(numEnc[0]).toString('hex')

test/fixtures/cases.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { Buffer } = require('buffer')
 const Bignum = require('bignumber.js').BigNumber
 const { URL } = require('iso-url')
 const expect = require('chai').expect
@@ -12,9 +13,11 @@ class TempClass {
     // render as the string tempClass with the tag 0xffff
     this.value = val || 'tempClass'
   }
+
   encodeCBOR (gen) {
     return gen._pushTag(0xffff) && gen.pushAny(this.value)
   }
+
   static toCBOR (gen, obj) {
     return gen._pushTag(0xfffe) && gen.pushAny(obj.value)
   }
@@ -323,11 +326,33 @@ exports.good = [
     61              -- String, length: 1
       45            -- {Val:4}, "E"
 0xa56161614161626142616361436164614461656145`],
-  [{ 1: { 2: { 3: { 4: { 5: { 6: {
-    7: { 8: { 9: { 10: { 11: { 12: {
-      13: 'hello', 14: 'world'
-    } } } } } }
-  } } } } } } }, `{"1": {"2": {"3": {"4": {"5": {"6": {"7": {"8": {"9": {"10": {"11": {"12": {"13": "hello", "14": "world"}}}}}}}}}}}}}`, `
+  [{
+    1: {
+      2: {
+        3: {
+          4: {
+            5: {
+              6: {
+                7: {
+                  8: {
+                    9: {
+                      10: {
+                        11: {
+                          12: {
+                            13: 'hello', 14: 'world'
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }, '{"1": {"2": {"3": {"4": {"5": {"6": {"7": {"8": {"9": {"10": {"11": {"12": {"13": "hello", "14": "world"}}}}}}}}}}}}}', `
 a1                                      # map(1)
    61                                   # text(1)
       31                                # "1"
@@ -977,7 +1002,7 @@ a1                                  # map(1)
           }]
         ]
       }
-    }], `[true, {"#0": {"hxj(DOQZ-+%7>'": "oA|", "": true, "4(CX:": [-0.992622389595498_3, [{"Sedx": -0.49904045994866497_3, "f|mMuJDG2K2>b:Ob-WC": true, "t": {"}[": false, "O_b": true, "P;?V": true, ".mP2U!1r=": [null]}}]]}}]`, `
+    }], '[true, {"#0": {"hxj(DOQZ-+%7>\'": "oA|", "": true, "4(CX:": [-0.992622389595498_3, [{"Sedx": -0.49904045994866497_3, "f|mMuJDG2K2>b:Ob-WC": true, "t": {"}[": false, "O_b": true, "P;?V": true, ".mP2U!1r=": [null]}}]]}}]', `
 82                                      # array(2)
    f5                                   # primitive(21)
    a1                                   # map(1)
@@ -1186,7 +1211,7 @@ class EncodeFailer extends cbor.Encoder {
     let enc = new EncodeFailer()
     enc.canonical = canonical
     expect(enc.pushAny(f)).to.be.eql(true)
-    let used = enc.used
+    const used = enc.used
     for (let i = 0; i < used; i++) {
       enc = new EncodeFailer(i)
       enc.canonical = canonical

test/garbage.spec.js

@@ -6,15 +6,15 @@ const garbage = require('garbage')
 
 const cbor = require('../src')
 
-const CBOR_GARBAGE = process.env.NODE_CBOR_GARBAGE
-const NO_GARBAGE = process.env.NO_GARBAGE
-const REPEATS = parseInt(CBOR_GARBAGE || 1000)
+// const CBOR_GARBAGE = global.process.env.NODE_CBOR_GARBAGE
+// const NO_GARBAGE = global.process.env.NO_GARBAGE
+const REPEATS = parseInt(1000)
 
 describe('random data', () => {
-  if (NO_GARBAGE) {
-    it.skip('garbage', () => {})
-    return
-  }
+  // if (NO_GARBAGE) {
+  //   it.skip('garbage', () => {})
+  //   return
+  // }
 
   it('garbage', function () {
     this.timeout(20 * 1000)

test/tagged.spec.js

@@ -1,6 +1,6 @@
 /* eslint-env mocha */
 'use strict'
-
+const { Buffer } = require('buffer')
 const expect = require('chai').expect
 
 const cbor = require('../')

test/utils.spec.js

@@ -1,18 +1,17 @@
 /* eslint-env mocha */
 'use strict'
-
+const { Buffer } = require('buffer')
 const expect = require('chai').expect
 const utils = require('../src/utils')
 
 function bin (s) {
-  let chunks
+  const chunks = []
   let end
   let start
 
   s = s.replace(/\s/g, '')
   start = 0
   end = (s.length % 8) || 8
-  chunks = []
   while (end <= s.length) {
     chunks.push(parseInt(s.slice(start, end), 2))
     start = end