WIP 2

Author: tnagorra

app/scripts/translatte/commands/applyMigrations.test.ts

@@ -4,7 +4,7 @@ import { join } from 'path';
 
 import { testWithTmpDir } from '../testHelpers';
 import {
-    writeFileAsync,
+    writeFilePromisify,
     readJsonFilesContents,
 } from '../utils';
 import {
@@ -29,7 +29,7 @@ testWithTmpDir('test applyMigrations with no data in server', async ({ tmpdir })
         { name: '000003-1000000000000.json', content: migrationContent3 },
         { name: '000004-1000000000000.json', content: migrationContent4 },
         { name: '000005-1000000000000.json', content: migrationContent5 },
-    ].map(({ name, content }) => writeFileAsync(
+    ].map(({ name, content }) => writeFilePromisify(
         join(tmpdir, 'migrations', name),
         JSON.stringify(content, null, 4),
         'utf8',
@@ -42,7 +42,7 @@ testWithTmpDir('test applyMigrations with no data in server', async ({ tmpdir })
         last_migration: undefined,
         strings: [],
     };
-    await writeFileAsync(
+    await writeFilePromisify(
         join(tmpdir, 'strings', 'before.json'),
         JSON.stringify(emptySourceFile),
         'utf8',
@@ -70,7 +70,7 @@ testWithTmpDir('test applyMigrations with data in server', async ({ tmpdir }) =>
     mkdirSync(join(tmpdir, 'migrations'));
     const migrations = [
         { name: '000006-1000000000000.json', content: migrationContent6 },
-    ].map(({ name, content }) => writeFileAsync(
+    ].map(({ name, content }) => writeFilePromisify(
         join(tmpdir, 'migrations', name),
         JSON.stringify(content, null, 4),
         'utf8',
@@ -79,7 +79,7 @@ testWithTmpDir('test applyMigrations with data in server', async ({ tmpdir }) =>
 
     mkdirSync(join(tmpdir, 'strings'));
 
-    await writeFileAsync(
+    await writeFilePromisify(
         join(tmpdir, 'strings', 'before.json'),
         JSON.stringify(strings1),
         'utf8',

app/scripts/translatte/commands/applyMigrations.ts

@@ -4,7 +4,7 @@ import { basename } from 'path';
 import {
     readJsonSource,
     readMigrations,
-    writeFileAsync,
+    writeFilePromisify,
     getMigrationFilesAttrsFromDir,
 } from '../utils';
 import { merge } from './mergeMigrations';
@@ -163,7 +163,7 @@ async function applyMigrations(
         console.info(`Creating file '${destinationFileName}'`);
         console.info(outputSourceFileContent);
     } else {
-        await writeFileAsync(
+        await writeFilePromisify(
             destinationFileName,
             JSON.stringify(outputSourceFileContent, null, 4),
             'utf8',

app/scripts/translatte/commands/exportStrings.ts

@@ -1,6 +1,6 @@
 import { join } from 'path';
 
-import { fetchAllServerStrings, writeFileAsync } from "../utils";
+import { fetchAllServerStrings, writeFilePromisify } from "../utils";
 
 async function exportStrings(
     apiUrl: string,
@@ -13,7 +13,7 @@ async function exportStrings(
     const exportFileName = `${url.hostname}-${now.getTime()}.json`;
     const exportFilePath = join(outputDir, exportFileName);
 
-    await writeFileAsync(
+    await writeFilePromisify(
         exportFilePath,
         JSON.stringify(serverStrings, null, 2),
         'utf8',

app/scripts/translatte/commands/generateMigration.ts

@@ -2,7 +2,7 @@ import { Md5 } from 'ts-md5';
 import { join, isAbsolute } from 'path';
 
 import {
-    writeFileAsync,
+    writeFilePromisify,
     oneOneMapping,
     readTranslations,
     getTranslationFileNames,
@@ -184,7 +184,7 @@ async function generate(
         console.info(`Creating migration file '${outputMigrationFile}'`);
         console.info(migrationContent);
     } else {
-        await writeFileAsync(
+        await writeFilePromisify(
             outputMigrationFile,
             JSON.stringify(migrationContent, null, 4),
             'utf8',

app/scripts/translatte/commands/importExcel.ts

@@ -2,7 +2,7 @@ import { compareString, isDefined, isNotDefined, isTruthyString, listToGroupList
 import xlsx from 'exceljs';
 import { Language, ServerActionItem, SourceStringItem, StringItem } from '../types';
 import { Md5 } from 'ts-md5';
-import { fetchAllServerStrings, postLanguageStrings, readFileAsync, writeFileAsync } from '../utils';
+import { fetchAllServerStrings, postLanguageStrings, readFilePromisify, writeFilePromisify } from '../utils';
 import stagingStrings from '../../../../../../go-temp/goadmin-stage.ifrc.org-1717130893109.json';
 
 async function importExcel(
@@ -142,7 +142,7 @@ async function importExcel(
     */
 
     /*
-    await writeFileAsync(
+    await writeFilePromisify(
         'serverResponse.json',
         JSON.stringify(postJsonResponses, null, 2),
         'utf8',

app/scripts/translatte/commands/mergeMigrations.ts

@@ -7,7 +7,7 @@ import {
     getMigrationFilesAttrs,
     readMigrations,
     removeFiles,
-    writeFileAsync
+    writeFilePromisify
 } from '../utils';
 
 function getCanonicalKey(
@@ -209,7 +209,7 @@ async function mergeMigrations(
         console.info(`Creating migration file '${newFileName}'`);
         console.info(mergedMigrationContent);
     } else {
-        await writeFileAsync(
+        await writeFilePromisify(
             newFileName,
             JSON.stringify(mergedMigrationContent, null, 4),
             'utf8',

app/scripts/translatte/commands/pushMigration.ts

@@ -1,6 +1,6 @@
 import { isDefined, isNotDefined, isTruthyString, listToGroupList, listToMap, mapToMap } from "@togglecorp/fujs";
 import { Language, MigrationActionItem, SourceStringItem } from "../types";
-import { fetchLanguageStrings, getCombinedKey, postLanguageStrings, readMigrations, writeFileAsync } from "../utils";
+import { fetchLanguageStrings, getCombinedKey, postLanguageStrings, readMigrations, writeFilePromisify } from "../utils";
 import { Md5 } from "ts-md5";
 
 const languages: Language[] = ['en', 'fr', 'es', 'ar'];
@@ -200,13 +200,13 @@ async function pushMigration(migrationFilePath: string, apiUrl: string, authToke
         }
     });
 
-    await writeFileAsync(
+    await writeFilePromisify(
         'prevServerState.json',
         JSON.stringify(serverStringMapByCombinedKey, null, 2),
         'utf8',
     );
 
-    await writeFileAsync(
+    await writeFilePromisify(
         'serverActions.json',
         JSON.stringify(serverActions, null, 2),
         'utf8',
@@ -246,7 +246,7 @@ async function pushMigration(migrationFilePath: string, apiUrl: string, authToke
         postResponses.map((response) => response.json())
     );
 
-    await writeFileAsync(
+    await writeFilePromisify(
         'serverResponse.json',
         JSON.stringify(postJsonResponses, null, 2),
         'utf8',

app/scripts/translatte/commands/uploadJson.ts

@@ -24,7 +24,7 @@ async function postSourceStrings(language: Language, strings: SourceStringItem[]
         console.info(response.status, response.statusText);
         /*
         const responseJson = await response.json();
-        await writeFileAsync(
+        await writeFilePromisify(
             'server-error.json',
             JSON.stringify(responseJson, null, 2),
             'utf-8'

app/scripts/translatte/utils.ts

@@ -21,9 +21,9 @@ import {
     SourceStringItem,
 } from './types';
 
-export const readFileAsync = promisify(readFile);
-export const writeFileAsync = promisify(writeFile);
-export const unlinkAsync = promisify(unlink);
+export const readFilePromisify = promisify(readFile);
+export const writeFilePromisify = promisify(writeFile);
+export const unlinkPromisify = promisify(unlink);
 export const glob = fg.glob;
 
 // Utilities
@@ -301,7 +301,7 @@ export async function getTranslationFileNames(basePath: string, pathNames: strin
 
 export async function readJsonFilesContents(fileNames: string[]) {
     const contentsPromise = fileNames.map(async (fileName) => {
-        const fileDescriptor = await readFileAsync(fileName);
+        const fileDescriptor = await readFilePromisify(fileName);
         try {
             const content = JSON.parse(fileDescriptor.toString());
             return {
@@ -361,7 +361,7 @@ export async function readJsonSource(fileName: string) {
 
 export async function removeFiles(files: string[]) {
     const removePromises = files.map(async (file) => (
-        unlinkAsync(file)
+        unlinkPromisify(file)
     ));
     await Promise.all(removePromises);
 }