compact-encoding 2.6.0 → 2.6.1

package/index.js

@@ -173,19 +173,18 @@ exports.buffer = {
   decode (state) {
     const len = uint.decode(state)
     if (len === 0) return null
-    const b = state.buffer.subarray(state.start, state.start += len)
-    if (b.length !== len) throw new Error('Out of bounds')
-    return b
+    if (state.end - state.start < len) throw new Error('Out of bounds')
+    return state.buffer.subarray(state.start, (state.start += len))
   }
 }
 
 const raw = exports.raw = {
   preencode (state, b) {
-    state.end += b.length
+    state.end += b.byteLength
   },
   encode (state, b) {
     state.buffer.set(b, state.start)
-    state.start += b.length
+    state.start += b.byteLength
   },
   decode (state) {
     const b = state.buffer.subarray(state.start, state.end)
@@ -251,9 +250,8 @@ exports.string = {
   },
   decode (state) {
     const len = uint.decode(state)
-    const s = b4a.toString(state.buffer, 'utf-8', state.start, state.start += len)
-    if (b4a.byteLength(s) !== len || state.start > state.end) throw new Error('Out of bounds')
-    return s
+    if (state.end - state.start < len) throw new Error('Out of bounds')
+    return b4a.toString(state.buffer, 'utf-8', state.start, (state.start += len))
   }
 }
 
@@ -280,9 +278,8 @@ const fixed = exports.fixed = function fixed (n) {
       state.start += n
     },
     decode (state) {
-      const b = state.buffer.subarray(state.start, state.start += n)
-      if (b.length !== n) throw new Error('Out of bounds')
-      return b
+      if (state.end - state.start < n) throw new Error('Out of bounds')
+      return state.buffer.subarray(state.start, (state.start += n))
     }
   }
 }
@@ -336,7 +333,7 @@ function fromCodec (enc) {
     preencode (state, m) {
       tmpM = m
       tmpBuf = enc.encode(m)
-      state.end += tmpBuf.length
+      state.end += tmpBuf.byteLength
     },
     encode (state, m) {
       raw.encode(state, m === tmpM ? tmpBuf : enc.encode(m))

package/package.json

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

package/test.js

@@ -170,9 +170,6 @@ tape('buffer', function (t) {
   t.is(state.start, state.end)
 
   t.exception(() => enc.buffer.decode(state))
-  state.buffer = state.buffer.subarray(0, 8)
-  state.start = 3
-  t.exception(() => enc.buffer.decode(state), 'partial throws')
 })
 
 tape('raw', function (t) {