gtx-cli 2.6.5 → 2.6.7

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # gtx-cli
 
+## 2.6.7
+
+### Patch Changes
+
+- [#975](https://github.com/generaltranslation/gt/pull/975) [`18d6672`](https://github.com/generaltranslation/gt/commit/18d6672c45d1cafe93817aec67fa60c70a1c7567) Thanks [@brian-lou](https://github.com/brian-lou)! - Add branch config options
+
+- [#978](https://github.com/generaltranslation/gt/pull/978) [`73238cf`](https://github.com/generaltranslation/gt/commit/73238cf4d55e8b42c10c870c6a525df9ff36c338) Thanks [@fernando-aviles](https://github.com/fernando-aviles)! - Fixing `save-local` behavior for composite JSONs
+
+## 2.6.6
+
+### Patch Changes
+
+- [#974](https://github.com/generaltranslation/gt/pull/974) [`ba07f07`](https://github.com/generaltranslation/gt/commit/ba07f078079a4ae0d07231fb98fee1a4668a5a39) Thanks [@fernando-aviles](https://github.com/fernando-aviles)! - Fixing `save-local` behavior for composite JSONs
+
 ## 2.6.5
 
 ### Patch Changes

package/dist/api/collectUserEditDiffs.js

@@ -7,6 +7,7 @@ import { gt } from '../utils/gt.js';
 import os from 'node:os';
 import { randomUUID } from 'node:crypto';
 import { hashStringSync } from '../utils/hash.js';
+import { extractJson } from '../formats/json/extractJson.js';
 const findLatestDownloadedVersion = (downloadedVersions, branchId, fileId, locale) => {
     const versionsForFile = downloadedVersions.entries?.[branchId]?.[fileId] ?? undefined;
     if (!versionsForFile)
@@ -125,7 +126,17 @@ export async function collectAndSendUserEditDiffs(files, settings) {
                 }
                 catch { }
                 if (diff && diff.trim().length > 0) {
-                    const localContent = await fs.promises.readFile(c.outputPath, 'utf8');
+                    const rawLocalContent = await fs.promises.readFile(c.outputPath, 'utf8');
+                    // For JSON files with jsonSchema config, extract to composite format
+                    let localContent = rawLocalContent;
+                    if (c.fileName.endsWith('.json') &&
+                        settings.options?.jsonSchema &&
+                        c.locale !== settings.defaultLocale) {
+                        const extractedContent = extractJson(rawLocalContent, c.fileName, settings.options, c.locale, settings.defaultLocale);
+                        if (extractedContent) {
+                            localContent = extractedContent;
+                        }
+                    }
                     collectedDiffs.push({
                         fileName: c.fileName,
                         locale: c.locale,

package/dist/cli/flags.js

@@ -1,4 +1,5 @@
 import findFilepath from '../fs/findFilepath.js';
+import { DEFAULT_GIT_REMOTE_NAME } from '../utils/constants.js';
 const DEFAULT_TIMEOUT = 600;
 export function attachSharedFlags(command) {
     command
@@ -35,7 +36,8 @@ export function attachTranslateFlags(command) {
         .option('--experimental-clear-locale-dirs', 'Clear locale directories before downloading new translations', false)
         .option('--branch <branch>', 'Specify a custom branch to use for translations')
         .option('--disable-branch-detection', 'Disable additional branch detection and optimizations and use the manually specified branch', false)
-        .option('--enable-branching', 'Enable branching for the project', false); // disabled by default for now
+        .option('--enable-branching', 'Enable branching for the project', false) // disabled by default for now
+        .option('--remote-name <name>', 'Specify a custom remote name to use for branch detection', DEFAULT_GIT_REMOTE_NAME);
     return command;
 }
 export function attachAdditionalReactTranslateFlags(command) {

package/dist/config/generateSettings.js

@@ -5,7 +5,7 @@ import fs from 'node:fs';
 import { createOrUpdateConfig } from '../fs/config/setupConfig.js';
 import { resolveFiles } from '../fs/config/parseFilesConfig.js';
 import { validateSettings } from './validateSettings.js';
-import { GT_DASHBOARD_URL } from '../utils/constants.js';
+import { DEFAULT_GIT_REMOTE_NAME, GT_DASHBOARD_URL, } from '../utils/constants.js';
 import { resolveProjectId } from '../fs/utils.js';
 import path from 'node:path';
 import chalk from 'chalk';
@@ -175,13 +175,17 @@ export async function generateSettings(flags, cwd = process.cwd()) {
     ];
     // Add branch options if not provided
     const branchOptions = mergedOptions.branchOptions || {};
-    branchOptions.enabled = flags.enableBranching ?? false;
+    branchOptions.enabled =
+        flags.enableBranching ?? gtConfig.branchOptions?.enabled ?? false;
     branchOptions.currentBranch =
         flags.branch ?? gtConfig.branchOptions?.currentBranch ?? undefined;
     branchOptions.autoDetectBranches = flags.disableBranchDetection
         ? false
-        : true;
-    branchOptions.remoteName = gtConfig.branchOptions?.remoteName ?? 'origin';
+        : (gtConfig.branchOptions?.autoDetectBranches ?? true);
+    branchOptions.remoteName =
+        flags.remoteName ??
+            gtConfig.branchOptions?.remoteName ??
+            DEFAULT_GIT_REMOTE_NAME;
     mergedOptions.branchOptions = branchOptions;
     // if there's no existing config file, creates one
     // does not include the API key to avoid exposing it

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

@@ -0,0 +1,15 @@
+import { AdditionalOptions } from '../../types/index.js';
+/**
+ * Extracts translated values from a full JSON file back into composite JSON format.
+ * This is the inverse of mergeJson - it takes a merged/reconstructed JSON file
+ * and extracts the values for a specific locale into the composite structure
+ * that the server expects.
+ *
+ * @param localContent - The full JSON content from the user's local file
+ * @param inputPath - The path to the file (used for matching jsonSchema)
+ * @param options - Additional options containing jsonSchema config
+ * @param targetLocale - The locale to extract values for
+ * @param defaultLocale - The default/source locale
+ * @returns The composite JSON string, or null if no extraction needed
+ */
+export declare function extractJson(localContent: string, inputPath: string, options: AdditionalOptions, targetLocale: string, defaultLocale: string): string | null;

package/dist/formats/json/extractJson.js

@@ -0,0 +1,92 @@
+import { logger } from '../../console/logger.js';
+import { findMatchingItemArray, findMatchingItemObject, generateSourceObjectPointers, validateJsonSchema, } from './utils.js';
+import { flattenJsonWithStringFilter } from './flattenJson.js';
+import { gt } from '../../utils/gt.js';
+/**
+ * Extracts translated values from a full JSON file back into composite JSON format.
+ * This is the inverse of mergeJson - it takes a merged/reconstructed JSON file
+ * and extracts the values for a specific locale into the composite structure
+ * that the server expects.
+ *
+ * @param localContent - The full JSON content from the user's local file
+ * @param inputPath - The path to the file (used for matching jsonSchema)
+ * @param options - Additional options containing jsonSchema config
+ * @param targetLocale - The locale to extract values for
+ * @param defaultLocale - The default/source locale
+ * @returns The composite JSON string, or null if no extraction needed
+ */
+export function extractJson(localContent, inputPath, options, targetLocale, defaultLocale) {
+    const jsonSchema = validateJsonSchema(options, inputPath);
+    if (!jsonSchema) {
+        // No schema
+        return null;
+    }
+    let localJson;
+    try {
+        localJson = JSON.parse(localContent);
+    }
+    catch {
+        logger.error(`Invalid JSON file: ${inputPath}`);
+        return null;
+    }
+    const useCanonicalLocaleKeys = options?.experimentalCanonicalLocaleKeys ?? false;
+    const canonicalTargetLocale = useCanonicalLocaleKeys
+        ? gt.resolveCanonicalLocale(targetLocale)
+        : targetLocale;
+    // Handle include-style schemas (simple path-based extraction)
+    if (jsonSchema.include) {
+        const extracted = flattenJsonWithStringFilter(localJson, jsonSchema.include);
+        return JSON.stringify(extracted, null, 2);
+    }
+    if (!jsonSchema.composite) {
+        logger.error('No include or composite property found in JSON schema');
+        return null;
+    }
+    // Handle composite schemas
+    const compositeResult = {};
+    // Generate source object pointers from the local JSON
+    const sourceObjectPointers = generateSourceObjectPointers(jsonSchema.composite, localJson);
+    for (const [sourceObjectPointer, { sourceObjectValue, sourceObjectOptions },] of Object.entries(sourceObjectPointers)) {
+        if (sourceObjectOptions.type === 'array') {
+            if (!Array.isArray(sourceObjectValue)) {
+                logger.warn(`Source object value is not an array at path: ${sourceObjectPointer}`);
+                continue;
+            }
+            // Find the matching items for the target locale
+            const matchingTargetLocaleItems = findMatchingItemArray(canonicalTargetLocale, sourceObjectOptions, sourceObjectPointer, sourceObjectValue);
+            if (!Object.keys(matchingTargetLocaleItems).length) {
+                logger.warn(`No matching items found for locale ${targetLocale} at path: ${sourceObjectPointer}`);
+                continue;
+            }
+            // Initialize the nested structure for this source object pointer
+            if (!compositeResult[sourceObjectPointer]) {
+                compositeResult[sourceObjectPointer] = {};
+            }
+            // For each matching item, extract the included values
+            for (const [itemPointer, { sourceItem }] of Object.entries(matchingTargetLocaleItems)) {
+                // Extract values at the include paths
+                const extractedValues = flattenJsonWithStringFilter(sourceItem, sourceObjectOptions.include);
+                // Store under the item pointer (e.g., "/0")
+                compositeResult[sourceObjectPointer][itemPointer] = extractedValues;
+            }
+        }
+        else {
+            // Object type
+            if (typeof sourceObjectValue !== 'object' || sourceObjectValue === null) {
+                logger.warn(`Source object value is not an object at path: ${sourceObjectPointer}`);
+                continue;
+            }
+            // Find the matching item for the target locale
+            const matchingTargetItem = findMatchingItemObject(canonicalTargetLocale, sourceObjectPointer, sourceObjectOptions, sourceObjectValue);
+            if (!matchingTargetItem.sourceItem) {
+                logger.warn(`No matching item found for locale ${targetLocale} at path: ${sourceObjectPointer}`);
+                continue;
+            }
+            // Extract values at the include paths
+            const extractedValues = flattenJsonWithStringFilter(matchingTargetItem.sourceItem, sourceObjectOptions.include);
+            // Store the extracted values
+            compositeResult[sourceObjectPointer] = extractedValues;
+        }
+    }
+    return JSON.stringify(compositeResult, null, 2);
+}

package/dist/generated/version.d.ts

@@ -1 +1 @@
-export declare const PACKAGE_VERSION = "2.6.5";
+export declare const PACKAGE_VERSION = "2.6.7";

package/dist/generated/version.js

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

package/dist/utils/constants.d.ts

@@ -2,3 +2,4 @@ export declare const GT_DASHBOARD_URL = "https://dash.generaltranslation.com";
 export declare const GT_CONFIG_SCHEMA_URL = "https://assets.gtx.dev/config-schema.json";
 export declare const TEMPLATE_FILE_NAME = "__INTERNAL_GT_TEMPLATE_NAME__";
 export declare const TEMPLATE_FILE_ID: string;
+export declare const DEFAULT_GIT_REMOTE_NAME = "origin";

package/dist/utils/constants.js

@@ -3,3 +3,4 @@ export const GT_DASHBOARD_URL = 'https://dash.generaltranslation.com';
 export const GT_CONFIG_SCHEMA_URL = 'https://assets.gtx.dev/config-schema.json';
 export const TEMPLATE_FILE_NAME = '__INTERNAL_GT_TEMPLATE_NAME__';
 export const TEMPLATE_FILE_ID = hashStringSync(TEMPLATE_FILE_NAME);
+export const DEFAULT_GIT_REMOTE_NAME = 'origin';

package/package.json

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