Merge pull request #97 from takker99/purge-req-and-res

 ✨ extract request builder and response analyzer in `getPage`/`listPages` and `getProject`/`listProjects`

Author: takker99

rest/__snapshots__/pages.test.ts.snap

@@ -0,0 +1,21 @@
+export const snapshot = {};
+
+snapshot[`getPage 1`] = `
+Request {
+  bodyUsed: false,
+  headers: Headers {},
+  method: "GET",
+  redirect: "follow",
+  url: "https://scrapbox.io/api/pages/takker/%E3%83%86%E3%82%B9%E3%83%88%E3%83%9A%E3%83%BC%E3%82%B8?followRe..."
+}
+`;
+
+snapshot[`listPages 1`] = `
+Request {
+  bodyUsed: false,
+  headers: Headers {},
+  method: "GET",
+  redirect: "follow",
+  url: "https://scrapbox.io/api/pages/takker?sort=updated"
+}
+`;

rest/__snapshots__/project.test.ts.snap

@@ -0,0 +1,21 @@
+export const snapshot = {};
+
+snapshot[`getProject 1`] = `
+Request {
+  bodyUsed: false,
+  headers: Headers {},
+  method: "GET",
+  redirect: "follow",
+  url: "https://scrapbox.io/api/projects/takker"
+}
+`;
+
+snapshot[`listProjects 1`] = `
+Request {
+  bodyUsed: false,
+  headers: Headers {},
+  method: "GET",
+  redirect: "follow",
+  url: "https://scrapbox.io/api/projects?ids=dummy-id1&ids=dummy-id2"
+}
+`;

rest/error.ts

@@ -4,19 +4,14 @@ import { tryToErrorLike } from "../is.ts";
 /** 想定されない応答が帰ってきたときに投げる例外 */
 export class UnexpectedResponseError extends Error {
   name = "UnexpectedResponseError";
-  request: Request;
-  response: Response;
 
   constructor(
-    init: { request: Request; response: Response },
+    public response: Response,
   ) {
     super(
-      `${init.response.status} ${init.response.statusText} when fetching ${init.request.url}`,
+      `${response.status} ${response.statusText} when fetching ${response.url}`,
     );
 
-    this.request = init.request.clone();
-    this.response = init.response.clone();
-
     // @ts-ignore only available on V8
     if (Error.captureStackTrace) {
       // @ts-ignore only available on V8
@@ -27,14 +22,13 @@ export class UnexpectedResponseError extends Error {
 
 /** 失敗した要求からエラー情報を取り出す */
 export const makeError = async <T extends ErrorLike>(
-  req: Request,
   res: Response,
 ): Promise<{ ok: false; value: T }> => {
   const response = res.clone();
   const text = await response.text();
   const value = tryToErrorLike(text);
   if (!value) {
-    throw new UnexpectedResponseError({ request: req, response });
+    throw new UnexpectedResponseError(response);
   }
   return {
     ok: false,

rest/getGyazoToken.ts

@@ -34,10 +34,7 @@ export const getGyazoToken = async (
 
   const res = await fetch(req);
   if (!res.ok) {
-    return makeError<NotLoggedInError>(
-      req,
-      res,
-    );
+    return makeError<NotLoggedInError>(res);
   }
 
   const { token } = (await res.json()) as { token?: string };

rest/getSnapshots.ts

@@ -58,10 +58,7 @@ export const getSnapshots = async (
         },
       };
     }
-    return makeError<NotFoundError | NotLoggedInError | NotMemberError>(
-      req,
-      res,
-    );
+    return makeError<NotFoundError | NotLoggedInError | NotMemberError>(res);
   }
 
   const data = (await res.json()) as PageSnapshot;

rest/getTweetInfo.ts

@@ -53,7 +53,7 @@ export const getTweetInfo = async (
         },
       };
     }
-    return makeError<SessionError | BadRequestError>(req, res);
+    return makeError<SessionError | BadRequestError>(res);
   }
 
   const tweet = (await res.json()) as TweetInfo;

rest/getWebPageTitle.ts

@@ -53,7 +53,7 @@ export const getWebPageTitle = async (
         },
       };
     }
-    return makeError<SessionError | BadRequestError>(req, res);
+    return makeError<SessionError | BadRequestError>(res);
   }
 
   const { title } = (await res.json()) as { title: string };

rest/link.ts

@@ -53,7 +53,7 @@ export const getLinks = async (
       };
     }
 
-    return makeError<NotFoundError | NotLoggedInError>(req, res);
+    return makeError<NotFoundError | NotLoggedInError>(res);
   }
 
   const pages = (await res.json()) as SearchedTitle[];

rest/page-data.ts

@@ -49,7 +49,7 @@ export const importPages = async (
 
   const res = await fetch(req);
   if (!res.ok) {
-    return makeError(req, res);
+    return makeError(res);
   }
 
   const { message } = (await res.json()) as { message: string };
@@ -83,9 +83,7 @@ export const exportPages = async <withMetadata extends true | false>(
   const res = await fetch(req);
 
   if (!res.ok) {
-    return makeError<
-      NotFoundError | NotPrivilegeError | NotLoggedInError
-    >(req, res);
+    return makeError<NotFoundError | NotPrivilegeError | NotLoggedInError>(res);
   }
 
   const value = (await res.json()) as ExportedData<withMetadata>;

rest/pages.test.ts

@@ -0,0 +1,15 @@
+import { getPage, listPages } from "./pages.ts";
+import { assertSnapshot } from "../deps/testing.ts";
+
+Deno.test("getPage", async (t) => {
+  await assertSnapshot(
+    t,
+    getPage.toRequest("takker", "テストページ", { followRename: true }),
+  );
+});
+Deno.test("listPages", async (t) => {
+  await assertSnapshot(
+    t,
+    listPages.toRequest("takker", { sort: "updated" }),
+  );
+});