typescript-fetch: Only generate npm package if npmName specified (#4472)

* Only generate npm package if npmName specified * additionalProperties not available in constructor
OpenAPITools · Nov 13, 2019 · 64c1547 · 64c1547
1 parent bdd34a3
commit 64c1547
Show file tree

Hide file tree

Showing 46 changed files with 13 additions and 78 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
@@ -54,8 +54,6 @@ public TypeScriptFetchClientCodegen() {
         outputFolder = "generated-code/typescript-fetch";
         embeddedTemplateDir = templateDir = "typescript-fetch";
 
-        this.apiPackage = "src" + File.separator +"apis";
-        this.modelPackage = "src" + File.separator + "models";
         this.apiTemplateFiles.put("apis.mustache", ".ts");
         this.modelTemplateFiles.put("models.mustache", ".ts");
         this.addExtraReservedWords();
@@ -98,10 +96,17 @@ public void processOpts() {
         super.processOpts();
         additionalProperties.put("isOriginalModelPropertyNaming", getModelPropertyNaming().equals("original"));
         additionalProperties.put("modelPropertyNaming", getModelPropertyNaming());
-        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"));
+
+        String sourceDir = "";
+        if (additionalProperties.containsKey(NPM_NAME)) {
+            sourceDir = "src" + File.separator;
+        }
+
+        this.apiPackage = sourceDir + "apis";
+        this.modelPackage = sourceDir + "models";
+
+        supportingFiles.add(new SupportingFile("index.mustache", sourceDir, "index.ts"));
+        supportingFiles.add(new SupportingFile("runtime.mustache", sourceDir, "runtime.ts"));
 
         if (additionalProperties.containsKey(USE_SINGLE_REQUEST_PARAMETER)) {
             this.setUseSingleRequestParameter(convertPropertyToBoolean(USE_SINGLE_REQUEST_PARAMETER));
@@ -211,7 +216,9 @@ 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("tsconfig.mustache", "", "tsconfig.json"));
         supportingFiles.add(new SupportingFile("npmignore.mustache", "", ".npmignore"));
+        supportingFiles.add(new SupportingFile("gitignore", "", ".gitignore"));
     }
 
     @Override

diff --git a/samples/client/petstore/typescript-fetch/builds/default/.gitignore b/samples/client/petstore/typescript-fetch/builds/default/.gitignore
diff --git a/...t-fetch/builds/default/src/apis/PetApi.ts → ...cript-fetch/builds/default/apis/PetApi.ts b/...t-fetch/builds/default/src/apis/PetApi.ts → ...cript-fetch/builds/default/apis/PetApi.ts
diff --git a/...fetch/builds/default/src/apis/StoreApi.ts → ...ipt-fetch/builds/default/apis/StoreApi.ts b/...fetch/builds/default/src/apis/StoreApi.ts → ...ipt-fetch/builds/default/apis/StoreApi.ts
diff --git a/...-fetch/builds/default/src/apis/UserApi.ts → ...ript-fetch/builds/default/apis/UserApi.ts b/...-fetch/builds/default/src/apis/UserApi.ts → ...ript-fetch/builds/default/apis/UserApi.ts
diff --git a/...pt-fetch/builds/default/src/apis/index.ts → ...script-fetch/builds/default/apis/index.ts b/...pt-fetch/builds/default/src/apis/index.ts → ...script-fetch/builds/default/apis/index.ts
diff --git a/...escript-fetch/builds/default/src/index.ts → .../typescript-fetch/builds/default/index.ts b/...escript-fetch/builds/default/src/index.ts → .../typescript-fetch/builds/default/index.ts
diff --git a/...tch/builds/default/src/models/Category.ts → ...t-fetch/builds/default/models/Category.ts b/...tch/builds/default/src/models/Category.ts → ...t-fetch/builds/default/models/Category.ts
diff --git a/...ds/default/src/models/ModelApiResponse.ts → ...builds/default/models/ModelApiResponse.ts b/...ds/default/src/models/ModelApiResponse.ts → ...builds/default/models/ModelApiResponse.ts
diff --git a/...-fetch/builds/default/src/models/Order.ts → ...ript-fetch/builds/default/models/Order.ts b/...-fetch/builds/default/src/models/Order.ts → ...ript-fetch/builds/default/models/Order.ts
diff --git a/...pt-fetch/builds/default/src/models/Pet.ts → ...script-fetch/builds/default/models/Pet.ts b/...pt-fetch/builds/default/src/models/Pet.ts → ...script-fetch/builds/default/models/Pet.ts
diff --git a/...pt-fetch/builds/default/src/models/Tag.ts → ...script-fetch/builds/default/models/Tag.ts b/...pt-fetch/builds/default/src/models/Tag.ts → ...script-fetch/builds/default/models/Tag.ts
diff --git a/...t-fetch/builds/default/src/models/User.ts → ...cript-fetch/builds/default/models/User.ts b/...t-fetch/builds/default/src/models/User.ts → ...cript-fetch/builds/default/models/User.ts
diff --git a/...-fetch/builds/default/src/models/index.ts → ...ript-fetch/builds/default/models/index.ts b/...-fetch/builds/default/src/models/index.ts → ...ript-fetch/builds/default/models/index.ts
diff --git a/...cript-fetch/builds/default/src/runtime.ts → ...ypescript-fetch/builds/default/runtime.ts b/...cript-fetch/builds/default/src/runtime.ts → ...ypescript-fetch/builds/default/runtime.ts
diff --git a/samples/client/petstore/typescript-fetch/builds/default/tsconfig.json b/samples/client/petstore/typescript-fetch/builds/default/tsconfig.json
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.gitignore b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.gitignore
diff --git a/...ds/multiple-parameters/src/apis/PetApi.ts → ...builds/multiple-parameters/apis/PetApi.ts b/...ds/multiple-parameters/src/apis/PetApi.ts → ...builds/multiple-parameters/apis/PetApi.ts
diff --git a/.../multiple-parameters/src/apis/StoreApi.ts → ...ilds/multiple-parameters/apis/StoreApi.ts b/.../multiple-parameters/src/apis/StoreApi.ts → ...ilds/multiple-parameters/apis/StoreApi.ts
diff --git a/...s/multiple-parameters/src/apis/UserApi.ts → ...uilds/multiple-parameters/apis/UserApi.ts b/...s/multiple-parameters/src/apis/UserApi.ts → ...uilds/multiple-parameters/apis/UserApi.ts
diff --git a/...lds/multiple-parameters/src/apis/index.ts → .../builds/multiple-parameters/apis/index.ts b/...lds/multiple-parameters/src/apis/index.ts → .../builds/multiple-parameters/apis/index.ts
diff --git a/...h/builds/multiple-parameters/src/index.ts → ...fetch/builds/multiple-parameters/index.ts b/...h/builds/multiple-parameters/src/index.ts → ...fetch/builds/multiple-parameters/index.ts
diff --git a/...ultiple-parameters/src/models/Category.ts → ...ds/multiple-parameters/models/Category.ts b/...ultiple-parameters/src/models/Category.ts → ...ds/multiple-parameters/models/Category.ts
diff --git a/...parameters/src/models/ModelApiResponse.ts → ...ple-parameters/models/ModelApiResponse.ts b/...parameters/src/models/ModelApiResponse.ts → ...ple-parameters/models/ModelApiResponse.ts
diff --git a/...s/multiple-parameters/src/models/Order.ts → ...uilds/multiple-parameters/models/Order.ts b/...s/multiple-parameters/src/models/Order.ts → ...uilds/multiple-parameters/models/Order.ts
diff --git a/...lds/multiple-parameters/src/models/Pet.ts → .../builds/multiple-parameters/models/Pet.ts b/...lds/multiple-parameters/src/models/Pet.ts → .../builds/multiple-parameters/models/Pet.ts
diff --git a/...lds/multiple-parameters/src/models/Tag.ts → .../builds/multiple-parameters/models/Tag.ts b/...lds/multiple-parameters/src/models/Tag.ts → .../builds/multiple-parameters/models/Tag.ts
diff --git a/...ds/multiple-parameters/src/models/User.ts → ...builds/multiple-parameters/models/User.ts b/...ds/multiple-parameters/src/models/User.ts → ...builds/multiple-parameters/models/User.ts
diff --git a/...s/multiple-parameters/src/models/index.ts → ...uilds/multiple-parameters/models/index.ts b/...s/multiple-parameters/src/models/index.ts → ...uilds/multiple-parameters/models/index.ts
diff --git a/...builds/multiple-parameters/src/runtime.ts → ...tch/builds/multiple-parameters/runtime.ts b/...builds/multiple-parameters/src/runtime.ts → ...tch/builds/multiple-parameters/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
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.gitignore b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.gitignore
diff --git a/...builds/with-interfaces/src/apis/PetApi.ts → ...tch/builds/with-interfaces/apis/PetApi.ts b/...builds/with-interfaces/src/apis/PetApi.ts → ...tch/builds/with-interfaces/apis/PetApi.ts
diff --git a/...ilds/with-interfaces/src/apis/StoreApi.ts → ...h/builds/with-interfaces/apis/StoreApi.ts b/...ilds/with-interfaces/src/apis/StoreApi.ts → ...h/builds/with-interfaces/apis/StoreApi.ts
diff --git a/...uilds/with-interfaces/src/apis/UserApi.ts → ...ch/builds/with-interfaces/apis/UserApi.ts b/...uilds/with-interfaces/src/apis/UserApi.ts → ...ch/builds/with-interfaces/apis/UserApi.ts
diff --git a/.../builds/with-interfaces/src/apis/index.ts → ...etch/builds/with-interfaces/apis/index.ts b/.../builds/with-interfaces/src/apis/index.ts → ...etch/builds/with-interfaces/apis/index.ts
diff --git a/...fetch/builds/with-interfaces/src/index.ts → ...ipt-fetch/builds/with-interfaces/index.ts b/...fetch/builds/with-interfaces/src/index.ts → ...ipt-fetch/builds/with-interfaces/index.ts
diff --git a/...ds/with-interfaces/src/models/Category.ts → ...builds/with-interfaces/models/Category.ts b/...ds/with-interfaces/src/models/Category.ts → ...builds/with-interfaces/models/Category.ts
diff --git a/...interfaces/src/models/ModelApiResponse.ts → ...ith-interfaces/models/ModelApiResponse.ts b/...interfaces/src/models/ModelApiResponse.ts → ...ith-interfaces/models/ModelApiResponse.ts
diff --git a/...uilds/with-interfaces/src/models/Order.ts → ...ch/builds/with-interfaces/models/Order.ts b/...uilds/with-interfaces/src/models/Order.ts → ...ch/builds/with-interfaces/models/Order.ts
diff --git a/.../builds/with-interfaces/src/models/Pet.ts → ...etch/builds/with-interfaces/models/Pet.ts b/.../builds/with-interfaces/src/models/Pet.ts → ...etch/builds/with-interfaces/models/Pet.ts
diff --git a/.../builds/with-interfaces/src/models/Tag.ts → ...etch/builds/with-interfaces/models/Tag.ts b/.../builds/with-interfaces/src/models/Tag.ts → ...etch/builds/with-interfaces/models/Tag.ts
diff --git a/...builds/with-interfaces/src/models/User.ts → ...tch/builds/with-interfaces/models/User.ts b/...builds/with-interfaces/src/models/User.ts → ...tch/builds/with-interfaces/models/User.ts
diff --git a/...uilds/with-interfaces/src/models/index.ts → ...ch/builds/with-interfaces/models/index.ts b/...uilds/with-interfaces/src/models/index.ts → ...ch/builds/with-interfaces/models/index.ts
diff --git a/...tch/builds/with-interfaces/src/runtime.ts → ...t-fetch/builds/with-interfaces/runtime.ts b/...tch/builds/with-interfaces/src/runtime.ts → ...t-fetch/builds/with-interfaces/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