fixed cancellation in modules and function context

Author: ppaska

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jspython-interpreter",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "description": "JSPython is a javascript implementation of Python language that runs within web browser or NodeJS environment",
   "keywords": [
     "python",

src/common/utils.ts

@@ -1,7 +1,8 @@
 import { Token } from "./token-types";
 
-export function parseDatetimeOrNull(value: string | Date): Date | null {
+export function parseDatetimeOrNull(value: string | number | Date): Date | null {
     if (!value) { return null; }
+    if(typeof value === 'number') { return new Date(value); }
     if (value instanceof Date && !isNaN(value.valueOf())) { return value; }
     // only string values can be converted to Date
     if (typeof value !== 'string') { return null; }

src/evaluator/evaluator.ts

@@ -25,9 +25,14 @@ export class Evaluator {
 
         for(let i = 0; i < ast.body.length; i++) {
             const node = ast.body[i];
-            if(blockContext.cancel) { 
+            if(blockContext.cancellationToken.cancel) { 
                 const loc = node.loc || [];
-                return `Cancelled. ${blockContext.moduleName}: ${loc[0]}, ${loc[1]}`; 
+
+                if(!blockContext.cancellationToken.message){
+                    blockContext.cancellationToken.message = `Cancelled. ${blockContext.moduleName}: ${loc[0]}, ${loc[1]}`
+                }
+
+                return blockContext.cancellationToken.message;
             }
 
             if (node.type === 'comment') { continue; }

src/evaluator/evaluatorAsync.ts

@@ -2,8 +2,6 @@ import {
     ArrowFuncDefNode,
     AssignNode, AstBlock, AstNode, BinOpNode, BracketObjectAccessNode, ConstNode, CreateArrayNode,
     CreateObjectNode, DotObjectAccessNode, ForNode, FuncDefNode, FunctionCallNode, FunctionDefNode, GetSingleVarNode,
-    getStartLine,
-    getTokenLoc,
     IfNode, ImportNode, IsNullCoelsing, LogicalOpNode, OperationFuncs, Primitive, RaiseNode, ReturnNode, SetSingleVarNode, TryExceptNode, WhileNode
 } from '../common';
 import { JspyEvalError, JspyError, getImportType } from '../common/utils';
@@ -54,9 +52,14 @@ export class EvaluatorAsync {
 
         for(let i = 0; i < ast.body.length; i++) {
             const node = ast.body[i];
-            if(blockContext.cancel){ 
+            if(blockContext.cancellationToken.cancel){ 
                 const loc = node.loc || [];
-                return `Cancelled. ${blockContext.moduleName}: ${loc[0]}, ${loc[1]}`; 
+
+                if(!blockContext.cancellationToken.message){
+                    blockContext.cancellationToken.message = `Cancelled. ${blockContext.moduleName}: ${loc[0]}, ${loc[1]}`
+                }
+
+                return blockContext.cancellationToken.message;
             }
 
             if (node.type === 'comment') { continue; }

src/evaluator/scope.ts

@@ -1,18 +1,26 @@
 
+export interface CancellationToken {
+    cancel?: boolean;
+    message?: string;
+}
+
 export interface BlockContext {
     moduleName: string;
     blockScope: Scope;
+    cancellationToken: CancellationToken;
     returnCalled?: boolean;
     breakCalled?: boolean;
     continueCalled?: boolean;
     returnObject?: any;
-    cancel?: boolean;
 }
 
 export function cloneContext(context: BlockContext): BlockContext {
     return {
         moduleName: context.moduleName,
-        blockScope: context.blockScope.clone()
+        blockScope: context.blockScope.clone(),
+        // this instance should never change. Otherwise cancel won't work
+        cancellationToken: context.cancellationToken
+
     } as BlockContext;
 }
 

src/initialScope.ts

@@ -2,7 +2,7 @@ import { parseDatetimeOrNull } from "./common/utils";
 
 export const INITIAL_SCOPE = {
     jsPython(): string {
-        return [`JSPython v2.1.8`, "(c) 2022 FalconSoft Ltd. All rights reserved."].join('\n')
+        return `JSPython v2.1.9 (c) 2022 FalconSoft Ltd. All rights reserved.`;
     },
     dateTime: (str: number | string | any = null) => parseDatetimeOrNull(str) || new Date(),
     range: range,

src/interpreter.ts

@@ -62,6 +62,7 @@ export class Interpreter {
 
         const blockContext = {
             moduleName: moduleName,
+            cancellationToken: { cancel: false },
             blockScope: new Scope(scope)
         } as BlockContext;
 
@@ -88,6 +89,7 @@ export class Interpreter {
         const evaluator = new EvaluatorAsync();
         const blockContext = {
             moduleName: moduleName,
+            cancellationToken: { cancel: false },
             blockScope: new Scope(scope)
         } as BlockContext;
 
@@ -109,7 +111,11 @@ export class Interpreter {
             .registerBlockContextFactory((moduleName, ast: AstBlock) => {
                 // enrich context
                 const newContext = this.assignImportContext(ast, scope);
-                const moduleContext = { moduleName, blockScope: new Scope(newContext) }
+                const moduleContext = { 
+                    moduleName, 
+                    blockScope: new Scope(newContext), 
+                    cancellationToken: blockContext.cancellationToken 
+                };
                 moduleContext.blockScope.set('printExecutionContext', () => console.log(moduleContext.blockScope.getScope()));
                 moduleContext.blockScope.set('getExecutionContext', () => moduleContext.blockScope.getScope());
                 return moduleContext;