e621 3.0.3 → 3.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +52 -0
- package/dist/browser/e621.d.ts +2 -0
- package/dist/browser/e621.js +19289 -0
- package/dist/browser/e621.js.map +7 -0
- package/dist/lib/Debug.browser.d.ts +6 -0
- package/dist/lib/Debug.browser.js +8 -0
- package/dist/lib/client.d.ts +59 -0
- package/dist/lib/client.js +72 -0
- package/dist/lib/errors.d.ts +3 -3
- package/dist/lib/errors.js +6 -2
- package/dist/lib/generated/client/client.js +105 -124
- package/dist/lib/generated/client/types.d.ts +6 -3
- package/dist/lib/generated/client/utils.d.ts +7 -3
- package/dist/lib/generated/client/utils.js +4 -4
- package/dist/lib/generated/core/params.js +5 -5
- package/dist/lib/generated/core/serverSentEvents.d.ts +1 -1
- package/dist/lib/generated/core/serverSentEvents.js +4 -5
- package/dist/lib/generated/schemas.d.ts +1192 -219
- package/dist/lib/generated/schemas.js +1780 -483
- package/dist/lib/generated/sdk.d.ts +612 -380
- package/dist/lib/generated/sdk.js +895 -546
- package/dist/lib/generated/types.d.ts +6241 -4549
- package/dist/lib/index.d.ts +2 -43
- package/dist/lib/index.js +5 -61
- package/dist/lib/models/Appeal.d.ts +48 -0
- package/dist/lib/models/Appeal.js +74 -0
- package/dist/lib/models/Artist.d.ts +15 -18
- package/dist/lib/models/Artist.js +24 -27
- package/dist/lib/models/AvoidPosting.d.ts +11 -15
- package/dist/lib/models/AvoidPosting.js +21 -25
- package/dist/lib/models/Base.browser.d.ts +14 -0
- package/dist/lib/models/Base.browser.js +22 -0
- package/dist/lib/models/BasicPost.d.ts +14 -0
- package/dist/lib/models/BasicPost.js +17 -0
- package/dist/lib/models/Blip.d.ts +19 -24
- package/dist/lib/models/Blip.js +30 -35
- package/dist/lib/models/BulkUpdateRequest.d.ts +9 -12
- package/dist/lib/models/BulkUpdateRequest.js +18 -21
- package/dist/lib/models/Comment.d.ts +25 -32
- package/dist/lib/models/Comment.js +39 -46
- package/dist/lib/models/CommentVote.d.ts +47 -0
- package/dist/lib/models/CommentVote.js +74 -0
- package/dist/lib/models/CurrentUser.d.ts +33 -1
- package/dist/lib/models/CurrentUser.js +54 -3
- package/dist/lib/models/DMail.d.ts +15 -9
- package/dist/lib/models/DMail.js +27 -13
- package/dist/lib/models/DbExport.d.ts +14 -0
- package/dist/lib/models/DbExport.js +17 -0
- package/dist/lib/models/EmailBlacklist.d.ts +2 -3
- package/dist/lib/models/EmailBlacklist.js +4 -5
- package/dist/lib/models/ExceptionLog.d.ts +14 -0
- package/dist/lib/models/ExceptionLog.js +17 -0
- package/dist/lib/models/ExtendedPost.d.ts +14 -0
- package/dist/lib/models/ExtendedPost.js +17 -0
- package/dist/lib/models/ForumPost.d.ts +37 -34
- package/dist/lib/models/ForumPost.js +57 -47
- package/dist/lib/models/ForumPostVote.d.ts +2 -3
- package/dist/lib/models/ForumPostVote.js +5 -6
- package/dist/lib/models/ForumTopic.d.ts +20 -26
- package/dist/lib/models/ForumTopic.js +33 -39
- package/dist/lib/models/HelpPage.d.ts +37 -0
- package/dist/lib/models/HelpPage.js +55 -0
- package/dist/lib/models/IpBan.d.ts +2 -3
- package/dist/lib/models/IpBan.js +4 -5
- package/dist/lib/models/Mascot.d.ts +6 -8
- package/dist/lib/models/Mascot.js +10 -12
- package/dist/lib/models/MinimalUser.d.ts +14 -0
- package/dist/lib/models/MinimalUser.js +17 -0
- package/dist/lib/models/NewsUpdate.d.ts +6 -8
- package/dist/lib/models/NewsUpdate.js +10 -12
- package/dist/lib/models/Note.d.ts +9 -12
- package/dist/lib/models/Note.js +18 -21
- package/dist/lib/models/NoteVersion.d.ts +2 -3
- package/dist/lib/models/NoteVersion.js +4 -5
- package/dist/lib/models/Pool.d.ts +15 -20
- package/dist/lib/models/Pool.js +28 -33
- package/dist/lib/models/PoolVersion.d.ts +2 -3
- package/dist/lib/models/PoolVersion.js +4 -5
- package/dist/lib/models/Post.d.ts +5 -174
- package/dist/lib/models/Post.js +8 -294
- package/dist/lib/models/PostApproval.d.ts +2 -3
- package/dist/lib/models/PostApproval.js +4 -5
- package/dist/lib/models/PostFlag.d.ts +4 -6
- package/dist/lib/models/PostFlag.js +8 -10
- package/dist/lib/models/PostReplacement.d.ts +10 -15
- package/dist/lib/models/PostReplacement.js +16 -21
- package/dist/lib/models/PostSet.d.ts +15 -20
- package/dist/lib/models/PostSet.js +26 -31
- package/dist/lib/models/PostVersion.d.ts +8 -12
- package/dist/lib/models/PostVersion.js +13 -17
- package/dist/lib/models/PostVote.d.ts +6 -9
- package/dist/lib/models/PostVote.js +11 -14
- package/dist/lib/models/SearchTrendBlacklist.d.ts +23 -0
- package/dist/lib/models/SearchTrendBlacklist.js +41 -3
- package/dist/lib/models/StaffFile.d.ts +37 -0
- package/dist/lib/models/StaffFile.js +55 -0
- package/dist/lib/models/StaffNote.d.ts +10 -13
- package/dist/lib/models/StaffNote.js +19 -22
- package/dist/lib/models/StaffWiki.d.ts +59 -0
- package/dist/lib/models/StaffWiki.js +93 -0
- package/dist/lib/models/StaffWikiVersion.d.ts +14 -0
- package/dist/lib/models/StaffWikiVersion.js +17 -0
- package/dist/lib/models/Tag.d.ts +16 -20
- package/dist/lib/models/Tag.js +28 -32
- package/dist/lib/models/TagAlias.d.ts +11 -14
- package/dist/lib/models/TagAlias.js +20 -23
- package/dist/lib/models/TagImplication.d.ts +11 -14
- package/dist/lib/models/TagImplication.js +20 -23
- package/dist/lib/models/Takedown.d.ts +18 -24
- package/dist/lib/models/Takedown.js +27 -33
- package/dist/lib/models/ThumbnailPost.d.ts +14 -0
- package/dist/lib/models/ThumbnailPost.js +17 -0
- package/dist/lib/models/Ticket.d.ts +11 -14
- package/dist/lib/models/Ticket.js +20 -23
- package/dist/lib/models/UploadWhitelist.d.ts +6 -8
- package/dist/lib/models/UploadWhitelist.js +10 -12
- package/dist/lib/models/User.d.ts +27 -23
- package/dist/lib/models/User.js +43 -31
- package/dist/lib/models/UserFeedback.d.ts +11 -15
- package/dist/lib/models/UserFeedback.js +21 -25
- package/dist/lib/models/UserNameChangeRequest.d.ts +2 -3
- package/dist/lib/models/UserNameChangeRequest.js +4 -5
- package/dist/lib/models/WikiPage.d.ts +11 -14
- package/dist/lib/models/WikiPage.js +20 -23
- package/dist/lib/models/WikiPageVersion.d.ts +2 -3
- package/dist/lib/models/WikiPageVersion.js +4 -5
- package/dist/lib/models/index.d.ts +12 -1
- package/dist/lib/models/index.js +13 -2
- package/dist/lib/models/posts/Actions.d.ts +279 -0
- package/dist/lib/models/posts/Actions.js +476 -0
- package/dist/lib/modules/Appeals.d.ts +69 -0
- package/dist/lib/modules/Appeals.js +125 -0
- package/dist/lib/modules/ArtistUrls.d.ts +5 -5
- package/dist/lib/modules/ArtistUrls.js +7 -7
- package/dist/lib/modules/ArtistVersions.d.ts +5 -5
- package/dist/lib/modules/ArtistVersions.js +7 -7
- package/dist/lib/modules/Artists.d.ts +31 -36
- package/dist/lib/modules/Artists.js +53 -58
- package/dist/lib/modules/AvoidPostingVersions.d.ts +5 -5
- package/dist/lib/modules/AvoidPostingVersions.js +7 -7
- package/dist/lib/modules/AvoidPostings.d.ts +29 -55
- package/dist/lib/modules/AvoidPostings.js +51 -75
- package/dist/lib/modules/Bans.d.ts +7 -8
- package/dist/lib/modules/Bans.js +11 -12
- package/dist/lib/modules/Base.d.ts +15 -4
- package/dist/lib/modules/Base.js +15 -4
- package/dist/lib/modules/Blips.d.ts +34 -41
- package/dist/lib/modules/Blips.js +59 -64
- package/dist/lib/modules/BulkUpdateRequests.d.ts +25 -30
- package/dist/lib/modules/BulkUpdateRequests.js +47 -52
- package/dist/lib/modules/CommentVotes.d.ts +45 -6
- package/dist/lib/modules/CommentVotes.js +75 -12
- package/dist/lib/modules/Comments.d.ts +34 -43
- package/dist/lib/modules/Comments.js +57 -66
- package/dist/lib/modules/DMails.d.ts +25 -20
- package/dist/lib/modules/DMails.js +37 -32
- package/dist/lib/modules/DText.d.ts +6 -6
- package/dist/lib/modules/DText.js +7 -7
- package/dist/lib/modules/DbExports.d.ts +13 -0
- package/dist/lib/modules/DbExports.js +27 -0
- package/dist/lib/modules/EditHistories.d.ts +8 -9
- package/dist/lib/modules/EditHistories.js +11 -12
- package/dist/lib/modules/EmailBlacklists.d.ts +10 -12
- package/dist/lib/modules/EmailBlacklists.js +16 -18
- package/dist/lib/modules/Favorites.d.ts +15 -17
- package/dist/lib/modules/Favorites.js +20 -20
- package/dist/lib/modules/ForumPostVotes.d.ts +40 -0
- package/dist/lib/modules/ForumPostVotes.js +71 -0
- package/dist/lib/modules/ForumPosts.d.ts +32 -41
- package/dist/lib/modules/ForumPosts.js +55 -64
- package/dist/lib/modules/ForumTopics.d.ts +36 -50
- package/dist/lib/modules/ForumTopics.js +61 -84
- package/dist/lib/modules/Health.d.ts +12 -0
- package/dist/lib/modules/Health.js +26 -0
- package/dist/lib/modules/HelpPages.d.ts +27 -26
- package/dist/lib/modules/HelpPages.js +58 -47
- package/dist/lib/modules/IpBans.d.ts +10 -12
- package/dist/lib/modules/IpBans.js +16 -18
- package/dist/lib/modules/IqdbQueries.d.ts +14 -14
- package/dist/lib/modules/IqdbQueries.js +25 -18
- package/dist/lib/modules/Mascots.d.ts +19 -22
- package/dist/lib/modules/Mascots.js +33 -36
- package/dist/lib/modules/ModActions.d.ts +7 -8
- package/dist/lib/modules/ModActions.js +11 -12
- package/dist/lib/modules/NewsUpdates.d.ts +19 -22
- package/dist/lib/modules/NewsUpdates.js +35 -38
- package/dist/lib/modules/NoteVersions.d.ts +5 -5
- package/dist/lib/modules/NoteVersions.js +7 -7
- package/dist/lib/modules/Notes.d.ts +24 -29
- package/dist/lib/modules/Notes.js +45 -50
- package/dist/lib/modules/PoolVersions.d.ts +5 -5
- package/dist/lib/modules/PoolVersions.js +7 -7
- package/dist/lib/modules/Pools.d.ts +33 -41
- package/dist/lib/modules/Pools.js +58 -66
- package/dist/lib/modules/Popular.d.ts +7 -7
- package/dist/lib/modules/Popular.js +13 -11
- package/dist/lib/modules/PostApprovals.d.ts +9 -11
- package/dist/lib/modules/PostApprovals.js +15 -17
- package/dist/lib/modules/PostDisapprovals.d.ts +11 -9
- package/dist/lib/modules/PostDisapprovals.js +12 -13
- package/dist/lib/modules/PostEvents.d.ts +5 -5
- package/dist/lib/modules/PostEvents.js +13 -9
- package/dist/lib/modules/PostFlags.d.ts +26 -15
- package/dist/lib/modules/PostFlags.js +42 -23
- package/dist/lib/modules/PostReplacements.d.ts +20 -26
- package/dist/lib/modules/PostReplacements.js +36 -38
- package/dist/lib/modules/PostSets.d.ts +34 -42
- package/dist/lib/modules/PostSets.js +60 -68
- package/dist/lib/modules/PostVersions.d.ts +11 -14
- package/dist/lib/modules/PostVersions.js +19 -22
- package/dist/lib/modules/PostVotes.d.ts +33 -12
- package/dist/lib/modules/PostVotes.js +56 -17
- package/dist/lib/modules/Posts.d.ts +130 -70
- package/dist/lib/modules/Posts.js +215 -115
- package/dist/lib/modules/RelatedTags.d.ts +7 -7
- package/dist/lib/modules/RelatedTags.js +7 -7
- package/dist/lib/modules/SearchTrendBlacklists.d.ts +11 -28
- package/dist/lib/modules/SearchTrendBlacklists.js +15 -40
- package/dist/lib/modules/SearchTrends.d.ts +30 -19
- package/dist/lib/modules/SearchTrends.js +41 -22
- package/dist/lib/modules/StaffAutomodDMails.d.ts +55 -0
- package/dist/lib/modules/StaffAutomodDMails.js +98 -0
- package/dist/lib/modules/{users/DMails.d.ts → StaffDMails.d.ts} +8 -9
- package/dist/lib/modules/StaffDMails.js +54 -0
- package/dist/lib/modules/StaffExceptionLogs.d.ts +33 -0
- package/dist/lib/modules/StaffExceptionLogs.js +54 -0
- package/dist/lib/modules/StaffFiles.d.ts +72 -0
- package/dist/lib/modules/StaffFiles.js +121 -0
- package/dist/lib/modules/StaffNotes.d.ts +26 -31
- package/dist/lib/modules/StaffNotes.js +47 -52
- package/dist/lib/modules/StaffUserCleanups.d.ts +60 -0
- package/dist/lib/modules/StaffUserCleanups.js +124 -0
- package/dist/lib/modules/StaffUsers.d.ts +43 -0
- package/dist/lib/modules/StaffUsers.js +75 -0
- package/dist/lib/modules/StaffVoteTrends.d.ts +26 -0
- package/dist/lib/modules/StaffVoteTrends.js +39 -0
- package/dist/lib/modules/StaffWikiVersions.d.ts +33 -0
- package/dist/lib/modules/StaffWikiVersions.js +54 -0
- package/dist/lib/modules/StaffWikis.d.ts +94 -0
- package/dist/lib/modules/StaffWikis.js +165 -0
- package/dist/lib/modules/TagAliases.d.ts +26 -31
- package/dist/lib/modules/TagAliases.js +47 -52
- package/dist/lib/modules/TagCorrections.d.ts +6 -7
- package/dist/lib/modules/TagCorrections.js +12 -13
- package/dist/lib/modules/TagImplications.d.ts +26 -31
- package/dist/lib/modules/TagImplications.js +47 -52
- package/dist/lib/modules/TagTypeVersions.d.ts +5 -5
- package/dist/lib/modules/TagTypeVersions.js +7 -7
- package/dist/lib/modules/Tags.d.ts +23 -27
- package/dist/lib/modules/Tags.js +42 -46
- package/dist/lib/modules/Takedowns.d.ts +37 -45
- package/dist/lib/modules/Takedowns.js +59 -67
- package/dist/lib/modules/Tickets.d.ts +24 -28
- package/dist/lib/modules/Tickets.js +44 -48
- package/dist/lib/modules/UploadWhitelists.d.ts +21 -25
- package/dist/lib/modules/UploadWhitelists.js +37 -41
- package/dist/lib/modules/Uploads.d.ts +11 -13
- package/dist/lib/modules/Uploads.js +16 -18
- package/dist/lib/modules/UserFeedbacks.d.ts +28 -34
- package/dist/lib/modules/UserFeedbacks.js +52 -58
- package/dist/lib/modules/UserNameChangeRequests.d.ts +12 -15
- package/dist/lib/modules/UserNameChangeRequests.js +20 -23
- package/dist/lib/modules/Users.d.ts +56 -40
- package/dist/lib/modules/Users.js +91 -63
- package/dist/lib/modules/WikiPageVersions.d.ts +7 -8
- package/dist/lib/modules/WikiPageVersions.js +11 -12
- package/dist/lib/modules/WikiPages.d.ts +26 -31
- package/dist/lib/modules/WikiPages.js +47 -52
- package/dist/lib/modules/index.d.ts +39 -10
- package/dist/lib/modules/index.js +27 -5
- package/dist/lib/modules/posts/Format.d.ts +27 -0
- package/dist/lib/modules/posts/Format.js +17 -0
- package/dist/lib/standalone.d.ts +20 -0
- package/dist/lib/standalone.js +17 -0
- package/dist/lib/util.js +4 -10
- package/dist/lib/version.d.ts +2 -0
- package/dist/lib/version.js +3 -0
- package/package.json +34 -10
- package/tsconfig.json +2 -2
- package/dist/lib/generated/source.json +0 -19075
- package/dist/lib/models/Help.d.ts +0 -39
- package/dist/lib/models/Help.js +0 -57
- package/dist/lib/modules/admin/Users.d.ts +0 -45
- package/dist/lib/modules/admin/Users.js +0 -77
- package/dist/lib/modules/comments/Votes.d.ts +0 -31
- package/dist/lib/modules/comments/Votes.js +0 -51
- package/dist/lib/modules/forum_posts/Votes.d.ts +0 -29
- package/dist/lib/modules/forum_posts/Votes.js +0 -51
- package/dist/lib/modules/posts/Flag.d.ts +0 -16
- package/dist/lib/modules/posts/Flag.js +0 -31
- package/dist/lib/modules/posts/Votes.d.ts +0 -31
- package/dist/lib/modules/posts/Votes.js +0 -51
- package/dist/lib/modules/users/DMails.js +0 -55
- package/dist/package.json +0 -73
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Browser build of {@link Debug}. `debug`/`persistent-debug` are Node-only optional dependencies whose
|
|
3
|
+
* dynamic imports break browser bundlers (see #15), so this no-op variant is swapped in via
|
|
4
|
+
* package.json's `browser` field.
|
|
5
|
+
*/
|
|
6
|
+
export default function Debug(_namespace: string, _formatter: unknown, ..._args: Array<unknown>): void;
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Browser build of {@link Debug}. `debug`/`persistent-debug` are Node-only optional dependencies whose
|
|
3
|
+
* dynamic imports break browser bundlers (see #15), so this no-op variant is swapped in via
|
|
4
|
+
* package.json's `browser` field.
|
|
5
|
+
*/
|
|
6
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function
|
|
7
|
+
export default function Debug(_namespace, _formatter, ..._args) { }
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVidWcuYnJvd3Nlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi9EZWJ1Zy5icm93c2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7O0dBSUc7QUFDSCxtR0FBbUc7QUFDbkcsTUFBTSxDQUFDLE9BQU8sVUFBVSxLQUFLLENBQUMsVUFBa0IsRUFBRSxVQUFtQixFQUFFLEdBQUcsS0FBcUIsSUFBUyxDQUFDIn0=
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import type { Client } from "./generated/client/types.js";
|
|
2
|
+
/** @category Main */
|
|
3
|
+
export interface Options {
|
|
4
|
+
/**
|
|
5
|
+
* The api key you want to authenticate with (Account -> Manage API Access)
|
|
6
|
+
* @default none
|
|
7
|
+
*/
|
|
8
|
+
authKey?: string;
|
|
9
|
+
/**
|
|
10
|
+
* The uername of the user you want to authenticate with
|
|
11
|
+
* @default none
|
|
12
|
+
*/
|
|
13
|
+
authUser?: string;
|
|
14
|
+
/**
|
|
15
|
+
* The base URL for the API.
|
|
16
|
+
* @default https://e621.net
|
|
17
|
+
*/
|
|
18
|
+
baseURL?: string;
|
|
19
|
+
/**
|
|
20
|
+
* The number of seconds before a request times out
|
|
21
|
+
* @default 30
|
|
22
|
+
*/
|
|
23
|
+
requestTimeout?: number;
|
|
24
|
+
/**
|
|
25
|
+
* The url to use for status checks.
|
|
26
|
+
* @default https://status.e621.church/json
|
|
27
|
+
*/
|
|
28
|
+
statusCheckURL?: string;
|
|
29
|
+
/**
|
|
30
|
+
* The user agent to use for requests
|
|
31
|
+
* @defaultWithoutAuthentication E621/\{version\} (+https://github.com/DonovanDMC/E621)
|
|
32
|
+
* @defaultWithAuthentication E621/\{version\} (+https://github.com/DonovanDMC/E621; \{authUser\})
|
|
33
|
+
*/
|
|
34
|
+
userAgent?: string;
|
|
35
|
+
}
|
|
36
|
+
/** @category Main */
|
|
37
|
+
export interface InstanceOptions {
|
|
38
|
+
authKey: string | null;
|
|
39
|
+
authUser: string | null;
|
|
40
|
+
baseURL: string;
|
|
41
|
+
requestTimeout: number;
|
|
42
|
+
statusCheckURL: string;
|
|
43
|
+
userAgent: string;
|
|
44
|
+
}
|
|
45
|
+
/** @category Main */
|
|
46
|
+
export interface E621ClientResult {
|
|
47
|
+
client: Client;
|
|
48
|
+
options: InstanceOptions;
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* Builds the generated API {@link Client} and resolved {@link InstanceOptions} used by the main {@link E621}
|
|
52
|
+
* class, handling auth header injection, the default user agent, and request/response {@link Debug} logging.
|
|
53
|
+
*
|
|
54
|
+
* Exposed standalone (see `e621/standalone`) so modules can be constructed directly, without the full
|
|
55
|
+
* {@link E621} client, when bundle size matters more than convenience.
|
|
56
|
+
*
|
|
57
|
+
* @category Main
|
|
58
|
+
*/
|
|
59
|
+
export declare function createE621Client(options?: Options): E621ClientResult;
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
import Debug from "./Debug.js";
|
|
2
|
+
import { createClient } from "./generated/client/client.js";
|
|
3
|
+
import { createConfig } from "./generated/client/utils.js";
|
|
4
|
+
import { VERSION } from "./version.js";
|
|
5
|
+
/**
|
|
6
|
+
* Builds the generated API {@link Client} and resolved {@link InstanceOptions} used by the main {@link E621}
|
|
7
|
+
* class, handling auth header injection, the default user agent, and request/response {@link Debug} logging.
|
|
8
|
+
*
|
|
9
|
+
* Exposed standalone (see `e621/standalone`) so modules can be constructed directly, without the full
|
|
10
|
+
* {@link E621} client, when bundle size matters more than convenience.
|
|
11
|
+
*
|
|
12
|
+
* @category Main
|
|
13
|
+
*/
|
|
14
|
+
export function createE621Client(options) {
|
|
15
|
+
const resolved = {
|
|
16
|
+
authKey: options?.authKey ?? null,
|
|
17
|
+
authUser: options?.authUser ?? null,
|
|
18
|
+
baseURL: options?.baseURL ?? "https://e621.net",
|
|
19
|
+
requestTimeout: options?.requestTimeout ?? 30,
|
|
20
|
+
statusCheckURL: options?.statusCheckURL ?? "https://status.e621.church/json",
|
|
21
|
+
userAgent: options?.userAgent ?? `E621/${VERSION} (https://github.com/DonovanDMC/E621${options?.authUser ? `; "${options.authUser}"` : ""})`,
|
|
22
|
+
};
|
|
23
|
+
let config;
|
|
24
|
+
const commonConfig = {
|
|
25
|
+
baseUrl: resolved.baseURL,
|
|
26
|
+
headers: {
|
|
27
|
+
"User-Agent": resolved.userAgent,
|
|
28
|
+
},
|
|
29
|
+
fetch: async (input, init) => {
|
|
30
|
+
let url = "unknown", method = "unknown";
|
|
31
|
+
// for some reason it doesn't seem to be inserting the Authorization header
|
|
32
|
+
if (input instanceof Request) {
|
|
33
|
+
url = input.url;
|
|
34
|
+
method = input.method.toLowerCase();
|
|
35
|
+
if (!input.headers.has("Auithorization") && resolved.authKey && resolved.authUser) {
|
|
36
|
+
input.headers.set("Authorization", `Basic ${btoa(`${resolved.authUser}:${resolved.authKey}`)}`);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
else if (init) {
|
|
40
|
+
url = input.toString();
|
|
41
|
+
method = init.method?.toLowerCase() ?? "get";
|
|
42
|
+
if (resolved.authKey && resolved.authUser) {
|
|
43
|
+
const headers = new Headers(init.headers);
|
|
44
|
+
if (!headers.has("Authorization")) {
|
|
45
|
+
headers.set("Authorization", `Basic ${btoa(`${resolved.authUser}:${resolved.authKey}`)}`);
|
|
46
|
+
}
|
|
47
|
+
init.headers = headers;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
Debug(`request:${method}`, `-> ${url}`);
|
|
51
|
+
const res = await fetch(input, init);
|
|
52
|
+
Debug(`response:${method}`, `<- ${url} ${res.status} ${res.statusText}`);
|
|
53
|
+
return res;
|
|
54
|
+
},
|
|
55
|
+
};
|
|
56
|
+
if (resolved.authKey && resolved.authUser) {
|
|
57
|
+
config = createConfig({
|
|
58
|
+
...commonConfig,
|
|
59
|
+
auth: (auth) => {
|
|
60
|
+
if (auth.scheme === "basic") {
|
|
61
|
+
return `${resolved.authUser}:${resolved.authKey}`;
|
|
62
|
+
}
|
|
63
|
+
return;
|
|
64
|
+
},
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
config = createConfig(commonConfig);
|
|
69
|
+
}
|
|
70
|
+
return { client: createClient(config), options: resolved };
|
|
71
|
+
}
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL2NsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssTUFBTSxZQUFZLENBQUM7QUFDL0IsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzVELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBdUR2Qzs7Ozs7Ozs7R0FRRztBQUNILE1BQU0sVUFBVSxnQkFBZ0IsQ0FBQyxPQUFpQjtJQUM5QyxNQUFNLFFBQVEsR0FBb0I7UUFDOUIsT0FBTyxFQUFFLE9BQU8sRUFBRSxPQUFPLElBQUksSUFBSTtRQUNqQyxRQUFRLEVBQUUsT0FBTyxFQUFFLFFBQVEsSUFBSSxJQUFJO1FBQ25DLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxJQUFJLGtCQUFrQjtRQUMvQyxjQUFjLEVBQUUsT0FBTyxFQUFFLGNBQWMsSUFBSSxFQUFFO1FBQzdDLGNBQWMsRUFBRSxPQUFPLEVBQUUsY0FBYyxJQUFJLGlDQUFpQztRQUM1RSxTQUFTLEVBQUUsT0FBTyxFQUFFLFNBQVMsSUFBSSxRQUFRLE9BQU8sdUNBQXVDLE9BQU8sRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDLE1BQU0sT0FBTyxDQUFDLFFBQVEsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEdBQUc7S0FDL0ksQ0FBQztJQUNGLElBQUksTUFBYyxDQUFDO0lBQ25CLE1BQU0sWUFBWSxHQUFnRDtRQUM5RCxPQUFPLEVBQUUsUUFBUSxDQUFDLE9BQU87UUFDekIsT0FBTyxFQUFFO1lBQ0wsWUFBWSxFQUFFLFFBQVEsQ0FBQyxTQUFTO1NBQ25DO1FBQ0QsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFxQixFQUFFO1lBQzVDLElBQUksR0FBRyxHQUFHLFNBQVMsRUFBRSxNQUFN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
|
package/dist/lib/errors.d.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
export declare class UnexpectedResponseError extends Error {
|
|
3
3
|
error: unknown;
|
|
4
4
|
name: string;
|
|
5
|
-
request
|
|
6
|
-
response
|
|
7
|
-
constructor(request: Request, response: Response, error: unknown);
|
|
5
|
+
request?: Request;
|
|
6
|
+
response?: Response;
|
|
7
|
+
constructor(request: Request | undefined, response: Response | undefined, error: unknown);
|
|
8
8
|
}
|
package/dist/lib/errors.js
CHANGED
|
@@ -5,7 +5,11 @@ export class UnexpectedResponseError extends Error {
|
|
|
5
5
|
request;
|
|
6
6
|
response;
|
|
7
7
|
constructor(request, response, error) {
|
|
8
|
-
let message =
|
|
8
|
+
let message = response
|
|
9
|
+
? `Unexpected ${response.status} ${response.statusText} on ${request?.method ?? "?"} ${request?.url ?? response.url}`
|
|
10
|
+
: request
|
|
11
|
+
? `Network error on ${request.method} ${request.url}`
|
|
12
|
+
: "Network error while building the request";
|
|
9
13
|
if (error) {
|
|
10
14
|
if (typeof error === "string")
|
|
11
15
|
message += `\n${error}`;
|
|
@@ -35,4 +39,4 @@ export class UnexpectedResponseError extends Error {
|
|
|
35
39
|
});
|
|
36
40
|
}
|
|
37
41
|
}
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL2Vycm9ycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1QkFBdUI7QUFDdkIsTUFBTSxPQUFPLHVCQUF3QixTQUFRLEtBQUs7SUFDOUMsS0FBSyxDQUFXO0lBQ1AsSUFBSSxHQUFHLHlCQUF5QixDQUFDO0lBQzFDLE9BQU8sQ0FBVztJQUNsQixRQUFRLENBQVk7SUFDcEIsWUFBWSxPQUE0QixFQUFFLFFBQThCLEVBQUUsS0FBYztRQUNwRixJQUFJLE9BQU8sR0FBRyxRQUFRO1lBQ2xCLENBQUMsQ0FBQyxjQUFjLFFBQVEsQ0FBQyxNQUFNLElBQUksUUFBUSxDQUFDLFVBQVUsT0FBTyxPQUFPLEVBQUUsTUFBTSxJQUFJLEdBQUcsSUFBSSxPQUFPLEVBQUUsR0FBRyxJQUFJLFFBQVEsQ0FBQyxHQUFHLEVBQUU7WUFDckgsQ0FBQyxDQUFDLE9BQU87Z0JBQ0wsQ0FBQyxDQUFDLG9CQUFvQixPQUFPLENBQUMsTUFBTSxJQUFJLE9BQU8sQ0FBQyxHQUFHLEVBQUU7Z0JBQ3JELENBQUMsQ0FBQywwQ0FBMEMsQ0FBQztRQUNyRCxJQUFJLEtBQUssRUFBRSxDQUFDO1lBQ1IsSUFBSSxPQUFPLEtBQUssS0FBSyxRQUFRO2dCQUFFLE9BQU8sSUFBSSxLQUFLLEtBQUssRUFBRSxDQUFDO2lCQUNsRCxJQUFJLEtBQUssWUFBWSxLQUFLO2dCQUFFLE9BQU8sSUFBSSxLQUFLLEtBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNqRSx1RUFBdUU7aUJBQ2xFLElBQUksT0FBTyxLQUFLLEtBQUssUUFBUSxJQUFJLEtBQUssS0FBSyxJQUFJLEVBQUUsQ0FBQztnQkFDbkQsSUFBSSxTQUFTLElBQUksS0FBSyxJQUFJLE9BQU8sS0FBSyxDQUFDLE9BQU8sS0FBSyxRQUFRO29CQUFFLE9BQU8sSUFBSSxLQUFLLEtBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQztxQkFDeEYsSUFBSSxPQUFPLElBQUksS0FBSyxJQUFJLE9BQU8sS0FBSyxDQUFDLEtBQUssS0FBSyxRQUFRO29CQUFFLE9BQU8sSUFBSSxLQUFLLEtBQUssQ0FBQyxLQUFLLEVBQUUsQ0FBQztxQkFDdkYsSUFBSSxRQUFRLElBQUksS0FBSyxJQUFJLE9BQU8sS0FBSyxDQUFDLE1BQU0sS0FBSyxRQUFRLElBQUksS0FBSyxDQUFDLE1BQU0sS0FBSyxJQUFJLEVBQUUsQ0FBQztvQkFDdEYsS0FBSyxNQUFNLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxJQUFJLE1BQU0sQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUM7d0JBQ3RELElBQUksT0FBTyxLQUFLLEtBQUssUUFBUTs0QkFBRSxPQUFPLElBQUksS0FBSyxHQUFHLEtBQUssS0FBSyxFQUFFLENBQUM7NkJBQzFELElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUM7NEJBQUUsT0FBTyxJQUFJLEtBQUssR0FBRyxLQUFLLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztvQkFDOUUsQ0FBQztnQkFDTCxDQUFDO1lBQ0wsQ0FBQztRQUNMLENBQUM7UUFDRCxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDZixNQUFNLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxFQUFFO1lBQzFCLE9BQU8sRUFBRSxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsVUFBVSxFQUFFLEtBQUssRUFBRTtZQUM5QyxRQUFRLEVBQUUsRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUFFLFVBQVUsRUFBRSxLQUFLLEVBQUU7WUFDaEQsS0FBSyxFQUFFLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxVQUFVLEVBQUUsS0FBSyxFQUFFO1NBQzdDLENBQUMsQ0FBQztJQUNQLENBQUM7Q0FDSiJ9
|
|
@@ -19,10 +19,7 @@ export const createClient = (config = {}) => {
|
|
|
19
19
|
serializedBody: undefined,
|
|
20
20
|
};
|
|
21
21
|
if (opts.security) {
|
|
22
|
-
await setAuthParams(
|
|
23
|
-
...opts,
|
|
24
|
-
security: opts.security,
|
|
25
|
-
});
|
|
22
|
+
await setAuthParams(opts);
|
|
26
23
|
}
|
|
27
24
|
if (opts.requestValidator) {
|
|
28
25
|
await opts.requestValidator(opts);
|
|
@@ -39,149 +36,134 @@ export const createClient = (config = {}) => {
|
|
|
39
36
|
return { opts: resolvedOpts, url };
|
|
40
37
|
};
|
|
41
38
|
const request = async (options) => {
|
|
42
|
-
const
|
|
43
|
-
const
|
|
44
|
-
|
|
45
|
-
...opts,
|
|
46
|
-
body: getValidRequestBody(opts),
|
|
47
|
-
};
|
|
48
|
-
let request = new Request(url, requestInit);
|
|
49
|
-
for (const fn of interceptors.request.fns) {
|
|
50
|
-
if (fn) {
|
|
51
|
-
request = await fn(request, opts);
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
// fetch must be assigned here, otherwise it would throw the error:
|
|
55
|
-
// TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
|
|
56
|
-
const _fetch = opts.fetch;
|
|
39
|
+
const throwOnError = options.throwOnError ?? _config.throwOnError;
|
|
40
|
+
const responseStyle = options.responseStyle ?? _config.responseStyle;
|
|
41
|
+
let request;
|
|
57
42
|
let response;
|
|
58
43
|
try {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
44
|
+
const { opts, url } = await beforeRequest(options);
|
|
45
|
+
const requestInit = {
|
|
46
|
+
redirect: 'follow',
|
|
47
|
+
...opts,
|
|
48
|
+
body: getValidRequestBody(opts),
|
|
49
|
+
};
|
|
50
|
+
request = new Request(url, requestInit);
|
|
51
|
+
for (const fn of interceptors.request.fns) {
|
|
65
52
|
if (fn) {
|
|
66
|
-
|
|
53
|
+
request = await fn(request, opts);
|
|
67
54
|
}
|
|
68
55
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
error: finalError,
|
|
78
|
-
request,
|
|
79
|
-
response: undefined,
|
|
80
|
-
};
|
|
81
|
-
}
|
|
82
|
-
for (const fn of interceptors.response.fns) {
|
|
83
|
-
if (fn) {
|
|
84
|
-
response = await fn(response, request, opts);
|
|
56
|
+
// fetch must be assigned here, otherwise it would throw the error:
|
|
57
|
+
// TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
|
|
58
|
+
const _fetch = opts.fetch;
|
|
59
|
+
response = await _fetch(request);
|
|
60
|
+
for (const fn of interceptors.response.fns) {
|
|
61
|
+
if (fn) {
|
|
62
|
+
response = await fn(response, request, opts);
|
|
63
|
+
}
|
|
85
64
|
}
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
65
|
+
const result = {
|
|
66
|
+
request,
|
|
67
|
+
response,
|
|
68
|
+
};
|
|
69
|
+
if (response.ok) {
|
|
70
|
+
const parseAs = (opts.parseAs === 'auto'
|
|
71
|
+
? getParseAs(response.headers.get('Content-Type'))
|
|
72
|
+
: opts.parseAs) ?? 'json';
|
|
73
|
+
if (response.status === 204 || response.headers.get('Content-Length') === '0') {
|
|
74
|
+
let emptyData;
|
|
75
|
+
switch (parseAs) {
|
|
76
|
+
case 'arrayBuffer':
|
|
77
|
+
case 'blob':
|
|
78
|
+
case 'text':
|
|
79
|
+
emptyData = await response[parseAs]();
|
|
80
|
+
break;
|
|
81
|
+
case 'formData':
|
|
82
|
+
emptyData = new FormData();
|
|
83
|
+
break;
|
|
84
|
+
case 'stream':
|
|
85
|
+
emptyData = response.body;
|
|
86
|
+
break;
|
|
87
|
+
case 'json':
|
|
88
|
+
default:
|
|
89
|
+
emptyData = {};
|
|
90
|
+
break;
|
|
91
|
+
}
|
|
92
|
+
return opts.responseStyle === 'data'
|
|
93
|
+
? emptyData
|
|
94
|
+
: {
|
|
95
|
+
data: emptyData,
|
|
96
|
+
...result,
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
let data;
|
|
97
100
|
switch (parseAs) {
|
|
98
101
|
case 'arrayBuffer':
|
|
99
102
|
case 'blob':
|
|
103
|
+
case 'formData':
|
|
100
104
|
case 'text':
|
|
101
|
-
|
|
105
|
+
data = await response[parseAs]();
|
|
102
106
|
break;
|
|
103
|
-
case '
|
|
104
|
-
|
|
107
|
+
case 'json': {
|
|
108
|
+
// Some servers return 200 with no Content-Length and empty body.
|
|
109
|
+
// response.json() would throw; read as text and parse if non-empty.
|
|
110
|
+
const text = await response.text();
|
|
111
|
+
data = text ? JSON.parse(text) : {};
|
|
105
112
|
break;
|
|
113
|
+
}
|
|
106
114
|
case 'stream':
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
115
|
+
return opts.responseStyle === 'data'
|
|
116
|
+
? response.body
|
|
117
|
+
: {
|
|
118
|
+
data: response.body,
|
|
119
|
+
...result,
|
|
120
|
+
};
|
|
121
|
+
}
|
|
122
|
+
if (parseAs === 'json') {
|
|
123
|
+
if (opts.responseValidator) {
|
|
124
|
+
await opts.responseValidator(data);
|
|
125
|
+
}
|
|
126
|
+
if (opts.responseTransformer) {
|
|
127
|
+
data = await opts.responseTransformer(data);
|
|
128
|
+
}
|
|
113
129
|
}
|
|
114
130
|
return opts.responseStyle === 'data'
|
|
115
|
-
?
|
|
131
|
+
? data
|
|
116
132
|
: {
|
|
117
|
-
data
|
|
133
|
+
data,
|
|
118
134
|
...result,
|
|
119
135
|
};
|
|
120
136
|
}
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
case 'formData':
|
|
126
|
-
case 'text':
|
|
127
|
-
data = await response[parseAs]();
|
|
128
|
-
break;
|
|
129
|
-
case 'json': {
|
|
130
|
-
// Some servers return 200 with no Content-Length and empty body.
|
|
131
|
-
// response.json() would throw; read as text and parse if non-empty.
|
|
132
|
-
const text = await response.text();
|
|
133
|
-
data = text ? JSON.parse(text) : {};
|
|
134
|
-
break;
|
|
135
|
-
}
|
|
136
|
-
case 'stream':
|
|
137
|
-
return opts.responseStyle === 'data'
|
|
138
|
-
? response.body
|
|
139
|
-
: {
|
|
140
|
-
data: response.body,
|
|
141
|
-
...result,
|
|
142
|
-
};
|
|
137
|
+
const textError = await response.text();
|
|
138
|
+
let jsonError;
|
|
139
|
+
try {
|
|
140
|
+
jsonError = JSON.parse(textError);
|
|
143
141
|
}
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
142
|
+
catch {
|
|
143
|
+
// noop
|
|
144
|
+
}
|
|
145
|
+
throw jsonError ?? textError;
|
|
146
|
+
}
|
|
147
|
+
catch (error) {
|
|
148
|
+
let finalError = error;
|
|
149
|
+
for (const fn of interceptors.error.fns) {
|
|
150
|
+
if (fn) {
|
|
151
|
+
finalError = await fn(finalError, response, request, options);
|
|
150
152
|
}
|
|
151
153
|
}
|
|
152
|
-
|
|
153
|
-
|
|
154
|
+
finalError = finalError || {};
|
|
155
|
+
if (throwOnError) {
|
|
156
|
+
throw finalError;
|
|
157
|
+
}
|
|
158
|
+
// TODO: we probably want to return error and improve types
|
|
159
|
+
return responseStyle === 'data'
|
|
160
|
+
? undefined
|
|
154
161
|
: {
|
|
155
|
-
|
|
156
|
-
|
|
162
|
+
error: finalError,
|
|
163
|
+
request,
|
|
164
|
+
response,
|
|
157
165
|
};
|
|
158
166
|
}
|
|
159
|
-
const textError = await response.text();
|
|
160
|
-
let jsonError;
|
|
161
|
-
try {
|
|
162
|
-
jsonError = JSON.parse(textError);
|
|
163
|
-
}
|
|
164
|
-
catch {
|
|
165
|
-
// noop
|
|
166
|
-
}
|
|
167
|
-
const error = jsonError ?? textError;
|
|
168
|
-
let finalError = error;
|
|
169
|
-
for (const fn of interceptors.error.fns) {
|
|
170
|
-
if (fn) {
|
|
171
|
-
finalError = (await fn(error, response, request, opts));
|
|
172
|
-
}
|
|
173
|
-
}
|
|
174
|
-
finalError = finalError || {};
|
|
175
|
-
if (opts.throwOnError) {
|
|
176
|
-
throw finalError;
|
|
177
|
-
}
|
|
178
|
-
// TODO: we probably want to return error and improve types
|
|
179
|
-
return opts.responseStyle === 'data'
|
|
180
|
-
? undefined
|
|
181
|
-
: {
|
|
182
|
-
error: finalError,
|
|
183
|
-
...result,
|
|
184
|
-
};
|
|
185
167
|
};
|
|
186
168
|
const makeMethodFn = (method) => (options) => request({ ...options, method });
|
|
187
169
|
const makeSseFn = (method) => async (options) => {
|
|
@@ -189,7 +171,6 @@ export const createClient = (config = {}) => {
|
|
|
189
171
|
return createSseClient({
|
|
190
172
|
...opts,
|
|
191
173
|
body: opts.body,
|
|
192
|
-
headers: opts.headers,
|
|
193
174
|
method,
|
|
194
175
|
onRequest: async (url, init) => {
|
|
195
176
|
let request = new Request(url, init);
|
|
@@ -233,4 +214,4 @@ export const createClient = (config = {}) => {
|
|
|
233
214
|
trace: makeMethodFn('TRACE'),
|
|
234
215
|
};
|
|
235
216
|
};
|
|
236
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
217
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../lib/generated/client/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,6 +63,7 @@ export interface RequestOptions<TData = unknown, TResponseStyle extends Response
|
|
|
63
63
|
url: Url;
|
|
64
64
|
}
|
|
65
65
|
export interface ResolvedRequestOptions<TResponseStyle extends ResponseStyle = 'fields', ThrowOnError extends boolean = boolean, Url extends string = string> extends RequestOptions<unknown, TResponseStyle, ThrowOnError, Url> {
|
|
66
|
+
headers: Headers;
|
|
66
67
|
serializedBody?: string;
|
|
67
68
|
}
|
|
68
69
|
export type RequestResult<TData = unknown, TError = unknown, ThrowOnError extends boolean = boolean, TResponseStyle extends ResponseStyle = 'fields'> = ThrowOnError extends true ? Promise<TResponseStyle extends 'data' ? TData extends Record<string, unknown> ? TData[keyof TData] : TData : {
|
|
@@ -76,8 +77,10 @@ export type RequestResult<TData = unknown, TError = unknown, ThrowOnError extend
|
|
|
76
77
|
data: undefined;
|
|
77
78
|
error: TError extends Record<string, unknown> ? TError[keyof TError] : TError;
|
|
78
79
|
}) & {
|
|
79
|
-
request
|
|
80
|
-
|
|
80
|
+
/** request may be undefined, because error may be from building the request object itself */
|
|
81
|
+
request?: Request;
|
|
82
|
+
/** response may be undefined, because error may be from building the request object itself or from a network error */
|
|
83
|
+
response?: Response;
|
|
81
84
|
}>;
|
|
82
85
|
export interface ClientOptions {
|
|
83
86
|
baseUrl?: string;
|
|
@@ -85,7 +88,7 @@ export interface ClientOptions {
|
|
|
85
88
|
throwOnError?: boolean;
|
|
86
89
|
}
|
|
87
90
|
type MethodFn = <TData = unknown, TError = unknown, ThrowOnError extends boolean = false, TResponseStyle extends ResponseStyle = 'fields'>(options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
|
|
88
|
-
type SseFn = <TData = unknown,
|
|
91
|
+
type SseFn = <TData = unknown, _TError = unknown, ThrowOnError extends boolean = false, TResponseStyle extends ResponseStyle = 'fields'>(options: Omit<RequestOptions<never, TResponseStyle, ThrowOnError>, 'method'>) => Promise<ServerSentEventsResult<TData>>;
|
|
89
92
|
type RequestFn = <TData = unknown, TError = unknown, ThrowOnError extends boolean = false, TResponseStyle extends ResponseStyle = 'fields'>(options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'> & Pick<Required<RequestOptions<TData, TResponseStyle, ThrowOnError>>, 'method'>) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
|
|
90
93
|
type BuildUrlFn = <TData extends {
|
|
91
94
|
body?: unknown;
|
|
@@ -5,13 +5,17 @@ export declare const createQuerySerializer: <T = unknown>({ parameters, ...args
|
|
|
5
5
|
* Infers parseAs value from provided Content-Type header.
|
|
6
6
|
*/
|
|
7
7
|
export declare const getParseAs: (contentType: string | null) => Exclude<Config["parseAs"], "auto">;
|
|
8
|
-
export declare
|
|
8
|
+
export declare function setAuthParams(options: Pick<RequestOptions, 'auth' | 'query' | 'security'> & {
|
|
9
9
|
headers: Headers;
|
|
10
|
-
})
|
|
10
|
+
}): Promise<void>;
|
|
11
11
|
export declare const buildUrl: Client['buildUrl'];
|
|
12
12
|
export declare const mergeConfigs: (a: Config, b: Config) => Config;
|
|
13
13
|
export declare const mergeHeaders: (...headers: Array<Required<Config>["headers"] | undefined>) => Headers;
|
|
14
|
-
type ErrInterceptor<Err, Res, Req, Options> = (error: Err,
|
|
14
|
+
type ErrInterceptor<Err, Res, Req, Options> = (error: Err,
|
|
15
|
+
/** response may be undefined due to a network error where no response object is produced */
|
|
16
|
+
response: Res | undefined,
|
|
17
|
+
/** request may be undefined, because error may be from building the request object itself */
|
|
18
|
+
request: Req | undefined, options: Options) => Err | Promise<Err>;
|
|
15
19
|
type ReqInterceptor<Req, Options> = (request: Req, options: Options) => Req | Promise<Req>;
|
|
16
20
|
type ResInterceptor<Res, Req, Options> = (response: Res, request: Req, options: Options) => Res | Promise<Res>;
|
|
17
21
|
declare class Interceptors<Interceptor> {
|
|
@@ -90,8 +90,8 @@ const checkForExistence = (options, name) => {
|
|
|
90
90
|
}
|
|
91
91
|
return false;
|
|
92
92
|
};
|
|
93
|
-
export
|
|
94
|
-
for (const auth of security) {
|
|
93
|
+
export async function setAuthParams(options) {
|
|
94
|
+
for (const auth of options.security ?? []) {
|
|
95
95
|
if (checkForExistence(options, auth.name)) {
|
|
96
96
|
continue;
|
|
97
97
|
}
|
|
@@ -116,7 +116,7 @@ export const setAuthParams = async ({ security, ...options }) => {
|
|
|
116
116
|
break;
|
|
117
117
|
}
|
|
118
118
|
}
|
|
119
|
-
}
|
|
119
|
+
}
|
|
120
120
|
export const buildUrl = (options) => getUrl({
|
|
121
121
|
baseUrl: options.baseUrl,
|
|
122
122
|
path: options.path,
|
|
@@ -226,4 +226,4 @@ export const createConfig = (override = {}) => ({
|
|
|
226
226
|
querySerializer: defaultQuerySerializer,
|
|
227
227
|
...override,
|
|
228
228
|
});
|
|
229
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
229
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../lib/generated/client/utils.ts"],"names":[],"mappings":"AAAA,qDAAqD;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG1C,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAc,EACjD,UAAU,GAAG,EAAE,EACf,GAAG,IAAI,KACmB,EAAE,EAAE,EAAE;IAChC,MAAM,eAAe,GAAG,CAAC,WAAc,EAAE,EAAE;QACzC,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,IAAI,WAAW,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;YACnD,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;gBAC/B,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;gBAEhC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;oBAC1C,SAAS;gBACX,CAAC;gBAED,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;gBAEzC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;oBACzB,MAAM,eAAe,GAAG,mBAAmB,CAAC;wBAC1C,aAAa,EAAE,OAAO,CAAC,aAAa;wBACpC,OAAO,EAAE,IAAI;wBACb,IAAI;wBACJ,KAAK,EAAE,MAAM;wBACb,KAAK;wBACL,GAAG,OAAO,CAAC,KAAK;qBACjB,CAAC,CAAC;oBACH,IAAI,eAAe;wBAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;gBACpD,CAAC;qBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;oBACrC,MAAM,gBAAgB,GAAG,oBAAoB,CAAC;wBAC5C,aAAa,EAAE,OAAO,CAAC,aAAa;wBACpC,OAAO,EAAE,IAAI;wBACb,IAAI;wBACJ,KAAK,EAAE,YAAY;wBACnB,KAAK,EAAE,KAAgC;wBACvC,GAAG,OAAO,CAAC,MAAM;qBAClB,CAAC,CAAC;oBACH,IAAI,gBAAgB;wBAAE,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;gBACtD,CAAC;qBAAM,CAAC;oBACN,MAAM,mBAAmB,GAAG,uBAAuB,CAAC;wBAClD,aAAa,EAAE,OAAO,CAAC,aAAa;wBACpC,IAAI;wBACJ,KAAK,EAAE,KAAe;qBACvB,CAAC,CAAC;oBACH,IAAI,mBAAmB;wBAAE,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;gBAC5D,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC,CAAC;IACF,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,WAA0B,EAAsC,EAAE;IAC3F,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,6FAA6F;QAC7F,wDAAwD;QACxD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;IAEvD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO;IACT,CAAC;IAED,IAAI,YAAY,CAAC,UAAU,CAAC,kBAAkB,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAClF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,YAAY,KAAK,qBAAqB,EAAE,CAAC;QAC3C,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,IACE,CAAC,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAC5F,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QACrC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO;AACT,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CACxB,OAEC,EACD,IAAa,EACJ,EAAE;IACX,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IACE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;QACzB,OAAO,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC;QACrB,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,GAAG,IAAI,GAAG,CAAC,EACnD,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAEC;IAED,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC;QAC1C,IAAI,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1C,SAAS;QACX,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAErD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,SAAS;QACX,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,eAAe,CAAC;QAE1C,QAAQ,IAAI,CAAC,EAAE,EAAE,CAAC;YAChB,KAAK,OAAO;gBACV,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;oBACnB,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC;gBACrB,CAAC;gBACD,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;gBAC5B,MAAM;YACR,KAAK,QAAQ;gBACX,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC,CAAC;gBACrD,MAAM;YACR,KAAK,QAAQ,CAAC;YACd;gBACE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACjC,MAAM;QACV,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,QAAQ,GAAuB,CAAC,OAAO,EAAE,EAAE,CACtD,MAAM,CAAC;IACL,OAAO,EAAE,OAAO,CAAC,OAAiB;IAClC,IAAI,EAAE,OAAO,CAAC,IAAI;IAClB,KAAK,EAAE,OAAO,CAAC,KAAK;IACpB,eAAe,EACb,OAAO,OAAO,CAAC,eAAe,KAAK,UAAU;QAC3C,CAAC,CAAC,OAAO,CAAC,eAAe;QACzB,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,eAAe,CAAC;IACpD,GAAG,EAAE,OAAO,CAAC,GAAG;CACjB,CAAC,CAAC;AAEL,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,CAAS,EAAE,CAAS,EAAU,EAAE;IAC3D,MAAM,MAAM,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;IAC9B,IAAI,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAClC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC1E,CAAC;IACD,MAAM,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;IACpD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,OAAgB,EAA2B,EAAE;IACnE,MAAM,OAAO,GAA4B,EAAE,CAAC;IAC5C,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QAC7B,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,GAAG,OAAuD,EACjD,EAAE;IACX,MAAM,aAAa,GAAG,IAAI,OAAO,EAAE,CAAC;IACpC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,SAAS;QACX,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,YAAY,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAE7F,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,QAAQ,EAAE,CAAC;YACpC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACnB,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC5B,CAAC;iBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBAChC,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;oBACtB,aAAa,CAAC,MAAM,CAAC,GAAG,EAAE,CAAW,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC;iBAAM,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC/B,sEAAsE;gBACtE,+DAA+D;gBAC/D,aAAa,CAAC,GAAG,CACf,GAAG,EACH,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAE,KAAgB,CACtE,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;AAmBF,MAAM,YAAY;IAChB,GAAG,GAA8B,EAAE,CAAC;IAEpC,KAAK;QACH,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,EAAwB;QAC5B,MAAM,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;QAC3C,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;QACzB,CAAC;IACH,CAAC;IAED,MAAM,CAAC,EAAwB;QAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;QAC3C,OAAO,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IAClC,CAAC;IAED,mBAAmB,CAAC,EAAwB;QAC1C,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,EAAwB,EAAE,EAAe;QAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;QAC3C,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;YACrB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,GAAG,CAAC,EAAe;QACjB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAClB,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;IAC7B,CAAC;CACF;AAQD,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAKhC,EAAE,CAAC,CAAC;IACJ,KAAK,EAAE,IAAI,YAAY,EAA0C;IACjE,OAAO,EAAE,IAAI,YAAY,EAAgC;IACzD,QAAQ,EAAE,IAAI,YAAY,EAAqC;CAChE,CAAC,CAAC;AAEH,MAAM,sBAAsB,GAAG,qBAAqB,CAAC;IACnD,aAAa,EAAE,KAAK;IACpB,KAAK,EAAE;QACL,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,MAAM;KACd;IACD,MAAM,EAAE;QACN,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,YAAY;KACpB;CACF,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG;IACrB,cAAc,EAAE,kBAAkB;CACnC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,WAAqD,EAAE,EACb,EAAE,CAAC,CAAC;IAC9C,GAAG,kBAAkB;IACrB,OAAO,EAAE,cAAc;IACvB,OAAO,EAAE,MAAM;IACf,eAAe,EAAE,sBAAsB;IACvC,GAAG,QAAQ;CACZ,CAAC,CAAC"}
|