Skip to content

Commit 80151be

Browse files
yeikosyeikos
committedNov 14, 2020
build
·
v2.1.1v2.1.0
1 parent 0acaaf3 commit 80151be

File tree

3 files changed

+135
-183
lines changed

3 files changed

+135
-183
lines changed
 

‎dist/merge.browser.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/merge.browser.test.js

+133-182
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,102 @@
1-
/******/ (function(modules) { // webpackBootstrap
2-
/******/ // The module cache
3-
/******/ var installedModules = {};
4-
/******/
5-
/******/ // The require function
6-
/******/ function __webpack_require__(moduleId) {
7-
/******/
8-
/******/ // Check if module is in cache
9-
/******/ if(installedModules[moduleId]) {
10-
/******/ return installedModules[moduleId].exports;
11-
/******/ }
12-
/******/ // Create a new module (and put it into the cache)
13-
/******/ var module = installedModules[moduleId] = {
14-
/******/ i: moduleId,
15-
/******/ l: false,
16-
/******/ exports: {}
17-
/******/ };
18-
/******/
19-
/******/ // Execute the module function
20-
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
21-
/******/
22-
/******/ // Flag the module as loaded
23-
/******/ module.l = true;
24-
/******/
25-
/******/ // Return the exports of the module
26-
/******/ return module.exports;
27-
/******/ }
28-
/******/
29-
/******/
30-
/******/ // expose the modules object (__webpack_modules__)
31-
/******/ __webpack_require__.m = modules;
32-
/******/
33-
/******/ // expose the module cache
34-
/******/ __webpack_require__.c = installedModules;
35-
/******/
36-
/******/ // define getter function for harmony exports
37-
/******/ __webpack_require__.d = function(exports, name, getter) {
38-
/******/ if(!__webpack_require__.o(exports, name)) {
39-
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
40-
/******/ }
41-
/******/ };
42-
/******/
43-
/******/ // define __esModule on exports
44-
/******/ __webpack_require__.r = function(exports) {
45-
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
46-
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
47-
/******/ }
48-
/******/ Object.defineProperty(exports, '__esModule', { value: true });
49-
/******/ };
50-
/******/
51-
/******/ // create a fake namespace object
52-
/******/ // mode & 1: value is a module id, require it
53-
/******/ // mode & 2: merge all properties of value into the ns
54-
/******/ // mode & 4: return value when already ns object
55-
/******/ // mode & 8|1: behave like require
56-
/******/ __webpack_require__.t = function(value, mode) {
57-
/******/ if(mode & 1) value = __webpack_require__(value);
58-
/******/ if(mode & 8) return value;
59-
/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
60-
/******/ var ns = Object.create(null);
61-
/******/ __webpack_require__.r(ns);
62-
/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
63-
/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
64-
/******/ return ns;
65-
/******/ };
66-
/******/
67-
/******/ // getDefaultExport function for compatibility with non-harmony modules
68-
/******/ __webpack_require__.n = function(module) {
69-
/******/ var getter = module && module.__esModule ?
70-
/******/ function getDefault() { return module['default']; } :
71-
/******/ function getModuleExports() { return module; };
72-
/******/ __webpack_require__.d(getter, 'a', getter);
73-
/******/ return getter;
74-
/******/ };
75-
/******/
76-
/******/ // Object.prototype.hasOwnProperty.call
77-
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
78-
/******/
79-
/******/ // __webpack_public_path__
80-
/******/ __webpack_require__.p = "";
81-
/******/
82-
/******/
83-
/******/ // Load entry module and return exports
84-
/******/ return __webpack_require__(__webpack_require__.s = 0);
85-
/******/ })
86-
/************************************************************************/
87-
/******/ ([
88-
/* 0 */
89-
/***/ (function(module, exports, __webpack_require__) {
1+
/******/ (() => { // webpackBootstrap
2+
/******/ "use strict";
3+
/******/ var __webpack_modules__ = ({
4+
5+
/***/ 496:
6+
/***/ ((module, exports) => {
7+
8+
9+
Object.defineProperty(exports, "__esModule", ({ value: true }));
10+
exports.isPlainObject = exports.clone = exports.recursive = exports.merge = exports.main = void 0;
11+
module.exports = exports = main;
12+
exports.default = main;
13+
function main() {
14+
var items = [];
15+
for (var _i = 0; _i < arguments.length; _i++) {
16+
items[_i] = arguments[_i];
17+
}
18+
return merge.apply(void 0, items);
19+
}
20+
exports.main = main;
21+
main.clone = clone;
22+
main.isPlainObject = isPlainObject;
23+
main.recursive = recursive;
24+
function merge() {
25+
var items = [];
26+
for (var _i = 0; _i < arguments.length; _i++) {
27+
items[_i] = arguments[_i];
28+
}
29+
return _merge(items[0] === true, false, items);
30+
}
31+
exports.merge = merge;
32+
function recursive() {
33+
var items = [];
34+
for (var _i = 0; _i < arguments.length; _i++) {
35+
items[_i] = arguments[_i];
36+
}
37+
return _merge(items[0] === true, true, items);
38+
}
39+
exports.recursive = recursive;
40+
function clone(input) {
41+
if (Array.isArray(input)) {
42+
var output = [];
43+
for (var index = 0; index < input.length; ++index)
44+
output.push(clone(input[index]));
45+
return output;
46+
}
47+
else if (isPlainObject(input)) {
48+
var output = {};
49+
for (var index in input)
50+
output[index] = clone(input[index]);
51+
return output;
52+
}
53+
else {
54+
return input;
55+
}
56+
}
57+
exports.clone = clone;
58+
function isPlainObject(input) {
59+
return input && typeof input === 'object' && !Array.isArray(input);
60+
}
61+
exports.isPlainObject = isPlainObject;
62+
function _recursiveMerge(base, extend) {
63+
if (!isPlainObject(base))
64+
return extend;
65+
for (var key in extend)
66+
base[key] = (isPlainObject(base[key]) && isPlainObject(extend[key])) ?
67+
_recursiveMerge(base[key], extend[key]) :
68+
extend[key];
69+
return base;
70+
}
71+
function _merge(isClone, isRecursive, items) {
72+
var result;
73+
if (isClone || !isPlainObject(result = items.shift()))
74+
result = {};
75+
for (var index = 0; index < items.length; ++index) {
76+
var item = items[index];
77+
if (!isPlainObject(item))
78+
continue;
79+
for (var key in item) {
80+
if (key === '__proto__' || key === 'constructor' || key === 'prototype')
81+
continue;
82+
var value = isClone ? clone(item[key]) : item[key];
83+
result[key] = isRecursive ? _recursiveMerge(result[key], value) : value;
84+
}
85+
}
86+
return result;
87+
}
88+
89+
90+
/***/ }),
91+
92+
/***/ 186:
93+
/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
9094

91-
"use strict";
95+
var __webpack_unused_export__;
9296

93-
Object.defineProperty(exports, "__esModule", { value: true });
94-
var chai_1 = __webpack_require__(1);
95-
var index_1 = __webpack_require__(2);
97+
__webpack_unused_export__ = ({ value: true });
98+
var chai_1 = __webpack_require__(153);
99+
var index_1 = __webpack_require__(496);
96100
describe('merge', function () {
97101
it('basic', function () {
98102
chai_1.assert.deepEqual(index_1.default({ a: 1 }, { b: 2 }), { a: 1, b: 2 });
@@ -195,96 +199,43 @@ describe('merge.recursive', function () {
195199

196200

197201
/***/ }),
198-
/* 1 */
199-
/***/ (function(module, exports) {
200202

201-
module.exports = chai;
202-
203-
/***/ }),
204-
/* 2 */
205-
/***/ (function(module, exports, __webpack_require__) {
206-
207-
"use strict";
208-
209-
Object.defineProperty(exports, "__esModule", { value: true });
210-
module.exports = exports = main;
211-
exports.default = main;
212-
function main() {
213-
var items = [];
214-
for (var _i = 0; _i < arguments.length; _i++) {
215-
items[_i] = arguments[_i];
216-
}
217-
return merge.apply(void 0, items);
218-
}
219-
exports.main = main;
220-
main.clone = clone;
221-
main.isPlainObject = isPlainObject;
222-
main.recursive = recursive;
223-
function merge() {
224-
var items = [];
225-
for (var _i = 0; _i < arguments.length; _i++) {
226-
items[_i] = arguments[_i];
227-
}
228-
return _merge(items[0] === true, false, items);
229-
}
230-
exports.merge = merge;
231-
function recursive() {
232-
var items = [];
233-
for (var _i = 0; _i < arguments.length; _i++) {
234-
items[_i] = arguments[_i];
235-
}
236-
return _merge(items[0] === true, true, items);
237-
}
238-
exports.recursive = recursive;
239-
function clone(input) {
240-
if (Array.isArray(input)) {
241-
var output = [];
242-
for (var index = 0; index < input.length; ++index)
243-
output.push(clone(input[index]));
244-
return output;
245-
}
246-
else if (isPlainObject(input)) {
247-
var output = {};
248-
for (var index in input)
249-
output[index] = clone(input[index]);
250-
return output;
251-
}
252-
else {
253-
return input;
254-
}
255-
}
256-
exports.clone = clone;
257-
function isPlainObject(input) {
258-
return input && typeof input === 'object' && !Array.isArray(input);
259-
}
260-
exports.isPlainObject = isPlainObject;
261-
function _recursiveMerge(base, extend) {
262-
if (!isPlainObject(base))
263-
return extend;
264-
for (var key in extend)
265-
base[key] = (isPlainObject(base[key]) && isPlainObject(extend[key])) ?
266-
_recursiveMerge(base[key], extend[key]) :
267-
extend[key];
268-
return base;
269-
}
270-
function _merge(isClone, isRecursive, items) {
271-
var result;
272-
if (isClone || !isPlainObject(result = items.shift()))
273-
result = {};
274-
for (var index = 0; index < items.length; ++index) {
275-
var item = items[index];
276-
if (!isPlainObject(item))
277-
continue;
278-
for (var key in item) {
279-
if (key === '__proto__' || key === 'constructor' || key === 'prototype')
280-
continue;
281-
var value = isClone ? clone(item[key]) : item[key];
282-
result[key] = isRecursive ? _recursiveMerge(result[key], value) : value;
283-
}
284-
}
285-
return result;
286-
}
203+
/***/ 153:
204+
/***/ ((module) => {
287205

206+
module.exports = chai;
288207

289208
/***/ })
290-
/******/ ]);
209+
210+
/******/ });
211+
/************************************************************************/
212+
/******/ // The module cache
213+
/******/ var __webpack_module_cache__ = {};
214+
/******/
215+
/******/ // The require function
216+
/******/ function __webpack_require__(moduleId) {
217+
/******/ // Check if module is in cache
218+
/******/ if(__webpack_module_cache__[moduleId]) {
219+
/******/ return __webpack_module_cache__[moduleId].exports;
220+
/******/ }
221+
/******/ // Create a new module (and put it into the cache)
222+
/******/ var module = __webpack_module_cache__[moduleId] = {
223+
/******/ // no module.id needed
224+
/******/ // no module.loaded needed
225+
/******/ exports: {}
226+
/******/ };
227+
/******/
228+
/******/ // Execute the module function
229+
/******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
230+
/******/
231+
/******/ // Return the exports of the module
232+
/******/ return module.exports;
233+
/******/ }
234+
/******/
235+
/************************************************************************/
236+
/******/ // startup
237+
/******/ // Load entry module
238+
/******/ __webpack_require__(186);
239+
/******/ // This entry module used 'exports' so it can't be inlined
240+
/******/ })()
241+
;

‎lib/src/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"use strict";
22
Object.defineProperty(exports, "__esModule", { value: true });
3+
exports.isPlainObject = exports.clone = exports.recursive = exports.merge = exports.main = void 0;
34
module.exports = exports = main;
45
exports.default = main;
56
function main() {

0 commit comments

Comments
 (0)
Please sign in to comment.