@augment-vir/common 21.0.0 → 21.1.0

package/dist/cjs/augments/object/merge-deep.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeDeep = void 0;
 const runtime_type_of_1 = require("../runtime-type-of");
 const tuple_1 = require("../tuple");
+const object_1 = require("./object");
 /**
  * Accepts multiple objects and merges their key-value pairs recursively.
  *
@@ -10,28 +11,40 @@ const tuple_1 = require("../tuple");
  */
 function mergeDeep(...inputs) {
     if (!(0, tuple_1.isLengthAtLeast)(inputs, 1)) {
+        // nothing to merge if no inputs
         return {};
     }
     if (inputs.length === 1) {
+        // nothing to merge if only one input
         return inputs[0];
     }
-    let result = {};
+    let result = undefined;
     const mergeProps = {};
     inputs.forEach((individualInput) => {
         try {
+            if (!(0, object_1.isObject)(individualInput)) {
+                /** If not an object, we can't merge. So overwrite instead. */
+                result = individualInput;
+                return;
+            }
             Object.entries(individualInput).forEach(([key, value,]) => {
-                if ((0, runtime_type_of_1.isRuntimeTypeOf)(value, 'object')) {
-                    const mergePropsArray = mergeProps[key] || [];
-                    if (!mergeProps[key]) {
-                        mergeProps[key] = mergePropsArray;
-                    }
-                    mergePropsArray.push(value);
+                const mergePropsArray = mergeProps[key] || [];
+                if (!mergeProps[key]) {
+                    mergeProps[key] = mergePropsArray;
                 }
+                mergePropsArray.push(value);
             });
-            result = {
-                ...result,
-                ...individualInput,
-            };
+            if (result) {
+                if ((0, runtime_type_of_1.isRuntimeTypeOf)(result, 'object')) {
+                    result = {
+                        ...result,
+                        ...individualInput,
+                    };
+                }
+            }
+            else {
+                result = individualInput;
+            }
         }
         catch (error) {
             /** Ignore errors, such as individualInput not actually being an object. */

package/dist/cjs/augments/object/object.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.copyThroughJson = exports.isObject = void 0;
+/** Checks if the input is non-null and an object. Includes arrays. */
 function isObject(input) {
     return !!input && typeof input === 'object';
 }

package/dist/esm/augments/object/merge-deep.js

@@ -1,5 +1,6 @@
 import { isRuntimeTypeOf } from '../runtime-type-of';
 import { isLengthAtLeast } from '../tuple';
+import { isObject } from './object';
 /**
  * Accepts multiple objects and merges their key-value pairs recursively.
  *
@@ -7,28 +8,40 @@ import { isLengthAtLeast } from '../tuple';
  */
 export function mergeDeep(...inputs) {
     if (!isLengthAtLeast(inputs, 1)) {
+        // nothing to merge if no inputs
         return {};
     }
     if (inputs.length === 1) {
+        // nothing to merge if only one input
         return inputs[0];
     }
-    let result = {};
+    let result = undefined;
     const mergeProps = {};
     inputs.forEach((individualInput) => {
         try {
+            if (!isObject(individualInput)) {
+                /** If not an object, we can't merge. So overwrite instead. */
+                result = individualInput;
+                return;
+            }
             Object.entries(individualInput).forEach(([key, value,]) => {
-                if (isRuntimeTypeOf(value, 'object')) {
-                    const mergePropsArray = mergeProps[key] || [];
-                    if (!mergeProps[key]) {
-                        mergeProps[key] = mergePropsArray;
-                    }
-                    mergePropsArray.push(value);
+                const mergePropsArray = mergeProps[key] || [];
+                if (!mergeProps[key]) {
+                    mergeProps[key] = mergePropsArray;
                 }
+                mergePropsArray.push(value);
             });
-            result = {
-                ...result,
-                ...individualInput,
-            };
+            if (result) {
+                if (isRuntimeTypeOf(result, 'object')) {
+                    result = {
+                        ...result,
+                        ...individualInput,
+                    };
+                }
+            }
+            else {
+                result = individualInput;
+            }
         }
         catch (error) {
             /** Ignore errors, such as individualInput not actually being an object. */

package/dist/esm/augments/object/object.js

@@ -1,3 +1,4 @@
+/** Checks if the input is non-null and an object. Includes arrays. */
 export function isObject(input) {
     return !!input && typeof input === 'object';
 }

package/dist/types/augments/object/object.d.ts

@@ -4,6 +4,7 @@ export type PartialAndNullable<T extends object> = {
 export type PartialAndUndefined<T extends object> = {
     [Prop in keyof T]?: T[Prop] | undefined;
 };
+/** Checks if the input is non-null and an object. Includes arrays. */
 export declare function isObject(input: any): input is NonNullable<object>;
 /** The input here must be serializable otherwise JSON parsing errors will be thrown */
 export declare function copyThroughJson<T>(input: T): T;

package/dist/types/augments/object/pick-deep.d.ts

@@ -1,6 +1,7 @@
+import { AnyFunction } from '../function';
 import { NestedKeys } from './nested-keys';
 type InnerPickDeep<OriginalObjectGeneric extends object, DeepKeys extends any[]> = DeepKeys extends [infer CurrentLevelPick, ...infer RemainingKeys] ? {
-    [CurrentProp in Extract<CurrentLevelPick, keyof OriginalObjectGeneric>]: OriginalObjectGeneric[CurrentProp] extends object ? InnerPickDeep<OriginalObjectGeneric[CurrentProp], RemainingKeys> : OriginalObjectGeneric[CurrentProp];
+    [CurrentProp in Extract<CurrentLevelPick, keyof OriginalObjectGeneric>]: OriginalObjectGeneric[CurrentProp] extends AnyFunction ? OriginalObjectGeneric[CurrentProp] : OriginalObjectGeneric[CurrentProp] extends Array<any> ? OriginalObjectGeneric[CurrentProp] : OriginalObjectGeneric[CurrentProp] extends object ? InnerPickDeep<OriginalObjectGeneric[CurrentProp], RemainingKeys> : OriginalObjectGeneric[CurrentProp];
 } : DeepKeys extends [] ? OriginalObjectGeneric : DeepKeys extends [infer CurrentLevelPick] ? CurrentLevelPick extends keyof OriginalObjectGeneric ? Pick<OriginalObjectGeneric, CurrentLevelPick> : never : never;
 /**
  * Pick nested keys with more strict type parameter requirements. However, these stricter type

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@augment-vir/common",
-    "version": "21.0.0",
+    "version": "21.1.0",
     "homepage": "https://github.com/electrovir/augment-vir/tree/main/packages/common",
     "bugs": {
         "url": "https://github.com/electrovir/augment-vir/issues"