Merge pull request #21 from regulaforensics/feature/export-base-request

Add baseRequest as process param

Author: hotibolshe

src/ext/document-reader.ts

@@ -6,7 +6,7 @@ import {Configuration} from "../configuration.js";
 import globalAxios, {AxiosInstance} from "axios";
 import {BASE_PATH} from "../base.js";
 import {ProcessRequestImage as ProcessRequestImageBase} from "../models/index.js";
-import {Base64String, ProcessRequest} from "./process-request.js";
+import {Base64String, instanceOfProcessRequest, ProcessRequest} from "./process-request.js";
 import {ProcessRequestImage} from "./process-request-image.js";
 
 // @ts-ignore
@@ -32,23 +32,29 @@ export class DocumentReaderApi {
    * @param {*} [options] Override http request option.
    * @throws {RequiredError} If some request params are missed
    * */
-  process(processRequest: ProcessRequest, options?: any): Promise<Response> {
+  process(request: ProcessRequest | ProcessRequestBase, options?: any): Promise<Response> {
+    let baseRequest;
+
+    if (instanceOfProcessRequest(request)) {
+      if (!request.processParam) {
+        request.processParam = {
+          scenario: Scenario.FULL_PROCESS,
+          resultTypeOutput: [Result.TEXT]
+        }
+      }
+      if (!request.systemInfo) {
+        request.systemInfo = {}
+      }
 
-    if (!processRequest.processParam) {
-      processRequest.processParam = {
-        scenario: Scenario.FULL_PROCESS,
-        resultTypeOutput: [Result.TEXT]
+      if (!request.systemInfo.license && this.license) {
+        request.systemInfo.license = this.license
       }
-    }
-    if (!processRequest.systemInfo) {
-      processRequest.systemInfo = {}
-    }
 
-    if (!processRequest.systemInfo.license && this.license) {
-      processRequest.systemInfo.license = this.license
+      baseRequest = requestToBaseRequest(request)
+    } else {
+      baseRequest = request
     }
 
-    const baseRequest = requestToBaseRequest(processRequest)
     return this.processApi.apiProcess(baseRequest, options)
       .then((axiosResult) => new Response(axiosResult.data));
   }

src/ext/process-request.ts

@@ -27,4 +27,6 @@ export interface ProcessRequest {
     systemInfo?: ProcessSystemInfo;
 }
 
-
+export const instanceOfProcessRequest = (data: any): data is ProcessRequest => {
+    return 'images' in data
+}