From 9b8594e3ae2ca9498797b7caf09fe20e030ea397 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Mon, 29 Jun 2020 15:54:11 +1000 Subject: [PATCH] latest multiformats, with ESM+CJS exports --- lib/reader.js | 6 +++--- package.json | 4 ++-- test/fixture-data.js | 4 ++-- test/test-decode.js | 2 +- test/test-encode.js | 2 +- test/test-errors.js | 2 +- test/test-large.js | 2 +- test/test-query.js | 4 ++-- test/test-raw.js | 4 ++-- test/test-readbuffer.js | 4 ++-- test/test-readfile-writestream.js | 4 ++-- test/test-readfile.js | 4 ++-- test/test-readindexed.js | 4 ++-- test/test-readstream.js | 4 ++-- test/test-readstreamcomplete.js | 4 ++-- 15 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lib/reader.js b/lib/reader.js index 00cb501..29a9f67 100644 --- a/lib/reader.js +++ b/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) diff --git a/package.json b/package.json index e0b3192..0656576 100644 --- a/package.json +++ b/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" } } diff --git a/test/fixture-data.js b/test/fixture-data.js index 949e224..dc5dd6d 100644 --- a/test/fixture-data.js +++ b/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 = [] diff --git a/test/test-decode.js b/test/test-decode.js index 3780f3c..4dc9a71 100644 --- a/test/test-decode.js +++ b/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') diff --git a/test/test-encode.js b/test/test-encode.js index cdd267b..62b4634 100644 --- a/test/test-encode.js +++ b/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') diff --git a/test/test-errors.js b/test/test-errors.js index 05b1ff1..b75124c 100644 --- a/test/test-errors.js +++ b/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') diff --git a/test/test-large.js b/test/test-large.js index 63405ad..b871b63 100644 --- a/test/test-large.js +++ b/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) diff --git a/test/test-query.js b/test/test-query.js index 5a95b89..e745ba3 100644 --- a/test/test-query.js +++ b/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') diff --git a/test/test-raw.js b/test/test-raw.js index 177af5b..7add2eb 100644 --- a/test/test-raw.js +++ b/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') diff --git a/test/test-readbuffer.js b/test/test-readbuffer.js index 7d48c81..43d3b4e 100644 --- a/test/test-readbuffer.js +++ b/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') diff --git a/test/test-readfile-writestream.js b/test/test-readfile-writestream.js index 27a3b67..50c1165 100644 --- a/test/test-readfile-writestream.js +++ b/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') diff --git a/test/test-readfile.js b/test/test-readfile.js index 687f535..0151073 100644 --- a/test/test-readfile.js +++ b/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') diff --git a/test/test-readindexed.js b/test/test-readindexed.js index 4747074..c7d9eb9 100644 --- a/test/test-readindexed.js +++ b/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') diff --git a/test/test-readstream.js b/test/test-readstream.js index 9ae22af..d9b674f 100644 --- a/test/test-readstream.js +++ b/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') diff --git a/test/test-readstreamcomplete.js b/test/test-readstreamcomplete.js index a77859e..86af16f 100644 --- a/test/test-readstreamcomplete.js +++ b/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')