From b21827242d314584d48a8cee2ef0bd44ee34eed9 Mon Sep 17 00:00:00 2001 From: Orrin Naylor Date: Mon, 25 Apr 2022 09:32:01 -0700 Subject: [PATCH 1/8] 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 2/8] 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 3/8] 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 4/8] 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 5/8] 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 6/8] 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 7/8] 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 8/8] 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}}