gtx-cli 2.5.6 → 2.5.8

package/dist/formats/json/mergeJson.js

@@ -1,10 +1,11 @@
 import JSONPointer from 'jsonpointer';
-import { exit, logError, logWarning } from '../../console/logging.js';
-import { findMatchingItemArray, findMatchingItemObject, generateSourceObjectPointers, getSourceObjectOptionsArray, validateJsonSchema, } from './utils.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';
 import { replaceLocalePlaceholders } from '../utils.js';
-export function mergeJson(originalContent, inputPath, options, targets, defaultLocale) {
+export function mergeJson(originalContent, inputPath, options, targets, defaultLocale, localeOrder = []) {
     const jsonSchema = validateJsonSchema(options, inputPath);
     if (!jsonSchema) {
         return targets.map((target) => target.translatedContent);
@@ -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,27 +130,27 @@ 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));
             // 10. Add all items to the original JSON
             filteredSourceObjectValue.push(...itemsToAdd);
-            JSONPointer.set(mergedJson, sourceObjectPointer, filteredSourceObjectValue);
+            JSONPointer.set(mergedJson, sourceObjectPointer, sortByLocaleOrder(filteredSourceObjectValue, sourceObjectOptions, localeOrder, sourceObjectPointer, defaultLocale));
         }
         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
@@ -205,6 +206,53 @@ export function mergeJson(originalContent, inputPath, options, targets, defaultL
     }
     return [JSON.stringify(mergedJson, null, 2)];
 }
+function sortByLocaleOrder(items, sourceObjectOptions, localeOrder, sourceObjectPointer, defaultLocale) {
+    if (sourceObjectOptions.experimentalSort !== 'locales' ||
+        !localeOrder.length ||
+        !sourceObjectOptions.key) {
+        return items;
+    }
+    const orderedLocaleList = [
+        defaultLocale,
+        ...localeOrder.filter((locale) => locale !== defaultLocale),
+    ];
+    const localeOrderValues = orderedLocaleList.map((locale) => getIdentifyingLocaleProperty(locale, sourceObjectPointer, sourceObjectOptions));
+    const itemsWithLocale = items.map((item) => {
+        let localeValue;
+        try {
+            const values = JSONPath({
+                json: item,
+                path: sourceObjectOptions.key,
+                resultType: 'value',
+                flatten: true,
+                wrap: true,
+            });
+            const value = values?.[0];
+            if (typeof value === 'string') {
+                localeValue = value;
+            }
+        }
+        catch {
+            /* empty */
+        }
+        return { item, localeValue };
+    });
+    const orderedItems = [];
+    const remainingItems = [...itemsWithLocale];
+    for (const localeValue of localeOrderValues) {
+        for (let i = 0; i < remainingItems.length;) {
+            const entry = remainingItems[i];
+            if (entry.localeValue === localeValue) {
+                orderedItems.push(entry.item);
+                remainingItems.splice(i, 1);
+                continue;
+            }
+            i += 1;
+        }
+    }
+    remainingItems.forEach((entry) => orderedItems.push(entry.item));
+    return orderedItems;
+}
 /**
  * Apply transformations to the sourceItem in-place
  * @param sourceItem - The source item to apply transformations to

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

package/dist/formats/json/utils.js

@@ -1,5 +1,6 @@
 import { getLocaleProperties } from 'generaltranslation';
-import { exit, logError } from '../../console/logging.js';
+import { exitSync } from '../../console/logging.js';
+import { logger } from '../../console/logger.js';
 import { JSONPath } from 'jsonpath-plus';
 import { flattenJson } from './flattenJson.js';
 import path from 'node:path';
@@ -22,8 +23,8 @@ export function findMatchingItemArray(locale, sourceObjectOptions, sourceObjectP
             wrap: true,
         });
         if (!keyCandidates) {
-            logError(`Source item at path: ${sourceObjectPointer} does not have a key value at path: ${localeKeyJsonPath}`);
-            exit(1);
+            logger.error(`Source item at path: ${sourceObjectPointer} does not have a key value at path: ${localeKeyJsonPath}`);
+            return exitSync(1);
         }
         else if (keyCandidates.length === 0) {
             // If no key candidates, skip the item
@@ -31,8 +32,8 @@ export function findMatchingItemArray(locale, sourceObjectOptions, sourceObjectP
         }
         else if (keyCandidates.length > 1) {
             // If multiple key candidates, exit with an error
-            logError(`Source item at path: ${sourceObjectPointer} has multiple matching keys with path: ${localeKeyJsonPath}`);
-            exit(1);
+            logger.error(`Source item at path: ${sourceObjectPointer} has multiple matching keys with path: ${localeKeyJsonPath}`);
+            return exitSync(1);
         }
         else if (identifyingLocaleProperty !== keyCandidates[0].value) {
             // Validate the key is the identifying locale property
@@ -74,8 +75,8 @@ export function getIdentifyingLocaleProperty(locale, sourceObjectPointer, source
     const localeProperty = sourceObjectOptions.localeProperty || 'code';
     const identifyingLocaleProperty = getLocaleProperties(locale)[localeProperty];
     if (!identifyingLocaleProperty) {
-        logError(`Source object options localeProperty is not a valid locale property at path: ${sourceObjectPointer}`);
-        exit(1);
+        logger.error(`Source object options localeProperty is not a valid locale property at path: ${sourceObjectPointer}`);
+        return exitSync(1);
     }
     return identifyingLocaleProperty;
 }
@@ -90,8 +91,8 @@ export function getSourceObjectOptionsArray(locale, sourceObjectPointer, sourceO
     const identifyingLocaleProperty = getIdentifyingLocaleProperty(locale, sourceObjectPointer, sourceObjectOptions);
     const localeKeyJsonPath = sourceObjectOptions.key;
     if (!localeKeyJsonPath) {
-        logError(`Source object options key is required for array at path: ${sourceObjectPointer}`);
-        exit(1);
+        logger.error(`Source object options key is required for array at path: ${sourceObjectPointer}`);
+        return exitSync(1);
     }
     return { identifyingLocaleProperty, localeKeyJsonPath };
 }
@@ -99,8 +100,8 @@ export function getSourceObjectOptionsObject(defaultLocale, sourceObjectPointer,
     const identifyingLocaleProperty = getIdentifyingLocaleProperty(defaultLocale, sourceObjectPointer, sourceObjectOptions);
     const jsonPathKey = sourceObjectOptions.key;
     if (jsonPathKey) {
-        logError(`Source object options key is not allowed for object at path: ${sourceObjectPointer}`);
-        exit(1);
+        logger.error(`Source object options key is not allowed for object at path: ${sourceObjectPointer}`);
+        return exitSync(1);
     }
     return { identifyingLocaleProperty };
 }
@@ -136,13 +137,13 @@ export function validateJsonSchema(options, filePath) {
     // Validate includes or composite
     const jsonSchema = options.jsonSchema[matchingGlob];
     if (jsonSchema.include && jsonSchema.composite) {
-        logError('include and composite cannot be used together in the same JSON schema');
-        exit(1);
+        logger.error('include and composite cannot be used together in the same JSON schema');
+        return exitSync(1);
         return null;
     }
     if (!jsonSchema.include && !jsonSchema.composite) {
-        logError('No include or composite property found in JSON schema');
-        exit(1);
+        logger.error('No include or composite property found in JSON schema');
+        return exitSync(1);
         return null;
     }
     return jsonSchema;

package/dist/formats/yaml/mergeYaml.js

@@ -1,5 +1,6 @@
 import JSONPointer from 'jsonpointer';
-import { exit, logError } from '../../console/logging.js';
+import { exitSync } from '../../console/logging.js';
+import { logger } from '../../console/logger.js';
 import { validateYamlSchema } from './utils.js';
 import YAML from 'yaml';
 import { applyTransformations } from '../json/mergeJson.js';
@@ -13,13 +14,13 @@ export default function mergeYaml(originalContent, inputPath, options, targets,
         originalYaml = YAML.parse(originalContent);
     }
     catch {
-        logError(`Invalid YAML file: ${inputPath}`);
-        exit(1);
+        logger.error(`Invalid YAML file: ${inputPath}`);
+        return exitSync(1);
     }
     // Unreachable (validated in validateYamlSchema, included for type check)
     if (!yamlSchema.include) {
-        logError('No include property found in YAML schema');
-        exit(1);
+        logger.error('No include property found in YAML schema');
+        return exitSync(1);
     }
     // Handle include
     const output = [];

package/dist/formats/yaml/parseYaml.js

@@ -1,4 +1,5 @@
-import { exit, logError } from '../../console/logging.js';
+import { exitSync } from '../../console/logging.js';
+import { logger } from '../../console/logger.js';
 import YAML from 'yaml';
 import { validateYamlSchema } from './utils.js';
 import { flattenJsonWithStringFilter } from '../json/flattenJson.js';
@@ -12,8 +13,8 @@ export default function parseYaml(content, filePath, options) {
         yaml = YAML.parse(content);
     }
     catch {
-        logError(`Invalid YAML file: ${filePath}`);
-        exit(1);
+        logger.error(`Invalid YAML file: ${filePath}`);
+        return exitSync(1);
     }
     if (yamlSchema.include) {
         const flattenedYaml = flattenJsonWithStringFilter(yaml, yamlSchema.include);

package/dist/formats/yaml/utils.js

@@ -1,4 +1,5 @@
-import { logError, exit } from '../../console/logging.js';
+import { exitSync } from '../../console/logging.js';
+import { logger } from '../../console/logger.js';
 import micromatch from 'micromatch';
 const { isMatch } = micromatch;
 import path from 'path';
@@ -15,8 +16,8 @@ export function validateYamlSchema(options, filePath) {
     // Validate includes
     const yamlSchema = options.yamlSchema[matchingGlob];
     if (!yamlSchema.include) {
-        logError('No include property found in YAML schema');
-        exit(1);
+        logger.error('No include property found in YAML schema');
+        return exitSync(1);
     }
     return yamlSchema;
 }

package/dist/fs/clearLocaleDirs.js

@@ -1,6 +1,6 @@
 import fs from 'fs/promises';
 import path from 'node:path';
-import { logSuccess, logWarning } from '../console/logging.js';
+import { logger } from '../console/logger.js';
 import fg from 'fast-glob';
 import micromatch from 'micromatch';
 /**
@@ -68,7 +68,7 @@ export async function clearLocaleDirs(filePaths, locales, excludePatterns, cwd =
             }
             if (!excludePatterns?.length) {
                 await fs.rm(dir, { recursive: true, force: true });
-                logSuccess(`Cleared locale directory: ${dir}`);
+                logger.success(`Cleared locale directory: ${dir}`);
                 continue;
             }
             const filesToDelete = await getFilesToDelete(dir, excludePatterns, locale, cwd);
@@ -80,7 +80,7 @@ export async function clearLocaleDirs(filePaths, locales, excludePatterns, cwd =
                 }
                 catch (error) {
                     if (error.code !== 'ENOENT') {
-                        logWarning(`Failed to delete file ${file}: ${error}`);
+                        logger.warn(`Failed to delete file ${file}: ${error}`);
                     }
                 }
             }
@@ -88,15 +88,15 @@ export async function clearLocaleDirs(filePaths, locales, excludePatterns, cwd =
             await cleanupEmptyDirs(dir);
             const excludedCount = allFiles.length - filesToDelete.length;
             if (excludedCount > 0) {
-                logSuccess(`Cleared locale directory: ${dir} (excluded ${excludedCount} file${excludedCount > 1 ? 's' : ''})`);
+                logger.success(`Cleared locale directory: ${dir} (excluded ${excludedCount} file${excludedCount > 1 ? 's' : ''})`);
             }
             else {
-                logSuccess(`Cleared locale directory: ${dir}`);
+                logger.success(`Cleared locale directory: ${dir}`);
             }
         }
         catch (error) {
             if (error.code !== 'ENOENT') {
-                logWarning(`Failed to clear locale directory ${dir}: ${error}`);
+                logger.warn(`Failed to clear locale directory ${dir}: ${error}`);
             }
         }
     }

package/dist/fs/config/downloadedVersions.js

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { logError } from '../../console/logging.js';
+import { logger } from '../../console/logger.js';
 // New lock file name, use old name for deletion of legacy lock file
 const GT_LOCK_FILE = 'gt-lock.json';
 const LEGACY_DOWNLOADED_VERSIONS_FILE = 'downloaded-versions.json';
@@ -25,7 +25,7 @@ export function getDownloadedVersions(configDirectory) {
         return { version: 1, entries: {} };
     }
     catch (error) {
-        logError(`An error occurred while getting downloaded versions: ${error}`);
+        logger.error(`An error occurred while getting downloaded versions: ${error}`);
         return { version: 1, entries: {} };
     }
 }
@@ -37,7 +37,7 @@ export function saveDownloadedVersions(configDirectory, lock) {
         fs.writeFileSync(filepath, JSON.stringify(lock, null, 2));
     }
     catch (error) {
-        logError(`An error occurred while updating ${GT_LOCK_FILE}: ${error}`);
+        logger.error(`An error occurred while updating ${GT_LOCK_FILE}: ${error}`);
     }
 }
 export function ensureNestedObject(obj, path) {

package/dist/fs/config/parseFilesConfig.js

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import fg from 'fast-glob';
 import { SUPPORTED_FILE_EXTENSIONS } from '../../formats/files/supportedFiles.js';
-import { logWarning } from '../../console/logging.js';
+import { logger } from '../../console/logger.js';
 import chalk from 'chalk';
 /**
  * Resolves the files from the files object
@@ -73,7 +73,7 @@ export function expandGlobPatterns(cwd, includePatterns, excludePatterns, locale
         if (!pattern.includes('[locale]') &&
             !transformPatterns &&
             !compositePatterns?.includes(pattern)) {
-            logWarning(chalk.yellow(`Pattern "${pattern}" does not include [locale], so the CLI tool may incorrectly save translated files.`));
+            logger.warn(chalk.yellow(`Pattern "${pattern}" does not include [locale], so the CLI tool may incorrectly save translated files.`));
         }
         const localePositions = [];
         let searchIndex = 0;

package/dist/fs/config/setupConfig.js

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import { displayCreatedConfigFile } from '../../console/logging.js';
-import { logError } from '../../console/logging.js';
+import { logger } from '../../console/logger.js';
 import { GT_CONFIG_SCHEMA_URL } from '../../utils/constants.js';
 /**
  * Checks if the config file exists.
@@ -44,7 +44,7 @@ export async function createOrUpdateConfig(configFilepath, options) {
         displayCreatedConfigFile(configFilepath);
     }
     catch (error) {
-        logError(`An error occurred while updating ${configFilepath}: ${error}`);
+        logger.error(`An error occurred while updating ${configFilepath}: ${error}`);
     }
     return configFilepath;
 }

package/dist/fs/config/updateConfig.js

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import { displayUpdatedConfigFile } from '../../console/logging.js';
-import { logError } from '../../console/logging.js';
+import { logger } from '../../console/logger.js';
 /**
  * Update the config file version id, locales, and projectId (if necessary)
  * @param {Record<string, any>} configObject - The config object to write if the file does not exist.
@@ -31,6 +31,6 @@ export default async function updateConfig({ configFilepath, projectId, _version
         displayUpdatedConfigFile(configFilepath);
     }
     catch (error) {
-        logError(`An error occurred while updating ${configFilepath}: ${error}`);
+        logger.error(`An error occurred while updating ${configFilepath}: ${error}`);
     }
 }

package/dist/fs/config/updateVersions.js

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import { displayUpdatedVersionsFile } from '../../console/logging.js';
-import { logError } from '../../console/logging.js';
+import { logger } from '../../console/logger.js';
 import path from 'node:path';
 const STAGED_VERSIONS_FILE = 'staged-versions.json';
 // Update the versions.json file with the new version ids
@@ -14,7 +14,7 @@ export async function updateVersions({ configDirectory, versionData, }) {
         displayUpdatedVersionsFile(versionFilepath);
     }
     catch (error) {
-        logError(`An error occurred while updating ${versionFilepath}: ${error}`);
+        logger.error(`An error occurred while updating ${versionFilepath}: ${error}`);
     }
 }
 export async function getStagedVersions(configDirectory) {
@@ -24,7 +24,7 @@ export async function getStagedVersions(configDirectory) {
         return versionData;
     }
     catch (error) {
-        logError(`An error occurred while getting staged versions: ${error}`);
+        logger.error(`An error occurred while getting staged versions: ${error}`);
         return {};
     }
 }

package/dist/fs/copyFile.js

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import fs from 'node:fs';
-import { logError } from '../console/logging.js';
+import { logger } from '../console/logger.js';
 /**
  * Copy a file to target locale without translation
  *
@@ -14,7 +14,7 @@ export default async function copyFile(settings) {
     const copyFiles = settings.options.copyFiles.reduce((paths, filePathTemplate) => {
         const sourcePath = path.join(process.cwd(), filePathTemplate.replace('[locale]', settings.defaultLocale));
         if (!fs.existsSync(sourcePath)) {
-            logError(`Failed to copy files: File path does not exist: ${sourcePath}`);
+            logger.error(`Failed to copy files: File path does not exist: ${sourcePath}`);
             return paths;
         }
         paths[sourcePath] = [];

package/dist/fs/createLoadTranslationsFile.js

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { logInfo } from '../console/logging.js';
+import { logger } from '../console/logger.js';
 import chalk from 'chalk';
 export async function createLoadTranslationsFile(appDirectory, translationsDir = './public/_gt') {
     const usingSrcDirectory = fs.existsSync(path.join(appDirectory, 'src'));
@@ -28,9 +28,9 @@ export default async function loadTranslations(locale) {
 }
 `;
         await fs.promises.writeFile(filePath, loadTranslationsContent);
-        logInfo(`Created ${chalk.cyan('loadTranslations.js')} file at ${chalk.cyan(filePath)}.`);
+        logger.info(`Created ${chalk.cyan('loadTranslations.js')} file at ${chalk.cyan(filePath)}.`);
     }
     else {
-        logInfo(`Found ${chalk.cyan('loadTranslations.js')} file at ${chalk.cyan(filePath)}. Skipping creation...`);
+        logger.info(`Found ${chalk.cyan('loadTranslations.js')} file at ${chalk.cyan(filePath)}. Skipping creation...`);
     }
 }

package/dist/fs/determineFramework.js

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import path from 'node:path';
 import fs from 'node:fs';
-import { logWarning, logError } from '../console/logging.js';
+import { logger } from '../console/logger.js';
 export function determineLibrary() {
     let library = 'base';
     const additionalModules = [];
@@ -11,7 +11,7 @@ export function determineLibrary() {
         const packageJsonPath = path.join(cwd, 'package.json');
         // Check if package.json exists
         if (!fs.existsSync(packageJsonPath)) {
-            logWarning(chalk.yellow('No package.json found in the current directory. Please run this command from the root of your project.'));
+            logger.warn(chalk.yellow('No package.json found in the current directory. Please run this command from the root of your project.'));
             return { library: 'base', additionalModules: [] };
         }
         // Read and parse package.json
@@ -40,7 +40,7 @@ export function determineLibrary() {
         return { library, additionalModules };
     }
     catch (error) {
-        logError('Error determining framework: ' + String(error));
+        logger.error('Error determining framework: ' + String(error));
         return { library: 'base', additionalModules: [] };
     }
 }

package/dist/fs/findFilepath.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';
 /**
  * Resolve the file path from the given file path or default paths.
  * @param {string} filePath - The file path to resolve.
@@ -24,8 +25,8 @@ export function findFilepaths(paths, errorMessage = '') {
         }
     }
     if (errorMessage) {
-        logError(errorMessage);
-        process.exit(1);
+        logger.error(errorMessage);
+        exitSync(1);
     }
     return resolvedPaths;
 }
@@ -79,7 +80,7 @@ export function findFileInDir(dir, file) {
         }
     }
     catch (error) {
-        logError('Error finding file in directory: ' + String(error));
+        logger.error('Error finding file in directory: ' + String(error));
     }
     return '';
 }