@tolgee/cli 1.2.0 → 1.3.1

package/dist/client/errors.js

@@ -1,32 +1,37 @@
+import { STATUS_CODES } from 'http';
 export class HttpError extends Error {
     request;
     response;
     constructor(request, response, options) {
-        super(response.statusText, options);
+        super(`HTTP Error ${response.statusCode} ${STATUS_CODES[response.statusCode]}`, options);
         this.request = request;
         this.response = response;
     }
     getErrorText() {
         // Unauthorized
-        if (this.response.status === 400) {
+        if (this.response.statusCode === 400) {
             return 'Invalid request data.';
         }
         // Unauthorized
-        if (this.response.status === 401) {
+        if (this.response.statusCode === 401) {
             return 'Missing or invalid authentication token.';
         }
         // Forbidden
-        if (this.response.status === 403) {
+        if (this.response.statusCode === 403) {
             return 'You are not allowed to perform this operation.';
         }
+        // Rate limited
+        if (this.response.statusCode === 429) {
+            return "You've been rate limited. Please try again later.";
+        }
         // Service Unavailable
-        if (this.response.status === 503) {
+        if (this.response.statusCode === 503) {
             return 'API is temporarily unavailable. Please try again later.';
         }
         // Server error
-        if (this.response.status >= 500) {
-            return `API reported a server error (${this.response.status}). Please try again later.`;
+        if (this.response.statusCode >= 500) {
+            return `API reported a server error (${this.response.statusCode}). Please try again later.`;
         }
-        return `Unknown error (HTTP ${this.response.status})`;
+        return `Unknown error (HTTP ${this.response.statusCode})`;
     }
 }

package/dist/client/export.js

@@ -8,6 +8,8 @@ export default class ExportClient {
             method: 'POST',
             path: `${this.requester.projectUrl}/export`,
             body: { ...req, zip: true },
+            headersTimeout: 300,
+            bodyTimeout: 300,
         });
     }
     async exportSingle(req) {
@@ -15,6 +17,8 @@ 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,6 +33,8 @@ export default class ImportClient {
             method: 'PUT',
             path: `${this.requester.projectUrl}/import/apply`,
             query: { forceMode: req?.forceMode },
+            headersTimeout: 300,
+            bodyTimeout: 300,
         });
     }
     async deleteImport() {
@@ -47,7 +49,7 @@ export default class ImportClient {
             await this.deleteImport();
         }
         catch (e) {
-            if (e instanceof HttpError && e.response.status === 404)
+            if (e instanceof HttpError && e.response.statusCode === 404)
                 return;
             throw e;
         }

package/dist/client/internal/requester.js

@@ -1,5 +1,5 @@
-import { Request } from 'undici';
-import { fetch } from 'undici';
+import { STATUS_CODES } from 'http';
+import { request } from 'undici';
 import FormData from 'form-data';
 import { HttpError } from '../errors.js';
 import { debug } from '../../utils/logger.js';
@@ -54,16 +54,17 @@ export default class Requester {
                 body = JSON.stringify(req.body);
             }
         }
-        const request = new Request(url, {
+        debug(`[HTTP] Requesting: ${req.method} ${url}`);
+        const response = await request(url, {
             method: req.method,
             headers: headers,
             body: body,
+            headersTimeout: req.headersTimeout,
+            bodyTimeout: req.bodyTimeout,
         });
-        debug(`[HTTP] Requesting: ${request.method} ${request.url}`);
-        const response = await fetch(request);
-        debug(`[HTTP] ${request.method} ${request.url} -> ${response.status} ${response.statusText}`);
-        if (!response.ok)
-            throw new HttpError(request, response);
+        debug(`[HTTP] ${req.method} ${url} -> ${response.statusCode} ${STATUS_CODES[response.statusCode]}`);
+        if (response.statusCode >= 400)
+            throw new HttpError(req, response);
         return response;
     }
     /**
@@ -73,7 +74,7 @@ export default class Requester {
      * @returns The response data
      */
     async requestJson(req) {
-        return this.request(req).then((r) => r.json());
+        return this.request(req).then((r) => r.body.json());
     }
     /**
      * Performs an HTTP request to the API and returns the result as a Blob
@@ -82,20 +83,13 @@ export default class Requester {
      * @returns The response blob
      */
     async requestBlob(req) {
-        return this.request(req).then((r) => r.blob());
+        return this.request(req).then((r) => r.body.blob());
     }
     /**
-     * Performs an HTTP request to the API and forces the consumption of the body, according to recommendations by Undici
-     *
-     * @see https://github.com/nodejs/undici#garbage-collection
-     * @param req Request data
+     * Performs an HTTP request to the API.
      */
     async requestVoid(req) {
-        const res = await this.request(req);
-        if (res.body) {
-            for await (const _chunk of res.body)
-                ;
-        }
+        await this.request(req);
     }
     /**
      * Performs an HTTP request to the API to a resource which is paginated.

package/dist/commands/login.js

@@ -10,7 +10,7 @@ async function loginHandler(key) {
         keyInfo = await RestClient.getApiKeyInformation(opts.apiUrl, key);
     }
     catch (e) {
-        if (e instanceof HttpError && e.response.status === 403) {
+        if (e instanceof HttpError && e.response.statusCode === 401) {
             error("Couldn't log in: the API key you provided is invalid.");
             process.exit(1);
         }

package/dist/commands/pull.js

@@ -1,21 +1,33 @@
 import { Command, Option } from 'commander';
 import { unzipBuffer } from '../utils/zip.js';
 import { overwriteDir } from '../utils/overwriteDir.js';
-import { loading, success } from '../utils/logger.js';
+import { error, loading, success } from '../utils/logger.js';
+import { HttpError } from '../client/errors.js';
 async function fetchZipBlob(opts) {
     return opts.client.export.export({
         format: opts.format,
         languages: opts.languages,
         filterState: opts.states,
         structureDelimiter: opts.delimiter,
+        filterNamespace: opts.namespaces,
     });
 }
 async function pullHandler(path) {
     const opts = this.optsWithGlobals();
     await overwriteDir(path, opts.overwrite);
-    const zipBlob = await loading('Fetching strings from Tolgee...', fetchZipBlob(opts));
-    await loading('Extracting strings...', unzipBuffer(zipBlob, path));
-    success('Done!');
+    try {
+        const zipBlob = await loading('Fetching strings from Tolgee...', fetchZipBlob(opts));
+        await loading('Extracting strings...', unzipBuffer(zipBlob, path));
+        success('Done!');
+    }
+    catch (e) {
+        if (e instanceof HttpError && e.response.statusCode === 400) {
+            const res = await e.response.body.json();
+            error(`Please check if your parameters, including namespaces, are configured correctly. Tolgee responded with: ${res.code}`);
+            return;
+        }
+        throw e;
+    }
 }
 export default new Command()
     .name('pull')
@@ -32,5 +44,6 @@ export default new Command()
     .addOption(new Option('-d, --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('.')
     .argParser((v) => v || ''))
+    .addOption(new Option('-n, --namespaces <namespaces...>', 'List of namespaces to pull. Defaults to all namespaces'))
     .option('-o, --overwrite', 'Whether to automatically overwrite existing files. BE CAREFUL, THIS WILL WIPE *ALL* THE CONTENTS OF THE TARGET FOLDER. If unspecified, the user will be prompted interactively, or the command will fail when in non-interactive')
     .action(pullHandler);

package/dist/commands/push.js

@@ -73,7 +73,7 @@ async function applyImport(client) {
         await loading('Applying changes...', client.import.applyImport());
     }
     catch (e) {
-        if (e instanceof HttpError && e.response.status === 400) {
+        if (e instanceof HttpError && e.response.statusCode === 400) {
             error("Some of the imported languages weren't recognized. Please create a language with corresponding tag in the Tolgee Platform.");
             return;
         }

package/dist/config/tolgeerc.js

@@ -49,7 +49,7 @@ function parseConfig(rc) {
         if (typeof rc.delimiter !== 'string' && rc.delimiter !== null) {
             throw new Error('Invalid config: delimiter is not a string');
         }
-        cfg.delimiter = rc.delimiter || void 0;
+        cfg.delimiter = rc.delimiter || '';
     }
     return cfg;
 }

package/dist/constants.js

@@ -8,4 +8,4 @@ export const USER_AGENT = `Tolgee-CLI/${VERSION} (+https://github.com/tolgee/tol
 export const DEFAULT_API_URL = new URL('https://app.tolgee.io');
 export const API_KEY_PAT_PREFIX = 'tgpat_';
 export const API_KEY_PAK_PREFIX = 'tgpak_';
-export const SDKS = ['react'];
+export const SDKS = ['react', 'vue', 'svelte'];

package/dist/extractor/machines/shared/properties.js

@@ -7,6 +7,7 @@ export default createMachine({
     context: {
         property: null,
         depth: 0,
+        jsxDepth: 0,
         static: false,
         nextDynamic: false,
         keyName: null,
@@ -268,10 +269,20 @@ export default createMachine({
                 cond: 'isCloseCurly',
             },
         ],
-        'punctuation.definition.tag.end.tsx': {
-            target: 'end',
-            actions: 'markPropertyAsDynamic',
+        'punctuation.definition.tag.begin.tsx': {
+            actions: 'incrementJsxDepth',
+            cond: (_ctx, evt) => evt.token === '<',
         },
+        'punctuation.definition.tag.end.tsx': [
+            {
+                target: 'end',
+                actions: 'markPropertyAsDynamic',
+                cond: (ctx) => ctx.jsxDepth === 0,
+            },
+            {
+                actions: 'decrementJsxDepth',
+            },
+        ],
         'punctuation.definition.tag.end.svelte': {
             target: 'end',
             actions: 'markPropertyAsDynamic',
@@ -346,6 +357,12 @@ export default createMachine({
         decrementDepth: assign({
             depth: (ctx, _evt) => ctx.depth - 1,
         }),
+        incrementJsxDepth: assign({
+            jsxDepth: (ctx, _evt) => ctx.jsxDepth + 2,
+        }),
+        decrementJsxDepth: assign({
+            jsxDepth: (ctx, _evt) => ctx.jsxDepth - 1,
+        }),
         markAsStatic: assign({
             static: true,
         }),

package/dist/index.js

@@ -112,10 +112,10 @@ async function loadConfig() {
 }
 async function handleHttpError(e) {
     error('An error occurred while requesting the API.');
-    error(`${e.request.method} ${e.request.url}`);
+    error(`${e.request.method} ${e.request.path}`);
     error(e.getErrorText());
     // Remove token from store if necessary
-    if (e.response.status === 401) {
+    if (e.response.statusCode === 401) {
         const removeFn = program.getOptionValue('_removeApiKeyFromStore');
         if (removeFn) {
             info('Removing the API key from the authentication store.');
@@ -129,7 +129,7 @@ async function handleHttpError(e) {
         // catastrophic failure) which means the output is completely unpredictable. While some errors are
         // formatted by the Tolgee server, reality is there's a huge chance the 5xx error hasn't been raised
         // by Tolgee's error handler.
-        const res = await e.response.text();
+        const res = await e.response.body.text();
         debug(`Server response:\n\n---\n${res}\n---`);
     }
 }

package/package.json

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