bfj 6.1.0 → 7.0.1

package/.eslintrc

@@ -1,6 +1,8 @@
 env:
   es6: true
   node: true
+parserOptions:
+  ecmaVersion: 2018
 rules:
   accessor-pairs: [ 2, { "setWithoutGet": true } ]
   array-bracket-spacing: [ 2, "always" ]

package/.gitlab-ci.yml

@@ -0,0 +1,25 @@
+cache:
+  key: "$CI_JOB_NAME"
+  untracked: true
+  paths:
+    - node_modules/
+
+before_script:
+  - npm install
+
+.test_template: &npm_test
+  script:
+    - npm run lint
+    - npm test
+
+test:node8:
+  image: node:8
+  <<: *npm_test
+
+test:node10:
+  image: node:10
+  <<: *npm_test
+
+test:node12:
+  image: node:12
+  <<: *npm_test

package/AUTHORS

@@ -1,4 +1,4 @@
-Phil Booth <pmbooth@gmail.com> (https://github.com/philbooth)
+Phil Booth <pmbooth@gmail.com> (https://philbooth.me/)
 Rowan Manning (https://github.com/rowanmanning)
 Benedikt Rötsch (https://github.com/axe312ger)
 

package/CONTRIBUTING.md

@@ -30,8 +30,8 @@
   if the change is one that you think
   needs some discussion.
 
-[readme]: https://github.com/philbooth/bfj/blob/master/README.md
-[authors]: https://github.com/philbooth/bfj/blob/master/AUTHORS
-[newissue]: https://github.com/philbooth/bfj/issues/new
-[issues]: https://github.com/philbooth/bfj/issues
+[readme]: https://gitlab.com/philbooth/bfj/blob/master/README.md
+[authors]: https://gitlab.com/philbooth/bfj/blob/master/AUTHORS
+[newissue]: https://gitlab.com/philbooth/bfj/issues/new
+[issues]: https://gitlab.com/philbooth/bfj/issues
 

package/HISTORY.md

@@ -1,5 +1,53 @@
 # History
 
+## 7.0.1
+
+### Bug fixes
+
+* match: prevent mismatched properties when minDepth is set (4efaf1a)
+
+## 7.0.0
+
+### Breaking changes
+
+* package: limit to node 8+ (cc42139)
+
+### New features
+
+* match: support minDepth option to improve performance (6d79fe4)
+
+### Refactorings
+
+* code: prefer spread syntax to Object.assign (5544086)
+* code: prefer Object.entries to iterate keys and values (d101317)
+
+### Other changes
+
+* package: test in node 12 (9bf4e6b)
+* git: ignore test/*.json (e87eaf7)
+
+## 6.1.2
+
+### Bug fixes
+
+* eventify: escape object keys (910ad08)
+
+### Other changes
+
+* package: update deps (aafb4ff)
+
+## 6.1.1
+
+### Bug fixes
+
+* eventify: don't serialise NaN or infinities (3c50fe4)
+
+### Other changes
+
+* deps: npm update (b3c86d0)
+* project: add package lock file (63df27d)
+* project: migrate to gitlab (26746a0)
+
 ## 6.1.0
 
 ### New features

package/README.md

@@ -1,8 +1,9 @@
 # BFJ
 
-[![Package status](https://img.shields.io/npm/v/bfj.svg?style=flat-square)](https://www.npmjs.com/package/bfj)
-[![Build status](https://img.shields.io/travis/philbooth/bfj.svg?style=flat-square)](https://travis-ci.org/philbooth/bfj)
-[![License](https://img.shields.io/github/license/philbooth/bfj.svg?style=flat-square)](https://opensource.org/licenses/MIT)
+[![Build status](https://gitlab.com/philbooth/bfj/badges/master/pipeline.svg)](https://gitlab.com/philbooth/bfj/pipelines)
+[![Package status](https://img.shields.io/npm/v/bfj.svg)](https://www.npmjs.com/package/bfj)
+[![Downloads](https://img.shields.io/npm/dm/bfj.svg)](https://www.npmjs.com/package/bfj)
+[![License](https://img.shields.io/npm/l/bfj.svg)](https://opensource.org/licenses/MIT)
 
 Big-Friendly JSON. Asynchronous streaming functions for large JSON data sets.
 
@@ -141,7 +142,7 @@ Or if you just want
 the git repo:
 
 ```
-git clone git@github.com:philbooth/bfj.git
+git clone git@gitlab.com:philbooth/bfj.git
 ```
 
 ## How do I read a JSON file?
@@ -279,6 +280,17 @@ Predicate functions will be called with three arguments:
 If the result of the predicate is a truthy value
 then the item will be deemed a match.
 
+In addition to the regular options
+accepted by other parsing functions,
+you can also specify `minDepth`
+to only apply the selector
+to certain depths.
+This can improve performance
+and memory usage,
+if you know that
+you're not interested in
+parsing top-level items.
+
 If there are any syntax errors in the JSON,
 a `dataError` event will be emitted.
 If any other errors occur,
@@ -920,21 +932,18 @@ with the command
 
 ## What versions of Node.js does it support?
 
-As of [version `3.0.0`](HISTORY.md#300),
+As of [version `7.0.0`](HISTORY.md#700),
+only Node.js versions 8 or greater
+are supported.
+
+Between versions [`3.0.0`](HISTORY.md#300)
+and [`6.1.2`](HISTORY.md#612),
 only Node.js versions 6 or greater
-are supported
-because of the dependency
-on [Hoopy](https://github.com/philbooth/hoopy).
-Previous versions supported
-node 4 and later.
-
-A separate `node-4` branch was maintained
-until version `5.4.1`,
-which had feature parity version-for-version
-with releases from `master`.
-Releases from the `node-4` branch
-are available in npm
-under the package name [`bfj-node4`](https://www.npmjs.com/package/bfj-node4).
+were supported.
+
+Until [version `2.1.2`](HISTORY.md#212),
+only Node.js versions 4 or greater
+were supported.
 
 ## What license is it released under?
 
@@ -958,5 +967,5 @@ under the package name [`bfj-node4`](https://www.npmjs.com/package/bfj-node4).
 [mocha]: https://mochajs.org/
 [chai]: http://chaijs.com/
 [proxyquire]: https://github.com/thlorenz/proxyquire
-[spooks]: https://github.com/philbooth/spooks.js
+[spooks]: https://gitlab.com/philbooth/spooks.js
 [license]: COPYING

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "bfj",
-  "version": "6.1.0",
+  "version": "7.0.1",
   "description": "Big-friendly JSON. Asynchronous streaming functions for large JSON data sets.",
-  "homepage": "https://github.com/philbooth/bfj",
-  "bugs": "https://github.com/philbooth/bfj/issues",
+  "homepage": "https://gitlab.com/philbooth/bfj",
+  "bugs": "https://gitlab.com/philbooth/bfj/issues",
   "license": "MIT",
-  "author": "Phil Booth (https://github.com/philbooth)",
+  "author": "Phil Booth (https://gitlab.com/philbooth)",
   "main": "./src",
   "keywords": [
     "json",
@@ -23,25 +23,25 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/philbooth/bfj.git"
+    "url": "https://gitlab.com/philbooth/bfj.git"
   },
   "engines": {
-    "node": ">= 6.0.0"
+    "node": ">= 8.0.0"
   },
   "dependencies": {
-    "bluebird": "^3.5.1",
-    "check-types": "^7.3.0",
-    "hoopy": "^0.1.2",
-    "tryer": "^1.0.0"
+    "bluebird": "^3.5.5",
+    "check-types": "^8.0.3",
+    "hoopy": "^0.1.4",
+    "tryer": "^1.0.1"
   },
   "devDependencies": {
-    "eslint": "4.19.x",
-    "mocha": "5.0.x",
-    "chai": "4.1.x",
-    "proxyquire": "1.8.x",
-    "spooks": "2.0.x",
-    "please-release-me": "2.0.x",
-    "request": "2.85.x"
+    "chai": "^4.2.0",
+    "eslint": "^6.0.1",
+    "mocha": "^6.1.4",
+    "please-release-me": "^2.1.2",
+    "proxyquire": "^2.1.0",
+    "request": "^2.88.0",
+    "spooks": "^2.0.0"
   },
   "scripts": {
     "lint": "eslint src",

package/src/datastream.js

@@ -13,5 +13,5 @@ function DataStream (read, options) {
     return new DataStream(read, options)
   }
 
-  return BfjStream.call(this, read, Object.assign({ objectMode: true }, options))
+  return BfjStream.call(this, read, { ...options, objectMode: true })
 }

package/src/eventify.js

@@ -110,7 +110,7 @@ function eventify (data, options = {}) {
     })
 
     function after (coerced) {
-      if (isInvalidType(coerced)) {
+      if (isInvalid(coerced)) {
         return
       }
 
@@ -205,8 +205,15 @@ function eventify (data, options = {}) {
     })
   }
 
-  function isInvalidType (datum) {
-    return !! invalidTypes[typeof datum]
+  function isInvalid (datum) {
+    const type = typeof datum
+    return !! invalidTypes[type] || (
+      type === 'number' && ! isValidNumber(datum)
+    )
+  }
+
+  function isValidNumber (datum) {
+    return datum > Number.NEGATIVE_INFINITY && datum < Number.POSITIVE_INFINITY
   }
 
   function literal (datum) {
@@ -232,7 +239,7 @@ function eventify (data, options = {}) {
   function array (datum) {
     // For an array, collection:object and collection:array are the same.
     return collection(datum, datum, 'array', item => {
-      if (isInvalidType(item)) {
+      if (isInvalid(item)) {
         return proceed(null)
       }
 
@@ -286,11 +293,11 @@ function eventify (data, options = {}) {
     return collection(datum, Object.keys(datum), 'object', key => {
       const item = datum[key]
 
-      if (isInvalidType(item)) {
+      if (isInvalid(item)) {
         return Promise.resolve()
       }
 
-      return emit(events.property, key)
+      return emit(events.property, escapeString(key))
         .then(() => proceed(item))
     })
   }

package/src/jsonstream.js

@@ -13,5 +13,5 @@ function JsonStream (read, options) {
     return new JsonStream(read, options)
   }
 
-  return BfjStream.call(this, read, Object.assign({ encoding: 'utf8' }, options))
+  return BfjStream.call(this, read, { ...options, encoding: 'utf8' })
 }

package/src/match.js

@@ -25,6 +25,11 @@ module.exports = match
  *                        passed, both the key and the value are passed to it as
  *                        arguments.
  *
+ * @option minDepth:      Number indicating the minimum depth to apply the selector
+ *                        to. The default is `0`, but setting it to a higher value
+ *                        can improve performance and reduce memory usage by
+ *                        eliminating the need to actualise top-level items.
+ *
  * @option numbers:       Boolean, indicating whether numerical keys (e.g. array
  *                        indices) should be coerced to strings before testing the
  *                        match. Only applies if the `selector` argument is a string
@@ -62,6 +67,9 @@ function match (stream, selector, options = {}) {
   let length = 0
   let index = 0
 
+  const minDepth = options.minDepth || 0
+  check.assert.greaterOrEqual(minDepth, 0)
+
   if (check.function(selector)) {
     selectorFunction = selector
     selector = null
@@ -152,6 +160,10 @@ function match (stream, selector, options = {}) {
   }
 
   function property (name) {
+    if (scopes.length < minDepth) {
+      return
+    }
+
     properties.push(name)
   }
 
@@ -162,6 +174,10 @@ function match (stream, selector, options = {}) {
   function value (v) {
     let key
 
+    if (scopes.length < minDepth) {
+      return
+    }
+
     if (scopes.length > 0) {
       const scope = scopes[scopes.length - 1]
 

package/src/parse.js

@@ -161,8 +161,8 @@ function parse (stream, options = {}) {
 
   function transform (obj, key) {
     if (obj && typeof obj === 'object') {
-      Object.keys(obj).forEach(childKey => {
-        obj[childKey] = transform(obj[childKey], childKey)
+      Object.entries(obj).forEach(([ k, v ]) => {
+        obj[k] = transform(v, k)
       })
     }
 

package/src/read.js

@@ -22,5 +22,5 @@ module.exports = read
  * @option Promise:   The promise constructor to use, defaults to bluebird.
  **/
 function read (path, options) {
-  return parse(fs.createReadStream(path, options), Object.assign({}, options, { ndjson: false }))
+  return parse(fs.createReadStream(path, options), { ...options, ndjson: false })
 }

package/src/unpipe.js

@@ -29,7 +29,7 @@ function unpipe (callback, options) {
 
   const jsonstream = new stream.PassThrough()
 
-  parse(jsonstream, Object.assign({}, options, { ndjson: false }))
+  parse(jsonstream, { ...options, ndjson: false })
     .then(data => callback(null, data))
     .catch(error => callback(error))
 

package/test/integration.js

@@ -229,7 +229,11 @@ suite('integration:', () => {
         }))
         results = []
         errors = []
-        const datastream = bfj.match(fs.createReadStream(file), (k, v) => k === 'baz' || v === 'blee')
+        const datastream = bfj.match(
+          fs.createReadStream(file),
+          (k, v) => k === 'baz' || v === 'blee',
+          { minDepth: 1 }
+        )
         datastream.on('data', item => results.push(item))
         datastream.on('error', error => errors.push(error))
         datastream.on('end', done)
@@ -305,7 +309,7 @@ suite('integration:', () => {
 
       setup(done => {
         const jsonstream = new stream.PassThrough()
-        request({ url: 'https://raw.githubusercontent.com/philbooth/bfj/master/package.json' })
+        request({ url: 'https://gitlab.com/philbooth/bfj/raw/master/package.json' })
           .pipe(bfj.unpipe((err, res) => {
             error = err
             result = res