gtx-cli 2.1.21 → 2.2.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # gtx-cli
 
+## 2.2.0
+
+### Minor Changes
+
+- [#638](https://github.com/generaltranslation/gt/pull/638) [`16bf30d`](https://github.com/generaltranslation/gt/commit/16bf30d70a0599ec863305f4f7a5a0852dd07e5d) Thanks [@ErnestM1234](https://github.com/ErnestM1234)! - feat: add locale aliasing
+
+### Patch Changes
+
+- Updated dependencies [[`16bf30d`](https://github.com/generaltranslation/gt/commit/16bf30d70a0599ec863305f4f7a5a0852dd07e5d)]:
+  - generaltranslation@7.5.0
+
 ## 2.1.21
 
 ### Patch Changes

package/dist/api/checkFileTranslations.js

@@ -182,7 +182,7 @@ async function checkTranslationDeployment(fileQueryData, downloadStatus, spinner
             // Prepare batch download data
             const batchFiles = readyTranslations
                 .map((translation) => {
-                const locale = translation.locale;
+                const locale = gt.resolveAliasLocale(translation.locale);
                 const fileName = translation.fileName;
                 const translationId = translation.id;
                 const outputPath = resolveOutputPath(fileName, locale);

package/dist/api/downloadFileBatch.js

@@ -20,7 +20,10 @@ export async function downloadFileBatch(files, options, maxRetries = 3, retryDel
     // Create a map of translationId to outputPath for easier lookup
     const outputPathMap = new Map(files.map((file) => [file.translationId, file.outputPath]));
     const inputPathMap = new Map(files.map((file) => [file.translationId, file.inputPath]));
-    const localeMap = new Map(files.map((file) => [file.translationId, file.locale]));
+    const localeMap = new Map(files.map((file) => [
+        file.translationId,
+        gt.resolveAliasLocale(file.locale),
+    ]));
     while (retries <= maxRetries) {
         try {
             // Download the files

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<Response>;
+}[], options: Settings): Promise<any>;

package/dist/api/uploadFiles.js

@@ -1,5 +1,6 @@
 import chalk from 'chalk';
 import { createSpinner, exit, logMessage } from '../console/logging.js';
+import { gt } from '../utils/gt.js';
 /**
  * Uploads multiple files to the API
  * @param files - Array of file objects to upload
@@ -16,31 +17,15 @@ export async function uploadFiles(files, options) {
             .join('\n'));
     const spinner = createSpinner('dots');
     spinner.start(`Uploading ${files.length} file${files.length !== 1 ? 's' : ''} to General Translation...`);
-    const uploadData = {
-        data: files.map((file) => ({
-            source: file.source,
-            translations: file.translations,
-        })),
-        sourceLocale: options.defaultLocale,
-        ...(options.modelProvider && { modelProvider: options.modelProvider }),
-    };
     try {
-        const response = await fetch(`${options.baseUrl}/v1/project/files/upload`, {
-            method: 'POST',
-            body: JSON.stringify(uploadData),
-            headers: {
-                'Content-Type': 'application/json',
-                'x-gt-api-key': options.apiKey,
-                'x-gt-project-id': options.projectId,
-            },
+        const result = gt.uploadFiles(files, {
+            ...options,
+            sourceLocale: options.defaultLocale,
         });
-        if (!response.ok) {
-            throw new Error(`Failed to upload files: ${response.statusText} (${response.status})`);
-        }
         spinner.stop(chalk.green('Files uploaded successfully'));
-        return response;
+        return result;
     }
-    catch (error) {
+    catch {
         spinner.stop(chalk.red('An unexpected error occurred while uploading files'));
         exit(1);
     }

package/dist/config/generateSettings.js

@@ -165,6 +165,7 @@ export async function generateSettings(options, cwd = process.cwd()) {
         apiKey: mergedOptions.apiKey,
         baseUrl: mergedOptions.baseUrl,
         sourceLocale: mergedOptions.defaultLocale,
+        customMapping: mergedOptions.customMapping,
     });
     return mergedOptions;
 }

package/dist/config/validateSettings.js

@@ -5,11 +5,12 @@ import path from 'node:path';
 export function validateSettings(settings) {
     // Validate locales
     for (const locale of settings.locales) {
-        if (!isValidLocale(locale)) {
+        if (!isValidLocale(locale, settings.customMapping)) {
             logErrorAndExit(`Provided locales: "${settings?.locales?.join()}", ${locale} is not a valid locale!`);
         }
     }
-    if (settings.defaultLocale && !isValidLocale(settings.defaultLocale)) {
+    if (settings.defaultLocale &&
+        !isValidLocale(settings.defaultLocale, settings.customMapping)) {
         logErrorAndExit(`defaultLocale: ${settings.defaultLocale} is not a valid locale!`);
     }
     // defaultLocale cannot be a superset of any other locale

package/dist/formats/files/upload.js

@@ -130,7 +130,7 @@ export async function upload(filePaths, placeholderPaths, transformPaths, dataFo
     });
     try {
         // Send all files in a single API call
-        const response = await uploadFiles(uploadData, options);
+        await uploadFiles(uploadData, options);
     }
     catch (error) {
         logErrorAndExit(`Error uploading files: ${error}`);

package/dist/next/config/parseNextConfig.js

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
-import { isValidLocale } from 'generaltranslation';
 import path from 'node:path';
+import { gt } from '../../utils/gt.js';
 /**
  * Extracts projectId, defaultLocale, and locales from a next.config.js file.
  * @param {string} filePath - The path to the next.config.js file.
@@ -36,7 +36,7 @@ export async function parseNextConfig(filePath) {
             .filter((locale) => typeof locale === 'string')
         : undefined;
     // Ensure approvedLocales is an array of strings
-    const validLocales = locales && locales.every((locale) => isValidLocale(locale))
+    const validLocales = locales && locales.every((locale) => gt.isValidLocale(locale))
         ? locales
         : undefined;
     // Return the extracted values if they pass type checks or return null

package/dist/setup/userInput.js

@@ -1,7 +1,7 @@
 import { libraryDefaultLocale } from 'generaltranslation/internal';
 import { promptText } from '../console/logging.js';
 import chalk from 'chalk';
-import { isValidLocale } from 'generaltranslation';
+import { gt } from '../utils/gt.js';
 export async function getDesiredLocales() {
     // Ask for the default locale
     const defaultLocale = await promptText({
@@ -18,7 +18,7 @@ export async function getDesiredLocales() {
                 return 'Please enter at least one locale';
             }
             for (const locale of localeList) {
-                if (!isValidLocale(locale)) {
+                if (!gt.isValidLocale(locale)) {
                     return 'Please enter a valid locale (e.g., en, fr, es)';
                 }
             }

package/dist/types/index.d.ts

@@ -1,3 +1,4 @@
+import { CustomMapping } from 'generaltranslation/types';
 import { SUPPORTED_FILE_EXTENSIONS } from '../formats/files/supportedFiles.js';
 export type { Updates } from 'generaltranslation/types';
 export type Options = {
@@ -113,6 +114,7 @@ export type Settings = {
     projectId?: string;
     defaultLocale: string;
     locales: string[];
+    customMapping?: CustomMapping;
     files: {
         resolvedPaths: ResolvedFiles;
         placeholderPaths: ResolvedFiles;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtx-cli",
-  "version": "2.1.21",
+  "version": "2.2.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.4.2",
+    "generaltranslation": "^7.5.0",
     "json-pointer": "^0.6.2",
     "jsonpath-plus": "^10.3.0",
     "jsonpointer": "^5.0.1",