gtx-cli 1.2.27 → 1.2.28

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # gtx-cli
 
+## 1.2.28
+
+### Patch Changes
+
+- [#397](https://github.com/generaltranslation/gt/pull/397) [`80a1395`](https://github.com/generaltranslation/gt/commit/80a13955db9ff46e5883ac8b0909ab294c63d001) Thanks [@brian-lou](https://github.com/brian-lou)! - Run translate after i18n
+
 ## 1.2.27
 
 ### Patch Changes

package/dist/api/waitForUpdates.js

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import { createOraSpinner } from '../console/logging.js';
+import { createOraSpinner, logErrorAndExit, } from '../console/logging.js';
 import { getLocaleProperties } from 'generaltranslation';
 /**
  * Waits for translations to be deployed to the General Translation API
@@ -28,8 +28,13 @@ export const waitForUpdates = async (apiKey, baseUrl, versionId, startTime, time
                 const data = await response.json();
                 const { availableLocales, locales, localesWaitingForApproval } = data;
                 if (localesWaitingForApproval.length > 0) {
-                    spinner.text = `Waiting for approval for ${localesWaitingForApproval.length} locales`;
-                    return false;
+                    spinner.stop();
+                    logErrorAndExit(`Error! ${localesWaitingForApproval.length} translations are waiting for approval:\n${localesWaitingForApproval
+                        .map((locale) => {
+                        const localeProperties = getLocaleProperties(locale);
+                        return `${localeProperties.name} (${localeProperties.code})`;
+                    })
+                        .join('\n')}\nPlease approve these locales in the General Translation dashboard, then re-run the command.`);
                 }
                 if (availableLocales) {
                     availableLocales.forEach((locale) => {

package/dist/config/generateSettings.d.ts

@@ -2,6 +2,7 @@ import { Settings } from '../types/index.js';
 /**
  * Generates settings from any
  * @param options - The options to generate settings from
+ * @param cwd - The current working directory
  * @returns The generated settings
  */
-export declare function generateSettings(options: any): Promise<Settings>;
+export declare function generateSettings(options: any, cwd?: string): Promise<Settings>;

package/dist/config/generateSettings.js

@@ -8,12 +8,14 @@ import { findFilepaths } from '../fs/findFilepath.js';
 import { validateSettings } from './validateSettings.js';
 import { GT_DASHBOARD_URL } from '../utils/constants.js';
 import { resolveProjectId } from '../fs/utils.js';
+import path from 'node:path';
 /**
  * Generates settings from any
  * @param options - The options to generate settings from
+ * @param cwd - The current working directory
  * @returns The generated settings
  */
-export async function generateSettings(options) {
+export async function generateSettings(options, cwd = process.cwd()) {
     // Load config file
     let gtConfig = {};
     if (options.config && !options.config.endsWith('.json')) {
@@ -22,13 +24,13 @@ export async function generateSettings(options) {
     if (options.config) {
         gtConfig = loadConfig(options.config);
     }
-    else if (fs.existsSync('gt.config.json')) {
-        options.config = 'gt.config.json';
-        gtConfig = loadConfig('gt.config.json');
+    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('src/gt.config.json')) {
-        options.config = 'src/gt.config.json';
-        gtConfig = loadConfig('src/gt.config.json');
+    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
@@ -57,7 +59,8 @@ export async function generateSettings(options) {
     // Add locales if not provided
     mergedOptions.locales = mergedOptions.locales || [];
     // Add default config file name if not provided
-    mergedOptions.config = mergedOptions.config || 'gt.config.json';
+    mergedOptions.config =
+        mergedOptions.config || path.join(cwd, 'gt.config.json');
     // Display projectId if present
     if (mergedOptions.projectId)
         displayProjectId(mergedOptions.projectId);
@@ -67,10 +70,15 @@ export async function generateSettings(options) {
     // Populate src if not provided
     mergedOptions.src =
         mergedOptions.src ||
-            findFilepaths(['./src', './app', './pages', './components']);
+            findFilepaths([
+                path.join(cwd, './src'),
+                path.join(cwd, './app'),
+                path.join(cwd, './pages'),
+                path.join(cwd, './components'),
+            ]);
     // Resolve all glob patterns in the files object
     mergedOptions.files = mergedOptions.files
-        ? resolveFiles(mergedOptions.files, mergedOptions.defaultLocale)
+        ? resolveFiles(mergedOptions.files, mergedOptions.defaultLocale, cwd)
         : undefined;
     // if there's no existing config file, creates one
     // does not include the API key to avoid exposing it

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

@@ -16,7 +16,7 @@ export declare function resolveLocaleFiles(files: ResolvedFiles, locale: string)
  * @param files - The files object
  * @returns The resolved files
  */
-export declare function resolveFiles(files: FilesOptions, locale: string): {
+export declare function resolveFiles(files: FilesOptions, locale: string, cwd: string): {
     resolvedPaths: ResolvedFiles;
     placeholderPaths: ResolvedFiles;
     transformPaths: TransformFiles;

package/dist/fs/config/parseFilesConfig.js

@@ -28,7 +28,7 @@ export function resolveLocaleFiles(files, locale) {
  * @param files - The files object
  * @returns The resolved files
  */
-export function resolveFiles(files, locale) {
+export function resolveFiles(files, locale, cwd) {
     // Initialize result object with empty arrays for each file type
     const result = {};
     const placeholderResult = {};
@@ -45,7 +45,7 @@ export function resolveFiles(files, locale) {
         }
         // ==== PLACEHOLDERS ==== //
         if (files[fileType]?.include) {
-            const filePaths = expandGlobPatterns(files[fileType].include, files[fileType]?.exclude || [], locale, transformPaths[fileType] || undefined);
+            const filePaths = expandGlobPatterns(cwd, files[fileType].include, files[fileType]?.exclude || [], locale, transformPaths[fileType] || undefined);
             result[fileType] = filePaths.resolvedPaths;
             placeholderResult[fileType] = filePaths.placeholderPaths;
         }
@@ -57,7 +57,7 @@ export function resolveFiles(files, locale) {
     };
 }
 // Helper function to expand glob patterns
-function expandGlobPatterns(includePatterns, excludePatterns, locale, transformPatterns) {
+function expandGlobPatterns(cwd, includePatterns, excludePatterns, locale, transformPatterns) {
     // Expand glob patterns to include all matching files
     const resolvedPaths = [];
     const placeholderPaths = [];
@@ -81,9 +81,9 @@ function expandGlobPatterns(includePatterns, excludePatterns, locale, transformP
         }
         const expandedPattern = pattern.replace(/\[locale\]/g, locale);
         // Resolve the absolute pattern path
-        const absolutePattern = path.resolve(process.cwd(), expandedPattern);
+        const absolutePattern = path.resolve(cwd, expandedPattern);
         // Prepare exclude patterns with locale replaced
-        const expandedExcludePatterns = excludePatterns.map((p) => path.resolve(process.cwd(), p.replace(/\[locale\]/g, locale)));
+        const expandedExcludePatterns = excludePatterns.map((p) => path.resolve(cwd, p.replace(/\[locale\]/g, locale)));
         // Use fast-glob to find all matching files, excluding the patterns
         const matches = fg.sync(absolutePattern, {
             absolute: true,
@@ -93,7 +93,7 @@ function expandGlobPatterns(includePatterns, excludePatterns, locale, transformP
         // For each match, create a version with [locale] in the correct positions
         matches.forEach((match) => {
             // Convert to relative path to make replacement easier
-            const relativePath = path.relative(process.cwd(), match);
+            const relativePath = path.relative(cwd, match);
             let originalRelativePath = relativePath;
             // Replace locale with [locale] at each tracked position
             if (localePositions.length > 0) {
@@ -113,7 +113,7 @@ function expandGlobPatterns(includePatterns, excludePatterns, locale, transformP
                 originalRelativePath = pathParts.join(path.sep);
             }
             // Convert back to absolute path
-            const originalPath = path.resolve(process.cwd(), originalRelativePath);
+            const originalPath = path.resolve(cwd, originalRelativePath);
             placeholderPaths.push(originalPath);
         });
     }

package/dist/utils/packageManager.d.ts

@@ -3,6 +3,7 @@ export interface PackageManager {
     name: string;
     label: string;
     installCommand: string;
+    installAllCommand: string;
     buildCommand: string;
     runScriptCommand: string;
     flags: string;
@@ -12,6 +13,9 @@ export interface PackageManager {
     detect: (cwd: string) => boolean;
     addOverride: (pkgName: string, pkgVersion: string) => Promise<void>;
 }
+export declare class NoPackageManagerError extends Error {
+    constructor(message: string);
+}
 export declare const BUN: PackageManager;
 export declare const DENO: PackageManager;
 export declare const YARN_V1: PackageManager;
@@ -21,4 +25,4 @@ export declare const PNPM: PackageManager;
 export declare const NPM: PackageManager;
 export declare const packageManagers: PackageManager[];
 export declare function _detectPackageManger(cwd: string): PackageManager | null;
-export declare function getPackageManager(cwd?: string, specifiedPackageManager?: string): Promise<PackageManager>;
+export declare function getPackageManager(cwd?: string, specifiedPackageManager?: string, errorIfNotFound?: boolean): Promise<PackageManager>;

package/dist/utils/packageManager.js

@@ -3,11 +3,18 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { getPackageJson, updatePackageJson } from './packageJson.js';
 import { promptSelect } from '../console/logging.js';
+export class NoPackageManagerError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'NoPackageManagerError';
+    }
+}
 export const BUN = {
     id: 'bun',
     name: 'bun',
     label: 'Bun',
     installCommand: 'add',
+    installAllCommand: 'bun install',
     buildCommand: 'bun run build',
     runScriptCommand: 'bun run',
     flags: '',
@@ -41,6 +48,7 @@ export const DENO = {
     name: 'deno',
     label: 'Deno',
     installCommand: 'install',
+    installAllCommand: 'deno install',
     buildCommand: 'deno task build',
     runScriptCommand: 'deno task',
     flags: '',
@@ -75,6 +83,7 @@ export const YARN_V1 = {
     name: 'yarn',
     label: 'Yarn V1',
     installCommand: 'add',
+    installAllCommand: 'yarn install',
     buildCommand: 'yarn build',
     runScriptCommand: 'yarn',
     flags: '--ignore-workspace-root-check',
@@ -112,6 +121,7 @@ export const YARN_V2 = {
     name: 'yarn',
     label: 'Yarn V2/3/4',
     installCommand: 'add',
+    installAllCommand: 'yarn install',
     buildCommand: 'yarn build',
     runScriptCommand: 'yarn',
     flags: '',
@@ -148,6 +158,7 @@ export const PNPM = {
     name: 'pnpm',
     label: 'PNPM',
     installCommand: 'add',
+    installAllCommand: 'pnpm install',
     buildCommand: 'pnpm build',
     runScriptCommand: 'pnpm',
     flags: '--ignore-workspace-root-check',
@@ -185,6 +196,7 @@ export const NPM = {
     name: 'npm',
     label: 'NPM',
     installCommand: 'install',
+    installAllCommand: 'npm ci',
     buildCommand: 'npm run build',
     runScriptCommand: 'npm run',
     flags: '',
@@ -225,7 +237,7 @@ export function _detectPackageManger(cwd) {
 }
 // Get the package manager for the current project
 // Uses a global cache to avoid prompting the user multiple times
-export async function getPackageManager(cwd = process.cwd(), specifiedPackageManager) {
+export async function getPackageManager(cwd = process.cwd(), specifiedPackageManager, errorIfNotFound = false) {
     const globalWizard = global;
     if (globalWizard._gt_wizard_cached_package_manager) {
         return globalWizard._gt_wizard_cached_package_manager;
@@ -242,6 +254,9 @@ export async function getPackageManager(cwd = process.cwd(), specifiedPackageMan
         globalWizard._gt_wizard_cached_package_manager = detectedPackageManager;
         return detectedPackageManager;
     }
+    if (errorIfNotFound) {
+        throw new NoPackageManagerError('No package manager found');
+    }
     const selectedPackageManager = await promptSelect({
         message: 'Please select your package manager.',
         options: packageManagers.map((packageManager) => ({

package/package.json

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