fix(typescript-fetch): remove barrel imports

modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesRecord.mustache

@@ -1,14 +1,14 @@
-import {Map, Record, RecordOf} from 'immutable';
+import { Map, Record, RecordOf } from 'immutable';
 
-import {
 {{#models}}
 {{#model}}
 {{#isEntity}}
+import {
     {{classname}}RecordEntity,
+} from "./models/{{classname}}{{importFileExtension}}"
 {{/isEntity}}
 {{/model}}
 {{/models}}
-} from "./models/index{{importFileExtension}}"
 
 export const ApiEntitiesRecordProps = {
     recType: "ApiEntitiesRecord" as "ApiEntitiesRecord",

modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesReducer.mustache

@@ -1,6 +1,6 @@
-import {ApiEntitiesRecord} from "./ApiEntitiesRecord{{importFileExtension}}";
-import {ReducerBuilder} from "redux-ts-simple";
-import {normalizedEntities} from "./runtimeSagasAndRecords{{importFileExtension}}";
+import { ApiEntitiesRecord } from "./ApiEntitiesRecord{{importFileExtension}}";
+import { ReducerBuilder } from "redux-ts-simple";
+import { normalizedEntities } from "./runtimeSagasAndRecords{{importFileExtension}}";
 
 export const ApiEntitiesReducer = new ReducerBuilder(ApiEntitiesRecord())
     .on(normalizedEntities, (state, action): ApiEntitiesRecord => {

modules/openapi-generator/src/main/resources/typescript-fetch/allSagas.mustache

@@ -1,12 +1,12 @@
-import {all, fork} from "redux-saga/effects";
+import { all, fork } from "redux-saga/effects";
 
-import {
 {{#apiInfo}}
 {{#apis}}
+import {
     {{#lambda.camelcase}}{{classFilename}}{{/lambda.camelcase}}AllSagas,
+} from "./{{classFilename}}Sagas{{importFileExtension}}";
 {{/apis}}
 {{/apiInfo}}
-} from "./index{{importFileExtension}}";
 
 export function *allApiSagas() {
     yield all([

modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache

@@ -2,23 +2,23 @@
 /* eslint-disable */
 {{>licenseInfo}}
 
-
 import * as runtime from '../runtime{{importFileExtension}}';
-{{#imports.0}}
+{{#withoutRuntimeChecks}}
 import type {
-  {{#imports}}
-  {{className}},
-  {{/imports}}
+{{#imports}}
+    {{className}},
+{{/imports}}
 } from '../models/index{{importFileExtension}}';
+{{/withoutRuntimeChecks}}
 {{^withoutRuntimeChecks}}
+{{#imports}}
 import {
-    {{#imports}}
+    type {{className}},
     {{className}}FromJSON,
     {{className}}ToJSON,
-    {{/imports}}
-} from '../models/index{{importFileExtension}}';
+} from '../models/{{className}}{{importFileExtension}}';
+{{/imports}}
 {{/withoutRuntimeChecks}}
-{{/imports.0}}
 
 {{#operations}}
 {{#operation}}

modules/openapi-generator/src/main/resources/typescript-fetch/recordGeneric.mustache

@@ -1,8 +1,8 @@
-import {ApiRecordUtils, knownRecordFactories{{#returnPassthrough}}, appFromJS, NormalizedRecordEntities{{/returnPassthrough}}} from "../runtimeSagasAndRecords{{importFileExtension}}";
-import {getApiEntitiesState} from "../ApiEntitiesSelectors{{importFileExtension}}"
-import {List, Record, RecordOf, Map} from 'immutable';
-import {Schema, schema, NormalizedSchema} from "normalizr";
-import {select, call} from "redux-saga/effects";
+import { ApiRecordUtils, knownRecordFactories{{#returnPassthrough}}, appFromJS, NormalizedRecordEntities{{/returnPassthrough}} } from "../runtimeSagasAndRecords{{importFileExtension}}";
+import { getApiEntitiesState } from "../ApiEntitiesSelectors{{importFileExtension}}"
+import { List, Record, RecordOf, Map } from 'immutable';
+import { Schema, schema, NormalizedSchema } from "normalizr";
+import { select, call } from "redux-saga/effects";
 
 import {
     {{classname}},

modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache

@@ -2,7 +2,6 @@
 /* eslint-disable */
 {{>licenseInfo}}
 
-
 export const BASE_PATH = "{{{basePath}}}".replace(/\/+$/, "");
 
 export interface ConfigurationParameters {

modules/openapi-generator/src/main/resources/typescript-fetch/runtimeSagasAndRecords.mustache

@@ -1,9 +1,9 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import {fromJS as originalFromJS, isIndexed, List, Map as ImmMap, RecordOf} from 'immutable';
-import {normalize, NormalizedSchema, schema, Schema} from "normalizr";
-import {ActionDefinition, createAction} from "redux-ts-simple";
+import { fromJS as originalFromJS, isIndexed, List, Map as ImmMap, RecordOf } from 'immutable';
+import { normalize, NormalizedSchema, schema, Schema } from "normalizr";
+import { ActionDefinition, createAction } from "redux-ts-simple";
 
 export const knownRecordFactories = new Map<string, any>();
 export const knownIndexedSetByKey: (string | number)[] = [];

modules/openapi-generator/src/main/resources/typescript-fetch/sagaApiManager.mustache

@@ -1,15 +1,15 @@
 import {
     Configuration,
     ConfigurationParameters,
-} from "../index{{importFileExtension}}";
+} from "../runtime{{importFileExtension}}";
 
-import {
 {{#apiInfo}}
 {{#apis}}
+import {
     {{classFilename}},
+} from "./{{classFilename}}{{importFileExtension}}";
 {{/apis}}
 {{/apiInfo}}
-} from "./index{{importFileExtension}}";
 
 export class Api {
 {{#apiInfo}}

modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache

@@ -2,25 +2,26 @@
 /* eslint-disable */
 {{>licenseInfo}}
 
+import { Api } from './index{{importFileExtension}}';
+import { List } from 'immutable';
+import { all, fork, put, takeLatest } from "redux-saga/effects";
+import { apiCall, createSagaAction as originalCreateSagaAction, BaseEntitySupportPayloadApiAction, BasePayloadApiAction, NormalizedRecordEntities, normalizedEntities } from "../runtimeSagasAndRecords{{importFileExtension}}";
+import { Action } from "redux-ts-simple";
 
-import {Api} from './index{{importFileExtension}}';
-import {List} from 'immutable';
-import {all, fork, put, takeLatest} from "redux-saga/effects";
-import {apiCall, createSagaAction as originalCreateSagaAction, BaseEntitySupportPayloadApiAction, BasePayloadApiAction, NormalizedRecordEntities, normalizedEntities} from "../runtimeSagasAndRecords{{importFileExtension}}";
-import {Action} from "redux-ts-simple";
-
-{{#imports.0}}
+{{#imports}}
 import {
-    {{#imports}}
     {{className}},
+} from '../models/{{className}}{{importFileExtension}}';
+import {
     {{className}}Record,
     {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}RecordUtils,
-    {{/imports}}
-    {{#passthroughImports}}
+} from '../models/{{className}}Record{{importFileExtension}}';
+{{/imports}}
+{{#passthroughImports}}
+import {
     {{.}},
-    {{/passthroughImports}}
-} from '../models/index{{importFileExtension}}';
-{{/imports.0}}
+} from '../models/{{.}}{{importFileExtension}}';
+{{/passthroughImports}}
 {{#hasEnums}}
 {{#operations}}
 {{#operation}}

samples/client/others/typescript-fetch/infinite-recursion-issue/apis/TestApi.ts

@@ -12,15 +12,12 @@
  * Do not edit the class manually.
  */
 
-
 import * as runtime from '../runtime';
-import type {
-  TestBaseDto,
-} from '../models/index';
 import {
+    type TestBaseDto,
     TestBaseDtoFromJSON,
     TestBaseDtoToJSON,
-} from '../models/index';
+} from '../models/TestBaseDto';
 
 /**
  * 

samples/client/others/typescript-fetch/infinite-recursion-issue/runtime.ts

@@ -12,7 +12,6 @@
  * Do not edit the class manually.
  */
 
-
 export const BASE_PATH = "http://localhost:8080".replace(/\/+$/, "");
 
 export interface ConfigurationParameters {

samples/client/others/typescript-fetch/self-import-issue/runtime.ts

@@ -12,7 +12,6 @@
  * Do not edit the class manually.
  */
 
-
 export const BASE_PATH = "http://localhost".replace(/\/+$/, "");
 
 export interface ConfigurationParameters {

samples/client/petstore/typescript-fetch/builds/allOf-nullable/apis/DefaultApi.ts

@@ -12,15 +12,12 @@
  * Do not edit the class manually.
  */
 
-
 import * as runtime from '../runtime';
-import type {
-  Club,
-} from '../models/index';
 import {
+    type Club,
     ClubFromJSON,
     ClubToJSON,
-} from '../models/index';
+} from '../models/Club';
 
 export interface ListRequest {
     personId: string;

samples/client/petstore/typescript-fetch/builds/allOf-nullable/runtime.ts

@@ -12,7 +12,6 @@
  * Do not edit the class manually.
  */
 
-
 export const BASE_PATH = "http://api.example.xyz/v1".replace(/\/+$/, "");
 
 export interface ConfigurationParameters {

samples/client/petstore/typescript-fetch/builds/allOf-readonly/apis/DefaultApi.ts

@@ -12,15 +12,12 @@
  * Do not edit the class manually.
  */
 
-
 import * as runtime from '../runtime';
-import type {
-  Club,
-} from '../models/index';
 import {
+    type Club,
     ClubFromJSON,
     ClubToJSON,
-} from '../models/index';
+} from '../models/Club';
 
 export interface ListRequest {
     personId: string;

samples/client/petstore/typescript-fetch/builds/allOf-readonly/runtime.ts

@@ -12,7 +12,6 @@
  * Do not edit the class manually.
  */
 
-
 export const BASE_PATH = "http://api.example.xyz/v1".replace(/\/+$/, "");
 
 export interface ConfigurationParameters {

samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/AnotherFakeApi.ts

@@ -12,15 +12,12 @@
  * Do not edit the class manually.
  */
 
-
 import * as runtime from '../runtime';
-import type {
-  Client,
-} from '../models/index';
 import {
+    type Client,
     ClientFromJSON,
     ClientToJSON,
-} from '../models/index';
+} from '../models/Client';
 
 export interface 123testSpecialTagsRequest {
     client: Client;

samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/DefaultApi.ts

@@ -12,15 +12,12 @@
  * Do not edit the class manually.
  */
 
-
 import * as runtime from '../runtime';
-import type {
-  FooGetDefaultResponse,
-} from '../models/index';
 import {
+    type FooGetDefaultResponse,
     FooGetDefaultResponseFromJSON,
     FooGetDefaultResponseToJSON,
-} from '../models/index';
+} from '../models/FooGetDefaultResponse';
 
 /**
  * 

samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts

@@ -12,45 +12,62 @@
  * Do not edit the class manually.
  */
 
-
 import * as runtime from '../runtime';
-import type {
-  ChildWithNullable,
-  Client,
-  EnumClass,
-  FakeBigDecimalMap200Response,
-  FileSchemaTestClass,
-  HealthCheckResult,
-  OuterComposite,
-  OuterObjectWithEnumProperty,
-  Pet,
-  TestInlineFreeformAdditionalPropertiesRequest,
-  User,
-} from '../models/index';
 import {
+    type ChildWithNullable,
     ChildWithNullableFromJSON,
     ChildWithNullableToJSON,
+} from '../models/ChildWithNullable';
+import {
+    type Client,
     ClientFromJSON,
     ClientToJSON,
+} from '../models/Client';
+import {
+    type EnumClass,
     EnumClassFromJSON,
     EnumClassToJSON,
+} from '../models/EnumClass';
+import {
+    type FakeBigDecimalMap200Response,
     FakeBigDecimalMap200ResponseFromJSON,
     FakeBigDecimalMap200ResponseToJSON,
+} from '../models/FakeBigDecimalMap200Response';
+import {
+    type FileSchemaTestClass,
     FileSchemaTestClassFromJSON,
     FileSchemaTestClassToJSON,
+} from '../models/FileSchemaTestClass';
+import {
+    type HealthCheckResult,
     HealthCheckResultFromJSON,
     HealthCheckResultToJSON,
+} from '../models/HealthCheckResult';
+import {
+    type OuterComposite,
     OuterCompositeFromJSON,
     OuterCompositeToJSON,
+} from '../models/OuterComposite';
+import {
+    type OuterObjectWithEnumProperty,
     OuterObjectWithEnumPropertyFromJSON,
     OuterObjectWithEnumPropertyToJSON,
+} from '../models/OuterObjectWithEnumProperty';
+import {
+    type Pet,
     PetFromJSON,
     PetToJSON,
+} from '../models/Pet';
+import {
+    type TestInlineFreeformAdditionalPropertiesRequest,
     TestInlineFreeformAdditionalPropertiesRequestFromJSON,
     TestInlineFreeformAdditionalPropertiesRequestToJSON,
+} from '../models/TestInlineFreeformAdditionalPropertiesRequest';
+import {
+    type User,
     UserFromJSON,
     UserToJSON,
-} from '../models/index';
+} from '../models/User';
 
 export interface FakeHttpSignatureTestRequest {
     pet: Pet;

samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeClassnameTags123Api.ts

@@ -12,15 +12,12 @@
  * Do not edit the class manually.
  */
 
-
 import * as runtime from '../runtime';
-import type {
-  Client,
-} from '../models/index';
 import {
+    type Client,
     ClientFromJSON,
     ClientToJSON,
-} from '../models/index';
+} from '../models/Client';
 
 export interface TestClassnameRequest {
     client: Client;