From b61f442a155da248e729a1a9b5c85ef3bc1a9201 Mon Sep 17 00:00:00 2001
From: Joseph Garrone <joseph.garrone.gj@gmail.com>
Date: Tue, 7 May 2024 18:10:22 +0200
Subject: [PATCH] Update readFieldNameUsage for new messagePerField methods

---
 .../generateTheme/readFieldNameUsage.ts       | 41 +++++++++++++++----
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/bin/keycloakify/generateTheme/readFieldNameUsage.ts b/src/bin/keycloakify/generateTheme/readFieldNameUsage.ts
index b30a7a7c..e51c002e 100644
--- a/src/bin/keycloakify/generateTheme/readFieldNameUsage.ts
+++ b/src/bin/keycloakify/generateTheme/readFieldNameUsage.ts
@@ -1,5 +1,4 @@
 import { crawl } from "../../tools/crawl";
-import { removeDuplicates } from "evt/tools/reducers/removeDuplicates";
 import { join as pathJoin } from "path";
 import * as fs from "fs";
 import type { ThemeType } from "../../constants";
@@ -8,7 +7,7 @@ import type { ThemeType } from "../../constants";
 export function readFieldNameUsage(params: { keycloakifySrcDirPath: string; themeSrcDirPath: string; themeType: ThemeType }): string[] {
     const { keycloakifySrcDirPath, themeSrcDirPath, themeType } = params;
 
-    const fieldNames: string[] = [];
+    const fieldNames = new Set<string>();
 
     for (const srcDirPath of [pathJoin(keycloakifySrcDirPath, themeType), pathJoin(themeSrcDirPath, themeType)]) {
         const filePaths = crawl({ "dirPath": srcDirPath, "returnedPathsType": "absolute" }).filter(filePath => /\.(ts|tsx|js|jsx)$/.test(filePath));
@@ -20,13 +19,39 @@ export function readFieldNameUsage(params: { keycloakifySrcDirPath: string; them
                 continue;
             }
 
-            fieldNames.push(
-                ...Array.from(rawSourceFile.matchAll(/(?:(?:printIfExists)|(?:existsError)|(?:get)|(?:exists))\(\s*["']([^"']+)["']/g), m => m[1])
-            );
+            for (const functionName of ["printIfExists", "existsError", "get", "exists", "getFirstError"] as const) {
+                if (!rawSourceFile.includes(functionName)) {
+                    continue;
+                }
+
+                try {
+                    rawSourceFile
+                        .split(functionName)
+                        .filter(part => part.startsWith("("))
+                        .map(part => {
+                            let [p1] = part.split(")");
+
+                            p1 = p1.slice(1);
+
+                            return p1;
+                        })
+                        .map(part => {
+                            console.log(part);
+
+                            return part
+                                .split(",")
+                                .map(a => a.trim())
+                                .filter((...[, i]) => (functionName !== "printIfExists" ? true : i === 0))
+                                .filter(a => a.startsWith('"') || a.startsWith("'") || a.startsWith("`"))
+                                .filter(a => a.endsWith('"') || a.endsWith("'") || a.endsWith("`"))
+                                .map(a => a.slice(1).slice(0, -1));
+                        })
+                        .flat()
+                        .forEach(fieldName => fieldNames.add(fieldName));
+                } catch {}
+            }
         }
     }
 
-    const out = fieldNames.reduce(...removeDuplicates<string>());
-
-    return out;
+    return Array.from(fieldNames);
 }