@tanstack/form-core 0.42.0 → 0.42.1

package/dist/cjs/mergeForm.cjs

@@ -1,22 +1,46 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+function isValidKey(key) {
+  const dangerousProps = ["__proto__", "constructor", "prototype"];
+  return !dangerousProps.includes(String(key));
+}
 function mutateMergeDeep(target, source) {
+  if (target === null || target === void 0 || typeof target !== "object")
+    return {};
+  if (source === null || source === void 0 || typeof source !== "object")
+    return target;
   const targetKeys = Object.keys(target);
   const sourceKeys = Object.keys(source);
   const keySet = /* @__PURE__ */ new Set([...targetKeys, ...sourceKeys]);
   for (const key of keySet) {
+    if (!isValidKey(key)) continue;
     const targetKey = key;
     const sourceKey = key;
-    if (Array.isArray(target[targetKey]) && Array.isArray(source[sourceKey])) {
-      target[targetKey] = source[sourceKey];
-    } else if (typeof target[targetKey] === "object" && typeof source[sourceKey] === "object") {
-      mutateMergeDeep(target[targetKey], source[sourceKey]);
-    } else {
-      if (!(sourceKey in source) && source[sourceKey] === void 0) {
-        continue;
-      }
-      target[targetKey] = source[sourceKey];
+    if (!Object.hasOwn(source, sourceKey)) continue;
+    const sourceValue = source[sourceKey];
+    const targetValue = target[targetKey];
+    if (Array.isArray(targetValue) && Array.isArray(sourceValue)) {
+      Object.defineProperty(target, key, {
+        value: [...sourceValue],
+        enumerable: true,
+        writable: true,
+        configurable: true
+      });
+      continue;
+    }
+    const isTargetObj = typeof targetValue === "object" && targetValue !== null;
+    const isSourceObj = typeof sourceValue === "object" && sourceValue !== null;
+    const areObjects = isTargetObj && isSourceObj && !Array.isArray(targetValue) && !Array.isArray(sourceValue);
+    if (areObjects) {
+      mutateMergeDeep(targetValue, sourceValue);
+      continue;
     }
+    Object.defineProperty(target, key, {
+      value: sourceValue,
+      enumerable: true,
+      writable: true,
+      configurable: true
+    });
   }
   return target;
 }

package/dist/cjs/mergeForm.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"mergeForm.cjs","sources":["../../src/mergeForm.ts"],"sourcesContent":["import type { FormApi } from './FormApi'\nimport type { Validator } from './types'\nimport type { NoInfer } from './util-types'\n\n/**\n * @private\n */\nexport function mutateMergeDeep(target: object, source: object): object {\n  const targetKeys = Object.keys(target)\n  const sourceKeys = Object.keys(source)\n  const keySet = new Set([...targetKeys, ...sourceKeys])\n  for (const key of keySet) {\n    const targetKey = key as never as keyof typeof target\n    const sourceKey = key as never as keyof typeof source\n\n    if (Array.isArray(target[targetKey]) && Array.isArray(source[sourceKey])) {\n      // always use the source array to prevent array fields from multiplying\n      target[targetKey] = source[sourceKey] as [] as never\n    } else if (\n      typeof target[targetKey] === 'object' &&\n      typeof source[sourceKey] === 'object'\n    ) {\n      mutateMergeDeep(target[targetKey] as {}, source[sourceKey] as {})\n    } else {\n      // Prevent assigning undefined to target, only if undefined is not explicitly set on source\n      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n      if (!(sourceKey in source) && source[sourceKey] === undefined) {\n        continue\n      }\n      target[targetKey] = source[sourceKey] as never\n    }\n  }\n  return target\n}\n\nexport function mergeForm<\n  TFormData,\n  TFormValidator extends Validator<TFormData, unknown> | undefined = undefined,\n>(\n  baseForm: FormApi<NoInfer<TFormData>, NoInfer<TFormValidator>>,\n  state: Partial<FormApi<TFormData, TFormValidator>['state']>,\n) {\n  mutateMergeDeep(baseForm.state, state)\n  return baseForm\n}\n"],"names":[],"mappings":";;AAOgB,SAAA,gBAAgB,QAAgB,QAAwB;AAChE,QAAA,aAAa,OAAO,KAAK,MAAM;AAC/B,QAAA,aAAa,OAAO,KAAK,MAAM;AAC/B,QAAA,6BAAa,IAAI,CAAC,GAAG,YAAY,GAAG,UAAU,CAAC;AACrD,aAAW,OAAO,QAAQ;AACxB,UAAM,YAAY;AAClB,UAAM,YAAY;AAEd,QAAA,MAAM,QAAQ,OAAO,SAAS,CAAC,KAAK,MAAM,QAAQ,OAAO,SAAS,CAAC,GAAG;AAEjE,aAAA,SAAS,IAAI,OAAO,SAAS;AAAA,IAAA,WAEpC,OAAO,OAAO,SAAS,MAAM,YAC7B,OAAO,OAAO,SAAS,MAAM,UAC7B;AACA,sBAAgB,OAAO,SAAS,GAAS,OAAO,SAAS,CAAO;AAAA,IAAA,OAC3D;AAGL,UAAI,EAAE,aAAa,WAAW,OAAO,SAAS,MAAM,QAAW;AAC7D;AAAA,MAAA;AAEK,aAAA,SAAS,IAAI,OAAO,SAAS;AAAA,IAAA;AAAA,EACtC;AAEK,SAAA;AACT;AAEgB,SAAA,UAId,UACA,OACA;AACgB,kBAAA,SAAS,OAAO,KAAK;AAC9B,SAAA;AACT;;;"}
+{"version":3,"file":"mergeForm.cjs","sources":["../../src/mergeForm.ts"],"sourcesContent":["import type { FormApi } from './FormApi'\nimport type { Validator } from './types'\nimport type { NoInfer } from './util-types'\n\nfunction isValidKey(key: string | number | symbol): boolean {\n  const dangerousProps = ['__proto__', 'constructor', 'prototype']\n  return !dangerousProps.includes(String(key))\n}\n\n/**\n * @private\n */\nexport function mutateMergeDeep(\n  target: object | null | undefined,\n  source: object | null | undefined,\n): object {\n  // Early return if either is not an object\n  if (target === null || target === undefined || typeof target !== 'object')\n    return {} as object\n  if (source === null || source === undefined || typeof source !== 'object')\n    return target\n\n  const targetKeys = Object.keys(target)\n  const sourceKeys = Object.keys(source)\n  const keySet = new Set([...targetKeys, ...sourceKeys])\n\n  for (const key of keySet) {\n    if (!isValidKey(key)) continue\n\n    const targetKey = key as keyof typeof target\n    const sourceKey = key as keyof typeof source\n\n    if (!Object.hasOwn(source, sourceKey)) continue\n\n    const sourceValue = source[sourceKey] as unknown\n    const targetValue = target[targetKey] as unknown\n\n    // Handle arrays\n    if (Array.isArray(targetValue) && Array.isArray(sourceValue)) {\n      Object.defineProperty(target, key, {\n        value: [...sourceValue],\n        enumerable: true,\n        writable: true,\n        configurable: true,\n      })\n      continue\n    }\n\n    // Handle nested objects (type assertion to satisfy ESLint)\n    const isTargetObj = typeof targetValue === 'object' && targetValue !== null\n    const isSourceObj = typeof sourceValue === 'object' && sourceValue !== null\n    const areObjects =\n      isTargetObj &&\n      isSourceObj &&\n      !Array.isArray(targetValue) &&\n      !Array.isArray(sourceValue)\n\n    if (areObjects) {\n      mutateMergeDeep(targetValue as object, sourceValue as object)\n      continue\n    }\n\n    // Handle all other cases\n    Object.defineProperty(target, key, {\n      value: sourceValue,\n      enumerable: true,\n      writable: true,\n      configurable: true,\n    })\n  }\n\n  return target\n}\n\nexport function mergeForm<\n  TFormData,\n  TFormValidator extends Validator<TFormData, unknown> | undefined = undefined,\n>(\n  baseForm: FormApi<NoInfer<TFormData>, NoInfer<TFormValidator>>,\n  state: Partial<FormApi<TFormData, TFormValidator>['state']>,\n) {\n  mutateMergeDeep(baseForm.state, state)\n  return baseForm\n}\n"],"names":[],"mappings":";;AAIA,SAAS,WAAW,KAAwC;AAC1D,QAAM,iBAAiB,CAAC,aAAa,eAAe,WAAW;AAC/D,SAAO,CAAC,eAAe,SAAS,OAAO,GAAG,CAAC;AAC7C;AAKgB,SAAA,gBACd,QACA,QACQ;AAER,MAAI,WAAW,QAAQ,WAAW,UAAa,OAAO,WAAW;AAC/D,WAAO,CAAC;AACV,MAAI,WAAW,QAAQ,WAAW,UAAa,OAAO,WAAW;AACxD,WAAA;AAEH,QAAA,aAAa,OAAO,KAAK,MAAM;AAC/B,QAAA,aAAa,OAAO,KAAK,MAAM;AAC/B,QAAA,6BAAa,IAAI,CAAC,GAAG,YAAY,GAAG,UAAU,CAAC;AAErD,aAAW,OAAO,QAAQ;AACpB,QAAA,CAAC,WAAW,GAAG,EAAG;AAEtB,UAAM,YAAY;AAClB,UAAM,YAAY;AAElB,QAAI,CAAC,OAAO,OAAO,QAAQ,SAAS,EAAG;AAEjC,UAAA,cAAc,OAAO,SAAS;AAC9B,UAAA,cAAc,OAAO,SAAS;AAGpC,QAAI,MAAM,QAAQ,WAAW,KAAK,MAAM,QAAQ,WAAW,GAAG;AACrD,aAAA,eAAe,QAAQ,KAAK;AAAA,QACjC,OAAO,CAAC,GAAG,WAAW;AAAA,QACtB,YAAY;AAAA,QACZ,UAAU;AAAA,QACV,cAAc;AAAA,MAAA,CACf;AACD;AAAA,IAAA;AAIF,UAAM,cAAc,OAAO,gBAAgB,YAAY,gBAAgB;AACvE,UAAM,cAAc,OAAO,gBAAgB,YAAY,gBAAgB;AACjE,UAAA,aACJ,eACA,eACA,CAAC,MAAM,QAAQ,WAAW,KAC1B,CAAC,MAAM,QAAQ,WAAW;AAE5B,QAAI,YAAY;AACd,sBAAgB,aAAuB,WAAqB;AAC5D;AAAA,IAAA;AAIK,WAAA,eAAe,QAAQ,KAAK;AAAA,MACjC,OAAO;AAAA,MACP,YAAY;AAAA,MACZ,UAAU;AAAA,MACV,cAAc;AAAA,IAAA,CACf;AAAA,EAAA;AAGI,SAAA;AACT;AAEgB,SAAA,UAId,UACA,OACA;AACgB,kBAAA,SAAS,OAAO,KAAK;AAC9B,SAAA;AACT;;;"}

package/dist/cjs/mergeForm.d.cts

@@ -4,5 +4,5 @@ import { NoInfer } from './util-types.cjs';
 /**
  * @private
  */
-export declare function mutateMergeDeep(target: object, source: object): object;
+export declare function mutateMergeDeep(target: object | null | undefined, source: object | null | undefined): object;
 export declare function mergeForm<TFormData, TFormValidator extends Validator<TFormData, unknown> | undefined = undefined>(baseForm: FormApi<NoInfer<TFormData>, NoInfer<TFormValidator>>, state: Partial<FormApi<TFormData, TFormValidator>['state']>): FormApi<NoInfer<TFormData>, NoInfer<TFormValidator>>;

package/dist/esm/mergeForm.d.ts

@@ -4,5 +4,5 @@ import { NoInfer } from './util-types.js';
 /**
  * @private
  */
-export declare function mutateMergeDeep(target: object, source: object): object;
+export declare function mutateMergeDeep(target: object | null | undefined, source: object | null | undefined): object;
 export declare function mergeForm<TFormData, TFormValidator extends Validator<TFormData, unknown> | undefined = undefined>(baseForm: FormApi<NoInfer<TFormData>, NoInfer<TFormValidator>>, state: Partial<FormApi<TFormData, TFormValidator>['state']>): FormApi<NoInfer<TFormData>, NoInfer<TFormValidator>>;

package/dist/esm/mergeForm.js

@@ -1,20 +1,44 @@
+function isValidKey(key) {
+  const dangerousProps = ["__proto__", "constructor", "prototype"];
+  return !dangerousProps.includes(String(key));
+}
 function mutateMergeDeep(target, source) {
+  if (target === null || target === void 0 || typeof target !== "object")
+    return {};
+  if (source === null || source === void 0 || typeof source !== "object")
+    return target;
   const targetKeys = Object.keys(target);
   const sourceKeys = Object.keys(source);
   const keySet = /* @__PURE__ */ new Set([...targetKeys, ...sourceKeys]);
   for (const key of keySet) {
+    if (!isValidKey(key)) continue;
     const targetKey = key;
     const sourceKey = key;
-    if (Array.isArray(target[targetKey]) && Array.isArray(source[sourceKey])) {
-      target[targetKey] = source[sourceKey];
-    } else if (typeof target[targetKey] === "object" && typeof source[sourceKey] === "object") {
-      mutateMergeDeep(target[targetKey], source[sourceKey]);
-    } else {
-      if (!(sourceKey in source) && source[sourceKey] === void 0) {
-        continue;
-      }
-      target[targetKey] = source[sourceKey];
+    if (!Object.hasOwn(source, sourceKey)) continue;
+    const sourceValue = source[sourceKey];
+    const targetValue = target[targetKey];
+    if (Array.isArray(targetValue) && Array.isArray(sourceValue)) {
+      Object.defineProperty(target, key, {
+        value: [...sourceValue],
+        enumerable: true,
+        writable: true,
+        configurable: true
+      });
+      continue;
+    }
+    const isTargetObj = typeof targetValue === "object" && targetValue !== null;
+    const isSourceObj = typeof sourceValue === "object" && sourceValue !== null;
+    const areObjects = isTargetObj && isSourceObj && !Array.isArray(targetValue) && !Array.isArray(sourceValue);
+    if (areObjects) {
+      mutateMergeDeep(targetValue, sourceValue);
+      continue;
     }
+    Object.defineProperty(target, key, {
+      value: sourceValue,
+      enumerable: true,
+      writable: true,
+      configurable: true
+    });
   }
   return target;
 }

package/dist/esm/mergeForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergeForm.js","sources":["../../src/mergeForm.ts"],"sourcesContent":["import type { FormApi } from './FormApi'\nimport type { Validator } from './types'\nimport type { NoInfer } from './util-types'\n\n/**\n * @private\n */\nexport function mutateMergeDeep(target: object, source: object): object {\n  const targetKeys = Object.keys(target)\n  const sourceKeys = Object.keys(source)\n  const keySet = new Set([...targetKeys, ...sourceKeys])\n  for (const key of keySet) {\n    const targetKey = key as never as keyof typeof target\n    const sourceKey = key as never as keyof typeof source\n\n    if (Array.isArray(target[targetKey]) && Array.isArray(source[sourceKey])) {\n      // always use the source array to prevent array fields from multiplying\n      target[targetKey] = source[sourceKey] as [] as never\n    } else if (\n      typeof target[targetKey] === 'object' &&\n      typeof source[sourceKey] === 'object'\n    ) {\n      mutateMergeDeep(target[targetKey] as {}, source[sourceKey] as {})\n    } else {\n      // Prevent assigning undefined to target, only if undefined is not explicitly set on source\n      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n      if (!(sourceKey in source) && source[sourceKey] === undefined) {\n        continue\n      }\n      target[targetKey] = source[sourceKey] as never\n    }\n  }\n  return target\n}\n\nexport function mergeForm<\n  TFormData,\n  TFormValidator extends Validator<TFormData, unknown> | undefined = undefined,\n>(\n  baseForm: FormApi<NoInfer<TFormData>, NoInfer<TFormValidator>>,\n  state: Partial<FormApi<TFormData, TFormValidator>['state']>,\n) {\n  mutateMergeDeep(baseForm.state, state)\n  return baseForm\n}\n"],"names":[],"mappings":"AAOgB,SAAA,gBAAgB,QAAgB,QAAwB;AAChE,QAAA,aAAa,OAAO,KAAK,MAAM;AAC/B,QAAA,aAAa,OAAO,KAAK,MAAM;AAC/B,QAAA,6BAAa,IAAI,CAAC,GAAG,YAAY,GAAG,UAAU,CAAC;AACrD,aAAW,OAAO,QAAQ;AACxB,UAAM,YAAY;AAClB,UAAM,YAAY;AAEd,QAAA,MAAM,QAAQ,OAAO,SAAS,CAAC,KAAK,MAAM,QAAQ,OAAO,SAAS,CAAC,GAAG;AAEjE,aAAA,SAAS,IAAI,OAAO,SAAS;AAAA,IAAA,WAEpC,OAAO,OAAO,SAAS,MAAM,YAC7B,OAAO,OAAO,SAAS,MAAM,UAC7B;AACA,sBAAgB,OAAO,SAAS,GAAS,OAAO,SAAS,CAAO;AAAA,IAAA,OAC3D;AAGL,UAAI,EAAE,aAAa,WAAW,OAAO,SAAS,MAAM,QAAW;AAC7D;AAAA,MAAA;AAEK,aAAA,SAAS,IAAI,OAAO,SAAS;AAAA,IAAA;AAAA,EACtC;AAEK,SAAA;AACT;AAEgB,SAAA,UAId,UACA,OACA;AACgB,kBAAA,SAAS,OAAO,KAAK;AAC9B,SAAA;AACT;"}
+{"version":3,"file":"mergeForm.js","sources":["../../src/mergeForm.ts"],"sourcesContent":["import type { FormApi } from './FormApi'\nimport type { Validator } from './types'\nimport type { NoInfer } from './util-types'\n\nfunction isValidKey(key: string | number | symbol): boolean {\n  const dangerousProps = ['__proto__', 'constructor', 'prototype']\n  return !dangerousProps.includes(String(key))\n}\n\n/**\n * @private\n */\nexport function mutateMergeDeep(\n  target: object | null | undefined,\n  source: object | null | undefined,\n): object {\n  // Early return if either is not an object\n  if (target === null || target === undefined || typeof target !== 'object')\n    return {} as object\n  if (source === null || source === undefined || typeof source !== 'object')\n    return target\n\n  const targetKeys = Object.keys(target)\n  const sourceKeys = Object.keys(source)\n  const keySet = new Set([...targetKeys, ...sourceKeys])\n\n  for (const key of keySet) {\n    if (!isValidKey(key)) continue\n\n    const targetKey = key as keyof typeof target\n    const sourceKey = key as keyof typeof source\n\n    if (!Object.hasOwn(source, sourceKey)) continue\n\n    const sourceValue = source[sourceKey] as unknown\n    const targetValue = target[targetKey] as unknown\n\n    // Handle arrays\n    if (Array.isArray(targetValue) && Array.isArray(sourceValue)) {\n      Object.defineProperty(target, key, {\n        value: [...sourceValue],\n        enumerable: true,\n        writable: true,\n        configurable: true,\n      })\n      continue\n    }\n\n    // Handle nested objects (type assertion to satisfy ESLint)\n    const isTargetObj = typeof targetValue === 'object' && targetValue !== null\n    const isSourceObj = typeof sourceValue === 'object' && sourceValue !== null\n    const areObjects =\n      isTargetObj &&\n      isSourceObj &&\n      !Array.isArray(targetValue) &&\n      !Array.isArray(sourceValue)\n\n    if (areObjects) {\n      mutateMergeDeep(targetValue as object, sourceValue as object)\n      continue\n    }\n\n    // Handle all other cases\n    Object.defineProperty(target, key, {\n      value: sourceValue,\n      enumerable: true,\n      writable: true,\n      configurable: true,\n    })\n  }\n\n  return target\n}\n\nexport function mergeForm<\n  TFormData,\n  TFormValidator extends Validator<TFormData, unknown> | undefined = undefined,\n>(\n  baseForm: FormApi<NoInfer<TFormData>, NoInfer<TFormValidator>>,\n  state: Partial<FormApi<TFormData, TFormValidator>['state']>,\n) {\n  mutateMergeDeep(baseForm.state, state)\n  return baseForm\n}\n"],"names":[],"mappings":"AAIA,SAAS,WAAW,KAAwC;AAC1D,QAAM,iBAAiB,CAAC,aAAa,eAAe,WAAW;AAC/D,SAAO,CAAC,eAAe,SAAS,OAAO,GAAG,CAAC;AAC7C;AAKgB,SAAA,gBACd,QACA,QACQ;AAER,MAAI,WAAW,QAAQ,WAAW,UAAa,OAAO,WAAW;AAC/D,WAAO,CAAC;AACV,MAAI,WAAW,QAAQ,WAAW,UAAa,OAAO,WAAW;AACxD,WAAA;AAEH,QAAA,aAAa,OAAO,KAAK,MAAM;AAC/B,QAAA,aAAa,OAAO,KAAK,MAAM;AAC/B,QAAA,6BAAa,IAAI,CAAC,GAAG,YAAY,GAAG,UAAU,CAAC;AAErD,aAAW,OAAO,QAAQ;AACpB,QAAA,CAAC,WAAW,GAAG,EAAG;AAEtB,UAAM,YAAY;AAClB,UAAM,YAAY;AAElB,QAAI,CAAC,OAAO,OAAO,QAAQ,SAAS,EAAG;AAEjC,UAAA,cAAc,OAAO,SAAS;AAC9B,UAAA,cAAc,OAAO,SAAS;AAGpC,QAAI,MAAM,QAAQ,WAAW,KAAK,MAAM,QAAQ,WAAW,GAAG;AACrD,aAAA,eAAe,QAAQ,KAAK;AAAA,QACjC,OAAO,CAAC,GAAG,WAAW;AAAA,QACtB,YAAY;AAAA,QACZ,UAAU;AAAA,QACV,cAAc;AAAA,MAAA,CACf;AACD;AAAA,IAAA;AAIF,UAAM,cAAc,OAAO,gBAAgB,YAAY,gBAAgB;AACvE,UAAM,cAAc,OAAO,gBAAgB,YAAY,gBAAgB;AACjE,UAAA,aACJ,eACA,eACA,CAAC,MAAM,QAAQ,WAAW,KAC1B,CAAC,MAAM,QAAQ,WAAW;AAE5B,QAAI,YAAY;AACd,sBAAgB,aAAuB,WAAqB;AAC5D;AAAA,IAAA;AAIK,WAAA,eAAe,QAAQ,KAAK;AAAA,MACjC,OAAO;AAAA,MACP,YAAY;AAAA,MACZ,UAAU;AAAA,MACV,cAAc;AAAA,IAAA,CACf;AAAA,EAAA;AAGI,SAAA;AACT;AAEgB,SAAA,UAId,UACA,OACA;AACgB,kBAAA,SAAS,OAAO,KAAK;AAC9B,SAAA;AACT;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/form-core",
-  "version": "0.42.0",
+  "version": "0.42.1",
   "description": "Powerful, type-safe, framework agnostic forms.",
   "author": "tannerlinsley",
   "license": "MIT",

package/src/mergeForm.ts

@@ -2,34 +2,73 @@ import type { FormApi } from './FormApi'
 import type { Validator } from './types'
 import type { NoInfer } from './util-types'
 
+function isValidKey(key: string | number | symbol): boolean {
+  const dangerousProps = ['__proto__', 'constructor', 'prototype']
+  return !dangerousProps.includes(String(key))
+}
+
 /**
  * @private
  */
-export function mutateMergeDeep(target: object, source: object): object {
+export function mutateMergeDeep(
+  target: object | null | undefined,
+  source: object | null | undefined,
+): object {
+  // Early return if either is not an object
+  if (target === null || target === undefined || typeof target !== 'object')
+    return {} as object
+  if (source === null || source === undefined || typeof source !== 'object')
+    return target
+
   const targetKeys = Object.keys(target)
   const sourceKeys = Object.keys(source)
   const keySet = new Set([...targetKeys, ...sourceKeys])
+
   for (const key of keySet) {
-    const targetKey = key as never as keyof typeof target
-    const sourceKey = key as never as keyof typeof source
-
-    if (Array.isArray(target[targetKey]) && Array.isArray(source[sourceKey])) {
-      // always use the source array to prevent array fields from multiplying
-      target[targetKey] = source[sourceKey] as [] as never
-    } else if (
-      typeof target[targetKey] === 'object' &&
-      typeof source[sourceKey] === 'object'
-    ) {
-      mutateMergeDeep(target[targetKey] as {}, source[sourceKey] as {})
-    } else {
-      // Prevent assigning undefined to target, only if undefined is not explicitly set on source
-      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-      if (!(sourceKey in source) && source[sourceKey] === undefined) {
-        continue
-      }
-      target[targetKey] = source[sourceKey] as never
+    if (!isValidKey(key)) continue
+
+    const targetKey = key as keyof typeof target
+    const sourceKey = key as keyof typeof source
+
+    if (!Object.hasOwn(source, sourceKey)) continue
+
+    const sourceValue = source[sourceKey] as unknown
+    const targetValue = target[targetKey] as unknown
+
+    // Handle arrays
+    if (Array.isArray(targetValue) && Array.isArray(sourceValue)) {
+      Object.defineProperty(target, key, {
+        value: [...sourceValue],
+        enumerable: true,
+        writable: true,
+        configurable: true,
+      })
+      continue
+    }
+
+    // Handle nested objects (type assertion to satisfy ESLint)
+    const isTargetObj = typeof targetValue === 'object' && targetValue !== null
+    const isSourceObj = typeof sourceValue === 'object' && sourceValue !== null
+    const areObjects =
+      isTargetObj &&
+      isSourceObj &&
+      !Array.isArray(targetValue) &&
+      !Array.isArray(sourceValue)
+
+    if (areObjects) {
+      mutateMergeDeep(targetValue as object, sourceValue as object)
+      continue
     }
+
+    // Handle all other cases
+    Object.defineProperty(target, key, {
+      value: sourceValue,
+      enumerable: true,
+      writable: true,
+      configurable: true,
+    })
   }
+
   return target
 }