fix(conf) proper typings for LinguiConfig['runtimeConfigModule'] (#1329)

lingui · Jan 10, 2023 · 389bb85 · 389bb85 · vercel · Jan 10, 2023
1 parent 557caa7
commit 389bb85
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/packages/conf/index.d.ts b/packages/conf/index.d.ts
@@ -49,7 +49,10 @@ export declare type LinguiConfig = {
     orderBy: OrderBy;
     pseudoLocale: string;
     rootDir: string;
-    runtimeConfigModule: [string, string?];
+    runtimeConfigModule: [source: string, identifier?: string] | {
+        i18n?: [source: string, identifier?: string]
+        Trans?: [source: string, identifier?: string]
+    };
     sourceLocale: string;
     service: CatalogService;
 };
@@ -77,7 +80,7 @@ export declare const configValidation: {
         orderBy: OrderBy;
         pseudoLocale: string;
         rootDir: string;
-        runtimeConfigModule: [string, string?];
+        runtimeConfigModule: LinguiConfig['runtimeConfigModule'];
         sourceLocale: string;
         service: CatalogService;
     };

diff --git a/packages/macro/src/index.ts b/packages/macro/src/index.ts
@@ -6,17 +6,15 @@ import MacroJSX from "./macroJsx"
 
 const config = getConfig({ configPath: process.env.LINGUI_CONFIG })
 
-const getSymbolSource = (name: string) => {
+const getSymbolSource = (name: 'i18n' | 'Trans'): [source: string, identifier?: string] => {
   if (Array.isArray(config.runtimeConfigModule)) {
     if (name === "i18n") {
       return config.runtimeConfigModule
     } else {
       return ["@lingui/react", name]
     }
   } else {
-    if (
-      Object.prototype.hasOwnProperty.call(config.runtimeConfigModule, name)
-    ) {
+    if (config.runtimeConfigModule[name]) {
       return config.runtimeConfigModule[name]
     } else {
       return ["@lingui/react", name]