@tolgee/cli 2.3.4 → 2.4.0

package/dist/commands/push.js

@@ -1,14 +1,14 @@
 import { extname, join } from 'path';
 import { readdir, readFile, stat } from 'fs/promises';
 import { Command, Option } from 'commander';
+import { glob } from 'tinyglobby';
 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';
-import { windowsCompatibleGlob } from '../utils/windowsCompatibleGlob.js';
 async function allInPattern(pattern) {
     const files = [];
-    const items = await windowsCompatibleGlob(pattern);
+    const items = await glob(pattern);
     for (const item of items) {
         if ((await stat(item)).isDirectory()) {
             files.push(...(await readDirectory(item)));

package/dist/config/tolgeerc.js

@@ -28,25 +28,25 @@ function parseConfig(input, configDir) {
     }
     // convert relative paths in config to absolute
     if (rc.extractor !== undefined) {
-        rc.extractor = resolve(configDir, rc.extractor);
+        rc.extractor = resolve(configDir, rc.extractor).replace(/\\/g, '/');
         if (!existsSync(rc.extractor)) {
             throw new Error(`Invalid config: extractor points to a file that does not exists (${rc.extractor})`);
         }
     }
     // convert relative paths in config to absolute
     if (rc.patterns !== undefined) {
-        rc.patterns = rc.patterns.map((pattern) => resolve(configDir, pattern));
+        rc.patterns = rc.patterns.map((pattern) => resolve(configDir, pattern).replace(/\\/g, '/'));
     }
     // convert relative paths in config to absolute
     if (rc.push?.files) {
         rc.push.files = rc.push.files.map((r) => ({
             ...r,
-            path: resolve(configDir, r.path),
+            path: resolve(configDir, r.path).replace(/\\/g, '/'),
         }));
     }
     // convert relative paths in config to absolute
     if (rc.pull?.path !== undefined) {
-        rc.pull.path = resolve(configDir, rc.pull.path);
+        rc.pull.path = resolve(configDir, rc.pull.path).replace(/\\/g, '/');
     }
     return rc;
 }

package/dist/extractor/runner.js

@@ -1,18 +1,27 @@
+import { glob } from 'tinyglobby';
 import { extname } from 'path';
 import { callWorker } from './worker.js';
 import { exitWithError } from '../utils/logger.js';
-import { windowsCompatibleGlob } from '../utils/windowsCompatibleGlob.js';
 export const NullNamespace = Symbol('namespace.null');
 function parseVerbose(v) {
     return Array.isArray(v) ? v : v ? [] : undefined;
 }
 export async function extractKeysFromFile(file, parserType, options, extractor) {
-    return callWorker({
-        extractor: extractor,
-        parserType,
-        file: file,
-        options,
-    });
+    if (typeof extractor !== 'undefined') {
+        return callWorker({
+            extractor,
+            file,
+            options,
+        });
+    }
+    else if (typeof parserType !== 'undefined') {
+        return callWorker({
+            parserType,
+            file,
+            options,
+        });
+    }
+    throw new Error('Internal error: neither the parser type nor a custom extractors have been defined! Please report this.');
 }
 export function findPossibleFrameworks(fileNames) {
     const possibleFrameworks = [];
@@ -54,14 +63,12 @@ export async function extractKeysOfFiles(opts) {
     if (!opts.patterns?.length) {
         exitWithError("Missing '--patterns' or 'config.patterns' option");
     }
-    const files = await windowsCompatibleGlob(opts.patterns, {
-        nodir: true,
-    });
+    const files = await glob(opts.patterns, { onlyFiles: true });
     if (files.length === 0) {
         exitWithError('No files were matched for extraction');
     }
     let parserType = opts.parser;
-    if (!parserType) {
+    if (!parserType && !opts.extractor) {
         parserType = detectParserType(files);
     }
     const result = new Map();

package/dist/extractor/worker.js

@@ -1,30 +1,26 @@
 import { fileURLToPath } from 'url';
-import { resolve, extname } from 'path';
-import { Worker, isMainThread, parentPort } from 'worker_threads';
-import { readFile } from 'fs/promises';
+import { extname, resolve } from 'path';
+import { isMainThread, parentPort, SHARE_ENV, Worker } from 'worker_threads';
+import { readFileSync } from 'fs';
 import internalExtractor from './extractor.js';
 import { loadModule } from '../utils/moduleLoader.js';
 import { createDeferred } from '../utils/deferred.js';
 const FILE_TIME_LIMIT = 60 * 1000; // one minute
-const IS_TS_NODE = extname(import.meta.url) === '.ts';
+const IS_TSX = extname(import.meta.url) === '.ts';
 // --- Worker functions
-let loadedExtractor = Symbol('unloaded');
 let extractor;
 async function handleJob(args) {
     const file = resolve(args.file);
-    const code = await readFile(file, 'utf8');
-    if (args.extractor) {
-        if (args.extractor !== loadedExtractor) {
-            loadedExtractor = args.extractor;
+    const code = readFileSync(file, 'utf8');
+    if ('extractor' in args) {
+        if (!extractor) {
             extractor = await loadModule(args.extractor).then((mdl) => mdl.default);
         }
         return extractor(code, file, args.options);
     }
-    else {
-        return internalExtractor(code, file, args.parserType, args.options);
-    }
+    return internalExtractor(code, file, args.parserType, args.options);
 }
-async function workerInit() {
+function workerInit() {
     parentPort.on('message', (params) => {
         handleJob(params)
             .then((res) => parentPort.postMessage({ data: res }))
@@ -37,12 +33,18 @@ if (!isMainThread)
 let worker;
 const jobQueue = [];
 function createWorker() {
-    const worker = IS_TS_NODE
-        ? new Worker(fileURLToPath(new URL(import.meta.url)).replace('.ts', '.js'), {
-            // ts-node workaround
-            execArgv: ['--require', 'ts-node/register'],
-        })
-        : new Worker(fileURLToPath(new URL(import.meta.url)));
+    let worker;
+    if (IS_TSX) {
+        worker = new Worker(`import('tsx/esm/api').then(({ register }) => { register(); import('${fileURLToPath(new URL(import.meta.url))}') })`, {
+            env: SHARE_ENV,
+            eval: true,
+        });
+    }
+    else {
+        worker = new Worker(fileURLToPath(new URL(import.meta.url)), {
+            env: SHARE_ENV,
+        });
+    }
     let timeout;
     let currentDeferred;
     function workOrDie() {

package/dist/utils/moduleLoader.js

@@ -1,33 +1,26 @@
-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: any) {
-        //   if (e.code === 'ERR_MODULE_NOT_FOUND') {
-        //     throw new Error('ts-node is required to load TypeScript files.');
-        //   }
-        //   throw e;
-        // }
-    }
-}
+import { pathToFileURL } from 'url';
+let jiti;
+// https://github.com/eslint/eslint/blob/6f37b0747a14dfa9a9e3bdebc5caed1f39b6b0e2/lib/config/config-loader.js#L164-L197
 async function importTypeScript(file) {
-    if (extname(import.meta.url) === '.ts') {
+    // @ts-ignore
+    if (!!globalThis.Bun || !!globalThis.Deno) {
+        // We're in an env that natively supports TS
         return import(file);
     }
-    await registerTsNode();
-    tsService.enabled(true);
-    const mdl = await import(file);
-    tsService.enabled(false);
-    return mdl;
+    if (!jiti) {
+        const { createJiti } = await import('jiti').catch(() => {
+            throw new Error("The 'jiti' library is required for loading TypeScript extractors. Make sure to install it.");
+        });
+        jiti = createJiti(import.meta.url);
+    }
+    return jiti.import(file);
 }
 export async function loadModule(module) {
     if (module.endsWith('.ts')) {
         return importTypeScript(module);
     }
-    const mdl = await import(module);
+    const fileUrl = pathToFileURL(module);
+    const mdl = await import(fileUrl.href);
     if (mdl.default?.default) {
         return mdl.default;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/cli",
-  "version": "2.3.4",
+  "version": "2.4.0",
   "type": "module",
   "description": "A tool to interact with the Tolgee Platform through CLI",
   "repository": {
@@ -34,40 +34,49 @@
     "base32-decode": "^1.0.0",
     "commander": "^12.1.0",
     "cosmiconfig": "^9.0.0",
-    "glob": "^11.0.0",
     "json5": "^2.2.3",
     "jsonschema": "^1.4.1",
-    "openapi-fetch": "^0.10.6",
+    "openapi-fetch": "0.13.1",
+    "tinyglobby": "^0.2.10",
     "unescape-js": "^1.1.4",
     "vscode-oniguruma": "^2.0.1",
     "vscode-textmate": "^9.1.0",
-    "yauzl": "^3.1.3"
+    "yauzl": "^3.2.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.8.0",
+    "@eslint/js": "^9.16.0",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
     "@tsconfig/node18": "^18.2.4",
-    "@tsconfig/recommended": "^1.0.7",
+    "@tsconfig/recommended": "^1.0.8",
     "@types/eslint__js": "^8.42.3",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^22.1.0",
+    "@types/node": "^22.10.1",
     "@types/yauzl": "^2.10.3",
     "cross-env": "^7.0.3",
-    "eslint": "^9.8.0",
+    "eslint": "^9.16.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
+    "jiti": "^2.4.1",
     "js-yaml": "^4.1.0",
-    "json-schema-to-typescript": "^15.0.0",
-    "openapi-typescript": "^7.3.0",
+    "json-schema-to-typescript": "^15.0.3",
+    "openapi-typescript": "^7.4.4",
     "premove": "^4.0.0",
-    "prettier": "^3.3.3",
-    "semantic-release": "^24.0.0",
+    "prettier": "^3.4.1",
+    "semantic-release": "^24.2.0",
     "tree-cli": "^0.6.7",
-    "tsx": "^4.17.0",
-    "typescript": "^5.5.4",
-    "typescript-eslint": "^8.0.1",
-    "vitest": "^2.0.5"
+    "tsx": "^4.19.2",
+    "typescript": "~5.6.3",
+    "typescript-eslint": "^8.17.0",
+    "vitest": "^2.1.8"
+  },
+  "peerDependencies": {
+    "jiti": ">= 2"
+  },
+  "peerDependenciesMeta": {
+    "jiti": {
+      "optional": true
+    }
   },
   "engines": {
     "node": ">= 18"

package/dist/utils/windowsCompatibleGlob.js

@@ -1,7 +0,0 @@
-import { glob } from 'glob';
-export const windowsCompatibleGlob = (pattern, options) => {
-    return glob(pattern, {
-        ...options,
-        windowsPathsNoEscape: process.platform === 'win32',
-    });
-};