chore: upgrade unixfs deps

Upgrades to new version with types

Author: achingbrain

examples/traverse-ipld-graphs/package.json

@@ -16,7 +16,7 @@
     "cids": "^1.1.5",
     "ipfs": "^0.54.2",
     "ipld-block": "^0.11.0",
-    "ipld-dag-pb": "^0.20.0",
+    "ipld-dag-pb": "ipld/js-ipld-dag-pb#feat/add-types",
     "ipld-git": "^0.6.1",
     "ipld-ethereum": "^5.0.1",
     "multihashing-async": "^2.0.1"

packages/interface-ipfs-core/package.json

@@ -39,12 +39,12 @@
     "delay": "^4.4.0",
     "dirty-chai": "^2.0.1",
     "err-code": "^2.0.3",
-    "ipfs-unixfs": "^2.0.3",
-    "ipfs-unixfs-importer": "^5.0.0",
+    "ipfs-unixfs": "https://gitpkg.now.sh/ipfs/js-ipfs-unixfs/packages/ipfs-unixfs?feat/add-types",
+    "ipfs-unixfs-importer": "https://gitpkg.now.sh/ipfs/js-ipfs-unixfs/packages/ipfs-unixfs-importer?feat/add-types",
     "ipfs-utils": "^6.0.1",
     "ipld-block": "^0.11.0",
     "ipld-dag-cbor": "^0.17.0",
-    "ipld-dag-pb": "^0.20.0",
+    "ipld-dag-pb": "ipld/js-ipld-dag-pb#feat/add-types",
     "ipns": "^0.8.0",
     "is-ipfs": "^2.0.0",
     "iso-random-stream": "^1.1.1",

packages/ipfs-cli/package.json

@@ -43,7 +43,7 @@
     "ipfs-repo": "^8.0.0",
     "ipfs-utils": "^6.0.1",
     "ipld-dag-cbor": "^0.17.0",
-    "ipld-dag-pb": "^0.20.0",
+    "ipld-dag-pb": "ipld/js-ipld-dag-pb#feat/add-types",
     "it-all": "^1.0.4",
     "it-concat": "^1.0.1",
     "it-first": "^1.0.4",

packages/ipfs-core-types/tsconfig-check.aegir.tsbuildinfo

@@ -73,14 +73,14 @@
     "ipfs-core-types": "^0.3.0",
     "ipfs-core-utils": "^0.7.1",
     "ipfs-repo": "^8.0.0",
-    "ipfs-unixfs": "^2.0.3",
-    "ipfs-unixfs-exporter": "^3.0.4",
-    "ipfs-unixfs-importer": "^5.0.0",
+    "ipfs-unixfs": "https://gitpkg.now.sh/ipfs/js-ipfs-unixfs/packages/ipfs-unixfs?feat/add-types",
+    "ipfs-unixfs-exporter": "https://gitpkg.now.sh/ipfs/js-ipfs-unixfs/packages/ipfs-unixfs-exporter?feat/add-types",
+    "ipfs-unixfs-importer": "https://gitpkg.now.sh/ipfs/js-ipfs-unixfs/packages/ipfs-unixfs-importer?feat/add-types",
     "ipfs-utils": "^6.0.1",
     "ipld": "^0.28.0",
     "ipld-block": "^0.11.0",
     "ipld-dag-cbor": "^0.17.0",
-    "ipld-dag-pb": "^0.20.0",
+    "ipld-dag-pb": "ipld/js-ipld-dag-pb#feat/add-types",
     "ipld-raw": "^6.0.0",
     "ipns": "^0.8.0",
     "is-domain-name": "^1.0.1",

packages/ipfs-core/package.json

@@ -127,7 +127,7 @@ const updateShard = async (context, positions, child, options) => {
 
   log(`Updating shard ${prefix} with name ${newName}`)
 
-  const size = DAGNode.isDAGNode(result.node) ? result.node.size : result.node.Tsize
+  const size = result.node instanceof DAGNode ? result.node.size : result.node.Tsize
 
   return updateShardParent(context, bucket, node, prefix, newName, size, result.cid, options)
 }

packages/ipfs-core/src/components/files/utils/remove-link.js

@@ -1,7 +1,8 @@
 'use strict'
 
-const dagPB = require('ipld-dag-pb')
-const DAGLink = dagPB.DAGLink
+const {
+  DAGLink
+} = require('ipld-dag-pb')
 const CID = require('cids')
 const withTimeoutOption = require('ipfs-core-utils/src/with-timeout-option')
 

packages/ipfs-core/src/components/object/links.js

@@ -1,7 +1,8 @@
 'use strict'
 
-const dagPB = require('ipld-dag-pb')
-const DAGNode = dagPB.DAGNode
+const {
+  DAGNode
+} = require('ipld-dag-pb')
 const multicodec = require('multicodec')
 const Unixfs = require('ipfs-unixfs')
 const withTimeoutOption = require('ipfs-core-utils/src/with-timeout-option')

packages/ipfs-core/src/components/object/new.js

@@ -1,8 +1,10 @@
 'use strict'
 
-const dagPB = require('ipld-dag-pb')
-const DAGNode = dagPB.DAGNode
-const DAGLink = dagPB.DAGLink
+const {
+  DAGNode,
+  DAGLink,
+  util: DAGLinkUtil
+} = require('ipld-dag-pb')
 const mh = require('multihashing-async').multihash
 const multicodec = require('multicodec')
 const withTimeoutOption = require('ipfs-core-utils/src/with-timeout-option')
@@ -43,7 +45,7 @@ function parseJSONBuffer (buf) {
 }
 
 function parseProtoBuffer (buf) {
-  return dagPB.util.deserialize(buf)
+  return DAGLinkUtil.deserialize(buf)
 }
 
 /**
@@ -54,8 +56,7 @@ function parseProtoBuffer (buf) {
  */
 module.exports = ({ ipld, gcLock, preload }) => {
   /**
-   *
-   * @param {Uint8Array|DAGNode|{ Data: any, links: DAGLink[]}} obj
+   * @param {Uint8Array|DAGNode|{ Data: any, Links: DAGLink[]}} obj
    * @param {PutOptions & AbortOptions} options
    * @returns {Promise<CID>}
    */
@@ -69,7 +70,7 @@ module.exports = ({ ipld, gcLock, preload }) => {
       } else {
         node = new DAGNode(obj)
       }
-    } else if (DAGNode.isDAGNode(obj)) {
+    } else if (obj instanceof DAGNode) {
       // already a dag node
       node = obj
     } else if (typeof obj === 'object') {

packages/ipfs-core/src/components/object/put.js

@@ -155,7 +155,7 @@ async function * objectStream (ipld, rootCid, maxDepth, uniqueOnly) { // eslint-
 async function getLinks (ipld, cid) {
   const node = await ipld.get(new CID(cid))
 
-  if (DAGNode.isDAGNode(node)) {
+  if (node instanceof DAGNode) {
     return node.Links.map(({ Name, Hash }) => ({ name: Name, cid: new CID(Hash) }))
   }