Merge branch 'develop' into hooks-migration

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>

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';
 

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(),

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(),

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),

packages/pl-api/lib/entities/utils.ts

@@ -31,7 +31,7 @@ const mimeSchema = v.pipe(v.string(), v.regex(/^\w+\/[-+.\w]+$/));
 const coerceObject = <T extends v.ObjectEntries>(shape: T) =>
   v.pipe(
     v.any(),
-    v.transform((input) => typeof input === 'object' ? input : {}),
+    v.transform((input) => typeof input === 'object' && input !== null ? input : {}),
     v.object(shape),
   );
 

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);

packages/pl-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pl-api",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "type": "module",
   "homepage": "https://github.com/mkljczk/pl-fe/tree/fork/packages/pl-api",
   "repository": {