Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 26fa51a

Browse files
ddunkinddunkin
authored
Merge pull request #3 from ddunkin/strict-typescript
Generate TypeScript strict mode compatible code.
2 parents d0bd757 + deb84ac commit 26fa51a

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

‎example/ts/exampleApi.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ type IFetch = HttpClientUtility.IFetch;
333333
type IFetchRequest = HttpClientUtility.IFetchRequest;
334334

335335
class ExampleApiHttpClient implements IExampleApi {
336-
constructor(fetch: IFetch, baseUri: string) {
336+
constructor(fetch: IFetch, baseUri?: string) {
337337
if (typeof fetch !== 'function') {
338338
throw new TypeError('fetch must be a function.');
339339
}
@@ -366,7 +366,7 @@ class ExampleApiHttpClient implements IExampleApi {
366366
return fetchResponse(this._fetch, this._baseUri + uri, fetchRequest)
367367
.then(result => {
368368
const status = result.response.status;
369-
let value: IGetWidgetsResponse = null;
369+
let value: IGetWidgetsResponse | null = null;
370370
if (result.json) {
371371
if (status === 200) {
372372
value = result.json;
@@ -393,7 +393,7 @@ class ExampleApiHttpClient implements IExampleApi {
393393
return fetchResponse(this._fetch, this._baseUri + uri, fetchRequest)
394394
.then(result => {
395395
const status = result.response.status;
396-
let value: ICreateWidgetResponse = null;
396+
let value: ICreateWidgetResponse | null = null;
397397
if (result.json) {
398398
if (status === 201) {
399399
value = { widget: result.json };
@@ -422,7 +422,7 @@ class ExampleApiHttpClient implements IExampleApi {
422422
return fetchResponse(this._fetch, this._baseUri + uri, fetchRequest)
423423
.then(result => {
424424
const status = result.response.status;
425-
let value: IGetWidgetResponse = null;
425+
let value: IGetWidgetResponse | null = null;
426426
if (result.json) {
427427
if (status === 200) {
428428
value = { widget: result.json };
@@ -456,7 +456,7 @@ class ExampleApiHttpClient implements IExampleApi {
456456
return fetchResponse(this._fetch, this._baseUri + uri, fetchRequest)
457457
.then(result => {
458458
const status = result.response.status;
459-
let value: IDeleteWidgetResponse = null;
459+
let value: IDeleteWidgetResponse | null = null;
460460
if (result.json) {
461461
if (status === 204) {
462462
value = {};
@@ -487,7 +487,7 @@ class ExampleApiHttpClient implements IExampleApi {
487487
return fetchResponse(this._fetch, this._baseUri + uri, fetchRequest)
488488
.then(result => {
489489
const status = result.response.status;
490-
let value: IEditWidgetResponse = null;
490+
let value: IEditWidgetResponse | null = null;
491491
if (result.json) {
492492
if (status === 200) {
493493
value = { widget: result.json };
@@ -514,7 +514,7 @@ class ExampleApiHttpClient implements IExampleApi {
514514
return fetchResponse(this._fetch, this._baseUri + uri, fetchRequest)
515515
.then(result => {
516516
const status = result.response.status;
517-
let value: IGetWidgetBatchResponse = null;
517+
let value: IGetWidgetBatchResponse | null = null;
518518
if (result.json) {
519519
if (status === 200) {
520520
value = { results: result.json };
@@ -543,7 +543,7 @@ class ExampleApiHttpClient implements IExampleApi {
543543
return fetchResponse(this._fetch, this._baseUri + uri, fetchRequest)
544544
.then(result => {
545545
const status = result.response.status;
546-
let value: IGetWidgetWeightResponse = null;
546+
let value: IGetWidgetWeightResponse | null = null;
547547
if (result.json) {
548548
if (status === 200) {
549549
value = result.json;
@@ -569,7 +569,7 @@ class ExampleApiHttpClient implements IExampleApi {
569569
return fetchResponse(this._fetch, this._baseUri + uri, fetchRequest)
570570
.then(result => {
571571
const status = result.response.status;
572-
let value: IGetPreferenceResponse = null;
572+
let value: IGetPreferenceResponse | null = null;
573573
if (result.json) {
574574
if (status === 200) {
575575
value = { value: result.json };
@@ -597,7 +597,7 @@ class ExampleApiHttpClient implements IExampleApi {
597597
return fetchResponse(this._fetch, this._baseUri + uri, fetchRequest)
598598
.then(result => {
599599
const status = result.response.status;
600-
let value: ISetPreferenceResponse = null;
600+
let value: ISetPreferenceResponse | null = null;
601601
if (result.json) {
602602
if (status === 200) {
603603
value = { value: result.json };
@@ -619,7 +619,7 @@ class ExampleApiHttpClient implements IExampleApi {
619619
return fetchResponse(this._fetch, this._baseUri + uri, fetchRequest)
620620
.then(result => {
621621
const status = result.response.status;
622-
let value: IGetInfoResponse = null;
622+
let value: IGetInfoResponse | null = null;
623623
if (result.json) {
624624
if (status === 200) {
625625
value = result.json;
@@ -641,7 +641,7 @@ class ExampleApiHttpClient implements IExampleApi {
641641
return fetchResponse(this._fetch, this._baseUri + uri, fetchRequest)
642642
.then(result => {
643643
const status = result.response.status;
644-
let value: INotRestfulResponse = null;
644+
let value: INotRestfulResponse | null = null;
645645
if (result.json) {
646646
if (status === 200) {
647647
value = {};
@@ -664,7 +664,7 @@ class ExampleApiHttpClient implements IExampleApi {
664664
return fetchResponse(this._fetch, this._baseUri + uri, fetchRequest)
665665
.then(result => {
666666
const status = result.response.status;
667-
let value: IKitchenResponse = null;
667+
let value: IKitchenResponse | null = null;
668668
if (result.json) {
669669
if (status === 200) {
670670
value = {};

‎src/Facility.CodeGen.JavaScript/JavaScriptGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ protected override CodeGenOutput GenerateOutputCore(ServiceInfo service)
9595
code.WriteLine();
9696
using (code.Block($"class {capModuleName}HttpClient" + IfTypeScript($" implements I{capModuleName}") + " {", "}"))
9797
{
98-
using (code.Block("constructor(fetch" + IfTypeScript(": IFetch") + ", baseUri" + IfTypeScript(": string") + ") {", "}"))
98+
using (code.Block("constructor(fetch" + IfTypeScript(": IFetch") + ", baseUri" + IfTypeScript("?: string") + ") {", "}"))
9999
{
100100
using (code.Block("if (typeof fetch !== 'function') {", "}"))
101101
code.WriteLine("throw new TypeError('fetch must be a function.');");
@@ -192,7 +192,7 @@ protected override CodeGenOutput GenerateOutputCore(ServiceInfo service)
192192
using (code.Block(".then(result => {", "});"))
193193
{
194194
code.WriteLine("const status = result.response.status;");
195-
code.WriteLine("let value" + IfTypeScript($": I{capMethodName}Response") + " = null;");
195+
code.WriteLine("let value" + IfTypeScript($": I{capMethodName}Response | null") + " = null;");
196196
using (code.Block($"if (result.json) {{", "}"))
197197
{
198198
var validResponses = httpMethodInfo.ValidResponses;

0 commit comments

Comments
 (0)