From 0f96c39ea1f8ad3fb080918ed5e47508d6d7dbd5 Mon Sep 17 00:00:00 2001
From: Daniel Ludwig <d.ludwig@micromata.de>
Date: Wed, 15 Jul 2020 11:22:07 +0200
Subject: [PATCH 1/8] Fix for issue 4656 typescript-node generate invalid
 require statement instead of import statement

---
 .../src/main/resources/typescript-node/api-single.mustache    | 4 ++--
 .../src/main/resources/typescript-node/models.mustache        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache b/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache
index d54c5bd341bf..1ab3bd0f66bd 100644
--- a/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache
@@ -1,6 +1,6 @@
 {{>licenseInfo}}
-import localVarRequest = require('request');
-import http = require('http');
+import localVarRequest from 'request';
+import http from 'http';
 
 /* tslint:disable:no-unused-locals */
 {{#imports}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-node/models.mustache b/modules/openapi-generator/src/main/resources/typescript-node/models.mustache
index f129eb63e785..41bf1422eab8 100644
--- a/modules/openapi-generator/src/main/resources/typescript-node/models.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-node/models.mustache
@@ -4,7 +4,7 @@ export * from '{{{ classFilename }}}';
 {{/model}}
 {{/models}}
 
-import localVarRequest = require('request');
+import localVarRequest from 'request';
 
 {{#models}}
 {{#model}}

From 0b1d179d69d512743c0e1a86197a3dfe9e781e9a Mon Sep 17 00:00:00 2001
From: Daniel Ludwig <d.ludwig@micromata.de>
Date: Wed, 15 Jul 2020 11:47:47 +0200
Subject: [PATCH 2/8] Fixed broken link under testing templates

---
 CONTRIBUTING.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f84bf3a3e60d..1cbc751830f0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -87,8 +87,7 @@ To add test cases (optional) covering the change in the code generator, please r
 To test the templates, please perform the following:
 
 - Update the Petstore sample by running the shell scripts under the `bin` folder. For example, run `./bin/generate-samples.sh .
-/bin/configs/python*` to update the Python-related samples under [`samples`](https://github.com/openapitools/openapi-generator/t
-ree/master/samples). For Windows, please install [GIT bash](https://gitforwindows.org/). (If you find that there are new files g
+/bin/configs/python*` to update the Python-related samples under [`samples`](https://github.com/openapitools/openapi-generator/tree/master/samples). For Windows, please install [GIT bash](https://gitforwindows.org/). (If you find that there are new files g
 enerated or unexpected changes as a result of the update, that's not unusual as the test cases are added to the OpenAPI spec fro
 m time to time. If you've questions or concerns, please open a ticket to start a discussion)
 - During development it can be helpful to quickly regenerate the samples without recompiling all of openapi-generator, e.g. when you have only updated the mustache templates. This can be done by passing the `-t` parameter: `-t modules/openapi-generator/src/main/resources/python`.

From dd86be369b387729cfb4687e7849b235aa726cfe Mon Sep 17 00:00:00 2001
From: Daniel Ludwig <d.ludwig@micromata.de>
Date: Wed, 15 Jul 2020 12:24:34 +0200
Subject: [PATCH 3/8] Result of run generate-samples.sh / typescript-node*

---
 .../typescript-node/default/.openapi-generator/FILES | 12 ++++++------
 .../petstore/typescript-node/default/api/petApi.ts   |  4 ++--
 .../petstore/typescript-node/default/api/storeApi.ts |  4 ++--
 .../petstore/typescript-node/default/api/userApi.ts  |  4 ++--
 .../petstore/typescript-node/default/model/models.ts |  2 +-
 .../typescript-node/npm/.openapi-generator/FILES     | 12 ++++++------
 .../petstore/typescript-node/npm/api/petApi.ts       |  4 ++--
 .../petstore/typescript-node/npm/api/storeApi.ts     |  4 ++--
 .../petstore/typescript-node/npm/api/userApi.ts      |  4 ++--
 .../petstore/typescript-node/npm/model/models.ts     |  2 +-
 10 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/samples/client/petstore/typescript-node/default/.openapi-generator/FILES b/samples/client/petstore/typescript-node/default/.openapi-generator/FILES
index c4f1df469e4b..ff52c7c5b2b8 100644
--- a/samples/client/petstore/typescript-node/default/.openapi-generator/FILES
+++ b/samples/client/petstore/typescript-node/default/.openapi-generator/FILES
@@ -5,10 +5,10 @@ api/petApi.ts
 api/storeApi.ts
 api/userApi.ts
 git_push.sh
-model/./apiResponse.ts
-model/./category.ts
-model/./order.ts
-model/./pet.ts
-model/./tag.ts
-model/./user.ts
+model/apiResponse.ts
+model/category.ts
+model/order.ts
+model/pet.ts
+model/tag.ts
+model/user.ts
 model/models.ts
diff --git a/samples/client/petstore/typescript-node/default/api/petApi.ts b/samples/client/petstore/typescript-node/default/api/petApi.ts
index 610dafca441c..ba780c0d90b8 100644
--- a/samples/client/petstore/typescript-node/default/api/petApi.ts
+++ b/samples/client/petstore/typescript-node/default/api/petApi.ts
@@ -10,8 +10,8 @@
  * Do not edit the class manually.
  */
 
-import localVarRequest = require('request');
-import http = require('http');
+import localVarRequest from 'request';
+import http from 'http';
 
 /* tslint:disable:no-unused-locals */
 import { ApiResponse } from '../model/apiResponse';
diff --git a/samples/client/petstore/typescript-node/default/api/storeApi.ts b/samples/client/petstore/typescript-node/default/api/storeApi.ts
index 42ca3f345af6..bc3911f3fbfb 100644
--- a/samples/client/petstore/typescript-node/default/api/storeApi.ts
+++ b/samples/client/petstore/typescript-node/default/api/storeApi.ts
@@ -10,8 +10,8 @@
  * Do not edit the class manually.
  */
 
-import localVarRequest = require('request');
-import http = require('http');
+import localVarRequest from 'request';
+import http from 'http';
 
 /* tslint:disable:no-unused-locals */
 import { Order } from '../model/order';
diff --git a/samples/client/petstore/typescript-node/default/api/userApi.ts b/samples/client/petstore/typescript-node/default/api/userApi.ts
index d22eedd21f86..9c27c5b4e732 100644
--- a/samples/client/petstore/typescript-node/default/api/userApi.ts
+++ b/samples/client/petstore/typescript-node/default/api/userApi.ts
@@ -10,8 +10,8 @@
  * Do not edit the class manually.
  */
 
-import localVarRequest = require('request');
-import http = require('http');
+import localVarRequest from 'request';
+import http from 'http';
 
 /* tslint:disable:no-unused-locals */
 import { User } from '../model/user';
diff --git a/samples/client/petstore/typescript-node/default/model/models.ts b/samples/client/petstore/typescript-node/default/model/models.ts
index faf72498f767..1da13addd120 100644
--- a/samples/client/petstore/typescript-node/default/model/models.ts
+++ b/samples/client/petstore/typescript-node/default/model/models.ts
@@ -5,7 +5,7 @@ export * from './pet';
 export * from './tag';
 export * from './user';
 
-import localVarRequest = require('request');
+import localVarRequest from 'request';
 
 import { ApiResponse } from './apiResponse';
 import { Category } from './category';
diff --git a/samples/client/petstore/typescript-node/npm/.openapi-generator/FILES b/samples/client/petstore/typescript-node/npm/.openapi-generator/FILES
index 914f5ced854a..d24a1934784b 100644
--- a/samples/client/petstore/typescript-node/npm/.openapi-generator/FILES
+++ b/samples/client/petstore/typescript-node/npm/.openapi-generator/FILES
@@ -5,12 +5,12 @@ api/petApi.ts
 api/storeApi.ts
 api/userApi.ts
 git_push.sh
-model/./apiResponse.ts
-model/./category.ts
-model/./order.ts
-model/./pet.ts
-model/./tag.ts
-model/./user.ts
+model/apiResponse.ts
+model/category.ts
+model/order.ts
+model/pet.ts
+model/tag.ts
+model/user.ts
 model/models.ts
 package.json
 tsconfig.json
diff --git a/samples/client/petstore/typescript-node/npm/api/petApi.ts b/samples/client/petstore/typescript-node/npm/api/petApi.ts
index 610dafca441c..ba780c0d90b8 100644
--- a/samples/client/petstore/typescript-node/npm/api/petApi.ts
+++ b/samples/client/petstore/typescript-node/npm/api/petApi.ts
@@ -10,8 +10,8 @@
  * Do not edit the class manually.
  */
 
-import localVarRequest = require('request');
-import http = require('http');
+import localVarRequest from 'request';
+import http from 'http';
 
 /* tslint:disable:no-unused-locals */
 import { ApiResponse } from '../model/apiResponse';
diff --git a/samples/client/petstore/typescript-node/npm/api/storeApi.ts b/samples/client/petstore/typescript-node/npm/api/storeApi.ts
index 42ca3f345af6..bc3911f3fbfb 100644
--- a/samples/client/petstore/typescript-node/npm/api/storeApi.ts
+++ b/samples/client/petstore/typescript-node/npm/api/storeApi.ts
@@ -10,8 +10,8 @@
  * Do not edit the class manually.
  */
 
-import localVarRequest = require('request');
-import http = require('http');
+import localVarRequest from 'request';
+import http from 'http';
 
 /* tslint:disable:no-unused-locals */
 import { Order } from '../model/order';
diff --git a/samples/client/petstore/typescript-node/npm/api/userApi.ts b/samples/client/petstore/typescript-node/npm/api/userApi.ts
index d22eedd21f86..9c27c5b4e732 100644
--- a/samples/client/petstore/typescript-node/npm/api/userApi.ts
+++ b/samples/client/petstore/typescript-node/npm/api/userApi.ts
@@ -10,8 +10,8 @@
  * Do not edit the class manually.
  */
 
-import localVarRequest = require('request');
-import http = require('http');
+import localVarRequest from 'request';
+import http from 'http';
 
 /* tslint:disable:no-unused-locals */
 import { User } from '../model/user';
diff --git a/samples/client/petstore/typescript-node/npm/model/models.ts b/samples/client/petstore/typescript-node/npm/model/models.ts
index faf72498f767..1da13addd120 100644
--- a/samples/client/petstore/typescript-node/npm/model/models.ts
+++ b/samples/client/petstore/typescript-node/npm/model/models.ts
@@ -5,7 +5,7 @@ export * from './pet';
 export * from './tag';
 export * from './user';
 
-import localVarRequest = require('request');
+import localVarRequest from 'request';
 
 import { ApiResponse } from './apiResponse';
 import { Category } from './category';

From b03d6327331cf2c99af7d4a0b7b9ebbc71f4ece0 Mon Sep 17 00:00:00 2001
From: Daniel Ludwig <d.ludwig@micromata.de>
Date: Wed, 15 Jul 2020 16:16:33 +0200
Subject: [PATCH 4/8] import stmt depending on flag supportsES6

---
 .../src/main/resources/typescript-node/api-single.mustache | 7 +++++++
 .../src/main/resources/typescript-node/models.mustache     | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache b/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache
index 1ab3bd0f66bd..ef54eada693d 100644
--- a/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache
@@ -1,6 +1,13 @@
 {{>licenseInfo}}
+
+{{#supportsES6}}
 import localVarRequest from 'request';
 import http from 'http';
+{{/supportsES6}}
+{{^supportsES6}}
+import localVarRequest = require('request');
+import http = require('http');
+{{/supportsES6}}
 
 /* tslint:disable:no-unused-locals */
 {{#imports}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-node/models.mustache b/modules/openapi-generator/src/main/resources/typescript-node/models.mustache
index 41bf1422eab8..a16b09265a04 100644
--- a/modules/openapi-generator/src/main/resources/typescript-node/models.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-node/models.mustache
@@ -4,7 +4,12 @@ export * from '{{{ classFilename }}}';
 {{/model}}
 {{/models}}
 
+{{#supportsES6}}
 import localVarRequest from 'request';
+{{/supportsES6}}
+{{^supportsES6}}
+import localVarRequest = require('request');
+{{/supportsES6}}
 
 {{#models}}
 {{#model}}

From 660e78c2fbf285e14f84041c8548842c9e1e3b2c Mon Sep 17 00:00:00 2001
From: Daniel Ludwig <d.ludwig@micromata.de>
Date: Wed, 15 Jul 2020 16:17:09 +0200
Subject: [PATCH 5/8] Update petstore sample for typescript-node

---
 .../client/petstore/typescript-node/default/api/petApi.ts    | 5 +++--
 .../client/petstore/typescript-node/default/api/storeApi.ts  | 5 +++--
 .../client/petstore/typescript-node/default/api/userApi.ts   | 5 +++--
 .../client/petstore/typescript-node/default/model/models.ts  | 2 +-
 samples/client/petstore/typescript-node/npm/api/petApi.ts    | 5 +++--
 samples/client/petstore/typescript-node/npm/api/storeApi.ts  | 5 +++--
 samples/client/petstore/typescript-node/npm/api/userApi.ts   | 5 +++--
 samples/client/petstore/typescript-node/npm/model/models.ts  | 2 +-
 8 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/samples/client/petstore/typescript-node/default/api/petApi.ts b/samples/client/petstore/typescript-node/default/api/petApi.ts
index ba780c0d90b8..8e6152afa965 100644
--- a/samples/client/petstore/typescript-node/default/api/petApi.ts
+++ b/samples/client/petstore/typescript-node/default/api/petApi.ts
@@ -10,8 +10,9 @@
  * Do not edit the class manually.
  */
 
-import localVarRequest from 'request';
-import http from 'http';
+
+import localVarRequest = require('request');
+import http = require('http');
 
 /* tslint:disable:no-unused-locals */
 import { ApiResponse } from '../model/apiResponse';
diff --git a/samples/client/petstore/typescript-node/default/api/storeApi.ts b/samples/client/petstore/typescript-node/default/api/storeApi.ts
index bc3911f3fbfb..3aa345899fae 100644
--- a/samples/client/petstore/typescript-node/default/api/storeApi.ts
+++ b/samples/client/petstore/typescript-node/default/api/storeApi.ts
@@ -10,8 +10,9 @@
  * Do not edit the class manually.
  */
 
-import localVarRequest from 'request';
-import http from 'http';
+
+import localVarRequest = require('request');
+import http = require('http');
 
 /* tslint:disable:no-unused-locals */
 import { Order } from '../model/order';
diff --git a/samples/client/petstore/typescript-node/default/api/userApi.ts b/samples/client/petstore/typescript-node/default/api/userApi.ts
index 9c27c5b4e732..81a0468a9d43 100644
--- a/samples/client/petstore/typescript-node/default/api/userApi.ts
+++ b/samples/client/petstore/typescript-node/default/api/userApi.ts
@@ -10,8 +10,9 @@
  * Do not edit the class manually.
  */
 
-import localVarRequest from 'request';
-import http from 'http';
+
+import localVarRequest = require('request');
+import http = require('http');
 
 /* tslint:disable:no-unused-locals */
 import { User } from '../model/user';
diff --git a/samples/client/petstore/typescript-node/default/model/models.ts b/samples/client/petstore/typescript-node/default/model/models.ts
index 1da13addd120..faf72498f767 100644
--- a/samples/client/petstore/typescript-node/default/model/models.ts
+++ b/samples/client/petstore/typescript-node/default/model/models.ts
@@ -5,7 +5,7 @@ export * from './pet';
 export * from './tag';
 export * from './user';
 
-import localVarRequest from 'request';
+import localVarRequest = require('request');
 
 import { ApiResponse } from './apiResponse';
 import { Category } from './category';
diff --git a/samples/client/petstore/typescript-node/npm/api/petApi.ts b/samples/client/petstore/typescript-node/npm/api/petApi.ts
index ba780c0d90b8..8e6152afa965 100644
--- a/samples/client/petstore/typescript-node/npm/api/petApi.ts
+++ b/samples/client/petstore/typescript-node/npm/api/petApi.ts
@@ -10,8 +10,9 @@
  * Do not edit the class manually.
  */
 
-import localVarRequest from 'request';
-import http from 'http';
+
+import localVarRequest = require('request');
+import http = require('http');
 
 /* tslint:disable:no-unused-locals */
 import { ApiResponse } from '../model/apiResponse';
diff --git a/samples/client/petstore/typescript-node/npm/api/storeApi.ts b/samples/client/petstore/typescript-node/npm/api/storeApi.ts
index bc3911f3fbfb..3aa345899fae 100644
--- a/samples/client/petstore/typescript-node/npm/api/storeApi.ts
+++ b/samples/client/petstore/typescript-node/npm/api/storeApi.ts
@@ -10,8 +10,9 @@
  * Do not edit the class manually.
  */
 
-import localVarRequest from 'request';
-import http from 'http';
+
+import localVarRequest = require('request');
+import http = require('http');
 
 /* tslint:disable:no-unused-locals */
 import { Order } from '../model/order';
diff --git a/samples/client/petstore/typescript-node/npm/api/userApi.ts b/samples/client/petstore/typescript-node/npm/api/userApi.ts
index 9c27c5b4e732..81a0468a9d43 100644
--- a/samples/client/petstore/typescript-node/npm/api/userApi.ts
+++ b/samples/client/petstore/typescript-node/npm/api/userApi.ts
@@ -10,8 +10,9 @@
  * Do not edit the class manually.
  */
 
-import localVarRequest from 'request';
-import http from 'http';
+
+import localVarRequest = require('request');
+import http = require('http');
 
 /* tslint:disable:no-unused-locals */
 import { User } from '../model/user';
diff --git a/samples/client/petstore/typescript-node/npm/model/models.ts b/samples/client/petstore/typescript-node/npm/model/models.ts
index 1da13addd120..faf72498f767 100644
--- a/samples/client/petstore/typescript-node/npm/model/models.ts
+++ b/samples/client/petstore/typescript-node/npm/model/models.ts
@@ -5,7 +5,7 @@ export * from './pet';
 export * from './tag';
 export * from './user';
 
-import localVarRequest from 'request';
+import localVarRequest = require('request');
 
 import { ApiResponse } from './apiResponse';
 import { Category } from './category';

From ad3cde0150087538f661d6b0bd496baccbe628c9 Mon Sep 17 00:00:00 2001
From: Daniel Ludwig <d.ludwig@micromata.de>
Date: Mon, 27 Jul 2020 11:00:14 +0200
Subject: [PATCH 6/8] import ... from stmt for http/request module

---
 .../src/main/resources/typescript-node/api-single.mustache  | 6 ------
 .../src/main/resources/typescript-node/models.mustache      | 5 -----
 .../src/main/resources/typescript-node/tsconfig.mustache    | 2 ++
 .../client/petstore/typescript-node/default/api/petApi.ts   | 4 ++--
 .../client/petstore/typescript-node/default/api/storeApi.ts | 4 ++--
 .../client/petstore/typescript-node/default/api/userApi.ts  | 4 ++--
 .../client/petstore/typescript-node/default/model/models.ts | 2 +-
 samples/client/petstore/typescript-node/npm/api/petApi.ts   | 4 ++--
 samples/client/petstore/typescript-node/npm/api/storeApi.ts | 4 ++--
 samples/client/petstore/typescript-node/npm/api/userApi.ts  | 4 ++--
 samples/client/petstore/typescript-node/npm/model/models.ts | 2 +-
 samples/client/petstore/typescript-node/npm/tsconfig.json   | 2 ++
 12 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache b/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache
index ef54eada693d..e8a6cc5bf360 100644
--- a/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache
@@ -1,13 +1,7 @@
 {{>licenseInfo}}
 
-{{#supportsES6}}
 import localVarRequest from 'request';
 import http from 'http';
-{{/supportsES6}}
-{{^supportsES6}}
-import localVarRequest = require('request');
-import http = require('http');
-{{/supportsES6}}
 
 /* tslint:disable:no-unused-locals */
 {{#imports}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-node/models.mustache b/modules/openapi-generator/src/main/resources/typescript-node/models.mustache
index a16b09265a04..41bf1422eab8 100644
--- a/modules/openapi-generator/src/main/resources/typescript-node/models.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-node/models.mustache
@@ -4,12 +4,7 @@ export * from '{{{ classFilename }}}';
 {{/model}}
 {{/models}}
 
-{{#supportsES6}}
 import localVarRequest from 'request';
-{{/supportsES6}}
-{{^supportsES6}}
-import localVarRequest = require('request');
-{{/supportsES6}}
 
 {{#models}}
 {{#model}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-node/tsconfig.mustache b/modules/openapi-generator/src/main/resources/typescript-node/tsconfig.mustache
index 160a99593a7d..de78697d22a3 100644
--- a/modules/openapi-generator/src/main/resources/typescript-node/tsconfig.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-node/tsconfig.mustache
@@ -4,6 +4,8 @@
         "noImplicitAny": false,
         "suppressImplicitAnyIndexErrors": true,
         "target": "{{#supportsES6}}ES6{{/supportsES6}}{{^supportsES6}}ES5{{/supportsES6}}",
+        "allowSyntheticDefaultImports": true,
+        "esModuleInterop": true,
         "strict": true,
         "moduleResolution": "node",
         "removeComments": true,
diff --git a/samples/client/petstore/typescript-node/default/api/petApi.ts b/samples/client/petstore/typescript-node/default/api/petApi.ts
index 8e6152afa965..f9bc6cfb93d7 100644
--- a/samples/client/petstore/typescript-node/default/api/petApi.ts
+++ b/samples/client/petstore/typescript-node/default/api/petApi.ts
@@ -11,8 +11,8 @@
  */
 
 
-import localVarRequest = require('request');
-import http = require('http');
+import localVarRequest from 'request';
+import http from 'http';
 
 /* tslint:disable:no-unused-locals */
 import { ApiResponse } from '../model/apiResponse';
diff --git a/samples/client/petstore/typescript-node/default/api/storeApi.ts b/samples/client/petstore/typescript-node/default/api/storeApi.ts
index 3aa345899fae..075dc6126fb3 100644
--- a/samples/client/petstore/typescript-node/default/api/storeApi.ts
+++ b/samples/client/petstore/typescript-node/default/api/storeApi.ts
@@ -11,8 +11,8 @@
  */
 
 
-import localVarRequest = require('request');
-import http = require('http');
+import localVarRequest from 'request';
+import http from 'http';
 
 /* tslint:disable:no-unused-locals */
 import { Order } from '../model/order';
diff --git a/samples/client/petstore/typescript-node/default/api/userApi.ts b/samples/client/petstore/typescript-node/default/api/userApi.ts
index 81a0468a9d43..6122ed4221e6 100644
--- a/samples/client/petstore/typescript-node/default/api/userApi.ts
+++ b/samples/client/petstore/typescript-node/default/api/userApi.ts
@@ -11,8 +11,8 @@
  */
 
 
-import localVarRequest = require('request');
-import http = require('http');
+import localVarRequest from 'request';
+import http from 'http';
 
 /* tslint:disable:no-unused-locals */
 import { User } from '../model/user';
diff --git a/samples/client/petstore/typescript-node/default/model/models.ts b/samples/client/petstore/typescript-node/default/model/models.ts
index faf72498f767..1da13addd120 100644
--- a/samples/client/petstore/typescript-node/default/model/models.ts
+++ b/samples/client/petstore/typescript-node/default/model/models.ts
@@ -5,7 +5,7 @@ export * from './pet';
 export * from './tag';
 export * from './user';
 
-import localVarRequest = require('request');
+import localVarRequest from 'request';
 
 import { ApiResponse } from './apiResponse';
 import { Category } from './category';
diff --git a/samples/client/petstore/typescript-node/npm/api/petApi.ts b/samples/client/petstore/typescript-node/npm/api/petApi.ts
index 8e6152afa965..f9bc6cfb93d7 100644
--- a/samples/client/petstore/typescript-node/npm/api/petApi.ts
+++ b/samples/client/petstore/typescript-node/npm/api/petApi.ts
@@ -11,8 +11,8 @@
  */
 
 
-import localVarRequest = require('request');
-import http = require('http');
+import localVarRequest from 'request';
+import http from 'http';
 
 /* tslint:disable:no-unused-locals */
 import { ApiResponse } from '../model/apiResponse';
diff --git a/samples/client/petstore/typescript-node/npm/api/storeApi.ts b/samples/client/petstore/typescript-node/npm/api/storeApi.ts
index 3aa345899fae..075dc6126fb3 100644
--- a/samples/client/petstore/typescript-node/npm/api/storeApi.ts
+++ b/samples/client/petstore/typescript-node/npm/api/storeApi.ts
@@ -11,8 +11,8 @@
  */
 
 
-import localVarRequest = require('request');
-import http = require('http');
+import localVarRequest from 'request';
+import http from 'http';
 
 /* tslint:disable:no-unused-locals */
 import { Order } from '../model/order';
diff --git a/samples/client/petstore/typescript-node/npm/api/userApi.ts b/samples/client/petstore/typescript-node/npm/api/userApi.ts
index 81a0468a9d43..6122ed4221e6 100644
--- a/samples/client/petstore/typescript-node/npm/api/userApi.ts
+++ b/samples/client/petstore/typescript-node/npm/api/userApi.ts
@@ -11,8 +11,8 @@
  */
 
 
-import localVarRequest = require('request');
-import http = require('http');
+import localVarRequest from 'request';
+import http from 'http';
 
 /* tslint:disable:no-unused-locals */
 import { User } from '../model/user';
diff --git a/samples/client/petstore/typescript-node/npm/model/models.ts b/samples/client/petstore/typescript-node/npm/model/models.ts
index faf72498f767..1da13addd120 100644
--- a/samples/client/petstore/typescript-node/npm/model/models.ts
+++ b/samples/client/petstore/typescript-node/npm/model/models.ts
@@ -5,7 +5,7 @@ export * from './pet';
 export * from './tag';
 export * from './user';
 
-import localVarRequest = require('request');
+import localVarRequest from 'request';
 
 import { ApiResponse } from './apiResponse';
 import { Category } from './category';
diff --git a/samples/client/petstore/typescript-node/npm/tsconfig.json b/samples/client/petstore/typescript-node/npm/tsconfig.json
index d6a89cb7a455..afce3b7abd4a 100644
--- a/samples/client/petstore/typescript-node/npm/tsconfig.json
+++ b/samples/client/petstore/typescript-node/npm/tsconfig.json
@@ -4,6 +4,8 @@
         "noImplicitAny": false,
         "suppressImplicitAnyIndexErrors": true,
         "target": "ES5",
+        "allowSyntheticDefaultImports": true,
+        "esModuleInterop": true,
         "strict": true,
         "moduleResolution": "node",
         "removeComments": true,

From 547e30521f96f8879fae76eca197ab7df20b99cc Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Tue, 28 Jul 2020 10:32:03 +0800
Subject: [PATCH 7/8] update samples

---
 .../typescript-node/default/.openapi-generator/FILES | 12 ++++++------
 .../typescript-node/npm/.openapi-generator/FILES     | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/samples/client/petstore/typescript-node/default/.openapi-generator/FILES b/samples/client/petstore/typescript-node/default/.openapi-generator/FILES
index ff52c7c5b2b8..c4f1df469e4b 100644
--- a/samples/client/petstore/typescript-node/default/.openapi-generator/FILES
+++ b/samples/client/petstore/typescript-node/default/.openapi-generator/FILES
@@ -5,10 +5,10 @@ api/petApi.ts
 api/storeApi.ts
 api/userApi.ts
 git_push.sh
-model/apiResponse.ts
-model/category.ts
-model/order.ts
-model/pet.ts
-model/tag.ts
-model/user.ts
+model/./apiResponse.ts
+model/./category.ts
+model/./order.ts
+model/./pet.ts
+model/./tag.ts
+model/./user.ts
 model/models.ts
diff --git a/samples/client/petstore/typescript-node/npm/.openapi-generator/FILES b/samples/client/petstore/typescript-node/npm/.openapi-generator/FILES
index d24a1934784b..914f5ced854a 100644
--- a/samples/client/petstore/typescript-node/npm/.openapi-generator/FILES
+++ b/samples/client/petstore/typescript-node/npm/.openapi-generator/FILES
@@ -5,12 +5,12 @@ api/petApi.ts
 api/storeApi.ts
 api/userApi.ts
 git_push.sh
-model/apiResponse.ts
-model/category.ts
-model/order.ts
-model/pet.ts
-model/tag.ts
-model/user.ts
+model/./apiResponse.ts
+model/./category.ts
+model/./order.ts
+model/./pet.ts
+model/./tag.ts
+model/./user.ts
 model/models.ts
 package.json
 tsconfig.json

From b09227c6db284ace83c4609f377c1314e8ed8f9f Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Thu, 30 Jul 2020 23:20:47 +0800
Subject: [PATCH 8/8] update doc

---
 docs/contributing.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/contributing.md b/docs/contributing.md
index 496391bd9dd1..99636ba92dfc 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -91,8 +91,7 @@ To add test cases (optional) covering the change in the code generator, please r
 To test the templates, please perform the following:
 
 - Update the Petstore sample by running the shell scripts under the `bin` folder. For example, run `./bin/generate-samples.sh .
-/bin/configs/python*` to update the Python-related samples under [`samples`](https://github.com/openapitools/openapi-generator/t
-ree/master/samples). For Windows, please install [GIT bash](https://gitforwindows.org/). (If you find that there are new files g
+/bin/configs/python*` to update the Python-related samples under [`samples`](https://github.com/openapitools/openapi-generator/tree/master/samples). For Windows, please install [GIT bash](https://gitforwindows.org/). (If you find that there are new files g
 enerated or unexpected changes as a result of the update, that's not unusual as the test cases are added to the OpenAPI spec fro
 m time to time. If you've questions or concerns, please open a ticket to start a discussion)
 - During development it can be helpful to quickly regenerate the samples without recompiling all of openapi-generator, e.g. when you have only updated the mustache templates. This can be done by passing the `-t` parameter: `-t modules/openapi-generator/src/main/resources/python`.