d5-api-initializer 1.3.0 → 1.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "d5-api-initializer",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "license": "MIT",
   "dependencies": {},
   "main": "publish/cjs/d5-api-initializer",

package/publish/cjs/d5-api-initializer.cjs

@@ -128,8 +128,8 @@ var ApiHttpRequest = class {
   set timeout(milliseconds) {
     this._jsWapiHttp = this._jsWapiHttp.setTimeout(milliseconds);
   }
-  setHeader(name, value) {
-    this._jsWapiHttp = this._jsWapiHttp.setHeader(name, "".concat(value));
+  setHeader(header, value) {
+    this._jsWapiHttp = this._jsWapiHttp.setHeader(header, "".concat(value));
     return this;
   }
   setHeaders(headers) {
@@ -145,7 +145,7 @@ var ApiHttpRequest = class {
   GET(callback) {
     return this._jsWapiHttp.GET(this._getWrappedCallback(callback));
   }
-  POST(request, callback) {
+  POST(request = {}, callback) {
     return this._jsWapiHttp.POST((req) => {
       if (request instanceof FileLink)
         return req.setBody((body) => body.setFileLink(request.link));
@@ -154,6 +154,9 @@ var ApiHttpRequest = class {
       if (request instanceof MultipartFormData) {
         return this.setMultipartBody(req, request);
       }
+      if (typeof request === "string") {
+        return req.setBody(request);
+      }
       return req.setBody(JSON.stringify(request));
     }, this._getWrappedCallback(callback));
   }
@@ -177,11 +180,11 @@ var ApiHttpRequest = class {
       return body;
     });
   }
-  PUT(requestBody, callback) {
-    return this._jsWapiHttp.PUT(JSON.stringify(requestBody), this._getWrappedCallback(callback));
+  PUT(body = {}, callback) {
+    return this._jsWapiHttp.PUT(typeof body === "string" ? body : JSON.stringify(body), this._getWrappedCallback(callback));
   }
-  PATCH(requestBody, callback) {
-    return this._jsWapiHttp.PATCH(JSON.stringify(requestBody), this._getWrappedCallback(callback));
+  PATCH(body = {}, callback) {
+    return this._jsWapiHttp.PATCH(typeof body === "string" ? body : JSON.stringify(body), this._getWrappedCallback(callback));
   }
   _getWrappedCallback(callback) {
     return (res) => {
@@ -227,12 +230,20 @@ var ApiResponse = class {
     }
     return this;
   }
-  sendHttpResponse(headers, body) {
-    this._jsWapiResponse.sendHttpResponse(headers, body);
-    return this;
+  sendHttpResponse() {
+    const args = [...arguments];
+    if (args[0] && args[1]) {
+      this._jsWapiResponse.sendHttpResponse(args[0], args[1]);
+      return this;
+    }
+    if (args[0] && !args[1]) {
+      this._jsWapiResponse.sendHttpResponse(args[0]);
+      return this;
+    }
+    throw new Error("Wrong parameters in function sendHttpResponse()");
   }
   sendHttpBody(body) {
-    this._jsWapiResponse.sendHttpResponse({}, body);
+    this._jsWapiResponse.sendHttpResponse(body);
     return this;
   }
   getPage() {

package/publish/d5-api-initializer.d.ts

@@ -72,6 +72,7 @@ declare namespace jsWapi {
         setResponse(resp: {
             [key: string]: Record<string, any>[];
         }): void;
+        sendHttpResponse(body: string | BinaryDataStream): void;
         sendHttpResponse(headers: Record<string, any>, body: string | BinaryDataStream): void;
         getPagesPredict(): number;
         setPagesPredict(pagesPredict: number): void;
@@ -173,16 +174,16 @@ declare class MultipartFormData {
 declare class ApiHttpRequest {
     private _jsWapiHttp;
     constructor(jsWapiHttp: jsWapi.JSWapiHttp);
-    set headers(headers: IMappedCollection);
+    set headers(headers: Record<string, string>);
     set timeout(milliseconds: number);
-    setHeader(name: string, value: any): ApiHttpRequest;
-    setHeaders(headers: IMappedCollection): ApiHttpRequest;
+    setHeader(header: string, value: string): ApiHttpRequest;
+    setHeaders(headers: Record<string, string>): ApiHttpRequest;
     setTimeout(milliseconds: number): ApiHttpRequest;
     GET(callback?: IHttpCallback): any;
-    POST(request: FileLink | FileRequestId | MultipartFormData | Record<string, any>, callback?: IHttpCallback): any;
+    POST(request?: FileLink | FileRequestId | MultipartFormData | Record<string, any> | string, callback?: IHttpCallback): any;
     private setMultipartBody;
-    PUT(requestBody: IMappedCollection, callback?: IHttpCallback): any;
-    PATCH(requestBody: IMappedCollection, callback: IHttpCallback): any;
+    PUT(body?: Record<string, any> | string, callback?: IHttpCallback): any;
+    PATCH(body: Record<string, any> | string, callback: IHttpCallback): any;
     private _getWrappedCallback;
 }
 
@@ -195,8 +196,9 @@ declare class ApiResponse {
     getResponse(responseName?: string): IMappedCollection[] | any;
     getResponseObject(): IMappedCollection[] | any;
     setResponse(response: IMappedCollection | any[], fieldsMap?: Record<string, any>): this;
-    sendHttpResponse(headers: IMappedCollection, body: string | jsWapi.BinaryDataStream): this;
-    sendHttpBody(body: string): this;
+    sendHttpResponse(body: string | jsWapi.BinaryDataStream): ApiResponse;
+    sendHttpResponse(headers: Record<string, string>, body: string | jsWapi.BinaryDataStream): ApiResponse;
+    sendHttpBody(body: string | jsWapi.BinaryDataStream): this;
     getPage(): number;
     setPage(page: number): this;
     getPagesPredict(): number;

package/publish/d5-api-initializer.legacy-esm.js

@@ -89,8 +89,8 @@ var ApiHttpRequest = class {
   set timeout(milliseconds) {
     this._jsWapiHttp = this._jsWapiHttp.setTimeout(milliseconds);
   }
-  setHeader(name, value) {
-    this._jsWapiHttp = this._jsWapiHttp.setHeader(name, "".concat(value));
+  setHeader(header, value) {
+    this._jsWapiHttp = this._jsWapiHttp.setHeader(header, "".concat(value));
     return this;
   }
   setHeaders(headers) {
@@ -106,7 +106,7 @@ var ApiHttpRequest = class {
   GET(callback) {
     return this._jsWapiHttp.GET(this._getWrappedCallback(callback));
   }
-  POST(request, callback) {
+  POST(request = {}, callback) {
     return this._jsWapiHttp.POST((req) => {
       if (request instanceof FileLink)
         return req.setBody((body) => body.setFileLink(request.link));
@@ -115,6 +115,9 @@ var ApiHttpRequest = class {
       if (request instanceof MultipartFormData) {
         return this.setMultipartBody(req, request);
       }
+      if (typeof request === "string") {
+        return req.setBody(request);
+      }
       return req.setBody(JSON.stringify(request));
     }, this._getWrappedCallback(callback));
   }
@@ -138,11 +141,11 @@ var ApiHttpRequest = class {
       return body;
     });
   }
-  PUT(requestBody, callback) {
-    return this._jsWapiHttp.PUT(JSON.stringify(requestBody), this._getWrappedCallback(callback));
+  PUT(body = {}, callback) {
+    return this._jsWapiHttp.PUT(typeof body === "string" ? body : JSON.stringify(body), this._getWrappedCallback(callback));
   }
-  PATCH(requestBody, callback) {
-    return this._jsWapiHttp.PATCH(JSON.stringify(requestBody), this._getWrappedCallback(callback));
+  PATCH(body = {}, callback) {
+    return this._jsWapiHttp.PATCH(typeof body === "string" ? body : JSON.stringify(body), this._getWrappedCallback(callback));
   }
   _getWrappedCallback(callback) {
     return (res) => {
@@ -188,12 +191,20 @@ var ApiResponse = class {
     }
     return this;
   }
-  sendHttpResponse(headers, body) {
-    this._jsWapiResponse.sendHttpResponse(headers, body);
-    return this;
+  sendHttpResponse() {
+    const args = [...arguments];
+    if (args[0] && args[1]) {
+      this._jsWapiResponse.sendHttpResponse(args[0], args[1]);
+      return this;
+    }
+    if (args[0] && !args[1]) {
+      this._jsWapiResponse.sendHttpResponse(args[0]);
+      return this;
+    }
+    throw new Error("Wrong parameters in function sendHttpResponse()");
   }
   sendHttpBody(body) {
-    this._jsWapiResponse.sendHttpResponse({}, body);
+    this._jsWapiResponse.sendHttpResponse(body);
     return this;
   }
   getPage() {

package/publish/d5-api-initializer.mjs

@@ -89,8 +89,8 @@ var ApiHttpRequest = class {
   set timeout(milliseconds) {
     this._jsWapiHttp = this._jsWapiHttp.setTimeout(milliseconds);
   }
-  setHeader(name, value) {
-    this._jsWapiHttp = this._jsWapiHttp.setHeader(name, "".concat(value));
+  setHeader(header, value) {
+    this._jsWapiHttp = this._jsWapiHttp.setHeader(header, "".concat(value));
     return this;
   }
   setHeaders(headers) {
@@ -106,7 +106,7 @@ var ApiHttpRequest = class {
   GET(callback) {
     return this._jsWapiHttp.GET(this._getWrappedCallback(callback));
   }
-  POST(request, callback) {
+  POST(request = {}, callback) {
     return this._jsWapiHttp.POST((req) => {
       if (request instanceof FileLink)
         return req.setBody((body) => body.setFileLink(request.link));
@@ -115,6 +115,9 @@ var ApiHttpRequest = class {
       if (request instanceof MultipartFormData) {
         return this.setMultipartBody(req, request);
       }
+      if (typeof request === "string") {
+        return req.setBody(request);
+      }
       return req.setBody(JSON.stringify(request));
     }, this._getWrappedCallback(callback));
   }
@@ -138,11 +141,11 @@ var ApiHttpRequest = class {
       return body;
     });
   }
-  PUT(requestBody, callback) {
-    return this._jsWapiHttp.PUT(JSON.stringify(requestBody), this._getWrappedCallback(callback));
+  PUT(body = {}, callback) {
+    return this._jsWapiHttp.PUT(typeof body === "string" ? body : JSON.stringify(body), this._getWrappedCallback(callback));
   }
-  PATCH(requestBody, callback) {
-    return this._jsWapiHttp.PATCH(JSON.stringify(requestBody), this._getWrappedCallback(callback));
+  PATCH(body = {}, callback) {
+    return this._jsWapiHttp.PATCH(typeof body === "string" ? body : JSON.stringify(body), this._getWrappedCallback(callback));
   }
   _getWrappedCallback(callback) {
     return (res) => {
@@ -188,12 +191,20 @@ var ApiResponse = class {
     }
     return this;
   }
-  sendHttpResponse(headers, body) {
-    this._jsWapiResponse.sendHttpResponse(headers, body);
-    return this;
+  sendHttpResponse() {
+    const args = [...arguments];
+    if (args[0] && args[1]) {
+      this._jsWapiResponse.sendHttpResponse(args[0], args[1]);
+      return this;
+    }
+    if (args[0] && !args[1]) {
+      this._jsWapiResponse.sendHttpResponse(args[0]);
+      return this;
+    }
+    throw new Error("Wrong parameters in function sendHttpResponse()");
   }
   sendHttpBody(body) {
-    this._jsWapiResponse.sendHttpResponse({}, body);
+    this._jsWapiResponse.sendHttpResponse(body);
     return this;
   }
   getPage() {