@quantform/core 0.7.0-beta.10 → 0.7.0-beta.12

package/dist/make-test-module.d.ts

@@ -7,7 +7,7 @@ export declare function makeTestModule(dependencies: Dependency[]): Promise<{
 }>;
 type MockableFunction = (...args: any[]) => any;
 export declare const mockedFunc: <Func extends MockableFunction>(mockedFunc: Func) => jest.MockedFunction<Func>;
-export declare function toArray<T>(observable: Observable<T>): T[];
+export declare function toArray<T>(observable: Observable<T>): (Error | T)[];
 export type InferObservableType<T> = T extends Observable<infer U> ? U : never;
 export {};
 //# sourceMappingURL=make-test-module.d.ts.map

package/dist/make-test-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"make-test-module.d.ts","sourceRoot":"","sources":["../src/make-test-module.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAO,MAAM,MAAM,CAAC;AAGvC,OAAO,EAAE,UAAU,EAAU,MAAM,aAAa,CAAC;AAEjD,wBAAsB,cAAc,CAAC,YAAY,EAAE,UAAU,EAAE;;;GAS9D;AAED,KAAK,gBAAgB,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;AAEhD,eAAO,MAAM,UAAU,gFAC+B,CAAC;AAEvD,wBAAgB,OAAO,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,OAsBnD;AAED,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC"}
+{"version":3,"file":"make-test-module.d.ts","sourceRoot":"","sources":["../src/make-test-module.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAGlC,OAAO,EAAE,UAAU,EAAU,MAAM,aAAa,CAAC;AAEjD,wBAAsB,cAAc,CAAC,YAAY,EAAE,UAAU,EAAE;;;GAS9D;AAED,KAAK,gBAAgB,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;AAEhD,eAAO,MAAM,UAAU,gFAC+B,CAAC;AAEvD,wBAAgB,OAAO,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,iBAyBnD;AAED,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC"}

package/dist/make-test-module.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toArray = exports.mockedFunc = exports.makeTestModule = void 0;
-const rxjs_1 = require("rxjs");
 const core_1 = require("./core");
 const module_1 = require("./module");
 function makeTestModule(dependencies) {
@@ -40,7 +39,10 @@ function toArray(observable) {
         }
         return it;
     };
-    observable.pipe((0, rxjs_1.tap)(it => array.push(clone(it)))).subscribe();
+    observable.subscribe({
+        next: it => array.push(clone(it)),
+        error: it => array.push(it)
+    });
     return array;
 }
 exports.toArray = toArray;

package/dist/use-logger.js

@@ -31,7 +31,7 @@ exports.useLogger = (0, use_1.use)((context, tint) => {
             ? console.warn(`${prefix()}: ${message}`, params)
             : console.warn(`${prefix()}: ${message}`),
         error: (message, ...params) => (params === null || params === void 0 ? void 0 : params.length)
-            ? console.error(`${prefix()}: ${message}`, params)
-            : console.error(`${prefix()}: ${message}`)
+            ? console.error(`${prefix()}: ${chalk_1.default.red(message)}`, params)
+            : console.error(`${prefix()}: ${chalk_1.default.red(message)}`)
     };
 });

package/dist/use-request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-request.d.ts","sourceRoot":"","sources":["../src/use-request.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,aAAa,GACrB,KAAK,GACL,MAAM,GACN,MAAM,GACN,KAAK,GACL,QAAQ,GACR,SAAS,GACT,SAAS,GACT,OAAO,GACP,OAAO,CAAC;AAEZ,qBAAa,mBAAoB,SAAQ,KAAK;IAChC,QAAQ,CAAC,UAAU,EAAE,MAAM;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC;gBAAxD,UAAU,EAAE,MAAM,EAAW,IAAI,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC;CAG9E;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE;IAC/B,MAAM,EAAE,aAAa,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;;;GAmBA"}
+{"version":3,"file":"use-request.d.ts","sourceRoot":"","sources":["../src/use-request.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,aAAa,GACrB,KAAK,GACL,MAAM,GACN,MAAM,GACN,KAAK,GACL,QAAQ,GACR,SAAS,GACT,SAAS,GACT,OAAO,GACP,OAAO,CAAC;AAEZ,qBAAa,mBAAoB,SAAQ,KAAK;IAChC,QAAQ,CAAC,UAAU,EAAE,MAAM;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC;gBAAxD,UAAU,EAAE,MAAM,EAAW,IAAI,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC;CAG9E;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE;IAC/B,MAAM,EAAE,aAAa,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;;;GA8BA"}

package/dist/use-request.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useRequest = exports.RequestNetworkError = void 0;
 const rxjs_1 = require("rxjs");
 const undici_1 = require("undici");
+const use_logger_1 = require("./use-logger");
 const use_timestamp_1 = require("./use-timestamp");
 class RequestNetworkError extends Error {
     constructor(statusCode, json) {
@@ -13,15 +14,20 @@ class RequestNetworkError extends Error {
 }
 exports.RequestNetworkError = RequestNetworkError;
 function useRequest(args) {
-    return (0, rxjs_1.from)((0, undici_1.request)(args.url, {
-        method: args.method,
-        headers: args.headers,
-        body: args.body
-    })).pipe((0, rxjs_1.switchMap)(it => {
-        if (it.statusCode !== 200) {
-            return (0, rxjs_1.throwError)(() => new RequestNetworkError(it.statusCode, () => it.body.json()));
-        }
-        return (0, rxjs_1.from)(it.body.json());
-    }), (0, rxjs_1.map)(payload => ({ timestamp: (0, use_timestamp_1.useTimestamp)(), payload })));
+    const { info, error } = (0, use_logger_1.useLogger)(useRequest.name);
+    return (0, rxjs_1.defer)(() => {
+        info('requested', args);
+        return (0, rxjs_1.from)((0, undici_1.request)(args.url, {
+            method: args.method,
+            headers: args.headers,
+            body: args.body
+        })).pipe((0, rxjs_1.switchMap)(it => {
+            if (it.statusCode !== 200) {
+                error(`errored`, Object.assign(Object.assign({}, args), { statusCode: it.statusCode }));
+                return (0, rxjs_1.throwError)(() => new RequestNetworkError(it.statusCode, () => it.body.json()));
+            }
+            return (0, rxjs_1.from)(it.body.json());
+        }), (0, rxjs_1.map)(payload => ({ timestamp: (0, use_timestamp_1.useTimestamp)(), payload })));
+    });
 }
 exports.useRequest = useRequest;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantform/core",
-  "version": "0.7.0-beta.10",
+  "version": "0.7.0-beta.12",
   "license": "MIT",
   "author": "Mateusz Majchrzak",
   "description": "Node.js library for building systematic trading strategies in reactive way.",

package/src/make-test-module.ts

@@ -1,4 +1,4 @@
-import { Observable, tap } from 'rxjs';
+import { Observable } from 'rxjs';
 
 import { core } from '@lib/core';
 import { Dependency, Module } from '@lib/module';
@@ -20,9 +20,9 @@ export const mockedFunc = <Func extends MockableFunction>(mockedFunc: Func) =>
   mockedFunc as jest.MockedFunction<typeof mockedFunc>;
 
 export function toArray<T>(observable: Observable<T>) {
-  const array = Array.of<T>();
+  const array = Array.of<T | Error>();
 
-  const clone = (it: T): T => {
+  const clone = (it: T | Error): T | Error => {
     if (typeof it === 'symbol') {
       return it;
     }
@@ -38,7 +38,10 @@ export function toArray<T>(observable: Observable<T>) {
     return it;
   };
 
-  observable.pipe(tap(it => array.push(clone(it)))).subscribe();
+  observable.subscribe({
+    next: it => array.push(clone(it)),
+    error: it => array.push(it)
+  });
 
   return array;
 }

package/src/use-logger.ts

@@ -41,7 +41,7 @@ export const useLogger = use((context: string, tint?: string) => {
 
     error: (message: any, ...params: unknown[]) =>
       params?.length
-        ? console.error(`${prefix()}: ${message}`, params)
-        : console.error(`${prefix()}: ${message}`)
+        ? console.error(`${prefix()}: ${chalk.red(message)}`, params)
+        : console.error(`${prefix()}: ${chalk.red(message)}`)
   };
 });

package/src/use-request.ts

@@ -1,6 +1,7 @@
-import { from, map, switchMap, throwError } from 'rxjs';
+import { defer, from, map, switchMap, throwError } from 'rxjs';
 import { request } from 'undici';
 
+import { useLogger } from './use-logger';
 import { useTimestamp } from './use-timestamp';
 
 export type RequestMethod =
@@ -26,22 +27,33 @@ export function useRequest(args: {
   headers?: Record<string, any>;
   body?: string;
 }) {
-  return from(
-    request(args.url, {
-      method: args.method,
-      headers: args.headers,
-      body: args.body
-    })
-  ).pipe(
-    switchMap(it => {
-      if (it.statusCode !== 200) {
-        return throwError(
-          () => new RequestNetworkError(it.statusCode, () => it.body.json())
-        );
-      }
-
-      return from(it.body.json());
-    }),
-    map(payload => ({ timestamp: useTimestamp(), payload }))
-  );
+  const { info, error } = useLogger(useRequest.name);
+
+  return defer(() => {
+    info('requested', args);
+
+    return from(
+      request(args.url, {
+        method: args.method,
+        headers: args.headers,
+        body: args.body
+      })
+    ).pipe(
+      switchMap(it => {
+        if (it.statusCode !== 200) {
+          error(`errored`, {
+            ...args,
+            statusCode: it.statusCode
+          });
+
+          return throwError(
+            () => new RequestNetworkError(it.statusCode, () => it.body.json())
+          );
+        }
+
+        return from(it.body.json());
+      }),
+      map(payload => ({ timestamp: useTimestamp(), payload }))
+    );
+  });
 }