@tolgee/cli 1.0.2 → 1.1.0

package/dist/extractor/extractor.js

@@ -0,0 +1,65 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = require("path");
+const xstate_1 = require("xstate");
+const react_1 = __importDefault(require("./machines/react"));
+const svelte_1 = __importDefault(require("./machines/svelte"));
+const comments_1 = __importDefault(require("./machines/comments"));
+const tokenizer_1 = __importDefault(require("./tokenizer"));
+const REACT_EXTS = [
+    '.js',
+    '.mjs',
+    '.cjs',
+    '.ts',
+    '.mts',
+    '.cts',
+    '.jsx',
+    '.tsx',
+];
+const ALL_EXTS = [
+    '.js',
+    '.mjs',
+    '.cjs',
+    '.ts',
+    '.mts',
+    '.cts',
+    '.jsx',
+    '.tsx',
+    '.svelte',
+];
+function pickMachine(code, fileName) {
+    const ext = (0, path_1.extname)(fileName);
+    if (REACT_EXTS.includes(ext) && code.includes('@tolgee/react')) {
+        return react_1.default;
+    }
+    if (ext === '.svelte' && code.includes('@tolgee/svelte')) {
+        return svelte_1.default;
+    }
+    if (ALL_EXTS.includes(ext) &&
+        (code.includes('@tolgee-key') || code.includes('@tolgee-ignore'))) {
+        return comments_1.default;
+    }
+    return null;
+}
+async function extractor(code, fileName) {
+    const machineSpec = pickMachine(code, fileName);
+    if (!machineSpec) {
+        return { warnings: [], keys: [] };
+    }
+    const tokens = await (0, tokenizer_1.default)(code, fileName);
+    // @ts-ignore -- Types are whacky, complains about withConfig but it's not a problem here.
+    const machine = (0, xstate_1.interpret)(machineSpec);
+    machine.start();
+    for (const token of tokens) {
+        machine.send(token);
+    }
+    const snapshot = machine.getSnapshot();
+    return {
+        warnings: snapshot.context.warnings,
+        keys: snapshot.context.keys,
+    };
+}
+exports.default = extractor;

package/dist/extractor/machines/comments.js

@@ -0,0 +1,83 @@
+"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 comments_1 = __importDefault(require("./shared/comments"));
+exports.default = (0, xstate_1.createMachine)({
+    predictableActionArguments: true,
+    id: 'commentsExtractor',
+    context: {
+        keys: [],
+        warnings: [],
+    },
+    invoke: {
+        id: 'comments',
+        src: () => comments_1.default,
+    },
+    on: {
+        // Service messages
+        MAGIC_COMMENT: [
+            {
+                actions: 'warnUnusedIgnore',
+                cond: (_ctx, evt) => evt.kind === 'ignore',
+            },
+            {
+                actions: 'pushKey',
+                cond: (_ctx, evt) => evt.kind === 'key',
+            },
+        ],
+        WARNING: {
+            actions: 'pushWarning',
+        },
+        // Code messages
+        'comment.line.double-slash.ts': {
+            actions: (0, xstate_1.send)((_ctx, evt) => ({
+                type: 'COMMENT',
+                data: evt.token,
+                line: evt.line,
+            }), { to: 'comments' }),
+        },
+        'comment.block.ts': {
+            actions: (0, xstate_1.send)((_ctx, evt) => ({
+                type: 'COMMENT',
+                data: evt.token,
+                line: evt.line,
+            }), { to: 'comments' }),
+        },
+        'comment.block.svelte': {
+            actions: (0, xstate_1.send)((_ctx, evt) => ({
+                type: 'COMMENT',
+                data: evt.token,
+                line: evt.line,
+            }), { to: 'comments' }),
+        },
+    },
+}, {
+    actions: {
+        warnUnusedIgnore: (0, xstate_1.assign)({
+            warnings: (ctx, evt) => [
+                ...ctx.warnings,
+                { warning: 'W_UNUSED_IGNORE', line: evt.line },
+            ],
+        }),
+        pushKey: (0, xstate_1.assign)({
+            keys: (ctx, evt) => [
+                ...ctx.keys,
+                {
+                    keyName: evt.keyName,
+                    namespace: evt.namespace,
+                    defaultValue: evt.defaultValue,
+                    line: evt.line,
+                },
+            ],
+        }),
+        pushWarning: (0, xstate_1.assign)({
+            warnings: (ctx, evt) => [
+                ...ctx.warnings,
+                { warning: evt.kind, line: evt.line },
+            ],
+        }),
+    },
+});

package/dist/extractor/machines/react.js

@@ -672,7 +672,7 @@ exports.default = (0, xstate_1.createMachine)({
                 ...ctx.key,
                 namespace: ctx.hooks.length
                     ? ctx.hooks[ctx.hooks.length - 1].namespace
-                    : void 0,
+                    : undefined,
             }),
         }),
         dynamicKeyName: (0, xstate_1.assign)({

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

@@ -42,6 +42,13 @@ exports.default = (0, xstate_1.createMachine)({
                     target: 'value',
                     actions: 'markAsStatic',
                 },
+                // Svelte
+                'entity.other.attribute-name.svelte': {
+                    actions: ['markPropertyAsDynamic', 'storePropertyType'],
+                },
+                'punctuation.separator.key-value.svelte': {
+                    target: 'value',
+                },
             },
         },
         complex_key: {
@@ -69,6 +76,8 @@ exports.default = (0, xstate_1.createMachine)({
                 // Extract strings
                 'punctuation.definition.string.begin.ts': 'value_string',
                 'punctuation.definition.string.template.begin.ts': 'value_string',
+                'punctuation.definition.string.begin.svelte': 'value_string',
+                'punctuation.definition.string.template.begin.svelte': 'value_string',
                 // Variable
                 'variable.other.readwrite.ts': {
                     target: 'idle',
@@ -82,6 +91,15 @@ exports.default = (0, xstate_1.createMachine)({
                 'punctuation.section.embedded.begin.tsx': {
                     actions: 'unmarkAsStatic',
                 },
+                // Svelte
+                'string.unquoted.svelte': {
+                    target: 'idle',
+                    actions: [
+                        'storePropertyValue',
+                        'clearPropertyType',
+                        'unmarkAsStatic',
+                    ],
+                },
                 // Value end
                 'punctuation.separator.comma.ts': {
                     target: 'idle',
@@ -113,6 +131,14 @@ exports.default = (0, xstate_1.createMachine)({
                     target: 'idle',
                     actions: ['storeEmptyPropertyValue', 'clearPropertyType'],
                 },
+                'punctuation.definition.string.end.svelte': {
+                    target: 'idle',
+                    actions: ['storeEmptyPropertyValue', 'clearPropertyType'],
+                },
+                'punctuation.definition.string.template.end.svelte': {
+                    target: 'idle',
+                    actions: ['storeEmptyPropertyValue', 'clearPropertyType'],
+                },
                 '*': [
                     {
                         target: 'idle',
@@ -149,6 +175,19 @@ exports.default = (0, xstate_1.createMachine)({
                     target: 'idle',
                     actions: 'clearPropertyType',
                 },
+                // Svelte
+                'punctuation.section.embedded.begin.svelte': {
+                    target: 'idle',
+                    actions: ['markPropertyAsDynamic', 'clearPropertyType'],
+                },
+                'punctuation.definition.string.end.svelte': {
+                    target: 'idle',
+                    actions: 'clearPropertyType',
+                },
+                'punctuation.section.embedded.end.svelte': {
+                    target: 'idle',
+                    actions: 'clearPropertyType',
+                },
             },
         },
         end: {
@@ -180,13 +219,19 @@ exports.default = (0, xstate_1.createMachine)({
             target: 'end',
             actions: 'markPropertyAsDynamic',
         },
+        'punctuation.definition.tag.end.svelte': {
+            target: 'end',
+            actions: 'markPropertyAsDynamic',
+        },
     },
 }, {
     guards: {
         isOpenCurly: (_ctx, evt) => evt.token === '{' &&
-            !evt.scopes.includes('meta.embedded.expression.tsx'),
+            !evt.scopes.includes('meta.embedded.expression.tsx') &&
+            !evt.scopes.includes('meta.embedded.expression.svelte'),
         isCloseCurly: (_ctx, evt) => evt.token === '}' &&
-            !evt.scopes.includes('meta.embedded.expression.tsx'),
+            !evt.scopes.includes('meta.embedded.expression.tsx') &&
+            !evt.scopes.includes('meta.embedded.expression.svelte'),
         isFinalCloseCurly: (ctx, evt) => evt.token === '}' && ctx.depth === 1,
         isOpenSquare: (_ctx, evt) => evt.token === '[',
         isCloseSquare: (_ctx, evt) => evt.token === ']',