@tolgee/cli 2.8.4 → 2.10.0

package/dist/commands/extract/print.js

@@ -1,48 +1,59 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { relative } from 'path';
 import { Command } from 'commander';
 import { extractKeysOfFiles } from '../../extractor/runner.js';
 import { WarningMessages } from '../../extractor/warnings.js';
 import { loading } from '../../utils/logger.js';
-const printHandler = (config) => async function () {
-    const opts = this.optsWithGlobals();
-    const extracted = await loading('Analyzing code...', extractKeysOfFiles(opts));
-    let warningCount = 0;
-    const keySet = new Set();
-    for (const [file, { keys, warnings }] of extracted) {
-        if (keys.length) {
-            const relFile = relative(process.cwd(), file);
-            console.log('%d key%s found in %s:', keys.length, keys.length !== 1 ? 's' : '', relFile);
-            for (const key of keys) {
-                keySet.add(key);
-                console.log('\tline %d: %s', key.line, key.keyName);
-                if (key.namespace) {
-                    console.log('\t\tnamespace: %s', key.namespace);
-                }
-                if (key.defaultValue) {
-                    console.log('\t\tdefault: %s', key.defaultValue);
+const printHandler = (config) => function () {
+    return __awaiter(this, void 0, void 0, function* () {
+        const opts = this.optsWithGlobals();
+        const extracted = yield loading('Analyzing code...', extractKeysOfFiles(opts));
+        let warningCount = 0;
+        const keySet = new Set();
+        for (const [file, { keys, warnings }] of extracted) {
+            if (keys.length) {
+                const relFile = relative(process.cwd(), file);
+                console.log('%d key%s found in %s:', keys.length, keys.length !== 1 ? 's' : '', relFile);
+                for (const key of keys) {
+                    keySet.add(key);
+                    console.log('\tline %d: %s', key.line, key.keyName);
+                    if (key.namespace) {
+                        console.log('\t\tnamespace: %s', key.namespace);
+                    }
+                    if (key.defaultValue) {
+                        console.log('\t\tdefault: %s', key.defaultValue);
+                    }
                 }
             }
-        }
-        if (warnings?.length) {
-            warningCount += warnings.length;
-            console.log('%d warning%s %s emitted during extraction:', warnings.length, warnings.length !== 1 ? 's' : '', warnings.length !== 1 ? 'were' : 'was');
-            for (const warning of warnings) {
-                if (warning.warning in WarningMessages) {
-                    const warn = warning.warning;
-                    const { name } = WarningMessages[warn];
-                    console.log('\tline %d: %s', warning.line, name);
-                }
-                else {
-                    console.log('\tline %d: %s', warning.line, warning.warning);
+            if (warnings === null || warnings === void 0 ? void 0 : warnings.length) {
+                warningCount += warnings.length;
+                console.log('%d warning%s %s emitted during extraction:', warnings.length, warnings.length !== 1 ? 's' : '', warnings.length !== 1 ? 'were' : 'was');
+                for (const warning of warnings) {
+                    if (warning.warning in WarningMessages) {
+                        const warn = warning.warning;
+                        const { name } = WarningMessages[warn];
+                        console.log('\tline %d: %s', warning.line, name);
+                    }
+                    else {
+                        console.log('\tline %d: %s', warning.line, warning.warning);
+                    }
                 }
             }
+            if (keys.length || (warnings === null || warnings === void 0 ? void 0 : warnings.length)) {
+                console.log();
+            }
         }
-        if (keys.length || warnings?.length) {
-            console.log();
-        }
-    }
-    console.log('Total unique keys found: %d', keySet.size);
-    console.log('Total warnings: %d', warningCount);
+        console.log('Total unique keys found: %d', keySet.size);
+        console.log('Total warnings: %d', warningCount);
+    });
 };
 export default (config) => new Command('print')
     .description('Prints extracted data to the console')

package/dist/commands/login.js

@@ -1,36 +1,49 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { Command } from 'commander';
 import ansi from 'ansi-colors';
 import { saveApiKey, removeApiKeys, clearAuthStore, } from '../config/credentials.js';
 import { exitWithError, success } from '../utils/logger.js';
 import { createTolgeeClient } from '../client/TolgeeClient.js';
 import { printApiKeyLists } from '../utils/apiKeyList.js';
-async function loginHandler(key) {
-    const opts = this.optsWithGlobals();
-    if (opts.list) {
-        printApiKeyLists();
-        return;
-    }
-    else if (!key) {
-        exitWithError('Missing argument [API Key]');
-    }
-    const keyInfo = await createTolgeeClient({
-        baseUrl: opts.apiUrl.toString(),
-        apiKey: key,
-    }).getApiKeyInfo();
-    await saveApiKey(opts.apiUrl, keyInfo);
-    success(keyInfo.type === 'PAK'
-        ? `Logged in as ${keyInfo.username} on ${ansi.blue(opts.apiUrl.hostname)} for project ${ansi.blue(String(keyInfo.project.id))} (${keyInfo.project.name}). Welcome back!`
-        : `Logged in as ${keyInfo.username} on ${ansi.blue(opts.apiUrl.hostname)}. Welcome back!`);
+function loginHandler(key) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const opts = this.optsWithGlobals();
+        if (opts.list) {
+            printApiKeyLists();
+            return;
+        }
+        else if (!key) {
+            exitWithError('Missing argument [API Key]');
+        }
+        const keyInfo = yield createTolgeeClient({
+            baseUrl: opts.apiUrl.toString(),
+            apiKey: key,
+        }).getApiKeyInfo();
+        yield saveApiKey(opts.apiUrl, keyInfo);
+        success(keyInfo.type === 'PAK'
+            ? `Logged in as ${keyInfo.username} on ${ansi.blue(opts.apiUrl.hostname)} for project ${ansi.blue(String(keyInfo.project.id))} (${keyInfo.project.name}). Welcome back!`
+            : `Logged in as ${keyInfo.username} on ${ansi.blue(opts.apiUrl.hostname)}. Welcome back!`);
+    });
 }
-async function logoutHandler() {
-    const opts = this.optsWithGlobals();
-    if (opts.all) {
-        await clearAuthStore();
-        success("You've been logged out of all Tolgee instances you were logged in.");
-        return;
-    }
-    await removeApiKeys(opts.apiUrl);
-    success(`You're now logged out of ${opts.apiUrl.hostname}.`);
+function logoutHandler() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const opts = this.optsWithGlobals();
+        if (opts.all) {
+            yield clearAuthStore();
+            success("You've been logged out of all Tolgee instances you were logged in.");
+            return;
+        }
+        yield removeApiKeys(opts.apiUrl);
+        success(`You're now logged out of ${opts.apiUrl.hostname}.`);
+    });
 }
 export const Login = new Command()
     .name('login')

package/dist/commands/pull.js

@@ -1,3 +1,12 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { Command, Option } from 'commander';
 import { unzipBuffer } from '../utils/zip.js';
 import { prepareDir } from '../utils/prepareDir.js';
@@ -5,49 +14,57 @@ import { exitWithError, loading, success } from '../utils/logger.js';
 import { checkPathNotAFile } from '../utils/checkPathNotAFile.js';
 import { mapExportFormat } from '../utils/mapExportFormat.js';
 import { handleLoadableError } from '../client/TolgeeClient.js';
-async function fetchZipBlob(opts) {
-    const exportFormat = mapExportFormat(opts.format);
-    const { format, messageFormat } = exportFormat;
-    const loadable = await opts.client.export.export({
-        format,
-        messageFormat,
-        supportArrays: opts.supportArrays,
-        languages: opts.languages,
-        filterState: opts.states,
-        structureDelimiter: opts.delimiter ?? '',
-        filterNamespace: opts.namespaces,
-        filterTagIn: opts.tags,
-        filterTagNotIn: opts.excludeTags,
-        fileStructureTemplate: opts.fileStructureTemplate,
+function fetchZipBlob(opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const exportFormat = mapExportFormat(opts.format);
+        const { format, messageFormat } = exportFormat;
+        const loadable = yield opts.client.export.export({
+            format,
+            messageFormat,
+            supportArrays: opts.supportArrays,
+            languages: opts.languages,
+            filterState: opts.states,
+            structureDelimiter: (_a = opts.delimiter) !== null && _a !== void 0 ? _a : '',
+            filterNamespace: opts.namespaces,
+            filterTagIn: opts.tags,
+            filterTagNotIn: opts.excludeTags,
+            fileStructureTemplate: opts.fileStructureTemplate,
+        });
+        handleLoadableError(loadable);
+        return loadable.data;
     });
-    handleLoadableError(loadable);
-    return loadable.data;
 }
-const pullHandler = () => async function () {
-    const opts = this.optsWithGlobals();
-    if (!opts.path) {
-        exitWithError('Missing option --path <path> or `pull.path` in tolgee config');
-    }
-    await checkPathNotAFile(opts.path);
-    const zipBlob = await loading('Fetching strings from Tolgee...', fetchZipBlob(opts));
-    await prepareDir(opts.path, opts.emptyDir);
-    await loading('Extracting strings...', unzipBuffer(zipBlob, opts.path));
-    success('Done!');
+const pullHandler = () => function () {
+    return __awaiter(this, void 0, void 0, function* () {
+        const opts = this.optsWithGlobals();
+        if (!opts.path) {
+            exitWithError('Missing option --path <path> or `pull.path` in tolgee config');
+        }
+        yield checkPathNotAFile(opts.path);
+        const zipBlob = yield loading('Fetching strings from Tolgee...', fetchZipBlob(opts));
+        yield prepareDir(opts.path, opts.emptyDir);
+        yield loading('Extracting strings...', unzipBuffer(zipBlob, opts.path));
+        success('Done!');
+    });
+};
+export default (config) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    return new Command()
+        .name('pull')
+        .description('Pulls translations from Tolgee')
+        .addOption(new Option('--path <path>', 'Destination of a folder where translation files will be stored in').default((_a = config.pull) === null || _a === void 0 ? void 0 : _a.path))
+        .addOption(new Option('-l, --languages <languages...>', 'List of languages to pull. Leave unspecified to export them all').default((_b = config.pull) === null || _b === void 0 ? void 0 : _b.languages))
+        .addOption(new Option('-s, --states <states...>', 'List of translation states to include. Defaults all except untranslated')
+        .choices(['UNTRANSLATED', 'TRANSLATED', 'REVIEWED'])
+        .default((_c = config.pull) === null || _c === void 0 ? void 0 : _c.states)
+        .argParser((v, a) => [v.toUpperCase(), ...(a || [])]))
+        .addOption(new Option('-d, --delimiter <delimiter>', 'Structure delimiter to use. By default, Tolgee interprets `.` as a nested structure. You can change the delimiter, or disable structure formatting by not specifying any value to the option').default(((_d = config.pull) === null || _d === void 0 ? void 0 : _d.delimiter) === undefined ? '.' : config.pull.delimiter))
+        .addOption(new Option('-n, --namespaces <namespaces...>', 'List of namespaces to pull. Defaults to all namespaces').default((_e = config.pull) === null || _e === void 0 ? void 0 : _e.namespaces))
+        .addOption(new Option('-t, --tags <tags...>', 'List of tags which to include. Keys tagged by at least one of these tags will be included.').default((_f = config.pull) === null || _f === void 0 ? void 0 : _f.tags))
+        .addOption(new Option('--exclude-tags <tags...>', 'List of tags which to exclude. Keys tagged by at least one of these tags will be excluded.').default((_g = config.pull) === null || _g === void 0 ? void 0 : _g.excludeTags))
+        .addOption(new Option('--support-arrays', 'Export keys with array syntax (e.g. item[0]) as arrays.').default((_j = (_h = config.pull) === null || _h === void 0 ? void 0 : _h.supportArrays) !== null && _j !== void 0 ? _j : false))
+        .addOption(new Option('--empty-dir', 'Empty target directory before inserting pulled files.').default((_k = config.pull) === null || _k === void 0 ? void 0 : _k.emptyDir))
+        .addOption(new Option('--file-structure-template <template>', 'Defines exported file structure: https://tolgee.io/tolgee-cli/push-pull-strings#file-structure-template-format').default((_l = config.pull) === null || _l === void 0 ? void 0 : _l.fileStructureTemplate))
+        .action(pullHandler());
 };
-export default (config) => new Command()
-    .name('pull')
-    .description('Pulls translations from Tolgee')
-    .addOption(new Option('--path <path>', 'Destination of a folder where translation files will be stored in').default(config.pull?.path))
-    .addOption(new Option('-l, --languages <languages...>', 'List of languages to pull. Leave unspecified to export them all').default(config.pull?.languages))
-    .addOption(new Option('-s, --states <states...>', 'List of translation states to include. Defaults all except untranslated')
-    .choices(['UNTRANSLATED', 'TRANSLATED', 'REVIEWED'])
-    .default(config.pull?.states)
-    .argParser((v, a) => [v.toUpperCase(), ...(a || [])]))
-    .addOption(new Option('-d, --delimiter <delimiter>', 'Structure delimiter to use. By default, Tolgee interprets `.` as a nested structure. You can change the delimiter, or disable structure formatting by not specifying any value to the option').default(config.pull?.delimiter === undefined ? '.' : config.pull.delimiter))
-    .addOption(new Option('-n, --namespaces <namespaces...>', 'List of namespaces to pull. Defaults to all namespaces').default(config.pull?.namespaces))
-    .addOption(new Option('-t, --tags <tags...>', 'List of tags which to include. Keys tagged by at least one of these tags will be included.').default(config.pull?.tags))
-    .addOption(new Option('--exclude-tags <tags...>', 'List of tags which to exclude. Keys tagged by at least one of these tags will be excluded.').default(config.pull?.excludeTags))
-    .addOption(new Option('--support-arrays', 'Export keys with array syntax (e.g. item[0]) as arrays.').default(config.pull?.supportArrays ?? false))
-    .addOption(new Option('--empty-dir', 'Empty target directory before inserting pulled files.').default(config.pull?.emptyDir))
-    .addOption(new Option('--file-structure-template <template>', 'Defines exported file structure: https://tolgee.io/tolgee-cli/push-pull-strings#file-structure-template-format').default(config.pull?.fileStructureTemplate))
-    .action(pullHandler());

package/dist/commands/push.js

@@ -1,140 +1,190 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 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';
 import { handleLoadableError } from '../client/TolgeeClient.js';
-async function allInPattern(pattern) {
-    const files = [];
-    const items = await glob(pattern);
-    for (const item of items) {
-        if ((await stat(item)).isDirectory()) {
-            files.push(...(await readDirectory(item)));
+import { findFilesByTemplate } from '../utils/filesTemplate.js';
+import { valueToArray } from '../utils/valueToArray.js';
+function allInPattern(pattern) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const files = [];
+        const items = yield glob(pattern);
+        for (const item of items) {
+            if ((yield stat(item)).isDirectory()) {
+                files.push(...(yield readDirectory(item)));
+            }
+            else {
+                const blob = yield readFile(item);
+                files.push({ name: item, data: blob });
+            }
         }
-        else {
-            const blob = await readFile(item);
-            files.push({ name: item, data: blob });
+        return files;
+    });
+}
+function readDirectory(directory_1) {
+    return __awaiter(this, arguments, void 0, function* (directory, base = '') {
+        const files = [];
+        const dir = yield readdir(directory);
+        for (const file of dir) {
+            const filePath = join(directory, file);
+            const fileStat = yield stat(filePath);
+            if (fileStat.isDirectory()) {
+                const dirFiles = yield readDirectory(filePath, `${file}/`);
+                files.push(...dirFiles);
+            }
+            else {
+                const blob = yield readFile(filePath);
+                files.push({ name: base + file, data: blob });
+            }
         }
-    }
-    return files;
+        return files;
+    });
 }
-async function readDirectory(directory, base = '') {
-    const files = [];
-    const dir = await readdir(directory);
-    for (const file of dir) {
-        const filePath = join(directory, file);
-        const fileStat = await stat(filePath);
-        if (fileStat.isDirectory()) {
-            const dirFiles = await readDirectory(filePath, `${file}/`);
-            files.push(...dirFiles);
+function promptConflicts(opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (opts.forceMode === 'NO_FORCE') {
+            exitWithError(`There are conflicts in the import and the force mode is set to "NO_FORCE". Set it to "KEEP" or "OVERRIDE" to continue.`);
         }
-        else {
-            const blob = await readFile(filePath);
-            files.push({ name: base + file, data: blob });
+        if (opts.forceMode) {
+            return opts.forceMode;
         }
-    }
-    return files;
-}
-async function promptConflicts(opts) {
-    if (opts.forceMode === 'NO_FORCE') {
-        exitWithError(`There are conflicts in the import and the force mode is set to "NO_FORCE". Set it to "KEEP" or "OVERRIDE" to continue.`);
-    }
-    if (opts.forceMode) {
-        return opts.forceMode;
-    }
-    if (!process.stdout.isTTY) {
-        exitWithError(`There are conflicts in the import. Please specify a --force-mode.`);
-    }
-    warn('There are conflicts in the import. What do you want to do?');
-    const resp = await askString('Type "KEEP" to preserve the version on the server, "OVERRIDE" to use the version from the import, and nothing to abort: ');
-    if (resp !== 'KEEP' && resp !== 'OVERRIDE') {
-        exitWithError(`Aborting.`);
-    }
-    return resp;
+        if (!process.stdout.isTTY) {
+            exitWithError(`There are conflicts in the import. Please specify a --force-mode.`);
+        }
+        warn('There are conflicts in the import. What do you want to do?');
+        const resp = yield askString('Type "KEEP" to preserve the version on the server, "OVERRIDE" to use the version from the import, and nothing to abort: ');
+        if (resp !== 'KEEP' && resp !== 'OVERRIDE') {
+            exitWithError(`Aborting.`);
+        }
+        return resp;
+    });
 }
-async function importData(client, data) {
-    return loading('Uploading files...', client.import.import(data));
+function importData(client, data) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return loading('Uploading files...', client.import.import(data));
+    });
 }
-async function readRecords(matchers) {
-    const result = [];
-    for (const matcher of matchers) {
-        const files = await allInPattern(matcher.path);
-        files.forEach((file) => {
-            result.push({
-                ...matcher,
-                data: file.data,
-                name: file.name,
+function readRecords(matchers) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const result = [];
+        for (const matcher of matchers) {
+            const files = yield allInPattern(matcher.path);
+            files.forEach((file) => {
+                result.push(Object.assign(Object.assign({}, matcher), { data: file.data, name: file.name }));
             });
-        });
-    }
-    return result;
+        }
+        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)) {
-            return false;
+const pushHandler = (config) => function () {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
+        const opts = this.optsWithGlobals();
+        let allMatchers = [];
+        const filesTemplate = opts.filesTemplate;
+        if (!filesTemplate && !((_b = (_a = config.push) === null || _a === void 0 ? void 0 : _a.files) === null || _b === void 0 ? void 0 : _b.length)) {
+            exitWithError('Missing option `push.filesTemplate` or `push.files`.');
         }
-        if (opts.namespaces && !opts.namespaces.includes(r.namespace ?? '')) {
-            return false;
+        if (filesTemplate) {
+            for (const template of filesTemplate) {
+                allMatchers = allMatchers.concat(...(yield findFilesByTemplate(template)));
+            }
         }
-        return true;
-    });
-    const files = await loading('Reading files...', readRecords(filteredMatchers));
-    if (files.length === 0) {
-        error('Nothing to import.');
-        return;
-    }
-    const params = {
-        createNewKeys: true,
-        forceMode: opts.forceMode,
-        overrideKeyDescriptions: opts.overrideKeyDescriptions,
-        convertPlaceholdersToIcu: opts.convertPlaceholdersToIcu,
-        tagNewKeys: opts.tagNewKeys ?? [],
-        fileMappings: files.map((f) => {
-            const format = mapImportFormat(opts.format, extname(f.name));
-            return {
-                fileName: f.name,
-                format: format,
-                languageTag: f.language,
-                namespace: f.namespace ?? '',
-            };
-        }),
-        removeOtherKeys: opts.removeOtherKeys,
-    };
-    const attempt1 = await loading('Importing...', importData(opts.client, {
-        files,
-        params,
-    }));
-    if (attempt1.error) {
-        if (attempt1.error.code !== 'conflict_is_not_resolved') {
-            handleLoadableError(attempt1);
+        allMatchers = allMatchers.concat(...(((_c = config.push) === null || _c === void 0 ? void 0 : _c.files) || []));
+        const filteredMatchers = allMatchers.filter((r) => {
+            var _a;
+            if (r.language &&
+                opts.languages &&
+                !opts.languages.includes(r.language)) {
+                return false;
+            }
+            if (opts.namespaces && !opts.namespaces.includes((_a = r.namespace) !== null && _a !== void 0 ? _a : '')) {
+                return false;
+            }
+            return true;
+        });
+        const files = yield loading('Reading files...', readRecords(filteredMatchers));
+        if (files.length === 0) {
+            error('Nothing to import.');
+            return;
         }
-        const forceMode = await promptConflicts(opts);
-        const attempt2 = await loading('Overriding...', importData(opts.client, {
+        const params = {
+            createNewKeys: true,
+            forceMode: opts.forceMode,
+            overrideKeyDescriptions: opts.overrideKeyDescriptions,
+            convertPlaceholdersToIcu: opts.convertPlaceholdersToIcu,
+            tagNewKeys: (_d = opts.tagNewKeys) !== null && _d !== void 0 ? _d : [],
+            fileMappings: files.map((f) => {
+                var _a;
+                const format = mapImportFormat(opts.format, extname(f.name));
+                return {
+                    fileName: f.name,
+                    format: format,
+                    languageTag: f.language,
+                    namespace: (_a = f.namespace) !== null && _a !== void 0 ? _a : '',
+                    languageTagsToImport: opts.languages,
+                };
+            }),
+            removeOtherKeys: opts.removeOtherKeys,
+        };
+        const attempt1 = yield loading('Importing...', importData(opts.client, {
             files,
-            params: { ...params, forceMode },
+            params,
         }));
-        handleLoadableError(attempt2);
-    }
-    success('Done!');
+        if (attempt1.error) {
+            if (attempt1.error.code === 'existing_language_not_selected') {
+                handleMappingError(params.fileMappings);
+            }
+            if (attempt1.error.code !== 'conflict_is_not_resolved') {
+                handleLoadableError(attempt1);
+            }
+            const forceMode = yield promptConflicts(opts);
+            const attempt2 = yield loading('Overriding...', importData(opts.client, {
+                files,
+                params: Object.assign(Object.assign({}, params), { forceMode }),
+            }));
+            handleLoadableError(attempt2);
+        }
+        success('Done!');
+    });
+};
+export default (config) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    return new Command()
+        .name('push')
+        .description('Pushes translations to Tolgee')
+        .addOption(new Option('-ft, --files-template <templates...>', 'A template that describes the structure of the local files and their location with file structure template format (more at: https://docs.tolgee.io/tolgee-cli/push-pull-strings#file-structure-template-format).\n\nExample: `./public/{namespace}/{languageTag}.json`\n\n').default(valueToArray((_a = config.push) === null || _a === void 0 ? void 0 : _a.filesTemplate)))
+        .addOption(new Option('-f, --force-mode <mode>', 'What should we do with possible conflicts? If unspecified, the user will be prompted interactively, or the command will fail when in non-interactive')
+        .choices(['OVERRIDE', 'KEEP', 'NO_FORCE'])
+        .argParser((v) => v.toUpperCase())
+        .default((_b = config.push) === null || _b === void 0 ? void 0 : _b.forceMode))
+        .addOption(new Option('--override-key-descriptions', 'Override existing key descriptions from local files (only relevant for some formats).').default((_d = (_c = config.push) === null || _c === void 0 ? void 0 : _c.overrideKeyDescriptions) !== null && _d !== void 0 ? _d : true))
+        .addOption(new Option('--convert-placeholders-to-icu', 'Convert placeholders in local files to ICU format.').default((_f = (_e = config.push) === null || _e === void 0 ? void 0 : _e.convertPlaceholdersToIcu) !== null && _f !== void 0 ? _f : true))
+        .addOption(new Option('-l, --languages <languages...>', 'Specifies which languages should be pushed (see push.files in config).').default((_g = config.push) === null || _g === void 0 ? void 0 : _g.languages))
+        .addOption(new Option('-n, --namespaces <namespaces...>', 'Specifies which namespaces should be pushed (see push.files in config).').default((_h = config.push) === null || _h === void 0 ? void 0 : _h.namespaces))
+        .addOption(new Option('--tag-new-keys <tags...>', 'Specify tags that will be added to newly created keys.').default((_j = config.push) === null || _j === void 0 ? void 0 : _j.tagNewKeys))
+        .addOption(new Option('--remove-other-keys', 'Remove keys which are not present in the import.').default((_k = config.push) === null || _k === void 0 ? void 0 : _k.removeOtherKeys))
+        .action(pushHandler(config));
 };
-export default (config) => new Command()
-    .name('push')
-    .description('Pushes translations to Tolgee')
-    .addOption(new Option('-f, --force-mode <mode>', 'What should we do with possible conflicts? If unspecified, the user will be prompted interactively, or the command will fail when in non-interactive')
-    .choices(['OVERRIDE', 'KEEP', 'NO_FORCE'])
-    .argParser((v) => v.toUpperCase())
-    .default(config.push?.forceMode))
-    .addOption(new Option('--override-key-descriptions', 'Override existing key descriptions from local files (only relevant for some formats).').default(config.push?.overrideKeyDescriptions ?? true))
-    .addOption(new Option('--convert-placeholders-to-icu', 'Convert placeholders in local files to ICU format.').default(config.push?.convertPlaceholdersToIcu ?? true))
-    .addOption(new Option('-l, --languages <languages...>', 'Specifies which languages should be pushed (see push.files in config).').default(config.push?.languages))
-    .addOption(new Option('-n, --namespaces <namespaces...>', 'Specifies which namespaces should be pushed (see push.files in config).').default(config.push?.namespaces))
-    .addOption(new Option('--tag-new-keys <tags...>', 'Specify tags that will be added to newly created keys.').default(config.push?.tagNewKeys))
-    .addOption(new Option('--remove-other-keys', 'Remove keys which are not present in the import.').default(config.push?.removeOtherKeys))
-    .action(pushHandler(config));