fix(VaConfig): correctly copy regex values

epicmaxco · Jun 27, 2024 · b9d0fcc · b9d0fcc
1 parent 9349d36
commit b9d0fcc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/packages/ui/src/utils/clone-deep.ts b/packages/ui/src/utils/clone-deep.ts
@@ -15,6 +15,18 @@ export const cloneDeep = <T>(source: T): T => {
     return new Date(source.getTime()) as any
   }
 
+  if (source instanceof RegExp) {
+    return new RegExp(source.source, source.flags) as any
+  }
+
+  if (source instanceof Map) {
+    return new Map(Array.from(source.entries()).map(([key, value]) => [key, cloneDeep(value)])) as any
+  }
+
+  if (source instanceof Set) {
+    return new Set(Array.from(source.values()).map(cloneDeep)) as any
+  }
+
   if (isObject(source)) {
     return Object.keys(source).reduce((acc, key) => {
       acc[key] = cloneDeep(source[key as keyof T])

diff --git a/packages/ui/src/utils/merge-deep.ts b/packages/ui/src/utils/merge-deep.ts
@@ -13,7 +13,9 @@ export const mergeDeep = (target: any, source: any): any => {
     const targetValue = target[key]
     const sourceValue = source[key]
 
-    if (isObject(targetValue) && isObject(sourceValue)) {
+    if (sourceValue instanceof RegExp || sourceValue instanceof Date) {
+      target[key] = sourceValue
+    } else if (isObject(targetValue) && isObject(sourceValue)) {
       target[key] = mergeDeep(Object.create(
         Object.getPrototypeOf(targetValue),
         Object.getOwnPropertyDescriptors(targetValue),