@tolgee/cli 2.1.5 → 2.1.7

package/dist/client/ApiClient.js

@@ -47,17 +47,15 @@ export function createApiClient({ baseUrl, apiKey, projectId, autoThrow = false,
         },
     });
     apiClient.use({
-        onRequest: (req, options) => {
-            debug(`[HTTP] Requesting: ${req.method} ${req.url}`);
-            return undefined;
+        onRequest: ({ request }) => {
+            debug(`[HTTP] Requesting: ${request.method} ${request.url}`);
         },
-        onResponse: async (res, options) => {
-            debug(`[HTTP] Response: ${res.url} [${res.status}]`);
-            if (autoThrow && !res.ok) {
-                const loadable = await parseResponse(res, options.parseAs);
-                throw new Error(`Tolgee request error ${res.url} ${errorFromLoadable(loadable)}`);
+        onResponse: async ({ response, options }) => {
+            debug(`[HTTP] Response: ${response.url} [${response.status}]`);
+            if (autoThrow && !response.ok) {
+                const loadable = await parseResponse(response, options.parseAs);
+                throw new Error(`Tolgee request error ${response.url} ${errorFromLoadable(loadable)}`);
             }
-            return undefined;
         },
     });
     return {

package/dist/client/ImportClient.js

@@ -1,21 +1,22 @@
-import FormData from 'form-data';
+import { pathToPosix } from '../utils/pathToPosix.js';
 export const createImportClient = ({ apiClient }) => {
     return {
         async import(data) {
             const body = new FormData();
             for (const file of data.files) {
-                body.append('files', file.data, { filepath: file.name });
+                // converting paths to posix style, so it's correctly matched on the server
+                body.append('files', new Blob([file.data]), pathToPosix(file.name));
             }
+            data.params.fileMappings = data.params.fileMappings.map((i) => ({
+                ...i,
+                // converting paths to posix style, so it's correctly matched on the server
+                fileName: pathToPosix(i.fileName),
+            }));
             body.append('params', JSON.stringify(data.params));
             return apiClient.POST('/v2/projects/{projectId}/single-step-import', {
                 params: { path: { projectId: apiClient.getProjectId() } },
                 body: body,
-                bodySerializer: (r) => {
-                    return r.getBuffer();
-                },
-                headers: {
-                    'content-type': `multipart/form-data; boundary=${body.getBoundary()}`,
-                },
+                bodySerializer: (r) => r,
             });
         },
     };

package/dist/commands/extract/check.js

@@ -9,14 +9,15 @@ const lintHandler = (config) => async function () {
     let warningCount = 0;
     let filesCount = 0;
     for (const [file, { warnings }] of extracted) {
-        if (warnings.length) {
+        if (warnings?.length) {
             warningCount += warnings.length;
             filesCount++;
             const relFile = relative(process.cwd(), file);
             console.log('%s:', relFile);
             for (const warning of warnings) {
                 if (warning.warning in WarningMessages) {
-                    const { name } = WarningMessages[warning.warning];
+                    const warn = warning.warning;
+                    const { name } = WarningMessages[warn];
                     console.log('\tline %d: %s', warning.line, name);
                 }
                 else {

package/dist/commands/extract/print.js

@@ -23,12 +23,13 @@ const printHandler = (config) => async function () {
                 }
             }
         }
-        if (warnings.length) {
+        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 { name } = WarningMessages[warning.warning];
+                    const warn = warning.warning;
+                    const { name } = WarningMessages[warn];
                     console.log('\tline %d: %s', warning.line, name);
                 }
                 else {
@@ -36,7 +37,7 @@ const printHandler = (config) => async function () {
                 }
             }
         }
-        if (keys.length || warnings.length) {
+        if (keys.length || warnings?.length) {
             console.log();
         }
     }

package/dist/commands/push.js

@@ -1,7 +1,7 @@
 import { extname, join } from 'path';
 import { readdir, readFile, stat } from 'fs/promises';
 import { Command, Option } from 'commander';
-import { glob } from 'glob';
+import glob from 'fast-glob';
 import { loading, success, error, warn, exitWithError, } from '../utils/logger.js';
 import { askString } from '../utils/ask.js';
 import { mapImportFormat } from '../utils/mapImportFormat.js';
@@ -91,6 +91,7 @@ const pushHandler = (config) => async function () {
         return;
     }
     const params = {
+        createNewKeys: true,
         forceMode: opts.forceMode,
         overrideKeyDescriptions: opts.overrideKeyDescriptions,
         convertPlaceholdersToIcu: opts.convertPlaceholdersToIcu,

package/dist/config/tolgeerc.js

@@ -16,7 +16,7 @@ function parseConfig(input, configDir) {
         try {
             new URL(rc.apiUrl);
         }
-        catch (e) {
+        catch {
             throw new Error('Invalid config: apiUrl is an invalid URL');
         }
     }

package/dist/extractor/parserReact/ParserReact.js

@@ -20,7 +20,7 @@ export const reactMergers = pipeMachines([
 ]);
 export const ParserReact = () => {
     return Parser({
-        mappers: [generalMapper, reactMapper],
+        mappers: reactMappers,
         blocks: {
             ...DEFAULT_BLOCKS,
         },

package/dist/extractor/runner.js

@@ -1,4 +1,4 @@
-import { glob } from 'glob';
+import glob from 'fast-glob';
 import { extname } from 'path';
 import { callWorker } from './worker.js';
 import { exitWithError } from '../utils/logger.js';
@@ -44,7 +44,7 @@ export async function extractKeysOfFiles(opts) {
     if (!opts.patterns?.length) {
         exitWithError("Missing '--patterns' or 'config.patterns' option");
     }
-    const files = await glob(opts.patterns, { nodir: true });
+    const files = await glob(opts.patterns, { onlyFiles: true });
     if (files.length === 0) {
         exitWithError('No files were matched for extraction');
     }

package/dist/extractor/warnings.js

@@ -50,14 +50,15 @@ export const WarningMessages = {
 export function dumpWarnings(extractionResult) {
     let warningCount = 0;
     for (const [file, { warnings }] of extractionResult.entries()) {
-        if (warnings.length) {
+        if (warnings?.length) {
             if (!warningCount) {
                 console.error('Warnings were emitted during extraction.');
             }
             console.error(file);
             for (const warning of warnings) {
                 const warnText = warning.warning in WarningMessages
-                    ? WarningMessages[warning.warning].name
+                    ? WarningMessages[warning.warning]
+                        .name
                     : warning.warning;
                 console.error('\tline %d: %s', warning.line, warnText);
                 emitGitHubWarning(warning.warning, file, warning.line);
@@ -75,7 +76,8 @@ export function emitGitHubWarning(warning, file, line) {
         return;
     file = relative(process.env.GITHUB_WORKSPACE ?? process.cwd(), file);
     if (warning in WarningMessages) {
-        const { name, description } = WarningMessages[warning];
+        const warn = warning;
+        const { name, description } = WarningMessages[warn];
         const encodedDescription = description
             .replaceAll('%', '%25')
             .replaceAll('\r', '%0D')

package/dist/utils/moduleLoader.js

@@ -2,16 +2,15 @@ import { extname } from 'path';
 let tsService;
 async function registerTsNode() {
     if (!tsService) {
-        try {
-            const tsNode = await import('ts-node');
-            tsService = tsNode.register({ compilerOptions: { module: 'CommonJS' } });
-        }
-        catch (e) {
-            if (e.code === 'ERR_MODULE_NOT_FOUND') {
-                throw new Error('ts-node is required to load TypeScript files.');
-            }
-            throw e;
-        }
+        // try {
+        //   const tsNode = await import('ts-node');
+        //   tsService = tsNode.register({ compilerOptions: { module: 'CommonJS' } });
+        // } catch (e: any) {
+        //   if (e.code === 'ERR_MODULE_NOT_FOUND') {
+        //     throw new Error('ts-node is required to load TypeScript files.');
+        //   }
+        //   throw e;
+        // }
     }
 }
 async function importTypeScript(file) {

package/dist/utils/pathToPosix.js

@@ -0,0 +1,4 @@
+import path from 'path';
+export function pathToPosix(input) {
+    return input.replaceAll(path.sep, path.posix.sep);
+}

package/extractor.d.ts

@@ -22,9 +22,6 @@ export type ParserType = 'react' | 'vue' | 'svelte';
 export type Extractor = (fileContents: string, fileName: string, options: ExtractOptions) => ExtractionResult;
 export type ExtractionResult = {
     keys: ExtractedKey[];
-    warnings: Warning[];
+    warnings?: Warning[];
 };
-export type ExtractionResults = Map<string, {
-    keys: ExtractedKey[];
-    warnings: Warning[];
-}>;
+export type ExtractionResults = Map<string, ExtractionResult>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/cli",
-  "version": "2.1.5",
+  "version": "2.1.7",
   "type": "module",
   "description": "A tool to interact with the Tolgee Platform through CLI",
   "repository": {
@@ -11,57 +11,63 @@
     "tolgee": "./dist/cli.js"
   },
   "scripts": {
-    "build": "rimraf dist dist-types && tsc -p tsconfig.prod.json && node scripts/copyExtractorTypes.mjs",
+    "prepack": "npm run build",
+    "build": "premove dist dist-types && tsc -p tsconfig.prod.json && tsx scripts/copyExtractorTypes.ts",
     "test": "vitest run",
-    "test:unit": "vitest run -c unit.vitest.config.ts --dir ./src/test/unit",
-    "test:e2e": "vitest run --dir ./src/test/e2e",
-    "test:package": "node scripts/validatePackage.js",
-    "tolgee:start": "node scripts/startDocker.js",
+    "test:unit": "vitest run -c unit.vitest.config.ts --dir ./test/unit",
+    "test:e2e": "vitest run --dir ./test/e2e",
+    "test:package": "tsx ./scripts/validatePackage.ts",
+    "test:types": "tsc --noEmit",
+    "tolgee:start": "tsx ./scripts/startDocker.ts",
     "tolgee:stop": "docker stop tolgee_cli_e2e",
-    "eslint": "eslint --max-warnings 0 --ext .ts --ext .js --ext .cjs ./src ./scripts vitest.config.ts",
-    "prettier": "prettier --write ./src ./scripts vitest.config.ts",
-    "run-dev": "cross-env NODE_OPTIONS=\"--import=./scripts/registerTsNode.js\" node ./src/cli.ts",
+    "eslint": "eslint --max-warnings 0",
+    "format": "eslint --fix",
+    "run-dev": "tsx ./src/cli.ts",
     "schema": "openapi-typescript http://localhost:22222/v3/api-docs/All%20Internal%20-%20for%20Tolgee%20Web%20application --output src/client/internal/schema.generated.ts",
     "release": "semantic-release",
-    "config:type": "node scripts/configType.mjs"
+    "config:type": "tsx scripts/configType.ts"
   },
   "author": "Jan Cizmar",
   "license": "MIT",
   "dependencies": {
     "ansi-colors": "^4.1.3",
     "base32-decode": "^1.0.0",
-    "commander": "^12.0.0",
-    "cosmiconfig": "^8.2.0",
-    "form-data": "^4.0.0",
-    "glob": "^10.3.3",
+    "commander": "^12.1.0",
+    "cosmiconfig": "^9.0.0",
+    "fast-glob": "^3.3.2",
     "json5": "^2.2.3",
     "jsonschema": "^1.4.1",
-    "openapi-fetch": "^0.9.7",
+    "openapi-fetch": "^0.10.6",
     "unescape-js": "^1.1.4",
-    "vscode-oniguruma": "^1.7.0",
-    "vscode-textmate": "^9.0.0",
-    "yauzl": "^2.10.0"
+    "vscode-oniguruma": "^2.0.1",
+    "vscode-textmate": "^9.1.0",
+    "yauzl": "^3.1.3"
   },
   "devDependencies": {
+    "@eslint/js": "^9.8.0",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "@types/node": "^20.4.5",
-    "@types/yauzl": "^2.10.0",
-    "@typescript-eslint/eslint-plugin": "^6.2.0",
-    "@typescript-eslint/parser": "^6.2.0",
+    "@tsconfig/node18": "^18.2.4",
+    "@tsconfig/recommended": "^1.0.7",
+    "@types/eslint__js": "^8.42.3",
+    "@types/js-yaml": "^4.0.9",
+    "@types/node": "^22.1.0",
+    "@types/yauzl": "^2.10.3",
     "cross-env": "^7.0.3",
-    "eslint": "^8.45.0",
-    "eslint-plugin-prettier": "^5.0.0",
+    "eslint": "^9.8.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.2.1",
     "js-yaml": "^4.1.0",
-    "json-schema-to-typescript": "^13.1.2",
-    "openapi-typescript": "^6.7.6",
-    "prettier": "^3.0.0",
-    "rimraf": "^5.0.1",
-    "semantic-release": "^21.0.7",
+    "json-schema-to-typescript": "^15.0.0",
+    "openapi-typescript": "^7.3.0",
+    "premove": "^4.0.0",
+    "prettier": "^3.3.3",
+    "semantic-release": "^24.0.0",
     "tree-cli": "^0.6.7",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.4.5",
-    "vitest": "^1.6.0"
+    "tsx": "^4.17.0",
+    "typescript": "^5.5.4",
+    "typescript-eslint": "^8.0.1",
+    "vitest": "^2.0.5"
   },
   "engines": {
     "node": ">= 18"
@@ -102,5 +108,10 @@
       "@semantic-release/npm",
       "@semantic-release/github"
     ]
+  },
+  "imports": {
+    "#cli/*.js": "./src/*.js",
+    "#tests/*.js": "./test/*.js",
+    "#tests/*.json": "./test/*.json"
   }
 }