Skip to content
This repository was archived by the owner on Jun 2, 2022. It is now read-only.

Commit 056bd95

Browse files
author
SSen
committed
feat: upgrade openapi-generator from 5.0.0-beta2 to 5.0.0
1 parent 7692646 commit 056bd95

File tree

23 files changed

+107
-119
lines changed

23 files changed

+107
-119
lines changed

‎packages/.packages.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'@rocket-scripts/openapi':
2-
version: 0.2.0
2+
version: 0.3.0
33
tag: latest
44
module: commonjs
55
packageJson:
@@ -11,6 +11,6 @@
1111
- openapi-generator
1212
- typescript
1313
'@rocket-scripts/*':
14-
version: 0.2.0
14+
version: 0.3.0
1515
tag: latest
1616
module: commonjs

‎packages/src/@rocket-scripts/openapi/generate.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import os from 'os';
77
import path from 'path';
88
import prettier from 'prettier';
99

10-
const openapiVersion: string = '5.0.0-beta2';
10+
const openapiVersion: string = '5.0.0';
1111

1212
async function download(url: string, file: string) {
1313
return new Promise((resolve) => {

‎packages/src/@rocket-scripts/openapi/models/TypeSerializer.ts‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ export type Property = [
2929
isFreeFormObject: boolean,
3030
isInherited: boolean,
3131
isInteger: boolean,
32-
isListContainer: boolean,
32+
isArray: boolean,
3333
isLong: boolean,
34-
isMapContainer: boolean,
34+
isMap: boolean,
3535
isModel: boolean,
3636
isNullable: boolean,
3737
isNumber: boolean,
@@ -70,9 +70,9 @@ export enum PropertyIndex {
7070
isFreeFormObject,
7171
isInherited,
7272
isInteger,
73-
isListContainer,
73+
isArray,
7474
isLong,
75-
isMapContainer,
75+
isMap,
7676
isModel,
7777
isNullable,
7878
isNumber,
@@ -190,10 +190,7 @@ export class TypeSerializer {
190190
property[PropertyIndex.isDateTime])
191191
? new Date(value)
192192
: value;
193-
} else if (
194-
Array.isArray(value) &&
195-
property[PropertyIndex.isListContainer]
196-
) {
193+
} else if (Array.isArray(value) && property[PropertyIndex.isArray]) {
197194
if (!property[PropertyIndex.itemsDataType]) {
198195
throw new APISerializeError(
199196
`Undefined items.datatype from ${property}`,
@@ -203,10 +200,7 @@ export class TypeSerializer {
203200
property[PropertyIndex.itemsDataType]!,
204201
)(value);
205202
}
206-
} else if (
207-
value instanceof Object &&
208-
property[PropertyIndex.isMapContainer]
209-
) {
203+
} else if (value instanceof Object && property[PropertyIndex.isMap]) {
210204
if (!property[PropertyIndex.itemsDataType]) {
211205
throw new APISerializeError(
212206
`Undefined items.datatype from ${property}`,
@@ -270,10 +264,7 @@ export class TypeSerializer {
270264
? value.toISOString()
271265
: value
272266
: value;
273-
} else if (
274-
Array.isArray(value) &&
275-
property[PropertyIndex.isListContainer]
276-
) {
267+
} else if (Array.isArray(value) && property[PropertyIndex.isArray]) {
277268
if (!property[PropertyIndex.itemsDataType]) {
278269
throw new APISerializeError(
279270
`Undefined items.datatype from ${property}`,
@@ -283,10 +274,7 @@ export class TypeSerializer {
283274
property[PropertyIndex.itemsDataType]!,
284275
)(value);
285276
}
286-
} else if (
287-
value instanceof Object &&
288-
property[PropertyIndex.isMapContainer]
289-
) {
277+
} else if (value instanceof Object && property[PropertyIndex.isMap]) {
290278
if (!property[PropertyIndex.itemsDataType]) {
291279
throw new APISerializeError(
292280
`Undefined items.datatype from ${property}`,

‎packages/src/@rocket-scripts/openapi/template/apis.mustache‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export const {{nickname}}Request = ({
7474
const queryParameters: UrlQueryInput = {};
7575

7676
{{#queryParams}}
77-
{{#isListContainer}}
77+
{{#isArray}}
7878
if (requestParameters.{{paramName}}) {
7979
{{#isCollectionFormatMulti}}
8080
queryParameters['{{baseName}}'] = requestParameters.{{paramName}};
@@ -83,8 +83,8 @@ export const {{nickname}}Request = ({
8383
queryParameters['{{baseName}}'] = requestParameters.{{paramName}}.join(collectionFormats["{{collectionFormat}}"]);
8484
{{/isCollectionFormatMulti}}
8585
}
86-
{{/isListContainer}}
87-
{{^isListContainer}}
86+
{{/isArray}}
87+
{{^isArray}}
8888
if (requestParameters.{{paramName}} !== undefined) {
8989
{{#isDateTime}}
9090
queryParameters['{{baseName}}'] = (requestParameters.{{paramName}} as any).toISOString();
@@ -98,7 +98,7 @@ export const {{nickname}}Request = ({
9898
{{/isDate}}
9999
{{/isDateTime}}
100100
}
101-
{{/isListContainer}}
101+
{{/isArray}}
102102
{{/queryParams}}
103103

104104
{{! header }}
@@ -114,16 +114,16 @@ export const {{nickname}}Request = ({
114114
{{/bodyParam}}
115115

116116
{{#headerParams}}
117-
{{#isListContainer}}
117+
{{#isArray}}
118118
if (requestParameters.{{paramName}}) {
119119
headerParameters.set('{{baseName}}', requestParameters.{{paramName}}.join(collectionFormats["{{collectionFormat}}"]));
120120
}
121-
{{/isListContainer}}
122-
{{^isListContainer}}
121+
{{/isArray}}
122+
{{^isArray}}
123123
if (requestParameters.{{paramName}} !== undefined && requestParameters.{{paramName}} !== null) {
124124
headerParameters.set('{{baseName}}', String(requestParameters.{{paramName}}));
125125
}
126-
{{/isListContainer}}
126+
{{/isArray}}
127127
{{/headerParams}}
128128

129129
{{#authMethods}}
@@ -195,7 +195,7 @@ export const {{nickname}}Request = ({
195195
}
196196

197197
{{#formParams}}
198-
{{#isListContainer}}
198+
{{#isArray}}
199199
if (requestParameters.{{paramName}}) {
200200
{{#isCollectionFormatMulti}}
201201
requestParameters.{{paramName}}.forEach((element) => {
@@ -207,12 +207,12 @@ export const {{nickname}}Request = ({
207207
{{/isCollectionFormatMulti}}
208208
}
209209

210-
{{/isListContainer}}
211-
{{^isListContainer}}
210+
{{/isArray}}
211+
{{^isArray}}
212212
if (requestParameters.{{paramName}} !== undefined) {
213213
formParams.append('{{baseName}}', requestParameters.{{paramName}} as any);
214214
}
215-
{{/isListContainer}}
215+
{{/isArray}}
216216
{{/formParams}}
217217
{{/hasFormParams}}
218218

@@ -224,7 +224,7 @@ export const {{nickname}}Request = ({
224224
{{#hasBodyParam}}
225225
{{#bodyParam}}
226226
{{#isContainer}}
227-
const body = JSON.stringify(requestParameters.{{paramName}}{{#isListContainer}}{{#items}}{{^isPrimitiveType}}?.map(typeSerializer.toJsonObject('{{datatype}}')){{/isPrimitiveType}}{{/items}}{{/isListContainer}});
227+
const body = JSON.stringify(requestParameters.{{paramName}}{{#isArray}}{{#items}}{{^isPrimitiveType}}?.map(typeSerializer.toJsonObject('{{datatype}}')){{/isPrimitiveType}}{{/items}}{{/isArray}});
228228
{{/isContainer}}
229229
{{^isContainer}}
230230
{{^isPrimitiveType}}
@@ -273,28 +273,28 @@ export const {{nickname}}Response = (configuration: ResponseConfiguration = {})
273273
{{/isResponseFile}}
274274
{{^isResponseFile}}
275275
{{#returnTypeIsPrimitive}}
276-
{{#isMapContainer}}
276+
{{#isMap}}
277277
return response.json();
278-
{{/isMapContainer}}
279-
{{#isListContainer}}
278+
{{/isMap}}
279+
{{#isArray}}
280280
return response.json();
281-
{{/isListContainer}}
281+
{{/isArray}}
282282
{{#returnSimpleType}}
283283
return response.text().then(typeSerializer.toValueObject('{{returnBaseType}}'));
284284
{{/returnSimpleType}}
285285
{{/returnTypeIsPrimitive}}
286286
{{^returnTypeIsPrimitive}}
287-
{{#isListContainer}}
287+
{{#isArray}}
288288
return response.json().then(typeSerializer.toValueObjectList('{{returnBaseType}}'));
289-
{{/isListContainer}}
290-
{{^isListContainer}}
291-
{{#isMapContainer}}
289+
{{/isArray}}
290+
{{^isArray}}
291+
{{#isMap}}
292292
return response.json().then(typeSerializer.toValueObjectMap('{{returnBaseType}}'));
293-
{{/isMapContainer}}
294-
{{^isMapContainer}}
293+
{{/isMap}}
294+
{{^isMap}}
295295
return response.json().then(typeSerializer.toValueObject('{{returnBaseType}}'));
296-
{{/isMapContainer}}
297-
{{/isListContainer}}
296+
{{/isMap}}
297+
{{/isArray}}
298298
{{/returnTypeIsPrimitive}}
299299
{{/isResponseFile}}
300300
{{/returnType}}

‎packages/src/@rocket-scripts/openapi/template/modelGeneric.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ export const {{classname}}Model: GenericModel = {
6868
{{isFreeFormObject}}, // isFreeFormObject
6969
{{isInherited}}, // isInherited
7070
{{isInteger}}, // isInteger
71-
{{isListContainer}}, // isListContainer
71+
{{isArray}}, // isArray
7272
{{isLong}}, // isLong
73-
{{isMapContainer}}, // isMapContainer
73+
{{isMap}}, // isMap
7474
{{isModel}}, // isModel
7575
{{isNullable}}, // isNullable
7676
{{isNumber}}, // isNumber

‎reference/src/basic/client/.openapi-generator/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.0.0-beta2
1+
5.0.0

‎reference/src/basic/client/models/SomeData.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ export const SomeDataModel: GenericModel = {
5151
false, // isFreeFormObject
5252
false, // isInherited
5353
false, // isInteger
54-
false, // isListContainer
54+
false, // isArray
5555
false, // isLong
56-
false, // isMapContainer
56+
false, // isMap
5757
false, // isModel
5858
false, // isNullable
5959
false, // isNumber

‎reference/src/basic/client/models/SomeException.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ export const SomeExceptionModel: GenericModel = {
5151
false, // isFreeFormObject
5252
false, // isInherited
5353
false, // isInteger
54-
false, // isListContainer
54+
false, // isArray
5555
false, // isLong
56-
false, // isMapContainer
56+
false, // isMap
5757
false, // isModel
5858
false, // isNullable
5959
false, // isNumber

‎reference/src/datatypes/client/.openapi-generator/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.0.0-beta2
1+
5.0.0

‎reference/src/datatypes/client/models/DataTypes.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ export const DataTypesModel: GenericModel = {
114114
false, // isFreeFormObject
115115
false, // isInherited
116116
true, // isInteger
117-
false, // isListContainer
117+
false, // isArray
118118
false, // isLong
119-
false, // isMapContainer
119+
false, // isMap
120120
false, // isModel
121121
false, // isNullable
122122
false, // isNumber
@@ -154,9 +154,9 @@ export const DataTypesModel: GenericModel = {
154154
false, // isFreeFormObject
155155
false, // isInherited
156156
false, // isInteger
157-
false, // isListContainer
157+
false, // isArray
158158
true, // isLong
159-
false, // isMapContainer
159+
false, // isMap
160160
false, // isModel
161161
false, // isNullable
162162
false, // isNumber
@@ -194,9 +194,9 @@ export const DataTypesModel: GenericModel = {
194194
false, // isFreeFormObject
195195
false, // isInherited
196196
false, // isInteger
197-
false, // isListContainer
197+
false, // isArray
198198
false, // isLong
199-
false, // isMapContainer
199+
false, // isMap
200200
false, // isModel
201201
false, // isNullable
202202
false, // isNumber
@@ -234,9 +234,9 @@ export const DataTypesModel: GenericModel = {
234234
false, // isFreeFormObject
235235
false, // isInherited
236236
false, // isInteger
237-
false, // isListContainer
237+
false, // isArray
238238
false, // isLong
239-
false, // isMapContainer
239+
false, // isMap
240240
false, // isModel
241241
false, // isNullable
242242
false, // isNumber
@@ -274,9 +274,9 @@ export const DataTypesModel: GenericModel = {
274274
false, // isFreeFormObject
275275
false, // isInherited
276276
false, // isInteger
277-
false, // isListContainer
277+
false, // isArray
278278
false, // isLong
279-
false, // isMapContainer
279+
false, // isMap
280280
false, // isModel
281281
false, // isNullable
282282
false, // isNumber
@@ -314,9 +314,9 @@ export const DataTypesModel: GenericModel = {
314314
false, // isFreeFormObject
315315
false, // isInherited
316316
false, // isInteger
317-
false, // isListContainer
317+
false, // isArray
318318
false, // isLong
319-
false, // isMapContainer
319+
false, // isMap
320320
false, // isModel
321321
false, // isNullable
322322
false, // isNumber
@@ -354,9 +354,9 @@ export const DataTypesModel: GenericModel = {
354354
false, // isFreeFormObject
355355
false, // isInherited
356356
false, // isInteger
357-
false, // isListContainer
357+
false, // isArray
358358
false, // isLong
359-
false, // isMapContainer
359+
false, // isMap
360360
false, // isModel
361361
false, // isNullable
362362
false, // isNumber
@@ -394,9 +394,9 @@ export const DataTypesModel: GenericModel = {
394394
false, // isFreeFormObject
395395
false, // isInherited
396396
false, // isInteger
397-
false, // isListContainer
397+
false, // isArray
398398
false, // isLong
399-
false, // isMapContainer
399+
false, // isMap
400400
false, // isModel
401401
false, // isNullable
402402
false, // isNumber
@@ -434,9 +434,9 @@ export const DataTypesModel: GenericModel = {
434434
false, // isFreeFormObject
435435
false, // isInherited
436436
false, // isInteger
437-
false, // isListContainer
437+
false, // isArray
438438
false, // isLong
439-
false, // isMapContainer
439+
false, // isMap
440440
false, // isModel
441441
false, // isNullable
442442
false, // isNumber
@@ -474,9 +474,9 @@ export const DataTypesModel: GenericModel = {
474474
false, // isFreeFormObject
475475
false, // isInherited
476476
false, // isInteger
477-
false, // isListContainer
477+
false, // isArray
478478
false, // isLong
479-
false, // isMapContainer
479+
false, // isMap
480480
false, // isModel
481481
false, // isNullable
482482
false, // isNumber

0 commit comments

Comments
 (0)