feat: add types

.travis.yml

@@ -1,12 +1,17 @@
 language: node_js
 cache: npm
+branches:
+  only:
+  - master
+  - /^release\/.*$/
 stages:
   - check
   - test
   - cov
 
 node_js:
-  - '10'
+  - '14'
+  - '15'
 
 os:
   - linux

package.json

@@ -5,6 +5,11 @@
   "leadMaintainer": "Volker Mische <volker.mische@gmail.com>",
   "main": "src/index.js",
   "scripts": {
+    "prepare": "run-s prepare:*",
+    "prepare:proto": "pbjs -t static-module -w commonjs --force-number --no-verify --no-delimited --no-create --no-beautify --no-defaults --lint eslint-disable -o src/dag.js ./src/dag.proto",
+    "prepare:proto:types": "pbts -o src/dag.d.ts src/dag.js",
+    "prepare:types": "aegir build --no-bundle",
+    "prepare:copy": "cp ./src/*.d.ts ./dist/src",
     "test": "aegir test",
     "test:browser": "aegir test --target browser",
     "test:node": "aegir test --target node",
@@ -13,7 +18,6 @@
     "release": "aegir release",
     "release-minor": "aegir release --type minor",
     "release-major": "aegir release --type major",
-    "build": "aegir build",
     "coverage": "aegir coverage",
     "coverage-publish": "aegir coverage publish"
   },
@@ -66,18 +70,29 @@
   },
   "dependencies": {
     "cids": "^1.0.0",
-    "class-is": "^1.1.0",
     "multicodec": "^2.0.0",
     "multihashing-async": "^2.0.0",
-    "protons": "^2.0.0",
+    "protobufjs": "^6.10.2",
     "reset": "^0.1.0",
     "run": "^1.4.0",
     "stable": "^0.1.8",
-    "uint8arrays": "^1.0.0"
+    "uint8arrays": "^2.0.5"
   },
   "devDependencies": {
-    "aegir": "^25.0.0",
+    "aegir": "^30.3.0",
     "multibase": "^3.0.0",
-    "multihashes": "^3.0.0"
+    "npm-run-all": "^4.1.5"
+  },
+  "types": "dist/src/index.d.ts",
+  "typesVersions": {
+    "*": {
+      "src/*": [
+        "dist/src/*",
+        "dist/src/*/index"
+      ],
+      "src/": [
+        "dist/src/index"
+      ]
+    }
   }
 }

src/dag-link/dagLink.js

@@ -1,11 +1,17 @@
 'use strict'
 
 const CID = require('cids')
-const withIs = require('class-is')
 const uint8ArrayFromString = require('uint8arrays/from-string')
 
-// Link represents an IPFS Merkle DAG Link between Nodes.
+/**
+ * Link represents an IPFS Merkle DAG Link between Nodes.
+ */
 class DAGLink {
+  /**
+   * @param {string | undefined | null} name
+   * @param {number} size
+   * @param {CID | string | Uint8Array} cid
+   */
   constructor (name, size, cid) {
     if (!cid) {
       throw new Error('A link requires a cid to point to')
@@ -14,11 +20,11 @@ class DAGLink {
     // assert(size, 'A link requires a size')
     //  note - links should include size, but this assert is disabled
     //  for now to maintain consistency with go-ipfs pinset
+    this.Name = name || ''
+    this.Tsize = size
+    this.Hash = new CID(cid)
 
     Object.defineProperties(this, {
-      Name: { value: name || '', writable: false, enumerable: true },
-      Tsize: { value: size, writable: false, enumerable: true },
-      Hash: { value: new CID(cid), writable: false, enumerable: true },
       _nameBuf: { value: null, writable: true, enumerable: false }
     })
   }
@@ -43,7 +49,7 @@ class DAGLink {
   // We need this to sort the links, otherwise
   // we will reallocate new Uint8Arrays every time
   get nameAsBuffer () {
-    if (this._nameBuf !== null) {
+    if (this._nameBuf != null) {
       return this._nameBuf
     }
 
@@ -52,4 +58,4 @@ class DAGLink {
   }
 }
 
-exports = module.exports = withIs(DAGLink, { className: 'DAGLink', symbolName: '@ipld/js-ipld-dag-pb/daglink' })
+module.exports = DAGLink

src/dag-link/index.js

@@ -1,4 +1,3 @@
 'use strict'
 
 exports = module.exports = require('./dagLink')
-exports.util = require('./util')

src/dag-link/util.js

@@ -1,7 +1,10 @@
 'use strict'
 
-const DAGLink = require('./dagLink')
+const DAGLink = require('./')
 
+/**
+ * @param {*} link
+ */
 function createDagLinkFromB58EncodedHash (link) {
   return new DAGLink(
     link.Name || link.name || '',
@@ -10,5 +13,6 @@ function createDagLinkFromB58EncodedHash (link) {
   )
 }
 
-exports = module.exports
-exports.createDagLinkFromB58EncodedHash = createDagLinkFromB58EncodedHash
+module.exports = {
+  createDagLinkFromB58EncodedHash
+}

src/dag-node/addLink.js

@@ -1,10 +1,19 @@
 'use strict'
 
 const sortLinks = require('./sortLinks')
-const DAGLink = require('../dag-link')
+const DAGLink = require('../dag-link/dagLink')
 
+/**
+ * @typedef {import('./dagNode')} DAGNode
+ * @typedef {import('../types')} DAGLinkLike
+ */
+
+/**
+ * @param {*} link
+ * @returns {DAGLink}
+ */
 const asDAGLink = (link) => {
-  if (DAGLink.isDAGLink(link)) {
+  if (link instanceof DAGLink) {
     // It's a DAGLink instance
     // no need to do anything
     return link
@@ -21,9 +30,14 @@ const asDAGLink = (link) => {
   }
 
   // It's a Object with name, multihash/hash/cid and size
+  // @ts-ignore
   return new DAGLink(link.Name || link.name, link.Tsize || link.size, link.Hash || link.multihash || link.hash || link.cid)
 }
 
+/**
+ * @param {DAGNode} node
+ * @param {DAGLink | DAGLinkLike} link
+ */
 const addLink = (node, link) => {
   const dagLink = asDAGLink(link)
   node.Links.push(dagLink)

src/dag-node/dagNode.js

@@ -1,16 +1,26 @@
 'use strict'
 
-const withIs = require('class-is')
 const sortLinks = require('./sortLinks')
 const DAGLink = require('../dag-link/dagLink')
-const { serializeDAGNode } = require('../serialize.js')
+const { createDagLinkFromB58EncodedHash } = require('../dag-link/util')
+const { serializeDAGNode } = require('../serialize')
 const toDAGLink = require('./toDagLink')
 const addLink = require('./addLink')
 const rmLink = require('./rmLink')
 const uint8ArrayFromString = require('uint8arrays/from-string')
 const uint8ArrayToString = require('uint8arrays/to-string')
 
+/**
+ * @typedef {import('cids')} CID
+ * @typedef {import('../types').DAGLinkLike} DAGLinkLike
+ */
+
 class DAGNode {
+  /**
+   *@param {Uint8Array | string} [data]
+   * @param {(DAGLink | DAGLinkLike)[]} links
+   * @param {number | null} [serializedSize]
+   */
   constructor (data, links = [], serializedSize = null) {
     if (!data) {
       data = new Uint8Array(0)
@@ -27,16 +37,17 @@ class DAGNode {
       throw new Error('Passed \'serializedSize\' must be a number!')
     }
 
-    links = links.map((link) => {
-      return DAGLink.isDAGLink(link)
+    const sortedLinks = links.map((link) => {
+      return link instanceof DAGLink
         ? link
-        : DAGLink.util.createDagLinkFromB58EncodedHash(link)
+        : createDagLinkFromB58EncodedHash(link)
     })
-    sortLinks(links)
+    sortLinks(sortedLinks)
+
+    this.Data = data
+    this.Links = sortedLinks
 
     Object.defineProperties(this, {
-      Data: { value: data, writable: false, enumerable: true },
-      Links: { value: links, writable: false, enumerable: true },
       _serializedSize: { value: serializedSize, writable: true, enumerable: false },
       _size: { value: null, writable: true, enumerable: false }
     })
@@ -63,31 +74,47 @@ class DAGNode {
     this._size = null
   }
 
+  /**
+   * @param {DAGLink | import('../types').DAGLinkLike} link
+   */
   addLink (link) {
     this._invalidateCached()
     return addLink(this, link)
   }
 
+  /**
+   * @param {DAGLink | string | CID} link
+   */
   rmLink (link) {
     this._invalidateCached()
     return rmLink(this, link)
   }
 
-  // @returns {Promise.<DAGLink>}
+  /**
+   * @param {import('./toDagLink').ToDagLinkOptions} [options]
+   */
   toDAGLink (options) {
     return toDAGLink(this, options)
   }
 
   serialize () {
-    return serializeDAGNode(this)
+    const buf = serializeDAGNode(this)
+
+    this._serializedSize = buf.length
+
+    return buf
   }
 
   get size () {
-    if (this._size === null) {
-      if (this._serializedSize === null) {
+    if (this._size == null) {
+      let serializedSize
+
+      if (serializedSize == null) {
         this._serializedSize = this.serialize().length
+        serializedSize = this._serializedSize
       }
-      this._size = this.Links.reduce((sum, l) => sum + l.Tsize, this._serializedSize)
+
+      this._size = this.Links.reduce((sum, l) => sum + l.Tsize, serializedSize)
     }
 
     return this._size
@@ -98,4 +125,4 @@ class DAGNode {
   }
 }
 
-exports = module.exports = withIs(DAGNode, { className: 'DAGNode', symbolName: '@ipld/js-ipld-dag-pb/dagnode' })
+module.exports = DAGNode

src/dag-node/rmLink.js

@@ -3,14 +3,25 @@
 const CID = require('cids')
 const uint8ArrayEquals = require('uint8arrays/equals')
 
+/**
+ * @typedef {import('../dag-link/dagLink')} DAGLink
+ */
+
+/**
+ *
+ * @param {import('./dagNode')} dagNode
+ * @param {string | CID | Uint8Array | DAGLink} nameOrCid
+ */
 const rmLink = (dagNode, nameOrCid) => {
   let predicate = null
 
   // It's a name
   if (typeof nameOrCid === 'string') {
-    predicate = (link) => link.Name === nameOrCid
-  } else if (nameOrCid instanceof Uint8Array || CID.isCID(nameOrCid)) {
-    predicate = (link) => uint8ArrayEquals(link.Hash, nameOrCid)
+    predicate = (/** @type {DAGLink} */ link) => link.Name === nameOrCid
+  } else if (nameOrCid instanceof Uint8Array) {
+    predicate = (/** @type {DAGLink} */ link) => uint8ArrayEquals(link.Hash.bytes, nameOrCid)
+  } else if (CID.isCID(nameOrCid)) {
+    predicate = (/** @type {DAGLink} */ link) => uint8ArrayEquals(link.Hash.bytes, nameOrCid.bytes)
   }
 
   if (predicate) {

src/dag-node/sortLinks.js

@@ -3,6 +3,15 @@
 const sort = require('stable')
 const uint8ArrayCompare = require('uint8arrays/compare')
 
+/**
+ * @typedef {import('../dag-link/dagLink')} DAGLink
+ */
+
+/**
+ *
+ * @param {DAGLink} a
+ * @param {DAGLink} b
+ */
 const linkSort = (a, b) => {
   const buf1 = a.nameAsBuffer
   const buf2 = b.nameAsBuffer
@@ -12,7 +21,8 @@ const linkSort = (a, b) => {
 
 /**
  * Sorts links in place (mutating given array)
- * @param {Array} links
+ *
+ * @param {DAGLink[]} links
  * @returns {void}
  */
 const sortLinks = (links) => {

src/dag-node/toDagLink.js

@@ -1,13 +1,24 @@
 'use strict'
 
-const DAGLink = require('../dag-link/dagLink')
+const DAGLink = require('../dag-link')
 const genCid = require('../genCid')
 
-/*
+/**
  * toDAGLink converts a DAGNode to a DAGLink
+ *
+ * @typedef {import('../genCid').GenCIDOptions} GenCIDOptions
+ *
+ * @typedef {object} ToDagLinkExtraOptions
+ * @property {string} [name]
+ *
+ * @typedef {GenCIDOptions & ToDagLinkExtraOptions} ToDagLinkOptions
+ *
+ * @param {import('./dagNode')} node
+ * @param {ToDagLinkOptions} options
  */
 const toDAGLink = async (node, options = {}) => {
-  const nodeCid = await genCid.cid(node.serialize(), options)
+  const buf = node.serialize()
+  const nodeCid = await genCid.cid(buf, options)
   return new DAGLink(options.name || '', node.size, nodeCid)
 }