From b21827242d314584d48a8cee2ef0bd44ee34eed9 Mon Sep 17 00:00:00 2001 From: Orrin Naylor Date: Mon, 25 Apr 2022 09:32:01 -0700 Subject: [PATCH 01/14] Remove barrel imports --- .../typescript-fetch/ApiEntitiesRecord.mustache | 4 ++-- .../resources/typescript-fetch/allSagas.mustache | 4 ++-- .../resources/typescript-fetch/apis.mustache | 16 +++++++--------- .../typescript-fetch/sagaApiManager.mustache | 6 +++--- .../resources/typescript-fetch/sagas.mustache | 15 ++++++++------- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesRecord.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesRecord.mustache index d0b6c4cb269e..12880ddd8788 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesRecord.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesRecord.mustache @@ -1,14 +1,14 @@ import {Map, Record, RecordOf} from 'immutable'; -import { {{#models}} {{#model}} {{#isEntity}} +import { {{classname}}RecordEntity, +} from "./models/{{classname}}" {{/isEntity}} {{/model}} {{/models}} -} from "./models/index{{importFileExtension}}" export const ApiEntitiesRecordProps = { recType: "ApiEntitiesRecord" as "ApiEntitiesRecord", diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/allSagas.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/allSagas.mustache index b756ab47c2c7..1437e1f189b0 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/allSagas.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/allSagas.mustache @@ -1,12 +1,12 @@ import {all, fork} from "redux-saga/effects"; -import { {{#apiInfo}} {{#apis}} +import { {{#lambda.camelcase}}{{classFilename}}{{/lambda.camelcase}}AllSagas, +} from "./classFilename"; {{/apis}} {{/apiInfo}} -} from "./index{{importFileExtension}}"; export function *allApiSagas() { yield all([ diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache index 5c99230c73f0..91c6440f8123 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache @@ -4,21 +4,19 @@ import * as runtime from '../runtime{{importFileExtension}}'; -{{#imports.0}} +{{#imports}} import type { - {{#imports}} - {{className}}, - {{/imports}} -} from '../models/index{{importFileExtension}}'; + {{className}}, +} from '../models/{{className}}'; {{^withoutRuntimeChecks}} import { - {{#imports}} + {{className}}, {{className}}FromJSON, {{className}}ToJSON, - {{/imports}} -} from '../models/index{{importFileExtension}}'; +} from '../models/{{className}}'; {{/withoutRuntimeChecks}} -{{/imports.0}} +{{/imports}} + {{#operations}} {{#operation}} diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/sagaApiManager.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/sagaApiManager.mustache index d8979fd9eda3..73a27a3a5aed 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/sagaApiManager.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/sagaApiManager.mustache @@ -1,15 +1,15 @@ import { Configuration, ConfigurationParameters, -} from "../index{{importFileExtension}}"; +} from "../runtime"; -import { {{#apiInfo}} {{#apis}} +import { {{classFilename}}, +} from "./{{classFilename}}"; {{/apis}} {{/apiInfo}} -} from "./index{{importFileExtension}}"; export class Api { {{#apiInfo}} diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache index 2ea9cf32d73a..c1330711cba3 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache @@ -9,18 +9,19 @@ 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}}, {{className}}Record, {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}RecordUtils, - {{/imports}} - {{#passthroughImports}} +} from '../models/{{className}}'; +{{/imports}} + +{{#passthroughImports}} +import { {{.}}, - {{/passthroughImports}} -} from '../models/index{{importFileExtension}}'; -{{/imports.0}} +} from '../models/{{.}}'; +{{/passthroughImports}} {{#hasEnums}} {{#operations}} {{#operation}} From b410e6630f6be4ff7c4779b07f589f4024eb5da1 Mon Sep 17 00:00:00 2001 From: Joseph Cellucci Date: Thu, 15 Jan 2026 19:51:54 -0600 Subject: [PATCH 02/14] add extensions where important --- .../src/main/resources/typescript-fetch/apis.mustache | 4 ++-- .../src/main/resources/typescript-fetch/sagas.mustache | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache index 91c6440f8123..f356ba849070 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache @@ -7,13 +7,13 @@ import * as runtime from '../runtime{{importFileExtension}}'; {{#imports}} import type { {{className}}, -} from '../models/{{className}}'; +} from '../models/{{className}}{{importFileExtension}}'; {{^withoutRuntimeChecks}} import { {{className}}, {{className}}FromJSON, {{className}}ToJSON, -} from '../models/{{className}}'; +} from '../models/{{className}}{{importFileExtension}}'; {{/withoutRuntimeChecks}} {{/imports}} diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache index c1330711cba3..9d7aa92140e5 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache @@ -14,13 +14,13 @@ import { {{className}}, {{className}}Record, {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}RecordUtils, -} from '../models/{{className}}'; +} from '../models/{{className}}{{importFileExtension}}'; {{/imports}} {{#passthroughImports}} import { {{.}}, -} from '../models/{{.}}'; +} from '../models/{{.}}{{importFileExtension}}'; {{/passthroughImports}} {{#hasEnums}} {{#operations}} From 9203775e3637c438c7d724ecc368c675debce181 Mon Sep 17 00:00:00 2001 From: Joseph Cellucci Date: Thu, 15 Jan 2026 20:31:53 -0600 Subject: [PATCH 03/14] fix a few things --- .../resources/typescript-fetch/ApiEntitiesRecord.mustache | 2 +- .../src/main/resources/typescript-fetch/allSagas.mustache | 2 +- .../src/main/resources/typescript-fetch/apis.mustache | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesRecord.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesRecord.mustache index 12880ddd8788..c7c86ffb4681 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesRecord.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesRecord.mustache @@ -5,7 +5,7 @@ import {Map, Record, RecordOf} from 'immutable'; {{#isEntity}} import { {{classname}}RecordEntity, -} from "./models/{{classname}}" +} from "./models/{{classname}}{{importFileExtension}}" {{/isEntity}} {{/model}} {{/models}} diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/allSagas.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/allSagas.mustache index 1437e1f189b0..c15c7e48caae 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/allSagas.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/allSagas.mustache @@ -4,7 +4,7 @@ import {all, fork} from "redux-saga/effects"; {{#apis}} import { {{#lambda.camelcase}}{{classFilename}}{{/lambda.camelcase}}AllSagas, -} from "./classFilename"; +} from "./{{classFilename}}{{importFileExtension}}"; {{/apis}} {{/apiInfo}} diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache index f356ba849070..08fb66f44b0c 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache @@ -5,19 +5,15 @@ import * as runtime from '../runtime{{importFileExtension}}'; {{#imports}} -import type { - {{className}}, -} from '../models/{{className}}{{importFileExtension}}'; {{^withoutRuntimeChecks}} import { - {{className}}, + type {{className}}, {{className}}FromJSON, {{className}}ToJSON, } from '../models/{{className}}{{importFileExtension}}'; {{/withoutRuntimeChecks}} {{/imports}} - {{#operations}} {{#operation}} {{#allParams.0}} From 60a58a227e0509ac9fb53a30f6d9be568ace1021 Mon Sep 17 00:00:00 2001 From: Joseph Cellucci Date: Thu, 15 Jan 2026 20:34:14 -0600 Subject: [PATCH 04/14] add file extension --- .../src/main/resources/typescript-fetch/sagaApiManager.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/sagaApiManager.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/sagaApiManager.mustache index 73a27a3a5aed..dbf20a8924ff 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/sagaApiManager.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/sagaApiManager.mustache @@ -1,7 +1,7 @@ import { Configuration, ConfigurationParameters, -} from "../runtime"; +} from "../runtime{{importFileExtension}}"; {{#apiInfo}} {{#apis}} From efa213c41172ba51fb8f195257295a5cb3adfe0c Mon Sep 17 00:00:00 2001 From: Joseph Cellucci Date: Thu, 15 Jan 2026 20:45:53 -0600 Subject: [PATCH 05/14] fix model vs record imports --- .../src/main/resources/typescript-fetch/sagas.mustache | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache index 9d7aa92140e5..b45523665587 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache @@ -12,9 +12,11 @@ import {Action} from "redux-ts-simple"; {{#imports}} import { {{className}}, +} from '../models/{{className}}{{importFileExtension}}'; +import { {{className}}Record, {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}RecordUtils, -} from '../models/{{className}}{{importFileExtension}}'; +} from '../models/{{className}}Record{{importFileExtension}}'; {{/imports}} {{#passthroughImports}} @@ -22,6 +24,7 @@ import { {{.}}, } from '../models/{{.}}{{importFileExtension}}'; {{/passthroughImports}} + {{#hasEnums}} {{#operations}} {{#operation}} From da2b413d9ba746094a1fcf80dec363ecf021161a Mon Sep 17 00:00:00 2001 From: Joseph Cellucci Date: Thu, 15 Jan 2026 20:49:38 -0600 Subject: [PATCH 06/14] unify spaces between braces --- .../typescript-fetch/ApiEntitiesRecord.mustache | 2 +- .../typescript-fetch/ApiEntitiesReducer.mustache | 6 +++--- .../main/resources/typescript-fetch/allSagas.mustache | 2 +- .../resources/typescript-fetch/recordGeneric.mustache | 10 +++++----- .../typescript-fetch/runtimeSagasAndRecords.mustache | 6 +++--- .../src/main/resources/typescript-fetch/sagas.mustache | 10 +++++----- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesRecord.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesRecord.mustache index c7c86ffb4681..2644d7dd1aff 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesRecord.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesRecord.mustache @@ -1,4 +1,4 @@ -import {Map, Record, RecordOf} from 'immutable'; +import { Map, Record, RecordOf } from 'immutable'; {{#models}} {{#model}} diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesReducer.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesReducer.mustache index 781fc5129f05..50b76da708b7 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/ApiEntitiesReducer.mustache +++ b/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 => { diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/allSagas.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/allSagas.mustache index c15c7e48caae..911a8fe9ed37 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/allSagas.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/allSagas.mustache @@ -1,4 +1,4 @@ -import {all, fork} from "redux-saga/effects"; +import { all, fork } from "redux-saga/effects"; {{#apiInfo}} {{#apis}} diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/recordGeneric.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/recordGeneric.mustache index 819a29e44ee8..188b2addea88 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/recordGeneric.mustache +++ b/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}}, diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/runtimeSagasAndRecords.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/runtimeSagasAndRecords.mustache index 5c6c927648f6..7e83c056b130 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/runtimeSagasAndRecords.mustache +++ b/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(); export const knownIndexedSetByKey: (string | number)[] = []; diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache index b45523665587..e16c67ef4f04 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache @@ -3,11 +3,11 @@ {{>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}} import { From 8ed8ab540cd87cce4dac6f54239b012acf19af1f Mon Sep 17 00:00:00 2001 From: Joseph Cellucci Date: Thu, 15 Jan 2026 20:49:52 -0600 Subject: [PATCH 07/14] remove extra line breaks between license and imports --- .../src/main/resources/typescript-fetch/apis.mustache | 1 - .../src/main/resources/typescript-fetch/runtime.mustache | 1 - .../src/main/resources/typescript-fetch/sagas.mustache | 1 - 3 files changed, 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache index 08fb66f44b0c..4f1a4420e027 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache @@ -2,7 +2,6 @@ /* eslint-disable */ {{>licenseInfo}} - import * as runtime from '../runtime{{importFileExtension}}'; {{#imports}} {{^withoutRuntimeChecks}} diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache index 8cfe7948e922..d29baae425a7 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache +++ b/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 { diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache index e16c67ef4f04..99f754518ae4 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache @@ -2,7 +2,6 @@ /* eslint-disable */ {{>licenseInfo}} - import { Api } from './index{{importFileExtension}}'; import { List } from 'immutable'; import { all, fork, put, takeLatest } from "redux-saga/effects"; From a991213e63096ad2e61ecf1c3bb4b5dcce4c0659 Mon Sep 17 00:00:00 2001 From: Joseph Cellucci Date: Thu, 15 Jan 2026 20:54:42 -0600 Subject: [PATCH 08/14] add missing extension --- .../src/main/resources/typescript-fetch/sagaApiManager.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/sagaApiManager.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/sagaApiManager.mustache index dbf20a8924ff..456f00512c0f 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/sagaApiManager.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/sagaApiManager.mustache @@ -7,7 +7,7 @@ import { {{#apis}} import { {{classFilename}}, -} from "./{{classFilename}}"; +} from "./{{classFilename}}{{importFileExtension}}"; {{/apis}} {{/apiInfo}} From d5463e077e483ebfba073ccbb4a56dd378bd999c Mon Sep 17 00:00:00 2001 From: Joseph Cellucci Date: Wed, 21 Jan 2026 20:23:20 -0600 Subject: [PATCH 09/14] regenerate sample files --- .../infinite-recursion-issue/apis/TestApi.ts | 7 +-- .../infinite-recursion-issue/runtime.ts | 1 - .../self-import-issue/runtime.ts | 1 - .../builds/allOf-nullable/apis/DefaultApi.ts | 7 +-- .../builds/allOf-nullable/runtime.ts | 1 - .../builds/allOf-readonly/apis/DefaultApi.ts | 7 +-- .../builds/allOf-readonly/runtime.ts | 1 - .../default-v3.0/apis/AnotherFakeApi.ts | 7 +-- .../builds/default-v3.0/apis/DefaultApi.ts | 7 +-- .../builds/default-v3.0/apis/FakeApi.ts | 47 +++++++++++++------ .../apis/FakeClassnameTags123Api.ts | 7 +-- .../builds/default-v3.0/apis/PetApi.ts | 11 ++--- .../builds/default-v3.0/apis/StoreApi.ts | 7 +-- .../builds/default-v3.0/apis/UserApi.ts | 7 +-- .../builds/default-v3.0/runtime.ts | 1 - .../builds/default/apis/PetApi.ts | 11 ++--- .../builds/default/apis/StoreApi.ts | 7 +-- .../builds/default/apis/UserApi.ts | 7 +-- .../builds/default/runtime.ts | 1 - .../builds/enum/apis/DefaultApi.ts | 19 ++++---- .../typescript-fetch/builds/enum/runtime.ts | 1 - .../builds/es6-target/src/apis/PetApi.ts | 11 ++--- .../builds/es6-target/src/apis/StoreApi.ts | 7 +-- .../builds/es6-target/src/apis/UserApi.ts | 7 +-- .../builds/es6-target/src/runtime.ts | 1 - .../builds/multiple-parameters/apis/PetApi.ts | 11 ++--- .../multiple-parameters/apis/StoreApi.ts | 7 +-- .../multiple-parameters/apis/UserApi.ts | 7 +-- .../builds/multiple-parameters/runtime.ts | 1 - .../builds/oneOf/apis/DefaultApi.ts | 15 +++--- .../typescript-fetch/builds/oneOf/runtime.ts | 1 - .../src/apis/PetApi.ts | 11 ++--- .../src/apis/StoreApi.ts | 7 +-- .../src/apis/UserApi.ts | 7 +-- .../src/runtime.ts | 1 - .../src/ApiEntitiesRecord.ts | 12 ++++- .../src/ApiEntitiesReducer.ts | 6 +-- .../sagas-and-records/src/apis/BehaviorApi.ts | 11 ++--- .../src/apis/BehaviorApiSagas.ts | 23 ++++++--- .../sagas-and-records/src/apis/PetApi.ts | 27 +++++++---- .../sagas-and-records/src/apis/PetApiSagas.ts | 39 ++++++++++++--- .../sagas-and-records/src/apis/PetPartApi.ts | 11 ++--- .../src/apis/PetPartApiSagas.ts | 25 +++++++--- .../src/apis/SagaApiManager.ts | 12 ++++- .../sagas-and-records/src/apis/StoreApi.ts | 7 +-- .../src/apis/StoreApiSagas.ts | 17 ++++--- .../sagas-and-records/src/apis/UserApi.ts | 11 ++--- .../src/apis/UserApiSagas.ts | 21 ++++++--- .../sagas-and-records/src/apis/allSagas.ts | 12 ++++- .../src/models/CategoryRecord.ts | 10 ++-- .../models/DefaultMetaOnlyResponseRecord.ts | 10 ++-- .../models/FindPetsByStatusResponseRecord.ts | 10 ++-- .../models/FindPetsByUserResponseRecord.ts | 10 ++-- .../GetBehaviorPermissionsResponseRecord.ts | 10 ++-- .../models/GetBehaviorTypeResponseRecord.ts | 10 ++-- .../models/GetMatchingPartsResponseRecord.ts | 10 ++-- .../models/GetPetPartTypeResponseRecord.ts | 10 ++-- .../src/models/ItemIdRecord.ts | 10 ++-- .../src/models/MatchingPartsRecord.ts | 10 ++-- .../src/models/ModelApiResponseRecord.ts | 10 ++-- .../src/models/ModelErrorRecord.ts | 10 ++-- .../src/models/OrderRecord.ts | 10 ++-- .../src/models/PartRecord.ts | 10 ++-- .../sagas-and-records/src/models/PetRecord.ts | 10 ++-- .../src/models/PetRegionsResponseRecord.ts | 10 ++-- .../src/models/ResponseMetaRecord.ts | 10 ++-- .../sagas-and-records/src/models/TagRecord.ts | 10 ++-- .../src/models/UserRecord.ts | 10 ++-- .../builds/sagas-and-records/src/runtime.ts | 1 - .../src/runtimeSagasAndRecords.ts | 6 +-- .../apis/AnotherFakeApi.ts | 7 +-- .../apis/DefaultApi.ts | 7 +-- .../snakecase-discriminator/apis/FakeApi.ts | 39 ++++++++++----- .../apis/FakeClassnameTags123Api.ts | 7 +-- .../snakecase-discriminator/apis/PetApi.ts | 11 ++--- .../snakecase-discriminator/apis/StoreApi.ts | 7 +-- .../snakecase-discriminator/apis/UserApi.ts | 7 +-- .../builds/snakecase-discriminator/runtime.ts | 1 - .../validation-attributes/apis/PetApi.ts | 11 ++--- .../validation-attributes/apis/StoreApi.ts | 7 +-- .../validation-attributes/apis/UserApi.ts | 7 +-- .../builds/validation-attributes/runtime.ts | 1 - .../builds/with-interfaces/apis/PetApi.ts | 11 ++--- .../builds/with-interfaces/apis/StoreApi.ts | 7 +-- .../builds/with-interfaces/apis/UserApi.ts | 7 +-- .../builds/with-interfaces/runtime.ts | 1 - .../with-npm-version/src/apis/PetApi.ts | 11 ++--- .../with-npm-version/src/apis/StoreApi.ts | 7 +-- .../with-npm-version/src/apis/UserApi.ts | 7 +-- .../builds/with-npm-version/src/runtime.ts | 1 - .../with-string-enums/apis/DefaultApi.ts | 19 ++++---- .../builds/with-string-enums/runtime.ts | 1 - .../without-runtime-checks/src/apis/PetApi.ts | 5 -- .../src/apis/StoreApi.ts | 4 -- .../src/apis/UserApi.ts | 4 -- .../without-runtime-checks/src/runtime.ts | 1 - 96 files changed, 442 insertions(+), 446 deletions(-) diff --git a/samples/client/others/typescript-fetch/infinite-recursion-issue/apis/TestApi.ts b/samples/client/others/typescript-fetch/infinite-recursion-issue/apis/TestApi.ts index ba47bcab5145..72cc787266be 100644 --- a/samples/client/others/typescript-fetch/infinite-recursion-issue/apis/TestApi.ts +++ b/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'; /** * diff --git a/samples/client/others/typescript-fetch/infinite-recursion-issue/runtime.ts b/samples/client/others/typescript-fetch/infinite-recursion-issue/runtime.ts index 492083e7c372..424ca7cadae6 100644 --- a/samples/client/others/typescript-fetch/infinite-recursion-issue/runtime.ts +++ b/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 { diff --git a/samples/client/others/typescript-fetch/self-import-issue/runtime.ts b/samples/client/others/typescript-fetch/self-import-issue/runtime.ts index c3175f3bac29..a39eb5e51591 100644 --- a/samples/client/others/typescript-fetch/self-import-issue/runtime.ts +++ b/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 { diff --git a/samples/client/petstore/typescript-fetch/builds/allOf-nullable/apis/DefaultApi.ts b/samples/client/petstore/typescript-fetch/builds/allOf-nullable/apis/DefaultApi.ts index ae2d4c75887f..fe6d3a50e528 100644 --- a/samples/client/petstore/typescript-fetch/builds/allOf-nullable/apis/DefaultApi.ts +++ b/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; diff --git a/samples/client/petstore/typescript-fetch/builds/allOf-nullable/runtime.ts b/samples/client/petstore/typescript-fetch/builds/allOf-nullable/runtime.ts index c9b10a3dc885..92307fa05429 100644 --- a/samples/client/petstore/typescript-fetch/builds/allOf-nullable/runtime.ts +++ b/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 { diff --git a/samples/client/petstore/typescript-fetch/builds/allOf-readonly/apis/DefaultApi.ts b/samples/client/petstore/typescript-fetch/builds/allOf-readonly/apis/DefaultApi.ts index ae2d4c75887f..fe6d3a50e528 100644 --- a/samples/client/petstore/typescript-fetch/builds/allOf-readonly/apis/DefaultApi.ts +++ b/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; diff --git a/samples/client/petstore/typescript-fetch/builds/allOf-readonly/runtime.ts b/samples/client/petstore/typescript-fetch/builds/allOf-readonly/runtime.ts index c9b10a3dc885..92307fa05429 100644 --- a/samples/client/petstore/typescript-fetch/builds/allOf-readonly/runtime.ts +++ b/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 { diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/AnotherFakeApi.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/AnotherFakeApi.ts index f5ba5857f5c5..0a7815a78af9 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/AnotherFakeApi.ts +++ b/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; diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/DefaultApi.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/DefaultApi.ts index ce1e24dc07f2..bd7085753bfb 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/DefaultApi.ts +++ b/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'; /** * diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts index 0eef4125671b..75fccf48d5b0 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts +++ b/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; diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeClassnameTags123Api.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeClassnameTags123Api.ts index cdefdb8e7951..0236073acb8a 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeClassnameTags123Api.ts +++ b/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; diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/PetApi.ts index 2a9812520139..fc79d795f1c3 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/PetApi.ts @@ -12,18 +12,17 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - ModelApiResponse, - Pet, -} from '../models/index'; import { + type ModelApiResponse, ModelApiResponseFromJSON, ModelApiResponseToJSON, +} from '../models/ModelApiResponse'; +import { + type Pet, PetFromJSON, PetToJSON, -} from '../models/index'; +} from '../models/Pet'; export interface AddPetRequest { pet: Pet; diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/StoreApi.ts index 3ba8c2cab723..f03d6c2fae65 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/StoreApi.ts @@ -12,15 +12,12 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - Order, -} from '../models/index'; import { + type Order, OrderFromJSON, OrderToJSON, -} from '../models/index'; +} from '../models/Order'; export interface DeleteOrderRequest { orderId: string; diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/UserApi.ts index 83a5374e23a5..0db0d891a5f2 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/UserApi.ts @@ -12,15 +12,12 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - User, -} from '../models/index'; import { + type User, UserFromJSON, UserToJSON, -} from '../models/index'; +} from '../models/User'; export interface CreateUserRequest { user: User; diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts index 6d3d965df11d..2738678aa8e3 100644 --- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/runtime.ts @@ -12,7 +12,6 @@ * Do not edit the class manually. */ - export const BASE_PATH = "http://petstore.swagger.io:80/v2".replace(/\/+$/, ""); export interface ConfigurationParameters { diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts index 586438f033c4..9e59db7ee9f8 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts @@ -12,18 +12,17 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - ModelApiResponse, - Pet, -} from '../models/index'; import { + type ModelApiResponse, ModelApiResponseFromJSON, ModelApiResponseToJSON, +} from '../models/ModelApiResponse'; +import { + type Pet, PetFromJSON, PetToJSON, -} from '../models/index'; +} from '../models/Pet'; export interface AddPetRequest { body: Pet; diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts index 0bcfdbf84600..b5f61e3713aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts @@ -12,15 +12,12 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - Order, -} from '../models/index'; import { + type Order, OrderFromJSON, OrderToJSON, -} from '../models/index'; +} from '../models/Order'; export interface DeleteOrderRequest { orderId: string; diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts index 43799227666d..697a7a6cb9d8 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts @@ -12,15 +12,12 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - User, -} from '../models/index'; import { + type User, UserFromJSON, UserToJSON, -} from '../models/index'; +} from '../models/User'; export interface CreateUserRequest { body: User; diff --git a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts index 3f125c3b0601..cacafc93eef3 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts @@ -12,7 +12,6 @@ * Do not edit the class manually. */ - export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); export interface ConfigurationParameters { diff --git a/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts b/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts index d6ef42525e47..adf876bc336e 100644 --- a/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts @@ -12,24 +12,27 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - EnumPatternObject, - FakeEnumRequestGetInline200Response, - NumberEnum, - StringEnum, -} from '../models/index'; import { + type EnumPatternObject, EnumPatternObjectFromJSON, EnumPatternObjectToJSON, +} from '../models/EnumPatternObject'; +import { + type FakeEnumRequestGetInline200Response, FakeEnumRequestGetInline200ResponseFromJSON, FakeEnumRequestGetInline200ResponseToJSON, +} from '../models/FakeEnumRequestGetInline200Response'; +import { + type NumberEnum, NumberEnumFromJSON, NumberEnumToJSON, +} from '../models/NumberEnum'; +import { + type StringEnum, StringEnumFromJSON, StringEnumToJSON, -} from '../models/index'; +} from '../models/StringEnum'; export interface FakeEnumRequestGetInlineRequest { stringEnum?: FakeEnumRequestGetInlineStringEnumEnum; diff --git a/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts b/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts index 8095de29bc32..748dbfca7a3c 100644 --- a/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/enum/runtime.ts @@ -12,7 +12,6 @@ * Do not edit the class manually. */ - export const BASE_PATH = "http://localhost:3000".replace(/\/+$/, ""); export interface ConfigurationParameters { diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/PetApi.ts index 586438f033c4..9e59db7ee9f8 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/PetApi.ts @@ -12,18 +12,17 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - ModelApiResponse, - Pet, -} from '../models/index'; import { + type ModelApiResponse, ModelApiResponseFromJSON, ModelApiResponseToJSON, +} from '../models/ModelApiResponse'; +import { + type Pet, PetFromJSON, PetToJSON, -} from '../models/index'; +} from '../models/Pet'; export interface AddPetRequest { body: Pet; diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/StoreApi.ts index 0bcfdbf84600..b5f61e3713aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/StoreApi.ts @@ -12,15 +12,12 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - Order, -} from '../models/index'; import { + type Order, OrderFromJSON, OrderToJSON, -} from '../models/index'; +} from '../models/Order'; export interface DeleteOrderRequest { orderId: string; diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/UserApi.ts index 43799227666d..697a7a6cb9d8 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/apis/UserApi.ts @@ -12,15 +12,12 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - User, -} from '../models/index'; import { + type User, UserFromJSON, UserToJSON, -} from '../models/index'; +} from '../models/User'; export interface CreateUserRequest { body: User; diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts index 3f125c3b0601..cacafc93eef3 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/src/runtime.ts @@ -12,7 +12,6 @@ * Do not edit the class manually. */ - export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); export interface ConfigurationParameters { diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts index 1c67884763ce..2e30a96eeb41 100644 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts @@ -12,18 +12,17 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - ModelApiResponse, - Pet, -} from '../models/index'; import { + type ModelApiResponse, ModelApiResponseFromJSON, ModelApiResponseToJSON, +} from '../models/ModelApiResponse'; +import { + type Pet, PetFromJSON, PetToJSON, -} from '../models/index'; +} from '../models/Pet'; export interface AddPetRequest { body: Pet; diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts index b3a1f18a31ce..3b0b8881be25 100644 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts @@ -12,15 +12,12 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - Order, -} from '../models/index'; import { + type Order, OrderFromJSON, OrderToJSON, -} from '../models/index'; +} from '../models/Order'; export interface DeleteOrderRequest { orderId: string; diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts index eb9fbebf507e..d1a26626f96e 100644 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts @@ -12,15 +12,12 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - User, -} from '../models/index'; import { + type User, UserFromJSON, UserToJSON, -} from '../models/index'; +} from '../models/User'; export interface CreateUserRequest { body: User; diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts index 3f125c3b0601..cacafc93eef3 100644 --- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts @@ -12,7 +12,6 @@ * Do not edit the class manually. */ - export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); export interface ConfigurationParameters { diff --git a/samples/client/petstore/typescript-fetch/builds/oneOf/apis/DefaultApi.ts b/samples/client/petstore/typescript-fetch/builds/oneOf/apis/DefaultApi.ts index 4d855b758fb7..85ae1088a364 100644 --- a/samples/client/petstore/typescript-fetch/builds/oneOf/apis/DefaultApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/oneOf/apis/DefaultApi.ts @@ -12,21 +12,22 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - TestArrayResponse, - TestDiscriminatorResponse, - TestResponse, -} from '../models/index'; import { + type TestArrayResponse, TestArrayResponseFromJSON, TestArrayResponseToJSON, +} from '../models/TestArrayResponse'; +import { + type TestDiscriminatorResponse, TestDiscriminatorResponseFromJSON, TestDiscriminatorResponseToJSON, +} from '../models/TestDiscriminatorResponse'; +import { + type TestResponse, TestResponseFromJSON, TestResponseToJSON, -} from '../models/index'; +} from '../models/TestResponse'; /** * diff --git a/samples/client/petstore/typescript-fetch/builds/oneOf/runtime.ts b/samples/client/petstore/typescript-fetch/builds/oneOf/runtime.ts index c807c6354f8d..b1cf05047a1c 100644 --- a/samples/client/petstore/typescript-fetch/builds/oneOf/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/oneOf/runtime.ts @@ -12,7 +12,6 @@ * Do not edit the class manually. */ - export const BASE_PATH = "http://localhost:3000".replace(/\/+$/, ""); export interface ConfigurationParameters { 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/src/apis/PetApi.ts index 4503fa90ce10..7fddfc1e4859 100644 --- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/PetApi.ts @@ -12,18 +12,17 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - ModelApiResponse, - Pet, -} from '../models/index'; import { + type ModelApiResponse, ModelApiResponseFromJSON, ModelApiResponseToJSON, +} from '../models/ModelApiResponse'; +import { + type Pet, PetFromJSON, PetToJSON, -} from '../models/index'; +} from '../models/Pet'; export interface PetApiAddPetRequest { body: Pet; 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/src/apis/StoreApi.ts index c0a916bebe98..122c2edfb2e3 100644 --- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/StoreApi.ts @@ -12,15 +12,12 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - Order, -} from '../models/index'; import { + type Order, OrderFromJSON, OrderToJSON, -} from '../models/index'; +} from '../models/Order'; export interface StoreApiDeleteOrderRequest { orderId: string; 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/src/apis/UserApi.ts index 6b8bd7d113b5..24e991a2637a 100644 --- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/apis/UserApi.ts @@ -12,15 +12,12 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - User, -} from '../models/index'; import { + type User, UserFromJSON, UserToJSON, -} from '../models/index'; +} from '../models/User'; export interface UserApiCreateUserRequest { body: User; diff --git a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts index 3f125c3b0601..cacafc93eef3 100644 --- a/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces/src/runtime.ts @@ -12,7 +12,6 @@ * Do not edit the class manually. */ - export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); export interface ConfigurationParameters { diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/ApiEntitiesRecord.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/ApiEntitiesRecord.ts index ca7044f65375..568ca14a1d10 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/ApiEntitiesRecord.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/ApiEntitiesRecord.ts @@ -1,12 +1,20 @@ -import {Map, Record, RecordOf} from 'immutable'; +import { Map, Record, RecordOf } from 'immutable'; import { CategoryRecordEntity, +} from "./models/Category" +import { OrderRecordEntity, +} from "./models/Order" +import { PetRecordEntity, +} from "./models/Pet" +import { TagRecordEntity, +} from "./models/Tag" +import { UserRecordEntity, -} from "./models/index" +} from "./models/User" export const ApiEntitiesRecordProps = { recType: "ApiEntitiesRecord" as "ApiEntitiesRecord", diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/ApiEntitiesReducer.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/ApiEntitiesReducer.ts index 539e8624a02a..cb6326b35781 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/ApiEntitiesReducer.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/ApiEntitiesReducer.ts @@ -1,6 +1,6 @@ -import {ApiEntitiesRecord} from "./ApiEntitiesRecord"; -import {ReducerBuilder} from "redux-ts-simple"; -import {normalizedEntities} from "./runtimeSagasAndRecords"; +import { ApiEntitiesRecord } from "./ApiEntitiesRecord"; +import { ReducerBuilder } from "redux-ts-simple"; +import { normalizedEntities } from "./runtimeSagasAndRecords"; export const ApiEntitiesReducer = new ReducerBuilder(ApiEntitiesRecord()) .on(normalizedEntities, (state, action): ApiEntitiesRecord => { diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/BehaviorApi.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/BehaviorApi.ts index eaee9f44b95e..3a0763322812 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/BehaviorApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/BehaviorApi.ts @@ -12,18 +12,17 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - GetBehaviorPermissionsResponse, - GetBehaviorTypeResponse, -} from '../models/index'; import { + type GetBehaviorPermissionsResponse, GetBehaviorPermissionsResponseFromJSON, GetBehaviorPermissionsResponseToJSON, +} from '../models/GetBehaviorPermissionsResponse'; +import { + type GetBehaviorTypeResponse, GetBehaviorTypeResponseFromJSON, GetBehaviorTypeResponseToJSON, -} from '../models/index'; +} from '../models/GetBehaviorTypeResponse'; export interface GetBehaviorPermissionsRequest { behaviorId: number; diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/BehaviorApiSagas.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/BehaviorApiSagas.ts index 14b123ff5450..7ec541ae7f47 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/BehaviorApiSagas.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/BehaviorApiSagas.ts @@ -12,22 +12,31 @@ * Do not edit the class manually. */ - -import {Api} from './index'; -import {List} from 'immutable'; -import {all, fork, put, takeLatest} from "redux-saga/effects"; -import {apiCall, createSagaAction as originalCreateSagaAction, BaseEntitySupportPayloadApiAction, BasePayloadApiAction, NormalizedRecordEntities, normalizedEntities} from "../runtimeSagasAndRecords"; -import {Action} from "redux-ts-simple"; +import { Api } from './index'; +import { List } from 'immutable'; +import { all, fork, put, takeLatest } from "redux-saga/effects"; +import { apiCall, createSagaAction as originalCreateSagaAction, BaseEntitySupportPayloadApiAction, BasePayloadApiAction, NormalizedRecordEntities, normalizedEntities } from "../runtimeSagasAndRecords"; +import { Action } from "redux-ts-simple"; import { GetBehaviorPermissionsResponse, +} from '../models/GetBehaviorPermissionsResponse'; +import { GetBehaviorPermissionsResponseRecord, getBehaviorPermissionsResponseRecordUtils, +} from '../models/GetBehaviorPermissionsResponseRecord'; +import { GetBehaviorTypeResponse, +} from '../models/GetBehaviorTypeResponse'; +import { GetBehaviorTypeResponseRecord, getBehaviorTypeResponseRecordUtils, +} from '../models/GetBehaviorTypeResponseRecord'; + +import { BehaviorType, -} from '../models/index'; +} from '../models/BehaviorType'; + const createSagaAction = (type: string) => originalCreateSagaAction(type, {namespace: "api_behaviorApi"}); diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetApi.ts index fff5fd90fedc..c76fc074bcd4 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetApi.ts @@ -12,30 +12,37 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - Category, - FindPetsByStatusResponse, - FindPetsByUserResponse, - ModelApiResponse, - Pet, - PetRegionsResponse, -} from '../models/index'; import { + type Category, CategoryFromJSON, CategoryToJSON, +} from '../models/Category'; +import { + type FindPetsByStatusResponse, FindPetsByStatusResponseFromJSON, FindPetsByStatusResponseToJSON, +} from '../models/FindPetsByStatusResponse'; +import { + type FindPetsByUserResponse, FindPetsByUserResponseFromJSON, FindPetsByUserResponseToJSON, +} from '../models/FindPetsByUserResponse'; +import { + type ModelApiResponse, ModelApiResponseFromJSON, ModelApiResponseToJSON, +} from '../models/ModelApiResponse'; +import { + type Pet, PetFromJSON, PetToJSON, +} from '../models/Pet'; +import { + type PetRegionsResponse, PetRegionsResponseFromJSON, PetRegionsResponseToJSON, -} from '../models/index'; +} from '../models/PetRegionsResponse'; export interface AddPetRequest { dummyCat: Category; diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetApiSagas.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetApiSagas.ts index 491cbceceeb2..d963f0b10d85 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetApiSagas.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetApiSagas.ts @@ -12,34 +12,59 @@ * Do not edit the class manually. */ - -import {Api} from './index'; -import {List} from 'immutable'; -import {all, fork, put, takeLatest} from "redux-saga/effects"; -import {apiCall, createSagaAction as originalCreateSagaAction, BaseEntitySupportPayloadApiAction, BasePayloadApiAction, NormalizedRecordEntities, normalizedEntities} from "../runtimeSagasAndRecords"; -import {Action} from "redux-ts-simple"; +import { Api } from './index'; +import { List } from 'immutable'; +import { all, fork, put, takeLatest } from "redux-saga/effects"; +import { apiCall, createSagaAction as originalCreateSagaAction, BaseEntitySupportPayloadApiAction, BasePayloadApiAction, NormalizedRecordEntities, normalizedEntities } from "../runtimeSagasAndRecords"; +import { Action } from "redux-ts-simple"; import { Category, +} from '../models/Category'; +import { CategoryRecord, categoryRecordUtils, +} from '../models/CategoryRecord'; +import { FindPetsByStatusResponse, +} from '../models/FindPetsByStatusResponse'; +import { FindPetsByStatusResponseRecord, findPetsByStatusResponseRecordUtils, +} from '../models/FindPetsByStatusResponseRecord'; +import { FindPetsByUserResponse, +} from '../models/FindPetsByUserResponse'; +import { FindPetsByUserResponseRecord, findPetsByUserResponseRecordUtils, +} from '../models/FindPetsByUserResponseRecord'; +import { ModelApiResponse, +} from '../models/ModelApiResponse'; +import { ModelApiResponseRecord, modelApiResponseRecordUtils, +} from '../models/ModelApiResponseRecord'; +import { Pet, +} from '../models/Pet'; +import { PetRecord, petRecordUtils, +} from '../models/PetRecord'; +import { PetRegionsResponse, +} from '../models/PetRegionsResponse'; +import { PetRegionsResponseRecord, petRegionsResponseRecordUtils, +} from '../models/PetRegionsResponseRecord'; + +import { UserRecord, -} from '../models/index'; +} from '../models/UserRecord'; + import { FindPetsByStatusStatusEnum, diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetPartApi.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetPartApi.ts index 4cb50b198310..8da10455c2f0 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetPartApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetPartApi.ts @@ -12,18 +12,17 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - GetMatchingPartsResponse, - GetPetPartTypeResponse, -} from '../models/index'; import { + type GetMatchingPartsResponse, GetMatchingPartsResponseFromJSON, GetMatchingPartsResponseToJSON, +} from '../models/GetMatchingPartsResponse'; +import { + type GetPetPartTypeResponse, GetPetPartTypeResponseFromJSON, GetPetPartTypeResponseToJSON, -} from '../models/index'; +} from '../models/GetPetPartTypeResponse'; export interface GetFakePetPartTypeRequest { fakePetPartId: number; diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetPartApiSagas.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetPartApiSagas.ts index cc5e7c765403..26be97ef6610 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetPartApiSagas.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetPartApiSagas.ts @@ -12,23 +12,34 @@ * Do not edit the class manually. */ - -import {Api} from './index'; -import {List} from 'immutable'; -import {all, fork, put, takeLatest} from "redux-saga/effects"; -import {apiCall, createSagaAction as originalCreateSagaAction, BaseEntitySupportPayloadApiAction, BasePayloadApiAction, NormalizedRecordEntities, normalizedEntities} from "../runtimeSagasAndRecords"; -import {Action} from "redux-ts-simple"; +import { Api } from './index'; +import { List } from 'immutable'; +import { all, fork, put, takeLatest } from "redux-saga/effects"; +import { apiCall, createSagaAction as originalCreateSagaAction, BaseEntitySupportPayloadApiAction, BasePayloadApiAction, NormalizedRecordEntities, normalizedEntities } from "../runtimeSagasAndRecords"; +import { Action } from "redux-ts-simple"; import { GetMatchingPartsResponse, +} from '../models/GetMatchingPartsResponse'; +import { GetMatchingPartsResponseRecord, getMatchingPartsResponseRecordUtils, +} from '../models/GetMatchingPartsResponseRecord'; +import { GetPetPartTypeResponse, +} from '../models/GetPetPartTypeResponse'; +import { GetPetPartTypeResponseRecord, getPetPartTypeResponseRecordUtils, +} from '../models/GetPetPartTypeResponseRecord'; + +import { MatchingPartsRecord, +} from '../models/MatchingPartsRecord'; +import { PetPartType, -} from '../models/index'; +} from '../models/PetPartType'; + const createSagaAction = (type: string) => originalCreateSagaAction(type, {namespace: "api_petPartApi"}); diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/SagaApiManager.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/SagaApiManager.ts index 9a4203b48805..0b290058cc05 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/SagaApiManager.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/SagaApiManager.ts @@ -1,15 +1,23 @@ import { Configuration, ConfigurationParameters, -} from "../index"; +} from "../runtime"; import { BehaviorApi, +} from "./BehaviorApi"; +import { PetApi, +} from "./PetApi"; +import { PetPartApi, +} from "./PetPartApi"; +import { StoreApi, +} from "./StoreApi"; +import { UserApi, -} from "./index"; +} from "./UserApi"; export class Api { public static behaviorApi: BehaviorApi; diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/StoreApi.ts index b3a1f18a31ce..3b0b8881be25 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/StoreApi.ts @@ -12,15 +12,12 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - Order, -} from '../models/index'; import { + type Order, OrderFromJSON, OrderToJSON, -} from '../models/index'; +} from '../models/Order'; export interface DeleteOrderRequest { orderId: string; diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/StoreApiSagas.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/StoreApiSagas.ts index ba4a4e32e8fa..fa89d4922c56 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/StoreApiSagas.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/StoreApiSagas.ts @@ -12,18 +12,21 @@ * Do not edit the class manually. */ - -import {Api} from './index'; -import {List} from 'immutable'; -import {all, fork, put, takeLatest} from "redux-saga/effects"; -import {apiCall, createSagaAction as originalCreateSagaAction, BaseEntitySupportPayloadApiAction, BasePayloadApiAction, NormalizedRecordEntities, normalizedEntities} from "../runtimeSagasAndRecords"; -import {Action} from "redux-ts-simple"; +import { Api } from './index'; +import { List } from 'immutable'; +import { all, fork, put, takeLatest } from "redux-saga/effects"; +import { apiCall, createSagaAction as originalCreateSagaAction, BaseEntitySupportPayloadApiAction, BasePayloadApiAction, NormalizedRecordEntities, normalizedEntities } from "../runtimeSagasAndRecords"; +import { Action } from "redux-ts-simple"; import { Order, +} from '../models/Order'; +import { OrderRecord, orderRecordUtils, -} from '../models/index'; +} from '../models/OrderRecord'; + + const createSagaAction = (type: string) => originalCreateSagaAction(type, {namespace: "api_storeApi"}); diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApi.ts index 3c7d7dd91a53..406253c7471e 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApi.ts @@ -12,18 +12,17 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - DefaultMetaOnlyResponse, - User, -} from '../models/index'; import { + type DefaultMetaOnlyResponse, DefaultMetaOnlyResponseFromJSON, DefaultMetaOnlyResponseToJSON, +} from '../models/DefaultMetaOnlyResponse'; +import { + type User, UserFromJSON, UserToJSON, -} from '../models/index'; +} from '../models/User'; export interface CreateUserRequest { body: User; diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApiSagas.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApiSagas.ts index ccb9c7614c92..90a1a22a87a3 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApiSagas.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApiSagas.ts @@ -12,21 +12,28 @@ * Do not edit the class manually. */ - -import {Api} from './index'; -import {List} from 'immutable'; -import {all, fork, put, takeLatest} from "redux-saga/effects"; -import {apiCall, createSagaAction as originalCreateSagaAction, BaseEntitySupportPayloadApiAction, BasePayloadApiAction, NormalizedRecordEntities, normalizedEntities} from "../runtimeSagasAndRecords"; -import {Action} from "redux-ts-simple"; +import { Api } from './index'; +import { List } from 'immutable'; +import { all, fork, put, takeLatest } from "redux-saga/effects"; +import { apiCall, createSagaAction as originalCreateSagaAction, BaseEntitySupportPayloadApiAction, BasePayloadApiAction, NormalizedRecordEntities, normalizedEntities } from "../runtimeSagasAndRecords"; +import { Action } from "redux-ts-simple"; import { DefaultMetaOnlyResponse, +} from '../models/DefaultMetaOnlyResponse'; +import { DefaultMetaOnlyResponseRecord, defaultMetaOnlyResponseRecordUtils, +} from '../models/DefaultMetaOnlyResponseRecord'; +import { User, +} from '../models/User'; +import { UserRecord, userRecordUtils, -} from '../models/index'; +} from '../models/UserRecord'; + + const createSagaAction = (type: string) => originalCreateSagaAction(type, {namespace: "api_userApi"}); diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/allSagas.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/allSagas.ts index c85bc8597775..a493fe53c49b 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/allSagas.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/allSagas.ts @@ -1,12 +1,20 @@ -import {all, fork} from "redux-saga/effects"; +import { all, fork } from "redux-saga/effects"; import { behaviorApiAllSagas, +} from "./BehaviorApi"; +import { petApiAllSagas, +} from "./PetApi"; +import { petPartApiAllSagas, +} from "./PetPartApi"; +import { storeApiAllSagas, +} from "./StoreApi"; +import { userApiAllSagas, -} from "./index"; +} from "./UserApi"; export function *allApiSagas() { yield all([ diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/CategoryRecord.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/CategoryRecord.ts index 2bb757b734aa..505928672c04 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/CategoryRecord.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/CategoryRecord.ts @@ -12,11 +12,11 @@ * Do not edit the class manually. */ -import {ApiRecordUtils, knownRecordFactories} from "../runtimeSagasAndRecords"; -import {getApiEntitiesState} from "../ApiEntitiesSelectors" -import {List, Record, RecordOf, Map} from 'immutable'; -import {Schema, schema, NormalizedSchema} from "normalizr"; -import {select, call} from "redux-saga/effects"; +import { ApiRecordUtils, knownRecordFactories } from "../runtimeSagasAndRecords"; +import { getApiEntitiesState } from "../ApiEntitiesSelectors" +import { List, Record, RecordOf, Map } from 'immutable'; +import { Schema, schema, NormalizedSchema } from "normalizr"; +import { select, call } from "redux-saga/effects"; import { Category, diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/DefaultMetaOnlyResponseRecord.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/DefaultMetaOnlyResponseRecord.ts index 73ce3a84c712..b996cadf58b7 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/DefaultMetaOnlyResponseRecord.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/DefaultMetaOnlyResponseRecord.ts @@ -12,11 +12,11 @@ * Do not edit the class manually. */ -import {ApiRecordUtils, knownRecordFactories} from "../runtimeSagasAndRecords"; -import {getApiEntitiesState} from "../ApiEntitiesSelectors" -import {List, Record, RecordOf, Map} from 'immutable'; -import {Schema, schema, NormalizedSchema} from "normalizr"; -import {select, call} from "redux-saga/effects"; +import { ApiRecordUtils, knownRecordFactories } from "../runtimeSagasAndRecords"; +import { getApiEntitiesState } from "../ApiEntitiesSelectors" +import { List, Record, RecordOf, Map } from 'immutable'; +import { Schema, schema, NormalizedSchema } from "normalizr"; +import { select, call } from "redux-saga/effects"; import { DefaultMetaOnlyResponse, diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/FindPetsByStatusResponseRecord.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/FindPetsByStatusResponseRecord.ts index f22a5c3f59cb..1f47a25744ed 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/FindPetsByStatusResponseRecord.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/FindPetsByStatusResponseRecord.ts @@ -12,11 +12,11 @@ * Do not edit the class manually. */ -import {ApiRecordUtils, knownRecordFactories, appFromJS, NormalizedRecordEntities} from "../runtimeSagasAndRecords"; -import {getApiEntitiesState} from "../ApiEntitiesSelectors" -import {List, Record, RecordOf, Map} from 'immutable'; -import {Schema, schema, NormalizedSchema} from "normalizr"; -import {select, call} from "redux-saga/effects"; +import { ApiRecordUtils, knownRecordFactories, appFromJS, NormalizedRecordEntities } from "../runtimeSagasAndRecords"; +import { getApiEntitiesState } from "../ApiEntitiesSelectors" +import { List, Record, RecordOf, Map } from 'immutable'; +import { Schema, schema, NormalizedSchema } from "normalizr"; +import { select, call } from "redux-saga/effects"; import { FindPetsByStatusResponse, diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/FindPetsByUserResponseRecord.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/FindPetsByUserResponseRecord.ts index 0af0862472d9..746e9f463c54 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/FindPetsByUserResponseRecord.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/FindPetsByUserResponseRecord.ts @@ -12,11 +12,11 @@ * Do not edit the class manually. */ -import {ApiRecordUtils, knownRecordFactories, appFromJS, NormalizedRecordEntities} from "../runtimeSagasAndRecords"; -import {getApiEntitiesState} from "../ApiEntitiesSelectors" -import {List, Record, RecordOf, Map} from 'immutable'; -import {Schema, schema, NormalizedSchema} from "normalizr"; -import {select, call} from "redux-saga/effects"; +import { ApiRecordUtils, knownRecordFactories, appFromJS, NormalizedRecordEntities } from "../runtimeSagasAndRecords"; +import { getApiEntitiesState } from "../ApiEntitiesSelectors" +import { List, Record, RecordOf, Map } from 'immutable'; +import { Schema, schema, NormalizedSchema } from "normalizr"; +import { select, call } from "redux-saga/effects"; import { FindPetsByUserResponse, diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetBehaviorPermissionsResponseRecord.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetBehaviorPermissionsResponseRecord.ts index 1769f9ba5b39..7e9310b4b771 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetBehaviorPermissionsResponseRecord.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetBehaviorPermissionsResponseRecord.ts @@ -12,11 +12,11 @@ * Do not edit the class manually. */ -import {ApiRecordUtils, knownRecordFactories, appFromJS, NormalizedRecordEntities} from "../runtimeSagasAndRecords"; -import {getApiEntitiesState} from "../ApiEntitiesSelectors" -import {List, Record, RecordOf, Map} from 'immutable'; -import {Schema, schema, NormalizedSchema} from "normalizr"; -import {select, call} from "redux-saga/effects"; +import { ApiRecordUtils, knownRecordFactories, appFromJS, NormalizedRecordEntities } from "../runtimeSagasAndRecords"; +import { getApiEntitiesState } from "../ApiEntitiesSelectors" +import { List, Record, RecordOf, Map } from 'immutable'; +import { Schema, schema, NormalizedSchema } from "normalizr"; +import { select, call } from "redux-saga/effects"; import { GetBehaviorPermissionsResponse, diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetBehaviorTypeResponseRecord.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetBehaviorTypeResponseRecord.ts index 55990ad5dcb0..90f27e6faa27 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetBehaviorTypeResponseRecord.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetBehaviorTypeResponseRecord.ts @@ -12,11 +12,11 @@ * Do not edit the class manually. */ -import {ApiRecordUtils, knownRecordFactories, appFromJS, NormalizedRecordEntities} from "../runtimeSagasAndRecords"; -import {getApiEntitiesState} from "../ApiEntitiesSelectors" -import {List, Record, RecordOf, Map} from 'immutable'; -import {Schema, schema, NormalizedSchema} from "normalizr"; -import {select, call} from "redux-saga/effects"; +import { ApiRecordUtils, knownRecordFactories, appFromJS, NormalizedRecordEntities } from "../runtimeSagasAndRecords"; +import { getApiEntitiesState } from "../ApiEntitiesSelectors" +import { List, Record, RecordOf, Map } from 'immutable'; +import { Schema, schema, NormalizedSchema } from "normalizr"; +import { select, call } from "redux-saga/effects"; import { GetBehaviorTypeResponse, diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetMatchingPartsResponseRecord.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetMatchingPartsResponseRecord.ts index 23663535b8cc..33d2675687a8 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetMatchingPartsResponseRecord.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetMatchingPartsResponseRecord.ts @@ -12,11 +12,11 @@ * Do not edit the class manually. */ -import {ApiRecordUtils, knownRecordFactories, appFromJS, NormalizedRecordEntities} from "../runtimeSagasAndRecords"; -import {getApiEntitiesState} from "../ApiEntitiesSelectors" -import {List, Record, RecordOf, Map} from 'immutable'; -import {Schema, schema, NormalizedSchema} from "normalizr"; -import {select, call} from "redux-saga/effects"; +import { ApiRecordUtils, knownRecordFactories, appFromJS, NormalizedRecordEntities } from "../runtimeSagasAndRecords"; +import { getApiEntitiesState } from "../ApiEntitiesSelectors" +import { List, Record, RecordOf, Map } from 'immutable'; +import { Schema, schema, NormalizedSchema } from "normalizr"; +import { select, call } from "redux-saga/effects"; import { GetMatchingPartsResponse, diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetPetPartTypeResponseRecord.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetPetPartTypeResponseRecord.ts index 57d64200571a..6aed99f3e02d 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetPetPartTypeResponseRecord.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/GetPetPartTypeResponseRecord.ts @@ -12,11 +12,11 @@ * Do not edit the class manually. */ -import {ApiRecordUtils, knownRecordFactories, appFromJS, NormalizedRecordEntities} from "../runtimeSagasAndRecords"; -import {getApiEntitiesState} from "../ApiEntitiesSelectors" -import {List, Record, RecordOf, Map} from 'immutable'; -import {Schema, schema, NormalizedSchema} from "normalizr"; -import {select, call} from "redux-saga/effects"; +import { ApiRecordUtils, knownRecordFactories, appFromJS, NormalizedRecordEntities } from "../runtimeSagasAndRecords"; +import { getApiEntitiesState } from "../ApiEntitiesSelectors" +import { List, Record, RecordOf, Map } from 'immutable'; +import { Schema, schema, NormalizedSchema } from "normalizr"; +import { select, call } from "redux-saga/effects"; import { GetPetPartTypeResponse, diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ItemIdRecord.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ItemIdRecord.ts index 6980c92e9b8d..b1da1ab7d62d 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ItemIdRecord.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ItemIdRecord.ts @@ -12,11 +12,11 @@ * Do not edit the class manually. */ -import {ApiRecordUtils, knownRecordFactories} from "../runtimeSagasAndRecords"; -import {getApiEntitiesState} from "../ApiEntitiesSelectors" -import {List, Record, RecordOf, Map} from 'immutable'; -import {Schema, schema, NormalizedSchema} from "normalizr"; -import {select, call} from "redux-saga/effects"; +import { ApiRecordUtils, knownRecordFactories } from "../runtimeSagasAndRecords"; +import { getApiEntitiesState } from "../ApiEntitiesSelectors" +import { List, Record, RecordOf, Map } from 'immutable'; +import { Schema, schema, NormalizedSchema } from "normalizr"; +import { select, call } from "redux-saga/effects"; import { ItemId, diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/MatchingPartsRecord.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/MatchingPartsRecord.ts index 4170d2f84e9e..fc1574d67ee7 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/MatchingPartsRecord.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/MatchingPartsRecord.ts @@ -12,11 +12,11 @@ * Do not edit the class manually. */ -import {ApiRecordUtils, knownRecordFactories} from "../runtimeSagasAndRecords"; -import {getApiEntitiesState} from "../ApiEntitiesSelectors" -import {List, Record, RecordOf, Map} from 'immutable'; -import {Schema, schema, NormalizedSchema} from "normalizr"; -import {select, call} from "redux-saga/effects"; +import { ApiRecordUtils, knownRecordFactories } from "../runtimeSagasAndRecords"; +import { getApiEntitiesState } from "../ApiEntitiesSelectors" +import { List, Record, RecordOf, Map } from 'immutable'; +import { Schema, schema, NormalizedSchema } from "normalizr"; +import { select, call } from "redux-saga/effects"; import { MatchingParts, diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ModelApiResponseRecord.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ModelApiResponseRecord.ts index 6a2465755760..4bc9e6abb82a 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ModelApiResponseRecord.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ModelApiResponseRecord.ts @@ -12,11 +12,11 @@ * Do not edit the class manually. */ -import {ApiRecordUtils, knownRecordFactories} from "../runtimeSagasAndRecords"; -import {getApiEntitiesState} from "../ApiEntitiesSelectors" -import {List, Record, RecordOf, Map} from 'immutable'; -import {Schema, schema, NormalizedSchema} from "normalizr"; -import {select, call} from "redux-saga/effects"; +import { ApiRecordUtils, knownRecordFactories } from "../runtimeSagasAndRecords"; +import { getApiEntitiesState } from "../ApiEntitiesSelectors" +import { List, Record, RecordOf, Map } from 'immutable'; +import { Schema, schema, NormalizedSchema } from "normalizr"; +import { select, call } from "redux-saga/effects"; import { ModelApiResponse, diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ModelErrorRecord.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ModelErrorRecord.ts index 1abeef522e2a..d31ebfd41432 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ModelErrorRecord.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ModelErrorRecord.ts @@ -12,11 +12,11 @@ * Do not edit the class manually. */ -import {ApiRecordUtils, knownRecordFactories} from "../runtimeSagasAndRecords"; -import {getApiEntitiesState} from "../ApiEntitiesSelectors" -import {List, Record, RecordOf, Map} from 'immutable'; -import {Schema, schema, NormalizedSchema} from "normalizr"; -import {select, call} from "redux-saga/effects"; +import { ApiRecordUtils, knownRecordFactories } from "../runtimeSagasAndRecords"; +import { getApiEntitiesState } from "../ApiEntitiesSelectors" +import { List, Record, RecordOf, Map } from 'immutable'; +import { Schema, schema, NormalizedSchema } from "normalizr"; +import { select, call } from "redux-saga/effects"; import { ModelError, diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/OrderRecord.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/OrderRecord.ts index a0ddf05e1ed8..1da5f82cdbf1 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/OrderRecord.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/OrderRecord.ts @@ -12,11 +12,11 @@ * Do not edit the class manually. */ -import {ApiRecordUtils, knownRecordFactories} from "../runtimeSagasAndRecords"; -import {getApiEntitiesState} from "../ApiEntitiesSelectors" -import {List, Record, RecordOf, Map} from 'immutable'; -import {Schema, schema, NormalizedSchema} from "normalizr"; -import {select, call} from "redux-saga/effects"; +import { ApiRecordUtils, knownRecordFactories } from "../runtimeSagasAndRecords"; +import { getApiEntitiesState } from "../ApiEntitiesSelectors" +import { List, Record, RecordOf, Map } from 'immutable'; +import { Schema, schema, NormalizedSchema } from "normalizr"; +import { select, call } from "redux-saga/effects"; import { Order, diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/PartRecord.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/PartRecord.ts index 539b8094c7a7..83db1595e006 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/PartRecord.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/PartRecord.ts @@ -12,11 +12,11 @@ * Do not edit the class manually. */ -import {ApiRecordUtils, knownRecordFactories} from "../runtimeSagasAndRecords"; -import {getApiEntitiesState} from "../ApiEntitiesSelectors" -import {List, Record, RecordOf, Map} from 'immutable'; -import {Schema, schema, NormalizedSchema} from "normalizr"; -import {select, call} from "redux-saga/effects"; +import { ApiRecordUtils, knownRecordFactories } from "../runtimeSagasAndRecords"; +import { getApiEntitiesState } from "../ApiEntitiesSelectors" +import { List, Record, RecordOf, Map } from 'immutable'; +import { Schema, schema, NormalizedSchema } from "normalizr"; +import { select, call } from "redux-saga/effects"; import { Part, diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/PetRecord.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/PetRecord.ts index 9c114b14d0f4..49efcafe2d0a 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/PetRecord.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/PetRecord.ts @@ -12,11 +12,11 @@ * Do not edit the class manually. */ -import {ApiRecordUtils, knownRecordFactories} from "../runtimeSagasAndRecords"; -import {getApiEntitiesState} from "../ApiEntitiesSelectors" -import {List, Record, RecordOf, Map} from 'immutable'; -import {Schema, schema, NormalizedSchema} from "normalizr"; -import {select, call} from "redux-saga/effects"; +import { ApiRecordUtils, knownRecordFactories } from "../runtimeSagasAndRecords"; +import { getApiEntitiesState } from "../ApiEntitiesSelectors" +import { List, Record, RecordOf, Map } from 'immutable'; +import { Schema, schema, NormalizedSchema } from "normalizr"; +import { select, call } from "redux-saga/effects"; import { Pet, diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/PetRegionsResponseRecord.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/PetRegionsResponseRecord.ts index df2bcc6d3cb2..79faa98e4dd2 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/PetRegionsResponseRecord.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/PetRegionsResponseRecord.ts @@ -12,11 +12,11 @@ * Do not edit the class manually. */ -import {ApiRecordUtils, knownRecordFactories, appFromJS, NormalizedRecordEntities} from "../runtimeSagasAndRecords"; -import {getApiEntitiesState} from "../ApiEntitiesSelectors" -import {List, Record, RecordOf, Map} from 'immutable'; -import {Schema, schema, NormalizedSchema} from "normalizr"; -import {select, call} from "redux-saga/effects"; +import { ApiRecordUtils, knownRecordFactories, appFromJS, NormalizedRecordEntities } from "../runtimeSagasAndRecords"; +import { getApiEntitiesState } from "../ApiEntitiesSelectors" +import { List, Record, RecordOf, Map } from 'immutable'; +import { Schema, schema, NormalizedSchema } from "normalizr"; +import { select, call } from "redux-saga/effects"; import { PetRegionsResponse, diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ResponseMetaRecord.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ResponseMetaRecord.ts index 79a092e4988e..75d0c16b4dc7 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ResponseMetaRecord.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/ResponseMetaRecord.ts @@ -12,11 +12,11 @@ * Do not edit the class manually. */ -import {ApiRecordUtils, knownRecordFactories} from "../runtimeSagasAndRecords"; -import {getApiEntitiesState} from "../ApiEntitiesSelectors" -import {List, Record, RecordOf, Map} from 'immutable'; -import {Schema, schema, NormalizedSchema} from "normalizr"; -import {select, call} from "redux-saga/effects"; +import { ApiRecordUtils, knownRecordFactories } from "../runtimeSagasAndRecords"; +import { getApiEntitiesState } from "../ApiEntitiesSelectors" +import { List, Record, RecordOf, Map } from 'immutable'; +import { Schema, schema, NormalizedSchema } from "normalizr"; +import { select, call } from "redux-saga/effects"; import { ResponseMeta, diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/TagRecord.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/TagRecord.ts index 64f36c334a24..ad272fec7b89 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/TagRecord.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/TagRecord.ts @@ -12,11 +12,11 @@ * Do not edit the class manually. */ -import {ApiRecordUtils, knownRecordFactories} from "../runtimeSagasAndRecords"; -import {getApiEntitiesState} from "../ApiEntitiesSelectors" -import {List, Record, RecordOf, Map} from 'immutable'; -import {Schema, schema, NormalizedSchema} from "normalizr"; -import {select, call} from "redux-saga/effects"; +import { ApiRecordUtils, knownRecordFactories } from "../runtimeSagasAndRecords"; +import { getApiEntitiesState } from "../ApiEntitiesSelectors" +import { List, Record, RecordOf, Map } from 'immutable'; +import { Schema, schema, NormalizedSchema } from "normalizr"; +import { select, call } from "redux-saga/effects"; import { Tag, diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/UserRecord.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/UserRecord.ts index 399720f55ea7..1b55979efd05 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/UserRecord.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/models/UserRecord.ts @@ -12,11 +12,11 @@ * Do not edit the class manually. */ -import {ApiRecordUtils, knownRecordFactories} from "../runtimeSagasAndRecords"; -import {getApiEntitiesState} from "../ApiEntitiesSelectors" -import {List, Record, RecordOf, Map} from 'immutable'; -import {Schema, schema, NormalizedSchema} from "normalizr"; -import {select, call} from "redux-saga/effects"; +import { ApiRecordUtils, knownRecordFactories } from "../runtimeSagasAndRecords"; +import { getApiEntitiesState } from "../ApiEntitiesSelectors" +import { List, Record, RecordOf, Map } from 'immutable'; +import { Schema, schema, NormalizedSchema } from "normalizr"; +import { select, call } from "redux-saga/effects"; import { User, diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtime.ts index 3f125c3b0601..cacafc93eef3 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtime.ts @@ -12,7 +12,6 @@ * Do not edit the class manually. */ - export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); export interface ConfigurationParameters { diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtimeSagasAndRecords.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtimeSagasAndRecords.ts index 5c6c927648f6..7e83c056b130 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtimeSagasAndRecords.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/runtimeSagasAndRecords.ts @@ -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(); export const knownIndexedSetByKey: (string | number)[] = []; diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/AnotherFakeApi.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/AnotherFakeApi.ts index f5ba5857f5c5..0a7815a78af9 100644 --- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/AnotherFakeApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/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; diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/DefaultApi.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/DefaultApi.ts index ce1e24dc07f2..bd7085753bfb 100644 --- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/DefaultApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/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'; /** * diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/FakeApi.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/FakeApi.ts index 21ad0984b848..6a01e7f5797d 100644 --- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/FakeApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/FakeApi.ts @@ -12,39 +12,52 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - Client, - EnumClass, - FakeBigDecimalMap200Response, - FileSchemaTestClass, - HealthCheckResult, - OuterComposite, - OuterObjectWithEnumProperty, - Pet, - User, -} from '../models/index'; 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 User, UserFromJSON, UserToJSON, -} from '../models/index'; +} from '../models/User'; export interface FakeHttpSignatureTestRequest { pet: Pet; diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/FakeClassnameTags123Api.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/FakeClassnameTags123Api.ts index cdefdb8e7951..0236073acb8a 100644 --- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/FakeClassnameTags123Api.ts +++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/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; diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/PetApi.ts index 2a9812520139..fc79d795f1c3 100644 --- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/PetApi.ts @@ -12,18 +12,17 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - ModelApiResponse, - Pet, -} from '../models/index'; import { + type ModelApiResponse, ModelApiResponseFromJSON, ModelApiResponseToJSON, +} from '../models/ModelApiResponse'; +import { + type Pet, PetFromJSON, PetToJSON, -} from '../models/index'; +} from '../models/Pet'; export interface AddPetRequest { pet: Pet; diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/StoreApi.ts index 3ba8c2cab723..f03d6c2fae65 100644 --- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/StoreApi.ts @@ -12,15 +12,12 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - Order, -} from '../models/index'; import { + type Order, OrderFromJSON, OrderToJSON, -} from '../models/index'; +} from '../models/Order'; export interface DeleteOrderRequest { orderId: string; diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/UserApi.ts index 83a5374e23a5..0db0d891a5f2 100644 --- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/apis/UserApi.ts @@ -12,15 +12,12 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - User, -} from '../models/index'; import { + type User, UserFromJSON, UserToJSON, -} from '../models/index'; +} from '../models/User'; export interface CreateUserRequest { user: User; diff --git a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/runtime.ts b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/runtime.ts index 6d3d965df11d..2738678aa8e3 100644 --- a/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/runtime.ts @@ -12,7 +12,6 @@ * Do not edit the class manually. */ - export const BASE_PATH = "http://petstore.swagger.io:80/v2".replace(/\/+$/, ""); export interface ConfigurationParameters { diff --git a/samples/client/petstore/typescript-fetch/builds/validation-attributes/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/validation-attributes/apis/PetApi.ts index b66ef90918b5..ef5110443bdd 100644 --- a/samples/client/petstore/typescript-fetch/builds/validation-attributes/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/validation-attributes/apis/PetApi.ts @@ -12,18 +12,17 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - ModelApiResponse, - Pet, -} from '../models/index'; import { + type ModelApiResponse, ModelApiResponseFromJSON, ModelApiResponseToJSON, +} from '../models/ModelApiResponse'; +import { + type Pet, PetFromJSON, PetToJSON, -} from '../models/index'; +} from '../models/Pet'; export interface AddPetRequest { pet: Pet; diff --git a/samples/client/petstore/typescript-fetch/builds/validation-attributes/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/validation-attributes/apis/StoreApi.ts index 7f1528fdb2cb..a1051e3031f9 100644 --- a/samples/client/petstore/typescript-fetch/builds/validation-attributes/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/validation-attributes/apis/StoreApi.ts @@ -12,15 +12,12 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - Order, -} from '../models/index'; import { + type Order, OrderFromJSON, OrderToJSON, -} from '../models/index'; +} from '../models/Order'; export interface DeleteOrderRequest { orderId: string; diff --git a/samples/client/petstore/typescript-fetch/builds/validation-attributes/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/validation-attributes/apis/UserApi.ts index 756c61cbee4a..cda8aa33bcce 100644 --- a/samples/client/petstore/typescript-fetch/builds/validation-attributes/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/validation-attributes/apis/UserApi.ts @@ -12,15 +12,12 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - User, -} from '../models/index'; import { + type User, UserFromJSON, UserToJSON, -} from '../models/index'; +} from '../models/User'; export interface CreateUserRequest { user: User; diff --git a/samples/client/petstore/typescript-fetch/builds/validation-attributes/runtime.ts b/samples/client/petstore/typescript-fetch/builds/validation-attributes/runtime.ts index 3f125c3b0601..cacafc93eef3 100644 --- a/samples/client/petstore/typescript-fetch/builds/validation-attributes/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/validation-attributes/runtime.ts @@ -12,7 +12,6 @@ * Do not edit the class manually. */ - export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); export interface ConfigurationParameters { diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts index 316ff58281ed..20f8cb51e32f 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts @@ -12,18 +12,17 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - ModelApiResponse, - Pet, -} from '../models/index'; import { + type ModelApiResponse, ModelApiResponseFromJSON, ModelApiResponseToJSON, +} from '../models/ModelApiResponse'; +import { + type Pet, PetFromJSON, PetToJSON, -} from '../models/index'; +} from '../models/Pet'; export interface AddPetRequest { body: Pet; diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts index 770ac98198bc..57ab75e99b74 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts @@ -12,15 +12,12 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - Order, -} from '../models/index'; import { + type Order, OrderFromJSON, OrderToJSON, -} from '../models/index'; +} from '../models/Order'; export interface DeleteOrderRequest { orderId: string; diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts index 83ee5cedbbfb..15b5491d2311 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts @@ -12,15 +12,12 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - User, -} from '../models/index'; import { + type User, UserFromJSON, UserToJSON, -} from '../models/index'; +} from '../models/User'; export interface CreateUserRequest { body: User; diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts index 3f125c3b0601..cacafc93eef3 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts @@ -12,7 +12,6 @@ * Do not edit the class manually. */ - export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); export interface ConfigurationParameters { 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/src/apis/PetApi.ts index 586438f033c4..9e59db7ee9f8 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/PetApi.ts @@ -12,18 +12,17 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - ModelApiResponse, - Pet, -} from '../models/index'; import { + type ModelApiResponse, ModelApiResponseFromJSON, ModelApiResponseToJSON, +} from '../models/ModelApiResponse'; +import { + type Pet, PetFromJSON, PetToJSON, -} from '../models/index'; +} from '../models/Pet'; export interface AddPetRequest { body: Pet; 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/src/apis/StoreApi.ts index 0bcfdbf84600..b5f61e3713aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/StoreApi.ts @@ -12,15 +12,12 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - Order, -} from '../models/index'; import { + type Order, OrderFromJSON, OrderToJSON, -} from '../models/index'; +} from '../models/Order'; export interface DeleteOrderRequest { orderId: string; 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/src/apis/UserApi.ts index 43799227666d..697a7a6cb9d8 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/apis/UserApi.ts @@ -12,15 +12,12 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - User, -} from '../models/index'; import { + type User, UserFromJSON, UserToJSON, -} from '../models/index'; +} from '../models/User'; export interface CreateUserRequest { body: User; diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts index 3f125c3b0601..cacafc93eef3 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/src/runtime.ts @@ -12,7 +12,6 @@ * Do not edit the class manually. */ - export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); export interface ConfigurationParameters { diff --git a/samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts b/samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts index 730f0a062006..b19dd3b8df53 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts @@ -12,24 +12,27 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - EnumPatternObject, - FakeEnumRequestGetInline200Response, - NumberEnum, - StringEnum, -} from '../models/index'; import { + type EnumPatternObject, EnumPatternObjectFromJSON, EnumPatternObjectToJSON, +} from '../models/EnumPatternObject'; +import { + type FakeEnumRequestGetInline200Response, FakeEnumRequestGetInline200ResponseFromJSON, FakeEnumRequestGetInline200ResponseToJSON, +} from '../models/FakeEnumRequestGetInline200Response'; +import { + type NumberEnum, NumberEnumFromJSON, NumberEnumToJSON, +} from '../models/NumberEnum'; +import { + type StringEnum, StringEnumFromJSON, StringEnumToJSON, -} from '../models/index'; +} from '../models/StringEnum'; export interface FakeEnumRequestGetInlineRequest { stringEnum?: FakeEnumRequestGetInlineStringEnumEnum; diff --git a/samples/client/petstore/typescript-fetch/builds/with-string-enums/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-string-enums/runtime.ts index 8095de29bc32..748dbfca7a3c 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-string-enums/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-string-enums/runtime.ts @@ -12,7 +12,6 @@ * Do not edit the class manually. */ - export const BASE_PATH = "http://localhost:3000".replace(/\/+$/, ""); export interface ConfigurationParameters { diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/PetApi.ts index accc88ffc8a7..a42ab97f3a34 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/PetApi.ts @@ -12,12 +12,7 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - ModelApiResponse, - Pet, -} from '../models/index'; export interface AddPetRequest { body: Pet; diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/StoreApi.ts index e650674e0cdf..6a3c3133f892 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/StoreApi.ts @@ -12,11 +12,7 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - Order, -} from '../models/index'; export interface DeleteOrderRequest { orderId: string; diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/UserApi.ts index 90c8a3d4362f..c3265a0dac1b 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/UserApi.ts @@ -12,11 +12,7 @@ * Do not edit the class manually. */ - import * as runtime from '../runtime'; -import type { - User, -} from '../models/index'; export interface CreateUserRequest { body: User; diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts index 1d27e4d7e3ba..67e30baa5ff8 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/runtime.ts @@ -12,7 +12,6 @@ * Do not edit the class manually. */ - export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); export interface ConfigurationParameters { From f23175b2fffa4dc2299c818f7721aba3468bcb71 Mon Sep 17 00:00:00 2001 From: Joseph Cellucci Date: Wed, 21 Jan 2026 22:22:58 -0600 Subject: [PATCH 10/14] remove extra whitespace --- .../src/main/resources/typescript-fetch/sagas.mustache | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache index 99f754518ae4..1d63188c74c8 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/sagas.mustache @@ -17,13 +17,11 @@ import { {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}RecordUtils, } from '../models/{{className}}Record{{importFileExtension}}'; {{/imports}} - {{#passthroughImports}} import { {{.}}, } from '../models/{{.}}{{importFileExtension}}'; {{/passthroughImports}} - {{#hasEnums}} {{#operations}} {{#operation}} From 9341fba922787509db1a5e1ffd77cf6680f5139d Mon Sep 17 00:00:00 2001 From: Joseph Cellucci Date: Wed, 21 Jan 2026 22:31:04 -0600 Subject: [PATCH 11/14] fix apis --- .../src/main/resources/typescript-fetch/apis.mustache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache index 4f1a4420e027..732c429fb21a 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache @@ -4,13 +4,13 @@ import * as runtime from '../runtime{{importFileExtension}}'; {{#imports}} -{{^withoutRuntimeChecks}} import { type {{className}}, +{{^withoutRuntimeChecks}} {{className}}FromJSON, {{className}}ToJSON, -} from '../models/{{className}}{{importFileExtension}}'; {{/withoutRuntimeChecks}} +} from '../models/{{className}}{{importFileExtension}}'; {{/imports}} {{#operations}} From 3a8858f82349f2ae2a6fc1b87e8cc2269dd896e3 Mon Sep 17 00:00:00 2001 From: Joseph Cellucci Date: Wed, 21 Jan 2026 22:41:03 -0600 Subject: [PATCH 12/14] fix imports for withoutRuntimeChecks --- .../src/main/resources/typescript-fetch/apis.mustache | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache index 732c429fb21a..f29b03fa4dc2 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache @@ -6,11 +6,14 @@ import * as runtime from '../runtime{{importFileExtension}}'; {{#imports}} import { type {{className}}, +{{#withoutRuntimeChecks}} +} from '../models/index{{importFileExtension}}'; +{{/withoutRuntimeChecks}} {{^withoutRuntimeChecks}} {{className}}FromJSON, {{className}}ToJSON, -{{/withoutRuntimeChecks}} } from '../models/{{className}}{{importFileExtension}}'; +{{/withoutRuntimeChecks}} {{/imports}} {{#operations}} From 62d3a78b6ebd5f7bce56e20806223217ee19c3aa Mon Sep 17 00:00:00 2001 From: Joseph Cellucci Date: Wed, 21 Jan 2026 22:41:15 -0600 Subject: [PATCH 13/14] regen files --- .../builds/sagas-and-records/src/apis/BehaviorApiSagas.ts | 2 -- .../builds/sagas-and-records/src/apis/PetApiSagas.ts | 2 -- .../builds/sagas-and-records/src/apis/PetPartApiSagas.ts | 2 -- .../builds/sagas-and-records/src/apis/StoreApiSagas.ts | 2 -- .../builds/sagas-and-records/src/apis/UserApiSagas.ts | 2 -- .../builds/without-runtime-checks/src/apis/PetApi.ts | 6 ++++++ .../builds/without-runtime-checks/src/apis/StoreApi.ts | 3 +++ .../builds/without-runtime-checks/src/apis/UserApi.ts | 3 +++ 8 files changed, 12 insertions(+), 10 deletions(-) diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/BehaviorApiSagas.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/BehaviorApiSagas.ts index 7ec541ae7f47..a695115b9a83 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/BehaviorApiSagas.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/BehaviorApiSagas.ts @@ -32,12 +32,10 @@ import { GetBehaviorTypeResponseRecord, getBehaviorTypeResponseRecordUtils, } from '../models/GetBehaviorTypeResponseRecord'; - import { BehaviorType, } from '../models/BehaviorType'; - const createSagaAction = (type: string) => originalCreateSagaAction(type, {namespace: "api_behaviorApi"}); export const behaviorApiSagaMap = new Map Generator>([ diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetApiSagas.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetApiSagas.ts index d963f0b10d85..ebc4890d7057 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetApiSagas.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetApiSagas.ts @@ -60,12 +60,10 @@ import { PetRegionsResponseRecord, petRegionsResponseRecordUtils, } from '../models/PetRegionsResponseRecord'; - import { UserRecord, } from '../models/UserRecord'; - import { FindPetsByStatusStatusEnum, } from './PetApi'; diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetPartApiSagas.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetPartApiSagas.ts index 26be97ef6610..65cf7bfd7b21 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetPartApiSagas.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/PetPartApiSagas.ts @@ -32,7 +32,6 @@ import { GetPetPartTypeResponseRecord, getPetPartTypeResponseRecordUtils, } from '../models/GetPetPartTypeResponseRecord'; - import { MatchingPartsRecord, } from '../models/MatchingPartsRecord'; @@ -40,7 +39,6 @@ import { PetPartType, } from '../models/PetPartType'; - const createSagaAction = (type: string) => originalCreateSagaAction(type, {namespace: "api_petPartApi"}); export const petPartApiSagaMap = new Map Generator>([ diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/StoreApiSagas.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/StoreApiSagas.ts index fa89d4922c56..919fa9a9e14d 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/StoreApiSagas.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/StoreApiSagas.ts @@ -26,8 +26,6 @@ import { orderRecordUtils, } from '../models/OrderRecord'; - - const createSagaAction = (type: string) => originalCreateSagaAction(type, {namespace: "api_storeApi"}); export const storeApiSagaMap = new Map Generator>([ diff --git a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApiSagas.ts b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApiSagas.ts index 90a1a22a87a3..63865345d2ce 100644 --- a/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApiSagas.ts +++ b/samples/client/petstore/typescript-fetch/builds/sagas-and-records/src/apis/UserApiSagas.ts @@ -33,8 +33,6 @@ import { userRecordUtils, } from '../models/UserRecord'; - - const createSagaAction = (type: string) => originalCreateSagaAction(type, {namespace: "api_userApi"}); export const userApiSagaMap = new Map Generator>([ diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/PetApi.ts index a42ab97f3a34..448070c4bdae 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/PetApi.ts @@ -13,6 +13,12 @@ */ import * as runtime from '../runtime'; +import { + type ModelApiResponse, +} from '../models/index'; +import { + type Pet, +} from '../models/index'; export interface AddPetRequest { body: Pet; diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/StoreApi.ts index 6a3c3133f892..ad76024fb368 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/StoreApi.ts @@ -13,6 +13,9 @@ */ import * as runtime from '../runtime'; +import { + type Order, +} from '../models/index'; export interface DeleteOrderRequest { orderId: string; diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/UserApi.ts index c3265a0dac1b..5ce8a215928e 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/UserApi.ts @@ -13,6 +13,9 @@ */ import * as runtime from '../runtime'; +import { + type User, +} from '../models/index'; export interface CreateUserRequest { body: User; From 0c0eac4084141fbc97c250878898cac92457de6e Mon Sep 17 00:00:00 2001 From: Joseph Cellucci Date: Wed, 21 Jan 2026 22:46:45 -0600 Subject: [PATCH 14/14] fix withoutRunTime checks again, accounting for type imports only --- .../main/resources/typescript-fetch/apis.mustache | 12 ++++++++---- .../builds/without-runtime-checks/src/apis/PetApi.ts | 8 +++----- .../without-runtime-checks/src/apis/StoreApi.ts | 4 ++-- .../without-runtime-checks/src/apis/UserApi.ts | 4 ++-- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache index f29b03fa4dc2..0227293a13bb 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache @@ -3,18 +3,22 @@ {{>licenseInfo}} import * as runtime from '../runtime{{importFileExtension}}'; -{{#imports}} -import { - type {{className}}, {{#withoutRuntimeChecks}} +import type { +{{#imports}} + {{className}}, +{{/imports}} } from '../models/index{{importFileExtension}}'; {{/withoutRuntimeChecks}} {{^withoutRuntimeChecks}} +{{#imports}} +import { + type {{className}}, {{className}}FromJSON, {{className}}ToJSON, } from '../models/{{className}}{{importFileExtension}}'; -{{/withoutRuntimeChecks}} {{/imports}} +{{/withoutRuntimeChecks}} {{#operations}} {{#operation}} diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/PetApi.ts index 448070c4bdae..992989c262da 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/PetApi.ts @@ -13,11 +13,9 @@ */ import * as runtime from '../runtime'; -import { - type ModelApiResponse, -} from '../models/index'; -import { - type Pet, +import type { + ModelApiResponse, + Pet, } from '../models/index'; export interface AddPetRequest { diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/StoreApi.ts index ad76024fb368..ef64f6610729 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/StoreApi.ts @@ -13,8 +13,8 @@ */ import * as runtime from '../runtime'; -import { - type Order, +import type { + Order, } from '../models/index'; export interface DeleteOrderRequest { diff --git a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/UserApi.ts index 5ce8a215928e..c10bfa000c53 100644 --- a/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/without-runtime-checks/src/apis/UserApi.ts @@ -13,8 +13,8 @@ */ import * as runtime from '../runtime'; -import { - type User, +import type { + User, } from '../models/index'; export interface CreateUserRequest {