gtx-cli 1.1.7-alpha.1 → 1.1.7-alpha.2

package/dist/api/checkFileTranslations.d.ts

@@ -13,4 +13,7 @@ export declare function checkFileTranslations(apiKey: string, baseUrl: string, d
         versionId: string;
         fileName: string;
     };
-}, locales: string[], timeoutDuration: number, resolveOutputPath: (sourcePath: string, locale: string) => string): Promise<boolean>;
+}, locales: string[], timeoutDuration: number, resolveOutputPath: (sourcePath: string, locale: string) => string, downloadStatus: {
+    downloaded: Set<string>;
+    failed: Set<string>;
+}): Promise<boolean>;

package/dist/api/checkFileTranslations.js

@@ -17,6 +17,7 @@ const chalk_1 = __importDefault(require("chalk"));
 const console_1 = require("../console/console");
 const generaltranslation_1 = require("generaltranslation");
 const downloadFile_1 = require("./downloadFile");
+const downloadFileBatch_1 = require("./downloadFileBatch");
 /**
  * Checks the status of translations for a given version ID
  * @param apiKey - The API key for the General Translation API
@@ -27,154 +28,26 @@ const downloadFile_1 = require("./downloadFile");
  * @param timeoutDuration - The timeout duration for the wait in seconds
  * @returns True if all translations are deployed, false otherwise
  */
-function checkFileTranslations(apiKey, baseUrl, data, locales, timeoutDuration, resolveOutputPath) {
+function checkFileTranslations(apiKey, baseUrl, data, locales, timeoutDuration, resolveOutputPath, downloadStatus) {
     return __awaiter(this, void 0, void 0, function* () {
         const startTime = Date.now();
         const spinner = yield (0, console_1.displayLoadingAnimation)('Waiting for translation...');
-        const downloadedFiles = new Set(); // Track which file+locale combinations have been downloaded
-        let fileQueryData = [];
         // Initialize the query data
-        for (const file in data) {
-            for (const locale of locales) {
-                fileQueryData.push({
-                    versionId: data[file].versionId,
-                    fileName: data[file].fileName,
-                    locale,
-                });
-            }
-        }
-        const checkDeployment = () => __awaiter(this, void 0, void 0, function* () {
-            try {
-                // Only query for files that haven't been downloaded yet
-                const currentQueryData = fileQueryData.filter((item) => !downloadedFiles.has(`${item.fileName}:${item.locale}`));
-                // If all files have been downloaded, we're done
-                if (currentQueryData.length === 0) {
-                    return true;
-                }
-                const response = yield fetch(`${baseUrl}/v1/project/translations/files/retrieve`, {
-                    method: 'POST',
-                    headers: Object.assign({ 'Content-Type': 'application/json' }, (apiKey && { 'x-gt-api-key': apiKey })),
-                    body: JSON.stringify({ files: currentQueryData }),
-                });
-                if (response.ok) {
-                    const responseData = yield response.json();
-                    const translations = responseData.translations || [];
-                    // Process available translations
-                    for (const translation of translations) {
-                        const locale = translation.locale;
-                        const fileName = translation.fileName;
-                        const translationId = translation.id;
-                        if (translation.isReady && fileName) {
-                            // Mark this file+locale as downloaded
-                            downloadedFiles.add(`${fileName}:${locale}`);
-                            // Download the file
-                            const outputPath = resolveOutputPath(fileName, locale);
-                            yield (0, downloadFile_1.downloadFile)(baseUrl, apiKey, translationId, outputPath);
-                        }
-                    }
-                    // Force a refresh of the spinner display
-                    const statusText = generateStatusSuffixText(downloadedFiles, fileQueryData);
-                    // Clear and reapply the suffix to force a refresh
-                    spinner.suffixText = statusText;
-                }
-                if (downloadedFiles.size === fileQueryData.length) {
-                    return true;
-                }
-                return false;
-            }
-            catch (error) {
-                console.error('Error checking translation status:', error);
-                return false;
-            }
-        });
-        /**
-         * Generates a formatted status text showing translation progress
-         * @param downloadedFiles - Set of downloaded file+locale combinations
-         * @param fileQueryData - Array of file query data objects
-         * @returns Formatted status text
-         */
-        function generateStatusSuffixText(downloadedFiles, fileQueryData) {
-            var _a;
-            // Simple progress indicator
-            const progressText = chalk_1.default.green(`[${downloadedFiles.size}/${fileQueryData.length}]`) +
-                ` translations completed`;
-            // Get terminal height to adapt our output
-            const terminalHeight = process.stdout.rows || 24; // Default to 24 if undefined
-            // If terminal is very small, just show the basic progress
-            if (terminalHeight < 6) {
-                return `\n${progressText}`;
-            }
-            const newSuffixText = [`\n${progressText}`];
-            // Organize data by filename
-            const fileStatus = new Map();
-            // Initialize with all files and locales from fileQueryData
-            for (const item of fileQueryData) {
-                if (!fileStatus.has(item.fileName)) {
-                    fileStatus.set(item.fileName, {
-                        completed: new Set(),
-                        pending: new Set([item.locale]),
-                    });
-                }
-                else {
-                    (_a = fileStatus.get(item.fileName)) === null || _a === void 0 ? void 0 : _a.pending.add(item.locale);
-                }
-            }
-            // Mark which ones are completed
-            for (const fileLocale of downloadedFiles) {
-                const [fileName, locale] = fileLocale.split(':');
-                const status = fileStatus.get(fileName);
-                if (status) {
-                    status.pending.delete(locale);
-                    status.completed.add(locale);
-                }
-            }
-            // Calculate how many files we can show based on terminal height
-            // Each file takes 1 line now
-            const filesArray = Array.from(fileStatus.entries());
-            const maxFilesToShow = Math.min(filesArray.length, terminalHeight - 3 // Header + progress + buffer
-            );
-            // Display each file with its status on a single line
-            for (let i = 0; i < maxFilesToShow; i++) {
-                const [fileName, status] = filesArray[i];
-                // Create condensed locale status
-                const localeStatuses = [];
-                // Add completed locales
-                if (status.completed.size > 0) {
-                    const completedCodes = Array.from(status.completed)
-                        .map((locale) => (0, generaltranslation_1.getLocaleProperties)(locale).code)
-                        .join(', ');
-                    localeStatuses.push(chalk_1.default.green(`${completedCodes}`));
-                }
-                // Add pending locales
-                if (status.pending.size > 0) {
-                    const pendingCodes = Array.from(status.pending)
-                        .map((locale) => (0, generaltranslation_1.getLocaleProperties)(locale).code)
-                        .join(', ');
-                    localeStatuses.push(chalk_1.default.yellow(`${pendingCodes}`));
-                }
-                // Format the line
-                newSuffixText.push(`${chalk_1.default.bold(fileName)} [${localeStatuses.join(', ')}]`);
-            }
-            // If we couldn't show all files, add an indicator
-            if (filesArray.length > maxFilesToShow) {
-                newSuffixText.push(`... and ${filesArray.length - maxFilesToShow} more files`);
-            }
-            return newSuffixText.join('\n');
-        }
-        // Calculate time until next 5-second interval since startTime
-        const msUntilNextInterval = Math.max(0, 5000 - ((Date.now() - startTime) % 5000));
+        const fileQueryData = prepareFileQueryData(data, locales);
         // Do first check immediately
-        const initialCheck = yield checkDeployment();
+        const initialCheck = yield checkTranslationDeployment(baseUrl, apiKey, fileQueryData, downloadStatus, spinner, resolveOutputPath);
         if (initialCheck) {
-            spinner.succeed(chalk_1.default.green('All translations are live!'));
+            spinner.succeed(chalk_1.default.green('Files translated!'));
             return true;
         }
+        // Calculate time until next 5-second interval since startTime
+        const msUntilNextInterval = Math.max(0, 5000 - ((Date.now() - startTime) % 5000));
         return new Promise((resolve) => {
             let intervalCheck;
             // Start the interval aligned with the original request time
             setTimeout(() => {
                 intervalCheck = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-                    const isDeployed = yield checkDeployment();
+                    const isDeployed = yield checkTranslationDeployment(baseUrl, apiKey, fileQueryData, downloadStatus, spinner, resolveOutputPath);
                     const elapsed = Date.now() - startTime;
                     if (isDeployed || elapsed >= timeoutDuration * 1000) {
                         process.stdout.write('\n');
@@ -193,3 +66,189 @@ function checkFileTranslations(apiKey, baseUrl, data, locales, timeoutDuration,
         });
     });
 }
+/**
+ * Prepares the file query data from input data and locales
+ */
+function prepareFileQueryData(data, locales) {
+    const fileQueryData = [];
+    for (const file in data) {
+        for (const locale of locales) {
+            fileQueryData.push({
+                versionId: data[file].versionId,
+                fileName: data[file].fileName,
+                locale,
+            });
+        }
+    }
+    return fileQueryData;
+}
+/**
+ * Generates a formatted status text showing translation progress
+ * @param downloadedFiles - Set of downloaded file+locale combinations
+ * @param fileQueryData - Array of file query data objects
+ * @returns Formatted status text
+ */
+function generateStatusSuffixText(downloadStatus, fileQueryData) {
+    var _a;
+    // Simple progress indicator
+    const progressText = chalk_1.default.green(`[${downloadStatus.downloaded.size + downloadStatus.failed.size}/${fileQueryData.length}]`) + ` translations completed`;
+    // Get terminal height to adapt our output
+    const terminalHeight = process.stdout.rows || 24; // Default to 24 if undefined
+    // If terminal is very small, just show the basic progress
+    if (terminalHeight < 6) {
+        return `\n${progressText}`;
+    }
+    const newSuffixText = [`\n${progressText}`];
+    // Organize data by filename
+    const fileStatus = new Map();
+    // Initialize with all files and locales from fileQueryData
+    for (const item of fileQueryData) {
+        if (!fileStatus.has(item.fileName)) {
+            fileStatus.set(item.fileName, {
+                completed: new Set(),
+                pending: new Set([item.locale]),
+                failed: new Set(),
+            });
+        }
+        else {
+            (_a = fileStatus.get(item.fileName)) === null || _a === void 0 ? void 0 : _a.pending.add(item.locale);
+        }
+    }
+    // Mark which ones are completed or failed
+    for (const fileLocale of downloadStatus.downloaded) {
+        const [fileName, locale] = fileLocale.split(':');
+        const status = fileStatus.get(fileName);
+        if (status) {
+            status.pending.delete(locale);
+            status.completed.add(locale);
+        }
+    }
+    for (const fileLocale of downloadStatus.failed) {
+        const [fileName, locale] = fileLocale.split(':');
+        const status = fileStatus.get(fileName);
+        if (status) {
+            status.pending.delete(locale);
+            status.failed.add(locale);
+        }
+    }
+    // Calculate how many files we can show based on terminal height
+    const filesArray = Array.from(fileStatus.entries());
+    const maxFilesToShow = Math.min(filesArray.length, terminalHeight - 3 // Header + progress + buffer
+    );
+    // Display each file with its status on a single line
+    for (let i = 0; i < maxFilesToShow; i++) {
+        const [fileName, status] = filesArray[i];
+        // Create condensed locale status
+        const localeStatuses = [];
+        // Add completed locales
+        if (status.completed.size > 0) {
+            const completedCodes = Array.from(status.completed)
+                .map((locale) => (0, generaltranslation_1.getLocaleProperties)(locale).code)
+                .join(', ');
+            localeStatuses.push(chalk_1.default.green(`${completedCodes}`));
+        }
+        // Add failed locales
+        if (status.failed.size > 0) {
+            const failedCodes = Array.from(status.failed)
+                .map((locale) => (0, generaltranslation_1.getLocaleProperties)(locale).code)
+                .join(', ');
+            localeStatuses.push(chalk_1.default.red(`${failedCodes}`));
+        }
+        // Add pending locales
+        if (status.pending.size > 0) {
+            const pendingCodes = Array.from(status.pending)
+                .map((locale) => (0, generaltranslation_1.getLocaleProperties)(locale).code)
+                .join(', ');
+            localeStatuses.push(chalk_1.default.yellow(`${pendingCodes}`));
+        }
+        // Format the line
+        newSuffixText.push(`${chalk_1.default.bold(fileName)} [${localeStatuses.join(', ')}]`);
+    }
+    // If we couldn't show all files, add an indicator
+    if (filesArray.length > maxFilesToShow) {
+        newSuffixText.push(`... and ${filesArray.length - maxFilesToShow} more files`);
+    }
+    return newSuffixText.join('\n');
+}
+/**
+ * Checks translation status and downloads ready files
+ */
+function checkTranslationDeployment(baseUrl, apiKey, fileQueryData, downloadStatus, spinner, resolveOutputPath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            // Only query for files that haven't been downloaded yet
+            const currentQueryData = fileQueryData.filter((item) => !downloadStatus.downloaded.has(`${item.fileName}:${item.locale}`) &&
+                !downloadStatus.failed.has(`${item.fileName}:${item.locale}`));
+            // If all files have been downloaded, we're done
+            if (currentQueryData.length === 0) {
+                return true;
+            }
+            const response = yield fetch(`${baseUrl}/v1/project/translations/files/retrieve`, {
+                method: 'POST',
+                headers: Object.assign({ 'Content-Type': 'application/json' }, (apiKey && { 'x-gt-api-key': apiKey })),
+                body: JSON.stringify({ files: currentQueryData }),
+            });
+            if (response.ok) {
+                const responseData = yield response.json();
+                const translations = responseData.translations || [];
+                // Filter for ready translations
+                const readyTranslations = translations.filter((translation) => translation.isReady && translation.fileName);
+                if (readyTranslations.length > 0) {
+                    // Prepare batch download data
+                    const batchFiles = readyTranslations.map((translation) => {
+                        const locale = translation.locale;
+                        const fileName = translation.fileName;
+                        const translationId = translation.id;
+                        const outputPath = resolveOutputPath(fileName, locale);
+                        return {
+                            translationId,
+                            outputPath,
+                            fileLocale: `${fileName}:${locale}`,
+                        };
+                    });
+                    // Use batch download if there are multiple files
+                    if (batchFiles.length > 1) {
+                        const batchResult = yield (0, downloadFileBatch_1.downloadFileBatch)(baseUrl, apiKey, batchFiles.map(({ translationId, outputPath }) => ({
+                            translationId,
+                            outputPath,
+                        })));
+                        // Process results
+                        batchFiles.forEach((file) => {
+                            const { translationId, fileLocale } = file;
+                            if (batchResult.successful.includes(translationId)) {
+                                downloadStatus.downloaded.add(fileLocale);
+                            }
+                            else if (batchResult.failed.includes(translationId)) {
+                                downloadStatus.failed.add(fileLocale);
+                            }
+                        });
+                    }
+                    else if (batchFiles.length === 1) {
+                        // For a single file, use the original downloadFile method
+                        const file = batchFiles[0];
+                        const result = yield (0, downloadFile_1.downloadFile)(baseUrl, apiKey, file.translationId, file.outputPath);
+                        if (result) {
+                            downloadStatus.downloaded.add(file.fileLocale);
+                        }
+                        else {
+                            downloadStatus.failed.add(file.fileLocale);
+                        }
+                    }
+                }
+                // Force a refresh of the spinner display
+                const statusText = generateStatusSuffixText(downloadStatus, fileQueryData);
+                // Clear and reapply the suffix to force a refresh
+                spinner.suffixText = statusText;
+            }
+            if (downloadStatus.downloaded.size + downloadStatus.failed.size ===
+                fileQueryData.length) {
+                return true;
+            }
+            return false;
+        }
+        catch (error) {
+            console.error('Error checking translation status:', error);
+            return false;
+        }
+    });
+}

package/dist/api/downloadFile.d.ts

@@ -1 +1 @@
-export declare function downloadFile(baseUrl: string, apiKey: string, translationId: string, outputPath: string): Promise<boolean>;
+export declare function downloadFile(baseUrl: string, apiKey: string, translationId: string, outputPath: string, maxRetries?: number, retryDelay?: number): Promise<boolean>;

package/dist/api/downloadFile.js

@@ -46,30 +46,45 @@ exports.downloadFile = downloadFile;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 // Helper function to download a file
-function downloadFile(baseUrl, apiKey, translationId, outputPath) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const downloadResponse = yield fetch(`${baseUrl}/v1/project/translations/files/${translationId}/download`, {
-                method: 'GET',
-                headers: Object.assign({}, (apiKey && { 'x-gt-api-key': apiKey })),
-            });
-            if (downloadResponse.ok) {
-                // Ensure the directory exists
-                const dir = path.dirname(outputPath);
-                if (!fs.existsSync(dir)) {
-                    fs.mkdirSync(dir, { recursive: true });
+function downloadFile(baseUrl_1, apiKey_1, translationId_1, outputPath_1) {
+    return __awaiter(this, arguments, void 0, function* (baseUrl, apiKey, translationId, outputPath, maxRetries = 3, retryDelay = 1000) {
+        let retries = 0;
+        while (retries <= maxRetries) {
+            try {
+                const downloadResponse = yield fetch(`${baseUrl}/v1/project/translations/files/${translationId}/download`, {
+                    method: 'GET',
+                    headers: Object.assign({}, (apiKey && { 'x-gt-api-key': apiKey })),
+                });
+                if (downloadResponse.ok) {
+                    // Ensure the directory exists
+                    const dir = path.dirname(outputPath);
+                    if (!fs.existsSync(dir)) {
+                        fs.mkdirSync(dir, { recursive: true });
+                    }
+                    // Get the file data as an ArrayBuffer
+                    const fileData = yield downloadResponse.arrayBuffer();
+                    // Write the file to disk
+                    fs.writeFileSync(outputPath, Buffer.from(fileData));
+                    return true;
                 }
-                // Get the file data as an ArrayBuffer
-                const fileData = yield downloadResponse.arrayBuffer();
-                // Write the file to disk
-                fs.writeFileSync(outputPath, Buffer.from(fileData));
-                return true;
+                // If we get here, the response was not OK
+                if (retries >= maxRetries) {
+                    console.error(`Failed to download file ${outputPath}. Status: ${downloadResponse.status} after ${maxRetries + 1} attempts.`);
+                    return false;
+                }
+                // Increment retry counter and wait before next attempt
+                retries++;
+                yield new Promise((resolve) => setTimeout(resolve, retryDelay));
+            }
+            catch (error) {
+                if (retries >= maxRetries) {
+                    console.error(`Error downloading file ${outputPath} after ${maxRetries + 1} attempts:`, error);
+                    return false;
+                }
+                retries++;
+                yield new Promise((resolve) => setTimeout(resolve, retryDelay));
             }
-            return false;
-        }
-        catch (error) {
-            console.error('Error downloading file:', error);
-            return false;
         }
+        return false;
     });
 }

package/dist/api/downloadFileBatch.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Downloads multiple translation files in a single batch request
+ * @param baseUrl - The base URL for the General Translation API
+ * @param apiKey - The API key for the General Translation API
+ * @param files - Array of files to download with their output paths
+ * @param maxRetries - Maximum number of retry attempts
+ * @param retryDelay - Delay between retries in milliseconds
+ * @returns Object containing successful and failed file IDs
+ */
+export declare function downloadFileBatch(baseUrl: string, apiKey: string, files: Array<{
+    translationId: string;
+    outputPath: string;
+}>, maxRetries?: number, retryDelay?: number): Promise<{
+    successful: string[];
+    failed: string[];
+}>;

package/dist/api/downloadFileBatch.js

@@ -0,0 +1,133 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.downloadFileBatch = downloadFileBatch;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+/**
+ * Downloads multiple translation files in a single batch request
+ * @param baseUrl - The base URL for the General Translation API
+ * @param apiKey - The API key for the General Translation API
+ * @param files - Array of files to download with their output paths
+ * @param maxRetries - Maximum number of retry attempts
+ * @param retryDelay - Delay between retries in milliseconds
+ * @returns Object containing successful and failed file IDs
+ */
+function downloadFileBatch(baseUrl_1, apiKey_1, files_1) {
+    return __awaiter(this, arguments, void 0, function* (baseUrl, apiKey, files, maxRetries = 3, retryDelay = 1000) {
+        let retries = 0;
+        const fileIds = files.map((file) => file.translationId);
+        const result = { successful: [], failed: [] };
+        // Create a map of translationId to outputPath for easier lookup
+        const outputPathMap = new Map(files.map((file) => [file.translationId, file.outputPath]));
+        while (retries <= maxRetries) {
+            try {
+                const response = yield fetch(`${baseUrl}/v1/project/translations/files/batch-download`, {
+                    method: 'POST',
+                    headers: Object.assign({ 'Content-Type': 'application/json' }, (apiKey && { 'x-gt-api-key': apiKey })),
+                    body: JSON.stringify({ fileIds }),
+                });
+                if (response.ok) {
+                    const responseData = yield response.json();
+                    const downloadedFiles = responseData.files || [];
+                    // Process each file in the response
+                    for (const file of downloadedFiles) {
+                        try {
+                            const translationId = file.id;
+                            const outputPath = outputPathMap.get(translationId);
+                            if (!outputPath) {
+                                console.warn(`No output path found for file: ${translationId}`);
+                                result.failed.push(translationId);
+                                continue;
+                            }
+                            // Ensure the directory exists
+                            const dir = path.dirname(outputPath);
+                            if (!fs.existsSync(dir)) {
+                                fs.mkdirSync(dir, { recursive: true });
+                            }
+                            // Write the file to disk
+                            fs.writeFileSync(outputPath, file.data);
+                            result.successful.push(translationId);
+                        }
+                        catch (error) {
+                            console.error(`Error saving file ${file.id}:`, error);
+                            result.failed.push(file.id);
+                        }
+                    }
+                    // Add any files that weren't in the response to the failed list
+                    const downloadedIds = new Set(downloadedFiles.map((file) => file.id));
+                    for (const fileId of fileIds) {
+                        if (!downloadedIds.has(fileId) && !result.failed.includes(fileId)) {
+                            result.failed.push(fileId);
+                        }
+                    }
+                    return result;
+                }
+                // If we get here, the response was not OK
+                if (retries >= maxRetries) {
+                    console.error(`Failed to download files in batch. Status: ${response.status} after ${maxRetries + 1} attempts.`);
+                    // Mark all files as failed
+                    result.failed = [...fileIds];
+                    return result;
+                }
+                // Increment retry counter and wait before next attempt
+                retries++;
+                yield new Promise((resolve) => setTimeout(resolve, retryDelay));
+            }
+            catch (error) {
+                if (retries >= maxRetries) {
+                    console.error(`Error downloading files in batch after ${maxRetries + 1} attempts:`, error);
+                    // Mark all files as failed
+                    result.failed = [...fileIds];
+                    return result;
+                }
+                retries++;
+                yield new Promise((resolve) => setTimeout(resolve, retryDelay));
+            }
+        }
+        // Mark all files as failed if we get here
+        result.failed = [...fileIds];
+        return result;
+    });
+}

package/dist/api/sendFiles.d.ts

@@ -19,5 +19,6 @@ type ApiOptions = Settings & {
 export declare function sendFiles(files: FileToTranslate[], options: ApiOptions): Promise<{
     data: any;
     locales: any;
+    translations: any;
 }>;
 export {};

package/dist/api/sendFiles.js

@@ -27,7 +27,7 @@ function sendFiles(files, options) {
         console.log(chalk_1.default.cyan('\nFiles to translate:'));
         console.log(files.map((file) => `  - ${chalk_1.default.bold(file.fileName)}`).join('\n'));
         console.log();
-        const spinner = yield (0, console_1.displayLoadingAnimation)(`Sending ${files.length} file${files.length > 1 ? 's' : ''} to Translation API...`);
+        const spinner = yield (0, console_1.displayLoadingAnimation)(`Sending ${files.length} file${files.length > 1 ? 's' : ''} to General Translation API...`);
         try {
             // Create form data
             const formData = new FormData();
@@ -58,9 +58,9 @@ function sendFiles(files, options) {
             }
             const responseData = yield response.json();
             // Handle version ID response (for async processing)
-            const { data, message, locales } = responseData;
+            const { data, message, locales, translations } = responseData;
             spinner.succeed(chalk_1.default.green(message || 'Translation job submitted successfully'));
-            return { data, locales };
+            return { data, locales, translations };
         }
         catch (error) {
             spinner.fail(chalk_1.default.red('Failed to send files for translation'));

package/dist/api/sendUpdates.d.ts

@@ -1,4 +1,4 @@
-import { Settings, Updates } from '../types';
+import { Settings, SupportedLibraries, Updates } from '../types';
 import { DataFormat } from '../types/data';
 type ApiOptions = Settings & {
     publish: boolean;
@@ -12,7 +12,7 @@ type ApiOptions = Settings & {
  * @param options - The options for the API call
  * @returns The versionId of the updated project
  */
-export declare function sendUpdates(updates: Updates, options: ApiOptions): Promise<{
+export declare function sendUpdates(updates: Updates, options: ApiOptions, library: SupportedLibraries): Promise<{
     versionId: any;
 } | undefined>;
 export {};

package/dist/api/sendUpdates.js

@@ -23,7 +23,7 @@ const waitForUpdates_1 = require("./waitForUpdates");
  * @param options - The options for the API call
  * @returns The versionId of the updated project
  */
-function sendUpdates(updates, options) {
+function sendUpdates(updates, options, library) {
     return __awaiter(this, void 0, void 0, function* () {
         const { apiKey, projectId, defaultLocale, dataFormat } = options;
         const globalMetadata = Object.assign(Object.assign({}, (projectId && { projectId })), (defaultLocale && { sourceLocale: defaultLocale }));
@@ -31,7 +31,8 @@ function sendUpdates(updates, options) {
         // If not, then options.locales will be translated
         // If neither, then project.current_locales will be translated
         const body = Object.assign(Object.assign(Object.assign(Object.assign({ updates }, (options.locales && { locales: options.locales })), { metadata: globalMetadata, publish: options.publish }), (dataFormat && { dataFormat })), (options.versionId && { versionId: options.versionId }));
-        const spinner = yield (0, console_1.displayLoadingAnimation)('Sending updates to General Translation API...');
+        console.log();
+        const spinner = yield (0, console_1.displayLoadingAnimation)(`Sending ${library} updates to General Translation API...`);
         try {
             const startTime = Date.now();
             const response = yield fetch(`${options.baseUrl}/v1/project/translations/update`, {

package/dist/cli/base.d.ts

@@ -1,7 +1,7 @@
 import { Settings, SupportedLibraries } from '../types';
 export declare class BaseCLI {
-    private library;
-    private additionalModules;
+    protected library: SupportedLibraries;
+    protected additionalModules: SupportedLibraries[];
     constructor(library: SupportedLibraries, additionalModules?: SupportedLibraries[]);
     init(): void;
     execute(): void;

package/dist/cli/react.js

@@ -52,7 +52,6 @@ const console_1 = require("../console/console");
 const loadJSON_1 = __importDefault(require("../fs/loadJSON"));
 const findFilepath_1 = __importStar(require("../fs/findFilepath"));
 const createESBuildConfig_1 = __importDefault(require("../react/config/createESBuildConfig"));
-const errors_1 = require("../console/errors");
 const internal_1 = require("generaltranslation/internal");
 const chalk_1 = __importDefault(require("chalk"));
 const prompts_1 = require("@inquirer/prompts");
@@ -439,7 +438,7 @@ class ReactCLI extends base_1.BaseCLI {
                 // Error if no projectId at this point
                 if (!settings.projectId)
                     throw new Error('No General Translation Project ID found. Use the --project-id flag to provide one.');
-                const updateResponse = yield (0, sendUpdates_1.sendUpdates)(updates, Object.assign(Object.assign({}, settings), { publish: options.publish, wait: options.wait, timeout: options.timeout, dataFormat: 'JSX' }));
+                const updateResponse = yield (0, sendUpdates_1.sendUpdates)(updates, Object.assign(Object.assign({}, settings), { publish: options.publish, wait: options.wait, timeout: options.timeout, dataFormat: 'JSX' }), this.library);
                 const versionId = updateResponse === null || updateResponse === void 0 ? void 0 : updateResponse.versionId;
                 // Save translations to local directory if files.gt.output is provided
                 if (versionId && options.files.placeholderPaths.gt) {
@@ -449,7 +448,7 @@ class ReactCLI extends base_1.BaseCLI {
                 }
             }
             else {
-                console.log(chalk_1.default.red(errors_1.noTranslationsError));
+                console.log(chalk_1.default.red(`No in-line content or dictionaries were found for ${chalk_1.default.green(this.library)}. Are you sure you're running this command in the right directory?`));
                 process.exit(0);
             }
         });

package/dist/console/errors.d.ts

@@ -1,4 +1,3 @@
-export declare const noTranslationsError = "No in-line content or dictionaries were found. Are you sure you're running this command in the right directory?";
 export declare const noLocalesError = "No locales found! Please provide a list of locales to translate to, or specify them in your gt.config.json file.";
 export declare const noDefaultLocaleError = "No default locale found! Please provide a default locale, or specify it in your gt.config.json file.";
 export declare const noFilesError = "No files configuration found! Please make sure your files are configured correctly in your gt.config.json file.";

package/dist/console/errors.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.noProjectIdError = exports.noApiKeyError = exports.noSupportedDataFormatError = exports.noDataFormatError = exports.noSourceFileError = exports.noFilesError = exports.noDefaultLocaleError = exports.noLocalesError = exports.noTranslationsError = void 0;
-exports.noTranslationsError = `No in-line content or dictionaries were found. Are you sure you're running this command in the right directory?`;
+exports.noProjectIdError = exports.noApiKeyError = exports.noSupportedDataFormatError = exports.noDataFormatError = exports.noSourceFileError = exports.noFilesError = exports.noDefaultLocaleError = exports.noLocalesError = void 0;
 exports.noLocalesError = `No locales found! Please provide a list of locales to translate to, or specify them in your gt.config.json file.`;
 exports.noDefaultLocaleError = `No default locale found! Please provide a default locale, or specify it in your gt.config.json file.`;
 exports.noFilesError = `No files configuration found! Please make sure your files are configured correctly in your gt.config.json file.`;

package/dist/formats/files/translate.js

@@ -20,6 +20,9 @@ const parseFilesConfig_1 = require("../../fs/config/parseFilesConfig");
 const findFilepath_1 = require("../../fs/findFilepath");
 const flattenDictionary_1 = require("../../react/utils/flattenDictionary");
 const path_1 = __importDefault(require("path"));
+const downloadFile_1 = require("../../api/downloadFile");
+const downloadFileBatch_1 = require("../../api/downloadFileBatch");
+const console_1 = require("../../console/console");
 const SUPPORTED_DATA_FORMATS = ['JSX', 'ICU', 'I18NEXT'];
 /**
  * Sends multiple files to the API for translation
@@ -91,46 +94,123 @@ function translateFiles(filePaths_1, placeholderPaths_1, transformPaths_1) {
         try {
             // Send all files in a single API call
             const response = yield (0, sendFiles_1.sendFiles)(allFiles, Object.assign(Object.assign({}, options), { publish: false, wait: true }));
-            const { data, locales } = response;
+            const { data, locales, translations } = response;
             // Create file mapping for all file types
-            const fileMapping = {};
-            for (const locale of locales) {
-                const translatedPaths = (0, parseFilesConfig_1.resolveLocaleFiles)(placeholderPaths, locale);
-                const localeMapping = {};
-                // Process each file type
-                for (const typeIndex of ['json', 'mdx', 'md']) {
-                    if (!filePaths[typeIndex] || !translatedPaths[typeIndex])
-                        continue;
-                    const sourcePaths = filePaths[typeIndex];
-                    let translatedFiles = translatedPaths[typeIndex];
-                    if (!translatedFiles)
-                        continue;
-                    const transformPath = transformPaths[typeIndex];
-                    if (transformPath) {
-                        translatedFiles = translatedFiles.map((filePath) => {
-                            const directory = path_1.default.dirname(filePath);
-                            const fileName = path_1.default.basename(filePath);
-                            const baseName = fileName.split('.')[0];
-                            const transformedFileName = transformPath
-                                .replace('*', baseName)
-                                .replace('[locale]', locale);
-                            return path_1.default.join(directory, transformedFileName);
-                        });
+            const fileMapping = createFileMapping(filePaths, placeholderPaths, transformPaths, locales);
+            // Process any translations that were already completed and returned with the initial response
+            const downloadStatus = yield processInitialTranslations(translations, fileMapping, options);
+            // Check for remaining translations
+            yield (0, checkFileTranslations_1.checkFileTranslations)(options.apiKey, options.baseUrl, data, locales, 600, (sourcePath, locale) => fileMapping[locale][sourcePath], downloadStatus // Pass the already downloaded files to avoid duplicate requests
+            );
+        }
+        catch (error) {
+            console.error('Error translating files:', error);
+        }
+    });
+}
+/**
+ * Creates a mapping between source files and their translated counterparts for each locale
+ */
+function createFileMapping(filePaths, placeholderPaths, transformPaths, locales) {
+    const fileMapping = {};
+    for (const locale of locales) {
+        const translatedPaths = (0, parseFilesConfig_1.resolveLocaleFiles)(placeholderPaths, locale);
+        const localeMapping = {};
+        // Process each file type
+        for (const typeIndex of ['json', 'mdx', 'md']) {
+            if (!filePaths[typeIndex] || !translatedPaths[typeIndex])
+                continue;
+            const sourcePaths = filePaths[typeIndex];
+            let translatedFiles = translatedPaths[typeIndex];
+            if (!translatedFiles)
+                continue;
+            const transformPath = transformPaths[typeIndex];
+            if (transformPath) {
+                translatedFiles = translatedFiles.map((filePath) => {
+                    const directory = path_1.default.dirname(filePath);
+                    const fileName = path_1.default.basename(filePath);
+                    const baseName = fileName.split('.')[0];
+                    const transformedFileName = transformPath
+                        .replace('*', baseName)
+                        .replace('[locale]', locale);
+                    return path_1.default.join(directory, transformedFileName);
+                });
+            }
+            for (let i = 0; i < sourcePaths.length; i++) {
+                const sourceFile = (0, findFilepath_1.getRelative)(sourcePaths[i]);
+                const translatedFile = (0, findFilepath_1.getRelative)(translatedFiles[i]);
+                localeMapping[sourceFile] = translatedFile;
+            }
+        }
+        fileMapping[locale] = localeMapping;
+    }
+    return fileMapping;
+}
+/**
+ * Processes translations that were already completed and returned with the initial API response
+ * @returns Set of downloaded file+locale combinations
+ */
+function processInitialTranslations() {
+    return __awaiter(this, arguments, void 0, function* (translations = [], fileMapping, options) {
+        const downloadStatus = {
+            downloaded: new Set(),
+            failed: new Set(),
+        };
+        if (!translations || translations.length === 0) {
+            return downloadStatus;
+        }
+        // Filter for ready translations
+        const readyTranslations = translations.filter((translation) => translation.isReady && translation.fileName);
+        if (readyTranslations.length > 0) {
+            const spinner = yield (0, console_1.displayLoadingAnimation)('Downloading translations...');
+            // Prepare batch download data
+            const batchFiles = readyTranslations
+                .map((translation) => {
+                const { locale, fileName, id } = translation;
+                const outputPath = fileMapping[locale][fileName];
+                if (!outputPath) {
+                    return null;
+                }
+                return {
+                    translationId: id,
+                    outputPath,
+                    fileLocale: `${fileName}:${locale}`,
+                };
+            })
+                .filter(Boolean);
+            if (batchFiles.length === 0 || batchFiles[0] === null) {
+                return downloadStatus;
+            }
+            // Use batch download if there are multiple files
+            if (batchFiles.length > 1) {
+                const batchResult = yield (0, downloadFileBatch_1.downloadFileBatch)(options.baseUrl, options.apiKey, batchFiles.map(({ translationId, outputPath }) => ({
+                    translationId,
+                    outputPath,
+                })));
+                // Process results
+                batchFiles.forEach((file) => {
+                    const { translationId, fileLocale } = file;
+                    if (batchResult.successful.includes(translationId)) {
+                        downloadStatus.downloaded.add(fileLocale);
                     }
-                    for (let i = 0; i < sourcePaths.length; i++) {
-                        const sourceFile = (0, findFilepath_1.getRelative)(sourcePaths[i]);
-                        const translatedFile = (0, findFilepath_1.getRelative)(translatedFiles[i]);
-                        localeMapping[sourceFile] = translatedFile;
+                    else if (batchResult.failed.includes(translationId)) {
+                        downloadStatus.failed.add(fileLocale);
                     }
+                });
+            }
+            else if (batchFiles.length === 1) {
+                // For a single file, use the original downloadFile method
+                const file = batchFiles[0];
+                const result = yield (0, downloadFile_1.downloadFile)(options.baseUrl, options.apiKey, file.translationId, file.outputPath);
+                if (result) {
+                    downloadStatus.downloaded.add(file.fileLocale);
+                }
+                else {
+                    downloadStatus.failed.add(file.fileLocale);
                 }
-                fileMapping[locale] = localeMapping;
             }
-            yield (0, checkFileTranslations_1.checkFileTranslations)(options.apiKey, options.baseUrl, data, locales, 600, (sourcePath, locale) => {
-                return fileMapping[locale][sourcePath];
-            });
-        }
-        catch (error) {
-            console.error('Error translating files:', error);
+            spinner.succeed('Downloaded cached translations');
         }
+        return downloadStatus;
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtx-cli",
-  "version": "1.1.7-alpha.1",
+  "version": "1.1.7-alpha.2",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "scripts": {

package/dist/formats/json/save.d.ts

@@ -1,11 +0,0 @@
-import { RetrievedTranslations } from '../../types/api';
-import { DataFormat } from '../../types/data';
-import { ResolvedFiles } from '../../types';
-/**
- * Saves translations to a file
- * @param translations - The translations to save
- * @param filePath - The file path to save the translations to
- * @param dataFormat - The data format to save the translations as
- * @deprecated Use saveFiles instead
- */
-export declare function saveTranslations(translations: RetrievedTranslations, placeholderPaths: ResolvedFiles, dataFormat: DataFormat): void;

package/dist/formats/json/save.js

@@ -1,67 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.saveTranslations = saveTranslations;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const parseFilesConfig_1 = require("../../fs/config/parseFilesConfig");
-const errors_1 = require("../../console/errors");
-/**
- * Saves translations to a file
- * @param translations - The translations to save
- * @param filePath - The file path to save the translations to
- * @param dataFormat - The data format to save the translations as
- * @deprecated Use saveFiles instead
- */
-function saveTranslations(translations, placeholderPaths, dataFormat) {
-    for (const translation of translations) {
-        const locale = translation.locale;
-        const translationFiles = (0, parseFilesConfig_1.resolveLocaleFiles)(placeholderPaths, locale);
-        if (!translationFiles.json) {
-            console.error(errors_1.noFilesError);
-            process.exit(1);
-        }
-        const translationData = translation.translation;
-        const translationMetadata = translation.metadata;
-        // Ensure directory exists
-        fs_1.default.mkdirSync(path_1.default.dirname(translationFiles.json[0]), { recursive: true });
-        // Handle different file types
-        let writeData;
-        if (dataFormat === 'ICU' ||
-            dataFormat === 'I18NEXT' ||
-            dataFormat === 'JSX') {
-            // JSONs need to be mapped back to the original format
-            const revertedJson = {};
-            for (const hash in translationData) {
-                const metadata = translationMetadata[hash];
-                const entry = translationData[hash];
-                if (metadata.id) {
-                    const keyPath = metadata.id.split('.');
-                    let current = revertedJson;
-                    // Process all keys except the last one
-                    for (let i = 0; i < keyPath.length - 1; i++) {
-                        const key = keyPath[i];
-                        // Make sure the current key points to an object
-                        if (!current[key] ||
-                            typeof current[key] !== 'object' ||
-                            Array.isArray(current[key])) {
-                            current[key] = {};
-                        }
-                        current = current[key];
-                    }
-                    // Set the value at the last key
-                    current[keyPath[keyPath.length - 1]] = entry;
-                }
-            }
-            writeData = JSON.stringify(revertedJson, null, 2);
-        }
-        // else if (dataFormat === 'yaml') {
-        //   writeData = yaml.stringify(translationData);
-        // }
-        if (writeData) {
-            fs_1.default.writeFileSync(translationFiles.json[0], writeData);
-        }
-    }
-}

package/dist/formats/json/translate.d.ts

@@ -1,17 +0,0 @@
-import { Settings } from '../../types';
-import { DataFormat } from '../../types/data';
-import { ResolvedFiles } from '../../types';
-/**
- * Translates a JSON object and saves the translations to a local directory
- * @param sourceJson - The source JSON object
- * @param defaultLocale - The default locale
- * @param locales - The locales to translate to
- * @param library - The library to use
- * @param apiKey - The API key for the General Translation API
- * @param projectId - The project ID
- * @param config - The config file path
- * @param translationsDir - The directory to save the translations to
- * @param fileType - The file type to save the translations as (file extension)
- * @deprecated Use translateFiles instead
- */
-export declare function translateJson(sourceJson: any, settings: Settings, dataFormat: DataFormat, placeholderPaths: ResolvedFiles): Promise<void>;

package/dist/formats/json/translate.js

@@ -1,52 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.translateJson = translateJson;
-const flattenDictionary_1 = require("../../react/utils/flattenDictionary");
-const sendUpdates_1 = require("../../api/sendUpdates");
-const fetchTranslations_1 = require("../../api/fetchTranslations");
-const save_1 = require("./save");
-/**
- * Translates a JSON object and saves the translations to a local directory
- * @param sourceJson - The source JSON object
- * @param defaultLocale - The default locale
- * @param locales - The locales to translate to
- * @param library - The library to use
- * @param apiKey - The API key for the General Translation API
- * @param projectId - The project ID
- * @param config - The config file path
- * @param translationsDir - The directory to save the translations to
- * @param fileType - The file type to save the translations as (file extension)
- * @deprecated Use translateFiles instead
- */
-function translateJson(sourceJson, settings, dataFormat, placeholderPaths) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const flattened = (0, flattenDictionary_1.flattenJsonDictionary)(sourceJson);
-        const updates = [];
-        for (const id of Object.keys(flattened)) {
-            const source = flattened[id];
-            const metadata = {
-                id,
-            };
-            updates.push({
-                dataFormat,
-                source,
-                metadata,
-            });
-        }
-        // Actually do the translation
-        const updateResponse = yield (0, sendUpdates_1.sendUpdates)(updates, Object.assign(Object.assign({}, settings), { publish: false, wait: true, timeout: '600', dataFormat }));
-        if (updateResponse === null || updateResponse === void 0 ? void 0 : updateResponse.versionId) {
-            const translations = yield (0, fetchTranslations_1.fetchTranslations)(settings.baseUrl, settings.apiKey, updateResponse.versionId);
-            (0, save_1.saveTranslations)(translations, placeholderPaths, dataFormat);
-        }
-    });
-}