chore: refactored TS types for config

Author: mikita-kandratsyeu

actions/auth/get-login-quote.ts

@@ -16,7 +16,7 @@ export const getLoginQuote = async () => {
 
   const provider = AIProvider(config?.ai?.provider as string);
 
-  const DEFAULT_MODEL = (config?.ai?.['text-models']?.[0] as Record<string, string>)?.value;
+  const DEFAULT_MODEL = config?.ai?.['text-models']?.[0].value;
 
   try {
     const response = await fetchCachedData(

actions/chat/get-chat-initial.ts

@@ -16,7 +16,7 @@ export const getChatInitial = async () => {
 
   const provider = AIProvider(config?.ai?.provider as string);
 
-  const DEFAULT_MODEL = (config?.ai?.['text-models']?.[0] as Record<string, string>)?.value;
+  const DEFAULT_MODEL = config?.ai?.['text-models']?.[0].value;
 
   try {
     const introMessages = await fetchCachedData(

actions/configs/get-app-config.ts

@@ -5,10 +5,13 @@ import { promises as fs } from 'fs';
 import { getGithubContents } from '../github/get-contents';
 
 export type GetAppConfig = {
-  ai: Record<string, string | Record<string, string>[]>;
-  auth: Record<string, boolean>;
-  features: Record<string, boolean>;
-  providers: Record<string, boolean>;
+  ai: {
+    'image-models': { value: string; label: string }[];
+    'text-models': { value: string; label: string }[];
+    provider: string;
+  };
+  auth: { isBlockedNewLogin: true; providers: Record<string, boolean> };
+  features: { christmas: boolean };
 };
 
 export const getAppConfig = async (): Promise<GetAppConfig> => {
@@ -30,19 +33,19 @@ export const getAppConfig = async (): Promise<GetAppConfig> => {
       },
       auth: {
         isBlockedNewLogin: true,
+        providers: {
+          google: false,
+          yandex: false,
+          vk: false,
+          mailru: false,
+          linkedin: false,
+          slack: false,
+          github: true,
+        },
       },
       features: {
         christmas: false,
       },
-      providers: {
-        google: false,
-        yandex: false,
-        vk: false,
-        mailru: false,
-        linkedin: false,
-        slack: false,
-        github: true,
-      },
     };
   }
 };

app/(chat)/(routes)/chat/[[...slug]]/_components/chat-main/chat-input-footer.tsx

@@ -29,7 +29,7 @@ export const ChatInputFooter = ({
     config: state.config,
   }));
 
-  const IMAGE_MODELS = (appConfig?.ai?.['image-models'] as Record<string, string>[]) ?? [];
+  const IMAGE_MODELS = appConfig?.ai?.['image-models'] ?? [];
 
   return (
     <div className="flex bg-background justify-between px-2 py-2 items-center">

app/(chat)/(routes)/chat/[[...slug]]/_components/chat-main/chat-top-bar.tsx

@@ -56,7 +56,7 @@ export const ChatTopBar = ({
 
   const [open, setOpen] = useState(false);
 
-  const TEXT_MODELS = (appConfig?.ai?.['text-models'] as Record<string, string>[]) ?? [];
+  const TEXT_MODELS = appConfig?.ai?.['text-models'] ?? [];
 
   const messages = chatMessages[conversationId] ?? [];
   const models = isOwner(user?.userId) ? TEXT_MODELS : TEXT_MODELS.slice(0, 2);

app/(chat)/(routes)/chat/[[...slug]]/_components/chat-main/chat.tsx

@@ -52,7 +52,7 @@ export const Chat = ({ conversations = [], initialData, isEmbed, isShared }: Cha
 
   const abortControllerRef = useRef<AbortController | null>(null);
 
-  const IMAGE_MODELS = (appConfig?.ai?.['image-models'] as Record<string, string>[]) ?? [];
+  const IMAGE_MODELS = appConfig?.ai?.['image-models'] ?? [];
 
   useEffect(() => {
     if (conversations.length) {

app/api/ai/completions/route.ts

@@ -22,7 +22,7 @@ export const POST = async (req: NextRequest) => {
       return new NextResponse(ReasonPhrases.UNAUTHORIZED, { status: StatusCodes.UNAUTHORIZED });
     }
 
-    const TEXT_MODELS = (config?.ai?.['text-models'] as Record<string, string>[]) ?? [];
+    const TEXT_MODELS = config?.ai?.['text-models'] ?? [];
     const models = (isOwner(user?.userId) ? TEXT_MODELS : TEXT_MODELS.slice(0, 2)).map(
       ({ value }) => value,
     );

app/api/ai/image/route.ts

@@ -22,7 +22,7 @@ export const POST = async (req: NextRequest) => {
       return new NextResponse(ReasonPhrases.UNAUTHORIZED, { status: StatusCodes.UNAUTHORIZED });
     }
 
-    const IMAGE_MODELS = (config?.ai?.['image-models'] as Record<string, string>[]) ?? [];
+    const IMAGE_MODELS = config?.ai?.['image-models'] ?? [];
     const models = IMAGE_MODELS.map(({ value }) => value);
 
     if (!models.includes(model)) {

components/ai/generate-text-response-ai.tsx

@@ -45,7 +45,7 @@ export const GenerateTextResponseAi = ({
   const [alreadyTranslated, setAlreadyTranslated] = useState(false);
 
   const shouldCacheResponse = isTranslateButton && cacheKey;
-  const DEFAULT_MODEL = (appConfig?.ai?.['text-models']?.[0] as Record<string, string>)?.value;
+  const DEFAULT_MODEL = appConfig?.ai?.['text-models']?.[0].value;
 
   const handleGenerate = async () => {
     try {

components/auth/auth-form.tsx

@@ -50,8 +50,7 @@ export const AuthForm = ({ callbackUrl }: AuthFormProps) => {
   const locale = useLocale();
 
   const { config } = useAppConfigStore((state) => ({ config: state.config }));
-  const providers = config?.providers ?? {};
-  const isBlockedNewLogin = config?.auth?.isBlockedNewLogin;
+  const { isBlockedNewLogin = false, providers = {} } = config?.auth ?? {};
 
   const [isDisabledButtons, setIsDisabledButtons] = useState(false);
   const [isSignUpFlow, setIsSignUpFlow] = useState(false);
@@ -101,7 +100,7 @@ export const AuthForm = ({ callbackUrl }: AuthFormProps) => {
     }
   };
 
-  const hasCredentialsProvider = providers[Provider.CREDENTIALS];
+  const hasCredentialsProvider = providers?.[Provider.CREDENTIALS];
 
   return (
     <>

configs/app.json

@@ -17,16 +17,16 @@
     "isBlockedNewLogin": false
   },
   "features": {
-    "christmas": false
-  },
-  "providers": {
-    "credentials": true,
-    "github": true,
-    "google": true,
-    "linkedin": true,
-    "mailru": true,
-    "slack": true,
-    "vk": true,
-    "yandex": true
+    "christmas": false,
+    "providers": {
+      "credentials": true,
+      "github": true,
+      "google": true,
+      "linkedin": true,
+      "mailru": true,
+      "slack": true,
+      "vk": true,
+      "yandex": true
+    }
   }
 }