Skip to content

Update TS #143

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

Merged
merged 3 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,12 @@ public ClassTemplateModel(OpenApiDocument doc, JsonSchema json, Mapper mapper) :

IsAbstract = DerivedClasses.Any() && InheritedSchema == null;

TsImports = Properties.SelectMany(_ => _.TsImports).Select(_=> new TsImport(_, from:mapper.TryGetModule(_))).ToList();
TsImports = Properties.SelectMany(_ => _.TsImports).Select(_ => new TsImport(_, from: mapper.TryGetModule(_))).ToList();

// add base class reference
if (!string.IsNullOrEmpty(Inheritance))
TsImports.Add(new TsImport(Inheritance, from: mapper.TryGetModule(Inheritance)));

// add derived class references
var dcs = DerivedClasses.Select(_ => _.ClassName).Select(_ => new TsImport(_, from: mapper.TryGetModule(_))).ToList();
TsImports?.AddRange(dcs);
// remove importing self
var tsImports = TsImports.Where(_ => _.Name != ClassName);
// remove duplicates
Expand Down
28 changes: 1 addition & 27 deletions .nswag-generator/Templates/TypeScript/Class2.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -52,40 +52,14 @@ export {% if IsAbstract %}abstract {% endif %}class {{ ClassName }}{% if HasInhe

static {% if HasInheritance %}override {% endif %}fromJS(data: any{% if HandleReferences %}, _mappings?: any{% endif %}): {{ ClassName }}{% if HandleReferences %} | null{% endif %} {
data = typeof data === 'object' ? data : {};
{% if HandleReferences -%}
{% for derivedClass in DerivedClasses -%}
if (data["{{ BaseDiscriminator }}"] === "{{ derivedClass.Discriminator }}")
{% if derivedClass.IsAbstract -%}
throw new Error("The abstract class '{{ derivedClass.ClassName }}' cannot be instantiated.");
{% else -%}
return createInstance<{{ derivedClass.ClassName }}>(data, _mappings, {{ derivedClass.ClassName }});
{% endif -%}
{% endfor -%}
{% if IsAbstract %}
throw new Error("The abstract class '{{ ClassName }}' cannot be instantiated.");
{% else %}
return createInstance<{{ ClassName }}>(data, _mappings, {{ ClassName }});
{% endif %}
{% else %}
{% for derivedClass in DerivedClasses -%}
if (data["{{ BaseDiscriminator }}"] === "{{ derivedClass.Discriminator }}") {
{% if derivedClass.IsAbstract -%}
throw new Error("The abstract class '{{ derivedClass.ClassName }}' cannot be instantiated.");
{% else -%}
let result = new {{ derivedClass.ClassName }}();
result.init(data);
return result;
{% endif -%}
}
{% endfor -%}

{% if IsAbstract -%}
throw new Error("The abstract class '{{ ClassName }}' cannot be instantiated.");
{% else -%}
let result = new {{ ClassName }}();
result.init(data);
return result;
{% endif -%}
{% endif -%}
}

{% if HasInheritance %}override {% endif %}toJSON(data?: any) {
Expand Down
6 changes: 0 additions & 6 deletions src/TypeScriptSDK/models/RoomGridParameter.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { IsString, IsOptional, IsNumber, validate, ValidationError as TsValidationError } from 'class-validator';
import { _GridParameterBase } from "./_GridParameterBase";
import { RoomRadialGridParameter } from "./RoomRadialGridParameter";

/** Instructions for a SensorGrid generated from a Room2D's floors. */
export class RoomGridParameter extends _GridParameterBase {
Expand Down Expand Up @@ -40,11 +39,6 @@ export class RoomGridParameter extends _GridParameterBase {
static override fromJS(data: any): RoomGridParameter {
data = typeof data === 'object' ? data : {};

if (data["type"] === "RoomRadialGridParameter") {
let result = new RoomRadialGridParameter();
result.init(data);
return result;
}
let result = new RoomGridParameter();
result.init(data);
return result;
Expand Down
24 changes: 0 additions & 24 deletions src/TypeScriptSDK/models/_GridParameterBase.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import { IsNumber, IsDefined, IsBoolean, IsOptional, IsString, validate, ValidationError as TsValidationError } from 'class-validator';
import { _OpenAPIGenBaseModel } from "./_OpenAPIGenBaseModel";
import { ExteriorApertureGridParameter } from "./ExteriorApertureGridParameter";
import { ExteriorFaceGridParameter } from "./ExteriorFaceGridParameter";
import { RoomGridParameter } from "./RoomGridParameter";
import { RoomRadialGridParameter } from "./RoomRadialGridParameter";

/** Base object for all GridParameters. */
export class _GridParameterBase extends _OpenAPIGenBaseModel {
Expand Down Expand Up @@ -42,26 +38,6 @@ export class _GridParameterBase extends _OpenAPIGenBaseModel {
static override fromJS(data: any): _GridParameterBase {
data = typeof data === 'object' ? data : {};

if (data["type"] === "RoomGridParameter") {
let result = new RoomGridParameter();
result.init(data);
return result;
}
if (data["type"] === "RoomRadialGridParameter") {
let result = new RoomRadialGridParameter();
result.init(data);
return result;
}
if (data["type"] === "ExteriorFaceGridParameter") {
let result = new ExteriorFaceGridParameter();
result.init(data);
return result;
}
if (data["type"] === "ExteriorApertureGridParameter") {
let result = new ExteriorApertureGridParameter();
result.init(data);
return result;
}
let result = new _GridParameterBase();
result.init(data);
return result;
Expand Down
12 changes: 0 additions & 12 deletions src/TypeScriptSDK/models/_LouversBase.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { IsNumber, IsDefined, IsOptional, IsArray, ValidateNested, IsBoolean, IsString, validate, ValidationError as TsValidationError } from 'class-validator';
import { _OpenAPIGenBaseModel } from "./_OpenAPIGenBaseModel";
import { LouversByCount } from "./LouversByCount";
import { LouversByDistance } from "./LouversByDistance";

/** Base class for for a series of louvered shades over a wall. */
export class _LouversBase extends _OpenAPIGenBaseModel {
Expand Down Expand Up @@ -62,16 +60,6 @@ export class _LouversBase extends _OpenAPIGenBaseModel {
static override fromJS(data: any): _LouversBase {
data = typeof data === 'object' ? data : {};

if (data["type"] === "LouversByDistance") {
let result = new LouversByDistance();
result.init(data);
return result;
}
if (data["type"] === "LouversByCount") {
let result = new LouversByCount();
result.init(data);
return result;
}
let result = new _LouversBase();
result.init(data);
return result;
Expand Down
Loading
Loading