From af7022a5f152ae641aeed3703bb1bbc541795cea Mon Sep 17 00:00:00 2001
From: Tim Kang <sh.kang@ecubelabs.com>
Date: Tue, 24 Sep 2019 09:12:08 +0900
Subject: [PATCH] [object-joiner] add @types (#38494)

* Update index.d.ts

* add object-joiner typings
---
 types/object-joiner/index.d.ts             |  8 ++++++++
 types/object-joiner/object-joiner-tests.ts | 11 +++++++++++
 types/object-joiner/tsconfig.json          | 23 ++++++++++++++++++++++
 types/object-joiner/tslint.json            |  1 +
 4 files changed, 43 insertions(+)
 create mode 100644 types/object-joiner/index.d.ts
 create mode 100644 types/object-joiner/object-joiner-tests.ts
 create mode 100644 types/object-joiner/tsconfig.json
 create mode 100644 types/object-joiner/tslint.json

diff --git a/types/object-joiner/index.d.ts b/types/object-joiner/index.d.ts
new file mode 100644
index 0000000000..626a01ef4d
--- /dev/null
+++ b/types/object-joiner/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for object-joiner 1.3
+// Project: https://github.com/sarukuku/object-joiner#readme
+// Definitions by: Tim <https://github.com/me>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function objectJoiner(...args: any[]): any;
+
+export = objectJoiner;
diff --git a/types/object-joiner/object-joiner-tests.ts b/types/object-joiner/object-joiner-tests.ts
new file mode 100644
index 0000000000..84b0c31596
--- /dev/null
+++ b/types/object-joiner/object-joiner-tests.ts
@@ -0,0 +1,11 @@
+import objectJoiner = require("object-joiner");
+
+const rs: any = objectJoiner(
+  {
+    a: 1234,
+    x: 2222
+  },
+  {
+    a: 5555
+  }
+);
diff --git a/types/object-joiner/tsconfig.json b/types/object-joiner/tsconfig.json
new file mode 100644
index 0000000000..e6af79d77e
--- /dev/null
+++ b/types/object-joiner/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",
+        "object-joiner-tests.ts"
+    ]
+}
diff --git a/types/object-joiner/tslint.json b/types/object-joiner/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/object-joiner/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }