Added function name to the error message

Author: ppaska

package.json

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

src/evaluator/evaluator.ts

@@ -230,6 +230,10 @@ export class Evaluator {
         if (node.type === "funcCall") {
             const funcCallNode = node as FunctionCallNode;
             const func = blockContext.blockScope.get(funcCallNode.name) as (...args: unknown[]) => unknown;
+            if(typeof func !== 'function') {
+                throw Error(`'${funcCallNode.name}' is not a function or not defined.`)
+            }
+
             const pms = funcCallNode.paramNodes?.map(n => this.evalNode(n, blockContext)) || []
 
             return this.invokeFunction(func, pms);
@@ -296,6 +300,10 @@ export class Evaluator {
                     const funcCallNode = nestedProp as FunctionCallNode;
                     const func = startObject[funcCallNode.name] as (...args: unknown[]) => unknown;
 
+                    if(typeof func !== 'function') {
+                        throw Error(`'${funcCallNode.name}' is not a function or not defined.`)
+                    }
+
                     if (func === undefined
                         && (dotObject.nestedProps[i - 1] as unknown as IsNullCoelsing).nullCoelsing) {
                         continue;

src/evaluator/evaluatorAsync.ts

@@ -237,7 +237,12 @@ export class EvaluatorAsync {
         if (node.type === "funcCall") {
             const funcCallNode = node as FunctionCallNode;
             const func = blockContext.blockScope.get(funcCallNode.name) as (...args: unknown[]) => unknown;
-            const pms = []
+
+            if(typeof func !== 'function') {
+                throw Error(`'${funcCallNode.name}' is not a function or not defined.`)
+            }
+
+            const pms = [];
             for (let p of funcCallNode.paramNodes || []) {
                 pms.push(await this.evalNodeAsync(p, blockContext));
             }
@@ -311,6 +316,9 @@ export class EvaluatorAsync {
                         continue;
                     }
 
+                    if(typeof(func) !== 'function'){
+                        throw Error(`'${funcCallNode.name}' is not a function or not defined.`)
+                    }
                     const pms = []
                     for (let p of funcCallNode.paramNodes || []) {
                         pms.push(await this.evalNodeAsync(p, blockContext));

src/initialScope.ts

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