Updated naming

Geta · eirhor · Jun 7, 2017 · Jun 2, 2017 · Jun 2, 2017 · Jun 2, 2017
commit b57a4c0c9218e11411e1699fd00dac084cabc699
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /node_modules/
-/.idea/
+/.idea/
+npm-debug.log
diff --git a/README.md b/README.md
@@ -1,5 +1,8 @@
 # NestedObjectAssign
 This package extends the functionality given by Object.assign() to also include the values of nested objects.
 
+## Usage
+To use this
+
 ## Tests
 Tests are done using mocha. to run tests, simply type `npm run tests`.
diff --git a/dist/nested-object.assign.js → dist/nestedObjectAssign.js b/dist/nested-object.assign.js → dist/nestedObjectAssign.js
@@ -68,56 +68,85 @@
 /************************************************************************/
 /******/ ([
 /* 0 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = nestedAssign;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__isObject__ = __webpack_require__(1);
 
 
-function nestedAssign(target, ...sources) {
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports.default = nestedObjectAssign;
+
+var _isObject = __webpack_require__(1);
+
+var _isObject2 = _interopRequireDefault(_isObject);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function nestedObjectAssign(target) {
+    for (var _len = arguments.length, sources = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+        sources[_key - 1] = arguments[_key];
+    }
+
     if (!sources.length) return target;
 
-    const source = sources.shift();
+    var source = sources.shift();
 
-    if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__isObject__["a" /* default */])(target) && __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__isObject__["a" /* default */])(source)) {
-        for (const key in source) {
-            if (__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__isObject__["a" /* default */])(source[key])) {
-                if (!target[key]) Object.assign(target, { [key]: {} });
+    if ((0, _isObject2.default)(target) && (0, _isObject2.default)(source)) {
+        for (var key in source) {
+            if ((0, _isObject2.default)(source[key])) {
+                if (!target[key]) Object.assign(target, _defineProperty({}, key, {}));
 
-                nestedAssign(target[key], source[key]);
+                nestedObjectAssign(target[key], source[key]);
             } else {
-                Object.assign(target, { [key]: source[key] });
+                Object.assign(target, _defineProperty({}, key, source[key]));
             }
         }
     }
 
-    return nestedAssign(target, ...sources);
+    return nestedObjectAssign.apply(undefined, [target].concat(sources));
 }
 
 /***/ }),
 /* 1 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* harmony export (immutable) */ __webpack_exports__["a"] = isObject;
+
+
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+exports.default = isObject;
 function isObject(item) {
-    return item && typeof item === 'object' && !Array.isArray(item);
+    return item && (typeof item === 'undefined' ? 'undefined' : _typeof(item)) === 'object' && !Array.isArray(item);
 }
 
 /***/ }),
 /* 2 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+/***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
-/* harmony export (immutable) */ __webpack_exports__["default"] = NestedAssign;
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__components_nestedAssign__ = __webpack_require__(0);
 
 
-function NestedAssign(target, ...sources) {
-    return __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_0__components_nestedAssign__["a" /* default */])(target, ...sources);
-}
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _nestedObjectAssign = __webpack_require__(0);
+
+Object.defineProperty(exports, 'nestedObjectAssign', {
+  enumerable: true,
+  get: function get() {
+    return _nestedObjectAssign.nestedObjectAssign;
+  }
+});
 
 /***/ })
 /******/ ]);
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "nested-object.assign",
   "version": "1.0.0",
   "description": "method for allowing nested objects to be merged, which object.assign doesn't currently support",
-  "main": "dist/nested-object.assign.js",
+  "main": "dist/nestedObjectAssign.js",
   "directories": {
     "test": "test"
   },

diff --git a/src/components/nestedAssign.js → src/components/nestedObjectAssign.js b/src/components/nestedAssign.js → src/components/nestedObjectAssign.js
@@ -1,6 +1,6 @@
 import isObject from './isObject';
 
-export default function nestedAssign(target, ...sources){
+export default function nestedObjectAssign(target, ...sources){
     if (!sources.length)
         return target;
 
@@ -12,13 +12,13 @@ export default function nestedAssign(target, ...sources){
                 if (!target[key])
                     Object.assign(target, {[key]: {}});
 
-                nestedAssign(target[key], source[key]);
+                nestedObjectAssign(target[key], source[key]);
             }
             else {
                 Object.assign(target, {[key]: source[key]});
             }
         }
     }
 
-    return nestedAssign(target, ...sources);
+    return nestedObjectAssign(target, ...sources);
 }
diff --git a/src/index.js b/src/index.js
@@ -1,5 +1 @@
-import nestedAssign from "./components/nestedAssign";
-
-export default function nestedObjectAssign(target, ...sources){
-    return nestedAssign(target, ...sources);
-}
+export {nestedObjectAssign} from './components/nestedObjectAssign';
diff --git a/tests/nestedObjectAssignTest.js b/tests/nestedObjectAssignTest.js
@@ -1,5 +1,5 @@
 var assert = require('assert');
-import nestedObjectAssign from '../src/index';
+import nestedObjectAssign from '../dist/nestedObjectAssign';
 
 var mockData = {
     default: {
@@ -21,7 +21,7 @@ var mockData = {
         }
     }
 
-}
+};
 
 var expectedData = {
     heading: 'title',
@@ -32,13 +32,7 @@ var expectedData = {
         header: 'header',
         heading2: 'h2'
     }
-}
-
-var test = function(){
-    var mergedData = nestedObjectAssign({}, mockData.default, mockData.first, mockData.second);
-
-    return mergedData === expectedData;
-}
+};
 
 describe('Object', function() {
     describe('nestedObjectAssign', function() {

diff --git a/webpack.config.js b/webpack.config.js
@@ -6,14 +6,17 @@ module.exports = {
     entry: './index',
     output: {
         path: path.resolve('dist'),
-        filename: 'nested-object.assign.js'
+        filename: 'nestedObjectAssign.js'
     },
     module:{
         loaders: [
             {
                 test: /\.js$/,
                 exclude: [/node_modules/, /dist/],
-                loader: 'babel-loader'
+                loader: 'babel-loader',
+                query: {
+                    presets: ['es2015']
+                }
             }
         ]
     },