gt 2.10.1 → 2.10.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # gtx-cli
 
+## 2.10.2
+
+### Patch Changes
+
+- [#1108](https://github.com/generaltranslation/gt/pull/1108) [`2dff603`](https://github.com/generaltranslation/gt/commit/2dff6036382040438a3fa8bbd4c2475da7617f93) Thanks [@brian-lou](https://github.com/brian-lou)! - Fix string behavior
+
 ## 2.10.1
 
 ### Patch Changes

package/dist/formats/json/extractJson.js

@@ -95,6 +95,11 @@ export function extractJson(localContent, inputPath, options, targetLocale, defa
                 logger.warn(`No matching item found for locale ${targetLocale} at path: ${sourceObjectPointer}`);
                 continue;
             }
+            // If the source item is a string, use it directly
+            if (typeof matchingTargetItem.sourceItem === 'string') {
+                compositeResult[sourceObjectPointer] = matchingTargetItem.sourceItem;
+                continue;
+            }
             // Extract values at the include paths
             const extractedValues = flattenJsonWithStringFilter(matchingTargetItem.sourceItem, sourceObjectOptions.include);
             // Store the extracted values

package/dist/formats/json/mergeJson.js

@@ -59,6 +59,11 @@ export function mergeJson(originalContent, inputPath, options, targets, defaultL
     // Handle composite
     // Create a deep copy of the original JSON to avoid mutations
     const mergedJson = structuredClone(originalJson);
+    // Pre-parse all target contents ONCE (avoid re-parsing per pointer)
+    const parsedTargets = targets.map((target) => ({
+        ...target,
+        parsedContent: JSON.parse(target.translatedContent),
+    }));
     // Create mapping of sourceObjectPointer to SourceObjectOptions
     const sourceObjectPointers = generateSourceObjectPointers(jsonSchema.composite, originalJson);
     // Find the source object
@@ -91,9 +96,8 @@ export function mergeJson(originalContent, inputPath, options, targets, defaultL
             // 10. Remove all items for the target locale (they can be identified by the key)
             const indiciesToRemove = new Set();
             const itemsToAdd = [];
-            for (const target of targets) {
-                const targetJson = JSON.parse(target.translatedContent);
-                let targetItems = targetJson[sourceObjectPointer];
+            for (const target of parsedTargets) {
+                let targetItems = target.parsedContent[sourceObjectPointer];
                 // 1. Get the target items
                 if (!targetItems) {
                     // If no translation can be found, a transformation may need to happen still
@@ -196,21 +200,28 @@ export function mergeJson(originalContent, inputPath, options, targets, defaultL
             // 5. Override the source item with the translated values
             // 6. Apply additional mutations to the sourceItem
             // 7. Merge the source item with the original JSON (if the source item is not a new item)
-            for (const target of targets) {
-                const targetJson = JSON.parse(target.translatedContent);
+            for (const target of parsedTargets) {
                 // 1. Get the target items
-                let targetItems = targetJson[sourceObjectPointer];
-                if (!targetItems) {
+                let targetItems = target.parsedContent[sourceObjectPointer];
+                if (targetItems == null) {
                     targetItems = {};
                 }
                 // 2. Find the source item for the target locale
                 const matchingTargetItem = findMatchingItemObject(useCanonicalLocaleKeys
                     ? gt.resolveCanonicalLocale(target.targetLocale)
                     : target.targetLocale, sourceObjectPointer, sourceObjectOptions, sourceObjectValue);
+                const mutateSourceItemKey = matchingTargetItem.keyParentProperty;
+                // If the source item is a string, use the translated string directly
+                if (typeof defaultLocaleSourceItem === 'string') {
+                    if (typeof targetItems === 'string') {
+                        sourceObjectValue[mutateSourceItemKey] = targetItems;
+                    }
+                    // If no translation found, leave the locale slot unchanged
+                    continue;
+                }
                 // If the target locale has a matching source item, use it to mutate the source item
                 // Otherwise, fallback to the default locale source item
                 const mutateSourceItem = structuredClone(defaultLocaleSourceItem);
-                const mutateSourceItemKey = matchingTargetItem.keyParentProperty;
                 // 3. Merge the target items with the source item (if there are transformations to perform)
                 const mergedItems = {
                     ...(sourceObjectOptions.transform ? defaultLocaleSourceItem : {}),

package/dist/formats/json/parseJson.js

@@ -104,6 +104,11 @@ export function parseJson(content, filePath, options, defaultLocale, filterStrin
                 return exitSync(1);
             }
             const { sourceItem } = matchingItem;
+            // If the source item is a string, use it directly
+            if (typeof sourceItem === 'string') {
+                sourceObjectsToTranslate[sourceObjectPointer] = sourceItem;
+                continue;
+            }
             // Get the fields to translate from the includes
             const flatten = filterStrings ? flattenJsonWithStringFilter : flattenJson;
             const itemsToTranslate = flatten(sourceItem, sourceObjectOptions.include);

package/dist/generated/version.d.ts

@@ -1 +1 @@
-export declare const PACKAGE_VERSION = "2.10.1";
+export declare const PACKAGE_VERSION = "2.10.2";

package/dist/generated/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gt",
-  "version": "2.10.1",
+  "version": "2.10.2",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [
@@ -110,9 +110,9 @@
     "unified": "^11.0.5",
     "unist-util-visit": "^5.0.0",
     "yaml": "^2.8.0",
+    "@generaltranslation/python-extractor": "0.1.2",
     "generaltranslation": "8.1.16",
-    "gt-remark": "1.0.5",
-    "@generaltranslation/python-extractor": "0.1.2"
+    "gt-remark": "1.0.5"
   },
   "devDependencies": {
     "@babel/types": "^7.28.4",