loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

fix(typescript-*): nullable additionalProperty values (#17379)

Browse Source 
* fix(typescript-*): nullable additionalProperty values

* chore(samples): update samples
This commit is contained in:
Drew Kimberly 2023-12-20 07:14:25 -06:00 committed by GitHub
parent aeb6fcbb8c
commit 457622c456
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
View File

@ -629,6 +629,9 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
} else if (ModelUtils.isMapSchema(p)) { } else if (ModelUtils.isMapSchema(p)) {
Schema<?> inner = getSchemaAdditionalProperties(p); Schema<?> inner = getSchemaAdditionalProperties(p);
String nullSafeSuffix = getNullSafeAdditionalProps() ? " | undefined" : ""; String nullSafeSuffix = getNullSafeAdditionalProps() ? " | undefined" : "";
if (Boolean.TRUE.equals(inner.getNullable())) {
nullSafeSuffix += " | null";
}
return "{ [key: string]: " + getTypeDeclaration(unaliasSchema(inner)) + nullSafeSuffix + "; }"; return "{ [key: string]: " + getTypeDeclaration(unaliasSchema(inner)) + nullSafeSuffix + "; }";
} else if (ModelUtils.isFileSchema(p)) { } else if (ModelUtils.isFileSchema(p)) {
return "File"; return "File";

8
samples/client/petstore/typescript-axios/builds/test-petstore/api.ts
View File

@ -1107,16 +1107,16 @@ export interface NullableClass {
'object_nullable_prop'?: { [key: string]: object; } | null; 'object_nullable_prop'?: { [key: string]: object; } | null;
/** /**
* *
* @type {{ [key: string]: object; }} * @type {{ [key: string]: object | null; }}
* @memberof NullableClass * @memberof NullableClass
*/ */
'object_and_items_nullable_prop'?: { [key: string]: object; } | null; 'object_and_items_nullable_prop'?: { [key: string]: object | null; } | null;
/** /**
* *
* @type {{ [key: string]: object; }} * @type {{ [key: string]: object | null; }}
* @memberof NullableClass * @memberof NullableClass
*/ */
'object_items_nullable'?: { [key: string]: object; }; 'object_items_nullable'?: { [key: string]: object | null; };
} }
/** /**
* @type NullableShape * @type NullableShape

8
samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/api.ts
View File

@ -875,16 +875,16 @@ export interface NullableClass {
'object_nullable_prop'?: { [key: string]: object; } | null; 'object_nullable_prop'?: { [key: string]: object; } | null;
/** /**
* *
* @type {{ [key: string]: object; }} * @type {{ [key: string]: object | null; }}
* @memberof NullableClass * @memberof NullableClass
*/ */
'object_and_items_nullable_prop'?: { [key: string]: object; } | null; 'object_and_items_nullable_prop'?: { [key: string]: object | null; } | null;
/** /**
* *
* @type {{ [key: string]: object; }} * @type {{ [key: string]: object | null; }}
* @memberof NullableClass * @memberof NullableClass
*/ */
'object_items_nullable'?: { [key: string]: object; }; 'object_items_nullable'?: { [key: string]: object | null; };
} }
/** /**
* *

8
samples/client/petstore/typescript-fetch/builds/default-v3.0/models/NullableClass.ts
View File

@ -82,16 +82,16 @@ export interface NullableClass {
objectNullableProp?: { [key: string]: object; } | null; objectNullableProp?: { [key: string]: object; } | null;
/** /**
* *
* @type {{ [key: string]: object; }} * @type {{ [key: string]: object | null; }}
* @memberof NullableClass * @memberof NullableClass
*/ */
objectAndItemsNullableProp?: { [key: string]: object; } | null; objectAndItemsNullableProp?: { [key: string]: object | null; } | null;
/** /**
* *
* @type {{ [key: string]: object; }} * @type {{ [key: string]: object | null; }}
* @memberof NullableClass * @memberof NullableClass
*/ */
objectItemsNullable?: { [key: string]: object; }; objectItemsNullable?: { [key: string]: object | null; };
} }
/** /**

8
samples/client/petstore/typescript-fetch/builds/snakecase-discriminator/models/NullableClass.ts
View File

@ -82,16 +82,16 @@ export interface NullableClass {
objectNullableProp?: { [key: string]: object; } | null; objectNullableProp?: { [key: string]: object; } | null;
/** /**
* *
* @type {{ [key: string]: object; }} * @type {{ [key: string]: object | null; }}
* @memberof NullableClass * @memberof NullableClass
*/ */
objectAndItemsNullableProp?: { [key: string]: object; } | null; objectAndItemsNullableProp?: { [key: string]: object | null; } | null;
/** /**
* *
* @type {{ [key: string]: object; }} * @type {{ [key: string]: object | null; }}
* @memberof NullableClass * @memberof NullableClass
*/ */
objectItemsNullable?: { [key: string]: object; }; objectItemsNullable?: { [key: string]: object | null; };
} }
/** /**