@uxf/scripts 10.0.0-beta.58 → 10.0.0-beta.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/scripts",
-  "version": "10.0.0-beta.58",
+  "version": "10.0.0-beta.75",
   "description": "",
   "main": "index.js",
   "bin": {

package/src/uxf-i18n-namespaces-gen/utils/find-t-function-namespaces.js

@@ -1,15 +1,11 @@
 function findTFunctionNamespaces(pageContent) {
-    const regex = /\bt\("([a-z0-9\-]+):([a-z0-9\-\.]+)"/g;
+    const regex = /\bt\("([a-zA-Z0-9\-]+):([a-zA-Z0-9\-\.]+)"/g;
     const matches = pageContent.matchAll(regex);
     const namespaces = new Set();
 
     for (const match of matches) {
-        const translationKey = match[0];
-        const separatorIndex = translationKey.indexOf(":");
-        if (separatorIndex !== -1) {
-            const namespace = translationKey.substring(3, separatorIndex);
-            namespaces.add(namespace);
-        }
+        const namespace = match[1];
+        namespaces.add(namespace);
     }
 
     return Array.from(namespaces);

package/src/uxf-i18n-namespaces-gen/utils/find-t-function-namespaces.test.js

@@ -4,6 +4,8 @@ const content = `
 <div>
     <div>
         {t("basic:title")}
+        {t("basic-dash:title-dash")}
+        {t("basicCamel:titleCamel")}
     </div>
     <div title={
         condition
@@ -20,6 +22,8 @@ describe("find namespaces in t functions", function () {
     it("should find namespaces", function () {
         expect(findTFunctionNamespaces(content)).toStrictEqual([
             "basic",
+            "basic-dash",
+            "basicCamel",
             "multiline-with-parameters",
             "with-parameters",
             "in-translation-parameter",

package/src/uxf-i18n-namespaces-gen/utils/find-trans-component-namespaces.js

@@ -1,15 +1,11 @@
 function findTransComponentNamespaces(pageContent) {
-    const regex = /<Trans[^>]*?i18nKey=(['"])(.*?)\1[^>]*\/>/g;
+    const regex = /<Trans[^>]*?i18nKey="([a-zA-Z0-9\-]+):([a-zA-Z0-9\-\.]+)"/g;
     const matches = pageContent.matchAll(regex);
     const namespaces = new Set();
 
     for (const match of matches) {
-        const [, , translationKey] = match;
-        const separatorIndex = translationKey.indexOf(":");
-        if (separatorIndex !== -1) {
-            const namespace = translationKey.substring(0, separatorIndex);
-            namespaces.add(namespace);
-        }
+        const namespace = match[1];
+        namespaces.add(namespace);
     }
 
     return Array.from(namespaces);

package/src/uxf-i18n-namespaces-gen/utils/find-trans-component-namespaces.test.js

@@ -3,11 +3,13 @@ const { findTransComponentNamespaces } = require("./find-trans-component-namespa
 const content = `
 <div>
     <Trans i18nKey="basic:title" />
+    <Trans i18nKey="basic-dash:title-dash" />
+    <Trans i18nKey="basicCamel:titleCamel" />
 </div>
 `;
 
 describe("find namespaces in trans component", function () {
     it("should find namespaces", function () {
-        expect(findTransComponentNamespaces(content)).toStrictEqual(["basic"]);
+        expect(findTransComponentNamespaces(content)).toStrictEqual(["basic", "basic-dash", "basicCamel"]);
     });
 });