Skip to content

feature: Update NJS v11.5.0, require TypeScript >= 4.3 #5268

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Sep 16, 2025
Merged

feature: Update NJS v11.5.0, require TypeScript >= 4.3 #5268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3cb6d50
feature: Update NJS v11.5.0, require TypeScript >= 4.3
RicoSuter Sep 15, 2025
1c025cc
update
RicoSuter Sep 15, 2025
59a7041
update nr
RicoSuter Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="MyToolkit" Version="2.5.16" />
<PackageVersion Include="MyToolkit.Extended" Version="2.5.16" />
<PackageVersion Include="Namotion.Reflection" Version="3.4.2" />
<PackageVersion Include="Namotion.Reflection" Version="3.4.3" />
<PackageVersion Include="NConsole" Version="3.12.6605.26941" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NJsonSchema" Version="11.4.0" />
<PackageVersion Include="NJsonSchema.CodeGeneration" Version="11.4.0" />
<PackageVersion Include="NJsonSchema.CodeGeneration.CSharp" Version="11.4.0" />
<PackageVersion Include="NJsonSchema.CodeGeneration.TypeScript" Version="11.4.0" />
<PackageVersion Include="NJsonSchema.NewtonsoftJson" Version="11.4.0" />
<PackageVersion Include="NJsonSchema.Yaml" Version="11.4.0" />
<PackageVersion Include="NJsonSchema.CodeGeneration" Version="11.5.0" />
<PackageVersion Include="NJsonSchema.CodeGeneration.CSharp" Version="11.5.0" />
<PackageVersion Include="NJsonSchema.CodeGeneration.TypeScript" Version="11.5.0" />
<PackageVersion Include="NJsonSchema.NewtonsoftJson" Version="11.5.0" />
<PackageVersion Include="NJsonSchema.Yaml" Version="11.5.0" />
<PackageVersion Include="System.Runtime.Loader" Version="4.0.0" />
<PackageVersion Include="Verify.XunitV3" Version="30.5.0" />
<PackageVersion Include="xunit.v3" Version="3.0.0" />
Expand Down
1 change: 0 additions & 1 deletion src/NSwag.CodeGeneration.TypeScript.Tests/OperationParameterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ public async Task When_query_parameter_is_enum_array_then_the_enum_is_referenced
{
Template = TypeScriptTemplate.JQueryCallbacks
};
clientSettings.TypeScriptGeneratorSettings.TypeScriptVersion = 1.8m;

var gen = new TypeScriptClientGenerator(document, clientSettings);
var code = gen.GenerateFile();
Expand Down
2 changes: 1 addition & 1 deletion ...shots/ArrayParameterTests.When_parameter_is_array_then_TypeScript_is_correct.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export class MyClass {
}

export class ApiException extends Error {
message: string;
override message: string;
status: number;
response: string;
headers: { [key: string]: any; };
Expand Down
2 changes: 1 addition & 1 deletion ...ta_with_property_array_then_content_should_be_added_in_foreach_in_typescript.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export interface FileResponse {
}

export class ApiException extends Error {
message: string;
override message: string;
status: number;
response: string;
headers: { [key: string]: any; };
Expand Down
2 changes: 1 addition & 1 deletion ....WhenSpecContainsFormDataInMultipartFileArray_ThenFormDataIsUsedInTypeScript.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export interface FileResponse {
}

export class ApiException extends Error {
message: string;
override message: string;
status: number;
response: string;
headers: { [key: string]: any; };
Expand Down
2 changes: 1 addition & 1 deletion ...WhenSpecContainsFormDataInNestedMultipartForm_ThenFormDataIsUsedInTypeScript.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export interface FileResponse {
}

export class ApiException extends Error {
message: string;
override message: string;
status: number;
response: string;
headers: { [key: string]: any; };
Expand Down
2 changes: 1 addition & 1 deletion ...WhenSpecContainsFormDataInSingleMultipartFile_ThenFormDataIsUsedInTypeScript.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export interface FileResponse {
}

export class ApiException extends Error {
message: string;
override message: string;
status: number;
response: string;
headers: { [key: string]: any; };
Expand Down
2 changes: 1 addition & 1 deletion ...BinaryTests.When_body_is_binary_then_blob_is_used_as_parameter_in_TypeScript.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export interface FileParameter {
}

export class ApiException extends Error {
message: string;
override message: string;
status: number;
response: string;
headers: { [key: string]: any; };
Expand Down
2 changes: 1 addition & 1 deletion ...nTests.When_generating_TypeScript_code_then_output_contains_expected_classes.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export interface Address {
}

export class ApiException extends Error {
message: string;
override message: string;
status: number;
response: string;
headers: { [key: string]: any; };
Expand Down
2 changes: 1 addition & 1 deletion ...pshots/CodeGenerationTests.When_path_starts_with_numeric_can_generate_client.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ export interface ITwoFactorResponse {
}

export class ApiException extends Error {
message: string;
override message: string;
status: number;
response: string;
headers: { [key: string]: any; };
Expand Down
2 changes: 1 addition & 1 deletion ...cript.Tests/Snapshots/FetchTests.When_include_RequestCredentialsType_Include.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ export interface IFoo {
}

export class ApiException extends Error {
message: string;
override message: string;
status: number;
response: string;
headers: { [key: string]: any; };
Expand Down
2 changes: 1 addition & 1 deletion ...tion.TypeScript.Tests/Snapshots/FetchTests.When_include_RequestModeType_Cors.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ export interface IFoo {
}

export class ApiException extends Error {
message: string;
override message: string;
status: number;
response: string;
headers: { [key: string]: any; };
Expand Down
6 changes: 3 additions & 3 deletions ...hen_generating_typescript_with_any_inheritance_then_inheritance_is_generated.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@ export class SessionStateResent extends SportsbookEventBody implements ISessionS
super(data);
}

init(_data?: any) {
override init(_data?: any) {
super.init(_data);
}

static fromJS(data: any): SessionStateResent {
static override fromJS(data: any): SessionStateResent {
data = typeof data === 'object' ? data : {};
let result = new SessionStateResent();
result.init(data);
return result;
}

toJSON(data?: any) {
override toJSON(data?: any) {
data = typeof data === 'object' ? data : {};
super.toJSON(data);
return data;
Expand Down
14 changes: 7 additions & 7 deletions src/NSwag.CodeGeneration.TypeScript.Tests/Snapshots/JIRA_OpenAPI_Angular.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61062,7 +61062,7 @@ export class FieldIdIdentifier extends FieldIdentifierObject implements IFieldId
this._discriminator = "FieldIdIdentifier";
}

init(_data?: any) {
override init(_data?: any) {
super.init(_data);
if (_data) {
for (var property in _data) {
Expand All @@ -61073,14 +61073,14 @@ export class FieldIdIdentifier extends FieldIdentifierObject implements IFieldId
}
}

static fromJS(data: any): FieldIdIdentifier {
static override fromJS(data: any): FieldIdIdentifier {
data = typeof data === 'object' ? data : {};
let result = new FieldIdIdentifier();
result.init(data);
return result;
}

toJSON(data?: any) {
override toJSON(data?: any) {
data = typeof data === 'object' ? data : {};
for (var property in this) {
if (this.hasOwnProperty(property))
Expand Down Expand Up @@ -85009,7 +85009,7 @@ export class ProjectIdAssociationContext extends AssociationContextObject implem
this._discriminator = "ProjectIdAssociationContext";
}

init(_data?: any) {
override init(_data?: any) {
super.init(_data);
if (_data) {
for (var property in _data) {
Expand All @@ -85020,14 +85020,14 @@ export class ProjectIdAssociationContext extends AssociationContextObject implem
}
}

static fromJS(data: any): ProjectIdAssociationContext {
static override fromJS(data: any): ProjectIdAssociationContext {
data = typeof data === 'object' ? data : {};
let result = new ProjectIdAssociationContext();
result.init(data);
return result;
}

toJSON(data?: any) {
override toJSON(data?: any) {
data = typeof data === 'object' ? data : {};
for (var property in this) {
if (this.hasOwnProperty(property))
Expand Down Expand Up @@ -104944,7 +104944,7 @@ function formatDate(d: Date) {
}

export class ApiException extends Error {
message: string;
override message: string;
status: number;
response: string;
headers: { [key: string]: any; };
Expand Down
14 changes: 7 additions & 7 deletions src/NSwag.CodeGeneration.TypeScript.Tests/Snapshots/JIRA_OpenAPI_AngularJS.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56357,7 +56357,7 @@ export class FieldIdIdentifier extends FieldIdentifierObject implements IFieldId
this._discriminator = "FieldIdIdentifier";
}

init(_data?: any) {
override init(_data?: any) {
super.init(_data);
if (_data) {
for (var property in _data) {
Expand All @@ -56368,14 +56368,14 @@ export class FieldIdIdentifier extends FieldIdentifierObject implements IFieldId
}
}

static fromJS(data: any): FieldIdIdentifier {
static override fromJS(data: any): FieldIdIdentifier {
data = typeof data === 'object' ? data : {};
let result = new FieldIdIdentifier();
result.init(data);
return result;
}

toJSON(data?: any) {
override toJSON(data?: any) {
data = typeof data === 'object' ? data : {};
for (var property in this) {
if (this.hasOwnProperty(property))
Expand Down Expand Up @@ -80304,7 +80304,7 @@ export class ProjectIdAssociationContext extends AssociationContextObject implem
this._discriminator = "ProjectIdAssociationContext";
}

init(_data?: any) {
override init(_data?: any) {
super.init(_data);
if (_data) {
for (var property in _data) {
Expand All @@ -80315,14 +80315,14 @@ export class ProjectIdAssociationContext extends AssociationContextObject implem
}
}

static fromJS(data: any): ProjectIdAssociationContext {
static override fromJS(data: any): ProjectIdAssociationContext {
data = typeof data === 'object' ? data : {};
let result = new ProjectIdAssociationContext();
result.init(data);
return result;
}

toJSON(data?: any) {
override toJSON(data?: any) {
data = typeof data === 'object' ? data : {};
for (var property in this) {
if (this.hasOwnProperty(property))
Expand Down Expand Up @@ -100239,7 +100239,7 @@ function formatDate(d: Date) {
}

export class ApiException extends Error {
message: string;
override message: string;
status: number;
response: string;
headers: { [key: string]: any; };
Expand Down
14 changes: 7 additions & 7 deletions src/NSwag.CodeGeneration.TypeScript.Tests/Snapshots/JIRA_OpenAPI_Aurelia.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52812,7 +52812,7 @@ export class FieldIdIdentifier extends FieldIdentifierObject implements IFieldId
this._discriminator = "FieldIdIdentifier";
}

init(_data?: any) {
override init(_data?: any) {
super.init(_data);
if (_data) {
for (var property in _data) {
Expand All @@ -52823,14 +52823,14 @@ export class FieldIdIdentifier extends FieldIdentifierObject implements IFieldId
}
}

static fromJS(data: any): FieldIdIdentifier {
static override fromJS(data: any): FieldIdIdentifier {
data = typeof data === 'object' ? data : {};
let result = new FieldIdIdentifier();
result.init(data);
return result;
}

toJSON(data?: any) {
override toJSON(data?: any) {
data = typeof data === 'object' ? data : {};
for (var property in this) {
if (this.hasOwnProperty(property))
Expand Down Expand Up @@ -76759,7 +76759,7 @@ export class ProjectIdAssociationContext extends AssociationContextObject implem
this._discriminator = "ProjectIdAssociationContext";
}

init(_data?: any) {
override init(_data?: any) {
super.init(_data);
if (_data) {
for (var property in _data) {
Expand All @@ -76770,14 +76770,14 @@ export class ProjectIdAssociationContext extends AssociationContextObject implem
}
}

static fromJS(data: any): ProjectIdAssociationContext {
static override fromJS(data: any): ProjectIdAssociationContext {
data = typeof data === 'object' ? data : {};
let result = new ProjectIdAssociationContext();
result.init(data);
return result;
}

toJSON(data?: any) {
override toJSON(data?: any) {
data = typeof data === 'object' ? data : {};
for (var property in this) {
if (this.hasOwnProperty(property))
Expand Down Expand Up @@ -96694,7 +96694,7 @@ function formatDate(d: Date) {
}

export class ApiException extends Error {
message: string;
override message: string;
status: number;
response: string;
headers: { [key: string]: any; };
Expand Down
17 changes: 9 additions & 8 deletions src/NSwag.CodeGeneration.TypeScript.Tests/Snapshots/JIRA_OpenAPI_Axios.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
/* eslint-disable */
// ReSharper disable InconsistentNaming

import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, CancelToken } from 'axios';
import axios, { AxiosError } from 'axios';
import type { AxiosInstance, AxiosRequestConfig, AxiosResponse, CancelToken } from 'axios';

export class Client {
protected instance: AxiosInstance;
Expand Down Expand Up @@ -61081,7 +61082,7 @@ export class FieldIdIdentifier extends FieldIdentifierObject implements IFieldId
this._discriminator = "FieldIdIdentifier";
}

init(_data?: any) {
override init(_data?: any) {
super.init(_data);
if (_data) {
for (var property in _data) {
Expand All @@ -61092,14 +61093,14 @@ export class FieldIdIdentifier extends FieldIdentifierObject implements IFieldId
}
}

static fromJS(data: any): FieldIdIdentifier {
static override fromJS(data: any): FieldIdIdentifier {
data = typeof data === 'object' ? data : {};
let result = new FieldIdIdentifier();
result.init(data);
return result;
}

toJSON(data?: any) {
override toJSON(data?: any) {
data = typeof data === 'object' ? data : {};
for (var property in this) {
if (this.hasOwnProperty(property))
Expand Down Expand Up @@ -85028,7 +85029,7 @@ export class ProjectIdAssociationContext extends AssociationContextObject implem
this._discriminator = "ProjectIdAssociationContext";
}

init(_data?: any) {
override init(_data?: any) {
super.init(_data);
if (_data) {
for (var property in _data) {
Expand All @@ -85039,14 +85040,14 @@ export class ProjectIdAssociationContext extends AssociationContextObject implem
}
}

static fromJS(data: any): ProjectIdAssociationContext {
static override fromJS(data: any): ProjectIdAssociationContext {
data = typeof data === 'object' ? data : {};
let result = new ProjectIdAssociationContext();
result.init(data);
return result;
}

toJSON(data?: any) {
override toJSON(data?: any) {
data = typeof data === 'object' ? data : {};
for (var property in this) {
if (this.hasOwnProperty(property))
Expand Down Expand Up @@ -104963,7 +104964,7 @@ function formatDate(d: Date) {
}

export class ApiException extends Error {
message: string;
override message: string;
status: number;
response: string;
headers: { [key: string]: any; };
Expand Down
Loading
Loading