gtx-cli 2.5.26 → 2.5.28

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # gtx-cli
 
+## 2.5.28
+
+### Patch Changes
+
+- [#883](https://github.com/generaltranslation/gt/pull/883) [`e113d8d`](https://github.com/generaltranslation/gt/commit/e113d8d8fb5e37f45a4aa77544e8f4666519bfe8) Thanks [@fernando-aviles](https://github.com/fernando-aviles)! - Send file paths in translation metadata
+
+- [#885](https://github.com/generaltranslation/gt/pull/885) [`22ef3ec`](https://github.com/generaltranslation/gt/commit/22ef3ecb9c2a41a5d982684cc2d45834be11ae5b) Thanks [@brian-lou](https://github.com/brian-lou)! - Add shared flags to CLI save-local command
+
+- [#886](https://github.com/generaltranslation/gt/pull/886) [`8ba1edf`](https://github.com/generaltranslation/gt/commit/8ba1edfa838fe9209ae6fa5fe154e7c991be9aa6) Thanks [@fernando-aviles](https://github.com/fernando-aviles)! - Handle Mintlify anchor IDs containing escaped characters
+
+- Updated dependencies [[`e113d8d`](https://github.com/generaltranslation/gt/commit/e113d8d8fb5e37f45a4aa77544e8f4666519bfe8)]:
+  - generaltranslation@8.1.3
+
+## 2.5.27
+
+### Patch Changes
+
+- [#880](https://github.com/generaltranslation/gt/pull/880) [`3dc7b64`](https://github.com/generaltranslation/gt/commit/3dc7b6460cd05ddcb656a247602f4f50b06312fd) Thanks [@fernando-aviles](https://github.com/fernando-aviles)! - Hotfix: sending format metadata to the API during build time translation
+
+- Updated dependencies [[`3dc7b64`](https://github.com/generaltranslation/gt/commit/3dc7b6460cd05ddcb656a247602f4f50b06312fd)]:
+  - generaltranslation@8.1.2
+
 ## 2.5.26
 
 ### Patch Changes

package/dist/cli/base.js

@@ -15,7 +15,7 @@ import { getPackageManager } from '../utils/packageManager.js';
 import { retrieveCredentials, setCredentials } from '../utils/credentials.js';
 import { areCredentialsSet } from '../utils/credentials.js';
 import { upload } from '../formats/files/upload.js';
-import { attachTranslateFlags } from './flags.js';
+import { attachSharedFlags, attachTranslateFlags } from './flags.js';
 import { handleStage } from './commands/stage.js';
 import { handleSetupProject } from './commands/setupProject.js';
 import { handleDownload, handleTranslate, postProcessTranslations, } from './commands/translate.js';
@@ -80,13 +80,11 @@ export class BaseCLI {
         });
     }
     setupSendDiffsCommand() {
-        this.program
+        attachSharedFlags(this.program
             .command('save-local')
-            .description('Save local edits for all configured files by sending diffs (no translation enqueued)')
-            .action(async () => {
+            .description('Save local edits for all configured files by sending diffs (no translation enqueued)')).action(async (initOptions) => {
             displayHeader('Saving local edits...');
-            const config = findFilepath(['gt.config.json']);
-            const settings = await generateSettings({ config });
+            const settings = await generateSettings(initOptions);
             await saveLocalEdits(settings);
             logger.endCommand('Saved local edits');
         });

package/dist/cli/flags.d.ts

@@ -1,3 +1,4 @@
 import { Command } from 'commander';
+export declare function attachSharedFlags(command: Command): Command;
 export declare function attachTranslateFlags(command: Command): Command;
 export declare function attachAdditionalReactTranslateFlags(command: Command): Command;

package/dist/cli/flags.js

@@ -1,10 +1,14 @@
 import findFilepath from '../fs/findFilepath.js';
 const DEFAULT_TIMEOUT = 600;
-export function attachTranslateFlags(command) {
+export function attachSharedFlags(command) {
     command
         .option('-c, --config <path>', 'Filepath to config file, by default gt.config.json', findFilepath(['gt.config.json']))
         .option('--api-key <key>', 'API key for General Translation cloud service')
-        .option('--project-id <id>', 'General Translation project ID')
+        .option('--project-id <id>', 'General Translation project ID');
+    return command;
+}
+export function attachTranslateFlags(command) {
+    attachSharedFlags(command)
         .option('--version-id <id>', 'General Translation version ID')
         .option('--default-language, --default-locale <locale>', 'Default locale (e.g., en)')
         .option('--new, --locales <locales...>', 'Space-separated list of locales (e.g., en fr es)')

package/dist/formats/files/collectFiles.js

@@ -41,7 +41,7 @@ export async function collectFiles(options, settings, library) {
                 fileFormat: 'GTJSON',
                 formatMetadata: fileMetadata,
                 fileId: TEMPLATE_FILE_ID,
-                versionId: hashStringSync(JSON.stringify(fileData)),
+                versionId: hashStringSync(JSON.stringify({ data: fileData, metadata: fileMetadata })),
             });
         }
     }

package/dist/react/jsx/utils/jsxParsing/parseJsx.js

@@ -19,6 +19,7 @@ import { handleChildrenWhitespace } from './handleChildrenWhitespace.js';
 import { isElementNode, } from './types.js';
 import { multiplyJsxTree } from './multiplication/multiplyJsxTree.js';
 import { removeNullChildrenFields } from './removeNullChildrenFields.js';
+import path from 'node:path';
 // Handle CommonJS/ESM interop
 const traverse = traverseModule.default || traverseModule;
 // TODO: currently we cover VariableDeclaration and FunctionDeclaration nodes, but are there others we should cover as well?
@@ -365,6 +366,8 @@ export function parseJSXElement({ importAliases, node, originalName, pkgs, updat
     const componentErrors = [];
     const componentWarnings = new Set();
     const metadata = {};
+    const relativeFilepath = path.relative(process.cwd(), file);
+    metadata.filePaths = [relativeFilepath];
     // We'll track this flag to know if any unwrapped {variable} is found in children
     const unwrappedExpressions = [];
     // Gather <T>'s props

package/dist/react/jsx/utils/parseStringFunction.js

@@ -8,6 +8,7 @@ import traverseModule from '@babel/traverse';
 const generate = generateModule.default || generateModule;
 const traverse = traverseModule.default || traverseModule;
 import fs from 'node:fs';
+import pathModule from 'node:path';
 import { parse } from '@babel/parser';
 import { resolveImportPath } from './resolveImportPath.js';
 import { buildImportMap } from './buildImportMap.js';
@@ -95,6 +96,17 @@ function processTranslationCall(tPath, updates, errors, warnings, file, ignoreAd
                     }
                 });
             }
+            const relativeFilepath = pathModule.relative(process.cwd(), file);
+            if (relativeFilepath) {
+                if (!metadata.filePaths) {
+                    metadata.filePaths = [relativeFilepath];
+                }
+                else if (Array.isArray(metadata.filePaths)) {
+                    if (!metadata.filePaths.includes(relativeFilepath)) {
+                        metadata.filePaths.push(relativeFilepath);
+                    }
+                }
+            }
             updates.push({
                 dataFormat: 'ICU',
                 source,

package/dist/react/parse/createInlineUpdates.d.ts

@@ -6,3 +6,4 @@ export declare function createInlineUpdates(pkg: GTLibrary, validate: boolean, f
     errors: string[];
     warnings: string[];
 }>;
+export declare function mergeUpdatesByHash(updates: Updates): void;

package/dist/react/parse/createInlineUpdates.js

@@ -71,6 +71,7 @@ export async function createInlineUpdates(pkg, validate, filePatterns, parsingOp
         });
         update.metadata.hash = hash;
     }));
+    mergeUpdatesByHash(updates);
     return { updates, errors, warnings: [...warnings] };
 }
 /**
@@ -80,3 +81,35 @@ export async function createInlineUpdates(pkg, validate, filePatterns, parsingOp
 function getUpstreamPackages(pkg) {
     return GT_LIBRARIES_UPSTREAM[pkg];
 }
+export function mergeUpdatesByHash(updates) {
+    const mergedByHash = new Map();
+    const noHashUpdates = [];
+    for (const update of updates) {
+        const hash = update.metadata.hash;
+        if (!hash) {
+            noHashUpdates.push(update);
+            continue;
+        }
+        const existing = mergedByHash.get(hash);
+        if (!existing) {
+            mergedByHash.set(hash, update);
+            continue;
+        }
+        const existingPaths = Array.isArray(existing.metadata.filePaths)
+            ? existing.metadata.filePaths.slice()
+            : [];
+        const newPaths = Array.isArray(update.metadata.filePaths)
+            ? update.metadata.filePaths
+            : [];
+        for (const p of newPaths) {
+            if (!existingPaths.includes(p)) {
+                existingPaths.push(p);
+            }
+        }
+        if (existingPaths.length) {
+            existing.metadata.filePaths = existingPaths;
+        }
+    }
+    const mergedUpdates = [...mergedByHash.values(), ...noHashUpdates];
+    updates.splice(0, updates.length, ...mergedUpdates);
+}

package/dist/types/index.d.ts

@@ -37,10 +37,12 @@ export type OpenApiConfig = {
 export type MintlifyOptions = {
     openapi?: OpenApiConfig;
 };
-export type TranslateFlags = {
+export type SharedFlags = {
     config?: string;
     apiKey?: string;
     projectId?: string;
+};
+export type TranslateFlags = SharedFlags & {
     versionId?: string;
     jsconfig?: string;
     dictionary?: string;

package/dist/utils/addExplicitAnchorIds.js

@@ -6,6 +6,7 @@ import remarkStringify from 'remark-stringify';
 import { visit } from 'unist-util-visit';
 import { logger } from '../console/logger.js';
 import escapeHtmlInTextNodes from 'gt-remark';
+import { decode } from 'html-entities';
 /**
  * Generates a slug from heading text
  */
@@ -379,7 +380,10 @@ function applyDivWrappedIds(translatedContent, translatedHeadings, idMappings) {
                     .replace(/`(.*?)`/g, '$1') // Remove inline code
                     .replace(/\[(.*?)\]\(.*?\)/g, '$1') // Remove links, keep text
                     .trim();
-                return cleanLineText === heading.text && hl.level === heading.level;
+                const normalizedLineText = decode(cleanLineText).trim();
+                const normalizedHeadingText = decode(heading.text).trim();
+                return (normalizedLineText === normalizedHeadingText &&
+                    hl.level === heading.level);
             });
             if (matchingLine) {
                 headingsToWrap.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtx-cli",
-  "version": "2.5.26",
+  "version": "2.5.28",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [
@@ -88,6 +88,7 @@
     "fast-glob": "^3.3.3",
     "fast-json-stable-stringify": "^2.1.0",
     "gt-remark": "^1.0.1",
+    "html-entities": "^2.6.0",
     "json-pointer": "^0.6.2",
     "jsonpath-plus": "^10.3.0",
     "jsonpointer": "^5.0.1",
@@ -104,7 +105,7 @@
     "unified": "^11.0.5",
     "unist-util-visit": "^5.0.0",
     "yaml": "^2.8.0",
-    "generaltranslation": "8.1.1"
+    "generaltranslation": "8.1.3"
   },
   "devDependencies": {
     "@babel/types": "^7.28.4",