gtx-cli 1.0.0 → 1.0.2

package/dist/cli/base.d.ts

@@ -1,7 +1,8 @@
 import { SupportedLibraries } from '../types';
 export declare class BaseCLI {
     private library;
-    constructor(library: SupportedLibraries);
+    private additionalModules;
+    constructor(library: SupportedLibraries, additionalModules?: SupportedLibraries[]);
     init(): void;
     execute(): void;
     protected setupGTCommand(): void;

package/dist/cli/base.js

@@ -59,11 +59,13 @@ const yaml_1 = __importDefault(require("yaml"));
 const translate_1 = require("../formats/json/translate");
 const utils_1 = require("../fs/utils");
 const generateSettings_1 = require("../config/generateSettings");
+const chalk_1 = __importDefault(require("chalk"));
 const SUPPORTED_DATA_FORMATS = ['JSX', 'ICU', 'I18NEXT'];
 class BaseCLI {
     // Constructor is shared amongst all CLI class types
-    constructor(library) {
+    constructor(library, additionalModules) {
         this.library = library;
+        this.additionalModules = additionalModules || [];
         this.setupInitCommand();
     }
     // Init is never called in a child class
@@ -119,13 +121,21 @@ class BaseCLI {
             const fileExtension = settings.translationsDir
                 .split('.')
                 .pop();
-            const dataFormat = this.library === 'next-intl'
-                ? 'ICU'
-                : this.library === 'react-i18next'
-                    ? 'I18NEXT'
-                    : this.library === 'next-i18next'
-                        ? 'I18NEXT'
-                        : 'JSX';
+            let dataFormat;
+            if (this.library === 'next-intl') {
+                dataFormat = 'ICU';
+            }
+            else if (this.library === 'i18next') {
+                if (this.additionalModules.includes('i18next-icu')) {
+                    dataFormat = 'ICU';
+                }
+                else {
+                    dataFormat = 'I18NEXT';
+                }
+            }
+            else {
+                dataFormat = 'JSX';
+            }
             if (!dataFormat) {
                 console.error(errors_1.noDataFormatError);
                 process.exit(1);
@@ -147,17 +157,14 @@ class BaseCLI {
             .action(() => __awaiter(this, void 0, void 0, function* () {
             (0, console_1.displayAsciiTitle)();
             (0, console_2.displayInitializingText)();
-            // Ask where the translations are stored
-            const translationsDir = yield (0, prompts_1.input)({
-                message: 'Where is the directory containing your language files?',
-            });
             // Ask for the default locale
             const defaultLocale = yield (0, prompts_1.input)({
                 message: 'What is the default locale for your project?',
+                default: 'en',
             });
             // Ask for the locales
             const locales = yield (0, prompts_1.input)({
-                message: 'What locales would you like to translate using General Translation? (space-separated list)',
+                message: `What locales would you like to translate using General Translation? ${chalk_1.default.gray('(space-separated list)')}`,
                 validate: (input) => {
                     const locales = input.split(' ');
                     if (locales.length === 0) {
@@ -171,20 +178,63 @@ class BaseCLI {
                     return true;
                 },
             });
-            const dataFormat = yield (0, prompts_1.select)({
-                message: 'What is the format of your language files?',
-                choices: ['.json', '.yaml'],
-                default: '.json',
+            // Ask where the translations are stored
+            const location = yield (0, prompts_1.select)({
+                message: 'Where are your language files stored? (CDN or local)',
+                choices: [
+                    { value: 'cdn', name: 'CDN' },
+                    { value: 'local', name: 'Local' },
+                ],
+                default: 'cdn',
             });
-            // combine translationsDir and dataFormat into something like
-            // translationsDir/*[.json|.yaml]
-            const translationsDirWithFormat = path_1.default.join(translationsDir, `*${dataFormat}`);
-            // Create gt.config.json
-            (0, setupConfig_1.default)('gt.config.json', {
-                defaultLocale,
-                locales: locales.split(' '),
-                translationsDir: translationsDirWithFormat,
+            if (location === 'cdn') {
+                // Create gt.config.json
+                (0, setupConfig_1.default)('gt.config.json', {
+                    defaultLocale,
+                    locales: locales.split(' '),
+                });
+                return;
+            }
+            // Ask where the translations are stored
+            const translationsDir = yield (0, prompts_1.input)({
+                message: 'What is the path to the directory containing your language files?',
             });
+            const thirdPartyLibrary = this.library !== 'gt-next' && this.library !== 'gt-react';
+            // Ask if using another i18n library
+            const i18nLibrary = thirdPartyLibrary
+                ? yield (0, prompts_1.select)({
+                    message: `Are you using a third-party i18n library? (${chalk_1.default.gray(`Auto-detected: ${this.library}`)})`,
+                    choices: [
+                        { value: true, name: 'Yes' },
+                        { value: false, name: 'No' },
+                    ],
+                    default: true,
+                })
+                : false;
+            if (i18nLibrary) {
+                const dataFormat = yield (0, prompts_1.select)({
+                    message: 'What is the format of your language files?',
+                    choices: ['.json', '.yaml'],
+                    default: '.json',
+                });
+                // combine translationsDir and dataFormat into something like
+                // translationsDir/*[.json|.yaml]
+                const translationsDirWithFormat = path_1.default.join(translationsDir, `*${dataFormat}`);
+                // Create gt.config.json
+                (0, setupConfig_1.default)('gt.config.json', {
+                    defaultLocale,
+                    locales: locales.split(' '),
+                    translationsDir: translationsDirWithFormat,
+                });
+            }
+            else {
+                // Create gt.config.json
+                (0, setupConfig_1.default)('gt.config.json', {
+                    defaultLocale,
+                    locales: locales.split(' '),
+                    translationsDir: translationsDir,
+                });
+            }
         }));
     }
 }

package/dist/cli/next.d.ts

@@ -1,7 +1,7 @@
-import { WrapOptions, Options, Updates, SetupOptions, SupportedFrameworks } from '../types';
+import { WrapOptions, Options, Updates, SetupOptions, SupportedFrameworks, SupportedLibraries } from '../types';
 import { ReactCLI } from './react';
 export declare class NextCLI extends ReactCLI {
-    constructor();
+    constructor(library: SupportedLibraries, additionalModules?: SupportedLibraries[]);
     init(): void;
     execute(): void;
     protected scanForContent(options: WrapOptions, framework: SupportedFrameworks): Promise<{

package/dist/cli/next.js

@@ -26,8 +26,8 @@ const react_1 = require("./react");
 const generateSettings_1 = require("../config/generateSettings");
 const pkg = 'gt-next';
 class NextCLI extends react_1.ReactCLI {
-    constructor() {
-        super();
+    constructor(library, additionalModules) {
+        super(library, additionalModules);
     }
     init() {
         this.setupTranslateCommand();

package/dist/cli/react.d.ts

@@ -1,7 +1,7 @@
-import { Options, SetupOptions, SupportedFrameworks, Updates, WrapOptions, GenerateSourceOptions } from '../types';
+import { Options, SetupOptions, SupportedFrameworks, Updates, WrapOptions, GenerateSourceOptions, SupportedLibraries } from '../types';
 import { BaseCLI } from './base';
 export declare class ReactCLI extends BaseCLI {
-    constructor();
+    constructor(library: SupportedLibraries, additionalModules?: SupportedLibraries[]);
     init(): void;
     execute(): void;
     protected scanForContent(options: WrapOptions, framework: SupportedFrameworks): Promise<{

package/dist/cli/react.js

@@ -70,8 +70,8 @@ const saveJSON_1 = require("../fs/saveJSON");
 const DEFAULT_TIMEOUT = 600;
 const pkg = 'gt-react';
 class ReactCLI extends base_1.BaseCLI {
-    constructor() {
-        super('gt-react');
+    constructor(library, additionalModules) {
+        super(library, additionalModules);
     }
     init() {
         this.setupTranslateCommand();
@@ -152,6 +152,10 @@ class ReactCLI extends base_1.BaseCLI {
             (0, console_1.displayInitializingText)();
             const settings = (0, generateSettings_1.generateSettings)(options);
             options = Object.assign(Object.assign({}, options), settings);
+            if (!settings.translationsDir) {
+                console.log(chalk_1.default.red('Error: the translationsDir path is required'));
+                process.exit(1);
+            }
             if (!options.dictionary) {
                 options.dictionary = (0, findFilepath_1.default)([
                     './dictionary.js',
@@ -192,7 +196,7 @@ class ReactCLI extends base_1.BaseCLI {
                 for (const locale of settings.locales) {
                     const existingTranslations = (0, loadJSON_1.default)(path_1.default.join(settings.translationsDir, `${locale}.json`));
                     const mergedTranslations = Object.assign(Object.assign({}, newData), existingTranslations);
-                    // Filter out only keys that exist in newData
+                    // Filter out keys that don't exist in newData
                     const filteredTranslations = Object.fromEntries(Object.entries(mergedTranslations).filter(([key]) => newData[key]));
                     (0, saveJSON_1.saveJSON)(path_1.default.join(settings.translationsDir, `${locale}.json`), filteredTranslations);
                 }

package/dist/fs/determineFramework.d.ts

@@ -1,2 +1,5 @@
 import { SupportedLibraries } from '../types';
-export declare function determineLibrary(): SupportedLibraries;
+export declare function determineLibrary(): {
+    library: SupportedLibraries;
+    additionalModules: SupportedLibraries[];
+};

package/dist/fs/determineFramework.js

@@ -8,6 +8,8 @@ const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 function determineLibrary() {
+    let library = 'base';
+    let additionalModules = [];
     try {
         // Get the current working directory (where the CLI is being run)
         const cwd = process.cwd();
@@ -15,32 +17,32 @@ function determineLibrary() {
         // Check if package.json exists
         if (!fs_1.default.existsSync(packageJsonPath)) {
             console.log(chalk_1.default.red('No package.json found in the current directory. Please run this command from the root of your project.'));
-            return 'base';
+            return { library: 'base', additionalModules: [] };
         }
         // Read and parse package.json
         const packageJson = JSON.parse(fs_1.default.readFileSync(packageJsonPath, 'utf8'));
         const dependencies = Object.assign(Object.assign({}, packageJson.dependencies), packageJson.devDependencies);
         // Check for gt-next or gt-react in dependencies
         if (dependencies['gt-next']) {
-            return 'gt-next';
+            library = 'gt-next';
         }
         else if (dependencies['gt-react']) {
-            return 'gt-react';
+            library = 'gt-react';
         }
         else if (dependencies['next-intl']) {
-            return 'next-intl';
+            library = 'next-intl';
         }
-        else if (dependencies['react-i18next']) {
-            return 'react-i18next';
+        else if (dependencies['i18next']) {
+            library = 'i18next';
         }
-        else if (dependencies['next-i18next']) {
-            return 'next-i18next';
+        if (dependencies['i18next-icu']) {
+            additionalModules.push('i18next-icu');
         }
         // Fallback to base if neither is found
-        return 'base';
+        return { library, additionalModules };
     }
     catch (error) {
         console.error('Error determining framework:', error);
-        return 'base';
+        return { library: 'base', additionalModules: [] };
     }
 }

package/dist/index.js

@@ -8,16 +8,16 @@ const next_1 = require("./cli/next");
 const react_1 = require("./cli/react");
 const determineFramework_1 = require("./fs/determineFramework");
 function main() {
-    const library = (0, determineFramework_1.determineLibrary)();
+    const { library, additionalModules } = (0, determineFramework_1.determineLibrary)();
     let cli;
     if (library === 'gt-next') {
-        cli = new next_1.NextCLI();
+        cli = new next_1.NextCLI(library, additionalModules);
     }
     else if (library === 'gt-react') {
-        cli = new react_1.ReactCLI();
+        cli = new react_1.ReactCLI(library, additionalModules);
     }
     else {
-        cli = new base_1.BaseCLI(library);
+        cli = new base_1.BaseCLI(library, additionalModules);
     }
     cli.init();
     cli.execute();

package/dist/types/index.d.ts

@@ -53,7 +53,7 @@ export type GenerateSourceOptions = {
 };
 export type Framework = 'gt-next' | 'gt-react';
 export type SupportedFrameworks = 'next-app' | 'next-pages' | 'vite' | 'react' | 'gatsby';
-export type SupportedLibraries = 'gt-next' | 'gt-react' | 'next-intl' | 'react-i18next' | 'next-i18next' | 'base';
+export type SupportedLibraries = 'gt-next' | 'gt-react' | 'next-intl' | 'react-i18next' | 'next-i18next' | 'i18next' | 'i18next-icu' | 'base';
 export interface ContentScanner {
     scanForContent(options: WrapOptions, framework: Framework): Promise<{
         errors: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtx-cli",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "scripts": {