extract regexp parser for better readability

solarwinds · Aug 31, 2023 · cea568c · cea568c
1 parent aa6d1c1
commit cea568c
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/packages/solarwinds-apm/src/config.ts b/packages/solarwinds-apm/src/config.ts
@@ -52,6 +52,21 @@ const boolean = z.union([
     .transform((b) => b === "true" || b === "1"),
 ])
 
+const regex = z.union([
+  z.instanceof(RegExp),
+  z.string().transform((s, ctx) => {
+    try {
+      return new RegExp(s)
+    } catch (err) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: (err as SyntaxError).message,
+      })
+      return z.NEVER
+    }
+  }),
+])
+
 const serviceKey = z
   .string()
   .includes(":")
@@ -100,20 +115,7 @@ const transactionSettings = z.array(
     .union([
       z.object({
         tracing: tracingMode,
-        regex: z.union([
-          z.instanceof(RegExp),
-          z.string().transform((s, ctx) => {
-            try {
-              return new RegExp(s)
-            } catch (err) {
-              ctx.addIssue({
-                code: z.ZodIssueCode.custom,
-                message: (err as SyntaxError).message,
-              })
-              return z.NEVER
-            }
-          }),
-        ]),
+        regex,
       }),
       z.object({
         tracing: tracingMode,
@@ -234,7 +236,7 @@ export function printError(err: unknown) {
         : // `full.key[0].path`
           path
             .map((p) => (typeof p === "string" ? `.${p}` : `[${p}]`))
-            .join(".")
+            .join("")
             .slice(1)
 
     const formatIssue =