bfj 8.0.0 → 9.0.0

package/src/streamify.js

@@ -5,10 +5,9 @@ const eventify = require('./eventify')
 const events = require('./events')
 const JsonStream = require('./jsonstream')
 const Hoopy = require('hoopy')
-const promise = require('./promise')
 const tryer = require('tryer')
 
-const DEFAULT_BUFFER_LENGTH = 1024
+const DEFAULT_BUFFER_LENGTH = 256
 
 module.exports = streamify
 
@@ -34,19 +33,16 @@ module.exports = streamify
  * @option circular:      'error' or 'ignore', default is 'error'.
  *
  * @option yieldRate:     The number of data items to process per timeslice,
- *                        default is 16384.
+ *                        default is 1024.
  *
- * @option bufferLength:  The length of the buffer, default is 1024.
+ * @option bufferLength:  The length of the buffer, default is 256.
  *
  * @option highWaterMark: If set, will be passed to the readable stream constructor
  *                        as the value for the highWaterMark option.
- *
- * @option Promise:       The promise constructor to use, defaults to bluebird.
  **/
 function streamify (data, options = {}) {
   const emitter = eventify(data, options)
   const json = new Hoopy(options.bufferLength || DEFAULT_BUFFER_LENGTH)
-  const Promise = promise(options)
   const space = normaliseSpace(options)
   let streamOptions
   const { highWaterMark } = options
@@ -125,20 +121,23 @@ function streamify (data, options = {}) {
   }
 
   function noRacing (handler) {
-    return eventData => mutex = mutex.then(() => handler(eventData))
+    return async (eventData) => {
+      await mutex
+      mutex = await handler(eventData)
+    }
   }
 
-  function array () {
-    return beforeScope()
-      .then(() => addJson('['))
-      .then(() => afterScope())
+  async function array () {
+    await beforeScope()
+    await addJson('[')
+    afterScope()
   }
 
   function beforeScope () {
     return before(true)
   }
 
-  function before (isScope) {
+  async function before (isScope) {
     if (isProperty) {
       isProperty = false
 
@@ -146,28 +145,22 @@ function streamify (data, options = {}) {
         return addJson(' ')
       }
 
-      return Promise.resolve()
+      return
     }
 
-    return Promise.resolve()
-      .then(() => {
-        if (needsComma) {
-          if (isScope) {
-            needsComma = false
-          }
+    if (needsComma) {
+      if (isScope) {
+        needsComma = false
+      }
 
-          return addJson(',')
-        }
+      await addJson(',')
+    } else if (! isScope) {
+      needsComma = true
+    }
 
-        if (! isScope) {
-          needsComma = true
-        }
-      })
-      .then(() => {
-        if (space && indentation) {
-          return indent()
-        }
-      })
+    if (space && indentation) {
+      return indent()
+    }
   }
 
   function addJson (chunk) {
@@ -207,53 +200,49 @@ function streamify (data, options = {}) {
     }
   }
 
-  function object () {
-    return beforeScope()
-      .then(() => addJson('{'))
-      .then(() => afterScope())
+  async function object () {
+    await beforeScope()
+    await addJson('{')
+    afterScope()
   }
 
-  function property (name) {
-    return before()
-      .then(() => addJson(`"${name}":`))
-      .then(() => {
-        isProperty = true
-      })
+  async function property (name) {
+    await before()
+    await addJson(`"${name}":`)
+    isProperty = true
   }
 
   function string (s) {
     return value(`"${s}"`)
   }
 
-  function value (v) {
-    return before()
-      .then(() => addJson(`${v}`))
+  async function value (v) {
+    await before()
+    await addJson(`${v}`)
   }
 
-  function endArray () {
-    return beforeScopeEnd()
-      .then(() => addJson(']'))
-      .then(() => afterScopeEnd())
+  async function endArray () {
+    await beforeScopeEnd()
+    await addJson(']')
+    afterScopeEnd()
   }
 
-  function beforeScopeEnd () {
+  async function beforeScopeEnd () {
     if (space) {
       indentation = indentation.substr(space.length)
 
-      return indent()
+      await indent()
     }
-
-    return Promise.resolve()
   }
 
   function afterScopeEnd () {
     needsComma = true
   }
 
-  function endObject () {
-    return beforeScopeEnd()
-      .then(() => addJson('}'))
-      .then(() => afterScopeEnd())
+  async function endObject () {
+    await beforeScopeEnd()
+    await addJson('}')
+    afterScopeEnd()
   }
 
   function end () {

package/src/stringify.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const promise = require('./promise')
 const streamify = require('./streamify')
 
 module.exports = stringify
@@ -27,18 +26,15 @@ module.exports = stringify
  * @option circular:     'error' or 'ignore', default is 'error'.
  *
  * @option yieldRate:     The number of data items to process per timeslice,
- *                        default is 16384.
+ *                        default is 1024.
  *
- * @option bufferLength:  The length of the buffer, default is 1024.
+ * @option bufferLength:  The length of the buffer, default is 256.
  *
  * @option highWaterMark: If set, will be passed to the readable stream constructor
  *                        as the value for the highWaterMark option.
- *
- * @option Promise:       The promise constructor to use, defaults to bluebird.
  **/
 function stringify (data, options) {
   const json = []
-  const Promise = promise(options)
   const stream = streamify(data, options)
 
   let resolve, reject

package/src/unpipe.js

@@ -22,16 +22,23 @@ module.exports = unpipe
  *                    to save memory. The default value is `1048576`.
  *
  * @option yieldRate: The number of data items to process per timeslice,
- *                    default is 16384.
+ *                    default is 1024.
  **/
 function unpipe (callback, options) {
   check.assert.function(callback, 'Invalid callback argument')
 
   const jsonstream = new stream.PassThrough()
 
-  parse(jsonstream, { ...options, ndjson: false })
-    .then(data => callback(null, data))
-    .catch(error => callback(error))
+  initStream(jsonstream, callback, options)
 
   return jsonstream
 }
+
+async function initStream (jsonstream, callback, options) {
+  try {
+    const data = await parse(jsonstream, { ...options, ndjson: false })
+    await callback(null, data)
+  } catch (error) {
+    await callback(error)
+  }
+}