@quantform/core 0.7.0-beta.32 → 0.7.0-beta.33

package/dist/cli/dev.js

@@ -21,7 +21,7 @@ function default_1(name, options) {
             return;
         }
         const script = new script_1.Script(name, [(0, use_execution_mode_1.paperExecutionMode)({ recording: false })]);
-        const output = yield script.runWhileFinished();
+        const output = yield script.run();
         console.log(output);
     });
 }

package/dist/cli/internal/script.d.ts

@@ -3,6 +3,6 @@ export declare class Script {
     private readonly name;
     private readonly dependencies;
     constructor(name: string, dependencies: Dependency[]);
-    runWhileFinished(): Promise<unknown>;
+    run(): Promise<unknown>;
 }
 //# sourceMappingURL=script.d.ts.map

package/dist/cli/internal/script.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"script.d.ts","sourceRoot":"","sources":["../../../src/cli/internal/script.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAU,MAAM,aAAa,CAAC;AAIjD,qBAAa,MAAM;IAEf,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,YAAY;gBADZ,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,UAAU,EAAE;IAGvC,gBAAgB;CAQvB"}
+{"version":3,"file":"script.d.ts","sourceRoot":"","sources":["../../../src/cli/internal/script.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,UAAU,EAAU,MAAM,aAAa,CAAC;AAIjD,qBAAa,MAAM;IAEf,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,YAAY;gBADZ,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,UAAU,EAAE;IAGvC,GAAG;CAyBV"}

package/dist/cli/internal/script.js

@@ -43,12 +43,15 @@ class Script {
         this.name = name;
         this.dependencies = dependencies;
     }
-    runWhileFinished() {
+    run() {
         return __awaiter(this, void 0, void 0, function* () {
             const script = yield Promise.resolve(`${(0, path_1.join)((0, workspace_1.buildDirectory)(), this.name)}`).then(s => __importStar(require(s)));
             const module = new module_1.Module([...(0, core_1.core)(), ...script.onInstall(), ...this.dependencies]);
             const { act } = yield module.awake();
-            return yield act(() => (0, rxjs_1.lastValueFrom)(script.onAwake()));
+            return yield act(() => {
+                process.stdin.resume();
+                return (0, rxjs_1.firstValueFrom)((0, rxjs_1.merge)(script.onAwake().pipe((0, rxjs_1.last)()), (0, rxjs_1.fromEvent)(process, 'exit'), (0, rxjs_1.fromEvent)(process, 'SIGINT'), (0, rxjs_1.fromEvent)(process, 'SIGUSR1'), (0, rxjs_1.fromEvent)(process, 'SIGUSR2'), (0, rxjs_1.fromEvent)(process, 'uncaughtException')).pipe((0, rxjs_1.take)(1), (0, rxjs_1.switchMap)(it => { var _a; return (_a = script.onExit()) !== null && _a !== void 0 ? _a : (0, rxjs_1.of)(it); }), (0, rxjs_1.finalize)(() => process.exit(0))));
+            });
         });
     }
 }

package/package.json

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

package/src/cli/dev.ts

@@ -9,7 +9,7 @@ export default async function (name: string, options: any) {
   }
 
   const script = new Script(name, [paperExecutionMode({ recording: false })]);
-  const output = await script.runWhileFinished();
+  const output = await script.run();
 
   console.log(output);
 }

package/src/cli/internal/script.ts

@@ -1,5 +1,14 @@
 import { join } from 'path';
-import { lastValueFrom } from 'rxjs';
+import {
+  finalize,
+  firstValueFrom,
+  fromEvent,
+  last,
+  merge,
+  of,
+  switchMap,
+  take
+} from 'rxjs';
 
 import { core } from '@lib/core';
 import { Dependency, Module } from '@lib/module';
@@ -12,12 +21,29 @@ export class Script {
     private readonly dependencies: Dependency[]
   ) {}
 
-  async runWhileFinished() {
+  async run() {
     const script = await import(join(buildDirectory(), this.name));
     const module = new Module([...core(), ...script.onInstall(), ...this.dependencies]);
 
     const { act } = await module.awake();
 
-    return await act(() => lastValueFrom(script.onAwake()));
+    return await act(() => {
+      process.stdin.resume();
+
+      return firstValueFrom(
+        merge(
+          script.onAwake().pipe(last()),
+          fromEvent(process, 'exit'),
+          fromEvent(process, 'SIGINT'),
+          fromEvent(process, 'SIGUSR1'),
+          fromEvent(process, 'SIGUSR2'),
+          fromEvent(process, 'uncaughtException')
+        ).pipe(
+          take(1),
+          switchMap(it => script.onExit() ?? of(it)),
+          finalize(() => process.exit(0))
+        )
+      );
+    });
   }
 }