@faasjs/deep_merge 0.0.2-beta.302 → 0.0.2-beta.320

package/{lib → dist}/index.d.ts

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

package/dist/index.js

@@ -0,0 +1,76 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __reExport = (target, module2, copyDefault, desc) => {
+  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
+    for (let key of __getOwnPropNames(module2))
+      if (!__hasOwnProp.call(target, key) && (copyDefault || key !== "default"))
+        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
+  }
+  return target;
+};
+var __toCommonJS = /* @__PURE__ */ ((cache) => {
+  return (module2, temp) => {
+    return cache && cache.get(module2) || (temp = __reExport(__markAsModule({}), module2, 1), cache && cache.set(module2, temp), temp);
+  };
+})(typeof WeakMap !== "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
+
+// src/index.ts
+var src_exports = {};
+__export(src_exports, {
+  deepMerge: () => deepMerge,
+  default: () => src_default
+});
+var shouldMerge = function(item) {
+  const type = Object.prototype.toString.call(item);
+  return type === "[object Object]" || type === "[object Array]";
+};
+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 = __spreadProps(__spreadValues({}, acc), {
+          [key]: val
+        });
+      }
+  return acc;
+}
+var src_default = deepMerge;
+module.exports = __toCommonJS(src_exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  deepMerge
+});

package/dist/index.mjs

@@ -0,0 +1,50 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+
+// 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 = 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 = __spreadProps(__spreadValues({}, acc), {
+          [key]: val
+        });
+      }
+  return acc;
+}
+var src_default = deepMerge;
+export {
+  deepMerge,
+  src_default as default
+};

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@faasjs/deep_merge",
-  "version": "0.0.2-beta.302",
+  "version": "0.0.2-beta.320",
   "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",
+  "module": "dist/index.mjs",
   "homepage": "https://faasjs.com/doc/deep_merge.html",
   "repository": {
     "type": "git",
@@ -16,22 +16,17 @@
   },
   "funding": "https://github.com/sponsors/faasjs",
   "scripts": {
-    "lint": "eslint --ext .ts src",
-    "prepack": "rm -rf ./lib && rollup -c"
+    "build": "rm -rf ./dist && tsup-node src/index.ts --format esm,cjs --dts"
   },
   "files": [
-    "lib"
+    "dist"
   ],
   "devDependencies": {
-    "@types/debug": "*",
-    "@types/jest": "*",
-    "@types/node": "*",
-    "rollup": "*",
-    "rollup-plugin-typescript2": "*",
+    "tsup": "*",
     "typescript": "*"
   },
   "engines": {
     "npm": ">=8.0.0"
   },
-  "gitHead": "b53fb35a91369afd0185fb555d98e5c9d90b54bd"
+  "gitHead": "4a9f699171ad7e20d922e68b74418d1ec5b7d016"
 }

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 { deepMerge, deepMerge as default };

package/lib/index.js

@@ -1,42 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-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;
-}
-
-exports.deepMerge = deepMerge;
-exports["default"] = deepMerge;