@tolgee/cli 1.1.0 → 1.1.2

package/dist/extractor/machines/svelte.js

@@ -1,13 +1,8 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const xstate_1 = require("xstate");
-const properties_1 = __importDefault(require("./shared/properties"));
-const comments_1 = __importDefault(require("./shared/comments"));
+import { createMachine, assign, send, forwardTo } from 'xstate';
+import propertiesMachine from './shared/properties.js';
+import commentsService from './shared/comments.js';
 const VOID_KEY = { keyName: '', line: -1 };
-exports.default = (0, xstate_1.createMachine)({
+export default createMachine({
     predictableActionArguments: true,
     id: 'svelteExtractor',
     type: 'parallel',
@@ -15,7 +10,7 @@ exports.default = (0, xstate_1.createMachine)({
         children: '',
         line: 0,
         key: VOID_KEY,
-        useTranslate: null,
+        getTranslate: null,
         ignore: null,
         keys: [],
         warnings: [],
@@ -24,7 +19,7 @@ exports.default = (0, xstate_1.createMachine)({
         comments: {
             invoke: {
                 id: 'comments',
-                src: () => comments_1.default,
+                src: () => commentsService,
             },
             on: {
                 // Service messages
@@ -43,21 +38,21 @@ exports.default = (0, xstate_1.createMachine)({
                 },
                 // Code messages
                 'comment.line.double-slash.ts': {
-                    actions: (0, xstate_1.send)((_ctx, evt) => ({
+                    actions: send((_ctx, evt) => ({
                         type: 'COMMENT',
                         data: evt.token,
                         line: evt.line,
                     }), { to: 'comments' }),
                 },
                 'comment.block.ts': {
-                    actions: (0, xstate_1.send)((_ctx, evt) => ({
+                    actions: send((_ctx, evt) => ({
                         type: 'COMMENT',
                         data: evt.token,
                         line: evt.line,
                     }), { to: 'comments' }),
                 },
                 'comment.block.svelte': {
-                    actions: (0, xstate_1.send)((_ctx, evt) => ({
+                    actions: send((_ctx, evt) => ({
                         type: 'COMMENT',
                         data: evt.token,
                         line: evt.line,
@@ -69,7 +64,7 @@ exports.default = (0, xstate_1.createMachine)({
                 },
             },
         },
-        useTranslate: {
+        getTranslate: {
             initial: 'idle',
             states: {
                 idle: {
@@ -77,7 +72,7 @@ exports.default = (0, xstate_1.createMachine)({
                         'entity.name.function.ts': {
                             target: 'func',
                             actions: 'storeLine',
-                            cond: (_ctx, evt) => evt.token === 'useTranslate',
+                            cond: (_ctx, evt) => evt.token === 'getTranslate',
                         },
                     },
                 },
@@ -108,12 +103,12 @@ exports.default = (0, xstate_1.createMachine)({
                         'punctuation.definition.string.template.begin.ts': 'namespace',
                         'variable.other.readwrite.ts': {
                             target: 'idle',
-                            actions: ['storeUseTranslate', 'markUseTranslateAsDynamic'],
+                            actions: ['storeGetTranslate', 'markGetTranslateAsDynamic'],
                         },
                         'meta.brace.round.ts': {
                             target: 'idle',
                             cond: (_ctx, evt) => evt.token === ')',
-                            actions: 'storeUseTranslate',
+                            actions: 'storeGetTranslate',
                         },
                     },
                 },
@@ -121,7 +116,7 @@ exports.default = (0, xstate_1.createMachine)({
                     on: {
                         '*': {
                             target: 'namespace_end',
-                            actions: 'storeNamespacedUseTranslate',
+                            actions: 'storeNamespacedGetTranslate',
                         },
                     },
                 },
@@ -131,11 +126,11 @@ exports.default = (0, xstate_1.createMachine)({
                         'meta.brace.round.ts': 'idle',
                         'punctuation.definition.template-expression.begin.ts': {
                             target: 'idle',
-                            actions: 'markUseTranslateAsDynamic',
+                            actions: 'markGetTranslateAsDynamic',
                         },
                         'keyword.operator.arithmetic.ts': {
                             target: 'idle',
-                            actions: 'markUseTranslateAsDynamic',
+                            actions: 'markGetTranslateAsDynamic',
                         },
                     },
                 },
@@ -174,7 +169,7 @@ exports.default = (0, xstate_1.createMachine)({
                 props: {
                     invoke: {
                         id: 'propertiesMachine',
-                        src: properties_1.default,
+                        src: propertiesMachine,
                         onDone: [
                             {
                                 target: 'idle',
@@ -196,7 +191,7 @@ exports.default = (0, xstate_1.createMachine)({
                     },
                     on: {
                         '*': {
-                            actions: (0, xstate_1.forwardTo)('propertiesMachine'),
+                            actions: forwardTo('propertiesMachine'),
                         },
                     },
                 },
@@ -209,7 +204,7 @@ exports.default = (0, xstate_1.createMachine)({
                     on: {
                         'punctuation.definition.variable.svelte': {
                             target: 'dollar',
-                            cond: (ctx, evt) => ctx.useTranslate !== null && evt.token === '$',
+                            cond: (ctx, evt) => ctx.getTranslate !== null && evt.token === '$',
                         },
                     },
                 },
@@ -328,7 +323,7 @@ exports.default = (0, xstate_1.createMachine)({
                 param_object: {
                     invoke: {
                         id: 'propertiesMachine',
-                        src: properties_1.default,
+                        src: propertiesMachine,
                         data: {
                             depth: 1,
                         },
@@ -346,7 +341,7 @@ exports.default = (0, xstate_1.createMachine)({
                     },
                     on: {
                         '*': {
-                            actions: (0, xstate_1.forwardTo)('propertiesMachine'),
+                            actions: forwardTo('propertiesMachine'),
                         },
                     },
                 },
@@ -358,35 +353,35 @@ exports.default = (0, xstate_1.createMachine)({
         isPropertiesDataDynamic: (_ctx, evt) => evt.data.keyName === false || evt.data.namespace === false,
     },
     actions: {
-        storeLine: (0, xstate_1.assign)({
+        storeLine: assign({
             line: (_ctx, evt) => evt.line,
         }),
-        ignoreNextLine: (0, xstate_1.assign)({
+        ignoreNextLine: assign({
             ignore: (_ctx, evt) => ({ type: 'ignore', line: evt.line + 1 }),
         }),
-        consumeIgnoredLine: (0, xstate_1.assign)({
+        consumeIgnoredLine: assign({
             ignore: (_ctx, _evt) => null,
         }),
-        warnUnusedIgnore: (0, xstate_1.assign)({
+        warnUnusedIgnore: assign({
             warnings: (ctx, evt) => [
                 ...ctx.warnings,
                 { warning: 'W_UNUSED_IGNORE', line: evt.line - 1 },
             ],
         }),
-        storeUseTranslate: (0, xstate_1.assign)({
-            useTranslate: (_ctx, _evt) => '',
+        storeGetTranslate: assign({
+            getTranslate: (_ctx, _evt) => '',
         }),
-        storeNamespacedUseTranslate: (0, xstate_1.assign)({
-            useTranslate: (_ctx, evt) => evt.token,
+        storeNamespacedGetTranslate: assign({
+            getTranslate: (_ctx, evt) => evt.token,
         }),
-        markUseTranslateAsDynamic: (0, xstate_1.assign)({
-            useTranslate: (_ctx, _evt) => false,
+        markGetTranslateAsDynamic: assign({
+            getTranslate: (_ctx, _evt) => false,
             warnings: (ctx, _evt) => [
                 ...ctx.warnings,
                 { warning: 'W_DYNAMIC_NAMESPACE', line: ctx.line },
             ],
         }),
-        consumeParameters: (0, xstate_1.assign)({
+        consumeParameters: assign({
             key: (ctx, evt) => ({
                 keyName: ctx.key.keyName || evt.data.keyName,
                 defaultValue: ctx.key.defaultValue || evt.data.defaultValue || undefined,
@@ -402,7 +397,7 @@ exports.default = (0, xstate_1.createMachine)({
                 ];
             },
         }),
-        emitWarningFromParameters: (0, xstate_1.assign)({
+        emitWarningFromParameters: assign({
             warnings: (ctx, evt) => [
                 ...ctx.warnings,
                 {
@@ -414,40 +409,40 @@ exports.default = (0, xstate_1.createMachine)({
             ],
             key: (_ctx, _evt) => VOID_KEY,
         }),
-        storeKeyName: (0, xstate_1.assign)({
+        storeKeyName: assign({
             key: (ctx, evt) => ({ ...ctx.key, keyName: evt.token }),
         }),
-        storeKeyDefault: (0, xstate_1.assign)({
+        storeKeyDefault: assign({
             key: (ctx, evt) => ({ ...ctx.key, defaultValue: evt.token }),
         }),
-        storeKeyCurrentNamespace: (0, xstate_1.assign)({
+        storeKeyCurrentNamespace: assign({
             key: (ctx, _evt) => ({
                 ...ctx.key,
-                namespace: ctx.useTranslate !== null ? ctx.useTranslate : undefined,
+                namespace: ctx.getTranslate !== null ? ctx.getTranslate : undefined,
             }),
         }),
-        dynamicKeyName: (0, xstate_1.assign)({
+        dynamicKeyName: assign({
             warnings: (ctx, _evt) => [
                 ...ctx.warnings,
                 { warning: 'W_DYNAMIC_KEY', line: ctx.line },
             ],
             key: (_ctx, _evt) => VOID_KEY,
         }),
-        dynamicKeyDefault: (0, xstate_1.assign)({
+        dynamicKeyDefault: assign({
             key: (ctx, _evt) => ({ ...ctx.key, defaultValue: undefined }),
             warnings: (ctx, _evt) => [
                 ...ctx.warnings,
                 { warning: 'W_DYNAMIC_DEFAULT_VALUE', line: ctx.line },
             ],
         }),
-        dynamicOptions: (0, xstate_1.assign)({
+        dynamicOptions: assign({
             key: (_ctx, _evt) => VOID_KEY,
             warnings: (ctx, _evt) => [
                 ...ctx.warnings,
                 { warning: 'W_DYNAMIC_OPTIONS', line: ctx.line },
             ],
         }),
-        pushKey: (0, xstate_1.assign)({
+        pushKey: assign({
             warnings: (ctx, _evt) => {
                 if (!ctx.key.keyName || ctx.key.namespace !== false)
                     return ctx.warnings;
@@ -473,7 +468,7 @@ exports.default = (0, xstate_1.createMachine)({
             },
             key: (_ctx, _evt) => ({ keyName: '', line: 0 }),
         }),
-        pushImmediateKey: (0, xstate_1.assign)({
+        pushImmediateKey: assign({
             ignore: (_ctx, evt) => ({ type: 'key', line: evt.line + 1 }),
             keys: (ctx, evt) => [
                 ...ctx.keys,
@@ -485,7 +480,7 @@ exports.default = (0, xstate_1.createMachine)({
                 },
             ],
         }),
-        pushWarning: (0, xstate_1.assign)({
+        pushWarning: assign({
             warnings: (ctx, evt) => [
                 ...ctx.warnings,
                 { warning: evt.kind, line: evt.line },

package/dist/extractor/runner.js

@@ -1,19 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.filterExtractionResult = exports.extractKeysOfFiles = exports.extractKeysFromFile = exports.NullNamespace = void 0;
-const glob_1 = require("glob");
-const worker_1 = require("./worker");
-const util_1 = require("util");
-const glob = (0, util_1.promisify)(glob_1.glob);
-exports.NullNamespace = Symbol('namespace.null');
-async function extractKeysFromFile(file, extractor) {
-    return (0, worker_1.callWorker)({
+import { glob } from 'glob';
+import { callWorker } from './worker.js';
+export const NullNamespace = Symbol('namespace.null');
+export async function extractKeysFromFile(file, extractor) {
+    return callWorker({
         extractor: extractor,
         file: file,
     });
 }
-exports.extractKeysFromFile = extractKeysFromFile;
-async function extractKeysOfFiles(filesPattern, extractor) {
+export async function extractKeysOfFiles(filesPattern, extractor) {
     const files = await glob(filesPattern, { nodir: true });
     const result = new Map();
     await Promise.all(files.map(async (file) => {
@@ -22,12 +16,11 @@ async function extractKeysOfFiles(filesPattern, extractor) {
     }));
     return result;
 }
-exports.extractKeysOfFiles = extractKeysOfFiles;
-function filterExtractionResult(data) {
+export function filterExtractionResult(data) {
     const result = Object.create(null);
     for (const { keys } of data.values()) {
         for (const key of keys) {
-            const namespace = key.namespace || exports.NullNamespace;
+            const namespace = key.namespace || NullNamespace;
             if (!(namespace in result)) {
                 result[namespace] = new Map();
             }
@@ -36,4 +29,3 @@ function filterExtractionResult(data) {
     }
     return result;
 }
-exports.filterExtractionResult = filterExtractionResult;

package/dist/extractor/tokenizer.js

@@ -1,36 +1,36 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = require("path");
-const promises_1 = require("fs/promises");
-const vscode_textmate_1 = require("vscode-textmate");
-const vscode_oniguruma_1 = require("vscode-oniguruma");
-const GRAMMAR_PATH = (0, path_1.join)(__dirname, '..', '..', 'textmate');
+import { extname } from 'path';
+import { readFile } from 'fs/promises';
+import { createRequire } from 'module';
+import TextMate from 'vscode-textmate';
+import Oniguruma from 'vscode-oniguruma';
+const GRAMMAR_PATH = new URL('../../textmate/', import.meta.url);
 const GrammarFiles = {
-    ["source.ts" /* Grammar.TYPESCRIPT */]: (0, path_1.join)(GRAMMAR_PATH, 'TypeScript.tmLanguage'),
-    ["source.tsx" /* Grammar.TYPESCRIPT_TSX */]: (0, path_1.join)(GRAMMAR_PATH, 'TypeScriptReact.tmLanguage'),
-    ["source.svelte" /* Grammar.SVELTE */]: (0, path_1.join)(GRAMMAR_PATH, 'Svelte.tmLanguage'),
+    ["source.ts" /* Grammar.TYPESCRIPT */]: new URL('TypeScript.tmLanguage', GRAMMAR_PATH),
+    ["source.tsx" /* Grammar.TYPESCRIPT_TSX */]: new URL('TypeScriptReact.tmLanguage', GRAMMAR_PATH),
+    ["source.svelte" /* Grammar.SVELTE */]: new URL('Svelte.tmLanguage', GRAMMAR_PATH),
 };
 let oniguruma;
 let registry;
 async function initializeOniguruma() {
+    const require = createRequire(import.meta.url);
     const wasmBlobPath = require
         .resolve('vscode-oniguruma')
         .replace('main.js', 'onig.wasm');
-    const wasmBlob = await (0, promises_1.readFile)(wasmBlobPath);
-    await (0, vscode_oniguruma_1.loadWASM)(wasmBlob);
+    const wasmBlob = await readFile(wasmBlobPath);
+    await Oniguruma.loadWASM(wasmBlob);
     return {
-        createOnigScanner: (patterns) => new vscode_oniguruma_1.OnigScanner(patterns),
-        createOnigString: (s) => new vscode_oniguruma_1.OnigString(s),
+        createOnigScanner: (patterns) => new Oniguruma.OnigScanner(patterns),
+        createOnigString: (s) => new Oniguruma.OnigString(s),
     };
 }
 async function loadGrammar(scope) {
     const file = GrammarFiles[scope];
     if (!file)
         return null;
-    const grammar = await (0, promises_1.readFile)(file, 'utf8');
+    const grammar = await readFile(file, 'utf8');
     return grammar.startsWith('{')
         ? JSON.parse(grammar)
-        : (0, vscode_textmate_1.parseRawGrammar)(grammar);
+        : TextMate.parseRawGrammar(grammar);
 }
 function extnameToGrammar(extname) {
     switch (extname) {
@@ -49,7 +49,7 @@ function extnameToGrammar(extname) {
     }
 }
 function tokenize(code, grammar) {
-    let stack = vscode_textmate_1.INITIAL;
+    let stack = TextMate.INITIAL;
     let linePtr = 0;
     const lines = code.split('\n');
     const tokens = [];
@@ -84,16 +84,16 @@ function tokenize(code, grammar) {
     }
     return tokens;
 }
-async function default_1(code, fileName) {
+export default async function (code, fileName) {
     if (!oniguruma) {
         // Lazily initialize the WebAssembly runtime
         oniguruma = initializeOniguruma();
-        registry = new vscode_textmate_1.Registry({
+        registry = new TextMate.Registry({
             onigLib: oniguruma,
             loadGrammar: loadGrammar,
         });
     }
-    const fileType = (0, path_1.extname)(fileName);
+    const fileType = extname(fileName);
     const grammarName = extnameToGrammar(fileType);
     if (!grammarName) {
         throw new Error(`Cannot find grammar for file type ${fileType}`);
@@ -104,4 +104,3 @@ async function default_1(code, fileName) {
     }
     return tokenize(code, grammar);
 }
-exports.default = default_1;

package/dist/extractor/warnings.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.emitGitHubWarning = exports.dumpWarnings = exports.WarningMessages = void 0;
-const path_1 = require("path");
-exports.WarningMessages = {
+import { relative } from 'path';
+export const WarningMessages = {
     W_DYNAMIC_KEY: {
         name: 'Dynamic key',
         description: 'The key not static and cannot be extracted automatically. This key will be ignored.\n\nUse @tolgee-key or @tolgee-ignore to suppress this warning.',
@@ -42,7 +39,7 @@ exports.WarningMessages = {
  * @param extractionResult Extraction result to dump warnings from.
  * @returns Count of emitted warnings in the extraction.
  */
-function dumpWarnings(extractionResult) {
+export function dumpWarnings(extractionResult) {
     let warningCount = 0;
     for (const [file, { warnings }] of extractionResult.entries()) {
         if (warnings.length) {
@@ -51,8 +48,8 @@ function dumpWarnings(extractionResult) {
             }
             console.error(file);
             for (const warning of warnings) {
-                const warnText = warning.warning in exports.WarningMessages
-                    ? exports.WarningMessages[warning.warning].name
+                const warnText = warning.warning in WarningMessages
+                    ? WarningMessages[warning.warning].name
                     : warning.warning;
                 console.error('\tline %d: %s', warning.line, warnText);
                 emitGitHubWarning(warning.warning, file, warning.line);
@@ -65,13 +62,12 @@ function dumpWarnings(extractionResult) {
     }
     return warningCount;
 }
-exports.dumpWarnings = dumpWarnings;
-function emitGitHubWarning(warning, file, line) {
+export function emitGitHubWarning(warning, file, line) {
     if (!process.env.GITHUB_ACTIONS)
         return;
-    file = (0, path_1.relative)(process.env.GITHUB_WORKSPACE ?? process.cwd(), file);
-    if (warning in exports.WarningMessages) {
-        const { name, description } = exports.WarningMessages[warning];
+    file = relative(process.env.GITHUB_WORKSPACE ?? process.cwd(), file);
+    if (warning in WarningMessages) {
+        const { name, description } = WarningMessages[warning];
         const encodedDescription = description
             .replaceAll('%', '%25')
             .replaceAll('\r', '%0D')
@@ -84,4 +80,3 @@ function emitGitHubWarning(warning, file, line) {
     }
     console.log(`::warning file=${file},line=${line}::${warning}`);
 }
-exports.emitGitHubWarning = emitGitHubWarning;

package/dist/extractor/worker.js

@@ -1,16 +1,10 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.callWorker = void 0;
-const path_1 = require("path");
-const worker_threads_1 = require("worker_threads");
-const promises_1 = require("fs/promises");
-const extractor_1 = __importDefault(require("./extractor"));
-const moduleLoader_1 = require("../utils/moduleLoader");
-const deferred_1 = require("../utils/deferred");
-const IS_TS_NODE = (0, path_1.extname)(__filename) === '.ts';
+import { resolve, extname } from 'path';
+import { Worker, isMainThread, parentPort } from 'worker_threads';
+import { readFile } from 'fs/promises';
+import internalExtractor from './extractor.js';
+import { loadModule } from '../utils/moduleLoader.js';
+import { createDeferred } from '../utils/deferred.js';
+const IS_TS_NODE = extname(import.meta.url) === '.ts';
 // --- Worker functions
 let loadedExtractor = Symbol('unloaded');
 let extractor;
@@ -18,30 +12,32 @@ async function handleJob(args) {
     if (loadedExtractor !== args.extractor) {
         loadedExtractor = args.extractor;
         extractor = args.extractor
-            ? await (0, moduleLoader_1.loadModule)(args.extractor).then((mdl) => mdl.default)
-            : extractor_1.default;
+            ? await loadModule(args.extractor).then((mdl) => mdl.default)
+            : internalExtractor;
     }
-    const file = (0, path_1.resolve)(args.file);
-    const code = await (0, promises_1.readFile)(file, 'utf8');
+    const file = resolve(args.file);
+    const code = await readFile(file, 'utf8');
     return extractor(code, file);
 }
 async function workerInit() {
-    worker_threads_1.parentPort.on('message', (params) => {
+    parentPort.on('message', (params) => {
         handleJob(params)
-            .then((res) => worker_threads_1.parentPort.postMessage({ data: res }))
-            .catch((e) => worker_threads_1.parentPort.postMessage({ err: e }));
+            .then((res) => parentPort.postMessage({ data: res }))
+            .catch((e) => parentPort.postMessage({ err: e }));
     });
 }
-if (!worker_threads_1.isMainThread)
+if (!isMainThread)
     workerInit();
 // --- Main thread functions
 let worker;
 const jobQueue = [];
 function createWorker() {
-    const worker = new worker_threads_1.Worker(__filename, {
-        // ts-node workaround
-        execArgv: IS_TS_NODE ? ['--require', 'ts-node/register'] : undefined,
-    });
+    const worker = IS_TS_NODE
+        ? new Worker(new URL(import.meta.url).pathname.replace('.ts', '.js'), {
+            // ts-node workaround
+            execArgv: ['--require', 'ts-node/register'],
+        })
+        : new Worker(new URL(import.meta.url).pathname);
     let timeout;
     let currentDeferred;
     function workOrDie() {
@@ -70,12 +66,11 @@ function createWorker() {
     workOrDie();
     return worker;
 }
-async function callWorker(params) {
-    const deferred = (0, deferred_1.createDeferred)();
+export async function callWorker(params) {
+    const deferred = createDeferred();
     jobQueue.push([params, deferred]);
     if (!worker) {
         worker = createWorker();
     }
     return deferred.promise;
 }
-exports.callWorker = callWorker;