[typescript-angular] Import models from a single model/models.ts (#5128)

* Make api to models from a single model/models.ts instead of individual model files.
Fixes inconsistent usage of file names with inline models (inline-model-1, inline-model-2, ...)

* Remove additional mapped filename prop from api imports (since it's not reliable)

* Rerun ./bin/typescript-angular-petstore-all.sh

* Restore the `filename` property passed to the templates, with a comment it's no longer used

Author: amakhrov

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java

@@ -451,6 +451,7 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
         // Add additional filename information for model imports in the services
         List<Map<String, Object>> imports = (List<Map<String, Object>>) operations.get("imports");
         for (Map<String, Object> im : imports) {
+            // This property is not used in the templates any more, subject for removal
             im.put("filename", im.get("import"));
             im.put("classname", im.get("classname"));
         }

modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache

@@ -24,7 +24,7 @@ import '../rxjs-operators';
 {{/useHttpClient}}
 
 {{#imports}}
-import { {{classname}} } from '../{{filename}}';
+import { {{classname}} } from '../model/models';
 {{/imports}}
 
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';

modules/openapi-generator/src/main/resources/typescript-angular/apiInterface.mustache

@@ -14,7 +14,7 @@ import { Observable }                                        from 'rxjs';
 {{/useRxJS6}}
 
 {{#imports}}
-import { {{classname}} } from '../{{filename}}';
+import { {{classname}} } from '../model/models';
 {{/imports}}
 
 

samples/client/petstore/typescript-angular-v2/default/api/pet.service.ts

@@ -19,8 +19,8 @@ import { CustomQueryEncoderHelper }                          from '../encoder';
 import { Observable }                                        from 'rxjs/Observable';
 import '../rxjs-operators';
 
-import { ApiResponse } from '../model/apiResponse';
-import { Pet } from '../model/pet';
+import { ApiResponse } from '../model/models';
+import { Pet } from '../model/models';
 
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
 import { Configuration }                                     from '../configuration';

samples/client/petstore/typescript-angular-v2/default/api/store.service.ts

@@ -19,7 +19,7 @@ import { CustomQueryEncoderHelper }                          from '../encoder';
 import { Observable }                                        from 'rxjs/Observable';
 import '../rxjs-operators';
 
-import { Order } from '../model/order';
+import { Order } from '../model/models';
 
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
 import { Configuration }                                     from '../configuration';

samples/client/petstore/typescript-angular-v2/default/api/user.service.ts

@@ -19,7 +19,7 @@ import { CustomQueryEncoderHelper }                          from '../encoder';
 import { Observable }                                        from 'rxjs/Observable';
 import '../rxjs-operators';
 
-import { User } from '../model/user';
+import { User } from '../model/models';
 
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
 import { Configuration }                                     from '../configuration';

samples/client/petstore/typescript-angular-v2/npm/api/pet.service.ts

@@ -19,8 +19,8 @@ import { CustomQueryEncoderHelper }                          from '../encoder';
 import { Observable }                                        from 'rxjs/Observable';
 import '../rxjs-operators';
 
-import { ApiResponse } from '../model/apiResponse';
-import { Pet } from '../model/pet';
+import { ApiResponse } from '../model/models';
+import { Pet } from '../model/models';
 
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
 import { Configuration }                                     from '../configuration';

samples/client/petstore/typescript-angular-v2/npm/api/store.service.ts

@@ -19,7 +19,7 @@ import { CustomQueryEncoderHelper }                          from '../encoder';
 import { Observable }                                        from 'rxjs/Observable';
 import '../rxjs-operators';
 
-import { Order } from '../model/order';
+import { Order } from '../model/models';
 
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
 import { Configuration }                                     from '../configuration';

samples/client/petstore/typescript-angular-v2/npm/api/user.service.ts

@@ -19,7 +19,7 @@ import { CustomQueryEncoderHelper }                          from '../encoder';
 import { Observable }                                        from 'rxjs/Observable';
 import '../rxjs-operators';
 
-import { User } from '../model/user';
+import { User } from '../model/models';
 
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
 import { Configuration }                                     from '../configuration';

samples/client/petstore/typescript-angular-v2/with-interfaces/api/pet.service.ts

@@ -19,8 +19,8 @@ import { CustomQueryEncoderHelper }                          from '../encoder';
 import { Observable }                                        from 'rxjs/Observable';
 import '../rxjs-operators';
 
-import { ApiResponse } from '../model/apiResponse';
-import { Pet } from '../model/pet';
+import { ApiResponse } from '../model/models';
+import { Pet } from '../model/models';
 
 import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
 import { Configuration }                                     from '../configuration';