From b4a7c249db6f8796a9fb557fa5dc33712e9c66f7 Mon Sep 17 00:00:00 2001 From: rob-deutsch Date: Wed, 13 Nov 2019 11:37:10 +1100 Subject: [PATCH 1/2] Only generate npm package if npmName specified --- .../TypeScriptFetchClientCodegen.java | 23 ++++++++++++++----- .../builds/default/.gitignore | 4 ---- .../builds/default/{src => }/apis/PetApi.ts | 0 .../builds/default/{src => }/apis/StoreApi.ts | 0 .../builds/default/{src => }/apis/UserApi.ts | 0 .../builds/default/{src => }/apis/index.ts | 0 .../builds/default/{src => }/index.ts | 0 .../default/{src => }/models/Category.ts | 0 .../{src => }/models/ModelApiResponse.ts | 0 .../builds/default/{src => }/models/Order.ts | 0 .../builds/default/{src => }/models/Pet.ts | 0 .../builds/default/{src => }/models/Tag.ts | 0 .../builds/default/{src => }/models/User.ts | 0 .../builds/default/{src => }/models/index.ts | 0 .../builds/default/{src => }/runtime.ts | 0 .../builds/default/tsconfig.json | 20 ---------------- .../es6-target/{src => }/apis/PetApi.ts | 0 .../es6-target/{src => }/apis/StoreApi.ts | 0 .../es6-target/{src => }/apis/UserApi.ts | 0 .../builds/es6-target/{src => }/apis/index.ts | 0 .../es6-target/{src => }/models/Category.ts | 0 .../{src => }/models/ModelApiResponse.ts | 0 .../es6-target/{src => }/models/Order.ts | 0 .../builds/es6-target/{src => }/models/Pet.ts | 0 .../builds/es6-target/{src => }/models/Tag.ts | 0 .../es6-target/{src => }/models/User.ts | 0 .../es6-target/{src => }/models/index.ts | 0 .../builds/multiple-parameters/.gitignore | 4 ---- .../{src => }/apis/PetApi.ts | 0 .../{src => }/apis/StoreApi.ts | 0 .../{src => }/apis/UserApi.ts | 0 .../{src => }/apis/index.ts | 0 .../multiple-parameters/{src => }/index.ts | 0 .../{src => }/models/Category.ts | 0 .../{src => }/models/ModelApiResponse.ts | 0 .../{src => }/models/Order.ts | 0 .../{src => }/models/Pet.ts | 0 .../{src => }/models/Tag.ts | 0 .../{src => }/models/User.ts | 0 .../{src => }/models/index.ts | 0 .../multiple-parameters/{src => }/runtime.ts | 0 .../builds/multiple-parameters/tsconfig.json | 20 ---------------- .../{src => }/apis/PetApi.ts | 0 .../{src => }/apis/StoreApi.ts | 0 .../{src => }/apis/UserApi.ts | 0 .../{src => }/apis/index.ts | 0 .../{src => }/models/Category.ts | 0 .../{src => }/models/ModelApiResponse.ts | 0 .../{src => }/models/Order.ts | 0 .../{src => }/models/Pet.ts | 0 .../{src => }/models/Tag.ts | 0 .../{src => }/models/User.ts | 0 .../{src => }/models/index.ts | 0 .../{src => }/apis/PetApi.ts | 0 .../{src => }/apis/StoreApi.ts | 0 .../{src => }/apis/UserApi.ts | 0 .../{src => }/apis/index.ts | 0 .../{src => }/models/Category.ts | 0 .../{src => }/models/ModelApiResponse.ts | 0 .../{src => }/models/Order.ts | 0 .../{src => }/models/Pet.ts | 0 .../{src => }/models/Tag.ts | 0 .../{src => }/models/User.ts | 0 .../{src => }/models/index.ts | 0 .../builds/with-interfaces/.gitignore | 4 ---- .../with-interfaces/{src => }/apis/PetApi.ts | 0 .../{src => }/apis/StoreApi.ts | 0 .../with-interfaces/{src => }/apis/UserApi.ts | 0 .../with-interfaces/{src => }/apis/index.ts | 0 .../builds/with-interfaces/{src => }/index.ts | 0 .../{src => }/models/Category.ts | 0 .../{src => }/models/ModelApiResponse.ts | 0 .../with-interfaces/{src => }/models/Order.ts | 0 .../with-interfaces/{src => }/models/Pet.ts | 0 .../with-interfaces/{src => }/models/Tag.ts | 0 .../with-interfaces/{src => }/models/User.ts | 0 .../with-interfaces/{src => }/models/index.ts | 0 .../with-interfaces/{src => }/runtime.ts | 0 .../builds/with-interfaces/tsconfig.json | 20 ---------------- .../with-npm-version/{src => }/apis/PetApi.ts | 0 .../{src => }/apis/StoreApi.ts | 0 .../{src => }/apis/UserApi.ts | 0 .../with-npm-version/{src => }/apis/index.ts | 0 .../{src => }/models/Category.ts | 0 .../{src => }/models/ModelApiResponse.ts | 0 .../{src => }/models/Order.ts | 0 .../with-npm-version/{src => }/models/Pet.ts | 0 .../with-npm-version/{src => }/models/Tag.ts | 0 .../with-npm-version/{src => }/models/User.ts | 0 .../{src => }/models/index.ts | 0 90 files changed, 17 insertions(+), 78 deletions(-) delete mode 100644 samples/client/petstore/typescript-fetch/builds/default/.gitignore rename samples/client/petstore/typescript-fetch/builds/default/{src => }/apis/PetApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/default/{src => }/apis/StoreApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/default/{src => }/apis/UserApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/default/{src => }/apis/index.ts (100%) rename samples/client/petstore/typescript-fetch/builds/default/{src => }/index.ts (100%) rename samples/client/petstore/typescript-fetch/builds/default/{src => }/models/Category.ts (100%) rename samples/client/petstore/typescript-fetch/builds/default/{src => }/models/ModelApiResponse.ts (100%) rename samples/client/petstore/typescript-fetch/builds/default/{src => }/models/Order.ts (100%) rename samples/client/petstore/typescript-fetch/builds/default/{src => }/models/Pet.ts (100%) rename samples/client/petstore/typescript-fetch/builds/default/{src => }/models/Tag.ts (100%) rename samples/client/petstore/typescript-fetch/builds/default/{src => }/models/User.ts (100%) rename samples/client/petstore/typescript-fetch/builds/default/{src => }/models/index.ts (100%) rename samples/client/petstore/typescript-fetch/builds/default/{src => }/runtime.ts (100%) delete mode 100644 samples/client/petstore/typescript-fetch/builds/default/tsconfig.json rename samples/client/petstore/typescript-fetch/builds/es6-target/{src => }/apis/PetApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/es6-target/{src => }/apis/StoreApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/es6-target/{src => }/apis/UserApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/es6-target/{src => }/apis/index.ts (100%) rename samples/client/petstore/typescript-fetch/builds/es6-target/{src => }/models/Category.ts (100%) rename samples/client/petstore/typescript-fetch/builds/es6-target/{src => }/models/ModelApiResponse.ts (100%) rename samples/client/petstore/typescript-fetch/builds/es6-target/{src => }/models/Order.ts (100%) rename samples/client/petstore/typescript-fetch/builds/es6-target/{src => }/models/Pet.ts (100%) rename samples/client/petstore/typescript-fetch/builds/es6-target/{src => }/models/Tag.ts (100%) rename samples/client/petstore/typescript-fetch/builds/es6-target/{src => }/models/User.ts (100%) rename samples/client/petstore/typescript-fetch/builds/es6-target/{src => }/models/index.ts (100%) delete mode 100644 samples/client/petstore/typescript-fetch/builds/multiple-parameters/.gitignore rename samples/client/petstore/typescript-fetch/builds/multiple-parameters/{src => }/apis/PetApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/multiple-parameters/{src => }/apis/StoreApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/multiple-parameters/{src => }/apis/UserApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/multiple-parameters/{src => }/apis/index.ts (100%) rename samples/client/petstore/typescript-fetch/builds/multiple-parameters/{src => }/index.ts (100%) rename samples/client/petstore/typescript-fetch/builds/multiple-parameters/{src => }/models/Category.ts (100%) rename samples/client/petstore/typescript-fetch/builds/multiple-parameters/{src => }/models/ModelApiResponse.ts (100%) rename samples/client/petstore/typescript-fetch/builds/multiple-parameters/{src => }/models/Order.ts (100%) rename samples/client/petstore/typescript-fetch/builds/multiple-parameters/{src => }/models/Pet.ts (100%) rename samples/client/petstore/typescript-fetch/builds/multiple-parameters/{src => }/models/Tag.ts (100%) rename samples/client/petstore/typescript-fetch/builds/multiple-parameters/{src => }/models/User.ts (100%) rename samples/client/petstore/typescript-fetch/builds/multiple-parameters/{src => }/models/index.ts (100%) rename samples/client/petstore/typescript-fetch/builds/multiple-parameters/{src => }/runtime.ts (100%) delete mode 100644 samples/client/petstore/typescript-fetch/builds/multiple-parameters/tsconfig.json rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{src => }/apis/PetApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{src => }/apis/StoreApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{src => }/apis/UserApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{src => }/apis/index.ts (100%) rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{src => }/models/Category.ts (100%) rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{src => }/models/ModelApiResponse.ts (100%) rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{src => }/models/Order.ts (100%) rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{src => }/models/Pet.ts (100%) rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{src => }/models/Tag.ts (100%) rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{src => }/models/User.ts (100%) rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{src => }/models/index.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{src => }/apis/PetApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{src => }/apis/StoreApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{src => }/apis/UserApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{src => }/apis/index.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{src => }/models/Category.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{src => }/models/ModelApiResponse.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{src => }/models/Order.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{src => }/models/Pet.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{src => }/models/Tag.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{src => }/models/User.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{src => }/models/index.ts (100%) delete mode 100644 samples/client/petstore/typescript-fetch/builds/with-interfaces/.gitignore rename samples/client/petstore/typescript-fetch/builds/with-interfaces/{src => }/apis/PetApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-interfaces/{src => }/apis/StoreApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-interfaces/{src => }/apis/UserApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-interfaces/{src => }/apis/index.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-interfaces/{src => }/index.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-interfaces/{src => }/models/Category.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-interfaces/{src => }/models/ModelApiResponse.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-interfaces/{src => }/models/Order.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-interfaces/{src => }/models/Pet.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-interfaces/{src => }/models/Tag.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-interfaces/{src => }/models/User.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-interfaces/{src => }/models/index.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-interfaces/{src => }/runtime.ts (100%) delete mode 100644 samples/client/petstore/typescript-fetch/builds/with-interfaces/tsconfig.json rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{src => }/apis/PetApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{src => }/apis/StoreApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{src => }/apis/UserApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{src => }/apis/index.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{src => }/models/Category.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{src => }/models/ModelApiResponse.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{src => }/models/Order.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{src => }/models/Pet.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{src => }/models/Tag.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{src => }/models/User.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{src => }/models/index.ts (100%) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java index 3e27363508b2..10a283673075 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java @@ -54,8 +54,14 @@ public TypeScriptFetchClientCodegen() { outputFolder = "generated-code/typescript-fetch"; embeddedTemplateDir = templateDir = "typescript-fetch"; - this.apiPackage = "src" + File.separator +"apis"; - this.modelPackage = "src" + File.separator + "models"; + 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(); @@ -98,10 +104,13 @@ 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"; + } + 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 +220,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 deleted file mode 100644 index 149b57654723..000000000000 --- a/samples/client/petstore/typescript-fetch/builds/default/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -wwwroot/*.js -node_modules -typings -dist diff --git a/samples/client/petstore/typescript-fetch/builds/default/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/default/src/apis/PetApi.ts rename to samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/default/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/default/src/apis/StoreApi.ts rename to samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/default/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/default/src/apis/UserApi.ts rename to samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/default/src/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/default/src/apis/index.ts rename to samples/client/petstore/typescript-fetch/builds/default/apis/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/default/src/index.ts b/samples/client/petstore/typescript-fetch/builds/default/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/default/src/index.ts rename to samples/client/petstore/typescript-fetch/builds/default/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/default/src/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/default/models/Category.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/default/src/models/Category.ts rename to samples/client/petstore/typescript-fetch/builds/default/models/Category.ts diff --git a/samples/client/petstore/typescript-fetch/builds/default/src/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/default/models/ModelApiResponse.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/default/src/models/ModelApiResponse.ts rename to samples/client/petstore/typescript-fetch/builds/default/models/ModelApiResponse.ts diff --git a/samples/client/petstore/typescript-fetch/builds/default/src/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/default/models/Order.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/default/src/models/Order.ts rename to samples/client/petstore/typescript-fetch/builds/default/models/Order.ts diff --git a/samples/client/petstore/typescript-fetch/builds/default/src/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/default/models/Pet.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/default/src/models/Pet.ts rename to samples/client/petstore/typescript-fetch/builds/default/models/Pet.ts diff --git a/samples/client/petstore/typescript-fetch/builds/default/src/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/default/models/Tag.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/default/src/models/Tag.ts rename to samples/client/petstore/typescript-fetch/builds/default/models/Tag.ts diff --git a/samples/client/petstore/typescript-fetch/builds/default/src/models/User.ts b/samples/client/petstore/typescript-fetch/builds/default/models/User.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/default/src/models/User.ts rename to samples/client/petstore/typescript-fetch/builds/default/models/User.ts diff --git a/samples/client/petstore/typescript-fetch/builds/default/src/models/index.ts b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/default/src/models/index.ts rename to samples/client/petstore/typescript-fetch/builds/default/models/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/default/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/default/src/runtime.ts rename to samples/client/petstore/typescript-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 deleted file mode 100644 index 4567ec19899a..000000000000 --- a/samples/client/petstore/typescript-fetch/builds/default/tsconfig.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "compilerOptions": { - "declaration": true, - "target": "es5", - "module": "commonjs", - "moduleResolution": "node", - "outDir": "dist", - "lib": [ - "es6", - "dom" - ], - "typeRoots": [ - "node_modules/@types" - ] - }, - "exclude": [ - "dist", - "node_modules" - ] -} diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/PetApi.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/StoreApi.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/UserApi.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/index.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/apis/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Category.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Category.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/models/Category.ts diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/ModelApiResponse.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/src/models/ModelApiResponse.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/models/ModelApiResponse.ts diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Order.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Order.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/models/Order.ts diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Pet.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Pet.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/models/Pet.ts diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Tag.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Tag.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/models/Tag.ts diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/User.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/User.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/src/models/User.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/models/User.ts diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/index.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/src/models/index.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.gitignore b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.gitignore deleted file mode 100644 index 149b57654723..000000000000 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -wwwroot/*.js -node_modules -typings -dist diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/apis/PetApi.ts rename to samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/apis/StoreApi.ts rename to samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/apis/UserApi.ts rename to samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/apis/index.ts rename to samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/index.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/index.ts rename to samples/client/petstore/typescript-fetch/builds/multiple-parameters/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Category.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/models/Category.ts rename to samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Category.ts diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/ModelApiResponse.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/models/ModelApiResponse.ts rename to samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/ModelApiResponse.ts diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Order.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/models/Order.ts rename to samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Order.ts diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Pet.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/models/Pet.ts rename to samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Pet.ts diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Tag.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/models/Tag.ts rename to samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Tag.ts diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/models/User.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/User.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/models/User.ts rename to samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/User.ts diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/models/index.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/models/index.ts rename to samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/multiple-parameters/src/runtime.ts rename to samples/client/petstore/typescript-fetch/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 deleted file mode 100644 index 4567ec19899a..000000000000 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/tsconfig.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "compilerOptions": { - "declaration": true, - "target": "es5", - "module": "commonjs", - "moduleResolution": "node", - "outDir": "dist", - "lib": [ - "es6", - "dom" - ], - "typeRoots": [ - "node_modules/@types" - ] - }, - "exclude": [ - "dist", - "node_modules" - ] -} diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/apis/PetApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/PetApi.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/apis/PetApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/apis/StoreApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/StoreApi.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/apis/StoreApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/apis/UserApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/UserApi.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/apis/UserApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/apis/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/index.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/apis/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/Category.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Category.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/Category.ts diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/ModelApiResponse.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/ModelApiResponse.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/ModelApiResponse.ts diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/Order.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Order.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/Order.ts diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/Pet.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Pet.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/Pet.ts diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/Tag.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Tag.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/Tag.ts diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/User.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/User.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/User.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/User.ts diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/index.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/index.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/apis/PetApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/PetApi.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/apis/PetApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/apis/StoreApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/StoreApi.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/apis/StoreApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/apis/UserApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/UserApi.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/apis/UserApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/apis/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/index.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/apis/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/Category.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/Category.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/Category.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/ModelApiResponse.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/ModelApiResponse.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/ModelApiResponse.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/Order.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/Order.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/Order.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/Pet.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/Pet.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/Pet.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/Tag.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/Tag.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/Tag.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/User.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/User.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/User.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/User.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/index.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/index.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.gitignore b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.gitignore deleted file mode 100644 index 149b57654723..000000000000 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -wwwroot/*.js -node_modules -typings -dist diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-interfaces/src/apis/PetApi.ts rename to samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-interfaces/src/apis/StoreApi.ts rename to samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-interfaces/src/apis/UserApi.ts rename to samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/src/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-interfaces/src/apis/index.ts rename to samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/src/index.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-interfaces/src/index.ts rename to samples/client/petstore/typescript-fetch/builds/with-interfaces/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/src/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Category.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-interfaces/src/models/Category.ts rename to samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Category.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/src/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ModelApiResponse.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-interfaces/src/models/ModelApiResponse.ts rename to samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ModelApiResponse.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/src/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Order.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-interfaces/src/models/Order.ts rename to samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Order.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/src/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Pet.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-interfaces/src/models/Pet.ts rename to samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Pet.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/src/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Tag.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-interfaces/src/models/Tag.ts rename to samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Tag.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/src/models/User.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/User.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-interfaces/src/models/User.ts rename to samples/client/petstore/typescript-fetch/builds/with-interfaces/models/User.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/src/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-interfaces/src/models/index.ts rename to samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-interfaces/src/runtime.ts rename to samples/client/petstore/typescript-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 deleted file mode 100644 index 4567ec19899a..000000000000 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/tsconfig.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "compilerOptions": { - "declaration": true, - "target": "es5", - "module": "commonjs", - "moduleResolution": "node", - "outDir": "dist", - "lib": [ - "es6", - "dom" - ], - "typeRoots": [ - "node_modules/@types" - ] - }, - "exclude": [ - "dist", - "node_modules" - ] -} diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/PetApi.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/StoreApi.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/UserApi.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/index.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Category.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Category.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Category.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ModelApiResponse.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/ModelApiResponse.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ModelApiResponse.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Order.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Order.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Order.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Pet.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Pet.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Pet.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Tag.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Tag.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Tag.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/User.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/User.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/User.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/models/User.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/index.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts From 944f1606f5c2baa25b1a557e3ad1e1acaabf604d Mon Sep 17 00:00:00 2001 From: rob-deutsch Date: Wed, 13 Nov 2019 16:12:43 +1100 Subject: [PATCH 2/2] additionalProperties not available in constructor --- .../languages/TypeScriptFetchClientCodegen.java | 14 +++++--------- .../builds/es6-target/{ => src}/apis/PetApi.ts | 0 .../builds/es6-target/{ => src}/apis/StoreApi.ts | 0 .../builds/es6-target/{ => src}/apis/UserApi.ts | 0 .../builds/es6-target/{ => src}/apis/index.ts | 0 .../builds/es6-target/{ => src}/models/Category.ts | 0 .../{ => src}/models/ModelApiResponse.ts | 0 .../builds/es6-target/{ => src}/models/Order.ts | 0 .../builds/es6-target/{ => src}/models/Pet.ts | 0 .../builds/es6-target/{ => src}/models/Tag.ts | 0 .../builds/es6-target/{ => src}/models/User.ts | 0 .../builds/es6-target/{ => src}/models/index.ts | 0 .../{ => src}/apis/PetApi.ts | 0 .../{ => src}/apis/StoreApi.ts | 0 .../{ => src}/apis/UserApi.ts | 0 .../{ => src}/apis/index.ts | 0 .../{ => src}/models/Category.ts | 0 .../{ => src}/models/ModelApiResponse.ts | 0 .../{ => src}/models/Order.ts | 0 .../{ => src}/models/Pet.ts | 0 .../{ => src}/models/Tag.ts | 0 .../{ => src}/models/User.ts | 0 .../{ => src}/models/index.ts | 0 .../typescript-three-plus/{ => src}/apis/PetApi.ts | 0 .../{ => src}/apis/StoreApi.ts | 0 .../{ => src}/apis/UserApi.ts | 0 .../typescript-three-plus/{ => src}/apis/index.ts | 0 .../{ => src}/models/Category.ts | 0 .../{ => src}/models/ModelApiResponse.ts | 0 .../{ => src}/models/Order.ts | 0 .../typescript-three-plus/{ => src}/models/Pet.ts | 0 .../typescript-three-plus/{ => src}/models/Tag.ts | 0 .../typescript-three-plus/{ => src}/models/User.ts | 0 .../{ => src}/models/index.ts | 0 .../with-npm-version/{ => src}/apis/PetApi.ts | 0 .../with-npm-version/{ => src}/apis/StoreApi.ts | 0 .../with-npm-version/{ => src}/apis/UserApi.ts | 0 .../with-npm-version/{ => src}/apis/index.ts | 0 .../with-npm-version/{ => src}/models/Category.ts | 0 .../{ => src}/models/ModelApiResponse.ts | 0 .../with-npm-version/{ => src}/models/Order.ts | 0 .../with-npm-version/{ => src}/models/Pet.ts | 0 .../with-npm-version/{ => src}/models/Tag.ts | 0 .../with-npm-version/{ => src}/models/User.ts | 0 .../with-npm-version/{ => src}/models/index.ts | 0 45 files changed, 5 insertions(+), 9 deletions(-) rename samples/client/petstore/typescript-fetch/builds/es6-target/{ => src}/apis/PetApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/es6-target/{ => src}/apis/StoreApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/es6-target/{ => src}/apis/UserApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/es6-target/{ => src}/apis/index.ts (100%) rename samples/client/petstore/typescript-fetch/builds/es6-target/{ => src}/models/Category.ts (100%) rename samples/client/petstore/typescript-fetch/builds/es6-target/{ => src}/models/ModelApiResponse.ts (100%) rename samples/client/petstore/typescript-fetch/builds/es6-target/{ => src}/models/Order.ts (100%) rename samples/client/petstore/typescript-fetch/builds/es6-target/{ => src}/models/Pet.ts (100%) rename samples/client/petstore/typescript-fetch/builds/es6-target/{ => src}/models/Tag.ts (100%) rename samples/client/petstore/typescript-fetch/builds/es6-target/{ => src}/models/User.ts (100%) rename samples/client/petstore/typescript-fetch/builds/es6-target/{ => src}/models/index.ts (100%) rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{ => src}/apis/PetApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{ => src}/apis/StoreApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{ => src}/apis/UserApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{ => src}/apis/index.ts (100%) rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{ => src}/models/Category.ts (100%) rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{ => src}/models/ModelApiResponse.ts (100%) rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{ => src}/models/Order.ts (100%) rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{ => src}/models/Pet.ts (100%) rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{ => src}/models/Tag.ts (100%) rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{ => src}/models/User.ts (100%) rename samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/{ => src}/models/index.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{ => src}/apis/PetApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{ => src}/apis/StoreApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{ => src}/apis/UserApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{ => src}/apis/index.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{ => src}/models/Category.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{ => src}/models/ModelApiResponse.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{ => src}/models/Order.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{ => src}/models/Pet.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{ => src}/models/Tag.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{ => src}/models/User.ts (100%) rename samples/client/petstore/typescript-fetch/builds/typescript-three-plus/{ => src}/models/index.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{ => src}/apis/PetApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{ => src}/apis/StoreApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{ => src}/apis/UserApi.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{ => src}/apis/index.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{ => src}/models/Category.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{ => src}/models/ModelApiResponse.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{ => src}/models/Order.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{ => src}/models/Pet.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{ => src}/models/Tag.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{ => src}/models/User.ts (100%) rename samples/client/petstore/typescript-fetch/builds/with-npm-version/{ => src}/models/index.ts (100%) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java index 10a283673075..966fe2621884 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java +++ b/modules/openapi-generator/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/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/PetApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/PetApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/StoreApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/StoreApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/UserApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/UserApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/apis/index.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Category.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/models/Category.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Category.ts diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/ModelApiResponse.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/models/ModelApiResponse.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/src/models/ModelApiResponse.ts diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Order.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/models/Order.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Order.ts diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Pet.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/models/Pet.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Pet.ts diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Tag.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/models/Tag.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/src/models/Tag.ts diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/User.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/User.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/models/User.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/src/models/User.ts diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/models/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts rename to samples/client/petstore/typescript-fetch/builds/es6-target/src/models/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/PetApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/apis/PetApi.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/PetApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/StoreApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/apis/StoreApi.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/StoreApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/UserApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/apis/UserApi.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/UserApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/apis/index.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Category.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/Category.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Category.ts diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/ModelApiResponse.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/ModelApiResponse.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/ModelApiResponse.ts diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Order.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/Order.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Order.ts diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Pet.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/Pet.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Pet.ts diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Tag.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/Tag.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/Tag.ts diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/User.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/User.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/User.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/User.ts diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/index.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/models/index.ts rename to samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/models/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/PetApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/apis/PetApi.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/PetApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/StoreApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/apis/StoreApi.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/StoreApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/UserApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/apis/UserApi.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/UserApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/apis/index.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/apis/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/Category.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/Category.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/Category.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/ModelApiResponse.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/ModelApiResponse.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/ModelApiResponse.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/Order.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/Order.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/Order.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/Pet.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/Pet.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/Pet.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/Tag.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/Tag.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/Tag.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/User.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/User.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/User.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/User.ts diff --git a/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/index.ts b/samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/typescript-three-plus/models/index.ts rename to samples/client/petstore/typescript-fetch/builds/typescript-three-plus/src/models/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/PetApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/PetApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/StoreApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/StoreApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/UserApi.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/UserApi.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/index.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/index.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Category.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Category.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Category.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/ModelApiResponse.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ModelApiResponse.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/ModelApiResponse.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Order.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Order.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Order.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Pet.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Pet.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Pet.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Tag.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Tag.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/Tag.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/User.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/User.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/models/User.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/User.ts diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/index.ts similarity index 100% rename from samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts rename to samples/client/petstore/typescript-fetch/builds/with-npm-version/src/models/index.ts