gtx-cli 1.2.22 → 1.2.24-alpha.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # gtx-cli
 
+## 1.2.23
+
+### Patch Changes
+
+- [#336](https://github.com/generaltranslation/gt/pull/336) [`d22c287`](https://github.com/generaltranslation/gt/commit/d22c2871f1b474bc6cf981621a37400a92b4bbff) Thanks [@brian-lou](https://github.com/brian-lou)! - Fix string translation fallback function tracing when translating
+
 ## 1.2.22
 
 ### Patch Changes

package/LICENSE.md

@@ -6,7 +6,7 @@ FSL-1.1-ALv2
 
 ## Notice
 
-Copyright 2024 General Translation, Inc.
+Copyright 2025 General Translation, Inc.
 
 ## Terms and Conditions
 

package/dist/cli/base.d.ts

@@ -1,3 +1,4 @@
+import { Command } from 'commander';
 import { Settings, SupportedLibraries, SetupOptions } from '../types';
 export type TranslateOptions = {
     config?: string;
@@ -13,7 +14,8 @@ export type LoginOptions = {
 export declare class BaseCLI {
     protected library: SupportedLibraries;
     protected additionalModules: SupportedLibraries[];
-    constructor(library: SupportedLibraries, additionalModules?: SupportedLibraries[]);
+    protected program: Command;
+    constructor(program: Command, library: SupportedLibraries, additionalModules?: SupportedLibraries[]);
     init(): void;
     execute(): void;
     protected setupGTCommand(): void;

package/dist/cli/base.js

@@ -37,8 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseCLI = void 0;
-const commander_1 = require("commander");
-const setupConfig_1 = __importDefault(require("../fs/config/setupConfig"));
+const setupConfig_1 = require("../fs/config/setupConfig");
 const findFilepath_1 = __importStar(require("../fs/findFilepath"));
 const console_1 = require("../console");
 const node_path_1 = __importDefault(require("node:path"));
@@ -57,8 +56,10 @@ const credentials_2 = require("../utils/credentials");
 class BaseCLI {
     library;
     additionalModules;
+    program;
     // Constructor is shared amongst all CLI class types
-    constructor(library, additionalModules) {
+    constructor(program, library, additionalModules) {
+        this.program = program;
         this.library = library;
         this.additionalModules = additionalModules || [];
         this.setupInitCommand();
@@ -76,10 +77,9 @@ class BaseCLI {
         if (process.argv.length <= 2) {
             process.argv.push('init');
         }
-        commander_1.program.parse();
     }
     setupGTCommand() {
-        commander_1.program
+        this.program
             .command('translate')
             .description('Translate your project using General Translation')
             .option('-c, --config <path>', 'Filepath to config file, by default gt.config.json', (0, findFilepath_1.default)(['gt.config.json']))
@@ -97,7 +97,7 @@ class BaseCLI {
         });
     }
     setupLoginCommand() {
-        commander_1.program
+        this.program
             .command('auth')
             .description('Generate a General Translation API key and project ID')
             .option('-c, --config <path>', 'Filepath to config file, by default gt.config.json', (0, findFilepath_1.default)(['gt.config.json']))
@@ -130,7 +130,7 @@ class BaseCLI {
         });
     }
     setupInitCommand() {
-        commander_1.program
+        this.program
             .command('init')
             .description('Run the setup wizard to configure your project for General Translation')
             .option('--src <paths...>', "Filepath to directory containing the app's source code, by default ./src || ./app || ./pages || ./components", (0, findFilepath_1.findFilepaths)(['./src', './app', './pages', './components']))
@@ -163,7 +163,7 @@ See the docs for more information: https://generaltranslation.com/docs/react/tut
         });
     }
     setupConfigureCommand() {
-        commander_1.program
+        this.program
             .command('configure')
             .description('Configure your project for General Translation. This will create a gt.config.json file in your codebase.')
             .action(async () => {
@@ -175,7 +175,7 @@ See the docs for more information: https://generaltranslation.com/docs/react/tut
         });
     }
     setupSetupCommand() {
-        commander_1.program
+        this.program
             .command('setup')
             .description('Run the setup to configure your Next.js or React project for General Translation')
             .option('--src <paths...>', "Filepath to directory containing the app's source code, by default ./src || ./app || ./pages || ./components", (0, findFilepath_1.findFilepaths)(['./src', './app', './pages', './components']))
@@ -248,7 +248,7 @@ See the docs for more information: https://generaltranslation.com/docs/react/tut
             : null;
         const message = !isUsingGT
             ? 'What is the format of your language resource files? Select as many as applicable.\nAdditionally, you can translate any other files you have in your project.'
-            : `${chalk_1.default.gray('(Optional)')} Do you have any separate files you would like to translate? For example, extra Markdown files for docs.`;
+            : `${chalk_1.default.dim('(Optional)')} Do you have any separate files you would like to translate? For example, extra Markdown files for docs.`;
         const dataFormats = await (0, console_1.promptMultiSelect)({
             message,
             options: [
@@ -281,7 +281,7 @@ See the docs for more information: https://generaltranslation.com/docs/react/tut
             configFilepath = 'src/gt.config.json';
         }
         // Create gt.config.json
-        await (0, setupConfig_1.default)(configFilepath, {
+        await (0, setupConfig_1.createOrUpdateConfig)(configFilepath, {
             defaultLocale,
             locales,
             files: Object.keys(files).length > 0 ? files : undefined,

package/dist/cli/next.d.ts

@@ -1,7 +1,8 @@
 import { WrapOptions, SupportedFrameworks, SupportedLibraries } from '../types';
 import { ReactCLI } from './react';
+import { Command } from 'commander';
 export declare class NextCLI extends ReactCLI {
-    constructor(library: 'gt-next', additionalModules?: SupportedLibraries[]);
+    constructor(command: Command, library: 'gt-next', additionalModules?: SupportedLibraries[]);
     init(): void;
     execute(): void;
     protected wrapContent(options: WrapOptions, framework: SupportedFrameworks, errors: string[], warnings: string[]): Promise<{

package/dist/cli/next.js

@@ -1,15 +1,12 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NextCLI = void 0;
 const react_1 = require("./react");
-const wrapContent_1 = __importDefault(require("../next/parse/wrapContent"));
+const wrapContent_1 = require("../next/parse/wrapContent");
 const pkg = 'gt-next';
 class NextCLI extends react_1.ReactCLI {
-    constructor(library, additionalModules) {
-        super(library, additionalModules);
+    constructor(command, library, additionalModules) {
+        super(command, library, additionalModules);
     }
     init() {
         this.setupStageCommand();
@@ -21,7 +18,7 @@ class NextCLI extends react_1.ReactCLI {
         super.execute();
     }
     wrapContent(options, framework, errors, warnings) {
-        return (0, wrapContent_1.default)(options, pkg, errors, warnings);
+        return (0, wrapContent_1.wrapContentNext)(options, pkg, errors, warnings);
     }
 }
 exports.NextCLI = NextCLI;

package/dist/cli/react.d.ts

@@ -1,7 +1,8 @@
+import { Command } from 'commander';
 import { Options, SupportedFrameworks, WrapOptions, GenerateSourceOptions, SupportedLibraries } from '../types';
 import { BaseCLI } from './base';
 export declare class ReactCLI extends BaseCLI {
-    constructor(library: 'gt-react' | 'gt-next', additionalModules?: SupportedLibraries[]);
+    constructor(command: Command, library: 'gt-react' | 'gt-next', additionalModules?: SupportedLibraries[]);
     init(): void;
     execute(): void;
     protected wrapContent(options: WrapOptions, framework: SupportedFrameworks, errors: string[], warnings: string[]): Promise<{

package/dist/cli/react.js

@@ -37,15 +37,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReactCLI = void 0;
-// packages/gt-cli-core/src/BaseCLI.ts
-const commander_1 = require("commander");
 const console_1 = require("../console/console");
 const loadJSON_1 = __importDefault(require("../fs/loadJSON"));
 const findFilepath_1 = __importStar(require("../fs/findFilepath"));
 const chalk_1 = __importDefault(require("chalk"));
 const postProcess_1 = require("../hooks/postProcess");
 const base_1 = require("./base");
-const wrapContent_1 = __importDefault(require("../react/parse/wrapContent"));
+const wrapContent_1 = require("../react/parse/wrapContent");
 const generateSettings_1 = require("../config/generateSettings");
 const saveJSON_1 = require("../fs/saveJSON");
 const parseFilesConfig_1 = require("../fs/config/parseFilesConfig");
@@ -57,8 +55,8 @@ const updateConfig_1 = __importDefault(require("../fs/config/updateConfig"));
 const DEFAULT_TIMEOUT = 600;
 const pkg = 'gt-react';
 class ReactCLI extends base_1.BaseCLI {
-    constructor(library, additionalModules) {
-        super(library, additionalModules);
+    constructor(command, library, additionalModules) {
+        super(command, library, additionalModules);
     }
     init() {
         this.setupStageCommand();
@@ -70,10 +68,10 @@ class ReactCLI extends base_1.BaseCLI {
         super.execute();
     }
     wrapContent(options, framework, errors, warnings) {
-        return (0, wrapContent_1.default)(options, pkg, framework, errors, warnings);
+        return (0, wrapContent_1.wrapContentReact)(options, pkg, framework, errors, warnings);
     }
     setupStageCommand() {
-        commander_1.program
+        this.program
             .command('stage')
             .description('Submits the project to the General Translation API for translation. Translations created using this command will require human approval.')
             .option('-c, --config <path>', 'Filepath to config file, by default gt.config.json', (0, findFilepath_1.default)(['gt.config.json']))
@@ -96,7 +94,7 @@ class ReactCLI extends base_1.BaseCLI {
         });
     }
     setupTranslateCommand() {
-        commander_1.program
+        this.program
             .command('translate')
             .description('Scans the project for a dictionary and/or <T> tags, and sends the updates to the General Translation API for translation.')
             .option('-c, --config <path>', 'Filepath to config file, by default gt.config.json', (0, findFilepath_1.default)(['gt.config.json']))
@@ -119,7 +117,7 @@ class ReactCLI extends base_1.BaseCLI {
         });
     }
     setupGenerateSourceCommand() {
-        commander_1.program
+        this.program
             .command('generate')
             .description('Generate a translation file for the source locale. The -t flag must be provided. This command should be used if you are handling your own translations.')
             .option('--src <paths...>', "Filepath to directory containing the app's source code, by default ./src || ./app || ./pages || ./components")
@@ -136,13 +134,14 @@ class ReactCLI extends base_1.BaseCLI {
         });
     }
     setupScanCommand() {
-        commander_1.program
+        this.program
             .command('scan')
             .description('Scans the project and wraps all JSX elements in the src directory with a <T> tag, with unique ids')
             .option('--src <paths...>', "Filepath to directory containing the app's source code, by default ./src || ./app || ./pages || ./components", (0, findFilepath_1.findFilepaths)(['./src', './app', './pages', './components']))
             .option('-c, --config <path>', 'Filepath to config file, by default gt.config.json', (0, findFilepath_1.default)(['gt.config.json']))
             .option('--disable-ids', 'Disable id generation for the <T> tags', false)
             .option('--disable-formatting', 'Disable formatting of edited files', false)
+            .option('--skip-ts', 'Skip wrapping <T> tags in TypeScript files', false)
             .action(async (options) => {
             (0, console_1.displayHeader)('Scanning project...');
             await this.handleScanCommand(options);
@@ -173,7 +172,7 @@ class ReactCLI extends base_1.BaseCLI {
                         .join('\n')));
             }
             else {
-                (0, console_1.logErrorAndExit)(chalk_1.default.red(`CLI tool encountered errors while scanning for translatable content. ${chalk_1.default.gray('To ignore these errors, re-run with --ignore-errors')}\n` +
+                (0, console_1.logErrorAndExit)(chalk_1.default.red(`CLI tool encountered errors while scanning for translatable content. ${chalk_1.default.dim('To ignore these errors, re-run with --ignore-errors')}\n` +
                     errors
                         .map((error) => chalk_1.default.red('• Error: ') + chalk_1.default.white(error))
                         .join('\n')));

package/dist/config/generateSettings.js

@@ -9,7 +9,7 @@ const warnings_1 = require("../console/warnings");
 const loadConfig_1 = __importDefault(require("../fs/config/loadConfig"));
 const internal_1 = require("generaltranslation/internal");
 const node_fs_1 = __importDefault(require("node:fs"));
-const setupConfig_1 = __importDefault(require("../fs/config/setupConfig"));
+const setupConfig_1 = require("../fs/config/setupConfig");
 const parseFilesConfig_1 = require("../fs/config/parseFilesConfig");
 const findFilepath_1 = require("../fs/findFilepath");
 const validateSettings_1 = require("./validateSettings");
@@ -82,7 +82,7 @@ async function generateSettings(options) {
     // if there's no existing config file, creates one
     // does not include the API key to avoid exposing it
     if (!node_fs_1.default.existsSync(mergedOptions.config)) {
-        await (0, setupConfig_1.default)(mergedOptions.config, {
+        await (0, setupConfig_1.createOrUpdateConfig)(mergedOptions.config, {
             projectId: mergedOptions.projectId,
             defaultLocale: mergedOptions.defaultLocale,
             locales: mergedOptions.locales?.length > 0 ? mergedOptions.locales : undefined,

package/dist/console/colors.js

@@ -22,5 +22,5 @@ function colorizeContent(content) {
     return chalk_1.default.yellow(content);
 }
 function colorizeLine(line) {
-    return chalk_1.default.gray(line);
+    return chalk_1.default.dim(line);
 }

package/dist/console/logging.d.ts

@@ -12,11 +12,7 @@ export declare function displayProjectId(projectId: string): void;
 export declare function displayResolvedPaths(resolvedPaths: [string, string][]): void;
 export declare function displayCreatedConfigFile(configFilepath: string): void;
 export declare function displayUpdatedConfigFile(configFilepath: string): void;
-export declare function createSpinner(indicator?: 'dots' | 'timer'): {
-    start: (msg?: string) => void;
-    stop: (msg?: string, code?: number) => void;
-    message: (msg?: string) => void;
-};
+export declare function createSpinner(indicator?: 'dots' | 'timer'): import("@clack/prompts", { with: { "resolution-mode": "import" } }).SpinnerResult;
 export declare function createOraSpinner(indicator?: 'dots' | 'circleHalves'): Promise<import("ora", { with: { "resolution-mode": "import" } }).Ora>;
 export declare function promptText({ message, defaultValue, validate, }: {
     message: string;

package/dist/console/logging.js

@@ -84,15 +84,15 @@ Y8,        88      88
 function displayInitializingText() {
     const version = (0, packageJson_1.getCLIVersion)();
     console.log(`\n${chalk_1.default.bold.blue('General Translation, Inc.')}
-${chalk_1.default.gray('https://generaltranslation.com/docs')}
-${chalk_1.default.gray(`CLI Version: ${version}\n`)}`);
+${chalk_1.default.dim('https://generaltranslation.com/docs')}
+${chalk_1.default.dim(`CLI Version: ${version}\n`)}`);
 }
 function displayProjectId(projectId) {
-    logMessage(chalk_1.default.gray(`Project ID: ${chalk_1.default.bold(projectId)}`));
+    logMessage(chalk_1.default.dim(`Project ID: ${chalk_1.default.bold(projectId)}`));
 }
 function displayResolvedPaths(resolvedPaths) {
     const paths = resolvedPaths.map(([key, resolvedPath]) => {
-        return chalk_1.default.gray(`'${chalk_1.default.white(key)}' → '${chalk_1.default.green(resolvedPath)}'`);
+        return chalk_1.default.dim(`'${chalk_1.default.white(key)}' → '${chalk_1.default.green(resolvedPath)}'`);
     });
     prompts_1.log.step(`Resolved path aliases:\n${paths.join('\n')}`);
 }
@@ -118,7 +118,7 @@ async function promptText({ message, defaultValue, validate, }) {
         placeholder: defaultValue,
         validate: validate
             ? (value) => {
-                const validation = validate(value);
+                const validation = validate(value || '');
                 return validation === true ? undefined : validation.toString();
             }
             : undefined,

package/dist/fs/config/setupConfig.d.ts

@@ -6,7 +6,7 @@ import { FilesOptions, SupportedFrameworks } from '../../types';
  * @param {string} configFilepath - The path to the config file.
  * @param {Record<string, any>} configObject - The config object to write if the file does not exist.
  */
-export default function createOrUpdateConfig(configFilepath: string, options: {
+export declare function createOrUpdateConfig(configFilepath: string, options: {
     projectId?: string;
     defaultLocale?: string;
     locales?: string[];

package/dist/fs/config/setupConfig.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = createOrUpdateConfig;
+exports.createOrUpdateConfig = createOrUpdateConfig;
 const node_fs_1 = __importDefault(require("node:fs"));
 const console_1 = require("../../console");
 /**

package/dist/hooks/postProcess.js

@@ -54,7 +54,7 @@ async function formatFiles(filesUpdated, formatter) {
             return;
         }
         if (detectedFormatter === 'prettier') {
-            (0, console_1.logMessage)(chalk_1.default.gray('Cleaning up with prettier...'));
+            (0, console_1.logMessage)(chalk_1.default.dim('Cleaning up with prettier...'));
             const prettier = require('prettier');
             for (const file of filesUpdated) {
                 const config = await prettier.resolveConfig(file);
@@ -68,7 +68,7 @@ async function formatFiles(filesUpdated, formatter) {
             return;
         }
         if (detectedFormatter === 'biome') {
-            (0, console_1.logMessage)(chalk_1.default.gray('Cleaning up with biome...'));
+            (0, console_1.logMessage)(chalk_1.default.dim('Cleaning up with biome...'));
             try {
                 await new Promise((resolve, reject) => {
                     const { spawn } = require('child_process');
@@ -99,7 +99,7 @@ async function formatFiles(filesUpdated, formatter) {
             return;
         }
         if (detectedFormatter === 'eslint') {
-            (0, console_1.logMessage)(chalk_1.default.gray('Cleaning up with eslint...'));
+            (0, console_1.logMessage)(chalk_1.default.dim('Cleaning up with eslint...'));
             const { ESLint } = require('eslint');
             const eslint = new ESLint({
                 fix: true,

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 import { BaseCLI } from './cli/base';
-export default function main(): void;
+import { Command } from 'commander';
+export declare function main(program: Command): void;
 export { BaseCLI };

package/dist/index.js

@@ -1,23 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseCLI = void 0;
-exports.default = main;
+exports.main = main;
 const base_1 = require("./cli/base");
 Object.defineProperty(exports, "BaseCLI", { enumerable: true, get: function () { return base_1.BaseCLI; } });
 const next_1 = require("./cli/next");
 const react_1 = require("./cli/react");
 const determineFramework_1 = require("./fs/determineFramework");
-function main() {
+function main(program) {
     const { library, additionalModules } = (0, determineFramework_1.determineLibrary)();
     let cli;
     if (library === 'gt-next') {
-        cli = new next_1.NextCLI(library, additionalModules);
+        cli = new next_1.NextCLI(program, library, additionalModules);
     }
     else if (library === 'gt-react') {
-        cli = new react_1.ReactCLI(library, additionalModules);
+        cli = new react_1.ReactCLI(program, library, additionalModules);
     }
     else {
-        cli = new base_1.BaseCLI(library, additionalModules);
+        cli = new base_1.BaseCLI(program, library, additionalModules);
     }
     cli.init();
     cli.execute();

package/dist/main.js

@@ -4,9 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = __importDefault(require("./index"));
+const index_1 = require("./index");
 const dotenv_1 = __importDefault(require("dotenv"));
+const commander_1 = require("commander");
 dotenv_1.default.config({ path: '.env' });
 dotenv_1.default.config({ path: '.env.local', override: true });
 dotenv_1.default.config({ path: '.env.production', override: true });
-(0, index_1.default)();
+(0, index_1.main)(commander_1.program);
+commander_1.program.parse();

package/dist/next/parse/handleInitGT.d.ts

@@ -1 +1 @@
-export default function handleInitGT(filepath: string, errors: string[], warnings: string[], filesUpdated: string[]): Promise<void>;
+export declare function handleInitGT(filepath: string, errors: string[], warnings: string[], filesUpdated: string[]): Promise<void>;

package/dist/next/parse/handleInitGT.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = handleInitGT;
+exports.handleInitGT = handleInitGT;
 const node_fs_1 = __importDefault(require("node:fs"));
 const parser_1 = require("@babel/parser");
 const generator_1 = __importDefault(require("@babel/generator"));

package/dist/next/parse/wrapContent.d.ts

@@ -6,6 +6,6 @@ import { WrapOptions } from '../../types';
  * @param options - The options object
  * @returns An object containing the updates and errors
  */
-export default function wrapContentNext(options: WrapOptions, pkg: 'gt-next', errors: string[], warnings: string[]): Promise<{
+export declare function wrapContentNext(options: WrapOptions, pkg: 'gt-next', errors: string[], warnings: string[]): Promise<{
     filesUpdated: string[];
 }>;

package/dist/next/parse/wrapContent.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = wrapContentNext;
+exports.wrapContentNext = wrapContentNext;
 const node_fs_1 = __importDefault(require("node:fs"));
 const t = __importStar(require("@babel/types"));
 const parser_1 = require("@babel/parser");
@@ -126,6 +126,10 @@ async function wrapContentNext(options, pkg, errors, warnings) {
                     path.skip();
                     return;
                 }
+                // If skip wrapping Ts, skip processing this node
+                if (options.skipTs) {
+                    return;
+                }
                 // Check if this JSX element has any JSX element ancestors
                 if (t.isJSXElement(path.parentPath?.node) ||
                     t.isJSXExpressionContainer(path.parentPath?.node)) {

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

@@ -6,12 +6,12 @@ export declare const attributes: string[];
  *
  * Supports complex patterns including:
  * 1. Direct calls: const t = useGT(); t('hello');
- * 2. Function parameters: const t = useGT(); getInfo(t); where getInfo uses t() internally
- * 3. Cross-file function calls: imported functions that receive t as a parameter
+ * 2. Translation callback prop drilling: const t = useGT(); getInfo(t); where getInfo uses t() internally
+ * 3. Cross-file function calls: imported functions that receive the translation callback as a parameter
  *
  * Example flow:
  * - const t = useGT();
  * - const { home } = getInfo(t); // getInfo is imported from './constants'
- * - This will parse constants.ts to find t() calls within getInfo function
+ * - This will parse constants.ts to find translation calls within getInfo function
  */
 export declare function parseStrings(importName: string, path: NodePath, updates: Updates, errors: string[], file: string): void;

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

@@ -105,21 +105,163 @@ function processTranslationCall(tPath, updates, errors, file) {
     }
 }
 /**
- * Finds all usages of a function parameter within a function's scope and processes
- * any translation calls made with that parameter.
+ * Extracts the parameter name from a function parameter node, handling TypeScript annotations.
+ */
+function extractParameterName(param) {
+    if (t.isIdentifier(param)) {
+        return param.name;
+    }
+    return null;
+}
+/**
+ * Builds a map of imported function names to their import paths from a given program path.
+ * Handles both named imports and default imports.
+ *
+ * Example: import { getInfo } from './constants' -> Map { 'getInfo' => './constants' }
+ * Example: import utils from './utils' -> Map { 'utils' => './utils' }
+ */
+function buildImportMap(programPath) {
+    const importMap = new Map();
+    programPath.traverse({
+        ImportDeclaration(importPath) {
+            if (t.isStringLiteral(importPath.node.source)) {
+                const importSource = importPath.node.source.value;
+                importPath.node.specifiers.forEach((spec) => {
+                    if (t.isImportSpecifier(spec) &&
+                        t.isIdentifier(spec.imported) &&
+                        t.isIdentifier(spec.local)) {
+                        importMap.set(spec.local.name, importSource);
+                    }
+                    else if (t.isImportDefaultSpecifier(spec) &&
+                        t.isIdentifier(spec.local)) {
+                        importMap.set(spec.local.name, importSource);
+                    }
+                });
+            }
+        },
+    });
+    return importMap;
+}
+/**
+ * Recursively resolves variable assignments to find all aliases of a translation callback parameter.
+ * Handles cases like: const t = translate; const a = translate; const b = a; const c = b;
+ *
+ * @param scope The scope to search within
+ * @param variableName The variable name to resolve
+ * @param visited Set to track already visited variables to prevent infinite loops
+ * @returns Array of all variable names that reference the original translation callback
+ */
+function resolveVariableAliases(scope, variableName, visited = new Set()) {
+    if (visited.has(variableName)) {
+        return []; // Prevent infinite loops
+    }
+    visited.add(variableName);
+    const aliases = [variableName];
+    const binding = scope.bindings[variableName];
+    if (binding) {
+        // Look for variable declarations that assign this variable to another name
+        // Example: const t = translate; or const a = t;
+        for (const [otherVarName, otherBinding] of Object.entries(scope.bindings)) {
+            if (otherVarName === variableName || visited.has(otherVarName))
+                continue;
+            const otherBindingTyped = otherBinding;
+            if (otherBindingTyped.path &&
+                otherBindingTyped.path.isVariableDeclarator() &&
+                otherBindingTyped.path.node.init &&
+                t.isIdentifier(otherBindingTyped.path.node.init) &&
+                otherBindingTyped.path.node.init.name === variableName) {
+                // Found an alias: const otherVarName = variableName;
+                const nestedAliases = resolveVariableAliases(scope, otherVarName, visited);
+                aliases.push(...nestedAliases);
+            }
+        }
+    }
+    return aliases;
+}
+/**
+ * Handles how translation callbacks are used within code.
+ * This covers both direct translation calls (t('hello')) and prop drilling
+ * where the translation callback is passed to other functions (getData(t)).
+ */
+function handleFunctionCall(tPath, updates, errors, file, importMap) {
+    if (tPath.parent.type === 'CallExpression' &&
+        tPath.parent.callee === tPath.node) {
+        // Direct translation call: t('hello')
+        processTranslationCall(tPath, updates, errors, file);
+    }
+    else if (tPath.parent.type === 'CallExpression' &&
+        t.isExpression(tPath.node) &&
+        tPath.parent.arguments.includes(tPath.node)) {
+        // Parameter passed to another function: getData(t)
+        const argIndex = tPath.parent.arguments.indexOf(tPath.node);
+        const callee = tPath.parent.callee;
+        if (t.isIdentifier(callee)) {
+            const calleeBinding = tPath.scope.getBinding(callee.name);
+            if (calleeBinding && calleeBinding.path.isFunction()) {
+                const functionPath = calleeBinding.path;
+                processFunctionIfMatches(callee.name, argIndex, functionPath.node, functionPath, updates, errors, file);
+            }
+            // Handle arrow functions assigned to variables: const getData = (t) => {...}
+            else if (calleeBinding &&
+                calleeBinding.path.isVariableDeclarator() &&
+                calleeBinding.path.node.init &&
+                (t.isArrowFunctionExpression(calleeBinding.path.node.init) ||
+                    t.isFunctionExpression(calleeBinding.path.node.init))) {
+                const initPath = calleeBinding.path.get('init');
+                processFunctionIfMatches(callee.name, argIndex, calleeBinding.path.node.init, initPath, updates, errors, file);
+            }
+            // If not found locally, check if it's an imported function
+            else if (importMap.has(callee.name)) {
+                const importPath = importMap.get(callee.name);
+                const resolvedPath = resolveImportPath(file, importPath);
+                if (resolvedPath) {
+                    findFunctionInFile(resolvedPath, callee.name, argIndex, updates, errors);
+                }
+            }
+        }
+    }
+}
+/**
+ * Processes a user-defined function that receives a translation callback as a parameter.
+ * Validates the function has enough parameters and traces how the translation callback
+ * is used within that function's body.
+ */
+function processFunctionIfMatches(_functionName, argIndex, functionNode, functionPath, updates, errors, filePath) {
+    if (functionNode.params.length > argIndex) {
+        const param = functionNode.params[argIndex];
+        const paramName = extractParameterName(param);
+        if (paramName) {
+            findFunctionParameterUsage(functionPath, paramName, updates, errors, filePath);
+        }
+    }
+}
+/**
+ * Finds all usages of a translation callback parameter within a user-defined function's scope.
+ * Processes both direct translation calls and cases where the translation callback is passed
+ * to other functions (prop drilling).
  *
  * Example: In function getInfo(t) { return t('hello'); }, this finds the t('hello') call.
+ * Example: In function getData(t) { return getFooter(t); }, this finds and traces into getFooter.
  */
 function findFunctionParameterUsage(functionPath, parameterName, updates, errors, file) {
     // Look for the function body and find all usages of the parameter
     if (functionPath.isFunction()) {
         const functionScope = functionPath.scope;
-        const binding = functionScope.bindings[parameterName];
-        if (binding) {
-            binding.referencePaths.forEach((refPath) => {
-                processTranslationCall(refPath, updates, errors, file);
-            });
-        }
+        // Resolve all aliases of the translation callback parameter
+        // Example: translate -> [translate, t, a, b] for const t = translate; const a = t; const b = a;
+        const allParameterNames = resolveVariableAliases(functionScope, parameterName);
+        // Build import map for this function's scope to handle cross-file calls
+        const programPath = functionPath.scope.getProgramParent().path;
+        const importMap = buildImportMap(programPath);
+        // Process references for all parameter names and their aliases
+        allParameterNames.forEach((name) => {
+            const binding = functionScope.bindings[name];
+            if (binding) {
+                binding.referencePaths.forEach((refPath) => {
+                    handleFunctionCall(refPath, updates, errors, file, importMap);
+                });
+            }
+        });
     }
 }
 /**
@@ -164,12 +306,31 @@ function resolveImportPath(currentFile, importPath) {
         return resolve.sync(importPath, { basedir, extensions });
     }
     catch {
+        // If resolution fails, try to manually replace .js/.jsx with .ts/.tsx for source files
+        if (importPath.endsWith('.js')) {
+            const tsPath = importPath.replace(/\.js$/, '.ts');
+            try {
+                return resolve.sync(tsPath, { basedir, extensions });
+            }
+            catch {
+                // Continue to return null
+            }
+        }
+        else if (importPath.endsWith('.jsx')) {
+            const tsxPath = importPath.replace(/\.jsx$/, '.tsx');
+            try {
+                return resolve.sync(tsxPath, { basedir, extensions });
+            }
+            catch {
+                // Continue to return null
+            }
+        }
         return null;
     }
 }
 /**
- * Searches for a specific function in a file and analyzes how a particular parameter
- * (at argIndex position) is used within that function for translation calls.
+ * Searches for a specific user-defined function in a file and analyzes how a translation callback
+ * parameter (at argIndex position) is used within that function.
  *
  * Handles multiple function declaration patterns:
  * - function getInfo(t) { ... }
@@ -186,25 +347,8 @@ function findFunctionInFile(filePath, functionName, argIndex, updates, errors) {
         (0, traverse_1.default)(ast, {
             // Handle function declarations: function getInfo(t) { ... }
             FunctionDeclaration(path) {
-                if (path.node.id?.name === functionName &&
-                    path.node.params.length > argIndex) {
-                    const param = path.node.params[argIndex];
-                    if (t.isIdentifier(param)) {
-                        findFunctionParameterUsage(path, param.name, updates, errors, filePath);
-                    }
-                }
-            },
-            // Handle exported function declarations: export function getInfo(t) { ... }
-            ExportNamedDeclaration(path) {
-                if (path.node.declaration &&
-                    t.isFunctionDeclaration(path.node.declaration)) {
-                    const func = path.node.declaration;
-                    if (func.id?.name === functionName && func.params.length > argIndex) {
-                        const param = func.params[argIndex];
-                        if (t.isIdentifier(param)) {
-                            findFunctionParameterUsage(path.get('declaration'), param.name, updates, errors, filePath);
-                        }
-                    }
+                if (path.node.id?.name === functionName) {
+                    processFunctionIfMatches(functionName, argIndex, path.node, path, updates, errors, filePath);
                 }
             },
             // Handle variable declarations: const getInfo = (t) => { ... }
@@ -213,13 +357,9 @@ function findFunctionInFile(filePath, functionName, argIndex, updates, errors) {
                     path.node.id.name === functionName &&
                     path.node.init &&
                     (t.isArrowFunctionExpression(path.node.init) ||
-                        t.isFunctionExpression(path.node.init)) &&
-                    path.node.init.params.length > argIndex) {
-                    const param = path.node.init.params[argIndex];
-                    if (t.isIdentifier(param)) {
-                        const initPath = path.get('init');
-                        findFunctionParameterUsage(initPath, param.name, updates, errors, filePath);
-                    }
+                        t.isFunctionExpression(path.node.init))) {
+                    const initPath = path.get('init');
+                    processFunctionIfMatches(functionName, argIndex, path.node.init, initPath, updates, errors, filePath);
                 }
             },
         });
@@ -233,35 +373,17 @@ function findFunctionInFile(filePath, functionName, argIndex, updates, errors) {
  *
  * Supports complex patterns including:
  * 1. Direct calls: const t = useGT(); t('hello');
- * 2. Function parameters: const t = useGT(); getInfo(t); where getInfo uses t() internally
- * 3. Cross-file function calls: imported functions that receive t as a parameter
+ * 2. Translation callback prop drilling: const t = useGT(); getInfo(t); where getInfo uses t() internally
+ * 3. Cross-file function calls: imported functions that receive the translation callback as a parameter
  *
  * Example flow:
  * - const t = useGT();
  * - const { home } = getInfo(t); // getInfo is imported from './constants'
- * - This will parse constants.ts to find t() calls within getInfo function
+ * - This will parse constants.ts to find translation calls within getInfo function
  */
 function parseStrings(importName, path, updates, errors, file) {
     // First, collect all imports in this file to track cross-file function calls
-    const importMap = new Map(); // functionName -> importPath
-    path.scope.getProgramParent().path.traverse({
-        ImportDeclaration(importPath) {
-            if (t.isStringLiteral(importPath.node.source)) {
-                const importSource = importPath.node.source.value;
-                importPath.node.specifiers.forEach((spec) => {
-                    if (t.isImportSpecifier(spec) &&
-                        t.isIdentifier(spec.imported) &&
-                        t.isIdentifier(spec.local)) {
-                        importMap.set(spec.local.name, importSource);
-                    }
-                    else if (t.isImportDefaultSpecifier(spec) &&
-                        t.isIdentifier(spec.local)) {
-                        importMap.set(spec.local.name, importSource);
-                    }
-                });
-            }
-        },
-    });
+    const importMap = buildImportMap(path.scope.getProgramParent().path);
     const referencePaths = path.scope.bindings[importName]?.referencePaths || [];
     for (const refPath of referencePaths) {
         // Find call expressions of useGT() / await getGT()
@@ -280,40 +402,7 @@ function parseStrings(importName, path, updates, errors, file) {
                 const variableScope = effectiveParent.scope;
                 const tReferencePaths = variableScope.bindings[tFuncName]?.referencePaths || [];
                 for (const tPath of tReferencePaths) {
-                    // Check if this is a direct call to the translation function
-                    if (tPath.parent.type === 'CallExpression' &&
-                        tPath.parent.callee === tPath.node) {
-                        processTranslationCall(tPath, updates, errors, file);
-                    }
-                    // Check if this is being passed as an argument to another function
-                    else if (tPath.parent.type === 'CallExpression' &&
-                        t.isExpression(tPath.node) &&
-                        tPath.parent.arguments.includes(tPath.node)) {
-                        // Find which parameter position this is
-                        const argIndex = tPath.parent.arguments.indexOf(tPath.node);
-                        // Try to find the function definition being called
-                        const callee = tPath.parent.callee;
-                        if (t.isIdentifier(callee)) {
-                            // Look for function declarations or function expressions with this name
-                            const calleeBinding = tPath.scope.getBinding(callee.name);
-                            if (calleeBinding && calleeBinding.path.isFunction()) {
-                                const functionPath = calleeBinding.path;
-                                const params = functionPath.node.params;
-                                if (params[argIndex] && t.isIdentifier(params[argIndex])) {
-                                    const paramName = params[argIndex].name;
-                                    findFunctionParameterUsage(functionPath, paramName, updates, errors, file);
-                                }
-                            }
-                            // If not found locally, check if it's an imported function
-                            else if (importMap.has(callee.name)) {
-                                const importPath = importMap.get(callee.name);
-                                const resolvedPath = resolveImportPath(file, importPath);
-                                if (resolvedPath) {
-                                    findFunctionInFile(resolvedPath, callee.name, argIndex, updates, errors);
-                                }
-                            }
-                        }
-                    }
+                    handleFunctionCall(tPath, updates, errors, file, importMap);
                 }
             }
         }

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

@@ -6,6 +6,6 @@ import { SupportedFrameworks, WrapOptions } from '../../types';
  * @param options - The options object
  * @returns An object containing the updates and errors
  */
-export default function wrapContentReact(options: WrapOptions, pkg: 'gt-react', framework: SupportedFrameworks, errors: string[], warnings: string[]): Promise<{
+export declare function wrapContentReact(options: WrapOptions, pkg: 'gt-react', framework: SupportedFrameworks, errors: string[], warnings: string[]): Promise<{
     filesUpdated: string[];
 }>;

package/dist/react/parse/wrapContent.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = wrapContentReact;
+exports.wrapContentReact = wrapContentReact;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const t = __importStar(require("@babel/types"));

package/dist/setup/userInput.js

@@ -16,7 +16,7 @@ async function getDesiredLocales() {
     });
     // Ask for the locales
     const locales = await (0, console_1.promptText)({
-        message: `What locales would you like to translate your project into? ${chalk_1.default.gray('(space-separated list)')}`,
+        message: `What locales would you like to translate your project into? ${chalk_1.default.dim('(space-separated list)')}`,
         defaultValue: 'es zh fr de ja',
         validate: (input) => {
             const localeList = input.split(' ');

package/dist/setup/wizard.js

@@ -11,13 +11,13 @@ const chalk_1 = __importDefault(require("chalk"));
 const console_3 = require("../console");
 const findFilepath_1 = __importDefault(require("../fs/findFilepath"));
 const postProcess_2 = require("../hooks/postProcess");
-const handleInitGT_1 = __importDefault(require("../next/parse/handleInitGT"));
+const handleInitGT_1 = require("../next/parse/handleInitGT");
 const packageJson_1 = require("../utils/packageJson");
-const wrapContent_1 = __importDefault(require("../react/parse/wrapContent"));
-const wrapContent_2 = __importDefault(require("../next/parse/wrapContent"));
+const wrapContent_1 = require("../react/parse/wrapContent");
+const wrapContent_2 = require("../next/parse/wrapContent");
 const packageManager_1 = require("../utils/packageManager");
 const installPackage_1 = require("../utils/installPackage");
-const setupConfig_1 = __importDefault(require("../fs/config/setupConfig"));
+const setupConfig_1 = require("../fs/config/setupConfig");
 async function handleSetupReactCommand(options) {
     // Ask user for confirmation using inquirer
     const answer = await (0, console_3.promptConfirm)({
@@ -41,7 +41,7 @@ Make sure you have committed or stashed any changes. Do you want to continue?`),
             { value: 'gatsby', label: chalk_1.default.magenta('Gatsby') },
             { value: 'react', label: chalk_1.default.yellow('React') },
             { value: 'redwood', label: chalk_1.default.red('RedwoodJS') },
-            { value: 'other', label: chalk_1.default.gray('Other') },
+            { value: 'other', label: chalk_1.default.dim('Other') },
         ],
         defaultValue: 'next-app',
     });
@@ -51,7 +51,7 @@ Please let us know what you would like to see supported at https://github.com/ge
         process.exit(0);
     }
     // ----- Create a starter gt.config.json file -----
-    await (0, setupConfig_1.default)(options.config || 'gt.config.json', {
+    await (0, setupConfig_1.createOrUpdateConfig)(options.config || 'gt.config.json', {
         framework: frameworkType,
     });
     const packageJson = await (0, packageJson_1.getPackageJson)();
@@ -103,17 +103,18 @@ Please let us know what you would like to see supported at https://github.com/ge
             ...options,
             disableIds: !includeTId,
             disableFormatting: true,
+            skipTs: false,
             addGTProvider,
         };
         const spinner = (0, console_1.createSpinner)();
         spinner.start('Wrapping JSX content with <T> tags...');
         // Wrap all JSX elements in the src directory with a <T> tag, with unique ids
-        const { filesUpdated: filesUpdatedNext } = await (0, wrapContent_2.default)(mergeOptions, 'gt-next', errors, warnings);
+        const { filesUpdated: filesUpdatedNext } = await (0, wrapContent_2.wrapContentNext)(mergeOptions, 'gt-next', errors, warnings);
         filesUpdated = [...filesUpdated, ...filesUpdatedNext];
         spinner.stop(chalk_1.default.green(`Success! Added <T> tags and updated ${chalk_1.default.bold.cyan(filesUpdated.length)} files:\n`) + filesUpdated.map((file) => `${chalk_1.default.green('-')} ${file}`).join('\n'));
         if (addWithGTConfig) {
             // Add the withGTConfig() function to the next.config.js file
-            await (0, handleInitGT_1.default)(nextConfigPath, errors, warnings, filesUpdated);
+            await (0, handleInitGT_1.handleInitGT)(nextConfigPath, errors, warnings, filesUpdated);
             (0, console_2.logStep)(chalk_1.default.green(`Added withGTConfig() to your ${nextConfigPath} file.`));
         }
         if (errors.length > 0) {
@@ -138,12 +139,13 @@ Please let us know what you would like to see supported at https://github.com/ge
             ...options,
             disableIds: !includeTId,
             disableFormatting: true,
+            skipTs: false,
             addGTProvider,
         };
         const spinner = (0, console_1.createSpinner)();
         spinner.start('Wrapping JSX content with <T> tags...');
         // Wrap all JSX elements in the src directory with a <T> tag, with unique ids
-        const { filesUpdated: filesUpdatedReact } = await (0, wrapContent_1.default)(mergeOptions, 'gt-react', frameworkType, errors, warnings);
+        const { filesUpdated: filesUpdatedReact } = await (0, wrapContent_1.wrapContentReact)(mergeOptions, 'gt-react', frameworkType, errors, warnings);
         filesUpdated = [...filesUpdated, ...filesUpdatedReact];
         spinner.stop(chalk_1.default.green(`Success! Added <T> tags and updated ${chalk_1.default.bold.cyan(filesUpdated.length)} files:\n`) + filesUpdated.map((file) => `${chalk_1.default.green('-')} ${file}`).join('\n'));
         if (errors.length > 0) {
@@ -162,7 +164,7 @@ Please let us know what you would like to see supported at https://github.com/ge
         return;
     }
     const applyFormatting = await (0, console_3.promptConfirm)({
-        message: `Would you like the wizard to auto-format the modified files? ${chalk_1.default.gray(`(${formatter})`)}`,
+        message: `Would you like the wizard to auto-format the modified files? ${chalk_1.default.dim(`(${formatter})`)}`,
         defaultValue: true,
     });
     // Format updated files if formatters are available

package/dist/translation/stage.js

@@ -40,7 +40,7 @@ async function stageProject(settings, pkg) {
                     .join('')));
         }
         else {
-            (0, errors_1.logErrorAndExit)(chalk_1.default.red(`Error: CLI tool encountered syntax errors while scanning for translatable content. ${chalk_1.default.gray('To ignore these errors, re-run with --ignore-errors')}\n` +
+            (0, errors_1.logErrorAndExit)(chalk_1.default.red(`Error: CLI tool encountered syntax errors while scanning for translatable content. ${chalk_1.default.dim('To ignore these errors, re-run with --ignore-errors')}\n` +
                 errors
                     .map((error) => chalk_1.default.red('• ') + chalk_1.default.white(error) + '\n')
                     .join('')));

package/dist/types/index.d.ts

@@ -32,6 +32,7 @@ export type Options = {
 export type WrapOptions = {
     src: string[];
     config: string;
+    skipTs: boolean;
     disableIds: boolean;
     disableFormatting: boolean;
     addGTProvider: boolean;

package/dist/utils/credentials.js

@@ -19,7 +19,7 @@ async function retrieveCredentials(settings, keyType) {
     await import('open').then((open) => open.default(urlToOpen, {
         wait: false,
     }));
-    (0, console_1.logMessage)(`${chalk_1.default.gray(`If the browser window didn't open automatically, please open the following link:`)}\n\n${chalk_1.default.cyan(urlToOpen)}`);
+    (0, console_1.logMessage)(`${chalk_1.default.dim(`If the browser window didn't open automatically, please open the following link:`)}\n\n${chalk_1.default.cyan(urlToOpen)}`);
     const spinner = (0, console_1.createSpinner)('dots');
     spinner.start('Waiting for response from dashboard...');
     const credentials = await new Promise(async (resolve, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtx-cli",
-  "version": "1.2.22",
+  "version": "1.2.24-alpha.1",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [
@@ -44,8 +44,14 @@
     "./api/*": {
       "import": "./dist/api/*.js"
     },
+    "./setup/*": {
+      "import": "./dist/setup/*.js"
+    },
     "./*": {
       "import": "./dist/*.js"
+    },
+    "./utils/*": {
+      "import": "./dist/utils/*.js"
     }
   },
   "repository": {
@@ -72,7 +78,7 @@
     "@babel/parser": "^7.25.7",
     "@babel/plugin-transform-react-jsx": "^7.25.9",
     "@babel/traverse": "^7.25.7",
-    "@clack/prompts": "^0.11.0",
+    "@clack/prompts": "^1.0.0-alpha.1",
     "chalk": "^4.1.2",
     "commander": "^12.1.0",
     "dotenv": "^16.4.5",