Merge pull request #46 from takker99/fix-types

🐛 rest/mod.tsはdeno.windowでも使えるようにする

Author: takker99

browser/websocket/patch.ts

@@ -3,7 +3,7 @@ import { connect, disconnect } from "./socket.ts";
 import { getProjectId, getUserId } from "./id.ts";
 import { makeChanges } from "./makeChanges.ts";
 import { HeadData, pull } from "./pull.ts";
-import type { Line } from "../../deps/scrapbox.ts";
+import type { Line } from "../../deps/scrapbox-rest.ts";
 import { pushCommit, pushWithRetry } from "./_fetch.ts";
 
 export interface PatchOptions {

browser/websocket/pull.ts

@@ -1,4 +1,4 @@
-import type { Line } from "../../deps/scrapbox.ts";
+import type { Line } from "../../deps/scrapbox-rest.ts";
 import { getPage } from "../../rest/pages.ts";
 
 export interface HeadData {

deps/scrapbox-rest.ts

@@ -0,0 +1,24 @@
+export type {
+  BadRequestError,
+  BaseLine as Line,
+  ErrorLike,
+  ExportedData,
+  GuestUser,
+  ImportedData,
+  InvalidURLError,
+  MemberProject,
+  MemberUser,
+  NoQueryError,
+  NotFoundError,
+  NotLoggedInError,
+  NotMemberError,
+  NotMemberProject,
+  NotPrivilegeError,
+  Page,
+  PageList,
+  ProjectSearchResult,
+  SearchedTitle,
+  SearchResult,
+  SessionError,
+  TweetInfo,
+} from "https://raw.githubusercontent.com/scrapbox-jp/types/0.3.3/rest.ts";

deps/scrapbox.ts

@@ -1,28 +1,5 @@
 export type {
-  BadRequestError,
-  BaseLine as Line,
-  ErrorLike,
-  ExportedData,
-  GuestUser,
-  ImportedData,
-  InvalidURLError,
-  MemberProject,
-  MemberUser,
-  NoQueryError,
-  NotFoundError,
-  NotLoggedInError,
-  NotMemberError,
-  NotMemberProject,
-  NotPrivilegeError,
-  Page,
-  PageList,
-  ProjectSearchResult,
-  SearchedTitle,
-  SearchResult,
-  SessionError,
-  TweetInfo,
-} from "https://raw.githubusercontent.com/scrapbox-jp/types/0.3.3/rest.ts";
-export type {
+  Line,
   Scrapbox,
 } from "https://raw.githubusercontent.com/scrapbox-jp/types/0.3.3/userscript.ts";
 export type {

is.ts

@@ -1,4 +1,4 @@
-import type { ErrorLike } from "./deps/scrapbox.ts";
+import type { ErrorLike } from "./deps/scrapbox-rest.ts";
 // These code are based on https://deno.land/x/unknownutil@v1.1.0/is.ts
 
 export const isNone = (value: unknown): value is undefined | null =>

rest/getGyazoToken.ts

@@ -1,4 +1,4 @@
-import type { NotLoggedInError } from "../deps/scrapbox.ts";
+import type { NotLoggedInError } from "../deps/scrapbox-rest.ts";
 import { cookie } from "./auth.ts";
 import { UnexpectedResponseError } from "./error.ts";
 import { tryToErrorLike } from "../is.ts";

rest/getTweetInfo.ts

@@ -3,7 +3,7 @@ import type {
   InvalidURLError,
   SessionError,
   TweetInfo,
-} from "../deps/scrapbox.ts";
+} from "../deps/scrapbox-rest.ts";
 import { cookie, getCSRFToken } from "./auth.ts";
 import { UnexpectedResponseError } from "./error.ts";
 import { tryToErrorLike } from "../is.ts";

rest/getWebPageTitle.ts

@@ -2,7 +2,7 @@ import type {
   BadRequestError,
   InvalidURLError,
   SessionError,
-} from "../deps/scrapbox.ts";
+} from "../deps/scrapbox-rest.ts";
 import { cookie, getCSRFToken } from "./auth.ts";
 import { UnexpectedResponseError } from "./error.ts";
 import { tryToErrorLike } from "../is.ts";

rest/link.ts

@@ -3,7 +3,7 @@ import type {
   NotFoundError,
   NotLoggedInError,
   SearchedTitle,
-} from "../deps/scrapbox.ts";
+} from "../deps/scrapbox-rest.ts";
 import { cookie } from "./auth.ts";
 import { UnexpectedResponseError } from "./error.ts";
 import { tryToErrorLike } from "../is.ts";

rest/page-data.ts

@@ -5,7 +5,7 @@ import type {
   NotFoundError,
   NotLoggedInError,
   NotPrivilegeError,
-} from "../deps/scrapbox.ts";
+} from "../deps/scrapbox-rest.ts";
 import { cookie, getCSRFToken } from "./auth.ts";
 import { UnexpectedResponseError } from "./error.ts";
 import { tryToErrorLike } from "../is.ts";