From b4cde2a92882af190a8df2122d459af370a7b0cc Mon Sep 17 00:00:00 2001
From: Ivan Motiienko <imoti@softserveinc.com>
Date: Fri, 25 Jan 2019 20:22:32 +0400
Subject: [PATCH] Add default exports to the non-published definition files

---
 types/terminal-kit/Rect.d.ts           | 16 ++++++++++++++--
 types/terminal-kit/ScreenBuffer.d.ts   |  7 ++++---
 types/terminal-kit/ScreenBufferHD.d.ts |  4 ++--
 types/terminal-kit/Terminal.d.ts       |  2 +-
 types/terminal-kit/TextBuffer.d.ts     | 11 +++++------
 types/terminal-kit/index.d.ts          |  6 +-----
 types/terminal-kit/tsconfig.json       |  1 -
 7 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/types/terminal-kit/Rect.d.ts b/types/terminal-kit/Rect.d.ts
index ac8c041dc1..4b2124ea6e 100644
--- a/types/terminal-kit/Rect.d.ts
+++ b/types/terminal-kit/Rect.d.ts
@@ -1,3 +1,7 @@
+import Terminal from "./Terminal";
+import ScreenBuffer from "./ScreenBuffer";
+import TextBuffer from "./TextBuffer";
+
 export as namespace Rect;
 
 declare class Rect {
@@ -9,7 +13,15 @@ declare class Rect {
   readonly ymax: number;
   readonly isNull: boolean;
 
-  constructor(options: Rect.AbsoluteOptions | Rect.Region | Rect | Terminal | ScreenBuffer | TextBuffer);
+  constructor(
+    options:
+      | Rect.AbsoluteOptions
+      | Rect.Region
+      | Rect
+      | Terminal
+      | ScreenBuffer
+      | TextBuffer
+  );
   constructor(xmin: number, xmax: number, ymin: number, ymax: number);
 
   static wrappingRect(params: {
@@ -30,7 +42,7 @@ declare class Rect {
   ): void;
 }
 
-export = Rect;
+export default Rect;
 
 declare namespace Rect {
   type Options = AbsoluteOptions | Region;
diff --git a/types/terminal-kit/ScreenBuffer.d.ts b/types/terminal-kit/ScreenBuffer.d.ts
index 01455b65ba..fdd3010393 100644
--- a/types/terminal-kit/ScreenBuffer.d.ts
+++ b/types/terminal-kit/ScreenBuffer.d.ts
@@ -1,7 +1,8 @@
 import NextGenEvents = require("nextgen-events");
 
-import Terminal = require("./Terminal");
-import ScreenBufferHD = require("./ScreenBufferHD");
+import Terminal from "./Terminal";
+import ScreenBufferHD from "./ScreenBufferHD";
+import Rect from "./Rect";
 
 export as namespace ScreenBuffer;
 
@@ -82,7 +83,7 @@ declare class ScreenBuffer extends NextGenEvents {
   saveSync(filepath: string): void;
 }
 
-export = ScreenBuffer;
+export default ScreenBuffer;
 
 declare namespace ScreenBuffer {
   interface Options {
diff --git a/types/terminal-kit/ScreenBufferHD.d.ts b/types/terminal-kit/ScreenBufferHD.d.ts
index 0f23cd263e..333938c1e9 100644
--- a/types/terminal-kit/ScreenBufferHD.d.ts
+++ b/types/terminal-kit/ScreenBufferHD.d.ts
@@ -1,4 +1,4 @@
-import ScreenBuffer = require("./ScreenBuffer");
+import ScreenBuffer from "./ScreenBuffer";
 
 export as namespace ScreenBufferHD;
 
@@ -37,7 +37,7 @@ declare class ScreenBufferHD extends ScreenBuffer {
   ): void;
 }
 
-export = ScreenBufferHD;
+export default ScreenBufferHD;
 
 declare namespace ScreenBufferHD {
   interface Attributes {
diff --git a/types/terminal-kit/Terminal.d.ts b/types/terminal-kit/Terminal.d.ts
index b6ff8e6fa7..e8b7aa27c0 100644
--- a/types/terminal-kit/Terminal.d.ts
+++ b/types/terminal-kit/Terminal.d.ts
@@ -3,7 +3,7 @@ import EventEmitter = require("nextgen-events");
 
 type Terminal = Terminal.Impl & EventEmitter;
 
-export = Terminal;
+export default Terminal;
 
 type Callback<T> = ((err: any) => void) | ((err: undefined, arg: T) => void);
 
diff --git a/types/terminal-kit/TextBuffer.d.ts b/types/terminal-kit/TextBuffer.d.ts
index 55e585f02a..030a3f6e82 100644
--- a/types/terminal-kit/TextBuffer.d.ts
+++ b/types/terminal-kit/TextBuffer.d.ts
@@ -1,3 +1,6 @@
+import ScreenBuffer from "./ScreenBuffer";
+import Rect from "./Rect";
+
 export as namespace TextBuffer;
 
 declare class TextBuffer {
@@ -16,11 +19,7 @@ declare class TextBuffer {
 
   setEmptyCellAttr(attr: ScreenBuffer.Attributes | number): void;
 
-  setAttrAt(
-    attr: ScreenBuffer.Attributes | number,
-    x: number,
-    y: number
-  ): void;
+  setAttrAt(attr: ScreenBuffer.Attributes | number, x: number, y: number): void;
   setAttrCodeAt(attr: number, x: number, y: number): void;
 
   setAttrRegion(
@@ -78,7 +77,7 @@ declare class TextBuffer {
   save(filepath: string, callback: (error?: any) => void): void;
 }
 
-export = TextBuffer;
+export default TextBuffer;
 
 declare namespace TextBuffer {
   interface Options {
diff --git a/types/terminal-kit/index.d.ts b/types/terminal-kit/index.d.ts
index 8d5d158d3e..38b981adc4 100644
--- a/types/terminal-kit/index.d.ts
+++ b/types/terminal-kit/index.d.ts
@@ -4,11 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.7
 
-import Terminal = require("./Terminal");
-import * as SB from "./ScreenBuffer";
-import * as SBHD from "./ScreenBufferHD";
-import * as R from "./Rect";
-import * as TB from "./TextBuffer";
+import Terminal from "./Terminal";
 
 export as namespace termkit;
 
diff --git a/types/terminal-kit/tsconfig.json b/types/terminal-kit/tsconfig.json
index 949b61722b..fbf0bdacde 100644
--- a/types/terminal-kit/tsconfig.json
+++ b/types/terminal-kit/tsconfig.json
@@ -5,7 +5,6 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "esModuleInterop": true,
         "baseUrl": "../",
         "typeRoots": ["../"],
         "types": [],