updated URI schemes

Author: joeltg

README.md

@@ -134,6 +134,4 @@ document: ipfs://QmPm5sCx6HLSmdJHFrozmsVNxC6mrE3VMHH7XuTQmtqUuA
 
 ## Support
 
-This loader supports JSON-encoded contexts and documents on IPFS under the `dweb:/ipfs/` and `ipfs://` URI schemes (the loader will atempt to parse those files into JSON and will throw an error if that fails), as well as the `dag-cbor`, `dag-json`, `dab-pb`, and `raw` IPLD formats.
-
-`dag-cbor` and `dag-json` both deserialize directly to JSON objects, which are used directly. This loader will attempt to parse `dab-pb` and `raw` blocks as JSON and will throw an error if unsuccessful.
+This loader supports JSON-encoded contexts and documents on IPFS under the `dweb:/ipfs/` and `ipfs://` URI schemes (the loader will atempt to parse those files as JSON and will throw an error if that fails), as well as the `dag-cbor` and `dag-json` IPLD formats, which deserialize directly to JSON.

index.js

@@ -1,46 +1,18 @@
 const CID = require("cids")
 
-function parseJSON(bytes, callback) {
-	const string = bytes.toString("utf8")
-	let value = null,
-		error = null
-	try {
-		value = { document: JSON.parse(string) }
-	} catch (e) {
-		error = e
-	} finally {
-		callback(error, value)
-	}
-}
-
-const ipldLoaders = {
-	raw(value, callback) {
-		parseJSON(value, callback)
-	},
-	"dag-pb"(value, callback) {
-		parseJSON(value.data, callback)
-	},
-	"dag-cbor"(value, callback) {
-		callback(null, { document: value })
-	},
-	"dag-json"(value, callback) {
-		callback(null, { document: value })
-	},
-}
-
 function ipldLoader(ipfs, path, callback) {
 	let cid
 	try {
 		cid = new CID(path)
 	} catch (e) {
 		callback(e)
 	}
-	if (ipldLoaders.hasOwnProperty(cid.codec)) {
+	if (cid.codec === "dag-cbor" || cid.codec === "dag-json") {
 		ipfs.dag.get(path, (err, { value }) => {
 			if (err) {
 				callback(err)
 			} else {
-				ipldLoaders[cid.codec](value, callback)
+				callback(null, { document: value })
 			}
 		})
 	} else {
@@ -53,7 +25,16 @@ function ipfsLoader(ipfs, path, callback) {
 		if (err) {
 			callback(err)
 		} else {
-			parseJSON(bytes, callback)
+			const string = bytes.toString("utf8")
+			let value = null,
+				error = null
+			try {
+				value = { document: JSON.parse(string) }
+			} catch (e) {
+				error = e
+			} finally {
+				callback(error, value)
+			}
 		}
 	})
 }