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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/scripts",
-  "version": "10.0.0-beta.49",
+  "version": "10.0.0-beta.57",
   "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

@@ -71,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);
 
@@ -108,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

@@ -1,5 +1,5 @@
 function findTFunctionNamespaces(pageContent) {
-    const regex = /\bt\("([^:]+):[^"]+"/g;
+    const regex = /\bt\("([a-z0-9\-]+):([a-z0-9\-\.]+)"/g;
     const matches = pageContent.matchAll(regex);
     const namespaces = new Set();
 

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

@@ -25,4 +25,20 @@ describe("find namespaces in t functions", function () {
             "in-translation-parameter",
         ]);
     });
+
+    it("should ignore old translations (without namespace)", function () {
+        expect(
+            findTFunctionNamespaces(`
+if (minutesDiff === 0) {
+        return t("datetime.format.rightNow");
+} else if (minutesDiff > 0 && minutesDiff < 60) {
+    return t("datetime.format.beforeMinutes", { count: minutesDiff });
+} else if (hoursDiff > 0 && hoursDiff < 24) {
+    return t("datetime.format.beforeHours", { count: hoursDiff });
+} else if (daysDiff === 1) {
+    return t("datetime.format.yesterdayAt", { time: date.format("LT") });
+}
+`),
+        ).toStrictEqual([]);
+    });
 });