utilium 3.6.1 → 3.6.2

package/dist/objects.d.ts

@@ -22,7 +22,18 @@ export declare function isObject(value: unknown): value is object;
 export type DeepAssign<To extends object, From extends object> = {
     [K in keyof To | keyof From]: K extends keyof To ? K extends keyof From ? To[K] extends object ? From[K] extends object ? Expand<DeepAssign<To[K], From[K]>> : never : From[K] extends object ? never : From[K] : To[K] : From[K & keyof From];
 };
-export declare function deepAssign<To extends object, From extends object>(to: To, from: From, treatArraysAsPrimitives?: boolean): DeepAssign<To, From>;
+export interface DeepAssignOptions {
+    /** Whether to replace arrays instead of merging them */
+    replaceArrays?: boolean;
+    /** Whether to allow unsafe override of the `constructor` property */
+    unsafeOverrideConstructor?: boolean;
+}
+/**
+ * @deprecated
+ * Use an options object instead, see {@link DeepAssignOptions}
+ */
+export declare function deepAssign<To extends object, From extends object>(to: To, from: From, treatArraysAsPrimitives: boolean): DeepAssign<To, From>;
+export declare function deepAssign<To extends object, From extends object>(to: To, from: From, options?: DeepAssignOptions): DeepAssign<To, From>;
 export type StructurallyEqual<To, From> = diff.DeepRT<To, From>['result'] extends 'equal' ? true : false;
 export declare function structurallyEqual<To, From>(to: To, from: From): StructurallyEqual<To, From>;
 /**

package/dist/objects.js

@@ -37,26 +37,22 @@ export function assignWithDefaults(to, from, defaults = to) {
 export function isObject(value) {
     return Object(value) === value;
 }
-export function deepAssign(to, from, treatArraysAsPrimitives = false) {
-    const keys = new Set([
-        ...Object.keys(to),
-        ...Object.keys(from),
-    ]);
-    for (const key of keys) {
-        if (!(key in from))
+export function deepAssign(to, from, options = {}) {
+    options = typeof options == 'boolean' ? { replaceArrays: options } : options;
+    for (const [key, value] of Object.entries(from)) {
+        if (key === '__proto__' || (!options.unsafeOverrideConstructor && key === 'constructor'))
             continue;
-        const value = from[key];
         if (!(key in to)) {
             to[key] = value;
             continue;
         }
         if ((!isObject(to[key]) && Object(value) !== value)
-            || (treatArraysAsPrimitives && (Array.isArray(value) || Array.isArray(to[key])))) {
+            || (options.replaceArrays && (Array.isArray(value) || Array.isArray(to[key])))) {
             to[key] = value;
             continue;
         }
         if (isObject(to[key]) && Object(value) === value) {
-            deepAssign(to[key], value, treatArraysAsPrimitives);
+            deepAssign(to[key], value, options);
             continue;
         }
         throw new TypeError(!isObject(to[key])

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "utilium",
-	"version": "3.6.1",
+	"version": "3.6.2",
 	"description": "Typescript utilities",
 	"funding": {
 		"type": "individual",