Fix NPM build for Typescript-fetch (#3403)

* -Fix bug in fetch -> Missing "runtime" -Move fetch files to an "src" folder instead of doing everything at the root which removes the bugs when using the library itself -Fix the distribution of fetch using npm * Move the .ts files to an `src` folder which is more common in npm package * Add missing mustache * Add missing .npmignore
OpenAPITools · Aug 6, 2019 · 9e659d1 · 9e659d1
1 parent b8295af
commit 9e659d1
Show file tree

Hide file tree

Showing 78 changed files with 12 additions and 14 deletions.
diff --git a/...erator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java b/...erator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java
@@ -50,9 +50,9 @@ public TypeScriptFetchClientCodegen() {
         outputFolder = "generated-code/typescript-fetch";
         embeddedTemplateDir = templateDir = "typescript-fetch";
 
-        this.apiPackage = "apis";
+        this.apiPackage = "src" + File.separator +"apis";
+        this.modelPackage = "src" + File.separator + "models";
         this.apiTemplateFiles.put("apis.mustache", ".ts");
-        this.modelPackage = "models";
         this.modelTemplateFiles.put("models.mustache", ".ts");
         this.addExtraReservedWords();
 
@@ -84,8 +84,8 @@ public void processOpts() {
         super.processOpts();
         additionalProperties.put("isOriginalModelPropertyNaming", getModelPropertyNaming().equals("original"));
         additionalProperties.put("modelPropertyNaming", getModelPropertyNaming());
-        supportingFiles.add(new SupportingFile("index.mustache", "", "index.ts"));
-        supportingFiles.add(new SupportingFile("runtime.mustache", "", "runtime.ts"));
+        supportingFiles.add(new SupportingFile("index.mustache", "src", "index.ts"));
+        supportingFiles.add(new SupportingFile("runtime.mustache", "src", "runtime.ts"));
         supportingFiles.add(new SupportingFile("tsconfig.mustache", "", "tsconfig.json"));
         supportingFiles.add(new SupportingFile("gitignore", "", ".gitignore"));
 
@@ -188,6 +188,7 @@ private void addNpmPackageGeneration() {
         //Files for building our lib
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
         supportingFiles.add(new SupportingFile("package.mustache", "", "package.json"));
+        supportingFiles.add(new SupportingFile("npmignore.mustache", "", ".npmignore"));
     }
 
     @Override
@@ -216,7 +217,7 @@ private void addOperationModelImportInfomation(Map<String, Object> operations) {
         // models for a given operation.
         List<Map<String, Object>> imports = (List<Map<String, Object>>) operations.get("imports");
         for (Map<String, Object> im : imports) {
-            im.put("className", im.get("import").toString().replace("models.", ""));
+            im.put("className", im.get("import").toString().replace(modelPackage() + ".", ""));
         }
     }
 

diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/npmignore.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/npmignore.mustache
@@ -0,0 +1 @@
+README.md
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/package.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/package.mustache
@@ -6,7 +6,7 @@
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
   "scripts" : {
-    "build": "tsc --outDir dist/",
+    "build": "tsc",
     "prepare": "npm run build"
   },
   "devDependencies": {

diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/tsconfig.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/tsconfig.mustache
@@ -5,7 +5,6 @@
     "module": "commonjs",
     "moduleResolution": "node",
     "outDir": "dist",
-    "rootDir": ".",
     {{^supportsES6}}
     "lib": [
       "es6",

diff --git a/...cript-fetch/builds/default/apis/PetApi.ts → ...t-fetch/builds/default/src/apis/PetApi.ts b/...cript-fetch/builds/default/apis/PetApi.ts → ...t-fetch/builds/default/src/apis/PetApi.ts
diff --git a/...ipt-fetch/builds/default/apis/StoreApi.ts → ...fetch/builds/default/src/apis/StoreApi.ts b/...ipt-fetch/builds/default/apis/StoreApi.ts → ...fetch/builds/default/src/apis/StoreApi.ts
diff --git a/...ript-fetch/builds/default/apis/UserApi.ts → ...-fetch/builds/default/src/apis/UserApi.ts b/...ript-fetch/builds/default/apis/UserApi.ts → ...-fetch/builds/default/src/apis/UserApi.ts
diff --git a/...script-fetch/builds/default/apis/index.ts → ...pt-fetch/builds/default/src/apis/index.ts b/...script-fetch/builds/default/apis/index.ts → ...pt-fetch/builds/default/src/apis/index.ts
diff --git a/.../typescript-fetch/builds/default/index.ts → ...escript-fetch/builds/default/src/index.ts b/.../typescript-fetch/builds/default/index.ts → ...escript-fetch/builds/default/src/index.ts
diff --git a/...t-fetch/builds/default/models/Category.ts → ...tch/builds/default/src/models/Category.ts b/...t-fetch/builds/default/models/Category.ts → ...tch/builds/default/src/models/Category.ts
diff --git a/...builds/default/models/ModelApiResponse.ts → ...ds/default/src/models/ModelApiResponse.ts b/...builds/default/models/ModelApiResponse.ts → ...ds/default/src/models/ModelApiResponse.ts
diff --git a/...ript-fetch/builds/default/models/Order.ts → ...-fetch/builds/default/src/models/Order.ts b/...ript-fetch/builds/default/models/Order.ts → ...-fetch/builds/default/src/models/Order.ts
diff --git a/...script-fetch/builds/default/models/Pet.ts → ...pt-fetch/builds/default/src/models/Pet.ts b/...script-fetch/builds/default/models/Pet.ts → ...pt-fetch/builds/default/src/models/Pet.ts
diff --git a/...script-fetch/builds/default/models/Tag.ts → ...pt-fetch/builds/default/src/models/Tag.ts b/...script-fetch/builds/default/models/Tag.ts → ...pt-fetch/builds/default/src/models/Tag.ts
diff --git a/...cript-fetch/builds/default/models/User.ts → ...t-fetch/builds/default/src/models/User.ts b/...cript-fetch/builds/default/models/User.ts → ...t-fetch/builds/default/src/models/User.ts
diff --git a/...ript-fetch/builds/default/models/index.ts → ...-fetch/builds/default/src/models/index.ts b/...ript-fetch/builds/default/models/index.ts → ...-fetch/builds/default/src/models/index.ts
diff --git a/...ypescript-fetch/builds/default/runtime.ts → ...cript-fetch/builds/default/src/runtime.ts b/...ypescript-fetch/builds/default/runtime.ts → ...cript-fetch/builds/default/src/runtime.ts
diff --git a/samples/client/petstore/typescript-fetch/builds/default/tsconfig.json b/samples/client/petstore/typescript-fetch/builds/default/tsconfig.json
@@ -5,7 +5,6 @@
     "module": "commonjs",
     "moduleResolution": "node",
     "outDir": "dist",
-    "rootDir": ".",
     "lib": [
       "es6",
       "dom"

diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/.npmignore b/samples/client/petstore/typescript-fetch/builds/es6-target/.npmignore
@@ -0,0 +1 @@
+README.md
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/package.json b/samples/client/petstore/typescript-fetch/builds/es6-target/package.json
@@ -6,7 +6,7 @@
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
   "scripts" : {
-    "build": "tsc --outDir dist/",
+    "build": "tsc",
     "prepare": "npm run build"
   },
   "devDependencies": {

diff --git a/...pt-fetch/builds/es6-target/apis/PetApi.ts → ...etch/builds/es6-target/src/apis/PetApi.ts b/...pt-fetch/builds/es6-target/apis/PetApi.ts → ...etch/builds/es6-target/src/apis/PetApi.ts
diff --git a/...-fetch/builds/es6-target/apis/StoreApi.ts → ...ch/builds/es6-target/src/apis/StoreApi.ts b/...-fetch/builds/es6-target/apis/StoreApi.ts → ...ch/builds/es6-target/src/apis/StoreApi.ts
diff --git a/...t-fetch/builds/es6-target/apis/UserApi.ts → ...tch/builds/es6-target/src/apis/UserApi.ts b/...t-fetch/builds/es6-target/apis/UserApi.ts → ...tch/builds/es6-target/src/apis/UserApi.ts
diff --git a/...ipt-fetch/builds/es6-target/apis/index.ts → ...fetch/builds/es6-target/src/apis/index.ts b/...ipt-fetch/builds/es6-target/apis/index.ts → ...fetch/builds/es6-target/src/apis/index.ts
diff --git a/...pescript-fetch/builds/es6-target/index.ts → ...ript-fetch/builds/es6-target/src/index.ts b/...pescript-fetch/builds/es6-target/index.ts → ...ript-fetch/builds/es6-target/src/index.ts
diff --git a/...etch/builds/es6-target/models/Category.ts → .../builds/es6-target/src/models/Category.ts b/...etch/builds/es6-target/models/Category.ts → .../builds/es6-target/src/models/Category.ts
diff --git a/...lds/es6-target/models/ModelApiResponse.ts → ...es6-target/src/models/ModelApiResponse.ts b/...lds/es6-target/models/ModelApiResponse.ts → ...es6-target/src/models/ModelApiResponse.ts
diff --git a/...t-fetch/builds/es6-target/models/Order.ts → ...tch/builds/es6-target/src/models/Order.ts b/...t-fetch/builds/es6-target/models/Order.ts → ...tch/builds/es6-target/src/models/Order.ts
diff --git a/...ipt-fetch/builds/es6-target/models/Pet.ts → ...fetch/builds/es6-target/src/models/Pet.ts b/...ipt-fetch/builds/es6-target/models/Pet.ts → ...fetch/builds/es6-target/src/models/Pet.ts
diff --git a/...ipt-fetch/builds/es6-target/models/Tag.ts → ...fetch/builds/es6-target/src/models/Tag.ts b/...ipt-fetch/builds/es6-target/models/Tag.ts → ...fetch/builds/es6-target/src/models/Tag.ts
diff --git a/...pt-fetch/builds/es6-target/models/User.ts → ...etch/builds/es6-target/src/models/User.ts b/...pt-fetch/builds/es6-target/models/User.ts → ...etch/builds/es6-target/src/models/User.ts
diff --git a/...t-fetch/builds/es6-target/models/index.ts → ...tch/builds/es6-target/src/models/index.ts b/...t-fetch/builds/es6-target/models/index.ts → ...tch/builds/es6-target/src/models/index.ts
diff --git a/...script-fetch/builds/es6-target/runtime.ts → ...pt-fetch/builds/es6-target/src/runtime.ts b/...script-fetch/builds/es6-target/runtime.ts → ...pt-fetch/builds/es6-target/src/runtime.ts
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/tsconfig.json b/samples/client/petstore/typescript-fetch/builds/es6-target/tsconfig.json
@@ -5,7 +5,6 @@
     "module": "commonjs",
     "moduleResolution": "node",
     "outDir": "dist",
-    "rootDir": ".",
     "typeRoots": [
       "node_modules/@types"
     ]

diff --git a/...builds/multiple-parameters/apis/PetApi.ts → ...ds/multiple-parameters/src/apis/PetApi.ts b/...builds/multiple-parameters/apis/PetApi.ts → ...ds/multiple-parameters/src/apis/PetApi.ts
diff --git a/...ilds/multiple-parameters/apis/StoreApi.ts → .../multiple-parameters/src/apis/StoreApi.ts b/...ilds/multiple-parameters/apis/StoreApi.ts → .../multiple-parameters/src/apis/StoreApi.ts
diff --git a/...uilds/multiple-parameters/apis/UserApi.ts → ...s/multiple-parameters/src/apis/UserApi.ts b/...uilds/multiple-parameters/apis/UserApi.ts → ...s/multiple-parameters/src/apis/UserApi.ts
diff --git a/.../builds/multiple-parameters/apis/index.ts → ...lds/multiple-parameters/src/apis/index.ts b/.../builds/multiple-parameters/apis/index.ts → ...lds/multiple-parameters/src/apis/index.ts
diff --git a/...fetch/builds/multiple-parameters/index.ts → ...h/builds/multiple-parameters/src/index.ts b/...fetch/builds/multiple-parameters/index.ts → ...h/builds/multiple-parameters/src/index.ts
diff --git a/...ds/multiple-parameters/models/Category.ts → ...ultiple-parameters/src/models/Category.ts b/...ds/multiple-parameters/models/Category.ts → ...ultiple-parameters/src/models/Category.ts
diff --git a/...ple-parameters/models/ModelApiResponse.ts → ...parameters/src/models/ModelApiResponse.ts b/...ple-parameters/models/ModelApiResponse.ts → ...parameters/src/models/ModelApiResponse.ts
diff --git a/...uilds/multiple-parameters/models/Order.ts → ...s/multiple-parameters/src/models/Order.ts b/...uilds/multiple-parameters/models/Order.ts → ...s/multiple-parameters/src/models/Order.ts
diff --git a/.../builds/multiple-parameters/models/Pet.ts → ...lds/multiple-parameters/src/models/Pet.ts b/.../builds/multiple-parameters/models/Pet.ts → ...lds/multiple-parameters/src/models/Pet.ts
diff --git a/.../builds/multiple-parameters/models/Tag.ts → ...lds/multiple-parameters/src/models/Tag.ts b/.../builds/multiple-parameters/models/Tag.ts → ...lds/multiple-parameters/src/models/Tag.ts
diff --git a/...builds/multiple-parameters/models/User.ts → ...ds/multiple-parameters/src/models/User.ts b/...builds/multiple-parameters/models/User.ts → ...ds/multiple-parameters/src/models/User.ts
diff --git a/...uilds/multiple-parameters/models/index.ts → ...s/multiple-parameters/src/models/index.ts b/...uilds/multiple-parameters/models/index.ts → ...s/multiple-parameters/src/models/index.ts
diff --git a/...tch/builds/multiple-parameters/runtime.ts → ...builds/multiple-parameters/src/runtime.ts b/...tch/builds/multiple-parameters/runtime.ts → ...builds/multiple-parameters/src/runtime.ts
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/tsconfig.json b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/tsconfig.json
@@ -5,7 +5,6 @@
     "module": "commonjs",
     "moduleResolution": "node",
     "outDir": "dist",
-    "rootDir": ".",
     "lib": [
       "es6",
       "dom"

diff --git a/...tch/builds/with-interfaces/apis/PetApi.ts → ...builds/with-interfaces/src/apis/PetApi.ts b/...tch/builds/with-interfaces/apis/PetApi.ts → ...builds/with-interfaces/src/apis/PetApi.ts
diff --git a/...h/builds/with-interfaces/apis/StoreApi.ts → ...ilds/with-interfaces/src/apis/StoreApi.ts b/...h/builds/with-interfaces/apis/StoreApi.ts → ...ilds/with-interfaces/src/apis/StoreApi.ts
diff --git a/...ch/builds/with-interfaces/apis/UserApi.ts → ...uilds/with-interfaces/src/apis/UserApi.ts b/...ch/builds/with-interfaces/apis/UserApi.ts → ...uilds/with-interfaces/src/apis/UserApi.ts
diff --git a/...etch/builds/with-interfaces/apis/index.ts → .../builds/with-interfaces/src/apis/index.ts b/...etch/builds/with-interfaces/apis/index.ts → .../builds/with-interfaces/src/apis/index.ts
diff --git a/...ipt-fetch/builds/with-interfaces/index.ts → ...fetch/builds/with-interfaces/src/index.ts b/...ipt-fetch/builds/with-interfaces/index.ts → ...fetch/builds/with-interfaces/src/index.ts
diff --git a/...builds/with-interfaces/models/Category.ts → ...ds/with-interfaces/src/models/Category.ts b/...builds/with-interfaces/models/Category.ts → ...ds/with-interfaces/src/models/Category.ts
diff --git a/...ith-interfaces/models/ModelApiResponse.ts → ...interfaces/src/models/ModelApiResponse.ts b/...ith-interfaces/models/ModelApiResponse.ts → ...interfaces/src/models/ModelApiResponse.ts
diff --git a/...ch/builds/with-interfaces/models/Order.ts → ...uilds/with-interfaces/src/models/Order.ts b/...ch/builds/with-interfaces/models/Order.ts → ...uilds/with-interfaces/src/models/Order.ts
diff --git a/...etch/builds/with-interfaces/models/Pet.ts → .../builds/with-interfaces/src/models/Pet.ts b/...etch/builds/with-interfaces/models/Pet.ts → .../builds/with-interfaces/src/models/Pet.ts
diff --git a/...etch/builds/with-interfaces/models/Tag.ts → .../builds/with-interfaces/src/models/Tag.ts b/...etch/builds/with-interfaces/models/Tag.ts → .../builds/with-interfaces/src/models/Tag.ts
diff --git a/...tch/builds/with-interfaces/models/User.ts → ...builds/with-interfaces/src/models/User.ts b/...tch/builds/with-interfaces/models/User.ts → ...builds/with-interfaces/src/models/User.ts
diff --git a/...ch/builds/with-interfaces/models/index.ts → ...uilds/with-interfaces/src/models/index.ts b/...ch/builds/with-interfaces/models/index.ts → ...uilds/with-interfaces/src/models/index.ts
diff --git a/...t-fetch/builds/with-interfaces/runtime.ts → ...tch/builds/with-interfaces/src/runtime.ts b/...t-fetch/builds/with-interfaces/runtime.ts → ...tch/builds/with-interfaces/src/runtime.ts
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/tsconfig.json b/samples/client/petstore/typescript-fetch/builds/with-interfaces/tsconfig.json
@@ -5,7 +5,6 @@
     "module": "commonjs",
     "moduleResolution": "node",
     "outDir": "dist",
-    "rootDir": ".",
     "lib": [
       "es6",
       "dom"

diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.npmignore b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.npmignore
@@ -0,0 +1 @@
+README.md
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/package.json b/samples/client/petstore/typescript-fetch/builds/with-npm-version/package.json
@@ -6,7 +6,7 @@
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
   "scripts" : {
-    "build": "tsc --outDir dist/",
+    "build": "tsc",
     "prepare": "npm run build"
   },
   "devDependencies": {

diff --git a/...ch/builds/with-npm-version/apis/PetApi.ts → ...uilds/with-npm-version/src/apis/PetApi.ts b/...ch/builds/with-npm-version/apis/PetApi.ts → ...uilds/with-npm-version/src/apis/PetApi.ts
diff --git a/.../builds/with-npm-version/apis/StoreApi.ts → ...lds/with-npm-version/src/apis/StoreApi.ts b/.../builds/with-npm-version/apis/StoreApi.ts → ...lds/with-npm-version/src/apis/StoreApi.ts
diff --git a/...h/builds/with-npm-version/apis/UserApi.ts → ...ilds/with-npm-version/src/apis/UserApi.ts b/...h/builds/with-npm-version/apis/UserApi.ts → ...ilds/with-npm-version/src/apis/UserApi.ts
diff --git a/...tch/builds/with-npm-version/apis/index.ts → ...builds/with-npm-version/src/apis/index.ts b/...tch/builds/with-npm-version/apis/index.ts → ...builds/with-npm-version/src/apis/index.ts
diff --git a/...pt-fetch/builds/with-npm-version/index.ts → ...etch/builds/with-npm-version/src/index.ts b/...pt-fetch/builds/with-npm-version/index.ts → ...etch/builds/with-npm-version/src/index.ts
diff --git a/...uilds/with-npm-version/models/Category.ts → ...s/with-npm-version/src/models/Category.ts b/...uilds/with-npm-version/models/Category.ts → ...s/with-npm-version/src/models/Category.ts
diff --git a/...th-npm-version/models/ModelApiResponse.ts → ...pm-version/src/models/ModelApiResponse.ts b/...th-npm-version/models/ModelApiResponse.ts → ...pm-version/src/models/ModelApiResponse.ts
diff --git a/...h/builds/with-npm-version/models/Order.ts → ...ilds/with-npm-version/src/models/Order.ts b/...h/builds/with-npm-version/models/Order.ts → ...ilds/with-npm-version/src/models/Order.ts
diff --git a/...tch/builds/with-npm-version/models/Pet.ts → ...builds/with-npm-version/src/models/Pet.ts b/...tch/builds/with-npm-version/models/Pet.ts → ...builds/with-npm-version/src/models/Pet.ts
diff --git a/...tch/builds/with-npm-version/models/Tag.ts → ...builds/with-npm-version/src/models/Tag.ts b/...tch/builds/with-npm-version/models/Tag.ts → ...builds/with-npm-version/src/models/Tag.ts
diff --git a/...ch/builds/with-npm-version/models/User.ts → ...uilds/with-npm-version/src/models/User.ts b/...ch/builds/with-npm-version/models/User.ts → ...uilds/with-npm-version/src/models/User.ts
diff --git a/...h/builds/with-npm-version/models/index.ts → ...ilds/with-npm-version/src/models/index.ts b/...h/builds/with-npm-version/models/index.ts → ...ilds/with-npm-version/src/models/index.ts
diff --git a/...-fetch/builds/with-npm-version/runtime.ts → ...ch/builds/with-npm-version/src/runtime.ts b/...-fetch/builds/with-npm-version/runtime.ts → ...ch/builds/with-npm-version/src/runtime.ts
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/tsconfig.json b/samples/client/petstore/typescript-fetch/builds/with-npm-version/tsconfig.json
@@ -5,7 +5,6 @@
     "module": "commonjs",
     "moduleResolution": "node",
     "outDir": "dist",
-    "rootDir": ".",
     "lib": [
       "es6",
       "dom"