merge-anything 2.4.0 → 2.4.4

package/.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: mesqueeb
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

package/README.md

@@ -14,6 +14,8 @@ I was looking for:
 
 - a simple merge function like `Object.assign()`
 - supports merging of nested properties
+- supports symbols
+- supports enumerable & nonenumerable props
 - **does not break special class instances**　‼️
 
 This last one is crucial! In JavaScript almost everything is _an object_, sure, but I don't want a merge function trying to merge eg. two `new Date()` instances! So many libraries use custom classes that create objects with special prototypes, and such objects all break when trying to merge them. So we gotta be careful!
@@ -186,7 +188,7 @@ const merged = copy(merge(original, extraInfo))
 merged.airport.airplane = 'lan. 🛬'
 (merged.airport.airplane === 'lan. 🛬') // true
 // `original` won't be modified!
-(original.airport.airplane === 'lan. 🛬') // true
+(original.airport.airplane === 'dep. 🛫') // true
 ```
 
 You can then play around where you want to place the `copy()` function.
@@ -230,4 +232,4 @@ function mergeRecursively (origin, newComer) {
 }
 ```
 
-\* Of course, there are small differences with the actual source code to cope with rare cases & extra features. The actual source code is [here](https://github.com/mesqueeb/merge-anything/blob/master/src/index.js).
+\* Of course, there are small differences with the actual source code to cope with rare cases & extra features. The actual source code is [here](https://github.com/mesqueeb/merge-anything/blob/master/src/merge.ts).

package/dist/index.cjs.js

@@ -4,6 +4,29 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var isWhat = require('is-what');
 
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+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 assignProp(carry, key, newVal, originalObject) {
     var propType = originalObject.propertyIsEnumerable(key)
         ? 'enumerable'
@@ -35,7 +58,7 @@ function mergeRecursively(origin, newComer, extensions) {
     if (isWhat.isPlainObject(origin)) {
         var props_1 = Object.getOwnPropertyNames(origin);
         var symbols_1 = Object.getOwnPropertySymbols(origin);
-        newObject = props_1.concat(symbols_1).reduce(function (carry, key) {
+        newObject = __spreadArrays(props_1, symbols_1).reduce(function (carry, key) {
             // @ts-ignore
             var targetVal = origin[key];
             if ((!isWhat.isSymbol(key) && !Object.getOwnPropertyNames(newComer).includes(key)) ||
@@ -47,7 +70,7 @@ function mergeRecursively(origin, newComer, extensions) {
     }
     var props = Object.getOwnPropertyNames(newComer);
     var symbols = Object.getOwnPropertySymbols(newComer);
-    var result = props.concat(symbols).reduce(function (carry, key) {
+    var result = __spreadArrays(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))
@@ -102,6 +125,6 @@ function concatArrays(originVal, newVal) {
     return newVal; // always return newVal as fallback!!
 }
 
-exports.merge = merge;
 exports.concatArrays = concatArrays;
 exports.default = merge;
+exports.merge = merge;

package/dist/index.esm.js

@@ -1,4 +1,27 @@
-import { isArray, isPlainObject, isSymbol } from 'is-what';
+import { isPlainObject, isArray, isSymbol } from 'is-what';
+
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+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 assignProp(carry, key, newVal, originalObject) {
     var propType = originalObject.propertyIsEnumerable(key)
@@ -31,7 +54,7 @@ function mergeRecursively(origin, newComer, extensions) {
     if (isPlainObject(origin)) {
         var props_1 = Object.getOwnPropertyNames(origin);
         var symbols_1 = Object.getOwnPropertySymbols(origin);
-        newObject = props_1.concat(symbols_1).reduce(function (carry, key) {
+        newObject = __spreadArrays(props_1, symbols_1).reduce(function (carry, key) {
             // @ts-ignore
             var targetVal = origin[key];
             if ((!isSymbol(key) && !Object.getOwnPropertyNames(newComer).includes(key)) ||
@@ -43,7 +66,7 @@ function mergeRecursively(origin, newComer, extensions) {
     }
     var props = Object.getOwnPropertyNames(newComer);
     var symbols = Object.getOwnPropertySymbols(newComer);
-    var result = props.concat(symbols).reduce(function (carry, key) {
+    var result = __spreadArrays(props, symbols).reduce(function (carry, key) {
         // re-define the origin and newComer as targetVal and newVal
         var newVal = newComer[key];
         var targetVal = (isPlainObject(origin))
@@ -99,4 +122,4 @@ function concatArrays(originVal, newVal) {
 }
 
 export default merge;
-export { merge, concatArrays };
+export { concatArrays, merge };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merge-anything",
-  "version": "2.4.0",
+  "version": "2.4.4",
   "description": "Merge objects & other types recursively. A simple & small integration.",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
@@ -43,16 +43,16 @@
   },
   "homepage": "https://github.com/mesqueeb/merge-anything#readme",
   "devDependencies": {
-    "@ava/babel-preset-stage-4": "^2.0.0",
-    "@babel/plugin-proposal-object-rest-spread": "^7.5.4",
-    "@babel/preset-env": "^7.5.4",
-    "ava": "^1.4.1",
-    "copy-anything": "^1.2.4",
-    "rollup": "^0.65.2",
-    "rollup-plugin-typescript2": "^0.21.2",
-    "typescript": "^3.5.3"
+    "@ava/babel-preset-stage-4": "^4.0.0",
+    "@babel/plugin-proposal-object-rest-spread": "^7.6.2",
+    "@babel/preset-env": "^7.7.1",
+    "ava": "^2.4.0",
+    "copy-anything": "^1.5.0",
+    "rollup": "^1.27.3",
+    "rollup-plugin-typescript2": "^0.25.2",
+    "typescript": "^3.7.2"
   },
   "dependencies": {
-    "is-what": "^3.2.4"
+    "is-what": "^3.3.1"
   }
 }

package/src/index.ts

@@ -1,5 +1,5 @@
 import merge from './merge'
 import { concatArrays } from './extensions'
 
-export { merge, concatArrays }
+export { concatArrays, merge }
 export default merge

package/types/index.d.ts

@@ -1,4 +1,4 @@
 import merge from './merge';
 import { concatArrays } from './extensions';
-export { merge, concatArrays };
+export { concatArrays, merge };
 export default merge;