merge-anything 3.0.6 → 4.0.2

package/README.md

@@ -35,7 +35,9 @@ merge-anything will merge objects and nested properties, but only as long as the
 
 ## Usage
 
-Pass the base param first and then an unlimited amount of params to merge onto it.
+- Unlimited — Merge will merge an unlimited amount of plain objects you pass as the arguments
+- Nested — Nested objects are merged deeply (see example below)
+- No modification — Merge always returns a new object without modifying the original, but does keep object/array references for nested props (see [#A note on JavaScript object references](#a-note-on-javascript-object-references))
 
 ```js
 import { merge } from 'merge-anything'
@@ -92,7 +94,7 @@ merge({ prop: 'a' }, { prop: {} }) // returns {prop: {}}
 
 merge-anything properly keeps special objects intact like dates, regex, functions, class instances etc.
 
-However, it's **very important** you understand how to work around JavaScript object references. Please be sure to read [a note on JavaScript object references](#a-note-on-javascript-object-references) down below.
+However, it's **very important** you understand how to work around JavaScript object references. Please be sure to read [#a note on JavaScript object references](#a-note-on-javascript-object-references) down below.
 
 ## Concat arrays
 

package/dist/index.cjs.js

@@ -19,14 +19,13 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
 
-function __spreadArrays() {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
+function __spreadArray(to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
 }
 
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 function concatArrays(originVal, newVal) {
     if (isWhat.isArray(originVal) && isWhat.isArray(newVal)) {
         // concat logic
@@ -59,7 +58,7 @@ function mergeRecursively(origin, newComer, compareFn) {
     if (isWhat.isPlainObject(origin)) {
         var props_1 = Object.getOwnPropertyNames(origin);
         var symbols_1 = Object.getOwnPropertySymbols(origin);
-        newObject = __spreadArrays(props_1, symbols_1).reduce(function (carry, key) {
+        newObject = __spreadArray(__spreadArray([], props_1), symbols_1).reduce(function (carry, key) {
             var targetVal = origin[key];
             if ((!isWhat.isSymbol(key) && !Object.getOwnPropertyNames(newComer).includes(key)) ||
                 (isWhat.isSymbol(key) && !Object.getOwnPropertySymbols(newComer).includes(key))) {
@@ -71,7 +70,7 @@ function mergeRecursively(origin, newComer, compareFn) {
     // newObject has all properties that newComer hasn't
     var props = Object.getOwnPropertyNames(newComer);
     var symbols = Object.getOwnPropertySymbols(newComer);
-    var result = __spreadArrays(props, symbols).reduce(function (carry, key) {
+    var result = __spreadArray(__spreadArray([], props), symbols).reduce(function (carry, key) {
         // re-define the origin and newComer as targetVal and newVal
         var newVal = newComer[key];
         var targetVal = isWhat.isPlainObject(origin) ? origin[key] : undefined;
@@ -97,7 +96,6 @@ function merge(object) {
     for (var _i = 1; _i < arguments.length; _i++) {
         otherObjects[_i - 1] = arguments[_i];
     }
-    // @ts-ignore
     return otherObjects.reduce(function (result, newComer) {
         return mergeRecursively(result, newComer);
     }, object);
@@ -107,7 +105,6 @@ function mergeAndCompare(compareFn, object) {
     for (var _i = 2; _i < arguments.length; _i++) {
         otherObjects[_i - 2] = arguments[_i];
     }
-    // @ts-ignore
     return otherObjects.reduce(function (result, newComer) {
         return mergeRecursively(result, newComer, compareFn);
     }, object);
@@ -117,7 +114,6 @@ function mergeAndConcat(object) {
     for (var _i = 1; _i < arguments.length; _i++) {
         otherObjects[_i - 1] = arguments[_i];
     }
-    // @ts-ignore
     return otherObjects.reduce(function (result, newComer) {
         return mergeRecursively(result, newComer, concatArrays);
     }, object);

package/dist/index.esm.js

@@ -15,14 +15,13 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
 
-function __spreadArrays() {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
+function __spreadArray(to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
 }
 
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 function concatArrays(originVal, newVal) {
     if (isArray(originVal) && isArray(newVal)) {
         // concat logic
@@ -55,7 +54,7 @@ function mergeRecursively(origin, newComer, compareFn) {
     if (isPlainObject(origin)) {
         var props_1 = Object.getOwnPropertyNames(origin);
         var symbols_1 = Object.getOwnPropertySymbols(origin);
-        newObject = __spreadArrays(props_1, symbols_1).reduce(function (carry, key) {
+        newObject = __spreadArray(__spreadArray([], props_1), symbols_1).reduce(function (carry, key) {
             var targetVal = origin[key];
             if ((!isSymbol(key) && !Object.getOwnPropertyNames(newComer).includes(key)) ||
                 (isSymbol(key) && !Object.getOwnPropertySymbols(newComer).includes(key))) {
@@ -67,7 +66,7 @@ function mergeRecursively(origin, newComer, compareFn) {
     // newObject has all properties that newComer hasn't
     var props = Object.getOwnPropertyNames(newComer);
     var symbols = Object.getOwnPropertySymbols(newComer);
-    var result = __spreadArrays(props, symbols).reduce(function (carry, key) {
+    var result = __spreadArray(__spreadArray([], props), symbols).reduce(function (carry, key) {
         // re-define the origin and newComer as targetVal and newVal
         var newVal = newComer[key];
         var targetVal = isPlainObject(origin) ? origin[key] : undefined;
@@ -93,7 +92,6 @@ function merge(object) {
     for (var _i = 1; _i < arguments.length; _i++) {
         otherObjects[_i - 1] = arguments[_i];
     }
-    // @ts-ignore
     return otherObjects.reduce(function (result, newComer) {
         return mergeRecursively(result, newComer);
     }, object);
@@ -103,7 +101,6 @@ function mergeAndCompare(compareFn, object) {
     for (var _i = 2; _i < arguments.length; _i++) {
         otherObjects[_i - 2] = arguments[_i];
     }
-    // @ts-ignore
     return otherObjects.reduce(function (result, newComer) {
         return mergeRecursively(result, newComer, compareFn);
     }, object);
@@ -113,7 +110,6 @@ function mergeAndConcat(object) {
     for (var _i = 1; _i < arguments.length; _i++) {
         otherObjects[_i - 1] = arguments[_i];
     }
-    // @ts-ignore
     return otherObjects.reduce(function (result, newComer) {
         return mergeRecursively(result, newComer, concatArrays);
     }, object);

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "merge-anything",
-  "version": "3.0.6",
+  "version": "4.0.2",
   "sideEffects": false,
   "description": "Merge objects & other types recursively. A simple & small integration.",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
-  "typings": "types/index.d.ts",
+  "types": "types/index.d.ts",
   "scripts": {
     "lint": "eslint src/ --ext .js,.jsx,.ts,.tsx",
     "test": "ava",
     "rollup": "rollup -c build/rollup.js",
-    "build": "npm run lint && npm run test && npm run rollup"
+    "build": "npm run lint && npm run test && npm run rollup",
+    "release": "npm run build && np"
   },
   "repository": {
     "type": "git",
@@ -45,21 +46,23 @@
   },
   "homepage": "https://github.com/mesqueeb/merge-anything#readme",
   "dependencies": {
-    "is-what": "^3.11.2",
-    "ts-toolbelt": "^8.0.6"
+    "is-what": "^3.14.1",
+    "ts-toolbelt": "^9.6.0"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^4.1.1",
-    "@typescript-eslint/parser": "^4.1.1",
-    "ava": "^3.12.1",
-    "eslint": "^7.9.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-tree-shaking": "^1.8.0",
-    "rollup": "^2.26.11",
-    "rollup-plugin-typescript2": "^0.27.2",
-    "tsconfig-paths": "^3.9.0",
-    "ts-node": "^9.0.0",
-    "typescript": "^4.0.2"
+    "@typescript-eslint/eslint-plugin": "^5.3.1",
+    "@typescript-eslint/parser": "^5.3.1",
+    "ava": "^3.15.0",
+    "eslint": "^8.2.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-tree-shaking": "^1.9.2",
+    "np": "^7.5.0",
+    "prettier": "^2.4.1",
+    "rollup": "^2.59.0",
+    "rollup-plugin-typescript2": "^0.30.0",
+    "ts-node": "^10.4.0",
+    "tsconfig-paths": "^3.11.0",
+    "typescript": "^4.4.4"
   },
   "ava": {
     "extensions": [
@@ -69,5 +72,29 @@
       "tsconfig-paths/register",
       "ts-node/register"
     ]
+  },
+  "np": {
+    "yarn": false,
+    "branch": "production"
+  },
+  "eslintConfig": {
+    "root": true,
+    "parser": "@typescript-eslint/parser",
+    "plugins": [
+      "@typescript-eslint",
+      "tree-shaking"
+    ],
+    "extends": [
+      "eslint:recommended",
+      "plugin:@typescript-eslint/eslint-recommended",
+      "plugin:@typescript-eslint/recommended",
+      "prettier"
+    ],
+    "rules": {
+      "@typescript-eslint/no-explicit-any": "off",
+      "@typescript-eslint/ban-ts-ignore": "off",
+      "tree-shaking/no-side-effects-in-initialization": "error",
+      "@typescript-eslint/ban-ts-comment": "off"
+    }
   }
 }

package/src/extensions.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { isArray } from 'is-what'
 
 export function concatArrays (originVal: any, newVal: any): any | any[] {

package/src/merge.ts

@@ -77,10 +77,9 @@ export function merge<T extends Record<string, any>, Tn extends Record<string, a
   object: T,
   ...otherObjects: Tn
 ): O.Assign<T, Tn, 'deep'> {
-  // @ts-ignore
   return otherObjects.reduce((result, newComer) => {
     return mergeRecursively(result, newComer)
-  }, object)
+  }, object) as any
 }
 
 export function mergeAndCompare<T extends Record<string, any>, Tn extends Record<string, any>[]>(
@@ -88,18 +87,16 @@ export function mergeAndCompare<T extends Record<string, any>, Tn extends Record
   object: T,
   ...otherObjects: Tn
 ): O.Assign<T, Tn, 'deep'> {
-  // @ts-ignore
   return otherObjects.reduce((result, newComer) => {
     return mergeRecursively(result, newComer, compareFn)
-  }, object)
+  }, object) as any
 }
 
 export function mergeAndConcat<T extends Record<string, any>, Tn extends Record<string, any>[]>(
   object: T,
   ...otherObjects: Tn
 ): O.Assign<T, Tn, 'deep'> {
-  // @ts-ignore
   return otherObjects.reduce((result, newComer) => {
     return mergeRecursively(result, newComer, concatArrays)
-  }, object)
+  }, object) as any
 }

package/tsconfig.json

@@ -1,9 +1,13 @@
 {
   "compilerOptions": {
     "baseUrl": ".",
+    "lib": ["ES2015", "ES2016", "ES2017", "ES2018", "ES2019", "ES2020"],
+    "strict": true,
+    "isolatedModules": true,
+    "esModuleInterop": true,
+    "moduleResolution": "node",
     "declaration": true,
-    "declarationDir": "./types/",
-    "strict": true
+    "declarationDir": "./types/"
   },
   "include": [
     "src/**/*",

package/.eslintrc.js

@@ -1,19 +0,0 @@
-// npm i -D @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint eslint-config-prettier eslint-plugin-tree-shaking
-module.exports = {
-  root: true,
-  parser: '@typescript-eslint/parser',
-  plugins: ['@typescript-eslint', 'tree-shaking'],
-  extends: [
-    'eslint:recommended',
-    'plugin:@typescript-eslint/eslint-recommended',
-    'plugin:@typescript-eslint/recommended',
-    'prettier/@typescript-eslint'
-  ],
-  rules: {
-    '@typescript-eslint/no-explicit-any': 'off',
-    '@typescript-eslint/ban-ts-ignore': 'off',
-    'tree-shaking/no-side-effects-in-initialization': 'error',
-    '@typescript-eslint/explicit-module-boundary-types': 'off',
-    '@typescript-eslint/ban-ts-comment': 'off'
-  }
-}