gtx-cli 2.3.3 → 2.3.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # gtx-cli
 
+## 2.3.5
+
+### Patch Changes
+
+- [#687](https://github.com/generaltranslation/gt/pull/687) [`99a1958`](https://github.com/generaltranslation/gt/commit/99a1958124d532bb3817f76a69d5232d9eb26f76) Thanks [@ErnestM1234](https://github.com/ErnestM1234)! - fix: showing superfluous warning for composite json paths
+
+## 2.3.4
+
+### Patch Changes
+
+- [#671](https://github.com/generaltranslation/gt/pull/671) [`b8c19d1`](https://github.com/generaltranslation/gt/commit/b8c19d13c0ab18a3f9376ebb940d9985cee6d961) Thanks [@fernando-aviles](https://github.com/fernando-aviles)! - Fixing --force command in gtx-cli
+
 ## 2.3.3
 
 ### Patch Changes

package/dist/api/checkFileTranslations.d.ts

@@ -20,4 +20,4 @@ export declare function checkFileTranslations(data: {
         versionId: string;
         fileName: string;
     };
-}, locales: string[], timeoutDuration: number, resolveOutputPath: (sourcePath: string, locale: string) => string | null, options: Settings): Promise<boolean>;
+}, locales: string[], timeoutDuration: number, resolveOutputPath: (sourcePath: string, locale: string) => string | null, options: Settings, forceRetranslation?: boolean): Promise<boolean>;

package/dist/api/checkFileTranslations.js

@@ -14,11 +14,14 @@ import { TEMPLATE_FILE_NAME } from '../cli/commands/stage.js';
  * @param timeoutDuration - The timeout duration for the wait in seconds
  * @returns True if all translations are deployed, false otherwise
  */
-export async function checkFileTranslations(data, locales, timeoutDuration, resolveOutputPath, options) {
+export async function checkFileTranslations(data, locales, timeoutDuration, resolveOutputPath, options, forceRetranslation) {
     const startTime = Date.now();
     console.log();
     const spinner = await createOraSpinner();
-    spinner.start('Waiting for translation...');
+    const spinnerMessage = forceRetranslation
+        ? 'Waiting for retranslation...'
+        : 'Waiting for translation...';
+    spinner.start(spinnerMessage);
     // Initialize the query data
     const fileQueryData = prepareFileQueryData(data, locales);
     const downloadStatus = {
@@ -26,11 +29,13 @@ export async function checkFileTranslations(data, locales, timeoutDuration, reso
         failed: new Set(),
         skipped: new Set(),
     };
-    // Do first check immediately
-    const initialCheck = await checkTranslationDeployment(fileQueryData, downloadStatus, spinner, resolveOutputPath, options);
-    if (initialCheck) {
-        spinner.succeed(chalk.green('Files translated!'));
-        return true;
+    // Do first check immediately, but skip if force retranslation is enabled
+    if (!forceRetranslation) {
+        const initialCheck = await checkTranslationDeployment(fileQueryData, downloadStatus, spinner, resolveOutputPath, options);
+        if (initialCheck) {
+            spinner.succeed(chalk.green('Files translated!'));
+            return true;
+        }
     }
     // Calculate time until next 5-second interval since startTime
     const msUntilNextInterval = Math.max(0, 5000 - ((Date.now() - startTime) % 5000));

package/dist/cli/commands/translate.js

@@ -15,7 +15,7 @@ export async function handleTranslate(options, settings, filesTranslationRespons
         const fileMapping = createFileMapping(resolvedPaths, placeholderPaths, transformPaths, settings.locales, settings.defaultLocale);
         const { data } = filesTranslationResponse;
         // Check for remaining translations
-        await checkFileTranslations(data, settings.locales, options.timeout, (sourcePath, locale) => fileMapping[locale][sourcePath] ?? null, settings);
+        await checkFileTranslations(data, settings.locales, options.timeout, (sourcePath, locale) => fileMapping[locale][sourcePath] ?? null, settings, options.force);
     }
 }
 // Downloads translations that were originally staged
@@ -33,7 +33,8 @@ export async function handleDownload(options, settings) {
     const fileMapping = createFileMapping(resolvedPaths, placeholderPaths, transformPaths, settings.locales, settings.defaultLocale);
     const stagedVersionData = await getStagedVersions(settings.configDirectory);
     // Check for remaining translations
-    await checkFileTranslations(stagedVersionData, settings.locales, options.timeout, (sourcePath, locale) => fileMapping[locale][sourcePath] ?? null, settings);
+    await checkFileTranslations(stagedVersionData, settings.locales, options.timeout, (sourcePath, locale) => fileMapping[locale][sourcePath] ?? null, settings, false // force is not applicable for downloading staged translations
+    );
 }
 export async function postProcessTranslations(settings) {
     // Localize static urls (/docs -> /[locale]/docs) and preserve anchor IDs for non-default locales

package/dist/config/generateSettings.js

@@ -108,8 +108,13 @@ export async function generateSettings(options, cwd = process.cwd()) {
     // Populate src if not provided
     mergedOptions.src = mergedOptions.src || DEFAULT_SRC_PATTERNS;
     // Resolve all glob patterns in the files object
+    const compositePatterns = [
+        ...Object.entries(mergedOptions.options?.jsonSchema || {}),
+    ]
+        .filter(([, schema]) => schema.composite)
+        .map(([key]) => key);
     mergedOptions.files = mergedOptions.files
-        ? resolveFiles(mergedOptions.files, mergedOptions.defaultLocale, mergedOptions.locales, cwd)
+        ? resolveFiles(mergedOptions.files, mergedOptions.defaultLocale, mergedOptions.locales, cwd, compositePatterns)
         : undefined;
     mergedOptions.options = {
         ...(mergedOptions.options || {}),

package/dist/fs/config/parseFilesConfig.d.ts

@@ -16,12 +16,12 @@ export declare function resolveLocaleFiles(files: ResolvedFiles, locale: string)
  * @param files - The files object
  * @returns The resolved files
  */
-export declare function resolveFiles(files: FilesOptions, locale: string, locales: string[], cwd: string): {
+export declare function resolveFiles(files: FilesOptions, locale: string, locales: string[], cwd: string, compositePatterns?: string[]): {
     resolvedPaths: ResolvedFiles;
     placeholderPaths: ResolvedFiles;
     transformPaths: TransformFiles;
 };
-export declare function expandGlobPatterns(cwd: string, includePatterns: string[], excludePatterns: string[], locale: string, locales: string[], transformPatterns?: TransformOption | string): {
+export declare function expandGlobPatterns(cwd: string, includePatterns: string[], excludePatterns: string[], locale: string, locales: string[], transformPatterns?: TransformOption | string, compositePatterns?: string[]): {
     resolvedPaths: string[];
     placeholderPaths: string[];
 };

package/dist/fs/config/parseFilesConfig.js

@@ -28,7 +28,7 @@ export function resolveLocaleFiles(files, locale) {
  * @param files - The files object
  * @returns The resolved files
  */
-export function resolveFiles(files, locale, locales, cwd) {
+export function resolveFiles(files, locale, locales, cwd, compositePatterns) {
     // Initialize result object with empty arrays for each file type
     const result = {};
     const placeholderResult = {};
@@ -47,7 +47,7 @@ export function resolveFiles(files, locale, locales, cwd) {
         }
         // ==== PLACEHOLDERS ==== //
         if (files[fileType]?.include) {
-            const filePaths = expandGlobPatterns(cwd, files[fileType].include, files[fileType]?.exclude || [], locale, locales, transformPaths[fileType] || undefined);
+            const filePaths = expandGlobPatterns(cwd, files[fileType].include, files[fileType]?.exclude || [], locale, locales, transformPaths[fileType] || undefined, compositePatterns);
             result[fileType] = filePaths.resolvedPaths;
             placeholderResult[fileType] = filePaths.placeholderPaths;
         }
@@ -59,7 +59,7 @@ export function resolveFiles(files, locale, locales, cwd) {
     };
 }
 // Helper function to expand glob patterns
-export function expandGlobPatterns(cwd, includePatterns, excludePatterns, locale, locales, transformPatterns) {
+export function expandGlobPatterns(cwd, includePatterns, excludePatterns, locale, locales, transformPatterns, compositePatterns) {
     // Expand glob patterns to include all matching files
     const resolvedPaths = [];
     const placeholderPaths = [];
@@ -68,7 +68,10 @@ export function expandGlobPatterns(cwd, includePatterns, excludePatterns, locale
         // Track positions where [locale] appears in the original pattern
         // It must be included in the pattern, otherwise the CLI tool will not be able to find the correct output path
         // Warn if it's not included
-        if (!pattern.includes('[locale]') && !transformPatterns) {
+        // Ignore if is composite pattern
+        if (!pattern.includes('[locale]') &&
+            !transformPatterns &&
+            !compositePatterns?.includes(pattern)) {
             logWarning(chalk.yellow(`Pattern "${pattern}" does not include [locale], so the CLI tool may incorrectly save translated files.`));
         }
         const localePositions = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtx-cli",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [