latest multiformats, with ESM+CJS exports

lib/reader.js

@@ -23,9 +23,9 @@ async function createFileIndexedReader (multiformats, path) {
   const { roots, iterator } = await indexer(multiformats, path)
   const index = new Map()
   const order = []
-  for await (const blockIndex of iterator) {
-    const cidStr = blockIndex.cid.toString()
-    index.set(cidStr, blockIndex)
+  for await (const { cid, blockLength, blockOffset } of iterator) {
+    const cidStr = cid.toString()
+    index.set(cidStr, { cid, blockLength, blockOffset })
     order.push(cidStr)
   }
   return new IndexedReader(path, roots, index, order)

package.json

@@ -30,7 +30,7 @@
   },
   "homepage": "https://github.com/rvagg/js-datastore-car#readme",
   "devDependencies": {
-    "@ipld/dag-cbor": "github:ipld/js-dag-cbor#multiformats",
+    "@ipld/dag-cbor": "^1.1.3",
     "assert": "^2.0.0",
     "bl": "^4.0.2",
     "cids": "^0.8.0",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "interface-datastore": "^1.0.2",
-    "multiformats": "github:rvagg/js-multiformats#rvagg/non-enumerable-basecache",
+    "multiformats": "^1.1.11",
     "varint": "^5.0.0"
   }
 }

test/fixture-data.js

@@ -2,9 +2,9 @@ const assert = require('assert')
 const { DAGNode, DAGLink, util: pbUtil } = require('ipld-dag-pb')
 // TODO: remove this
 const CID = require('cids')
-const multiformats = require('multiformats/basics')
+const multiformats = require('multiformats/basics.js')
 multiformats.add(require('@ipld/dag-cbor'))
-multiformats.multibase.add(require('multiformats/bases/base58'))
+multiformats.multibase.add(require('multiformats/bases/base58.js'))
 
 let rawBlocks
 const pbBlocks = []

test/test-decode.js

@@ -5,7 +5,7 @@ const { promisify } = require('util')
 const path = require('path')
 const fs = require('fs')
 fs.readFile = promisify(fs.readFile)
-const multiformats = require('multiformats/basics')
+const multiformats = require('multiformats/basics.js')
 multiformats.add(require('@ipld/dag-cbor'))
 const { makeData, verifyDecoded } = require('./fixture-data')
 const coding = require('../lib/coding')

test/test-encode.js

@@ -6,7 +6,7 @@ const fs = require('fs')
 const bl = require('bl')
 fs.readFile = promisify(fs.readFile)
 fs.unlink = promisify(fs.unlink)
-const multiformats = require('multiformats/basics')
+const multiformats = require('multiformats/basics.js')
 multiformats.add(require('@ipld/dag-cbor'))
 const { verifyDecoded, makeData } = require('./fixture-data')
 const coding = require('../lib/coding')

test/test-errors.js

@@ -3,7 +3,7 @@
 const assert = require('assert')
 const fs = require('fs').promises
 const path = require('path')
-const multiformats = require('multiformats/basics')
+const multiformats = require('multiformats/basics.js')
 multiformats.add(require('@ipld/dag-cbor'))
 const { readBuffer, readFileComplete, writeStream } = require('../')(multiformats)
 const { acid, car } = require('./fixture-data')

test/test-large.js

@@ -5,7 +5,7 @@ const fs = require('fs')
 const unlink = require('util').promisify(require('fs').unlink)
 const garbage = require('garbage')
 const varint = require('varint')
-const multiformats = require('multiformats/basics')
+const multiformats = require('multiformats/basics.js')
 multiformats.add(require('@ipld/dag-cbor'))
 const { writeStream, readFileComplete, readStreaming, indexer } = require('../')(multiformats)
 

test/test-query.js

@@ -2,9 +2,9 @@
 
 const assert = require('assert')
 const path = require('path')
-const multiformats = require('multiformats/basics')
+const multiformats = require('multiformats/basics.js')
 multiformats.add(require('@ipld/dag-cbor'))
-multiformats.multibase.add(require('multiformats/bases/base58'))
+multiformats.multibase.add(require('multiformats/bases/base58.js'))
 const { readBuffer, readFile } = require('../')(multiformats)
 const { car, makeData, compareBlockData } = require('./fixture-data')
 

test/test-raw.js

@@ -6,9 +6,9 @@ const path = require('path')
 const fs = require('fs')
 fs.open = promisify(fs.open)
 fs.close = promisify(fs.close)
-const multiformats = require('multiformats/basics')
+const multiformats = require('multiformats/basics.js')
 multiformats.add(require('@ipld/dag-cbor'))
-multiformats.multibase.add(require('multiformats/bases/base58'))
+multiformats.multibase.add(require('multiformats/bases/base58.js'))
 const { indexer, readRaw } = require('../')(multiformats)
 const { makeData } = require('./fixture-data')
 

test/test-readbuffer.js

@@ -1,9 +1,9 @@
 /* eslint-env mocha */
 
 const assert = require('assert')
-const multiformats = require('multiformats/basics')
+const multiformats = require('multiformats/basics.js')
 multiformats.add(require('@ipld/dag-cbor'))
-multiformats.multibase.add(require('multiformats/bases/base58'))
+multiformats.multibase.add(require('multiformats/bases/base58.js'))
 const { readBuffer } = require('../')(multiformats)
 const { acid, car, makeData, verifyBlocks, verifyHas, verifyRoots } = require('./fixture-data')
 

test/test-readfile-writestream.js

@@ -3,9 +3,9 @@
 const assert = require('assert')
 const fs = require('fs')
 const unlink = require('util').promisify(require('fs').unlink)
-const multiformats = require('multiformats/basics')
+const multiformats = require('multiformats/basics.js')
 multiformats.add(require('@ipld/dag-cbor'))
-multiformats.multibase.add(require('multiformats/bases/base58'))
+multiformats.multibase.add(require('multiformats/bases/base58.js'))
 const { writeStream, readFileComplete } = require('../')(multiformats)
 const { makeData, verifyBlocks, verifyHas, verifyRoots } = require('./fixture-data')
 

test/test-readfile.js

@@ -2,9 +2,9 @@
 
 const assert = require('assert')
 const path = require('path')
-const multiformats = require('multiformats/basics')
+const multiformats = require('multiformats/basics.js')
 multiformats.add(require('@ipld/dag-cbor'))
-multiformats.multibase.add(require('multiformats/bases/base58'))
+multiformats.multibase.add(require('multiformats/bases/base58.js'))
 const { readFileComplete } = require('../car')(multiformats)
 const { acid, makeData, verifyBlocks, verifyHas, verifyRoots } = require('./fixture-data')
 

test/test-readindexed.js

@@ -2,9 +2,9 @@
 
 const assert = require('assert')
 const path = require('path')
-const multiformats = require('multiformats/basics')
+const multiformats = require('multiformats/basics.js')
 multiformats.add(require('@ipld/dag-cbor'))
-multiformats.multibase.add(require('multiformats/bases/base58'))
+multiformats.multibase.add(require('multiformats/bases/base58.js'))
 const { readFileIndexed } = require('../')(multiformats)
 const { acid, makeData, compareBlockData, verifyBlocks, verifyHas, verifyRoots } = require('./fixture-data')
 

test/test-readstream.js

@@ -3,9 +3,9 @@
 const assert = require('assert')
 const fs = require('fs')
 const path = require('path')
-const multiformats = require('multiformats/basics')
+const multiformats = require('multiformats/basics.js')
 multiformats.add(require('@ipld/dag-cbor'))
-multiformats.multibase.add(require('multiformats/bases/base58'))
+multiformats.multibase.add(require('multiformats/bases/base58.js'))
 const { readStreaming } = require('../')(multiformats)
 const { acid, makeData, compareBlockData, verifyRoots } = require('./fixture-data')
 

test/test-readstreamcomplete.js

@@ -3,9 +3,9 @@
 const assert = require('assert')
 const fs = require('fs')
 const path = require('path')
-const multiformats = require('multiformats/basics')
+const multiformats = require('multiformats/basics.js')
 multiformats.add(require('@ipld/dag-cbor'))
-multiformats.multibase.add(require('multiformats/bases/base58'))
+multiformats.multibase.add(require('multiformats/bases/base58.js'))
 const { readStreamComplete } = require('../')(multiformats)
 const { acid, makeData, verifyBlocks, verifyHas, verifyRoots } = require('./fixture-data')