insulated module scope.

Author: Pavlo

package.json

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

src/evaluator/evaluator.ts

@@ -114,7 +114,28 @@ export class Evaluator {
             return func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7], fps[8], fps[9]);
         }
 
-        if (fps.length > 10) {
+        if (fps.length === 11) {
+            return func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7], fps[8], fps[9], fps[10]);
+        }
+
+        if (fps.length === 12) {
+            return func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7], fps[8], fps[9], fps[10], fps[11]);
+        }
+
+        if (fps.length === 13) {
+            return func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7], fps[8], fps[9], fps[10], fps[11], fps[12]);
+        }
+
+        if (fps.length === 14) {
+            return func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7], fps[8], fps[9], fps[10], fps[11], fps[12], fps[13]);
+        }
+
+        if (fps.length === 15) {
+            return func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7], fps[8], fps[9], fps[10], fps[11], fps[12], fps[13], fps[14]);
+        }
+
+
+        if (fps.length > 15) {
             throw Error('Function has too many parameters. Current limitation is 10');
         }
 

src/evaluator/evaluatorAsync.ts

@@ -51,7 +51,7 @@ export class EvaluatorAsync {
             if (node.type === 'import') {
                 const importNode = node as ImportNode;
 
-                if(!importNode.module.name.startsWith('/') /* || !importNode.module.name.endsWith('.jspy')*/){
+                if (!importNode.module.name.startsWith('/') /* || !importNode.module.name.endsWith('.jspy')*/) {
                     // it is not JSPY imort. It is JS and should be handled externally
                     continue;
                 }
@@ -60,12 +60,19 @@ export class EvaluatorAsync {
                     throw new Error('blockContextFactory is not initialized');
                 }
 
-                const moduleAst = await this.moduleParser(importNode.module.name)
+                const moduleAst = await this.moduleParser(importNode.module.name);
                 const moduleBlockContext = this.blockContextFactory(importNode.module.name, moduleAst);
-                await this.evalBlockAsync(moduleAst, moduleBlockContext)
+                await this.evalBlockAsync(moduleAst, moduleBlockContext);
 
-                blockContext.blockScope.set(importNode.module.alias || this.defaultModuleName(importNode.module.name), moduleBlockContext.blockScope.getScope())
+                let scope = blockContext.blockScope.getScope();
 
+                if (!importNode.parts?.length) {
+                    // if no parts, then we need to assign to a separate object
+                    scope = {};
+                    blockContext.blockScope.set(importNode.module.alias || this.defaultModuleName(importNode.module.name), scope);
+                }
+
+                this.assignFunctionsToScope(scope, moduleBlockContext, moduleAst, importNode.parts?.map(p => p.name));
                 continue;
             }
 
@@ -102,6 +109,22 @@ export class EvaluatorAsync {
         return lastResult;
     }
 
+    private assignFunctionsToScope(scope: Record<string, unknown>, moduleBlockContext: BlockContext,
+        moduleAst: AstBlock, parts?: string[]): void {
+
+        const funcs = moduleAst.funcs.filter(f => !parts || parts.indexOf(f.funcAst?.name) >= 0);
+
+        for (let i = 0; i < funcs.length; i++) {
+            const funcDef = funcs[i] as FunctionDefNode;
+
+            const invoker = (funcDef.isAsync) ?
+                async (...args: unknown[]): Promise<unknown> => await this.jspyFuncInvokerAsync(funcDef, moduleBlockContext, ...args)
+                : (...args: unknown[]): unknown => new Evaluator().jspyFuncInvoker(funcDef, moduleBlockContext, ...args);
+
+            scope[funcDef.funcAst.name] = invoker;
+        }
+    }
+
     private defaultModuleName(name: string): string {
         return name.substring(name.lastIndexOf('/') + 1, name.lastIndexOf('.'))
     }
@@ -156,7 +179,27 @@ export class EvaluatorAsync {
             return await func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7], fps[8], fps[9]);
         }
 
-        if (fps.length > 10) {
+        if (fps.length === 11) {
+            return await func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7], fps[8], fps[9], fps[10]);
+        }
+
+        if (fps.length === 12) {
+            return await func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7], fps[8], fps[9], fps[10], fps[11]);
+        }
+
+        if (fps.length === 13) {
+            return await func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7], fps[8], fps[9], fps[10], fps[11], fps[12]);
+        }
+
+        if (fps.length === 14) {
+            return await func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7], fps[8], fps[9], fps[10], fps[11], fps[12], fps[13]);
+        }
+
+        if (fps.length === 15) {
+            return await func(fps[0], fps[1], fps[2], fps[3], fps[4], fps[5], fps[6], fps[7], fps[8], fps[9], fps[10], fps[11], fps[12], fps[13], fps[14]);
+        }
+
+        if (fps.length > 15) {
             throw Error('Function has too many parameters. Current limitation is 10');
         }
     }

src/initialScope.ts

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

src/interpreter.spec.ts

@@ -644,10 +644,10 @@ describe('Interpreter', () => {
     const res = await interpreter.evaluate(`
     import '/service.jspy' as obj
 
-    return obj.func1(2, 3) + obj.multiply(2, 3) + obj.someNumber
+    return obj.func1(2, 3) + obj.multiply(2, 3)
     `);
 
-    expect(res).toBe(122);
+    expect(res).toBe(67);
   });
 
 
@@ -670,10 +670,10 @@ describe('Interpreter', () => {
     const res = await interpreter.evaluate(`
     import '/service.jspy' as obj
 
-    return obj.func1(2) + obj.multiply(2, 3) + obj.someNumber
+    return obj.func1(2) + obj.multiply(2, 3)
     `);
 
-    expect(res).toBe(316);
+    expect(res).toBe(261);
   });
 
   it('Import with package loader', async () => {
@@ -682,9 +682,9 @@ describe('Interpreter', () => {
     interpreter.registerPackagesLoader(path =>
       (
         path === 'service' ? {
-          add: (x, y) => x + y,
-          remove: (x, y) => x - y,
-          times: (x, y) => x * y,
+          add: (x: number, y: number) => x + y,
+          remove: (x: number, y: number) => x - y,
+          times: (x: number, y: number) => x * y,
         } 
         : null
       )
@@ -704,13 +704,22 @@ describe('Interpreter', () => {
       `);
     }));
 
-    const res = await interpreter.evaluate(`
+    let res = await interpreter.evaluate(`
     import '/service.jspy' as obj
 
     return obj.func1(2, 3)
     `);
 
     expect(res).toBe(60);
+
+    res = await interpreter.evaluate(`
+    from '/service.jspy' import func1
+
+    return func1(2, 3)
+    `);
+
+    expect(res).toBe(60);
+
   });