fix: make test coverage 100 and fix test case

Author: BelfordZ

src/index.test.ts

@@ -90,8 +90,19 @@ describe("referenceResolver", () => {
 
 
 describe("refs with hash fragment / internal reference component", () => {
-  it("works with file paths", async () => {
-    expect(await referenceResolver("./src/test-obj.json#/type", {})).toBe("string");
+  describe("files", () => {
+    it("works in simple case", async () => {
+      expect(await referenceResolver("./src/test-obj.json#/type", {})).toBe("string");
+    });
+
+    it("errors when the json pointer is invalid", async () => {
+      expect.assertions(1);
+      try {
+        await referenceResolver("./src/test-obj.json#balony", {});
+      } catch (e) {
+        expect(e).toBeInstanceOf(InvalidJsonPointerRefError);
+      }
+    });
   });
 
   describe("urls", () => {
@@ -107,7 +118,7 @@ describe("refs with hash fragment / internal reference component", () => {
       try {
         await referenceResolver("https://meta.open-rpc.org/#type", {});
       } catch (e) {
-        expect(e).toBeInstanceOf(InvalidRemoteURLError);
+        expect(e).toBeInstanceOf(InvalidJsonPointerRefError);
       }
     });
 
@@ -116,7 +127,7 @@ describe("refs with hash fragment / internal reference component", () => {
       try {
         await referenceResolver("https://meta.open-rpc.org/#properties/#openrpc", {});
       } catch (e) {
-        expect(e).toBeInstanceOf(InvalidRemoteURLError);
+        expect(e).toBeInstanceOf(InvalidJsonPointerRefError);
       }
     });
   });

src/reference-resolver.ts

@@ -136,7 +136,6 @@ export default (fetch: any, fs: any) => {
       }
     }
 
-    // copy hash fragment from the filepath / url
     const hashFragmentSplit = ref.split("#");
     let hashFragment;
     if (hashFragmentSplit.length > 1) {
@@ -149,7 +148,6 @@ export default (fetch: any, fs: any) => {
     }
 
     if (await fileExistsAndReadable(hashlessRef) === true) {
-      // pull off the hash fragment first
       const fileContents = await readFile(hashlessRef);
       let reffedSchema;
       try {
@@ -172,22 +170,23 @@ export default (fetch: any, fs: any) => {
       throw new InvalidFileSystemPathError(ref);
     }
 
+    let result;
     try {
-      // leave the hash fragment on
-      // but evaluate the result after
-      const result = await fetch(ref).then((r: any) => r.json());
-      if (hashFragment) {
-        try {
-          const pointer = Ptr.parse(hashFragment);
-          return Promise.resolve(pointer.eval(result));
-        } catch (e) {
-          throw new InvalidJsonPointerRefError({ $ref: ref });
-        }
-      }
-      return result;
+      result = await fetch(ref).then((r: any) => r.json());
     } catch (e) {
       throw new InvalidRemoteURLError(ref);
     }
+
+    if (hashFragment) {
+      try {
+        const pointer = Ptr.parse(hashFragment);
+        return Promise.resolve(pointer.eval(result));
+      } catch (e) {
+        throw new InvalidJsonPointerRefError({ $ref: ref });
+      }
+    }
+
+    return result;
   };
 
   return resolveReference;