gt 2.14.7 → 2.14.8

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # gtx-cli
 
+## 2.14.8
+
+### Patch Changes
+
+- [#1187](https://github.com/generaltranslation/gt/pull/1187) [`9281fe5`](https://github.com/generaltranslation/gt/commit/9281fe5d9c2f3e35b67ccedb9c444aebbb6a8bd1) Thanks [@ErnestM1234](https://github.com/ErnestM1234)! - fix(cli): extend autoderive gt msg
+
+- [#1185](https://github.com/generaltranslation/gt/pull/1185) [`121be24`](https://github.com/generaltranslation/gt/commit/121be24def7f9dc464b8589bf0be14d04ac3e6e1) Thanks [@ErnestM1234](https://github.com/ErnestM1234)! - fix: exploration of properties for Branch and Plural during multiplication step
+
+- [#1186](https://github.com/generaltranslation/gt/pull/1186) [`7a3c7de`](https://github.com/generaltranslation/gt/commit/7a3c7de8e5d5103bd9fec893a677a13068f822e6) Thanks [@moss-bryophyta](https://github.com/moss-bryophyta)! - Warn when Mintlify docs.json contains unsupported $ref fields
+
 ## 2.14.7
 
 ## 2.14.6

package/dist/cli/base.d.ts

@@ -53,6 +53,6 @@ export declare class BaseCLI {
     protected setupInitCommand(): void;
     protected setupConfigureCommand(): void;
     protected handleUploadCommand(settings: Settings & UploadOptions): Promise<void>;
-    protected handleInitCommand(ranReactSetup: boolean, useDefaults?: boolean): Promise<void>;
+    protected handleInitCommand(ranReactSetup: boolean, useDefaults?: boolean, isVite?: boolean): Promise<void>;
     protected handleLoginCommand(options: LoginOptions): Promise<void>;
 }

package/dist/cli/base.js

@@ -1,3 +1,4 @@
+import { DEFAULT_TRANSLATIONS_DIR, DEFAULT_VITE_TRANSLATIONS_DIR, } from '../utils/constants.js';
 import { createOrUpdateConfig } from '../fs/config/setupConfig.js';
 import findFilepath from '../fs/findFilepath.js';
 import { displayHeader, promptText, logErrorAndExit, promptConfirm, promptMultiSelect, promptSelect, } from '../console/logging.js';
@@ -271,9 +272,12 @@ export class BaseCLI {
                     ? getReactFrameworkLibrary(framework)
                     : null;
                 // Build defaults description based on detected framework
+                const defaultTranslationsDir = framework.name === 'vite'
+                    ? DEFAULT_VITE_TRANSLATIONS_DIR
+                    : DEFAULT_TRANSLATIONS_DIR;
                 const defaultsDescription = framework.type === 'react'
-                    ? `${library} & GTProvider, ${frameworkDisplayName}, Files saved locally in ./public/_gt`
-                    : 'Files saved locally in ./public/_gt';
+                    ? `${library} & GTProvider, ${frameworkDisplayName}, Files saved locally in ${defaultTranslationsDir}`
+                    : `Files saved locally in ${defaultTranslationsDir}`;
                 // Ask if user wants to use defaults
                 const useDefaults = await promptConfirm({
                     message: `Would you like to use the recommended General Translation defaults? ${chalk.dim(`(${defaultsDescription})`)}`,
@@ -300,7 +304,7 @@ export class BaseCLI {
                     logger.startCommand('Setting up project config...');
                 }
                 // Configure gt.config.json
-                await this.handleInitCommand(ranReactSetup, useDefaults);
+                await this.handleInitCommand(ranReactSetup, useDefaults, framework.name === 'vite');
                 logger.endCommand('Done! Check out our docs for more information on how to use General Translation: https://generaltranslation.com/docs');
             }
         });
@@ -313,7 +317,8 @@ export class BaseCLI {
             displayHeader('Configuring project...');
             logger.info('Welcome! This tool will help you configure your gt.config.json file. See the docs: https://generaltranslation.com/docs/cli/reference/config for more information.');
             // Configure gt.config.json
-            await this.handleInitCommand(false);
+            const framework = await detectFramework();
+            await this.handleInitCommand(false, false, framework.name === 'vite');
             logger.endCommand('Done! Make sure you have an API key and project ID to use General Translation. Get them on the dashboard: https://generaltranslation.com/dashboard');
         });
     }
@@ -342,7 +347,7 @@ export class BaseCLI {
         await upload(sourceFiles, placeholderPaths, transformPaths, dataFormat, settings);
     }
     // Wizard for configuring gt.config.json
-    async handleInitCommand(ranReactSetup, useDefaults = false) {
+    async handleInitCommand(ranReactSetup, useDefaults = false, isVite = false) {
         const { defaultLocale, locales } = await getDesiredLocales(); // Locales should still be asked for even if using defaults
         const packageJson = await searchForPackageJson();
         // Ask if using another i18n library
@@ -365,17 +370,20 @@ export class BaseCLI {
             });
             return selectedValue === 'cdn';
         })();
+        const defaultTranslationsDir = isVite
+            ? DEFAULT_VITE_TRANSLATIONS_DIR
+            : DEFAULT_TRANSLATIONS_DIR;
         // Ask where the translations are stored
         const translationsDir = isUsingGT && !usingCDN
             ? useDefaults
-                ? './public/_gt'
+                ? defaultTranslationsDir
                 : await promptText({
                     message: 'What is the path to the directory where you would like to store your translation files?',
-                    defaultValue: './public/_gt',
+                    defaultValue: defaultTranslationsDir,
                 })
             : null;
         // Determine final translations directory with fallback
-        const finalTranslationsDir = translationsDir?.trim() || './public/_gt';
+        const finalTranslationsDir = translationsDir?.trim() || defaultTranslationsDir;
         if (isUsingGT && !usingCDN) {
             // Create loadTranslations.js file for local translations
             await createLoadTranslationsFile(process.cwd(), finalTranslationsDir, locales);

package/dist/cli/commands/upload.js

@@ -2,11 +2,12 @@ import { noSupportedFormatError, noDefaultLocaleError, } from '../../console/ind
 import { exitSync, logErrorAndExit } from '../../console/logging.js';
 import { logger } from '../../console/logger.js';
 import { getRelative, readFile } from '../../fs/findFilepath.js';
+import path from 'node:path';
 import { SUPPORTED_FILE_EXTENSIONS } from '../../formats/files/supportedFiles.js';
 import sanitizeFileContent from '../../utils/sanitizeFileContent.js';
 import { parseJson } from '../../formats/json/parseJson.js';
 import { extractJson } from '../../formats/json/extractJson.js';
-import { validateJsonSchema } from '../../formats/json/utils.js';
+import { validateJsonSchema, detectMintlifyUnsupportedFields, } from '../../formats/json/utils.js';
 import { runUploadFilesWorkflow } from '../../workflows/upload.js';
 import { existsSync, readFileSync } from 'node:fs';
 import { createFileMapping } from '../../formats/files/fileMapping.js';
@@ -37,6 +38,16 @@ export async function upload(filePaths, placeholderPaths, transformPaths, dataFo
         }
         const jsonFiles = filePaths.json.map((filePath) => {
             const content = readFile(filePath);
+            // Detect unsupported fields in Mintlify docs.json
+            if (settings.framework === 'mintlify' &&
+                path.basename(filePath) === 'docs.json') {
+                try {
+                    detectMintlifyUnsupportedFields(JSON.parse(content), filePath);
+                }
+                catch {
+                    // JSON parse errors are handled below by parseJson
+                }
+            }
             const parsedJson = parseJson(content, filePath, additionalOptions, settings.defaultLocale);
             const relativePath = getRelative(filePath);
             const jsonSchema = validateJsonSchema(additionalOptions, filePath);

package/dist/formats/files/aggregateFiles.js

@@ -3,6 +3,8 @@ import { recordWarning } from '../../state/translateWarnings.js';
 import { getRelative, readFile } from '../../fs/findFilepath.js';
 import { SUPPORTED_FILE_EXTENSIONS } from './supportedFiles.js';
 import { parseJson } from '../json/parseJson.js';
+import { detectMintlifyUnsupportedFields } from '../json/utils.js';
+import path from 'node:path';
 import parseYaml from '../yaml/parseYaml.js';
 import { validateYamlSchema } from '../yaml/utils.js';
 import { flattenJson } from '../json/flattenJson.js';
@@ -73,6 +75,16 @@ export async function aggregateFiles(settings) {
                     return null;
                 }
             }
+            // Detect unsupported fields in Mintlify docs.json
+            if (settings.framework === 'mintlify' &&
+                path.basename(filePath) === 'docs.json') {
+                try {
+                    detectMintlifyUnsupportedFields(JSON.parse(content), filePath);
+                }
+                catch {
+                    // JSON parse errors are handled below by parseJson
+                }
+            }
             const parsedJson = parseJson(content, filePath, settings.options || {}, settings.defaultLocale);
             // Detect companion metadata file
             let keyedMetadata;

package/dist/formats/json/utils.d.ts

@@ -52,3 +52,8 @@ export declare function generateSourceObjectPointers(jsonSchema: {
  * @returns exitSync(1) if the json schema is invalid
  */
 export declare function validateJsonSchema(options: AdditionalOptions, filePath: string): JsonSchema | null;
+/**
+ * Detect unsupported fields (e.g. $ref) in Mintlify docs.json files.
+ * Logs a warning listing the fields found.
+ */
+export declare function detectMintlifyUnsupportedFields(json: any, filePath: string): void;

package/dist/formats/json/utils.js

@@ -3,6 +3,7 @@ import { exitSync } from '../../console/logging.js';
 import { logger } from '../../console/logger.js';
 import { JSONPath } from 'jsonpath-plus';
 import { flattenJson } from './flattenJson.js';
+import chalk from 'chalk';
 import path from 'node:path';
 import micromatch from 'micromatch';
 const { isMatch } = micromatch;
@@ -160,3 +161,46 @@ export function validateJsonSchema(options, filePath) {
     }
     return jsonSchema;
 }
+const UNSUPPORTED_MINTLIFY_FIELDS = ['$ref'];
+/**
+ * Recursively traverse a JSON value and collect all objects whose key
+ * matches one of the unsupported field names.
+ */
+function findMintlifyUnsupportedFields(value, fieldNames, pointer = '') {
+    if (value === null || typeof value !== 'object')
+        return [];
+    if (Array.isArray(value)) {
+        const results = [];
+        for (let i = 0; i < value.length; i++) {
+            results.push(...findMintlifyUnsupportedFields(value[i], fieldNames, `${pointer}/${i}`));
+        }
+        return results;
+    }
+    // Check if this object contains an unsupported field
+    for (const field of fieldNames) {
+        if (typeof value[field] === 'string') {
+            return [{ pointer, field, fieldValue: value[field] }];
+        }
+    }
+    // Recurse into child properties
+    const results = [];
+    for (const key of Object.keys(value)) {
+        results.push(...findMintlifyUnsupportedFields(value[key], fieldNames, `${pointer}/${key}`));
+    }
+    return results;
+}
+/**
+ * Detect unsupported fields (e.g. $ref) in Mintlify docs.json files.
+ * Logs a warning listing the fields found.
+ */
+export function detectMintlifyUnsupportedFields(json, filePath) {
+    const unsupported = findMintlifyUnsupportedFields(json, UNSUPPORTED_MINTLIFY_FIELDS);
+    if (unsupported.length > 0) {
+        const fileName = path.basename(filePath);
+        const lines = unsupported
+            .map((u) => chalk.yellow('• ') +
+            chalk.white(`${u.pointer.replace(/\//g, '.').replace(/^\./, '')}.${u.field}`))
+            .join('\n');
+        logger.warn(chalk.yellow(`Mintlify config splitting is not yet supported. The following \`$ref\` fields were detected in \`${fileName}\` and will not be resolved:\n`) + lines);
+    }
+}

package/dist/fs/createLoadTranslationsFile.js

@@ -2,7 +2,8 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { logger } from '../console/logger.js';
 import chalk from 'chalk';
-export async function createLoadTranslationsFile(appDirectory, translationsDir = './public/_gt', locales) {
+import { DEFAULT_TRANSLATIONS_DIR } from '../utils/constants.js';
+export async function createLoadTranslationsFile(appDirectory, translationsDir = DEFAULT_TRANSLATIONS_DIR, locales) {
     const usingSrcDirectory = fs.existsSync(path.join(appDirectory, 'src'));
     // Calculate the relative path from the loadTranslations.js location to the translations directory
     const loadTranslationsDir = usingSrcDirectory

package/dist/generated/version.d.ts

@@ -1 +1 @@
-export declare const PACKAGE_VERSION = "2.14.7";
+export declare const PACKAGE_VERSION = "2.14.8";

package/dist/generated/version.js

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

package/dist/react/jsx/utils/jsxParsing/multiplication/findMultiplicationNode.js

@@ -1,4 +1,6 @@
 import { isWhitespaceMultiplicationNode, isWhitespaceJsxTree, } from '../types.js';
+import { isAcceptedPluralForm } from 'generaltranslation/internal';
+import { PLURAL_COMPONENT, BRANCH_COMPONENT, BRANCH_CONTROL_PROPS, } from '../../constants.js';
 /**
  * Finds the immediate multiplication node from the given root (eg no nested multiplication nodes)
  * TODO: I am sure there is some optimization to be done here
@@ -28,12 +30,34 @@ export function findMultiplicationNode(root) {
             return { parent, key, node: curr };
         }
         else if (isWhitespaceJsxTree(curr)) {
-            if (curr.props?.children) {
-                return handleChildren(curr.props.children, curr.props, 'children');
-            }
-            else {
+            if (!curr.props)
                 return undefined;
+            // Check children first
+            if (curr.props.children) {
+                const result = handleChildren(curr.props.children, curr.props, 'children');
+                if (result)
+                    return result;
             }
+            // For Plural/Branch, also search translatable content props
+            // Mirrors the prop filtering in handleChildrenWhitespace.ts and autoInsertion.ts
+            const elementIsPlural = curr.type === PLURAL_COMPONENT;
+            const elementIsBranch = curr.type === BRANCH_COMPONENT;
+            if (elementIsPlural || elementIsBranch) {
+                for (const [propKey, propValue] of Object.entries(curr.props)) {
+                    if (propKey === 'children')
+                        continue;
+                    if (elementIsPlural && !isAcceptedPluralForm(propKey))
+                        continue;
+                    if (elementIsBranch && BRANCH_CONTROL_PROPS.has(propKey))
+                        continue;
+                    if (propValue && typeof propValue === 'object') {
+                        const result = handleChildren(propValue, curr.props, propKey);
+                        if (result)
+                            return result;
+                    }
+                }
+            }
+            return undefined;
         }
         else {
             return undefined;

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

@@ -1,5 +1,5 @@
 import * as t from '@babel/types';
-import { INLINE_TRANSLATION_HOOK, INLINE_TRANSLATION_HOOK_ASYNC, INLINE_MESSAGE_HOOK, INLINE_MESSAGE_HOOK_ASYNC, STRING_REGISTRATION_FUNCS, T_GLOBAL_REGISTRATION_FUNCTION_MARKER, T_REGISTRATION_FUNCTION, } from './constants.js';
+import { INLINE_TRANSLATION_HOOK, INLINE_TRANSLATION_HOOK_ASYNC, INLINE_MESSAGE_HOOK, INLINE_MESSAGE_HOOK_ASYNC, STRING_REGISTRATION_FUNCS, T_GLOBAL_REGISTRATION_FUNCTION_MARKER, } from './constants.js';
 import { warnAsyncUseGT, warnSyncGetGT } from '../../../console/index.js';
 import traverseModule from '@babel/traverse';
 // Handle CommonJS/ESM interop
@@ -323,7 +323,7 @@ export function parseStrings(importName, originalName, path, config, output) {
             if (refPath.parent.type === 'CallExpression' &&
                 refPath.parent.callee === refPath.node) {
                 /**
-                 * SPECIAL CASE: Auto-derive t() function
+                 * CASE: Auto-derive t() and msg() function
                  * The t() function, will treat variable content as if it was marked for derivation
                  * without explicit calls to derive().
                  *
@@ -336,17 +336,12 @@ export function parseStrings(importName, originalName, path, config, output) {
                  * );
                  * // "Hello, John! My name is {interpolatedValue}"
                  */
-                if (originalName === T_REGISTRATION_FUNCTION) {
-                    processTranslationCall(refPath, config.autoDeriveMethod === 'AUTO'
-                        ? {
-                            ...stringRegistrationConfig,
-                            autoDeriveMethod: 'ENABLED',
-                        }
-                        : stringRegistrationConfig, output);
-                }
-                else {
-                    processTranslationCall(refPath, stringRegistrationConfig, output);
-                }
+                processTranslationCall(refPath, config.autoDeriveMethod === 'AUTO'
+                    ? {
+                        ...stringRegistrationConfig,
+                        autoDeriveMethod: 'ENABLED',
+                    }
+                    : stringRegistrationConfig, output);
             }
             else if (!stringRegistrationConfig.ignoreTaggedTemplates &&
                 refPath.parent.type === 'TaggedTemplateExpression' &&
@@ -392,7 +387,9 @@ export function parseStrings(importName, originalName, path, config, output) {
                 ignoreGlobalTaggedTemplates: false,
                 // User configurable, otherwise default to DISABLED
                 autoDeriveMethod: config.autoDeriveMethod === 'AUTO'
-                    ? 'DISABLED'
+                    ? isInlineGT
+                        ? 'ENABLED'
+                        : 'DISABLED'
                     : config.autoDeriveMethod,
             };
             const effectiveParent = parentPath?.node.type === 'AwaitExpression'

package/dist/utils/constants.d.ts

@@ -5,3 +5,5 @@ export declare const TEMPLATE_FILE_ID: string;
 export declare const DEFAULT_GIT_REMOTE_NAME = "origin";
 export declare const DEFAULT_TIMEOUT_SECONDS = 900;
 export declare const SURROUNDING_LINE_COUNT = 5;
+export declare const DEFAULT_TRANSLATIONS_DIR = "./public/_gt";
+export declare const DEFAULT_VITE_TRANSLATIONS_DIR = "./src/_gt";

package/dist/utils/constants.js

@@ -7,3 +7,6 @@ export const DEFAULT_GIT_REMOTE_NAME = 'origin';
 export const DEFAULT_TIMEOUT_SECONDS = 900;
 // Number of source code lines to capture above and below a translation site
 export const SURROUNDING_LINE_COUNT = 5;
+// Default translations directory paths
+export const DEFAULT_TRANSLATIONS_DIR = './public/_gt';
+export const DEFAULT_VITE_TRANSLATIONS_DIR = './src/_gt';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gt",
-  "version": "2.14.7",
+  "version": "2.14.8",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [