chore: fix linter errors

Author: vmx

packages/ipfs-unixfs-exporter/package.json

@@ -41,7 +41,7 @@
     "crypto-browserify": "^3.12.0",
     "detect-node": "^2.0.4",
     "events": "^3.3.0",
-    "ipfs-core-types": "^0.3.1",
+    "ipfs-core-types": "next",
     "ipfs-unixfs-importer": "^7.0.1",
     "it-all": "^1.0.5",
     "it-buffer-stream": "^2.0.0",

packages/ipfs-unixfs-exporter/src/index.js

@@ -30,7 +30,6 @@ const toPathComponents = (path = '') => {
  */
 const cidAndRest = (path) => {
   if (path instanceof Uint8Array) {
-    console.log('vmx: index: path:', path)
     return {
       cid: CID.decode(path),
       toResolve: []

packages/ipfs-unixfs-exporter/src/resolvers/unixfs-v1/content/file.js

@@ -66,7 +66,7 @@ async function * emitBytes (blockService, node, start, end, streamPosition = 0,
         (end > childStart && end <= childEnd) || // child has end byte
         (start < childStart && end > childEnd)) { // child is between offset and end bytes
       const block = await blockService.get(childLink.Hash, {
-        signal: options.signal,
+        signal: options.signal
       })
       let child
       switch (childLink.Hash.code) {
@@ -75,18 +75,16 @@ async function * emitBytes (blockService, node, start, end, streamPosition = 0,
           break
         case mc.RAW:
           child = block.bytes
-          break;
+          break
         case mc.DAG_CBOR:
           // @ts-ignore - TODO vmx 2021-04-01: will work once js-dag-cbor has proper types
           child = await dagCbor.decode(block.bytes)
-          break;
+          break
         default:
           // TODO vmx 2021-03-05: fix this type issue properly
           // @ts-ignore
           throw Error(`Unsupported codec: ${mc.getName(childLink.Hash.code)}`)
       }
-      //console.log('file: childlink cid codec:', childLink.Hash.code)
-      //const child = await decode(block.bytes)
 
       for await (const buf of emitBytes(blockService, child, start, end, streamPosition, options)) {
         streamPosition += buf.length

packages/ipfs-unixfs-exporter/test/exporter.spec.js

@@ -269,7 +269,6 @@ describe('exporter', () => {
       data: content.slice(0, 5)
     })
     const chunkNode1 = dagPb.prepare({ Data: chunk1.marshal() })
-    // TODO vmx 2022-02-23: Use CIv0
     const chunkBlock1 = await Block.encode({
       value: chunkNode1,
       codec: dagPb,
@@ -283,7 +282,6 @@ describe('exporter', () => {
       codec: dagPb,
       hasher: sha256
     })
-    // TODO vmx 2022-02-23: USE CIDv0
     const chunkBlock2 = await Block.encode({
       value: chunkNode2,
       codec: dagPb,
@@ -302,22 +300,21 @@ describe('exporter', () => {
       Links: [{
         Name: '',
         Tsize: chunkNode1.size,
-        Hash: chunkBlock1.cid
+        Hash: chunkBlock1.cid.toV0()
       }, {
         Name: '',
         Tsize: chunkNode2.size,
-        Hash: chunkBlock2.cid
+        Hash: chunkBlock2.cid.toV0()
       }]
     })
-    // TODO vmx 2022-02-23: Use CIDv0
     const fileBlock = await Block.encode({
       value: fileNode,
       codec: dagPb,
       hasher: sha256
     })
     await block.put(fileBlock)
 
-    const exported = await exporter(fileBlock.cid, block)
+    const exported = await exporter(fileBlock.cid.toV0(), block)
 
     if (exported.type !== 'file') {
       throw new Error('Unexpected type')

packages/ipfs-unixfs-exporter/test/helpers/block.js

@@ -1,5 +1,7 @@
 'use strict'
 
+const errCode = require('err-code')
+
 function createBlockApi () {
   /** @type {{[key: string]: Uint8Array}} */
   const blocks = {}
@@ -16,10 +18,7 @@ function createBlockApi () {
     get: async (cid, _options) => {
       const bytes = blocks[cid.toV1().toString()]
       if (bytes === undefined) {
-        const error = new Error(`Couold not find data for CID '${cid}'`)
-        // @ts-ignore - TODO vmx 2021-03-24: Should the error type be wrapped in a custom type?
-        error.code = 'ERR_NOT_FOUND'
-        throw(error)
+        throw errCode(new Error(`Couold not find data for CID '${cid}'`), 'ERR_NOT_FOUND')
       }
 
       return { cid, bytes }

packages/ipfs-unixfs-exporter/test/importer.spec.js

@@ -30,7 +30,6 @@ const { decode } = require('@ipld/dag-pb')
 const { parseMtime } = require('ipfs-unixfs')
 
 /**
- * @typedef {import('ipfs-core-types/src/block-service').BlockService} BlockService
  * @typedef {import('ipfs-unixfs-importer/src/types').BlockAPI} BlockAPI
  * @typedef {import('../src/types').PbNode} PbNode
  */
@@ -226,7 +225,7 @@ const checkLeafNodeTypes = async (block, options, expected) => {
     node.Links.map(link => block.get(link.Hash))
   )
 
-  linkedBlocks.forEach(({ bytes}) => {
+  linkedBlocks.forEach(({ bytes }) => {
     const node = decode(bytes)
     const meta = UnixFS.unmarshal(node.Data)
     expect(meta.type).to.equal(expected)

packages/ipfs-unixfs-importer/src/dag-builder/file/index.js

@@ -10,7 +10,7 @@ const {
 } = require('@ipld/dag-pb')
 const parallelBatch = require('it-parallel-batch')
 const mc = require('multicodec')
-//const mh = require('multiformats/hashes/digest')
+// const mh = require('multiformats/hashes/digest')
 const rawCodec = require('multiformats/codecs/raw')
 
 /**
@@ -94,25 +94,25 @@ const reduce = (file, block, options) => {
 
         buffer = encode(prepare({ Data: leaf.unixfs.marshal() }))
 
-        //// TODO vmx 2021-03-26: This is what the original code does, it checks
-        //// the multihash of the original leaf node and uses then the same
-        //// hasher. i wonder if that's really needed or if we could just use
-        //// the hasher from `options.hasher` instead.
-        //const multihash = mh.decode(leaf.cid.multihash.bytes)
-        //let hasher
-        //switch multihash {
-        //  case sha256.code {
-        //    hasher = sha256
-        //    break;
-        //  }
-        //  //case identity.code {
-        //  //  hasher = identity
-        //  //  break;
-        //  //}
-        //  default: {
-        //    throw new Error(`Unsupported hasher "${multihash}"`)
-        //  }
-        //}
+        // // TODO vmx 2021-03-26: This is what the original code does, it checks
+        // // the multihash of the original leaf node and uses then the same
+        // // hasher. i wonder if that's really needed or if we could just use
+        // // the hasher from `options.hasher` instead.
+        // const multihash = mh.decode(leaf.cid.multihash.bytes)
+        // let hasher
+        // switch multihash {
+        //   case sha256.code {
+        //     hasher = sha256
+        //     break;
+        //   }
+        //   //case identity.code {
+        //   //  hasher = identity
+        //   //  break;
+        //   //}
+        //   default: {
+        //     throw new Error(`Unsupported hasher "${multihash}"`)
+        //   }
+        // }
         leaf.cid = await persist(buffer, block, {
           ...options,
           codec: mc.DAG_PB,

packages/ipfs-unixfs-importer/src/utils/persist.js

@@ -10,7 +10,7 @@ const { CID } = require('multiformats/cid')
  */
 const persist = async (buffer, block, options) => {
   if (!options.hasher) {
-    throw new Error(`Hasher must be specified.`)
+    throw new Error('Hasher must be specified.')
   }
 
   if (!options.codec) {
@@ -32,7 +32,7 @@ const persist = async (buffer, block, options) => {
       // @ts-ignore pin option is missing from block api typedefs
       pin: options.pin,
       preload: options.preload,
-      timeout: options.timeout,
+      timeout: options.timeout
     })
   }
 

packages/ipfs-unixfs-importer/test/builder.spec.js

@@ -109,4 +109,4 @@ describe('builder', () => {
       expect(meta.type).to.equal('directory')
     }
   })
- })
+})

packages/ipfs-unixfs-importer/test/chunker-custom.spec.js

@@ -11,7 +11,6 @@ const blockApi = require('./helpers/block')
 const uint8ArrayFromString = require('uint8arrays/from-string')
 const { UnixFS } = require('ipfs-unixfs')
 
-
 const iter = async function * () {
   yield uint8ArrayFromString('one')
   yield uint8ArrayFromString('two')

packages/ipfs-unixfs-importer/test/helpers/block.js

@@ -1,5 +1,7 @@
 'use strict'
 
+const errCode = require('err-code')
+
 function createBlockApi () {
   /** @type {{[key: string]: Uint8Array}} */
   const blocks = {}
@@ -16,10 +18,7 @@ function createBlockApi () {
     get: async (cid, _options) => {
       const bytes = blocks[cid.toV1().toString()]
       if (bytes === undefined) {
-        const error = new Error(`Couold not find data for CID '${cid}'`)
-        // @ts-ignore - TODO vmx 2021-03-24: Should the error type be wrapped in a custom type?
-        error.code = 'ERR_NOT_FOUND'
-        throw(error)
+        throw errCode(new Error(`Couold not find data for CID '${cid}'`), 'ERR_NOT_FOUND')
       }
 
       return { cid, bytes }