gtx-cli 2.1.15 → 2.1.17

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # gtx-cli
 
+## 2.1.17
+
+### Patch Changes
+
+- [#635](https://github.com/generaltranslation/gt/pull/635) [`10aa051`](https://github.com/generaltranslation/gt/commit/10aa051592cea43f772615da200c8615d4dd1a78) Thanks [@brian-lou](https://github.com/brian-lou)! - Create dictionary with uuid to reduce flakiness
+
+## 2.1.16
+
+### Patch Changes
+
+- [#630](https://github.com/generaltranslation/gt/pull/630) [`1f0dc1b`](https://github.com/generaltranslation/gt/commit/1f0dc1b17f22737263938998f5c516e0aa136b1a) Thanks [@fernando-aviles](https://github.com/fernando-aviles)! - Adding localization of import paths to MDX files
+
 ## 2.1.15
 
 ### Patch Changes

package/dist/cli/commands/translate.js

@@ -7,6 +7,7 @@ import flattenJsonFiles from '../../utils/flattenJsonFiles.js';
 import localizeStaticUrls from '../../utils/localizeStaticUrls.js';
 import processAnchorIds from '../../utils/processAnchorIds.js';
 import { noFilesError, noVersionIdError } from '../../console/index.js';
+import localizeStaticImports from '../../utils/localizeStaticImports.js';
 // Downloads translations that were completed
 export async function handleTranslate(options, settings, filesTranslationResponse) {
     if (filesTranslationResponse && settings.files) {
@@ -46,6 +47,10 @@ export async function postProcessTranslations(settings) {
         // Uses inline {#id} format by default, or div wrapping if experimentalAddHeaderAnchorIds is 'mintlify'
         await processAnchorIds(settings);
     }
+    // Localize static imports (import Snippet from /snippets/file.mdx -> import Snippet from /snippets/[locale]/file.mdx)
+    if (settings.options?.experimentalLocalizeStaticImports) {
+        await localizeStaticImports(settings);
+    }
     // Flatten json files into a single file
     if (settings.options?.experimentalFlattenJsonFiles) {
         await flattenJsonFiles(settings);

package/dist/react/parse/createDictionaryUpdates.js

@@ -7,6 +7,7 @@ import loadJSON from '../../fs/loadJSON.js';
 import { hashSource } from 'generaltranslation/id';
 import getEntryAndMetadata from '../utils/getEntryAndMetadata.js';
 import { logError } from '../../console/logging.js';
+import { randomUUID } from 'node:crypto';
 export async function createDictionaryUpdates(dictionaryPath, esbuildConfig) {
     let dictionary;
     // ---- HANDLE JSON STRING DICTIONARY ----- //
@@ -21,7 +22,7 @@ export async function createDictionaryUpdates(dictionaryPath, esbuildConfig) {
             write: false,
         });
         const bundledCode = result.outputFiles[0].text;
-        const tempFilePath = path.join(os.tmpdir(), 'bundled-dictionary.js');
+        const tempFilePath = path.join(os.tmpdir(), `bundled-dictionary-${randomUUID()}.js`);
         await fs.promises.writeFile(tempFilePath, bundledCode);
         // Load the module using dynamic import
         let dictionaryModule;

package/dist/utils/localizeStaticImports.js

@@ -1,13 +1,24 @@
 import * as fs from 'fs';
+import * as path from 'path';
 import { createFileMapping } from '../formats/files/fileMapping.js';
 import micromatch from 'micromatch';
 import { unified } from 'unified';
 import remarkParse from 'remark-parse';
 import remarkMdx from 'remark-mdx';
 import remarkFrontmatter from 'remark-frontmatter';
-import remarkStringify from 'remark-stringify';
 import { visit } from 'unist-util-visit';
 const { isMatch } = micromatch;
+/**
+ * Checks if a file exists at the given path
+ */
+function fileExists(filePath) {
+    try {
+        return fs.existsSync(filePath);
+    }
+    catch {
+        return false;
+    }
+}
 /**
  * Localizes static imports in content files.
  * Currently only supported for md and mdx files. (/docs/ -> /[locale]/docs/)
@@ -48,7 +59,7 @@ export default async function localizeStaticImports(settings) {
                 const fileContent = await fs.promises.readFile(filePath, 'utf8');
                 // Localize the file using default locale
                 const localizedFile = localizeStaticImportsForFile(fileContent, settings.defaultLocale, settings.defaultLocale, // Process as default locale
-                settings.options?.docsHideDefaultLocaleImport || false, settings.options?.docsImportPattern, settings.options?.excludeStaticImports, filePath.endsWith('.md'));
+                settings.options?.docsHideDefaultLocaleImport || false, settings.options?.docsImportPattern, settings.options?.excludeStaticImports, filePath);
                 // Write the localized file back to the same path
                 await fs.promises.writeFile(filePath, localizedFile);
             }));
@@ -64,7 +75,7 @@ export default async function localizeStaticImports(settings) {
             // Get file content
             const fileContent = await fs.promises.readFile(filePath, 'utf8');
             // Localize the file
-            const localizedFile = localizeStaticImportsForFile(fileContent, settings.defaultLocale, locale, settings.options?.docsHideDefaultLocaleImport || false, settings.options?.docsImportPattern, settings.options?.excludeStaticImports, filePath.endsWith('.md'));
+            const localizedFile = localizeStaticImportsForFile(fileContent, settings.defaultLocale, locale, settings.options?.docsHideDefaultLocaleImport || false, settings.options?.docsImportPattern, settings.options?.excludeStaticImports, filePath);
             // Write the localized file to the target path
             await fs.promises.writeFile(filePath, localizedFile);
         }));
@@ -175,23 +186,45 @@ function transformNonDefaultLocaleImportPath(fullPath, patternHead, targetLocale
 /**
  * Main import path transformation function that delegates to specific scenarios
  */
-function transformImportPath(fullPath, patternHead, targetLocale, defaultLocale, hideDefaultLocale) {
+function transformImportPath(fullPath, patternHead, targetLocale, defaultLocale, hideDefaultLocale, currentFilePath, projectRoot = process.cwd() // fallback if not provided
+) {
+    let newPath;
     if (targetLocale === defaultLocale) {
-        return transformDefaultLocaleImportPath(fullPath, patternHead, defaultLocale, hideDefaultLocale);
+        newPath = transformDefaultLocaleImportPath(fullPath, patternHead, defaultLocale, hideDefaultLocale);
     }
     else if (hideDefaultLocale) {
-        return transformNonDefaultLocaleImportPathWithHidden(fullPath, patternHead, targetLocale, defaultLocale);
+        newPath = transformNonDefaultLocaleImportPathWithHidden(fullPath, patternHead, targetLocale, defaultLocale);
     }
     else {
-        return transformNonDefaultLocaleImportPath(fullPath, patternHead, targetLocale, defaultLocale);
+        newPath = transformNonDefaultLocaleImportPath(fullPath, patternHead, targetLocale, defaultLocale);
     }
+    if (!newPath)
+        return null;
+    if (currentFilePath) {
+        let resolvedPath;
+        if (newPath.startsWith('/')) {
+            // Interpret as project-root relative
+            resolvedPath = path.join(projectRoot, newPath.replace(/^\//, ''));
+        }
+        else {
+            // Relative to current file
+            const currentDir = path.dirname(currentFilePath);
+            resolvedPath = path.resolve(currentDir, newPath);
+        }
+        const pathExists = fileExists(resolvedPath);
+        if (!pathExists) {
+            return null;
+        }
+    }
+    return newPath;
 }
 /**
  * AST-based transformation for MDX files using remark-mdx
  */
-function transformMdxImports(mdxContent, defaultLocale, targetLocale, hideDefaultLocale, pattern = '/[locale]', exclude = []) {
+function transformMdxImports(mdxContent, defaultLocale, targetLocale, hideDefaultLocale, pattern = '/[locale]', exclude = [], currentFilePath) {
     const transformedImports = [];
-    if (!pattern.startsWith('/')) {
+    // Don't auto-prefix relative patterns that start with . or ..
+    if (!pattern.startsWith('/') && !pattern.startsWith('.')) {
         pattern = '/' + pattern;
     }
     const patternHead = pattern.split('[locale]')[0];
@@ -239,23 +272,23 @@ function transformMdxImports(mdxContent, defaultLocale, targetLocale, hideDefaul
             transformedImports: [],
         };
     }
-    // Visit only mdxjsEsm nodes (import/export statements)
+    let content = mdxContent;
+    // Visit only mdxjsEsm nodes (import/export statements) to collect replacements
     visit(processedAst, 'mdxjsEsm', (node) => {
         if (node.value && node.value.includes(patternHead.replace(/\/$/, ''))) {
-            // Find and transform import paths in the node value
+            // Find import lines that need transformation
             const lines = node.value.split('\n');
-            const transformedLines = lines.map((line) => {
+            lines.forEach((line) => {
                 // Only process import lines that match our pattern
                 if (!line.trim().startsWith('import ')) {
-                    return line;
+                    return;
                 }
                 // Check if this line should be processed
                 if (!shouldProcessImportPath(line, patternHead, targetLocale, defaultLocale)) {
-                    return line;
+                    return;
                 }
                 // Extract the path from the import statement
                 const quotes = ['"', "'", '`'];
-                let transformedLine = line;
                 for (const quote of quotes) {
                     // Try both with and without trailing slash
                     let startPattern = `${quote}${patternHead}`;
@@ -274,7 +307,7 @@ function transformMdxImports(mdxContent, defaultLocale, targetLocale, hideDefaul
                         continue;
                     const fullPath = line.slice(pathStart, pathEnd);
                     // Transform the import path
-                    const newPath = transformImportPath(fullPath, patternHead, targetLocale, defaultLocale, hideDefaultLocale);
+                    const newPath = transformImportPath(fullPath, patternHead, targetLocale, defaultLocale, hideDefaultLocale, currentFilePath);
                     if (!newPath) {
                         continue; // No transformation needed
                     }
@@ -282,43 +315,15 @@ function transformMdxImports(mdxContent, defaultLocale, targetLocale, hideDefaul
                     if (isImportPathExcluded(fullPath, exclude, defaultLocale)) {
                         continue;
                     }
-                    // Apply the transformation
+                    // Apply the transformation to the original content
+                    // Simply replace the import path with the new path
+                    content = content.replace(`${quote}${fullPath}${quote}`, `${quote}${newPath}${quote}`);
                     transformedImports.push({ originalPath: fullPath, newPath });
-                    transformedLine =
-                        line.slice(0, pathStart) + newPath + line.slice(pathEnd);
                     break;
                 }
-                return transformedLine;
             });
-            node.value = transformedLines.join('\n');
         }
     });
-    // Convert the modified AST back to MDX string
-    let content;
-    try {
-        const stringifyProcessor = unified()
-            .use(remarkStringify)
-            .use(remarkFrontmatter, ['yaml', 'toml'])
-            .use(remarkMdx);
-        content = stringifyProcessor.stringify(processedAst);
-    }
-    catch (error) {
-        console.warn(`Failed to stringify MDX content: ${error instanceof Error ? error.message : String(error)}`);
-        console.warn('Returning original content unchanged due to stringify error.');
-        return {
-            content: mdxContent,
-            hasChanges: false,
-            transformedImports: [],
-        };
-    }
-    // Handle newline formatting to match original input
-    if (content.endsWith('\n') && !mdxContent.endsWith('\n')) {
-        content = content.slice(0, -1);
-    }
-    // Preserve leading newlines from original content
-    if (mdxContent.startsWith('\n') && !content.startsWith('\n')) {
-        content = '\n' + content;
-    }
     return {
         content,
         hasChanges: transformedImports.length > 0,
@@ -329,12 +334,12 @@ function transformMdxImports(mdxContent, defaultLocale, targetLocale, hideDefaul
  * AST-based transformation for MDX files only
  */
 function localizeStaticImportsForFile(file, defaultLocale, targetLocale, hideDefaultLocale, pattern = '/[locale]', // eg /docs/[locale] or /[locale]
-exclude = [], isMarkdown = false) {
+exclude = [], currentFilePath) {
     // Skip .md files entirely - they cannot have imports
-    if (isMarkdown) {
+    if (currentFilePath && currentFilePath.endsWith('.md')) {
         return file;
     }
     // For MDX files, use AST-based transformation
-    const result = transformMdxImports(file, defaultLocale, targetLocale, hideDefaultLocale, pattern, exclude);
+    const result = transformMdxImports(file, defaultLocale, targetLocale, hideDefaultLocale, pattern, exclude, currentFilePath);
     return result.content;
 }

package/package.json

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