Passing parameters to the function with eval and evalAsync

ppaska · ppaska · commit e14b61fb553e · 2023-01-27T20:48:26.000Z
diff --git a/index.html b/index.html
@@ -32,9 +32,9 @@ <h4>JSPython development console</h4>
 a = 33
 b = 33
 if b > a:
-  print("b is greater than a")
+  return print("b is greater than a")
 elif a == b:
-  print("a and b are equal")
+  return print("a and b are equal")
     </div>
 
     <button onclick="tokenize()">Tokenize</button>
diff --git a/src/interpreter.spec.ts b/src/interpreter.spec.ts
@@ -288,6 +288,15 @@ describe('Interpreter', () => {
     expect(e.eval(script)).toBe(5);
   });
 
+  it('funcCall with params', () => {
+    const script = `
+    def times(a, b):
+      return a * b
+    `;
+    expect(e.eval(script, {}, ['times', 2, 3])).toBe(6);
+  });
+
+
   it('long comments issue', () => {
     const script = `
     async def f2():
diff --git a/src/interpreter.ts b/src/interpreter.ts
@@ -57,7 +57,7 @@ export class Interpreter {
   eval(
     codeOrAst: string | AstBlock,
     scope: Record<string, unknown> = {},
-    entryFunctionName = '',
+    entryFunctionName: string | [string, ...unknown[]] = '',
     moduleName = 'main.jspy'
   ): unknown {
     const ast =
@@ -81,18 +81,20 @@ export class Interpreter {
     if (!entryFunctionName || !entryFunctionName.length) {
       return result;
     } else {
-      const func = blockContext.blockScope.get(entryFunctionName);
+      const funcName = Array.isArray(entryFunctionName)? entryFunctionName[0] : entryFunctionName as string
+      const funcParams = Array.isArray(entryFunctionName)? entryFunctionName.slice(1) : []
+      const func = blockContext.blockScope.get(funcName);
       if (typeof func !== 'function') {
         throw Error(`Function ${entryFunctionName} does not exists or not a function`);
       }
-      return func();
+      return func(...funcParams);
     }
   }
 
   async evalAsync(
     codeOrAst: string | AstBlock,
     scope: Record<string, unknown> = {},
-    entryFunctionName = '',
+    entryFunctionName: string | [string, ...unknown[]] = '',
     moduleName = 'main.jspy',
     ctxInitialized?: (ctx: BlockContext) => void
   ): Promise<unknown> {
@@ -146,11 +148,14 @@ export class Interpreter {
     if (!entryFunctionName || !entryFunctionName.length) {
       return result;
     } else {
-      const func = blockContext.blockScope.get(entryFunctionName);
+      const funcName = Array.isArray(entryFunctionName)? entryFunctionName[0] : entryFunctionName as string
+      const funcParams = Array.isArray(entryFunctionName)? entryFunctionName.slice(1) : []
+
+      const func = blockContext.blockScope.get(funcName);
       if (typeof func !== 'function') {
         throw Error(`Function ${entryFunctionName} does not exists or not a function`);
       }
-      return await func();
+      return await func(...funcParams);
     }
   }
 
@@ -160,7 +165,7 @@ export class Interpreter {
   async evaluate(
     script: string,
     context: Record<string, unknown> = {},
-    entryFunctionName = '',
+    entryFunctionName: string | [string, ...unknown[]] = '',
     moduleName = 'main.jspy',
     ctxInitialized?: (ctx: BlockContext) => void
   ): Promise<unknown> {
diff --git a/src/interpreter.v1.spec.ts b/src/interpreter.v1.spec.ts
@@ -1376,7 +1376,8 @@ describe('Interpreter', () => {
     expect(o[1][1]).toBe('ss22');
     expect(o[1][2]).toBe(6);
 
-    expect(o[2][1].toISOString()).toBeDefined(); //.toBe(new Date('2020-03-07').toISOString());
+    expect(o[2][1]).toBeInstanceOf(Date);
+    expect((o[2][1] as Date).getFullYear()).toBe(2020);
     expect(o[3].length).toBe(0);
   });
 
