generaltranslation 9.3.1 → 9.4.1

package/dist/index.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_unwrapApiResult = require("./unwrapApiResult-Dv6Mfw_K.cjs");
-const require_runtime = require("./runtime-DeF1Ef5w.cjs");
-const require_derive = require("./derive-Yxp38Tjn.cjs");
+const require_runtime = require("./runtime-C25lwh9m.cjs");
+const require_derive = require("./derive-2CDqwrvS.cjs");
 const require_file = require("./file-B37WkCqM.cjs");
 let _generaltranslation_format = require("@generaltranslation/format");
 let _generaltranslation_api = require("@generaltranslation/api");
@@ -774,7 +774,7 @@ var GT = class extends require_runtime.GTRuntime {
 		this._validateAuth("setupProject");
 		options = {
 			...options,
-			locales: options?.locales?.map((locale) => this.resolveCanonicalLocale(locale))
+			locales: options?.locales?.map((locale) => this.resolveServiceLocale(locale))
 		};
 		return await _setupProject(files, this._getTranslationConfig(), options);
 	}
@@ -839,11 +839,16 @@ var GT = class extends require_runtime.GTRuntime {
 			require_runtime.gtInstanceLogger.error(error);
 			throw new Error(error);
 		}
+		const targetLocaleIdentities = [...mergedOptions.targetLocales];
 		mergedOptions = {
 			...mergedOptions,
-			targetLocales: mergedOptions.targetLocales.map((locale) => this.resolveCanonicalLocale(locale))
+			sourceLocale: this.resolveServiceLocale(mergedOptions.sourceLocale),
+			targetLocales: mergedOptions.targetLocales.map((locale) => this.resolveServiceLocale(locale))
+		};
+		return {
+			...await _enqueueFiles(files, mergedOptions, this._getTranslationConfig()),
+			locales: targetLocaleIdentities
 		};
-		return await _enqueueFiles(files, mergedOptions, this._getTranslationConfig());
 	}
 	/**
 	* Creates or upserts a file tag, associating a set of source files
@@ -864,7 +869,10 @@ var GT = class extends require_runtime.GTRuntime {
 	*/
 	async publishFiles(files) {
 		this._validateAuth("publishFiles");
-		return await _publishFiles(files, this._getTranslationConfig());
+		return { results: (await _publishFiles(files, this._getTranslationConfig())).results.map((item) => ({
+			...item,
+			...item.locale && { locale: this.resolveServiceResponseLocale(item.locale) }
+		})) };
 	}
 	/**
 	* Submits user edit diffs for existing translations so future generations preserve user intent.
@@ -878,7 +886,7 @@ var GT = class extends require_runtime.GTRuntime {
 			...payload,
 			diffs: (payload.diffs || []).map((d) => ({
 				...d,
-				locale: this.resolveCanonicalLocale(d.locale)
+				locale: this.resolveServiceLocale(d.locale)
 			}))
 		}, this._getTranslationConfig());
 	}
@@ -910,23 +918,28 @@ var GT = class extends require_runtime.GTRuntime {
 	*/
 	async getProjectInfo(options = {}) {
 		this._validateAuth("getProjectInfo");
-		return await _getProjectInfo(options, this._getTranslationConfig());
+		const result = await _getProjectInfo(options, this._getTranslationConfig());
+		return {
+			...result,
+			defaultLocale: this.resolveServiceResponseLocale(result.defaultLocale),
+			currentLocales: result.currentLocales.map((locale) => this.resolveServiceResponseLocale(locale))
+		};
 	}
 	async queryFileData(data, options = {}) {
 		this._validateAuth("queryFileData");
 		data.translatedFiles = data.translatedFiles?.map((item) => ({
 			...item,
-			locale: this.resolveCanonicalLocale(item.locale)
+			locale: this.resolveServiceLocale(item.locale)
 		}));
 		const result = await _queryFileData(data, options, this._getTranslationConfig());
 		result.translatedFiles = result.translatedFiles?.map((item) => ({
 			...item,
-			...item.locale && { locale: this.resolveAliasLocale(item.locale) }
+			...item.locale && { locale: this.resolveServiceResponseLocale(item.locale) }
 		}));
 		result.sourceFiles = result.sourceFiles?.map((item) => ({
 			...item,
-			...item.sourceLocale && { sourceLocale: this.resolveAliasLocale(item.sourceLocale) },
-			locales: item.locales.map((locale) => this.resolveAliasLocale(locale))
+			...item.sourceLocale && { sourceLocale: this.resolveServiceResponseLocale(item.sourceLocale) },
+			locales: item.locales.map((locale) => this.resolveServiceResponseLocale(locale))
 		}));
 		return result;
 	}
@@ -949,10 +962,10 @@ var GT = class extends require_runtime.GTRuntime {
 		const result = await _querySourceFile(data, options, this._getTranslationConfig());
 		result.translations = result.translations.map((item) => ({
 			...item,
-			...item.locale && { locale: this.resolveAliasLocale(item.locale) }
+			...item.locale && { locale: this.resolveServiceResponseLocale(item.locale) }
 		}));
-		result.sourceFile.locales = result.sourceFile.locales.map((locale) => this.resolveAliasLocale(locale));
-		if (result.sourceFile.sourceLocale) result.sourceFile.sourceLocale = this.resolveAliasLocale(result.sourceFile.sourceLocale);
+		result.sourceFile.locales = result.sourceFile.locales.map((locale) => this.resolveServiceResponseLocale(locale));
+		if (result.sourceFile.sourceLocale) result.sourceFile.sourceLocale = this.resolveServiceResponseLocale(result.sourceFile.sourceLocale);
 		return result;
 	}
 	/**
@@ -970,8 +983,8 @@ var GT = class extends require_runtime.GTRuntime {
 	async getProjectData(projectId, options = {}) {
 		this._validateAuth("getProjectData");
 		const result = await _getProjectData(projectId, options, this._getTranslationConfig());
-		result.currentLocales = result.currentLocales.map((item) => this.resolveAliasLocale(item));
-		result.defaultLocale = this.resolveAliasLocale(result.defaultLocale);
+		result.currentLocales = result.currentLocales.map((item) => this.resolveServiceResponseLocale(item));
+		result.defaultLocale = this.resolveServiceResponseLocale(result.defaultLocale);
 		return result;
 	}
 	/**
@@ -1000,7 +1013,7 @@ var GT = class extends require_runtime.GTRuntime {
 		return (await _downloadFileBatch([{
 			fileId: file.fileId,
 			branchId: file.branchId,
-			locale: file.locale ? this.resolveCanonicalLocale(file.locale) : void 0,
+			locale: file.locale ? this.resolveServiceLocale(file.locale) : void 0,
 			versionId: file.versionId,
 			useLatestAvailableVersion: file.useLatestAvailableVersion
 		}], options, this._getTranslationConfig())).data?.[0]?.data ?? "";
@@ -1023,16 +1036,31 @@ var GT = class extends require_runtime.GTRuntime {
 	*/
 	async downloadFileBatch(requests, options = {}) {
 		this._validateAuth("downloadFileBatch");
-		requests = requests.map((request) => ({
-			...request,
-			locale: request.locale ? this.resolveCanonicalLocale(request.locale) : void 0
-		}));
+		const requestedFiles = /* @__PURE__ */ new Map();
+		requests = requests.map((request) => {
+			const locale = request.locale ? this.resolveServiceLocale(request.locale) : void 0;
+			if (locale) {
+				const key = JSON.stringify([request.fileId, locale]);
+				const group = requestedFiles.get(key) ?? [];
+				group.push(request);
+				requestedFiles.set(key, group);
+			}
+			return {
+				...request,
+				locale
+			};
+		});
 		const result = await _downloadFileBatch(requests, options, this._getTranslationConfig());
 		return {
-			files: result.data.map((file) => ({
-				...file,
-				...file.locale && { locale: this.resolveAliasLocale(file.locale) }
-			})),
+			files: result.data.map((file) => {
+				if (!file.locale) return file;
+				const serviceLocale = this.standardizeLocale(file.locale);
+				const matchingRequests = (requestedFiles.get(JSON.stringify([file.fileId, serviceLocale])) ?? []).filter((request) => (!request.branchId || request.branchId === file.branchId) && (!request.versionId || request.versionId === file.versionId));
+				return {
+					...file,
+					locale: matchingRequests.length === 1 ? matchingRequests[0].locale : this.resolveServiceResponseLocale(file.locale)
+				};
+			}),
 			count: result.count
 		};
 	}
@@ -1052,13 +1080,13 @@ var GT = class extends require_runtime.GTRuntime {
 		this._validateAuth("uploadSourceFiles");
 		const mergedOptions = {
 			...options,
-			sourceLocale: this.resolveCanonicalLocale(options.sourceLocale ?? this.sourceLocale ?? "en")
+			sourceLocale: this.resolveServiceLocale(options.sourceLocale ?? this.sourceLocale ?? "en")
 		};
 		files = files.map((f) => ({
 			...f,
 			source: {
 				...f.source,
-				locale: this.resolveCanonicalLocale(f.source.locale)
+				locale: this.resolveServiceLocale(f.source.locale)
 			}
 		}));
 		const result = await _uploadSourceFiles(files, mergedOptions, this._getTranslationConfig());
@@ -1109,12 +1137,16 @@ var GT = class extends require_runtime.GTRuntime {
 			require_runtime.gtInstanceLogger.error(error);
 			throw new Error(error);
 		}
-		mergedOptions.sourceLocale = this.resolveCanonicalLocale(mergedOptions.sourceLocale);
+		mergedOptions.sourceLocale = this.resolveServiceLocale(mergedOptions.sourceLocale);
 		const result = await _uploadTranslations(files.map((f) => ({
 			...f,
+			source: {
+				...f.source,
+				locale: this.resolveServiceLocale(f.source.locale)
+			},
 			translations: f.translations.map((t) => ({
 				...t,
-				locale: this.resolveCanonicalLocale(t.locale)
+				locale: this.resolveServiceLocale(t.locale)
 			}))
 		})), mergedOptions, this._getTranslationConfig());
 		return {