Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[typescript-fetch] Improve code generation for oneOf cases without discriminator #18702

Merged
merged 1 commit into from
May 18, 2024

Conversation

odiak
Copy link
Contributor

@odiak odiak commented May 17, 2024

Problem

Previously, generated code from the oneOf schema without a discriminator might cause runtime errors.

schema:

openapi: 3.0.0
info:
  version: 1.0.0
  title: Test
  description: Test
paths:
  /foo:
    get:
      responses:
        200:
          description: foo
          content:
            application/json:
              schema:
                $ref: '#/components/schemas/Foo'
components:
  schemas:
    Foo:
      oneOf:
        - $ref: '#/components/schemas/Bar'
        - $ref: '#/components/schemas/Buzz'
    Bar:
      type: object
      required:
        - abc
      properties:
        abc:
          type: array
          items:
            type: object
            properties:
              xyz:
                type: number
    Buzz:
      type: object
      required:
        - def
      properties:
        def:
          type: number

generated model code (partial):

// models/Foo.ts
// ...
export function FooFromJSON(json: any): Foo {
    return FooFromJSONTyped(json, false);
}

export function FooFromJSONTyped(json: any, ignoreDiscriminator: boolean): Foo {
    if (json == null) {
        return json;
    }
    return BarFromJSONTyped(json, true) || BuzzFromJSONTyped(json, true);
}
// ...

// on models/Bar.ts
// ...
export function BarFromJSONTyped(json: any, ignoreDiscriminator: boolean): Bar {
    if (json == null) {
        return json;
    }
    return {
        'abc': ((json['abc'] as Array<any>).map(BarAbcInnerFromJSON)),  // ← this causes error
    };
}
// ...

In BarFromJSONTyped, if the given json doesn't have the abc property, (json['abc'] as Array<any>).map(...) will fail.
The same problem also occurs if abc is a string with a date-time format.

Solution

I modified the template to generate FooFromJSONTyped like the following:

// models/Foo.ts
// ...
export function FooFromJSONTyped(json: any, ignoreDiscriminator: boolean): Foo {
    if (json == null) {
        return json;
    }
    if (instanceOfBar(json)) {
        return BarFromJSONTyped(json, true);
    }
    if (instanceOfBuzz(json)) {
        return BuzzFromJSONTyped(json, true);
    }
}
// ...

Because instanceOfXXXX functions check for the existence of required keys, it makes the generated code safer.

How to check

  1. Check out this branch.
  2. Build the generator.
  3. Generate an API client using the schema above.
  4. Check generated model files.

PR checklist

  • Read the contribution guidelines.
  • Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
  • Run the following to build the project and update samples:
    ./mvnw clean package 
    ./bin/generate-samples.sh ./bin/configs/*.yaml
    ./bin/utils/export_docs_generators.sh
    
    (For Windows users, please run the script in Git BASH)
    Commit all changed files.
    This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
    These must match the expectations made by your contribution.
    You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*.
    IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
  • File the PR against the correct branch: master (upcoming 7.1.0 minor release - breaking changes with fallbacks), 8.0.x (breaking changes without fallbacks)
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

@odiak
Copy link
Contributor Author

odiak commented May 17, 2024

Dear technical committee members of TypeScript, please check this pull request if you have time. 🙇
@TiFu @taxpon @sebastianhaas @kenisteward @Vrolijkx @macjohnny @topce @akehir @petejohansonxo @amakhrov @davidgamero @mkusaka

Copy link
Member

@macjohnny macjohnny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

thanks for your contribution!

An edge case that wouldnt work is if the models dont contain required fields or they are the same, but i guess then its hard to distinguish without a discriminator anyway

@macjohnny macjohnny merged commit 57dceae into OpenAPITools:master May 18, 2024
14 checks passed
@odiak odiak deleted the improve-typescript-fetch-oneof branch May 19, 2024 04:02
@wing328 wing328 added this to the 7.6.0 milestone May 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants