gt 2.10.6 → 2.10.7

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # gtx-cli
 
+## 2.10.7
+
+### Patch Changes
+
+- [#1118](https://github.com/generaltranslation/gt/pull/1118) [`de6a2d1`](https://github.com/generaltranslation/gt/commit/de6a2d1caa150383c70844b3ee6b9b2e66f77769) Thanks [@ErnestM1234](https://github.com/ErnestM1234)! - feat: add t macro
+
 ## 2.10.6
 
 ### Patch Changes

package/dist/generated/version.d.ts

@@ -1 +1 @@
-export declare const PACKAGE_VERSION = "2.10.6";
+export declare const PACKAGE_VERSION = "2.10.7";

package/dist/generated/version.js

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

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

@@ -6,6 +6,7 @@ export declare const DECLARE_STATIC_FUNCTION = "declareStatic";
 export declare const DERIVE_FUNCTION = "derive";
 export declare const MSG_REGISTRATION_FUNCTION = "msg";
 export declare const T_REGISTRATION_FUNCTION = "t";
+export declare const T_GLOBAL_REGISTRATION_FUNCTION = "t";
 export declare const INLINE_TRANSLATION_HOOK = "useGT";
 export declare const INLINE_TRANSLATION_HOOK_ASYNC = "getGT";
 export declare const INLINE_MESSAGE_HOOK = "useMessages";
@@ -23,3 +24,4 @@ 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-";
+export declare const T_GLOBAL_REGISTRATION_FUNCTION_MARKER = "_gt_internal_t_global_registration_marker";

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

@@ -6,6 +6,7 @@ export const DECLARE_STATIC_FUNCTION = 'declareStatic';
 export const DERIVE_FUNCTION = 'derive';
 export const MSG_REGISTRATION_FUNCTION = 'msg';
 export const T_REGISTRATION_FUNCTION = 't';
+export const T_GLOBAL_REGISTRATION_FUNCTION = 't';
 export const INLINE_TRANSLATION_HOOK = 'useGT';
 export const INLINE_TRANSLATION_HOOK_ASYNC = 'getGT';
 export const INLINE_MESSAGE_HOOK = 'useMessages';
@@ -65,3 +66,5 @@ export const GT_ATTRIBUTES = [
 ];
 // Data attribute prefix injected by build tools
 export const DATA_ATTR_PREFIX = 'data-';
+// demarcation for global t macro
+export const T_GLOBAL_REGISTRATION_FUNCTION_MARKER = '_gt_internal_t_global_registration_marker';

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

@@ -1,6 +1,7 @@
 import traverseModule from '@babel/traverse';
-import { GT_TRANSLATION_FUNCS, INLINE_TRANSLATION_HOOK, INLINE_TRANSLATION_HOOK_ASYNC, INLINE_MESSAGE_HOOK, INLINE_MESSAGE_HOOK_ASYNC, MSG_REGISTRATION_FUNCTION, T_REGISTRATION_FUNCTION, TRANSLATION_COMPONENT, } from '../../jsx/utils/constants.js';
+import { GT_TRANSLATION_FUNCS, INLINE_TRANSLATION_HOOK, INLINE_TRANSLATION_HOOK_ASYNC, INLINE_MESSAGE_HOOK, INLINE_MESSAGE_HOOK_ASYNC, MSG_REGISTRATION_FUNCTION, T_REGISTRATION_FUNCTION, TRANSLATION_COMPONENT, T_GLOBAL_REGISTRATION_FUNCTION, T_GLOBAL_REGISTRATION_FUNCTION_MARKER, } from '../../jsx/utils/constants.js';
 import { extractImportName } from './parseAst.js';
+import * as t from '@babel/types';
 // Handle CommonJS/ESM interop
 const traverse = traverseModule.default || traverseModule;
 /**
@@ -15,6 +16,19 @@ export function getPathsAndAliases(ast, pkgs) {
     const inlineTranslationPaths = [];
     const translationComponentPaths = [];
     traverse(ast, {
+        // extract global t tagged template
+        TaggedTemplateExpression(path) {
+            if (t.isIdentifier(path.node.tag, {
+                name: T_GLOBAL_REGISTRATION_FUNCTION,
+            }) &&
+                !path.scope.hasBinding(T_GLOBAL_REGISTRATION_FUNCTION)) {
+                inlineTranslationPaths.push({
+                    localName: T_GLOBAL_REGISTRATION_FUNCTION,
+                    path: path.get('tag'),
+                    originalName: T_GLOBAL_REGISTRATION_FUNCTION_MARKER,
+                });
+            }
+        },
         ImportDeclaration(path) {
             if (pkgs.some((pkg) => path.node.source.value.startsWith(pkg))) {
                 const importName = extractImportName(path.node, pkgs, GT_TRANSLATION_FUNCS);

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

@@ -1,5 +1,5 @@
 import * as t from '@babel/types';
-import { INLINE_TRANSLATION_HOOK, INLINE_TRANSLATION_HOOK_ASYNC, INLINE_MESSAGE_HOOK, INLINE_MESSAGE_HOOK_ASYNC, STRING_REGISTRATION_FUNCS, } from './constants.js';
+import { INLINE_TRANSLATION_HOOK, INLINE_TRANSLATION_HOOK_ASYNC, INLINE_MESSAGE_HOOK, INLINE_MESSAGE_HOOK_ASYNC, STRING_REGISTRATION_FUNCS, T_GLOBAL_REGISTRATION_FUNCTION_MARKER, } from './constants.js';
 import { warnAsyncUseGT, warnSyncGetGT } from '../../../console/index.js';
 import traverseModule from '@babel/traverse';
 // Handle CommonJS/ESM interop
@@ -9,6 +9,7 @@ import { parse } from '@babel/parser';
 import { resolveImportPath } from './resolveImportPath.js';
 import { buildImportMap } from './buildImportMap.js';
 import { processTranslationCall } from './stringParsing/processTranslationCall/index.js';
+import { processTaggedTemplateCall } from './stringParsing/processTaggedTemplateCall/index.js';
 /**
  * Cache for resolved import paths to avoid redundant I/O operations.
  * Key: `${currentFile}::${importPath}`
@@ -88,6 +89,12 @@ function handleFunctionCall(tPath, config, state, output) {
         // Direct translation call: t('hello')
         processTranslationCall(tPath, config, output);
     }
+    else if (!config.ignoreTaggedTemplates &&
+        tPath.parent.type === 'TaggedTemplateExpression' &&
+        tPath.parent.tag === tPath.node) {
+        // Tagged template: t`hello ${name}`
+        processTaggedTemplateCall(tPath, config, output);
+    }
     else if (tPath.parent.type === 'CallExpression' &&
         t.isExpression(tPath.node) &&
         tPath.parent.arguments.includes(tPath.node)) {
@@ -270,6 +277,13 @@ function processFunctionInFile(filePath, functionName, argIndex, config, state,
  * - This will parse constants.ts to find translation calls within getInfo function
  */
 export function parseStrings(importName, originalName, path, config, output) {
+    // Handle global t macro directly — path is already the tag identifier
+    if (originalName === T_GLOBAL_REGISTRATION_FUNCTION_MARKER) {
+        if (!config.ignoreGlobalTaggedTemplates) {
+            processTaggedTemplateCall(path, config, output);
+        }
+        return;
+    }
     // First, collect all imports in this file to track cross-file function calls
     const importMap = buildImportMap(path.scope.getProgramParent().path);
     const referencePaths = path.scope.bindings[importName]?.referencePaths || [];
@@ -284,12 +298,20 @@ export function parseStrings(importName, originalName, path, config, output) {
                 ignoreInvalidIcu: false,
                 ignoreInlineListContent: false,
                 includeSourceCodeContext: config.includeSourceCodeContext,
+                ignoreTaggedTemplates: false,
+                ignoreGlobalTaggedTemplates: false,
             };
-            // Check if this is a direct call to msg('string')
+            // Check if this is a direct call to msg('string') or t('string')
             if (refPath.parent.type === 'CallExpression' &&
                 refPath.parent.callee === refPath.node) {
                 processTranslationCall(refPath, stringRegistrationConfig, output);
             }
+            else if (!stringRegistrationConfig.ignoreTaggedTemplates &&
+                refPath.parent.type === 'TaggedTemplateExpression' &&
+                refPath.parent.tag === refPath.node) {
+                // Tagged template: t`hello ${name}`
+                processTaggedTemplateCall(refPath, stringRegistrationConfig, output);
+            }
             continue;
         }
         // Handle useGT(), getGT(), useMessages(), and getMessages() calls that need variable assignment
@@ -324,6 +346,8 @@ export function parseStrings(importName, originalName, path, config, output) {
                 // TODO: when we add support for array content in gt function, this should just always be false
                 ignoreInlineListContent: isInlineGT,
                 includeSourceCodeContext: config.includeSourceCodeContext,
+                ignoreTaggedTemplates: false,
+                ignoreGlobalTaggedTemplates: false,
             };
             const effectiveParent = parentPath?.node.type === 'AwaitExpression'
                 ? parentPath.parentPath

package/dist/react/jsx/utils/stringParsing/processTaggedTemplateCall/handleTaggedTemplateTranslationCall.d.ts

@@ -0,0 +1,23 @@
+import * as t from '@babel/types';
+import { ParsingConfig, ParsingOutput } from '../types.js';
+import { InlineMetadata } from '../processTranslationCall/extractStringEntryMetadata.js';
+/**
+ * Extracts a translatable message from a TaggedTemplateExpression.
+ *
+ * Follows the same extraction pattern as `extractInterpolatableValues` in
+ * `packages/react/src/i18n-context/functions/translation/t.ts`:
+ * - Iterates through quasis and expressions interleaved
+ * - Creates numeric placeholders ({0}, {1}, etc.) for each expression
+ * - Joins all parts into the final source string
+ *
+ * @param quasi - The TemplateLiteral from the TaggedTemplateExpression
+ * @param metadata - Extracted metadata (empty for tagged templates)
+ * @param config - Parsing configuration
+ * @param output - Parsing output collectors
+ */
+export declare function handleTaggedTemplateTranslationCall({ quasi, metadata, config, output, }: {
+    quasi: t.TemplateLiteral;
+    metadata: InlineMetadata;
+    config: ParsingConfig;
+    output: ParsingOutput;
+}): void;

package/dist/react/jsx/utils/stringParsing/processTaggedTemplateCall/handleTaggedTemplateTranslationCall.js

@@ -0,0 +1,42 @@
+import { isValidIcu } from '../../../evaluateJsx.js';
+import { warnInvalidIcuSync } from '../../../../../console/index.js';
+/**
+ * Extracts a translatable message from a TaggedTemplateExpression.
+ *
+ * Follows the same extraction pattern as `extractInterpolatableValues` in
+ * `packages/react/src/i18n-context/functions/translation/t.ts`:
+ * - Iterates through quasis and expressions interleaved
+ * - Creates numeric placeholders ({0}, {1}, etc.) for each expression
+ * - Joins all parts into the final source string
+ *
+ * @param quasi - The TemplateLiteral from the TaggedTemplateExpression
+ * @param metadata - Extracted metadata (empty for tagged templates)
+ * @param config - Parsing configuration
+ * @param output - Parsing output collectors
+ */
+export function handleTaggedTemplateTranslationCall({ quasi, metadata, config, output, }) {
+    const parts = [];
+    let varIndex = 0;
+    for (let i = 0; i < quasi.quasis.length; i++) {
+        parts.push(quasi.quasis[i].value.cooked ?? quasi.quasis[i].value.raw);
+        if (i < quasi.expressions.length) {
+            const key = varIndex.toString();
+            parts.push(`{${key}}`);
+            varIndex++;
+        }
+    }
+    const source = parts.join('');
+    // Validate ICU format
+    if (!config.ignoreInvalidIcu) {
+        const { isValid, error } = isValidIcu(source);
+        if (!isValid) {
+            output.warnings.add(warnInvalidIcuSync(config.file, source, error ?? 'Unknown error', `${quasi.loc?.start?.line}:${quasi.loc?.start?.column}`));
+            return;
+        }
+    }
+    output.updates.push({
+        dataFormat: 'ICU',
+        source,
+        metadata,
+    });
+}

package/dist/react/jsx/utils/stringParsing/processTaggedTemplateCall/index.d.ts

@@ -0,0 +1,13 @@
+import { NodePath } from '@babel/traverse';
+import { ParsingConfig, ParsingOutput } from '../types.js';
+/**
+ * Processes a tagged template expression (e.g., t`hello ${name}`).
+ * Extracts the translatable string with numeric placeholders for expressions.
+ *
+ * Tagged templates don't support an options argument, so metadata is empty.
+ *
+ * @param tPath - The path to the tag identifier
+ * @param config - Parsing configuration
+ * @param output - Parsing output collectors
+ */
+export declare function processTaggedTemplateCall(tPath: NodePath, config: ParsingConfig, output: ParsingOutput): void;

package/dist/react/jsx/utils/stringParsing/processTaggedTemplateCall/index.js

@@ -0,0 +1,24 @@
+import * as t from '@babel/types';
+import { handleTaggedTemplateTranslationCall } from './handleTaggedTemplateTranslationCall.js';
+/**
+ * Processes a tagged template expression (e.g., t`hello ${name}`).
+ * Extracts the translatable string with numeric placeholders for expressions.
+ *
+ * Tagged templates don't support an options argument, so metadata is empty.
+ *
+ * @param tPath - The path to the tag identifier
+ * @param config - Parsing configuration
+ * @param output - Parsing output collectors
+ */
+export function processTaggedTemplateCall(tPath, config, output) {
+    if (!t.isTaggedTemplateExpression(tPath.parent) ||
+        tPath.parent.tag !== tPath.node) {
+        return;
+    }
+    handleTaggedTemplateTranslationCall({
+        quasi: tPath.parent.quasi,
+        metadata: {},
+        config,
+        output,
+    });
+}

package/dist/react/jsx/utils/stringParsing/types.d.ts

@@ -27,6 +27,14 @@ export type ParsingConfig = {
      * If true, include surrounding source code lines as context for translations
      */
     includeSourceCodeContext?: boolean;
+    /**
+     * If true, ignore tagged template expressions (e.g., t`hello ${name}`)
+     */
+    ignoreTaggedTemplates: boolean;
+    /**
+     * If true, ignore global tagged template expressions (t`hello` without import)
+     */
+    ignoreGlobalTaggedTemplates: boolean;
 };
 /**
  * Mutable state for tracking parsing progress.

package/dist/react/parse/createInlineUpdates.js

@@ -40,6 +40,8 @@ export async function createInlineUpdates(pkg, validate, filePatterns, parsingOp
                 ignoreInvalidIcu: false,
                 ignoreInlineListContent: false,
                 includeSourceCodeContext,
+                ignoreTaggedTemplates: false,
+                ignoreGlobalTaggedTemplates: false,
             }, { updates, errors, warnings });
         }
         // Parse <T> components

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gt",
-  "version": "2.10.6",
+  "version": "2.10.7",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [