simplify

amannn · Nov 14, 2024 · ef7192e · ef7192e
1 parent c8eb283
commit ef7192e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/packages/use-intl/src/core/ICUArgs.tsx b/packages/use-intl/src/core/ICUArgs.tsx
@@ -1,22 +1,8 @@
-import {GetICUArgs} from '@schummar/icu-type-parser';
+import {GetICUArgs, GetICUArgsOptions} from '@schummar/icu-type-parser';
 
-type ICUArgs<
-  Message extends string,
-  ICUArgument,
-  ICUNumberArgument,
-  ICUDateArgument
-> =
+type ICUArgs<Message extends string, Options extends GetICUArgsOptions> =
   // This is important when `t` is returned from a function and there's no
   // known `Message` yet. Otherwise, we'd run into an infinite loop.
-  string extends Message
-    ? {}
-    : GetICUArgs<
-        Message,
-        {
-          ICUArgument: ICUArgument;
-          ICUNumberArgument: ICUNumberArgument;
-          ICUDateArgument: ICUDateArgument;
-        }
-      >;
+  string extends Message ? {} : GetICUArgs<Message, Options>;
 
 export default ICUArgs;
diff --git a/packages/use-intl/src/core/createTranslator.tsx b/packages/use-intl/src/core/createTranslator.tsx
@@ -30,7 +30,14 @@ import {Prettify} from './types.tsx';
 type ICUArgsWithTags<
   MessageString extends string,
   TagsFn extends RichTagsFunction | MarkupTagsFunction = never
-> = ICUArgs<MessageString, ICUArg, ICUNumber, ICUDate> &
+> = ICUArgs<
+  MessageString,
+  {
+    ICUArgument: ICUArg;
+    ICUNumberArgument: ICUNumber;
+    ICUDateArgument: ICUDate;
+  }
+> &
   ([TagsFn] extends [never] ? {} : ICUTags<MessageString, TagsFn>);
 
 type OnlyOptional<T> = Partial<T> extends T ? true : false;