gtx-cli 2.5.7 → 2.5.9

package/dist/console/logging.js

@@ -1,45 +1,23 @@
-import { log, spinner, intro, outro, text, select, confirm, isCancel, cancel, multiselect, progress, } from '@clack/prompts';
+import { text, select, confirm, isCancel, cancel, multiselect, } from '@clack/prompts';
 import chalk from 'chalk';
 import { getCLIVersion } from '../utils/packageJson.js';
-// Basic logging functions
-export function logInfo(message) {
-    log.info(message);
-}
-export function logWarning(message) {
-    log.warn(message);
-}
-export function logError(message) {
-    log.error(message);
-}
-export function logSuccess(message) {
-    log.success(message);
-}
-export function logStep(message) {
-    log.step(message);
-}
-export function logMessage(message) {
-    log.message(message, { symbol: chalk.cyan('~') });
-}
+import { logger } from './logger.js';
+import { TEMPLATE_FILE_NAME } from '../utils/constants.js';
 export function logErrorAndExit(message) {
-    log.error(message);
-    exit(1);
+    logger.error(message);
+    return exitSync(1);
 }
-export function exit(code) {
+export function exitSync(code) {
+    // Flush logs before exit
+    logger.flush();
     process.exit(code);
 }
-// Clack prompts
-export function startCommand(message) {
-    intro(chalk.cyan(message));
-}
-export function endCommand(message) {
-    outro(chalk.cyan(message));
-}
 // GT specific logging
 export function displayHeader(introString) {
     displayAsciiTitle();
     displayInitializingText();
     if (introString) {
-        startCommand(introString);
+        logger.startCommand(introString);
     }
 }
 function displayAsciiTitle() {
@@ -59,30 +37,22 @@ ${chalk.dim('https://generaltranslation.com/docs')}
 ${chalk.dim(`CLI Version: ${version}\n`)}`);
 }
 export function displayProjectId(projectId) {
-    logMessage(chalk.dim(`Project ID: ${chalk.bold(projectId)}`));
+    logger.message(chalk.dim(`Project ID: ${chalk.bold(projectId)}`), chalk.cyan('~'));
 }
 export function displayResolvedPaths(resolvedPaths) {
     const paths = resolvedPaths.map(([key, resolvedPath]) => {
         return chalk.dim(`'${chalk.white(key)}' → '${chalk.green(resolvedPath)}'`);
     });
-    log.step(`Resolved path aliases:\n${paths.join('\n')}`);
+    logger.step(`Resolved path aliases:\n${paths.join('\n')}`);
 }
 export function displayCreatedConfigFile(configFilepath) {
-    log.step(`Created config file ${chalk.cyan(configFilepath)}`);
+    logger.step(`Created config file ${chalk.cyan(configFilepath)}`);
 }
 export function displayUpdatedConfigFile(configFilepath) {
-    log.success(`Updated config file ${chalk.cyan(configFilepath)}`);
+    logger.success(`Updated config file ${chalk.cyan(configFilepath)}`);
 }
 export function displayUpdatedVersionsFile(versionFilepath) {
-    log.success(`Updated versions file ${chalk.cyan(versionFilepath)}`);
-}
-// Spinner functionality
-export function createSpinner(indicator = 'timer') {
-    return spinner({ indicator });
-}
-// Spinner functionality
-export function createProgressBar(total) {
-    return progress({ max: total });
+    logger.success(`Updated versions file ${chalk.cyan(versionFilepath)}`);
 }
 // Input prompts
 export async function promptText({ message, defaultValue, validate, }) {
@@ -98,7 +68,7 @@ export async function promptText({ message, defaultValue, validate, }) {
     });
     if (isCancel(result)) {
         cancel('Operation cancelled');
-        process.exit(0);
+        return exitSync(0);
     }
     return result;
 }
@@ -116,7 +86,7 @@ export async function promptSelect({ message, options, defaultValue, }) {
     });
     if (isCancel(result)) {
         cancel('Operation cancelled');
-        process.exit(0);
+        return exitSync(0);
     }
     return result;
 }
@@ -134,7 +104,7 @@ export async function promptMultiSelect({ message, options, required = true, })
     });
     if (isCancel(result)) {
         cancel('Operation cancelled');
-        process.exit(0);
+        return exitSync(0);
     }
     return result;
 }
@@ -145,25 +115,25 @@ export async function promptConfirm({ message, defaultValue = true, cancelMessag
     });
     if (isCancel(result)) {
         cancel(cancelMessage);
-        process.exit(0);
+        return exitSync(0);
     }
     return result;
 }
 // Warning display functions
 export function warnApiKeyInConfig(optionsFilepath) {
-    log.warn(`Found ${chalk.cyan('apiKey')} in "${chalk.green(optionsFilepath)}". ` +
+    logger.warn(`Found ${chalk.cyan('apiKey')} in "${chalk.green(optionsFilepath)}". ` +
         chalk.white('Your API key is exposed! Please remove it from the file and include it as an environment variable.'));
 }
 export function warnVariableProp(file, attrName, value) {
-    log.warn(`Found ${chalk.green('<T>')} component in ${chalk.cyan(file)} with variable ${attrName}: "${chalk.white(value)}". ` +
+    logger.warn(`Found ${chalk.green('<T>')} component in ${chalk.cyan(file)} with variable ${attrName}: "${chalk.white(value)}". ` +
         `Change "${attrName}" to ensure this content is translated.`);
 }
 export function warnNoId(file) {
-    log.warn(`Found ${chalk.green('<T>')} component in ${chalk.cyan(file)} with no id. ` +
+    logger.warn(`Found ${chalk.green('<T>')} component in ${chalk.cyan(file)} with no id. ` +
         chalk.white('Add an id to ensure the content is translated.'));
 }
 export function warnHasUnwrappedExpression(file, id, unwrappedExpressions) {
-    log.warn(`${chalk.green('<T>')} with id "${id}" in ${chalk.cyan(file)} has children: ${unwrappedExpressions.join(', ')} that could change at runtime. ` +
+    logger.warn(`${chalk.green('<T>')} with id "${id}" in ${chalk.cyan(file)} has children: ${unwrappedExpressions.join(', ')} that could change at runtime. ` +
         chalk.white('Use a variable component like ') +
         chalk.green('<Var>') +
         chalk.white(' (') +
@@ -171,14 +141,29 @@ export function warnHasUnwrappedExpression(file, id, unwrappedExpressions) {
         chalk.white(') to translate this properly.'));
 }
 export function warnNonStaticExpression(file, attrName, value) {
-    log.warn(`Found non-static expression in ${chalk.cyan(file)} for attribute ${attrName}: "${chalk.white(value)}". ` +
+    logger.warn(`Found non-static expression in ${chalk.cyan(file)} for attribute ${attrName}: "${chalk.white(value)}". ` +
         `Change "${attrName}" to ensure this content is translated.`);
 }
 export function warnTemplateLiteral(file, value) {
-    log.warn(`Found template literal with quasis (${value}) in ${chalk.cyan(file)}. ` +
+    logger.warn(`Found template literal with quasis (${value}) in ${chalk.cyan(file)}. ` +
         chalk.white('Change the template literal to a string to ensure this content is translated.'));
 }
 export function warnTernary(file) {
-    log.warn(`Found ternary expression in ${chalk.cyan(file)}. ` +
+    logger.warn(`Found ternary expression in ${chalk.cyan(file)}. ` +
         chalk.white('A Branch component may be more appropriate here.'));
 }
+/**
+ * Helper: Log all collected files
+ */
+export function logCollectedFiles(files, reactComponents) {
+    logger.message(chalk.cyan('Files found in project:') +
+        '\n' +
+        files
+            .map((file) => {
+            if (file.fileName === TEMPLATE_FILE_NAME) {
+                return `- <React Elements>${reactComponents ? ` (${reactComponents})` : ''}`;
+            }
+            return `- ${file.fileName}`;
+        })
+            .join('\n'));
+}

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

@@ -0,0 +1,6 @@
+import { Settings, SupportedLibraries, TranslateFlags } from '../../types/index.js';
+import type { FileToUpload } from 'generaltranslation/types';
+export declare function collectFiles(options: TranslateFlags, settings: Settings, library: SupportedLibraries): Promise<{
+    files: FileToUpload[];
+    reactComponents: number;
+}>;

package/dist/formats/files/collectFiles.js

@@ -0,0 +1,49 @@
+import { logErrorAndExit } from '../../console/logging.js';
+import { invalidConfigurationError } from '../../console/index.js';
+import { aggregateFiles } from '../../formats/files/translate.js';
+import { aggregateReactTranslations } from '../../translation/stage.js';
+import { hashStringSync } from '../../utils/hash.js';
+import { TEMPLATE_FILE_NAME, TEMPLATE_FILE_ID } from '../../utils/constants.js';
+export async function collectFiles(options, settings, library) {
+    // Aggregate files
+    const allFiles = await aggregateFiles(settings);
+    // Parse for React components
+    let reactComponents = 0;
+    if (library === 'gt-react' || library === 'gt-next') {
+        const updates = await aggregateReactTranslations(options, settings, library);
+        if (updates.length > 0) {
+            if (!options.dryRun &&
+                !settings.publish &&
+                !settings.files?.placeholderPaths.gt) {
+                logErrorAndExit(invalidConfigurationError);
+            }
+            // Convert updates to a file object
+            const fileData = {};
+            const fileMetadata = {};
+            // Convert updates to the proper data format
+            for (const update of updates) {
+                const { source, metadata, dataFormat } = update;
+                metadata.dataFormat = dataFormat; // add the data format to the metadata
+                const { hash, id } = metadata;
+                if (id) {
+                    fileData[id] = source;
+                    fileMetadata[id] = metadata;
+                }
+                else {
+                    fileData[hash] = source;
+                    fileMetadata[hash] = metadata;
+                }
+            }
+            reactComponents = updates.length;
+            allFiles.push({
+                fileName: TEMPLATE_FILE_NAME,
+                content: JSON.stringify(fileData),
+                fileFormat: 'GTJSON',
+                formatMetadata: fileMetadata,
+                fileId: TEMPLATE_FILE_ID,
+                versionId: hashStringSync(JSON.stringify(fileData)),
+            });
+        }
+    }
+    return { files: allFiles, reactComponents };
+}

package/dist/formats/files/fileMapping.js

@@ -4,7 +4,7 @@ import path from 'node:path';
 import { getRelative } from '../../fs/findFilepath.js';
 import { getLocaleProperties } from 'generaltranslation';
 import { replaceLocalePlaceholders } from '../utils.js';
-import { TEMPLATE_FILE_NAME } from '../../cli/commands/stage.js';
+import { TEMPLATE_FILE_NAME } from '../../utils/constants.js';
 /**
  * Creates a mapping between source files and their translated counterparts for each locale
  * @param filePaths - Resolved file paths for different file types

package/dist/formats/files/save.js

@@ -1,6 +1,6 @@
 import fs from 'fs/promises';
 import path from 'node:path';
-import { logSuccess } from '../../console/logging.js';
+import { logger } from '../../console/logger.js';
 /**
  * Saves translated MDX/MD file content to the appropriate location
  */
@@ -12,6 +12,6 @@ export async function saveTranslatedFile(translatedContent, outputDir, fileName,
         // Save the translated file with the appropriate extension
         const outputPath = path.join(localeDir, fileName);
         await fs.writeFile(outputPath, translatedContent);
-        logSuccess(`Saved translated ${dataFormat} file to: ${outputPath}`);
+        logger.success(`Saved translated ${dataFormat} file to: ${outputPath}`);
     }
 }

package/dist/formats/files/translate.js

@@ -1,4 +1,4 @@
-import { logError, logWarning } from '../../console/logging.js';
+import { logger } from '../../console/logger.js';
 import { getRelative, readFile } from '../../fs/findFilepath.js';
 import { SUPPORTED_FILE_EXTENSIONS } from './supportedFiles.js';
 import sanitizeFileContent from '../../utils/sanitizeFileContent.js';
@@ -46,7 +46,7 @@ export async function aggregateFiles(settings) {
                 JSON.parse(content);
             }
             catch (e) {
-                logWarning(`Skipping ${relativePath}: JSON file is not parsable`);
+                logger.warn(`Skipping ${relativePath}: JSON file is not parsable`);
                 return null;
             }
             const parsedJson = parseJson(content, filePath, settings.options || {}, settings.defaultLocale);
@@ -63,7 +63,7 @@ export async function aggregateFiles(settings) {
             if (!file)
                 return false;
             if (typeof file.content !== 'string' || !file.content.trim()) {
-                logWarning(`Skipping ${file.fileName}: JSON file is empty`);
+                logger.warn(`Skipping ${file.fileName}: JSON file is empty`);
                 return false;
             }
             return true;
@@ -81,7 +81,7 @@ export async function aggregateFiles(settings) {
                 YAML.parse(content);
             }
             catch (e) {
-                logWarning(`Skipping ${relativePath}: YAML file is not parsable`);
+                logger.warn(`Skipping ${relativePath}: YAML file is not parsable`);
                 return null;
             }
             const { content: parsedYaml, fileFormat } = parseYaml(content, filePath, settings.options || {});
@@ -95,7 +95,7 @@ export async function aggregateFiles(settings) {
         })
             .filter((file) => {
             if (!file || typeof file.content !== 'string' || !file.content.trim()) {
-                logWarning(`Skipping ${file?.fileName ?? 'unknown'}: YAML file is empty`);
+                logger.warn(`Skipping ${file?.fileName ?? 'unknown'}: YAML file is empty`);
                 return false;
             }
             return true;
@@ -113,7 +113,7 @@ export async function aggregateFiles(settings) {
                 if (fileType === 'mdx') {
                     const validation = isValidMdx(content, filePath);
                     if (!validation.isValid) {
-                        logWarning(`Skipping ${relativePath}: MDX file is not AST parsable${validation.error ? `: ${validation.error}` : ''}`);
+                        logger.warn(`Skipping ${relativePath}: MDX file is not AST parsable${validation.error ? `: ${validation.error}` : ''}`);
                         return null;
                     }
                 }
@@ -130,7 +130,7 @@ export async function aggregateFiles(settings) {
                 if (!file ||
                     typeof file.content !== 'string' ||
                     !file.content.trim()) {
-                    logWarning(`Skipping ${file?.fileName ?? 'unknown'}: File is empty after sanitization`);
+                    logger.warn(`Skipping ${file?.fileName ?? 'unknown'}: File is empty after sanitization`);
                     return false;
                 }
                 return true;
@@ -139,7 +139,7 @@ export async function aggregateFiles(settings) {
         }
     }
     if (allFiles.length === 0 && !settings.publish) {
-        logError('No files to translate were found. Please check your configuration and try again.');
+        logger.error('No files to translate were found. Please check your configuration and try again.');
     }
     return allFiles;
 }

package/dist/formats/files/upload.js

@@ -1,5 +1,6 @@
 import { noSupportedFormatError, noDefaultLocaleError, noApiKeyError, noProjectIdError, devApiKeyError, } from '../../console/index.js';
-import { logErrorAndExit, logError } from '../../console/logging.js';
+import { logErrorAndExit } from '../../console/logging.js';
+import { logger } from '../../console/logger.js';
 import { getRelative, readFile } from '../../fs/findFilepath.js';
 import { SUPPORTED_FILE_EXTENSIONS } from './supportedFiles.js';
 import sanitizeFileContent from '../../utils/sanitizeFileContent.js';
@@ -80,20 +81,20 @@ export async function upload(filePaths, placeholderPaths, transformPaths, dataFo
         }
     }
     if (allFiles.length === 0) {
-        logError('No files to upload were found. Please check your configuration and try again.');
+        logger.error('No files to upload were found. Please check your configuration and try again.');
         return;
     }
     if (!options.defaultLocale) {
-        logErrorAndExit(noDefaultLocaleError);
+        return logErrorAndExit(noDefaultLocaleError);
     }
     if (!options.apiKey) {
-        logErrorAndExit(noApiKeyError);
+        return logErrorAndExit(noApiKeyError);
     }
     if (options.apiKey.startsWith('gtx-dev-')) {
-        logErrorAndExit(devApiKeyError);
+        return logErrorAndExit(devApiKeyError);
     }
     if (!options.projectId) {
-        logErrorAndExit(noProjectIdError);
+        return logErrorAndExit(noProjectIdError);
     }
     const locales = options.locales || [];
     // Create file mapping for all file types

package/dist/formats/gt/save.js

@@ -1,6 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { logError } from '../../console/logging.js';
+import { logger } from '../../console/logger.js';
+import { exitSync } from '../../console/logging.js';
 import { noFilesError } from '../../console/index.js';
 import { resolveLocaleFiles } from '../../fs/config/parseFilesConfig.js';
 /**
@@ -14,8 +15,8 @@ export async function saveTranslations(translations, placeholderPaths) {
         const locale = translation.locale;
         const translationFiles = resolveLocaleFiles(placeholderPaths, locale);
         if (!translationFiles.gt) {
-            logError(noFilesError);
-            process.exit(1);
+            logger.error(noFilesError);
+            exitSync(1);
         }
         const filepath = translationFiles.gt;
         const translationData = translation.translation;

package/dist/formats/json/flattenJson.js

@@ -1,5 +1,5 @@
 import { JSONPath } from 'jsonpath-plus';
-import { logError } from '../../console/logging.js';
+import { logger } from '../../console/logger.js';
 /**
  * Flattens a JSON object according to a list of JSON paths.
  * @param json - The JSON object to flatten
@@ -25,7 +25,7 @@ export function flattenJson(json, jsonPaths) {
             });
         }
         catch (error) {
-            logError(`Error with JSONPath pattern: ${jsonPath}`);
+            logger.error(`Error with JSONPath pattern: ${jsonPath}`);
         }
     }
     return extractedJson;
@@ -57,7 +57,7 @@ export function flattenJsonWithStringFilter(json, jsonPaths) {
             });
         }
         catch {
-            logError(`Error with JSONPath pattern: ${jsonPath}`);
+            logger.error(`Error with JSONPath pattern: ${jsonPath}`);
         }
     }
     return extractedJson;

package/dist/formats/json/mergeJson.js

@@ -1,5 +1,6 @@
 import JSONPointer from 'jsonpointer';
-import { exit, logError, logWarning } from '../../console/logging.js';
+import { exitSync } from '../../console/logging.js';
+import { logger } from '../../console/logger.js';
 import { findMatchingItemArray, findMatchingItemObject, generateSourceObjectPointers, getIdentifyingLocaleProperty, getSourceObjectOptionsArray, validateJsonSchema, } from './utils.js';
 import { JSONPath } from 'jsonpath-plus';
 import { getLocaleProperties } from 'generaltranslation';
@@ -14,8 +15,8 @@ export function mergeJson(originalContent, inputPath, options, targets, defaultL
         originalJson = JSON.parse(originalContent);
     }
     catch {
-        logError(`Invalid JSON file: ${inputPath}`);
-        exit(1);
+        logger.error(`Invalid JSON file: ${inputPath}`);
+        return exitSync(1);
     }
     // Handle include
     if (jsonSchema.include) {
@@ -40,8 +41,8 @@ export function mergeJson(originalContent, inputPath, options, targets, defaultL
         return output;
     }
     if (!jsonSchema.composite) {
-        logError('No composite property found in JSON schema');
-        exit(1);
+        logger.error('No composite property found in JSON schema');
+        return exitSync(1);
     }
     // Handle composite
     // Create a deep copy of the original JSON to avoid mutations
@@ -54,13 +55,13 @@ export function mergeJson(originalContent, inputPath, options, targets, defaultL
         if (sourceObjectOptions.type === 'array') {
             // Validate type
             if (!Array.isArray(sourceObjectValue)) {
-                logError(`Source object value is not an array at path: ${sourceObjectPointer}`);
-                exit(1);
+                logger.error(`Source object value is not an array at path: ${sourceObjectPointer}`);
+                return exitSync(1);
             }
             // Get source item for default locale
             const matchingDefaultLocaleItems = findMatchingItemArray(defaultLocale, sourceObjectOptions, sourceObjectPointer, sourceObjectValue);
             if (!Object.keys(matchingDefaultLocaleItems).length) {
-                logWarning(`Matching sourceItems not found at path: ${sourceObjectPointer}. Please check your JSON file includes the key field. Skipping this target`);
+                logger.warn(`Matching sourceItems not found at path: ${sourceObjectPointer}. Please check your JSON file includes the key field. Skipping this target`);
                 continue;
             }
             const matchingDefaultLocaleItemKeys = new Set(Object.keys(matchingDefaultLocaleItems));
@@ -96,14 +97,14 @@ export function mergeJson(originalContent, inputPath, options, targets, defaultL
                 };
                 // 4. Validate that the mergedItems is not empty
                 if (Object.keys(mergedItems).length === 0) {
-                    logWarning(`Translated JSON for locale: ${target.targetLocale} does not have a valid sourceObjectPointer: ${sourceObjectPointer}. Skipping this target`);
+                    logger.warn(`Translated JSON for locale: ${target.targetLocale} does not have a valid sourceObjectPointer: ${sourceObjectPointer}. Skipping this target`);
                     continue;
                 }
                 for (const [sourceItemPointer, targetItem] of Object.entries(mergedItems)) {
                     // 5. Validate that all the array indecies are still present in the source json
                     if (!matchingDefaultLocaleItemKeys.has(sourceItemPointer)) {
-                        logError(`Array index ${sourceItemPointer} is not present in the source json. It is possible that the source json has been modified since the translation was generated.`);
-                        exit(1);
+                        logger.error(`Array index ${sourceItemPointer} is not present in the source json. It is possible that the source json has been modified since the translation was generated.`);
+                        return exitSync(1);
                     }
                     // 6. Override the source item with the translated values
                     const defaultLocaleSourceItem = matchingDefaultLocaleItems[sourceItemPointer].sourceItem;
@@ -129,8 +130,8 @@ export function mergeJson(originalContent, inputPath, options, targets, defaultL
             }
             // 8. Check that items to add is >= items to remove (if this happens, something is very wrong)
             if (itemsToAdd.length < indiciesToRemove.size) {
-                logError(`Items to add is less than items to remove at path: ${sourceObjectPointer}. Please check your JSON schema key field.`);
-                exit(1);
+                logger.error(`Items to add is less than items to remove at path: ${sourceObjectPointer}. Please check your JSON schema key field.`);
+                return exitSync(1);
             }
             // 9. Remove all items for the target locale (they can be identified by the key)
             const filteredSourceObjectValue = sourceObjectValue.filter((_, index) => !indiciesToRemove.has(index));
@@ -141,15 +142,15 @@ export function mergeJson(originalContent, inputPath, options, targets, defaultL
         else {
             // Validate type
             if (typeof sourceObjectValue !== 'object' || sourceObjectValue === null) {
-                logError(`Source object value is not an object at path: ${sourceObjectPointer}`);
-                exit(1);
+                logger.error(`Source object value is not an object at path: ${sourceObjectPointer}`);
+                return exitSync(1);
             }
             // Validate localeProperty
             const matchingDefaultLocaleItem = findMatchingItemObject(defaultLocale, sourceObjectPointer, sourceObjectOptions, sourceObjectValue);
             // Validate source item exists
             if (!matchingDefaultLocaleItem.sourceItem) {
-                logError(`Source item not found at path: ${sourceObjectPointer}. You must specify a source item where its key matches the default locale`);
-                exit(1);
+                logger.error(`Source item not found at path: ${sourceObjectPointer}. You must specify a source item where its key matches the default locale`);
+                return exitSync(1);
             }
             const { sourceItem: defaultLocaleSourceItem } = matchingDefaultLocaleItem;
             // For each target:
@@ -180,7 +181,7 @@ export function mergeJson(originalContent, inputPath, options, targets, defaultL
                 };
                 // 4. Validate that the mergedItems is not empty
                 if (Object.keys(mergedItems).length === 0) {
-                    logWarning(`Translated JSON for locale: ${target.targetLocale} does not have a valid sourceObjectPointer: ${sourceObjectPointer}. Skipping this target`);
+                    logger.warn(`Translated JSON for locale: ${target.targetLocale} does not have a valid sourceObjectPointer: ${sourceObjectPointer}. Skipping this target`);
                     continue;
                 }
                 // 5. Override the source item with the translated values

package/dist/formats/json/parseJson.js

@@ -1,6 +1,7 @@
 import { flattenJsonWithStringFilter } from './flattenJson.js';
 import { JSONPath } from 'jsonpath-plus';
-import { exit, logError } from '../../console/logging.js';
+import { exitSync } from '../../console/logging.js';
+import { logger } from '../../console/logger.js';
 import { findMatchingItemArray, findMatchingItemObject, generateSourceObjectPointers, validateJsonSchema, } from './utils.js';
 // Parse a JSON file according to a JSON schema
 export function parseJson(content, filePath, options, defaultLocale) {
@@ -13,8 +14,8 @@ export function parseJson(content, filePath, options, defaultLocale) {
         json = JSON.parse(content);
     }
     catch {
-        logError(`Invalid JSON file: ${filePath}`);
-        exit(1);
+        logger.error(`Invalid JSON file: ${filePath}`);
+        return exitSync(1);
     }
     // Handle include
     if (jsonSchema.include) {
@@ -22,8 +23,8 @@ export function parseJson(content, filePath, options, defaultLocale) {
         return JSON.stringify(flattenedJson);
     }
     if (!jsonSchema.composite) {
-        logError('No composite property found in JSON schema');
-        exit(1);
+        logger.error('No composite property found in JSON schema');
+        return exitSync(1);
     }
     // Construct lvl 1
     // Create mapping of sourceObjectPointer to SourceObjectOptions
@@ -40,14 +41,14 @@ export function parseJson(content, filePath, options, defaultLocale) {
         if (sourceObjectOptions.type === 'array') {
             // Validate type
             if (!Array.isArray(sourceObjectValue)) {
-                logError(`Source object value is not an array at path: ${sourceObjectPointer}`);
-                exit(1);
+                logger.error(`Source object value is not an array at path: ${sourceObjectPointer}`);
+                return exitSync(1);
             }
             // Find matching source items
             const matchingItems = findMatchingItemArray(defaultLocale, sourceObjectOptions, sourceObjectPointer, sourceObjectValue);
             if (!Object.keys(matchingItems).length) {
-                logError(`Matching sourceItem not found at path: ${sourceObjectPointer} for locale: ${defaultLocale}. Please check your JSON schema`);
-                exit(1);
+                logger.error(`Matching sourceItem not found at path: ${sourceObjectPointer} for locale: ${defaultLocale}. Please check your JSON schema`);
+                return exitSync(1);
             }
             // Construct lvl 3
             const sourceItemsToTranslate = {};
@@ -87,15 +88,15 @@ export function parseJson(content, filePath, options, defaultLocale) {
             // Object: use the key in this object with the matching locale property
             // Validate type
             if (typeof sourceObjectValue !== 'object' || sourceObjectValue === null) {
-                logError(`Source object value is not an object at path: ${sourceObjectPointer}`);
-                exit(1);
+                logger.error(`Source object value is not an object at path: ${sourceObjectPointer}`);
+                return exitSync(1);
             }
             // Validate localeProperty
             const matchingItem = findMatchingItemObject(defaultLocale, sourceObjectPointer, sourceObjectOptions, sourceObjectValue);
             // Validate source item exists
             if (!matchingItem.sourceItem) {
-                logError(`Source item not found at path: ${sourceObjectPointer}. You must specify a source item where its key matches the default locale`);
-                exit(1);
+                logger.error(`Source item not found at path: ${sourceObjectPointer}. You must specify a source item where its key matches the default locale`);
+                return exitSync(1);
             }
             const { sourceItem } = matchingItem;
             // Get the fields to translate from the includes