gt 2.6.30-alpha.0 → 2.7.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # gtx-cli
 
+## 2.7.0
+
+### Minor Changes
+
+- [#1069](https://github.com/generaltranslation/gt/pull/1069) [`ff38c7c`](https://github.com/generaltranslation/gt/commit/ff38c7c72886882ddb8851fc8173e1ba863d0078) Thanks [@ErnestM1234](https://github.com/ErnestM1234)! - feat: add new gt package
+
+## 2.6.31
+
+### Patch Changes
+
+- [#1070](https://github.com/generaltranslation/gt/pull/1070) [`516979d`](https://github.com/generaltranslation/gt/commit/516979d36cd16c4bc9080ea7dc06b7e299200919) Thanks [@fernando-aviles](https://github.com/fernando-aviles)! - Handle case where all jobs fail
+
+## 2.6.30
+
+### Patch Changes
+
+- [#1068](https://github.com/generaltranslation/gt/pull/1068) [`94b95ef`](https://github.com/generaltranslation/gt/commit/94b95ef662b81dac51416ecc64f3318339171f0b) Thanks [@ErnestM1234](https://github.com/ErnestM1234)! - fix: runtime calculation for the injection of 'data-' attribute in jsx
+
+- [#1066](https://github.com/generaltranslation/gt/pull/1066) [`7b4837f`](https://github.com/generaltranslation/gt/commit/7b4837fe44e387c4de812d9b3f7fc394cb24e49e) Thanks [@fernando-aviles](https://github.com/fernando-aviles)! - Wrapping text node URLs for Mintlify MDX to align with their parser
+
 ## 2.6.29
 
 ### Patch Changes

package/dist/console/index.d.ts

@@ -18,6 +18,7 @@ export declare const warnFunctionNotFoundSync: (file: string, functionName: stri
 export declare const warnInvalidDeclareVarNameSync: (file: string, value: string, location?: string) => string;
 export declare const warnDuplicateFunctionDefinitionSync: (file: string, functionName: string, location?: string) => string;
 export declare const warnInvalidStaticInitSync: (file: string, functionName: string, location?: string) => string;
+export declare const warnDataAttrOnBranch: (file: string, attrName: string, location?: string) => string;
 export declare const warnRecursiveFunctionCallSync: (file: string, functionName: string, location?: string) => string;
 export declare const warnDeclareStaticNotWrappedSync: (file: string, functionName: string, location?: string) => string;
 export declare const warnDeclareStaticNoResultsSync: (file: string, functionName: string, location?: string) => string;

package/dist/console/index.js

@@ -1,3 +1,4 @@
+import { BRANCH_COMPONENT } from '../react/jsx/utils/constants.js';
 import { colorizeFilepath, colorizeComponent, colorizeIdString, colorizeContent, colorizeLine, colorizeFunctionName, } from './colors.js';
 import { formatCodeClamp } from './formatting.js';
 const withWillErrorInNextVersion = (message) => `${message} (This will become an error in the next major version of the CLI.)`;
@@ -28,6 +29,7 @@ export const warnDuplicateFunctionDefinitionSync = (file, functionName, location
 export const warnInvalidStaticInitSync = (file, functionName, location) => withLocation(file, withStaticError(`The definition for ${colorizeFunctionName(functionName)} could not be resolved. When using arrow syntax to define a static function, the right hand side or the assignment MUST only contain the arrow function itself and no other expressions.
 Example: ${colorizeContent(`const ${colorizeFunctionName(functionName)} = () => { ... }`)}
 Invalid: ${colorizeContent(`const ${colorizeFunctionName(functionName)} = [() => { ... }][0]`)}`), location);
+export const warnDataAttrOnBranch = (file, attrName, location) => withLocation(file, `${colorizeComponent(`<${BRANCH_COMPONENT}>`)} component ignores attributes prefixed with ${colorizeIdString('"data-"')}. Found ${colorizeIdString(attrName)}. Remove it or use a different attribute name.`, location);
 export const warnRecursiveFunctionCallSync = (file, functionName, location) => withLocation(file, withStaticError(`Recursive function call detected: ${colorizeFunctionName(functionName)}. A static function cannot use recursive calls to construct its result.`), location);
 export const warnDeclareStaticNotWrappedSync = (file, functionName, location) => withLocation(file, withDeclareStaticError(`Could not resolve ${colorizeFunctionName(formatCodeClamp(functionName))}. This call is not wrapped in declareStatic(). Ensure the function is properly wrapped with declareStatic() and does not have circular import dependencies.`), location);
 export const warnDeclareStaticNoResultsSync = (file, functionName, location) => withLocation(file, withDeclareStaticError(`Could not resolve ${colorizeFunctionName(formatCodeClamp(functionName))}. DeclareStatic can only receive function invocations and cannot use undefined values or looped calls to construct its result.`), location);

package/dist/formats/files/aggregateFiles.js

@@ -2,14 +2,12 @@ import { logger } from '../../console/logger.js';
 import { recordWarning } from '../../state/translateWarnings.js';
 import { getRelative, readFile } from '../../fs/findFilepath.js';
 import { SUPPORTED_FILE_EXTENSIONS } from './supportedFiles.js';
-import sanitizeFileContent from '../../utils/sanitizeFileContent.js';
 import { parseJson } from '../json/parseJson.js';
 import parseYaml from '../yaml/parseYaml.js';
 import YAML from 'yaml';
 import { determineLibrary } from '../../fs/determineFramework.js';
-import { isValidMdx } from '../../utils/validateMdx.js';
 import { hashStringSync } from '../../utils/hash.js';
-import { applyMintlifyTitleFallback } from '../../utils/mintlifyTitleFallback.js';
+import { preprocessContent } from './preprocessContent.js';
 export const SUPPORTED_DATA_FORMATS = ['JSX', 'ICU', 'I18NEXT'];
 export async function aggregateFiles(settings) {
     // Aggregate all files to translate
@@ -123,33 +121,18 @@ export async function aggregateFiles(settings) {
                 .map((filePath) => {
                 const content = readFile(filePath);
                 const relativePath = getRelative(filePath);
-                if (fileType === 'mdx') {
-                    if (!skipValidation?.mdx) {
-                        const validation = isValidMdx(content, filePath);
-                        if (!validation.isValid) {
-                            logger.warn(`Skipping ${relativePath}: MDX file is not AST parsable${validation.error ? `: ${validation.error}` : ''}`);
-                            recordWarning('skipped_file', relativePath, `MDX file is not AST parsable${validation.error ? `: ${validation.error}` : ''}`);
-                            return null;
-                        }
-                    }
-                }
-                let processedContent = content;
-                let addedMintlifyTitle = false;
-                if (fileType === 'mdx' &&
-                    settings.options?.mintlify?.inferTitleFromFilename) {
-                    const result = applyMintlifyTitleFallback(processedContent, relativePath, settings.defaultLocale);
-                    processedContent = result.content;
-                    addedMintlifyTitle = result.addedTitle;
+                const processed = preprocessContent(content, relativePath, fileType, settings);
+                if (typeof processed !== 'string') {
+                    logger.warn(`Skipping ${relativePath}: ${processed.skip}`);
+                    recordWarning('skipped_file', relativePath, processed.skip);
+                    return null;
                 }
-                const sanitizedContent = sanitizeFileContent(processedContent);
-                // Always hash original content for versionId
-                const computedVersionId = hashStringSync(content);
                 return {
-                    content: sanitizedContent,
+                    content: processed,
                     fileName: relativePath,
                     fileFormat: fileType.toUpperCase(),
                     fileId: hashStringSync(relativePath),
-                    versionId: computedVersionId,
+                    versionId: hashStringSync(content),
                     locale: settings.defaultLocale,
                 };
             })

package/dist/formats/files/preprocess/mdx.d.ts

@@ -0,0 +1,6 @@
+import { Settings } from '../../../types/index.js';
+/**
+ * Runs MDX-specific preprocessing. Returns a skip reason if the file
+ * should be skipped, or null if validation passed.
+ */
+export declare function preprocessMdx(content: string, filePath: string, settings: Settings): string | null;

package/dist/formats/files/preprocess/mdx.js

@@ -0,0 +1,14 @@
+import { isValidMdx } from '../../../utils/validateMdx.js';
+/**
+ * Runs MDX-specific preprocessing. Returns a skip reason if the file
+ * should be skipped, or null if validation passed.
+ */
+export function preprocessMdx(content, filePath, settings) {
+    if (!settings.options?.skipFileValidation?.mdx) {
+        const validation = isValidMdx(content, filePath);
+        if (!validation.isValid) {
+            return `MDX file is not AST parsable${validation.error ? `: ${validation.error}` : ''}`;
+        }
+    }
+    return null;
+}

package/dist/formats/files/preprocess/mintlify.d.ts

@@ -0,0 +1,5 @@
+import { Settings } from '../../../types/index.js';
+/**
+ * Runs all Mintlify-specific preprocessing on file content.
+ */
+export declare function preprocessMintlify(content: string, filePath: string, fileType: string, settings: Settings): string;

package/dist/formats/files/preprocess/mintlify.js

@@ -0,0 +1,15 @@
+import { applyMintlifyTitleFallback } from '../../../utils/mintlifyTitleFallback.js';
+import wrapPlainUrls from '../../../utils/wrapPlainUrls.js';
+/**
+ * Runs all Mintlify-specific preprocessing on file content.
+ */
+export function preprocessMintlify(content, filePath, fileType, settings) {
+    if (fileType !== 'mdx')
+        return content;
+    let result = content;
+    if (settings.options?.mintlify?.inferTitleFromFilename) {
+        result = applyMintlifyTitleFallback(result, filePath, settings.defaultLocale).content;
+    }
+    result = wrapPlainUrls(result);
+    return result;
+}

package/dist/formats/files/preprocessContent.d.ts

@@ -0,0 +1,8 @@
+import { Settings } from '../../types/index.js';
+/**
+ * Preprocesses file content before upload. Returns the processed content,
+ * or { skip: reason } if the file should be skipped.
+ */
+export declare function preprocessContent(content: string, filePath: string, fileType: string, settings: Settings): string | {
+    skip: string;
+};

package/dist/formats/files/preprocessContent.js

@@ -0,0 +1,23 @@
+import { preprocessMdx } from './preprocess/mdx.js';
+import { preprocessMintlify } from './preprocess/mintlify.js';
+import sanitizeFileContent from '../../utils/sanitizeFileContent.js';
+/**
+ * Preprocesses file content before upload. Returns the processed content,
+ * or { skip: reason } if the file should be skipped.
+ */
+export function preprocessContent(content, filePath, fileType, settings) {
+    let result = content;
+    // File-type-specific
+    if (fileType === 'mdx') {
+        const skipReason = preprocessMdx(result, filePath, settings);
+        if (skipReason)
+            return { skip: skipReason };
+    }
+    // Framework-specific
+    if (settings.framework === 'mintlify') {
+        result = preprocessMintlify(result, filePath, fileType, settings);
+    }
+    // Universal
+    result = sanitizeFileContent(result);
+    return result;
+}

package/dist/generated/version.d.ts

@@ -1 +1 @@
-export declare const PACKAGE_VERSION = "2.6.30-alpha.0";
+export declare const PACKAGE_VERSION = "2.7.0";

package/dist/generated/version.js

@@ -1,2 +1,2 @@
 // This file is auto-generated. Do not edit manually.
-export const PACKAGE_VERSION = '2.6.30-alpha.0';
+export const PACKAGE_VERSION = '2.7.0';

package/dist/react/jsx/utils/constants.d.ts

@@ -7,7 +7,9 @@ export declare const INLINE_MESSAGE_HOOK = "useMessages";
 export declare const INLINE_MESSAGE_HOOK_ASYNC = "getMessages";
 export declare const TRANSLATION_COMPONENT = "T";
 export declare const STATIC_COMPONENT = "Static";
+export declare const BRANCH_COMPONENT = "Branch";
 export declare const GT_TRANSLATION_FUNCS: string[];
 export declare const VARIABLE_COMPONENTS: string[];
 export declare const GT_ATTRIBUTES_WITH_SUGAR: readonly ["$id", "$context", "$maxChars"];
 export declare const GT_ATTRIBUTES: readonly ["id", "context", "maxChars", "$id", "$context", "$maxChars"];
+export declare const DATA_ATTR_PREFIX: "data-";

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

@@ -7,6 +7,7 @@ export const INLINE_MESSAGE_HOOK = 'useMessages';
 export const INLINE_MESSAGE_HOOK_ASYNC = 'getMessages';
 export const TRANSLATION_COMPONENT = 'T';
 export const STATIC_COMPONENT = 'Static';
+export const BRANCH_COMPONENT = 'Branch';
 // GT translation functions
 export const GT_TRANSLATION_FUNCS = [
     INLINE_TRANSLATION_HOOK,
@@ -22,7 +23,7 @@ export const GT_TRANSLATION_FUNCS = [
     'DateTime',
     'Currency',
     'Num',
-    'Branch',
+    BRANCH_COMPONENT,
     'Plural',
 ];
 // Valid variable components
@@ -44,3 +45,5 @@ export const GT_ATTRIBUTES = [
     'maxChars',
     ...GT_ATTRIBUTES_WITH_SUGAR,
 ];
+// Data attribute prefix injected by build tools
+export const DATA_ATTR_PREFIX = 'data-';

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

@@ -1,6 +1,7 @@
 import { HTML_CONTENT_PROPS, } from 'generaltranslation/types';
 import { defaultVariableNames, getVariableName, minifyVariableType, } from '../../../utils/getVariableName.js';
 import { isAcceptedPluralForm } from 'generaltranslation/internal';
+import { DATA_ATTR_PREFIX } from '../constants.js';
 /**
  * Construct the data-_gt prop
  * @param type - The type of the element
@@ -33,7 +34,9 @@ function constructGTProp(type, props, id) {
     }
     else if (type === 'Branch') {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars, no-unused-vars
-        const { children, branch, ...branches } = props;
+        const { children, branch, ...allBranches } = props;
+        // Filter out data-* attributes injected by build tools
+        const branches = Object.fromEntries(Object.entries(allBranches).filter(([key]) => !key.startsWith(DATA_ATTR_PREFIX)));
         const resultBranches = Object.entries(branches).reduce((acc, [branchName, branch]) => {
             acc[branchName] = addGTIdentifierToSyntaxTree(branch, id);
             return acc;

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

@@ -6,10 +6,10 @@ import * as t from '@babel/types';
 import fs from 'node:fs';
 import { parse } from '@babel/parser';
 import addGTIdentifierToSyntaxTree from './addGTIdentifierToSyntaxTree.js';
-import { warnHasUnwrappedExpressionSync, warnNestedTComponent, warnFunctionNotFoundSync, warnMissingReturnSync, warnDuplicateFunctionDefinitionSync, warnInvalidStaticInitSync, warnRecursiveFunctionCallSync, } from '../../../../console/index.js';
+import { warnHasUnwrappedExpressionSync, warnNestedTComponent, warnFunctionNotFoundSync, warnMissingReturnSync, warnDuplicateFunctionDefinitionSync, warnInvalidStaticInitSync, warnRecursiveFunctionCallSync, warnDataAttrOnBranch, } from '../../../../console/index.js';
 import { isAcceptedPluralForm } from 'generaltranslation/internal';
 import { isStaticExpression } from '../../evaluateJsx.js';
-import { STATIC_COMPONENT, TRANSLATION_COMPONENT, VARIABLE_COMPONENTS, } from '../constants.js';
+import { DATA_ATTR_PREFIX, STATIC_COMPONENT, TRANSLATION_COMPONENT, VARIABLE_COMPONENTS, } from '../constants.js';
 import { HTML_CONTENT_PROPS } from 'generaltranslation/types';
 import { resolveImportPath } from '../resolveImportPath.js';
 import traverseModule from '@babel/traverse';
@@ -161,6 +161,10 @@ function buildJSXTree({ node, helperPath, scopeNode, insideT, inStatic, config,
                     ? attr.name.name
                     : attr.name.name.name;
                 let attrValue = null;
+                if (elementIsBranch && attrName.startsWith(DATA_ATTR_PREFIX)) {
+                    const location = `${attr.loc?.start?.line}:${attr.loc?.start?.column}`;
+                    output.errors.push(warnDataAttrOnBranch(config.file, attrName, location));
+                }
                 if (attr.value) {
                     if (t.isStringLiteral(attr.value)) {
                         attrValue = attr.value.value;
@@ -171,7 +175,9 @@ function buildJSXTree({ node, helperPath, scopeNode, insideT, inStatic, config,
                         const isHtmlContentProp = Object.values(HTML_CONTENT_PROPS).includes(attrName);
                         // If its a plural or branch prop
                         if ((elementIsPlural && isAcceptedPluralForm(attrName)) ||
-                            (elementIsBranch && attrName !== 'branch')) {
+                            (elementIsBranch &&
+                                attrName !== 'branch' &&
+                                !attrName.startsWith(DATA_ATTR_PREFIX))) {
                             // Make sure that variable strings like {`I have ${count} book`} are invalid!
                             if (t.isTemplateLiteral(attr.value.expression) &&
                                 !isStaticExpression(attr.value.expression, true).isStatic) {

package/dist/utils/wrapPlainUrls.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Wraps plain URLs in markdown link syntax [url](url) so that
+ * translation pipelines preserve the URL separately from surrounding text.
+ *
+ * Uses remark AST parsing to identify URLs that appear in text nodes only.
+ *
+ */
+export default function wrapPlainUrls(content: string): string;

package/dist/utils/wrapPlainUrls.js

@@ -0,0 +1,72 @@
+import { unified } from 'unified';
+import remarkParse from 'remark-parse';
+import remarkMdx from 'remark-mdx';
+import remarkFrontmatter from 'remark-frontmatter';
+import { visit } from 'unist-util-visit';
+/**
+ * Wraps plain URLs in markdown link syntax [url](url) so that
+ * translation pipelines preserve the URL separately from surrounding text.
+ *
+ * Uses remark AST parsing to identify URLs that appear in text nodes only.
+ *
+ */
+export default function wrapPlainUrls(content) {
+    const URL_REGEX = /https?:\/\/[^\s<>\[\]]*[^\s<>\[\].,;:!?'"\]}>]/g;
+    let ast;
+    try {
+        const processor = unified()
+            .use(remarkParse)
+            .use(remarkFrontmatter, ['yaml', 'toml'])
+            .use(remarkMdx);
+        ast = processor.parse(content);
+        ast = processor.runSync(ast);
+    }
+    catch {
+        // If parsing fails, return content unchanged
+        return content;
+    }
+    // Collect all URL replacements from text nodes with their positions
+    const replacements = [];
+    visit(ast, 'text', (node, _index, parent) => {
+        // Skip text nodes inside links — those are already display text for a link
+        if (parent && parent.type === 'link')
+            return;
+        const pos = node.position;
+        if (!pos)
+            return;
+        const value = node.value;
+        let match;
+        while ((match = URL_REGEX.exec(value)) !== null) {
+            let url = match[0];
+            const nodeStartOffset = pos.start.offset;
+            if (nodeStartOffset === undefined)
+                continue;
+            // Trim unbalanced trailing ')' so that prose like "(see https://example.com)"
+            // doesn't absorb the surrounding paren, while Wikipedia-style URLs with
+            // balanced parens (e.g. /wiki/Unix_(operating_system)) are kept intact.
+            while (url.endsWith(')')) {
+                const open = url.split('(').length - 1;
+                const close = url.split(')').length - 1;
+                if (close > open) {
+                    url = url.slice(0, -1);
+                }
+                else {
+                    break;
+                }
+            }
+            // Calculate the absolute offset in the original content
+            const urlStart = nodeStartOffset + match.index;
+            const urlEnd = urlStart + url.length;
+            replacements.push({ start: urlStart, end: urlEnd, url });
+        }
+    });
+    if (replacements.length === 0)
+        return content;
+    // Apply replacements in reverse order to preserve positions
+    let result = content;
+    for (let i = replacements.length - 1; i >= 0; i--) {
+        const { start, end, url } = replacements[i];
+        result = result.slice(0, start) + `[${url}](${url})` + result.slice(end);
+    }
+    return result;
+}

package/dist/workflows/download.js

@@ -75,6 +75,10 @@ export async function runDownloadWorkflow({ fileVersionData, jobData, branchData
             for (const [, value] of pollResult.fileTracker.failed) {
                 recordWarning('failed_translation', value.fileName, `Failed to translate for locale ${value.locale}`);
             }
+            // If all files failed translation, exit early
+            if (pollResult.fileTracker.completed.size === 0) {
+                return false;
+            }
         }
         // Even if polling timed out, still download whatever completed successfully
         if (!pollResult.success) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gt",
-  "version": "2.6.30-alpha.0",
+  "version": "2.7.0",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [
@@ -131,7 +131,8 @@
     "prettier": "^3.4.2",
     "ts-node": "^10.9.2",
     "tslib": "^2.8.1",
-    "typescript": "^5.5.4"
+    "typescript": "^5.5.4",
+    "vitest": "^2.0.0"
   },
   "scripts": {
     "build": "node scripts/generate-version.js && tsc && rm -rf dist/setup/instructions && cp -r src/setup/instructions dist/setup/instructions",