+103

packages/shared/src/openApi/shared/transforms/readWrite.ts

reviewed

··· 437 437 split.reverseMapping[writePointer] = pointer; 438 438 } 439 439 440 440 + // Helper function to update discriminator mappings in a schema 441 441 + const updateDiscriminatorMappingsInSchema = ( 442 442 + schema: unknown, 443 443 + contextVariant: 'read' | 'write', 444 444 + ) => { 445 445 + if (schema && typeof schema === 'object') { 446 446 + // If this schema has a discriminator with a mapping 447 447 + if ( 448 448 + 'discriminator' in schema && 449 449 + schema.discriminator && 450 450 + typeof schema.discriminator === 'object' && 451 451 + 'mapping' in schema.discriminator && 452 452 + schema.discriminator.mapping && 453 453 + typeof schema.discriminator.mapping === 'object' 454 454 + ) { 455 455 + const mapping = schema.discriminator.mapping as Record<string, string>; 456 456 + const updatedMapping: Record<string, string> = {}; 457 457 + 458 458 + for (const [discriminatorValue, originalRef] of Object.entries(mapping)) { 459 459 + const map = split.mapping[originalRef]; 460 460 + if (map) { 461 461 + // Update to the appropriate variant 462 462 + if (contextVariant === 'read' && map.read) { 463 463 + updatedMapping[discriminatorValue] = map.read; 464 464 + } else if (contextVariant === 'write' && map.write) { 465 465 + updatedMapping[discriminatorValue] = map.write; 466 466 + } else { 467 467 + updatedMapping[discriminatorValue] = originalRef; 468 468 + } 469 469 + } else { 470 470 + updatedMapping[discriminatorValue] = originalRef; 471 471 + } 472 472 + } 473 473 + 474 474 + (schema.discriminator as Record<string, unknown>).mapping = updatedMapping; 475 475 + } 476 476 + 477 477 + // Recursively update discriminators in allOf, oneOf, anyOf 478 478 + for (const key of ['allOf', 'oneOf', 'anyOf'] as const) { 479 479 + if (key in schema && Array.isArray((schema as Record<string, unknown>)[key])) { 480 480 + const compositions = (schema as Record<string, unknown>)[key] as Array<unknown>; 481 481 + for (const comp of compositions) { 482 482 + updateDiscriminatorMappingsInSchema(comp, contextVariant); 483 483 + } 484 484 + } 485 485 + } 486 486 + } 487 487 + }; 488 488 + 489 489 + // Update discriminator mappings in all split schemas 490 490 + for (const [name, schema] of Object.entries(split.schemas)) { 491 491 + const pointer = `${schemasPointerNamespace}${name}`; 492 492 + const originalPointer = split.reverseMapping[pointer]; 493 493 + 494 494 + if (originalPointer) { 495 495 + const mapping = split.mapping[originalPointer]; 496 496 + if (mapping) { 497 497 + // Determine if this is a read or write variant 498 498 + const isRead = mapping.read === pointer; 499 499 + const isWrite = mapping.write === pointer; 500 500 + 501 501 + if (isRead) { 502 502 + updateDiscriminatorMappingsInSchema(schema, 'read'); 503 503 + } else if (isWrite) { 504 504 + updateDiscriminatorMappingsInSchema(schema, 'write'); 505 505 + } 506 506 + } 507 507 + } 508 508 + } 509 509 + 440 510 event.timeEnd(); 441 511 return split; 442 512 }; ··· 630 700 (node as Record<string, unknown>)[key] = map.read; 631 701 } 632 702 } 703 703 + } else if (key === 'discriminator' && typeof value === 'object' && value !== null) { 704 704 + // Update discriminator mappings to point to the correct read/write variants 705 705 + const discriminator = value as Record<string, unknown>; 706 706 + if (discriminator.mapping && typeof discriminator.mapping === 'object') { 707 707 + const mapping = discriminator.mapping as Record<string, string>; 708 708 + const updatedMapping: Record<string, string> = {}; 709 709 + for (const [discriminatorValue, originalRef] of Object.entries(mapping)) { 710 710 + const map = split.mapping[originalRef]; 711 711 + if (map) { 712 712 + if (nextContext === 'read' && map.read) { 713 713 + updatedMapping[discriminatorValue] = map.read; 714 714 + } else if (nextContext === 'write' && map.write) { 715 715 + updatedMapping[discriminatorValue] = map.write; 716 716 + } else { 717 717 + // For schemas with no context, don't update the mapping. 718 718 + // This preserves the original mapping for base schemas. 719 719 + updatedMapping[discriminatorValue] = originalRef; 720 720 + } 721 721 + } else { 722 722 + updatedMapping[discriminatorValue] = originalRef; 723 723 + } 724 724 + } 725 725 + discriminator.mapping = updatedMapping; 726 726 + } 727 727 + // Continue walking the discriminator object for other properties 728 728 + walk({ 729 729 + context: nextContext, 730 730 + currentPointer: nextPointer, 731 731 + inSchema, 732 732 + node: value, 733 733 + path: [...path, key], 734 734 + visited, 735 735 + }); 633 736 } else { 634 737 walk({ 635 738 context: nextContext,

+107

specs/3.1.x/discriminator-one-of-read-write.yaml

reviewed

··· 1 1 + openapi: 3.1.0 2 2 + info: 3 3 + title: OpenAPI 3.1.0 discriminator one of with read/write example 4 4 + version: 1 5 5 + paths: 6 6 + /pets: 7 7 + post: 8 8 + requestBody: 9 9 + content: 10 10 + application/json: 11 11 + schema: 12 12 + $ref: '#/components/schemas/CreatePetRequest' 13 13 + required: true 14 14 + responses: 15 15 + '200': 16 16 + content: 17 17 + application/json: 18 18 + schema: 19 19 + $ref: '#/components/schemas/CreatePetResponse' 20 20 + description: OK 21 21 + components: 22 22 + schemas: 23 23 + AnimalPayload: 24 24 + type: object 25 25 + required: 26 26 + - typeDiscriminator 27 27 + properties: 28 28 + typeDiscriminator: 29 29 + type: string 30 30 + discriminator: 31 31 + propertyName: typeDiscriminator 32 32 + mapping: 33 33 + dog: '#/components/schemas/DogPayload' 34 34 + cat: '#/components/schemas/CatPayload' 35 35 + 36 36 + DogPayload: 37 37 + allOf: 38 38 + - $ref: '#/components/schemas/AnimalPayload' 39 39 + - type: object 40 40 + required: 41 41 + - breed 42 42 + - canFetch 43 43 + - displayBreed 44 44 + properties: 45 45 + breed: 46 46 + type: string 47 47 + canFetch: 48 48 + type: boolean 49 49 + displayBreed: 50 50 + type: string 51 51 + readOnly: true 52 52 + 53 53 + CatPayload: 54 54 + allOf: 55 55 + - $ref: '#/components/schemas/AnimalPayload' 56 56 + - type: object 57 57 + required: 58 58 + - breed 59 59 + - livesRemaining 60 60 + - displayBreed 61 61 + properties: 62 62 + breed: 63 63 + type: string 64 64 + livesRemaining: 65 65 + type: integer 66 66 + displayBreed: 67 67 + type: string 68 68 + readOnly: true 69 69 + 70 70 + CreatePetRequest: 71 71 + type: object 72 72 + required: 73 73 + - name 74 74 + - animal 75 75 + properties: 76 76 + name: 77 77 + type: string 78 78 + animal: 79 79 + oneOf: 80 80 + - $ref: '#/components/schemas/DogPayload' 81 81 + - $ref: '#/components/schemas/CatPayload' 82 82 + discriminator: 83 83 + propertyName: typeDiscriminator 84 84 + mapping: 85 85 + dog: '#/components/schemas/DogPayload' 86 86 + cat: '#/components/schemas/CatPayload' 87 87 + 88 88 + CreatePetResponse: 89 89 + type: object 90 90 + required: 91 91 + - id 92 92 + - name 93 93 + - animal 94 94 + properties: 95 95 + id: 96 96 + type: string 97 97 + name: 98 98 + type: string 99 99 + animal: 100 100 + oneOf: 101 101 + - $ref: '#/components/schemas/DogPayload' 102 102 + - $ref: '#/components/schemas/CatPayload' 103 103 + discriminator: 104 104 + propertyName: typeDiscriminator 105 105 + mapping: 106 106 + dog: '#/components/schemas/DogPayload' 107 107 + cat: '#/components/schemas/CatPayload'