gt 2.20.4 → 2.21.1

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # gtx-cli
 
+## 2.21.1
+
+### Patch Changes
+
+- [#2217](https://github.com/generaltranslation/gt/pull/2217) [`bf3ce1e`](https://github.com/generaltranslation/gt/commit/bf3ce1eb967e1798c95b78c04313de2c8362932c) Thanks [@internal-gt-public-api-sync](https://github.com/apps/internal-gt-public-api-sync)! - Require `--org-id` for `gt project create` and pass the organization ID to the updated project creation API.
+
+- Updated dependencies []:
+  - generaltranslation@9.3.1
+  - @generaltranslation/python-extractor@0.2.49
+  - @generaltranslation/supported-locales@2.1.29
+  - @generaltranslation/vue-extractor@0.1.9
+
+## 2.21.0
+
+### Minor Changes
+
+- [#2254](https://github.com/generaltranslation/gt/pull/2254) [`8e59be2`](https://github.com/generaltranslation/gt/commit/8e59be28c129b4b9509ce8897156de3282b2a295) Thanks [@eoinest](https://github.com/eoinest)! - Add Apple `.xcstrings` catalog upload support to the CLI. An `.xcstrings` catalog holds every locale in one file; on upload the CLI extracts a source-only slice (only the catalog's `sourceLanguage` localization per entry) and uploads that as the source document. The slice is serialized with a pinned byte layout and hashed into its `versionId`, so an unchanged catalog re-slices byte-identically and does not re-upload. Configure it under `files.xcstrings` in `gt.config.json`; patterns without `[locale]` are expected because the catalog is shared across locales.
+
+### Patch Changes
+
+- [#2254](https://github.com/generaltranslation/gt/pull/2254) [`e3aae42`](https://github.com/generaltranslation/gt/commit/e3aae423660e8d9116a08afc337ff3b587786a96) Thanks [@eoinest](https://github.com/eoinest)! - Record download bookkeeping per locale for translation files that hold every locale, so every locale keeps its post-process hash and unchanged in-place files are no longer resubmitted as user edits by save-local.
+
+- Updated dependencies [[`8e59be2`](https://github.com/generaltranslation/gt/commit/8e59be28c129b4b9509ce8897156de3282b2a295)]:
+  - generaltranslation@9.3.0
+  - @generaltranslation/python-extractor@0.2.48
+  - @generaltranslation/supported-locales@2.1.28
+  - @generaltranslation/vue-extractor@0.1.8
+
 ## 2.20.4
 
 ### Patch Changes

package/dist/api/collectUserEditDiffs.d.ts

@@ -3,6 +3,8 @@ import { FileReference } from 'generaltranslation/types';
 /**
  * Collects local user edits by diffing the latest downloaded server translation version
  * against the current local translation file, and submits the diffs upstream.
+ * A file that holds every locale is compared one locale slice at a time, so an
+ * edit to one locale is submitted under that locale alone.
  *
  * Must run before enqueueing new translations so rules are available to the generator.
  */

package/dist/api/collectUserEditDiffs.js

@@ -8,6 +8,7 @@ import { recordWarning } from "../state/translateWarnings.js";
 import { readLockfile } from "../fs/config/downloadedVersions.js";
 import { createFileMapping } from "../formats/files/fileMapping.js";
 import { getGitUnifiedDiff } from "../utils/gitDiff.js";
+import { emptyLocaleContent, localeContent } from "../formats/files/localeContent.js";
 import { extractYaml } from "../formats/yaml/extractYaml.js";
 import { randomUUID } from "node:crypto";
 import * as path$1 from "node:path";
@@ -34,6 +35,8 @@ const findLatestDownloadedVersion = (entryMap, fileId, locale) => {
 /**
 * Collects local user edits by diffing the latest downloaded server translation version
 * against the current local translation file, and submits the diffs upstream.
+* A file that holds every locale is compared one locale slice at a time, so an
+* edit to one locale is submitted under that locale alone.
 *
 * Must run before enqueueing new translations so rules are available to the generator.
 */
@@ -53,7 +56,8 @@ async function collectAndSendUserEditDiffs(files, settings) {
 		if (!latestDownloaded) continue;
 		const downloadedVersion = latestDownloaded.entry;
 		if (downloadedVersion.postProcessHash) try {
-			if (hashStringSync(readFileContent(outputPath, uploadedFile.fileFormat)) === downloadedVersion.postProcessHash) continue;
+			const localFile = readFileContent(outputPath, uploadedFile.fileFormat);
+			if (hashStringSync(localeContent(localFile, uploadedFile.fileFormat, locale) ?? emptyLocaleContent(localFile, uploadedFile.fileFormat)) === downloadedVersion.postProcessHash) continue;
 		} catch {}
 		candidates.push({
 			branchId: uploadedFile.branchId,
@@ -74,22 +78,41 @@ async function collectAndSendUserEditDiffs(files, settings) {
 			branchId: c.branchId
 		}));
 		const translatedFiles = (await api.queryFileData({ translatedFiles: fileQueryData })).translatedFiles?.filter((t) => t.completedAt) ?? [];
-		const serverContentByKey = /* @__PURE__ */ new Map();
+		const serverPayloadByKey = /* @__PURE__ */ new Map();
 		try {
-			const files = (await api.downloadFileBatch(translatedFiles.map((file) => ({
+			const resp = await api.downloadFileBatch(translatedFiles.map((file) => ({
 				branchId: file.branchId,
 				fileId: file.fileId,
 				locale: file.locale,
 				versionId: file.versionId
-			}))))?.files || [];
-			for (const f of files) serverContentByKey.set(`${f.branchId}:${f.fileId}:${f.versionId}:${f.locale}`, contentBytes(f.data, f.fileFormat));
+			})));
+			for (const f of resp?.files || []) {
+				if (!f.locale) continue;
+				serverPayloadByKey.set(`${f.branchId}:${f.fileId}:${f.versionId}:${f.locale}`, {
+					data: f.data,
+					fileFormat: f.fileFormat
+				});
+			}
 		} catch {}
 		for (const c of candidates) {
 			const key = `${c.branchId}:${c.fileId}:${c.versionId}:${c.locale}`;
-			const serverBytes = serverContentByKey.get(key);
-			if (!serverBytes) continue;
+			const payload = serverPayloadByKey.get(key);
+			if (!payload) continue;
+			let serverContent;
 			try {
-				const localBytes = contentBytes(readFileContent(c.outputPath, c.fileFormat), c.fileFormat);
+				serverContent = localeContent(payload.data, payload.fileFormat, c.locale) ?? emptyLocaleContent(payload.data, payload.fileFormat);
+			} catch (error) {
+				const relativePath = getRelative(c.outputPath);
+				const reason = `The downloaded ${c.locale} translation could not be read (${error instanceof Error ? error.message : String(error)})`;
+				logger.warn(`Skipping local edits to ${relativePath}: ${reason}`);
+				recordWarning("skipped_file", relativePath, reason);
+				continue;
+			}
+			const serverBytes = contentBytes(serverContent, payload.fileFormat);
+			try {
+				const local = localeContent(readFileContent(c.outputPath, c.fileFormat), c.fileFormat, c.locale);
+				if (local === void 0) continue;
+				const localBytes = contentBytes(local, c.fileFormat);
 				if (localBytes.equals(serverBytes)) continue;
 				if (isBinaryFileFormat(c.fileFormat)) {
 					const relativePath = getRelative(c.outputPath);

package/dist/api/collectUserEditDiffs.js.map

@@ -1 +1 @@
-{"version":3,"file":"collectUserEditDiffs.js","names":["path","fs"],"sources":["../../src/api/collectUserEditDiffs.ts"],"sourcesContent":["import * as fs from 'node:fs';\nimport * as path from 'node:path';\nimport {\n  readLockfile,\n  EntryMap,\n  DownloadedTranslation,\n} from '../fs/config/downloadedVersions.js';\nimport { Settings } from '../types/index.js';\nimport { createFileMapping } from '../formats/files/fileMapping.js';\nimport { getGitUnifiedDiff } from '../utils/gitDiff.js';\nimport { api } from '../utils/api.js';\nimport {\n  FileReference,\n  isBinaryFileFormat,\n  SubmitUserEditDiff,\n  type FileFormat,\n} from 'generaltranslation/types';\nimport { readFileContent } from '../fs/fileContent.js';\nimport os from 'node:os';\nimport { randomUUID } from 'node:crypto';\nimport { hashStringSync } from '../utils/hash.js';\nimport { extractJson } from '../formats/json/extractJson.js';\nimport { extractYaml } from '../formats/yaml/extractYaml.js';\nimport { logger } from '../console/logger.js';\nimport { recordWarning } from '../state/translateWarnings.js';\nimport { getRelative } from '../fs/findFilepath.js';\n\ntype LatestDownloadedVersion = {\n  versionId: string;\n  entry: DownloadedTranslation;\n};\n\n/**\n * The bytes a file's pipeline content stands for: binary formats carry base64,\n * everything else carries UTF-8 text. Applied to both sides of the comparison\n * so they are measured the same way.\n */\nconst contentBytes = (content: string, fileFormat: FileFormat): Buffer =>\n  isBinaryFileFormat(fileFormat)\n    ? Buffer.from(content, 'base64')\n    : Buffer.from(content, 'utf8');\n\nconst findLatestDownloadedVersion = (\n  entryMap: EntryMap,\n  fileId: string,\n  locale: string\n): LatestDownloadedVersion | null => {\n  const entry = entryMap.get(fileId);\n  if (!entry) return null;\n\n  const translation = entry.translations[locale];\n  if (!translation) return null;\n\n  return { versionId: entry.versionId, entry: translation };\n};\n\n/**\n * Collects local user edits by diffing the latest downloaded server translation version\n * against the current local translation file, and submits the diffs upstream.\n *\n * Must run before enqueueing new translations so rules are available to the generator.\n */\nexport async function collectAndSendUserEditDiffs(\n  files: FileReference[],\n  settings: Settings\n): Promise<boolean> {\n  if (!settings.files) return false;\n\n  const { resolvedPaths, placeholderPaths, transformPaths, transformFormats } =\n    settings.files;\n  const fileMapping = createFileMapping(\n    resolvedPaths,\n    placeholderPaths,\n    transformPaths,\n    transformFormats,\n    settings.locales,\n    settings.defaultLocale\n  );\n\n  const { entryMap } = readLockfile(settings);\n\n  const tempDir = path.join(os.tmpdir(), randomUUID());\n  if (!fs.existsSync(tempDir)) fs.mkdirSync(tempDir, { recursive: true });\n\n  // Build candidates for diff and batch-fetch server contents\n  type DiffCandidate = {\n    branchId: string;\n    fileName: string;\n    fileId: string;\n    versionId: string;\n    locale: string; // resolved\n    outputPath: string;\n    fileFormat: FileFormat;\n  };\n  const candidates: DiffCandidate[] = [];\n\n  for (const uploadedFile of files) {\n    for (const locale of settings.locales) {\n      const outputPath = fileMapping[locale]?.[uploadedFile.fileName] ?? null;\n      if (!outputPath) continue;\n      if (!fs.existsSync(outputPath)) continue;\n\n      const latestDownloaded = findLatestDownloadedVersion(\n        entryMap,\n        uploadedFile.fileId,\n        locale\n      );\n\n      if (!latestDownloaded) continue;\n      const downloadedVersion = latestDownloaded.entry;\n\n      // Skip if local file matches the last postprocessed content hash\n      if (downloadedVersion.postProcessHash) {\n        try {\n          // Hashed from the same pipeline content the hash was recorded from,\n          // so a file stored in UTF-16 still matches when it is untouched.\n          const localContent = readFileContent(\n            outputPath,\n            uploadedFile.fileFormat\n          );\n          const localHash = hashStringSync(localContent);\n          if (localHash === downloadedVersion.postProcessHash) {\n            continue;\n          }\n        } catch {\n          // If hash check fails, fall through to diff\n        }\n      }\n\n      candidates.push({\n        branchId: uploadedFile.branchId,\n        fileName: uploadedFile.fileName,\n        fileId: uploadedFile.fileId,\n        versionId: latestDownloaded.versionId,\n        locale: locale,\n        outputPath,\n        fileFormat: uploadedFile.fileFormat,\n      });\n    }\n  }\n\n  const collectedDiffs: SubmitUserEditDiff[] = [];\n\n  if (candidates.length > 0) {\n    const fileQueryData = candidates.map((c) => ({\n      versionId: c.versionId,\n      locale: c.locale,\n      fileId: c.fileId,\n      branchId: c.branchId,\n    }));\n\n    // Single batched check to obtain translation IDs\n    const checkResponse = await api.queryFileData({\n      translatedFiles: fileQueryData,\n    });\n    const translatedFiles =\n      checkResponse.translatedFiles?.filter((t) => t.completedAt) ?? [];\n\n    const serverContentByKey = new Map<string, Buffer>();\n    try {\n      const resp = await api.downloadFileBatch(\n        translatedFiles.map((file) => ({\n          branchId: file.branchId,\n          fileId: file.fileId,\n          locale: file.locale,\n          versionId: file.versionId,\n        }))\n      );\n      const files = resp?.files || [];\n      for (const f of files) {\n        serverContentByKey.set(\n          `${f.branchId}:${f.fileId}:${f.versionId}:${f.locale}`,\n          contentBytes(f.data, f.fileFormat)\n        );\n      }\n    } catch {\n      // Ignore chunk failures; proceed with what we have\n    }\n\n    // Compute diffs using fetched server contents\n    for (const c of candidates) {\n      const key = `${c.branchId}:${c.fileId}:${c.versionId}:${c.locale}`;\n      const serverBytes = serverContentByKey.get(key);\n      // Absent means the batch did not return this file, so there is no\n      // baseline. An empty payload is a baseline of nothing, which the user\n      // may well have written against.\n      if (!serverBytes) continue;\n\n      try {\n        // Read the local file the same way the pipeline read it originally, so\n        // a file stored differently on disk than the server's copy is compared\n        // as content rather than as bytes. Otherwise every such file would read\n        // as edited on every run.\n        const localBytes = contentBytes(\n          readFileContent(c.outputPath, c.fileFormat),\n          c.fileFormat\n        );\n\n        // Nothing was edited, so there is no diff to compute or report.\n        if (localBytes.equals(serverBytes)) continue;\n\n        // A unified diff and localContent are both UTF-8 text, and every text\n        // format's content is UTF-8 by the time it reaches here. Only a binary\n        // format's bytes — a Lottie zip — have no text form at all. Say so:\n        // the edit is real and will be lost on the next download.\n        if (isBinaryFileFormat(c.fileFormat)) {\n          const relativePath = getRelative(c.outputPath);\n          const reason =\n            'Edited file is a binary format, so its changes cannot be submitted';\n          logger.warn(`Skipping local edits to ${relativePath}: ${reason}`);\n          recordWarning('skipped_file', relativePath, reason);\n          continue;\n        }\n\n        const safeName = Buffer.from(\n          `${c.branchId}:${c.fileId}:${c.versionId}:${c.locale}`\n        )\n          .toString('base64')\n          .replace(/=+$/g, '');\n        const tempServerFile = path.join(tempDir, `${safeName}.server`);\n        await fs.promises.writeFile(tempServerFile, serverBytes);\n\n        // git diff reads bytes, so both sides are written from the content\n        // they represent rather than diffing the file as it sits on disk.\n        const tempLocalFile = path.join(tempDir, `${safeName}.local`);\n        await fs.promises.writeFile(tempLocalFile, localBytes);\n\n        const diff = await getGitUnifiedDiff(tempServerFile, tempLocalFile);\n        for (const tempFile of [tempServerFile, tempLocalFile]) {\n          try {\n            await fs.promises.unlink(tempFile);\n          } catch {\n            // Ignore cleanup errors for temporary comparison files.\n          }\n        }\n\n        if (diff && diff.trim().length > 0) {\n          const rawLocalContent = localBytes.toString('utf8');\n\n          // For JSON files with jsonSchema config, extract to composite format\n          let localContent = rawLocalContent;\n          if (\n            c.fileName.endsWith('.json') &&\n            settings.options?.jsonSchema &&\n            c.locale !== settings.defaultLocale\n          ) {\n            const extractedContent = extractJson(\n              rawLocalContent,\n              c.fileName,\n              settings.options,\n              c.locale,\n              settings.defaultLocale\n            );\n            if (extractedContent) {\n              localContent = extractedContent;\n            }\n          } else if (\n            (c.fileName.endsWith('.yaml') || c.fileName.endsWith('.yml')) &&\n            settings.options?.yamlSchema &&\n            c.locale !== settings.defaultLocale\n          ) {\n            const extractedContent = extractYaml(\n              rawLocalContent,\n              c.fileName,\n              settings.options\n            );\n            if (extractedContent) {\n              localContent = extractedContent;\n            }\n          }\n\n          collectedDiffs.push({\n            fileName: c.fileName,\n            locale: c.locale,\n            diff,\n            branchId: c.branchId,\n            versionId: c.versionId,\n            fileId: c.fileId,\n            localContent,\n          } satisfies SubmitUserEditDiff);\n        }\n      } catch {\n        // Ignore failures for this file\n      }\n    }\n  }\n\n  if (collectedDiffs.length > 0) {\n    await api.submitUserEditDiffs({ diffs: collectedDiffs });\n  }\n\n  return collectedDiffs.length > 0;\n}\n"],"mappings":"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"}
+{"version":3,"file":"collectUserEditDiffs.js","names":["path","fs"],"sources":["../../src/api/collectUserEditDiffs.ts"],"sourcesContent":["import * as fs from 'node:fs';\nimport * as path from 'node:path';\nimport {\n  readLockfile,\n  EntryMap,\n  DownloadedTranslation,\n} from '../fs/config/downloadedVersions.js';\nimport { Settings } from '../types/index.js';\nimport { createFileMapping } from '../formats/files/fileMapping.js';\nimport { getGitUnifiedDiff } from '../utils/gitDiff.js';\nimport { api } from '../utils/api.js';\nimport {\n  FileReference,\n  isBinaryFileFormat,\n  SubmitUserEditDiff,\n  type FileFormat,\n} from 'generaltranslation/types';\nimport { readFileContent } from '../fs/fileContent.js';\nimport os from 'node:os';\nimport { randomUUID } from 'node:crypto';\nimport { hashStringSync } from '../utils/hash.js';\nimport { extractJson } from '../formats/json/extractJson.js';\nimport {\n  emptyLocaleContent,\n  localeContent,\n} from '../formats/files/localeContent.js';\nimport { extractYaml } from '../formats/yaml/extractYaml.js';\nimport { logger } from '../console/logger.js';\nimport { recordWarning } from '../state/translateWarnings.js';\nimport { getRelative } from '../fs/findFilepath.js';\n\ntype LatestDownloadedVersion = {\n  versionId: string;\n  entry: DownloadedTranslation;\n};\n\n/**\n * The bytes a file's pipeline content stands for: binary formats carry base64,\n * everything else carries UTF-8 text. Applied to both sides of the comparison\n * so they are measured the same way.\n */\nconst contentBytes = (content: string, fileFormat: FileFormat): Buffer =>\n  isBinaryFileFormat(fileFormat)\n    ? Buffer.from(content, 'base64')\n    : Buffer.from(content, 'utf8');\n\nconst findLatestDownloadedVersion = (\n  entryMap: EntryMap,\n  fileId: string,\n  locale: string\n): LatestDownloadedVersion | null => {\n  const entry = entryMap.get(fileId);\n  if (!entry) return null;\n\n  const translation = entry.translations[locale];\n  if (!translation) return null;\n\n  return { versionId: entry.versionId, entry: translation };\n};\n\n/**\n * Collects local user edits by diffing the latest downloaded server translation version\n * against the current local translation file, and submits the diffs upstream.\n * A file that holds every locale is compared one locale slice at a time, so an\n * edit to one locale is submitted under that locale alone.\n *\n * Must run before enqueueing new translations so rules are available to the generator.\n */\nexport async function collectAndSendUserEditDiffs(\n  files: FileReference[],\n  settings: Settings\n): Promise<boolean> {\n  if (!settings.files) return false;\n\n  const { resolvedPaths, placeholderPaths, transformPaths, transformFormats } =\n    settings.files;\n  const fileMapping = createFileMapping(\n    resolvedPaths,\n    placeholderPaths,\n    transformPaths,\n    transformFormats,\n    settings.locales,\n    settings.defaultLocale\n  );\n\n  const { entryMap } = readLockfile(settings);\n\n  const tempDir = path.join(os.tmpdir(), randomUUID());\n  if (!fs.existsSync(tempDir)) fs.mkdirSync(tempDir, { recursive: true });\n\n  // Build candidates for diff and batch-fetch server contents\n  type DiffCandidate = {\n    branchId: string;\n    fileName: string;\n    fileId: string;\n    versionId: string;\n    locale: string; // resolved\n    outputPath: string;\n    fileFormat: FileFormat;\n  };\n  const candidates: DiffCandidate[] = [];\n\n  for (const uploadedFile of files) {\n    for (const locale of settings.locales) {\n      const outputPath = fileMapping[locale]?.[uploadedFile.fileName] ?? null;\n      if (!outputPath) continue;\n      if (!fs.existsSync(outputPath)) continue;\n\n      const latestDownloaded = findLatestDownloadedVersion(\n        entryMap,\n        uploadedFile.fileId,\n        locale\n      );\n\n      if (!latestDownloaded) continue;\n      const downloadedVersion = latestDownloaded.entry;\n\n      // Skip if the locale's local content matches the last recorded hash\n      if (downloadedVersion.postProcessHash) {\n        try {\n          // Hashed from the locale's share of the pipeline content, which is\n          // what was recorded, so an untouched locale matches regardless of\n          // the file's encoding or of edits to its other locales.\n          const localFile = readFileContent(\n            outputPath,\n            uploadedFile.fileFormat\n          );\n          const localHash = hashStringSync(\n            localeContent(localFile, uploadedFile.fileFormat, locale) ??\n              emptyLocaleContent(localFile, uploadedFile.fileFormat)\n          );\n          if (localHash === downloadedVersion.postProcessHash) {\n            continue;\n          }\n        } catch {\n          // If hash check fails, fall through to diff\n        }\n      }\n\n      candidates.push({\n        branchId: uploadedFile.branchId,\n        fileName: uploadedFile.fileName,\n        fileId: uploadedFile.fileId,\n        versionId: latestDownloaded.versionId,\n        locale: locale,\n        outputPath,\n        fileFormat: uploadedFile.fileFormat,\n      });\n    }\n  }\n\n  const collectedDiffs: SubmitUserEditDiff[] = [];\n\n  if (candidates.length > 0) {\n    const fileQueryData = candidates.map((c) => ({\n      versionId: c.versionId,\n      locale: c.locale,\n      fileId: c.fileId,\n      branchId: c.branchId,\n    }));\n\n    // Single batched check to obtain translation IDs\n    const checkResponse = await api.queryFileData({\n      translatedFiles: fileQueryData,\n    });\n    const translatedFiles =\n      checkResponse.translatedFiles?.filter((t) => t.completedAt) ?? [];\n\n    // The server's copy of each candidate, keyed like the candidates\n    type ServerPayload = { data: string; fileFormat: FileFormat };\n    const serverPayloadByKey = new Map<string, ServerPayload>();\n    try {\n      const resp = await api.downloadFileBatch(\n        translatedFiles.map((file) => ({\n          branchId: file.branchId,\n          fileId: file.fileId,\n          locale: file.locale,\n          versionId: file.versionId,\n        }))\n      );\n      for (const f of resp?.files || []) {\n        if (!f.locale) continue;\n        serverPayloadByKey.set(\n          `${f.branchId}:${f.fileId}:${f.versionId}:${f.locale}`,\n          { data: f.data, fileFormat: f.fileFormat }\n        );\n      }\n    } catch {\n      // Ignore chunk failures; proceed with what we have\n    }\n\n    // Compute diffs using fetched server contents\n    for (const c of candidates) {\n      const key = `${c.branchId}:${c.fileId}:${c.versionId}:${c.locale}`;\n      const payload = serverPayloadByKey.get(key);\n      // Absent means the batch did not return this file, so there is no\n      // baseline. An empty payload is a baseline of nothing, which the user\n      // may well have written against.\n      if (!payload) continue;\n\n      // The locale's share of the payload, read on its own so a payload the\n      // server sent malformed costs only its own locale. A catalog payload\n      // that carries nothing for the locale is that file's empty payload, and\n      // a baseline of nothing like any other.\n      let serverContent: string;\n      try {\n        serverContent =\n          localeContent(payload.data, payload.fileFormat, c.locale) ??\n          emptyLocaleContent(payload.data, payload.fileFormat);\n      } catch (error) {\n        const relativePath = getRelative(c.outputPath);\n        const reason = `The downloaded ${c.locale} translation could not be read (${\n          error instanceof Error ? error.message : String(error)\n        })`;\n        logger.warn(`Skipping local edits to ${relativePath}: ${reason}`);\n        recordWarning('skipped_file', relativePath, reason);\n        continue;\n      }\n      const serverBytes = contentBytes(serverContent, payload.fileFormat);\n\n      try {\n        // Read the local file the same way the pipeline read it originally, so\n        // a file stored differently on disk than the server's copy is compared\n        // as content rather than as bytes. Otherwise every such file would read\n        // as edited on every run. Then cut to this locale's share, so a file\n        // that holds every locale is compared slice to slice.\n        const local = localeContent(\n          readFileContent(c.outputPath, c.fileFormat),\n          c.fileFormat,\n          c.locale\n        );\n        // A catalog that no longer carries the locale has nothing to submit\n        if (local === undefined) continue;\n        const localBytes = contentBytes(local, c.fileFormat);\n\n        // Nothing was edited, so there is no diff to compute or report.\n        if (localBytes.equals(serverBytes)) continue;\n\n        // A unified diff and localContent are both UTF-8 text, and every text\n        // format's content is UTF-8 by the time it reaches here. Only a binary\n        // format's bytes — a Lottie zip — have no text form at all. Say so:\n        // the edit is real and will be lost on the next download.\n        if (isBinaryFileFormat(c.fileFormat)) {\n          const relativePath = getRelative(c.outputPath);\n          const reason =\n            'Edited file is a binary format, so its changes cannot be submitted';\n          logger.warn(`Skipping local edits to ${relativePath}: ${reason}`);\n          recordWarning('skipped_file', relativePath, reason);\n          continue;\n        }\n\n        const safeName = Buffer.from(\n          `${c.branchId}:${c.fileId}:${c.versionId}:${c.locale}`\n        )\n          .toString('base64')\n          .replace(/=+$/g, '');\n        const tempServerFile = path.join(tempDir, `${safeName}.server`);\n        await fs.promises.writeFile(tempServerFile, serverBytes);\n\n        // git diff reads bytes, so both sides are written from the content\n        // they represent rather than diffing the file as it sits on disk.\n        const tempLocalFile = path.join(tempDir, `${safeName}.local`);\n        await fs.promises.writeFile(tempLocalFile, localBytes);\n\n        const diff = await getGitUnifiedDiff(tempServerFile, tempLocalFile);\n        for (const tempFile of [tempServerFile, tempLocalFile]) {\n          try {\n            await fs.promises.unlink(tempFile);\n          } catch {\n            // Ignore cleanup errors for temporary comparison files.\n          }\n        }\n\n        if (diff && diff.trim().length > 0) {\n          const rawLocalContent = localBytes.toString('utf8');\n\n          // For JSON files with jsonSchema config, extract to composite format\n          let localContent = rawLocalContent;\n          if (\n            c.fileName.endsWith('.json') &&\n            settings.options?.jsonSchema &&\n            c.locale !== settings.defaultLocale\n          ) {\n            const extractedContent = extractJson(\n              rawLocalContent,\n              c.fileName,\n              settings.options,\n              c.locale,\n              settings.defaultLocale\n            );\n            if (extractedContent) {\n              localContent = extractedContent;\n            }\n          } else if (\n            (c.fileName.endsWith('.yaml') || c.fileName.endsWith('.yml')) &&\n            settings.options?.yamlSchema &&\n            c.locale !== settings.defaultLocale\n          ) {\n            const extractedContent = extractYaml(\n              rawLocalContent,\n              c.fileName,\n              settings.options\n            );\n            if (extractedContent) {\n              localContent = extractedContent;\n            }\n          }\n\n          collectedDiffs.push({\n            fileName: c.fileName,\n            locale: c.locale,\n            diff,\n            branchId: c.branchId,\n            versionId: c.versionId,\n            fileId: c.fileId,\n            localContent,\n          } satisfies SubmitUserEditDiff);\n        }\n      } catch {\n        // Ignore failures for this file\n      }\n    }\n  }\n\n  if (collectedDiffs.length > 0) {\n    await api.submitUserEditDiffs({ diffs: collectedDiffs });\n  }\n\n  return collectedDiffs.length > 0;\n}\n"],"mappings":"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"}

package/dist/api/downloadFileBatch.js

@@ -13,6 +13,7 @@ import { resolveMintlifyRefs, shouldResolveRefs } from "../utils/resolveMintlify
 import { validateYamlSchema } from "../formats/yaml/utils.js";
 import { extractYaml } from "../formats/yaml/extractYaml.js";
 import { mergeJson } from "../formats/json/mergeJson.js";
+import { mergeXcstringsLocale } from "../formats/xcstrings/mergeXcstrings.js";
 import mergeYaml from "../formats/yaml/mergeYaml.js";
 import { recordDownloaded, recordRemerged } from "../state/recentDownloads.js";
 import * as fs$1 from "fs";
@@ -162,8 +163,9 @@ async function downloadFileBatch(fileTracker, files, options, forceDownload = fa
 					}
 					continue;
 				}
+				const isXcstringsCatalog = file.fileFormat === "XCSTRINGS";
 				const isInPlaceComposite = options.options?.jsonSchema ? !!validateJsonSchema(options.options, inputPath)?.composite : false;
-				if (!forceDownload && fileExists && downloadedTranslation && !isInPlaceComposite) {
+				if (!forceDownload && fileExists && downloadedTranslation && !(isXcstringsCatalog || isInPlaceComposite)) {
 					try {
 						let existingContent = fs$1.readFileSync(outputPath, "utf8");
 						if (shouldResolveRefs(outputPath, options.options)) try {
@@ -186,11 +188,15 @@ async function downloadFileBatch(fileTracker, files, options, forceDownload = fa
 					result.skipped.push(requestedFile);
 					continue;
 				}
-				let data = mergeWithSource(file.data, locale, inputPath, options);
-				if (file.fileFormat === "GTJSON" || outputPath.endsWith(".json")) try {
-					data = sortJsonString(data);
-				} catch (error) {
-					logger.warn(`Failed to sort JSON file: ${file.id}: ` + error);
+				let data;
+				if (isXcstringsCatalog) data = mergeXcstringsLocale(file.data, locale, inputPath);
+				else {
+					data = mergeWithSource(file.data, locale, inputPath, options);
+					if (file.fileFormat === "GTJSON" || outputPath.endsWith(".json")) try {
+						data = sortJsonString(data);
+					} catch (error) {
+						logger.warn(`Failed to sort JSON file: ${file.id}: ` + error);
+					}
 				}
 				await fs$1.promises.writeFile(outputPath, encodeFileContent(data, file.fileFormat, inputPath, outputPath));
 				recordDownloaded(outputPath, {
@@ -207,6 +213,7 @@ async function downloadFileBatch(fileTracker, files, options, forceDownload = fa
 					const entry = findOrCreateEntry(entryMap, downloadedVersions.entries, fileId, versionId);
 					entry.fileName = inputPath;
 					entry.translations[locale] = {
+						...entry.translations[locale],
 						updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
 						fileName: getRelative(outputPath)
 					};

package/dist/api/downloadFileBatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"downloadFileBatch.js","names":["fs","path"],"sources":["../../src/api/downloadFileBatch.ts"],"sourcesContent":["import * as fs from 'fs';\nimport * as path from 'path';\nimport { isBinaryFileFormat } from 'generaltranslation/types';\nimport { logger } from '../console/logger.js';\nimport { api } from '../utils/api.js';\nimport { Settings } from '../types/index.js';\nimport { validateJsonSchema } from '../formats/json/utils.js';\nimport { validateYamlSchema } from '../formats/yaml/utils.js';\nimport { mergeJson } from '../formats/json/mergeJson.js';\nimport { extractJson } from '../formats/json/extractJson.js';\nimport mergeYaml from '../formats/yaml/mergeYaml.js';\nimport { extractYaml } from '../formats/yaml/extractYaml.js';\nimport {\n  resolveMintlifyRefs,\n  shouldResolveRefs,\n} from '../utils/resolveMintlifyRefs.js';\nimport {\n  readLockfile,\n  writeLockfile,\n  findOrCreateEntry,\n} from '../fs/config/downloadedVersions.js';\nimport { recordDownloaded, recordRemerged } from '../state/recentDownloads.js';\nimport { recordWarning } from '../state/translateWarnings.js';\nimport stringify from 'fast-json-stable-stringify';\nimport type { FileStatusTracker } from '../workflows/steps/PollJobsStep.js';\nimport { SUPPORTED_FILE_EXTENSIONS } from '../formats/files/supportedFiles.js';\nimport { hasNonIdentityFileFormatTransformForType } from '../formats/files/transformFormat.js';\nimport { getRelative } from '../fs/findFilepath.js';\nimport { encodeFileContent } from '../fs/fileContent.js';\nimport {\n  getInlineElementsLabel,\n  type InlineLibrary,\n} from '../types/libraries.js';\n\n/**\n * The platform withholds unapproved review-gated GTJSON components from\n * served output. Reports the delta between the source component count and\n * the served content so partially-served files don't read as fully\n * translated — for both fresh downloads and already-downloaded skips.\n */\nfunction reportWithheldGtJsonComponents(\n  fileFormat: string | undefined,\n  servedContent: string,\n  componentCount: number | undefined,\n  locale: string,\n  inlineLibrary?: InlineLibrary\n): void {\n  if (fileFormat !== 'GTJSON' || componentCount == null) return;\n  const received = countGtJsonEntries(servedContent);\n  if (received == null) return;\n  const withheld = componentCount - received;\n  if (withheld > 0) {\n    recordWarning(\n      'pending_review',\n      `<${getInlineElementsLabel(inlineLibrary)}>`,\n      `${withheld} component translation(s) for locale ${locale} require review and are not approved yet`\n    );\n  }\n}\n\n/**\n * Counts entries in downloaded GTJSON output, tolerating both the flat\n * public shape and a wrapped { type, data } shape.\n */\nfunction countGtJsonEntries(content: string): number | undefined {\n  try {\n    const parsed: unknown = JSON.parse(content);\n    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {\n      return undefined;\n    }\n    const entries =\n      'type' in parsed &&\n      parsed.type === 'GTJSON' &&\n      'data' in parsed &&\n      parsed.data &&\n      typeof parsed.data === 'object' &&\n      !Array.isArray(parsed.data)\n        ? parsed.data\n        : parsed;\n    return Object.keys(entries).length;\n  } catch {\n    return undefined;\n  }\n}\n\nfunction sortJsonString(data: string): string {\n  const sortedData = stringify(JSON.parse(data));\n  return JSON.stringify(JSON.parse(sortedData), null, 2);\n}\n\n/**\n * Merges translated content with the current source file for schema-based formats.\n */\nfunction mergeWithSource(\n  translatedContent: string,\n  locale: string,\n  inputPath: string,\n  options: Settings\n): string {\n  if (shouldSkipSourceFormatMerge(inputPath, options)) {\n    return translatedContent;\n  }\n  if (!options.options) return translatedContent;\n\n  const jsonSchema = options.options.jsonSchema\n    ? validateJsonSchema(options.options, inputPath)\n    : null;\n  const yamlSchema =\n    !jsonSchema && options.options.yamlSchema\n      ? validateYamlSchema(options.options, inputPath)\n      : null;\n\n  if (!jsonSchema && !yamlSchema) return translatedContent;\n\n  const sourceContent = fs.readFileSync(inputPath, 'utf8');\n  if (!sourceContent) return translatedContent;\n\n  if (jsonSchema) {\n    // Resolve $ref before merging if configured\n    let resolvedSourceContent = sourceContent;\n    if (shouldResolveRefs(inputPath, options.options)) {\n      try {\n        const json = JSON.parse(sourceContent);\n        const { resolved } = resolveMintlifyRefs(json, inputPath);\n        resolvedSourceContent = JSON.stringify(resolved, null, 2);\n      } catch {\n        // Fall through with original content\n      }\n    }\n    return mergeJson(\n      resolvedSourceContent,\n      inputPath,\n      options.options,\n      [{ translatedContent, targetLocale: locale }],\n      options.defaultLocale,\n      options.locales\n    )[0];\n  } else {\n    return mergeYaml(\n      sourceContent,\n      inputPath,\n      options.options,\n      [{ translatedContent, targetLocale: locale }],\n      options.defaultLocale\n    )[0];\n  }\n}\n\n/**\n * Determines whether a source file should be skipped for schema re-merging.\n * @param inputPath - The path of the source file\n * @param options - The settings for the project\n * @returns True if the source file should be skipped for schema re-merging, false otherwise\n */\nfunction shouldSkipSourceFormatMerge(\n  inputPath: string,\n  options: Settings\n): boolean {\n  for (const fileType of SUPPORTED_FILE_EXTENSIONS) {\n    if (!hasNonIdentityFileFormatTransformForType(options, fileType)) continue;\n\n    const transformedSourcePaths = options.files.resolvedPaths[fileType] || [];\n    if (\n      transformedSourcePaths.some(\n        (sourcePath) => getRelative(sourcePath) === inputPath\n      )\n    ) {\n      return true;\n    }\n  }\n\n  return false;\n}\n\nexport type BatchedFiles = {\n  branchId: string;\n  fileId: string;\n  versionId: string;\n  locale: string;\n  outputPath: string;\n  inputPath: string;\n}[];\n\nexport type DownloadFileBatchResult = {\n  successful: BatchedFiles;\n  failed: BatchedFiles;\n  skipped: BatchedFiles;\n};\n/**\n * Downloads multiple translation files in a single batch request\n * @param fileTracker - Current translation status keyed by file identity\n * @param files - Array of files to download with their output paths\n * @param options - Resolved CLI settings used for merge and lockfile behavior\n * @param forceDownload - Whether to bypass an up-to-date local translation\n * @param inlineLibrary - Inline runtime used to label the shared GTJSON file\n * @returns Object containing successful and failed file IDs\n */\nexport async function downloadFileBatch(\n  fileTracker: FileStatusTracker,\n  files: BatchedFiles,\n  options: Settings,\n  forceDownload: boolean = false,\n  inlineLibrary?: InlineLibrary\n): Promise<DownloadFileBatchResult> {\n  // Local record of what version was last downloaded for each fileName:locale\n  const {\n    data: downloadedVersions,\n    entryMap,\n    originalV1,\n  } = readLockfile(options);\n  let didUpdateDownloadedLock = false;\n\n  // Create a map of requested file keys to the file object\n  const requestedFileMap = new Map(\n    files.map((file) => [\n      `${file.branchId}:${file.fileId}:${file.versionId}:${file.locale}`,\n      file,\n    ])\n  );\n  const result: DownloadFileBatchResult = {\n    successful: [],\n    failed: [],\n    skipped: [],\n  };\n\n  // Create a map of translationId to outputPath for easier lookup\n  const outputPathMap = new Map(\n    files.map((file) => [\n      `${file.branchId}:${file.fileId}:${file.versionId}:${file.locale}`,\n      file.outputPath,\n    ])\n  );\n\n  try {\n    // Download the files\n    const responseData = await api.downloadFileBatch(\n      files.map((file) => ({\n        fileId: file.fileId,\n        branchId: file.branchId,\n        versionId: file.versionId,\n        locale: file.locale,\n      }))\n    );\n    const downloadedFiles = responseData.files || [];\n\n    // Process each file in the response\n    for (const file of downloadedFiles) {\n      const fileKey = `${file.branchId}:${file.fileId}:${file.versionId}:${file.locale}`;\n      const requestedFile = requestedFileMap.get(fileKey);\n      if (!requestedFile) {\n        continue;\n      }\n      try {\n        const outputPath = outputPathMap.get(fileKey);\n        const fileProperties = fileTracker.completed.get(fileKey);\n\n        if (!outputPath || !fileProperties) {\n          logger.warn(`No input/output path found for file: ${fileKey}`);\n          recordWarning(\n            'failed_download',\n            fileKey,\n            'No input/output path found'\n          );\n          result.failed.push(requestedFile);\n          continue;\n        }\n\n        const {\n          fileId,\n          versionId,\n          locale,\n          branchId,\n          fileName: inputPath,\n        } = fileProperties;\n\n        // Ensure the directory exists\n        const dir = path.dirname(outputPath);\n        if (!fs.existsSync(dir)) {\n          fs.mkdirSync(dir, { recursive: true });\n        }\n        // If a local translation already exists for the same source version, skip overwrite\n        const existingEntry = entryMap.get(fileId);\n        const downloadedTranslation =\n          existingEntry?.versionId === versionId\n            ? existingEntry.translations[locale]\n            : undefined;\n        const fileExists = fs.existsSync(outputPath);\n\n        // Binary formats (e.g. LOTTIE zip bundles) carry base64 content that must\n        // not go through the text merge/sort path — decode straight to bytes and\n        // write. Skip only when an unchanged local translation already exists.\n        if (isBinaryFileFormat(file.fileFormat)) {\n          if (!forceDownload && fileExists && downloadedTranslation) {\n            result.skipped.push(requestedFile);\n            continue;\n          }\n          await fs.promises.writeFile(\n            outputPath,\n            Buffer.from(file.data, 'base64')\n          );\n          recordDownloaded(outputPath, {\n            branchId,\n            fileId,\n            versionId,\n            locale,\n            fileFormat: file.fileFormat,\n            inputPath,\n          });\n          result.successful.push(requestedFile);\n          if (fileId && versionId && locale) {\n            const entry = findOrCreateEntry(\n              entryMap,\n              downloadedVersions.entries,\n              fileId,\n              versionId\n            );\n            entry.fileName = inputPath;\n            entry.translations[locale] = {\n              updatedAt: new Date().toISOString(),\n              // Store a relative path (matches the text path) so gt-lock.json\n              // stays portable and the skip-on-re-download check matches.\n              fileName: getRelative(outputPath),\n            };\n            // A staged entry tracks the whole file, not one locale. Keep it\n            // staged until every configured locale has downloaded, so a partial\n            // batch (locales still translating) doesn't abandon the rest.\n            if (entry.staged) {\n              entry.staged = !options.locales.every(\n                (l) => entry.translations[l]\n              );\n            }\n            didUpdateDownloadedLock = true;\n          }\n          continue;\n        }\n\n        // Composite schema files merge translations into the source file itself,\n        // so outputPath always exists and the lock can't tell whether derived\n        // split outputs (e.g. {locale}/docs.json) are still on disk. Always\n        // merge fresh API data so derived files are regenerated every run;\n        // local edits to translated output are preserved via `gt save-local`.\n        const isInPlaceComposite = options.options?.jsonSchema\n          ? !!validateJsonSchema(options.options, inputPath)?.composite\n          : false;\n\n        if (\n          !forceDownload &&\n          fileExists &&\n          downloadedTranslation &&\n          !isInPlaceComposite\n        ) {\n          // For schema-based files, re-merge with current source in case\n          // non-translatable fields changed (skip the API download, not the merge)\n          try {\n            let existingContent = fs.readFileSync(outputPath, 'utf8');\n            // Resolve $ref before extraction if configured\n            if (shouldResolveRefs(outputPath, options.options)) {\n              try {\n                const json = JSON.parse(existingContent);\n                const { resolved } = resolveMintlifyRefs(json, outputPath);\n                existingContent = JSON.stringify(resolved, null, 2);\n              } catch {\n                // Fall through with original content\n              }\n            }\n            const jsonExtracted = options.options?.jsonSchema\n              ? extractJson(\n                  existingContent,\n                  inputPath,\n                  options.options,\n                  locale,\n                  options.defaultLocale\n                )\n              : null;\n            const extracted =\n              jsonExtracted ??\n              (options.options?.yamlSchema\n                ? extractYaml(existingContent, inputPath, options.options)\n                : null);\n            if (extracted) {\n              const remerged = mergeWithSource(\n                extracted,\n                locale,\n                inputPath,\n                options\n              );\n              let remergedData = remerged;\n              if (outputPath.endsWith('.json')) {\n                try {\n                  remergedData = sortJsonString(remergedData);\n                } catch {\n                  // Fall through with unsorted content\n                }\n              }\n              if (remergedData !== existingContent) {\n                await fs.promises.writeFile(outputPath, remergedData);\n              }\n              // Track for postprocessing (e.g. openapi path localization)\n              // even when the API download was skipped\n              recordRemerged(outputPath);\n            }\n          } catch (error) {\n            // If re-merge fails, still count as skipped — not worth failing\n            // the download, but surface it so missing output is diagnosable\n            logger.warn(\n              `Failed to re-merge existing translation for ${outputPath} (${locale}): ${error}`\n            );\n          }\n          // Even when the local copy is current, the served content may\n          // still be missing review-withheld components — keep reporting\n          reportWithheldGtJsonComponents(\n            file.fileFormat,\n            file.data,\n            fileProperties.componentCount,\n            locale,\n            inlineLibrary\n          );\n          result.skipped.push(requestedFile);\n          continue;\n        }\n        let data = mergeWithSource(file.data, locale, inputPath, options);\n\n        // Stable sort JSON keys for deterministic output\n        if (file.fileFormat === 'GTJSON' || outputPath.endsWith('.json')) {\n          try {\n            data = sortJsonString(data);\n          } catch (error) {\n            logger.warn(`Failed to sort JSON file: ${file.id}: ` + error);\n          }\n        }\n\n        // Write the file to disk\n        await fs.promises.writeFile(\n          outputPath,\n          encodeFileContent(data, file.fileFormat, inputPath, outputPath)\n        );\n        // Track as downloaded with metadata for downstream postprocessing\n        recordDownloaded(outputPath, {\n          branchId,\n          fileId,\n          versionId,\n          locale,\n          fileFormat: file.fileFormat,\n          inputPath,\n        });\n\n        reportWithheldGtJsonComponents(\n          file.fileFormat,\n          data,\n          fileProperties.componentCount,\n          locale,\n          inlineLibrary\n        );\n\n        result.successful.push(requestedFile);\n        if (fileId && versionId && locale) {\n          const entry = findOrCreateEntry(\n            entryMap,\n            downloadedVersions.entries,\n            fileId,\n            versionId\n          );\n          entry.fileName = inputPath;\n          entry.translations[locale] = {\n            updatedAt: new Date().toISOString(),\n            fileName: getRelative(outputPath),\n          };\n          // A staged entry tracks the whole file, not one locale. Keep it\n          // staged until every configured locale has downloaded, so a partial\n          // batch (locales still translating) doesn't abandon the rest.\n          if (entry.staged) {\n            entry.staged = !options.locales.every((l) => entry.translations[l]);\n          }\n          didUpdateDownloadedLock = true;\n        }\n      } catch (error) {\n        logger.error(`Error saving file ${fileKey}: ` + error);\n        recordWarning(\n          'failed_download',\n          fileKey,\n          `Error saving file: ${error}`\n        );\n        result.failed.push(requestedFile);\n      }\n    }\n\n    // Add any files that weren't in the response to the failed list\n    const downloadedFileKeys = new Set(\n      downloadedFiles.map(\n        (file) =>\n          `${file.branchId}:${file.fileId}:${file.versionId}:${file.locale}`\n      )\n    );\n    for (const [fileKey, requestedFile] of requestedFileMap.entries()) {\n      if (!downloadedFileKeys.has(fileKey)) {\n        result.failed.push(requestedFile);\n      }\n    }\n\n    // Persist any updates to the downloaded map at the end of a successful cycle\n    if (didUpdateDownloadedLock) {\n      writeLockfile(downloadedVersions, originalV1);\n      didUpdateDownloadedLock = false;\n    }\n    return result;\n  } catch (error) {\n    logger.error(\n      `An unexpected error occurred while downloading files: ` + error\n    );\n  }\n\n  // Mark all files as failed if we get here\n  result.failed = [...requestedFileMap.values()];\n  if (didUpdateDownloadedLock) {\n    writeLockfile(downloadedVersions, originalV1);\n  }\n  return result;\n}\n"],"mappings":"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"}
+{"version":3,"file":"downloadFileBatch.js","names":["fs","path"],"sources":["../../src/api/downloadFileBatch.ts"],"sourcesContent":["import * as fs from 'fs';\nimport * as path from 'path';\nimport { isBinaryFileFormat } from 'generaltranslation/types';\nimport { logger } from '../console/logger.js';\nimport { api } from '../utils/api.js';\nimport { Settings } from '../types/index.js';\nimport { validateJsonSchema } from '../formats/json/utils.js';\nimport { validateYamlSchema } from '../formats/yaml/utils.js';\nimport { mergeJson } from '../formats/json/mergeJson.js';\nimport { extractJson } from '../formats/json/extractJson.js';\nimport { mergeXcstringsLocale } from '../formats/xcstrings/mergeXcstrings.js';\nimport mergeYaml from '../formats/yaml/mergeYaml.js';\nimport { extractYaml } from '../formats/yaml/extractYaml.js';\nimport {\n  resolveMintlifyRefs,\n  shouldResolveRefs,\n} from '../utils/resolveMintlifyRefs.js';\nimport {\n  readLockfile,\n  writeLockfile,\n  findOrCreateEntry,\n} from '../fs/config/downloadedVersions.js';\nimport { recordDownloaded, recordRemerged } from '../state/recentDownloads.js';\nimport { recordWarning } from '../state/translateWarnings.js';\nimport stringify from 'fast-json-stable-stringify';\nimport type { FileStatusTracker } from '../workflows/steps/PollJobsStep.js';\nimport { SUPPORTED_FILE_EXTENSIONS } from '../formats/files/supportedFiles.js';\nimport { hasNonIdentityFileFormatTransformForType } from '../formats/files/transformFormat.js';\nimport { getRelative } from '../fs/findFilepath.js';\nimport { encodeFileContent } from '../fs/fileContent.js';\nimport {\n  getInlineElementsLabel,\n  type InlineLibrary,\n} from '../types/libraries.js';\n\n/**\n * The platform withholds unapproved review-gated GTJSON components from\n * served output. Reports the delta between the source component count and\n * the served content so partially-served files don't read as fully\n * translated — for both fresh downloads and already-downloaded skips.\n */\nfunction reportWithheldGtJsonComponents(\n  fileFormat: string | undefined,\n  servedContent: string,\n  componentCount: number | undefined,\n  locale: string,\n  inlineLibrary?: InlineLibrary\n): void {\n  if (fileFormat !== 'GTJSON' || componentCount == null) return;\n  const received = countGtJsonEntries(servedContent);\n  if (received == null) return;\n  const withheld = componentCount - received;\n  if (withheld > 0) {\n    recordWarning(\n      'pending_review',\n      `<${getInlineElementsLabel(inlineLibrary)}>`,\n      `${withheld} component translation(s) for locale ${locale} require review and are not approved yet`\n    );\n  }\n}\n\n/**\n * Counts entries in downloaded GTJSON output, tolerating both the flat\n * public shape and a wrapped { type, data } shape.\n */\nfunction countGtJsonEntries(content: string): number | undefined {\n  try {\n    const parsed: unknown = JSON.parse(content);\n    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {\n      return undefined;\n    }\n    const entries =\n      'type' in parsed &&\n      parsed.type === 'GTJSON' &&\n      'data' in parsed &&\n      parsed.data &&\n      typeof parsed.data === 'object' &&\n      !Array.isArray(parsed.data)\n        ? parsed.data\n        : parsed;\n    return Object.keys(entries).length;\n  } catch {\n    return undefined;\n  }\n}\n\nfunction sortJsonString(data: string): string {\n  const sortedData = stringify(JSON.parse(data));\n  return JSON.stringify(JSON.parse(sortedData), null, 2);\n}\n\n/**\n * Merges translated content with the current source file for schema-based formats.\n */\nfunction mergeWithSource(\n  translatedContent: string,\n  locale: string,\n  inputPath: string,\n  options: Settings\n): string {\n  if (shouldSkipSourceFormatMerge(inputPath, options)) {\n    return translatedContent;\n  }\n  if (!options.options) return translatedContent;\n\n  const jsonSchema = options.options.jsonSchema\n    ? validateJsonSchema(options.options, inputPath)\n    : null;\n  const yamlSchema =\n    !jsonSchema && options.options.yamlSchema\n      ? validateYamlSchema(options.options, inputPath)\n      : null;\n\n  if (!jsonSchema && !yamlSchema) return translatedContent;\n\n  const sourceContent = fs.readFileSync(inputPath, 'utf8');\n  if (!sourceContent) return translatedContent;\n\n  if (jsonSchema) {\n    // Resolve $ref before merging if configured\n    let resolvedSourceContent = sourceContent;\n    if (shouldResolveRefs(inputPath, options.options)) {\n      try {\n        const json = JSON.parse(sourceContent);\n        const { resolved } = resolveMintlifyRefs(json, inputPath);\n        resolvedSourceContent = JSON.stringify(resolved, null, 2);\n      } catch {\n        // Fall through with original content\n      }\n    }\n    return mergeJson(\n      resolvedSourceContent,\n      inputPath,\n      options.options,\n      [{ translatedContent, targetLocale: locale }],\n      options.defaultLocale,\n      options.locales\n    )[0];\n  } else {\n    return mergeYaml(\n      sourceContent,\n      inputPath,\n      options.options,\n      [{ translatedContent, targetLocale: locale }],\n      options.defaultLocale\n    )[0];\n  }\n}\n\n/**\n * Determines whether a source file should be skipped for schema re-merging.\n * @param inputPath - The path of the source file\n * @param options - The settings for the project\n * @returns True if the source file should be skipped for schema re-merging, false otherwise\n */\nfunction shouldSkipSourceFormatMerge(\n  inputPath: string,\n  options: Settings\n): boolean {\n  for (const fileType of SUPPORTED_FILE_EXTENSIONS) {\n    if (!hasNonIdentityFileFormatTransformForType(options, fileType)) continue;\n\n    const transformedSourcePaths = options.files.resolvedPaths[fileType] || [];\n    if (\n      transformedSourcePaths.some(\n        (sourcePath) => getRelative(sourcePath) === inputPath\n      )\n    ) {\n      return true;\n    }\n  }\n\n  return false;\n}\n\nexport type BatchedFiles = {\n  branchId: string;\n  fileId: string;\n  versionId: string;\n  locale: string;\n  outputPath: string;\n  inputPath: string;\n}[];\n\nexport type DownloadFileBatchResult = {\n  successful: BatchedFiles;\n  failed: BatchedFiles;\n  skipped: BatchedFiles;\n};\n/**\n * Downloads multiple translation files in a single batch request\n * @param fileTracker - Current translation status keyed by file identity\n * @param files - Array of files to download with their output paths\n * @param options - Resolved CLI settings used for merge and lockfile behavior\n * @param forceDownload - Whether to bypass an up-to-date local translation\n * @param inlineLibrary - Inline runtime used to label the shared GTJSON file\n * @returns Object containing successful and failed file IDs\n */\nexport async function downloadFileBatch(\n  fileTracker: FileStatusTracker,\n  files: BatchedFiles,\n  options: Settings,\n  forceDownload: boolean = false,\n  inlineLibrary?: InlineLibrary\n): Promise<DownloadFileBatchResult> {\n  // Local record of what version was last downloaded for each fileName:locale\n  const {\n    data: downloadedVersions,\n    entryMap,\n    originalV1,\n  } = readLockfile(options);\n  let didUpdateDownloadedLock = false;\n\n  // Create a map of requested file keys to the file object\n  const requestedFileMap = new Map(\n    files.map((file) => [\n      `${file.branchId}:${file.fileId}:${file.versionId}:${file.locale}`,\n      file,\n    ])\n  );\n  const result: DownloadFileBatchResult = {\n    successful: [],\n    failed: [],\n    skipped: [],\n  };\n\n  // Create a map of translationId to outputPath for easier lookup\n  const outputPathMap = new Map(\n    files.map((file) => [\n      `${file.branchId}:${file.fileId}:${file.versionId}:${file.locale}`,\n      file.outputPath,\n    ])\n  );\n\n  try {\n    // Download the files\n    const responseData = await api.downloadFileBatch(\n      files.map((file) => ({\n        fileId: file.fileId,\n        branchId: file.branchId,\n        versionId: file.versionId,\n        locale: file.locale,\n      }))\n    );\n    const downloadedFiles = responseData.files || [];\n\n    // Process each file in the response\n    for (const file of downloadedFiles) {\n      const fileKey = `${file.branchId}:${file.fileId}:${file.versionId}:${file.locale}`;\n      const requestedFile = requestedFileMap.get(fileKey);\n      if (!requestedFile) {\n        continue;\n      }\n      try {\n        const outputPath = outputPathMap.get(fileKey);\n        const fileProperties = fileTracker.completed.get(fileKey);\n\n        if (!outputPath || !fileProperties) {\n          logger.warn(`No input/output path found for file: ${fileKey}`);\n          recordWarning(\n            'failed_download',\n            fileKey,\n            'No input/output path found'\n          );\n          result.failed.push(requestedFile);\n          continue;\n        }\n\n        const {\n          fileId,\n          versionId,\n          locale,\n          branchId,\n          fileName: inputPath,\n        } = fileProperties;\n\n        // Ensure the directory exists\n        const dir = path.dirname(outputPath);\n        if (!fs.existsSync(dir)) {\n          fs.mkdirSync(dir, { recursive: true });\n        }\n        // If a local translation already exists for the same source version, skip overwrite\n        const existingEntry = entryMap.get(fileId);\n        const downloadedTranslation =\n          existingEntry?.versionId === versionId\n            ? existingEntry.translations[locale]\n            : undefined;\n        const fileExists = fs.existsSync(outputPath);\n\n        // Binary formats (e.g. LOTTIE zip bundles) carry base64 content that must\n        // not go through the text merge/sort path — decode straight to bytes and\n        // write. Skip only when an unchanged local translation already exists.\n        if (isBinaryFileFormat(file.fileFormat)) {\n          if (!forceDownload && fileExists && downloadedTranslation) {\n            result.skipped.push(requestedFile);\n            continue;\n          }\n          await fs.promises.writeFile(\n            outputPath,\n            Buffer.from(file.data, 'base64')\n          );\n          recordDownloaded(outputPath, {\n            branchId,\n            fileId,\n            versionId,\n            locale,\n            fileFormat: file.fileFormat,\n            inputPath,\n          });\n          result.successful.push(requestedFile);\n          if (fileId && versionId && locale) {\n            const entry = findOrCreateEntry(\n              entryMap,\n              downloadedVersions.entries,\n              fileId,\n              versionId\n            );\n            entry.fileName = inputPath;\n            entry.translations[locale] = {\n              updatedAt: new Date().toISOString(),\n              // Store a relative path (matches the text path) so gt-lock.json\n              // stays portable and the skip-on-re-download check matches.\n              fileName: getRelative(outputPath),\n            };\n            // A staged entry tracks the whole file, not one locale. Keep it\n            // staged until every configured locale has downloaded, so a partial\n            // batch (locales still translating) doesn't abandon the rest.\n            if (entry.staged) {\n              entry.staged = !options.locales.every(\n                (l) => entry.translations[l]\n              );\n            }\n            didUpdateDownloadedLock = true;\n          }\n          continue;\n        }\n\n        // In-place translation files (composite schema JSON, .xcstrings\n        // catalogs) merge translations into the source file itself, so\n        // outputPath always exists and the lock can't tell whether this\n        // locale's content or derived split outputs (e.g. {locale}/docs.json)\n        // are still on disk. Always merge fresh API data so they are\n        // regenerated every run; local edits to translated output are\n        // preserved via `gt save-local`.\n        const isXcstringsCatalog = file.fileFormat === 'XCSTRINGS';\n        const isInPlaceComposite = options.options?.jsonSchema\n          ? !!validateJsonSchema(options.options, inputPath)?.composite\n          : false;\n        const isInPlaceTranslationFile =\n          isXcstringsCatalog || isInPlaceComposite;\n\n        if (\n          !forceDownload &&\n          fileExists &&\n          downloadedTranslation &&\n          !isInPlaceTranslationFile\n        ) {\n          // For schema-based files, re-merge with current source in case\n          // non-translatable fields changed (skip the API download, not the merge)\n          try {\n            let existingContent = fs.readFileSync(outputPath, 'utf8');\n            // Resolve $ref before extraction if configured\n            if (shouldResolveRefs(outputPath, options.options)) {\n              try {\n                const json = JSON.parse(existingContent);\n                const { resolved } = resolveMintlifyRefs(json, outputPath);\n                existingContent = JSON.stringify(resolved, null, 2);\n              } catch {\n                // Fall through with original content\n              }\n            }\n            const jsonExtracted = options.options?.jsonSchema\n              ? extractJson(\n                  existingContent,\n                  inputPath,\n                  options.options,\n                  locale,\n                  options.defaultLocale\n                )\n              : null;\n            const extracted =\n              jsonExtracted ??\n              (options.options?.yamlSchema\n                ? extractYaml(existingContent, inputPath, options.options)\n                : null);\n            if (extracted) {\n              const remerged = mergeWithSource(\n                extracted,\n                locale,\n                inputPath,\n                options\n              );\n              let remergedData = remerged;\n              if (outputPath.endsWith('.json')) {\n                try {\n                  remergedData = sortJsonString(remergedData);\n                } catch {\n                  // Fall through with unsorted content\n                }\n              }\n              if (remergedData !== existingContent) {\n                await fs.promises.writeFile(outputPath, remergedData);\n              }\n              // Track for postprocessing (e.g. openapi path localization)\n              // even when the API download was skipped\n              recordRemerged(outputPath);\n            }\n          } catch (error) {\n            // If re-merge fails, still count as skipped — not worth failing\n            // the download, but surface it so missing output is diagnosable\n            logger.warn(\n              `Failed to re-merge existing translation for ${outputPath} (${locale}): ${error}`\n            );\n          }\n          // Even when the local copy is current, the served content may\n          // still be missing review-withheld components — keep reporting\n          reportWithheldGtJsonComponents(\n            file.fileFormat,\n            file.data,\n            fileProperties.componentCount,\n            locale,\n            inlineLibrary\n          );\n          result.skipped.push(requestedFile);\n          continue;\n        }\n        let data: string;\n        if (isXcstringsCatalog) {\n          // The pinned serializer owns the bytes and the JSON key sorter below\n          // must never see them. JSON.parse hoists integer-like keys (\"404\")\n          // first; versionId is unaffected (slices come from the parsed object)\n          // and Xcode re-sorts on its next save, so the only effect is a\n          // one-time reorder.\n          data = mergeXcstringsLocale(file.data, locale, inputPath);\n        } else {\n          data = mergeWithSource(file.data, locale, inputPath, options);\n\n          // Stable sort JSON keys for deterministic output\n          if (file.fileFormat === 'GTJSON' || outputPath.endsWith('.json')) {\n            try {\n              data = sortJsonString(data);\n            } catch (error) {\n              logger.warn(`Failed to sort JSON file: ${file.id}: ` + error);\n            }\n          }\n        }\n\n        // Write the file to disk\n        await fs.promises.writeFile(\n          outputPath,\n          encodeFileContent(data, file.fileFormat, inputPath, outputPath)\n        );\n        // Track as downloaded with metadata for downstream postprocessing\n        recordDownloaded(outputPath, {\n          branchId,\n          fileId,\n          versionId,\n          locale,\n          fileFormat: file.fileFormat,\n          inputPath,\n        });\n\n        reportWithheldGtJsonComponents(\n          file.fileFormat,\n          data,\n          fileProperties.componentCount,\n          locale,\n          inlineLibrary\n        );\n\n        result.successful.push(requestedFile);\n        if (fileId && versionId && locale) {\n          const entry = findOrCreateEntry(\n            entryMap,\n            downloadedVersions.entries,\n            fileId,\n            versionId\n          );\n          entry.fileName = inputPath;\n          // Keep the hash upload recorded until postprocessing re-hashes the file\n          entry.translations[locale] = {\n            ...entry.translations[locale],\n            updatedAt: new Date().toISOString(),\n            fileName: getRelative(outputPath),\n          };\n          // A staged entry tracks the whole file, not one locale. Keep it\n          // staged until every configured locale has downloaded, so a partial\n          // batch (locales still translating) doesn't abandon the rest.\n          if (entry.staged) {\n            entry.staged = !options.locales.every((l) => entry.translations[l]);\n          }\n          didUpdateDownloadedLock = true;\n        }\n      } catch (error) {\n        logger.error(`Error saving file ${fileKey}: ` + error);\n        recordWarning(\n          'failed_download',\n          fileKey,\n          `Error saving file: ${error}`\n        );\n        result.failed.push(requestedFile);\n      }\n    }\n\n    // Add any files that weren't in the response to the failed list\n    const downloadedFileKeys = new Set(\n      downloadedFiles.map(\n        (file) =>\n          `${file.branchId}:${file.fileId}:${file.versionId}:${file.locale}`\n      )\n    );\n    for (const [fileKey, requestedFile] of requestedFileMap.entries()) {\n      if (!downloadedFileKeys.has(fileKey)) {\n        result.failed.push(requestedFile);\n      }\n    }\n\n    // Persist any updates to the downloaded map at the end of a successful cycle\n    if (didUpdateDownloadedLock) {\n      writeLockfile(downloadedVersions, originalV1);\n      didUpdateDownloadedLock = false;\n    }\n    return result;\n  } catch (error) {\n    logger.error(\n      `An unexpected error occurred while downloading files: ` + error\n    );\n  }\n\n  // Mark all files as failed if we get here\n  result.failed = [...requestedFileMap.values()];\n  if (didUpdateDownloadedLock) {\n    writeLockfile(downloadedVersions, originalV1);\n  }\n  return result;\n}\n"],"mappings":"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"}

package/dist/cli/base.js

@@ -178,10 +178,10 @@ var BaseCLI = class {
 	}
 	setupProjectCommands() {
 		const projectCommand = this.program.command("project").description("Manage General Translation projects");
-		attachSharedFlags(projectCommand.command("create").description("Create a General Translation project using an organization API key").requiredOption("--name <name>", "Project name").requiredOption("--default-locale <locale>", "Project default locale").option("--cdn-enabled", "Enable CDN delivery", false)).action(async (options) => {
+		attachSharedFlags(projectCommand.command("create").description("Create a General Translation project using an organization API key").requiredOption("--org-id <orgId>", "Organization ID").requiredOption("--name <name>", "Project name").requiredOption("--default-locale <locale>", "Project default locale").option("--cdn-enabled", "Enable CDN delivery", false)).action(async (options) => {
 			try {
 				if (!hasValidApiKey(await generateSettings(options))) return exitSync(1);
-				const { project } = await api.createProject({
+				const { project } = await api.createProject(options.orgId, {
 					name: options.name,
 					defaultLocale: options.defaultLocale,
 					cdnEnabled: options.cdnEnabled