gtx-cli 2.2.0 → 2.3.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # gtx-cli
 
+## 2.3.0
+
+### Minor Changes
+
+- [#651](https://github.com/generaltranslation/gt/pull/651) [`3e5705b`](https://github.com/generaltranslation/gt/commit/3e5705bc96005441798619fec97574fa15a5a2bd) Thanks [@fernando-aviles](https://github.com/fernando-aviles)! - Split up file upload into source/translation specific uploads; added project setup visibility
+
+### Patch Changes
+
+- Updated dependencies [[`3e5705b`](https://github.com/generaltranslation/gt/commit/3e5705bc96005441798619fec97574fa15a5a2bd)]:
+  - generaltranslation@7.6.0
+
 ## 2.2.0
 
 ### Minor Changes

package/dist/api/sendFiles.js

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import { createSpinner, logMessage, logSuccess } from '../console/logging.js';
+import { createSpinner, logError, logMessage, logSuccess, } from '../console/logging.js';
 import { gt } from '../utils/gt.js';
 import { TEMPLATE_FILE_NAME } from '../cli/commands/stage.js';
 /**
@@ -9,6 +9,8 @@ import { TEMPLATE_FILE_NAME } from '../cli/commands/stage.js';
  * @returns The translated content or version ID
  */
 export async function sendFiles(files, options, settings) {
+    // Keep track of the most recent spinner so we can stop it on error
+    let currentSpinner = null;
     logMessage(chalk.cyan('Files to translate:') +
         '\n' +
         files
@@ -19,26 +21,95 @@ export async function sendFiles(files, options, settings) {
             return `- ${file.fileName}`;
         })
             .join('\n'));
-    const spinner = createSpinner('dots');
-    spinner.start(`Sending ${files.length} file${files.length !== 1 ? 's' : ''} to General Translation API...`);
     try {
-        // Send the files to the API
-        const responseData = await gt.enqueueFiles(files, {
-            publish: settings.publish,
+        // Step 1: Upload files (get references)
+        const uploadSpinner = createSpinner('dots');
+        currentSpinner = uploadSpinner;
+        uploadSpinner.start(`Uploading ${files.length} file${files.length !== 1 ? 's' : ''} to General Translation API...`);
+        const sourceLocale = settings.defaultLocale;
+        if (!sourceLocale) {
+            uploadSpinner.stop(chalk.red('Missing default source locale'));
+            throw new Error('sendFiles: settings.defaultLocale is required to upload source files');
+        }
+        // Convert FileToTranslate[] -> { source: FileUpload }[]
+        const uploads = files.map(({ content, fileName, fileFormat, dataFormat }) => ({
+            source: {
+                content,
+                fileName,
+                fileFormat,
+                dataFormat,
+                locale: sourceLocale,
+            },
+        }));
+        const upload = await gt.uploadSourceFiles(uploads, {
+            sourceLocale,
+            modelProvider: settings.modelProvider,
+        });
+        uploadSpinner.stop(chalk.green('Files uploaded successfully'));
+        // Check if setup is needed
+        const setupDecision = await Promise.resolve(gt.shouldSetupProject?.())
+            .then((v) => v)
+            .catch(() => ({ shouldSetupProject: false }));
+        const shouldSetupProject = Boolean(setupDecision?.shouldSetupProject);
+        // Step 2: Setup if needed and poll until complete
+        if (shouldSetupProject) {
+            // Calculate timeout once for setup fetching
+            // Accept number or numeric string, default to 600s
+            const timeoutVal = options?.timeout !== undefined ? Number(options.timeout) : 600;
+            const setupTimeoutMs = (Number.isFinite(timeoutVal) ? timeoutVal : 600) * 1000;
+            const { setupJobId } = await gt.setupProject(upload.uploadedFiles);
+            const setupSpinner = createSpinner('dots');
+            currentSpinner = setupSpinner;
+            setupSpinner.start('Setting up project...');
+            const start = Date.now();
+            const pollInterval = 2000;
+            let setupCompleted = false;
+            let setupFailedMessage = null;
+            while (true) {
+                const status = await gt.checkSetupStatus(setupJobId);
+                if (status.status === 'completed') {
+                    setupCompleted = true;
+                    break;
+                }
+                if (status.status === 'failed') {
+                    setupFailedMessage = status.error?.message || 'Unknown error';
+                    break;
+                }
+                if (Date.now() - start > setupTimeoutMs) {
+                    setupFailedMessage = 'Timed out while waiting for setup generation';
+                    break;
+                }
+                await new Promise((r) => setTimeout(r, pollInterval));
+            }
+            if (setupCompleted) {
+                setupSpinner.stop(chalk.green('Setup successfully completed'));
+            }
+            else {
+                setupSpinner.stop(chalk.yellow(`Setup ${setupFailedMessage ? 'failed' : 'timed out'} — proceeding without setup${setupFailedMessage ? ` (${setupFailedMessage})` : ''}`));
+            }
+        }
+        // Step 3: Enqueue translations by reference
+        const enqueueSpinner = createSpinner('dots');
+        currentSpinner = enqueueSpinner;
+        enqueueSpinner.start('Enqueuing translations...');
+        const enqueueResult = await gt.enqueueFiles(upload.uploadedFiles, {
             sourceLocale: settings.defaultLocale,
             targetLocales: settings.locales,
-            version: settings.version, // not set ATM
+            publish: settings.publish,
+            requireApproval: settings.stageTranslations,
             modelProvider: settings.modelProvider,
             force: options?.force,
         });
-        // Handle version ID response (for async processing)
-        const { data, message, locales, translations } = responseData;
-        spinner.stop(chalk.green('Files for translation uploaded successfully'));
+        const { data, message, locales, translations } = enqueueResult;
+        enqueueSpinner.stop(chalk.green('Files for translation uploaded successfully'));
         logSuccess(message);
         return { data, locales, translations };
     }
     catch (error) {
-        spinner.stop(chalk.red('Failed to send files for translation'));
+        if (currentSpinner) {
+            currentSpinner.stop(chalk.red('Failed to send files for translation'));
+        }
+        logError('Failed to send files for translation');
         throw error;
     }
 }

package/dist/api/uploadFiles.d.ts

@@ -24,4 +24,4 @@ export type UploadData = {
 export declare function uploadFiles(files: {
     source: FileUpload;
     translations: FileUpload[];
-}[], options: Settings): Promise<any>;
+}[], options: Settings): Promise<void>;

package/dist/api/uploadFiles.js

@@ -18,12 +18,20 @@ export async function uploadFiles(files, options) {
     const spinner = createSpinner('dots');
     spinner.start(`Uploading ${files.length} file${files.length !== 1 ? 's' : ''} to General Translation...`);
     try {
-        const result = gt.uploadFiles(files, {
+        // Upload sources
+        await gt.uploadSourceFiles(files, {
             ...options,
             sourceLocale: options.defaultLocale,
         });
+        // Upload translations (if any exist)
+        const withTranslations = files.filter((f) => f.translations.length > 0);
+        if (withTranslations.length > 0) {
+            await gt.uploadTranslations(withTranslations, {
+                ...options,
+                sourceLocale: options.defaultLocale, // optional, safe to include
+            });
+        }
         spinner.stop(chalk.green('Files uploaded successfully'));
-        return result;
     }
     catch {
         spinner.stop(chalk.red('An unexpected error occurred while uploading files'));

package/dist/formats/files/upload.js

@@ -100,9 +100,8 @@ export async function upload(filePaths, placeholderPaths, transformPaths, dataFo
     const fileMapping = createFileMapping(filePaths, placeholderPaths, transformPaths, locales, options.defaultLocale);
     // construct object
     const uploadData = allFiles.map((file) => {
-        const encodedContent = Buffer.from(file.content).toString('base64');
         const sourceFile = {
-            content: encodedContent,
+            content: file.content,
             fileName: file.fileName,
             fileFormat: file.fileFormat,
             dataFormat: file.dataFormat,
@@ -113,9 +112,8 @@ export async function upload(filePaths, placeholderPaths, transformPaths, dataFo
             const translatedFileName = fileMapping[locale][file.fileName];
             if (translatedFileName && existsSync(translatedFileName)) {
                 const translatedContent = readFileSync(translatedFileName, 'utf8');
-                const encodedTranslatedContent = Buffer.from(translatedContent).toString('base64');
                 translations.push({
-                    content: encodedTranslatedContent,
+                    content: translatedContent,
                     fileName: translatedFileName,
                     fileFormat: file.fileFormat,
                     dataFormat: file.dataFormat,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtx-cli",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [
@@ -87,7 +87,7 @@
     "esbuild": "^0.25.4",
     "fast-glob": "^3.3.3",
     "form-data": "^4.0.4",
-    "generaltranslation": "^7.5.0",
+    "generaltranslation": "^7.6.0",
     "json-pointer": "^0.6.2",
     "jsonpath-plus": "^10.3.0",
     "jsonpointer": "^5.0.1",