feat(REST API): Replace my own Result<T, E> with option-t`'s

Also delete`is.ts` and use `unknownutil`

`Result.value` has been changed into `Result.val`

Author: takker99

browser/dom/edit.ts

@@ -3,7 +3,7 @@ import { press } from "./press.ts";
 import { getLineCount } from "./node.ts";
 import { range } from "../../range.ts";
 import { textInput } from "./dom.ts";
-import { isArray, isNumber, isString } from "../../is.ts";
+import { isArray, isNumber, isString } from "../../deps/unknownutil.ts";
 import { sleep } from "../../sleep.ts";
 
 export const undo = (count = 1): void => {

browser/dom/node.ts

@@ -1,7 +1,7 @@
 /// <reference no-default-lib="true"/>
 /// <reference lib="esnext"/>
 /// <reference lib="dom" />
-import { isNone, isNumber, isString } from "../../is.ts";
+import { isNumber, isString, isUndefined } from "../../deps/unknownutil.ts";
 import { ensureArray } from "../../ensure.ts";
 import { getCachedLines } from "./getCachedLines.ts";
 import { takeInternalLines } from "./takeInternalLines.ts";
@@ -18,7 +18,7 @@ import * as Text from "../../text.ts";
 export const getLineId = <T extends HTMLElement>(
   value?: number | string | T,
 ): string | undefined => {
-  if (isNone(value)) return undefined;
+  if (isUndefined(value)) return undefined;
 
   // 行番号のとき
   if (isNumber(value)) return getBaseLine(value)?.id;
@@ -43,7 +43,7 @@ export const getLineId = <T extends HTMLElement>(
 export const getLineNo = <T extends HTMLElement>(
   value?: number | string | T,
 ): number | undefined => {
-  if (isNone(value)) return undefined;
+  if (isUndefined(value)) return undefined;
 
   // 行番号のとき
   if (isNumber(value)) return value;
@@ -55,7 +55,7 @@ export const getLineNo = <T extends HTMLElement>(
 export const getLine = <T extends HTMLElement>(
   value?: number | string | T,
 ): Line | undefined => {
-  if (isNone(value)) return undefined;
+  if (isUndefined(value)) return undefined;
 
   // 行番号のとき
   if (isNumber(value)) return getLines()[value];
@@ -67,7 +67,7 @@ export const getLine = <T extends HTMLElement>(
 export const getBaseLine = <T extends HTMLElement>(
   value?: number | string | T,
 ): BaseLine | undefined => {
-  if (isNone(value)) return undefined;
+  if (isUndefined(value)) return undefined;
 
   // 行番号のとき
   if (isNumber(value)) return takeInternalLines()[value];
@@ -82,9 +82,9 @@ export const getLineDOM = <T extends HTMLElement>(
   if (isLineDOM(value)) return value;
 
   const id = getLineId(value);
-  if (isNone(id)) return id;
+  if (isUndefined(id)) return id;
   const line = document.getElementById(`L${id}`);
-  if (isNone(line)) return undefined;
+  if (isUndefined(line)) return undefined;
   return line as HTMLDivElement;
 };
 export const isLineDOM = (dom: unknown): dom is HTMLDivElement =>
@@ -101,7 +101,7 @@ export const getLines = (): readonly Line[] => {
 export const getText = <T extends HTMLElement>(
   value?: number | string | T,
 ): string | undefined => {
-  if (isNone(value)) return undefined;
+  if (isUndefined(value)) return undefined;
 
   // 数字と文字列は行として扱う
   if (isNumber(value) || isString(value)) return getBaseLine(value)?.text;
@@ -121,7 +121,7 @@ export const getText = <T extends HTMLElement>(
   //中に含まれている文字の列番号を全て取得し、それに対応する文字列を返す
   const chars = [] as number[];
   const line = getBaseLine(value);
-  if (isNone(line)) return;
+  if (isUndefined(line)) return;
   for (const dom of getChars(value)) {
     chars.push(getIndex(dom));
   }
@@ -130,30 +130,30 @@ export const getText = <T extends HTMLElement>(
 
 export const getExternalLink = (dom: HTMLElement): HTMLElement | undefined => {
   const link = dom.closest(".link");
-  if (isNone(link)) return undefined;
+  if (isUndefined(link)) return undefined;
   return link as HTMLElement;
 };
 export const getInternalLink = (dom: HTMLElement): HTMLElement | undefined => {
   const link = dom.closest(".page-link");
-  if (isNone(link)) return undefined;
+  if (isUndefined(link)) return undefined;
   return link as HTMLElement;
 };
 export const getLink = (dom: HTMLElement) => {
   const link = dom.closest(".link, .page-link");
-  if (isNone(link)) return undefined;
+  if (isUndefined(link)) return undefined;
   return link as HTMLElement;
 };
 
 export const getFormula = (dom: HTMLElement): HTMLElement | undefined => {
   const formula = dom.closest(".formula");
-  if (isNone(formula)) return undefined;
+  if (isUndefined(formula)) return undefined;
   return formula as HTMLElement;
 };
 export const getNextLine = <T extends HTMLElement>(
   value?: number | string | T,
 ): Line | undefined => {
   const index = getLineNo(value);
-  if (isNone(index)) return undefined;
+  if (isUndefined(index)) return undefined;
 
   return getLine(index + 1);
 };
@@ -162,26 +162,26 @@ export const getPrevLine = <T extends HTMLElement>(
   value?: number | string | T,
 ): Line | undefined => {
   const index = getLineNo(value);
-  if (isNone(index)) return undefined;
+  if (isUndefined(index)) return undefined;
 
   return getLine(index - 1);
 };
 
 export const getHeadLineDOM = (): HTMLDivElement | undefined => {
   const line = lines()?.firstElementChild;
-  if (isNone(line)) return undefined;
+  if (isUndefined(line)) return undefined;
   return line as HTMLDivElement;
 };
 export const getTailLineDOM = (): HTMLDivElement | undefined => {
   const line = lines()?.lastElementChild;
-  if (isNone(line)) return undefined;
+  if (isUndefined(line)) return undefined;
   return line as HTMLDivElement;
 };
 export const getIndentCount = <T extends HTMLElement>(
   value?: number | string | T,
 ): number | undefined => {
   const text = getText(value);
-  if (isNone(text)) return undefined;
+  if (isUndefined(text)) return undefined;
   return Text.getIndentCount(text);
 };
 /** 指定した行の配下にある行の数を返す
@@ -192,7 +192,7 @@ export const getIndentLineCount = <T extends HTMLElement>(
   value?: number | string | T,
 ): number | undefined => {
   const index = getLineNo(value);
-  if (isNone(index)) return;
+  if (isUndefined(index)) return;
   return Text.getIndentLineCount(index, getLines());
 };
 
@@ -213,7 +213,7 @@ export const getIndex = (dom: HTMLSpanElement): number => {
   if (!isCharDOM(dom)) throw Error("A char DOM is required.");
 
   const index = dom.className.match(/c-(\d+)/)?.[1];
-  if (isNone(index)) throw Error('.char-index must have ".c-{\\d}"');
+  if (isUndefined(index)) throw Error('.char-index must have ".c-{\\d}"');
   return parseInt(index);
 };
 export const getHeadCharDOM = (
@@ -245,7 +245,7 @@ export const getDOMFromPoint = (
   const char = targets.find((target) => isCharDOM(target));
   const line = targets.find((target) => isLineDOM(target));
   return {
-    char: isNone(char) ? undefined : char as HTMLSpanElement,
-    line: isNone(line) ? undefined : line as HTMLDivElement,
+    char: isUndefined(char) ? undefined : char as HTMLSpanElement,
+    line: isUndefined(line) ? undefined : line as HTMLDivElement,
   };
 };

browser/websocket/deletePage.ts

@@ -1,5 +1,5 @@
-import { push, PushOptions, RetryError } from "./push.ts";
-import { Result } from "../../rest/util.ts";
+import { Result } from "../../deps/option-t.ts";
+import { push, PushError, PushOptions } from "./push.ts";
 
 export type DeletePageOptions = PushOptions;
 
@@ -13,7 +13,7 @@ export const deletePage = (
   project: string,
   title: string,
   options?: DeletePageOptions,
-): Promise<Result<string, RetryError>> =>
+): Promise<Result<string, PushError>> =>
   push(
     project,
     title,

browser/websocket/id.ts

@@ -1,35 +1,3 @@
-import { getProject } from "../../rest/project.ts";
-import { getProfile } from "../../rest/profile.ts";
-
-/** cached user ID */
-let userId: string | undefined;
-export const getUserId = async (): Promise<string> => {
-  if (userId !== undefined) return userId;
-
-  const user = await getProfile();
-  if (user.isGuest) {
-    throw new Error("this script can only be executed by Logged in users");
-  }
-  userId = user.id;
-  return userId;
-};
-
-/** cached pairs of project name and project id */
-const projectMap = new Map<string, string>();
-export const getProjectId = async (project: string): Promise<string> => {
-  const cachedId = projectMap.get(project);
-  if (cachedId !== undefined) return cachedId;
-
-  const result = await getProject(project);
-  if (!result.ok) {
-    const { name, message } = result.value;
-    throw new Error(`${name} ${message}`);
-  }
-  const { id } = result.value;
-  projectMap.set(project, id);
-  return id;
-};
-
 const zero = (n: string) => n.padStart(8, "0");
 
 export const createNewLineId = (userId: string): string => {

browser/websocket/listen.ts

@@ -1,12 +1,20 @@
+import { createOk, isErr, Result, unwrapOk } from "../../deps/option-t.ts";
+import {
+  NotFoundError,
+  NotLoggedInError,
+  NotMemberError,
+} from "../../deps/scrapbox-rest.ts";
 import {
   ProjectUpdatesStreamCommit,
   ProjectUpdatesStreamEvent,
   Socket,
   socketIO,
   wrap,
 } from "../../deps/socket.ts";
+import { HTTPError } from "../../rest/responseIntoResult.ts";
+import { AbortError, NetworkError } from "../../rest/robustFetch.ts";
+import { getProjectId } from "./pull.ts";
 import { connect, disconnect } from "./socket.ts";
-import { getProjectId } from "./id.ts";
 export type {
   ProjectUpdatesStreamCommit,
   ProjectUpdatesStreamEvent,
@@ -27,11 +35,24 @@ export async function* listenStream(
   events: ["commit" | "event", ...("commit" | "event")[]],
   options?: ListenStreamOptions,
 ): AsyncGenerator<
-  ProjectUpdatesStreamEvent | ProjectUpdatesStreamCommit,
+  Result<
+    ProjectUpdatesStreamEvent | ProjectUpdatesStreamCommit,
+    | NotFoundError
+    | NotLoggedInError
+    | NotMemberError
+    | NetworkError
+    | AbortError
+    | HTTPError
+  >,
   void,
   unknown
 > {
-  const projectId = await getProjectId(project);
+  const result = await getProjectId(project);
+  if (isErr(result)) {
+    yield result;
+    return;
+  }
+  const projectId = unwrapOk(result);
 
   const injectedSocket = options?.socket;
   const socket = injectedSocket ?? await socketIO();
@@ -45,9 +66,13 @@ export async function* listenStream(
       data: { projectId, pageId: null, projectUpdatesStream: true },
     });
 
-    yield* response(
-      ...events.map((event) => `projectUpdatesStream:${event}` as const),
-    );
+    for await (
+      const streamEvent of response(
+        ...events.map((event) => `projectUpdatesStream:${event}` as const),
+      )
+    ) {
+      yield createOk(streamEvent);
+    }
   } finally {
     if (!injectedSocket) await disconnect(socket);
   }

browser/websocket/patch.ts

@@ -1,9 +1,9 @@
 import { Change, DeletePageChange, PinChange } from "../../deps/socket.ts";
 import { makeChanges } from "./makeChanges.ts";
 import { Line, Page } from "../../deps/scrapbox-rest.ts";
-import { push, PushOptions, RetryError } from "./push.ts";
+import { push, PushError, PushOptions } from "./push.ts";
 import { suggestUnDupTitle } from "./suggestUnDupTitle.ts";
-import { Result } from "../../rest/util.ts";
+import { Result } from "../../deps/option-t.ts";
 
 export type PatchOptions = PushOptions;
 
@@ -32,7 +32,7 @@ export const patch = (
     metadata: PatchMetadata,
   ) => string[] | undefined | Promise<string[] | undefined>,
   options?: PatchOptions,
-): Promise<Result<string, RetryError>> =>
+): Promise<Result<string, PushError>> =>
   push(
     project,
     title,

browser/websocket/pin.ts

@@ -1,6 +1,6 @@
+import { Result } from "../../deps/option-t.ts";
 import { Change, Socket } from "../../deps/socket.ts";
-import { push, PushOptions, RetryError } from "./push.ts";
-import { Result } from "../../rest/util.ts";
+import { push, PushError, PushOptions } from "./push.ts";
 
 export interface PinOptions extends PushOptions {
   /** ピン留め対象のページが存在しないときの振る舞いを変えるoption
@@ -22,7 +22,7 @@ export const pin = (
   project: string,
   title: string,
   options?: PinOptions,
-): Promise<Result<string, RetryError>> =>
+): Promise<Result<string, PushError>> =>
   push(
     project,
     title,
@@ -51,7 +51,7 @@ export const unpin = (
   project: string,
   title: string,
   options: UnPinOptions,
-): Promise<Result<string, RetryError>> =>
+): Promise<Result<string, PushError>> =>
   push(
     project,
     title,