Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • O openapi-generator
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 3,476
    • Issues 3,476
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 402
    • Merge requests 402
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • OpenAPI Tools
  • openapi-generator
  • Merge requests
  • !3919

[typescript][fetch] Fix null typing errors

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Administrator requested to merge github/fork/allejo/ts-fix-null-typing into master Sep 20, 2019
  • Overview 0
  • Commits 3
  • Pipelines 0
  • Changes 65

Created by: allejo

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.

Description of the PR

The current typescript-fetch template generates some invalid Typescript where the typing for the function is either undefined or the model. However, in the other generated code it can also be null and the function itself is generating a null check.

Additionally, for each nullable entity in the return statement, checking against == null will essentially check for both undefined and null since in JS, null == undefined is true.

Current

export function ModelToJSON(value?: Model): any {
    if (value === undefined) {
        return undefined;
    }
    if (value === null) {
        return null;
    }
    return {
        
        'primitive_value': value.primitiveValue,
        'nullable_date': value.nullableDate === undefined ? undefined : value.nullableDate.toISOString(),
        'regular_date': value.regularDate.toISOString(),
    }
}

After PR

export function ModelToJSON(value?: Model | null): any {
    if (value === undefined) {
        return undefined;
    }
    if (value === null) {
        return null;
    }
    return {
        
        'primitive_value': value.primitiveValue,
        'nullable_date': value.nullableDate == null ? undefined : value.nullableDate.toISOString(),
        'regular_date': value.regularDate.toISOString(),
    }
}

Additionally, the indentation of a generated comment is wrong, so that fix is included in here as well.

I don't currently have a Java dev environment setup on my computer but I've tested these template changes through the -t flag and would appreciate any early feedback while I get Java set up to check that last box.

@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)

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: github/fork/allejo/ts-fix-null-typing