Skip to content

Commit dbc399d

Browse files
author
Andy Hite
committed
fix: pascalize imports as well
1 parent fe1a325 commit dbc399d

18 files changed

+68
-20
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@shipengine/openapi-typescript-codegen",
3-
"version": "0.23.1",
3+
"version": "0.23.2",
44
"description": "Library that generates Typescript clients based on the OpenAPI specification.",
55
"author": "Ferdi Koomen",
66
"homepage": "https://github.com/ferdikoomen/openapi-typescript-codegen",

‎src/openApi/v2/parser/getModel.ts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export const getModel = (
5353
model.type = definitionRef.type;
5454
model.base = definitionRef.base;
5555
model.template = definitionRef.template;
56-
model.imports.push(...definitionRef.imports.map(x => camelCaseName(x, { pascalCase: true })));
56+
model.imports.push(...definitionRef.imports);
5757
return model;
5858
}
5959

@@ -76,7 +76,7 @@ export const getModel = (
7676
model.type = arrayItems.type;
7777
model.base = arrayItems.base;
7878
model.template = arrayItems.template;
79-
model.imports.push(...arrayItems.imports.map(x => camelCaseName(x, { pascalCase: true })));
79+
model.imports.push(...arrayItems.imports);
8080
return model;
8181
} else {
8282
const arrayItems = getModel(openApi, definition.items);
@@ -85,7 +85,7 @@ export const getModel = (
8585
model.base = arrayItems.base;
8686
model.template = arrayItems.template;
8787
model.link = arrayItems;
88-
model.imports.push(...arrayItems.imports.map(x => camelCaseName(x, { pascalCase: true })));
88+
model.imports.push(...arrayItems.imports);
8989
return model;
9090
}
9191
}
@@ -97,7 +97,7 @@ export const getModel = (
9797
model.type = additionalProperties.type;
9898
model.base = additionalProperties.base;
9999
model.template = additionalProperties.template;
100-
model.imports.push(...additionalProperties.imports.map(x => camelCaseName(x, { pascalCase: true })));
100+
model.imports.push(...additionalProperties.imports);
101101
return model;
102102
} else {
103103
const additionalProperties = getModel(openApi, definition.additionalProperties);
@@ -106,15 +106,15 @@ export const getModel = (
106106
model.base = additionalProperties.base;
107107
model.template = additionalProperties.template;
108108
model.link = additionalProperties;
109-
model.imports.push(...additionalProperties.imports.map(x => camelCaseName(x, { pascalCase: true })));
109+
model.imports.push(...additionalProperties.imports);
110110
return model;
111111
}
112112
}
113113

114114
if (definition.allOf?.length) {
115115
const composition = getModelComposition(openApi, definition, definition.allOf, 'all-of', getModel);
116116
model.export = composition.type;
117-
model.imports.push(...composition.imports.map(x => camelCaseName(x, { pascalCase: true })));
117+
model.imports.push(...composition.imports);
118118
model.properties.push(...composition.properties);
119119
model.enums.push(...composition.enums);
120120
return model;
@@ -128,7 +128,7 @@ export const getModel = (
128128
if (definition.properties) {
129129
const modelProperties = getModelProperties(openApi, definition, getModel);
130130
modelProperties.forEach(modelProperty => {
131-
model.imports.push(...modelProperty.imports.map(x => camelCaseName(x, { pascalCase: true })));
131+
model.imports.push(...modelProperty.imports);
132132
model.enums.push(...modelProperty.enums);
133133
model.properties.push(modelProperty);
134134
if (modelProperty.export === 'enum') {
@@ -146,9 +146,11 @@ export const getModel = (
146146
model.type = definitionType.type;
147147
model.base = definitionType.base;
148148
model.template = definitionType.template;
149-
model.imports.push(...definitionType.imports.map(x => camelCaseName(x, { pascalCase: true })));
149+
model.imports.push(...definitionType.imports);
150150
return model;
151151
}
152152

153+
model.imports = model.imports.map(x => camelCaseName(x, { pascalCase: true }));
154+
153155
return model;
154156
};

‎src/openApi/v2/parser/getModelComposition.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import type { Model } from '../../../client/interfaces/Model';
22
import type { ModelComposition } from '../../../client/interfaces/ModelComposition';
33
import type { OpenApi } from '../interfaces/OpenApi';
44
import type { OpenApiSchema } from '../interfaces/OpenApiSchema';
5+
import { camelCaseName } from './camelCaseName';
56
import { escapeAndCamelizeName } from './escapeName';
67
import type { getModel } from './getModel';
78
import { getModelProperties } from './getModelProperties';
@@ -87,5 +88,7 @@ export const getModelComposition = (
8788
});
8889
}
8990

91+
composition.imports = composition.imports.map(x => camelCaseName(x, { pascalCase: true }));
92+
9093
return composition;
9194
};

‎src/openApi/v2/parser/getOperation.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import type { Operation } from '../../../client/interfaces/Operation';
22
import type { OperationParameters } from '../../../client/interfaces/OperationParameters';
33
import type { OpenApi } from '../interfaces/OpenApi';
44
import type { OpenApiOperation } from '../interfaces/OpenApiOperation';
5+
import { camelCaseName } from './camelCaseName';
56
import { getOperationErrors } from './getOperationErrors';
67
import { getOperationName } from './getOperationName';
78
import { getOperationParameters } from './getOperationParameters';
@@ -71,6 +72,7 @@ export const getOperation = (
7172
}
7273

7374
operation.parameters = operation.parameters.sort(sortByRequired);
75+
operation.imports = operation.imports.map(x => camelCaseName(x, { pascalCase: true }));
7476

7577
return operation;
7678
};

‎src/openApi/v2/parser/getOperationParameter.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { getPattern } from '../../../utils/getPattern';
33
import type { OpenApi } from '../interfaces/OpenApi';
44
import type { OpenApiParameter } from '../interfaces/OpenApiParameter';
55
import type { OpenApiSchema } from '../interfaces/OpenApiSchema';
6+
import { camelCaseName } from './camelCaseName';
67
import { extendEnum } from './extendEnum';
78
import { getEnum } from './getEnum';
89
import { getModel } from './getModel';
@@ -133,5 +134,7 @@ export const getOperationParameter = (openApi: OpenApi, parameter: OpenApiParame
133134
return operationParameter;
134135
}
135136

137+
operationParameter.imports = operationParameter.imports.map(x => camelCaseName(x, { pascalCase: true }));
138+
136139
return operationParameter;
137140
};

‎src/openApi/v2/parser/getOperationParameters.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import type { OperationParameters } from '../../../client/interfaces/OperationParameters';
22
import type { OpenApi } from '../interfaces/OpenApi';
33
import type { OpenApiParameter } from '../interfaces/OpenApiParameter';
4+
import { camelCaseName } from './camelCaseName';
45
import { getOperationParameter } from './getOperationParameter';
56
import { getRef } from './getRef';
67

@@ -57,5 +58,8 @@ export const getOperationParameters = (openApi: OpenApi, parameters: OpenApiPara
5758
}
5859
}
5960
});
61+
62+
operationParameters.imports = operationParameters.imports.map(x => camelCaseName(x, { pascalCase: true }));
63+
6064
return operationParameters;
6165
};

‎src/openApi/v2/parser/getOperationResponse.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { getPattern } from '../../../utils/getPattern';
33
import type { OpenApi } from '../interfaces/OpenApi';
44
import type { OpenApiResponse } from '../interfaces/OpenApiResponse';
55
import type { OpenApiSchema } from '../interfaces/OpenApiSchema';
6+
import { camelCaseName } from './camelCaseName';
67
import { getModel } from './getModel';
78
import { getRef } from './getRef';
89
import { getType } from './getType';
@@ -95,5 +96,7 @@ export const getOperationResponse = (
9596
}
9697
}
9798

99+
operationResponse.imports = operationResponse.imports.map(x => camelCaseName(x, { pascalCase: true }));
100+
98101
return operationResponse;
99102
};

‎src/openApi/v2/parser/getServices.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import type { Service } from '../../../client/interfaces/Service';
22
import { unique } from '../../../utils/unique';
33
import type { OpenApi } from '../interfaces/OpenApi';
4+
import { camelCaseName } from './camelCaseName';
45
import { getOperation } from './getOperation';
56
import { getOperationParameters } from './getOperationParameters';
67

@@ -43,6 +44,7 @@ export const getServices = (openApi: OpenApi): Service[] => {
4344
// Push the operation in the service
4445
service.operations.push(operation);
4546
service.imports.push(...operation.imports);
47+
service.imports = service.imports.map(x => camelCaseName(x, { pascalCase: true }));
4648
services.set(operation.service, service);
4749
});
4850
break;
@@ -51,5 +53,6 @@ export const getServices = (openApi: OpenApi): Service[] => {
5153
}
5254
}
5355
}
56+
5457
return Array.from(services.values());
5558
};

‎src/openApi/v2/parser/getType.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import type { Type } from '../../../client/interfaces/Type';
2+
import { camelCaseName } from './camelCaseName';
23
import { getMappedType } from './getMappedType';
34
import { stripNamespace } from './stripNamespace';
45

@@ -63,5 +64,7 @@ export const getType = (type: string = 'any', format?: string): Type => {
6364
return result;
6465
}
6566

67+
result.imports = result.imports.map(x => camelCaseName(x, { pascalCase: true }));
68+
6669
return result;
6770
};

‎src/openApi/v3/parser/getModel.ts

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export const getModel = (
5555
model.type = definitionRef.type;
5656
model.base = definitionRef.base;
5757
model.template = definitionRef.template;
58-
model.imports.push(...definitionRef.imports.map(x => camelCaseName(x, { pascalCase: true })));
58+
model.imports.push(...definitionRef.imports);
5959
model.default = getModelDefault(definition, model);
6060
return model;
6161
}
@@ -80,7 +80,7 @@ export const getModel = (
8080
model.type = arrayItems.type;
8181
model.base = arrayItems.base;
8282
model.template = arrayItems.template;
83-
model.imports.push(...arrayItems.imports.map(x => camelCaseName(x, { pascalCase: true })));
83+
model.imports.push(...arrayItems.imports);
8484
model.default = getModelDefault(definition, model);
8585
return model;
8686
} else {
@@ -90,7 +90,7 @@ export const getModel = (
9090
model.base = arrayItems.base;
9191
model.template = arrayItems.template;
9292
model.link = arrayItems;
93-
model.imports.push(...arrayItems.imports.map(x => camelCaseName(x, { pascalCase: true })));
93+
model.imports.push(...arrayItems.imports);
9494
model.default = getModelDefault(definition, model);
9595
return model;
9696
}
@@ -107,7 +107,7 @@ export const getModel = (
107107
model.type = additionalProperties.type;
108108
model.base = additionalProperties.base;
109109
model.template = additionalProperties.template;
110-
model.imports.push(...additionalProperties.imports.map(x => camelCaseName(x, { pascalCase: true })));
110+
model.imports.push(...additionalProperties.imports);
111111
model.default = getModelDefault(definition, model);
112112
return model;
113113
} else {
@@ -117,7 +117,7 @@ export const getModel = (
117117
model.base = additionalProperties.base;
118118
model.template = additionalProperties.template;
119119
model.link = additionalProperties;
120-
model.imports.push(...additionalProperties.imports.map(x => camelCaseName(x, { pascalCase: true })));
120+
model.imports.push(...additionalProperties.imports);
121121
model.default = getModelDefault(definition, model);
122122
return model;
123123
}
@@ -126,7 +126,7 @@ export const getModel = (
126126
if (definition.oneOf?.length) {
127127
const composition = getModelComposition(openApi, definition, definition.oneOf, 'one-of', getModel);
128128
model.export = composition.type;
129-
model.imports.push(...composition.imports.map(x => camelCaseName(x, { pascalCase: true })));
129+
model.imports.push(...composition.imports);
130130
model.properties.push(...composition.properties);
131131
model.enums.push(...composition.enums);
132132
return model;
@@ -135,7 +135,7 @@ export const getModel = (
135135
if (definition.anyOf?.length) {
136136
const composition = getModelComposition(openApi, definition, definition.anyOf, 'any-of', getModel);
137137
model.export = composition.type;
138-
model.imports.push(...composition.imports.map(x => camelCaseName(x, { pascalCase: true })));
138+
model.imports.push(...composition.imports);
139139
model.properties.push(...composition.properties);
140140
model.enums.push(...composition.enums);
141141
return model;
@@ -144,7 +144,7 @@ export const getModel = (
144144
if (definition.allOf?.length) {
145145
const composition = getModelComposition(openApi, definition, definition.allOf, 'all-of', getModel);
146146
model.export = composition.type;
147-
model.imports.push(...composition.imports.map(x => camelCaseName(x, { pascalCase: true })));
147+
model.imports.push(...composition.imports);
148148
model.properties.push(...composition.properties);
149149
model.enums.push(...composition.enums);
150150
return model;
@@ -159,7 +159,7 @@ export const getModel = (
159159

160160
const modelProperties = getModelProperties(openApi, definition, getModel, model);
161161
modelProperties.forEach(modelProperty => {
162-
model.imports.push(...modelProperty.imports.map(x => camelCaseName(x, { pascalCase: true })));
162+
model.imports.push(...modelProperty.imports);
163163
model.enums.push(...modelProperty.enums);
164164
model.properties.push(modelProperty);
165165
if (modelProperty.export === 'enum') {
@@ -174,7 +174,7 @@ export const getModel = (
174174
model.base = additionalProperties.base;
175175
model.template = additionalProperties.template;
176176
model.link = additionalProperties;
177-
model.imports.push(...additionalProperties.imports.map(x => camelCaseName(x, { pascalCase: true })));
177+
model.imports.push(...additionalProperties.imports);
178178
model.default = getModelDefault(definition, model);
179179
return model;
180180
}
@@ -188,10 +188,12 @@ export const getModel = (
188188
model.base = definitionType.base;
189189
model.template = definitionType.template;
190190
model.isNullable = definitionType.isNullable || model.isNullable;
191-
model.imports.push(...definitionType.imports.map(x => camelCaseName(x, { pascalCase: true })));
191+
model.imports.push(...definitionType.imports);
192192
model.default = getModelDefault(definition, model);
193193
return model;
194194
}
195195

196+
model.imports = model.imports.map(x => camelCaseName(x, { pascalCase: true }));
197+
196198
return model;
197199
};

0 commit comments

Comments
 (0)