gtx-cli 1.2.30 → 1.2.31-alpha.2

package/dist/api/checkFileTranslations.d.ts

@@ -8,7 +8,7 @@
  * @param timeoutDuration - The timeout duration for the wait in seconds
  * @returns True if all translations are deployed, false otherwise
  */
-export declare function checkFileTranslations(apiKey: string, baseUrl: string, data: {
+export declare function checkFileTranslations(projectId: string, apiKey: string, baseUrl: string, data: {
     [key: string]: {
         versionId: string;
         fileName: string;

package/dist/api/checkFileTranslations.js

@@ -3,6 +3,7 @@ import { createOraSpinner, logError } from '../console/logging.js';
 import { getLocaleProperties } from 'generaltranslation';
 import { downloadFile } from './downloadFile.js';
 import { downloadFileBatch } from './downloadFileBatch.js';
+import { getAuthHeaders } from '../utils/headers.js';
 /**
  * Checks the status of translations for a given version ID
  * @param apiKey - The API key for the General Translation API
@@ -13,7 +14,7 @@ import { downloadFileBatch } from './downloadFileBatch.js';
  * @param timeoutDuration - The timeout duration for the wait in seconds
  * @returns True if all translations are deployed, false otherwise
  */
-export async function checkFileTranslations(apiKey, baseUrl, data, locales, timeoutDuration, resolveOutputPath, downloadStatus) {
+export async function checkFileTranslations(projectId, apiKey, baseUrl, data, locales, timeoutDuration, resolveOutputPath, downloadStatus) {
     const startTime = Date.now();
     console.log();
     const spinner = await createOraSpinner();
@@ -21,7 +22,7 @@ export async function checkFileTranslations(apiKey, baseUrl, data, locales, time
     // Initialize the query data
     const fileQueryData = prepareFileQueryData(data, locales);
     // Do first check immediately
-    const initialCheck = await checkTranslationDeployment(baseUrl, apiKey, fileQueryData, downloadStatus, spinner, resolveOutputPath);
+    const initialCheck = await checkTranslationDeployment(baseUrl, projectId, apiKey, fileQueryData, downloadStatus, spinner, resolveOutputPath);
     if (initialCheck) {
         spinner.succeed(chalk.green('Files translated!'));
         return true;
@@ -33,7 +34,7 @@ export async function checkFileTranslations(apiKey, baseUrl, data, locales, time
         // Start the interval aligned with the original request time
         setTimeout(() => {
             intervalCheck = setInterval(async () => {
-                const isDeployed = await checkTranslationDeployment(baseUrl, apiKey, fileQueryData, downloadStatus, spinner, resolveOutputPath);
+                const isDeployed = await checkTranslationDeployment(baseUrl, projectId, apiKey, fileQueryData, downloadStatus, spinner, resolveOutputPath);
                 const elapsed = Date.now() - startTime;
                 if (isDeployed || elapsed >= timeoutDuration * 1000) {
                     clearInterval(intervalCheck);
@@ -156,7 +157,7 @@ function generateStatusSuffixText(downloadStatus, fileQueryData) {
 /**
  * Checks translation status and downloads ready files
  */
-async function checkTranslationDeployment(baseUrl, apiKey, fileQueryData, downloadStatus, spinner, resolveOutputPath) {
+async function checkTranslationDeployment(baseUrl, projectId, apiKey, fileQueryData, downloadStatus, spinner, resolveOutputPath) {
     try {
         // Only query for files that haven't been downloaded yet
         const currentQueryData = fileQueryData.filter((item) => !downloadStatus.downloaded.has(`${item.fileName}:${item.locale}`) &&
@@ -169,7 +170,7 @@ async function checkTranslationDeployment(baseUrl, apiKey, fileQueryData, downlo
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
-                ...(apiKey && { 'x-gt-api-key': apiKey }),
+                ...getAuthHeaders(projectId, apiKey),
             },
             body: JSON.stringify({ files: currentQueryData }),
         });
@@ -193,7 +194,7 @@ async function checkTranslationDeployment(baseUrl, apiKey, fileQueryData, downlo
                 });
                 // Use batch download if there are multiple files
                 if (batchFiles.length > 1) {
-                    const batchResult = await downloadFileBatch(baseUrl, apiKey, batchFiles.map(({ translationId, outputPath }) => ({
+                    const batchResult = await downloadFileBatch(baseUrl, projectId, apiKey, batchFiles.map(({ translationId, outputPath }) => ({
                         translationId,
                         outputPath,
                     })));
@@ -211,7 +212,7 @@ async function checkTranslationDeployment(baseUrl, apiKey, fileQueryData, downlo
                 else if (batchFiles.length === 1) {
                     // For a single file, use the original downloadFile method
                     const file = batchFiles[0];
-                    const result = await downloadFile(baseUrl, apiKey, file.translationId, file.outputPath);
+                    const result = await downloadFile(baseUrl, projectId, apiKey, file.translationId, file.outputPath);
                     if (result) {
                         downloadStatus.downloaded.add(file.fileLocale);
                     }

package/dist/api/downloadFile.d.ts

@@ -1 +1 @@
-export declare function downloadFile(baseUrl: string, apiKey: string, translationId: string, outputPath: string, maxRetries?: number, retryDelay?: number): Promise<boolean>;
+export declare function downloadFile(baseUrl: string, projectId: string, apiKey: string, translationId: string, outputPath: string, maxRetries?: number, retryDelay?: number): Promise<boolean>;

package/dist/api/downloadFile.js

@@ -1,15 +1,16 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { logError } from '../console/logging.js';
+import { getAuthHeaders } from '../utils/headers.js';
 // Helper function to download a file
-export async function downloadFile(baseUrl, apiKey, translationId, outputPath, maxRetries = 3, retryDelay = 1000) {
+export async function downloadFile(baseUrl, projectId, apiKey, translationId, outputPath, maxRetries = 3, retryDelay = 1000) {
     let retries = 0;
     while (retries <= maxRetries) {
         try {
             const downloadResponse = await fetch(`${baseUrl}/v1/project/translations/files/${translationId}/download`, {
                 method: 'GET',
                 headers: {
-                    ...(apiKey && { 'x-gt-api-key': apiKey }),
+                    ...getAuthHeaders(projectId, apiKey),
                 },
             });
             if (downloadResponse.ok) {

package/dist/api/downloadFileBatch.d.ts

@@ -7,7 +7,7 @@
  * @param retryDelay - Delay between retries in milliseconds
  * @returns Object containing successful and failed file IDs
  */
-export declare function downloadFileBatch(baseUrl: string, apiKey: string, files: Array<{
+export declare function downloadFileBatch(baseUrl: string, projectId: string, apiKey: string, files: Array<{
     translationId: string;
     outputPath: string;
 }>, maxRetries?: number, retryDelay?: number): Promise<{

package/dist/api/downloadFileBatch.js

@@ -1,6 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { logError, logWarning } from '../console/logging.js';
+import { getAuthHeaders } from '../utils/headers.js';
 /**
  * Downloads multiple translation files in a single batch request
  * @param baseUrl - The base URL for the General Translation API
@@ -10,7 +11,7 @@ import { logError, logWarning } from '../console/logging.js';
  * @param retryDelay - Delay between retries in milliseconds
  * @returns Object containing successful and failed file IDs
  */
-export async function downloadFileBatch(baseUrl, apiKey, files, maxRetries = 3, retryDelay = 1000) {
+export async function downloadFileBatch(baseUrl, projectId, apiKey, files, maxRetries = 3, retryDelay = 1000) {
     let retries = 0;
     const fileIds = files.map((file) => file.translationId);
     const result = { successful: [], failed: [] };
@@ -22,7 +23,7 @@ export async function downloadFileBatch(baseUrl, apiKey, files, maxRetries = 3,
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
-                    ...(apiKey && { 'x-gt-api-key': apiKey }),
+                    ...getAuthHeaders(projectId, apiKey),
                 },
                 body: JSON.stringify({ fileIds }),
             });

package/dist/api/fetchTranslations.d.ts

@@ -7,4 +7,4 @@ import { RetrievedTranslations } from '../types/api.js';
  * @param translationsDir - The directory to save the translations to
  * @param fileType - The file type to save the translations as (file extension)
  */
-export declare function fetchTranslations(baseUrl: string, apiKey: string, versionId: string): Promise<RetrievedTranslations>;
+export declare function fetchTranslations(baseUrl: string, projectId: string, apiKey: string, versionId: string): Promise<RetrievedTranslations>;

package/dist/api/fetchTranslations.js

@@ -1,5 +1,6 @@
 import chalk from 'chalk';
 import { logError } from '../console/logging.js';
+import { getAuthHeaders } from '../utils/headers.js';
 /**
  * Fetches translations from the API and saves them to a local directory
  * @param baseUrl - The base URL for the API
@@ -8,13 +9,13 @@ import { logError } from '../console/logging.js';
  * @param translationsDir - The directory to save the translations to
  * @param fileType - The file type to save the translations as (file extension)
  */
-export async function fetchTranslations(baseUrl, apiKey, versionId) {
+export async function fetchTranslations(baseUrl, projectId, apiKey, versionId) {
     // First fetch the translations from the API
     const response = await fetch(`${baseUrl}/v1/project/translations/info/${encodeURIComponent(versionId)}`, {
         method: 'GET',
         headers: {
             'Content-Type': 'application/json',
-            ...(apiKey && { 'x-gt-api-key': apiKey }),
+            ...getAuthHeaders(projectId, apiKey),
         },
     });
     if (response.ok) {

package/dist/api/sendFiles.js

@@ -1,5 +1,6 @@
 import chalk from 'chalk';
 import { createSpinner, logMessage, logSuccess } from '../console/logging.js';
+import { getAuthHeaders } from '../utils/headers.js';
 /**
  * Sends multiple files for translation to the API
  * @param files - Array of file objects to translate
@@ -7,7 +8,6 @@ import { createSpinner, logMessage, logSuccess } from '../console/logging.js';
  * @returns The translated content or version ID
  */
 export async function sendFiles(files, options) {
-    const { apiKey } = options;
     logMessage(chalk.cyan('Files to translate:') +
         '\n' +
         files.map((file) => `  - ${chalk.bold(file.fileName)}`).join('\n'));
@@ -35,7 +35,7 @@ export async function sendFiles(files, options) {
         const response = await fetch(`${options.baseUrl}/v1/project/translations/files/upload`, {
             method: 'POST',
             headers: {
-                ...(apiKey && { 'x-gt-api-key': apiKey }),
+                ...getAuthHeaders(options.projectId, options.apiKey),
             },
             body: formData,
         });

package/dist/api/sendUpdates.js

@@ -2,6 +2,7 @@ import chalk from 'chalk';
 import { createSpinner, logSuccess, logWarning } from '../console/logging.js';
 import updateConfig from '../fs/config/updateConfig.js';
 import { isUsingLocalTranslations } from '../config/utils.js';
+import { getAuthHeaders } from '../utils/headers.js';
 /**
  * Sends updates to the API
  * @param updates - The updates to send
@@ -35,7 +36,7 @@ export async function sendUpdates(updates, options, library) {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
-                ...(apiKey && { 'x-gt-api-key': apiKey }),
+                ...getAuthHeaders(options.projectId, options.apiKey),
             },
             body: JSON.stringify(body),
         });

package/dist/api/waitForUpdates.d.ts

@@ -8,4 +8,4 @@
  * @param timeoutDuration - The timeout duration for the wait
  * @returns True if all translations are deployed, false otherwise
  */
-export declare const waitForUpdates: (apiKey: string, baseUrl: string, versionId: string, startTime: number, timeoutDuration: number) => Promise<boolean>;
+export declare const waitForUpdates: (projectId: string, apiKey: string, baseUrl: string, versionId: string, startTime: number, timeoutDuration: number) => Promise<boolean>;

package/dist/api/waitForUpdates.js

@@ -1,6 +1,7 @@
 import chalk from 'chalk';
 import { createOraSpinner, logErrorAndExit, } from '../console/logging.js';
 import { getLocaleProperties } from 'generaltranslation';
+import { getAuthHeaders } from '../utils/headers.js';
 /**
  * Waits for translations to be deployed to the General Translation API
  * @param apiKey - The API key for the General Translation API
@@ -11,7 +12,7 @@ import { getLocaleProperties } from 'generaltranslation';
  * @param timeoutDuration - The timeout duration for the wait
  * @returns True if all translations are deployed, false otherwise
  */
-export const waitForUpdates = async (apiKey, baseUrl, versionId, startTime, timeoutDuration) => {
+export const waitForUpdates = async (projectId, apiKey, baseUrl, versionId, startTime, timeoutDuration) => {
     console.log();
     const spinner = await createOraSpinner();
     spinner.start('Waiting for translation...');
@@ -21,7 +22,7 @@ export const waitForUpdates = async (apiKey, baseUrl, versionId, startTime, time
                 method: 'GET',
                 headers: {
                     'Content-Type': 'application/json',
-                    ...(apiKey && { 'x-gt-api-key': apiKey }),
+                    ...getAuthHeaders(projectId, apiKey),
                 },
             });
             if (response.ok) {

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/formats/files/translate.js

@@ -99,7 +99,7 @@ export async function translateFiles(filePaths, placeholderPaths, transformPaths
         // Process any translations that were already completed and returned with the initial response
         const downloadStatus = await processInitialTranslations(translations, fileMapping, options);
         // Check for remaining translations
-        await checkFileTranslations(options.apiKey, options.baseUrl, data, locales, 600, (sourcePath, locale) => fileMapping[locale][sourcePath], downloadStatus // Pass the already downloaded files to avoid duplicate requests
+        await checkFileTranslations(options.projectId, options.apiKey, options.baseUrl, data, locales, 600, (sourcePath, locale) => fileMapping[locale][sourcePath], downloadStatus // Pass the already downloaded files to avoid duplicate requests
         );
     }
     catch (error) {
@@ -181,7 +181,7 @@ async function processInitialTranslations(translations = [], fileMapping, option
         }
         // Use batch download if there are multiple files
         if (batchFiles.length > 1) {
-            const batchResult = await downloadFileBatch(options.baseUrl, options.apiKey, batchFiles.map(({ translationId, outputPath }) => ({
+            const batchResult = await downloadFileBatch(options.baseUrl, options.projectId, options.apiKey, batchFiles.map(({ translationId, outputPath }) => ({
                 translationId,
                 outputPath,
             })));
@@ -199,7 +199,7 @@ async function processInitialTranslations(translations = [], fileMapping, option
         else if (batchFiles.length === 1) {
             // For a single file, use the original downloadFile method
             const file = batchFiles[0];
-            const result = await downloadFile(options.baseUrl, options.apiKey, file.translationId, file.outputPath);
+            const result = await downloadFile(options.baseUrl, options.projectId, options.apiKey, file.translationId, file.outputPath);
             if (result) {
                 downloadStatus.downloaded.add(file.fileLocale);
             }

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/dist/translation/translate.js

@@ -6,11 +6,11 @@ export async function translate(settings, versionId) {
     // timeout was validated earlier
     const startTime = Date.now();
     const timeout = parseInt(settings.timeout) * 1000;
-    const result = await waitForUpdates(settings.apiKey, settings.baseUrl, versionId, startTime, timeout);
+    const result = await waitForUpdates(settings.projectId, settings.apiKey, settings.baseUrl, versionId, startTime, timeout);
     if (!result) {
         process.exit(1);
     }
-    const translations = await fetchTranslations(settings.baseUrl, settings.apiKey, versionId);
+    const translations = await fetchTranslations(settings.baseUrl, settings.projectId, settings.apiKey, versionId);
     // Save translations to local directory if files.gt.output is provided
     if (settings.files && isUsingLocalTranslations(settings)) {
         await saveTranslations(translations, settings.files.placeholderPaths, 'JSX');

package/dist/utils/headers.d.ts

@@ -0,0 +1 @@
+export declare function getAuthHeaders(projectId: string, apiKey: string): Record<string, string>;

package/dist/utils/headers.js

@@ -0,0 +1,14 @@
+export function getAuthHeaders(projectId, apiKey) {
+    const authHeaders = {
+        'x-gt-project-id': projectId,
+    };
+    if (apiKey) {
+        if (apiKey.startsWith('gtx-internal-')) {
+            authHeaders['x-gt-internal-api-key'] = apiKey;
+        }
+        else {
+            authHeaders['x-gt-api-key'] = apiKey;
+        }
+    }
+    return authHeaders;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtx-cli",
-  "version": "1.2.30",
+  "version": "1.2.31-alpha.2",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [
@@ -11,6 +11,7 @@
   "scripts": {
     "build": "tsc",
     "build:clean": "rm -rf dist; npm run build",
+    "build:release": "npm run build:clean",
     "lint": "eslint \"src/**/*.{js,ts}\" \"__tests__/**/*.{js,ts}\"",
     "lint:fix": "eslint \"src/**/*.{js,ts}\" \"__tests__/**/*.{js,ts}\" --fix",
     "test": "vitest run",