fix: more typescript type fixes

Author: vmx

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

@@ -32,13 +32,11 @@ const cidAndRest = (path) => {
   if (path instanceof Uint8Array) {
     console.log('vmx: index: path:', path)
     return {
-      // @ts-ignore
       cid: CID.decode(path),
       toResolve: []
     }
   }
 
-  // @ts-ignore
   const cid = CID.asCID(path)
   if (cid) {
     return {
@@ -55,7 +53,6 @@ const cidAndRest = (path) => {
     const output = toPathComponents(path)
 
     return {
-      // @ts-ignore
       cid: CID.parse(output[0]),
       toResolve: output.slice(1)
     }

packages/ipfs-unixfs-exporter/src/resolvers/dag-cbor.js

@@ -26,7 +26,6 @@ const resolve = async (cid, name, path, toResolve, resolve, depth, blockService,
       toResolve.shift()
       subPath = `${subPath}/${prop}`
 
-      // @ts-ignore
       const subObjectCid = CID.asCID(subObject[prop])
       if (subObjectCid) {
         return {

packages/ipfs-unixfs-exporter/src/resolvers/identity.js

@@ -36,15 +36,13 @@ const resolve = async (cid, name, path, toResolve, resolve, depth, blockService,
   if (toResolve.length) {
     throw errCode(new Error(`No link named ${path} found in raw node ${cid.toString()}`), 'ERR_NOT_FOUND')
   }
-  // @ts-ignore
   const buf = await mh.decode(cid.multihash.bytes)
 
   return {
     entry: {
       type: 'identity',
       name,
       path,
-      // @ts-ignore
       cid,
       content: rawContent(buf.digest),
       depth,

packages/ipfs-unixfs-exporter/src/resolvers/raw.js

@@ -42,13 +42,11 @@ const resolve = async (cid, name, path, toResolve, resolve, depth, blockService,
       type: 'raw',
       name,
       path,
-      // @ts-ignore
       cid,
       content: rawContent(block.bytes),
       depth,
       // TODO vmx 2021-03-24: Check if `size` is needed
       size: 0,
-      // @ts-ignore
       node: block.bytes
     }
   }

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

@@ -97,7 +97,6 @@ const unixFsResolver = async (cid, name, path, toResolve, resolve, depth, blockS
       type: unixfs.isDirectory() ? 'directory' : 'file',
       name,
       path,
-      // @ts-ignore
       cid,
       // @ts-ignore
       content: contentExporters[unixfs.type](cid, node, unixfs, path, resolve, depth, blockService),

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')
 
 /**
@@ -92,14 +92,13 @@ const reduce = (file, block, options) => {
           data: buffer
         })
 
-        // @ts-ignore
-        const multihash = mh.decode(leaf.cid.multihash.bytes)
         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 {

packages/ipfs-unixfs-importer/src/dir-flat.js

@@ -102,15 +102,13 @@ class DirFlat extends Dir {
       }
     }
 
-    // @ts-ignore - TODO vmx 2021-03-24: figure out what's wrong and fix it
     const unixfs = new UnixFS({
       type: 'directory',
       mtime: this.mtime,
       mode: this.mode
     })
 
     /** @type {PbNode} */
-    // @ts-ignore - TODO vmx 2021-03-27: fix this
     const node = { Data: unixfs.marshal(), Links: links }
     const buffer = encode(prepare(node))
     const cid = await persist(buffer, block, this.options)
@@ -122,7 +120,6 @@ class DirFlat extends Dir {
       (acc, curr) => acc + curr.Tsize,
       0)
 
-    // @ts-ignore - TODO vmx 2021-03-27: fix this
     this.cid = cid
     this.size = size
 

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

@@ -22,13 +22,10 @@ const persist = async (buffer, block, options) => {
   }
 
   const multihash = await options.hasher.digest(buffer)
-  // TODO vmx 2021-02-24: no idea why TypeScript fails here, it should work
-  // @ts-ignore
   const cid = CID.create(options.cidVersion, options.codec, multihash)
 
   if (!options.onlyHash) {
     await block.put({
-      // @ts-ignore TODO vmx 2021-03-17
       bytes: buffer,
       cid
     }, {

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

@@ -31,7 +31,6 @@ const options = {
 describe('builder: balanced', () => {
   it('reduces one value into itself', async () => {
     const source = [{
-      // @ts-ignore - TODO vmx 2021-03-25: fix: error TS2339: Property 'parse' does not exist on type 'typeof import("/js-multiformats/dist/types/cid")'
       cid: CID.parse('QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn'),
       size: 0
     }]
@@ -45,15 +44,12 @@ describe('builder: balanced', () => {
 
   it('reduces 3 values into parent', async () => {
     const source = [{
-      // @ts-ignore - TODO vmx 2021-03-25: fix: error TS2339: Property 'parse' does not exist on type 'typeof import("/js-multiformats/dist/types/cid")'
       cid: CID.parse('QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn'),
       size: 0
     }, {
-      // @ts-ignore - TODO vmx 2021-03-25: fix: error TS2339: Property 'parse' does not exist on type 'typeof import("/js-multiformats/dist/types/cid")'
       cid: CID.parse('QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn'),
       size: 0
     }, {
-      // @ts-ignore - TODO vmx 2021-03-25: fix: error TS2339: Property 'parse' does not exist on type 'typeof import("/js-multiformats/dist/types/cid")'
       cid: CID.parse('QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn'),
       size: 0
     }]

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

@@ -31,7 +31,6 @@ describe('builder', () => {
 
       const result = await first(builder([inputFile], block, {
         ...defaultOptions(),
-        // @ts-ignore thinks these aren't valid hash alg names
         hasher
       }))
 
@@ -68,7 +67,6 @@ describe('builder', () => {
 
       const result = await first(builder([inputFile], block, {
         ...defaultOptions(),
-        // @ts-ignore thinks these aren't valid hash alg names
         hasher
       }))
 
@@ -92,7 +90,6 @@ describe('builder', () => {
 
       const result = await first(builder([{ ...inputFile }], block, {
         ...defaultOptions(),
-        // @ts-ignore thinks these aren't valid hash alg names
         hasher
       }))