rattail 1.0.1 → 1.0.2

package/README.md

@@ -1,11 +1,11 @@
 <div align="center">
-  <a href="https://rattail.pages.dev">
-    <img src="https://rattail.pages.dev/logo.svg" width="150">
+  <a href="https://rattail.varletjs.org">
+    <img src="https://rattail.varletjs.org/logo.svg" width="150">
   </a>
   <h1>Rattail</h1>
   <p>A utilities library for front-end developers, lightweight and ts-friendly.</p>
   <p>
-    <a href="https://rattail.pages.dev">Documentation</a> |
+    <a href="https://rattail.varletjs.org">Documentation</a> |
     <a href="https://github.com/varletjs/rattail/blob/main/README.zh-CN.md">中文介绍</a>
   </p>
   <p>

package/README.zh-CN.md

@@ -1,11 +1,11 @@
 <div align="center">
-  <a href="https://rattail.pages.dev/zh">
-    <img src="https://rattail.pages.dev/logo.svg" width="150">
+  <a href="https://rattail.varletjs.org/zh">
+    <img src="https://rattail.varletjs.org/logo.svg" width="150">
   </a>
   <h1>Rattail</h1>
   <p>面向前端开发人员的实用工具库，轻量级且 ts 友好</p>
   <p>
-    <a href="https://rattail.pages.dev/zh">文档</a> |
+    <a href="https://rattail.varletjs.org/zh">文档</a> |
     <a href="https://github.com/varletjs/rattail/blob/main/README.md">ENGLISH README</a>
   </p>
   <p>

package/lib/index.cjs

@@ -1066,34 +1066,45 @@ function cloneDeep(value) {
 }
 
 // src/collection/mergeWith.ts
-function mergeWith(object, source, fn) {
-  function baseMerge(target, src) {
-    for (const key3 in src) {
-      if (hasOwn(src, key3)) {
-        const srcValue = src[key3];
-        const targetValue = target[key3];
-        const customResult = fn(targetValue, srcValue, key3, object, source);
-        if (customResult !== void 0) {
-          target[key3] = customResult;
-        } else if (isObject(srcValue)) {
-          if (isObject(targetValue)) {
-            target[key3] = baseMerge(targetValue, srcValue);
+function mergeWith(object, ...sources) {
+  const fn = at(sources, -1);
+  const targets = [object, ...sources.slice(0, -1)];
+  let len = targets.length - 1;
+  let result = targets[len];
+  while (len) {
+    result = baseMergeWith(targets[len - 1], result, fn);
+    len--;
+  }
+  function baseMergeWith(object2, source, fn2) {
+    function baseMerge(target, src) {
+      for (const key3 in src) {
+        if (hasOwn(src, key3)) {
+          const srcValue = src[key3];
+          const targetValue = target[key3];
+          const customResult = fn2(targetValue, srcValue, key3, object2, source);
+          if (customResult !== void 0) {
+            target[key3] = customResult;
+          } else if (isObject(srcValue)) {
+            if (isObject(targetValue)) {
+              target[key3] = baseMerge(targetValue, srcValue);
+            } else {
+              target[key3] = baseMerge(isArray(srcValue) ? [] : {}, srcValue);
+            }
           } else {
-            target[key3] = baseMerge(isArray(srcValue) ? [] : {}, srcValue);
+            target[key3] = srcValue;
           }
-        } else {
-          target[key3] = srcValue;
         }
       }
+      return target;
     }
-    return target;
+    return baseMerge(object2, source);
   }
-  return baseMerge(object, source);
+  return result;
 }
 
 // src/collection/merge.ts
-function merge(object, source) {
-  return mergeWith(object, source, () => void 0);
+function merge(object, ...sources) {
+  return mergeWith(object, ...sources, () => void 0);
 }
 
 // src/file/toArrayBuffer.ts

package/lib/index.d.cts

@@ -203,9 +203,10 @@ declare function cloneDeep<T>(value: T): T;
 
 declare function cloneDeepWith<T>(value: T, fn: (value: any) => any): T;
 
-declare function merge<T extends Record<string, any>, K extends Record<string, any>>(object: T, source: K): T & K;
+declare function merge<T extends Record<string, any>, K extends Record<string, any>>(object: T, ...sources: K[]): T & K;
 
-declare function mergeWith<T extends Record<string, any>, K extends Record<string, any>>(object: T, source: K, fn: (objValue: any, srcValue: any, key: string | number | symbol, object?: T, source?: K) => any): T & K;
+type Fn = (objValue: any, srcValue: any, key: string | number | symbol, object?: any, source?: any) => any;
+declare function mergeWith<T extends Record<string, any>, K extends Record<string, any>>(object: T, ...sources: [...K[], fn: Fn]): T & K;
 
 declare function toArrayBuffer(file: File): Promise<ArrayBuffer>;
 

package/lib/index.d.ts

@@ -203,9 +203,10 @@ declare function cloneDeep<T>(value: T): T;
 
 declare function cloneDeepWith<T>(value: T, fn: (value: any) => any): T;
 
-declare function merge<T extends Record<string, any>, K extends Record<string, any>>(object: T, source: K): T & K;
+declare function merge<T extends Record<string, any>, K extends Record<string, any>>(object: T, ...sources: K[]): T & K;
 
-declare function mergeWith<T extends Record<string, any>, K extends Record<string, any>>(object: T, source: K, fn: (objValue: any, srcValue: any, key: string | number | symbol, object?: T, source?: K) => any): T & K;
+type Fn = (objValue: any, srcValue: any, key: string | number | symbol, object?: any, source?: any) => any;
+declare function mergeWith<T extends Record<string, any>, K extends Record<string, any>>(object: T, ...sources: [...K[], fn: Fn]): T & K;
 
 declare function toArrayBuffer(file: File): Promise<ArrayBuffer>;
 

package/lib/index.js

@@ -933,34 +933,45 @@ function cloneDeep(value) {
 }
 
 // src/collection/mergeWith.ts
-function mergeWith(object, source, fn) {
-  function baseMerge(target, src) {
-    for (const key3 in src) {
-      if (hasOwn(src, key3)) {
-        const srcValue = src[key3];
-        const targetValue = target[key3];
-        const customResult = fn(targetValue, srcValue, key3, object, source);
-        if (customResult !== void 0) {
-          target[key3] = customResult;
-        } else if (isObject(srcValue)) {
-          if (isObject(targetValue)) {
-            target[key3] = baseMerge(targetValue, srcValue);
+function mergeWith(object, ...sources) {
+  const fn = at(sources, -1);
+  const targets = [object, ...sources.slice(0, -1)];
+  let len = targets.length - 1;
+  let result = targets[len];
+  while (len) {
+    result = baseMergeWith(targets[len - 1], result, fn);
+    len--;
+  }
+  function baseMergeWith(object2, source, fn2) {
+    function baseMerge(target, src) {
+      for (const key3 in src) {
+        if (hasOwn(src, key3)) {
+          const srcValue = src[key3];
+          const targetValue = target[key3];
+          const customResult = fn2(targetValue, srcValue, key3, object2, source);
+          if (customResult !== void 0) {
+            target[key3] = customResult;
+          } else if (isObject(srcValue)) {
+            if (isObject(targetValue)) {
+              target[key3] = baseMerge(targetValue, srcValue);
+            } else {
+              target[key3] = baseMerge(isArray(srcValue) ? [] : {}, srcValue);
+            }
           } else {
-            target[key3] = baseMerge(isArray(srcValue) ? [] : {}, srcValue);
+            target[key3] = srcValue;
           }
-        } else {
-          target[key3] = srcValue;
         }
       }
+      return target;
     }
-    return target;
+    return baseMerge(object2, source);
   }
-  return baseMerge(object, source);
+  return result;
 }
 
 // src/collection/merge.ts
-function merge(object, source) {
-  return mergeWith(object, source, () => void 0);
+function merge(object, ...sources) {
+  return mergeWith(object, ...sources, () => void 0);
 }
 
 // src/file/toArrayBuffer.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rattail",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "type": "module",
   "main": "lib/index.cjs",
   "module": "lib/index.js",