chore: fix types (#3608)

Updates deps, fixes typos.

Not sure why the compiler doesn't pick up things like this.

Author: achingbrain

package.json

@@ -41,21 +41,22 @@
     "lint": "aegir lint",
     "coverage": "npx nyc -r html npm run test:node -- --bail",
     "clean": "rimraf ./dist",
-    "dep-check": "aegir dep-check -i ipfs-core -i rimraf -i ipfs-core-types -i abort-controller"
+    "dep-check": "aegir dep-check -i ipfs-core -i rimraf -i ipfs-core-types -i abort-controller -i ipld"
   },
   "dependencies": {
     "abort-controller": "^3.0.0",
     "any-signal": "^2.1.2",
-    "cids": "^1.1.5",
+    "cids": "^1.1.6",
     "debug": "^4.1.1",
     "form-data": "^4.0.0",
     "ipfs-core-types": "^0.3.1",
     "ipfs-core-utils": "^0.7.2",
     "ipfs-unixfs": "^4.0.1",
     "ipfs-utils": "^6.0.4",
+    "ipld": "^0.29.0",
     "ipld-block": "^0.11.0",
     "ipld-dag-cbor": "^0.18.0",
-    "ipld-dag-pb": "^0.22.0",
+    "ipld-dag-pb": "^0.22.1",
     "ipld-raw": "^7.0.0",
     "it-last": "^1.0.4",
     "it-map": "^1.0.4",

src/lib/core.js

@@ -15,8 +15,8 @@ const DEFAULT_HOST = isBrowser || isWebWorker ? location.hostname : 'localhost'
 const DEFAULT_PORT = isBrowser || isWebWorker ? location.port : '5001'
 
 /**
- * @typedef {import('electron-fetch').Response} Response
- * @typedef {import('ipfs-utils/dist/types/electron-fetch').Request} Request
+ * @typedef {import('ipfs-utils/dist/types/native-fetch').Response} Response
+ * @typedef {import('ipfs-utils/dist/types/native-fetch').Request} Request
  * @typedef {import('ipfs-utils/src/types').HTTPOptions} HTTPOptions
  * @typedef {import('../types').Options} Options
  */
@@ -188,7 +188,6 @@ class Client extends HTTP {
     /**
      * @param {string | Request} resource
      * @param {HTTPOptions} options
-     * @returns {Promise<import('ipfs-utils/dist/types/electron-fetch').Response>}
      */
     this.fetch = (resource, options = {}) => {
       if (typeof resource === 'string' && !resource.startsWith('/')) {

src/lib/ipld-formats.js

@@ -45,8 +45,8 @@ module.exports = ({ formats = [], loadFormat = noop } = {}) => {
    * @param {import('multicodec').CodecName} codec - The code to load the format for
    */
   const loadResolver = async (codec) => {
-    // @ts-ignore - codec is a string and not a CodecName
-    const number = multicodec.getNumber(codec)
+    const number = multicodec.getCodeFromName(codec)
+    // @ts-ignore wat
     const format = configuredFormats[number] || await loadFormat(codec)
 
     if (!format) {

src/types.d.ts

@@ -2,21 +2,22 @@ import { Format as IPLDFormat } from 'interface-ipld-format'
 import { LoadFormatFn } from 'ipld'
 import { Agent as HttpAgent } from 'http'
 import { Agent as HttpsAgent } from 'https'
+import Multiaddr from 'multiaddr'
 
 export interface Options {
   host?: string
   port?: number
   protocol?: string
   headers?: Headers | Record<string, string>
-  timeout?: number | sttring
+  timeout?: number | string
   apiPath?: string
   url?: URL|string|Multiaddr
   ipld?: IPLDOptions
   agent?: HttpAgent | HttpsAgent
 }
 
 export interface IPLDOptions {
-  formats?: IPLDFormat[]
+  formats?: IPLDFormat<any>[]
   loadFormat?: LoadFormatFn
 }