Use regex 'positive lookahead' in every join

Author: jedymatt

src/index.ts

@@ -77,29 +77,14 @@ export const getFields = (shape: Record<string, any>) => {
     return undefined;
   })
     .replace(/[": \n]/g, "")
-    // .replace(/\{/g, "(")
-    // .replace(/\}/g, ")")
+    .replace(/\{/g, "(")
+    .replace(/\}/g, ")")
     .slice(1, -1)}`;
 
-  if (Object.keys(joins).length > 0) {
-
-    let joinsModifiedKeys: Record<string, string> = {}
-
-    // Added `{` at the end of every key
-    Object.entries(joins)
-      .forEach(([k, v]) => {
-        joinsModifiedKeys[`${k}{`] = v;
-      });
-
+  if (Object.keys(joins).length > 0) 
     return fields.replace(
-      new RegExp(Object.keys(joinsModifiedKeys).join("|"), "g"),
-      (m) => {
-        let trimKey = m.slice(0, -1); // removed the last `{`
-        return `${trimKey}:${joinsModifiedKeys[m]}(`; // appended the `(`
-      }
-    )
-      .replace(/\{/g, '(')
-      .replace(/\}/g, ')');
-  }
+      new RegExp(Object.keys(joins).map((j) => `${j}(?=\\()`).join("|"), "g"),
+      (m) =>  `${m}:${joins[m]}`
+    );
   return fields;
 };