@tolgee/cli 2.1.1 → 2.1.2

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 ?? context.options.defaultNamespace,
-            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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/cli",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "type": "module",
   "description": "A tool to interact with the Tolgee Platform through CLI",
   "repository": {