@uxf/scripts 10.0.0-beta.47 → 10.0.0-beta.56

package/package.json

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

package/src/uxf-i18n-namespaces-gen/cli.js

@@ -3,22 +3,24 @@ const { argv, env } = require("process");
 module.exports = async () => {
     const cli = require("yargs")
         .command("$0", "UXF i18n namespaces generator", (yargs) => {
-            yargs.demandCommand(0, 0).usage(`UXF i18n namespaces generator
-Usage:
+            yargs.demandCommand(0, 0).usage(`
+            Usage:
   uxf-i18n-namespaces-gen [options]`);
         })
-        .option("h", { alias: "help", group: "Options" })
+        .option("i", { alias: "include", array: true, default: [] })
+        .option("o", { alias: "output", default: "i18n-pages.json" })
+        .option("h", { alias: "help" })
         .strict(false)
         .exitProcess(false);
 
     try {
-        const { help, ...options } = cli.parse(argv.slice(2));
+        const { help, include, output } = cli.parse(argv.slice(2));
 
         if (Boolean(help)) {
             return 0;
         }
 
-        await require("./index");
+        await require("./index")(include, output);
     } catch (e) {
         console.error(e);
         return 1;

package/src/uxf-i18n-namespaces-gen/index.js

@@ -3,6 +3,8 @@ const madge = require("madge");
 const path = require("path");
 const fs = require("fs");
 const { readFileSync, readdirSync, writeFileSync } = require("fs");
+const { findTFunctionNamespaces } = require("./utils/find-t-function-namespaces");
+const { findTransComponentNamespaces } = require("./utils/find-trans-component-namespaces");
 const join = require("node:path").join;
 
 const INCLUDE = ["src"];
@@ -29,40 +31,6 @@ const walk = (dirPath) => {
     });
 };
 
-const findTFunctionNamespaces = (pageContent) => {
-    const regex = /\bt\("([^:]+):[^"]+"\)/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);
-        }
-    }
-
-    return Array.from(namespaces);
-};
-
-const findTransComponentNamespaces = (pageContent) => {
-    const regex = /<Trans[^>]*?i18nKey=(['"])(.*?)\1[^>]*\/>/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);
-        }
-    }
-
-    return Array.from(namespaces);
-};
-
 const findNamespaces = (pageContent) => {
     const namespaces = [...findTFunctionNamespaces(pageContent), ...findTransComponentNamespaces(pageContent)];
 
@@ -103,10 +71,10 @@ const filePathToRoute = (filePath) => {
     return removeTrailingSlash(route);
 };
 
-function main() {
+function main(includes, output) {
     // Negative lookahead – ignore searching for any files
     // that aren't part of our include list
-    const searchDirs = new RegExp(`^(?!(${INCLUDE.join("|")}))`, "i");
+    const searchDirs = new RegExp(`^(?!(${[...INCLUDE, includes].join("|")}))`, "i");
 
     const pages = walk("src/pages").flat(Number.POSITIVE_INFINITY);
 
@@ -140,14 +108,10 @@ function main() {
             }
         }
 
-        writeFileSync(path.resolve(process.cwd(), "i18n-pages.json"), JSON.stringify(result, null, 4));
+        writeFileSync(path.resolve(process.cwd(), output), JSON.stringify(result, null, 4));
 
         console.log("Namespaces generated!");
     });
 }
 
-try {
-    main();
-} catch (e) {
-    console.error("Error:", e);
-}
+module.exports = main;

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

@@ -0,0 +1,20 @@
+function findTFunctionNamespaces(pageContent) {
+    const regex = /\bt\("([^:]+):[^"]+"/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);
+        }
+    }
+
+    return Array.from(namespaces);
+}
+
+module.exports = {
+    findTFunctionNamespaces,
+};

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

@@ -0,0 +1,28 @@
+const { findTFunctionNamespaces } = require("./find-t-function-namespaces");
+
+const content = `
+<div>
+    <div>
+        {t("basic:title")}
+    </div>
+    <div title={
+        condition
+            ? 'title'
+            : t("multiline-with-parameters:title", {
+                param: 1
+            })
+    }/>
+    {t("with-parameters:title", {a: t("in-translation-parameter:title")})}
+</div>
+`;
+
+describe("find namespaces in t functions", function () {
+    it("should find namespaces", function () {
+        expect(findTFunctionNamespaces(content)).toStrictEqual([
+            "basic",
+            "multiline-with-parameters",
+            "with-parameters",
+            "in-translation-parameter",
+        ]);
+    });
+});

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

@@ -0,0 +1,18 @@
+function findTransComponentNamespaces(pageContent) {
+    const regex = /<Trans[^>]*?i18nKey=(['"])(.*?)\1[^>]*\/>/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);
+        }
+    }
+
+    return Array.from(namespaces);
+}
+
+module.exports = { findTransComponentNamespaces };

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

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