@tolgee/cli 2.8.4 → 2.9.0

package/dist/commands/push.js

@@ -2,6 +2,7 @@ import { extname, join } from 'path';
 import { readdir, readFile, stat } from 'fs/promises';
 import { Command, Option } from 'commander';
 import { glob } from 'tinyglobby';
+import { exit } from 'process';
 import { loading, success, error, warn, exitWithError, } from '../utils/logger.js';
 import { askString } from '../utils/ask.js';
 import { mapImportFormat } from '../utils/mapImportFormat.js';
@@ -71,13 +72,24 @@ async function readRecords(matchers) {
     }
     return result;
 }
+function handleMappingError(fileMappings) {
+    error('Not able to map files to existing languages in the platform');
+    console.log(`Pushed files:`);
+    fileMappings.forEach(({ fileName, languageTag }) => {
+        console.log(`"${fileName}"${languageTag ? ` => "${languageTag}"` : ''}`);
+    });
+    console.log('\nYou can use `push.files[*].language` property in `tolgeerc` file to map language correctly');
+    exit(1);
+}
 const pushHandler = (config) => async function () {
     const opts = this.optsWithGlobals();
     if (!config.push?.files) {
         exitWithError('Missing option `push.files` in configuration file.');
     }
     const filteredMatchers = config.push.files.filter((r) => {
-        if (opts.languages && !opts.languages.includes(r.language)) {
+        if (r.language &&
+            opts.languages &&
+            !opts.languages.includes(r.language)) {
             return false;
         }
         if (opts.namespaces && !opts.namespaces.includes(r.namespace ?? '')) {
@@ -103,6 +115,7 @@ const pushHandler = (config) => async function () {
                 format: format,
                 languageTag: f.language,
                 namespace: f.namespace ?? '',
+                languageTagsToImport: opts.languages,
             };
         }),
         removeOtherKeys: opts.removeOtherKeys,
@@ -112,6 +125,9 @@ const pushHandler = (config) => async function () {
         params,
     }));
     if (attempt1.error) {
+        if (attempt1.error.code === 'existing_language_not_selected') {
+            handleMappingError(params.fileMappings);
+        }
         if (attempt1.error.code !== 'conflict_is_not_resolved') {
             handleLoadableError(attempt1);
         }

package/dist/options.js

@@ -44,6 +44,7 @@ export const FORMAT_OPT = new Option('--format <format>', 'Localization files fo
     'PO_PYTHON',
     'APPLE_STRINGS',
     'APPLE_XLIFF',
+    'APPLE_XCSTRINGS',
     'PROPERTIES_ICU',
     'PROPERTIES_JAVA',
     'ANDROID_XML',

package/dist/utils/mapExportFormat.js

@@ -9,6 +9,8 @@ export const mapExportFormat = (format) => {
             };
         case 'APPLE_XLIFF':
             return { format: 'APPLE_XLIFF', messageFormat: 'APPLE_SPRINTF' };
+        case 'APPLE_XCSTRINGS':
+            return { format: 'APPLE_XCSTRINGS', messageFormat: 'APPLE_SPRINTF' };
         case 'COMPOSE_XML':
             return { format: 'COMPOSE_XML', messageFormat: 'JAVA_STRING_FORMAT' };
         case 'FLUTTER_ARB':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/cli",
-  "version": "2.8.4",
+  "version": "2.9.0",
   "type": "module",
   "description": "A tool to interact with the Tolgee Platform through CLI",
   "repository": {

package/schema.json

@@ -219,10 +219,13 @@
       "type": "object",
       "properties": {
         "path": { "$ref": "#/$defs/path" },
-        "language": { "type": "string" },
+        "language": {
+          "description": "Explicitly map file to language.\n\nIf not provided, backend will try to detect language from language name or it's content.",
+          "type": "string"
+        },
         "namespace": { "type": "string" }
       },
-      "required": ["path", "language"]
+      "required": ["path"]
     },
     "forceMode": {
       "description": "Specifies how to solve potential conflicts in the pushed data.\n\nOptions:\n\n  `OVERRIDE` - update everything according to local files\n  `KEEP` - create only non-existent strings, don't touch existing ones\n  `NO_FORCE` - throw an error, if there are any conflict",
@@ -251,6 +254,7 @@
         "PO_PYTHON",
         "APPLE_STRINGS",
         "APPLE_XLIFF",
+        "APPLE_XCSTRINGS",
         "PROPERTIES_ICU",
         "PROPERTIES_JAVA",
         "ANDROID_XML",