@flink-app/test-utils 0.4.4 → 0.4.5

package/dist/index.d.ts

@@ -12,7 +12,7 @@ export declare type HttpOpts = {
  * Should be invoked prior to using test methods.
  */
 export declare function init(_app: FlinkApp<any>, host?: string): void;
-export declare function get<T = any>(path: string, opts?: HttpOpts): Promise<FlinkResponse<T>>;
-export declare function post<T = any>(path: string, body: any, opts?: HttpOpts): Promise<FlinkResponse<T>>;
-export declare function put<T = any>(path: string, body: any, opts?: HttpOpts): Promise<FlinkResponse<T>>;
-export declare function del<T = any>(path: string, opts?: HttpOpts): Promise<FlinkResponse<T>>;
+export declare function get<Res = any>(path: string, opts?: HttpOpts): Promise<FlinkResponse<Res>>;
+export declare function post<Req = any, Res = any>(path: string, body: Req, opts?: HttpOpts): Promise<FlinkResponse<Res>>;
+export declare function put<Req = any, Res = any>(path: string, body: Req, opts?: HttpOpts): Promise<FlinkResponse<Res>>;
+export declare function del<Res = any>(path: string, opts?: HttpOpts): Promise<FlinkResponse<Res>>;

package/dist/index.js

@@ -140,7 +140,7 @@ function del(path, opts) {
 exports.del = del;
 function validateApp() {
     if (!app) {
-        throw new Error("App not initialized, run `init(app)` prior to invoking get/post/put/del");
+        throw new Error("App not initialized, run `init(app)` prior to invoking get/post/put/del");
     }
 }
 function getUrl(path, queryString) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flink-app/test-utils",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "Test utils for Flink",
   "scripts": {
     "test": "echo \"Error: no test specified\"",
@@ -19,7 +19,7 @@
     "qs": "^6.7.0"
   },
   "devDependencies": {
-    "@flink-app/flink": "^0.4.4",
+    "@flink-app/flink": "^0.4.5",
     "@types/express": "^4.17.12",
     "@types/got": "^9.6.12",
     "@types/node": "^15.6.2",
@@ -29,5 +29,5 @@
     "tsc-watch": "^4.2.9",
     "typescript": "^4.2.4"
   },
-  "gitHead": "f7b39bc69a69b51311352b1368093bc4c5d05a39"
+  "gitHead": "38a0ca4c987f280accc5f4c7f408e51f7b076587"
 }

package/src/index.ts

@@ -6,14 +6,14 @@ let app: FlinkApp<any>;
 let baseUrl: string;
 
 const gotOpts: GotJSONOptions = {
-  throwHttpErrors: false,
-  json: true,
-  retry: 0,
+    throwHttpErrors: false,
+    json: true,
+    retry: 0,
 };
 
 export type HttpOpts = {
-  qs?: { [x: string]: string | string[] };
-  headers?: { [x: string]: string };
+    qs?: { [x: string]: string | string[] };
+    headers?: { [x: string]: string };
 };
 
 /**
@@ -21,86 +21,70 @@ export type HttpOpts = {
  * Should be invoked prior to using test methods.
  */
 export function init(_app: FlinkApp<any>, host = "localhost") {
-  app = _app;
-  baseUrl = `http://${host}:${app.port}`;
+    app = _app;
+    baseUrl = `http://${host}:${app.port}`;
 }
 
-export async function get<T = any>(
-  path: string,
-  opts: HttpOpts = {}
-): Promise<FlinkResponse<T>> {
-  validateApp();
-  const res = await got.get(getUrl(path, opts.qs), {
-    ...gotOpts,
-    headers: opts.headers,
-  });
-  return {
-    status: res.statusCode,
-    ...res.body,
-  };
+export async function get<Res = any>(path: string, opts: HttpOpts = {}): Promise<FlinkResponse<Res>> {
+    validateApp();
+    const res = await got.get(getUrl(path, opts.qs), {
+        ...gotOpts,
+        headers: opts.headers,
+    });
+    return {
+        status: res.statusCode,
+        ...res.body,
+    };
 }
 
-export async function post<T = any>(
-  path: string,
-  body: any,
-  opts: HttpOpts = {}
-): Promise<FlinkResponse<T>> {
-  validateApp();
-  const res = await got.post(getUrl(path, opts.qs), {
-    ...gotOpts,
-    body,
-    headers: opts.headers,
-  });
+export async function post<Req = any, Res = any>(path: string, body: Req, opts: HttpOpts = {}): Promise<FlinkResponse<Res>> {
+    validateApp();
+    const res = await got.post(getUrl(path, opts.qs), {
+        ...gotOpts,
+        body: body as any,
+        headers: opts.headers,
+    });
 
-  return {
-    status: res.statusCode,
-    ...res.body,
-  };
+    return {
+        status: res.statusCode,
+        ...res.body,
+    };
 }
 
-export async function put<T = any>(
-  path: string,
-  body: any,
-  opts: HttpOpts = {}
-): Promise<FlinkResponse<T>> {
-  validateApp();
-  const res = await got.put(getUrl(path, opts.qs), {
-    ...gotOpts,
-    body,
-    headers: opts.headers,
-  });
-  return {
-    status: res.statusCode,
-    ...res.body,
-  };
+export async function put<Req = any, Res = any>(path: string, body: Req, opts: HttpOpts = {}): Promise<FlinkResponse<Res>> {
+    validateApp();
+    const res = await got.put(getUrl(path, opts.qs), {
+        ...gotOpts,
+        body: body as any,
+        headers: opts.headers,
+    });
+    return {
+        status: res.statusCode,
+        ...res.body,
+    };
 }
 
-export async function del<T = any>(
-  path: string,
-  opts: HttpOpts = {}
-): Promise<FlinkResponse<T>> {
-  validateApp();
-  const res = await got.delete(getUrl(path, opts.qs), {
-    ...gotOpts,
-    headers: opts.headers,
-  });
-  return {
-    status: res.statusCode,
-    ...res.body,
-  };
+export async function del<Res = any>(path: string, opts: HttpOpts = {}): Promise<FlinkResponse<Res>> {
+    validateApp();
+    const res = await got.delete(getUrl(path, opts.qs), {
+        ...gotOpts,
+        headers: opts.headers,
+    });
+    return {
+        status: res.statusCode,
+        ...res.body,
+    };
 }
 
 function validateApp() {
-  if (!app) {
-    throw new Error(
-      "App not initialized, run `init(app)` prior to invoking get/post/put/del"
-    );
-  }
+    if (!app) {
+        throw new Error("App not initialized, run `init(app)` prior to invoking get/post/put/del");
+    }
 }
 
 function getUrl(path: string, queryString?: HttpOpts["qs"]) {
-  if (queryString) {
-    return baseUrl + path + "?" + qs.stringify(queryString);
-  }
-  return baseUrl + path;
+    if (queryString) {
+        return baseUrl + path + "?" + qs.stringify(queryString);
+    }
+    return baseUrl + path;
 }