@fireproof/vendor 1.0.0 → 1.0.1

package/src/cborg/{lib → utils}/1negint.js

@@ -2,11 +2,10 @@
 
 import { Token, Type } from './token.js'
 import * as uint from './0uint.js'
-import { decodeErrPrefix } from './common.js'
 
 /**
  * @typedef {import('./bl.js').Bl} Bl
- * @typedef {import('../interface').DecodeOptions} DecodeOptions
+ * @typedef {import('../interface.js').DecodeOptions} DecodeOptions
  */
 
 /**
@@ -61,7 +60,7 @@ export function decodeNegint64 (data, pos, _minor, options) {
     }
   }
   if (options.allowBigInt !== true) {
-    throw new Error(`${decodeErrPrefix} integers outside of the safe integer range are not supported`)
+    throw new Error(`${options.decodeErrPrefix} integers outside of the safe integer range are not supported`)
   }
   return new Token(Type.negint, neg1b - BigInt(int), 9)
 }
@@ -69,11 +68,12 @@ export function decodeNegint64 (data, pos, _minor, options) {
 /**
  * @param {Bl} buf
  * @param {Token} token
+ * @param {import('../interface.js').EncodeOptions} options
  */
-export function encodeNegint (buf, token) {
+export function encodeNegint (buf, token, { encodeErrPrefix }) {
   const negint = token.value
   const unsigned = (typeof negint === 'bigint' ? (negint * neg1b - pos1b) : (negint * -1 - 1))
-  uint.encodeUintValue(buf, token.type.majorEncoded, unsigned)
+  uint.encodeUintValue(buf, token.type.majorEncoded, unsigned, encodeErrPrefix)
 }
 
 /**

package/src/cborg/{lib → utils}/2bytes.js

@@ -1,11 +1,11 @@
 import { Token, Type } from './token.js'
-import { assertEnoughData, decodeErrPrefix } from './common.js'
+import { assertEnoughData } from './common.js'
 import * as uint from './0uint.js'
 import { compare, fromString, slice } from './byte-utils.js'
 
 /**
  * @typedef {import('./bl.js').Bl} Bl
- * @typedef {import('../interface').DecodeOptions} DecodeOptions
+ * @typedef {import('../interface.js').DecodeOptions} DecodeOptions
  */
 
 /**
@@ -13,10 +13,11 @@ import { compare, fromString, slice } from './byte-utils.js'
  * @param {number} pos
  * @param {number} prefix
  * @param {number} length
+ * @param {string} decodeErrPrefix
  * @returns {Token}
  */
-function toToken (data, pos, prefix, length) {
-  assertEnoughData(data, pos, prefix + length)
+function toToken (data, pos, prefix, length, decodeErrPrefix) {
+  assertEnoughData(data, pos, prefix + length, decodeErrPrefix)
   const buf = slice(data, pos + prefix, pos + prefix + length)
   return new Token(Type.bytes, buf, prefix + length)
 }
@@ -25,11 +26,11 @@ function toToken (data, pos, prefix, length) {
  * @param {Uint8Array} data
  * @param {number} pos
  * @param {number} minor
- * @param {DecodeOptions} _options
+ * @param {DecodeOptions} options
  * @returns {Token}
  */
-export function decodeBytesCompact (data, pos, minor, _options) {
-  return toToken(data, pos, 1, minor)
+export function decodeBytesCompact (data, pos, minor, options) {
+  return toToken(data, pos, 1, minor, options.decodeErrPrefix)
 }
 
 /**
@@ -40,7 +41,7 @@ export function decodeBytesCompact (data, pos, minor, _options) {
  * @returns {Token}
  */
 export function decodeBytes8 (data, pos, _minor, options) {
-  return toToken(data, pos, 2, uint.readUint8(data, pos + 1, options))
+  return toToken(data, pos, 2, uint.readUint8(data, pos + 1, options), options.decodeErrPrefix)
 }
 
 /**
@@ -51,7 +52,7 @@ export function decodeBytes8 (data, pos, _minor, options) {
  * @returns {Token}
  */
 export function decodeBytes16 (data, pos, _minor, options) {
-  return toToken(data, pos, 3, uint.readUint16(data, pos + 1, options))
+  return toToken(data, pos, 3, uint.readUint16(data, pos + 1, options), options.decodeErrPrefix)
 }
 
 /**
@@ -62,7 +63,7 @@ export function decodeBytes16 (data, pos, _minor, options) {
  * @returns {Token}
  */
 export function decodeBytes32 (data, pos, _minor, options) {
-  return toToken(data, pos, 5, uint.readUint32(data, pos + 1, options))
+  return toToken(data, pos, 5, uint.readUint32(data, pos + 1, options), options.decodeErrPrefix)
 }
 
 // TODO: maybe we shouldn't support this ..
@@ -76,9 +77,9 @@ export function decodeBytes32 (data, pos, _minor, options) {
 export function decodeBytes64 (data, pos, _minor, options) {
   const l = uint.readUint64(data, pos + 1, options)
   if (typeof l === 'bigint') {
-    throw new Error(`${decodeErrPrefix} 64-bit integer bytes lengths not supported`)
+    throw new Error(`${options.decodeErrPrefix} 64-bit integer bytes lengths not supported`)
   }
-  return toToken(data, pos, 9, l)
+  return toToken(data, pos, 9, l, options.decodeErrPrefix)
 }
 
 /**
@@ -98,10 +99,11 @@ function tokenBytes (token) {
 /**
  * @param {Bl} buf
  * @param {Token} token
+ * @param {import('../interface.js').EncodeOptions} options
  */
-export function encodeBytes (buf, token) {
+export function encodeBytes (buf, token, { encodeErrPrefix }) {
   const bytes = tokenBytes(token)
-  uint.encodeUintValue(buf, token.type.majorEncoded, bytes.length)
+  uint.encodeUintValue(buf, token.type.majorEncoded, bytes.length, encodeErrPrefix)
   buf.push(bytes)
 }
 

package/src/cborg/{lib → utils}/3string.js

@@ -1,12 +1,12 @@
 import { Token, Type } from './token.js'
-import { assertEnoughData, decodeErrPrefix } from './common.js'
+import { assertEnoughData } from './common.js'
 import * as uint from './0uint.js'
 import { encodeBytes } from './2bytes.js'
 import { toString, slice } from './byte-utils.js'
 
 /**
  * @typedef {import('./bl.js').Bl} Bl
- * @typedef {import('../interface').DecodeOptions} DecodeOptions
+ * @typedef {import('../interface.js').DecodeOptions} DecodeOptions
  */
 
 /**
@@ -19,7 +19,7 @@ import { toString, slice } from './byte-utils.js'
  */
 function toToken (data, pos, prefix, length, options) {
   const totLength = prefix + length
-  assertEnoughData(data, pos, totLength)
+  assertEnoughData(data, pos, totLength, options.decodeErrPrefix)
   const tok = new Token(Type.string, toString(data, pos + prefix, pos + totLength), totLength)
   if (options.retainStringBytes === true) {
     tok.byteValue = slice(data, pos + prefix, pos + totLength)
@@ -82,7 +82,7 @@ export function decodeString32 (data, pos, _minor, options) {
 export function decodeString64 (data, pos, _minor, options) {
   const l = uint.readUint64(data, pos + 1, options)
   if (typeof l === 'bigint') {
-    throw new Error(`${decodeErrPrefix} 64-bit integer string lengths not supported`)
+    throw new Error(`${options.decodeErrPrefix} 64-bit integer string lengths not supported`)
   }
   return toToken(data, pos, 9, l, options)
 }

package/src/cborg/{lib → utils}/4array.js

@@ -1,10 +1,10 @@
 import { Token, Type } from './token.js'
 import * as uint from './0uint.js'
-import { decodeErrPrefix } from './common.js'
+// import { decodeErrPrefix } from '../lib/common.js'
 
 /**
  * @typedef {import('./bl.js').Bl} Bl
- * @typedef {import('../interface').DecodeOptions} DecodeOptions
+ * @typedef {import('../interface.js').DecodeOptions} DecodeOptions
  */
 
 /**
@@ -73,7 +73,7 @@ export function decodeArray32 (data, pos, _minor, options) {
 export function decodeArray64 (data, pos, _minor, options) {
   const l = uint.readUint64(data, pos + 1, options)
   if (typeof l === 'bigint') {
-    throw new Error(`${decodeErrPrefix} 64-bit integer array lengths not supported`)
+    throw new Error(`${options.decodeErrPrefix} 64-bit integer array lengths not supported`)
   }
   return toToken(data, pos, 9, l)
 }
@@ -87,7 +87,7 @@ export function decodeArray64 (data, pos, _minor, options) {
  */
 export function decodeArrayIndefinite (data, pos, _minor, options) {
   if (options.allowIndefinite === false) {
-    throw new Error(`${decodeErrPrefix} indefinite length items not allowed`)
+    throw new Error(`${options.decodeErrPrefix} indefinite length items not allowed`)
   }
   return toToken(data, pos, 1, Infinity)
 }
@@ -95,9 +95,10 @@ export function decodeArrayIndefinite (data, pos, _minor, options) {
 /**
  * @param {Bl} buf
  * @param {Token} token
+ * @param {import('../interface.js').EncodeOptions} options
  */
-export function encodeArray (buf, token) {
-  uint.encodeUintValue(buf, Type.array.majorEncoded, token.value)
+export function encodeArray (buf, token, { encodeErrPrefix }) {
+  uint.encodeUintValue(buf, Type.array.majorEncoded, token.value, encodeErrPrefix)
 }
 
 // using an array as a map key, are you sure about this? we can only sort

package/src/cborg/{lib → utils}/5map.js

@@ -1,10 +1,9 @@
 import { Token, Type } from './token.js'
 import * as uint from './0uint.js'
-import { decodeErrPrefix } from './common.js'
 
 /**
  * @typedef {import('./bl.js').Bl} Bl
- * @typedef {import('../interface').DecodeOptions} DecodeOptions
+ * @typedef {import('../interface.js').DecodeOptions} DecodeOptions
  */
 
 /**
@@ -73,7 +72,7 @@ export function decodeMap32 (data, pos, _minor, options) {
 export function decodeMap64 (data, pos, _minor, options) {
   const l = uint.readUint64(data, pos + 1, options)
   if (typeof l === 'bigint') {
-    throw new Error(`${decodeErrPrefix} 64-bit integer map lengths not supported`)
+    throw new Error(`${options.decodeErrPrefix} 64-bit integer map lengths not supported`)
   }
   return toToken(data, pos, 9, l)
 }
@@ -87,7 +86,7 @@ export function decodeMap64 (data, pos, _minor, options) {
  */
 export function decodeMapIndefinite (data, pos, _minor, options) {
   if (options.allowIndefinite === false) {
-    throw new Error(`${decodeErrPrefix} indefinite length items not allowed`)
+    throw new Error(`${options.decodeErrPrefix} indefinite length items not allowed`)
   }
   return toToken(data, pos, 1, Infinity)
 }
@@ -95,9 +94,10 @@ export function decodeMapIndefinite (data, pos, _minor, options) {
 /**
  * @param {Bl} buf
  * @param {Token} token
+ * @param {import('../interface.js').EncodeOptions} options
  */
-export function encodeMap (buf, token) {
-  uint.encodeUintValue(buf, Type.map.majorEncoded, token.value)
+export function encodeMap (buf, token, { encodeErrPrefix }) {
+  uint.encodeUintValue(buf, Type.map.majorEncoded, token.value, encodeErrPrefix)
 }
 
 // using a map as a map key, are you sure about this? we can only sort

package/src/cborg/{lib → utils}/6tag.js

@@ -3,7 +3,7 @@ import * as uint from './0uint.js'
 
 /**
  * @typedef {import('./bl.js').Bl} Bl
- * @typedef {import('../interface').DecodeOptions} DecodeOptions
+ * @typedef {import('../interface.js').DecodeOptions} DecodeOptions
  */
 
 /**
@@ -64,9 +64,10 @@ export function decodeTag64 (data, pos, _minor, options) {
 /**
  * @param {Bl} buf
  * @param {Token} token
+ * @param {import('../interface.js').EncodeOptions} options
  */
-export function encodeTag (buf, token) {
-  uint.encodeUintValue(buf, Type.tag.majorEncoded, token.value)
+export function encodeTag (buf, token, { encodeErrPrefix }) {
+  uint.encodeUintValue(buf, Type.tag.majorEncoded, token.value, encodeErrPrefix)
 }
 
 encodeTag.compareTokens = uint.encodeUint.compareTokens

package/src/cborg/{lib → utils}/7float.js

@@ -2,13 +2,12 @@
 // where possible
 
 import { Token, Type } from './token.js'
-import { decodeErrPrefix } from './common.js'
 import { encodeUint } from './0uint.js'
 
 /**
  * @typedef {import('./bl.js').Bl} Bl
- * @typedef {import('../interface').DecodeOptions} DecodeOptions
- * @typedef {import('../interface').EncodeOptions} EncodeOptions
+ * @typedef {import('../interface.js').DecodeOptions} DecodeOptions
+ * @typedef {import('../interface.js').EncodeOptions} EncodeOptions
  */
 
 const MINOR_FALSE = 20
@@ -25,7 +24,7 @@ const MINOR_UNDEFINED = 23
  */
 export function decodeUndefined (_data, _pos, _minor, options) {
   if (options.allowUndefined === false) {
-    throw new Error(`${decodeErrPrefix} undefined values are not supported`)
+    throw new Error(`${options.decodeErrPrefix} undefined values are not supported`)
   } else if (options.coerceUndefinedToNull === true) {
     return new Token(Type.null, null, 1)
   }
@@ -41,7 +40,7 @@ export function decodeUndefined (_data, _pos, _minor, options) {
  */
 export function decodeBreak (_data, _pos, _minor, options) {
   if (options.allowIndefinite === false) {
-    throw new Error(`${decodeErrPrefix} indefinite length items not allowed`)
+    throw new Error(`${options.decodeErrPrefix} indefinite length items not allowed`)
   }
   return new Token(Type.break, undefined, 1)
 }
@@ -55,10 +54,10 @@ export function decodeBreak (_data, _pos, _minor, options) {
 function createToken (value, bytes, options) {
   if (options) {
     if (options.allowNaN === false && Number.isNaN(value)) {
-      throw new Error(`${decodeErrPrefix} NaN values are not supported`)
+      throw new Error(`${options.decodeErrPrefix} NaN values are not supported`)
     }
     if (options.allowInfinity === false && (value === Infinity || value === -Infinity)) {
-      throw new Error(`${decodeErrPrefix} Infinity values are not supported`)
+      throw new Error(`${options.decodeErrPrefix} Infinity values are not supported`)
     }
   }
   return new Token(Type.float, value, bytes)
@@ -72,7 +71,7 @@ function createToken (value, bytes, options) {
  * @returns {Token}
  */
 export function decodeFloat16 (data, pos, _minor, options) {
-  return createToken(readFloat16(data, pos + 1), 3, options)
+  return createToken(readFloat16(data, pos + 1, options.decodeErrPrefix), 3, options)
 }
 
 /**
@@ -83,7 +82,7 @@ export function decodeFloat16 (data, pos, _minor, options) {
  * @returns {Token}
  */
 export function decodeFloat32 (data, pos, _minor, options) {
-  return createToken(readFloat32(data, pos + 1), 5, options)
+  return createToken(readFloat32(data, pos + 1, options.decodeErrPrefix), 5, options)
 }
 
 /**
@@ -94,7 +93,7 @@ export function decodeFloat32 (data, pos, _minor, options) {
  * @returns {Token}
  */
 export function decodeFloat64 (data, pos, _minor, options) {
-  return createToken(readFloat64(data, pos + 1), 9, options)
+  return createToken(readFloat64(data, pos + 1, options.decodeErrPrefix), 9, options)
 }
 
 /**
@@ -118,14 +117,14 @@ export function encodeFloat (buf, token, options) {
     let success = false
     if (!options || options.float64 !== true) {
       encodeFloat16(float)
-      decoded = readFloat16(ui8a, 1)
+      decoded = readFloat16(ui8a, 1, options.encodeErrPrefix)
       if (float === decoded || Number.isNaN(float)) {
         ui8a[0] = 0xf9
         buf.push(ui8a.slice(0, 3))
         success = true
       } else {
         encodeFloat32(float)
-        decoded = readFloat32(ui8a, 1)
+        decoded = readFloat32(ui8a, 1, options.encodeErrPrefix)
         if (float === decoded) {
           ui8a[0] = 0xfa
           buf.push(ui8a.slice(0, 5))
@@ -135,7 +134,7 @@ export function encodeFloat (buf, token, options) {
     }
     if (!success) {
       encodeFloat64(float)
-      decoded = readFloat64(ui8a, 1)
+      decoded = readFloat64(ui8a, 1, options.encodeErrPrefix)
       ui8a[0] = 0xfb
       buf.push(ui8a.slice(0, 9))
     }
@@ -156,12 +155,12 @@ encodeFloat.encodedSize = function encodedSize (token, options) {
 
   if (!options || options.float64 !== true) {
     encodeFloat16(float)
-    let decoded = readFloat16(ui8a, 1)
+    let decoded = readFloat16(ui8a, 1, options.encodeErrPrefix)
     if (float === decoded || Number.isNaN(float)) {
       return 3
     }
     encodeFloat32(float)
-    decoded = readFloat32(ui8a, 1)
+    decoded = readFloat32(ui8a, 1, options.encodeErrPrefix)
     if (float === decoded) {
       return 5
     }
@@ -222,11 +221,12 @@ function encodeFloat16 (inp) {
 /**
  * @param {Uint8Array} ui8a
  * @param {number} pos
+ * @param {string} encodeErrPrefix
  * @returns {number}
  */
-function readFloat16 (ui8a, pos) {
+function readFloat16 (ui8a, pos, encodeErrPrefix) {
   if (ui8a.length - pos < 2) {
-    throw new Error(`${decodeErrPrefix} not enough data for float16`)
+    throw new Error(`${encodeErrPrefix} not enough data for float16`)
   }
 
   const half = (ui8a[pos] << 8) + ui8a[pos + 1]
@@ -264,11 +264,12 @@ function encodeFloat32 (inp) {
 /**
  * @param {Uint8Array} ui8a
  * @param {number} pos
+ * @param {string} encodeErrPrefix
  * @returns {number}
  */
-function readFloat32 (ui8a, pos) {
+function readFloat32 (ui8a, pos, encodeErrPrefix) {
   if (ui8a.length - pos < 4) {
-    throw new Error(`${decodeErrPrefix} not enough data for float32`)
+    throw new Error(`${encodeErrPrefix} not enough data for float32`)
   }
   const offset = (ui8a.byteOffset || 0) + pos
   return new DataView(ui8a.buffer, offset, 4).getFloat32(0, false)
@@ -284,11 +285,12 @@ function encodeFloat64 (inp) {
 /**
  * @param {Uint8Array} ui8a
  * @param {number} pos
+ * @param {string} encodeErrPrefix
  * @returns {number}
  */
-function readFloat64 (ui8a, pos) {
+function readFloat64 (ui8a, pos, encodeErrPrefix) {
   if (ui8a.length - pos < 8) {
-    throw new Error(`${decodeErrPrefix} not enough data for float64`)
+    throw new Error(`${encodeErrPrefix} not enough data for float64`)
   }
   const offset = (ui8a.byteOffset || 0) + pos
   return new DataView(ui8a.buffer, offset, 8).getFloat64(0, false)

package/src/cborg/{lib → utils}/bl.js

@@ -16,7 +16,7 @@
  */
 
 // TODO: ipjs doesn't support this, only for test files: https://github.com/mikeal/ipjs/blob/master/src/package/testFile.js#L39
-import { alloc, concat, slice } from './byte-utils.js'
+import { alloc, concat, slice } from 'cborg/utils'
 
 // the ts-ignores in this file are almost all for the `Uint8Array|number[]` duality that exists
 // for perf reasons. Consider better approaches to this or removing it entirely, it is quite

package/src/cborg/utils/common.js

@@ -0,0 +1,11 @@
+/**
+ * @param {Uint8Array} data
+ * @param {number} pos
+ * @param {number} need
+ * @param {string} decodeErrPrefix
+ */
+export function assertEnoughData (data, pos, need, decodeErrPrefix) {
+  if (data.length - pos < need) {
+    throw new Error(`${decodeErrPrefix} not enough data for type`)
+  }
+}

package/src/cborg/utils/index.js

@@ -0,0 +1,12 @@
+export * from './byte-utils.js'
+export { encodeUint, uintBoundaries } from './0uint.js'
+export { encodeNegint } from './1negint.js'
+export { encodeBytes } from './2bytes.js'
+export { encodeString } from './3string.js'
+export { encodeArray } from './4array.js'
+export { encodeMap } from './5map.js'
+export { encodeTag } from './6tag.js'
+export { encodeFloat } from './7float.js'
+export { Bl } from './bl.js'
+export { Token, Type } from './token.js'
+export * from './jump.js'