update for node >4

bendrucker · bendrucker · commit fd63e71d1caf · 2018-10-22T11:04:46.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,5 @@
 language: node_js
 node_js:
-- iojs
+- '4'
+- 'lts/*'
+- node
diff --git a/index.js b/index.js
@@ -4,90 +4,92 @@ exports.parse = function (source, transform) {
   return new ArrayParser(source, transform).parse()
 }
 
-function ArrayParser (source, transform) {
-  this.source = source
-  this.transform = transform || identity
-  this.position = 0
-  this.entries = []
-  this.recorded = []
-  this.dimension = 0
-}
+class ArrayParser {
+  constructor (source, transform) {
+    this.source = source
+    this.transform = transform || identity
+    this.position = 0
+    this.entries = []
+    this.recorded = []
+    this.dimension = 0
+  }
 
-ArrayParser.prototype.isEof = function () {
-  return this.position >= this.source.length
-}
+  isEof () {
+    return this.position >= this.source.length
+  }
 
-ArrayParser.prototype.nextCharacter = function () {
-  var character = this.source[this.position++]
-  if (character === '\\') {
+  nextCharacter () {
+    var character = this.source[this.position++]
+    if (character === '\\') {
+      return {
+        value: this.source[this.position++],
+        escaped: true
+      }
+    }
     return {
-      value: this.source[this.position++],
-      escaped: true
+      value: character,
+      escaped: false
     }
   }
-  return {
-    value: character,
-    escaped: false
-  }
-}
 
-ArrayParser.prototype.record = function (character) {
-  this.recorded.push(character)
-}
+  record (character) {
+    this.recorded.push(character)
+  }
 
-ArrayParser.prototype.newEntry = function (includeEmpty) {
-  var entry
-  if (this.recorded.length > 0 || includeEmpty) {
-    entry = this.recorded.join('')
-    if (entry === 'NULL' && !includeEmpty) {
-      entry = null
+  newEntry (includeEmpty) {
+    var entry
+    if (this.recorded.length > 0 || includeEmpty) {
+      entry = this.recorded.join('')
+      if (entry === 'NULL' && !includeEmpty) {
+        entry = null
+      }
+      if (entry !== null) entry = this.transform(entry)
+      this.entries.push(entry)
+      this.recorded = []
     }
-    if (entry !== null) entry = this.transform(entry)
-    this.entries.push(entry)
-    this.recorded = []
   }
-}
 
-ArrayParser.prototype.consumeDimensions = function () {
-  if (this.source[0] === '[') {
-    while (!this.isEof()) {
-      var char = this.nextCharacter()
-      if (char.value === '=') break
+  consumeDimensions () {
+    if (this.source[0] === '[') {
+      while (!this.isEof()) {
+        var char = this.nextCharacter()
+        if (char.value === '=') break
+      }
     }
   }
-}
 
-ArrayParser.prototype.parse = function (nested) {
-  var character, parser, quote
-  this.consumeDimensions()
-  while (!this.isEof()) {
-    character = this.nextCharacter()
-    if (character.value === '{' && !quote) {
-      this.dimension++
-      if (this.dimension > 1) {
-        parser = new ArrayParser(this.source.substr(this.position - 1), this.transform)
-        this.entries.push(parser.parse(true))
-        this.position += parser.position - 2
-      }
-    } else if (character.value === '}' && !quote) {
-      this.dimension--
-      if (!this.dimension) {
+  parse (nested) {
+    var character, parser, quote
+    this.consumeDimensions()
+    while (!this.isEof()) {
+      character = this.nextCharacter()
+      if (character.value === '{' && !quote) {
+        this.dimension++
+        if (this.dimension > 1) {
+          parser = new ArrayParser(this.source.substr(this.position - 1), this.transform)
+          this.entries.push(parser.parse(true))
+          this.position += parser.position - 2
+        }
+      } else if (character.value === '}' && !quote) {
+        this.dimension--
+        if (!this.dimension) {
+          this.newEntry()
+          if (nested) return this.entries
+        }
+      } else if (character.value === '"' && !character.escaped) {
+        if (quote) this.newEntry(true)
+        quote = !quote
+      } else if (character.value === ',' && !quote) {
         this.newEntry()
-        if (nested) return this.entries
+      } else {
+        this.record(character.value)
       }
-    } else if (character.value === '"' && !character.escaped) {
-      if (quote) this.newEntry(true)
-      quote = !quote
-    } else if (character.value === ',' && !quote) {
-      this.newEntry()
-    } else {
-      this.record(character.value)
     }
+    if (this.dimension !== 0) {
+      throw new Error('array dimension not balanced')
+    }
+    return this.entries
   }
-  if (this.dimension !== 0) {
-    throw new Error('array dimension not balanced')
-  }
-  return this.entries
 }
 
 function identity (value) {
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "url": "bendrucker.me"
   },
   "engines": {
-    "node": ">=0.10.0"
+    "node": ">=4"
   },
   "scripts": {
     "test": "standard && tape test.js"
@@ -25,7 +25,7 @@
   "dependencies": {},
   "devDependencies": {
     "ap": "^0.2.0",
-    "standard": "^4.0.0",
+    "standard": "^12.0.1",
     "tape": "^4.0.0"
   },
   "files": [

-Original file line number
+Diff line change
@@ @@ -1,3 +1,5 @@ @@
 language: node_js
 node_js:
 -- iojs
 +- '4'
 +- 'lts/*'
 +- node