@tolgee/cli 1.3.1 → 1.4.0

package/dist/arguments.js

@@ -0,0 +1,2 @@
+import { Argument } from 'commander';
+export const FILE_PATTERNS = new Argument('<patterns...>', 'File glob patterns to include (hint: make sure to escape it in quotes, or your shell might attempt to unroll some tokens like *)');

package/dist/client/export.js

@@ -8,8 +8,6 @@ export default class ExportClient {
             method: 'POST',
             path: `${this.requester.projectUrl}/export`,
             body: { ...req, zip: true },
-            headersTimeout: 300,
-            bodyTimeout: 300,
         });
     }
     async exportSingle(req) {
@@ -17,8 +15,6 @@ export default class ExportClient {
             method: 'POST',
             path: `${this.requester.projectUrl}/export`,
             body: { ...req, zip: false },
-            headersTimeout: 300,
-            bodyTimeout: 300,
         });
     }
 }

package/dist/client/import.js

@@ -33,8 +33,6 @@ export default class ImportClient {
             method: 'PUT',
             path: `${this.requester.projectUrl}/import/apply`,
             query: { forceMode: req?.forceMode },
-            headersTimeout: 300,
-            bodyTimeout: 300,
         });
     }
     async deleteImport() {

package/dist/client/internal/requester.js

@@ -59,8 +59,8 @@ export default class Requester {
             method: req.method,
             headers: headers,
             body: body,
-            headersTimeout: req.headersTimeout,
-            bodyTimeout: req.bodyTimeout,
+            headersTimeout: req.headersTimeout ?? 300000,
+            bodyTimeout: req.bodyTimeout ?? 300000,
         });
         debug(`[HTTP] ${req.method} ${url} -> ${response.statusCode} ${STATUS_CODES[response.statusCode]}`);
         if (response.statusCode >= 400)

package/dist/commands/extract/check.js

@@ -3,9 +3,10 @@ import { Command } from 'commander';
 import { extractKeysOfFiles } from '../../extractor/runner.js';
 import { WarningMessages, emitGitHubWarning, } from '../../extractor/warnings.js';
 import { loading } from '../../utils/logger.js';
-async function lintHandler(filesPattern) {
+import { FILE_PATTERNS } from '../../arguments.js';
+async function lintHandler(filesPatterns) {
     const opts = this.optsWithGlobals();
-    const extracted = await loading('Analyzing code...', extractKeysOfFiles(filesPattern, opts.extractor));
+    const extracted = await loading('Analyzing code...', extractKeysOfFiles(filesPatterns, opts.extractor));
     let warningCount = 0;
     let filesCount = 0;
     for (const [file, { warnings }] of extracted) {
@@ -35,5 +36,5 @@ async function lintHandler(filesPattern) {
 }
 export default new Command('check')
     .description('Checks if the keys can be extracted automatically, and reports problems if any')
-    .argument('<pattern>', 'File pattern to include (hint: make sure to escape it in quotes, or your shell might attempt to unroll some tokens like *)')
+    .addArgument(FILE_PATTERNS)
     .action(lintHandler);

package/dist/commands/extract/print.js

@@ -3,9 +3,10 @@ import { Command } from 'commander';
 import { extractKeysOfFiles } from '../../extractor/runner.js';
 import { WarningMessages } from '../../extractor/warnings.js';
 import { loading } from '../../utils/logger.js';
-async function printHandler(filesPattern) {
+import { FILE_PATTERNS } from '../../arguments.js';
+async function printHandler(filesPatterns) {
     const opts = this.optsWithGlobals();
-    const extracted = await loading('Analyzing code...', extractKeysOfFiles(filesPattern, opts.extractor));
+    const extracted = await loading('Analyzing code...', extractKeysOfFiles(filesPatterns, opts.extractor));
     let warningCount = 0;
     const keySet = new Set();
     for (const [file, { keys, warnings }] of extracted) {
@@ -45,5 +46,5 @@ async function printHandler(filesPattern) {
 }
 export default new Command('print')
     .description('Prints extracted data to the console')
-    .argument('<pattern>', 'File glob pattern to include (hint: make sure to escape it in quotes, or your shell might attempt to unroll some tokens like *)')
+    .addArgument(FILE_PATTERNS)
     .action(printHandler);

package/dist/commands/sync/compare.js

@@ -5,9 +5,10 @@ import { extractKeysOfFiles, filterExtractionResult, } from '../../extractor/run
 import { dumpWarnings } from '../../extractor/warnings.js';
 import { EXTRACTOR } from '../../options.js';
 import { loading } from '../../utils/logger.js';
-async function compareHandler(pattern) {
+import { FILE_PATTERNS } from '../../arguments.js';
+async function compareHandler(filesPatterns) {
     const opts = this.optsWithGlobals();
-    const rawKeys = await loading('Analyzing code...', extractKeysOfFiles(pattern, opts.extractor));
+    const rawKeys = await loading('Analyzing code...', extractKeysOfFiles(filesPatterns, opts.extractor));
     dumpWarnings(rawKeys);
     const localKeys = filterExtractionResult(rawKeys);
     const remoteKeys = await opts.client.project.fetchAllKeys();
@@ -40,6 +41,6 @@ async function compareHandler(pattern) {
 export default new Command()
     .name('compare')
     .description('Compares the keys in your code project and in the Tolgee project.')
-    .argument('<pattern>', 'File pattern to include (hint: make sure to escape it in quotes, or your shell might attempt to unroll some tokens like *)')
+    .addArgument(FILE_PATTERNS)
     .addOption(EXTRACTOR)
     .action(compareHandler);

package/dist/commands/sync/sync.js

@@ -8,6 +8,7 @@ import { unzipBuffer } from '../../utils/zip.js';
 import { askBoolean } from '../../utils/ask.js';
 import { loading, error } from '../../utils/logger.js';
 import { EXTRACTOR } from '../../options.js';
+import { FILE_PATTERNS } from '../../arguments.js';
 async function backup(client, dest) {
     const blob = await client.export.export({
         format: 'JSON',
@@ -30,9 +31,9 @@ async function askForConfirmation(keys, operation) {
         process.exit(1);
     }
 }
-async function syncHandler(pattern) {
+async function syncHandler(filesPatterns) {
     const opts = this.optsWithGlobals();
-    const rawKeys = await loading('Analyzing code...', extractKeysOfFiles(pattern, opts.extractor));
+    const rawKeys = await loading('Analyzing code...', extractKeysOfFiles(filesPatterns, opts.extractor));
     const warnCount = dumpWarnings(rawKeys);
     if (!opts.continueOnWarning && warnCount) {
         console.log(ansi.bold.red('Aborting as warnings have been emitted.'));
@@ -96,7 +97,7 @@ async function syncHandler(pattern) {
 export default new Command()
     .name('sync')
     .description('Synchronizes the keys in your code project and in the Tolgee project, by creating missing keys and optionally deleting unused ones. For a dry-run, use `tolgee compare`.')
-    .argument('<pattern>', 'File pattern to include (hint: make sure to escape it in quotes, or your shell might attempt to unroll some tokens like *)')
+    .addArgument(FILE_PATTERNS)
     .addOption(EXTRACTOR)
     .option('-B, --backup <path>', 'Path where a backup should be downloaded before performing the sync. If something goes wrong, the backup can be used to restore the project to its previous state.')
     .option('--continue-on-warning', 'Set this flag to continue the sync if warnings are detected during string extraction. By default, as warnings may indicate an invalid extraction, the CLI will abort the sync.')

package/dist/extractor/runner.js

@@ -7,8 +7,8 @@ export async function extractKeysFromFile(file, extractor) {
         file: file,
     });
 }
-export async function extractKeysOfFiles(filesPattern, extractor) {
-    const files = await glob(filesPattern, { nodir: true });
+export async function extractKeysOfFiles(filesPatterns, extractor) {
+    const files = await glob(filesPatterns, { nodir: true });
     const result = new Map();
     await Promise.all(files.map(async (file) => {
         const keys = await extractKeysFromFile(file, extractor);

package/package.json

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