feat: implement config file support

florianldt · Sep 20, 2022 · d0fe37b · d0fe37b
1 parent 4439c6b
commit d0fe37b
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 17 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -4,6 +4,7 @@ import { Command, Option } from 'commander';
 import ora from 'ora';
 
 import {
+    extractConfig,
     papagoLocals,
     parseFile,
     renderErrorLogs,
@@ -14,6 +15,8 @@ import {
     writeFile,
 } from './lib';
 import {
+    ConfigFileNotFoundError,
+    ConfigPropertyNotFoundError,
     FileInvalidExtensionError,
     FileNotExistError,
     PapagoError,
@@ -57,13 +60,15 @@ program.parse();
 const { input, source, target } = program.opts<CLIArgs>();
 
 async function main() {
-    renderHeaderLogs(version, input, source, target);
-
     const testInputSpinner = ora();
     const translationSpinner = ora();
     const writeSpinner = ora();
 
     try {
+        const { config, configPath } = extractConfig();
+
+        renderHeaderLogs(version, configPath, input, source, target);
+
         testInputSpinner.start(`Testing input file: ${input}`);
         testInput(input);
         testInputSpinner.succeed(`Valid input file: ${input}`);
@@ -73,7 +78,7 @@ async function main() {
         translationSpinner.start(
             `Translating ${papagoLocals[source]}  to ${papagoLocals[target]}`,
         );
-        const translations = await translate(keyValues, source, target);
+        const translations = await translate(config, keyValues, source, target);
         translationSpinner.succeed(
             `Translated ${papagoLocals[source]}  to ${papagoLocals[target]}`,
         );
@@ -85,7 +90,11 @@ async function main() {
         renderFooterLogs();
         process.exit(0);
     } catch (e) {
-        if (
+        if (e instanceof ConfigFileNotFoundError) {
+            renderHeaderLogs(version, null, input, source, target);
+        } else if (e instanceof ConfigPropertyNotFoundError) {
+            renderHeaderLogs(version, e.configPath, input, source, target);
+        } else if (
             e instanceof FileNotExistError ||
             e instanceof FileInvalidExtensionError
         ) {

diff --git a/src/lib/logging.ts b/src/lib/logging.ts
@@ -5,6 +5,7 @@ import { PapagoLocalKeys } from '../types';
 /* eslint-disable no-console */
 function renderHeaderLogs(
     version: string,
+    configPath: string | null,
     input: string,
     source: PapagoLocalKeys,
     target: PapagoLocalKeys,
@@ -17,6 +18,7 @@ function renderHeaderLogs(
     console.log(`  \\____/ \\___|_|  \\___/|_| |_| |_|\\___| v${version}`);
 
     console.log();
+    console.log(`${chalk.bold('Config:')} ${configPath ?? ''}`);
     console.log(`${chalk.bold('Input:')} ${input}`);
     console.log(`${chalk.bold('Source:')} ${source}`);
     console.log(`${chalk.bold('Target:')} ${target}`);

diff --git a/src/lib/translate.test.ts b/src/lib/translate.test.ts
@@ -2,11 +2,16 @@ import axios from 'axios';
 
 import { buildTextPackets, requestsBuilder, translate } from './translate';
 
-import { KeyValues } from '../types';
+import { Config, KeyValues } from '../types';
 
 jest.mock('axios');
 const mockedAxios = axios as jest.Mocked<typeof axios>;
 
+const dummyConfig: Config = {
+    X_NAVER_CLIENT_ID: '',
+    X_NAVER_CLIENT_SECRET: '',
+};
+
 describe('buildTextPackets', () => {
     test('should return empty array as keyValues is empty', () => {
         expect(buildTextPackets([])).toEqual([]);
@@ -52,13 +57,13 @@ describe('buildTextPackets', () => {
 
 describe('requestsBuilder', () => {
     test('should return empty array as packets is empty', () => {
-        expect(requestsBuilder([], 'ko', 'en')).toEqual([]);
+        expect(requestsBuilder(dummyConfig, [], 'ko', 'en')).toEqual([]);
     });
 
     test('should return 3 requests', () => {
-        expect(requestsBuilder(['홈', '홈', '홈'], 'ko', 'en').length).toEqual(
-            3,
-        );
+        expect(
+            requestsBuilder(dummyConfig, ['홈', '홈', '홈'], 'ko', 'en').length,
+        ).toEqual(3);
     });
 });
 
@@ -89,7 +94,9 @@ describe('translate', () => {
             { key: '6788d684', value: '그럼요!' },
         ];
         mockedAxios.post.mockResolvedValue({ data });
-        await expect(translate(keyValues, 'ko', 'en')).resolves.toEqual(
+        await expect(
+            translate(dummyConfig, keyValues, 'ko', 'en'),
+        ).resolves.toEqual(
             'Home\n\nMy Carrot\n\nDoes the Carrot App help you keep alive?\n\nNo.\n\nOf course!',
         );
     });

diff --git a/src/lib/translate.ts b/src/lib/translate.ts
@@ -1,12 +1,14 @@
 import axios, { AxiosError, AxiosRequestHeaders, AxiosResponse } from 'axios';
-import dotenv from 'dotenv';
 import { stringify } from 'qs';
 
-import { KeyValues, PapagoFailureResponse, PapagoOkResponse } from '../types';
+import {
+    Config,
+    KeyValues,
+    PapagoFailureResponse,
+    PapagoOkResponse,
+} from '../types';
 import { PapagoError } from './errors';
 
-dotenv.config();
-
 function buildTextPackets(keyValues: KeyValues): string[] {
     const max = 5000;
     const packets: string[] = [];
@@ -39,14 +41,16 @@ function buildTextPackets(keyValues: KeyValues): string[] {
 }
 
 function requestsBuilder(
+    config: Config,
     packets: string[],
     baseLocal: string,
     toLocal: string,
 ): Promise<AxiosResponse<PapagoOkResponse>>[] {
+    const { X_NAVER_CLIENT_ID, X_NAVER_CLIENT_SECRET } = config;
     const baseUrl = 'https://openapi.naver.com/v1/papago/n2mt';
     const headers: AxiosRequestHeaders = {
-        'X-Naver-Client-Id': process.env.X_NAVER_CLIENT_ID ?? '',
-        'X-Naver-Client-Secret': process.env.X_NAVER_CLIENT_SECRET ?? '',
+        'X-Naver-Client-Id': X_NAVER_CLIENT_ID,
+        'X-Naver-Client-Secret': X_NAVER_CLIENT_SECRET,
     };
 
     const requests: Promise<AxiosResponse<PapagoOkResponse>>[] = [];
@@ -70,12 +74,13 @@ function requestsBuilder(
 }
 
 async function translate(
+    config: Config,
     keyValues: KeyValues,
     baseLocal: string,
     toLocals: string,
 ): Promise<string> {
     const packets = buildTextPackets(keyValues);
-    const requests = requestsBuilder(packets, baseLocal, toLocals);
+    const requests = requestsBuilder(config, packets, baseLocal, toLocals);
 
     return Promise.all(requests)
         .then((responses) => {