gtx-cli 1.2.4 → 1.2.5-alpha.2

package/dist/setup/wizard.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -27,144 +18,152 @@ const wrapContent_1 = __importDefault(require("../react/parse/wrapContent"));
 const wrapContent_2 = __importDefault(require("../next/parse/wrapContent"));
 const packageManager_1 = require("../utils/packageManager");
 const installPackage_1 = require("../utils/installPackage");
-function handleSetupReactCommand(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // Ask user for confirmation using inquirer
-        const answer = yield (0, console_3.promptConfirm)({
-            message: chalk_1.default.yellow(`This wizard will configure your React project for internationalization with GT.
+async function handleSetupReactCommand(options) {
+    // Ask user for confirmation using inquirer
+    const answer = await (0, console_3.promptConfirm)({
+        message: chalk_1.default.yellow(`This wizard will configure your React project for internationalization with GT.
 If your project is already using a different i18n library, this wizard may cause issues.
 
 Make sure you have committed or stashed any changes. Do you want to continue?`),
+        defaultValue: true,
+        cancelMessage: 'Operation cancelled. You can re-run this wizard with: npx gtx-cli setup',
+    });
+    if (!answer) {
+        (0, console_2.logInfo)('Operation cancelled. You can re-run this wizard with: npx gtx-cli setup');
+        process.exit(0);
+    }
+    const frameworkType = await (0, console_1.promptSelect)({
+        message: 'What framework are you using?',
+        options: [
+            { value: 'next-app', label: chalk_1.default.blue('Next.js App Router') },
+            { value: 'next-pages', label: chalk_1.default.green('Next.js Pages Router') },
+            { value: 'vite', label: chalk_1.default.cyan('Vite + React') },
+            { 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') },
+        ],
+        defaultValue: 'next-app',
+    });
+    if (frameworkType === 'other') {
+        (0, console_2.logError)(`Sorry, other React frameworks are not currently supported. 
+Please let us know what you would like to see supported at https://github.com/generaltranslation/gt/issues`);
+        process.exit(0);
+    }
+    const packageJson = await (0, packageJson_1.getPackageJson)();
+    // Check if gt-next or gt-react is installed
+    if (frameworkType === 'next-app' &&
+        !(0, packageJson_1.isPackageInstalled)('gt-next', packageJson)) {
+        const packageManager = await (0, packageManager_1.getPackageManager)();
+        const spinner = (0, console_1.createSpinner)('timer');
+        spinner.start(`Installing gt-next with ${packageManager.name}...`);
+        await (0, installPackage_1.installPackage)('gt-next', packageManager);
+        spinner.stop(chalk_1.default.green('Automatically installed gt-next.'));
+    }
+    else if (['next-pages', 'react', 'redwood', 'vite', 'gatsby'].includes(frameworkType) &&
+        !(0, packageJson_1.isPackageInstalled)('gt-react', packageJson)) {
+        const packageManager = await (0, packageManager_1.getPackageManager)();
+        const spinner = (0, console_1.createSpinner)('timer');
+        spinner.start(`Installing gt-react with ${packageManager.name}...`);
+        await (0, installPackage_1.installPackage)('gt-react', packageManager);
+        spinner.stop(chalk_1.default.green('Automatically installed gt-react.'));
+    }
+    // ----- Create a starter gt.config.json file -----
+    await (0, generateSettings_1.generateSettings)(options);
+    let errors = [];
+    let warnings = [];
+    let filesUpdated = [];
+    if (frameworkType === 'next-app') {
+        // Check if they have a next.config.js file
+        const nextConfigPath = (0, findFilepath_1.default)([
+            './next.config.js',
+            './next.config.ts',
+            './next.config.mjs',
+            './next.config.mts',
+        ]);
+        if (!nextConfigPath) {
+            (0, console_2.logError)('No next.config.[js|ts|mjs|mts] file found.');
+            process.exit(1);
+        }
+        const addGTProvider = await (0, console_3.promptConfirm)({
+            message: 'Do you want the setup wizard to automatically add the GTProvider component?',
             defaultValue: true,
-            cancelMessage: 'Operation cancelled. You can re-run this wizard with: npx gtx-cli setup',
         });
-        if (!answer) {
-            (0, console_2.logInfo)('Operation cancelled. You can re-run this wizard with: npx gtx-cli setup');
-            process.exit(0);
-        }
-        const frameworkType = yield (0, console_1.promptSelect)({
-            message: 'What framework are you using?',
-            options: [
-                { value: 'next-app', label: chalk_1.default.blue('Next.js App Router') },
-                { value: 'next-pages', label: chalk_1.default.green('Next.js Pages Router') },
-                { value: 'vite', label: chalk_1.default.cyan('Vite + React') },
-                { 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') },
-            ],
-            defaultValue: 'next-app',
+        const addWithGTConfig = await (0, console_3.promptConfirm)({
+            message: `Do you want to automatically add withGTConfig() to your ${nextConfigPath}?`,
+            defaultValue: true,
         });
-        if (frameworkType === 'other') {
-            (0, console_2.logError)(`Sorry, other React frameworks are not currently supported. 
-Please let us know what you would like to see supported at https://github.com/generaltranslation/gt/issues`);
-            process.exit(0);
-        }
-        const packageJson = yield (0, packageJson_1.getPackageJson)();
-        // Check if gt-next or gt-react is installed
-        if (frameworkType === 'next-app' &&
-            !(0, packageJson_1.isPackageInstalled)('gt-next', packageJson)) {
-            const packageManager = yield (0, packageManager_1.getPackageManager)();
-            const spinner = (0, console_1.createSpinner)('timer');
-            spinner.start(`Installing gt-next with ${packageManager.name}...`);
-            yield (0, installPackage_1.installPackage)('gt-next', packageManager);
-            spinner.stop(chalk_1.default.green('Automatically installed gt-next.'));
+        const includeTId = await (0, console_3.promptConfirm)({
+            message: 'Do you want to include an unique id for each <T> tag?',
+            defaultValue: true,
+        });
+        const mergeOptions = {
+            ...options,
+            disableIds: !includeTId,
+            disableFormatting: true,
+            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);
+        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);
+            (0, console_2.logStep)(chalk_1.default.green(`Added withGTConfig() to your ${nextConfigPath} file.`));
         }
-        else if (['next-pages', 'react', 'redwood', 'vite', 'gatsby'].includes(frameworkType) &&
-            !(0, packageJson_1.isPackageInstalled)('gt-react', packageJson)) {
-            const packageManager = yield (0, packageManager_1.getPackageManager)();
-            const spinner = (0, console_1.createSpinner)('timer');
-            spinner.start(`Installing gt-react with ${packageManager.name}...`);
-            yield (0, installPackage_1.installPackage)('gt-react', packageManager);
-            spinner.stop(chalk_1.default.green('Automatically installed gt-react.'));
+        if (errors.length > 0) {
+            (0, console_2.logError)(chalk_1.default.red('Failed to write files:\n') + errors.join('\n'));
         }
-        // ----- Create a starter gt.config.json file -----
-        yield (0, generateSettings_1.generateSettings)(options);
-        let errors = [];
-        let warnings = [];
-        let filesUpdated = [];
-        if (frameworkType === 'next-app') {
-            // Check if they have a next.config.js file
-            const nextConfigPath = (0, findFilepath_1.default)([
-                './next.config.js',
-                './next.config.ts',
-                './next.config.mjs',
-                './next.config.mts',
-            ]);
-            if (!nextConfigPath) {
-                (0, console_2.logError)('No next.config.[js|ts|mjs|mts] file found.');
-                process.exit(1);
-            }
-            const addGTProvider = yield (0, console_3.promptConfirm)({
+        (0, console_2.logSuccess)(chalk_1.default.green(`Success! All JSX content has been wrapped with <T> tags${includeTId ? ' and unique ids.' : '.'}`));
+        (0, console_1.logMessage)(`To translate strings, see the docs on useGT and getGT: https://generaltranslation.com/docs/next/api/strings/getGT`);
+    }
+    else {
+        let addGTProvider = false;
+        if (frameworkType === 'next-pages') {
+            addGTProvider = await (0, console_3.promptConfirm)({
                 message: 'Do you want the setup wizard to automatically add the GTProvider component?',
                 defaultValue: true,
             });
-            const addWithGTConfig = yield (0, console_3.promptConfirm)({
-                message: `Do you want to automatically add withGTConfig() to your ${nextConfigPath}?`,
-                defaultValue: true,
-            });
-            const includeTId = yield (0, console_3.promptConfirm)({
-                message: 'Do you want to include an unique id for each <T> tag?',
-                defaultValue: true,
-            });
-            const mergeOptions = Object.assign(Object.assign({}, options), { disableIds: !includeTId, disableFormatting: true, 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 } = yield (0, wrapContent_2.default)(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
-                yield (0, handleInitGT_1.default)(nextConfigPath, errors, warnings, filesUpdated);
-                (0, console_2.logStep)(chalk_1.default.green(`Added withGTConfig() to your ${nextConfigPath} file.`));
-            }
-            if (errors.length > 0) {
-                (0, console_2.logError)(chalk_1.default.red('Failed to write files:\n') + errors.join('\n'));
-            }
-            (0, console_2.logSuccess)(chalk_1.default.green(`Success! All JSX content has been wrapped with <T> tags${includeTId ? ' and unique ids.' : '.'}`));
-            (0, console_1.logMessage)(`To translate strings, see the docs on useGT and getGT: https://generaltranslation.com/docs/next/api/strings/getGT`);
         }
-        else {
-            let addGTProvider = false;
-            if (frameworkType === 'next-pages') {
-                addGTProvider = yield (0, console_3.promptConfirm)({
-                    message: 'Do you want the setup wizard to automatically add the GTProvider component?',
-                    defaultValue: true,
-                });
-            }
-            const includeTId = yield (0, console_3.promptConfirm)({
-                message: 'Do you want to include an unique id for each <T> tag?',
-                defaultValue: true,
-            });
-            const mergeOptions = Object.assign(Object.assign({}, options), { disableIds: !includeTId, disableFormatting: true, 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 } = yield (0, wrapContent_1.default)(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) {
-                (0, console_2.logError)(chalk_1.default.red('Failed to write files:\n') + errors.join('\n'));
-            }
-            (0, console_2.logSuccess)(chalk_1.default.green(`Success! All JSX content has been wrapped with <T> tags${includeTId ? ' and unique ids.' : '.'}`));
-            (0, console_1.logMessage)(`To translate strings, see the docs on useGT: https://generaltranslation.com/docs/react/api/strings/useGT`);
-        }
-        if (warnings.length > 0) {
-            (0, console_2.logWarning)(chalk_1.default.yellow('Warnings encountered:') +
-                '\n' +
-                warnings.map((warning) => `${chalk_1.default.yellow('-')} ${warning}`).join('\n'));
-        }
-        const formatter = yield (0, postProcess_1.detectFormatter)();
-        if (!formatter || filesUpdated.length === 0) {
-            return;
-        }
-        const applyFormatting = yield (0, console_3.promptConfirm)({
-            message: `Would you like the wizard to auto-format the modified files? ${chalk_1.default.gray(`(${formatter})`)}`,
+        const includeTId = await (0, console_3.promptConfirm)({
+            message: 'Do you want to include an unique id for each <T> tag?',
             defaultValue: true,
         });
-        // Format updated files if formatters are available
-        if (applyFormatting)
-            yield (0, postProcess_2.formatFiles)(filesUpdated, formatter);
+        const mergeOptions = {
+            ...options,
+            disableIds: !includeTId,
+            disableFormatting: true,
+            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);
+        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) {
+            (0, console_2.logError)(chalk_1.default.red('Failed to write files:\n') + errors.join('\n'));
+        }
+        (0, console_2.logSuccess)(chalk_1.default.green(`Success! All JSX content has been wrapped with <T> tags${includeTId ? ' and unique ids.' : '.'}`));
+        (0, console_1.logMessage)(`To translate strings, see the docs on useGT: https://generaltranslation.com/docs/react/api/strings/useGT`);
+    }
+    if (warnings.length > 0) {
+        (0, console_2.logWarning)(chalk_1.default.yellow('Warnings encountered:') +
+            '\n' +
+            warnings.map((warning) => `${chalk_1.default.yellow('-')} ${warning}`).join('\n'));
+    }
+    const formatter = await (0, postProcess_1.detectFormatter)();
+    if (!formatter || filesUpdated.length === 0) {
+        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})`)}`,
+        defaultValue: true,
     });
+    // Format updated files if formatters are available
+    if (applyFormatting)
+        await (0, postProcess_2.formatFiles)(filesUpdated, formatter);
 }

package/dist/translation/parse.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -29,65 +20,63 @@ const chalk_1 = __importDefault(require("chalk"));
  * @param pkg - The package name
  * @returns An object containing the updates and errors
  */
-function createUpdates(options, sourceDictionary, pkg) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let updates = [];
-        let errors = [];
-        // Parse dictionary with esbuildConfig
-        if (sourceDictionary &&
-            fs_1.default.existsSync(sourceDictionary) &&
-            fs_1.default.statSync(sourceDictionary).isFile()) {
-            if (sourceDictionary.endsWith('.json')) {
-                updates = [
-                    ...updates,
-                    ...(yield (0, createDictionaryUpdates_1.default)(options, sourceDictionary)),
-                ];
-            }
-            else {
-                let esbuildConfig;
-                if (options.jsconfig) {
-                    const jsconfig = (0, loadJSON_1.default)(options.jsconfig);
-                    if (!jsconfig) {
-                        (0, logging_1.logError)(`Failed to resolve jsconfig.json or tsconfig.json at provided filepath: "${options.jsconfig}"`);
-                        process.exit(1);
-                    }
-                    esbuildConfig = (0, createESBuildConfig_1.default)(jsconfig);
-                }
-                else {
-                    esbuildConfig = (0, createESBuildConfig_1.default)({});
-                }
-                updates = [
-                    ...updates,
-                    ...(yield (0, createDictionaryUpdates_1.default)(options, sourceDictionary, esbuildConfig)),
-                ];
-            }
-        }
-        // Scan through project for <T> tags
-        if (options.inline) {
-            const { updates: newUpdates, errors: newErrors } = yield (0, createInlineUpdates_1.default)(options, pkg);
-            errors = [...errors, ...newErrors];
-            updates = [...updates, ...newUpdates];
+async function createUpdates(options, sourceDictionary, pkg) {
+    let updates = [];
+    let errors = [];
+    // Parse dictionary with esbuildConfig
+    if (sourceDictionary &&
+        fs_1.default.existsSync(sourceDictionary) &&
+        fs_1.default.statSync(sourceDictionary).isFile()) {
+        if (sourceDictionary.endsWith('.json')) {
+            updates = [
+                ...updates,
+                ...(await (0, createDictionaryUpdates_1.default)(options, sourceDictionary)),
+            ];
         }
-        // Metadata addition and validation
-        const idHashMap = new Map();
-        const duplicateIds = new Set();
-        updates = updates.map((update) => {
-            if (!update.metadata.id)
-                return update;
-            const existingHash = idHashMap.get(update.metadata.id);
-            if (existingHash) {
-                if (existingHash !== update.metadata.hash) {
-                    errors.push(`Hashes don't match on two components with the same id: ${chalk_1.default.blue(update.metadata.id)}. Check your ${chalk_1.default.green('<T>')} tags and dictionary entries and make sure you're not accidentally duplicating IDs.`);
-                    duplicateIds.add(update.metadata.id);
+        else {
+            let esbuildConfig;
+            if (options.jsconfig) {
+                const jsconfig = (0, loadJSON_1.default)(options.jsconfig);
+                if (!jsconfig) {
+                    (0, logging_1.logError)(`Failed to resolve jsconfig.json or tsconfig.json at provided filepath: "${options.jsconfig}"`);
+                    process.exit(1);
                 }
+                esbuildConfig = (0, createESBuildConfig_1.default)(jsconfig);
             }
             else {
-                idHashMap.set(update.metadata.id, update.metadata.hash);
+                esbuildConfig = (0, createESBuildConfig_1.default)({});
             }
+            updates = [
+                ...updates,
+                ...(await (0, createDictionaryUpdates_1.default)(options, sourceDictionary, esbuildConfig)),
+            ];
+        }
+    }
+    // Scan through project for <T> tags
+    if (options.inline) {
+        const { updates: newUpdates, errors: newErrors } = await (0, createInlineUpdates_1.default)(options, pkg);
+        errors = [...errors, ...newErrors];
+        updates = [...updates, ...newUpdates];
+    }
+    // Metadata addition and validation
+    const idHashMap = new Map();
+    const duplicateIds = new Set();
+    updates = updates.map((update) => {
+        if (!update.metadata.id)
             return update;
-        });
-        // Filter out updates with duplicate IDs
-        updates = updates.filter((update) => !duplicateIds.has(update.metadata.id));
-        return { updates, errors };
+        const existingHash = idHashMap.get(update.metadata.id);
+        if (existingHash) {
+            if (existingHash !== update.metadata.hash) {
+                errors.push(`Hashes don't match on two components with the same id: ${chalk_1.default.blue(update.metadata.id)}. Check your ${chalk_1.default.green('<T>')} tags and dictionary entries and make sure you're not accidentally duplicating IDs.`);
+                duplicateIds.add(update.metadata.id);
+            }
+        }
+        else {
+            idHashMap.set(update.metadata.id, update.metadata.hash);
+        }
+        return update;
     });
+    // Filter out updates with duplicate IDs
+    updates = updates.filter((update) => !duplicateIds.has(update.metadata.id));
+    return { updates, errors };
 }

package/dist/translation/stage.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -20,65 +11,67 @@ const logging_1 = require("../console/logging");
 const parse_1 = require("./parse");
 const errors_2 = require("../console/errors");
 const sendUpdates_1 = require("../api/sendUpdates");
-function stageProject(settings, pkg) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!settings.dictionary) {
-            settings.dictionary = (0, findFilepath_1.default)([
-                './dictionary.js',
-                './src/dictionary.js',
-                './dictionary.json',
-                './src/dictionary.json',
-                './dictionary.ts',
-                './src/dictionary.ts',
-            ]);
-        }
-        // Separate defaultLocale from locales
-        settings.locales = settings.locales.filter((locale) => locale !== settings.defaultLocale);
-        // validate timeout
-        const timeout = parseInt(settings.timeout);
-        if (isNaN(timeout) || timeout < 0) {
-            (0, errors_1.logErrorAndExit)(`Invalid timeout: ${settings.timeout}. Must be a positive integer.`);
-        }
-        settings.timeout = timeout.toString();
-        // ---- CREATING UPDATES ---- //
-        const { updates, errors } = yield (0, parse_1.createUpdates)(settings, settings.dictionary, pkg);
-        if (errors.length > 0) {
-            if (settings.ignoreErrors) {
-                (0, logging_1.logWarning)(chalk_1.default.red(`CLI tool encountered errors while scanning for ${chalk_1.default.green('<T>')} tags. These components will not be translated.\n` +
-                    errors
-                        .map((error) => chalk_1.default.yellow('• Warning: ') + error + '\n')
-                        .join('')));
-            }
-            else {
-                (0, logging_1.logError)(chalk_1.default.red(`CLI tool encountered errors while scanning for ${chalk_1.default.green('<T>')} tags. ${chalk_1.default.gray('To ignore these errors, re-run with --ignore-errors')}\n` +
-                    errors
-                        .map((error) => chalk_1.default.red('• Error: ') + error + '\n')
-                        .join('')));
-            }
-        }
-        if (settings.dryRun) {
-            (0, logging_1.logSuccess)('Dry run: No translations were sent to General Translation.');
-            return null;
-        }
-        if (updates.length == 0) {
-            (0, logging_1.logError)(chalk_1.default.red(`No in-line content or dictionaries were found for ${chalk_1.default.green(pkg)}. Are you sure you're running this command in the right directory?`));
-            return null;
-        }
-        // Send updates to General Translation API
-        if (!settings.locales) {
-            (0, errors_1.logErrorAndExit)(errors_2.noLocalesError);
-        }
-        if (!settings.defaultLocale) {
-            (0, errors_1.logErrorAndExit)(errors_2.noDefaultLocaleError);
-        }
-        if (!settings.apiKey) {
-            (0, errors_1.logErrorAndExit)(errors_2.noApiKeyError);
+async function stageProject(settings, pkg) {
+    if (!settings.dictionary) {
+        settings.dictionary = (0, findFilepath_1.default)([
+            './dictionary.js',
+            './src/dictionary.js',
+            './dictionary.json',
+            './src/dictionary.json',
+            './dictionary.ts',
+            './src/dictionary.ts',
+        ]);
+    }
+    // Separate defaultLocale from locales
+    settings.locales = settings.locales.filter((locale) => locale !== settings.defaultLocale);
+    // validate timeout
+    const timeout = parseInt(settings.timeout);
+    if (isNaN(timeout) || timeout < 0) {
+        (0, errors_1.logErrorAndExit)(`Invalid timeout: ${settings.timeout}. Must be a positive integer.`);
+    }
+    settings.timeout = timeout.toString();
+    // ---- CREATING UPDATES ---- //
+    const { updates, errors } = await (0, parse_1.createUpdates)(settings, settings.dictionary, pkg);
+    if (errors.length > 0) {
+        if (settings.ignoreErrors) {
+            (0, logging_1.logWarning)(chalk_1.default.red(`CLI tool encountered errors while scanning for ${chalk_1.default.green('<T>')} tags. These components will not be translated.\n` +
+                errors
+                    .map((error) => chalk_1.default.yellow('• Warning: ') + error + '\n')
+                    .join('')));
         }
-        if (!settings.projectId) {
-            (0, errors_1.logErrorAndExit)(errors_2.noProjectIdError);
+        else {
+            (0, logging_1.logError)(chalk_1.default.red(`CLI tool encountered errors while scanning for ${chalk_1.default.green('<T>')} tags. ${chalk_1.default.gray('To ignore these errors, re-run with --ignore-errors')}\n` +
+                errors
+                    .map((error) => chalk_1.default.red('• Error: ') + error + '\n')
+                    .join('')));
         }
-        const updateResponse = yield (0, sendUpdates_1.sendUpdates)(updates, Object.assign(Object.assign({}, settings), { timeout: settings.timeout, dataFormat: 'JSX' }), pkg);
-        const { versionId, locales } = updateResponse;
-        return { versionId, locales };
-    });
+    }
+    if (settings.dryRun) {
+        (0, logging_1.logSuccess)('Dry run: No translations were sent to General Translation.');
+        return null;
+    }
+    if (updates.length == 0) {
+        (0, logging_1.logError)(chalk_1.default.red(`No in-line content or dictionaries were found for ${chalk_1.default.green(pkg)}. Are you sure you're running this command in the right directory?`));
+        return null;
+    }
+    // Send updates to General Translation API
+    if (!settings.locales) {
+        (0, errors_1.logErrorAndExit)(errors_2.noLocalesError);
+    }
+    if (!settings.defaultLocale) {
+        (0, errors_1.logErrorAndExit)(errors_2.noDefaultLocaleError);
+    }
+    if (!settings.apiKey) {
+        (0, errors_1.logErrorAndExit)(errors_2.noApiKeyError);
+    }
+    if (!settings.projectId) {
+        (0, errors_1.logErrorAndExit)(errors_2.noProjectIdError);
+    }
+    const updateResponse = await (0, sendUpdates_1.sendUpdates)(updates, {
+        ...settings,
+        timeout: settings.timeout,
+        dataFormat: 'JSX',
+    }, pkg);
+    const { versionId, locales } = updateResponse;
+    return { versionId, locales };
 }

package/dist/translation/translate.js

@@ -1,31 +1,20 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.translate = translate;
 const fetchTranslations_1 = require("../api/fetchTranslations");
 const waitForUpdates_1 = require("../api/waitForUpdates");
 const save_1 = require("../formats/gt/save");
-function translate(settings, versionId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // timeout was validated earlier
-        const startTime = Date.now();
-        const timeout = parseInt(settings.timeout) * 1000;
-        const result = yield (0, waitForUpdates_1.waitForUpdates)(settings.apiKey, settings.baseUrl, versionId, startTime, timeout);
-        if (!result) {
-            process.exit(1);
-        }
-        const translations = yield (0, fetchTranslations_1.fetchTranslations)(settings.baseUrl, settings.apiKey, versionId);
-        // Save translations to local directory if files.gt.output is provided
-        if (settings.files && settings.files.placeholderPaths.gt) {
-            yield (0, save_1.saveTranslations)(translations, settings.files.placeholderPaths, 'JSX');
-        }
-    });
+async function translate(settings, versionId) {
+    // timeout was validated earlier
+    const startTime = Date.now();
+    const timeout = parseInt(settings.timeout) * 1000;
+    const result = await (0, waitForUpdates_1.waitForUpdates)(settings.apiKey, settings.baseUrl, versionId, startTime, timeout);
+    if (!result) {
+        process.exit(1);
+    }
+    const translations = await (0, fetchTranslations_1.fetchTranslations)(settings.baseUrl, settings.apiKey, versionId);
+    // Save translations to local directory if files.gt.output is provided
+    if (settings.files && settings.files.placeholderPaths.gt) {
+        await (0, save_1.saveTranslations)(translations, settings.files.placeholderPaths, 'JSX');
+    }
 }