gt 2.8.1 → 2.8.2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # gtx-cli
 
+## 2.8.2
+
+### Patch Changes
+
+- [#1098](https://github.com/generaltranslation/gt/pull/1098) [`612ace4`](https://github.com/generaltranslation/gt/commit/612ace4bb30aaa3406b949931c8ffdb3f43ebd9f) Thanks [@ErnestM1234](https://github.com/ErnestM1234)! - fix: upload supporting composite json
+
+- Updated dependencies [[`1793010`](https://github.com/generaltranslation/gt/commit/1793010ea33ceceba307832195433ff3b7f1143e)]:
+  - generaltranslation@8.1.15
+  - @generaltranslation/python-extractor@0.1.1
+
 ## 2.8.1
 
 ### Patch Changes

package/dist/cli/commands/upload.js

@@ -5,6 +5,8 @@ import { getRelative, readFile } from '../../fs/findFilepath.js';
 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 { runUploadFilesWorkflow } from '../../workflows/upload.js';
 import { existsSync, readFileSync } from 'node:fs';
 import { createFileMapping } from '../../formats/files/fileMapping.js';
@@ -25,6 +27,7 @@ export async function upload(filePaths, placeholderPaths, transformPaths, dataFo
     // Collect all files to translate
     const allFiles = [];
     const additionalOptions = settings.options || {};
+    const compositeJsonFiles = new Map();
     // Process JSON files
     if (filePaths.json) {
         if (!SUPPORTED_DATA_FORMATS.includes(dataFormat)) {
@@ -34,6 +37,10 @@ export async function upload(filePaths, placeholderPaths, transformPaths, dataFo
             const content = readFile(filePath);
             const parsedJson = parseJson(content, filePath, additionalOptions, settings.defaultLocale);
             const relativePath = getRelative(filePath);
+            const jsonSchema = validateJsonSchema(additionalOptions, filePath);
+            if (jsonSchema?.composite) {
+                compositeJsonFiles.set(relativePath, { filePath, content });
+            }
             return {
                 content: parsedJson,
                 fileName: relativePath,
@@ -112,19 +119,38 @@ export async function upload(filePaths, placeholderPaths, transformPaths, dataFo
             versionId: file.versionId,
         };
         const translations = [];
+        const compositeInfo = compositeJsonFiles.get(file.fileName);
         for (const locale of locales) {
-            const translatedFileName = fileMapping[locale][file.fileName];
-            if (translatedFileName && existsSync(translatedFileName)) {
-                const translatedContent = readFileSync(translatedFileName, 'utf8');
-                translations.push({
-                    content: translatedContent,
-                    fileName: file.fileName,
-                    fileFormat: file.fileFormat,
-                    dataFormat: file.dataFormat,
-                    locale,
-                    fileId: file.fileId,
-                    versionId: file.versionId,
-                });
+            if (compositeInfo) {
+                // Composite JSON: extract translations from the same source file
+                const extracted = extractJson(compositeInfo.content, compositeInfo.filePath, additionalOptions, locale, settings.defaultLocale);
+                if (extracted) {
+                    translations.push({
+                        content: extracted,
+                        fileName: file.fileName,
+                        fileFormat: file.fileFormat,
+                        dataFormat: file.dataFormat,
+                        locale,
+                        fileId: file.fileId,
+                        versionId: file.versionId,
+                    });
+                }
+            }
+            else {
+                // Non-composite: look for separate translation files
+                const translatedFileName = fileMapping[locale]?.[file.fileName];
+                if (translatedFileName && existsSync(translatedFileName)) {
+                    const translatedContent = readFileSync(translatedFileName, 'utf8');
+                    translations.push({
+                        content: translatedContent,
+                        fileName: file.fileName,
+                        fileFormat: file.fileFormat,
+                        dataFormat: file.dataFormat,
+                        locale,
+                        fileId: file.fileId,
+                        versionId: file.versionId,
+                    });
+                }
             }
         }
         return {

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

@@ -44,4 +44,11 @@ export declare function generateSourceObjectPointers(jsonSchema: {
     sourceObjectValue: any;
     sourceObjectOptions: SourceObjectOptions;
 }>;
+/**
+ * Validate the json schema for composite or include schemas
+ * @param options - Additional options containing jsonSchema config
+ * @param filePath - The path to the file (used for matching jsonSchema)
+ * @returns The json schema, or null if no schema is found
+ * @returns exitSync(1) if the json schema is invalid
+ */
 export declare function validateJsonSchema(options: AdditionalOptions, filePath: string): JsonSchema | null;

package/dist/formats/json/utils.js

@@ -125,6 +125,13 @@ export function generateSourceObjectPointers(jsonSchema, originalJson) {
     }, {});
     return sourceObjectPointers;
 }
+/**
+ * Validate the json schema for composite or include schemas
+ * @param options - Additional options containing jsonSchema config
+ * @param filePath - The path to the file (used for matching jsonSchema)
+ * @returns The json schema, or null if no schema is found
+ * @returns exitSync(1) if the json schema is invalid
+ */
 export function validateJsonSchema(options, filePath) {
     if (!options.jsonSchema) {
         return null;

package/dist/generated/version.d.ts

@@ -1 +1 @@
-export declare const PACKAGE_VERSION = "2.8.1";
+export declare const PACKAGE_VERSION = "2.8.2";

package/dist/generated/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gt",
-  "version": "2.8.1",
+  "version": "2.8.2",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [
@@ -110,8 +110,8 @@
     "unified": "^11.0.5",
     "unist-util-visit": "^5.0.0",
     "yaml": "^2.8.0",
-    "@generaltranslation/python-extractor": "0.1.0",
-    "generaltranslation": "8.1.14",
+    "@generaltranslation/python-extractor": "0.1.1",
+    "generaltranslation": "8.1.15",
     "gt-remark": "1.0.5"
   },
   "devDependencies": {