From 60eaf01940bc0fda24dcabcd5316e2d63e6dec43 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 13 Jun 2023 22:12:42 -0500
Subject: [PATCH] Add Resolve<T> utility type

---
 app/soapbox/schemas/account.ts | 4 +++-
 app/soapbox/schemas/status.ts  | 4 +++-
 app/soapbox/utils/types.ts     | 7 +++++++
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 app/soapbox/utils/types.ts

diff --git a/app/soapbox/schemas/account.ts b/app/soapbox/schemas/account.ts
index f0fdf4887..6c41bebc4 100644
--- a/app/soapbox/schemas/account.ts
+++ b/app/soapbox/schemas/account.ts
@@ -7,6 +7,8 @@ import { unescapeHTML } from 'soapbox/utils/html';
 import { customEmojiSchema } from './custom-emoji';
 import { contentSchema, filteredArray, makeCustomEmojiMap } from './utils';
 
+import type { Resolve } from 'soapbox/utils/types';
+
 const avatarMissing = require('assets/images/avatar-missing.png');
 const headerMissing = require('assets/images/header-missing.png');
 
@@ -142,6 +144,6 @@ const accountSchema = baseAccountSchema.extend({
   moved: baseAccountSchema.transform(transformAccount).nullable().catch(null),
 }).transform(transformAccount);
 
-type Account = z.infer<typeof accountSchema>;
+type Account = Resolve<z.infer<typeof accountSchema>>;
 
 export { accountSchema, type Account };
\ No newline at end of file
diff --git a/app/soapbox/schemas/status.ts b/app/soapbox/schemas/status.ts
index de06ecb98..accd31a6a 100644
--- a/app/soapbox/schemas/status.ts
+++ b/app/soapbox/schemas/status.ts
@@ -16,6 +16,8 @@ import { pollSchema } from './poll';
 import { tagSchema } from './tag';
 import { contentSchema, dateSchema, filteredArray, makeCustomEmojiMap } from './utils';
 
+import type { Resolve } from 'soapbox/utils/types';
+
 const statusPleromaSchema = z.object({
   emoji_reactions: filteredArray(emojiReactionSchema),
   event: eventSchema.nullish().catch(undefined),
@@ -144,6 +146,6 @@ const statusSchema = baseStatusSchema.extend({
   };
 }).transform(transformStatus);
 
-type Status = z.infer<typeof statusSchema>;
+type Status = Resolve<z.infer<typeof statusSchema>>;
 
 export { statusSchema, type Status };
\ No newline at end of file
diff --git a/app/soapbox/utils/types.ts b/app/soapbox/utils/types.ts
new file mode 100644
index 000000000..31eacd481
--- /dev/null
+++ b/app/soapbox/utils/types.ts
@@ -0,0 +1,7 @@
+/**
+ * Resolve a type into a flat POJO interface if it's been wrapped by generics.
+ * https://gleasonator.com/@alex/posts/AWfK4hyppMDCqrT2y8
+ */
+type Resolve<T> = Pick<T, keyof T>;
+
+export type { Resolve };
\ No newline at end of file