From fb12206078448b19b3e24b5b0bc50a45eaee527e Mon Sep 17 00:00:00 2001
From: Richie Bendall <richiebendall@gmail.com>
Date: Sat, 25 Jan 2020 13:27:38 +1300
Subject: [PATCH] feat: Add types for merge-objects (#41822)

Signed-off-by: Richie Bendall <richiebendall@gmail.com>
---
 types/merge-objects/index.d.ts             |  8 ++++++++
 types/merge-objects/merge-objects-tests.ts |  3 +++
 types/merge-objects/tsconfig.json          | 23 ++++++++++++++++++++++
 types/merge-objects/tslint.json            |  1 +
 4 files changed, 35 insertions(+)
 create mode 100644 types/merge-objects/index.d.ts
 create mode 100644 types/merge-objects/merge-objects-tests.ts
 create mode 100644 types/merge-objects/tsconfig.json
 create mode 100644 types/merge-objects/tslint.json

diff --git a/types/merge-objects/index.d.ts b/types/merge-objects/index.d.ts
new file mode 100644
index 0000000000..847414c5a7
--- /dev/null
+++ b/types/merge-objects/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for merge-objects 1.0
+// Project: https://github.com/shevaroller/node-merge-objects#readme
+// Definitions by: Richie Bendall <https://github.com/Richienb>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function mergeObjects<T extends object, U extends object>(object1: T, object2: U): T & U;
+
+export = mergeObjects;
diff --git a/types/merge-objects/merge-objects-tests.ts b/types/merge-objects/merge-objects-tests.ts
new file mode 100644
index 0000000000..fac41562eb
--- /dev/null
+++ b/types/merge-objects/merge-objects-tests.ts
@@ -0,0 +1,3 @@
+import mergeObjects = require("merge-objects");
+
+mergeObjects({ a: 1, b: [2, 3] }, { b: [4, 5], c: 6 }); // $ExpectType { a: number; b: number[]; } & { b: number[]; c: number; }
diff --git a/types/merge-objects/tsconfig.json b/types/merge-objects/tsconfig.json
new file mode 100644
index 0000000000..bc68e5810f
--- /dev/null
+++ b/types/merge-objects/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "merge-objects-tests.ts"
+    ]
+}
diff --git a/types/merge-objects/tslint.json b/types/merge-objects/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/merge-objects/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }