Fix typescript angular inheritance by enabling supportsMultipleInheritance flag

[mnahkies]

PR checklist

• Read the contribution guidelines.
• Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.
• Filed the PR against the correct branch: master, 4.1.x, 5.0.x. Default: master.
• Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

@TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @nicokoenig (2018/09) @topce (2018/10) @akehir (2019/07)

Description of the PR

It appears that the typescript-angular template was re-written to expect the supportsMultipleInheritance flag to be enabled in 8c599eb but that the flag wasn't actually enabled.

By enabling this flag, parents are correctly added to interfaces as expected.

Also ran ./bin/openapi3/typescript-angular-petstore-all.sh before and after making changes. Seems this hadn't been run on master so there is some noise from that. Unfortunately the sample yaml used doesn't seem to exercise the allOf, anyOf, oneOf keywords and so no change occurred after the fix.

Fixes #2845

[macjohnny]

LGTM

[macjohnny]

Please re-generate the samples with the
./bin/typescript-angular-petstore-all.sh
Command only

[macjohnny]

Should the flag be added for typescript-fetch, too?

[wing328]

@mnahkies thanks for the PR. Looks like you're using an old version of OpenAPI Generator as the body name in OAS v2 is not preserved. Can you please pull the latest master into your branch and regenerate the samples again?

[mnahkies]

Hmm, seems like this script actually generates to the same directory as the openapi2 script, is that intentional?

$ mvn clean package && ./bin/openapi3/typescript-angular-petstore-all.sh

Results in no changes (based on latest master)

Running

$ mvn clean package && ./bin/typescript-angular-petstore-all.sh

Reverts all changes to samples to current master. I'll push this, but seems like some work needs to be done around the typescript client samples with respect to openapi3

[wing328]

Unfortunately the sample yaml used doesn't seem to exercise the allOf, anyOf, oneOf keywords and so no change occurred after the fix.

We've some test spec (OAS v3) for allOf, anyOf, oneOf under https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator/src/test/resources/3_0 and you're, right that the default petstore spec doesn't contain tests for different cases of allOf, anyOf, oneOf

[wing328]

@mnahkies do you have a spec to reproduce the error? sorry if I miss it in your previous conversation. Just want to perform a bit more tests before merging this PR.

Thanks again for the PR.

[mnahkies]

@wing328 this is the spec I was testing with. Also I missed deleting some files that were generating when I ran the openapi3 script but shouldn't exist after running the openapi2 script.

openapi: "3.0.1"
info:
  version: 1.0.0
  title: Inheritance test
paths:
  /pets:
    patch:
      requestBody:
        content:
          application/json:
            schema:
              oneOf:
                - $ref: '#/components/schemas/Cat'
                - $ref: '#/components/schemas/Dog'
              discriminator:
                propertyName: pet_type
      responses:
        '200':
          description: Updated
components:
  schemas:
    Pet:
      type: object
      required:
        - pet_type
      properties:
        pet_type:
          type: string
      discriminator:
        propertyName: pet_type
    Dog:     # "Dog" is a value for the pet_type property (the discriminator value)
      allOf: # Combines the main `Pet` schema with `Dog`-specific properties 
        - $ref: '#/components/schemas/Pet'
        - type: object
          # all other properties specific to a `Dog`
          properties:
            bark:
              type: boolean
            breed:
              type: string
              enum: [Dingo, Husky, Retriever, Shepherd]
    Cat:     # "Cat" is a value for the pet_type property (the discriminator value)
      allOf: # Combines the main `Pet` schema with `Cat`-specific properties 
        - $ref: '#/components/schemas/Pet'
        - type: object
          # all other properties specific to a `Cat`
          properties:
            hunts:
              type: boolean
            age:
              type: integer

example.txt

[wing328]

Did some tests and notice the following changes when compared with the master:

 import { Pet } from './pet';
 
-export interface Cat { 
+export interface Cat extends Pet { 
     hunts?: boolean;
     age?: number;
 }

Let's go with this fix and I'll merge it once the CircleCI tests pass.

[wing328]

@mnahkies thanks for the PR, which has been included in the v4.1.2 release: https://twitter.com/oas_generator/status/1172068944355528705

[mnahkies]

Thanks @wing328 - will this release also go to maven? https://mvnrepository.com/artifact/org.openapitools/openapi-generator-maven-plugin

[wing328]

https://search.maven.org/artifact/org.openapitools/openapi-generator-maven-plugin/4.1.2/maven-plugin

The link you provided seems not up-to-date.