From 77c06893216fde076d0454bd9194d5b798fff2ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Sun, 20 Oct 2024 12:53:12 +0200
Subject: [PATCH] pl-api: Avoid barrel imports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 packages/pl-api/lib/directory-client.ts              | 5 ++++-
 packages/pl-api/lib/entities/conversation.ts         | 4 ++--
 packages/pl-api/lib/entities/notification-request.ts | 4 ++--
 packages/pl-api/lib/entities/search.ts               | 6 ++++--
 packages/pl-api/lib/features.ts                      | 2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/packages/pl-api/lib/directory-client.ts b/packages/pl-api/lib/directory-client.ts
index 2a41b061c..ae11e1b8c 100644
--- a/packages/pl-api/lib/directory-client.ts
+++ b/packages/pl-api/lib/directory-client.ts
@@ -1,6 +1,9 @@
 import * as v from 'valibot';
 
-import { directoryCategorySchema, directoryLanguageSchema, directoryServerSchema, directoryStatisticsPeriodSchema } from './entities';
+import { directoryCategorySchema } from './entities/directory/category';
+import { directoryLanguageSchema } from './entities/directory/language';
+import { directoryServerSchema } from './entities/directory/server';
+import { directoryStatisticsPeriodSchema } from './entities/directory/statistics-period';
 import { filteredArray } from './entities/utils';
 import request from './request';
 
diff --git a/packages/pl-api/lib/entities/conversation.ts b/packages/pl-api/lib/entities/conversation.ts
index 8bdb375f1..50cea95bb 100644
--- a/packages/pl-api/lib/entities/conversation.ts
+++ b/packages/pl-api/lib/entities/conversation.ts
@@ -1,9 +1,9 @@
 import * as v from 'valibot';
 
+import { accountSchema } from './account';
+import { statusSchema } from './status';
 import { filteredArray } from './utils';
 
-import { accountSchema, statusSchema } from '.';
-
 /** @see {@link https://docs.joinmastodon.org/entities/Conversation} */
 const conversationSchema = v.object({
   id: v.string(),
diff --git a/packages/pl-api/lib/entities/notification-request.ts b/packages/pl-api/lib/entities/notification-request.ts
index d1d24a91e..cdef784d2 100644
--- a/packages/pl-api/lib/entities/notification-request.ts
+++ b/packages/pl-api/lib/entities/notification-request.ts
@@ -1,9 +1,9 @@
 import * as v from 'valibot';
 
+import { accountSchema } from './account';
+import { statusSchema } from './status';
 import { datetimeSchema } from './utils';
 
-import { accountSchema, statusSchema } from '.';
-
 /** @see {@link https://docs.joinmastodon.org/entities/NotificationRequest} */
 const notificationRequestSchema = v.object({
   id: v.string(),
diff --git a/packages/pl-api/lib/entities/search.ts b/packages/pl-api/lib/entities/search.ts
index a8b0d4db6..250644d10 100644
--- a/packages/pl-api/lib/entities/search.ts
+++ b/packages/pl-api/lib/entities/search.ts
@@ -1,9 +1,11 @@
 import * as v from 'valibot';
 
+import { accountSchema } from './account';
+import { groupSchema } from './group';
+import { statusSchema } from './status';
+import { tagSchema } from './tag';
 import { filteredArray } from './utils';
 
-import { accountSchema, groupSchema, statusSchema, tagSchema } from '.';
-
 /** @see {@link https://docs.joinmastodon.org/entities/Search} */
 const searchSchema = v.object({
   accounts: filteredArray(accountSchema),
diff --git a/packages/pl-api/lib/features.ts b/packages/pl-api/lib/features.ts
index 2fb4bceaf..f1056035f 100644
--- a/packages/pl-api/lib/features.ts
+++ b/packages/pl-api/lib/features.ts
@@ -2,7 +2,7 @@ import semverCoerce from 'semver/functions/coerce';
 import gte from 'semver/functions/gte';
 import semverParse from 'semver/functions/parse';
 
-import type { Instance } from './entities';
+import type { Instance } from './entities/instance';
 
 /** Truthy array convenience function */
 const any = (arr: Array<any>): boolean => arr.some(Boolean);