gtx-cli 1.2.31-alpha.1 → 1.2.31-alpha.2

package/dist/config/generateSettings.js

@@ -1,5 +1,5 @@
-import { displayProjectId, warnApiKeyInConfig } from '../console/logging.js';
-import loadConfig from '../fs/config/loadConfig.js';
+import { displayProjectId, logErrorAndExit, warnApiKeyInConfig, } from '../console/logging.js';
+import { loadConfig } from '../fs/config/loadConfig.js';
 import { defaultBaseUrl, libraryDefaultLocale, } from 'generaltranslation/internal';
 import fs from 'node:fs';
 import { createOrUpdateConfig } from '../fs/config/setupConfig.js';
@@ -9,6 +9,8 @@ import { validateSettings } from './validateSettings.js';
 import { GT_DASHBOARD_URL } from '../utils/constants.js';
 import { resolveProjectId } from '../fs/utils.js';
 import path from 'node:path';
+import chalk from 'chalk';
+import { resolveConfig } from './resolveConfig.js';
 /**
  * Generates settings from any
  * @param options - The options to generate settings from
@@ -24,23 +26,33 @@ export async function generateSettings(options, cwd = process.cwd()) {
     if (options.config) {
         gtConfig = loadConfig(options.config);
     }
-    else if (fs.existsSync(path.join(cwd, 'gt.config.json'))) {
-        options.config = path.join(cwd, 'gt.config.json');
-        gtConfig = loadConfig(options.config);
-    }
-    else if (fs.existsSync(path.join(cwd, 'src/gt.config.json'))) {
-        options.config = path.join(cwd, 'src/gt.config.json');
-        gtConfig = loadConfig(options.config);
-    }
     else {
-        // If neither config exists, use empty config
-        gtConfig = {};
+        const config = resolveConfig(cwd);
+        if (config) {
+            gtConfig = config.config;
+            options.config = config.path;
+        }
+        else {
+            gtConfig = {};
+        }
     }
     // Warn if apiKey is present in gt.config.json
     if (gtConfig.apiKey) {
         warnApiKeyInConfig(options.config);
         process.exit(1);
     }
+    const projectIdEnv = resolveProjectId();
+    // Resolve mismatched projectIds
+    if (gtConfig.projectId &&
+        options.projectId &&
+        gtConfig.projectId !== options.projectId) {
+        logErrorAndExit(`Project ID mismatch between ${chalk.green(gtConfig.projectId)} and ${chalk.green(options.projectId)}! Please use the same projectId in all configs.`);
+    }
+    else if (gtConfig.projectId &&
+        projectIdEnv &&
+        gtConfig.projectId !== projectIdEnv) {
+        logErrorAndExit(`Project ID mismatch between ${chalk.green(gtConfig.projectId)} and ${chalk.green(projectIdEnv)}! Please use the same projectId in all configs.`);
+    }
     // merge options
     const mergedOptions = { ...gtConfig, ...options };
     // merge locales

package/dist/config/resolveConfig.d.ts

@@ -0,0 +1,4 @@
+export declare function resolveConfig(cwd: string): {
+    path: string;
+    config: Record<string, any>;
+} | null;

package/dist/config/resolveConfig.js

@@ -0,0 +1,19 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { loadConfig } from '../fs/config/loadConfig.js';
+export function resolveConfig(cwd) {
+    const configFilepath = 'gt.config.json';
+    if (fs.existsSync(path.join(cwd, configFilepath))) {
+        return {
+            path: path.join(cwd, configFilepath),
+            config: loadConfig(path.join(cwd, configFilepath)),
+        };
+    }
+    if (fs.existsSync(path.join(cwd, 'src/gt.config.json'))) {
+        return {
+            path: path.join(cwd, 'src/gt.config.json'),
+            config: loadConfig(path.join(cwd, 'src/gt.config.json')),
+        };
+    }
+    return null;
+}

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

@@ -1 +1 @@
-export default function loadConfig(filepath: string): Record<string, any>;
+export declare function loadConfig(filepath: string): Record<string, any>;

package/dist/fs/config/loadConfig.js

@@ -1,5 +1,5 @@
 import fs from 'node:fs';
-export default function loadConfig(filepath) {
+export function loadConfig(filepath) {
     try {
         return JSON.parse(fs.readFileSync(filepath, 'utf-8'));
     }

package/package.json

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