gtx-cli 2.5.30-alpha.9 → 2.5.31

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # gtx-cli
 
+## 2.5.31
+
+### Patch Changes
+
+- [#895](https://github.com/generaltranslation/gt/pull/895) [`a64277c`](https://github.com/generaltranslation/gt/commit/a64277cd1d633899f4ac0977b389ccfa00660512) Thanks [@ErnestM1234](https://github.com/ErnestM1234)! - fix: support for cli execution independent of package resolution
+
+## 2.5.30
+
+### Patch Changes
+
+- [#896](https://github.com/generaltranslation/gt/pull/896) [`443ee73`](https://github.com/generaltranslation/gt/commit/443ee73395a514eec448b03810cb871062bf5b2a) Thanks [@brian-lou](https://github.com/brian-lou)! - Fix dry-run error conditions
+
 ## 2.5.29
 
 ### Patch Changes

package/dist/bin/bin-entry.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/bin/bin-entry.js

@@ -0,0 +1,9 @@
+// Entry point for binaries
+import { main } from '../index.js';
+import dotenv from 'dotenv';
+import { program } from 'commander';
+dotenv.config({ path: '.env' });
+dotenv.config({ path: '.env.local', override: true });
+dotenv.config({ path: '.env.production', override: true });
+main(program);
+program.parse();

package/dist/{router.js → bin/bin-main.js}

@@ -28,11 +28,13 @@ function detectPlatform() {
 function routeToBinary() {
     const binaryName = detectPlatform();
     if (!binaryName) {
-        return;
+        console.error(`Unsupported platform: ${process.platform}-${process.arch}`);
+        process.exit(1);
     }
-    const binaryPath = join(__dirname, '..', 'binaries', binaryName);
+    const binaryPath = join(__dirname, '..', '..', 'binaries', binaryName);
     if (!existsSync(binaryPath)) {
-        return;
+        console.error(`Binary not found at: ${binaryPath}`);
+        process.exit(1);
     }
     // Check and fix execute permissions if needed (Unix-like systems only)
     if (process.platform !== 'win32') {
@@ -53,7 +55,8 @@ function routeToBinary() {
         stdio: 'inherit',
     });
     child.on('close', (code) => {
-        process.exit(code);
+        // code might be null
+        process.exit(code ?? 1);
     });
     child.on('error', () => {
         process.exit(1);

package/dist/cli/commands/setupProject.js

@@ -4,14 +4,14 @@ import { noLocalesError, noDefaultLocaleError, noApiKeyError, noProjectIdError,
 import { collectFiles } from '../../formats/files/collectFiles.js';
 import { setupProject } from '../../workflow/setupProject.js';
 export async function handleSetupProject(options, settings, library) {
+    if (!settings.locales) {
+        return logErrorAndExit(noLocalesError);
+    }
+    if (!settings.defaultLocale) {
+        return logErrorAndExit(noDefaultLocaleError);
+    }
     // Validate required settings are present if not in dry run
     if (!options.dryRun) {
-        if (!settings.locales) {
-            return logErrorAndExit(noLocalesError);
-        }
-        if (!settings.defaultLocale) {
-            return logErrorAndExit(noDefaultLocaleError);
-        }
         if (!settings.apiKey) {
             return logErrorAndExit(noApiKeyError);
         }

package/dist/cli/commands/stage.js

@@ -7,14 +7,14 @@ import updateConfig from '../../fs/config/updateConfig.js';
 import { TEMPLATE_FILE_ID } from '../../utils/constants.js';
 import { collectFiles } from '../../formats/files/collectFiles.js';
 export async function handleStage(options, settings, library, stage) {
+    if (!settings.locales) {
+        return logErrorAndExit(noLocalesError);
+    }
+    if (!settings.defaultLocale) {
+        return logErrorAndExit(noDefaultLocaleError);
+    }
     // Validate required settings are present if not in dry run
     if (!options.dryRun) {
-        if (!settings.locales) {
-            return logErrorAndExit(noLocalesError);
-        }
-        if (!settings.defaultLocale) {
-            return logErrorAndExit(noDefaultLocaleError);
-        }
         if (!settings.apiKey) {
             return logErrorAndExit(noApiKeyError);
         }

package/dist/formats/files/collectFiles.js

@@ -12,9 +12,7 @@ export async function collectFiles(options, settings, library) {
     if (library === 'gt-react' || library === 'gt-next') {
         const updates = await aggregateReactTranslations(options, settings, library);
         if (updates.length > 0) {
-            if (!options.dryRun &&
-                !settings.publish &&
-                !settings.files?.placeholderPaths.gt) {
+            if (!settings.publish && !settings.files?.placeholderPaths.gt) {
                 logErrorAndExit(invalidConfigurationError);
             }
             // Convert updates to a file object

package/dist/generated/version.d.ts

@@ -0,0 +1 @@
+export declare const PACKAGE_VERSION = "2.5.31";

package/dist/generated/version.js

@@ -0,0 +1,2 @@
+// This file is auto-generated. Do not edit manually.
+export const PACKAGE_VERSION = '2.5.31';

package/dist/index.js

@@ -3,6 +3,7 @@ import { NextCLI } from './cli/next.js';
 import { ReactCLI } from './cli/react.js';
 import { determineLibrary } from './fs/determineFramework.js';
 export function main(program) {
+    program.name('gtx-cli');
     const { library, additionalModules } = determineLibrary();
     let cli;
     if (library === 'gt-next') {

package/dist/main.d.ts

@@ -1 +1,2 @@
+#!/usr/bin/env node
 export {};

package/dist/main.js

@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+// Non-binary router - directly runs main.ts
 import { main } from './index.js';
 import dotenv from 'dotenv';
 import { program } from 'commander';

package/dist/utils/packageJson.js

@@ -2,8 +2,8 @@ import { logger } from '../console/logger.js';
 import chalk from 'chalk';
 import path from 'node:path';
 import fs from 'node:fs';
-import { fromBinariesRoot, fromPackageRoot } from '../fs/getPackageResource.js';
 import { exitSync } from '../console/logging.js';
+import { PACKAGE_VERSION } from '../generated/version.js';
 // search for package.json such that we can run init in non-js projects
 export async function searchForPackageJson(cwd = process.cwd()) {
     // Get the current working directory (where the CLI is being run)
@@ -33,25 +33,7 @@ export async function getPackageJson(cwd = process.cwd()) {
     }
 }
 export function getCLIVersion() {
-    console.log('getCLIVersion');
-    logger.error('getCLIVersion -- logger');
-    let packageJsonPath = fromPackageRoot('package.json');
-    if (!fs.existsSync(packageJsonPath)) {
-        // Try binaries behavior instead
-        packageJsonPath = fromBinariesRoot('package.json');
-        if (!fs.existsSync(packageJsonPath)) {
-            return 'unknown';
-        }
-    }
-    try {
-        const result = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8')).version;
-        console.log('CLI version: ' + result);
-        return result;
-    }
-    catch (error) {
-        console.log(chalk.red('Error getting CLI version: ' + String(error)));
-        return 'unknown';
-    }
+    return PACKAGE_VERSION;
 }
 export async function updatePackageJson(packageJson, cwd = process.cwd()) {
     try {

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "gtx-cli",
-  "version": "2.5.30-alpha.9",
+  "version": "2.5.31",
   "main": "dist/index.js",
-  "bin": "dist/router.js",
+  "bin": "dist/main.js",
   "files": [
     "dist",
     "binaries",
@@ -130,23 +130,28 @@
     "typescript": "^5.5.4"
   },
   "scripts": {
-    "build": "tsc && pnpm run build:exe",
-    "build:clean": "sh ../../scripts/clean.sh && rm -rf binaries && pnpm run build",
+    "build": "node scripts/generate-version.js && tsc",
+    "build:clean": "sh ../../scripts/clean.sh && pnpm restore-bin-release && rm -rf binaries && pnpm run build",
     "build:release": "pnpm run build:clean",
-    "build:exe": "sh scripts/build-exe.sh all",
-    "build:exe:darwin-x64": "sh scripts/build-exe.sh darwin-x64",
-    "build:exe:darwin-arm64": "sh scripts/build-exe.sh darwin-arm64",
-    "build:exe:linux-x64": "sh scripts/build-exe.sh linux-x64",
-    "build:exe:linux-arm64": "sh scripts/build-exe.sh linux-arm64",
-    "build:exe:windows-x64": "sh scripts/build-exe.sh windows-x64",
+    "build:bin": "node scripts/generate-version.js && tsc && sh scripts/build-exe.sh all",
+    "build:bin:clean": "sh ../../scripts/clean.sh && rm -rf binaries && pnpm run build:bin",
+    "build:bin:release": "pnpm run build:bin:clean && pnpm run build:bin",
+    "build:bin:darwin-x64": "sh scripts/build-exe.sh darwin-x64",
+    "build:bin:darwin-arm64": "sh scripts/build-exe.sh darwin-arm64",
+    "build:bin:linux-x64": "sh scripts/build-exe.sh linux-x64",
+    "build:bin:linux-arm64": "sh scripts/build-exe.sh linux-arm64",
+    "build:bin:windows-x64": "sh scripts/build-exe.sh windows-x64",
     "lint": "eslint \"src/**/*.{js,ts}\" \"./**/__tests__/**/*.{js,ts}\"",
     "lint:fix": "eslint \"src/**/*.{js,ts}\" \"./**/__tests__/**/*.{js,ts}\" --fix",
     "test": "vitest run --config=./vitest.config.ts",
     "test:watch": "vitest --config=./vitest.config.ts",
-    "release": "pnpm run build:clean && pnpm publish",
+    "release": "pnpm run release:normal && pnpm run release:bin",
+    "release:normal": "pnpm run build:clean && pnpm publish",
+    "release:bin": "pnpm run prep-bin-release && pnpm run build:bin:clean && pnpm publish --tag bin --no-git-checks && pnpm run restore-bin-release && pnpm run build:clean",
     "release:alpha": "pnpm run build:clean && pnpm publish --tag alpha",
     "release:beta": "pnpm run build:clean && pnpm publish --tag beta",
-    "release:bin": "pnpm run build:clean && pnpm publish --tag bin",
-    "release:latest": "pnpm run build:clean && pnpm publish --tag latest"
+    "release:latest": "pnpm run build:clean && pnpm publish --tag latest",
+    "prep-bin-release": "node scripts/prepare-binary-release.js",
+    "restore-bin-release": "node scripts/restore-package-json.js"
   }
 }

package/dist/fs/getPackageResource.d.ts

@@ -1,2 +0,0 @@
-export declare function fromPackageRoot(relative: string): string;
-export declare function fromBinariesRoot(relative: string): string;

package/dist/fs/getPackageResource.js

@@ -1,11 +0,0 @@
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-export function fromPackageRoot(relative) {
-    console.log('fromPackageRoot __dirname' + __dirname);
-    return path.resolve(__dirname, `../../`, relative);
-}
-export function fromBinariesRoot(relative) {
-    console.log('fromBinariesRoot __dirname' + __dirname);
-    return path.resolve(__dirname, `../`, relative);
-}