@oscarpalmer/atoms 0.92.0 → 0.93.0

package/dist/value/merge.cjs

@@ -3,12 +3,20 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const is = require('../is.cjs');
+const math = require('../math.cjs');
 
-function merge(values, options) {
+function getIndices(arrays) {
+  return Array.from(
+    {
+      length: math.min(arrays.map((array) => array.length))
+    },
+    (_, index) => String(index)
+  );
+}
+function merge(values) {
   if (!Array.isArray(values) || values.length === 0) {
     return {};
   }
-  const skipNullable = options?.skipNullable === true;
   const actual = values.filter((value) => is.isArrayOrPlainObject(value));
   if (actual.length === 0) {
     return {};
@@ -16,22 +24,20 @@ function merge(values, options) {
   if (actual.length === 1) {
     return actual[0];
   }
-  const result = actual.every(Array.isArray) ? [] : {};
-  const isArray = Array.isArray(result);
+  const isArray = actual.every(Array.isArray);
+  const result = isArray ? [] : {};
+  const indices = isArray ? getIndices(actual) : void 0;
   const { length } = actual;
   for (let outerIndex = 0; outerIndex < length; outerIndex += 1) {
     const item = actual[outerIndex];
-    const keys = Object.keys(item);
+    const keys = indices ?? Object.keys(item);
     const size = keys.length;
     for (let innerIndex = 0; innerIndex < size; innerIndex += 1) {
       const key = keys[innerIndex];
       const next = item[key];
       const previous = result[key];
-      if (isArray && skipNullable && next == null) {
-        continue;
-      }
-      if (is.isArrayOrPlainObject(next)) {
-        result[key] = is.isArrayOrPlainObject(previous) ? merge([previous, next]) : merge([next]);
+      if (is.isArrayOrPlainObject(next) && is.isArrayOrPlainObject(previous)) {
+        result[key] = merge([previous, next]);
       } else {
         result[key] = next;
       }

package/dist/value/merge.js

@@ -1,10 +1,18 @@
 import { isArrayOrPlainObject } from '../is.js';
+import { min } from '../math.js';
 
-function merge(values, options) {
+function getIndices(arrays) {
+  return Array.from(
+    {
+      length: min(arrays.map((array) => array.length))
+    },
+    (_, index) => String(index)
+  );
+}
+function merge(values) {
   if (!Array.isArray(values) || values.length === 0) {
     return {};
   }
-  const skipNullable = options?.skipNullable === true;
   const actual = values.filter((value) => isArrayOrPlainObject(value));
   if (actual.length === 0) {
     return {};
@@ -12,22 +20,20 @@ function merge(values, options) {
   if (actual.length === 1) {
     return actual[0];
   }
-  const result = actual.every(Array.isArray) ? [] : {};
-  const isArray = Array.isArray(result);
+  const isArray = actual.every(Array.isArray);
+  const result = isArray ? [] : {};
+  const indices = isArray ? getIndices(actual) : void 0;
   const { length } = actual;
   for (let outerIndex = 0; outerIndex < length; outerIndex += 1) {
     const item = actual[outerIndex];
-    const keys = Object.keys(item);
+    const keys = indices ?? Object.keys(item);
     const size = keys.length;
     for (let innerIndex = 0; innerIndex < size; innerIndex += 1) {
       const key = keys[innerIndex];
       const next = item[key];
       const previous = result[key];
-      if (isArray && skipNullable && next == null) {
-        continue;
-      }
-      if (isArrayOrPlainObject(next)) {
-        result[key] = isArrayOrPlainObject(previous) ? merge([previous, next]) : merge([next]);
+      if (isArrayOrPlainObject(next) && isArrayOrPlainObject(previous)) {
+        result[key] = merge([previous, next]);
       } else {
         result[key] = next;
       }

package/package.json

@@ -208,5 +208,5 @@
 	},
 	"type": "module",
 	"types": "./types/index.d.cts",
-	"version": "0.92.0"
+	"version": "0.93.0"
 }

package/src/value/merge.ts

@@ -1,27 +1,26 @@
 import {isArrayOrPlainObject} from '../is';
+import {min} from '../math';
 import type {ArrayOrPlainObject, PlainObject} from '../models';
 
-type MergeOptions = {
-	/**
-	 * - Skip nullable values when merging arrays?
-	 * - E.g. `merge([1, 2, 3], [null, null, 99])` => `[1, 2, 99]`
-	 */
-	skipNullable?: boolean;
-};
+function getIndices(arrays: unknown[][]): string[] {
+	return Array.from(
+		{
+			length: min(arrays.map(array => array.length)),
+		},
+		(_, index) => String(index),
+	);
+}
 
 /**
  * Merge multiple arrays or objects into a single one
  */
 export function merge<Model extends ArrayOrPlainObject>(
 	values: Model[],
-	options?: Partial<MergeOptions>,
 ): Model {
 	if (!Array.isArray(values) || values.length === 0) {
 		return {} as Model;
 	}
 
-	const skipNullable = options?.skipNullable === true;
-
 	const actual = values.filter(value => isArrayOrPlainObject(value)) as Model[];
 
 	if (actual.length === 0) {
@@ -32,13 +31,14 @@ export function merge<Model extends ArrayOrPlainObject>(
 		return actual[0];
 	}
 
-	const result = (actual.every(Array.isArray) ? [] : {}) as PlainObject;
-	const isArray = Array.isArray(result);
+	const isArray = actual.every(Array.isArray);
+	const result = (isArray ? [] : {}) as PlainObject;
+	const indices = isArray ? getIndices(actual as unknown[][]) : undefined;
 	const {length} = actual;
 
 	for (let outerIndex = 0; outerIndex < length; outerIndex += 1) {
 		const item = actual[outerIndex] as PlainObject;
-		const keys = Object.keys(item);
+		const keys = indices ?? Object.keys(item);
 		const size = keys.length;
 
 		for (let innerIndex = 0; innerIndex < size; innerIndex += 1) {
@@ -46,14 +46,8 @@ export function merge<Model extends ArrayOrPlainObject>(
 			const next = item[key];
 			const previous = result[key];
 
-			if (isArray && skipNullable && next == null) {
-				continue;
-			}
-
-			if (isArrayOrPlainObject(next)) {
-				result[key] = isArrayOrPlainObject(previous)
-					? merge([previous, next])
-					: merge([next]);
+			if (isArrayOrPlainObject(next) && isArrayOrPlainObject(previous)) {
+				result[key] = merge([previous, next]);
 			} else {
 				result[key] = next;
 			}

package/types/index.d.cts

@@ -2817,17 +2817,10 @@ export declare function getValue<Data extends ArrayOrPlainObject, Path extends P
  * - Returns `undefined` if the value is not found
  */
 export declare function getValue<Data extends ArrayOrPlainObject>(data: Data, path: string, ignoreCase?: boolean): unknown;
-export type MergeOptions = {
-	/**
-	 * - Skip nullable values when merging arrays?
-	 * - E.g. `merge([1, 2, 3], [null, null, 99])` => `[1, 2, 99]`
-	 */
-	skipNullable?: boolean;
-};
 /**
  * Merge multiple arrays or objects into a single one
  */
-export declare function merge<Model extends ArrayOrPlainObject>(values: Model[], options?: Partial<MergeOptions>): Model;
+export declare function merge<Model extends ArrayOrPlainObject>(values: Model[]): Model;
 /**
  * - Set the value in an object using a known path
  * - You can set a nested value by using dot notation, e.g., `foo.bar.baz`

package/types/value/index.d.cts

@@ -1723,17 +1723,10 @@ export declare function getValue<Data extends ArrayOrPlainObject, Path extends P
  * - Returns `undefined` if the value is not found
  */
 export declare function getValue<Data extends ArrayOrPlainObject>(data: Data, path: string, ignoreCase?: boolean): unknown;
-export type MergeOptions = {
-	/**
-	 * - Skip nullable values when merging arrays?
-	 * - E.g. `merge([1, 2, 3], [null, null, 99])` => `[1, 2, 99]`
-	 */
-	skipNullable?: boolean;
-};
 /**
  * Merge multiple arrays or objects into a single one
  */
-export declare function merge<Model extends ArrayOrPlainObject>(values: Model[], options?: Partial<MergeOptions>): Model;
+export declare function merge<Model extends ArrayOrPlainObject>(values: Model[]): Model;
 /**
  * - Set the value in an object using a known path
  * - You can set a nested value by using dot notation, e.g., `foo.bar.baz`

package/types/value/merge.d.cts

@@ -1,16 +1,9 @@
 // Generated by dts-bundle-generator v9.5.1
 
 export type ArrayOrPlainObject = unknown[] | Record<PropertyKey, unknown>;
-export type MergeOptions = {
-	/**
-	 * - Skip nullable values when merging arrays?
-	 * - E.g. `merge([1, 2, 3], [null, null, 99])` => `[1, 2, 99]`
-	 */
-	skipNullable?: boolean;
-};
 /**
  * Merge multiple arrays or objects into a single one
  */
-export declare function merge<Model extends ArrayOrPlainObject>(values: Model[], options?: Partial<MergeOptions>): Model;
+export declare function merge<Model extends ArrayOrPlainObject>(values: Model[]): Model;
 
 export {};

package/types/value/merge.d.ts

@@ -1,13 +1,5 @@
 import type { ArrayOrPlainObject } from '../models';
-type MergeOptions = {
-    /**
-     * - Skip nullable values when merging arrays?
-     * - E.g. `merge([1, 2, 3], [null, null, 99])` => `[1, 2, 99]`
-     */
-    skipNullable?: boolean;
-};
 /**
  * Merge multiple arrays or objects into a single one
  */
-export declare function merge<Model extends ArrayOrPlainObject>(values: Model[], options?: Partial<MergeOptions>): Model;
-export {};
+export declare function merge<Model extends ArrayOrPlainObject>(values: Model[]): Model;