feat(sync): upload new messages for all locales

Author: Anton Savoskin

src/commands/sync.ts

@@ -1,6 +1,6 @@
 import * as path from 'path';
 
-import { readFile, showError, showInfo, writeFile } from '../utils';
+import { asyncForEach, readFile, showError, showInfo, writeFile } from '../utils';
 import { Base } from '../base';
 import { Lokalise } from '../providers/lokalise';
 import { Provider } from '../providers/provider';
@@ -21,14 +21,14 @@ export default class Extract extends Base {
     ...Base.providersFlags,
   };
   provider?: Provider;
-  messages: { [id: string]: Message } = {};
+  messages: { [locale: string]: { [id: string]: Message } } = {};
 
   async mergeToFile(locale: string) {
     const {
       flags: { messagesDir },
     } = this.parse(Extract);
     const fileName = path.join(messagesDir, `${locale}.json`);
-    const originalMessages: { [id: string]: Message } = this.messages;
+    const originalMessages: { [id: string]: Message } = this.messages[locale];
     try {
       const oldFile = await readFile(fileName);
 
@@ -93,13 +93,23 @@ export default class Extract extends Base {
     }
 
     const locales = langs.split(',');
+    this.messages = locales.reduce(
+      (acc, locale) => {
+        acc[locale] = {};
+        return acc;
+      },
+      {} as { [locale: string]: { [id: string]: Message } },
+    );
 
     await this.provider.getKeys(locales);
     await Promise.all(locales.map(locale => this.mergeToFile(locale)));
     const newMessages = this.provider.getNewMessages();
     if (newMessages.length > 0) {
       showInfo(`New translation keys: ${newMessages.length}`);
-      await this.provider.uploadMessages(newMessages.map(id => this.messages[id]));
+      await this.provider.uploadMessages(newMessages.map(id => this.messages[locales[0]][id]), locales);
+      asyncForEach(locales, locale =>
+        this.provider!.uploadMessages(newMessages.map(id => this.messages[locale][id]), locales),
+      );
     }
   }
 }

src/providers/locize.ts

@@ -43,7 +43,7 @@ export class Locize implements Provider {
     return '';
   }
 
-  async uploadMessages(messages: Message[]) {
+  async uploadMessages(messages: Message[], locales: string[]) {
     const headers = { Authorization: `Bearer ${this.apiKey}`, 'content-type': 'application/json' };
     const body = messages.reduce(
       (acc, { id, message, defaultMessage, description }) => {

src/providers/provider.ts

@@ -3,6 +3,6 @@ import { Message } from '../types';
 export interface Provider {
   getKeys(locales: string[]): Promise<void>;
   getMessage(locale: string, id: string): string;
-  uploadMessages(messages: Message[]): Promise<void>;
+  uploadMessages(messages: Message[], locales: string[]): Promise<void>;
   getNewMessages(): string[];
 }

src/utils.ts

@@ -60,7 +60,7 @@ export const request = <T>({ url, body, qs, headers = {}, ...rest }: Options) =>
 const format = (time: Date) => time.toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, '$1');
 export const showError = (message: string) => console.error('\x1b[31m', message, '\x1b[0m');
 export const showInfo = (message: string) => console.info(`\x1b[34m[${format(new Date())}]\x1b[0m`, `${message}`);
-export const asyncForEach = async (array: any[], callback: any) => {
+export const asyncForEach = async <T>(array: T[], callback: (item: T, index: number, array: T[]) => Promise<void>) => {
   for (let index = 0; index < array.length; index += 1) {
     await callback(array[index], index, array);
   }