gtx-cli 2.4.4 → 2.4.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # gtx-cli
 
+## 2.4.6
+
+### Patch Changes
+
+- [#763](https://github.com/generaltranslation/gt/pull/763) [`b6a79a8`](https://github.com/generaltranslation/gt/commit/b6a79a868630725eb1106faaa2c385c305891e9c) Thanks [@fernando-aviles](https://github.com/fernando-aviles)! - Allow lists for overrides in gt.config.json
+
+## 2.4.5
+
+### Patch Changes
+
+- [#759](https://github.com/generaltranslation/gt/pull/759) [`cf04026`](https://github.com/generaltranslation/gt/commit/cf04026df7072af60999f281ba342a1baa58f7ff) Thanks [@fernando-aviles](https://github.com/fernando-aviles)! - Migrating downloaded-versions.json to gt-lock.json, make .gt and .locadex interchangable
+
 ## 2.4.4
 
 ### Patch Changes

package/dist/cli/flags.js

@@ -26,7 +26,7 @@ export function attachTranslateFlags(command) {
         .option('--experimental-flatten-json-files', 'Triggering this will flatten the json files into a single file. This is useful for projects that have a lot of json files.', false)
         .option('--experimental-localize-static-imports', 'Triggering this will run a script after the cli tool that localizes all static imports in content files. Currently only supported for md and mdx files.', false)
         .option('--force', 'Force a retranslation, invalidating all existing cached translations if they exist.', false)
-        .option('--force-download', 'Force download and overwrite local files, bypassing downloaded-versions checks.', false)
+        .option('--force-download', 'Force download and overwrite local files, bypassing gt-lock.json checks.', false)
         .option('--experimental-clear-locale-dirs', 'Clear locale directories before downloading new translations', false);
     return command;
 }

package/dist/config/resolveConfig.js

@@ -15,6 +15,14 @@ export function resolveConfig(cwd) {
             config: loadConfig(path.join(cwd, 'src/gt.config.json')),
         };
     }
+    // Support config under .gt for parity with .locadex
+    if (fs.existsSync(path.join(cwd, '.gt/gt.config.json'))) {
+        return {
+            path: path.join(cwd, '.gt/gt.config.json'),
+            config: loadConfig(path.join(cwd, '.gt/gt.config.json')),
+        };
+    }
+    // Backward compatibility: support legacy .locadex directory
     if (fs.existsSync(path.join(cwd, '.locadex/gt.config.json'))) {
         return {
             path: path.join(cwd, '.locadex/gt.config.json'),

package/dist/formats/files/fileMapping.js

@@ -44,6 +44,39 @@ export function createFileMapping(filePaths, placeholderPaths, transformPaths, t
                         return path.join(directory, transformedFileName);
                     });
                 }
+                else if (Array.isArray(transformPath)) {
+                    // transformPath is an array of TransformOption objects
+                    const targetLocaleProperties = getLocaleProperties(locale);
+                    const defaultLocaleProperties = getLocaleProperties(defaultLocale);
+                    translatedFiles = translatedFiles.map((filePath) => {
+                        const relativePath = getRelative(filePath);
+                        // Try each transform in order until one matches
+                        for (const transform of transformPath) {
+                            if (!transform.replace || typeof transform.replace !== 'string') {
+                                continue;
+                            }
+                            // Replace all locale property placeholders in the replace string
+                            const replaceString = replaceLocalePlaceholders(transform.replace, targetLocaleProperties);
+                            if (transform.match && typeof transform.match === 'string') {
+                                // Replace locale placeholders in the match string using defaultLocale properties
+                                let matchString = transform.match;
+                                matchString = replaceLocalePlaceholders(matchString, defaultLocaleProperties);
+                                const regex = new RegExp(matchString);
+                                if (regex.test(relativePath)) {
+                                    // This transform matches, apply it and break
+                                    const transformedPath = relativePath.replace(new RegExp(matchString, 'g'), replaceString);
+                                    return path.resolve(transformedPath);
+                                }
+                            }
+                            else {
+                                // No match provided: treat as a direct replacement (override)
+                                return path.resolve(replaceString);
+                            }
+                        }
+                        // If no transforms matched, return the original path
+                        return filePath;
+                    });
+                }
                 else {
                     // transformPath is an object
                     const targetLocaleProperties = getLocaleProperties(locale);

package/dist/fs/config/downloadedVersions.js

@@ -1,11 +1,22 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { logError } from '../../console/logging.js';
-const DOWNLOADED_VERSIONS_FILE = 'downloaded-versions.json';
+// 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';
 export function getDownloadedVersions(configDirectory) {
     try {
-        const filepath = path.join(configDirectory, DOWNLOADED_VERSIONS_FILE);
-        if (!fs.existsSync(filepath))
+        // Clean up legacy lock files inside the config directory
+        const rootPath = path.join(process.cwd(), GT_LOCK_FILE);
+        const legacyPath = path.join(configDirectory, LEGACY_DOWNLOADED_VERSIONS_FILE);
+        try {
+            if (fs.existsSync(legacyPath)) {
+                fs.unlinkSync(legacyPath);
+            }
+        }
+        catch { }
+        const filepath = fs.existsSync(rootPath) ? rootPath : null;
+        if (!filepath)
             return { version: 1, entries: {} };
         const raw = JSON.parse(fs.readFileSync(filepath, 'utf8'));
         if (raw && typeof raw === 'object' && raw.version && raw.entries) {
@@ -20,11 +31,12 @@ export function getDownloadedVersions(configDirectory) {
 }
 export function saveDownloadedVersions(configDirectory, lock) {
     try {
-        const filepath = path.join(configDirectory, DOWNLOADED_VERSIONS_FILE);
-        fs.mkdirSync(configDirectory, { recursive: true });
+        // Write the lock file to the repo root
+        const filepath = path.join(process.cwd(), GT_LOCK_FILE);
+        fs.mkdirSync(path.dirname(filepath), { recursive: true });
         fs.writeFileSync(filepath, JSON.stringify(lock, null, 2));
     }
     catch (error) {
-        logError(`An error occurred while updating ${DOWNLOADED_VERSIONS_FILE}: ${error}`);
+        logError(`An error occurred while updating ${GT_LOCK_FILE}: ${error}`);
     }
 }

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

@@ -21,7 +21,7 @@ export declare function resolveFiles(files: FilesOptions, locale: string, locale
     placeholderPaths: ResolvedFiles;
     transformPaths: TransformFiles;
 };
-export declare function expandGlobPatterns(cwd: string, includePatterns: string[], excludePatterns: string[], locale: string, locales: string[], transformPatterns?: TransformOption | string, compositePatterns?: string[]): {
+export declare function expandGlobPatterns(cwd: string, includePatterns: string[], excludePatterns: string[], locale: string, locales: string[], transformPatterns?: TransformOption | string | TransformOption[], compositePatterns?: string[]): {
     resolvedPaths: string[];
     placeholderPaths: string[];
 };

package/dist/fs/config/parseFilesConfig.js

@@ -41,8 +41,9 @@ export function resolveFiles(files, locale, locales, cwd, compositePatterns) {
         // ==== TRANSFORMS ==== //
         const transform = files[fileType]?.transform;
         if (transform &&
-            !Array.isArray(transform) &&
-            (typeof transform === 'string' || typeof transform === 'object')) {
+            (typeof transform === 'string' ||
+                typeof transform === 'object' ||
+                Array.isArray(transform))) {
             transformPaths[fileType] = transform;
         }
         // ==== PLACEHOLDERS ==== //

package/dist/types/index.d.ts

@@ -93,13 +93,13 @@ export type TransformOption = {
     replace: string;
 };
 export type TransformFiles = {
-    [K in SupportedFileExtension]?: TransformOption | string;
+    [K in SupportedFileExtension]?: TransformOption | string | TransformOption[];
 };
 export type FilesOptions = {
     [K in SupportedFileExtension]?: {
         include: string[];
         exclude?: string[];
-        transform?: string | TransformOption;
+        transform?: string | TransformOption | TransformOption[];
     };
 } & {
     gt?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtx-cli",
-  "version": "2.4.4",
+  "version": "2.4.6",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [