@tolgee/cli 2.1.0 → 2.1.2

package/dist/extractor/parser/generalMapper.js

@@ -19,6 +19,8 @@ export const generalMapper = (token) => {
         case 'string.quoted.single.ts':
         case 'string.quoted.double.ts':
             return 'string.body';
+        case 'constant.character.escape.ts':
+            return 'escaped.character';
         // template strings
         case 'punctuation.definition.string.template.begin.ts':
             return 'string.teplate.begin';

package/dist/extractor/parser/generateReport.js

@@ -7,20 +7,23 @@ function shouldBeIgnored(context, line) {
     }
     return isIgnore;
 }
-function keyInfoFromComment(context, line) {
+function commentKeyInfoOnLine(context, line) {
     const commentAtLine = context.commentMap.get(line - 1);
     const isKeyInfo = commentAtLine?.type === 'MAGIC_COMMENT' && commentAtLine.kind === 'key';
     if (isKeyInfo) {
         context.unusedComments.delete(commentAtLine);
-        return {
-            keyName: commentAtLine.keyName,
-            namespace: commentAtLine.namespace,
-            defaultValue: commentAtLine.defaultValue,
-            line: commentAtLine.line,
-        };
+        return keyInfoFromComment(context, commentAtLine);
     }
     return undefined;
 }
+function keyInfoFromComment(context, info) {
+    return {
+        keyName: info.keyName,
+        namespace: info.namespace ?? context.options.defaultNamespace,
+        defaultValue: info.defaultValue,
+        line: info.line,
+    };
+}
 function reportKey(context, node, contextNs) {
     const { strictNamespace, defaultNamespace } = context.options;
     const { keys, warnings } = context;
@@ -28,7 +31,7 @@ function reportKey(context, node, contextNs) {
     if (shouldBeIgnored(context, line)) {
         return { keys, warnings };
     }
-    const overrideInfo = keyInfoFromComment(context, node.line);
+    const overrideInfo = commentKeyInfoOnLine(context, node.line);
     if (overrideInfo) {
         // key info is overriten by comment
         keys.push(overrideInfo);
@@ -146,12 +149,7 @@ export function generateReport({ node, contextNs, comments, options, }) {
             context.warnings.push({ line: value.line, warning: value.kind });
         }
         else if (value.type === 'MAGIC_COMMENT' && value.kind === 'key') {
-            context.keys.push({
-                keyName: value.keyName,
-                namespace: value.namespace,
-                defaultValue: value.defaultValue,
-                line: value.line,
-            });
+            context.keys.push(keyInfoFromComment(context, value));
         }
         else if (value.type === 'MAGIC_COMMENT' && value.kind === 'ignore') {
             context.warnings.push({ line: value.line, warning: 'W_UNUSED_IGNORE' });

package/dist/extractor/parser/tokenMergers/stringMerger.js

@@ -1,3 +1,4 @@
+import unescape from 'unescape-js';
 export const stringMerger = {
     initial: 0 /* S.Idle */,
     step: (state, token, end) => {
@@ -8,43 +9,47 @@ export const stringMerger = {
                     return 1 /* S.RegularString */;
                 }
                 else if (type === 'string.teplate.begin') {
-                    return 3 /* S.TemplateString */;
+                    return 2 /* S.TemplateString */;
                 }
                 break;
             case 1 /* S.RegularString */:
                 if (type === 'string.body') {
-                    return 2 /* S.RegularStringEnd */;
+                    return 1 /* S.RegularString */;
                 }
-                else if (type === 'string.end') {
-                    return end.MERGE_ALL;
+                else if (type === 'escaped.character') {
+                    return 1 /* S.RegularString */;
                 }
-                break;
-            case 2 /* S.RegularStringEnd */:
-                if (type === 'string.end') {
+                else if (type === 'string.end') {
                     return end.MERGE_ALL;
                 }
                 break;
-            case 3 /* S.TemplateString */:
+            case 2 /* S.TemplateString */:
                 if (type === 'string.template.body') {
-                    return 4 /* S.TemplateStringEnd */;
+                    return 2 /* S.TemplateString */;
+                }
+                else if (type === 'escaped.character') {
+                    return 2 /* S.TemplateString */;
                 }
                 else if (type === 'string.template.end') {
                     return end.MERGE_ALL;
                 }
                 break;
-            case 4 /* S.TemplateStringEnd */:
-                if (type === 'string.template.end') {
-                    return end.MERGE_ALL;
-                }
         }
     },
     customType: 'string',
     resultToken: (matched) => {
-        if (matched.length === 3) {
-            return matched[1].token;
-        }
-        else {
-            return '';
-        }
+        const escaped = matched
+            .map((t) => {
+            switch (t.customType) {
+                case 'string.template.body':
+                case 'string.body':
+                case 'escaped.character':
+                    return t.token;
+                default:
+                    return '';
+            }
+        })
+            .join('');
+        return unescape(escaped);
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/cli",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "type": "module",
   "description": "A tool to interact with the Tolgee Platform through CLI",
   "repository": {
@@ -37,6 +37,7 @@
     "json5": "^2.2.3",
     "jsonschema": "^1.4.1",
     "openapi-fetch": "^0.9.7",
+    "unescape-js": "^1.1.4",
     "vscode-oniguruma": "^1.7.0",
     "vscode-textmate": "^9.0.0",
     "yauzl": "^2.10.0"