gtx-cli 2.5.33 → 2.5.35

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # gtx-cli
 
+## 2.5.35
+
+### Patch Changes
+
+- [#905](https://github.com/generaltranslation/gt/pull/905) [`e73bf82`](https://github.com/generaltranslation/gt/commit/e73bf820422771a59408eb643e22ef7f99682b9f) Thanks [@brian-lou](https://github.com/brian-lou)! - Fix CLI failure handling
+
+## 2.5.34
+
+### Patch Changes
+
+- [#904](https://github.com/generaltranslation/gt/pull/904) [`51d412f`](https://github.com/generaltranslation/gt/commit/51d412f503bbb838daaaca47fc8165873ce1857e) Thanks [@fernando-aviles](https://github.com/fernando-aviles)! - Assign `save-local` changes to most recent download
+
 ## 2.5.33
 
 ### Patch Changes

package/dist/api/collectUserEditDiffs.js

@@ -7,6 +7,27 @@ import { gt } from '../utils/gt.js';
 import os from 'node:os';
 import { randomUUID } from 'node:crypto';
 import { hashStringSync } from '../utils/hash.js';
+const findLatestDownloadedVersion = (downloadedVersions, branchId, fileId, locale) => {
+    const versionsForFile = downloadedVersions.entries?.[branchId]?.[fileId] ?? undefined;
+    if (!versionsForFile)
+        return null;
+    let latest = null;
+    for (const [versionId, locales] of Object.entries(versionsForFile)) {
+        const entry = locales?.[locale];
+        if (!entry)
+            continue;
+        const updatedAt = entry.updatedAt
+            ? Date.parse(entry.updatedAt)
+            : Number.NEGATIVE_INFINITY;
+        const latestUpdatedAt = latest?.entry.updatedAt
+            ? Date.parse(latest.entry.updatedAt)
+            : Number.NEGATIVE_INFINITY;
+        if (!latest || updatedAt > latestUpdatedAt) {
+            latest = { versionId, entry };
+        }
+    }
+    return latest;
+};
 /**
  * Collects local user edits by diffing the latest downloaded server translation version
  * against the current local translation file, and submits the diffs upstream.
@@ -30,9 +51,10 @@ export async function collectAndSendUserEditDiffs(files, settings) {
                 continue;
             if (!fs.existsSync(outputPath))
                 continue;
-            const downloadedVersion = downloadedVersions.entries?.[uploadedFile.branchId]?.[uploadedFile.fileId]?.[uploadedFile.versionId]?.[locale];
-            if (!downloadedVersion)
+            const latestDownloaded = findLatestDownloadedVersion(downloadedVersions, uploadedFile.branchId, uploadedFile.fileId, locale);
+            if (!latestDownloaded)
                 continue;
+            const downloadedVersion = latestDownloaded.entry;
             // Skip if local file matches the last postprocessed content hash
             if (downloadedVersion.postProcessHash) {
                 try {
@@ -50,7 +72,7 @@ export async function collectAndSendUserEditDiffs(files, settings) {
                 branchId: uploadedFile.branchId,
                 fileName: uploadedFile.fileName,
                 fileId: uploadedFile.fileId,
-                versionId: uploadedFile.versionId,
+                versionId: latestDownloaded.versionId,
                 locale: locale,
                 outputPath,
             });

package/dist/generated/version.d.ts

@@ -1 +1 @@
-export declare const PACKAGE_VERSION = "2.5.33";
+export declare const PACKAGE_VERSION = "2.5.35";

package/dist/generated/version.js

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

package/dist/workflow/download.js

@@ -70,7 +70,6 @@ export async function downloadTranslations(fileVersionData, jobData, branchData,
             logger.error(`${chalk.red(`${pollResult.fileTracker.failed.size} file(s) failed to translate:`)}\n${Array.from(pollResult.fileTracker.failed.entries())
                 .map(([key, value]) => `- ${value.fileName}`)
                 .join('\n')}`);
-            return false;
         }
         if (!pollResult.success) {
             return false;

package/package.json

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