gtx-cli 1.2.30-alpha.35 → 1.2.31-alpha.1

package/CHANGELOG.md

@@ -1,23 +1,5 @@
 # gtx-cli
 
-## 1.2.34
-
-### Patch Changes
-
-- [#428](https://github.com/generaltranslation/gt/pull/428) [`54036f5`](https://github.com/generaltranslation/gt/commit/54036f54308bdb9f9e6dcec93871e004dcf1be4c) Thanks [@ErnestM1234](https://github.com/ErnestM1234)! - feat: add experimental options to translate
-
-## 1.2.33
-
-### Patch Changes
-
-- [#426](https://github.com/generaltranslation/gt/pull/426) [`ce57545`](https://github.com/generaltranslation/gt/commit/ce575454301185c663cfb93345d3058c9ceb25dd) Thanks [@brian-lou](https://github.com/brian-lou)! - Improve file pattern matching
-
-## 1.2.31
-
-### Patch Changes
-
-- [#423](https://github.com/generaltranslation/gt/pull/423) [`0ed08c7`](https://github.com/generaltranslation/gt/commit/0ed08c7bb1e63c99296b74138e4d44b718681fc8) Thanks [@brian-lou](https://github.com/brian-lou)! - Add setting configuration options
-
 ## 1.2.30
 
 ### Patch Changes

package/dist/api/sendFiles.d.ts

@@ -1,16 +1,9 @@
 import { Settings } from '../types/index.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
- */
+import { FileFormats, DataFormat } from '../types/data.js';
 export interface FileToTranslate {
     content: string;
     fileName: string;
-    fileExtension: FileExtension;
+    fileFormat: FileFormats;
     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(`fileExtension${index}`, file.fileExtension);
-            formData.append(`dataFormat${index}`, file.dataFormat); // Only used when translating JSON files
+            formData.append(`fileFormat${index}`, file.fileFormat);
+            formData.append(`fileDataFormat${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 from '../fs/findFilepath.js';
+import findFilepath, { findFilepaths } 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_EXT_LABEL } from '../formats/files/supportedFiles.js';
+import { FILE_EXT_TO_FORMAT } 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...>', "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('--src <paths...>', "Filepath to directory containing the app's source code, by default ./src || ./app || ./pages || ./components", findFilepaths(['./src', './app', './pages', './components']))
             .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...>', "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('--src <paths...>', "Filepath to directory containing the app's source code, by default ./src || ./app || ./pages || ./components", findFilepaths(['./src', './app', './pages', './components']))
             .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 fileExtensions = await promptMultiSelect({
+        const dataFormats = await promptMultiSelect({
             message,
             options: [
-                { 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 },
+                { value: 'json', label: 'JSON' },
+                { value: 'md', label: 'Markdown' },
+                { value: 'mdx', label: 'MDX' },
+                { value: 'ts', label: 'TypeScript' },
+                { value: 'js', label: 'JavaScript' },
             ],
             required: !isUsingGT,
         });
         const files = {};
-        for (const fileExtension of fileExtensions) {
+        for (const dataFormat of dataFormats) {
             const paths = await promptText({
-                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}`,
+                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}`,
             });
-            files[fileExtension] = {
+            files[dataFormat] = {
                 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 from '../fs/findFilepath.js';
+import findFilepath, { findFilepaths } from '../fs/findFilepath.js';
 import chalk from 'chalk';
 import { formatFiles } from '../hooks/postProcess.js';
 import { BaseCLI } from './base.js';
@@ -16,8 +16,6 @@ import updateConfig from '../fs/config/updateConfig.js';
 import { validateConfigExists } from '../config/validateSettings.js';
 import { validateProject } from '../translation/validate.js';
 import { intro } from '@clack/prompts';
-import localizeStaticUrls from '../utils/localizeStaticUrls.js';
-import flattenJsonFiles from '../utils/flattenJsonFiles.js';
 const DEFAULT_TIMEOUT = 600;
 const pkg = 'gt-react';
 export class ReactCLI extends BaseCLI {
@@ -47,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...>', "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('--src <paths...>', "Filepath to directory containing the app's source code, by default ./src || ./app || ./pages || ./components")
             .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)
@@ -70,16 +68,13 @@ 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...>', "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('--src <paths...>', "Filepath to directory containing the app's source code, by default ./src || ./app || ./pages || ./components")
             .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)
             .option('--ignore-errors', 'Ignore errors encountered while scanning for <T> tags', false)
             .option('--dry-run', 'Dry run, does not send updates to General Translation API', false)
             .option('--timeout <seconds>', 'Timeout in seconds for waiting for updates to be deployed to the CDN', DEFAULT_TIMEOUT.toString())
-            .option('--experimental-localize-static-urls', 'Triggering this will run a script after the cli tool that localizes all urls in content files. Currently only supported for md and mdx files.', false)
-            .option('--experimental-hide-default-locale', 'When localizing static locales, hide the default locale from the path', false)
-            .option('--experimental-flatten-json-files', 'Triggering this will flatten the json files into a single file. This is useful for projects that have a lot of json files.', false)
             .action(async (options) => {
             displayHeader('Translating project...');
             await this.handleTranslate(options);
@@ -93,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...>', "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('--src <paths...>', "Filepath to directory containing the app's source code, by default ./src || ./app || ./pages || ./components")
             .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
@@ -106,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...>', "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('--src <paths...>', "Filepath to directory containing the app's source code, by default ./src || ./app || ./pages || ./components")
             .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)')
@@ -123,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...>', "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('--src <paths...>', "Filepath to directory containing the app's source code, by default ./src || ./app || ./pages || ./components", findFilepaths(['./src', './app', './pages', './components']))
             .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)
@@ -158,7 +153,7 @@ export class ReactCLI extends BaseCLI {
                         .join('\n')));
             }
             else {
-                logErrorAndExit(chalk.red(`CLI tool encountered errors while scanning for translatable content. ${chalk.gray('To ignore these errors, re-run with --ignore-errors')}\n` +
+                logErrorAndExit(chalk.red(`CLI tool encountered errors while scanning for translatable content. ${chalk.dim('To ignore these errors, re-run with --ignore-errors')}\n` +
                     errors
                         .map((error) => chalk.red('• Error: ') + chalk.white(error))
                         .join('\n')));
@@ -267,7 +262,7 @@ export class ReactCLI extends BaseCLI {
             await super.handleGenericTranslate(options);
             // If the base class's handleTranslate completes successfully, continue with ReactCLI-specific code
         }
-        catch {
+        catch (error) {
             // Continue with ReactCLI-specific code even if base handleTranslate failed
         }
         if (!settings.stageTranslations) {
@@ -285,14 +280,6 @@ export class ReactCLI extends BaseCLI {
             }
             await translate(options, settings._versionId);
         }
-        // Localize static urls (/docs -> /[locale]/docs)
-        if (options.experimentalLocalizeStaticUrls) {
-            await localizeStaticUrls(options);
-        }
-        // Flatten json files into a single file
-        if (options.experimentalFlattenJsonFiles) {
-            await flattenJsonFiles(options);
-        }
     }
     async handleValidate(initOptions) {
         validateConfigExists();

package/dist/config/generateSettings.d.ts

@@ -1,5 +1,4 @@
 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

@@ -1,21 +1,14 @@
-import { displayProjectId, logErrorAndExit, warnApiKeyInConfig, } from '../console/logging.js';
-import { loadConfig } from '../fs/config/loadConfig.js';
+import { displayProjectId, warnApiKeyInConfig } from '../console/logging.js';
+import loadConfig from '../fs/config/loadConfig.js';
 import { defaultBaseUrl, libraryDefaultLocale, } from 'generaltranslation/internal';
 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';
-import chalk from 'chalk';
-import { resolveConfig } from './resolveConfig.js';
-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
@@ -31,33 +24,23 @@ export async function generateSettings(options, cwd = process.cwd()) {
     if (options.config) {
         gtConfig = loadConfig(options.config);
     }
+    else if (fs.existsSync(path.join(cwd, 'gt.config.json'))) {
+        options.config = path.join(cwd, 'gt.config.json');
+        gtConfig = loadConfig(options.config);
+    }
+    else if (fs.existsSync(path.join(cwd, 'src/gt.config.json'))) {
+        options.config = path.join(cwd, 'src/gt.config.json');
+        gtConfig = loadConfig(options.config);
+    }
     else {
-        const config = resolveConfig(cwd);
-        if (config) {
-            gtConfig = config.config;
-            options.config = config.path;
-        }
-        else {
-            gtConfig = {};
-        }
+        // If neither config exists, use empty config
+        gtConfig = {};
     }
     // Warn if apiKey is present in gt.config.json
     if (gtConfig.apiKey) {
         warnApiKeyInConfig(options.config);
         process.exit(1);
     }
-    const projectIdEnv = resolveProjectId();
-    // Resolve mismatched projectIds
-    if (gtConfig.projectId &&
-        options.projectId &&
-        gtConfig.projectId !== options.projectId) {
-        logErrorAndExit(`Project ID mismatch between ${chalk.green(gtConfig.projectId)} and ${chalk.green(options.projectId)}! Please use the same projectId in all configs.`);
-    }
-    else if (gtConfig.projectId &&
-        projectIdEnv &&
-        gtConfig.projectId !== projectIdEnv) {
-        logErrorAndExit(`Project ID mismatch between ${chalk.green(gtConfig.projectId)} and ${chalk.green(projectIdEnv)}! Please use the same projectId in all configs.`);
-    }
     // merge options
     const mergedOptions = { ...gtConfig, ...options };
     // merge locales
@@ -85,7 +68,14 @@ 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 || DEFAULT_SRC_PATTERNS;
+    mergedOptions.src =
+        mergedOptions.src ||
+            findFilepaths([
+                path.join(cwd, './src'),
+                path.join(cwd, './app'),
+                path.join(cwd, './pages'),
+                path.join(cwd, './components'),
+            ]);
     // 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,7 +13,8 @@ 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 noSupportedFormatError = "Unsupported data format! Please make sure your translationsDir parameter ends with a supported file extension.";
+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 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,7 +16,8 @@ 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 noSupportedFormatError = `Unsupported data format! Please make sure your translationsDir parameter ends with a supported file extension.`;
+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 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/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_EXT_LABEL: {
+export declare const FILE_EXT_TO_FORMAT: {
     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_EXT_LABEL = {
+export const FILE_EXT_TO_FORMAT = {
     json: 'JSON',
     mdx: 'MDX',
     md: 'Markdown',

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

@@ -6,12 +6,9 @@ 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
  */
 export declare function translateFiles(filePaths: ResolvedFiles, placeholderPaths: ResolvedFiles, transformPaths: TransformFiles, dataFormat: DataFormat | undefined, options: Settings & TranslateOptions): Promise<void>;
-/**
- * Creates a mapping between source files and their translated counterparts for each locale
- */
-export declare function createFileMapping(filePaths: ResolvedFiles, placeholderPaths: ResolvedFiles, transformPaths: TransformFiles, locales: string[]): Record<string, Record<string, string>>;

package/dist/formats/files/translate.js

@@ -1,6 +1,6 @@
 import { checkFileTranslations } from '../../api/checkFileTranslations.js';
 import { sendFiles } from '../../api/sendFiles.js';
-import { noSupportedFormatError, noLocalesError, noDefaultLocaleError, noApiKeyError, noProjectIdError, devApiKeyError, } from '../../console/index.js';
+import { noSupportedDataFormatError, 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';
@@ -10,13 +10,13 @@ import chalk from 'chalk';
 import { downloadFile } from '../../api/downloadFile.js';
 import { downloadFileBatch } from '../../api/downloadFileBatch.js';
 import { SUPPORTED_FILE_EXTENSIONS } from './supportedFiles.js';
-import sanitizeFileContent from '../../utils/sanitizeFileContent.js';
 const SUPPORTED_DATA_FORMATS = ['JSX', 'ICU', 'I18NEXT'];
 /**
  * Sends multiple files to the API for translation
  * @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 +27,7 @@ export async function translateFiles(filePaths, placeholderPaths, transformPaths
     // Process JSON files
     if (filePaths.json) {
         if (!SUPPORTED_DATA_FORMATS.includes(dataFormat)) {
-            logErrorAndExit(noSupportedFormatError);
+            logErrorAndExit(noSupportedDataFormatError);
         }
         const jsonFiles = filePaths.json.map((filePath) => {
             const content = readFile(filePath);
@@ -38,7 +38,7 @@ export async function translateFiles(filePaths, placeholderPaths, transformPaths
             return {
                 content,
                 fileName: relativePath,
-                fileExtension: 'JSON',
+                fileFormat: 'JSON',
                 dataFormat,
             };
         });
@@ -50,12 +50,11 @@ export async function translateFiles(filePaths, placeholderPaths, transformPaths
         if (filePaths[fileType]) {
             const files = filePaths[fileType].map((filePath) => {
                 const content = readFile(filePath);
-                const sanitizedContent = sanitizeFileContent(content);
                 const relativePath = getRelative(filePath);
                 return {
-                    content: sanitizedContent,
+                    content,
                     fileName: relativePath,
-                    fileExtension: fileType.toUpperCase(),
+                    fileFormat: fileType.toUpperCase(),
                     dataFormat,
                 };
             });
@@ -110,7 +109,7 @@ export async function translateFiles(filePaths, placeholderPaths, transformPaths
 /**
  * Creates a mapping between source files and their translated counterparts for each locale
  */
-export function createFileMapping(filePaths, placeholderPaths, transformPaths, locales) {
+function createFileMapping(filePaths, placeholderPaths, transformPaths, locales) {
     const fileMapping = {};
     for (const locale of locales) {
         const translatedPaths = resolveLocaleFiles(placeholderPaths, locale);

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

@@ -1 +1 @@
-export declare function loadConfig(filepath: string): Record<string, any>;
+export default function loadConfig(filepath: string): Record<string, any>;

package/dist/fs/config/loadConfig.js

@@ -1,5 +1,5 @@
 import fs from 'node:fs';
-export function loadConfig(filepath) {
+export default function loadConfig(filepath) {
     try {
         return JSON.parse(fs.readFileSync(filepath, 'utf-8'));
     }

package/dist/fs/config/parseFilesConfig.js

@@ -92,30 +92,29 @@ function expandGlobPatterns(cwd, includePatterns, excludePatterns, locale, trans
         resolvedPaths.push(...matches);
         // For each match, create a version with [locale] in the correct positions
         matches.forEach((match) => {
-            // Convert to absolute path to make replacement easier
-            const absolutePath = path.resolve(cwd, match);
-            const patternPath = path.resolve(cwd, pattern);
-            let originalAbsolutePath = absolutePath;
+            // Convert to relative path to make replacement easier
+            const relativePath = path.relative(cwd, match);
+            let originalRelativePath = relativePath;
+            // Replace locale with [locale] at each tracked position
             if (localePositions.length > 0) {
-                // Replace all instances of [locale]
+                // We need to account for path resolution differences
+                // This is a simplified approach - we'll replace all instances of the locale
                 // but only in path segments where we expect it based on the original pattern
-                const pathParts = absolutePath.split(path.sep);
-                const patternParts = patternPath.split(path.sep);
+                const pathParts = relativePath.split(path.sep);
+                const patternParts = pattern.split(/[\/\\]/); // Handle both slash types
                 for (let i = 0; i < pathParts.length; i++) {
                     if (i < patternParts.length) {
                         if (patternParts[i].includes(localeTag)) {
                             // This segment should have the locale replaced
-                            // Create regex from pattern to match the actual path structure
-                            const regexPattern = patternParts[i].replace(/\[locale\]/g, `(${locale.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')})`);
-                            const regex = new RegExp(regexPattern);
-                            pathParts[i] = pathParts[i].replace(regex, patternParts[i].replace(/\[locale\]/g, localeTag));
+                            pathParts[i] = pathParts[i].replace(locale, localeTag);
                         }
                     }
                 }
-                originalAbsolutePath = pathParts.join(path.sep);
+                originalRelativePath = pathParts.join(path.sep);
             }
             // Convert back to absolute path
-            placeholderPaths.push(originalAbsolutePath);
+            const originalPath = path.resolve(cwd, originalRelativePath);
+            placeholderPaths.push(originalPath);
         });
     }
     return { resolvedPaths, placeholderPaths };

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

@@ -12,5 +12,4 @@ export declare function createOrUpdateConfig(configFilepath: string, options: {
     locales?: string[];
     files?: FilesOptions;
     framework?: SupportedFrameworks;
-    baseUrl?: string;
 }): Promise<string>;

package/dist/fs/config/setupConfig.js

@@ -15,7 +15,6 @@ export async function createOrUpdateConfig(configFilepath, options) {
         ...(options.defaultLocale && { defaultLocale: options.defaultLocale }),
         ...(options.files && { files: options.files }),
         ...(options.framework && { framework: options.framework }),
-        ...(options.baseUrl && { baseUrl: options.baseUrl }),
     };
     try {
         // if file exists

package/dist/fs/findJsxFilepath.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 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

@@ -0,0 +1,30 @@
+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;
+}

package/dist/next/parse/wrapContent.js

@@ -6,13 +6,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 '../../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' },
@@ -29,12 +28,13 @@ const IMPORT_MAP = {
  * @returns An object containing the updates and errors
  */
 export async function wrapContentNext(options, pkg, errors, warnings) {
-    const files = matchFiles(process.cwd(), options.src || DEFAULT_SRC_PATTERNS);
+    const srcDirectory = options.src || ['./'];
+    const files = srcDirectory.flatMap((dir) => getFiles(dir));
     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, process.cwd());
+        const relativePath = getRelativePath(file, srcDirectory[0]);
         let ast;
         try {
             ast = parse(code, {

package/dist/react/data-_gt/addGTIdentifierToSyntaxTree.d.ts

@@ -1,8 +1 @@
-import { JsxChildren } from 'generaltranslation/types';
-/**
- * Add GT Identifier and minify the tree (recreates addGTIdentifier and writeChildrenAsObjects)
- * @param tree - The tree to add GT identifiers to
- * @param startingIndex - The starting index for GT IDs
- * @returns The tree with GT identifiers added
- */
-export default function addGTIdentifierToSyntaxTree(tree: any, startingIndex?: number): JsxChildren;
+export default function addGTIdentifierToSyntaxTree(tree: any, startingIndex?: number): any;