From 0c62a9291dd5e69e40d0682900a759b5498a9029 Mon Sep 17 00:00:00 2001
From: Tom McLaughlin <tom@codedown.io>
Date: Mon, 13 Nov 2023 17:25:32 -0800
Subject: [PATCH] Apply typeNameModifier to fields within interfaces

---
 CHANGELOG.md                            | 3 +++
 src/Data/Aeson/TypeScript/Formatting.hs | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d7aba8..720c2c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change log
 
+## Unreleased
+
+* Apply `typeNameModifier` to type names emitted on the RHS of fields within interfaces, for consistency.
 
 ## 0.6.0.0
 
diff --git a/src/Data/Aeson/TypeScript/Formatting.hs b/src/Data/Aeson/TypeScript/Formatting.hs
index b4e4c77..c6051fc 100644
--- a/src/Data/Aeson/TypeScript/Formatting.hs
+++ b/src/Data/Aeson/TypeScript/Formatting.hs
@@ -41,6 +41,9 @@ formatTSDeclaration (FormattingOptions {..}) (TSInterfaceDeclaration interfaceNa
       ls = T.intercalate "\n" $ [indentTo numIndentSpaces (T.pack (formatTSField member <> ";")) | member <- members]
       modifiedInterfaceName = (\(li, name) -> li <> interfaceNameModifier name) . splitAt 1 $ interfaceName
 
+      formatTSField :: TSField -> String
+      formatTSField (TSField optional name typ maybeDoc) = makeDocPrefix maybeDoc <> [i|#{name}#{if optional then ("?" :: String) else ""}: #{typeNameModifier typ}|]
+
 formatTSDeclaration _ (TSRawDeclaration text) = text
 
 indentTo :: Int -> T.Text -> T.Text
@@ -89,9 +92,6 @@ validateFormattingOptions options@FormattingOptions{..} decls
     -- Units (data U = U) contain two declarations, and thus are invalid
     isPlainSumType ds = (not . any isInterface $ ds) && length ds == 1
 
-formatTSField :: TSField -> String
-formatTSField (TSField optional name typ maybeDoc) = makeDocPrefix maybeDoc <> [i|#{name}#{if optional then ("?" :: String) else ""}: #{typ}|]
-
 makeDocPrefix :: Maybe String -> String
 makeDocPrefix maybeDoc = case maybeDoc of
   Nothing -> ""