gtx-cli 2.5.6 → 2.5.8

package/dist/hooks/postProcess.js

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import { spawn } from 'node:child_process';
 import chalk from 'chalk';
-import { logMessage, logWarning } from '../console/logging.js';
+import { logger } from '../console/logger.js';
 export async function detectFormatter() {
     // Try Prettier
     try {
@@ -43,11 +43,11 @@ export async function formatFiles(filesUpdated, formatter) {
     try {
         const detectedFormatter = formatter || (await detectFormatter());
         if (!detectedFormatter) {
-            logWarning(chalk.yellow('No supported formatter detected'));
+            logger.warn(chalk.yellow('No supported formatter detected'));
             return;
         }
         if (detectedFormatter === 'prettier') {
-            logMessage(chalk.dim('Cleaning up with prettier...'));
+            logger.message(chalk.dim('Cleaning up with prettier...'));
             const prettier = await import('prettier');
             for (const file of filesUpdated) {
                 const config = await prettier.resolveConfig(file);
@@ -61,7 +61,7 @@ export async function formatFiles(filesUpdated, formatter) {
             return;
         }
         if (detectedFormatter === 'biome') {
-            logMessage(chalk.dim('Cleaning up with biome...'));
+            logger.message(chalk.dim('Cleaning up with biome...'));
             try {
                 await new Promise((resolve, reject) => {
                     const args = [
@@ -74,24 +74,24 @@ export async function formatFiles(filesUpdated, formatter) {
                         stdio: ['ignore', 'inherit', 'inherit'],
                     });
                     child.on('error', (error) => {
-                        logWarning(chalk.yellow('Biome formatting failed: ' + error.message));
+                        logger.warn(chalk.yellow('Biome formatting failed: ' + error.message));
                         resolve();
                     });
                     child.on('close', (code) => {
                         if (code !== 0) {
-                            logWarning(chalk.yellow(`Biome formatting failed with exit code ${code}`));
+                            logger.warn(chalk.yellow(`Biome formatting failed with exit code ${code}`));
                         }
                         resolve();
                     });
                 });
             }
             catch (error) {
-                logWarning(chalk.yellow('Biome formatting failed: ' + String(error)));
+                logger.warn(chalk.yellow('Biome formatting failed: ' + String(error)));
             }
             return;
         }
         if (detectedFormatter === 'eslint') {
-            logMessage(chalk.dim('Cleaning up with eslint...'));
+            logger.message(chalk.dim('Cleaning up with eslint...'));
             const { ESLint } = await import('eslint');
             const eslint = new ESLint({
                 fix: true,
@@ -105,6 +105,6 @@ export async function formatFiles(filesUpdated, formatter) {
         }
     }
     catch (e) {
-        logWarning(chalk.yellow('Unable to run code formatter: ' + String(e)));
+        logger.warn(chalk.yellow('Unable to run code formatter: ' + String(e)));
     }
 }

package/dist/next/parse/handleInitGT.js

@@ -6,7 +6,7 @@ import traverseModule from '@babel/traverse';
 const traverse = traverseModule.default || traverseModule;
 const generate = generateModule.default || generateModule;
 import * as t from '@babel/types';
-import { logError } from '../../console/logging.js';
+import { logger } from '../../console/logger.js';
 import { needsCJS } from '../../utils/parse/needsCJS.js';
 export async function handleInitGT(filepath, errors, warnings, filesUpdated, packageJson, tsconfigJson) {
     const code = await fs.promises.readFile(filepath, 'utf8');
@@ -151,7 +151,7 @@ export async function handleInitGT(filepath, errors, warnings, filesUpdated, pac
         filesUpdated.push(filepath);
     }
     catch (error) {
-        logError(`Error parsing file ${filepath}: ${error}`);
+        logger.error(`Error parsing file ${filepath}: ${error}`);
         errors.push(`Failed to parse ${filepath}: ${error}`);
     }
 }

package/dist/react/parse/addVitePlugin/index.js

@@ -1,7 +1,8 @@
 import findFilepath from '../../../fs/findFilepath.js';
-import { logError } from '../../../console/logging.js';
+import { logger } from '../../../console/logger.js';
 import { installCompiler } from './installCompiler.js';
 import { updateViteConfig } from './updateViteConfig.js';
+import { exitSync } from '../../../console/logging.js';
 const VITE_CONFIG_PATH_BASE = './vite.config.';
 /**
  * Adds the gt compiler plugin to the vite config file
@@ -17,13 +18,13 @@ export async function addVitePlugin({ errors, warnings, filesUpdated, packageJso
         VITE_CONFIG_PATH_BASE + 'cts',
     ]);
     if (!viteConfigPath) {
-        logError(`No ${VITE_CONFIG_PATH_BASE}[js|ts|mjs|mts|cjs|cts] file found. Please add the @generaltranslation/compiler plugin to your vite configuration file:
+        logger.error(`No ${VITE_CONFIG_PATH_BASE}[js|ts|mjs|mts|cjs|cts] file found. Please add the @generaltranslation/compiler plugin to your vite configuration file:
       import { vite as gtCompiler } from '@generaltranslation/compiler';
       export default defineConfig({
         plugins: [gtCompiler()],
       });
       `);
-        process.exit(1);
+        exitSync(1);
     }
     // Install @generaltranslation/compiler if not installed
     await installCompiler({ packageJson });

package/dist/react/parse/addVitePlugin/installCompiler.js

@@ -1,4 +1,4 @@
-import { createSpinner } from '../../../console/logging.js';
+import { logger } from '../../../console/logger.js';
 import { installPackage } from '../../../utils/installPackage.js';
 import { isPackageInstalled } from '../../../utils/packageJson.js';
 import { getPackageManager } from '../../../utils/packageManager.js';
@@ -12,7 +12,7 @@ export async function installCompiler({ packageJson, }) {
         return;
     }
     // Animation
-    const spinner = createSpinner();
+    const spinner = logger.createSpinner();
     spinner.start(`Installing @generaltranslation/compiler...`);
     // Install
     const packageManager = await getPackageManager();

package/dist/react/parse/addVitePlugin/updateViteConfig.js

@@ -1,5 +1,4 @@
-import { createSpinner } from '../../../console/logging.js';
-import { logError } from '../../../console/logging.js';
+import { logger } from '../../../console/logger.js';
 import fs from 'node:fs';
 import chalk from 'chalk';
 import generateModule from '@babel/generator';
@@ -9,6 +8,7 @@ import { addCompilerImport } from './utils/addCompilerImport.js';
 import { checkCompilerImport } from './utils/checkCompilerImport.js';
 import { checkPluginInvocation } from './utils/checkPluginInvocation.js';
 import { addPluginInvocation } from './utils/addPluginInvocation.js';
+import { exitSync } from '../../../console/logging.js';
 // Handle CommonJS/ESM interop
 const generate = generateModule.default || generateModule;
 /**
@@ -18,7 +18,7 @@ const generate = generateModule.default || generateModule;
  */
 export async function updateViteConfig({ errors, warnings, filesUpdated, viteConfigPath, packageJson, tsconfigJson, }) {
     // Animation
-    const spinner = createSpinner();
+    const spinner = logger.createSpinner();
     spinner.start(`Adding gt compiler plugin to ${viteConfigPath}...`);
     // Read the file
     let code;
@@ -26,9 +26,8 @@ export async function updateViteConfig({ errors, warnings, filesUpdated, viteCon
         code = await fs.promises.readFile(viteConfigPath, 'utf8');
     }
     catch (error) {
-        logError(`Error: Failed to read ${viteConfigPath}: ${error}`);
-        process.exit(1);
-        return;
+        logger.error(`Error: Failed to read ${viteConfigPath}: ${error}`);
+        exitSync(1);
     }
     // Update the ast
     let updatedCode, success;
@@ -43,9 +42,8 @@ export async function updateViteConfig({ errors, warnings, filesUpdated, viteCon
         }));
     }
     catch (error) {
-        logError(`Error: Failed to update ${viteConfigPath}: ${error}`);
-        process.exit(1);
-        return;
+        logger.error(`Error: Failed to update ${viteConfigPath}: ${error}`);
+        exitSync(1);
     }
     // Write the file
     try {
@@ -53,9 +51,8 @@ export async function updateViteConfig({ errors, warnings, filesUpdated, viteCon
         filesUpdated.push(viteConfigPath);
     }
     catch (error) {
-        logError(`Error: Failed to write ${viteConfigPath}: ${error}`);
-        process.exit(1);
-        return;
+        logger.error(`Error: Failed to write ${viteConfigPath}: ${error}`);
+        exitSync(1);
     }
     // Animation
     spinner.stop(success

package/dist/react/parse/createDictionaryUpdates.js

@@ -6,10 +6,11 @@ import flattenDictionary from '../utils/flattenDictionary.js';
 import loadJSON from '../../fs/loadJSON.js';
 import { hashSource } from 'generaltranslation/id';
 import getEntryAndMetadata from '../utils/getEntryAndMetadata.js';
-import { logError } from '../../console/logging.js';
+import { logger } from '../../console/logger.js';
 import { randomUUID } from 'node:crypto';
 import { isValidIcu } from '../jsx/evaluateJsx.js';
 import { warnInvalidIcuSync } from '../../console/index.js';
+import { exitSync } from '../../console/logging.js';
 export async function createDictionaryUpdates(dictionaryPath, warnings, esbuildConfig) {
     let dictionary;
     // ---- HANDLE JSON STRING DICTIONARY ----- //
@@ -32,8 +33,8 @@ export async function createDictionaryUpdates(dictionaryPath, warnings, esbuildC
             dictionaryModule = await import(tempFilePath);
         }
         catch (error) {
-            logError(`Failed to load the bundled dictionary code: ${error}`);
-            process.exit(1);
+            logger.error(`Failed to load the bundled dictionary code: ${error}`);
+            exitSync(1);
         }
         finally {
             // Clean up the temporary file

package/dist/react/parse/createInlineUpdates.js

@@ -3,7 +3,7 @@ import { parse } from '@babel/parser';
 import { hashSource } from 'generaltranslation/id';
 import { parseTranslationComponent } from '../jsx/utils/jsxParsing/parseJsx.js';
 import { parseStrings } from '../jsx/utils/parseStringFunction.js';
-import { logError } from '../../console/logging.js';
+import { logger } from '../../console/logger.js';
 import { matchFiles } from '../../fs/matchFiles.js';
 import { DEFAULT_SRC_PATTERNS } from '../../config/generateSettings.js';
 import { getPathsAndAliases } from '../jsx/utils/getPathsAndAliases.js';
@@ -23,7 +23,7 @@ export async function createInlineUpdates(pkg, validate, filePatterns, parsingOp
             });
         }
         catch (error) {
-            logError(`Error parsing file ${file}: ${error}`);
+            logger.error(`Error parsing file ${file}: ${error}`);
             continue;
         }
         // First pass: collect imports and process translation functions

package/dist/setup/wizard.js

@@ -1,6 +1,6 @@
 import { detectFormatter } from '../hooks/postProcess.js';
-import { createSpinner, promptSelect } from '../console/logging.js';
-import { logInfo, logError, logStep, logWarning } from '../console/logging.js';
+import { promptSelect } from '../console/logging.js';
+import { logger } from '../console/logger.js';
 import chalk from 'chalk';
 import { promptConfirm } from '../console/logging.js';
 import findFilepath from '../fs/findFilepath.js';
@@ -13,6 +13,7 @@ import { installPackage } from '../utils/installPackage.js';
 import { createOrUpdateConfig } from '../fs/config/setupConfig.js';
 import { loadConfig } from '../fs/config/loadConfig.js';
 import { addVitePlugin } from '../react/parse/addVitePlugin/index.js';
+import { exitSync } from '../console/logging.js';
 export async function handleSetupReactCommand(options) {
     // Ask user for confirmation using inquirer
     const answer = await promptConfirm({
@@ -24,8 +25,8 @@ Make sure you have committed or stashed any changes. Do you want to continue?`),
         cancelMessage: 'Operation cancelled. You can re-run this wizard with: npx gtx-cli setup',
     });
     if (!answer) {
-        logInfo('Operation cancelled. You can re-run this wizard with: npx gtx-cli setup');
-        process.exit(0);
+        logger.info('Operation cancelled. You can re-run this wizard with: npx gtx-cli setup');
+        exitSync(0);
     }
     const frameworkType = await promptSelect({
         message: 'What framework are you using?',
@@ -41,9 +42,9 @@ Make sure you have committed or stashed any changes. Do you want to continue?`),
         defaultValue: 'next-app',
     });
     if (frameworkType === 'other') {
-        logError(`Sorry, other React frameworks are not currently supported. 
+        logger.error(`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);
+        exitSync(0);
     }
     // ----- Create a starter gt.config.json file -----
     await createOrUpdateConfig(options.config || 'gt.config.json', {
@@ -51,14 +52,14 @@ Please let us know what you would like to see supported at https://github.com/ge
     });
     const packageJson = await getPackageJson();
     if (!packageJson) {
-        logError(chalk.red('No package.json found in the current directory. Please run this command from the root of your project.'));
-        process.exit(1);
+        logger.error(chalk.red('No package.json found in the current directory. Please run this command from the root of your project.'));
+        exitSync(1);
     }
     // Check if gt-next or gt-react is installed
     if (frameworkType === 'next-app' &&
         !isPackageInstalled('gt-next', packageJson)) {
         const packageManager = await getPackageManager();
-        const spinner = createSpinner('timer');
+        const spinner = logger.createSpinner('timer');
         spinner.start(`Installing gt-next with ${packageManager.name}...`);
         await installPackage('gt-next', packageManager);
         spinner.stop(chalk.green('Automatically installed gt-next.'));
@@ -66,7 +67,7 @@ Please let us know what you would like to see supported at https://github.com/ge
     else if (['next-pages', 'react', 'redwood', 'vite', 'gatsby'].includes(frameworkType) &&
         !isPackageInstalled('gt-react', packageJson)) {
         const packageManager = await getPackageManager();
-        const spinner = createSpinner('timer');
+        const spinner = logger.createSpinner('timer');
         spinner.start(`Installing gt-react with ${packageManager.name}...`);
         await installPackage('gt-react', packageManager);
         spinner.stop(chalk.green('Automatically installed gt-react.'));
@@ -86,8 +87,8 @@ Please let us know what you would like to see supported at https://github.com/ge
             './next.config.mts',
         ]);
         if (!nextConfigPath) {
-            logError('No next.config.[js|ts|mjs|mts] file found.');
-            process.exit(1);
+            logger.error('No next.config.[js|ts|mjs|mts] file found.');
+            exitSync(1);
         }
         const mergeOptions = {
             ...options,
@@ -96,7 +97,7 @@ Please let us know what you would like to see supported at https://github.com/ge
             skipTs: true,
             addGTProvider: true,
         };
-        const spinner = createSpinner();
+        const spinner = logger.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 wrapContentNext(mergeOptions, 'gt-next', errors, warnings);
@@ -104,7 +105,7 @@ Please let us know what you would like to see supported at https://github.com/ge
         spinner.stop(chalk.green(`Success! Updated ${chalk.bold.cyan(filesUpdated.length)} files:\n`) + filesUpdated.map((file) => `${chalk.green('-')} ${file}`).join('\n'));
         // Add the withGTConfig() function to the next.config.js file
         await handleInitGT(nextConfigPath, errors, warnings, filesUpdated, packageJson, tsconfigJson);
-        logStep(chalk.green(`Added withGTConfig() to your ${nextConfigPath} file.`));
+        logger.step(chalk.green(`Added withGTConfig() to your ${nextConfigPath} file.`));
     }
     // Add gt compiler plugin
     if (frameworkType === 'vite') {
@@ -117,10 +118,10 @@ Please let us know what you would like to see supported at https://github.com/ge
         });
     }
     if (errors.length > 0) {
-        logError(chalk.red('Failed to write files:\n') + errors.join('\n'));
+        logger.error(chalk.red('Failed to write files:\n') + errors.join('\n'));
     }
     if (warnings.length > 0) {
-        logWarning(chalk.yellow('Warnings encountered:') +
+        logger.warn(chalk.yellow('Warnings encountered:') +
             '\n' +
             warnings.map((warning) => `${chalk.yellow('-')} ${warning}`).join('\n'));
     }

package/dist/translation/parse.js

@@ -1,10 +1,11 @@
 import fs from 'fs';
-import { logError } from '../console/logging.js';
+import { logger } from '../console/logger.js';
 import loadJSON from '../fs/loadJSON.js';
 import { createDictionaryUpdates } from '../react/parse/createDictionaryUpdates.js';
 import { createInlineUpdates } from '../react/parse/createInlineUpdates.js';
 import createESBuildConfig from '../react/config/createESBuildConfig.js';
 import chalk from 'chalk';
+import { exitSync } from '../console/logging.js';
 /**
  * Searches for gt-react or gt-next dictionary files and creates updates for them,
  * as well as inline updates for <T> tags and useGT()/getGT() calls
@@ -33,8 +34,8 @@ export async function createUpdates(options, src, sourceDictionary, pkg, validat
             if (options.jsconfig) {
                 const jsconfig = loadJSON(options.jsconfig);
                 if (!jsconfig) {
-                    logError(`Failed to resolve jsconfig.json or tsconfig.json at provided filepath: "${options.jsconfig}"`);
-                    process.exit(1);
+                    logger.error(`Failed to resolve jsconfig.json or tsconfig.json at provided filepath: "${options.jsconfig}"`);
+                    exitSync(1);
                 }
                 esbuildConfig = createESBuildConfig(jsconfig);
             }

package/dist/translation/stage.js

@@ -1,7 +1,7 @@
 import { logErrorAndExit } from '../console/logging.js';
 import chalk from 'chalk';
 import findFilepath from '../fs/findFilepath.js';
-import { logWarning, logError } from '../console/logging.js';
+import { logger } from '../console/logger.js';
 import { createUpdates } from './parse.js';
 export async function aggregateReactTranslations(options, settings, library) {
     if (!options.dictionary) {
@@ -17,14 +17,14 @@ export async function aggregateReactTranslations(options, settings, library) {
     // ---- CREATING UPDATES ---- //
     const { updates, errors, warnings } = await createUpdates(options, settings.src, options.dictionary, library, false, settings.parsingOptions);
     if (warnings.length > 0) {
-        logWarning(chalk.yellow(`CLI tool encountered ${warnings.length} warnings while scanning for translatable content.\n` +
+        logger.warn(chalk.yellow(`CLI tool encountered ${warnings.length} warnings while scanning for translatable content.\n` +
             warnings
                 .map((warning) => chalk.yellow('• Warning: ') + chalk.white(warning))
                 .join('\n')));
     }
     if (errors.length > 0) {
         if (options.ignoreErrors) {
-            logWarning(chalk.yellow(`Warning: CLI tool encountered ${errors.length} syntax errors while scanning for translatable content. These components will not be translated.\n` +
+            logger.warn(chalk.yellow(`Warning: CLI tool encountered ${errors.length} syntax errors while scanning for translatable content. These components will not be translated.\n` +
                 errors
                     .map((error) => chalk.yellow('• ') + chalk.white(error) + '\n')
                     .join('')));
@@ -37,7 +37,7 @@ export async function aggregateReactTranslations(options, settings, library) {
         }
     }
     if (updates.length == 0) {
-        logError(chalk.red(`No in-line content or dictionaries were found for ${chalk.green(library)}. Are you sure you're running this command in the right directory?`));
+        logger.error(chalk.red(`No in-line content or dictionaries were found for ${chalk.green(library)}. Are you sure you're running this command in the right directory?`));
         return updates;
     }
     return updates;

package/dist/translation/validate.js

@@ -1,7 +1,7 @@
-import { logErrorAndExit, logWarning } from '../console/logging.js';
+import { logErrorAndExit } from '../console/logging.js';
 import chalk from 'chalk';
 import findFilepath from '../fs/findFilepath.js';
-import { logError, logSuccess } from '../console/logging.js';
+import { logger } from '../console/logger.js';
 import { createUpdates } from './parse.js';
 import { createInlineUpdates } from '../react/parse/createInlineUpdates.js';
 export async function validateProject(settings, pkg, files) {
@@ -14,7 +14,7 @@ export async function validateProject(settings, pkg, files) {
                     .map((error) => chalk.red('• ') + chalk.white(error) + '\n')
                     .join('')));
         }
-        logSuccess(chalk.green(`Success! Found ${updates.length} translatable entries.`));
+        logger.success(chalk.green(`Success! Found ${updates.length} translatable entries.`));
         return;
     }
     if (!settings.dictionary) {
@@ -29,7 +29,7 @@ export async function validateProject(settings, pkg, files) {
     }
     const { updates, errors, warnings } = await createUpdates(settings, settings.src, settings.dictionary, pkg, true, settings.parsingOptions);
     if (warnings.length > 0) {
-        logWarning(chalk.yellow(`CLI tool encountered ${warnings.length} warnings while scanning for translatable content.`) +
+        logger.warn(chalk.yellow(`CLI tool encountered ${warnings.length} warnings while scanning for translatable content.`) +
             '\n' +
             warnings
                 .map((warning) => chalk.yellow('• ') + chalk.white(warning))
@@ -42,9 +42,9 @@ export async function validateProject(settings, pkg, files) {
                 .join('')));
     }
     if (updates.length === 0) {
-        logError(chalk.red(`No in-line content or dictionaries were found for ${chalk.green(pkg)}. Are you sure you're running this command in the right directory?`));
+        logger.error(chalk.red(`No in-line content or dictionaries were found for ${chalk.green(pkg)}. Are you sure you're running this command in the right directory?`));
     }
     else {
-        logSuccess(chalk.green(`Success! Found ${updates.length} translatable entries for ${chalk.green(pkg)}.`));
+        logger.success(chalk.green(`Success! Found ${updates.length} translatable entries for ${chalk.green(pkg)}.`));
     }
 }

package/dist/types/index.d.ts

@@ -187,6 +187,7 @@ export type SourceObjectOptions = {
     key?: string;
     localeProperty?: string;
     transform?: TransformOptions;
+    experimentalSort?: 'locales';
 };
 export type TransformOptions = {
     [transformPath: string]: TransformOption;

package/dist/utils/addExplicitAnchorIds.js

@@ -4,7 +4,7 @@ import remarkMdx from 'remark-mdx';
 import remarkFrontmatter from 'remark-frontmatter';
 import remarkStringify from 'remark-stringify';
 import { visit } from 'unist-util-visit';
-import { logWarning } from '../console/logging.js';
+import { logger } from '../console/logger.js';
 import escapeHtmlInTextNodes from 'gt-remark';
 /**
  * Generates a slug from heading text
@@ -90,7 +90,7 @@ export function addExplicitAnchorIds(translatedContent, sourceHeadingMap, settin
         const translatedFile = translatedPath
             ? `translated file: ${translatedPath}`
             : 'translated file';
-        logWarning(`Header count mismatch detected! ${sourceFile} has ${sourceHeadingMap.length} headers but ${translatedFile} has ${translatedHeadings.length} headers. ` +
+        logger.warn(`Header count mismatch detected! ${sourceFile} has ${sourceHeadingMap.length} headers but ${translatedFile} has ${translatedHeadings.length} headers. ` +
             `This likely means your source file was edited after translation was requested, causing a mismatch between ` +
             `the number of headers in your source file vs the translated file. Please re-translate this file to resolve the issue.`);
     }

package/dist/utils/credentials.js

@@ -1,4 +1,5 @@
-import { createSpinner, logErrorAndExit, logMessage, } from '../console/logging.js';
+import { logErrorAndExit } from '../console/logging.js';
+import { logger } from '../console/logger.js';
 import path from 'node:path';
 import fs from 'node:fs';
 import chalk from 'chalk';
@@ -10,8 +11,8 @@ export async function retrieveCredentials(settings, keyType) {
     await import('open').then((open) => open.default(urlToOpen, {
         wait: false,
     }));
-    logMessage(`${chalk.dim(`If the browser window didn't open automatically, please open the following link:`)}\n\n${chalk.cyan(urlToOpen)}`);
-    const spinner = createSpinner('dots');
+    logger.message(`${chalk.dim(`If the browser window didn't open automatically, please open the following link:`)}\n\n${chalk.cyan(urlToOpen)}`);
+    const spinner = logger.createSpinner('dots');
     spinner.start('Waiting for response from dashboard...');
     const credentials = await new Promise(async (resolve, reject) => {
         const interval = setInterval(async () => {

package/dist/utils/installPackage.js

@@ -1,6 +1,6 @@
 import chalk from 'chalk';
 import { spawn } from 'child_process';
-import { logError, logInfo } from '../console/logging.js';
+import { logger } from '../console/logger.js';
 export async function installPackage(packageName, packageManager, asDevDependency, cwd = process.cwd()) {
     return new Promise((resolve, reject) => {
         const command = packageManager.name;
@@ -19,8 +19,8 @@ export async function installPackage(packageName, packageManager, asDevDependenc
             });
         }
         childProcess.on('error', (error) => {
-            logError(chalk.red(`Installation error: ${error.message}`));
-            logInfo(`Please manually install ${packageName} with: ${packageManager.name} ${packageManager.installCommand} ${packageName}`);
+            logger.error(chalk.red(`Installation error: ${error.message}`));
+            logger.info(`Please manually install ${packageName} with: ${packageManager.name} ${packageManager.installCommand} ${packageName}`);
             reject(error);
         });
         childProcess.on('close', (code) => {
@@ -28,11 +28,11 @@ export async function installPackage(packageName, packageManager, asDevDependenc
                 resolve();
             }
             else {
-                logError(chalk.red(`Installation failed with exit code ${code}`));
+                logger.error(chalk.red(`Installation failed with exit code ${code}`));
                 if (errorOutput) {
-                    logError(chalk.red(`Error details: ${errorOutput}`));
+                    logger.error(chalk.red(`Error details: ${errorOutput}`));
                 }
-                logInfo(`Please manually install ${packageName} with: ${packageManager.name} ${packageManager.installCommand} ${packageName}`);
+                logger.info(`Please manually install ${packageName} with: ${packageManager.name} ${packageManager.installCommand} ${packageName}`);
                 reject(new Error(`Process exited with code ${code}`));
             }
         });
@@ -56,8 +56,8 @@ export async function installPackageGlobal(packageName, version) {
             });
         }
         childProcess.on('error', (error) => {
-            logError(chalk.red(`Installation error: ${error.message}`));
-            logInfo(`Please manually install ${packageName} with: npm install -g ${packageName}`);
+            logger.error(chalk.red(`Installation error: ${error.message}`));
+            logger.info(`Please manually install ${packageName} with: npm install -g ${packageName}`);
             reject(error);
         });
         childProcess.on('close', (code) => {
@@ -65,11 +65,11 @@ export async function installPackageGlobal(packageName, version) {
                 resolve();
             }
             else {
-                logError(chalk.red(`Installation failed with exit code ${code}`));
+                logger.error(chalk.red(`Installation failed with exit code ${code}`));
                 if (errorOutput) {
-                    logError(chalk.red(`Error details: ${errorOutput}`));
+                    logger.error(chalk.red(`Error details: ${errorOutput}`));
                 }
-                logInfo(`Please manually install ${packageName} with: npm install -g ${packageName}`);
+                logger.info(`Please manually install ${packageName} with: npm install -g ${packageName}`);
                 reject(new Error(`Process exited with code ${code}`));
             }
         });

package/dist/utils/packageJson.js

@@ -1,8 +1,9 @@
-import { logError } from '../console/logging.js';
+import { logger } from '../console/logger.js';
 import chalk from 'chalk';
 import path from 'node:path';
 import fs from 'node:fs';
 import { fromPackageRoot } from '../fs/getPackageResource.js';
+import { exitSync } from '../console/logging.js';
 // search for package.json such that we can run init in non-js projects
 export async function searchForPackageJson(cwd = process.cwd()) {
     // Get the current working directory (where the CLI is being run)
@@ -48,8 +49,8 @@ export async function updatePackageJson(packageJson, cwd = process.cwd()) {
         await fs.promises.writeFile(path.join(cwd, 'package.json'), JSON.stringify(packageJson, null, 2));
     }
     catch (error) {
-        logError(chalk.red('Error updating package.json: ' + String(error)));
-        process.exit(1);
+        logger.error(chalk.red('Error updating package.json: ' + String(error)));
+        exitSync(1);
     }
 }
 // check if a package is installed in the package.json file

package/dist/workflow/BranchStep.js

@@ -1,11 +1,12 @@
 import { WorkflowStep } from './Workflow.js';
-import { createSpinner, logError, logErrorAndExit, } from '../console/logging.js';
+import { logErrorAndExit } from '../console/logging.js';
+import { logger } from '../console/logger.js';
 import chalk from 'chalk';
 import { getCurrentBranch, getIncomingBranches, getCheckedOutBranches, } from '../git/branches.js';
 import { ApiError } from 'generaltranslation/errors';
 // Step 1: Resolve the current branch id & update API with branch information
 export class BranchStep extends WorkflowStep {
-    spinner = createSpinner('dots');
+    spinner = logger.createSpinner('dots');
     branchData;
     settings;
     gt;
@@ -70,7 +71,7 @@ export class BranchStep extends WorkflowStep {
         }
         else {
             if (!current) {
-                logErrorAndExit('Failed to determine the current branch. Please specify a custom branch or enable automatic branch detection.');
+                return logErrorAndExit('Failed to determine the current branch. Please specify a custom branch or enable automatic branch detection.');
             }
             const currentBranch = branchData.branches.find((b) => b.name === current.currentBranchName);
             if (!currentBranch) {
@@ -83,7 +84,7 @@ export class BranchStep extends WorkflowStep {
                 }
                 catch (error) {
                     if (error instanceof ApiError && error.code === 403) {
-                        logError('Failed to create branch. To enable branching, please upgrade your plan.');
+                        logger.error('Failed to create branch. To enable branching, please upgrade your plan.');
                         // retry with default branch
                         const createBranchResult = await this.gt.createBranch({
                             branchName: 'main', // name doesn't matter for default branch