gtx-cli 1.2.7 → 1.2.8-alpha.2

package/dist/cli/base.d.ts

@@ -7,6 +7,9 @@ export type TranslateOptions = {
     projectId?: string;
     dryRun: boolean;
 };
+export type LoginOptions = {
+    keyType?: 'development' | 'production';
+};
 export declare class BaseCLI {
     protected library: SupportedLibraries;
     protected additionalModules: SupportedLibraries[];
@@ -21,5 +24,5 @@ export declare class BaseCLI {
     protected handleGenericTranslate(settings: Settings & TranslateOptions): Promise<void>;
     protected handleSetupReactCommand(options: SetupOptions): Promise<void>;
     protected handleInitCommand(ranReactSetup: boolean): Promise<void>;
-    protected handleLoginCommand(): Promise<void>;
+    protected handleLoginCommand(options: LoginOptions): Promise<void>;
 }

package/dist/cli/base.js

@@ -98,10 +98,32 @@ class BaseCLI {
             .command('auth')
             .description('Generate a General Translation API key and project ID')
             .option('-c, --config <path>', 'Filepath to config file, by default gt.config.json', (0, findFilepath_1.default)(['gt.config.json']))
-            .action(async () => {
+            .option('-t, --key-type <type>', 'Type of key to generate, production | development')
+            .action(async (options) => {
             (0, console_1.displayHeader)('Authenticating with General Translation...');
-            await this.handleLoginCommand();
-            (0, console_1.endCommand)('Done!');
+            if (!options.keyType) {
+                const packageJson = await (0, packageJson_1.searchForPackageJson)();
+                const isUsingGTNext = packageJson
+                    ? (0, packageJson_1.isPackageInstalled)('gt-next', packageJson)
+                    : false;
+                const isUsingGTReact = packageJson
+                    ? (0, packageJson_1.isPackageInstalled)('gt-react', packageJson)
+                    : false;
+                if (isUsingGTNext || isUsingGTReact) {
+                    options.keyType = 'development';
+                }
+                else {
+                    options.keyType = 'production';
+                }
+            }
+            else {
+                if (options.keyType !== 'development' &&
+                    options.keyType !== 'production') {
+                    (0, console_1.logErrorAndExit)('Invalid key type, must be development or production');
+                }
+            }
+            await this.handleLoginCommand(options);
+            (0, console_1.endCommand)(`Done! A ${options.keyType} key has been generated and saved to your .env.local file.`);
         });
     }
     setupInitCommand() {
@@ -109,7 +131,7 @@ class BaseCLI {
             .command('init')
             .description('Run the setup wizard to configure your project for General Translation')
             .option('--src <paths...>', "Filepath to directory containing the app's source code, by default ./src || ./app || ./pages || ./components", (0, findFilepath_1.findFilepaths)(['./src', './app', './pages', './components']))
-            .option('--config <path>', 'Filepath to config file, by default gt.config.json', (0, findFilepath_1.default)(['gt.config.json']))
+            .option('-c, --config <path>', 'Filepath to config file, by default gt.config.json', (0, findFilepath_1.default)(['gt.config.json']))
             .action(async (options) => {
             (0, console_1.displayHeader)('Running setup wizard...');
             const packageJson = await (0, packageJson_1.searchForPackageJson)();
@@ -154,7 +176,7 @@ See the docs for more information: https://generaltranslation.com/docs/react/tut
             .command('setup')
             .description('Run the setup to configure your Next.js or React project for General Translation')
             .option('--src <paths...>', "Filepath to directory containing the app's source code, by default ./src || ./app || ./pages || ./components", (0, findFilepath_1.findFilepaths)(['./src', './app', './pages', './components']))
-            .option('--config <path>', 'Filepath to config file, by default gt.config.json', (0, findFilepath_1.default)(['gt.config.json']))
+            .option('-c, --config <path>', 'Filepath to config file, by default gt.config.json', (0, findFilepath_1.default)(['gt.config.json']))
             .action(async (options) => {
             (0, console_1.displayHeader)('Running React setup wizard...');
             await this.handleSetupReactCommand(options);
@@ -207,12 +229,12 @@ See the docs for more information: https://generaltranslation.com/docs/react/tut
             ? await (0, console_1.promptConfirm)({
                 message: `Auto-detected that you're using gt-next or gt-react. Would you like to use the General Translation CDN to store your translations?\nSee ${isUsingGTNext
                     ? 'https://generaltranslation.com/docs/next/reference/local-tx'
-                    : 'https://generaltranslation.com/docs/react/reference/local-tx'} for more information.\nIf you answer no, we'll setup your project to store translations locally.`,
+                    : 'https://generaltranslation.com/docs/react/reference/local-tx'} for more information.\nIf you answer no, we'll configure the CLI tool to download completed translations.`,
                 defaultValue: true,
             })
             : false;
         if (isUsingGT && !usingCDN) {
-            (0, console_1.logMessage)(`To block translations from being published, please disable the project setting on the dashboard: ${chalk_1.default.cyan('https://dash.generaltranslation.com/settings/project')}`);
+            (0, console_1.logMessage)(`To prevent translations from being published, please disable the project setting on the dashboard: ${chalk_1.default.cyan('https://dash.generaltranslation.com/settings/project')}`);
         }
         // Ask where the translations are stored
         const translationsDir = isUsingGT && !usingCDN
@@ -276,18 +298,22 @@ See the docs for more information: https://generaltranslation.com/docs/react/tut
         // Set credentials
         if (!(0, credentials_2.areCredentialsSet)()) {
             const loginQuestion = await (0, console_1.promptConfirm)({
-                message: 'Would you like the wizard to automatically generate an API key and project ID for you?',
+                message: `Would you like the wizard to automatically generate a ${isUsingGT ? 'development' : 'production'} API key and project ID for you?`,
                 defaultValue: true,
             });
             if (loginQuestion) {
-                await this.handleLoginCommand();
+                const settings = await (0, generateSettings_1.generateSettings)({});
+                const keyType = isUsingGT ? 'development' : 'production';
+                const credentials = await (0, credentials_1.retrieveCredentials)(settings, keyType);
+                await (0, credentials_1.setCredentials)(credentials, keyType, settings.framework);
             }
         }
     }
-    async handleLoginCommand() {
+    async handleLoginCommand(options) {
         const settings = await (0, generateSettings_1.generateSettings)({});
-        const credentials = await (0, credentials_1.retrieveCredentials)(settings);
-        await (0, credentials_1.setCredentials)(credentials);
+        const keyType = options.keyType || 'production';
+        const credentials = await (0, credentials_1.retrieveCredentials)(settings, keyType);
+        await (0, credentials_1.setCredentials)(credentials, keyType, settings.framework);
     }
 }
 exports.BaseCLI = BaseCLI;

package/dist/cli/react.js

@@ -77,7 +77,7 @@ class ReactCLI extends base_1.BaseCLI {
         commander_1.program
             .command('stage')
             .description('Submits the project to the General Translation API for translation. Translations created using this command will require human approval.')
-            .option('--config <path>', 'Filepath to config file, by default gt.config.json', (0, findFilepath_1.default)(['gt.config.json']))
+            .option('-c, --config <path>', 'Filepath to config file, by default gt.config.json', (0, findFilepath_1.default)(['gt.config.json']))
             .option('--api-key <key>', 'API key for General Translation cloud service')
             .option('--project-id <id>', 'Project ID for the translation service', (0, utils_1.resolveProjectId)())
             .option('--version-id <id>', 'Version ID for the translation service')
@@ -100,7 +100,7 @@ class ReactCLI extends base_1.BaseCLI {
         commander_1.program
             .command('translate')
             .description('Scans the project for a dictionary and/or <T> tags, and sends the updates to the General Translation API for translation.')
-            .option('--config <path>', 'Filepath to config file, by default gt.config.json', (0, findFilepath_1.default)(['gt.config.json']))
+            .option('-c, --config <path>', 'Filepath to config file, by default gt.config.json', (0, findFilepath_1.default)(['gt.config.json']))
             .option('--api-key <key>', 'API key for General Translation cloud service')
             .option('--project-id <id>', 'Project ID for the translation service', (0, utils_1.resolveProjectId)())
             .option('--version-id <id>', 'Version ID for the translation service')
@@ -141,7 +141,7 @@ class ReactCLI extends base_1.BaseCLI {
             .command('scan')
             .description('Scans the project and wraps all JSX elements in the src directory with a <T> tag, with unique ids')
             .option('--src <paths...>', "Filepath to directory containing the app's source code, by default ./src || ./app || ./pages || ./components", (0, findFilepath_1.findFilepaths)(['./src', './app', './pages', './components']))
-            .option('--config <path>', 'Filepath to config file, by default gt.config.json', (0, findFilepath_1.default)(['gt.config.json']))
+            .option('-c, --config <path>', 'Filepath to config file, by default gt.config.json', (0, findFilepath_1.default)(['gt.config.json']))
             .option('--disable-ids', 'Disable id generation for the <T> tags', false)
             .option('--disable-formatting', 'Disable formatting of edited files', false)
             .action(async (options) => {
@@ -168,14 +168,16 @@ class ReactCLI extends base_1.BaseCLI {
         const { updates, errors } = await (0, parse_1.createUpdates)(options, options.dictionary, this.library === 'gt-next' ? 'gt-next' : 'gt-react');
         if (errors.length > 0) {
             if (options.ignoreErrors) {
-                (0, console_1.logWarning)(chalk_1.default.red(`CLI tool encountered errors while scanning for ${chalk_1.default.green('<T>')} tags. These components will not be translated.\n` +
+                (0, console_1.logWarning)(chalk_1.default.yellow(`CLI tool encountered errors while scanning for translatable content. These components will not be translated.\n` +
                     errors
-                        .map((error) => chalk_1.default.yellow('• Warning: ') + error)
+                        .map((error) => chalk_1.default.yellow('• Warning: ') + chalk_1.default.white(error))
                         .join('\n')));
             }
             else {
-                (0, console_1.logErrorAndExit)(chalk_1.default.red(`CLI tool encountered errors while scanning for ${chalk_1.default.green('<T>')} tags. ${chalk_1.default.gray('To ignore these errors, re-run with --ignore-errors')}\n` +
-                    errors.map((error) => chalk_1.default.red('• Error: ') + error).join('\n')));
+                (0, console_1.logErrorAndExit)(chalk_1.default.red(`CLI tool encountered errors while scanning for translatable content. ${chalk_1.default.gray('To ignore these errors, re-run with --ignore-errors')}\n` +
+                    errors
+                        .map((error) => chalk_1.default.red('• Error: ') + chalk_1.default.white(error))
+                        .join('\n')));
             }
         }
         // Convert updates to the proper data format

package/dist/config/generateSettings.js

@@ -86,6 +86,7 @@ async function generateSettings(options) {
             projectId: mergedOptions.projectId,
             defaultLocale: mergedOptions.defaultLocale,
             locales: mergedOptions.locales?.length > 0 ? mergedOptions.locales : undefined,
+            framework: mergedOptions.framework,
         });
     }
     (0, validateSettings_1.validateSettings)(mergedOptions);

package/dist/console/colors.d.ts

@@ -0,0 +1,5 @@
+export declare function colorizeFilepath(filepath: string): string;
+export declare function colorizeComponent(component: string): string;
+export declare function colorizeIdString(id: string): string;
+export declare function colorizeContent(content: string): string;
+export declare function colorizeLine(line: string): string;

package/dist/console/colors.js

@@ -0,0 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.colorizeFilepath = colorizeFilepath;
+exports.colorizeComponent = colorizeComponent;
+exports.colorizeIdString = colorizeIdString;
+exports.colorizeContent = colorizeContent;
+exports.colorizeLine = colorizeLine;
+const chalk_1 = __importDefault(require("chalk"));
+function colorizeFilepath(filepath) {
+    return chalk_1.default.cyan(filepath);
+}
+function colorizeComponent(component) {
+    return chalk_1.default.yellow(component);
+}
+function colorizeIdString(id) {
+    return chalk_1.default.yellow(id);
+}
+function colorizeContent(content) {
+    return chalk_1.default.yellow(content);
+}
+function colorizeLine(line) {
+    return chalk_1.default.gray(line);
+}

package/dist/console/index.d.ts

@@ -1,11 +1,12 @@
 export * from './logging';
 export declare const warnApiKeyInConfigSync: (optionsFilepath: string) => string;
-export declare const warnVariablePropSync: (file: string, attrName: string, value: string) => string;
-export declare const warnNoIdSync: (file: string) => string;
-export declare const warnHasUnwrappedExpressionSync: (file: string, id: string, unwrappedExpressions: string[]) => string;
-export declare const warnNonStaticExpressionSync: (file: string, attrName: string, value: string) => string;
-export declare const warnTemplateLiteralSync: (file: string, value: string) => string;
-export declare const warnTernarySync: (file: string) => string;
+export declare const warnVariablePropSync: (file: string, attrName: string, value: string, location?: string) => string;
+export declare const warnHasUnwrappedExpressionSync: (file: string, unwrappedExpressions: string[], id?: string, location?: string) => string;
+export declare const warnNonStaticExpressionSync: (file: string, attrName: string, value: string, location?: string) => string;
+export declare const warnTemplateLiteralSync: (file: string, value: string, location?: string) => string;
+export declare const warnNonStringSync: (file: string, value: string, location?: string) => string;
+export declare const warnTernarySync: (file: string, location?: string) => string;
+export declare const withLocation: (file: string, message: string, location?: string) => string;
 export declare const noLocalesError = "No locales found! Please provide a list of locales to translate to, or specify them in your gt.config.json file.";
 export declare const noDefaultLocaleError = "No default locale found! Please provide a default locale, or specify it in your gt.config.json file.";
 export declare const noFilesError = "Incorrect or missing files configuration! Please make sure your files are configured correctly in your gt.config.json file.";
@@ -13,5 +14,6 @@ export declare const noSourceFileError = "No source file found! Please double ch
 export declare const noDataFormatError = "No data format found! Please make sure your translationsDir parameter ends with a supported file extension.";
 export declare const noSupportedDataFormatError = "Unsupported data format! Please make sure your translationsDir parameter ends with a supported file extension.";
 export declare const noApiKeyError = "No API key found! Please provide an API key using the --api-key flag or set the GT_API_KEY environment variable.";
+export declare const devApiKeyError = "You are using a development API key. Please use a production API key to send files to General Translation.\nYou can generate a production API key with the command: npx gtx-cli auth -t production";
 export declare const noProjectIdError = "No project ID found! Please provide a project ID using the --project-id flag, specify it in your gt.config.json file, or set the GT_PROJECT_ID environment variable.";
 export declare const noVersionIdError = "No version ID found! Please provide a version ID using the --version-id flag or specify it in your gt.config.json file as the _versionId property.";

package/dist/console/index.js

@@ -14,24 +14,27 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.noVersionIdError = exports.noProjectIdError = exports.noApiKeyError = exports.noSupportedDataFormatError = exports.noDataFormatError = exports.noSourceFileError = exports.noFilesError = exports.noDefaultLocaleError = exports.noLocalesError = exports.warnTernarySync = exports.warnTemplateLiteralSync = exports.warnNonStaticExpressionSync = exports.warnHasUnwrappedExpressionSync = exports.warnNoIdSync = exports.warnVariablePropSync = exports.warnApiKeyInConfigSync = void 0;
+exports.noVersionIdError = exports.noProjectIdError = exports.devApiKeyError = exports.noApiKeyError = exports.noSupportedDataFormatError = exports.noDataFormatError = exports.noSourceFileError = exports.noFilesError = exports.noDefaultLocaleError = exports.noLocalesError = exports.withLocation = exports.warnTernarySync = exports.warnNonStringSync = exports.warnTemplateLiteralSync = exports.warnNonStaticExpressionSync = exports.warnHasUnwrappedExpressionSync = exports.warnVariablePropSync = exports.warnApiKeyInConfigSync = void 0;
 // Export all logging functions
 __exportStar(require("./logging"), exports);
+const colors_1 = require("./colors");
 // Synchronous wrappers for backward compatibility
-const warnApiKeyInConfigSync = (optionsFilepath) => `Found apiKey in "${optionsFilepath}". Your API key is exposed! Please remove it from the file and include it as an environment variable.`;
+const warnApiKeyInConfigSync = (optionsFilepath) => `${(0, colors_1.colorizeFilepath)(optionsFilepath)}: Your API key is exposed! Please remove it from the file and include it as an environment variable.`;
 exports.warnApiKeyInConfigSync = warnApiKeyInConfigSync;
-const warnVariablePropSync = (file, attrName, value) => `Found <T> component in ${file} with variable ${attrName}: "${value}". Change "${attrName}" to ensure this content is translated.`;
+const warnVariablePropSync = (file, attrName, value, location) => (0, exports.withLocation)(file, `${(0, colors_1.colorizeComponent)('<T>')} component has dynamic attribute ${(0, colors_1.colorizeIdString)(attrName)} with value: ${(0, colors_1.colorizeContent)(value)}. Change ${(0, colors_1.colorizeIdString)(attrName)} to ensure this content is translated.`, location);
 exports.warnVariablePropSync = warnVariablePropSync;
-const warnNoIdSync = (file) => `Found <T> component in ${file} with no id. Add an id to ensure the content is translated.`;
-exports.warnNoIdSync = warnNoIdSync;
-const warnHasUnwrappedExpressionSync = (file, id, unwrappedExpressions) => `<T> with id "${id}" in ${file} has children: ${unwrappedExpressions.join(', ')} that could change at runtime. Use a variable component like <Var> to translate this properly.`;
+const warnHasUnwrappedExpressionSync = (file, unwrappedExpressions, id, location) => (0, exports.withLocation)(file, `${(0, colors_1.colorizeComponent)('<T>')} component${id ? ` with id ${(0, colors_1.colorizeIdString)(id)}` : ''} has children that could change at runtime. Use a variable component like ${(0, colors_1.colorizeComponent)('<Var>')} to ensure this content is translated.\n${(0, colors_1.colorizeContent)(unwrappedExpressions.join('\n'))}`, location);
 exports.warnHasUnwrappedExpressionSync = warnHasUnwrappedExpressionSync;
-const warnNonStaticExpressionSync = (file, attrName, value) => `Found non-static expression in ${file} for attribute ${attrName}: "${value}". Change "${attrName}" to ensure this content is translated.`;
+const warnNonStaticExpressionSync = (file, attrName, value, location) => (0, exports.withLocation)(file, `Found non-static expression for attribute ${(0, colors_1.colorizeIdString)(attrName)}: ${(0, colors_1.colorizeContent)(value)}. Change "${(0, colors_1.colorizeIdString)(attrName)}" to ensure this content is translated.`, location);
 exports.warnNonStaticExpressionSync = warnNonStaticExpressionSync;
-const warnTemplateLiteralSync = (file, value) => `Found template literal with quasis (${value}) in ${file}. Change the template literal to a string to ensure this content is translated.`;
+const warnTemplateLiteralSync = (file, value, location) => (0, exports.withLocation)(file, `Found template literal with quasis (${(0, colors_1.colorizeContent)(value)}). Change the template literal to a string to ensure this content is translated.`, location);
 exports.warnTemplateLiteralSync = warnTemplateLiteralSync;
-const warnTernarySync = (file) => `Found ternary expression in ${file}. A Branch component may be more appropriate here.`;
+const warnNonStringSync = (file, value, location) => (0, exports.withLocation)(file, `Found non-string literal (${(0, colors_1.colorizeContent)(value)}). Change the value to a string literal to ensure this content is translated.`, location);
+exports.warnNonStringSync = warnNonStringSync;
+const warnTernarySync = (file, location) => (0, exports.withLocation)(file, 'Found ternary expression. A Branch component may be more appropriate here.', location);
 exports.warnTernarySync = warnTernarySync;
+const withLocation = (file, message, location) => `${(0, colors_1.colorizeFilepath)(file)}${location ? ` (${(0, colors_1.colorizeLine)(location)})` : ''}: ${message}`;
+exports.withLocation = withLocation;
 // Re-export error messages
 exports.noLocalesError = `No locales found! Please provide a list of locales to translate to, or specify them in your gt.config.json file.`;
 exports.noDefaultLocaleError = `No default locale found! Please provide a default locale, or specify it in your gt.config.json file.`;
@@ -40,5 +43,6 @@ exports.noSourceFileError = `No source file found! Please double check your tran
 exports.noDataFormatError = `No data format found! Please make sure your translationsDir parameter ends with a supported file extension.`;
 exports.noSupportedDataFormatError = `Unsupported data format! Please make sure your translationsDir parameter ends with a supported file extension.`;
 exports.noApiKeyError = `No API key found! Please provide an API key using the --api-key flag or set the GT_API_KEY environment variable.`;
+exports.devApiKeyError = `You are using a development API key. Please use a production API key to send files to General Translation.\nYou can generate a production API key with the command: npx gtx-cli auth -t production`;
 exports.noProjectIdError = `No project ID found! Please provide a project ID using the --project-id flag, specify it in your gt.config.json file, or set the GT_PROJECT_ID environment variable.`;
 exports.noVersionIdError = `No version ID found! Please provide a version ID using the --version-id flag or specify it in your gt.config.json file as the _versionId property.`;

package/dist/formats/files/translate.js

@@ -84,6 +84,9 @@ async function translateFiles(filePaths, placeholderPaths, transformPaths, dataF
     if (!options.apiKey) {
         (0, console_1.logErrorAndExit)(console_1.noApiKeyError);
     }
+    if (options.apiKey.startsWith('gtx-dev-')) {
+        (0, console_1.logErrorAndExit)(console_1.devApiKeyError);
+    }
     if (!options.projectId) {
         (0, console_1.logErrorAndExit)(console_1.noProjectIdError);
     }

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

@@ -1,4 +1,4 @@
-import { FilesOptions } from '../../types';
+import { FilesOptions, SupportedFrameworks } from '../../types';
 /**
  * Checks if the config file exists.
  * If yes, make sure make sure projectId is correct
@@ -11,4 +11,5 @@ export default function createOrUpdateConfig(configFilepath: string, options: {
     defaultLocale?: string;
     locales?: string[];
     files?: FilesOptions;
+    framework?: SupportedFrameworks;
 }): Promise<string>;

package/dist/fs/config/setupConfig.js

@@ -19,6 +19,7 @@ async function createOrUpdateConfig(configFilepath, options) {
         ...(options.projectId && { projectId: options.projectId }),
         ...(options.defaultLocale && { defaultLocale: options.defaultLocale }),
         ...(options.files && { files: options.files }),
+        ...(options.framework && { framework: options.framework }),
     };
     try {
         // if file exists

package/dist/react/jsx/parse/parseStringFunction.js

@@ -91,7 +91,7 @@ function parseStrings(importName, path, updates, errors, file) {
                                             t.isExpression(prop.value)) {
                                             const result = (0, evaluateJsx_1.isStaticExpression)(prop.value);
                                             if (!result.isStatic) {
-                                                errors.push((0, console_1.warnNonStaticExpressionSync)(file, attribute, (0, generator_1.default)(prop.value).code));
+                                                errors.push((0, console_1.warnNonStaticExpressionSync)(file, attribute, (0, generator_1.default)(prop.value).code, `${prop.loc?.start?.line}:${prop.loc?.start?.column}`));
                                             }
                                             if (result.isStatic && result.value) {
                                                 metadata[attribute] = result.value;
@@ -108,7 +108,7 @@ function parseStrings(importName, path, updates, errors, file) {
                         }
                         else if (t.isTemplateLiteral(arg)) {
                             // warn if template literal
-                            errors.push((0, console_1.warnTemplateLiteralSync)(file, (0, generator_1.default)(arg).code));
+                            errors.push((0, console_1.warnTemplateLiteralSync)(file, (0, generator_1.default)(arg).code, `${arg.loc?.start?.line}:${arg.loc?.start?.column}`));
                         }
                     }
                 });

package/dist/react/jsx/utils/parseJsx.js

@@ -205,7 +205,7 @@ function parseJSXElement(importAliases, node, updates, errors, file) {
                     if (attrName === 'id' || attrName === 'context') {
                         const staticAnalysis = (0, evaluateJsx_1.isStaticExpression)(expr);
                         if (!staticAnalysis.isStatic) {
-                            errors.push((0, console_1.warnVariablePropSync)(file, attrName, code));
+                            errors.push((0, console_1.warnVariablePropSync)(file, attrName, code, `${expr.loc?.start?.line}:${expr.loc?.start?.column}`));
                         }
                         // Use the static value if available
                         if (staticAnalysis.isStatic && staticAnalysis.value !== undefined) {
@@ -231,7 +231,7 @@ function parseJSXElement(importAliases, node, updates, errors, file) {
         const id = componentObj.props.id;
         // If we found an unwrapped expression, skip
         if (unwrappedExpressions.length > 0) {
-            errors.push((0, console_1.warnHasUnwrappedExpressionSync)(file, id, unwrappedExpressions));
+            errors.push((0, console_1.warnHasUnwrappedExpressionSync)(file, unwrappedExpressions, id, `${node.loc?.start?.line}:${node.loc?.start?.column}`));
         }
         if (errors.length > 0)
             return;

package/dist/react/jsx/utils/parseStringFunction.d.ts

@@ -3,8 +3,8 @@ import { Updates } from '../../../types';
 export declare const attributes: string[];
 /**
  * For the following example code:
- * const tx = useGT();
- * tx('string to translate', { id: 'exampleId', context: 'exampleContext' });
+ * const t = useGT();
+ * t('string to translate', { id: 'exampleId', context: 'exampleContext' });
  *
  * This function will find all call expressions of useGT(), then find all call expressions
  * of the subsequent tx() calls, and append the content and metadata to the updates array.

package/dist/react/jsx/utils/parseStringFunction.js

@@ -46,8 +46,8 @@ const generator_1 = __importDefault(require("@babel/generator"));
 exports.attributes = ['id', 'context'];
 /**
  * For the following example code:
- * const tx = useGT();
- * tx('string to translate', { id: 'exampleId', context: 'exampleContext' });
+ * const t = useGT();
+ * t('string to translate', { id: 'exampleId', context: 'exampleContext' });
  *
  * This function will find all call expressions of useGT(), then find all call expressions
  * of the subsequent tx() calls, and append the content and metadata to the updates array.
@@ -91,7 +91,7 @@ function parseStrings(importName, path, updates, errors, file) {
                                             t.isExpression(prop.value)) {
                                             const result = (0, evaluateJsx_1.isStaticExpression)(prop.value);
                                             if (!result.isStatic) {
-                                                errors.push((0, console_1.warnNonStaticExpressionSync)(file, attribute, (0, generator_1.default)(prop.value).code));
+                                                errors.push((0, console_1.warnNonStaticExpressionSync)(file, attribute, (0, generator_1.default)(prop.value).code, `${prop.loc?.start?.line}:${prop.loc?.start?.column}`));
                                             }
                                             if (result.isStatic && result.value) {
                                                 metadata[attribute] = result.value;
@@ -108,7 +108,10 @@ function parseStrings(importName, path, updates, errors, file) {
                         }
                         else if (t.isTemplateLiteral(arg)) {
                             // warn if template literal
-                            errors.push((0, console_1.warnTemplateLiteralSync)(file, (0, generator_1.default)(arg).code));
+                            errors.push((0, console_1.warnTemplateLiteralSync)(file, (0, generator_1.default)(arg).code, `${arg.loc?.start?.line}:${arg.loc?.start?.column}`));
+                        }
+                        else {
+                            errors.push((0, console_1.warnNonStringSync)(file, (0, generator_1.default)(arg).code, `${arg.loc?.start?.line}:${arg.loc?.start?.column}`));
                         }
                     }
                 });

package/dist/react/jsx/wrapJsx.js

@@ -86,7 +86,7 @@ function wrapJsxExpression(node, options, isMeaningful, mark) {
             }
             // Warn about ternary (should use branch instead)
             if (result.wrappedInT && !mark) {
-                options.warnings.push((0, console_1.warnTernarySync)(options.file));
+                options.warnings.push((0, console_1.warnTernarySync)(options.file, `${consequent.loc?.start?.line}:${consequent.loc?.start?.column}`));
             }
         }
         else if (t.isConditionalExpression(consequent) ||

package/dist/setup/wizard.js

@@ -10,7 +10,6 @@ const console_2 = require("../console");
 const chalk_1 = __importDefault(require("chalk"));
 const console_3 = require("../console");
 const findFilepath_1 = __importDefault(require("../fs/findFilepath"));
-const generateSettings_1 = require("../config/generateSettings");
 const postProcess_2 = require("../hooks/postProcess");
 const handleInitGT_1 = __importDefault(require("../next/parse/handleInitGT"));
 const packageJson_1 = require("../utils/packageJson");
@@ -18,6 +17,7 @@ const wrapContent_1 = __importDefault(require("../react/parse/wrapContent"));
 const wrapContent_2 = __importDefault(require("../next/parse/wrapContent"));
 const packageManager_1 = require("../utils/packageManager");
 const installPackage_1 = require("../utils/installPackage");
+const setupConfig_1 = __importDefault(require("../fs/config/setupConfig"));
 async function handleSetupReactCommand(options) {
     // Ask user for confirmation using inquirer
     const answer = await (0, console_3.promptConfirm)({
@@ -50,6 +50,10 @@ Make sure you have committed or stashed any changes. Do you want to continue?`),
 Please let us know what you would like to see supported at https://github.com/generaltranslation/gt/issues`);
         process.exit(0);
     }
+    // ----- Create a starter gt.config.json file -----
+    await (0, setupConfig_1.default)(options.config || 'gt.config.json', {
+        framework: frameworkType,
+    });
     const packageJson = await (0, packageJson_1.getPackageJson)();
     // Check if gt-next or gt-react is installed
     if (frameworkType === 'next-app' &&
@@ -68,8 +72,6 @@ Please let us know what you would like to see supported at https://github.com/ge
         await (0, installPackage_1.installPackage)('gt-react', packageManager);
         spinner.stop(chalk_1.default.green('Automatically installed gt-react.'));
     }
-    // ----- Create a starter gt.config.json file -----
-    await (0, generateSettings_1.generateSettings)(options);
     let errors = [];
     let warnings = [];
     let filesUpdated = [];

package/dist/translation/stage.js

@@ -34,15 +34,15 @@ async function stageProject(settings, pkg) {
     const { updates, errors } = await (0, parse_1.createUpdates)(settings, settings.dictionary, pkg);
     if (errors.length > 0) {
         if (settings.ignoreErrors) {
-            (0, logging_1.logWarning)(chalk_1.default.red(`CLI tool encountered errors while scanning for ${chalk_1.default.green('<T>')} tags. These components will not be translated.\n` +
+            (0, logging_1.logWarning)(chalk_1.default.yellow(`Warning: CLI tool encountered syntax errors while scanning for translatable content. These components will not be translated.\n` +
                 errors
-                    .map((error) => chalk_1.default.yellow('• Warning: ') + error + '\n')
+                    .map((error) => chalk_1.default.yellow('• ') + chalk_1.default.white(error) + '\n')
                     .join('')));
         }
         else {
-            (0, errors_1.logErrorAndExit)(chalk_1.default.red(`CLI tool encountered errors while scanning for ${chalk_1.default.green('<T>')} tags. ${chalk_1.default.gray('To ignore these errors, re-run with --ignore-errors')}\n` +
+            (0, errors_1.logErrorAndExit)(chalk_1.default.red(`Error: CLI tool encountered syntax errors while scanning for translatable content. ${chalk_1.default.gray('To ignore these errors, re-run with --ignore-errors')}\n` +
                 errors
-                    .map((error) => chalk_1.default.red('• Error: ') + error + '\n')
+                    .map((error) => chalk_1.default.red('• ') + chalk_1.default.white(error) + '\n')
                     .join('')));
         }
     }
@@ -64,6 +64,9 @@ async function stageProject(settings, pkg) {
     if (!settings.apiKey) {
         (0, errors_1.logErrorAndExit)(errors_2.noApiKeyError);
     }
+    if (settings.apiKey.startsWith('gtx-dev-')) {
+        (0, errors_1.logErrorAndExit)(errors_1.devApiKeyError);
+    }
     if (!settings.projectId) {
         (0, errors_1.logErrorAndExit)(errors_2.noProjectIdError);
     }

package/dist/types/index.d.ts

@@ -97,4 +97,5 @@ export type Settings = {
     version?: string;
     description?: string;
     src?: string[];
+    framework?: SupportedFrameworks;
 };

package/dist/utils/credentials.d.ts

@@ -1,12 +1,12 @@
-import { Settings } from '../types';
+import { Settings, SupportedFrameworks } from '../types';
 type Credentials = {
     apiKey: string;
     projectId: string;
 };
-export declare function retrieveCredentials(settings: Settings): Promise<Credentials>;
-export declare function generateCredentialsSession(url: string): Promise<{
+export declare function retrieveCredentials(settings: Settings, keyType: 'development' | 'production'): Promise<Credentials>;
+export declare function generateCredentialsSession(url: string, keyType: 'development' | 'production'): Promise<{
     sessionId: string;
 }>;
 export declare function areCredentialsSet(): string | undefined;
-export declare function setCredentials(credentials: Credentials): Promise<void>;
+export declare function setCredentials(credentials: Credentials, type: 'development' | 'production', framework?: SupportedFrameworks): Promise<void>;
 export {};

package/dist/utils/credentials.js

@@ -12,9 +12,9 @@ const node_path_1 = __importDefault(require("node:path"));
 const node_fs_1 = __importDefault(require("node:fs"));
 const chalk_1 = __importDefault(require("chalk"));
 // Fetches project ID and API key by opening the dashboard in the browser
-async function retrieveCredentials(settings) {
+async function retrieveCredentials(settings, keyType) {
     // Generate a session ID
-    const { sessionId } = await generateCredentialsSession(settings.baseUrl);
+    const { sessionId } = await generateCredentialsSession(settings.baseUrl, keyType);
     const urlToOpen = `${settings.dashboardUrl}/cli/wizard/${sessionId}`;
     await import('open').then((open) => open.default(urlToOpen, {
         wait: false,
@@ -53,12 +53,15 @@ async function retrieveCredentials(settings) {
     spinner.stop('Received credentials');
     return credentials;
 }
-async function generateCredentialsSession(url) {
+async function generateCredentialsSession(url, keyType) {
     const res = await fetch(`${url}/cli/wizard/session`, {
         method: 'POST',
         headers: {
             'Content-Type': 'application/json',
         },
+        body: JSON.stringify({
+            keyType,
+        }),
     });
     if (!res.ok) {
         (0, console_1.logErrorAndExit)('Failed to generate credentials session');
@@ -70,7 +73,7 @@ function areCredentialsSet() {
     return process.env.GT_PROJECT_ID && process.env.GT_API_KEY;
 }
 // Sets the credentials in .env.local file
-async function setCredentials(credentials) {
+async function setCredentials(credentials, type, framework) {
     const envFile = node_path_1.default.join(process.cwd(), '.env.local');
     let envContent = '';
     // Check if .env.local exists, create it if it doesn't
@@ -95,8 +98,29 @@ async function setCredentials(credentials) {
         envContent = await node_fs_1.default.promises.readFile(envFile, 'utf8');
     }
     // Always append the credentials to the file
-    envContent += `\nGT_PROJECT_ID=${credentials.projectId}\n`;
-    envContent += `GT_API_KEY=${credentials.apiKey}\n`;
+    let prefix = '';
+    if (framework === 'next-pages') {
+        prefix = 'NEXT_PUBLIC_';
+    }
+    else if (framework === 'vite') {
+        prefix = 'VITE_';
+    }
+    else if (framework === 'gatsby') {
+        prefix = 'GATSBY_';
+    }
+    else if (framework === 'react') {
+        prefix = 'REACT_APP_';
+    }
+    else if (framework === 'redwood') {
+        prefix = 'REDWOOD_ENV_';
+    }
+    envContent += `\n${prefix}GT_PROJECT_ID=${credentials.projectId}\n`;
+    if (type === 'development') {
+        envContent += `${prefix || ''}GT_DEV_API_KEY=${credentials.apiKey}\n`;
+    }
+    else {
+        envContent += `GT_API_KEY=${credentials.apiKey}\n`;
+    }
     // Ensure we don't have excessive newlines
     envContent = envContent.replace(/\n{3,}/g, '\n\n').trim() + '\n';
     // Write the updated content back to the file

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtx-cli",
-  "version": "1.2.7",
+  "version": "1.2.8-alpha.2",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "scripts": {
@@ -69,7 +69,7 @@
     "chalk": "^4.1.2",
     "commander": "^12.1.0",
     "dotenv": "^16.4.5",
-    "esbuild": "^0.23.1",
+    "esbuild": "^0.25.4",
     "fast-glob": "^3.3.3",
     "form-data": "^4.0.2",
     "generaltranslation": "^6.2.4",