@fireproof/vendor 1.0.0 → 1.0.1

package/src/cborg/{lib/json → json}/decode.js

@@ -1,13 +1,11 @@
 // never reference the file directly to ensure the
 // indepency of the json module
 import { decode as _decode, decodeFirst as _decodeFirst } from "@fireproof/vendor/cborg"
-import { Token, Type } from "@fireproof/vendor/cborg"
-import { decodeCodePointsArray } from "@fireproof/vendor/cborg"
-import { decodeErrPrefix } from "@fireproof/vendor/cborg"
+import { Token, Type, decodeCodePointsArray } from 'cborg/utils'
 
 /**
- * @typedef {import('../../interface').DecodeOptions} DecodeOptions
- * @typedef {import('../../interface').DecodeTokenizer} DecodeTokenizer
+ * @typedef {import('../interface').DecodeOptions} DecodeOptions
+ * @typedef {import('../interface').DecodeTokenizer} DecodeTokenizer
  */
 
 /**
@@ -18,7 +16,7 @@ class Tokenizer {
    * @param {Uint8Array} data
    * @param {DecodeOptions} options
    */
-  constructor (data, options = {}) {
+  constructor (data, options) {
     this._pos = 0
     this.data = data
     this.options = options
@@ -65,11 +63,11 @@ class Tokenizer {
    */
   expect (str) {
     if (this.data.length - this._pos < str.length) {
-      throw new Error(`${decodeErrPrefix} unexpected end of input at position ${this._pos}`)
+      throw new Error(`${this.options.decodeErrPrefix} unexpected end of input at position ${this._pos}`)
     }
     for (let i = 0; i < str.length; i++) {
       if (this.data[this._pos++] !== str[i]) {
-        throw new Error(`${decodeErrPrefix} unexpected token at position ${this._pos}, expected to find '${String.fromCharCode(...str)}'`)
+        throw new Error(`${this.options.decodeErrPrefix} unexpected token at position ${this._pos}, expected to find '${String.fromCharCode(...str)}'`)
       }
     }
   }
@@ -109,11 +107,11 @@ class Tokenizer {
     }
     swallow([48, 49, 50, 51, 52, 53, 54, 55, 56, 57]) // DIGIT
     if (negative && this._pos === startPos + 1) {
-      throw new Error(`${decodeErrPrefix} unexpected token at position ${this._pos}`)
+      throw new Error(`${this.options.decodeErrPrefix} unexpected token at position ${this._pos}`)
     }
     if (!this.done() && this.ch() === 46) { // '.'
       if (float) {
-        throw new Error(`${decodeErrPrefix} unexpected token at position ${this._pos}`)
+        throw new Error(`${this.options.decodeErrPrefix} unexpected token at position ${this._pos}`)
       }
       float = true
       this._pos++
@@ -146,7 +144,7 @@ class Tokenizer {
     /* c8 ignore next 4 */
     if (this.ch() !== 34) { // '"'
       // this would be a programming error
-      throw new Error(`${decodeErrPrefix} unexpected character at position ${this._pos}; this shouldn't happen`)
+      throw new Error(`${this.options.decodeErrPrefix} unexpected character at position ${this._pos}; this shouldn't happen`)
     }
     this._pos++
 
@@ -170,7 +168,7 @@ class Tokenizer {
 
     const readu4 = () => {
       if (this._pos + 4 >= this.data.length) {
-        throw new Error(`${decodeErrPrefix} unexpected end of unicode escape sequence at position ${this._pos}`)
+        throw new Error(`${this.options.decodeErrPrefix} unexpected end of unicode escape sequence at position ${this._pos}`)
       }
       let u4 = 0
       for (let i = 0; i < 4; i++) {
@@ -182,7 +180,7 @@ class Tokenizer {
         } else if (ch >= 65 && ch <= 70) { // 'A' && 'F'
           ch = ch - 65 + 10
         } else {
-          throw new Error(`${decodeErrPrefix} unexpected unicode escape character at position ${this._pos}`)
+          throw new Error(`${this.options.decodeErrPrefix} unexpected unicode escape character at position ${this._pos}`)
         }
         u4 = u4 * 16 + ch
         this._pos++
@@ -198,7 +196,7 @@ class Tokenizer {
       let bytesPerSequence = (firstByte > 0xef) ? 4 : (firstByte > 0xdf) ? 3 : (firstByte > 0xbf) ? 2 : 1
 
       if (this._pos + bytesPerSequence > this.data.length) {
-        throw new Error(`${decodeErrPrefix} unexpected unicode sequence at position ${this._pos}`)
+        throw new Error(`${this.options.decodeErrPrefix} unexpected unicode sequence at position ${this._pos}`)
       }
 
       let secondByte, thirdByte, fourthByte, tempCodePoint
@@ -269,7 +267,7 @@ class Tokenizer {
         case 92: // '\'
           this._pos++
           if (this.done()) {
-            throw new Error(`${decodeErrPrefix} unexpected string termination at position ${this._pos}`)
+            throw new Error(`${this.options.decodeErrPrefix} unexpected string termination at position ${this._pos}`)
           }
           ch1 = this.ch()
           this._pos++
@@ -299,7 +297,7 @@ class Tokenizer {
               chars.push(readu4())
               break
             default:
-              throw new Error(`${decodeErrPrefix} unexpected string escape character at position ${this._pos}`)
+              throw new Error(`${this.options.decodeErrPrefix} unexpected string escape character at position ${this._pos}`)
           }
           break
         case 34: // '"'
@@ -307,7 +305,7 @@ class Tokenizer {
           return new Token(Type.string, decodeCodePointsArray(chars), this._pos - startPos)
         default:
           if (ch < 32) { // ' '
-            throw new Error(`${decodeErrPrefix} invalid control character at position ${this._pos}`)
+            throw new Error(`${this.options.decodeErrPrefix} invalid control character at position ${this._pos}`)
           } else if (ch < 0x80) {
             chars.push(ch)
             this._pos++
@@ -317,7 +315,7 @@ class Tokenizer {
       }
     }
 
-    throw new Error(`${decodeErrPrefix} unexpected end of string at position ${this._pos}`)
+    throw new Error(`${this.options.decodeErrPrefix} unexpected end of string at position ${this._pos}`)
   }
 
   /**
@@ -358,7 +356,7 @@ class Tokenizer {
       case 57: // '9'
         return this.parseNumber()
       default:
-        throw new Error(`${decodeErrPrefix} unexpected character at position ${this._pos}`)
+        throw new Error(`${this.options.decodeErrPrefix} unexpected character at position ${this._pos}`)
     }
   }
 
@@ -379,7 +377,7 @@ class Tokenizer {
           return new Token(Type.break, undefined, 1)
         }
         if (this.ch() !== 44) { // ','
-          throw new Error(`${decodeErrPrefix} unexpected character at position ${this._pos}, was expecting array delimiter but found '${String.fromCharCode(this.ch())}'`)
+          throw new Error(`${this.options.decodeErrPrefix} unexpected character at position ${this._pos}, was expecting array delimiter but found '${String.fromCharCode(this.ch())}'`)
         }
         this._pos++
         this.modeStack.push('array-value')
@@ -406,7 +404,7 @@ class Tokenizer {
           return new Token(Type.break, undefined, 1)
         }
         if (this.ch() !== 44) { // ','
-          throw new Error(`${decodeErrPrefix} unexpected character at position ${this._pos}, was expecting object delimiter but found '${String.fromCharCode(this.ch())}'`)
+          throw new Error(`${this.options.decodeErrPrefix} unexpected character at position ${this._pos}, was expecting object delimiter but found '${String.fromCharCode(this.ch())}'`)
         }
         this._pos++
         this.skipWhitespace()
@@ -420,7 +418,7 @@ class Tokenizer {
         const token = this.parseString()
         this.skipWhitespace()
         if (this.ch() !== 58) { // ':'
-          throw new Error(`${decodeErrPrefix} unexpected character at position ${this._pos}, was expecting key/value delimiter ':' but found '${String.fromCharCode(this.ch())}'`)
+          throw new Error(`${this.options.decodeErrPrefix} unexpected character at position ${this._pos}, was expecting key/value delimiter ':' but found '${String.fromCharCode(this.ch())}'`)
         }
         this._pos++
         this.modeStack.push('obj-value')
@@ -434,7 +432,7 @@ class Tokenizer {
       }
       /* c8 ignore next 2 */
       default:
-        throw new Error(`${decodeErrPrefix} unexpected parse state at position ${this._pos}; this shouldn't happen`)
+        throw new Error(`${this.options.decodeErrPrefix} unexpected parse state at position ${this._pos}; this shouldn't happen`)
     }
   }
 }
@@ -445,7 +443,8 @@ class Tokenizer {
  * @returns {any}
  */
 function decode (data, options) {
-  options = Object.assign({ tokenizer: new Tokenizer(data, options) }, options)
+  options = { decodeErrPrefix: 'JSON decode error:', ...options }
+  options.tokenizer = options.tokenizer || new Tokenizer(data, options)
   return _decode(data, options)
 }
 
@@ -455,7 +454,8 @@ function decode (data, options) {
  * @returns {[any, Uint8Array]}
  */
 function decodeFirst (data, options) {
-  options = Object.assign({ tokenizer: new Tokenizer(data, options) }, options)
+  options = { decodeErrPrefix: 'JSON decode error:', ...options }
+  options.tokenizer = options.tokenizer || new Tokenizer(data, options)
   return _decodeFirst(data, options)
 }
 

package/src/cborg/{lib/json → json}/encode.js

@@ -1,23 +1,21 @@
 // never reference the file directly to ensure the
 // indepency of the json module
-import { Type } from "@fireproof/vendor/cborg"
 import { encodeCustom } from "@fireproof/vendor/cborg"
-import { encodeErrPrefix } from "@fireproof/vendor/cborg"
-import { asU8A, fromString } from "@fireproof/vendor/cborg"
+import { Type, asU8A, fromString } from 'cborg/utils'
 
 /**
- * @typedef {import('../../interface').EncodeOptions} EncodeOptions
- * @typedef {import('../../interface').TokenTypeEncoder} TokenTypeEncoder
- * @typedef {import('../token').Token} Token
- * @typedef {import('../bl').Bl} Bl
+ * @typedef {import('../interface').EncodeOptions} EncodeOptions
+ * @typedef {import('../interface').TokenTypeEncoder} TokenTypeEncoder
+ * @typedef {import('cborg/utils').Token} Token
+ * @typedef {import('cborg/utils').Bl} Bl
  */
 
 /**
- * @param {(buf: Bl, token: Token) => void} action
+ * @param {(buf: Bl, token: Token, opt: EncodeOptions) => void} action
  * @returns {TokenTypeEncoder}
  */
 function wrapCompareTokens (action) {
-  const wrapped = (/** @type {Bl} */ buf, /** @type {Token} */token) => action(buf, token)
+  const wrapped = (/** @type {Bl} */ buf, /** @type {Token} */token, /** @type {EncodeOptions} */opt) => action(buf, token, opt)
   /**
    * @param {Token} tok1
    * @param {Token} tok2
@@ -32,7 +30,7 @@ function wrapCompareTokens (action) {
 /**
  * @returns {TokenTypeEncoder[]}
  */
-function makeJSONEncoders() {
+function makeJSONEncoders () {
   /** @type {TokenTypeEncoder[]} */
   const encoders = []
   /** @type {{type:Type,elements:number}[]} */
@@ -73,11 +71,11 @@ function makeJSONEncoders() {
     buf.push(isa)
   })
 
-  encoders[Type.negint.major] = wrapCompareTokens((buf, token) => {
-     encoders[Type.uint.major](buf, token)
-   })
+  encoders[Type.negint.major] = wrapCompareTokens((buf, token, opt) => {
+    encoders[Type.uint.major](buf, token, opt)
+  })
 
-  encoders[Type.bytes.major] = wrapCompareTokens((_buf, _token) => {
+  encoders[Type.bytes.major] = wrapCompareTokens((_buf, _token, { encodeErrPrefix }) => {
     throw new Error(`${encodeErrPrefix} unsupported type: Uint8Array`)
   })
 
@@ -102,7 +100,7 @@ function makeJSONEncoders() {
   encoders[Type.tag.major] = wrapCompareTokens((_buf, _token) => {
   })
 
-  encoders[Type.float.major] = wrapCompareTokens((buf, token) => {
+  encoders[Type.float.major] = wrapCompareTokens((buf, token, { encodeErrPrefix }) => {
     if (token.type.equals(Type.break)) {
       const recurs = inRecursive.pop()
       if (recurs) {
@@ -260,6 +258,7 @@ function makeJSONEncoders() {
 //   }
 // }
 
+const encodeErrPrefix = 'JSON encode error:'
 /**
  * @param {(Token|Token[])[]} e1
  * @param {(Token|Token[])[]} e2
@@ -284,7 +283,11 @@ function mapSorter (e1, e2) {
   throw new Error(`${encodeErrPrefix} unexpected duplicate map keys, this is not supported`)
 }
 
-const defaultEncodeOptions = { addBreakTokens: true, mapSorter }
+const defaultEncodeOptions = {
+  addBreakTokens: true,
+  encodeErrPrefix,
+  mapSorter
+}
 
 /**
  * @param {any} data

package/src/cborg/package.json

@@ -2,10 +2,10 @@
   "name": "cborg",
   "version": "4.2.7",
   "description": "Fast CBOR with a focus on strictness",
-  "main": "cborg.js",
+  "main": "cborg/index.js",
   "type": "module",
   "bin": {
-    "cborg": "lib/bin.js"
+    "cborg": "cborg/bin.js"
   },
   "repository": {
     "type": "git",
@@ -38,33 +38,37 @@
   },
   "exports": {
     ".": {
-      "import": "./cborg.js",
-      "types": "./types/cborg.d.ts"
+      "import": "./cborg/index.js",
+      "types": "./types/cborg/index.d.ts"
     },
     "./length": {
-      "import": "./lib/length.js",
-      "types": "./types/lib/length.d.ts"
+      "import": "./cborg/length.js",
+      "types": "./types/cborg/length.d.ts"
     },
     "./taglib": {
       "import": "./taglib.js",
       "types": "./types/taglib.d.ts"
     },
     "./json": {
-      "import": "./lib/json/json.js",
-      "types": "./types/lib/json/json.d.ts"
+      "import": "./json/json.js",
+      "types": "./types/json/json.d.ts"
     },
     "./interface": {
       "types": "./types/interface.d.ts"
+    },
+    "./utils": {
+      "import": "./utils/index.js",
+      "types": "./types/utils/index.d.ts"
     }
   },
   "types": "cborg.d.ts",
   "typesVersions": {
     "*": {
       "json": [
-        "types/lib/json/json.d.ts"
+        "types/json/json.d.ts"
       ],
       "length": [
-        "types/lib/length.d.ts"
+        "types/cborg/length.d.ts"
       ],
       "*": [
         "types/*"
@@ -156,7 +160,7 @@
     ]
   },
   "scripts": {
-    "lint": "standard *.js lib/*.js test/*.js",
+    "lint": "standard *.js cborg/*.js json/*.js utils/*.js test/*.js",
     "build": "npm run build:types",
     "build:types": "tsc --build",
     "test:node": "c8 --check-coverage --exclude=test/** mocha test/test-*.js",

package/src/cborg/taglib.js

@@ -1,4 +1,6 @@
-import { Token, Type } from './cborg.js'
+// never reference the file directly to ensure the
+// indepency of the json module
+import { Token, Type } from 'cborg/utils'
 
 /*
 A collection of some standard CBOR tags.

package/src/cborg/test/common.js

@@ -1,4 +1,4 @@
-import { Token, Type } from '../lib/token.js'
+import { Token, Type } from 'cborg/utils'
 
 export function dateDecoder (obj) {
   if (typeof obj !== 'string') {

package/src/cborg/test/noop-bin-test.js

@@ -1,3 +1,3 @@
 // file included so ipjs will compile ../lib/bin.js
 // this test file is not intended to be run or loaded
-import bin from '../lib/bin.js' // eslint-disable-line
+import bin from "@fireproof/vendor/cborg" // eslint-disable-line

package/src/cborg/test/test-0uint.js

@@ -2,8 +2,8 @@
 
 import * as chai from 'chai'
 
-import { decode, encode } from '../cborg.js'
-import { fromHex, toHex } from '../lib/byte-utils.js'
+import { decode, encode } from "@fireproof/vendor/cborg"
+import { fromHex, toHex } from 'cborg/utils'
 
 const { assert } = chai
 

package/src/cborg/test/test-1negint.js

@@ -2,8 +2,8 @@
 
 import * as chai from 'chai'
 
-import { decode, encode } from '../cborg.js'
-import { fromHex, toHex } from '../lib/byte-utils.js'
+import { decode, encode } from "@fireproof/vendor/cborg"
+import { fromHex, toHex } from 'cborg/utils'
 
 const { assert } = chai
 

package/src/cborg/test/test-2bytes.js

@@ -2,8 +2,8 @@
 
 import * as chai from 'chai'
 
-import { decode, encode } from '../cborg.js'
-import { useBuffer, fromHex, toHex } from '../lib/byte-utils.js'
+import { decode, encode } from "@fireproof/vendor/cborg"
+import { useBuffer, fromHex, toHex } from 'cborg/utils'
 
 const { assert } = chai
 

package/src/cborg/test/test-3string.js

@@ -2,8 +2,8 @@
 
 import * as chai from 'chai'
 
-import { decode, encode } from '../cborg.js'
-import { fromHex, toHex } from '../lib/byte-utils.js'
+import { decode, encode } from "@fireproof/vendor/cborg"
+import { fromHex, toHex } from 'cborg/utils'
 
 const { assert } = chai
 

package/src/cborg/test/test-4array.js

@@ -2,8 +2,8 @@
 
 import * as chai from 'chai'
 
-import { decode, encode } from '../cborg.js'
-import { fromHex, toHex } from '../lib/byte-utils.js'
+import { decode, encode } from "@fireproof/vendor/cborg"
+import { fromHex, toHex } from 'cborg/utils'
 
 const { assert } = chai
 

package/src/cborg/test/test-5map.js

@@ -2,8 +2,8 @@
 
 import * as chai from 'chai'
 
-import { decode, encode } from '../cborg.js'
-import { fromHex, toHex } from '../lib/byte-utils.js'
+import { decode, encode } from "@fireproof/vendor/cborg"
+import { fromHex, toHex } from 'cborg/utils'
 
 const { assert } = chai
 

package/src/cborg/test/test-6tag.js

@@ -2,9 +2,8 @@
 
 import * as chai from 'chai'
 
-import { Token, Type } from '../lib/token.js'
-import { decode, encode } from '../cborg.js'
-import { fromHex, toHex } from '../lib/byte-utils.js'
+import { decode, encode } from "@fireproof/vendor/cborg"
+import { fromHex, toHex, Token, Type } from 'cborg/utils'
 import { dateDecoder, dateEncoder } from './common.js'
 
 const { assert } = chai

package/src/cborg/test/test-7float.js

@@ -2,8 +2,8 @@
 
 import * as chai from 'chai'
 
-import { decode, encode } from '../cborg.js'
-import { fromHex, toHex } from '../lib/byte-utils.js'
+import { decode, encode } from "@fireproof/vendor/cborg"
+import { fromHex, toHex } from 'cborg/utils'
 
 const { assert } = chai
 

package/src/cborg/test/test-bl.js

@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 
 import * as chai from 'chai'
-import { Bl } from '../lib/bl.js'
+import { Bl } from 'cborg/utils'
 
 const { assert } = chai
 

package/src/cborg/test/test-cbor-vectors.js

@@ -2,9 +2,9 @@
 
 import * as chai from 'chai'
 
-import { decode, encode } from '../cborg.js'
+import { decode, encode } from "@fireproof/vendor/cborg"
 import * as taglib from "@fireproof/vendor/cborg/taglib"
-import { fromHex, toHex } from '../lib/byte-utils.js'
+import { fromHex, toHex } from 'cborg/utils'
 // fixtures from https://github.com/cbor/test-vectors
 import { fixtures } from './appendix_a.js'
 

package/src/cborg/test/test-decode-errors.js

@@ -2,8 +2,8 @@
 
 import * as chai from 'chai'
 
-import { decode } from '../cborg.js'
-import { fromHex } from '../lib/byte-utils.js'
+import { decode } from "@fireproof/vendor/cborg"
+import { fromHex } from 'cborg/utils'
 
 const { assert } = chai
 

package/src/cborg/test/test-fuzz.js

@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 
 import { garbage } from 'ipld-garbage'
-import { decode, encode } from '../cborg.js'
+import { decode, encode } from "@fireproof/vendor/cborg"
 import * as chai from 'chai'
 
 const { assert } = chai

package/src/cborg/test/test-json.js

@@ -154,39 +154,39 @@ describe('json basics', () => {
   })
 
   it('should throw on bad types', () => {
-    assert.throws(() => encode(new Uint8Array([1, 2])), /CBOR encode error: unsupported type: Uint8Array/)
-    assert.throws(() => encode({ boop: new Uint8Array([1, 2]) }), /CBOR encode error: unsupported type: Uint8Array/)
-    assert.throws(() => encode(undefined), /CBOR encode error: unsupported type: undefined/)
-    assert.throws(() => encode(new Map([[1, 2], [2, 3]])), /CBOR encode error: non-string map keys are not supported/)
-    assert.throws(() => encode(new Map([[['foo', 'bar'], 2], [['bar', 'foo'], 3]])), /CBOR encode error: complex map keys are not supported/)
+    assert.throws(() => encode(new Uint8Array([1, 2])), /JSON encode error: unsupported type: Uint8Array/)
+    assert.throws(() => encode({ boop: new Uint8Array([1, 2]) }), /JSON encode error: unsupported type: Uint8Array/)
+    assert.throws(() => encode(undefined), /JSON encode error: unsupported type: undefined/)
+    assert.throws(() => encode(new Map([[1, 2], [2, 3]])), /JSON encode error: non-string map keys are not supported/)
+    assert.throws(() => encode(new Map([[['foo', 'bar'], 2], [['bar', 'foo'], 3]])), /JSON encode error: complex map keys are not supported/)
   })
 
   it('should throw on bad decode failure modes', () => {
-    assert.throws(() => decode(toBytes('{"a":1 & "b":2}')), 'CBOR decode error: unexpected character at position 7, was expecting object delimiter but found \'&\'')
-    assert.throws(() => decode(toBytes('{"a":1,"b"!2}')), 'CBOR decode error: unexpected character at position 10, was expecting key/value delimiter \':\' but found \'!\'')
-    assert.throws(() => decode(toBytes('[1,2&3]')), 'CBOR decode error: unexpected character at position 4, was expecting array delimiter but found \'&\'')
-    assert.throws(() => decode(toBytes('{"a":!}')), 'CBOR decode error: unexpected character at position 5')
-    assert.throws(() => decode(toBytes('"abc')), 'CBOR decode error: unexpected end of string at position 4')
-    assert.throws(() => decode(toBytes('"ab\\xc"')), 'CBOR decode error: unexpected string escape character at position 5')
-    assert.throws(() => decode(toBytes('"ab\x1Ec"')), 'CBOR decode error: invalid control character at position 3')
-    assert.throws(() => decode(toBytes('"ab\\')), 'CBOR decode error: unexpected string termination at position 4')
+    assert.throws(() => decode(toBytes('{"a":1 & "b":2}')), 'JSON decode error: unexpected character at position 7, was expecting object delimiter but found \'&\'')
+    assert.throws(() => decode(toBytes('{"a":1,"b"!2}')), 'JSON decode error: unexpected character at position 10, was expecting key/value delimiter \':\' but found \'!\'')
+    assert.throws(() => decode(toBytes('[1,2&3]')), 'JSON decode error: unexpected character at position 4, was expecting array delimiter but found \'&\'')
+    assert.throws(() => decode(toBytes('{"a":!}')), 'JSON decode error: unexpected character at position 5')
+    assert.throws(() => decode(toBytes('"abc')), 'JSON decode error: unexpected end of string at position 4')
+    assert.throws(() => decode(toBytes('"ab\\xc"')), 'JSON decode error: unexpected string escape character at position 5')
+    assert.throws(() => decode(toBytes('"ab\x1Ec"')), 'JSON decode error: invalid control character at position 3')
+    assert.throws(() => decode(toBytes('"ab\\')), 'JSON decode error: unexpected string termination at position 4')
     // begining of a quoted string with 3-byte unicode sequence with the last one truncated
-    assert.throws(() => decode(toBytes('"☺').subarray(0, 3)), 'CBOR decode error: unexpected unicode sequence at position 1')
-    assert.throws(() => decode(toBytes('"\\uxyza"')), 'CBOR decode error: unexpected unicode escape character at position 3')
-    assert.throws(() => decode(toBytes('"\\u11"')), 'CBOR decode error: unexpected end of unicode escape sequence at position 3')
-    assert.throws(() => decode(toBytes('-boop')), 'CBOR decode error: unexpected token at position 1')
-    assert.throws(() => decode(toBytes('{"v":nope}')), 'CBOR decode error: unexpected token at position 7, expected to find \'null\'')
-    assert.throws(() => decode(toBytes('[n]')), 'CBOR decode error: unexpected end of input at position 1')
-    assert.throws(() => decode(toBytes('{"v":truu}')), 'CBOR decode error: unexpected token at position 9, expected to find \'true\'')
-    assert.throws(() => decode(toBytes('[tr]')), 'CBOR decode error: unexpected end of input at position 1')
-    assert.throws(() => decode(toBytes('{"v":flase}')), 'CBOR decode error: unexpected token at position 7, expected to find \'false\'')
-    assert.throws(() => decode(toBytes('[fa]')), 'CBOR decode error: unexpected end of input at position 1')
-    assert.throws(() => decode(toBytes('-0..1')), 'CBOR decode error: unexpected token at position 3')
+    assert.throws(() => decode(toBytes('"☺').subarray(0, 3)), 'JSON decode error: unexpected unicode sequence at position 1')
+    assert.throws(() => decode(toBytes('"\\uxyza"')), 'JSON decode error: unexpected unicode escape character at position 3')
+    assert.throws(() => decode(toBytes('"\\u11"')), 'JSON decode error: unexpected end of unicode escape sequence at position 3')
+    assert.throws(() => decode(toBytes('-boop')), 'JSON decode error: unexpected token at position 1')
+    assert.throws(() => decode(toBytes('{"v":nope}')), 'JSON decode error: unexpected token at position 7, expected to find \'null\'')
+    assert.throws(() => decode(toBytes('[n]')), 'JSON decode error: unexpected end of input at position 1')
+    assert.throws(() => decode(toBytes('{"v":truu}')), 'JSON decode error: unexpected token at position 9, expected to find \'true\'')
+    assert.throws(() => decode(toBytes('[tr]')), 'JSON decode error: unexpected end of input at position 1')
+    assert.throws(() => decode(toBytes('{"v":flase}')), 'JSON decode error: unexpected token at position 7, expected to find \'false\'')
+    assert.throws(() => decode(toBytes('[fa]')), 'JSON decode error: unexpected end of input at position 1')
+    assert.throws(() => decode(toBytes('-0..1')), 'JSON decode error: unexpected token at position 3')
   })
 
   it('should throw when rejectDuplicateMapKeys enabled on duplicate keys', () => {
     assert.deepStrictEqual(decode(toBytes('{"foo":1,"foo":2}')), { foo: 2 })
-    assert.throws(() => decode(toBytes('{"foo":1,"foo":2}'), { rejectDuplicateMapKeys: true }), /CBOR decode error: found repeat map key "foo"/)
+    assert.throws(() => decode(toBytes('{"foo":1,"foo":2}'), { rejectDuplicateMapKeys: true }), /JSON decode error: found repeat map key "foo"/)
   })
 
   it('decodeFirst', () => {

package/src/cborg/test/test-length.js

@@ -2,9 +2,9 @@
 
 import * as chai from 'chai'
 import { garbage } from 'ipld-garbage'
-import { uintBoundaries } from '../lib/0uint.js'
-import { encode } from '../cborg.js'
-import { encodedLength } from '../lib/length.js'
+import { uintBoundaries } from 'cborg/utils'
+import { encode } from "@fireproof/vendor/cborg"
+import { encodedLength } from "@fireproof/vendor/cborg/length"
 import { dateEncoder } from './common.js'
 
 const { assert } = chai

package/src/cborg/test/test-partial.js

@@ -2,8 +2,8 @@
 
 import * as chai from 'chai'
 import { garbage } from 'ipld-garbage'
-import { uintBoundaries } from '../lib/0uint.js'
-import { encode, decodeFirst } from '../cborg.js'
+import { uintBoundaries } from 'cborg/utils'
+import { encode, decodeFirst } from "@fireproof/vendor/cborg"
 import { dateDecoder, dateEncoder } from './common.js'
 
 const { assert } = chai

package/src/cborg/tsconfig.json

@@ -28,7 +28,10 @@
     "emitDeclarationOnly": true,
     "paths": {
       "cborg": [
-        "cborg.js"
+        "cborg/index.js"
+      ],
+      "cborg/utils": [
+        "./utils/index.js"
       ]
     }
   },
@@ -37,7 +40,7 @@
     "example.js",
     "taglib.js",
     "lib/"
-  ],
+, "utils/byte-utils.js", "utils/jump.js", "utils/0uint.js", "utils/1negint.js", "utils/2bytes.js", "utils/3string.js", "utils/4array.js", "utils/5map.js", "utils/6tag.js", "utils/7float.js", "json"  ],
   "exclude": [
     "node_modules"
   ],