added null parameters to func call and named JSON

Author: ppaska

index.html

@@ -29,11 +29,12 @@
   <div class="container">
     <h4>JSPython development console</h4>
     <div id="editor">
-    async def f1():
-      errorFunc(1)
-      errorFunc(3)
-      errorFunc(6)
-      errorFunc(7)
+    async def f1(p1, p2, p3, p4, p5):
+      errorFunc(p1 or 1)
+      errorFunc(p2 or 3)
+      errorFunc(p3 or 6)
+      errorFunc(p4 or 7)
+      
       """
       l = null
       r = {price: 5}

package.json

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

src/evaluator/evaluator.ts

@@ -62,19 +62,15 @@ export class Evaluator {
     }
 
     jspyFuncInvoker(funcDef: FuncDefNode, context: BlockContext, ...args: unknown[]): unknown {
-
         const ast = Object.assign({}, funcDef.funcAst);
         ast.type = 'func';
 
         const blockContext = cloneContext(context);
 
-        // set parameters into new scope, based incomming arguments
-        for (let i = 0; i < args?.length || 0; i++) {
-            if (i >= funcDef.params.length) {
-                break;
-                // throw new Error('Too much parameters provided');
-            }
-            blockContext.blockScope.set(funcDef.params[i], args[i]);
+        // set parameters into new scope, based incomming arguments        
+        for (let i = 0; i < funcDef.params?.length || 0; i++) {
+            const argValue = args?.length > i ? args[i] : null;
+            blockContext.blockScope.set(funcDef.params[i], argValue);
         }
 
         return this.evalBlock(ast, blockContext);

src/evaluator/evaluatorAsync.ts

@@ -76,13 +76,10 @@ export class EvaluatorAsync {
 
         const blockContext = cloneContext(context);
 
-        // set parameters into new scope, based incomming arguments
-        for (let i = 0; i < args?.length || 0; i++) {
-            if (i >= funcDef.params.length) {
-                break;
-                // throw new Error('Too much parameters provided');
-            }
-            blockContext.blockScope.set(funcDef.params[i], args[i]);
+        // set parameters into new scope, based incomming arguments        
+        for (let i = 0; i < funcDef.params?.length || 0; i++) {
+            const argValue = args?.length > i ? args[i] : null;
+            blockContext.blockScope.set(funcDef.params[i], argValue);
         }
 
         return await this.evalBlockAsync(ast, blockContext);

src/initialScope.ts

@@ -2,12 +2,15 @@ import { parseDatetimeOrNull } from "./common/utils";
 
 export const INITIAL_SCOPE = {
     jsPython(): string {
-        return [`JSPython v2.0.11`, "(c) 2021 FalconSoft Ltd. All rights reserved."].join('\n')
+        return [`JSPython v2.0.12`, "(c) 2021 FalconSoft Ltd. All rights reserved."].join('\n')
     },
     dateTime: (str: number | string | any = null) => parseDatetimeOrNull(str) || new Date(),
     range: range,
     print: (...args: any[]) => { console.log(...args); return args.length > 0 ? args[0] : null; },
     isNull: (v: any, defValue: any = null): boolean | any => defValue === null ? v === null : v || defValue,
+    isDate: (d: any): boolean => d instanceof Date,
+    isFunction: (v: any): boolean => typeof v === 'function',
+    isString: (v: any): boolean => typeof v === 'string',
     deleteProperty: (obj: any, propName: string): boolean => delete obj[propName],
     Math: Math,
     Object: Object,

src/interpreter.spec.ts

@@ -127,6 +127,11 @@ describe('Interpreter', () => {
     expect(e.eval("x = {'m'+1: 1+2*3}\nx.m1")).toBe(7);
   });
 
+  it('json single name prop', () => {
+    expect(e.eval("pp = 't1'\nx = {pp}\nx.pp")).toBe('t1');
+    expect(e.eval("pp = 5\nx = {pp, x:10}\nx.pp + x.x")).toBe(15);
+  });
+
   it('json array', () => {
     expect(e.eval("x = [{m1: 1+2*3, m2: 'ee'}]\nx.length")).toBe(1);
     expect(e.eval("x = [1,2,3]\nx.length")).toBe(3);

src/interpreter.v1.spec.ts

@@ -311,7 +311,7 @@ describe('Interpreter', () => {
     await Interpreter.create()
       .addFunction('setResult', r => res = r)
       .evaluate([
-        'def func1(p1, p2):',
+        'def func1():',
         '  x = p1 + p2',
         '  setResult(x)'
       ].join('\n'), { p1: 5, p2: 10 }, 'func1');

src/parser/parser.ts

@@ -544,20 +544,27 @@ export class Parser {
             const props = [] as ObjectPropertyInfo[];
             for (let i = 0; i < keyValueTokens.length; i++) {
                 const keyValue = splitTokens(keyValueTokens[i], ':');
-                if (keyValue.length !== 2) {
+                if (keyValue.length === 1) {
+                    const pInfo = {
+                        name: new ConstNode(keyValue[0][0]),
+                        value: this.createExpressionNode(keyValue[0])
+                    } as ObjectPropertyInfo;
+
+                    props.push(pInfo);                    
+                } else if (keyValue.length === 2) {
+                    // unquoted string becomes a variable, so, we don't need it, that is why we are creating const node explicitlely
+                    const name = (keyValue[0].length === 1 && !`'"`.includes((getTokenValue(keyValue[0][0]) as string)[0]))
+                        ? new ConstNode(keyValue[0][0])
+                        : this.createExpressionNode(keyValue[0]);
+                    const pInfo = {
+                        name,
+                        value: this.createExpressionNode(keyValue[1])
+                    } as ObjectPropertyInfo;
+
+                    props.push(pInfo);
+                } else {
                     throw Error('Incorrect JSON')
                 }
-
-                // unquoted string becomes a variable, so, we don't need it, that is why we are creating const node explicitlely
-                const name = (keyValue[0].length === 1 && !`'"`.includes((getTokenValue(keyValue[0][0]) as string)[0]))
-                    ? new ConstNode(keyValue[0][0])
-                    : this.createExpressionNode(keyValue[0]);
-                const pInfo = {
-                    name,
-                    value: this.createExpressionNode(keyValue[1])
-                } as ObjectPropertyInfo;
-
-                props.push(pInfo);
             }
 
             return new CreateObjectNode(props, getTokenLoc(tokens[0]))