mokkenstorm.dev / openapi-ts
fork of hey-api/openapi-ts because I need some additional things
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #450 from hey-api/fix/do-no-destructure

authored by

Jordan Shatford and committed by
GitHub 3b53f5e3 2357fd28

+395 -829
+5
.changeset/chatty-brooms-obey.md
··· 1 + --- 2 + "@hey-api/openapi-ts": patch 3 + --- 4 + 5 + fix: do not destructure data when using use options
+2 -23
packages/openapi-ts/src/utils/write/services.ts
··· 102 102 }; 103 103 104 104 const toRequestOptions = (operation: Operation) => { 105 + const config = getConfig(); 105 106 const toObj = (parameters: OperationParameter[]) => 106 107 parameters.reduce( 107 108 (prev, curr) => { 108 109 const key = curr.prop; 109 - const value = curr.name; 110 + const value = config.useOptions ? `data.${curr.name}` : curr.name; 110 111 if (key === value) { 111 112 prev[key] = key; 112 113 } else if (escapeName(key) === key) { ··· 166 167 }); 167 168 }; 168 169 169 - export const toDestructuredData = (operation: Operation) => { 170 - const config = getConfig(); 171 - if (!config.useOptions || !operation.parameters.length) { 172 - return ''; 173 - } 174 - const obj: Record<string, unknown> = {}; 175 - operation.parameters.forEach((p) => { 176 - obj[p.name] = p.name; 177 - }); 178 - const node = compiler.types.object({ 179 - identifiers: Object.keys(obj), 180 - obj, 181 - shorthand: true, 182 - }); 183 - return `const ${compiler.utils.toString(node)} = data;`; 184 - }; 185 - 186 170 const toOperationStatements = (operation: Operation) => { 187 171 const config = getConfig(); 188 172 const statements: any[] = []; 189 - // If using options we destructor the parameter 190 - if (config.useOptions && operation.parameters.length) { 191 - statements.push(compiler.utils.toNode(toDestructuredData(operation))); 192 - } 193 - 194 173 const requestOptions = compiler.utils.toString(toRequestOptions(operation)); 195 174 if (config.name) { 196 175 statements.push(
+58 -121
packages/openapi-ts/test/__snapshots__/test/generated/v2/services.gen.ts.snap
··· 106 106 public static callWithDescriptions( 107 107 data: $OpenApiTs['/api/v{api-version}/descriptions/']['post']['req'] = {}, 108 108 ): CancelablePromise<void> { 109 - const { 110 - parameterWithBreaks, 111 - parameterWithBackticks, 112 - parameterWithSlashes, 113 - parameterWithExpressionPlaceholders, 114 - parameterWithQuotes, 115 - parameterWithReservedCharacters, 116 - } = data; 117 109 return __request(OpenAPI, { 118 110 method: 'POST', 119 111 url: '/api/v{api-version}/descriptions/', 120 112 query: { 121 - parameterWithBreaks, 122 - parameterWithBackticks, 123 - parameterWithSlashes, 124 - parameterWithExpressionPlaceholders, 125 - parameterWithQuotes, 126 - parameterWithReservedCharacters, 113 + parameterWithBreaks: data.parameterWithBreaks, 114 + parameterWithBackticks: data.parameterWithBackticks, 115 + parameterWithSlashes: data.parameterWithSlashes, 116 + parameterWithExpressionPlaceholders: 117 + data.parameterWithExpressionPlaceholders, 118 + parameterWithQuotes: data.parameterWithQuotes, 119 + parameterWithReservedCharacters: data.parameterWithReservedCharacters, 127 120 }, 128 121 }); 129 122 } ··· 142 135 public static callWithParameters( 143 136 data: $OpenApiTs['/api/v{api-version}/parameters/{parameterPath}']['post']['req'], 144 137 ): CancelablePromise<void> { 145 - const { 146 - parameterHeader, 147 - parameterQuery, 148 - parameterForm, 149 - parameterBody, 150 - parameterPath, 151 - } = data; 152 138 return __request(OpenAPI, { 153 139 method: 'POST', 154 140 url: '/api/v{api-version}/parameters/{parameterPath}', 155 141 path: { 156 - parameterPath, 142 + parameterPath: data.parameterPath, 157 143 }, 158 144 headers: { 159 - parameterHeader, 145 + parameterHeader: data.parameterHeader, 160 146 }, 161 147 query: { 162 - parameterQuery, 148 + parameterQuery: data.parameterQuery, 163 149 }, 164 150 formData: { 165 - parameterForm, 151 + parameterForm: data.parameterForm, 166 152 }, 167 153 body: parameterBody, 168 154 }); ··· 183 169 public static callWithWeirdParameterNames( 184 170 data: $OpenApiTs['/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}']['post']['req'], 185 171 ): CancelablePromise<void> { 186 - const { 187 - parameterHeader, 188 - parameterQuery, 189 - parameterForm, 190 - parameterBody, 191 - parameterPath1, 192 - parameterPath2, 193 - parameterPath3, 194 - _default, 195 - } = data; 196 172 return __request(OpenAPI, { 197 173 method: 'POST', 198 174 url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', 199 175 path: { 200 - 'parameter.path.1': parameterPath1, 201 - 'parameter-path-2': parameterPath2, 202 - 'PARAMETER-PATH-3': parameterPath3, 176 + 'parameter.path.1': data.parameterPath1, 177 + 'parameter-path-2': data.parameterPath2, 178 + 'PARAMETER-PATH-3': data.parameterPath3, 203 179 }, 204 180 headers: { 205 - 'parameter.header': parameterHeader, 181 + 'parameter.header': data.parameterHeader, 206 182 }, 207 183 query: { 208 - default: _default, 209 - 'parameter-query': parameterQuery, 184 + default: data._default, 185 + 'parameter-query': data.parameterQuery, 210 186 }, 211 187 formData: { 212 - parameter_form: parameterForm, 188 + parameter_form: data.parameterForm, 213 189 }, 214 190 body: parameterBody, 215 191 }); ··· 229 205 public static callWithDefaultParameters( 230 206 data: $OpenApiTs['/api/v{api-version}/defaults']['get']['req'], 231 207 ): CancelablePromise<void> { 232 - const { 233 - parameterString, 234 - parameterNumber, 235 - parameterBoolean, 236 - parameterEnum, 237 - parameterModel, 238 - } = data; 239 208 return __request(OpenAPI, { 240 209 method: 'GET', 241 210 url: '/api/v{api-version}/defaults', 242 211 query: { 243 - parameterString, 244 - parameterNumber, 245 - parameterBoolean, 246 - parameterEnum, 247 - parameterModel, 212 + parameterString: data.parameterString, 213 + parameterNumber: data.parameterNumber, 214 + parameterBoolean: data.parameterBoolean, 215 + parameterEnum: data.parameterEnum, 216 + parameterModel: data.parameterModel, 248 217 }, 249 218 }); 250 219 } ··· 261 230 public static callWithDefaultOptionalParameters( 262 231 data: $OpenApiTs['/api/v{api-version}/defaults']['post']['req'] = {}, 263 232 ): CancelablePromise<void> { 264 - const { 265 - parameterString, 266 - parameterNumber, 267 - parameterBoolean, 268 - parameterEnum, 269 - parameterModel, 270 - } = data; 271 233 return __request(OpenAPI, { 272 234 method: 'POST', 273 235 url: '/api/v{api-version}/defaults', 274 236 query: { 275 - parameterString, 276 - parameterNumber, 277 - parameterBoolean, 278 - parameterEnum, 279 - parameterModel, 237 + parameterString: data.parameterString, 238 + parameterNumber: data.parameterNumber, 239 + parameterBoolean: data.parameterBoolean, 240 + parameterEnum: data.parameterEnum, 241 + parameterModel: data.parameterModel, 280 242 }, 281 243 }); 282 244 } ··· 296 258 public static callToTestOrderOfParams( 297 259 data: $OpenApiTs['/api/v{api-version}/defaults']['put']['req'], 298 260 ): CancelablePromise<void> { 299 - const { 300 - parameterStringWithNoDefault, 301 - parameterOptionalStringWithDefault, 302 - parameterOptionalStringWithEmptyDefault, 303 - parameterOptionalStringWithNoDefault, 304 - parameterStringWithDefault, 305 - parameterStringWithEmptyDefault, 306 - parameterStringNullableWithNoDefault, 307 - parameterStringNullableWithDefault, 308 - } = data; 309 261 return __request(OpenAPI, { 310 262 method: 'PUT', 311 263 url: '/api/v{api-version}/defaults', 312 264 query: { 313 - parameterOptionalStringWithDefault, 314 - parameterOptionalStringWithEmptyDefault, 315 - parameterOptionalStringWithNoDefault, 316 - parameterStringWithDefault, 317 - parameterStringWithEmptyDefault, 318 - parameterStringWithNoDefault, 319 - parameterStringNullableWithNoDefault, 320 - parameterStringNullableWithDefault, 265 + parameterOptionalStringWithDefault: 266 + data.parameterOptionalStringWithDefault, 267 + parameterOptionalStringWithEmptyDefault: 268 + data.parameterOptionalStringWithEmptyDefault, 269 + parameterOptionalStringWithNoDefault: 270 + data.parameterOptionalStringWithNoDefault, 271 + parameterStringWithDefault: data.parameterStringWithDefault, 272 + parameterStringWithEmptyDefault: data.parameterStringWithEmptyDefault, 273 + parameterStringWithNoDefault: data.parameterStringWithNoDefault, 274 + parameterStringNullableWithNoDefault: 275 + data.parameterStringNullableWithNoDefault, 276 + parameterStringNullableWithDefault: 277 + data.parameterStringNullableWithDefault, 321 278 }, 322 279 }); 323 280 } ··· 551 508 public static collectionFormat( 552 509 data: $OpenApiTs['/api/v{api-version}/collectionFormat']['get']['req'], 553 510 ): CancelablePromise<void> { 554 - const { 555 - parameterArrayCsv, 556 - parameterArraySsv, 557 - parameterArrayTsv, 558 - parameterArrayPipes, 559 - parameterArrayMulti, 560 - } = data; 561 511 return __request(OpenAPI, { 562 512 method: 'GET', 563 513 url: '/api/v{api-version}/collectionFormat', 564 514 query: { 565 - parameterArrayCSV: parameterArrayCsv, 566 - parameterArraySSV: parameterArraySsv, 567 - parameterArrayTSV: parameterArrayTsv, 568 - parameterArrayPipes, 569 - parameterArrayMulti, 515 + parameterArrayCSV: data.parameterArrayCsv, 516 + parameterArraySSV: data.parameterArraySsv, 517 + parameterArrayTSV: data.parameterArrayTsv, 518 + parameterArrayPipes: data.parameterArrayPipes, 519 + parameterArrayMulti: data.parameterArrayMulti, 570 520 }, 571 521 }); 572 522 } ··· 597 547 | $OpenApiTs['/api/v{api-version}/types']['get']['res'][202] 598 548 | $OpenApiTs['/api/v{api-version}/types']['get']['res'][203] 599 549 > { 600 - const { 601 - parameterArray, 602 - parameterDictionary, 603 - parameterEnum, 604 - parameterNumber, 605 - parameterString, 606 - parameterBoolean, 607 - parameterObject, 608 - id, 609 - } = data; 610 550 return __request(OpenAPI, { 611 551 method: 'GET', 612 552 url: '/api/v{api-version}/types', 613 553 path: { 614 - id, 554 + id: data.id, 615 555 }, 616 556 query: { 617 - parameterNumber, 618 - parameterString, 619 - parameterBoolean, 620 - parameterObject, 621 - parameterArray, 622 - parameterDictionary, 623 - parameterEnum, 557 + parameterNumber: data.parameterNumber, 558 + parameterString: data.parameterString, 559 + parameterBoolean: data.parameterBoolean, 560 + parameterObject: data.parameterObject, 561 + parameterArray: data.parameterArray, 562 + parameterDictionary: data.parameterDictionary, 563 + parameterEnum: data.parameterEnum, 624 564 }, 625 565 }); 626 566 } ··· 639 579 ): CancelablePromise< 640 580 $OpenApiTs['/api/v{api-version}/complex']['get']['res'][200] 641 581 > { 642 - const { parameterObject, parameterReference } = data; 643 582 return __request(OpenAPI, { 644 583 method: 'GET', 645 584 url: '/api/v{api-version}/complex', 646 585 query: { 647 - parameterObject, 648 - parameterReference, 586 + parameterObject: data.parameterObject, 587 + parameterReference: data.parameterReference, 649 588 }, 650 589 errors: { 651 590 400: '400 server error', ··· 687 626 ): CancelablePromise< 688 627 $OpenApiTs['/api/v{api-version}/error']['post']['res'][200] 689 628 > { 690 - const { status } = data; 691 629 return __request(OpenAPI, { 692 630 method: 'POST', 693 631 url: '/api/v{api-version}/error', 694 632 query: { 695 - status, 633 + status: data.status, 696 634 }, 697 635 errors: { 698 636 500: 'Custom message: Internal Server Error', ··· 716 654 ): CancelablePromise< 717 655 $OpenApiTs['/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串']['post']['res'][200] 718 656 > { 719 - const { nonAsciiParamæøåÆøÅöôêÊ } = data; 720 657 return __request(OpenAPI, { 721 658 method: 'POST', 722 659 url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', 723 660 query: { 724 - nonAsciiParamæøåÆØÅöôêÊ: nonAsciiParamæøåÆøÅöôêÊ, 661 + nonAsciiParamæøåÆØÅöôêÊ: data.nonAsciiParamæøåÆøÅöôêÊ, 725 662 }, 726 663 }); 727 664 }
+72 -150
packages/openapi-ts/test/__snapshots__/test/generated/v3/services.gen.ts.snap
··· 27 27 ): CancelablePromise< 28 28 $OpenApiTs['/api/v{api-version}/no-tag']['post']['res'][200] 29 29 > { 30 - const { requestBody } = data; 31 30 return __request(OpenAPI, { 32 31 method: 'POST', 33 32 url: '/api/v{api-version}/no-tag', ··· 132 131 public static deleteFoo( 133 132 data: $OpenApiTs['/api/v{api-version}/foo/{foo}/bar/{bar}']['delete']['req'], 134 133 ): CancelablePromise<void> { 135 - const { foo, bar } = data; 136 134 return __request(OpenAPI, { 137 135 method: 'DELETE', 138 136 url: '/api/v{api-version}/foo/{foo}/bar/{bar}', 139 137 path: { 140 - foo, 141 - bar, 138 + foo: data.foo, 139 + bar: data.bar, 142 140 }, 143 141 }); 144 142 } ··· 158 156 public static callWithParameters( 159 157 data: $OpenApiTs['/api/v{api-version}/parameters/{parameterPath}']['post']['req'], 160 158 ): CancelablePromise<void> { 161 - const { 162 - parameterHeader, 163 - fooAllOfEnum, 164 - parameterQuery, 165 - parameterForm, 166 - parameterCookie, 167 - parameterPath, 168 - requestBody, 169 - fooRefEnum, 170 - } = data; 171 159 return __request(OpenAPI, { 172 160 method: 'POST', 173 161 url: '/api/v{api-version}/parameters/{parameterPath}', 174 162 path: { 175 - parameterPath, 163 + parameterPath: data.parameterPath, 176 164 }, 177 165 cookies: { 178 - parameterCookie, 166 + parameterCookie: data.parameterCookie, 179 167 }, 180 168 headers: { 181 - parameterHeader, 169 + parameterHeader: data.parameterHeader, 182 170 }, 183 171 query: { 184 - foo_ref_enum: fooRefEnum, 185 - foo_all_of_enum: fooAllOfEnum, 186 - parameterQuery, 172 + foo_ref_enum: data.fooRefEnum, 173 + foo_all_of_enum: data.fooAllOfEnum, 174 + parameterQuery: data.parameterQuery, 187 175 }, 188 176 formData: { 189 - parameterForm, 177 + parameterForm: data.parameterForm, 190 178 }, 191 179 body: requestBody, 192 180 mediaType: 'application/json', ··· 209 197 public static callWithWeirdParameterNames( 210 198 data: $OpenApiTs['/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}']['post']['req'], 211 199 ): CancelablePromise<void> { 212 - const { 213 - parameterHeader, 214 - parameterQuery, 215 - parameterForm, 216 - parameterCookie, 217 - requestBody, 218 - parameterPath1, 219 - parameterPath2, 220 - parameterPath3, 221 - _default, 222 - } = data; 223 200 return __request(OpenAPI, { 224 201 method: 'POST', 225 202 url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', 226 203 path: { 227 - 'parameter.path.1': parameterPath1, 228 - 'parameter-path-2': parameterPath2, 229 - 'PARAMETER-PATH-3': parameterPath3, 204 + 'parameter.path.1': data.parameterPath1, 205 + 'parameter-path-2': data.parameterPath2, 206 + 'PARAMETER-PATH-3': data.parameterPath3, 230 207 }, 231 208 cookies: { 232 - 'PARAMETER-COOKIE': parameterCookie, 209 + 'PARAMETER-COOKIE': data.parameterCookie, 233 210 }, 234 211 headers: { 235 - 'parameter.header': parameterHeader, 212 + 'parameter.header': data.parameterHeader, 236 213 }, 237 214 query: { 238 - default: _default, 239 - 'parameter-query': parameterQuery, 215 + default: data._default, 216 + 'parameter-query': data.parameterQuery, 240 217 }, 241 218 formData: { 242 - parameter_form: parameterForm, 219 + parameter_form: data.parameterForm, 243 220 }, 244 221 body: requestBody, 245 222 mediaType: 'application/json', ··· 255 232 public static getCallWithOptionalParam( 256 233 data: $OpenApiTs['/api/v{api-version}/parameters/']['get']['req'], 257 234 ): CancelablePromise<void> { 258 - const { requestBody, parameter } = data; 259 235 return __request(OpenAPI, { 260 236 method: 'GET', 261 237 url: '/api/v{api-version}/parameters/', 262 238 query: { 263 - parameter, 239 + parameter: data.parameter, 264 240 }, 265 241 body: requestBody, 266 242 mediaType: 'application/json', ··· 276 252 public static postCallWithOptionalParam( 277 253 data: $OpenApiTs['/api/v{api-version}/parameters/']['post']['req'], 278 254 ): CancelablePromise<void> { 279 - const { parameter, requestBody } = data; 280 255 return __request(OpenAPI, { 281 256 method: 'POST', 282 257 url: '/api/v{api-version}/parameters/', 283 258 query: { 284 - parameter, 259 + parameter: data.parameter, 285 260 }, 286 261 body: requestBody, 287 262 mediaType: 'application/json', ··· 306 281 public static callWithDescriptions( 307 282 data: $OpenApiTs['/api/v{api-version}/descriptions/']['post']['req'] = {}, 308 283 ): CancelablePromise<void> { 309 - const { 310 - parameterWithBreaks, 311 - parameterWithBackticks, 312 - parameterWithSlashes, 313 - parameterWithExpressionPlaceholders, 314 - parameterWithQuotes, 315 - parameterWithReservedCharacters, 316 - } = data; 317 284 return __request(OpenAPI, { 318 285 method: 'POST', 319 286 url: '/api/v{api-version}/descriptions/', 320 287 query: { 321 - parameterWithBreaks, 322 - parameterWithBackticks, 323 - parameterWithSlashes, 324 - parameterWithExpressionPlaceholders, 325 - parameterWithQuotes, 326 - parameterWithReservedCharacters, 288 + parameterWithBreaks: data.parameterWithBreaks, 289 + parameterWithBackticks: data.parameterWithBackticks, 290 + parameterWithSlashes: data.parameterWithSlashes, 291 + parameterWithExpressionPlaceholders: 292 + data.parameterWithExpressionPlaceholders, 293 + parameterWithQuotes: data.parameterWithQuotes, 294 + parameterWithReservedCharacters: data.parameterWithReservedCharacters, 327 295 }, 328 296 }); 329 297 } ··· 339 307 public static deprecatedCall( 340 308 data: $OpenApiTs['/api/v{api-version}/parameters/deprecated']['post']['req'], 341 309 ): CancelablePromise<void> { 342 - const { parameter } = data; 343 310 return __request(OpenAPI, { 344 311 method: 'POST', 345 312 url: '/api/v{api-version}/parameters/deprecated', 346 313 headers: { 347 - parameter, 314 + parameter: data.parameter, 348 315 }, 349 316 }); 350 317 } ··· 360 327 public static postApiRequestBody( 361 328 data: $OpenApiTs['/api/v{api-version}/requestBody/']['post']['req'] = {}, 362 329 ): CancelablePromise<void> { 363 - const { parameter, foo } = data; 364 330 return __request(OpenAPI, { 365 331 method: 'POST', 366 332 url: '/api/v{api-version}/requestBody/', 367 333 query: { 368 - parameter, 334 + parameter: data.parameter, 369 335 }, 370 336 body: foo, 371 337 mediaType: 'application/json', ··· 383 349 public static postApiFormData( 384 350 data: $OpenApiTs['/api/v{api-version}/formData/']['post']['req'] = {}, 385 351 ): CancelablePromise<void> { 386 - const { parameter, formData } = data; 387 352 return __request(OpenAPI, { 388 353 method: 'POST', 389 354 url: '/api/v{api-version}/formData/', 390 355 query: { 391 - parameter, 356 + parameter: data.parameter, 392 357 }, 393 358 formData, 394 359 mediaType: 'multipart/form-data', ··· 409 374 public static callWithDefaultParameters( 410 375 data: $OpenApiTs['/api/v{api-version}/defaults']['get']['req'] = {}, 411 376 ): CancelablePromise<void> { 412 - const { 413 - parameterString, 414 - parameterNumber, 415 - parameterBoolean, 416 - parameterEnum, 417 - parameterModel, 418 - } = data; 419 377 return __request(OpenAPI, { 420 378 method: 'GET', 421 379 url: '/api/v{api-version}/defaults', 422 380 query: { 423 - parameterString, 424 - parameterNumber, 425 - parameterBoolean, 426 - parameterEnum, 427 - parameterModel, 381 + parameterString: data.parameterString, 382 + parameterNumber: data.parameterNumber, 383 + parameterBoolean: data.parameterBoolean, 384 + parameterEnum: data.parameterEnum, 385 + parameterModel: data.parameterModel, 428 386 }, 429 387 }); 430 388 } ··· 441 399 public static callWithDefaultOptionalParameters( 442 400 data: $OpenApiTs['/api/v{api-version}/defaults']['post']['req'] = {}, 443 401 ): CancelablePromise<void> { 444 - const { 445 - parameterString, 446 - parameterNumber, 447 - parameterBoolean, 448 - parameterEnum, 449 - parameterModel, 450 - } = data; 451 402 return __request(OpenAPI, { 452 403 method: 'POST', 453 404 url: '/api/v{api-version}/defaults', 454 405 query: { 455 - parameterString, 456 - parameterNumber, 457 - parameterBoolean, 458 - parameterEnum, 459 - parameterModel, 406 + parameterString: data.parameterString, 407 + parameterNumber: data.parameterNumber, 408 + parameterBoolean: data.parameterBoolean, 409 + parameterEnum: data.parameterEnum, 410 + parameterModel: data.parameterModel, 460 411 }, 461 412 }); 462 413 } ··· 476 427 public static callToTestOrderOfParams( 477 428 data: $OpenApiTs['/api/v{api-version}/defaults']['put']['req'], 478 429 ): CancelablePromise<void> { 479 - const { 480 - parameterStringWithNoDefault, 481 - parameterOptionalStringWithDefault, 482 - parameterOptionalStringWithEmptyDefault, 483 - parameterOptionalStringWithNoDefault, 484 - parameterStringWithDefault, 485 - parameterStringWithEmptyDefault, 486 - parameterStringNullableWithNoDefault, 487 - parameterStringNullableWithDefault, 488 - } = data; 489 430 return __request(OpenAPI, { 490 431 method: 'PUT', 491 432 url: '/api/v{api-version}/defaults', 492 433 query: { 493 - parameterOptionalStringWithDefault, 494 - parameterOptionalStringWithEmptyDefault, 495 - parameterOptionalStringWithNoDefault, 496 - parameterStringWithDefault, 497 - parameterStringWithEmptyDefault, 498 - parameterStringWithNoDefault, 499 - parameterStringNullableWithNoDefault, 500 - parameterStringNullableWithDefault, 434 + parameterOptionalStringWithDefault: 435 + data.parameterOptionalStringWithDefault, 436 + parameterOptionalStringWithEmptyDefault: 437 + data.parameterOptionalStringWithEmptyDefault, 438 + parameterOptionalStringWithNoDefault: 439 + data.parameterOptionalStringWithNoDefault, 440 + parameterStringWithDefault: data.parameterStringWithDefault, 441 + parameterStringWithEmptyDefault: data.parameterStringWithEmptyDefault, 442 + parameterStringWithNoDefault: data.parameterStringWithNoDefault, 443 + parameterStringNullableWithNoDefault: 444 + data.parameterStringNullableWithNoDefault, 445 + parameterStringNullableWithDefault: 446 + data.parameterStringNullableWithDefault, 501 447 }, 502 448 }); 503 449 } ··· 731 677 public static collectionFormat( 732 678 data: $OpenApiTs['/api/v{api-version}/collectionFormat']['get']['req'], 733 679 ): CancelablePromise<void> { 734 - const { 735 - parameterArrayCsv, 736 - parameterArraySsv, 737 - parameterArrayTsv, 738 - parameterArrayPipes, 739 - parameterArrayMulti, 740 - } = data; 741 680 return __request(OpenAPI, { 742 681 method: 'GET', 743 682 url: '/api/v{api-version}/collectionFormat', 744 683 query: { 745 - parameterArrayCSV: parameterArrayCsv, 746 - parameterArraySSV: parameterArraySsv, 747 - parameterArrayTSV: parameterArrayTsv, 748 - parameterArrayPipes, 749 - parameterArrayMulti, 684 + parameterArrayCSV: data.parameterArrayCsv, 685 + parameterArraySSV: data.parameterArraySsv, 686 + parameterArrayTSV: data.parameterArrayTsv, 687 + parameterArrayPipes: data.parameterArrayPipes, 688 + parameterArrayMulti: data.parameterArrayMulti, 750 689 }, 751 690 }); 752 691 } ··· 777 716 | $OpenApiTs['/api/v{api-version}/types']['get']['res'][202] 778 717 | $OpenApiTs['/api/v{api-version}/types']['get']['res'][203] 779 718 > { 780 - const { 781 - parameterArray, 782 - parameterDictionary, 783 - parameterEnum, 784 - parameterNumber, 785 - parameterString, 786 - parameterBoolean, 787 - parameterObject, 788 - id, 789 - } = data; 790 719 return __request(OpenAPI, { 791 720 method: 'GET', 792 721 url: '/api/v{api-version}/types', 793 722 path: { 794 - id, 723 + id: data.id, 795 724 }, 796 725 query: { 797 - parameterNumber, 798 - parameterString, 799 - parameterBoolean, 800 - parameterObject, 801 - parameterArray, 802 - parameterDictionary, 803 - parameterEnum, 726 + parameterNumber: data.parameterNumber, 727 + parameterString: data.parameterString, 728 + parameterBoolean: data.parameterBoolean, 729 + parameterObject: data.parameterObject, 730 + parameterArray: data.parameterArray, 731 + parameterDictionary: data.parameterDictionary, 732 + parameterEnum: data.parameterEnum, 804 733 }, 805 734 }); 806 735 } ··· 818 747 ): CancelablePromise< 819 748 $OpenApiTs['/api/v{api-version}/upload']['post']['res'][200] 820 749 > { 821 - const { file } = data; 822 750 return __request(OpenAPI, { 823 751 method: 'POST', 824 752 url: '/api/v{api-version}/upload', 825 753 formData: { 826 - file, 754 + file: data.file, 827 755 }, 828 756 }); 829 757 } ··· 841 769 ): CancelablePromise< 842 770 $OpenApiTs['/api/v{api-version}/file/{id}']['get']['res'][200] 843 771 > { 844 - const { id } = data; 845 772 return __request(OpenAPI, { 846 773 method: 'GET', 847 774 url: '/api/v{api-version}/file/{id}', 848 775 path: { 849 - id, 776 + id: data.id, 850 777 }, 851 778 }); 852 779 } ··· 865 792 ): CancelablePromise< 866 793 $OpenApiTs['/api/v{api-version}/complex']['get']['res'][200] 867 794 > { 868 - const { parameterObject, parameterReference } = data; 869 795 return __request(OpenAPI, { 870 796 method: 'GET', 871 797 url: '/api/v{api-version}/complex', 872 798 query: { 873 - parameterObject, 874 - parameterReference, 799 + parameterObject: data.parameterObject, 800 + parameterReference: data.parameterReference, 875 801 }, 876 802 errors: { 877 803 400: '400 `server` error', ··· 892 818 ): CancelablePromise< 893 819 $OpenApiTs['/api/v{api-version}/complex/{id}']['put']['res'][200] 894 820 > { 895 - const { id, requestBody } = data; 896 821 return __request(OpenAPI, { 897 822 method: 'PUT', 898 823 url: '/api/v{api-version}/complex/{id}', 899 824 path: { 900 - id, 825 + id: data.id, 901 826 }, 902 827 body: requestBody, 903 828 mediaType: 'application/json-patch+json', ··· 914 839 public static multipartRequest( 915 840 data: $OpenApiTs['/api/v{api-version}/multipart']['post']['req'] = {}, 916 841 ): CancelablePromise<void> { 917 - const { formData } = data; 918 842 return __request(OpenAPI, { 919 843 method: 'POST', 920 844 url: '/api/v{api-version}/multipart', ··· 969 893 ): CancelablePromise< 970 894 $OpenApiTs['/api/v{api-version}/error']['post']['res'][200] 971 895 > { 972 - const { status } = data; 973 896 return __request(OpenAPI, { 974 897 method: 'POST', 975 898 url: '/api/v{api-version}/error', 976 899 query: { 977 - status, 900 + status: data.status, 978 901 }, 979 902 errors: { 980 903 500: 'Custom message: Internal Server Error', ··· 998 921 ): CancelablePromise< 999 922 $OpenApiTs['/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串']['post']['res'][200] 1000 923 > { 1001 - const { nonAsciiParamæøåÆøÅöôêÊ } = data; 1002 924 return __request(OpenAPI, { 1003 925 method: 'POST', 1004 926 url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', 1005 927 query: { 1006 - nonAsciiParamæøåÆØÅöôêÊ: nonAsciiParamæøåÆøÅöôêÊ, 928 + nonAsciiParamæøåÆØÅöôêÊ: data.nonAsciiParamæøåÆøÅöôêÊ, 1007 929 }, 1008 930 }); 1009 931 }
+72 -150
packages/openapi-ts/test/__snapshots__/test/generated/v3_angular/services.gen.ts.snap
··· 32 32 public postServiceWithEmptyTag( 33 33 data: $OpenApiTs['/api/v{api-version}/no-tag']['post']['req'], 34 34 ): Observable<$OpenApiTs['/api/v{api-version}/no-tag']['post']['res'][200]> { 35 - const { requestBody } = data; 36 35 return __request(OpenAPI, this.http, { 37 36 method: 'POST', 38 37 url: '/api/v{api-version}/no-tag', ··· 147 146 public deleteFoo( 148 147 data: $OpenApiTs['/api/v{api-version}/foo/{foo}/bar/{bar}']['delete']['req'], 149 148 ): Observable<void> { 150 - const { foo, bar } = data; 151 149 return __request(OpenAPI, this.http, { 152 150 method: 'DELETE', 153 151 url: '/api/v{api-version}/foo/{foo}/bar/{bar}', 154 152 path: { 155 - foo, 156 - bar, 153 + foo: data.foo, 154 + bar: data.bar, 157 155 }, 158 156 }); 159 157 } ··· 173 171 public callWithParameters( 174 172 data: $OpenApiTs['/api/v{api-version}/parameters/{parameterPath}']['post']['req'], 175 173 ): Observable<void> { 176 - const { 177 - parameterHeader, 178 - fooAllOfEnum, 179 - parameterQuery, 180 - parameterForm, 181 - parameterCookie, 182 - parameterPath, 183 - requestBody, 184 - fooRefEnum, 185 - } = data; 186 174 return __request(OpenAPI, this.http, { 187 175 method: 'POST', 188 176 url: '/api/v{api-version}/parameters/{parameterPath}', 189 177 path: { 190 - parameterPath, 178 + parameterPath: data.parameterPath, 191 179 }, 192 180 cookies: { 193 - parameterCookie, 181 + parameterCookie: data.parameterCookie, 194 182 }, 195 183 headers: { 196 - parameterHeader, 184 + parameterHeader: data.parameterHeader, 197 185 }, 198 186 query: { 199 - foo_ref_enum: fooRefEnum, 200 - foo_all_of_enum: fooAllOfEnum, 201 - parameterQuery, 187 + foo_ref_enum: data.fooRefEnum, 188 + foo_all_of_enum: data.fooAllOfEnum, 189 + parameterQuery: data.parameterQuery, 202 190 }, 203 191 formData: { 204 - parameterForm, 192 + parameterForm: data.parameterForm, 205 193 }, 206 194 body: requestBody, 207 195 mediaType: 'application/json', ··· 224 212 public callWithWeirdParameterNames( 225 213 data: $OpenApiTs['/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}']['post']['req'], 226 214 ): Observable<void> { 227 - const { 228 - parameterHeader, 229 - parameterQuery, 230 - parameterForm, 231 - parameterCookie, 232 - requestBody, 233 - parameterPath1, 234 - parameterPath2, 235 - parameterPath3, 236 - _default, 237 - } = data; 238 215 return __request(OpenAPI, this.http, { 239 216 method: 'POST', 240 217 url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', 241 218 path: { 242 - 'parameter.path.1': parameterPath1, 243 - 'parameter-path-2': parameterPath2, 244 - 'PARAMETER-PATH-3': parameterPath3, 219 + 'parameter.path.1': data.parameterPath1, 220 + 'parameter-path-2': data.parameterPath2, 221 + 'PARAMETER-PATH-3': data.parameterPath3, 245 222 }, 246 223 cookies: { 247 - 'PARAMETER-COOKIE': parameterCookie, 224 + 'PARAMETER-COOKIE': data.parameterCookie, 248 225 }, 249 226 headers: { 250 - 'parameter.header': parameterHeader, 227 + 'parameter.header': data.parameterHeader, 251 228 }, 252 229 query: { 253 - default: _default, 254 - 'parameter-query': parameterQuery, 230 + default: data._default, 231 + 'parameter-query': data.parameterQuery, 255 232 }, 256 233 formData: { 257 - parameter_form: parameterForm, 234 + parameter_form: data.parameterForm, 258 235 }, 259 236 body: requestBody, 260 237 mediaType: 'application/json', ··· 270 247 public getCallWithOptionalParam( 271 248 data: $OpenApiTs['/api/v{api-version}/parameters/']['get']['req'], 272 249 ): Observable<void> { 273 - const { requestBody, parameter } = data; 274 250 return __request(OpenAPI, this.http, { 275 251 method: 'GET', 276 252 url: '/api/v{api-version}/parameters/', 277 253 query: { 278 - parameter, 254 + parameter: data.parameter, 279 255 }, 280 256 body: requestBody, 281 257 mediaType: 'application/json', ··· 291 267 public postCallWithOptionalParam( 292 268 data: $OpenApiTs['/api/v{api-version}/parameters/']['post']['req'], 293 269 ): Observable<void> { 294 - const { parameter, requestBody } = data; 295 270 return __request(OpenAPI, this.http, { 296 271 method: 'POST', 297 272 url: '/api/v{api-version}/parameters/', 298 273 query: { 299 - parameter, 274 + parameter: data.parameter, 300 275 }, 301 276 body: requestBody, 302 277 mediaType: 'application/json', ··· 326 301 public callWithDescriptions( 327 302 data: $OpenApiTs['/api/v{api-version}/descriptions/']['post']['req'] = {}, 328 303 ): Observable<void> { 329 - const { 330 - parameterWithBreaks, 331 - parameterWithBackticks, 332 - parameterWithSlashes, 333 - parameterWithExpressionPlaceholders, 334 - parameterWithQuotes, 335 - parameterWithReservedCharacters, 336 - } = data; 337 304 return __request(OpenAPI, this.http, { 338 305 method: 'POST', 339 306 url: '/api/v{api-version}/descriptions/', 340 307 query: { 341 - parameterWithBreaks, 342 - parameterWithBackticks, 343 - parameterWithSlashes, 344 - parameterWithExpressionPlaceholders, 345 - parameterWithQuotes, 346 - parameterWithReservedCharacters, 308 + parameterWithBreaks: data.parameterWithBreaks, 309 + parameterWithBackticks: data.parameterWithBackticks, 310 + parameterWithSlashes: data.parameterWithSlashes, 311 + parameterWithExpressionPlaceholders: 312 + data.parameterWithExpressionPlaceholders, 313 + parameterWithQuotes: data.parameterWithQuotes, 314 + parameterWithReservedCharacters: data.parameterWithReservedCharacters, 347 315 }, 348 316 }); 349 317 } ··· 364 332 public deprecatedCall( 365 333 data: $OpenApiTs['/api/v{api-version}/parameters/deprecated']['post']['req'], 366 334 ): Observable<void> { 367 - const { parameter } = data; 368 335 return __request(OpenAPI, this.http, { 369 336 method: 'POST', 370 337 url: '/api/v{api-version}/parameters/deprecated', 371 338 headers: { 372 - parameter, 339 + parameter: data.parameter, 373 340 }, 374 341 }); 375 342 } ··· 390 357 public postApiRequestBody( 391 358 data: $OpenApiTs['/api/v{api-version}/requestBody/']['post']['req'] = {}, 392 359 ): Observable<void> { 393 - const { parameter, foo } = data; 394 360 return __request(OpenAPI, this.http, { 395 361 method: 'POST', 396 362 url: '/api/v{api-version}/requestBody/', 397 363 query: { 398 - parameter, 364 + parameter: data.parameter, 399 365 }, 400 366 body: foo, 401 367 mediaType: 'application/json', ··· 418 384 public postApiFormData( 419 385 data: $OpenApiTs['/api/v{api-version}/formData/']['post']['req'] = {}, 420 386 ): Observable<void> { 421 - const { parameter, formData } = data; 422 387 return __request(OpenAPI, this.http, { 423 388 method: 'POST', 424 389 url: '/api/v{api-version}/formData/', 425 390 query: { 426 - parameter, 391 + parameter: data.parameter, 427 392 }, 428 393 formData, 429 394 mediaType: 'multipart/form-data', ··· 449 414 public callWithDefaultParameters( 450 415 data: $OpenApiTs['/api/v{api-version}/defaults']['get']['req'] = {}, 451 416 ): Observable<void> { 452 - const { 453 - parameterString, 454 - parameterNumber, 455 - parameterBoolean, 456 - parameterEnum, 457 - parameterModel, 458 - } = data; 459 417 return __request(OpenAPI, this.http, { 460 418 method: 'GET', 461 419 url: '/api/v{api-version}/defaults', 462 420 query: { 463 - parameterString, 464 - parameterNumber, 465 - parameterBoolean, 466 - parameterEnum, 467 - parameterModel, 421 + parameterString: data.parameterString, 422 + parameterNumber: data.parameterNumber, 423 + parameterBoolean: data.parameterBoolean, 424 + parameterEnum: data.parameterEnum, 425 + parameterModel: data.parameterModel, 468 426 }, 469 427 }); 470 428 } ··· 481 439 public callWithDefaultOptionalParameters( 482 440 data: $OpenApiTs['/api/v{api-version}/defaults']['post']['req'] = {}, 483 441 ): Observable<void> { 484 - const { 485 - parameterString, 486 - parameterNumber, 487 - parameterBoolean, 488 - parameterEnum, 489 - parameterModel, 490 - } = data; 491 442 return __request(OpenAPI, this.http, { 492 443 method: 'POST', 493 444 url: '/api/v{api-version}/defaults', 494 445 query: { 495 - parameterString, 496 - parameterNumber, 497 - parameterBoolean, 498 - parameterEnum, 499 - parameterModel, 446 + parameterString: data.parameterString, 447 + parameterNumber: data.parameterNumber, 448 + parameterBoolean: data.parameterBoolean, 449 + parameterEnum: data.parameterEnum, 450 + parameterModel: data.parameterModel, 500 451 }, 501 452 }); 502 453 } ··· 516 467 public callToTestOrderOfParams( 517 468 data: $OpenApiTs['/api/v{api-version}/defaults']['put']['req'], 518 469 ): Observable<void> { 519 - const { 520 - parameterStringWithNoDefault, 521 - parameterOptionalStringWithDefault, 522 - parameterOptionalStringWithEmptyDefault, 523 - parameterOptionalStringWithNoDefault, 524 - parameterStringWithDefault, 525 - parameterStringWithEmptyDefault, 526 - parameterStringNullableWithNoDefault, 527 - parameterStringNullableWithDefault, 528 - } = data; 529 470 return __request(OpenAPI, this.http, { 530 471 method: 'PUT', 531 472 url: '/api/v{api-version}/defaults', 532 473 query: { 533 - parameterOptionalStringWithDefault, 534 - parameterOptionalStringWithEmptyDefault, 535 - parameterOptionalStringWithNoDefault, 536 - parameterStringWithDefault, 537 - parameterStringWithEmptyDefault, 538 - parameterStringWithNoDefault, 539 - parameterStringNullableWithNoDefault, 540 - parameterStringNullableWithDefault, 474 + parameterOptionalStringWithDefault: 475 + data.parameterOptionalStringWithDefault, 476 + parameterOptionalStringWithEmptyDefault: 477 + data.parameterOptionalStringWithEmptyDefault, 478 + parameterOptionalStringWithNoDefault: 479 + data.parameterOptionalStringWithNoDefault, 480 + parameterStringWithDefault: data.parameterStringWithDefault, 481 + parameterStringWithEmptyDefault: data.parameterStringWithEmptyDefault, 482 + parameterStringWithNoDefault: data.parameterStringWithNoDefault, 483 + parameterStringNullableWithNoDefault: 484 + data.parameterStringNullableWithNoDefault, 485 + parameterStringNullableWithDefault: 486 + data.parameterStringNullableWithDefault, 541 487 }, 542 488 }); 543 489 } ··· 806 752 public collectionFormat( 807 753 data: $OpenApiTs['/api/v{api-version}/collectionFormat']['get']['req'], 808 754 ): Observable<void> { 809 - const { 810 - parameterArrayCsv, 811 - parameterArraySsv, 812 - parameterArrayTsv, 813 - parameterArrayPipes, 814 - parameterArrayMulti, 815 - } = data; 816 755 return __request(OpenAPI, this.http, { 817 756 method: 'GET', 818 757 url: '/api/v{api-version}/collectionFormat', 819 758 query: { 820 - parameterArrayCSV: parameterArrayCsv, 821 - parameterArraySSV: parameterArraySsv, 822 - parameterArrayTSV: parameterArrayTsv, 823 - parameterArrayPipes, 824 - parameterArrayMulti, 759 + parameterArrayCSV: data.parameterArrayCsv, 760 + parameterArraySSV: data.parameterArraySsv, 761 + parameterArrayTSV: data.parameterArrayTsv, 762 + parameterArrayPipes: data.parameterArrayPipes, 763 + parameterArrayMulti: data.parameterArrayMulti, 825 764 }, 826 765 }); 827 766 } ··· 857 796 | $OpenApiTs['/api/v{api-version}/types']['get']['res'][202] 858 797 | $OpenApiTs['/api/v{api-version}/types']['get']['res'][203] 859 798 > { 860 - const { 861 - parameterArray, 862 - parameterDictionary, 863 - parameterEnum, 864 - parameterNumber, 865 - parameterString, 866 - parameterBoolean, 867 - parameterObject, 868 - id, 869 - } = data; 870 799 return __request(OpenAPI, this.http, { 871 800 method: 'GET', 872 801 url: '/api/v{api-version}/types', 873 802 path: { 874 - id, 803 + id: data.id, 875 804 }, 876 805 query: { 877 - parameterNumber, 878 - parameterString, 879 - parameterBoolean, 880 - parameterObject, 881 - parameterArray, 882 - parameterDictionary, 883 - parameterEnum, 806 + parameterNumber: data.parameterNumber, 807 + parameterString: data.parameterString, 808 + parameterBoolean: data.parameterBoolean, 809 + parameterObject: data.parameterObject, 810 + parameterArray: data.parameterArray, 811 + parameterDictionary: data.parameterDictionary, 812 + parameterEnum: data.parameterEnum, 884 813 }, 885 814 }); 886 815 } ··· 901 830 public uploadFile( 902 831 data: $OpenApiTs['/api/v{api-version}/upload']['post']['req'], 903 832 ): Observable<$OpenApiTs['/api/v{api-version}/upload']['post']['res'][200]> { 904 - const { file } = data; 905 833 return __request(OpenAPI, this.http, { 906 834 method: 'POST', 907 835 url: '/api/v{api-version}/upload', 908 836 formData: { 909 - file, 837 + file: data.file, 910 838 }, 911 839 }); 912 840 } ··· 929 857 ): Observable< 930 858 $OpenApiTs['/api/v{api-version}/file/{id}']['get']['res'][200] 931 859 > { 932 - const { id } = data; 933 860 return __request(OpenAPI, this.http, { 934 861 method: 'GET', 935 862 url: '/api/v{api-version}/file/{id}', 936 863 path: { 937 - id, 864 + id: data.id, 938 865 }, 939 866 }); 940 867 } ··· 956 883 public complexTypes( 957 884 data: $OpenApiTs['/api/v{api-version}/complex']['get']['req'], 958 885 ): Observable<$OpenApiTs['/api/v{api-version}/complex']['get']['res'][200]> { 959 - const { parameterObject, parameterReference } = data; 960 886 return __request(OpenAPI, this.http, { 961 887 method: 'GET', 962 888 url: '/api/v{api-version}/complex', 963 889 query: { 964 - parameterObject, 965 - parameterReference, 890 + parameterObject: data.parameterObject, 891 + parameterReference: data.parameterReference, 966 892 }, 967 893 errors: { 968 894 400: '400 `server` error', ··· 983 909 ): Observable< 984 910 $OpenApiTs['/api/v{api-version}/complex/{id}']['put']['res'][200] 985 911 > { 986 - const { id, requestBody } = data; 987 912 return __request(OpenAPI, this.http, { 988 913 method: 'PUT', 989 914 url: '/api/v{api-version}/complex/{id}', 990 915 path: { 991 - id, 916 + id: data.id, 992 917 }, 993 918 body: requestBody, 994 919 mediaType: 'application/json-patch+json', ··· 1010 935 public multipartRequest( 1011 936 data: $OpenApiTs['/api/v{api-version}/multipart']['post']['req'] = {}, 1012 937 ): Observable<void> { 1013 - const { formData } = data; 1014 938 return __request(OpenAPI, this.http, { 1015 939 method: 'POST', 1016 940 url: '/api/v{api-version}/multipart', ··· 1073 997 public testErrorCode( 1074 998 data: $OpenApiTs['/api/v{api-version}/error']['post']['req'], 1075 999 ): Observable<$OpenApiTs['/api/v{api-version}/error']['post']['res'][200]> { 1076 - const { status } = data; 1077 1000 return __request(OpenAPI, this.http, { 1078 1001 method: 'POST', 1079 1002 url: '/api/v{api-version}/error', 1080 1003 query: { 1081 - status, 1004 + status: data.status, 1082 1005 }, 1083 1006 errors: { 1084 1007 500: 'Custom message: Internal Server Error', ··· 1107 1030 ): Observable< 1108 1031 $OpenApiTs['/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串']['post']['res'][200] 1109 1032 > { 1110 - const { nonAsciiParamæøåÆøÅöôêÊ } = data; 1111 1033 return __request(OpenAPI, this.http, { 1112 1034 method: 'POST', 1113 1035 url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', 1114 1036 query: { 1115 - nonAsciiParamæøåÆØÅöôêÊ: nonAsciiParamæøåÆøÅöôêÊ, 1037 + nonAsciiParamæøåÆØÅöôêÊ: data.nonAsciiParamæøåÆøÅöôêÊ, 1116 1038 }, 1117 1039 }); 1118 1040 }
+72 -150
packages/openapi-ts/test/__snapshots__/test/generated/v3_client/services.gen.ts.snap
··· 28 28 ): CancelablePromise< 29 29 $OpenApiTs['/api/v{api-version}/no-tag']['post']['res'][200] 30 30 > { 31 - const { requestBody } = data; 32 31 return this.httpRequest.request({ 33 32 method: 'POST', 34 33 url: '/api/v{api-version}/no-tag', ··· 137 136 public deleteFoo( 138 137 data: $OpenApiTs['/api/v{api-version}/foo/{foo}/bar/{bar}']['delete']['req'], 139 138 ): CancelablePromise<void> { 140 - const { foo, bar } = data; 141 139 return this.httpRequest.request({ 142 140 method: 'DELETE', 143 141 url: '/api/v{api-version}/foo/{foo}/bar/{bar}', 144 142 path: { 145 - foo, 146 - bar, 143 + foo: data.foo, 144 + bar: data.bar, 147 145 }, 148 146 }); 149 147 } ··· 163 161 public callWithParameters( 164 162 data: $OpenApiTs['/api/v{api-version}/parameters/{parameterPath}']['post']['req'], 165 163 ): CancelablePromise<void> { 166 - const { 167 - parameterHeader, 168 - fooAllOfEnum, 169 - parameterQuery, 170 - parameterForm, 171 - parameterCookie, 172 - parameterPath, 173 - requestBody, 174 - fooRefEnum, 175 - } = data; 176 164 return this.httpRequest.request({ 177 165 method: 'POST', 178 166 url: '/api/v{api-version}/parameters/{parameterPath}', 179 167 path: { 180 - parameterPath, 168 + parameterPath: data.parameterPath, 181 169 }, 182 170 cookies: { 183 - parameterCookie, 171 + parameterCookie: data.parameterCookie, 184 172 }, 185 173 headers: { 186 - parameterHeader, 174 + parameterHeader: data.parameterHeader, 187 175 }, 188 176 query: { 189 - foo_ref_enum: fooRefEnum, 190 - foo_all_of_enum: fooAllOfEnum, 191 - parameterQuery, 177 + foo_ref_enum: data.fooRefEnum, 178 + foo_all_of_enum: data.fooAllOfEnum, 179 + parameterQuery: data.parameterQuery, 192 180 }, 193 181 formData: { 194 - parameterForm, 182 + parameterForm: data.parameterForm, 195 183 }, 196 184 body: requestBody, 197 185 mediaType: 'application/json', ··· 214 202 public callWithWeirdParameterNames( 215 203 data: $OpenApiTs['/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}']['post']['req'], 216 204 ): CancelablePromise<void> { 217 - const { 218 - parameterHeader, 219 - parameterQuery, 220 - parameterForm, 221 - parameterCookie, 222 - requestBody, 223 - parameterPath1, 224 - parameterPath2, 225 - parameterPath3, 226 - _default, 227 - } = data; 228 205 return this.httpRequest.request({ 229 206 method: 'POST', 230 207 url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', 231 208 path: { 232 - 'parameter.path.1': parameterPath1, 233 - 'parameter-path-2': parameterPath2, 234 - 'PARAMETER-PATH-3': parameterPath3, 209 + 'parameter.path.1': data.parameterPath1, 210 + 'parameter-path-2': data.parameterPath2, 211 + 'PARAMETER-PATH-3': data.parameterPath3, 235 212 }, 236 213 cookies: { 237 - 'PARAMETER-COOKIE': parameterCookie, 214 + 'PARAMETER-COOKIE': data.parameterCookie, 238 215 }, 239 216 headers: { 240 - 'parameter.header': parameterHeader, 217 + 'parameter.header': data.parameterHeader, 241 218 }, 242 219 query: { 243 - default: _default, 244 - 'parameter-query': parameterQuery, 220 + default: data._default, 221 + 'parameter-query': data.parameterQuery, 245 222 }, 246 223 formData: { 247 - parameter_form: parameterForm, 224 + parameter_form: data.parameterForm, 248 225 }, 249 226 body: requestBody, 250 227 mediaType: 'application/json', ··· 260 237 public getCallWithOptionalParam( 261 238 data: $OpenApiTs['/api/v{api-version}/parameters/']['get']['req'], 262 239 ): CancelablePromise<void> { 263 - const { requestBody, parameter } = data; 264 240 return this.httpRequest.request({ 265 241 method: 'GET', 266 242 url: '/api/v{api-version}/parameters/', 267 243 query: { 268 - parameter, 244 + parameter: data.parameter, 269 245 }, 270 246 body: requestBody, 271 247 mediaType: 'application/json', ··· 281 257 public postCallWithOptionalParam( 282 258 data: $OpenApiTs['/api/v{api-version}/parameters/']['post']['req'], 283 259 ): CancelablePromise<void> { 284 - const { parameter, requestBody } = data; 285 260 return this.httpRequest.request({ 286 261 method: 'POST', 287 262 url: '/api/v{api-version}/parameters/', 288 263 query: { 289 - parameter, 264 + parameter: data.parameter, 290 265 }, 291 266 body: requestBody, 292 267 mediaType: 'application/json', ··· 313 288 public callWithDescriptions( 314 289 data: $OpenApiTs['/api/v{api-version}/descriptions/']['post']['req'] = {}, 315 290 ): CancelablePromise<void> { 316 - const { 317 - parameterWithBreaks, 318 - parameterWithBackticks, 319 - parameterWithSlashes, 320 - parameterWithExpressionPlaceholders, 321 - parameterWithQuotes, 322 - parameterWithReservedCharacters, 323 - } = data; 324 291 return this.httpRequest.request({ 325 292 method: 'POST', 326 293 url: '/api/v{api-version}/descriptions/', 327 294 query: { 328 - parameterWithBreaks, 329 - parameterWithBackticks, 330 - parameterWithSlashes, 331 - parameterWithExpressionPlaceholders, 332 - parameterWithQuotes, 333 - parameterWithReservedCharacters, 295 + parameterWithBreaks: data.parameterWithBreaks, 296 + parameterWithBackticks: data.parameterWithBackticks, 297 + parameterWithSlashes: data.parameterWithSlashes, 298 + parameterWithExpressionPlaceholders: 299 + data.parameterWithExpressionPlaceholders, 300 + parameterWithQuotes: data.parameterWithQuotes, 301 + parameterWithReservedCharacters: data.parameterWithReservedCharacters, 334 302 }, 335 303 }); 336 304 } ··· 348 316 public deprecatedCall( 349 317 data: $OpenApiTs['/api/v{api-version}/parameters/deprecated']['post']['req'], 350 318 ): CancelablePromise<void> { 351 - const { parameter } = data; 352 319 return this.httpRequest.request({ 353 320 method: 'POST', 354 321 url: '/api/v{api-version}/parameters/deprecated', 355 322 headers: { 356 - parameter, 323 + parameter: data.parameter, 357 324 }, 358 325 }); 359 326 } ··· 371 338 public postApiRequestBody( 372 339 data: $OpenApiTs['/api/v{api-version}/requestBody/']['post']['req'] = {}, 373 340 ): CancelablePromise<void> { 374 - const { parameter, foo } = data; 375 341 return this.httpRequest.request({ 376 342 method: 'POST', 377 343 url: '/api/v{api-version}/requestBody/', 378 344 query: { 379 - parameter, 345 + parameter: data.parameter, 380 346 }, 381 347 body: foo, 382 348 mediaType: 'application/json', ··· 396 362 public postApiFormData( 397 363 data: $OpenApiTs['/api/v{api-version}/formData/']['post']['req'] = {}, 398 364 ): CancelablePromise<void> { 399 - const { parameter, formData } = data; 400 365 return this.httpRequest.request({ 401 366 method: 'POST', 402 367 url: '/api/v{api-version}/formData/', 403 368 query: { 404 - parameter, 369 + parameter: data.parameter, 405 370 }, 406 371 formData, 407 372 mediaType: 'multipart/form-data', ··· 424 389 public callWithDefaultParameters( 425 390 data: $OpenApiTs['/api/v{api-version}/defaults']['get']['req'] = {}, 426 391 ): CancelablePromise<void> { 427 - const { 428 - parameterString, 429 - parameterNumber, 430 - parameterBoolean, 431 - parameterEnum, 432 - parameterModel, 433 - } = data; 434 392 return this.httpRequest.request({ 435 393 method: 'GET', 436 394 url: '/api/v{api-version}/defaults', 437 395 query: { 438 - parameterString, 439 - parameterNumber, 440 - parameterBoolean, 441 - parameterEnum, 442 - parameterModel, 396 + parameterString: data.parameterString, 397 + parameterNumber: data.parameterNumber, 398 + parameterBoolean: data.parameterBoolean, 399 + parameterEnum: data.parameterEnum, 400 + parameterModel: data.parameterModel, 443 401 }, 444 402 }); 445 403 } ··· 456 414 public callWithDefaultOptionalParameters( 457 415 data: $OpenApiTs['/api/v{api-version}/defaults']['post']['req'] = {}, 458 416 ): CancelablePromise<void> { 459 - const { 460 - parameterString, 461 - parameterNumber, 462 - parameterBoolean, 463 - parameterEnum, 464 - parameterModel, 465 - } = data; 466 417 return this.httpRequest.request({ 467 418 method: 'POST', 468 419 url: '/api/v{api-version}/defaults', 469 420 query: { 470 - parameterString, 471 - parameterNumber, 472 - parameterBoolean, 473 - parameterEnum, 474 - parameterModel, 421 + parameterString: data.parameterString, 422 + parameterNumber: data.parameterNumber, 423 + parameterBoolean: data.parameterBoolean, 424 + parameterEnum: data.parameterEnum, 425 + parameterModel: data.parameterModel, 475 426 }, 476 427 }); 477 428 } ··· 491 442 public callToTestOrderOfParams( 492 443 data: $OpenApiTs['/api/v{api-version}/defaults']['put']['req'], 493 444 ): CancelablePromise<void> { 494 - const { 495 - parameterStringWithNoDefault, 496 - parameterOptionalStringWithDefault, 497 - parameterOptionalStringWithEmptyDefault, 498 - parameterOptionalStringWithNoDefault, 499 - parameterStringWithDefault, 500 - parameterStringWithEmptyDefault, 501 - parameterStringNullableWithNoDefault, 502 - parameterStringNullableWithDefault, 503 - } = data; 504 445 return this.httpRequest.request({ 505 446 method: 'PUT', 506 447 url: '/api/v{api-version}/defaults', 507 448 query: { 508 - parameterOptionalStringWithDefault, 509 - parameterOptionalStringWithEmptyDefault, 510 - parameterOptionalStringWithNoDefault, 511 - parameterStringWithDefault, 512 - parameterStringWithEmptyDefault, 513 - parameterStringWithNoDefault, 514 - parameterStringNullableWithNoDefault, 515 - parameterStringNullableWithDefault, 449 + parameterOptionalStringWithDefault: 450 + data.parameterOptionalStringWithDefault, 451 + parameterOptionalStringWithEmptyDefault: 452 + data.parameterOptionalStringWithEmptyDefault, 453 + parameterOptionalStringWithNoDefault: 454 + data.parameterOptionalStringWithNoDefault, 455 + parameterStringWithDefault: data.parameterStringWithDefault, 456 + parameterStringWithEmptyDefault: data.parameterStringWithEmptyDefault, 457 + parameterStringWithNoDefault: data.parameterStringWithNoDefault, 458 + parameterStringNullableWithNoDefault: 459 + data.parameterStringNullableWithNoDefault, 460 + parameterStringNullableWithDefault: 461 + data.parameterStringNullableWithDefault, 516 462 }, 517 463 }); 518 464 } ··· 760 706 public collectionFormat( 761 707 data: $OpenApiTs['/api/v{api-version}/collectionFormat']['get']['req'], 762 708 ): CancelablePromise<void> { 763 - const { 764 - parameterArrayCsv, 765 - parameterArraySsv, 766 - parameterArrayTsv, 767 - parameterArrayPipes, 768 - parameterArrayMulti, 769 - } = data; 770 709 return this.httpRequest.request({ 771 710 method: 'GET', 772 711 url: '/api/v{api-version}/collectionFormat', 773 712 query: { 774 - parameterArrayCSV: parameterArrayCsv, 775 - parameterArraySSV: parameterArraySsv, 776 - parameterArrayTSV: parameterArrayTsv, 777 - parameterArrayPipes, 778 - parameterArrayMulti, 713 + parameterArrayCSV: data.parameterArrayCsv, 714 + parameterArraySSV: data.parameterArraySsv, 715 + parameterArrayTSV: data.parameterArrayTsv, 716 + parameterArrayPipes: data.parameterArrayPipes, 717 + parameterArrayMulti: data.parameterArrayMulti, 779 718 }, 780 719 }); 781 720 } ··· 808 747 | $OpenApiTs['/api/v{api-version}/types']['get']['res'][202] 809 748 | $OpenApiTs['/api/v{api-version}/types']['get']['res'][203] 810 749 > { 811 - const { 812 - parameterArray, 813 - parameterDictionary, 814 - parameterEnum, 815 - parameterNumber, 816 - parameterString, 817 - parameterBoolean, 818 - parameterObject, 819 - id, 820 - } = data; 821 750 return this.httpRequest.request({ 822 751 method: 'GET', 823 752 url: '/api/v{api-version}/types', 824 753 path: { 825 - id, 754 + id: data.id, 826 755 }, 827 756 query: { 828 - parameterNumber, 829 - parameterString, 830 - parameterBoolean, 831 - parameterObject, 832 - parameterArray, 833 - parameterDictionary, 834 - parameterEnum, 757 + parameterNumber: data.parameterNumber, 758 + parameterString: data.parameterString, 759 + parameterBoolean: data.parameterBoolean, 760 + parameterObject: data.parameterObject, 761 + parameterArray: data.parameterArray, 762 + parameterDictionary: data.parameterDictionary, 763 + parameterEnum: data.parameterEnum, 835 764 }, 836 765 }); 837 766 } ··· 851 780 ): CancelablePromise< 852 781 $OpenApiTs['/api/v{api-version}/upload']['post']['res'][200] 853 782 > { 854 - const { file } = data; 855 783 return this.httpRequest.request({ 856 784 method: 'POST', 857 785 url: '/api/v{api-version}/upload', 858 786 formData: { 859 - file, 787 + file: data.file, 860 788 }, 861 789 }); 862 790 } ··· 876 804 ): CancelablePromise< 877 805 $OpenApiTs['/api/v{api-version}/file/{id}']['get']['res'][200] 878 806 > { 879 - const { id } = data; 880 807 return this.httpRequest.request({ 881 808 method: 'GET', 882 809 url: '/api/v{api-version}/file/{id}', 883 810 path: { 884 - id, 811 + id: data.id, 885 812 }, 886 813 }); 887 814 } ··· 902 829 ): CancelablePromise< 903 830 $OpenApiTs['/api/v{api-version}/complex']['get']['res'][200] 904 831 > { 905 - const { parameterObject, parameterReference } = data; 906 832 return this.httpRequest.request({ 907 833 method: 'GET', 908 834 url: '/api/v{api-version}/complex', 909 835 query: { 910 - parameterObject, 911 - parameterReference, 836 + parameterObject: data.parameterObject, 837 + parameterReference: data.parameterReference, 912 838 }, 913 839 errors: { 914 840 400: '400 `server` error', ··· 929 855 ): CancelablePromise< 930 856 $OpenApiTs['/api/v{api-version}/complex/{id}']['put']['res'][200] 931 857 > { 932 - const { id, requestBody } = data; 933 858 return this.httpRequest.request({ 934 859 method: 'PUT', 935 860 url: '/api/v{api-version}/complex/{id}', 936 861 path: { 937 - id, 862 + id: data.id, 938 863 }, 939 864 body: requestBody, 940 865 mediaType: 'application/json-patch+json', ··· 953 878 public multipartRequest( 954 879 data: $OpenApiTs['/api/v{api-version}/multipart']['post']['req'] = {}, 955 880 ): CancelablePromise<void> { 956 - const { formData } = data; 957 881 return this.httpRequest.request({ 958 882 method: 'POST', 959 883 url: '/api/v{api-version}/multipart', ··· 1012 936 ): CancelablePromise< 1013 937 $OpenApiTs['/api/v{api-version}/error']['post']['res'][200] 1014 938 > { 1015 - const { status } = data; 1016 939 return this.httpRequest.request({ 1017 940 method: 'POST', 1018 941 url: '/api/v{api-version}/error', 1019 942 query: { 1020 - status, 943 + status: data.status, 1021 944 }, 1022 945 errors: { 1023 946 500: 'Custom message: Internal Server Error', ··· 1043 966 ): CancelablePromise< 1044 967 $OpenApiTs['/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串']['post']['res'][200] 1045 968 > { 1046 - const { nonAsciiParamæøåÆøÅöôêÊ } = data; 1047 969 return this.httpRequest.request({ 1048 970 method: 'POST', 1049 971 url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', 1050 972 query: { 1051 - nonAsciiParamæøåÆØÅöôêÊ: nonAsciiParamæøåÆøÅöôêÊ, 973 + nonAsciiParamæøåÆØÅöôêÊ: data.nonAsciiParamæøåÆøÅöôêÊ, 1052 974 }, 1053 975 }); 1054 976 }
+72 -150
packages/openapi-ts/test/__snapshots__/test/generated/v3_enums_typescript/services.gen.ts.snap
··· 27 27 ): CancelablePromise< 28 28 $OpenApiTs['/api/v{api-version}/no-tag']['post']['res'][200] 29 29 > { 30 - const { requestBody } = data; 31 30 return __request(OpenAPI, { 32 31 method: 'POST', 33 32 url: '/api/v{api-version}/no-tag', ··· 132 131 public static deleteFoo( 133 132 data: $OpenApiTs['/api/v{api-version}/foo/{foo}/bar/{bar}']['delete']['req'], 134 133 ): CancelablePromise<void> { 135 - const { foo, bar } = data; 136 134 return __request(OpenAPI, { 137 135 method: 'DELETE', 138 136 url: '/api/v{api-version}/foo/{foo}/bar/{bar}', 139 137 path: { 140 - foo, 141 - bar, 138 + foo: data.foo, 139 + bar: data.bar, 142 140 }, 143 141 }); 144 142 } ··· 158 156 public static callWithParameters( 159 157 data: $OpenApiTs['/api/v{api-version}/parameters/{parameterPath}']['post']['req'], 160 158 ): CancelablePromise<void> { 161 - const { 162 - parameterHeader, 163 - fooAllOfEnum, 164 - parameterQuery, 165 - parameterForm, 166 - parameterCookie, 167 - parameterPath, 168 - requestBody, 169 - fooRefEnum, 170 - } = data; 171 159 return __request(OpenAPI, { 172 160 method: 'POST', 173 161 url: '/api/v{api-version}/parameters/{parameterPath}', 174 162 path: { 175 - parameterPath, 163 + parameterPath: data.parameterPath, 176 164 }, 177 165 cookies: { 178 - parameterCookie, 166 + parameterCookie: data.parameterCookie, 179 167 }, 180 168 headers: { 181 - parameterHeader, 169 + parameterHeader: data.parameterHeader, 182 170 }, 183 171 query: { 184 - foo_ref_enum: fooRefEnum, 185 - foo_all_of_enum: fooAllOfEnum, 186 - parameterQuery, 172 + foo_ref_enum: data.fooRefEnum, 173 + foo_all_of_enum: data.fooAllOfEnum, 174 + parameterQuery: data.parameterQuery, 187 175 }, 188 176 formData: { 189 - parameterForm, 177 + parameterForm: data.parameterForm, 190 178 }, 191 179 body: requestBody, 192 180 mediaType: 'application/json', ··· 209 197 public static callWithWeirdParameterNames( 210 198 data: $OpenApiTs['/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}']['post']['req'], 211 199 ): CancelablePromise<void> { 212 - const { 213 - parameterHeader, 214 - parameterQuery, 215 - parameterForm, 216 - parameterCookie, 217 - requestBody, 218 - parameterPath1, 219 - parameterPath2, 220 - parameterPath3, 221 - _default, 222 - } = data; 223 200 return __request(OpenAPI, { 224 201 method: 'POST', 225 202 url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', 226 203 path: { 227 - 'parameter.path.1': parameterPath1, 228 - 'parameter-path-2': parameterPath2, 229 - 'PARAMETER-PATH-3': parameterPath3, 204 + 'parameter.path.1': data.parameterPath1, 205 + 'parameter-path-2': data.parameterPath2, 206 + 'PARAMETER-PATH-3': data.parameterPath3, 230 207 }, 231 208 cookies: { 232 - 'PARAMETER-COOKIE': parameterCookie, 209 + 'PARAMETER-COOKIE': data.parameterCookie, 233 210 }, 234 211 headers: { 235 - 'parameter.header': parameterHeader, 212 + 'parameter.header': data.parameterHeader, 236 213 }, 237 214 query: { 238 - default: _default, 239 - 'parameter-query': parameterQuery, 215 + default: data._default, 216 + 'parameter-query': data.parameterQuery, 240 217 }, 241 218 formData: { 242 - parameter_form: parameterForm, 219 + parameter_form: data.parameterForm, 243 220 }, 244 221 body: requestBody, 245 222 mediaType: 'application/json', ··· 255 232 public static getCallWithOptionalParam( 256 233 data: $OpenApiTs['/api/v{api-version}/parameters/']['get']['req'], 257 234 ): CancelablePromise<void> { 258 - const { requestBody, parameter } = data; 259 235 return __request(OpenAPI, { 260 236 method: 'GET', 261 237 url: '/api/v{api-version}/parameters/', 262 238 query: { 263 - parameter, 239 + parameter: data.parameter, 264 240 }, 265 241 body: requestBody, 266 242 mediaType: 'application/json', ··· 276 252 public static postCallWithOptionalParam( 277 253 data: $OpenApiTs['/api/v{api-version}/parameters/']['post']['req'], 278 254 ): CancelablePromise<void> { 279 - const { parameter, requestBody } = data; 280 255 return __request(OpenAPI, { 281 256 method: 'POST', 282 257 url: '/api/v{api-version}/parameters/', 283 258 query: { 284 - parameter, 259 + parameter: data.parameter, 285 260 }, 286 261 body: requestBody, 287 262 mediaType: 'application/json', ··· 306 281 public static callWithDescriptions( 307 282 data: $OpenApiTs['/api/v{api-version}/descriptions/']['post']['req'] = {}, 308 283 ): CancelablePromise<void> { 309 - const { 310 - parameterWithBreaks, 311 - parameterWithBackticks, 312 - parameterWithSlashes, 313 - parameterWithExpressionPlaceholders, 314 - parameterWithQuotes, 315 - parameterWithReservedCharacters, 316 - } = data; 317 284 return __request(OpenAPI, { 318 285 method: 'POST', 319 286 url: '/api/v{api-version}/descriptions/', 320 287 query: { 321 - parameterWithBreaks, 322 - parameterWithBackticks, 323 - parameterWithSlashes, 324 - parameterWithExpressionPlaceholders, 325 - parameterWithQuotes, 326 - parameterWithReservedCharacters, 288 + parameterWithBreaks: data.parameterWithBreaks, 289 + parameterWithBackticks: data.parameterWithBackticks, 290 + parameterWithSlashes: data.parameterWithSlashes, 291 + parameterWithExpressionPlaceholders: 292 + data.parameterWithExpressionPlaceholders, 293 + parameterWithQuotes: data.parameterWithQuotes, 294 + parameterWithReservedCharacters: data.parameterWithReservedCharacters, 327 295 }, 328 296 }); 329 297 } ··· 339 307 public static deprecatedCall( 340 308 data: $OpenApiTs['/api/v{api-version}/parameters/deprecated']['post']['req'], 341 309 ): CancelablePromise<void> { 342 - const { parameter } = data; 343 310 return __request(OpenAPI, { 344 311 method: 'POST', 345 312 url: '/api/v{api-version}/parameters/deprecated', 346 313 headers: { 347 - parameter, 314 + parameter: data.parameter, 348 315 }, 349 316 }); 350 317 } ··· 360 327 public static postApiRequestBody( 361 328 data: $OpenApiTs['/api/v{api-version}/requestBody/']['post']['req'] = {}, 362 329 ): CancelablePromise<void> { 363 - const { parameter, foo } = data; 364 330 return __request(OpenAPI, { 365 331 method: 'POST', 366 332 url: '/api/v{api-version}/requestBody/', 367 333 query: { 368 - parameter, 334 + parameter: data.parameter, 369 335 }, 370 336 body: foo, 371 337 mediaType: 'application/json', ··· 383 349 public static postApiFormData( 384 350 data: $OpenApiTs['/api/v{api-version}/formData/']['post']['req'] = {}, 385 351 ): CancelablePromise<void> { 386 - const { parameter, formData } = data; 387 352 return __request(OpenAPI, { 388 353 method: 'POST', 389 354 url: '/api/v{api-version}/formData/', 390 355 query: { 391 - parameter, 356 + parameter: data.parameter, 392 357 }, 393 358 formData, 394 359 mediaType: 'multipart/form-data', ··· 409 374 public static callWithDefaultParameters( 410 375 data: $OpenApiTs['/api/v{api-version}/defaults']['get']['req'] = {}, 411 376 ): CancelablePromise<void> { 412 - const { 413 - parameterString, 414 - parameterNumber, 415 - parameterBoolean, 416 - parameterEnum, 417 - parameterModel, 418 - } = data; 419 377 return __request(OpenAPI, { 420 378 method: 'GET', 421 379 url: '/api/v{api-version}/defaults', 422 380 query: { 423 - parameterString, 424 - parameterNumber, 425 - parameterBoolean, 426 - parameterEnum, 427 - parameterModel, 381 + parameterString: data.parameterString, 382 + parameterNumber: data.parameterNumber, 383 + parameterBoolean: data.parameterBoolean, 384 + parameterEnum: data.parameterEnum, 385 + parameterModel: data.parameterModel, 428 386 }, 429 387 }); 430 388 } ··· 441 399 public static callWithDefaultOptionalParameters( 442 400 data: $OpenApiTs['/api/v{api-version}/defaults']['post']['req'] = {}, 443 401 ): CancelablePromise<void> { 444 - const { 445 - parameterString, 446 - parameterNumber, 447 - parameterBoolean, 448 - parameterEnum, 449 - parameterModel, 450 - } = data; 451 402 return __request(OpenAPI, { 452 403 method: 'POST', 453 404 url: '/api/v{api-version}/defaults', 454 405 query: { 455 - parameterString, 456 - parameterNumber, 457 - parameterBoolean, 458 - parameterEnum, 459 - parameterModel, 406 + parameterString: data.parameterString, 407 + parameterNumber: data.parameterNumber, 408 + parameterBoolean: data.parameterBoolean, 409 + parameterEnum: data.parameterEnum, 410 + parameterModel: data.parameterModel, 460 411 }, 461 412 }); 462 413 } ··· 476 427 public static callToTestOrderOfParams( 477 428 data: $OpenApiTs['/api/v{api-version}/defaults']['put']['req'], 478 429 ): CancelablePromise<void> { 479 - const { 480 - parameterStringWithNoDefault, 481 - parameterOptionalStringWithDefault, 482 - parameterOptionalStringWithEmptyDefault, 483 - parameterOptionalStringWithNoDefault, 484 - parameterStringWithDefault, 485 - parameterStringWithEmptyDefault, 486 - parameterStringNullableWithNoDefault, 487 - parameterStringNullableWithDefault, 488 - } = data; 489 430 return __request(OpenAPI, { 490 431 method: 'PUT', 491 432 url: '/api/v{api-version}/defaults', 492 433 query: { 493 - parameterOptionalStringWithDefault, 494 - parameterOptionalStringWithEmptyDefault, 495 - parameterOptionalStringWithNoDefault, 496 - parameterStringWithDefault, 497 - parameterStringWithEmptyDefault, 498 - parameterStringWithNoDefault, 499 - parameterStringNullableWithNoDefault, 500 - parameterStringNullableWithDefault, 434 + parameterOptionalStringWithDefault: 435 + data.parameterOptionalStringWithDefault, 436 + parameterOptionalStringWithEmptyDefault: 437 + data.parameterOptionalStringWithEmptyDefault, 438 + parameterOptionalStringWithNoDefault: 439 + data.parameterOptionalStringWithNoDefault, 440 + parameterStringWithDefault: data.parameterStringWithDefault, 441 + parameterStringWithEmptyDefault: data.parameterStringWithEmptyDefault, 442 + parameterStringWithNoDefault: data.parameterStringWithNoDefault, 443 + parameterStringNullableWithNoDefault: 444 + data.parameterStringNullableWithNoDefault, 445 + parameterStringNullableWithDefault: 446 + data.parameterStringNullableWithDefault, 501 447 }, 502 448 }); 503 449 } ··· 731 677 public static collectionFormat( 732 678 data: $OpenApiTs['/api/v{api-version}/collectionFormat']['get']['req'], 733 679 ): CancelablePromise<void> { 734 - const { 735 - parameterArrayCsv, 736 - parameterArraySsv, 737 - parameterArrayTsv, 738 - parameterArrayPipes, 739 - parameterArrayMulti, 740 - } = data; 741 680 return __request(OpenAPI, { 742 681 method: 'GET', 743 682 url: '/api/v{api-version}/collectionFormat', 744 683 query: { 745 - parameterArrayCSV: parameterArrayCsv, 746 - parameterArraySSV: parameterArraySsv, 747 - parameterArrayTSV: parameterArrayTsv, 748 - parameterArrayPipes, 749 - parameterArrayMulti, 684 + parameterArrayCSV: data.parameterArrayCsv, 685 + parameterArraySSV: data.parameterArraySsv, 686 + parameterArrayTSV: data.parameterArrayTsv, 687 + parameterArrayPipes: data.parameterArrayPipes, 688 + parameterArrayMulti: data.parameterArrayMulti, 750 689 }, 751 690 }); 752 691 } ··· 777 716 | $OpenApiTs['/api/v{api-version}/types']['get']['res'][202] 778 717 | $OpenApiTs['/api/v{api-version}/types']['get']['res'][203] 779 718 > { 780 - const { 781 - parameterArray, 782 - parameterDictionary, 783 - parameterEnum, 784 - parameterNumber, 785 - parameterString, 786 - parameterBoolean, 787 - parameterObject, 788 - id, 789 - } = data; 790 719 return __request(OpenAPI, { 791 720 method: 'GET', 792 721 url: '/api/v{api-version}/types', 793 722 path: { 794 - id, 723 + id: data.id, 795 724 }, 796 725 query: { 797 - parameterNumber, 798 - parameterString, 799 - parameterBoolean, 800 - parameterObject, 801 - parameterArray, 802 - parameterDictionary, 803 - parameterEnum, 726 + parameterNumber: data.parameterNumber, 727 + parameterString: data.parameterString, 728 + parameterBoolean: data.parameterBoolean, 729 + parameterObject: data.parameterObject, 730 + parameterArray: data.parameterArray, 731 + parameterDictionary: data.parameterDictionary, 732 + parameterEnum: data.parameterEnum, 804 733 }, 805 734 }); 806 735 } ··· 818 747 ): CancelablePromise< 819 748 $OpenApiTs['/api/v{api-version}/upload']['post']['res'][200] 820 749 > { 821 - const { file } = data; 822 750 return __request(OpenAPI, { 823 751 method: 'POST', 824 752 url: '/api/v{api-version}/upload', 825 753 formData: { 826 - file, 754 + file: data.file, 827 755 }, 828 756 }); 829 757 } ··· 841 769 ): CancelablePromise< 842 770 $OpenApiTs['/api/v{api-version}/file/{id}']['get']['res'][200] 843 771 > { 844 - const { id } = data; 845 772 return __request(OpenAPI, { 846 773 method: 'GET', 847 774 url: '/api/v{api-version}/file/{id}', 848 775 path: { 849 - id, 776 + id: data.id, 850 777 }, 851 778 }); 852 779 } ··· 865 792 ): CancelablePromise< 866 793 $OpenApiTs['/api/v{api-version}/complex']['get']['res'][200] 867 794 > { 868 - const { parameterObject, parameterReference } = data; 869 795 return __request(OpenAPI, { 870 796 method: 'GET', 871 797 url: '/api/v{api-version}/complex', 872 798 query: { 873 - parameterObject, 874 - parameterReference, 799 + parameterObject: data.parameterObject, 800 + parameterReference: data.parameterReference, 875 801 }, 876 802 errors: { 877 803 400: '400 `server` error', ··· 892 818 ): CancelablePromise< 893 819 $OpenApiTs['/api/v{api-version}/complex/{id}']['put']['res'][200] 894 820 > { 895 - const { id, requestBody } = data; 896 821 return __request(OpenAPI, { 897 822 method: 'PUT', 898 823 url: '/api/v{api-version}/complex/{id}', 899 824 path: { 900 - id, 825 + id: data.id, 901 826 }, 902 827 body: requestBody, 903 828 mediaType: 'application/json-patch+json', ··· 914 839 public static multipartRequest( 915 840 data: $OpenApiTs['/api/v{api-version}/multipart']['post']['req'] = {}, 916 841 ): CancelablePromise<void> { 917 - const { formData } = data; 918 842 return __request(OpenAPI, { 919 843 method: 'POST', 920 844 url: '/api/v{api-version}/multipart', ··· 969 893 ): CancelablePromise< 970 894 $OpenApiTs['/api/v{api-version}/error']['post']['res'][200] 971 895 > { 972 - const { status } = data; 973 896 return __request(OpenAPI, { 974 897 method: 'POST', 975 898 url: '/api/v{api-version}/error', 976 899 query: { 977 - status, 900 + status: data.status, 978 901 }, 979 902 errors: { 980 903 500: 'Custom message: Internal Server Error', ··· 998 921 ): CancelablePromise< 999 922 $OpenApiTs['/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串']['post']['res'][200] 1000 923 > { 1001 - const { nonAsciiParamæøåÆøÅöôêÊ } = data; 1002 924 return __request(OpenAPI, { 1003 925 method: 'POST', 1004 926 url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串', 1005 927 query: { 1006 - nonAsciiParamæøåÆØÅöôêÊ: nonAsciiParamæøåÆøÅöôêÊ, 928 + nonAsciiParamæøåÆØÅöôêÊ: data.nonAsciiParamæøåÆøÅöôêÊ, 1007 929 }, 1008 930 }); 1009 931 }
+23 -42
packages/openapi-ts/test/__snapshots__/test/generated/v3_options/services.gen.ts.snap
··· 18 18 public static callWithDefaultParameters( 19 19 data: $OpenApiTs['/api/v{api-version}/defaults']['get']['req'] = {}, 20 20 ): CancelablePromise<void> { 21 - const { 22 - parameterString, 23 - parameterNumber, 24 - parameterBoolean, 25 - parameterEnum, 26 - parameterModel, 27 - } = data; 28 21 return __request(OpenAPI, { 29 22 method: 'GET', 30 23 url: '/api/v{api-version}/defaults', 31 24 query: { 32 - parameterString, 33 - parameterNumber, 34 - parameterBoolean, 35 - parameterEnum, 36 - parameterModel, 25 + parameterString: data.parameterString, 26 + parameterNumber: data.parameterNumber, 27 + parameterBoolean: data.parameterBoolean, 28 + parameterEnum: data.parameterEnum, 29 + parameterModel: data.parameterModel, 37 30 }, 38 31 }); 39 32 } ··· 50 43 public static callWithDefaultOptionalParameters( 51 44 data: $OpenApiTs['/api/v{api-version}/defaults']['post']['req'] = {}, 52 45 ): CancelablePromise<void> { 53 - const { 54 - parameterString, 55 - parameterNumber, 56 - parameterBoolean, 57 - parameterEnum, 58 - parameterModel, 59 - } = data; 60 46 return __request(OpenAPI, { 61 47 method: 'POST', 62 48 url: '/api/v{api-version}/defaults', 63 49 query: { 64 - parameterString, 65 - parameterNumber, 66 - parameterBoolean, 67 - parameterEnum, 68 - parameterModel, 50 + parameterString: data.parameterString, 51 + parameterNumber: data.parameterNumber, 52 + parameterBoolean: data.parameterBoolean, 53 + parameterEnum: data.parameterEnum, 54 + parameterModel: data.parameterModel, 69 55 }, 70 56 }); 71 57 } ··· 85 71 public static callToTestOrderOfParams( 86 72 data: $OpenApiTs['/api/v{api-version}/defaults']['put']['req'], 87 73 ): CancelablePromise<void> { 88 - const { 89 - parameterStringWithNoDefault, 90 - parameterOptionalStringWithDefault, 91 - parameterOptionalStringWithEmptyDefault, 92 - parameterOptionalStringWithNoDefault, 93 - parameterStringWithDefault, 94 - parameterStringWithEmptyDefault, 95 - parameterStringNullableWithNoDefault, 96 - parameterStringNullableWithDefault, 97 - } = data; 98 74 return __request(OpenAPI, { 99 75 method: 'PUT', 100 76 url: '/api/v{api-version}/defaults', 101 77 query: { 102 - parameterOptionalStringWithDefault, 103 - parameterOptionalStringWithEmptyDefault, 104 - parameterOptionalStringWithNoDefault, 105 - parameterStringWithDefault, 106 - parameterStringWithEmptyDefault, 107 - parameterStringWithNoDefault, 108 - parameterStringNullableWithNoDefault, 109 - parameterStringNullableWithDefault, 78 + parameterOptionalStringWithDefault: 79 + data.parameterOptionalStringWithDefault, 80 + parameterOptionalStringWithEmptyDefault: 81 + data.parameterOptionalStringWithEmptyDefault, 82 + parameterOptionalStringWithNoDefault: 83 + data.parameterOptionalStringWithNoDefault, 84 + parameterStringWithDefault: data.parameterStringWithDefault, 85 + parameterStringWithEmptyDefault: data.parameterStringWithEmptyDefault, 86 + parameterStringWithNoDefault: data.parameterStringWithNoDefault, 87 + parameterStringNullableWithNoDefault: 88 + data.parameterStringNullableWithNoDefault, 89 + parameterStringNullableWithDefault: 90 + data.parameterStringNullableWithDefault, 110 91 }, 111 92 }); 112 93 }
+19 -43
packages/openapi-ts/test/__snapshots__/test/generated/v3_services_name/services.gen.ts.snap
··· 99 99 public static deleteFoo( 100 100 data: $OpenApiTs['/api/v{api-version}/foo/{foo}/bar/{bar}']['delete']['req'], 101 101 ): CancelablePromise<void> { 102 - const { foo, bar } = data; 103 102 return __request(OpenAPI, { 104 103 method: 'DELETE', 105 104 url: '/api/v{api-version}/foo/{foo}/bar/{bar}', 106 105 path: { 107 - foo, 108 - bar, 106 + foo: data.foo, 107 + bar: data.bar, 109 108 }, 110 109 }); 111 110 } ··· 125 124 public static callWithParameters( 126 125 data: $OpenApiTs['/api/v{api-version}/parameters/{parameterPath}']['post']['req'], 127 126 ): CancelablePromise<void> { 128 - const { 129 - parameterHeader, 130 - fooAllOfEnum, 131 - parameterQuery, 132 - parameterForm, 133 - parameterCookie, 134 - parameterPath, 135 - requestBody, 136 - fooRefEnum, 137 - } = data; 138 127 return __request(OpenAPI, { 139 128 method: 'POST', 140 129 url: '/api/v{api-version}/parameters/{parameterPath}', 141 130 path: { 142 - parameterPath, 131 + parameterPath: data.parameterPath, 143 132 }, 144 133 cookies: { 145 - parameterCookie, 134 + parameterCookie: data.parameterCookie, 146 135 }, 147 136 headers: { 148 - parameterHeader, 137 + parameterHeader: data.parameterHeader, 149 138 }, 150 139 query: { 151 - foo_ref_enum: fooRefEnum, 152 - foo_all_of_enum: fooAllOfEnum, 153 - parameterQuery, 140 + foo_ref_enum: data.fooRefEnum, 141 + foo_all_of_enum: data.fooAllOfEnum, 142 + parameterQuery: data.parameterQuery, 154 143 }, 155 144 formData: { 156 - parameterForm, 145 + parameterForm: data.parameterForm, 157 146 }, 158 147 body: requestBody, 159 148 mediaType: 'application/json', ··· 176 165 public static callWithWeirdParameterNames( 177 166 data: $OpenApiTs['/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}']['post']['req'], 178 167 ): CancelablePromise<void> { 179 - const { 180 - parameterHeader, 181 - parameterQuery, 182 - parameterForm, 183 - parameterCookie, 184 - requestBody, 185 - parameterPath1, 186 - parameterPath2, 187 - parameterPath3, 188 - _default, 189 - } = data; 190 168 return __request(OpenAPI, { 191 169 method: 'POST', 192 170 url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}', 193 171 path: { 194 - 'parameter.path.1': parameterPath1, 195 - 'parameter-path-2': parameterPath2, 196 - 'PARAMETER-PATH-3': parameterPath3, 172 + 'parameter.path.1': data.parameterPath1, 173 + 'parameter-path-2': data.parameterPath2, 174 + 'PARAMETER-PATH-3': data.parameterPath3, 197 175 }, 198 176 cookies: { 199 - 'PARAMETER-COOKIE': parameterCookie, 177 + 'PARAMETER-COOKIE': data.parameterCookie, 200 178 }, 201 179 headers: { 202 - 'parameter.header': parameterHeader, 180 + 'parameter.header': data.parameterHeader, 203 181 }, 204 182 query: { 205 - default: _default, 206 - 'parameter-query': parameterQuery, 183 + default: data._default, 184 + 'parameter-query': data.parameterQuery, 207 185 }, 208 186 formData: { 209 - parameter_form: parameterForm, 187 + parameter_form: data.parameterForm, 210 188 }, 211 189 body: requestBody, 212 190 mediaType: 'application/json', ··· 222 200 public static getCallWithOptionalParam( 223 201 data: $OpenApiTs['/api/v{api-version}/parameters/']['get']['req'], 224 202 ): CancelablePromise<void> { 225 - const { requestBody, parameter } = data; 226 203 return __request(OpenAPI, { 227 204 method: 'GET', 228 205 url: '/api/v{api-version}/parameters/', 229 206 query: { 230 - parameter, 207 + parameter: data.parameter, 231 208 }, 232 209 body: requestBody, 233 210 mediaType: 'application/json', ··· 243 220 public static postCallWithOptionalParam( 244 221 data: $OpenApiTs['/api/v{api-version}/parameters/']['post']['req'], 245 222 ): CancelablePromise<void> { 246 - const { parameter, requestBody } = data; 247 223 return __request(OpenAPI, { 248 224 method: 'POST', 249 225 url: '/api/v{api-version}/parameters/', 250 226 query: { 251 - parameter, 227 + parameter: data.parameter, 252 228 }, 253 229 body: requestBody, 254 230 mediaType: 'application/json',