gtx-cli 2.0.3 → 2.0.5

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # gtx-cli
 
+## 2.0.5
+
+### Patch Changes
+
+- [#467](https://github.com/generaltranslation/gt/pull/467) [`e043f07`](https://github.com/generaltranslation/gt/commit/e043f07decb426c2b275b67ad955b4ddca7d20ee) Thanks [@brian-lou](https://github.com/brian-lou)! - Add async errors for useGT/getGT to translate
+
+## 2.0.4
+
+### Patch Changes
+
+- [#464](https://github.com/generaltranslation/gt/pull/464) [`a10331c`](https://github.com/generaltranslation/gt/commit/a10331c6854d60f3328d4ce6c307acc0c28e8ef4) Thanks [@brian-lou](https://github.com/brian-lou)! - Add success message for validate
+
+- [#464](https://github.com/generaltranslation/gt/pull/464) [`a10331c`](https://github.com/generaltranslation/gt/commit/a10331c6854d60f3328d4ce6c307acc0c28e8ef4) Thanks [@brian-lou](https://github.com/brian-lou)! - Fix glob pattern for validate files
+
 ## 2.0.3
 
 ### Patch Changes

package/dist/fs/matchFiles.d.ts

@@ -1,2 +1 @@
-export declare const IGNORED_PATTERNS: string[];
 export declare function matchFiles(cwd: string, patterns: string[]): string[];

package/dist/fs/matchFiles.js

@@ -1,10 +1,8 @@
 import fg from 'fast-glob';
-export const IGNORED_PATTERNS = ['**/.*', '**/.*/**'];
 export function matchFiles(cwd, patterns) {
     return fg.sync(patterns, {
         cwd,
         absolute: true,
         onlyFiles: true,
-        ignore: IGNORED_PATTERNS,
     });
 }

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

@@ -13,4 +13,4 @@ import { Updates } from '../../../types/index.js';
  * - const { home } = getInfo(t); // getInfo is imported from './constants'
  * - This will parse constants.ts to find translation calls within getInfo function
  */
-export declare function parseStrings(importName: string, path: NodePath, updates: Updates, errors: string[], file: string): void;
+export declare function parseStrings(importName: string, originalName: string, path: NodePath, updates: Updates, errors: string[], file: string): void;

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

@@ -1,7 +1,7 @@
 import * as t from '@babel/types';
 import { isStaticExpression } from '../evaluateJsx.js';
 import { GT_ATTRIBUTES_WITH_SUGAR, mapAttributeName } from './constants.js';
-import { warnNonStaticExpressionSync, warnNonStringSync, warnTemplateLiteralSync, } from '../../../console/index.js';
+import { warnNonStaticExpressionSync, warnNonStringSync, warnTemplateLiteralSync, warnAsyncUseGT, warnSyncGetGT, } from '../../../console/index.js';
 import generateModule from '@babel/generator';
 import traverseModule from '@babel/traverse';
 // Handle CommonJS/ESM interop
@@ -343,7 +343,7 @@ function findFunctionInFile(filePath, functionName, argIndex, updates, errors) {
  * - const { home } = getInfo(t); // getInfo is imported from './constants'
  * - This will parse constants.ts to find translation calls within getInfo function
  */
-export function parseStrings(importName, path, updates, errors, file) {
+export function parseStrings(importName, originalName, path, updates, errors, file) {
     // First, collect all imports in this file to track cross-file function calls
     const importMap = buildImportMap(path.scope.getProgramParent().path);
     const referencePaths = path.scope.bindings[importName]?.referencePaths || [];
@@ -353,6 +353,16 @@ export function parseStrings(importName, path, updates, errors, file) {
         if (callExpr) {
             // Get the parent, handling both await and non-await cases
             const parentPath = callExpr.parentPath;
+            const parentFunction = refPath.getFunctionParent();
+            const asyncScope = parentFunction?.node.async;
+            if (asyncScope && originalName === 'useGT') {
+                errors.push(warnAsyncUseGT(file, `${refPath.node.loc?.start?.line}:${refPath.node.loc?.start?.column}`));
+                return;
+            }
+            else if (!asyncScope && originalName === 'getGT') {
+                errors.push(warnSyncGetGT(file, `${refPath.node.loc?.start?.line}:${refPath.node.loc?.start?.column}`));
+                return;
+            }
             const effectiveParent = parentPath?.node.type === 'AwaitExpression'
                 ? parentPath.parentPath
                 : parentPath;

package/dist/react/parse/createInlineUpdates.js

@@ -8,7 +8,6 @@ import { parseJSXElement } from '../jsx/utils/parseJsx.js';
 import { parseStrings } from '../jsx/utils/parseStringFunction.js';
 import { extractImportName } from '../jsx/utils/parseAst.js';
 import { logError } from '../../console/logging.js';
-import { validateStringFunction } from '../jsx/utils/validateStringFunction.js';
 import { GT_TRANSLATION_FUNCS } from '../jsx/utils/constants.js';
 import { matchFiles } from '../../fs/matchFiles.js';
 import { DEFAULT_SRC_PATTERNS } from '../../config/generateSettings.js';
@@ -82,8 +81,8 @@ export async function createInlineUpdates(pkg, validate, filePatterns) {
             },
         });
         // Process translation functions asynchronously
-        for (const { localName: name, path } of translationPaths) {
-            parseStrings(name, path, updates, errors, file);
+        for (const { localName: name, originalName, path } of translationPaths) {
+            parseStrings(name, originalName, path, updates, errors, file);
         }
         // Parse <T> components
         traverse(ast, {
@@ -92,11 +91,12 @@ export async function createInlineUpdates(pkg, validate, filePatterns) {
             },
         });
         // Extra validation (for Locadex)
-        if (validate) {
-            for (const { localName: name, path, originalName } of translationPaths) {
-                validateStringFunction(name, path, updates, errors, file, originalName);
-            }
-        }
+        // Done in parseStrings() atm
+        // if (validate) {
+        //   for (const { localName: name, path, originalName } of translationPaths) {
+        //     validateStringFunction(name, path, updates, errors, file, originalName);
+        //   }
+        // }
     }
     // Post-process to add a hash to each update
     await Promise.all(updates.map(async (update) => {

package/dist/translation/validate.js

@@ -7,13 +7,14 @@ import { createInlineUpdates } from '../react/parse/createInlineUpdates.js';
 export async function validateProject(settings, pkg, files) {
     if (files && files.length > 0) {
         // Validate specific files using createInlineUpdates
-        const { errors } = await createInlineUpdates(pkg, true, files);
+        const { errors, updates } = await createInlineUpdates(pkg, true, files);
         if (errors.length > 0) {
             logErrorAndExit(chalk.red(`Error: CLI tool encountered ${errors.length} syntax errors:\n` +
                 errors
                     .map((error) => chalk.red('• ') + chalk.white(error) + '\n')
                     .join('')));
         }
+        logSuccess(chalk.green(`Success! Found ${updates.length} translatable entries.`));
         return;
     }
     if (!settings.dictionary) {

package/package.json

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