@enplug/scripts 1.11.4-dev4 → 1.11.4-dev40

package/bin/functions/translations/crowdin.js

@@ -1,6 +1,7 @@
 const axios = require('axios');
 const chalk = require('chalk');
 const fs = require('fs');
+const path = require('path');
 const FormData = require('form-data');
 const inquirer = require('inquirer');
 const loadDevPrivateFile = require('../loadDevPrivateFile');
@@ -108,62 +109,48 @@ function getCrowdinConfig() {
   return pkg.config.crowdin;
 }
 
-function generateFormData(crowdinPath, localPath) {
-  const formData = new FormData();
-
-  // formData.append('update_option', 'update_without_changes'); // Previous translations should remain valid
-  formData.append('json', '');
-  formData.append(`files[${crowdinPath}]`, fs.createReadStream(localPath));
-  formData.append(`export_patterns[${crowdinPath}]`, '%locale%.json');
-  return formData;
-}
-
-function postFileToCrowdin(operation, credentials, crowdinPath, localPath) {
-  const AuthStr = 'Bearer '.concat(credentials.token);
-  const formData = generateFormData(crowdinPath, localPath);
-
-  const url = `${CROWDIN_STORAGE_URL}`;
-
-  return from(axios.post(url, formData, { headers: { 
-    "Authorization": AuthStr,
-    "Content-Type": "application/json",
-    "Crowdin-API-FileName": "en.json" 
-  } }));
-}
-
-async function findCrowdinAppDirectoryId(credentials, crowdinPath) {
-  path = crowdinPath.startsWith('/') ? crowdinPath.substr(1) : crowdinPath;
-  if(path.startsWith('apps')){
-    const appName = path.split('/')[1];
+async function findCrowdinAppDirectoryId(credentials, crowdinPath, appName) {
+  if(crowdinPath.startsWith('apps')){
     const url = `${CROWDIN_PROJECT_URL}/directories?filter=${appName}`;
     const AuthStr = 'Bearer '.concat(credentials.token);
-    const directories = await axios.get(url, { headers: { Authorization: AuthStr } });
-    console.log('directories', directories.data.data)
-    return directories.data.data.find(d => d.data.name === appName).id;
-  } else if(path.startsWith('dashboard')) {
+    const resp = await axios.get(url, { headers: { Authorization: AuthStr } });
+    const directory = resp.data.data.find(d => d.data.name === appName );
+    return directory ? directory.data.id : undefined;
+  } else if(crowdinPath.startsWith('dashboard')) {
     const url = `${CROWDIN_PROJECT_URL}/directories?filter=dashboard`;
     const AuthStr = 'Bearer '.concat(credentials.token);
-    const directories = axios.get(url, { headers: { Authorization: AuthStr } });
-    console.log('directories', directories.data.data)
-
-    return directories.data.data.find(d => d.data.name === 'dashboard' && d.data.title === 'Dashboard' && d.data.path === '/dashboard').id;
+    const resp = axios.get(url, { headers: { Authorization: AuthStr } });
+    const directory = resp.data.data.find(d => d.data.name === 'dashboard' && d.data.title === 'Dashboard' && d.data.path === '/dashboard');
+    return directory ? directory.data.id : undefined;
   }
 }
 
 async function findCrowdinAppSubFolderId(credentials, directoryId, subfolderName) {
     const url = `${CROWDIN_PROJECT_URL}/directories?directoryId=${directoryId}`;
     const AuthStr = 'Bearer '.concat(credentials.token);
-    const directories = await axios.get(url, { headers: { Authorization: AuthStr } });
-    console.log('subdirectories', directories.data.data)
-
-    return directories.data.data.find(d => d.data.name === subfolderName).id;
+    const resp = await axios.get(url, { headers: { Authorization: AuthStr } });
+    const subdirectory = resp.data.data.find(d => d.data.name === subfolderName);
+    return subdirectory ? subdirectory.data.id : undefined;
 }
 
 async function getFileIdIfExists(credentials, directoryId, fileName) {
   const url = `${CROWDIN_PROJECT_URL}/files?directoryId=${directoryId}`;
   const AuthStr = 'Bearer '.concat(credentials.token);
-  const files = await axios.get(url, { headers: { Authorization: AuthStr } });
-  return files.data.find(d => d.data.name === fileName).id;
+  const resp = await axios.get(url, { headers: { Authorization: AuthStr } });
+  const file = resp.data.data.find(d => d.data.name === fileName);
+  return file ? file.data.id : undefined;
+}
+
+function postFileToCrowdin(credentials, localPath) {
+  const AuthStr = 'Bearer '.concat(credentials.token);
+  const file = fs.readFileSync(localPath);
+  const url = `${CROWDIN_STORAGE_URL}`;
+  
+  return from(axios.post(url, file, { headers: { 
+    "Authorization": AuthStr,
+    "Content-Type": 'application/json',
+    "Crowdin-API-FileName": 'en.json' 
+  } }));
 }
 
 async function uploadFileToCrowdinStorage(credentials, crowdinPath, localPath) {
@@ -171,18 +158,31 @@ async function uploadFileToCrowdinStorage(credentials, crowdinPath, localPath) {
     console.error(`${chalk.red.bold('Local file does not exists')} ${chalk.yellow.bold(`[${localPath}]`)}`);
     throw new Error('Local file does not exist');
   }
-
-  return postFileToCrowdin('update', credentials, crowdinPath, localPath).pipe(
+  return postFileToCrowdin(credentials, localPath).pipe(
     catchError(error => {
-      if (error.response.status === HTTP_NOT_FOUND_STATUS_CODE) {
-        return promptAddFile(crowdinPath).pipe(
-          filter(({addFileConfirm}) => addFileConfirm === true),
-          switchMap(() => postFileToCrowdin('add', credentials, crowdinPath, localPath))
-        );
-      }
-      
+      console('ERROR could not upload file to crowdin storage')
       return throwError(error);
-    }),
+    })
+  ).toPromise();
+}
+
+function updateCrowdinFile(credentials, storageId, fileId) {
+  console.log('fileId', fileId);
+  const url = `${CROWDIN_PROJECT_URL}/files/${fileId}`;
+  const AuthStr = 'Bearer '.concat(credentials.token);
+  const body = {
+    "storageId": storageId,
+    "updateOption": "keep_translations_and_approvals",
+    "importOptions": {
+        "contentSegmentation": false,
+        "customSegmentation": false
+    },
+    "exportOptions": {
+        "exportPattern": "%locale%.json"
+    },
+    "replaceModifiedContext": false
+  }
+  return axios.put(url, body, { headers: { Authorization: AuthStr } }).pipe(
     tap({
       next: response => {
         if (response.data) {
@@ -207,25 +207,7 @@ async function uploadFileToCrowdinStorage(credentials, crowdinPath, localPath) {
         }
       }
     })
-  ).toPromise();
-}
-
-function updateCrowdinFile(credentials, storageId, fileId) {
-  const url = `${CROWDIN_PROJECT_URL}/files/${fileId}`;
-  const AuthStr = 'Bearer '.concat(credentials.token);
-  const body = {
-    "storageId": storageId,
-    "updateOption": "keep_translations_and_approvals",
-    "importOptions": {
-        "contentSegmentation": false,
-        "customSegmentation": false
-    },
-    "exportOptions": {
-        "exportPattern": "%locale%.json"
-    },
-    "replaceModifiedContext": false
-  }
-  return axios.put(url, body, { headers: { Authorization: AuthStr } });
+  );
 }
 
 function fetchFileFromCrowdin(credentials, crowdinPath, language) {

package/bin/functions/translations/translations.js

@@ -61,19 +61,33 @@ async function syncTranslations(s3Client, bucket) {
       await uploadTranslationToS3(s3Client, bucket, s3EnPath, enTranslation);
 
       if (isProduction) {
-        const appDirectoryId = await findCrowdinAppDirectoryId(credentials, config.crowdinPath);
-        console.log('found directoryId', appDirectoryId);
-        if(config.crowdinPath.includes('apps')) {
-          const path = crowdinPath.startsWith('/') ? crowdinPath.substr(1) : crowdinPath;
-          const subfolderName = path.split('/')[2];
+        const crowdiPath = config.crowdinPath.startsWith('/') ? config.crowdinPath.substr(1) : config.crowdinPath;
+        const crowdinPathSections = crowdiPath.split('/');
+        const appName = crowdinPathSections[1];
+        const appDirectoryId = await findCrowdinAppDirectoryId(credentials, crowdiPath, appName);
+        if(appDirectoryId === undefined) {
+          console(`ERROR could not find app ${chalk.yellow.bold(`[${appName}]`)} directory`)
+          return throwError(error);
+        }
+        if(crowdinPathSections[0] === 'apps' && appDirectoryId) {
+          if(crowdinPathSections.length !== 4 && crowdinPathSections[3] !== 'en.json') {
+            console.error(`\n${chalk.red.bold('Crowdin path provided does not match defined format, make sure the path is as follows /apps/{app-id}/dashboard/en.json or /apps/{app-id}/app/en.json')}`);
+          }
+          const subfolderName = crowdinPathSections[2]; //dashboard or app folder
           const folderId = await findCrowdinAppSubFolderId(credentials, appDirectoryId, subfolderName);
-          console.log('found folderId', folderId);
-          const fileId = await getFileIdIfExists(credentials, appDirectoryId, path.split('/')[3]);
-          console.log('found fileId', fileId);
-          const storageId = await uploadFileToCrowdinStorage(credentials, config.crowdinPath, config.localPath)
+          if(folderId === undefined) {
+            console.error(`Could not find ${chalk.yellow.bold(`[${subfolderName}]`)} folder`);
+          }
+          const fileId = await getFileIdIfExists(credentials, folderId, crowdinPathSections[3]); // en.json file id to update
           if(fileId) {
-            await updateCrowdinFile(credentials, storageId, fileId);
+            const storageId = await uploadFileToCrowdinStorage(credentials, crowdiPath, config.localPath);
+            if(fileId && storageId) {
+              await updateCrowdinFile(credentials, storageId.data.data.id, fileId);
+            }
+          } else {
+            //TODO add file
           }
+          
         } else {
           // TODO Update dashboard transtlations file
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enplug/scripts",
-  "version": "1.11.4-dev4",
+  "version": "1.11.4-dev40",
   "description": "Enplug scripts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -29,6 +29,7 @@
   "dependencies": {
     "aws-sdk": "^2.474.0",
     "axios": "^0.19.2",
+    "buffer": "^6.0.3",
     "chalk": "2.4.1",
     "command-line-args": "5.0.2",
     "fs": "0.0.1-security",