fix(msw): simplify combine

[AllieJonsson]

Status

READY

Description

Rewrite combine.ts a bit to solve some nested all-of, any-of and one-of issues. (hide whitespace in diff view to get a better view of what changed)
Fixes #1807
Fixes #1526
Fixes #1692

Todos

• Tests
• Documentation
• Changelog Entry (unreleased)

[AllieJonsson]

I hope we had tests for all previously known cases. I also tried all specs in the linked issues, hope I didn't miss any edge case

[melloware]

@AllieJonsson this is great! I will let the others review but I know this has been a pain for MSW users.

[anymaniax]

To be honest I don’t remember all the cases neither 😅. Maybe it’s better to start with that and some tests for each cases that we know for now and build on it after?

[soartec-lab]

I'll check the operation with several OpenAPIs I have on hand. Please give me a moment.

[soartec-lab]

I checked and there were some regressions. I will report the details again 👍

[soartec-lab]

@AllieJonsson

The details of the error are below:

paths:
  /pets:
    get:
      operationId: get-pets
      responses:
        '200':
          content:
            application/json:
              schema:
                items:
                  $ref: '#/components/schemas/Pets'
                type: array
          description: OK
components:
  schemas:
    Pets:
      properties:
        petId:
          allOf:
            - $ref: '#/components/schemas/DogId'
            - $ref: '#/components/schemas/CatId'
          nullable: true 
    DogId:
      nullable: true
      type: string
    CatId:
      description: サービス申込者用コンテンツID
      type: string

It seems that an error occurs in the definition when referencing the schema with ref.
generated:

export const getGetPetsResponseMock = (): Pets[] => (Array.from({ length: faker.number.int({ min: 1, max: 10 }) }, (_, i) => i + 1).map(() => ({petId: faker.helpers.arrayElement([{faker.helpers.arrayElement([faker.string.alpha(20), null]),faker.string.alpha(20),}, undefined])})))

and occured error error TS1005: ',' expected.

[AllieJonsson]

I checked and there were some regressions. I will report the details again 👍

Great, Ill check it out and try to solve this!

[soartec-lab]

@AllieJonsson

Thank you. I have confirmed that this case has been fixed 👍
However, it seems that the case still remains. I found that allOf referenced from ref is an error.

/pet:
    get:
      operationId: get-pet
      responses:
        '200':
          content:
            application/json:
              schema:
                $ref: '#/components/schemas/Pet'
          description: OK
      tags:
        - Pet
components:
  schemas:
    Pet:
      type: object
      required:
        - id
        - detail
      properties:
        id:
          type: string
        detail:
          allOf:
            - $ref: '#/components/schemas/Name'
    Name:
      type: string

when i auto generated with the above definition, the following error will occur:

Property assignment expected.

18 export const getGetPetResponseMock = (overrideResponse: Partial< Pet > = {}): Pet => ({id: faker.string.alpha(20), detail: faker.string.alpha(20),, ...overrideResponse})