@lingual/i18n-check 0.7.5 → 0.8.1

package/dist/utils/nextIntlSrcParser.js

@@ -44,7 +44,7 @@ const GET_TRANSLATIONS = "getTranslations";
 const COMMENT_CONTAINS_STATIC_KEY_REGEX = /t\((["'])(.*?[^\\])(["'])\)/;
 const extract = (filesPaths) => {
     return filesPaths.flatMap(getKeys).sort((a, b) => {
-        return a > b ? 1 : -1;
+        return a.key > b.key ? 1 : -1;
     });
 };
 exports.extract = extract;
@@ -67,6 +67,14 @@ const getKeys = (path) => {
     const pushNamespace = (namespace) => {
         namespaces.push(namespace);
     };
+    const setNamespaceAsDynamic = (name) => {
+        namespaces = namespaces.map((namespace) => {
+            if (namespace.name === name) {
+                return { ...namespace, dynamic: true };
+            }
+            return namespace;
+        });
+    };
     const removeNamespaces = (range = 1) => {
         if (namespaces.length > 0) {
             namespaces = namespaces.slice(0, namespaces.length - range);
@@ -74,7 +82,7 @@ const getKeys = (path) => {
     };
     const visit = (node) => {
         let key = null;
-        let current = namespaces.length;
+        let initialNamespacesLength = namespaces.length;
         if (node === undefined) {
             return;
         }
@@ -168,7 +176,7 @@ const getKeys = (path) => {
                             if (key) {
                                 foundKeys.push({
                                     key: inlineNamespace ? `${inlineNamespace}.${key}` : key,
-                                    meta: { file: path },
+                                    meta: { file: path, namespace: inlineNamespace ?? undefined },
                                 });
                             }
                         }
@@ -187,6 +195,12 @@ const getKeys = (path) => {
                 if (argument && ts.isStringLiteral(argument)) {
                     key = { name: argument.text, identifier: expressionName };
                 }
+                else if (argument && ts.isIdentifier(argument)) {
+                    setNamespaceAsDynamic(namespace.name);
+                }
+                else if (argument && ts.isTemplateExpression(argument)) {
+                    setNamespaceAsDynamic(namespace.name);
+                }
             }
         }
         // Search for `t.*()` calls, i.e. t.html() or t.rich()
@@ -201,6 +215,12 @@ const getKeys = (path) => {
                 if (argument && ts.isStringLiteral(argument)) {
                     key = { name: argument.text, identifier: expressionName };
                 }
+                else if (argument && ts.isIdentifier(argument)) {
+                    setNamespaceAsDynamic(namespace.name);
+                }
+                else if (argument && ts.isTemplateExpression(argument)) {
+                    setNamespaceAsDynamic(namespace.name);
+                }
             }
         }
         if (key) {
@@ -208,7 +228,7 @@ const getKeys = (path) => {
             const namespaceName = namespace ? namespace.name : "";
             foundKeys.push({
                 key: namespaceName ? `${namespaceName}.${key.name}` : key.name,
-                meta: { file: path },
+                meta: { file: path, namespace: namespaceName },
             });
         }
         // Search for single-line comments that contain the static values of a dynamic key
@@ -234,15 +254,26 @@ const getKeys = (path) => {
                             key: namespaceName
                                 ? `${namespaceName}.${commentKey}`
                                 : commentKey,
-                            meta: { file: path },
+                            meta: { file: path, namespace: namespaceName },
                         });
                     }
                 }
             });
         }
         ts.forEachChild(node, visit);
-        if (ts.isFunctionLike(node) && namespaces.length > current) {
-            removeNamespaces(namespaces.length - current);
+        if (ts.isFunctionLike(node) &&
+            namespaces.length > initialNamespacesLength) {
+            // check if the namespaces are dynamic and add a placeholder key
+            const currentNamespaces = getCurrentNamespaces(namespaces?.length - initialNamespacesLength);
+            currentNamespaces?.forEach((namespace) => {
+                if (namespace.dynamic) {
+                    foundKeys.push({
+                        key: namespace.name,
+                        meta: { file: path, namespace: namespace.name, dynamic: true },
+                    });
+                }
+            });
+            removeNamespaces(namespaces.length - initialNamespacesLength);
         }
     };
     ts.forEachChild(sourceFile, visit);