additionalProperties not available in constructor

OpenAPITools · macjohnny · Nov 13, 2019 · Nov 13, 2019 · Nov 13, 2019 · Nov 13, 2019
commit 944f1606f5c2baa25b1a557e3ad1e1acaabf604d
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,14 +54,6 @@ public TypeScriptFetchClientCodegen() {
         outputFolder = "generated-code/typescript-fetch";
         embeddedTemplateDir = templateDir = "typescript-fetch";
 
-        if (additionalProperties.containsKey(NPM_NAME)) {
-            this.apiPackage = "src" + File.separator +"apis";
-            this.modelPackage = "src" + File.separator + "models";
-        } else {
-            this.apiPackage = "apis";
-            this.modelPackage = "models";
-        }
-
         this.apiTemplateFiles.put("apis.mustache", ".ts");
         this.modelTemplateFiles.put("models.mustache", ".ts");
         this.addExtraReservedWords();
@@ -107,8 +99,12 @@ public void processOpts() {
 
         String sourceDir = "";
         if (additionalProperties.containsKey(NPM_NAME)) {
-            sourceDir = "src";
+            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"));
 

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/...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/...refix-parameter-interfaces/apis/PetApi.ts → ...x-parameter-interfaces/src/apis/PetApi.ts b/...refix-parameter-interfaces/apis/PetApi.ts → ...x-parameter-interfaces/src/apis/PetApi.ts
diff --git a/...fix-parameter-interfaces/apis/StoreApi.ts → ...parameter-interfaces/src/apis/StoreApi.ts b/...fix-parameter-interfaces/apis/StoreApi.ts → ...parameter-interfaces/src/apis/StoreApi.ts
diff --git a/...efix-parameter-interfaces/apis/UserApi.ts → ...-parameter-interfaces/src/apis/UserApi.ts b/...efix-parameter-interfaces/apis/UserApi.ts → ...-parameter-interfaces/src/apis/UserApi.ts
diff --git a/...prefix-parameter-interfaces/apis/index.ts → ...ix-parameter-interfaces/src/apis/index.ts b/...prefix-parameter-interfaces/apis/index.ts → ...ix-parameter-interfaces/src/apis/index.ts
diff --git a/...x-parameter-interfaces/models/Category.ts → ...rameter-interfaces/src/models/Category.ts b/...x-parameter-interfaces/models/Category.ts → ...rameter-interfaces/src/models/Category.ts
diff --git a/...ter-interfaces/models/ModelApiResponse.ts → ...interfaces/src/models/ModelApiResponse.ts b/...ter-interfaces/models/ModelApiResponse.ts → ...interfaces/src/models/ModelApiResponse.ts
diff --git a/...efix-parameter-interfaces/models/Order.ts → ...-parameter-interfaces/src/models/Order.ts b/...efix-parameter-interfaces/models/Order.ts → ...-parameter-interfaces/src/models/Order.ts
diff --git a/...prefix-parameter-interfaces/models/Pet.ts → ...ix-parameter-interfaces/src/models/Pet.ts b/...prefix-parameter-interfaces/models/Pet.ts → ...ix-parameter-interfaces/src/models/Pet.ts
diff --git a/...prefix-parameter-interfaces/models/Tag.ts → ...ix-parameter-interfaces/src/models/Tag.ts b/...prefix-parameter-interfaces/models/Tag.ts → ...ix-parameter-interfaces/src/models/Tag.ts
diff --git a/...refix-parameter-interfaces/models/User.ts → ...x-parameter-interfaces/src/models/User.ts b/...refix-parameter-interfaces/models/User.ts → ...x-parameter-interfaces/src/models/User.ts
diff --git a/...efix-parameter-interfaces/models/index.ts → ...-parameter-interfaces/src/models/index.ts b/...efix-parameter-interfaces/models/index.ts → ...-parameter-interfaces/src/models/index.ts
diff --git a/...ilds/typescript-three-plus/apis/PetApi.ts → .../typescript-three-plus/src/apis/PetApi.ts b/...ilds/typescript-three-plus/apis/PetApi.ts → .../typescript-three-plus/src/apis/PetApi.ts
diff --git a/...ds/typescript-three-plus/apis/StoreApi.ts → ...ypescript-three-plus/src/apis/StoreApi.ts b/...ds/typescript-three-plus/apis/StoreApi.ts → ...ypescript-three-plus/src/apis/StoreApi.ts
diff --git a/...lds/typescript-three-plus/apis/UserApi.ts → ...typescript-three-plus/src/apis/UserApi.ts b/...lds/typescript-three-plus/apis/UserApi.ts → ...typescript-three-plus/src/apis/UserApi.ts
diff --git a/...uilds/typescript-three-plus/apis/index.ts → ...s/typescript-three-plus/src/apis/index.ts b/...uilds/typescript-three-plus/apis/index.ts → ...s/typescript-three-plus/src/apis/index.ts
diff --git a/.../typescript-three-plus/models/Category.ts → ...escript-three-plus/src/models/Category.ts b/.../typescript-three-plus/models/Category.ts → ...escript-three-plus/src/models/Category.ts
diff --git a/...ipt-three-plus/models/ModelApiResponse.ts → ...three-plus/src/models/ModelApiResponse.ts b/...ipt-three-plus/models/ModelApiResponse.ts → ...three-plus/src/models/ModelApiResponse.ts
diff --git a/...lds/typescript-three-plus/models/Order.ts → ...typescript-three-plus/src/models/Order.ts b/...lds/typescript-three-plus/models/Order.ts → ...typescript-three-plus/src/models/Order.ts
diff --git a/...uilds/typescript-three-plus/models/Pet.ts → ...s/typescript-three-plus/src/models/Pet.ts b/...uilds/typescript-three-plus/models/Pet.ts → ...s/typescript-three-plus/src/models/Pet.ts
diff --git a/...uilds/typescript-three-plus/models/Tag.ts → ...s/typescript-three-plus/src/models/Tag.ts b/...uilds/typescript-three-plus/models/Tag.ts → ...s/typescript-three-plus/src/models/Tag.ts
diff --git a/...ilds/typescript-three-plus/models/User.ts → .../typescript-three-plus/src/models/User.ts b/...ilds/typescript-three-plus/models/User.ts → .../typescript-three-plus/src/models/User.ts
diff --git a/...lds/typescript-three-plus/models/index.ts → ...typescript-three-plus/src/models/index.ts b/...lds/typescript-three-plus/models/index.ts → ...typescript-three-plus/src/models/index.ts
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/...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