gtx-cli 2.6.7 → 2.6.8

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # gtx-cli
 
+## 2.6.8
+
+### Patch Changes
+
+- [#981](https://github.com/generaltranslation/gt/pull/981) [`fca3a25`](https://github.com/generaltranslation/gt/commit/fca3a2583eb7f21bc3ef13516351d479f7bef882) Thanks [@fernando-aviles](https://github.com/fernando-aviles)! - Handling source file movement to persist existing translations instead of retranslating
+
+- Updated dependencies [[`fca3a25`](https://github.com/generaltranslation/gt/commit/fca3a2583eb7f21bc3ef13516351d479f7bef882)]:
+  - generaltranslation@8.1.8
+
 ## 2.6.7
 
 ### Patch Changes

package/dist/formats/files/translate.js

@@ -136,12 +136,14 @@ export async function aggregateFiles(settings) {
                     addedMintlifyTitle = result.addedTitle;
                 }
                 const sanitizedContent = sanitizeFileContent(processedContent);
+                // Always hash original content for versionId
+                const computedVersionId = hashStringSync(content);
                 return {
                     content: sanitizedContent,
                     fileName: relativePath,
                     fileFormat: fileType.toUpperCase(),
                     fileId: hashStringSync(relativePath),
-                    versionId: hashStringSync(addedMintlifyTitle ? processedContent : content),
+                    versionId: computedVersionId,
                     locale: settings.defaultLocale,
                 };
             })

package/dist/generated/version.d.ts

@@ -1 +1 @@
-export declare const PACKAGE_VERSION = "2.6.7";
+export declare const PACKAGE_VERSION = "2.6.8";

package/dist/generated/version.js

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

package/dist/workflow/UploadSourcesStep.d.ts

@@ -13,6 +13,12 @@ export declare class UploadSourcesStep extends WorkflowStep<{
     private spinner;
     private result;
     constructor(gt: GT, settings: Settings);
+    /**
+     * Detects file moves by comparing local files against orphaned files.
+     * A move is detected when a local file has the same versionId (content hash)
+     * as an orphaned file but a different fileId (path hash).
+     */
+    private detectMoves;
     run({ files, branchData, }: {
         files: FileToUpload[];
         branchData: BranchData;

package/dist/workflow/UploadSourcesStep.js

@@ -11,21 +11,70 @@ export class UploadSourcesStep extends WorkflowStep {
         this.gt = gt;
         this.settings = settings;
     }
+    /**
+     * Detects file moves by comparing local files against orphaned files.
+     * A move is detected when a local file has the same versionId (content hash)
+     * as an orphaned file but a different fileId (path hash).
+     */
+    detectMoves(localFiles, orphanedFiles) {
+        const moves = [];
+        // Build a map of versionId -> orphaned file
+        const orphansByVersionId = new Map();
+        for (const orphan of orphanedFiles) {
+            orphansByVersionId.set(orphan.versionId, orphan);
+        }
+        // Check each local file against orphaned files
+        for (const local of localFiles) {
+            const orphan = orphansByVersionId.get(local.versionId);
+            if (orphan && orphan.fileId !== local.fileId) {
+                // Same content, different path = move detected
+                moves.push({
+                    oldFileId: orphan.fileId,
+                    newFileId: local.fileId,
+                    newFileName: local.fileName,
+                });
+                // Remove from map to avoid matching same orphan twice
+                orphansByVersionId.delete(local.versionId);
+            }
+        }
+        return moves;
+    }
     async run({ files, branchData, }) {
         if (files.length === 0) {
             logger.info('No files to upload found... skipping upload step');
             return [];
         }
+        const currentBranchId = branchData.currentBranch.id;
         this.spinner.start(`Syncing ${files.length} file${files.length !== 1 ? 's' : ''} with General Translation API...`);
-        // First, figure out which files need to be uploaded
-        const fileData = await this.gt.queryFileData({
-            sourceFiles: files.map((f) => ({
-                fileId: f.fileId,
-                versionId: f.versionId,
-                branchId: f.branchId ?? branchData.currentBranch.id,
-            })),
-        });
-        // build a map of branch:fileId:versionId to fileData
+        // Query file data and orphaned files in parallel
+        const [fileData, orphanedFilesResult] = await Promise.all([
+            this.gt.queryFileData({
+                sourceFiles: files.map((f) => ({
+                    fileId: f.fileId,
+                    versionId: f.versionId,
+                    branchId: f.branchId ?? currentBranchId,
+                })),
+            }),
+            this.gt.getOrphanedFiles(currentBranchId, files.map((f) => f.fileId)),
+        ]);
+        // Detect file moves
+        const moves = this.detectMoves(files, orphanedFilesResult.orphanedFiles);
+        // Track successfully moved files
+        let successfullyMovedFileIds = new Set();
+        // Process moves if any were detected
+        if (moves.length > 0) {
+            this.spinner.message(`Detected ${moves.length} moved file${moves.length !== 1 ? 's' : ''}, preserving translations...`);
+            const moveResult = await this.gt.processFileMoves(moves, {
+                branchId: currentBranchId,
+            });
+            // Only track files where the move actually succeeded
+            successfullyMovedFileIds = new Set(moveResult.results.filter((r) => r.success).map((r) => r.newFileId));
+            const failed = moveResult.summary.failed;
+            if (failed > 0) {
+                logger.warn(`Failed to migrate ${failed} moved file${failed !== 1 ? 's' : ''}`);
+            }
+        }
+        // Build a map of branch:fileId:versionId to fileData
         const fileDataMap = new Map();
         fileData.sourceFiles?.forEach((f) => {
             fileDataMap.set(`${f.branchId}:${f.fileId}:${f.versionId}`, f);
@@ -34,7 +83,8 @@ export class UploadSourcesStep extends WorkflowStep {
         const filesToUpload = [];
         const filesToSkipUpload = [];
         files.forEach((f) => {
-            if (fileDataMap.has(`${f.branchId ?? branchData.currentBranch.id}:${f.fileId}:${f.versionId}`)) {
+            const key = `${f.branchId ?? currentBranchId}:${f.fileId}:${f.versionId}`;
+            if (fileDataMap.has(key) || successfullyMovedFileIds.has(f.fileId)) {
                 filesToSkipUpload.push(f);
             }
             else {
@@ -44,7 +94,7 @@ export class UploadSourcesStep extends WorkflowStep {
         const response = await this.gt.uploadSourceFiles(filesToUpload.map((f) => ({
             source: {
                 ...f,
-                branchId: f.branchId ?? branchData.currentBranch.id,
+                branchId: f.branchId ?? currentBranchId,
                 locale: this.settings.defaultLocale,
                 incomingBranchId: branchData.incomingBranch?.id,
                 checkedOutBranchId: branchData.checkedOutBranch?.id,
@@ -58,13 +108,14 @@ export class UploadSourcesStep extends WorkflowStep {
         this.result.push(...filesToSkipUpload.map((f) => ({
             fileId: f.fileId,
             versionId: f.versionId,
-            branchId: f.branchId ?? branchData.currentBranch.id,
+            branchId: f.branchId ?? currentBranchId,
             fileName: f.fileName,
             fileFormat: f.fileFormat,
             dataFormat: f.dataFormat,
             locale: f.locale,
         })));
-        this.spinner.stop(chalk.green('Files uploaded successfully'));
+        const moveMsg = moves.length > 0 ? ` (${moves.length} moved)` : '';
+        this.spinner.stop(chalk.green(`Files uploaded successfully${moveMsg}`));
         return this.result;
     }
     async wait() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtx-cli",
-  "version": "2.6.7",
+  "version": "2.6.8",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [
@@ -106,7 +106,7 @@
     "unified": "^11.0.5",
     "unist-util-visit": "^5.0.0",
     "yaml": "^2.8.0",
-    "generaltranslation": "8.1.7"
+    "generaltranslation": "8.1.8"
   },
   "devDependencies": {
     "@babel/types": "^7.28.4",