greybel-interpreter 2.8.3 → 2.8.5

package/dist/context.d.ts

@@ -46,6 +46,9 @@ export interface ExitObserver {
 export declare class ProcessState extends EventEmitter {
     isPending: boolean;
     last: OperationContext;
+    private observer;
+    private observerWithExitOccurence;
+    constructor();
     createExitObserver(): ExitObserver;
 }
 export declare class LoopState {

package/dist/context.js

@@ -19,6 +19,7 @@ const default_1 = require("./types/default");
 const map_1 = require("./types/map");
 const path_1 = require("./utils/path");
 const set_immediate_1 = require("./utils/set-immediate");
+const uuid_1 = require("uuid");
 var ContextType;
 (function (ContextType) {
     ContextType[ContextType["Api"] = 0] = "Api";
@@ -124,22 +125,22 @@ class Debugger {
 exports.Debugger = Debugger;
 class ProcessState extends events_1.EventEmitter {
     constructor() {
-        super(...arguments);
+        super();
         this.isPending = false;
         /* eslint-disable no-use-before-define */
         this.last = null;
+        this.observer = new Set();
+        this.observerWithExitOccurence = new Set();
+        this.once('exit', () => {
+            this.observerWithExitOccurence = new Set(this.observer);
+        });
     }
     createExitObserver() {
-        let isExit = false;
-        const listener = () => {
-            isExit = true;
-        };
-        this.once('exit', listener);
+        const id = (0, uuid_1.v4)();
+        this.observer.add(id);
         return {
-            occured: () => isExit,
-            close: () => {
-                this.off('exit', listener);
-            }
+            occured: () => this.observerWithExitOccurence.has(id),
+            close: () => this.observer.delete(id)
         };
     }
 }

package/dist/operations/call.js

@@ -32,15 +32,24 @@ class Call extends operation_1.Operation {
         return __awaiter(this, void 0, void 0, function* () {
             const exitObserver = ctx.processState.createExitObserver();
             const resolveResult = yield this.fnRef.getResult(ctx);
-            exitObserver.close();
             if (exitObserver.occured()) {
+                exitObserver.close();
                 return default_1.DefaultType.Void;
             }
             const valueRef = yield this.fnRef.handle(ctx, resolveResult, false);
             const fnArgs = [];
             for (let index = 0; index < this.args.length; index++) {
+                if (exitObserver.occured()) {
+                    exitObserver.close();
+                    return default_1.DefaultType.Void;
+                }
                 fnArgs.push(yield this.args[index].handle(ctx));
             }
+            if (exitObserver.occured()) {
+                exitObserver.close();
+                return default_1.DefaultType.Void;
+            }
+            exitObserver.close();
             if (valueRef instanceof function_1.CustomFunction) {
                 const func = valueRef;
                 if (this.fnRef.path.isSuper() && ctx.functionState.context) {

package/dist/operations/if-statement.js

@@ -67,14 +67,19 @@ class IfStatement extends operation_1.OperationBlock {
     }
     handle(ctx) {
         return __awaiter(this, void 0, void 0, function* () {
+            const exitObserver = ctx.processState.createExitObserver();
             for (let index = 0; index < this.clauses.length; index++) {
                 const clause = this.clauses[index];
                 const clauseResult = yield ctx.step(clause.condition);
+                if (exitObserver.occured()) {
+                    break;
+                }
                 if (clauseResult.toTruthy()) {
                     yield clause.block.handle(ctx);
                     break;
                 }
             }
+            exitObserver.close();
             return default_1.DefaultType.Void;
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "2.8.3",
+    "version": "2.8.5",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -50,7 +50,8 @@
     "dependencies": {
         "greybel-core": "^0.10.0",
         "greyscript-core": "^0.10.0",
-        "lru-cache": "^10.0.1"
+        "lru-cache": "^10.0.1",
+        "uuid": "^9.0.1"
     },
     "keywords": [
         "greyscript",