diff --git a/src/1.6.8/generateAuthURI.ts b/src/1.6.8/generateAuthURI.ts index 094131e..1d8b122 100644 --- a/src/1.6.8/generateAuthURI.ts +++ b/src/1.6.8/generateAuthURI.ts @@ -1,4 +1,4 @@ -import type { generateAuthURIOptions } from "1.6.8/types/auth"; +import type { generateAuthURIOptions } from "./types/auth"; import { v4 as uuidv4 } from "uuid"; /** ユーザー認可によるトークン取得のURIを生成します。 */ diff --git a/src/1.6.8/map.d.ts b/src/1.6.8/map.d.ts index f7db136..7b2f5ca 100644 --- a/src/1.6.8/map.d.ts +++ b/src/1.6.8/map.d.ts @@ -1,2 +1,2 @@ -import { ApiMap } from "1.6.8/types/api/map"; +import { ApiMap } from "./types/api/map"; export default ApiMap; \ No newline at end of file diff --git a/src/1.6.8/types/api/admin/reports/index.d.ts b/src/1.6.8/types/api/admin/reports/index.d.ts index e77588c..c049c10 100644 --- a/src/1.6.8/types/api/admin/reports/index.d.ts +++ b/src/1.6.8/types/api/admin/reports/index.d.ts @@ -1,6 +1,6 @@ -import InputError from "1.6.8/types/modules/error/input"; -import AuthError from "1.6.8/types/modules/error/auth"; -import Page from "1.6.8/types/modules/page"; +import InputError from "../../../modules/error/input"; +import AuthError from "../../../modules/error/auth"; +import Page from "../../../modules/page"; export default interface AdminReports { "admin/reports/": { diff --git a/src/1.6.8/types/api/admin/reports/resolve.d.ts b/src/1.6.8/types/api/admin/reports/resolve.d.ts index 9d7d385..3cd8907 100644 --- a/src/1.6.8/types/api/admin/reports/resolve.d.ts +++ b/src/1.6.8/types/api/admin/reports/resolve.d.ts @@ -1,5 +1,5 @@ -import InputError from "1.6.8/types/modules/error/input"; -import AuthError from "1.6.8/types/modules/error/auth"; +import InputError from "../../../modules/error/input"; +import AuthError from "../../../modules/error/auth"; export default interface AdminReportsResolve { "admin/reports/resolve": { diff --git a/src/1.6.8/types/api/admin/users/index.d.ts b/src/1.6.8/types/api/admin/users/index.d.ts index 742f941..5179cd8 100644 --- a/src/1.6.8/types/api/admin/users/index.d.ts +++ b/src/1.6.8/types/api/admin/users/index.d.ts @@ -1,4 +1,4 @@ -import { UserResponse } from "1.6.8/types/api/users"; +import { UserResponse } from "../../../api/users"; export default interface AdminUsers { "admin/users/": { diff --git a/src/1.6.8/types/api/admin/users/sanction.d.ts b/src/1.6.8/types/api/admin/users/sanction.d.ts index d642b9c..2c7533f 100644 --- a/src/1.6.8/types/api/admin/users/sanction.d.ts +++ b/src/1.6.8/types/api/admin/users/sanction.d.ts @@ -1,6 +1,6 @@ -import InputError from "1.6.8/types/modules/error/input"; -import AuthError from "1.6.8/types/modules/error/auth"; -import { UserDataNotFound } from "1.6.8/types/modules/error/critical"; +import InputError from "../../../modules/error/input"; +import AuthError from "../../../modules/error/auth"; +import { UserDataNotFound } from "../../../modules/error/critical"; interface RequestBase { /** 対象のユーザーID */ diff --git a/src/1.6.8/types/api/favorite/change.d.ts b/src/1.6.8/types/api/favorite/change.d.ts index dc5f122..bcc92cd 100644 --- a/src/1.6.8/types/api/favorite/change.d.ts +++ b/src/1.6.8/types/api/favorite/change.d.ts @@ -1,5 +1,5 @@ -import InputError from "1.6.8/types/modules/error/input"; -import AuthError from "1.6.8/types/modules/error/auth"; +import InputError from "../../modules/error/input"; +import AuthError from "../../modules/error/auth"; export default interface FavoriteChange { "favorite/change": { diff --git a/src/1.6.8/types/api/favorite/get.d.ts b/src/1.6.8/types/api/favorite/get.d.ts index 4929fcd..f663e74 100644 --- a/src/1.6.8/types/api/favorite/get.d.ts +++ b/src/1.6.8/types/api/favorite/get.d.ts @@ -1,5 +1,5 @@ -import InputError from "1.6.8/types/modules/error/input"; -import AuthError from "1.6.8/types/modules/error/auth"; +import InputError from "../../modules/error/input"; +import AuthError from "../../modules/error/auth"; export default interface FavoriteGet { "favorite/get": { diff --git a/src/1.6.8/types/api/map.d.ts b/src/1.6.8/types/api/map.d.ts index 23c6008..7432b17 100644 --- a/src/1.6.8/types/api/map.d.ts +++ b/src/1.6.8/types/api/map.d.ts @@ -1,11 +1,11 @@ -import ServerInfo from "1.6.8/types/api/serverinfo-api"; -import Users from "1.6.8/types/api/users"; -import UsersFollow from "1.6.8/types/api/users/follow"; -import Me from "1.6.8/types/api/me"; -import MeNotification from "1.6.8/types/api/me/notification"; -import MeNotificationRead from "1.6.8/types/api/me/notification/read"; -import MeSettings from "1.6.8/types/api/me/settings"; -import Ueuse from "1.6.8/types/api/ueuse"; +import ServerInfo from "./serverinfo-api"; +import Users from "./users"; +import UsersFollow from "./users/follow"; +import Me from "./me"; +import MeNotification from "./me/notification"; +import MeNotificationRead from "./me/notification/read"; +import MeSettings from "./me/settings"; +import Ueuse from "./ueuse"; export type ApiMap = & ServerInfo diff --git a/src/1.6.8/types/api/me/index.d.ts b/src/1.6.8/types/api/me/index.d.ts index ed92876..0bf9bc8 100644 --- a/src/1.6.8/types/api/me/index.d.ts +++ b/src/1.6.8/types/api/me/index.d.ts @@ -1,4 +1,4 @@ -import { UserResponse } from "1.6.8/types/api/users"; +import { UserResponse } from "../../api/users"; export default interface Me { "me/": { diff --git a/src/1.6.8/types/api/me/notification/index.d.ts b/src/1.6.8/types/api/me/notification/index.d.ts index 7276fe4..025ea00 100644 --- a/src/1.6.8/types/api/me/notification/index.d.ts +++ b/src/1.6.8/types/api/me/notification/index.d.ts @@ -1,6 +1,6 @@ -import InputError from "1.6.8/types/modules/error/input"; -import AuthError from "1.6.8/types/modules/error/auth"; -import Page from "1.6.8/types/modules/page"; +import InputError from "../../../modules/error/input"; +import AuthError from "../../../modules/error/auth"; +import Page from "../../../modules/page"; export default interface MeNotification { "me/notification/": { diff --git a/src/1.6.8/types/api/me/notification/read.d.ts b/src/1.6.8/types/api/me/notification/read.d.ts index 37ae60b..ac9e3bf 100644 --- a/src/1.6.8/types/api/me/notification/read.d.ts +++ b/src/1.6.8/types/api/me/notification/read.d.ts @@ -1,6 +1,6 @@ -import InputError from "1.6.8/types/modules/error/input"; -import AuthError from "1.6.8/types/modules/error/auth"; -import UpdateError from "1.6.8/types/modules/error/update"; +import InputError from "../../../modules/error/input"; +import AuthError from "../../../modules/error/auth"; +import UpdateError from "../../../modules/error/update"; export default interface MeNotificationRead { "me/notification/read": { diff --git a/src/1.6.8/types/api/me/settings.d.ts b/src/1.6.8/types/api/me/settings.d.ts index afdccc9..0d28163 100644 --- a/src/1.6.8/types/api/me/settings.d.ts +++ b/src/1.6.8/types/api/me/settings.d.ts @@ -1,7 +1,7 @@ -import InputError from "1.6.8/types/modules/error/input"; -import AuthError from "1.6.8/types/modules/error/auth"; -import UpdateError from "1.6.8/types/modules/error/update"; -import { Upload1Error, Upload2Error, UploadCommonError } from "1.6.8/types/modules/error/upload"; +import InputError from "../../modules/error/input"; +import AuthError from "../../modules/error/auth"; +import UpdateError from "../../modules/error/update"; +import { Upload1Error, Upload2Error, UploadCommonError } from "../../modules/error/upload"; type AtLeastOne = { [K in keyof T]: Required> & Partial> diff --git a/src/1.6.8/types/api/token/get.d.ts b/src/1.6.8/types/api/token/get.d.ts index a038af5..5ed189e 100644 --- a/src/1.6.8/types/api/token/get.d.ts +++ b/src/1.6.8/types/api/token/get.d.ts @@ -1,5 +1,5 @@ -import InputError from "1.6.8/types/modules/error/input"; -import { UserDataNotFound } from "1.6.8/types/modules/error/critical"; +import InputError from "../../modules/error/input"; +import { UserDataNotFound } from "../../modules/error/critical"; export default interface TokenGet { "ueuse/get": { diff --git a/src/1.6.8/types/api/ueuse/bookmark/index.d.ts b/src/1.6.8/types/api/ueuse/bookmark/index.d.ts index 23c8b60..0755dce 100644 --- a/src/1.6.8/types/api/ueuse/bookmark/index.d.ts +++ b/src/1.6.8/types/api/ueuse/bookmark/index.d.ts @@ -1,8 +1,8 @@ -import InputError from "1.6.8/types/modules/error/input"; -import AuthError from "1.6.8/types/modules/error/auth"; -import { ueuseModule } from "1.6.8/types/modules/ueuse"; -import ueuseError from "1.6.8/types/modules/error/ueuse"; -import Page from "1.6.8/types/modules/page"; +import InputError from "../../../modules/error/input"; +import AuthError from "../../../modules/error/auth"; +import { ueuseModule } from "../../../modules/ueuse"; +import ueuseError from "../../../modules/error/ueuse"; +import Page from "../../../modules/page"; export default interface UeuseBookmark { "ueuse/bookmark/": { diff --git a/src/1.6.8/types/api/ueuse/create.d.ts b/src/1.6.8/types/api/ueuse/create.d.ts index d425e0e..0d1f10c 100644 --- a/src/1.6.8/types/api/ueuse/create.d.ts +++ b/src/1.6.8/types/api/ueuse/create.d.ts @@ -1,6 +1,6 @@ -import InputError from "1.6.8/types/modules/error/input"; -import AuthError from "1.6.8/types/modules/error/auth"; -import { Media } from "1.6.8/types/modules/ueuse"; +import InputError from "../../modules/error/input"; +import AuthError from "../../modules/error/auth"; +import { Media } from "../../modules/ueuse"; export default interface UeuseCreate { "ueuse/get": { diff --git a/src/1.6.8/types/api/ueuse/delete.d.ts b/src/1.6.8/types/api/ueuse/delete.d.ts index d03d0ba..ca83430 100644 --- a/src/1.6.8/types/api/ueuse/delete.d.ts +++ b/src/1.6.8/types/api/ueuse/delete.d.ts @@ -1,5 +1,5 @@ -import InputError from "1.6.8/types/modules/error/input"; -import AuthError from "1.6.8/types/modules/error/auth"; +import InputError from "../../modules/error/input"; +import AuthError from "../../modules/error/auth"; interface ResponseBase { /** 成功かどうか */ diff --git a/src/1.6.8/types/api/ueuse/get.d.ts b/src/1.6.8/types/api/ueuse/get.d.ts index 44e1339..0c74030 100644 --- a/src/1.6.8/types/api/ueuse/get.d.ts +++ b/src/1.6.8/types/api/ueuse/get.d.ts @@ -1,7 +1,7 @@ -import InputError from "1.6.8/types/modules/error/input"; -import AuthError from "1.6.8/types/modules/error/auth"; -import { ueuseModule } from "1.6.8/types/modules/ueuse"; -import ueuseError from "1.6.8/types/modules/error/ueuse"; +import InputError from "../../modules/error/input"; +import AuthError from "../../modules/error/auth"; +import { ueuseModule } from "../../modules/ueuse"; +import ueuseError from "../../modules/error/ueuse"; export default interface UeuseGet { "ueuse/get": { diff --git a/src/1.6.8/types/api/ueuse/index.d.ts b/src/1.6.8/types/api/ueuse/index.d.ts index fdb1b16..f02d782 100644 --- a/src/1.6.8/types/api/ueuse/index.d.ts +++ b/src/1.6.8/types/api/ueuse/index.d.ts @@ -1,8 +1,8 @@ -import InputError from "1.6.8/types/modules/error/input"; -import AuthError from "1.6.8/types/modules/error/auth"; -import { ueuseModule } from "1.6.8/types/modules/ueuse"; -import ueuseError from "1.6.8/types/modules/error/ueuse"; -import Page from "1.6.8/types/modules/page"; +import InputError from "../../modules/error/input"; +import AuthError from "../../modules/error/auth"; +import { ueuseModule } from "../../modules/ueuse"; +import ueuseError from "../../modules/error/ueuse"; +import Page from "../../modules/page"; export default interface Ueuse { "ueuse/": { diff --git a/src/1.6.8/types/api/ueuse/mentions.d.ts b/src/1.6.8/types/api/ueuse/mentions.d.ts index 805046d..e0ec484 100644 --- a/src/1.6.8/types/api/ueuse/mentions.d.ts +++ b/src/1.6.8/types/api/ueuse/mentions.d.ts @@ -1,8 +1,8 @@ -import InputError from "1.6.8/types/modules/error/input"; -import AuthError from "1.6.8/types/modules/error/auth"; -import { ueuseModule } from "1.6.8/types/modules/ueuse"; -import ueuseError from "1.6.8/types/modules/error/ueuse"; -import Page from "1.6.8/types/modules/page"; +import InputError from "../../modules/error/input"; +import AuthError from "../../modules/error/auth"; +import { ueuseModule } from "../../modules/ueuse"; +import ueuseError from "../../modules/error/ueuse"; +import Page from "../../modules/page"; export default interface UeuseMentions { "ueuse/mentions": { diff --git a/src/1.6.8/types/api/ueuse/replies.d.ts b/src/1.6.8/types/api/ueuse/replies.d.ts index 74c4ac1..536371b 100644 --- a/src/1.6.8/types/api/ueuse/replies.d.ts +++ b/src/1.6.8/types/api/ueuse/replies.d.ts @@ -1,8 +1,8 @@ -import InputError from "1.6.8/types/modules/error/input"; -import AuthError from "1.6.8/types/modules/error/auth"; -import { ueuseModule } from "1.6.8/types/modules/ueuse"; -import ueuseError from "1.6.8/types/modules/error/ueuse"; -import Page from "1.6.8/types/modules/page"; +import InputError from "../../modules/error/input"; +import AuthError from "../../modules/error/auth"; +import { ueuseModule } from "../../modules/ueuse"; +import ueuseError from "../../modules/error/ueuse"; +import Page from "../../modules/page"; export default interface UeuseReplies { "ueuse/replies": { diff --git a/src/1.6.8/types/api/ueuse/search.d.ts b/src/1.6.8/types/api/ueuse/search.d.ts index 0b2b938..d77da9d 100644 --- a/src/1.6.8/types/api/ueuse/search.d.ts +++ b/src/1.6.8/types/api/ueuse/search.d.ts @@ -1,8 +1,8 @@ -import InputError from "1.6.8/types/modules/error/input"; -import AuthError from "1.6.8/types/modules/error/auth"; -import { ueuseModule } from "1.6.8/types/modules/ueuse"; -import ueuseError from "1.6.8/types/modules/error/ueuse"; -import Page from "1.6.8/types/modules/page"; +import InputError from "../../modules/error/input"; +import AuthError from "../../modules/error/auth"; +import { ueuseModule } from "../../modules/ueuse"; +import ueuseError from "../../modules/error/ueuse"; +import Page from "../../modules/page"; export default interface UeuseSearch { "ueuse/search": { diff --git a/src/1.6.8/types/api/users/follow.d.ts b/src/1.6.8/types/api/users/follow.d.ts index d8fff6e..2224cea 100644 --- a/src/1.6.8/types/api/users/follow.d.ts +++ b/src/1.6.8/types/api/users/follow.d.ts @@ -1,8 +1,8 @@ -import InputError from "1.6.8/types/modules/error/input"; -import AuthError from "1.6.8/types/modules/error/auth"; -import UpdateError, { CouldNotComplete } from "1.6.8/types/modules/error/update"; -import ToYouNotAllowed from "1.6.8/types/modules/error/follow"; -import { UserDataNotFound } from "1.6.8/types/modules/error/critical"; +import InputError from "../../modules/error/input"; +import AuthError from "../../modules/error/auth"; +import UpdateError, { CouldNotComplete } from "../../modules/error/update"; +import ToYouNotAllowed from "../../modules/error/follow"; +import { UserDataNotFound } from "../../modules/error/critical"; interface Follow { body: { diff --git a/src/1.6.8/types/api/users/index.d.ts b/src/1.6.8/types/api/users/index.d.ts index 2ea3422..d256ec4 100644 --- a/src/1.6.8/types/api/users/index.d.ts +++ b/src/1.6.8/types/api/users/index.d.ts @@ -1,7 +1,7 @@ -import Role from "1.6.8/types/modules/role"; -import InputError from "1.6.8/types/modules/error/input"; -import AuthError from "1.6.8/types/modules/error/auth"; -import { UserDataNotFound } from "1.6.8/types/modules/error/critical"; +import Role from "../../modules/role"; +import InputError from "../../modules/error/input"; +import AuthError from "../../modules/error/auth"; +import { UserDataNotFound } from "../../modules/error/critical"; export type UserResponse = { /** 成功かどうか */ diff --git a/src/index.ts b/src/index.ts index 17f947c..201475c 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,5 +1,5 @@ -import uwuzuError from "@/lib/error"; -import uwuzuFetch from "@/lib/fetch"; +import uwuzuError from "./lib/error"; +import uwuzuFetch from "./lib/fetch"; interface sdkOptions { /** uwuzuサーバーのorigin */ diff --git a/src/lib/fetch.ts b/src/lib/fetch.ts index 3870b84..8aaa95b 100644 --- a/src/lib/fetch.ts +++ b/src/lib/fetch.ts @@ -1,4 +1,4 @@ -import uwuzuError from "@/lib/error"; +import uwuzuError from "./error"; export function generateURL( origin: string, diff --git a/tsconfig.json b/tsconfig.json index 9a70e2d..ae934d2 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -17,10 +17,6 @@ "typeRoots": [ "./node_modules/@types", ], - "paths": { - "@/*": ["./*"], - "1.6.8/*": ["./1.6.8/*"], - }, }, "tsc-alias": { "resolveFullPaths": true,