gtx-cli 1.2.30-alpha.1 → 1.2.30-alpha.18

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # gtx-cli
 
+## 1.2.30
+
+### Patch Changes
+
+- [#409](https://github.com/generaltranslation/gt/pull/409) [`557f74d`](https://github.com/generaltranslation/gt/commit/557f74da58ebd84ca50c1961fc6dfecd63bb7797) Thanks [@brian-lou](https://github.com/brian-lou)! - Make locadex more reliable + improve validation
+
 ## 1.2.29
 
 ### Patch Changes

package/dist/api/sendFiles.d.ts

@@ -1,9 +1,16 @@
 import { Settings } from '../types/index.js';
-import { FileFormats, DataFormat } from '../types/data.js';
+import { FileExtension, DataFormat } from '../types/data.js';
+/**
+ * File object structure
+ * @param content - The content of the file
+ * @param fileName - The name of the file
+ * @param fileExtension - The format of the file (JSON, MDX, MD, etc.)
+ * @param dataFormat - The format of the data within the file
+ */
 export interface FileToTranslate {
     content: string;
     fileName: string;
-    fileFormat: FileFormats;
+    fileExtension: FileExtension;
     dataFormat: DataFormat;
 }
 type ApiOptions = Settings & {

package/dist/api/sendFiles.js

@@ -19,8 +19,8 @@ export async function sendFiles(files, options) {
         // Add each file to the form data
         files.forEach((file, index) => {
             formData.append(`file${index}`, new Blob([file.content]), file.fileName);
-            formData.append(`fileFormat${index}`, file.fileFormat);
-            formData.append(`fileDataFormat${index}`, file.dataFormat); // Only used when translating JSON files
+            formData.append(`fileExtension${index}`, file.fileExtension);
+            formData.append(`dataFormat${index}`, file.dataFormat); // Only used when translating JSON files
             formData.append(`fileName${index}`, file.fileName);
         });
         // Add number of files

package/dist/cli/base.js

@@ -1,12 +1,12 @@
 import { createOrUpdateConfig } from '../fs/config/setupConfig.js';
-import findFilepath, { findFilepaths } from '../fs/findFilepath.js';
+import findFilepath from '../fs/findFilepath.js';
 import { displayHeader, promptText, logErrorAndExit, endCommand, promptConfirm, promptMultiSelect, logSuccess, logInfo, startCommand, createSpinner, logMessage, } from '../console/logging.js';
 import path from 'node:path';
 import fs from 'node:fs';
 import { generateSettings } from '../config/generateSettings.js';
 import chalk from 'chalk';
 import { translateFiles } from '../formats/files/translate.js';
-import { FILE_EXT_TO_FORMAT } from '../formats/files/supportedFiles.js';
+import { FILE_EXT_TO_EXT_LABEL } from '../formats/files/supportedFiles.js';
 import { handleSetupReactCommand } from '../setup/wizard.js';
 import { isPackageInstalled, searchForPackageJson, } from '../utils/packageJson.js';
 import { getDesiredLocales } from '../setup/userInput.js';
@@ -94,7 +94,7 @@ export class BaseCLI {
         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", findFilepaths(['./src', './app', './pages', './components']))
+            .option('--src <paths...>', "Space-separated list of glob patterns containing the app's source code, by default 'src/**/*.{js,jsx,ts,tsx}' 'app/**/*.{js,jsx,ts,tsx}' 'pages/**/*.{js,jsx,ts,tsx}' 'components/**/*.{js,jsx,ts,tsx}'")
             .option('-c, --config <path>', 'Filepath to config file, by default gt.config.json', findFilepath(['gt.config.json']))
             .action(async (options) => {
             displayHeader('Running setup wizard...');
@@ -139,7 +139,7 @@ See the docs for more information: https://generaltranslation.com/docs/react/tut
         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", findFilepaths(['./src', './app', './pages', './components']))
+            .option('--src <paths...>', "Space-separated list of glob patterns containing the app's source code, by default 'src/**/*.{js,jsx,ts,tsx}' 'app/**/*.{js,jsx,ts,tsx}' 'pages/**/*.{js,jsx,ts,tsx}' 'components/**/*.{js,jsx,ts,tsx}'")
             .option('-c, --config <path>', 'Filepath to config file, by default gt.config.json', findFilepath(['gt.config.json']))
             .action(async (options) => {
             displayHeader('Running React setup wizard...');
@@ -210,24 +210,24 @@ See the docs for more information: https://generaltranslation.com/docs/react/tut
         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.dim('(Optional)')} Do you have any separate files you would like to translate? For example, extra Markdown files for docs.`;
-        const dataFormats = await promptMultiSelect({
+        const fileExtensions = await promptMultiSelect({
             message,
             options: [
-                { value: 'json', label: 'JSON' },
-                { value: 'md', label: 'Markdown' },
-                { value: 'mdx', label: 'MDX' },
-                { value: 'ts', label: 'TypeScript' },
-                { value: 'js', label: 'JavaScript' },
+                { value: 'json', label: FILE_EXT_TO_EXT_LABEL.json },
+                { value: 'md', label: FILE_EXT_TO_EXT_LABEL.md },
+                { value: 'mdx', label: FILE_EXT_TO_EXT_LABEL.mdx },
+                { value: 'ts', label: FILE_EXT_TO_EXT_LABEL.ts },
+                { value: 'js', label: FILE_EXT_TO_EXT_LABEL.js },
             ],
             required: !isUsingGT,
         });
         const files = {};
-        for (const dataFormat of dataFormats) {
+        for (const fileExtension of fileExtensions) {
             const paths = await promptText({
-                message: `${chalk.cyan(FILE_EXT_TO_FORMAT[dataFormat])}: Please enter a space-separated list of glob patterns matching the location of the ${FILE_EXT_TO_FORMAT[dataFormat]} files you would like to translate.\nMake sure to include [locale] in the patterns.\nSee https://generaltranslation.com/docs/cli/reference/config#include for more information.`,
-                defaultValue: `./**/[locale]/*.${dataFormat}`,
+                message: `${chalk.cyan(FILE_EXT_TO_EXT_LABEL[fileExtension])}: Please enter a space-separated list of glob patterns matching the location of the ${FILE_EXT_TO_EXT_LABEL[fileExtension]} files you would like to translate.\nMake sure to include [locale] in the patterns.\nSee https://generaltranslation.com/docs/cli/reference/config#include for more information.`,
+                defaultValue: `./**/[locale]/*.${fileExtension}`,
             });
-            files[dataFormat] = {
+            files[fileExtension] = {
                 include: paths.split(' '),
             };
         }

package/dist/cli/react.js

@@ -1,6 +1,6 @@
 import { displayHeader, endCommand, logError, logErrorAndExit, logStep, logSuccess, logWarning, promptConfirm, } from '../console/logging.js';
 import loadJSON from '../fs/loadJSON.js';
-import findFilepath, { findFilepaths } from '../fs/findFilepath.js';
+import findFilepath from '../fs/findFilepath.js';
 import chalk from 'chalk';
 import { formatFiles } from '../hooks/postProcess.js';
 import { BaseCLI } from './base.js';
@@ -45,7 +45,7 @@ export class ReactCLI extends BaseCLI {
             .option('--version-id <id>', 'Version ID for the translation service')
             .option('--tsconfig, --jsconfig <path>', 'Path to jsconfig or tsconfig file', findFilepath(['./tsconfig.json', './jsconfig.json']))
             .option('--dictionary <path>', 'Path to dictionary file')
-            .option('--src <paths...>', "Filepath to directory containing the app's source code, by default ./src || ./app || ./pages || ./components")
+            .option('--src <paths...>', "Space-separated list of glob patterns containing the app's source code, by default 'src/**/*.{js,jsx,ts,tsx}' 'app/**/*.{js,jsx,ts,tsx}' 'pages/**/*.{js,jsx,ts,tsx}' 'components/**/*.{js,jsx,ts,tsx}'")
             .option('--default-language, --default-locale <locale>', 'Default locale (e.g., en)')
             .option('--new, --locales <locales...>', 'Space-separated list of locales (e.g., en fr es)')
             .option('--inline', 'Include inline <T> tags in addition to dictionary file', true)
@@ -68,7 +68,7 @@ export class ReactCLI extends BaseCLI {
             .option('--version-id <id>', 'Version ID for the translation service')
             .option('--tsconfig, --jsconfig <path>', 'Path to jsconfig or tsconfig file', findFilepath(['./tsconfig.json', './jsconfig.json']))
             .option('--dictionary <path>', 'Path to dictionary file')
-            .option('--src <paths...>', "Filepath to directory containing the app's source code, by default ./src || ./app || ./pages || ./components")
+            .option('--src <paths...>', "Space-separated list of glob patterns containing the app's source code, by default 'src/**/*.{js,jsx,ts,tsx}' 'app/**/*.{js,jsx,ts,tsx}' 'pages/**/*.{js,jsx,ts,tsx}' 'components/**/*.{js,jsx,ts,tsx}'")
             .option('--default-language, --default-locale <locale>', 'Default locale (e.g., en)')
             .option('--new, --locales <locales...>', 'Space-separated list of locales (e.g., en fr es)')
             .option('--inline', 'Include inline <T> tags in addition to dictionary file', true)
@@ -88,7 +88,7 @@ export class ReactCLI extends BaseCLI {
             .option('-c, --config <path>', 'Filepath to config file, by default gt.config.json', findFilepath(['gt.config.json']))
             .option('--tsconfig, --jsconfig <path>', 'Path to jsconfig or tsconfig file', findFilepath(['./tsconfig.json', './jsconfig.json']))
             .option('--dictionary <path>', 'Path to dictionary file')
-            .option('--src <paths...>', "Filepath to directory containing the app's source code, by default ./src || ./app || ./pages || ./components")
+            .option('--src <paths...>', "Space-separated list of glob patterns containing the app's source code, by default 'src/**/*.{js,jsx,ts,tsx}' 'app/**/*.{js,jsx,ts,tsx}' 'pages/**/*.{js,jsx,ts,tsx}' 'components/**/*.{js,jsx,ts,tsx}'")
             .option('--inline', 'Include inline <T> tags in addition to dictionary file', true)
             .action(async (options) => {
             // intro here since we don't want to show the ascii title
@@ -101,7 +101,7 @@ export class ReactCLI extends BaseCLI {
         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")
+            .option('--src <paths...>', "Space-separated list of glob patterns containing the app's source code, by default 'src/**/*.{js,jsx,ts,tsx}' 'app/**/*.{js,jsx,ts,tsx}' 'pages/**/*.{js,jsx,ts,tsx}' 'components/**/*.{js,jsx,ts,tsx}'")
             .option('--tsconfig, --jsconfig <path>', 'Path to jsconfig or tsconfig file', findFilepath(['./tsconfig.json', './jsconfig.json']))
             .option('--dictionary <path>', 'Path to dictionary file')
             .option('--default-language, --default-locale <locale>', 'Source locale (e.g., en)')
@@ -118,7 +118,7 @@ export class ReactCLI extends BaseCLI {
         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", findFilepaths(['./src', './app', './pages', './components']))
+            .option('--src <paths...>', "Space-separated list of glob patterns containing the app's source code, by default 'src/**/*.{js,jsx,ts,tsx}' 'app/**/*.{js,jsx,ts,tsx}' 'pages/**/*.{js,jsx,ts,tsx}' 'components/**/*.{js,jsx,ts,tsx}'")
             .option('-c, --config <path>', 'Filepath to config file, by default gt.config.json', findFilepath(['gt.config.json']))
             .option('--disable-ids', 'Disable id generation for the <T> tags', false)
             .option('--disable-formatting', 'Disable formatting of edited files', false)
@@ -153,7 +153,7 @@ export class ReactCLI extends BaseCLI {
                         .join('\n')));
             }
             else {
-                logErrorAndExit(chalk.red(`CLI tool encountered errors while scanning for translatable content. ${chalk.dim('To ignore these errors, re-run with --ignore-errors')}\n` +
+                logErrorAndExit(chalk.red(`CLI tool encountered errors while scanning for translatable content. ${chalk.gray('To ignore these errors, re-run with --ignore-errors')}\n` +
                     errors
                         .map((error) => chalk.red('• Error: ') + chalk.white(error))
                         .join('\n')));

package/dist/config/generateSettings.d.ts

@@ -1,4 +1,5 @@
 import { Settings } from '../types/index.js';
+export declare const DEFAULT_SRC_PATTERNS: string[];
 /**
  * Generates settings from any
  * @param options - The options to generate settings from

package/dist/config/generateSettings.js

@@ -4,11 +4,16 @@ import { defaultBaseUrl, libraryDefaultLocale, } from 'generaltranslation/intern
 import fs from 'node:fs';
 import { createOrUpdateConfig } from '../fs/config/setupConfig.js';
 import { resolveFiles } from '../fs/config/parseFilesConfig.js';
-import { findFilepaths } from '../fs/findFilepath.js';
 import { validateSettings } from './validateSettings.js';
 import { GT_DASHBOARD_URL } from '../utils/constants.js';
 import { resolveProjectId } from '../fs/utils.js';
 import path from 'node:path';
+export const DEFAULT_SRC_PATTERNS = [
+    'src/**/*.{js,jsx,ts,tsx}',
+    'app/**/*.{js,jsx,ts,tsx}',
+    'pages/**/*.{js,jsx,ts,tsx}',
+    'components/**/*.{js,jsx,ts,tsx}',
+];
 /**
  * Generates settings from any
  * @param options - The options to generate settings from
@@ -68,14 +73,7 @@ export async function generateSettings(options, cwd = process.cwd()) {
     // For human review, always stage the project
     mergedOptions.stageTranslations = mergedOptions.stageTranslations ?? false;
     // Populate src if not provided
-    mergedOptions.src =
-        mergedOptions.src ||
-            findFilepaths([
-                path.join(cwd, './src'),
-                path.join(cwd, './app'),
-                path.join(cwd, './pages'),
-                path.join(cwd, './components'),
-            ]);
+    mergedOptions.src = mergedOptions.src || DEFAULT_SRC_PATTERNS;
     // Resolve all glob patterns in the files object
     mergedOptions.files = mergedOptions.files
         ? resolveFiles(mergedOptions.files, mergedOptions.defaultLocale, cwd)

package/dist/console/index.d.ts

@@ -13,8 +13,7 @@ export declare const noLocalesError = "No locales found! Please provide a list o
 export declare const noDefaultLocaleError = "No default locale found! Please provide a default locale, or specify it in your gt.config.json file.";
 export declare const noFilesError = "Incorrect or missing files configuration! Please make sure your files are configured correctly in your gt.config.json file.";
 export declare const noSourceFileError = "No source file found! Please double check your translations directory and default locale.";
-export declare const noDataFormatError = "No data format found! Please make sure your translationsDir parameter ends with a supported file extension.";
-export declare const noSupportedDataFormatError = "Unsupported data format! Please make sure your translationsDir parameter ends with a supported file extension.";
+export declare const noSupportedFormatError = "Unsupported data format! Please make sure your translationsDir parameter ends with a supported file extension.";
 export declare const noApiKeyError = "No API key found! Please provide an API key using the --api-key flag or set the GT_API_KEY environment variable.";
 export declare const devApiKeyError = "You are using a development API key. Please use a production API key to use the General Translation API.\nYou can generate a production API key with the command: npx gtx-cli auth -t production";
 export declare const noProjectIdError = "No project ID found! Please provide a project ID using the --project-id flag, specify it in your gt.config.json file, or set the GT_PROJECT_ID environment variable.";

package/dist/console/index.js

@@ -16,8 +16,7 @@ export const noLocalesError = `No locales found! Please provide a list of locale
 export const noDefaultLocaleError = `No default locale found! Please provide a default locale, or specify it in your gt.config.json file.`;
 export const noFilesError = `Incorrect or missing files configuration! Please make sure your files are configured correctly in your gt.config.json file.`;
 export const noSourceFileError = `No source file found! Please double check your translations directory and default locale.`;
-export const noDataFormatError = `No data format found! Please make sure your translationsDir parameter ends with a supported file extension.`;
-export const noSupportedDataFormatError = `Unsupported data format! Please make sure your translationsDir parameter ends with a supported file extension.`;
+export const noSupportedFormatError = `Unsupported data format! Please make sure your translationsDir parameter ends with a supported file extension.`;
 export const noApiKeyError = `No API key found! Please provide an API key using the --api-key flag or set the GT_API_KEY environment variable.`;
 export const devApiKeyError = `You are using a development API key. Please use a production API key to use the General Translation API.\nYou can generate a production API key with the command: npx gtx-cli auth -t production`;
 export const noProjectIdError = `No project ID found! Please provide a project ID using the --project-id flag, specify it in your gt.config.json file, or set the GT_PROJECT_ID environment variable.`;

package/dist/console/logging.d.ts

@@ -12,7 +12,11 @@ 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'): import("@clack/prompts").SpinnerResult;
+export declare function createSpinner(indicator?: 'dots' | 'timer'): {
+    start: (msg?: string) => void;
+    stop: (msg?: string, code?: number) => void;
+    message: (msg?: string) => void;
+};
 export declare function createOraSpinner(indicator?: 'dots' | 'circleHalves'): Promise<import("ora").Ora>;
 export declare function promptText({ message, defaultValue, validate, }: {
     message: string;

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

@@ -1,5 +1,5 @@
 export declare const SUPPORTED_FILE_EXTENSIONS: readonly ["json", "mdx", "md", "ts", "js"];
-export declare const FILE_EXT_TO_FORMAT: {
+export declare const FILE_EXT_TO_EXT_LABEL: {
     json: string;
     mdx: string;
     md: string;

package/dist/formats/files/supportedFiles.js

@@ -5,7 +5,7 @@ export const SUPPORTED_FILE_EXTENSIONS = [
     'ts',
     'js',
 ];
-export const FILE_EXT_TO_FORMAT = {
+export const FILE_EXT_TO_EXT_LABEL = {
     json: 'JSON',
     mdx: 'MDX',
     md: 'Markdown',

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

@@ -6,7 +6,6 @@ import { TranslateOptions } from '../../cli/base.js';
  * @param filePaths - Resolved file paths for different file types
  * @param placeholderPaths - Placeholder paths for translated files
  * @param transformPaths - Transform paths for file naming
- * @param fileFormat - Format of the files
  * @param dataFormat - Format of the data within the files
  * @param options - Translation options including API settings
  * @returns Promise that resolves when translation is complete

package/dist/formats/files/translate.js

@@ -1,6 +1,6 @@
 import { checkFileTranslations } from '../../api/checkFileTranslations.js';
 import { sendFiles } from '../../api/sendFiles.js';
-import { noSupportedDataFormatError, noLocalesError, noDefaultLocaleError, noApiKeyError, noProjectIdError, devApiKeyError, } from '../../console/index.js';
+import { noSupportedFormatError, noLocalesError, noDefaultLocaleError, noApiKeyError, noProjectIdError, devApiKeyError, } from '../../console/index.js';
 import { logErrorAndExit, createSpinner, logError, logSuccess, } from '../../console/logging.js';
 import { resolveLocaleFiles } from '../../fs/config/parseFilesConfig.js';
 import { getRelative, readFile } from '../../fs/findFilepath.js';
@@ -16,7 +16,6 @@ const SUPPORTED_DATA_FORMATS = ['JSX', 'ICU', 'I18NEXT'];
  * @param filePaths - Resolved file paths for different file types
  * @param placeholderPaths - Placeholder paths for translated files
  * @param transformPaths - Transform paths for file naming
- * @param fileFormat - Format of the files
  * @param dataFormat - Format of the data within the files
  * @param options - Translation options including API settings
  * @returns Promise that resolves when translation is complete
@@ -27,7 +26,7 @@ export async function translateFiles(filePaths, placeholderPaths, transformPaths
     // Process JSON files
     if (filePaths.json) {
         if (!SUPPORTED_DATA_FORMATS.includes(dataFormat)) {
-            logErrorAndExit(noSupportedDataFormatError);
+            logErrorAndExit(noSupportedFormatError);
         }
         const jsonFiles = filePaths.json.map((filePath) => {
             const content = readFile(filePath);
@@ -38,7 +37,7 @@ export async function translateFiles(filePaths, placeholderPaths, transformPaths
             return {
                 content,
                 fileName: relativePath,
-                fileFormat: 'JSON',
+                fileExtension: 'JSON',
                 dataFormat,
             };
         });
@@ -54,7 +53,7 @@ export async function translateFiles(filePaths, placeholderPaths, transformPaths
                 return {
                     content,
                     fileName: relativePath,
-                    fileFormat: fileType.toUpperCase(),
+                    fileExtension: fileType.toUpperCase(),
                     dataFormat,
                 };
             });

package/dist/fs/matchFiles.d.ts

@@ -0,0 +1,2 @@
+export declare const IGNORED_PATTERNS: string[];
+export declare function matchFiles(cwd: string, patterns: string[]): string[];

package/dist/fs/matchFiles.js

@@ -0,0 +1,10 @@
+import fg from 'fast-glob';
+export const IGNORED_PATTERNS = ['**/.*', '**/.*/**'];
+export function matchFiles(cwd, patterns) {
+    return fg.sync(patterns, {
+        cwd,
+        absolute: true,
+        onlyFiles: true,
+        ignore: IGNORED_PATTERNS,
+    });
+}

package/dist/next/parse/wrapContent.js

@@ -6,12 +6,13 @@ import generateModule from '@babel/generator';
 // Handle CommonJS/ESM interop
 const traverse = traverseModule.default || traverseModule;
 const generate = generateModule.default || generateModule;
-import { getFiles } from '../../fs/findJsxFilepath.js';
 import { isMeaningful } from '../../react/jsx/evaluateJsx.js';
 import { handleJsxElement } from '../../react/jsx/wrapJsx.js';
 import { getRelativePath } from '../../fs/findFilepath.js';
 import { isHtmlElement, isBodyElement, hasGTProviderChild, addDynamicLangAttribute, makeParentFunctionAsync, } from '../jsx/utils.js';
 import { generateImportMap, createImports, } from '../../react/jsx/utils/parseAst.js';
+import { matchFiles } from '../../fs/matchFiles.js';
+import { DEFAULT_SRC_PATTERNS } from '../../config/generateSettings.js';
 const IMPORT_MAP = {
     T: { name: 'T', source: 'gt-next' },
     Var: { name: 'Var', source: 'gt-next' },
@@ -28,13 +29,12 @@ const IMPORT_MAP = {
  * @returns An object containing the updates and errors
  */
 export async function wrapContentNext(options, pkg, errors, warnings) {
-    const srcDirectory = options.src || ['./'];
-    const files = srcDirectory.flatMap((dir) => getFiles(dir));
+    const files = matchFiles(process.cwd(), options.src || DEFAULT_SRC_PATTERNS);
     const filesUpdated = [];
     for (const file of files) {
         const code = await fs.promises.readFile(file, 'utf8');
         // Create relative path from src directory and remove extension
-        const relativePath = getRelativePath(file, srcDirectory[0]);
+        const relativePath = getRelativePath(file, process.cwd());
         let ast;
         try {
             ast = parse(code, {

package/dist/react/data-_gt/addGTIdentifierToSyntaxTree.js

@@ -13,28 +13,28 @@ export default function addGTIdentifierToSyntaxTree(tree, startingIndex = 0) {
                 return {
                     variable: 'variable',
                     id: indexObject.index,
-                    key: getVariableName({ ...props, 'data-_gt': generaltranslation }, 'variable'),
+                    key: getVariableName(props, 'variable', indexObject.index),
                 };
             }
             else if (type === 'Num') {
                 return {
                     variable: 'number',
                     id: indexObject.index,
-                    key: getVariableName({ ...props, 'data-_gt': generaltranslation }, 'number'),
+                    key: getVariableName(props, 'number', indexObject.index),
                 };
             }
             else if (type === 'Currency') {
                 return {
                     variable: 'currency',
                     id: indexObject.index,
-                    key: getVariableName({ ...props, 'data-_gt': generaltranslation }, 'currency'),
+                    key: getVariableName(props, 'currency', indexObject.index),
                 };
             }
             else if (type === 'DateTime') {
                 return {
                     variable: 'datetime',
                     id: indexObject.index,
-                    key: getVariableName({ ...props, 'data-_gt': generaltranslation }, 'datetime'),
+                    key: getVariableName(props, 'datetime', indexObject.index),
                 };
             }
             else if (type === '' || type === 'React.Fragment') {

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

@@ -1,4 +1,3 @@
-import { splitStringToContent } from 'generaltranslation';
 import * as t from '@babel/types';
 import { isStaticExpression } from '../evaluateJsx.js';
 import { warnNonStaticExpressionSync, warnTemplateLiteralSync, } from '../../../console/index.js';
@@ -39,8 +38,6 @@ export function parseStrings(importName, path, updates, errors, file) {
                             const source = arg.type === 'StringLiteral'
                                 ? arg.value
                                 : arg.quasis[0].value.raw;
-                            // split the string into content (same as runtime behavior)
-                            const content = splitStringToContent(source);
                             // get metadata and id from options
                             const options = tPath.parent.arguments[1];
                             const metadata = {};
@@ -63,8 +60,8 @@ export function parseStrings(importName, path, updates, errors, file) {
                                 });
                             }
                             updates.push({
-                                dataFormat: 'JSX',
-                                source: content,
+                                dataFormat: 'ICU',
+                                source,
                                 metadata,
                             });
                         }

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

@@ -1,4 +1,3 @@
-import { splitStringToContent } from 'generaltranslation';
 import * as t from '@babel/types';
 import { isStaticExpression } from '../evaluateJsx.js';
 import { warnNonStaticExpressionSync, warnNonStringSync, warnTemplateLiteralSync, } from '../../../console/index.js';
@@ -30,8 +29,6 @@ function processTranslationCall(tPath, updates, errors, file) {
         if (arg.type === 'StringLiteral' ||
             (t.isTemplateLiteral(arg) && arg.expressions.length === 0)) {
             const source = arg.type === 'StringLiteral' ? arg.value : arg.quasis[0].value.raw;
-            // split the string into content (same as runtime behavior)
-            const content = splitStringToContent(source);
             // get metadata and id from options
             const options = tPath.parent.arguments[1];
             const metadata = {};
@@ -53,8 +50,8 @@ function processTranslationCall(tPath, updates, errors, file) {
                 });
             }
             updates.push({
-                dataFormat: 'JSX',
-                source: content,
+                dataFormat: 'ICU',
+                source,
                 metadata,
             });
         }

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

@@ -1,3 +1,3 @@
 import { BuildOptions } from 'esbuild';
-import { Options, Updates } from '../../types/index.js';
-export default function createDictionaryUpdates(options: Options, dictionaryPath: string, esbuildConfig?: BuildOptions): Promise<Updates>;
+import { Updates } from '../../types/index.js';
+export default function createDictionaryUpdates(dictionaryPath: string, esbuildConfig?: BuildOptions): Promise<Updates>;

package/dist/react/parse/createDictionaryUpdates.js

@@ -3,12 +3,11 @@ import path from 'node:path';
 import os from 'os';
 import { build } from 'esbuild';
 import flattenDictionary from '../utils/flattenDictionary.js';
-import { splitStringToContent } from 'generaltranslation';
 import loadJSON from '../../fs/loadJSON.js';
-import { hashJsxChildren } from 'generaltranslation/id';
+import { hashSource } from 'generaltranslation/id';
 import getEntryAndMetadata from '../utils/getEntryAndMetadata.js';
 import { logError } from '../../console/logging.js';
-export default async function createDictionaryUpdates(options, dictionaryPath, esbuildConfig) {
+export default async function createDictionaryUpdates(dictionaryPath, esbuildConfig) {
     let dictionary;
     // ---- HANDLE JSON STRING DICTIONARY ----- //
     if (dictionaryPath.endsWith('.json')) {
@@ -46,22 +45,21 @@ export default async function createDictionaryUpdates(options, dictionaryPath, e
     for (const id of Object.keys(dictionary)) {
         const { entry, metadata: props, // context, etc.
          } = getEntryAndMetadata(dictionary[id]);
-        const source = splitStringToContent(entry);
         const context = props?.context;
         const metadata = {
             id,
             ...(context && { context }),
             // This hash isn't actually used by the GT API, just for consistency sake
-            hash: hashJsxChildren({
-                source,
+            hash: hashSource({
+                source: entry,
                 ...(context && { context }),
                 ...(id && { id }),
-                dataFormat: 'JSX',
+                dataFormat: 'ICU',
             }),
         };
         updates.push({
-            dataFormat: 'JSX',
-            source,
+            dataFormat: 'ICU',
+            source: entry,
             metadata,
         });
     }

package/dist/react/parse/createInlineUpdates.js

@@ -1,50 +1,23 @@
 import fs from 'node:fs';
-import path from 'node:path';
 import { parse } from '@babel/parser';
 import traverseModule from '@babel/traverse';
 // Handle CommonJS/ESM interop
 const traverse = traverseModule.default || traverseModule;
-import { hashJsxChildren } from 'generaltranslation/id';
+import { hashSource } from 'generaltranslation/id';
 import { parseJSXElement } from '../jsx/utils/parseJsx.js';
 import { parseStrings } from '../jsx/utils/parseStringFunction.js';
 import { extractImportName } from '../jsx/utils/parseAst.js';
 import { logError } from '../../console/logging.js';
 import { validateStringFunction } from '../jsx/utils/validateStringFunction.js';
 import { GT_TRANSLATION_FUNCS } from '../jsx/utils/constants.js';
+import { matchFiles } from '../../fs/matchFiles.js';
+import { DEFAULT_SRC_PATTERNS } from '../../config/generateSettings.js';
 export default async function createInlineUpdates(options, pkg, validate) {
     const updates = [];
     const errors = [];
     // Use the provided app directory or default to the current directory
-    const srcDirectory = options.src || ['./'];
-    // Define the file extensions to look for
-    const extensions = ['.js', '.jsx', '.tsx', '.ts'];
-    /**
-     * Recursively scan the directory and collect all files with the specified extensions,
-     * excluding files or directories that start with a dot (.)
-     * @param dir - The directory to scan
-     * @returns An array of file paths
-     */
-    function getFiles(dir) {
-        let files = [];
-        const items = fs.readdirSync(dir);
-        for (const item of items) {
-            // Skip hidden files and directories
-            if (item.startsWith('.'))
-                continue;
-            const fullPath = path.join(dir, item);
-            const stat = fs.statSync(fullPath);
-            if (stat.isDirectory()) {
-                // Recursively scan subdirectories
-                files = files.concat(getFiles(fullPath));
-            }
-            else if (extensions.includes(path.extname(item))) {
-                // Add files with the specified extensions
-                files.push(fullPath);
-            }
-        }
-        return files;
-    }
-    const files = srcDirectory.flatMap((dir) => getFiles(dir));
+    const filePatterns = options.src || DEFAULT_SRC_PATTERNS;
+    const files = matchFiles(process.cwd(), filePatterns);
     for (const file of files) {
         const code = await fs.promises.readFile(file, 'utf8');
         let ast;
@@ -129,11 +102,11 @@ export default async function createInlineUpdates(options, pkg, validate) {
     // Post-process to add a hash to each update
     await Promise.all(updates.map(async (update) => {
         const context = update.metadata.context;
-        const hash = hashJsxChildren({
+        const hash = hashSource({
             source: update.source,
             ...(context && { context }),
             ...(update.metadata.id && { id: update.metadata.id }),
-            dataFormat: 'JSX',
+            dataFormat: update.dataFormat,
         });
         update.metadata.hash = hash;
     }));

package/dist/react/parse/wrapContent.js

@@ -7,11 +7,12 @@ import generateModule from '@babel/generator';
 // Handle CommonJS/ESM interop
 const traverse = traverseModule.default || traverseModule;
 const generate = generateModule.default || generateModule;
-import { getFiles } from '../../fs/findJsxFilepath.js';
 import { isMeaningful } from '../jsx/evaluateJsx.js';
 import { handleJsxElement } from '../jsx/wrapJsx.js';
 import { getRelativePath } from '../../fs/findFilepath.js';
 import { generateImportMap, createImports, } from '../jsx/utils/parseAst.js';
+import { DEFAULT_SRC_PATTERNS } from '../../config/generateSettings.js';
+import { matchFiles } from '../../fs/matchFiles.js';
 const IMPORT_MAP = {
     T: { name: 'T', source: 'gt-react' },
     Var: { name: 'Var', source: 'gt-react' },
@@ -28,8 +29,8 @@ const IMPORT_MAP = {
  * @returns An object containing the updates and errors
  */
 export async function wrapContentReact(options, pkg, framework, errors, warnings) {
-    const srcDirectory = options.src || ['./'];
-    const files = srcDirectory.flatMap((dir) => getFiles(dir));
+    const filePatterns = options.src || DEFAULT_SRC_PATTERNS;
+    const files = matchFiles(process.cwd(), filePatterns);
     const filesUpdated = [];
     for (const file of files) {
         const baseFileName = path.basename(file);
@@ -40,7 +41,7 @@ export async function wrapContentReact(options, pkg, framework, errors, warnings
             : './' + configPath;
         const code = await fs.promises.readFile(file, 'utf8');
         // Create relative path from src directory and remove extension
-        const relativePath = getRelativePath(file, srcDirectory[0]);
+        const relativePath = getRelativePath(file, process.cwd());
         let ast;
         try {
             ast = parse(code, {

package/dist/react/utils/getVariableName.d.ts

@@ -1,2 +1,2 @@
 export declare const baseVariablePrefix = "_gt_";
-export declare function getVariableName(props: Record<string, any> | undefined, variableType: string): string;
+export declare function getVariableName(props: Record<string, any> | undefined, variableType: 'variable' | 'number' | 'datetime' | 'currency', id: number): string;

package/dist/react/utils/getVariableName.js

@@ -5,9 +5,9 @@ const defaultVariableNames = {
     currency: 'cost',
 };
 export const baseVariablePrefix = '_gt_';
-export function getVariableName(props = {}, variableType) {
+export function getVariableName(props = {}, variableType, id) {
     if (props.name)
         return props.name;
     const baseVariableName = defaultVariableNames[variableType] || 'value';
-    return `${baseVariablePrefix}${baseVariableName}_${props['data-_gt']?.id}`;
+    return `${baseVariablePrefix}${baseVariableName}_${id}`;
 }

package/dist/translation/parse.js

@@ -24,7 +24,7 @@ export async function createUpdates(options, sourceDictionary, pkg, validate) {
         if (sourceDictionary.endsWith('.json')) {
             updates = [
                 ...updates,
-                ...(await createDictionaryUpdates(options, sourceDictionary)),
+                ...(await createDictionaryUpdates(sourceDictionary)),
             ];
         }
         else {
@@ -42,7 +42,7 @@ export async function createUpdates(options, sourceDictionary, pkg, validate) {
             }
             updates = [
                 ...updates,
-                ...(await createDictionaryUpdates(options, sourceDictionary, esbuildConfig)),
+                ...(await createDictionaryUpdates(sourceDictionary, esbuildConfig)),
             ];
         }
     }

package/dist/translation/stage.js

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

package/dist/types/data.d.ts

@@ -18,7 +18,7 @@ export type FlattenedJSONDictionary = {
     [key: string]: string;
 };
 export type DataFormat = 'JSX' | 'ICU' | 'I18NEXT';
-export type FileFormats = 'JSON' | 'YAML' | 'MDX' | 'MD' | 'TS' | 'JS';
+export type FileExtension = 'JSON' | 'YAML' | 'MDX' | 'MD' | 'TS' | 'JS';
 export type JsxChildren = string | string[] | any;
 export type Translations = {
     [key: string]: JsxChildren;

package/dist/types/index.d.ts

@@ -30,7 +30,7 @@ export type Options = {
     stageTranslations?: boolean;
 };
 export type WrapOptions = {
-    src: string[];
+    src?: string[];
     config: string;
     skipTs: boolean;
     disableIds: boolean;
@@ -38,11 +38,11 @@ export type WrapOptions = {
     addGTProvider: boolean;
 };
 export type SetupOptions = {
-    src: string[];
+    src?: string[];
     config: string;
 };
 export type GenerateSourceOptions = {
-    src: string[];
+    src?: string[];
     config: string;
     defaultLocale: string;
     dictionary?: string;
@@ -97,6 +97,6 @@ export type Settings = {
     _versionId?: string;
     version?: string;
     description?: string;
-    src?: string[];
+    src: string[];
     framework?: SupportedFrameworks;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtx-cli",
-  "version": "1.2.30-alpha.1",
+  "version": "1.2.30-alpha.18",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [
@@ -86,7 +86,7 @@
     "esbuild": "^0.25.4",
     "fast-glob": "^3.3.3",
     "form-data": "^4.0.2",
-    "generaltranslation": "^6.2.10",
+    "generaltranslation": "^7.0.0-alpha.18",
     "open": "^10.1.1",
     "ora": "^8.2.0",
     "resolve": "^1.22.10",

package/dist/fs/findJsxFilepath.d.ts

@@ -1,7 +0,0 @@
-/**
- * Recursively scan the directory and collect all files with the specified extensions,
- * excluding files or directories that start with a dot (.)
- * @param dir - The directory to scan
- * @returns An array of file paths
- */
-export declare function getFiles(dir: string): string[];

package/dist/fs/findJsxFilepath.js

@@ -1,30 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-// Define the file extensions to look for
-const extensions = ['.js', '.jsx', '.tsx'];
-/**
- * Recursively scan the directory and collect all files with the specified extensions,
- * excluding files or directories that start with a dot (.)
- * @param dir - The directory to scan
- * @returns An array of file paths
- */
-export function getFiles(dir) {
-    let files = [];
-    const items = fs.readdirSync(dir);
-    for (const item of items) {
-        // Skip hidden files and directories
-        if (item.startsWith('.'))
-            continue;
-        const fullPath = path.join(dir, item);
-        const stat = fs.statSync(fullPath);
-        if (stat.isDirectory()) {
-            // Recursively scan subdirectories
-            files = files.concat(getFiles(fullPath));
-        }
-        else if (extensions.includes(path.extname(item))) {
-            // Add files with the specified extensions
-            files.push(fullPath);
-        }
-    }
-    return files;
-}