gtx-cli 2.6.23 → 2.6.24

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # gtx-cli
 
+## 2.6.24
+
+### Patch Changes
+
+- [#1036](https://github.com/generaltranslation/gt/pull/1036) [`5fc08d0`](https://github.com/generaltranslation/gt/commit/5fc08d0028b7936b5916a048786bedc3b13e0042) Thanks [@fernando-aviles](https://github.com/fernando-aviles)! - Fix: Update composite JSONs when non-translatable content changes, fix bug where `save-local` update composite key index
+
 ## 2.6.23
 
 ### Patch Changes

package/dist/api/downloadFileBatch.js

@@ -9,6 +9,7 @@ import mergeYaml from '../formats/yaml/mergeYaml.js';
 import { getDownloadedVersions, saveDownloadedVersions, ensureNestedObject, } from '../fs/config/downloadedVersions.js';
 import { recordDownloaded } from '../state/recentDownloads.js';
 import { recordWarning } from '../state/translateWarnings.js';
+import { hashStringSync } from '../utils/hash.js';
 import stringify from 'fast-json-stable-stringify';
 /**
  * Downloads multiple translation files in a single batch request
@@ -70,16 +71,32 @@ export async function downloadFileBatch(fileTracker, files, options, forceDownlo
                 // If a local translation already exists for the same source version, skip overwrite
                 const downloadedVersion = downloadedVersions.entries[branchId]?.[fileId]?.[versionId]?.[locale];
                 const fileExists = fs.existsSync(outputPath);
-                if (!forceDownload && fileExists && downloadedVersion) {
+                let sourceChanged = false;
+                if (downloadedVersion?.sourceHash) {
+                    try {
+                        const currentSourceContent = fs.readFileSync(inputPath, 'utf8');
+                        const currentSourceHash = hashStringSync(currentSourceContent);
+                        sourceChanged = currentSourceHash !== downloadedVersion.sourceHash;
+                    }
+                    catch {
+                        sourceChanged = true;
+                    }
+                }
+                if (!forceDownload &&
+                    !sourceChanged &&
+                    fileExists &&
+                    downloadedVersion) {
                     result.skipped.push(requestedFile);
                     continue;
                 }
                 let data = file.data;
+                let sourceContentHash;
                 if (options.options?.jsonSchema && locale) {
                     const jsonSchema = validateJsonSchema(options.options, inputPath);
                     if (jsonSchema) {
                         const originalContent = fs.readFileSync(inputPath, 'utf8');
                         if (originalContent) {
+                            sourceContentHash = hashStringSync(originalContent);
                             data = mergeJson(originalContent, inputPath, options.options, [
                                 {
                                     translatedContent: file.data,
@@ -94,6 +111,7 @@ export async function downloadFileBatch(fileTracker, files, options, forceDownlo
                     if (yamlSchema) {
                         const originalContent = fs.readFileSync(inputPath, 'utf8');
                         if (originalContent) {
+                            sourceContentHash = hashStringSync(originalContent);
                             data = mergeYaml(originalContent, inputPath, options.options, [
                                 {
                                     translatedContent: file.data,
@@ -135,6 +153,7 @@ export async function downloadFileBatch(fileTracker, files, options, forceDownlo
                     ]);
                     downloadedVersions.entries[branchId][fileId][versionId][locale] = {
                         updatedAt: new Date().toISOString(),
+                        ...(sourceContentHash ? { sourceHash: sourceContentHash } : {}),
                     };
                     didUpdateDownloadedLock = true;
                 }

package/dist/formats/json/extractJson.js

@@ -33,6 +33,9 @@ export function extractJson(localContent, inputPath, options, targetLocale, defa
     const canonicalTargetLocale = useCanonicalLocaleKeys
         ? gt.resolveCanonicalLocale(targetLocale)
         : targetLocale;
+    const canonicalDefaultLocale = useCanonicalLocaleKeys
+        ? gt.resolveCanonicalLocale(defaultLocale)
+        : defaultLocale;
     // Handle include-style schemas (simple path-based extraction)
     if (jsonSchema.include) {
         const extracted = flattenJsonWithStringFilter(localJson, jsonSchema.include);
@@ -58,16 +61,22 @@ export function extractJson(localContent, inputPath, options, targetLocale, defa
                 logger.warn(`No matching items found for locale ${targetLocale} at path: ${sourceObjectPointer}`);
                 continue;
             }
+            // Also find default locale items
+            const matchingDefaultLocaleItems = findMatchingItemArray(canonicalDefaultLocale, sourceObjectOptions, sourceObjectPointer, sourceObjectValue);
+            const defaultKeys = Object.keys(matchingDefaultLocaleItems);
+            const targetEntries = Object.entries(matchingTargetLocaleItems);
             // Initialize the nested structure for this source object pointer
             if (!compositeResult[sourceObjectPointer]) {
                 compositeResult[sourceObjectPointer] = {};
             }
-            // For each matching item, extract the included values
-            for (const [itemPointer, { sourceItem }] of Object.entries(matchingTargetLocaleItems)) {
+            // For each target item, use the default locale's key position
+            for (let i = 0; i < targetEntries.length; i++) {
+                const [, { sourceItem }] = targetEntries[i];
                 // Extract values at the include paths
                 const extractedValues = flattenJsonWithStringFilter(sourceItem, sourceObjectOptions.include);
-                // Store under the item pointer (e.g., "/0")
-                compositeResult[sourceObjectPointer][itemPointer] = extractedValues;
+                // Use default locale key
+                const outputKey = i < defaultKeys.length ? defaultKeys[i] : targetEntries[i][0];
+                compositeResult[sourceObjectPointer][outputKey] = extractedValues;
             }
         }
         else {

package/dist/formats/json/mergeJson.js

@@ -100,10 +100,25 @@ export function mergeJson(originalContent, inputPath, options, targets, defaultL
                     ? gt.resolveCanonicalLocale(target.targetLocale)
                     : target.targetLocale, sourceObjectOptions, sourceObjectPointer, sourceObjectValue);
                 Object.values(targetItemsToRemove).forEach(({ index }) => indiciesToRemove.add(index));
-                // 3. Merge matchingDefaultLocaleItems and targetItems
+                // Remap mismatched positional keys to current source positions
+                const sourceKeys = [...matchingDefaultLocaleItemKeys];
+                const remappedTargetItems = {};
+                for (const [key, value] of Object.entries(targetItems)) {
+                    if (matchingDefaultLocaleItemKeys.has(key)) {
+                        remappedTargetItems[key] = value;
+                    }
+                    else if (sourceKeys.length === 1 &&
+                        !(sourceKeys[0] in remappedTargetItems)) {
+                        remappedTargetItems[sourceKeys[0]] = value;
+                    }
+                    else {
+                        logger.warn(`Skipping translated item at ${key}: cannot map to source item at path ${sourceObjectPointer}`);
+                    }
+                }
+                // Merge matchingDefaultLocaleItems and remapped targetItems
                 const mergedItems = {
                     ...(sourceObjectOptions.transform ? matchingDefaultLocaleItems : {}),
-                    ...targetItems,
+                    ...remappedTargetItems,
                 };
                 // 4. Validate that the mergedItems is not empty
                 if (Object.keys(mergedItems).length === 0) {
@@ -113,8 +128,8 @@ export function mergeJson(originalContent, inputPath, options, targets, defaultL
                 for (const [sourceItemPointer, targetItem] of Object.entries(mergedItems)) {
                     // 5. Validate that all the array indecies are still present in the source json
                     if (!matchingDefaultLocaleItemKeys.has(sourceItemPointer)) {
-                        logger.error(`Array index ${sourceItemPointer} is not present in the source json. It is possible that the source json has been modified since the translation was generated.`);
-                        return exitSync(1);
+                        logger.warn(`Skipping translated item at ${sourceItemPointer}: not present in source json at path ${sourceObjectPointer}`);
+                        continue;
                     }
                     // 6. Override the source item with the translated values
                     const defaultLocaleSourceItem = matchingDefaultLocaleItems[sourceItemPointer].sourceItem;
@@ -145,10 +160,9 @@ export function mergeJson(originalContent, inputPath, options, targets, defaultL
                     itemsToAdd.push(mutatedSourceItem);
                 }
             }
-            // 8. Check that items to add is >= items to remove (if this happens, something is very wrong)
+            // 8. Check that items to add is >= items to remove
             if (itemsToAdd.length < indiciesToRemove.size) {
-                logger.error(`Items to add is less than items to remove at path: ${sourceObjectPointer}. Please check your JSON schema key field.`);
-                return exitSync(1);
+                logger.warn(`Items to add (${itemsToAdd.length}) is less than items to remove (${indiciesToRemove.size}) at path: ${sourceObjectPointer}. Some translated items may have been skipped.`);
             }
             // 9. Remove all items for the target locale (they can be identified by the key)
             const filteredSourceObjectValue = sourceObjectValue.filter((_, index) => !indiciesToRemove.has(index));

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

@@ -2,6 +2,7 @@ export type DownloadedVersionEntry = {
     fileName?: string;
     updatedAt?: string;
     postProcessHash?: string;
+    sourceHash?: string;
 };
 export type DownloadedVersions = {
     version: number;

package/dist/generated/version.d.ts

@@ -1 +1 @@
-export declare const PACKAGE_VERSION = "2.6.23";
+export declare const PACKAGE_VERSION = "2.6.24";

package/dist/generated/version.js

@@ -1,2 +1,2 @@
 // This file is auto-generated. Do not edit manually.
-export const PACKAGE_VERSION = '2.6.23';
+export const PACKAGE_VERSION = '2.6.24';

package/dist/workflow/download.js

@@ -57,6 +57,7 @@ export async function downloadTranslations(fileVersionData, jobData, branchData,
         skipped: new Map(),
     };
     // Step 1: Poll translation jobs if jobData exists
+    let pollTimedOut = false;
     if (jobData) {
         const pollStep = new PollTranslationJobsStep(gt);
         const pollResult = await pollStep.run({
@@ -75,8 +76,15 @@ export async function downloadTranslations(fileVersionData, jobData, branchData,
                 recordWarning('failed_translation', value.fileName, `Failed to translate for locale ${value.locale}`);
             }
         }
+        // Even if polling timed out, still download whatever completed successfully
         if (!pollResult.success) {
-            return false;
+            pollTimedOut = true;
+            if (pollResult.fileTracker.completed.size > 0) {
+                logger.warn(chalk.yellow(`Timed out, but ${pollResult.fileTracker.completed.size} translation(s) completed successfully. Downloading completed files...`));
+            }
+            else {
+                return false;
+            }
         }
     }
     else {
@@ -93,6 +101,10 @@ export async function downloadTranslations(fileVersionData, jobData, branchData,
         forceDownload,
     });
     await downloadStep.wait();
+    // If polling timed out, report failure even though we downloaded what we could
+    if (pollTimedOut) {
+        return false;
+    }
     return downloadResult;
 }
 /**

package/package.json

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