gtx-cli 2.1.17 → 2.1.19

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # gtx-cli
 
+## 2.1.19
+
+### Patch Changes
+
+- [#641](https://github.com/generaltranslation/gt/pull/641) [`4c67f77`](https://github.com/generaltranslation/gt/commit/4c67f775ee892b47eebcc3178c00ad6547a84d84) Thanks [@fernando-aviles](https://github.com/fernando-aviles)! - Encoding placeholders that break MDX parse
+
+## 2.1.18
+
+### Patch Changes
+
+- [#637](https://github.com/generaltranslation/gt/pull/637) [`9c40a3c`](https://github.com/generaltranslation/gt/commit/9c40a3c729bf690381959679078c11c9c29bcdf2) Thanks [@fernando-aviles](https://github.com/fernando-aviles)! - Skipping over empty files when sending for translation
+
 ## 2.1.17
 
 ### Patch Changes

package/dist/formats/files/translate.js

@@ -35,30 +35,46 @@ export async function aggregateFiles(settings) {
         else {
             dataFormat = 'JSX';
         }
-        const jsonFiles = filePaths.json.map((filePath) => {
+        const jsonFiles = filePaths.json
+            .map((filePath) => {
             const content = readFile(filePath);
-            const parsedJson = parseJson(content, filePath, settings.options || {}, settings.defaultLocale);
             const relativePath = getRelative(filePath);
+            const parsedJson = parseJson(content, filePath, settings.options || {}, settings.defaultLocale);
             return {
                 content: parsedJson,
                 fileName: relativePath,
                 fileFormat: 'JSON',
                 dataFormat,
             };
+        })
+            .filter((file) => {
+            if (!file || typeof file.content !== 'string' || !file.content.trim()) {
+                logWarning(`Skipping ${file?.fileName ?? 'unknown'}: JSON file is empty`);
+                return false;
+            }
+            return true;
         });
         allFiles.push(...jsonFiles);
     }
     // Process YAML files
     if (filePaths.yaml) {
-        const yamlFiles = filePaths.yaml.map((filePath) => {
+        const yamlFiles = filePaths.yaml
+            .map((filePath) => {
             const content = readFile(filePath);
-            const { content: parsedYaml, fileFormat } = parseYaml(content, filePath, settings.options || {});
             const relativePath = getRelative(filePath);
+            const { content: parsedYaml, fileFormat } = parseYaml(content, filePath, settings.options || {});
             return {
                 content: parsedYaml,
                 fileName: relativePath,
                 fileFormat,
             };
+        })
+            .filter((file) => {
+            if (!file || typeof file.content !== 'string' || !file.content.trim()) {
+                logWarning(`Skipping ${file?.fileName ?? 'unknown'}: YAML file is empty`);
+                return false;
+            }
+            return true;
         });
         allFiles.push(...yamlFiles);
     }
@@ -73,8 +89,7 @@ export async function aggregateFiles(settings) {
                 if (fileType === 'mdx') {
                     const validation = isValidMdx(content, filePath);
                     if (!validation.isValid) {
-                        const errorMsg = validation.error ? `: ${validation.error}` : '';
-                        logWarning(`Skipping ${relativePath}: MDX file is not AST parsable${errorMsg}`);
+                        logWarning(`Skipping ${relativePath}: MDX file is not AST parsable${validation.error ? `: ${validation.error}` : ''}`);
                         return null;
                     }
                 }
@@ -85,7 +100,15 @@ export async function aggregateFiles(settings) {
                     fileFormat: fileType.toUpperCase(),
                 };
             })
-                .filter((file) => file !== null);
+                .filter((file) => {
+                if (!file ||
+                    typeof file.content !== 'string' ||
+                    !file.content.trim()) {
+                    logWarning(`Skipping ${file?.fileName ?? 'unknown'}: File is empty after sanitization`);
+                    return false;
+                }
+                return true;
+            });
             allFiles.push(...files);
         }
     }

package/dist/utils/addExplicitAnchorIds.js

@@ -5,6 +5,7 @@ import remarkFrontmatter from 'remark-frontmatter';
 import remarkStringify from 'remark-stringify';
 import { visit } from 'unist-util-visit';
 import { logWarning } from '../console/logging.js';
+import { encodeAnglePlaceholders } from './encodePlaceholders.js';
 /**
  * Generates a slug from heading text
  */
@@ -173,6 +174,9 @@ function applyInlineIds(translatedContent, idMappings) {
     // Convert the modified AST back to MDX string
     try {
         const stringifyProcessor = unified()
+            .use(remarkFrontmatter, ['yaml', 'toml'])
+            .use(remarkMdx)
+            .use(encodeAnglePlaceholders)
             .use(remarkStringify, {
             bullet: '-',
             emphasis: '_',
@@ -186,10 +190,9 @@ function applyInlineIds(translatedContent, idMappings) {
                     return node.value;
                 },
             },
-        })
-            .use(remarkFrontmatter, ['yaml', 'toml'])
-            .use(remarkMdx);
-        let content = stringifyProcessor.stringify(processedAst);
+        });
+        const outTree = stringifyProcessor.runSync(processedAst);
+        let content = stringifyProcessor.stringify(outTree);
         // Handle newline formatting to match original input
         if (content.endsWith('\n') && !translatedContent.endsWith('\n')) {
             content = content.slice(0, -1);

package/dist/utils/encodePlaceholders.d.ts

@@ -0,0 +1,11 @@
+import type { Plugin } from 'unified';
+import type { Root } from 'mdast';
+/**
+ * Re-encode angle-bracket placeholders like <accountName> -> &lt;accountName&gt;
+ * in plain text, to prevent MDX JSX parsing on re-parse.
+ *
+ * - Only touches Text nodes.
+ * - Idempotent: already-encoded entities are left unchanged.
+ * - Does NOT affect actual MDX/JSX elements because those are not text nodes.
+ */
+export declare const encodeAnglePlaceholders: Plugin<[], Root>;

package/dist/utils/encodePlaceholders.js

@@ -0,0 +1,30 @@
+import { findAndReplace } from 'mdast-util-find-and-replace';
+const IGNORE_PARENTS = [
+    'code',
+    'inlineCode',
+    'mdxFlowExpression',
+    'mdxTextExpression',
+    'mdxjsEsm',
+    'yaml',
+    'toml',
+    'math',
+    'inlineMath',
+];
+/**
+ * Re-encode angle-bracket placeholders like <accountName> -> &lt;accountName&gt;
+ * in plain text, to prevent MDX JSX parsing on re-parse.
+ *
+ * - Only touches Text nodes.
+ * - Idempotent: already-encoded entities are left unchanged.
+ * - Does NOT affect actual MDX/JSX elements because those are not text nodes.
+ */
+export const encodeAnglePlaceholders = function () {
+    return (tree) => {
+        findAndReplace(tree, [
+            [
+                /<([A-Za-z][\w.-]*)>/g, // <content>, <con-tent>, <con.tent>, <con_tent>
+                (_match, name) => `&lt;${name}&gt;`,
+            ],
+        ], { ignore: IGNORE_PARENTS });
+    };
+};

package/dist/utils/localizeStaticImports.js

@@ -8,17 +8,6 @@ import remarkMdx from 'remark-mdx';
 import remarkFrontmatter from 'remark-frontmatter';
 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/)
@@ -55,6 +44,10 @@ export default async function localizeStaticImports(settings) {
         }
         if (defaultLocaleFiles.length > 0) {
             const defaultPromise = Promise.all(defaultLocaleFiles.map(async (filePath) => {
+                // Check if file exists before processing
+                if (!fs.existsSync(filePath)) {
+                    return;
+                }
                 // Get file content
                 const fileContent = await fs.promises.readFile(filePath, 'utf8');
                 // Localize the file using default locale
@@ -72,6 +65,10 @@ export default async function localizeStaticImports(settings) {
         const targetFiles = Object.values(filesMap).filter((path) => path.endsWith('.md') || path.endsWith('.mdx'));
         // Replace the placeholder path with the target path
         await Promise.all(targetFiles.map(async (filePath) => {
+            // Check if file exists before processing
+            if (!fs.existsSync(filePath)) {
+                return;
+            }
             // Get file content
             const fileContent = await fs.promises.readFile(filePath, 'utf8');
             // Localize the file
@@ -211,8 +208,7 @@ function transformImportPath(fullPath, patternHead, targetLocale, defaultLocale,
             const currentDir = path.dirname(currentFilePath);
             resolvedPath = path.resolve(currentDir, newPath);
         }
-        const pathExists = fileExists(resolvedPath);
-        if (!pathExists) {
+        if (!fs.existsSync(resolvedPath)) {
             return null;
         }
     }

package/dist/utils/localizeStaticUrls.js

@@ -7,6 +7,7 @@ import remarkMdx from 'remark-mdx';
 import remarkFrontmatter from 'remark-frontmatter';
 import remarkStringify from 'remark-stringify';
 import { visit } from 'unist-util-visit';
+import { encodeAnglePlaceholders } from './encodePlaceholders.js';
 const { isMatch } = micromatch;
 /**
  * Localizes static urls in content files.
@@ -49,6 +50,10 @@ export default async function localizeStaticUrls(settings, targetLocales) {
         }
         if (defaultLocaleFiles.length > 0) {
             const defaultPromise = Promise.all(defaultLocaleFiles.map(async (filePath) => {
+                // Check if file exists before processing
+                if (!fs.existsSync(filePath)) {
+                    return;
+                }
                 // Get file content
                 const fileContent = await fs.promises.readFile(filePath, 'utf8');
                 // Localize the file using default locale
@@ -366,6 +371,9 @@ function transformMdxUrls(mdxContent, defaultLocale, targetLocale, hideDefaultLo
     let content;
     try {
         const stringifyProcessor = unified()
+            .use(remarkFrontmatter, ['yaml', 'toml'])
+            .use(remarkMdx)
+            .use(encodeAnglePlaceholders)
             .use(remarkStringify, {
             bullet: '-',
             emphasis: '_',
@@ -373,10 +381,15 @@ function transformMdxUrls(mdxContent, defaultLocale, targetLocale, hideDefaultLo
             rule: '-',
             ruleRepetition: 3,
             ruleSpaces: false,
-        })
-            .use(remarkFrontmatter, ['yaml', 'toml'])
-            .use(remarkMdx);
-        content = stringifyProcessor.stringify(processedAst);
+            handlers: {
+                // Handler to prevent escaping (avoids '<' -> '\<')
+                text(node) {
+                    return node.value;
+                },
+            },
+        });
+        const outTree = stringifyProcessor.runSync(processedAst);
+        content = stringifyProcessor.stringify(outTree);
     }
     catch (error) {
         console.warn(`Failed to stringify MDX content: ${error instanceof Error ? error.message : String(error)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtx-cli",
-  "version": "2.1.17",
+  "version": "2.1.19",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [
@@ -91,6 +91,7 @@
     "json-pointer": "^0.6.2",
     "jsonpath-plus": "^10.3.0",
     "jsonpointer": "^5.0.1",
+    "mdast-util-find-and-replace": "^3.0.2",
     "micromatch": "^4.0.8",
     "open": "^10.1.1",
     "ora": "^8.2.0",