@faasjs/deep_merge 0.0.2-beta.54 → 0.0.3-beta.2

package/README.md

@@ -1,7 +1,45 @@
 # @faasjs/deep_merge
 
-合并对象
-
-[![License: MIT](https://img.shields.io/npm/l/@faasjs/deep_merge.svg)](https://github.com/faasjs/faasjs/blob/master/packages/faasjs/deep_merge/LICENSE)
+[![License: MIT](https://img.shields.io/npm/l/@faasjs/deep_merge.svg)](https://github.com/faasjs/faasjs/blob/main/packages/faasjs/deep_merge/LICENSE)
 [![NPM Stable Version](https://img.shields.io/npm/v/@faasjs/deep_merge/stable.svg)](https://www.npmjs.com/package/@faasjs/deep_merge)
 [![NPM Beta Version](https://img.shields.io/npm/v/@faasjs/deep_merge/beta.svg)](https://www.npmjs.com/package/@faasjs/deep_merge)
+
+A helper function to deep merge objects and array.
+
+## Install
+
+    npm install @faasjs/deep_merge
+
+## Modules
+
+### Functions
+
+- [deepMerge](#deepmerge)
+
+## Functions
+
+### deepMerge
+
+▸ **deepMerge**(...`sources`): `any`
+
+Deep merge two objects or arrays.
+
+Features:
+* All objects will be cloned before merging.
+* Merging order is from right to left.
+* If an array include same objects, it will be unique to one.
+
+```ts
+deepMerge({ a: 1 }, { a: 2 }) // { a: 2 }
+deepMerge([1, 2], [2, 3]) // [1, 2, 3]
+```
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `...sources` | `any`[] |
+
+#### Returns
+
+`any`

package/dist/index.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Deep merge two objects or arrays.
+ *
+ * Features:
+ * * All objects will be cloned before merging.
+ * * Merging order is from right to left.
+ * * If an array include same objects, it will be unique to one.
+ *
+ * ```ts
+ * deepMerge({ a: 1 }, { a: 2 }) // { a: 2 }
+ * deepMerge([1, 2], [2, 3]) // [1, 2, 3]
+ * ```
+ */
+declare function deepMerge(...sources: any[]): any;
+
+export { deepMerge };

package/dist/index.js

@@ -0,0 +1,54 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/index.ts
+var src_exports = {};
+__export(src_exports, {
+  deepMerge: () => deepMerge
+});
+module.exports = __toCommonJS(src_exports);
+var shouldMerge = function(item) {
+  const type = Object.prototype.toString.call(item);
+  return type === "[object Object]" || type === "[object Array]";
+};
+function deepMerge(...sources) {
+  let acc = /* @__PURE__ */ Object.create(null);
+  for (const source of sources)
+    if (source instanceof Array) {
+      if (!(acc instanceof Array))
+        acc = [];
+      acc = [...new Set(source.concat(...acc))];
+    } else if (shouldMerge(source))
+      for (const [key, value] of Object.entries(source)) {
+        let val;
+        if (shouldMerge(value))
+          val = deepMerge(acc[key], value);
+        else
+          val = value;
+        acc = {
+          ...acc,
+          [key]: val
+        };
+      }
+  return acc;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  deepMerge
+});

package/dist/index.mjs

@@ -0,0 +1,29 @@
+// src/index.ts
+var shouldMerge = function(item) {
+  const type = Object.prototype.toString.call(item);
+  return type === "[object Object]" || type === "[object Array]";
+};
+function deepMerge(...sources) {
+  let acc = /* @__PURE__ */ Object.create(null);
+  for (const source of sources)
+    if (source instanceof Array) {
+      if (!(acc instanceof Array))
+        acc = [];
+      acc = [...new Set(source.concat(...acc))];
+    } else if (shouldMerge(source))
+      for (const [key, value] of Object.entries(source)) {
+        let val;
+        if (shouldMerge(value))
+          val = deepMerge(acc[key], value);
+        else
+          val = value;
+        acc = {
+          ...acc,
+          [key]: val
+        };
+      }
+  return acc;
+}
+export {
+  deepMerge
+};

package/package.json

@@ -1,25 +1,28 @@
 {
   "name": "@faasjs/deep_merge",
-  "version": "0.0.2-beta.54",
+  "version": "0.0.3-beta.2",
   "license": "MIT",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "module": "lib/index.es.js",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "homepage": "https://faasjs.com/doc/deep_merge.html",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/faasjs/faasjs.git",
+    "directory": "packages/deep_merge"
+  },
+  "bugs": {
+    "url": "https://github.com/faasjs/faasjs/issues"
+  },
+  "funding": "https://github.com/sponsors/faasjs",
   "scripts": {
-    "lint": "eslint --ext .ts src",
-    "prepack": "rm -rf ./lib && rollup -c",
-    "ci": "yarn lint && jest --silent"
+    "build": "tsup-node src/index.ts --format esm,cjs",
+    "build:types": "tsup-node src/index.ts --dts-only"
   },
   "files": [
-    "lib"
+    "dist"
   ],
-  "devDependencies": {
-    "@types/debug": "*",
-    "@types/jest": "*",
-    "@types/node": "*",
-    "rollup": "*",
-    "rollup-plugin-typescript2": "*",
-    "typescript": "*"
-  },
-  "gitHead": "ef598f53e0d1a357ced00d98df09818309dd207f"
+  "engines": {
+    "npm": ">=8.0.0",
+    "node": ">=16.0.0"
+  }
 }

package/lib/index.d.ts

@@ -1,10 +0,0 @@
-/**
- * 合并对象
- * @description
- * 注意事项：
- * * 合并时会复制对象，不会修改原对象
- * * 合并顺序是后面的覆盖前面的
- * * 若有数组形式的属性，数组里的内容将被去重合并
- * @param sources [...any] 合并对象
- */
-export default function deepMerge(...sources: any[]): any;

package/lib/index.es.js

@@ -1,37 +0,0 @@
-const shouldMerge = function (item) {
-    const type = Object.prototype.toString.call(item);
-    return type === '[object Object]' || type === '[object Array]';
-};
-/**
- * 合并对象
- * @description
- * 注意事项：
- * * 合并时会复制对象，不会修改原对象
- * * 合并顺序是后面的覆盖前面的
- * * 若有数组形式的属性，数组里的内容将被去重合并
- * @param sources [...any] 合并对象
- */
-function deepMerge(...sources) {
-    let acc = Object.create(null);
-    for (const source of sources)
-        if (source instanceof Array) {
-            if (!(acc instanceof Array))
-                acc = [];
-            acc = [...new Set((source).concat(...acc))];
-        }
-        else if (shouldMerge(source))
-            for (const [key, value] of Object.entries(source)) {
-                let val;
-                if (shouldMerge(value))
-                    val = deepMerge(acc[key], value);
-                else
-                    val = value;
-                acc = {
-                    ...acc,
-                    [key]: val,
-                };
-            }
-    return acc;
-}
-
-export default deepMerge;

package/lib/index.js

@@ -1,39 +0,0 @@
-'use strict';
-
-const shouldMerge = function (item) {
-    const type = Object.prototype.toString.call(item);
-    return type === '[object Object]' || type === '[object Array]';
-};
-/**
- * 合并对象
- * @description
- * 注意事项：
- * * 合并时会复制对象，不会修改原对象
- * * 合并顺序是后面的覆盖前面的
- * * 若有数组形式的属性，数组里的内容将被去重合并
- * @param sources [...any] 合并对象
- */
-function deepMerge(...sources) {
-    let acc = Object.create(null);
-    for (const source of sources)
-        if (source instanceof Array) {
-            if (!(acc instanceof Array))
-                acc = [];
-            acc = [...new Set((source).concat(...acc))];
-        }
-        else if (shouldMerge(source))
-            for (const [key, value] of Object.entries(source)) {
-                let val;
-                if (shouldMerge(value))
-                    val = deepMerge(acc[key], value);
-                else
-                    val = value;
-                acc = {
-                    ...acc,
-                    [key]: val,
-                };
-            }
-    return acc;
-}
-
-module.exports = deepMerge;