refactor: addressing PR review

Author: lidel

README.md

@@ -94,7 +94,7 @@ isIPFS.ipnsSubdomain('http://foo-bar.ipns.dweb.link') // false (not a PeerID)
 
 # API
 
-A suite of util methods provides efficient validation.
+A suite of util methods that provides efficient validation.
 
 Detection of IPFS Paths and identifiers in URLs is a two-stage process:
 1.  `urlPattern`/`pathPattern`/`subdomainPattern` regex is applied to quickly identify potential candidates

package.json

@@ -31,6 +31,7 @@
   "dependencies": {
     "bs58": "4.0.1",
     "cids": "0.5.3",
+    "multibase": "0.4.0",
     "multihashes": "0.4.13"
   },
   "devDependencies": {

src/index.js

@@ -106,13 +106,16 @@ function convertToString (input) {
   return false
 }
 
+const ipfsSubdomain = (url) => isIpfs(url, fqdnPattern, fqdnProtocolMatch, fqdnHashMatch)
+const ipnsSubdomain = (url) => isIpns(url, fqdnPattern, fqdnProtocolMatch, fqdnHashMatch)
+
 module.exports = {
   multihash: isMultihash,
   cid: isCID,
   base32cid: (cid) => (isMultibase(cid) === 'base32' && isCID(cid)),
-  ipfsSubdomain: (url) => isIpfs(url, fqdnPattern, fqdnProtocolMatch, fqdnHashMatch),
-  ipnsSubdomain: (url) => isIpns(url, fqdnPattern, fqdnProtocolMatch, fqdnHashMatch),
-  subdomain: (url) => (isIpfs(url, fqdnPattern, fqdnProtocolMatch, fqdnHashMatch) || isIpns(url, fqdnPattern, fqdnProtocolMatch, fqdnHashMatch)),
+  ipfsSubdomain: ipfsSubdomain,
+  ipnsSubdomain: ipnsSubdomain,
+  subdomain: (url) => (ipfsSubdomain(url) || ipnsSubdomain(url)),
   subdomainPattern: fqdnPattern,
   ipfsUrl: (url) => isIpfs(url, urlPattern),
   ipnsUrl: (url) => isIpns(url, urlPattern),