Fixe bug with empty strings #11

ppaska · ppaska · commit 010e98d0ff73 · 2020-02-22T20:12:41.000Z
diff --git a/index.html b/index.html
@@ -28,8 +28,8 @@
   <div class="container">
     <h4>JSPython development console</h4>
     <div id="editor">
-      x = """issue  = {}"""
-      x</div>
+"".trim().length
+    </div>
     <button onclick="runInterpreter()">Run</button>
     <textarea id="result"></textarea>
   </div>
@@ -48,7 +48,7 @@ <h4>JSPython development console</h4>
         const result = await jsPython()
           .addFunction('returnsPromise', a1 => new Promise((s, f) => { setTimeout(() => s(a1), 10) }))
           .addFunction('nullValue', () => { console.log(' ** invoked!!!'); return null })
-          .evaluate(scripts);
+          .evaluate(scripts, {str: "shdsd sd,sd d s ds d"});
         document.getElementById('result').value = typeof result === 'object' ? JSON.stringify(result) : result
         console.log('Result => ', result);
       } catch (err) {
diff --git a/src/eval/eval.expression.ts b/src/eval/eval.expression.ts
@@ -272,14 +272,14 @@ export class EvalExpression {
             }
         }
 
-        if (parentObject) {
+        if (parentObject !== null && parentObject !== undefined) {
             const value = getValue(parentObject, token);
             return (value !== undefined) ? value : null
 
         } else {
             const value = getValue(context.blockScope, token);
             if (value === undefined) {
-                throw Error(`Undefined property '${token}'`);
+                throw Error(`Can't resolve property '${token}' of undefined object`);
             }
             return value;
         }
@@ -375,16 +375,16 @@ export class EvalExpression {
         token = token.trim();
         const findFunction = (name: string, obj: any = null): AnyFunc => {
             if (name.indexOf('.') < 0) {
-                if (!obj) {
+                if (obj === null || obj === undefined) {
                     const fn = context.blockScope[name];
                     if (typeof fn !== 'function') {
-                        throw Error(`Token '${name}' is not a valid function (1)`);
+                        throw Error(`Can't call '${name}' of null (1)`);
                     }
                     return fn; // all functions should be here and no 'bind' required
                 } else {
                     const ff = obj[name];
                     if (typeof ff !== 'function') {
-                        throw Error(`Token '${name}' is not a valid function (2)`);
+                        throw Error(`Can't call '${name}' of null (2)`);
                     }
                     return ff.bind(obj);
                 }
diff --git a/src/interpreter.spec.ts b/src/interpreter.spec.ts
@@ -1481,5 +1481,13 @@ issue["dd22"]
     `)).toBe(55);
   });
 
+  it('Empty string bug', async () => {
+    expect(await e.evaluate(`"".trim()`)).toBe("");
+  });
+
+  it('Empty string bug for function return', async () => {
+    expect(await e.evaluate(`"".trim().length`)).toBe(0);
+  });
+
 
 });

Original file line number	Diff line number	Diff line change
`@@ -272,14 +272,14 @@ export class EvalExpression {`
`272`	`272`	`}`
`273`	`273`	`}`
`274`	`274`
`275`		`- if (parentObject) {`
	`275`	`+ if (parentObject !== null && parentObject !== undefined) {`
`276`	`276`	`const value = getValue(parentObject, token);`
`277`	`277`	`return (value !== undefined) ? value : null`
`278`	`278`
`279`	`279`	`} else {`
`280`	`280`	`const value = getValue(context.blockScope, token);`
`281`	`281`	`if (value === undefined) {`
`282`		- throw Error(`Undefined property '${token}'`);
	`282`	+ throw Error(`Can't resolve property '${token}' of undefined object`);
`283`	`283`	`}`
`284`	`284`	`return value;`
`285`	`285`	`}`
`@@ -375,16 +375,16 @@ export class EvalExpression {`
`375`	`375`	`token = token.trim();`
`376`	`376`	`const findFunction = (name: string, obj: any = null): AnyFunc => {`
`377`	`377`	`if (name.indexOf('.') < 0) {`
`378`		`- if (!obj) {`
	`378`	`+ if (obj === null \|\| obj === undefined) {`
`379`	`379`	`const fn = context.blockScope[name];`
`380`	`380`	`if (typeof fn !== 'function') {`
`381`		- throw Error(`Token '${name}' is not a valid function (1)`);
	`381`	+ throw Error(`Can't call '${name}' of null (1)`);
`382`	`382`	`}`
`383`	`383`	`return fn; // all functions should be here and no 'bind' required`
`384`	`384`	`} else {`
`385`	`385`	`const ff = obj[name];`
`386`	`386`	`if (typeof ff !== 'function') {`
`387`		- throw Error(`Token '${name}' is not a valid function (2)`);
	`387`	+ throw Error(`Can't call '${name}' of null (2)`);
`388`	`388`	`}`
`389`	`389`	`return ff.bind(obj);`
`390`	`390`	`}`