greybel-interpreter 2.6.12 → 2.6.14

package/dist/context.d.ts

@@ -39,10 +39,14 @@ export declare class Debugger {
     resume(): Promise<void>;
     interact(ctx: OperationContext, _ast: ASTBase, _op: Operation): void;
 }
+export interface ExitObserver {
+    occured: () => boolean;
+    close: () => void;
+}
 export declare class ProcessState extends EventEmitter {
-    isExit: boolean;
     isPending: boolean;
     last: OperationContext;
+    createExitObserver(): ExitObserver;
 }
 export declare class LoopState {
     isBreak: boolean;
@@ -75,6 +79,7 @@ export interface ContextForkOptions {
     target?: string;
     injected?: boolean;
     ignoreOuter?: boolean;
+    processState?: ProcessState;
 }
 export declare class OperationContext {
     target: string;
@@ -104,7 +109,6 @@ export declare class OperationContext {
     step(op: Operation): Promise<CustomValue>;
     setLastActive(ctx: OperationContext): OperationContext;
     getLastActive(): OperationContext;
-    isExit(): boolean;
     isPending(): boolean;
     setPending(pending: boolean): OperationContext;
     lookupAllOfType(validate: (type: ContextType) => boolean): OperationContext[];

package/dist/context.js

@@ -124,11 +124,23 @@ exports.Debugger = Debugger;
 class ProcessState extends events_1.EventEmitter {
     constructor() {
         super(...arguments);
-        this.isExit = false;
         this.isPending = false;
         /* eslint-disable no-use-before-define */
         this.last = null;
     }
+    createExitObserver() {
+        let isExit = false;
+        const listener = () => {
+            isExit = true;
+        };
+        this.once('exit', listener);
+        return {
+            occured: () => isExit,
+            close: () => {
+                this.off('exit', listener);
+            }
+        };
+    }
 }
 exports.ProcessState = ProcessState;
 class LoopState {
@@ -203,17 +215,11 @@ class OperationContext {
     getLastActive() {
         return this.processState.last;
     }
-    isExit() {
-        return this.processState.isExit;
-    }
     isPending() {
         return this.processState.isPending;
     }
     setPending(pending) {
         this.processState.isPending = pending;
-        if (!this.processState.isPending && this.processState.isExit) {
-            this.processState.isExit = false;
-        }
         return this;
     }
     lookupAllOfType(validate) {
@@ -233,7 +239,6 @@ class OperationContext {
     }
     exit() {
         if (this.processState.isPending) {
-            this.processState.isExit = true;
             this.processState.emit('exit');
             return new Promise((resolve) => {
                 const check = () => {
@@ -315,7 +320,7 @@ class OperationContext {
         return this.locals.scope.get(path);
     }
     fork(options) {
-        var _a;
+        var _a, _b;
         const newContext = new OperationContext({
             target: (_a = options.target) !== null && _a !== void 0 ? _a : this.target,
             stackTrace: this.stackTrace,
@@ -328,7 +333,7 @@ class OperationContext {
             debugger: this.debugger,
             handler: this.handler,
             cps: this.cps,
-            processState: this.processState,
+            processState: (_b = options.processState) !== null && _b !== void 0 ? _b : this.processState,
             environmentVariables: this.environmentVariables
         });
         if (options.type !== ContextType.Function) {

package/dist/operations/assign.js

@@ -30,8 +30,10 @@ class Assign extends operation_1.Operation {
     }
     handle(ctx) {
         return __awaiter(this, void 0, void 0, function* () {
+            const exitObserver = ctx.processState.createExitObserver();
             const resolveResult = yield this.left.getResult(ctx);
-            if (ctx.isExit()) {
+            exitObserver.close();
+            if (exitObserver.occured()) {
                 return default_1.DefaultType.Void;
             }
             if (resolveResult.path.count() === 0) {

package/dist/operations/block.js

@@ -32,13 +32,15 @@ class Block extends operation_1.Operation {
             else if (ctx.type === context_1.ContextType.Function) {
                 isEOL = () => ctx.functionState.isReturn;
             }
+            const exitObserver = ctx.processState.createExitObserver();
             for (let index = 0; index < this.stack.length; index++) {
-                if (isEOL() || ctx.isExit()) {
+                if (isEOL() || exitObserver.occured()) {
                     break;
                 }
                 const op = this.stack[index];
                 yield ctx.step(op);
             }
+            exitObserver.close();
             return default_1.DefaultType.Void;
         });
     }

package/dist/operations/call.js

@@ -31,8 +31,10 @@ class Call extends operation_1.Operation {
     }
     handle(ctx) {
         return __awaiter(this, void 0, void 0, function* () {
+            const exitObserver = ctx.processState.createExitObserver();
             const resolveResult = yield this.fnRef.getResult(ctx);
-            if (ctx.isExit()) {
+            exitObserver.close();
+            if (exitObserver.occured()) {
                 return default_1.DefaultType.Void;
             }
             const valueRef = yield this.fnRef.handle(ctx, resolveResult, false);

package/dist/operations/for.js

@@ -43,6 +43,7 @@ class For extends operation_1.OperationBlock {
                 return Promise.resolve(default_1.DefaultType.Void);
             }
             const loopState = new context_1.LoopState();
+            const exitObserver = ctx.processState.createExitObserver();
             forCtx.loopState = loopState;
             return new Promise((resolve, reject) => {
                 const iterator = iteratorValue[Symbol.iterator]();
@@ -52,6 +53,7 @@ class For extends operation_1.OperationBlock {
                 const iteration = () => __awaiter(this, void 0, void 0, function* () {
                     try {
                         if (iteratorResult.done) {
+                            exitObserver.close();
                             resolve(default_1.DefaultType.Void);
                             return;
                         }
@@ -62,7 +64,8 @@ class For extends operation_1.OperationBlock {
                         yield this.block.handle(forCtx);
                         if (loopState.isBreak ||
                             forCtx.functionState.isReturn ||
-                            ctx.isExit()) {
+                            exitObserver.occured()) {
+                            exitObserver.close();
                             resolve(default_1.DefaultType.Void);
                             return;
                         }
@@ -72,6 +75,7 @@ class For extends operation_1.OperationBlock {
                         (0, set_immediate_1.setImmediate)(iteration);
                     }
                     catch (err) {
+                        exitObserver.close();
                         reject(err);
                     }
                 });

package/dist/operations/function-reference.js

@@ -28,8 +28,10 @@ class FunctionReference extends operation_1.Operation {
     }
     handle(ctx) {
         return __awaiter(this, void 0, void 0, function* () {
+            const exitObserver = ctx.processState.createExitObserver();
             const refResult = yield this.ref.getResult(ctx);
-            if (ctx.isExit()) {
+            exitObserver.close();
+            if (exitObserver.occured()) {
                 return default_1.DefaultType.Void;
             }
             if (!(refResult.handle instanceof resolve_1.ResolveNil)) {

package/dist/operations/resolve.js

@@ -157,10 +157,12 @@ class Resolve extends operation_1.Operation {
         return __awaiter(this, void 0, void 0, function* () {
             let traversedPath = new path_1.Path();
             let index = 0;
+            const exitObserver = ctx.processState.createExitObserver();
             const maxIndex = this.path.count();
             const lastIndex = maxIndex - 1;
             for (; index < maxIndex; index++) {
-                if (ctx.isExit()) {
+                if (exitObserver.occured()) {
+                    exitObserver.close();
                     return new ResolveResult(null, new ResolveNil());
                 }
                 const current = this.path.at(index);
@@ -211,6 +213,7 @@ class Resolve extends operation_1.Operation {
                     }
                 }
             }
+            exitObserver.close();
             return new ResolveResult(traversedPath, handle);
         });
     }
@@ -218,8 +221,10 @@ class Resolve extends operation_1.Operation {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (result === null) {
+                const exitObserver = ctx.processState.createExitObserver();
                 result = yield this.getResult(ctx);
-                if (ctx.isExit()) {
+                exitObserver.close();
+                if (exitObserver.occured()) {
                     return default_1.DefaultType.Void;
                 }
             }

package/dist/operations/while.js

@@ -35,12 +35,14 @@ class While extends operation_1.OperationBlock {
                 state: context_1.ContextState.Temporary
             });
             const loopState = new context_1.LoopState();
+            const exitObserver = ctx.processState.createExitObserver();
             whileCtx.loopState = loopState;
             return new Promise((resolve, reject) => {
                 const iteration = () => __awaiter(this, void 0, void 0, function* () {
                     try {
                         const conditionResult = yield whileCtx.step(this.condition);
                         if (!conditionResult.toTruthy()) {
+                            exitObserver.close();
                             resolve(default_1.DefaultType.Void);
                             return;
                         }
@@ -48,13 +50,15 @@ class While extends operation_1.OperationBlock {
                         yield this.block.handle(whileCtx);
                         if (loopState.isBreak ||
                             whileCtx.functionState.isReturn ||
-                            ctx.isExit()) {
+                            exitObserver.occured()) {
+                            exitObserver.close();
                             resolve(default_1.DefaultType.Void);
                             return;
                         }
                         (0, set_immediate_1.setImmediate)(iteration);
                     }
                     catch (err) {
+                        exitObserver.close();
                         reject(err);
                     }
                 });

package/dist/types/function.js

@@ -115,7 +115,8 @@ class CustomFunction extends base_1.CustomValue {
             const fnCtx = (_a = this.scope) === null || _a === void 0 ? void 0 : _a.fork({
                 type: context_1.ContextType.Function,
                 state: context_1.ContextState.Default,
-                ignoreOuter: !this.assignOuter
+                ignoreOuter: !this.assignOuter,
+                processState: callContext.processState
             });
             const argMap = new Map();
             const hasSelf = !(self instanceof nil_1.CustomNil);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "2.6.12",
+    "version": "2.6.14",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",