compact-encoding 2.7.0 → 2.10.0

package/README.md

@@ -11,13 +11,13 @@ npm install compact-encoding
 ``` js
 const cenc = require('compact-encoding')
 
-const state = { start: 0, end: 0, buffer: null }
+const state = cenc.state()
 
 // use preencode to figure out how big a buffer is needed
 cenc.uint.preencode(state, 42)
 cenc.string.preencode(state, 'hi')
 
-console.log(state) // { start: 0, end: 4, buffer: null }
+console.log(state) // { start: 0, end: 4, buffer: null, cache: null }
 
 state.buffer = Buffer.allocUnsafe(state.end)
 
@@ -36,13 +36,14 @@ cenc.string.decode(state) // 'hi'
 
 #### `state`
 
-Should be an object that looks like this `{ start, end, buffer }`.
+Should be an object that looks like this `{ start, end, buffer, cache }`.
 
 You can also get a blank state object using `cenc.state()`.
 
 * `start` is the byte offset to start encoding/decoding at.
 * `end` is the byte offset indicating the end of the buffer.
 * `buffer` should be either a Node.js Buffer or Uint8Array.
+* `cache` is used internally be codecs, starts out as `null`.
 
 #### `enc.preencode(state, val)`
 
@@ -107,14 +108,21 @@ to build others on top. Feel free to PR more that are missing.
 * `cenc.float64array` - Encodes a float64array with its element length uint prefixed.
 * `cenc.bool` - Encodes a boolean as 1 or 0.
 * `cenc.string`, `cenc.utf8` - Encodes a utf-8 string, similar to buffer.
+* `cenc.string.fixed(n)`, `cenc.utf8.fixed(n)` - Encodes a fixed sized utf-8 string.
 * `cenc.ascii` - Encodes an ascii string.
+* `cenc.ascii.fixed(n)` - Encodes a fixed size ascii string.
 * `cenc.hex` - Encodes a hex string.
+* `cenc.hex.fixed(n)` - Encodes a fixed size hex string.
 * `cenc.base64` - Encodes a base64 string.
+* `cenc.base64.fixed(n)` - Encodes a fixed size base64 string.
 * `cenc.utf16le`, `cenc.ucs2` - Encodes a utf16le string.
+* `cenc.utf16le.fixed(n)`, `cenc.ucs2.fixed(n)` - Encodes a fixed size utf16le string.
 * `cenc.fixed32` - Encodes a fixed 32 byte buffer.
 * `cenc.fixed64` - Encodes a fixed 64 byte buffer.
 * `cenc.fixed(n)` - Makes a fixed sized encoder.
 * `cenc.array(enc)` - Makes an array encoder from another encoder. Arrays are uint prefixed with their length.
+* `cenc.json` - Encodes a JSON value as utf-8.
+* `cenc.ndjson` - Encodes a JSON value as newline delimited utf-8.
 * `cenc.from(enc)` - Makes a compact encoder from a [codec](https://github.com/mafintosh/codecs) or [abstract-encoding](https://github.com/mafintosh/abstract-encoding).
 
 ## License

package/index.js

@@ -3,8 +3,8 @@ const b4a = require('b4a')
 const LE = (new Uint8Array(new Uint16Array([0xff]).buffer))[0] === 0xff
 const BE = !LE
 
-exports.state = function () {
-  return { start: 0, end: 0, buffer: null }
+exports.state = function (start = 0, end = 0, buffer = null) {
+  return { start, end, buffer, cache: null }
 }
 
 const uint = exports.uint = {
@@ -303,11 +303,26 @@ function string (encoding) {
       const len = uint.decode(state)
       if (state.end - state.start < len) throw new Error('Out of bounds')
       return b4a.toString(state.buffer, encoding, state.start, (state.start += len))
+    },
+    fixed (n) {
+      return {
+        preencode (state) {
+          state.end += n
+        },
+        encode (state, s) {
+          b4a.write(state.buffer, s, state.start, n, encoding)
+          state.start += n
+        },
+        decode (state) {
+          if (state.end - state.start < n) throw new Error('Out of bounds')
+          return b4a.toString(state.buffer, encoding, state.start, (state.start += n))
+        }
+      }
     }
   }
 }
 
-exports.string = exports.utf8 = string('utf-8')
+const utf8 = exports.string = exports.utf8 = string('utf-8')
 exports.ascii = string('ascii')
 exports.hex = string('hex')
 exports.base64 = string('base64')
@@ -377,6 +392,30 @@ exports.array = function array (enc) {
   }
 }
 
+exports.json = {
+  preencode (state, v) {
+    utf8.preencode(state, JSON.stringify(v))
+  },
+  encode (state, v) {
+    utf8.encode(state, JSON.stringify(v))
+  },
+  decode (state) {
+    return JSON.parse(utf8.decode(state))
+  }
+}
+
+exports.ndjson = {
+  preencode (state, v) {
+    utf8.preencode(state, JSON.stringify(v) + '\n')
+  },
+  encode (state, v) {
+    utf8.encode(state, JSON.stringify(v) + '\n')
+  },
+  decode (state) {
+    return JSON.parse(utf8.decode(state))
+  }
+}
+
 exports.from = function from (enc) {
   if (enc.preencode) return enc
   if (enc.encodingLength) return fromAbstractEncoder(enc)
@@ -421,7 +460,7 @@ function fromAbstractEncoder (enc) {
 }
 
 exports.encode = function encode (enc, m) {
-  const state = { start: 0, end: 0, buffer: null }
+  const state = exports.state()
   enc.preencode(state, m)
   state.buffer = b4a.allocUnsafe(state.end)
   enc.encode(state, m)
@@ -429,7 +468,7 @@ exports.encode = function encode (enc, m) {
 }
 
 exports.decode = function decode (enc, buffer) {
-  return enc.decode({ start: 0, end: buffer.byteLength, buffer })
+  return enc.decode(exports.state(0, buffer.byteLength, buffer))
 }
 
 function zigZag (enc) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "compact-encoding",
-  "version": "2.7.0",
+  "version": "2.10.0",
   "description": "A series of compact encoding schemes for building small and fast parsers and serializers",
   "main": "index.js",
   "dependencies": {

package/test.js

@@ -1,23 +1,24 @@
 const enc = require('./')
 const tape = require('brittle')
+const b4a = require('b4a')
 
 tape('uint', function (t) {
   const state = enc.state()
 
   enc.uint.preencode(state, 42)
-  t.alike(state, { start: 0, end: 1, buffer: null })
+  t.alike(state, enc.state(0, 1))
   enc.uint.preencode(state, 4200)
-  t.alike(state, { start: 0, end: 4, buffer: null })
+  t.alike(state, enc.state(0, 4))
   enc.uint.preencode(state, Number.MAX_SAFE_INTEGER)
-  t.alike(state, { start: 0, end: 13, buffer: null })
+  t.alike(state, enc.state(0, 13))
 
-  state.buffer = Buffer.alloc(state.end)
+  state.buffer = b4a.alloc(state.end)
   enc.uint.encode(state, 42)
-  t.alike(state, { start: 1, end: 13, buffer: Buffer.from([42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]) })
+  t.alike(state, enc.state(1, 13, b4a.from([42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])))
   enc.uint.encode(state, 4200)
-  t.alike(state, { start: 4, end: 13, buffer: Buffer.from([42, 0xfd, 104, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0]) })
+  t.alike(state, enc.state(4, 13, b4a.from([42, 0xfd, 104, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0])))
   enc.uint.encode(state, Number.MAX_SAFE_INTEGER)
-  t.alike(state, { start: 13, end: 13, buffer: Buffer.from([42, 0xfd, 104, 16, 0xff, 255, 255, 255, 255, 255, 255, 31, 0]) })
+  t.alike(state, enc.state(13, 13, b4a.from([42, 0xfd, 104, 16, 0xff, 255, 255, 255, 255, 255, 255, 31, 0])))
 
   state.start = 0
   t.is(enc.uint.decode(state), 42)
@@ -32,15 +33,15 @@ tape('int', function (t) {
   const state = enc.state()
 
   enc.int.preencode(state, 42)
-  t.alike(state, { start: 0, end: 1, buffer: null })
+  t.alike(state, enc.state(0, 1))
   enc.int.preencode(state, -4200)
-  t.alike(state, { start: 0, end: 4, buffer: null })
+  t.alike(state, enc.state(0, 4))
 
-  state.buffer = Buffer.alloc(state.end)
+  state.buffer = b4a.alloc(state.end)
   enc.int.encode(state, 42)
-  t.alike(state, { start: 1, end: 4, buffer: Buffer.from([84, 0, 0, 0]) })
+  t.alike(state, enc.state(1, 4, b4a.from([84, 0, 0, 0])))
   enc.int.encode(state, -4200)
-  t.alike(state, { start: 4, end: 4, buffer: Buffer.from([84, 0xfd, 207, 32]) })
+  t.alike(state, enc.state(4, 4, b4a.from([84, 0xfd, 207, 32])))
 
   state.start = 0
   t.is(enc.int.decode(state), 42)
@@ -54,12 +55,12 @@ tape('float64', function (t) {
   const state = enc.state()
 
   enc.float64.preencode(state, 162.2377294)
-  t.alike(state, { start: 0, end: 8, buffer: null })
+  t.alike(state, enc.state(0, 8))
 
-  state.buffer = Buffer.alloc(state.end)
-  t.alike(state, { start: 0, end: 8, buffer: Buffer.from([0, 0, 0, 0, 0, 0, 0, 0]) })
+  state.buffer = b4a.alloc(state.end)
+  t.alike(state, enc.state(0, 8, b4a.from([0, 0, 0, 0, 0, 0, 0, 0])))
   enc.float64.encode(state, 162.2377294)
-  t.alike(state, { start: 8, end: 8, buffer: Buffer.from([0x87, 0xc9, 0xaf, 0x7a, 0x9b, 0x47, 0x64, 0x40]) })
+  t.alike(state, enc.state(8, 8, b4a.from([0x87, 0xc9, 0xaf, 0x7a, 0x9b, 0x47, 0x64, 0x40])))
 
   state.start = 0
   t.is(enc.float64.decode(state), 162.2377294)
@@ -74,13 +75,13 @@ tape('float64', function (t) {
 
   enc.int.preencode(state, 0)
   enc.float64.preencode(state, 162.2377294)
-  t.alike(state, { start: 0, end: 9, buffer: null })
+  t.alike(state, enc.state(0, 9))
 
-  state.buffer = Buffer.alloc(state.end)
-  t.alike(state, { start: 0, end: 9, buffer: Buffer.from([0, 0, 0, 0, 0, 0, 0, 0, 0]) })
+  state.buffer = b4a.alloc(state.end)
+  t.alike(state, enc.state(0, 9, b4a.from([0, 0, 0, 0, 0, 0, 0, 0, 0])))
   enc.int.encode(state, 0)
   enc.float64.encode(state, 162.2377294)
-  t.alike(state, { start: 9, end: 9, buffer: Buffer.from([0, 0x87, 0xc9, 0xaf, 0x7a, 0x9b, 0x47, 0x64, 0x40]) })
+  t.alike(state, enc.state(9, 9, b4a.from([0, 0x87, 0xc9, 0xaf, 0x7a, 0x9b, 0x47, 0x64, 0x40])))
 
   state.start = 0
   t.is(enc.int.decode(state), 0)
@@ -88,14 +89,14 @@ tape('float64', function (t) {
   t.is(state.start, state.end)
 
   // subarray
-  const buf = Buffer.alloc(10)
+  const buf = b4a.alloc(10)
   state.start = 0
   state.buffer = buf.subarray(1)
-  t.alike(state, { start: 0, end: 9, buffer: Buffer.from([0, 0, 0, 0, 0, 0, 0, 0, 0]) })
+  t.alike(state, enc.state(0, 9, b4a.from([0, 0, 0, 0, 0, 0, 0, 0, 0])))
   enc.int.encode(state, 0)
   enc.float64.encode(state, 162.2377294)
-  t.alike(state, { start: 9, end: 9, buffer: Buffer.from([0, 0x87, 0xc9, 0xaf, 0x7a, 0x9b, 0x47, 0x64, 0x40]) })
-  t.alike(buf, Buffer.from([0, 0, 0x87, 0xc9, 0xaf, 0x7a, 0x9b, 0x47, 0x64, 0x40]))
+  t.alike(state, enc.state(9, 9, b4a.from([0, 0x87, 0xc9, 0xaf, 0x7a, 0x9b, 0x47, 0x64, 0x40])))
+  t.alike(buf, b4a.from([0, 0, 0x87, 0xc9, 0xaf, 0x7a, 0x9b, 0x47, 0x64, 0x40]))
 
   state.start = 0
   t.is(enc.int.decode(state), 0)
@@ -108,9 +109,9 @@ tape('float64', function (t) {
   state.buffer = null
 
   enc.float64.preencode(state, 162.2377294)
-  state.buffer = Buffer.alloc(state.end)
+  state.buffer = b4a.alloc(state.end)
   enc.float64.encode(state, 0)
-  t.alike(state, { start: 8, end: 8, buffer: Buffer.from([0, 0, 0, 0, 0, 0, 0, 0]) })
+  t.alike(state, enc.state(8, 8, b4a.from([0, 0, 0, 0, 0, 0, 0, 0])))
 
   state.start = 0
   t.is(enc.float64.decode(state), 0)
@@ -122,9 +123,9 @@ tape('float64', function (t) {
   state.buffer = null
 
   enc.float64.preencode(state, Infinity)
-  state.buffer = Buffer.alloc(state.end)
+  state.buffer = b4a.alloc(state.end)
   enc.float64.encode(state, Infinity)
-  t.alike(state, { start: 8, end: 8, buffer: Buffer.from([0, 0, 0, 0, 0, 0, 0xf0, 0x7f]) })
+  t.alike(state, enc.state(8, 8, b4a.from([0, 0, 0, 0, 0, 0, 0xf0, 0x7f])))
 
   state.start = 0
   t.is(enc.float64.decode(state), Infinity)
@@ -136,9 +137,9 @@ tape('float64', function (t) {
   state.buffer = null
 
   enc.float64.preencode(state, 0.1 + 0.2)
-  state.buffer = Buffer.alloc(state.end)
+  state.buffer = b4a.alloc(state.end)
   enc.float64.encode(state, 0.1 + 0.2)
-  t.alike(state, { start: 8, end: 8, buffer: Buffer.from([0x34, 0x33, 0x33, 0x33, 0x33, 0x33, 0xd3, 0x3f]) })
+  t.alike(state, enc.state(8, 8, b4a.from([0x34, 0x33, 0x33, 0x33, 0x33, 0x33, 0xd3, 0x3f])))
 
   state.start = 0
   t.is(enc.float64.decode(state), 0.1 + 0.2)
@@ -148,24 +149,24 @@ tape('float64', function (t) {
 tape('buffer', function (t) {
   const state = enc.state()
 
-  enc.buffer.preencode(state, Buffer.from('hi'))
-  t.alike(state, { start: 0, end: 3, buffer: null })
-  enc.buffer.preencode(state, Buffer.from('hello'))
-  t.alike(state, { start: 0, end: 9, buffer: null })
+  enc.buffer.preencode(state, b4a.from('hi'))
+  t.alike(state, enc.state(0, 3))
+  enc.buffer.preencode(state, b4a.from('hello'))
+  t.alike(state, enc.state(0, 9))
   enc.buffer.preencode(state, null)
-  t.alike(state, { start: 0, end: 10, buffer: null })
+  t.alike(state, enc.state(0, 10))
 
-  state.buffer = Buffer.alloc(state.end)
-  enc.buffer.encode(state, Buffer.from('hi'))
-  t.alike(state, { start: 3, end: 10, buffer: Buffer.from('\x02hi\x00\x00\x00\x00\x00\x00\x00') })
-  enc.buffer.encode(state, Buffer.from('hello'))
-  t.alike(state, { start: 9, end: 10, buffer: Buffer.from('\x02hi\x05hello\x00') })
+  state.buffer = b4a.alloc(state.end)
+  enc.buffer.encode(state, b4a.from('hi'))
+  t.alike(state, enc.state(3, 10, b4a.from('\x02hi\x00\x00\x00\x00\x00\x00\x00')))
+  enc.buffer.encode(state, b4a.from('hello'))
+  t.alike(state, enc.state(9, 10, b4a.from('\x02hi\x05hello\x00')))
   enc.buffer.encode(state, null)
-  t.alike(state, { start: 10, end: 10, buffer: Buffer.from('\x02hi\x05hello\x00') })
+  t.alike(state, enc.state(10, 10, b4a.from('\x02hi\x05hello\x00')))
 
   state.start = 0
-  t.alike(enc.buffer.decode(state), Buffer.from('hi'))
-  t.alike(enc.buffer.decode(state), Buffer.from('hello'))
+  t.alike(enc.buffer.decode(state), b4a.from('hi'))
+  t.alike(enc.buffer.decode(state), b4a.from('hello'))
   t.is(enc.buffer.decode(state), null)
   t.is(state.start, state.end)
 
@@ -175,15 +176,15 @@ tape('buffer', function (t) {
 tape('raw', function (t) {
   const state = enc.state()
 
-  enc.raw.preencode(state, Buffer.from('hi'))
-  t.alike(state, { start: 0, end: 2, buffer: null })
+  enc.raw.preencode(state, b4a.from('hi'))
+  t.alike(state, enc.state(0, 2))
 
-  state.buffer = Buffer.alloc(state.end)
-  enc.raw.encode(state, Buffer.from('hi'))
-  t.alike(state, { start: 2, end: 2, buffer: Buffer.from('hi') })
+  state.buffer = b4a.alloc(state.end)
+  enc.raw.encode(state, b4a.from('hi'))
+  t.alike(state, enc.state(2, 2, b4a.from('hi')))
 
   state.start = 0
-  t.alike(enc.raw.decode(state), Buffer.from('hi'))
+  t.alike(enc.raw.decode(state), b4a.from('hi'))
   t.is(state.start, state.end)
 })
 
@@ -191,11 +192,11 @@ tape('uint16array', function (t) {
   const state = enc.state()
 
   enc.uint16array.preencode(state, new Uint16Array([1, 2, 3]))
-  t.alike(state, { start: 0, end: 7, buffer: null })
+  t.alike(state, enc.state(0, 7))
 
-  state.buffer = Buffer.alloc(state.end)
+  state.buffer = b4a.alloc(state.end)
   enc.uint16array.encode(state, new Uint16Array([1, 2, 3]))
-  t.alike(state, { start: 7, end: 7, buffer: Buffer.from([3, 1, 0, 2, 0, 3, 0]) })
+  t.alike(state, enc.state(7, 7, b4a.from([3, 1, 0, 2, 0, 3, 0])))
 
   state.start = 0
   t.alike(enc.uint16array.decode(state), new Uint16Array([1, 2, 3]))
@@ -208,15 +209,15 @@ tape('uint32array', function (t) {
   const state = enc.state()
 
   enc.uint32array.preencode(state, new Uint32Array([1]))
-  t.alike(state, { start: 0, end: 5, buffer: null })
+  t.alike(state, enc.state(0, 5))
   enc.uint32array.preencode(state, new Uint32Array([42, 43]))
-  t.alike(state, { start: 0, end: 14, buffer: null })
+  t.alike(state, enc.state(0, 14))
 
-  state.buffer = Buffer.alloc(state.end)
+  state.buffer = b4a.alloc(state.end)
   enc.uint32array.encode(state, new Uint32Array([1]))
-  t.alike(state, { start: 5, end: 14, buffer: Buffer.from([1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]) })
+  t.alike(state, enc.state(5, 14, b4a.from([1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])))
   enc.uint32array.encode(state, new Uint32Array([42, 43]))
-  t.alike(state, { start: 14, end: 14, buffer: Buffer.from([1, 1, 0, 0, 0, 2, 42, 0, 0, 0, 43, 0, 0, 0]) })
+  t.alike(state, enc.state(14, 14, b4a.from([1, 1, 0, 0, 0, 2, 42, 0, 0, 0, 43, 0, 0, 0])))
 
   state.start = 0
   t.alike(enc.uint32array.decode(state), new Uint32Array([1]))
@@ -230,11 +231,11 @@ tape('int16array', function (t) {
   const state = enc.state()
 
   enc.int16array.preencode(state, new Int16Array([1, -2, 3]))
-  t.alike(state, { start: 0, end: 7, buffer: null })
+  t.alike(state, enc.state(0, 7))
 
-  state.buffer = Buffer.alloc(state.end)
+  state.buffer = b4a.alloc(state.end)
   enc.int16array.encode(state, new Int16Array([1, -2, 3]))
-  t.alike(state, { start: 7, end: 7, buffer: Buffer.from([3, 1, 0, 0xfe, 0xff, 3, 0]) })
+  t.alike(state, enc.state(7, 7, b4a.from([3, 1, 0, 0xfe, 0xff, 3, 0])))
 
   state.start = 0
   t.alike(enc.int16array.decode(state), new Int16Array([1, -2, 3]))
@@ -247,11 +248,11 @@ tape('int32array', function (t) {
   const state = enc.state()
 
   enc.int32array.preencode(state, new Int32Array([1, -2, 3]))
-  t.alike(state, { start: 0, end: 13, buffer: null })
+  t.alike(state, enc.state(0, 13))
 
-  state.buffer = Buffer.alloc(state.end)
+  state.buffer = b4a.alloc(state.end)
   enc.int32array.encode(state, new Int32Array([1, -2, 3]))
-  t.alike(state, { start: 13, end: 13, buffer: Buffer.from([3, 1, 0, 0, 0, 0xfe, 0xff, 0xff, 0xff, 3, 0, 0, 0]) })
+  t.alike(state, enc.state(13, 13, b4a.from([3, 1, 0, 0, 0, 0xfe, 0xff, 0xff, 0xff, 3, 0, 0, 0])))
 
   state.start = 0
   t.alike(enc.int32array.decode(state), new Int32Array([1, -2, 3]))
@@ -264,11 +265,11 @@ tape('float32array', function (t) {
   const state = enc.state()
 
   enc.float32array.preencode(state, new Float32Array([1.1, -2.2, 3.3]))
-  t.alike(state, { start: 0, end: 13, buffer: null })
+  t.alike(state, enc.state(0, 13))
 
-  state.buffer = Buffer.alloc(state.end)
+  state.buffer = b4a.alloc(state.end)
   enc.float32array.encode(state, new Float32Array([1.1, -2.2, 3.3]))
-  t.alike(state, { start: 13, end: 13, buffer: Buffer.from([3, 0xcd, 0xcc, 0x8c, 0x3f, 0xcd, 0xcc, 0x0c, 0xc0, 0x33, 0x33, 0x53, 0x40]) })
+  t.alike(state, enc.state(13, 13, b4a.from([3, 0xcd, 0xcc, 0x8c, 0x3f, 0xcd, 0xcc, 0x0c, 0xc0, 0x33, 0x33, 0x53, 0x40])))
 
   state.start = 0
   t.alike(enc.float32array.decode(state), new Float32Array([1.1, -2.2, 3.3]))
@@ -281,11 +282,11 @@ tape('float64array', function (t) {
   const state = enc.state()
 
   enc.float64array.preencode(state, new Float64Array([1.1, -2.2, 3.3]))
-  t.alike(state, { start: 0, end: 25, buffer: null })
+  t.alike(state, enc.state(0, 25))
 
-  state.buffer = Buffer.alloc(state.end)
+  state.buffer = b4a.alloc(state.end)
   enc.float64array.encode(state, new Float64Array([1.1, -2.2, 3.3]))
-  t.alike(state, { start: 25, end: 25, buffer: Buffer.from([3, 0x9a, 0x99, 0x99, 0x99, 0x99, 0x99, 0xf1, 0x3f, 0x9a, 0x99, 0x99, 0x99, 0x99, 0x99, 0x01, 0xc0, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x0a, 0x40]) })
+  t.alike(state, enc.state(25, 25, b4a.from([3, 0x9a, 0x99, 0x99, 0x99, 0x99, 0x99, 0xf1, 0x3f, 0x9a, 0x99, 0x99, 0x99, 0x99, 0x99, 0x01, 0xc0, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x0a, 0x40])))
 
   state.start = 0
   t.alike(enc.float64array.decode(state), new Float64Array([1.1, -2.2, 3.3]))
@@ -298,15 +299,15 @@ tape('string', function (t) {
   const state = enc.state()
 
   enc.string.preencode(state, '🌾')
-  t.alike(state, { start: 0, end: 5, buffer: null })
+  t.alike(state, enc.state(0, 5))
   enc.string.preencode(state, 'høsten er fin')
-  t.alike(state, { start: 0, end: 20, buffer: null })
+  t.alike(state, enc.state(0, 20))
 
-  state.buffer = Buffer.alloc(state.end)
+  state.buffer = b4a.alloc(state.end)
   enc.string.encode(state, '🌾')
-  t.alike(state, { start: 5, end: 20, buffer: Buffer.from('\x04🌾\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00') })
+  t.alike(state, enc.state(5, 20, b4a.from('\x04🌾\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')))
   enc.string.encode(state, 'høsten er fin')
-  t.alike(state, { start: 20, end: 20, buffer: Buffer.from('\x04🌾\x0ehøsten er fin') })
+  t.alike(state, enc.state(20, 20, b4a.from('\x04🌾\x0ehøsten er fin')))
 
   state.start = 0
   t.is(enc.string.decode(state), '🌾')
@@ -319,20 +320,20 @@ tape('string', function (t) {
 tape('fixed32', function (t) {
   const state = enc.state()
 
-  enc.fixed32.preencode(state, Buffer.alloc(32).fill('a'))
-  t.alike(state, { start: 0, end: 32, buffer: null })
-  enc.fixed32.preencode(state, Buffer.alloc(32).fill('b'))
-  t.alike(state, { start: 0, end: 64, buffer: null })
+  enc.fixed32.preencode(state, b4a.alloc(32).fill('a'))
+  t.alike(state, enc.state(0, 32))
+  enc.fixed32.preencode(state, b4a.alloc(32).fill('b'))
+  t.alike(state, enc.state(0, 64))
 
-  state.buffer = Buffer.alloc(state.end)
-  enc.fixed32.encode(state, Buffer.alloc(32).fill('a'))
-  t.alike(state, { start: 32, end: 64, buffer: Buffer.alloc(64).fill('a', 0, 32) })
-  enc.fixed32.encode(state, Buffer.alloc(32).fill('b'))
-  t.alike(state, { start: 64, end: 64, buffer: Buffer.alloc(64).fill('a', 0, 32).fill('b', 32, 64) })
+  state.buffer = b4a.alloc(state.end)
+  enc.fixed32.encode(state, b4a.alloc(32).fill('a'))
+  t.alike(state, enc.state(32, 64, b4a.alloc(64).fill('a', 0, 32)))
+  enc.fixed32.encode(state, b4a.alloc(32).fill('b'))
+  t.alike(state, enc.state(64, 64, b4a.alloc(64).fill('a', 0, 32).fill('b', 32, 64)))
 
   state.start = 0
-  t.alike(enc.fixed32.decode(state), Buffer.alloc(32).fill('a'))
-  t.alike(enc.fixed32.decode(state), Buffer.alloc(32).fill('b'))
+  t.alike(enc.fixed32.decode(state), b4a.alloc(32).fill('a'))
+  t.alike(enc.fixed32.decode(state), b4a.alloc(32).fill('b'))
   t.is(state.start, state.end)
 
   t.exception(() => enc.fixed32.decode(state))
@@ -341,20 +342,20 @@ tape('fixed32', function (t) {
 tape('fixed64', function (t) {
   const state = enc.state()
 
-  enc.fixed64.preencode(state, Buffer.alloc(64).fill('a'))
-  t.alike(state, { start: 0, end: 64, buffer: null })
-  enc.fixed64.preencode(state, Buffer.alloc(64).fill('b'))
-  t.alike(state, { start: 0, end: 128, buffer: null })
+  enc.fixed64.preencode(state, b4a.alloc(64).fill('a'))
+  t.alike(state, enc.state(0, 64))
+  enc.fixed64.preencode(state, b4a.alloc(64).fill('b'))
+  t.alike(state, enc.state(0, 128))
 
-  state.buffer = Buffer.alloc(state.end)
-  enc.fixed64.encode(state, Buffer.alloc(64).fill('a'))
-  t.alike(state, { start: 64, end: 128, buffer: Buffer.alloc(128).fill('a', 0, 64) })
-  enc.fixed64.encode(state, Buffer.alloc(64).fill('b'))
-  t.alike(state, { start: 128, end: 128, buffer: Buffer.alloc(128).fill('a', 0, 64).fill('b', 64, 128) })
+  state.buffer = b4a.alloc(state.end)
+  enc.fixed64.encode(state, b4a.alloc(64).fill('a'))
+  t.alike(state, enc.state(64, 128, b4a.alloc(128).fill('a', 0, 64)))
+  enc.fixed64.encode(state, b4a.alloc(64).fill('b'))
+  t.alike(state, enc.state(128, 128, b4a.alloc(128).fill('a', 0, 64).fill('b', 64, 128)))
 
   state.start = 0
-  t.alike(enc.fixed64.decode(state), Buffer.alloc(64).fill('a'))
-  t.alike(enc.fixed64.decode(state), Buffer.alloc(64).fill('b'))
+  t.alike(enc.fixed64.decode(state), b4a.alloc(64).fill('a'))
+  t.alike(enc.fixed64.decode(state), b4a.alloc(64).fill('b'))
   t.is(state.start, state.end)
 
   t.exception(() => enc.fixed64.decode(state))
@@ -364,20 +365,20 @@ tape('fixed n', function (t) {
   const state = enc.state()
   const fixed = enc.fixed(3)
 
-  fixed.preencode(state, Buffer.alloc(3).fill('a'))
-  t.alike(state, { start: 0, end: 3, buffer: null })
-  fixed.preencode(state, Buffer.alloc(3).fill('b'))
-  t.alike(state, { start: 0, end: 6, buffer: null })
+  fixed.preencode(state, b4a.alloc(3).fill('a'))
+  t.alike(state, enc.state(0, 3))
+  fixed.preencode(state, b4a.alloc(3).fill('b'))
+  t.alike(state, enc.state(0, 6))
 
-  state.buffer = Buffer.alloc(state.end)
-  fixed.encode(state, Buffer.alloc(3).fill('a'))
-  t.alike(state, { start: 3, end: 6, buffer: Buffer.alloc(6).fill('a', 0, 3) })
-  fixed.encode(state, Buffer.alloc(3).fill('b'))
-  t.alike(state, { start: 6, end: 6, buffer: Buffer.alloc(6).fill('a', 0, 3).fill('b', 3, 6) })
+  state.buffer = b4a.alloc(state.end)
+  fixed.encode(state, b4a.alloc(3).fill('a'))
+  t.alike(state, enc.state(3, 6, b4a.alloc(6).fill('a', 0, 3)))
+  fixed.encode(state, b4a.alloc(3).fill('b'))
+  t.alike(state, enc.state(6, 6, b4a.alloc(6).fill('a', 0, 3).fill('b', 3, 6)))
 
   state.start = 0
-  t.alike(fixed.decode(state), Buffer.alloc(3).fill('a'))
-  t.alike(fixed.decode(state), Buffer.alloc(3).fill('b'))
+  t.alike(fixed.decode(state), b4a.alloc(3).fill('a'))
+  t.alike(fixed.decode(state), b4a.alloc(3).fill('b'))
   t.is(state.start, state.end)
 
   t.exception(() => fixed.decode(state))
@@ -390,15 +391,15 @@ tape('array', function (t) {
   const arr = enc.array(enc.bool)
 
   arr.preencode(state, [true, false, true])
-  t.alike(state, { start: 0, end: 4, buffer: null })
+  t.alike(state, enc.state(0, 4))
   arr.preencode(state, [false, false, true, true])
-  t.alike(state, { start: 0, end: 9, buffer: null })
+  t.alike(state, enc.state(0, 9))
 
-  state.buffer = Buffer.alloc(state.end)
+  state.buffer = b4a.alloc(state.end)
   arr.encode(state, [true, false, true])
-  t.alike(state, { start: 4, end: 9, buffer: Buffer.from([3, 1, 0, 1, 0, 0, 0, 0, 0]) })
+  t.alike(state, enc.state(4, 9, b4a.from([3, 1, 0, 1, 0, 0, 0, 0, 0])))
   arr.encode(state, [false, false, true, true])
-  t.alike(state, { start: 9, end: 9, buffer: Buffer.from([3, 1, 0, 1, 4, 0, 0, 1, 1]) })
+  t.alike(state, enc.state(9, 9, b4a.from([3, 1, 0, 1, 4, 0, 0, 1, 1])))
 
   state.start = 0
   t.alike(arr.decode(state), [true, false, true])
@@ -408,6 +409,25 @@ tape('array', function (t) {
   t.exception(() => arr.decode(state))
 })
 
+tape('json', function (t) {
+  const state = enc.state()
+
+  enc.json.preencode(state, { a: 1, b: 2 })
+  t.alike(state, enc.state(0, 14))
+
+  state.buffer = b4a.alloc(state.end)
+  enc.json.encode(state, { a: 1, b: 2 })
+  t.alike(state, enc.state(14, 14, b4a.concat([
+    b4a.from([13]),
+    b4a.from('{"a":1,"b":2}')
+  ])))
+
+  state.start = 0
+  t.alike(enc.json.decode(state), { a: 1, b: 2 })
+
+  t.exception(() => enc.json.decode(state))
+})
+
 tape('lexint: big numbers', function (t) {
   t.plan(1)
 
@@ -418,7 +438,7 @@ tape('lexint: big numbers', function (t) {
 
   for (n = 1; n < Number.MAX_VALUE; n += skip) {
     const cur = enc.encode(enc.lexint, n)
-    if (Buffer.compare(cur, prev) < 1) break
+    if (b4a.compare(cur, prev) < 1) break
     prev = cur
     skip = 1 + Math.pow(245, Math.ceil(Math.log(n) / Math.log(256)))
   }
@@ -440,7 +460,7 @@ tape('lexint: range precision', function (t) {
   const skip = 0.000000001e55
   for (let i = 0, n = 1e55; i < 1000; n = 1e55 + skip * ++i) {
     const cur = enc.encode(enc.lexint, n)
-    if (Buffer.compare(cur, prev) < 1) t.fail('cur <= prev')
+    if (b4a.compare(cur, prev) < 1) t.fail('cur <= prev')
     prev = cur
   }
   t.ok(true)
@@ -451,7 +471,7 @@ tape('lexint: small numbers', function (t) {
   let prev = enc.encode(enc.lexint, 0)
   for (let n = 1; n < 256 * 256 * 16; n++) {
     const cur = enc.encode(enc.lexint, n)
-    if (Buffer.compare(cur, prev) < 1) t.fail('cur <= prev')
+    if (b4a.compare(cur, prev) < 1) t.fail('cur <= prev')
     prev = cur
   }
   t.ok(true)
@@ -460,19 +480,15 @@ tape('lexint: small numbers', function (t) {
 
 tape('lexint: throws', function (t) {
   t.exception(() => {
-    enc.decode(enc.lexint, Buffer.alloc(1, 251))
+    enc.decode(enc.lexint, b4a.alloc(1, 251))
   })
 
   let num = 252
 
-  const state = {
-    start: 0,
-    end: 0,
-    buffer: null
-  }
+  const state = enc.state()
 
   enc.lexint.preencode(state, num)
-  state.buffer = Buffer.alloc(state.end - state.start)
+  state.buffer = b4a.alloc(state.end - state.start)
   enc.lexint.encode(state, num)
 
   t.exception(() => {
@@ -486,7 +502,7 @@ tape('lexint: throws', function (t) {
   state.buffer = null
 
   enc.lexint.preencode(state, num)
-  state.buffer = Buffer.alloc(state.end - state.start)
+  state.buffer = b4a.alloc(state.end - state.start)
   enc.lexint.encode(state, num)
 
   t.exception(() => {
@@ -500,7 +516,7 @@ tape('lexint: throws', function (t) {
   state.buffer = null
 
   enc.lexint.preencode(state, num)
-  state.buffer = Buffer.alloc(state.end - state.start)
+  state.buffer = b4a.alloc(state.end - state.start)
   enc.lexint.encode(state, num)
 
   t.exception(() => {
@@ -514,7 +530,7 @@ tape('lexint: throws', function (t) {
   state.buffer = null
 
   enc.lexint.preencode(state, num)
-  state.buffer = Buffer.alloc(state.end - state.start)
+  state.buffer = b4a.alloc(state.end - state.start)
   enc.lexint.encode(state, num)
 
   t.exception(() => {
@@ -528,7 +544,7 @@ tape('lexint: throws', function (t) {
   state.buffer = null
 
   enc.lexint.preencode(state, num)
-  state.buffer = Buffer.alloc(state.end - state.start)
+  state.buffer = b4a.alloc(state.end - state.start)
   enc.lexint.encode(state, num)
 
   t.exception(() => {