From a4dd5e035837b122db164dce26a5ac1d407efdd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= Date: Fri, 27 Feb 2026 02:32:38 +0100 Subject: [PATCH] pl-api: reimport TypeObject, need to eep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nicole mikołajczyk --- packages/pl-api/lib/client/accounts.ts | 12 ++++++------ packages/pl-api/lib/client/admin.ts | 18 +++++++++--------- packages/pl-api/lib/client/announcements.ts | 9 ++++----- packages/pl-api/lib/client/antennas.ts | 11 +++++------ packages/pl-api/lib/client/apps.ts | 6 +++--- packages/pl-api/lib/client/async-refreshes.ts | 4 ++-- packages/pl-api/lib/client/chats.ts | 6 +++--- packages/pl-api/lib/client/circles.ts | 11 +++++------ packages/pl-api/lib/client/drive.ts | 9 ++++----- packages/pl-api/lib/client/emails.ts | 5 ++--- packages/pl-api/lib/client/events.ts | 6 +++--- packages/pl-api/lib/client/experimental.ts | 16 ++++++++-------- packages/pl-api/lib/client/filtering.ts | 11 +++++------ .../pl-api/lib/client/grouped-notifications.ts | 18 +++++++++--------- packages/pl-api/lib/client/instance.ts | 9 +++++---- .../pl-api/lib/client/interaction-requests.ts | 6 +++--- packages/pl-api/lib/client/lists.ts | 11 +++++------ packages/pl-api/lib/client/media.ts | 10 +++++----- packages/pl-api/lib/client/my-account.ts | 18 +++++++++--------- packages/pl-api/lib/client/notifications.ts | 10 +++++----- packages/pl-api/lib/client/oauth.ts | 10 +++++----- packages/pl-api/lib/client/oembed.ts | 2 +- packages/pl-api/lib/client/polls.ts | 4 ++-- .../pl-api/lib/client/push-notifications.ts | 9 ++++----- .../lib/client/rss-feed-subscriptions.ts | 9 ++++----- .../pl-api/lib/client/scheduled-statuses.ts | 9 ++++----- packages/pl-api/lib/client/search.ts | 9 +++++---- packages/pl-api/lib/client/settings.ts | 12 ++++++------ packages/pl-api/lib/client/shoutbox.ts | 9 +++++---- packages/pl-api/lib/client/statuses.ts | 12 ++++++------ packages/pl-api/lib/client/stories.ts | 11 +++++------ packages/pl-api/lib/client/streaming.ts | 7 ++++--- packages/pl-api/lib/client/subscriptions.ts | 6 +++--- packages/pl-api/lib/client/timelines.ts | 10 +++++----- packages/pl-api/lib/client/trends.ts | 9 +++++---- packages/pl-api/lib/client/utils.ts | 2 +- .../pl-api/lib/entities/admin/announcement.ts | 3 ++- packages/pl-api/lib/entities/admin/report.ts | 3 ++- packages/pl-api/lib/utils/domain.ts | 2 +- packages/pl-api/lib/utils/types.ts | 3 +++ packages/pl-api/tsconfig.json | 2 +- 41 files changed, 174 insertions(+), 175 deletions(-) create mode 100644 packages/pl-api/lib/utils/types.ts diff --git a/packages/pl-api/lib/client/accounts.ts b/packages/pl-api/lib/client/accounts.ts index 3c8b8808f..26385c742 100644 --- a/packages/pl-api/lib/client/accounts.ts +++ b/packages/pl-api/lib/client/accounts.ts @@ -11,12 +11,13 @@ import { reportSchema, scrobbleSchema, statusSchema, -} from '../entities'; -import { filteredArray } from '../entities/utils'; +} from '@/entities'; +import { filteredArray } from '@/entities/utils'; + import { ICESHRIMP_NET, PIXELFED, PLEROMA } from '../features'; import { type RequestMeta } from '../request'; -import type { PlApiBaseClient } from '../client-base'; +import type { PlApiBaseClient } from '@/client-base'; import type { CreateScrobbleParams, FollowAccountParams, @@ -31,9 +32,8 @@ import type { GetScrobblesParams, ReportAccountParams, SearchAccountParams, -} from '../params/accounts'; - -type EmptyObject = Record; +} from '@/params/accounts'; +import type { EmptyObject } from '@/utils/types'; const accounts = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/admin.ts b/packages/pl-api/lib/client/admin.ts index 66f101e75..88eb917b4 100644 --- a/packages/pl-api/lib/client/admin.ts +++ b/packages/pl-api/lib/client/admin.ts @@ -22,11 +22,13 @@ import { statusSchema, statusSourceSchema, trendsLinkSchema, -} from '../entities'; -import { filteredArray } from '../entities/utils'; +} from '@/entities'; +import { filteredArray } from '@/entities/utils'; + import { GOTOSOCIAL, MITRA, PLEROMA } from '../features'; -import type { PlApiBaseClient } from '../client-base'; +import type { PaginatedResponse } from '../responses'; +import type { PlApiBaseClient } from '@/client-base'; import type { AdminAccount, AdminAnnouncement, @@ -34,7 +36,7 @@ import type { AdminReport, PleromaConfig, Status, -} from '../entities'; +} from '@/entities'; import type { AdminAccountAction, AdminCreateAccountParams, @@ -66,11 +68,9 @@ import type { AdminUpdateReportParams, AdminUpdateRuleParams, AdminUpdateStatusParams, -} from '../params/admin'; -import type { EditStatusParams } from '../params/statuses'; -import type { PaginatedResponse } from '../responses'; - -type EmptyObject = Record; +} from '@/params/admin'; +import type { EditStatusParams } from '@/params/statuses'; +import type { EmptyObject } from '@/utils/types'; const paginatedPleromaAccounts = async ( client: PlApiBaseClient, diff --git a/packages/pl-api/lib/client/announcements.ts b/packages/pl-api/lib/client/announcements.ts index 71a07d0db..a5c55e32c 100644 --- a/packages/pl-api/lib/client/announcements.ts +++ b/packages/pl-api/lib/client/announcements.ts @@ -1,11 +1,10 @@ import * as v from 'valibot'; -import { announcementSchema } from '../entities'; -import { filteredArray } from '../entities/utils'; +import { announcementSchema } from '@/entities'; +import { filteredArray } from '@/entities/utils'; -import type { PlApiBaseClient } from '../client-base'; - -type EmptyObject = Record; +import type { PlApiBaseClient } from '@/client-base'; +import type { EmptyObject } from '@/utils/types'; const announcements = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/antennas.ts b/packages/pl-api/lib/client/antennas.ts index 26f88e763..d5d72f12e 100644 --- a/packages/pl-api/lib/client/antennas.ts +++ b/packages/pl-api/lib/client/antennas.ts @@ -1,12 +1,11 @@ import * as v from 'valibot'; -import { accountSchema, antennaSchema } from '../entities'; -import { filteredArray } from '../entities/utils'; +import { accountSchema, antennaSchema } from '@/entities'; +import { filteredArray } from '@/entities/utils'; -import type { PlApiBaseClient } from '../client-base'; -import type { CreateAntennaParams, UpdateAntennaParams } from '../params/antennas'; - -type EmptyObject = Record; +import type { PlApiBaseClient } from '@/client-base'; +import type { CreateAntennaParams, UpdateAntennaParams } from '@/params/antennas'; +import type { EmptyObject } from '@/utils/types'; const antennas = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/apps.ts b/packages/pl-api/lib/client/apps.ts index 1b48f336c..15cfe5866 100644 --- a/packages/pl-api/lib/client/apps.ts +++ b/packages/pl-api/lib/client/apps.ts @@ -1,9 +1,9 @@ import * as v from 'valibot'; -import { applicationSchema, credentialApplicationSchema } from '../entities'; +import { applicationSchema, credentialApplicationSchema } from '@/entities'; -import type { PlApiBaseClient } from '../client-base'; -import type { CreateApplicationParams } from '../params/apps'; +import type { PlApiBaseClient } from '@/client-base'; +import type { CreateApplicationParams } from '@/params/apps'; /** Register client applications that can be used to obtain OAuth tokens. */ const apps = (client: PlApiBaseClient) => ({ diff --git a/packages/pl-api/lib/client/async-refreshes.ts b/packages/pl-api/lib/client/async-refreshes.ts index 4d7b437ed..f15609aa1 100644 --- a/packages/pl-api/lib/client/async-refreshes.ts +++ b/packages/pl-api/lib/client/async-refreshes.ts @@ -1,8 +1,8 @@ import * as v from 'valibot'; -import { asyncRefreshSchema } from '../entities'; +import { asyncRefreshSchema } from '@/entities'; -import type { PlApiBaseClient } from '../client-base'; +import type { PlApiBaseClient } from '@/client-base'; /** Experimental async refreshes API methods */ const asyncRefreshes = (client: PlApiBaseClient) => ({ diff --git a/packages/pl-api/lib/client/chats.ts b/packages/pl-api/lib/client/chats.ts index 0b9081841..ba961a73a 100644 --- a/packages/pl-api/lib/client/chats.ts +++ b/packages/pl-api/lib/client/chats.ts @@ -1,13 +1,13 @@ import * as v from 'valibot'; -import { chatMessageSchema, chatSchema } from '../entities'; +import { chatMessageSchema, chatSchema } from '@/entities'; -import type { PlApiBaseClient } from '../client-base'; +import type { PlApiBaseClient } from '@/client-base'; import type { CreateChatMessageParams, GetChatMessagesParams, GetChatsParams, -} from '../params/chats'; +} from '@/params/chats'; /** @see {@link https://docs.pleroma.social/backend/development/API/chats} */ const chats = (client: PlApiBaseClient) => ({ diff --git a/packages/pl-api/lib/client/circles.ts b/packages/pl-api/lib/client/circles.ts index 000cd56df..7e9711422 100644 --- a/packages/pl-api/lib/client/circles.ts +++ b/packages/pl-api/lib/client/circles.ts @@ -1,12 +1,11 @@ import * as v from 'valibot'; -import { accountSchema, circleSchema, statusSchema } from '../entities'; -import { filteredArray } from '../entities/utils'; +import { accountSchema, circleSchema, statusSchema } from '@/entities'; +import { filteredArray } from '@/entities/utils'; -import type { PlApiBaseClient } from '../client-base'; -import type { GetCircleAccountsParams, GetCircleStatusesParams } from '../params/circles'; - -type EmptyObject = Record; +import type { PlApiBaseClient } from '@/client-base'; +import type { GetCircleAccountsParams, GetCircleStatusesParams } from '@/params/circles'; +import type { EmptyObject } from '@/utils/types'; const circles = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/drive.ts b/packages/pl-api/lib/client/drive.ts index 469561021..a410b6f56 100644 --- a/packages/pl-api/lib/client/drive.ts +++ b/packages/pl-api/lib/client/drive.ts @@ -1,11 +1,10 @@ import * as v from 'valibot'; -import { driveFileSchema, driveFolderSchema, driveStatusSchema } from '../entities'; +import { driveFileSchema, driveFolderSchema, driveStatusSchema } from '@/entities'; -import type { PlApiBaseClient } from '../client-base'; -import type { UpdateFileParams } from '../params/drive'; - -type EmptyObject = Record; +import type { PlApiBaseClient } from '@/client-base'; +import type { UpdateFileParams } from '@/params/drive'; +import type { EmptyObject } from '@/utils/types'; const drive = (client: PlApiBaseClient) => ({ getDrive: async () => { diff --git a/packages/pl-api/lib/client/emails.ts b/packages/pl-api/lib/client/emails.ts index 274af74e0..c61ec55d9 100644 --- a/packages/pl-api/lib/client/emails.ts +++ b/packages/pl-api/lib/client/emails.ts @@ -1,6 +1,5 @@ -import type { PlApiBaseClient } from '../client-base'; - -type EmptyObject = Record; +import type { PlApiBaseClient } from '@/client-base'; +import type { EmptyObject } from '@/utils/types'; const emails = (client: PlApiBaseClient) => ({ resendConfirmationEmail: async (email: string) => { diff --git a/packages/pl-api/lib/client/events.ts b/packages/pl-api/lib/client/events.ts index 846e9896f..ddb832416 100644 --- a/packages/pl-api/lib/client/events.ts +++ b/packages/pl-api/lib/client/events.ts @@ -1,15 +1,15 @@ import * as v from 'valibot'; -import { accountSchema, statusSchema } from '../entities'; +import { accountSchema, statusSchema } from '@/entities'; -import type { PlApiBaseClient } from '../client-base'; +import type { PlApiBaseClient } from '@/client-base'; import type { CreateEventParams, EditEventParams, GetEventParticipationRequestsParams, GetEventParticipationsParams, GetJoinedEventsParams, -} from '../params/events'; +} from '@/params/events'; const events = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/experimental.ts b/packages/pl-api/lib/client/experimental.ts index 728a7f32d..6b73d4915 100644 --- a/packages/pl-api/lib/client/experimental.ts +++ b/packages/pl-api/lib/client/experimental.ts @@ -6,22 +6,22 @@ import { groupRelationshipSchema, groupSchema, statusSchema, -} from '../entities'; -import { filteredArray } from '../entities/utils'; +} from '@/entities'; +import { filteredArray } from '@/entities/utils'; + import { PIXELFED } from '../features'; -import type { PlApiBaseClient } from '../client-base'; -import type { GroupRole } from '../entities'; -import type { AdminGetGroupsParams } from '../params/admin'; +import type { PlApiBaseClient } from '@/client-base'; +import type { GroupRole } from '@/entities'; +import type { AdminGetGroupsParams } from '@/params/admin'; import type { CreateGroupParams, GetGroupBlocksParams, GetGroupMembershipRequestsParams, GetGroupMembershipsParams, UpdateGroupParams, -} from '../params/groups'; - -type EmptyObject = Record; +} from '@/params/groups'; +import type { EmptyObject } from '@/utils/types'; /** Routes that are not part of any stable release */ const experimental = (client: PlApiBaseClient) => { diff --git a/packages/pl-api/lib/client/filtering.ts b/packages/pl-api/lib/client/filtering.ts index 5e8610521..11348a85d 100644 --- a/packages/pl-api/lib/client/filtering.ts +++ b/packages/pl-api/lib/client/filtering.ts @@ -7,10 +7,10 @@ import { filterStatusSchema, mutedAccountSchema, relationshipSchema, -} from '../entities'; -import { filteredArray } from '../entities/utils'; +} from '@/entities'; +import { filteredArray } from '@/entities/utils'; -import type { PlApiBaseClient } from '../client-base'; +import type { PlApiBaseClient } from '@/client-base'; import type { BlockAccountParams, CreateFilterParams, @@ -19,9 +19,8 @@ import type { GetMutesParams, MuteAccountParams, UpdateFilterParams, -} from '../params/filtering'; - -type EmptyObject = Record; +} from '@/params/filtering'; +import type { EmptyObject } from '@/utils/types'; const filtering = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/grouped-notifications.ts b/packages/pl-api/lib/client/grouped-notifications.ts index d10e10114..222abb8af 100644 --- a/packages/pl-api/lib/client/grouped-notifications.ts +++ b/packages/pl-api/lib/client/grouped-notifications.ts @@ -1,26 +1,26 @@ import * as v from 'valibot'; -import { accountSchema, groupedNotificationsResultsSchema } from '../entities'; -import { filteredArray } from '../entities/utils'; +import { accountSchema, groupedNotificationsResultsSchema } from '@/entities'; +import { filteredArray } from '@/entities/utils'; + import { type RequestMeta } from '../request'; import { pick, omit } from '../utils'; -import type { PlApiBaseClient } from '../client-base'; +import type { PaginatedResponse } from '../responses'; +import type { notifications } from './notifications'; +import type { PlApiBaseClient } from '@/client-base'; import type { Account, GroupedNotificationsResults, Notification, NotificationGroup, Status, -} from '../entities'; +} from '@/entities'; import type { GetGroupedNotificationsParams, GetUnreadNotificationGroupCountParams, -} from '../params/grouped-notifications'; -import type { PaginatedResponse } from '../responses'; -import type { notifications } from './notifications'; - -type EmptyObject = Record; +} from '@/params/grouped-notifications'; +import type { EmptyObject } from '@/utils/types'; const GROUPED_TYPES = [ 'favourite', diff --git a/packages/pl-api/lib/client/instance.ts b/packages/pl-api/lib/client/instance.ts index f83f9332f..92c039541 100644 --- a/packages/pl-api/lib/client/instance.ts +++ b/packages/pl-api/lib/client/instance.ts @@ -9,12 +9,13 @@ import { privacyPolicySchema, ruleSchema, termsOfServiceSchema, -} from '../entities'; -import { filteredArray } from '../entities/utils'; +} from '@/entities'; +import { filteredArray } from '@/entities/utils'; + import { AKKOMA, MITRA } from '../features'; -import type { PlApiBaseClient } from '../client-base'; -import type { ProfileDirectoryParams } from '../params/instance'; +import type { PlApiBaseClient } from '@/client-base'; +import type { ProfileDirectoryParams } from '@/params/instance'; const instance = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/interaction-requests.ts b/packages/pl-api/lib/client/interaction-requests.ts index 745900ce7..b541602d5 100644 --- a/packages/pl-api/lib/client/interaction-requests.ts +++ b/packages/pl-api/lib/client/interaction-requests.ts @@ -1,9 +1,9 @@ import * as v from 'valibot'; -import { interactionRequestSchema } from '../entities'; +import { interactionRequestSchema } from '@/entities'; -import type { PlApiBaseClient } from '../client-base'; -import type { GetInteractionRequestsParams } from '../params/interaction-requests'; +import type { PlApiBaseClient } from '@/client-base'; +import type { GetInteractionRequestsParams } from '@/params/interaction-requests'; const interactionRequests = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/lists.ts b/packages/pl-api/lib/client/lists.ts index 659df9647..17593a8ca 100644 --- a/packages/pl-api/lib/client/lists.ts +++ b/packages/pl-api/lib/client/lists.ts @@ -1,12 +1,11 @@ import * as v from 'valibot'; -import { accountSchema, listSchema } from '../entities'; -import { filteredArray } from '../entities/utils'; +import { accountSchema, listSchema } from '@/entities'; +import { filteredArray } from '@/entities/utils'; -import type { PlApiBaseClient } from '../client-base'; -import type { CreateListParams, GetListAccountsParams, UpdateListParams } from '../params/lists'; - -type EmptyObject = Record; +import type { PlApiBaseClient } from '@/client-base'; +import type { CreateListParams, GetListAccountsParams, UpdateListParams } from '@/params/lists'; +import type { EmptyObject } from '@/utils/types'; const lists = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/media.ts b/packages/pl-api/lib/client/media.ts index 40e2da133..b0ae466e6 100644 --- a/packages/pl-api/lib/client/media.ts +++ b/packages/pl-api/lib/client/media.ts @@ -1,12 +1,12 @@ import * as v from 'valibot'; -import { mediaAttachmentSchema } from '../entities'; +import { mediaAttachmentSchema } from '@/entities'; + import { type RequestMeta } from '../request'; -import type { PlApiBaseClient } from '../client-base'; -import type { UpdateMediaParams, UploadMediaParams } from '../params/media'; - -type EmptyObject = Record; +import type { PlApiBaseClient } from '@/client-base'; +import type { UpdateMediaParams, UploadMediaParams } from '@/params/media'; +import type { EmptyObject } from '@/utils/types'; const media = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/my-account.ts b/packages/pl-api/lib/client/my-account.ts index 9a09d2023..dd803a491 100644 --- a/packages/pl-api/lib/client/my-account.ts +++ b/packages/pl-api/lib/client/my-account.ts @@ -8,13 +8,16 @@ import { statusSchema, suggestionSchema, tagSchema, -} from '../entities'; -import { filteredArray } from '../entities/utils'; +} from '@/entities'; +import { filteredArray } from '@/entities/utils'; + import { GOTOSOCIAL, ICESHRIMP_NET, PIXELFED, PLEROMA } from '../features'; import { getNextLink, getPrevLink } from '../request'; -import type { PlApiBaseClient } from '../client-base'; -import type { Account } from '../entities'; +import type { PaginatedResponse } from '../responses'; +import type { accounts } from './accounts'; +import type { PlApiBaseClient } from '@/client-base'; +import type { Account } from '@/entities'; import type { CreateBookmarkFolderParams, GetBookmarksParams, @@ -23,11 +26,8 @@ import type { GetFollowRequestsParams, GetFollowedTagsParams, UpdateBookmarkFolderParams, -} from '../params/my-account'; -import type { PaginatedResponse } from '../responses'; -import type { accounts } from './accounts'; - -type EmptyObject = Record; +} from '@/params/my-account'; +import type { EmptyObject } from '@/utils/types'; const paginatedIceshrimpAccountsList = async ( client: PlApiBaseClient & { accounts: ReturnType }, diff --git a/packages/pl-api/lib/client/notifications.ts b/packages/pl-api/lib/client/notifications.ts index e511f7380..bae47f565 100644 --- a/packages/pl-api/lib/client/notifications.ts +++ b/packages/pl-api/lib/client/notifications.ts @@ -4,18 +4,18 @@ import { notificationPolicySchema, notificationRequestSchema, notificationSchema, -} from '../entities'; +} from '@/entities'; + import { type RequestMeta } from '../request'; -import type { PlApiBaseClient } from '../client-base'; +import type { PlApiBaseClient } from '@/client-base'; import type { GetNotificationParams, GetNotificationRequestsParams, GetUnreadNotificationCountParams, UpdateNotificationPolicyRequest, -} from '../params/notifications'; - -type EmptyObject = Record; +} from '@/params/notifications'; +import type { EmptyObject } from '@/utils/types'; const notifications = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/oauth.ts b/packages/pl-api/lib/client/oauth.ts index 4f998c1e3..2cb99c97a 100644 --- a/packages/pl-api/lib/client/oauth.ts +++ b/packages/pl-api/lib/client/oauth.ts @@ -1,17 +1,17 @@ import * as v from 'valibot'; -import { authorizationServerMetadataSchema, tokenSchema, userInfoSchema } from '../entities'; +import { authorizationServerMetadataSchema, tokenSchema, userInfoSchema } from '@/entities'; + import { ICESHRIMP_NET } from '../features'; -import type { PlApiBaseClient } from '../client-base'; +import type { PlApiBaseClient } from '@/client-base'; import type { GetTokenParams, MfaChallengeParams, OauthAuthorizeParams, RevokeTokenParams, -} from '../params/oauth'; - -type EmptyObject = Record; +} from '@/params/oauth'; +import type { EmptyObject } from '@/utils/types'; const oauth = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/oembed.ts b/packages/pl-api/lib/client/oembed.ts index feb73acb5..478afb043 100644 --- a/packages/pl-api/lib/client/oembed.ts +++ b/packages/pl-api/lib/client/oembed.ts @@ -1,6 +1,6 @@ import * as v from 'valibot'; -import type { PlApiBaseClient } from '../client-base'; +import type { PlApiBaseClient } from '@/client-base'; const oembed = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/polls.ts b/packages/pl-api/lib/client/polls.ts index 8f16b4e07..ba7f188f4 100644 --- a/packages/pl-api/lib/client/polls.ts +++ b/packages/pl-api/lib/client/polls.ts @@ -1,8 +1,8 @@ import * as v from 'valibot'; -import { pollSchema } from '../entities'; +import { pollSchema } from '@/entities'; -import type { PlApiBaseClient } from '../client-base'; +import type { PlApiBaseClient } from '@/client-base'; const polls = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/push-notifications.ts b/packages/pl-api/lib/client/push-notifications.ts index 4d0f24c37..8be1d2b05 100644 --- a/packages/pl-api/lib/client/push-notifications.ts +++ b/packages/pl-api/lib/client/push-notifications.ts @@ -1,14 +1,13 @@ import * as v from 'valibot'; -import { webPushSubscriptionSchema } from '../entities'; +import { webPushSubscriptionSchema } from '@/entities'; -import type { PlApiBaseClient } from '../client-base'; +import type { PlApiBaseClient } from '@/client-base'; import type { CreatePushNotificationsSubscriptionParams, UpdatePushNotificationsSubscriptionParams, -} from '../params/push-notifications'; - -type EmptyObject = Record; +} from '@/params/push-notifications'; +import type { EmptyObject } from '@/utils/types'; const pushNotifications = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/rss-feed-subscriptions.ts b/packages/pl-api/lib/client/rss-feed-subscriptions.ts index 9ff1754c1..29dd0f610 100644 --- a/packages/pl-api/lib/client/rss-feed-subscriptions.ts +++ b/packages/pl-api/lib/client/rss-feed-subscriptions.ts @@ -1,11 +1,10 @@ import * as v from 'valibot'; -import { rssFeedSchema } from '../entities'; -import { filteredArray } from '../entities/utils'; +import { rssFeedSchema } from '@/entities'; +import { filteredArray } from '@/entities/utils'; -import type { PlApiBaseClient } from '../client-base'; - -type EmptyObject = Record; +import type { PlApiBaseClient } from '@/client-base'; +import type { EmptyObject } from '@/utils/types'; const rssFeedSubscriptions = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/scheduled-statuses.ts b/packages/pl-api/lib/client/scheduled-statuses.ts index d0b43b785..3814d470c 100644 --- a/packages/pl-api/lib/client/scheduled-statuses.ts +++ b/packages/pl-api/lib/client/scheduled-statuses.ts @@ -1,11 +1,10 @@ import * as v from 'valibot'; -import { scheduledStatusSchema } from '../entities'; +import { scheduledStatusSchema } from '@/entities'; -import type { PlApiBaseClient } from '../client-base'; -import type { GetScheduledStatusesParams } from '../params/scheduled-statuses'; - -type EmptyObject = Record; +import type { PlApiBaseClient } from '@/client-base'; +import type { GetScheduledStatusesParams } from '@/params/scheduled-statuses'; +import type { EmptyObject } from '@/utils/types'; const scheduledStatuses = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/search.ts b/packages/pl-api/lib/client/search.ts index 49699b7a4..3b14a549a 100644 --- a/packages/pl-api/lib/client/search.ts +++ b/packages/pl-api/lib/client/search.ts @@ -1,11 +1,12 @@ import * as v from 'valibot'; -import { locationSchema, searchSchema } from '../entities'; -import { filteredArray } from '../entities/utils'; +import { locationSchema, searchSchema } from '@/entities'; +import { filteredArray } from '@/entities/utils'; + import { type RequestMeta } from '../request'; -import type { PlApiBaseClient } from '../client-base'; -import type { SearchParams } from '../params/search'; +import type { PlApiBaseClient } from '@/client-base'; +import type { SearchParams } from '@/params/search'; const search = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/settings.ts b/packages/pl-api/lib/client/settings.ts index ad5009d7b..b8a46a5df 100644 --- a/packages/pl-api/lib/client/settings.ts +++ b/packages/pl-api/lib/client/settings.ts @@ -6,19 +6,19 @@ import { interactionPoliciesSchema, oauthTokenSchema, tokenSchema, -} from '../entities'; -import { coerceObject, filteredArray } from '../entities/utils'; +} from '@/entities'; +import { coerceObject, filteredArray } from '@/entities/utils'; + import { GOTOSOCIAL, ICESHRIMP_NET, MITRA, PIXELFED } from '../features'; -import type { PlApiBaseClient } from '../client-base'; +import type { PlApiBaseClient } from '@/client-base'; import type { CreateAccountParams, UpdateCredentialsParams, UpdateInteractionPoliciesParams, UpdateNotificationSettingsParams, -} from '../params/settings'; - -type EmptyObject = Record; +} from '@/params/settings'; +import type { EmptyObject } from '@/utils/types'; const settings = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/shoutbox.ts b/packages/pl-api/lib/client/shoutbox.ts index dc5627988..c69a5af46 100644 --- a/packages/pl-api/lib/client/shoutbox.ts +++ b/packages/pl-api/lib/client/shoutbox.ts @@ -1,12 +1,13 @@ import { WebSocket } from 'isows'; import * as v from 'valibot'; -import { shoutMessageSchema } from '../entities'; -import { filteredArray } from '../entities/utils'; +import { shoutMessageSchema } from '@/entities'; +import { filteredArray } from '@/entities/utils'; + import { buildFullPath } from '../utils/url'; -import type { PlApiBaseClient } from '../client-base'; -import type { ShoutMessage } from '../entities'; +import type { PlApiBaseClient } from '@/client-base'; +import type { ShoutMessage } from '@/entities'; const shoutbox = (client: PlApiBaseClient) => ({ connect: ( diff --git a/packages/pl-api/lib/client/statuses.ts b/packages/pl-api/lib/client/statuses.ts index 505d21d55..88f4a5e73 100644 --- a/packages/pl-api/lib/client/statuses.ts +++ b/packages/pl-api/lib/client/statuses.ts @@ -11,12 +11,13 @@ import { statusSchema, statusSourceSchema, translationSchema, -} from '../entities'; -import { filteredArray } from '../entities/utils'; +} from '@/entities'; +import { filteredArray } from '@/entities/utils'; + import { AKKOMA, ICESHRIMP_NET, MITRA, PLEROMA } from '../features'; import { getAsyncRefreshHeader } from '../request'; -import type { PlApiBaseClient } from '../client-base'; +import type { PlApiBaseClient } from '@/client-base'; import type { CreateStatusParams, EditInteractionPolicyParams, @@ -29,9 +30,8 @@ import type { GetStatusQuotesParams, GetStatusReferencesParams, GetStatusesParams, -} from '../params/statuses'; - -type EmptyObject = Record; +} from '@/params/statuses'; +import type { EmptyObject } from '@/utils/types'; const statuses = (client: PlApiBaseClient) => { const category = { diff --git a/packages/pl-api/lib/client/stories.ts b/packages/pl-api/lib/client/stories.ts index eb5ae65ef..88e54dbfe 100644 --- a/packages/pl-api/lib/client/stories.ts +++ b/packages/pl-api/lib/client/stories.ts @@ -5,18 +5,17 @@ import { storyCarouselItemSchema, storyMediaSchema, storyProfileSchema, -} from '../entities'; -import { filteredArray } from '../entities/utils'; +} from '@/entities'; +import { filteredArray } from '@/entities/utils'; -import type { PlApiBaseClient } from '../client-base'; +import type { PlApiBaseClient } from '@/client-base'; import type { CreateStoryParams, CreateStoryPollParams, CropStoryPhotoParams, StoryReportType, -} from '../params/stories'; - -type EmptyObject = Record; +} from '@/params/stories'; +import type { EmptyObject } from '@/utils/types'; const stories = (client: PlApiBaseClient) => ({ getRecentStories: async () => { diff --git a/packages/pl-api/lib/client/streaming.ts b/packages/pl-api/lib/client/streaming.ts index 3c16c9e82..458240e4e 100644 --- a/packages/pl-api/lib/client/streaming.ts +++ b/packages/pl-api/lib/client/streaming.ts @@ -1,11 +1,12 @@ import { WebSocket } from 'isows'; import * as v from 'valibot'; -import { streamingEventSchema } from '../entities'; +import { streamingEventSchema } from '@/entities'; + import { buildFullPath } from '../utils/url'; -import type { PlApiBaseClient } from '../client-base'; -import type { StreamingEvent } from '../entities'; +import type { PlApiBaseClient } from '@/client-base'; +import type { StreamingEvent } from '@/entities'; const streaming = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/subscriptions.ts b/packages/pl-api/lib/client/subscriptions.ts index b2416da9d..d01ee4d50 100644 --- a/packages/pl-api/lib/client/subscriptions.ts +++ b/packages/pl-api/lib/client/subscriptions.ts @@ -5,10 +5,10 @@ import { subscriptionDetailsSchema, subscriptionInvoiceSchema, subscriptionOptionSchema, -} from '../entities'; -import { filteredArray } from '../entities/utils'; +} from '@/entities'; +import { filteredArray } from '@/entities/utils'; -import type { PlApiBaseClient } from '../client-base'; +import type { PlApiBaseClient } from '@/client-base'; const subscriptions = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/timelines.ts b/packages/pl-api/lib/client/timelines.ts index afc90c858..3102709c9 100644 --- a/packages/pl-api/lib/client/timelines.ts +++ b/packages/pl-api/lib/client/timelines.ts @@ -1,9 +1,10 @@ import * as v from 'valibot'; -import { conversationSchema, markersSchema, statusSchema } from '../entities'; +import { conversationSchema, markersSchema, statusSchema } from '@/entities'; + import { PIXELFED } from '../features'; -import type { PlApiBaseClient } from '../client-base'; +import type { PlApiBaseClient } from '@/client-base'; import type { AntennaTimelineParams, BubbleTimelineParams, @@ -16,9 +17,8 @@ import type { PublicTimelineParams, SaveMarkersParams, WrenchedTimelineParams, -} from '../params/timelines'; - -type EmptyObject = Record; +} from '@/params/timelines'; +import type { EmptyObject } from '@/utils/types'; const timelines = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/trends.ts b/packages/pl-api/lib/client/trends.ts index 24aa3cb76..303a6257c 100644 --- a/packages/pl-api/lib/client/trends.ts +++ b/packages/pl-api/lib/client/trends.ts @@ -1,11 +1,12 @@ import * as v from 'valibot'; -import { statusSchema, tagSchema, trendsLinkSchema } from '../entities'; -import { filteredArray } from '../entities/utils'; +import { statusSchema, tagSchema, trendsLinkSchema } from '@/entities'; +import { filteredArray } from '@/entities/utils'; + import { PIXELFED } from '../features'; -import type { PlApiBaseClient } from '../client-base'; -import type { GetTrendingLinks, GetTrendingStatuses, GetTrendingTags } from '../params/trends'; +import type { PlApiBaseClient } from '@/client-base'; +import type { GetTrendingLinks, GetTrendingStatuses, GetTrendingTags } from '@/params/trends'; const trends = (client: PlApiBaseClient) => ({ /** diff --git a/packages/pl-api/lib/client/utils.ts b/packages/pl-api/lib/client/utils.ts index c2ea8ddb8..00921f630 100644 --- a/packages/pl-api/lib/client/utils.ts +++ b/packages/pl-api/lib/client/utils.ts @@ -1,4 +1,4 @@ -import type { PlApiBaseClient } from '../client-base'; +import type { PlApiBaseClient } from '@/client-base'; const utils = (client: PlApiBaseClient) => ({ paginatedGet: client.paginatedGet.bind(client), diff --git a/packages/pl-api/lib/entities/admin/announcement.ts b/packages/pl-api/lib/entities/admin/announcement.ts index 41bac606f..fe74671cd 100644 --- a/packages/pl-api/lib/entities/admin/announcement.ts +++ b/packages/pl-api/lib/entities/admin/announcement.ts @@ -1,6 +1,7 @@ import * as v from 'valibot'; -import { pick } from '../../utils'; +import { pick } from '@/utils'; + import { announcementSchema } from '../announcement'; /** diff --git a/packages/pl-api/lib/entities/admin/report.ts b/packages/pl-api/lib/entities/admin/report.ts index 39e72b3d2..caa3fd927 100644 --- a/packages/pl-api/lib/entities/admin/report.ts +++ b/packages/pl-api/lib/entities/admin/report.ts @@ -1,6 +1,7 @@ import * as v from 'valibot'; -import { pick } from '../../utils'; +import { pick } from '@/utils'; + import { ruleSchema } from '../rule'; import { statusWithoutAccountSchema } from '../status'; import { datetimeSchema, filteredArray } from '../utils'; diff --git a/packages/pl-api/lib/utils/domain.ts b/packages/pl-api/lib/utils/domain.ts index 11e2b4b70..467af3ef3 100644 --- a/packages/pl-api/lib/utils/domain.ts +++ b/packages/pl-api/lib/utils/domain.ts @@ -1,4 +1,4 @@ -import type { Account } from '../entities'; +import type { Account } from '@/entities'; const getDomainFromURL = (account: Pick): string => { try { diff --git a/packages/pl-api/lib/utils/types.ts b/packages/pl-api/lib/utils/types.ts new file mode 100644 index 000000000..971514218 --- /dev/null +++ b/packages/pl-api/lib/utils/types.ts @@ -0,0 +1,3 @@ +type EmptyObject = Record; + +export type { EmptyObject }; diff --git a/packages/pl-api/tsconfig.json b/packages/pl-api/tsconfig.json index 534dfa6ca..00a4c28b3 100644 --- a/packages/pl-api/tsconfig.json +++ b/packages/pl-api/tsconfig.json @@ -6,7 +6,7 @@ "lib": ["ES2020", "DOM", "DOM.Iterable"], "skipLibCheck": true, "paths": { - "@/*": ["./src/*"] + "@/*": ["./lib/*"] }, /* Bundler mode */