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

package/package.json

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

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

@@ -9,18 +9,21 @@ module.exports = async () => {
         })
         .option("i", { alias: "include", array: true, default: [] })
         .option("o", { alias: "output", default: "i18n-pages.json" })
+        .option("n", { alias: "defaultNamespace", array: true, default: ["common"] })
+        .option("p", { alias: "pagesDirectory", default: "src/pages" })
+        .option("e", { alias: "fileExtension", array: true, default: ["ts", "tsx"] })
         .option("h", { alias: "help" })
         .strict(false)
         .exitProcess(false);
 
     try {
-        const { help, include, output } = cli.parse(argv.slice(2));
+        const { help, include, output, defaultNamespace, pagesDirectory, fileExtension } = cli.parse(argv.slice(2));
 
         if (Boolean(help)) {
             return 0;
         }
 
-        await require("./index")(include, output);
+        await require("./index")(include, output, defaultNamespace, pagesDirectory, fileExtension);
     } catch (e) {
         console.error(e);
         return 1;

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

@@ -7,16 +7,9 @@ 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"];
-const EXCLUDE = [];
-
-const FILE_EXTENSIONS = ["ts", "tsx"];
-
 const TS_CONFIG_PATH = path.resolve(process.cwd(), "tsconfig.json");
 const TS_CONFIG = fs.existsSync(TS_CONFIG_PATH) ? TS_CONFIG_PATH : undefined;
 
-const result = { "*": ["common"] };
-
 function removeTrailingSlash(str) {
     return str.replace(/\/$/, "");
 }
@@ -71,17 +64,25 @@ const filePathToRoute = (filePath) => {
     return removeTrailingSlash(route);
 };
 
-function main(includes, output) {
+/**
+ * @param include string[]
+ * @param output string
+ * @param defaultNamespaces string[]
+ * @param pagesDirectory string
+ * @param fileExtensions string[]
+ */
+function main(include, output, defaultNamespaces, pagesDirectory, fileExtensions) {
+    const result = { "*": defaultNamespaces };
     // Negative lookahead – ignore searching for any files
     // that aren't part of our include list
-    const searchDirs = new RegExp(`^(?!(${[...INCLUDE, includes].join("|")}))`, "i");
+    const searchDirs = new RegExp(`^(?!(${include.join("|")}))`, "i");
 
-    const pages = walk("src/pages").flat(Number.POSITIVE_INFINITY);
+    const pages = walk(pagesDirectory).flat(Number.POSITIVE_INFINITY);
 
     madge(process.cwd(), {
         tsConfig: TS_CONFIG,
-        excludeRegExp: [searchDirs, ...EXCLUDE],
-        fileExtensions: FILE_EXTENSIONS,
+        excludeRegExp: [searchDirs],
+        fileExtensions: fileExtensions,
     }).then((res) => {
         const tree = res.obj();
 

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"]);
     });
 });