From: Jakub Jirutka <jakub@jirutka.cz>
Date: Sat, 31 Oct 2020 21:38:22 +0000 (+0100)
Subject: Types: fixed signature of subrequest() with detached: true.
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=d30b6f28144fe09c9d520a27d7dbe2157289a9b0;p=njs.git

Types: fixed signature of subrequest() with detached: true.

Order of method overloading declaration matters.
---

diff --git a/test/ts/test.ts b/test/ts/test.ts
index ce7940de..30d92dab 100644
--- a/test/ts/test.ts
+++ b/test/ts/test.ts
@@ -5,6 +5,7 @@ import crypto from 'crypto';
 function http_module(r: NginxHTTPRequest) {
     var bs: NjsByteString;
     var s: string;
+    var vod: void;
 
     // builtin string vs NjsByteString
 
@@ -57,9 +58,12 @@ function http_module(r: NginxHTTPRequest) {
 
     // r.subrequest
     r.subrequest('/p/sub1').then(reply => r.return(reply.status));
-    r.subrequest('/p/sub2', reply => r.return(reply.status));
-    r.subrequest('/p/sub3', {detached:true});
-    r.subrequest('/p/sub4', 'a=1&b=2').then(reply => r.return(reply.status,
+    r.subrequest('/p/sub2', {method:'POST'}).then(reply => r.return(reply.status));
+    vod = r.subrequest('/p/sub3', reply => r.return(reply.status));
+    vod = r.subrequest('/p/sub4', {method:'POST'}, reply => r.return(reply.status));
+    vod = r.subrequest('/p/sub5', {detached:true});
+    // Warning: vod = r.subrequest('/p/sub9', {detached:true}, reply => r.return(reply.status));
+    r.subrequest('/p/sub6', 'a=1&b=2').then(reply => r.return(reply.status,
                                         JSON.stringify(JSON.parse(reply.responseBody ?? ''))));
 
 }
diff --git a/ts/ngx_http_js_module.d.ts b/ts/ngx_http_js_module.d.ts
index c6b94e4f..93364034 100644
--- a/ts/ngx_http_js_module.d.ts
+++ b/ts/ngx_http_js_module.d.ts
@@ -346,11 +346,11 @@ interface NginxHTTPRequest {
      * @param options Subrequest options.
      * @param callback Completion callback.
      */
+    subrequest(uri: NjsStringLike, options: NginxSubrequestOptions & { detached: true }): void;
     subrequest(uri: NjsStringLike, options?: NginxSubrequestOptions | string): Promise<NginxHTTPRequest>;
-    subrequest(uri: NjsStringLike, options: NginxSubrequestOptions | string,
+    subrequest(uri: NjsStringLike, options: NginxSubrequestOptions & { detached?: false } | string,
                callback:(reply:NginxHTTPRequest) => void): void;
     subrequest(uri: NjsStringLike, callback:(reply:NginxHTTPRequest) => void): void;
-    subrequest(uri: NjsStringLike, options: NginxSubrequestOptions & { detached: true }): void;
     /**
      * Current URI in request, normalized.
      */