added optional workingdir parameter in constructGotRequest and getCurlRequest

Author: koul1sh

src/constructCurl.ts

@@ -8,9 +8,9 @@ function replaceSingleQuotes<T>(value: T): T {
   return value.replace(/'/g, "%27") as T & string;
 }
 
-function formatCurlFormField(key: string, value: string): string {
+function formatCurlFormField(key: string, value: string, workingDir?: string): string {
   if (isFilePath(value)) {
-    return ` --form ${key}=@"${path.resolve(value.slice(7))}"`;
+    return ` --form ${key}=@"${path.resolve(workingDir || "", value.slice(7))}"`; // if workingDir not given, it takes current working directory.
   }
   return ` --form '${key}="${encodeURIComponent(value)}"'`;
 }
@@ -27,30 +27,30 @@ function getFormDataUrlEncoded(request: RequestSpec): string {
   return result;
 }
 
-function getFormDataCurlRequest(request: RequestSpec): string {
+function getFormDataCurlRequest(request: RequestSpec, workingDir?: string): string {
   const formValues = request.httpRequest.formValues;
   if (!formValues) return "";
   let result = "";
   for (const { name, value } of formValues) {
-    result += formatCurlFormField(name, value);
+    result += formatCurlFormField(name, value, workingDir);
   }
   return result;
 }
 
-export function getCurlRequest(request: RequestSpec): string {
+export function getCurlRequest(request: RequestSpec, workingDir?: string): string {
   let curl: string = "curl";
 
   if (
     request.httpRequest.headers["content-type"] == "multipart/form-data" ||
     hasFile(request.httpRequest.formValues)
   ) {
-    curl += getFormDataCurlRequest(request);
+    curl += getFormDataCurlRequest(request, workingDir);
     curl += ` '${replaceSingleQuotes(
       getURL(
         request.httpRequest.baseUrl,
         request.httpRequest.url,
-        getParamsForUrl(request.httpRequest.params, request.options.rawParams),
-      ),
+        getParamsForUrl(request.httpRequest.params, request.options.rawParams)
+      )
     )}'`;
     return curl;
   } else if (
@@ -62,8 +62,8 @@ export function getCurlRequest(request: RequestSpec): string {
       getURL(
         request.httpRequest.baseUrl,
         request.httpRequest.url,
-        getParamsForUrl(request.httpRequest.params, request.options.rawParams),
-      ),
+        getParamsForUrl(request.httpRequest.params, request.options.rawParams)
+      )
     )}'`;
     return curl;
   }
@@ -97,8 +97,8 @@ export function getCurlRequest(request: RequestSpec): string {
     getURL(
       request.httpRequest.baseUrl,
       request.httpRequest.url,
-      getParamsForUrl(request.httpRequest.params, request.options.rawParams),
-    ),
+      getParamsForUrl(request.httpRequest.params, request.options.rawParams)
+    )
   )}'`;
 
   return curl;

src/executeRequest.ts

@@ -10,16 +10,16 @@ import { FormData } from "formdata-node";
 import { Readable } from "stream";
 import * as path from "path";
 
-export function constructGotRequest(allData: RequestSpec): GotRequest {
+export function constructGotRequest(allData: RequestSpec, workingDir?: string): GotRequest {
   const completeUrl: string = getURL(
     allData.httpRequest.baseUrl,
     allData.httpRequest.url,
-    getParamsForUrl(allData.httpRequest.params, allData.options.rawParams),
+    getParamsForUrl(allData.httpRequest.params, allData.options.rawParams)
   );
 
   const options: OptionsOfTextResponseBody = {
     method: allData.httpRequest.method.toLowerCase() as Method,
-    body: getBody(allData),
+    body: getBody(allData, workingDir),
     headers: allData.httpRequest.headers,
     followRedirect: allData.options.follow,
     https: { rejectUnauthorized: allData.options.verifySSL },
@@ -29,8 +29,13 @@ export function constructGotRequest(allData: RequestSpec): GotRequest {
   return got(completeUrl, options);
 }
 
-function getFileFromPath(filePath: string) {
-  filePath = path.resolve(filePath.slice(7)); // removes file:// prefix
+function getFileFromPath(filePath: string, workingDir?: string) {
+  if (workingDir) {
+    filePath = path.resolve(workingDir, filePath.slice(7)); // removes <file://> prefix
+  } else {
+    filePath = path.resolve(filePath.slice(7)); // takes current working directory
+  }
+
   const fileName = path.basename(filePath);
   return fileFromPathSync(filePath, fileName);
 }
@@ -50,14 +55,14 @@ function constructFormUrlEncoded(request: RequestSpec) {
   return result.toString();
 }
 
-function constructFormData(request: RequestSpec) {
+function constructFormData(request: RequestSpec, workingDir?: string) {
   const formValues = request.httpRequest.formValues;
   if (!formValues) return;
   const multipart = new FormData();
 
   for (const fv of formValues) {
     if (isFilePath(fv.value)) {
-      multipart.append(fv.name, getFileFromPath(fv.value));
+      multipart.append(fv.name, getFileFromPath(fv.value, workingDir));
     } else {
       multipart.append(fv.name, fv.value);
     }
@@ -68,12 +73,12 @@ function constructFormData(request: RequestSpec) {
   return Readable.from(fde);
 }
 
-export function getBody(request: RequestSpec) {
+export function getBody(request: RequestSpec, workingDir?: string) {
   const body = request.httpRequest.body;
   const formValues = request.httpRequest.formValues;
 
   if (request.httpRequest.headers["content-type"] == "multipart/form-data" || hasFile(formValues)) {
-    return constructFormData(request);
+    return constructFormData(request, workingDir);
   }
 
   if (formValues) {