jslike 1.7.0 → 1.7.2

package/dist/esm/interpreter/interpreter.js

@@ -141,6 +141,9 @@ export class Interpreter {
 
       if (node.callee.type === 'MemberExpression') {
         thisContext = await this.evaluateAsync(node.callee.object, env);
+        if (node.callee.optional && (thisContext === null || thisContext === undefined)) {
+          return undefined;
+        }
         const prop = node.callee.computed
           ? await this.evaluateAsync(node.callee.property, env)
           : node.callee.property.name;
@@ -1230,6 +1233,9 @@ export class Interpreter {
     if (node.callee.type === 'MemberExpression') {
       // For method calls like obj.method(), set this to obj
       thisContext = this.evaluate(node.callee.object, env);
+      if (node.callee.optional && (thisContext === null || thisContext === undefined)) {
+        return undefined;
+      }
       const prop = node.callee.computed
         ? this.evaluate(node.callee.property, env)
         : node.callee.property.name;
@@ -1308,8 +1314,14 @@ export class Interpreter {
     // Get function name for call stack tracking
     const funcName = metadata.name || func.name || 'anonymous';
 
-    // Bind 'this' if provided (for method calls)
-    if (thisContext !== undefined) {
+    // Bind 'this': for arrow functions use captured this (lexical), for regular functions use call-site this
+    if (metadata.isArrow) {
+      // Arrow functions use lexically captured 'this', ignoring call-site 'this'
+      if (metadata.capturedThis !== undefined) {
+        funcEnv.define('this', metadata.capturedThis);
+      }
+    } else if (thisContext !== undefined) {
+      // Regular functions use 'this' from the call site
       funcEnv.define('this', thisContext);
     }
 
@@ -1490,13 +1502,28 @@ export class Interpreter {
   }
 
   evaluateFunctionExpression(node, env) {
+    const isArrow = node.type === 'ArrowFunctionExpression';
+
+    // For arrow functions, capture 'this' lexically from the enclosing scope
+    let capturedThis;
+    if (isArrow) {
+      try {
+        capturedThis = env.get('this');
+      } catch (e) {
+        // 'this' not defined in enclosing scope, leave undefined
+        capturedThis = undefined;
+      }
+    }
+
     const funcMetadata = {
       __isFunction: true,
       params: node.params,
       body: node.body,
       closure: env,
-      expression: node.type === 'ArrowFunctionExpression' && node.expression,
-      async: node.async || false
+      expression: isArrow && node.expression,
+      async: node.async || false,
+      isArrow: isArrow,
+      capturedThis: isArrow ? capturedThis : undefined
     };
 
     // Wrap in actual JavaScript function so it can be called by native code

package/dist/index.cjs

@@ -6579,6 +6579,9 @@ var Interpreter = class _Interpreter {
       let methodName = null;
       if (node.callee.type === "MemberExpression") {
         thisContext = await this.evaluateAsync(node.callee.object, env);
+        if (node.callee.optional && (thisContext === null || thisContext === void 0)) {
+          return void 0;
+        }
         const prop = node.callee.computed ? await this.evaluateAsync(node.callee.property, env) : node.callee.property.name;
         callee = thisContext[prop];
         methodName = prop;
@@ -7447,6 +7450,9 @@ var Interpreter = class _Interpreter {
     let methodName = null;
     if (node.callee.type === "MemberExpression") {
       thisContext = this.evaluate(node.callee.object, env);
+      if (node.callee.optional && (thisContext === null || thisContext === void 0)) {
+        return void 0;
+      }
       const prop = node.callee.computed ? this.evaluate(node.callee.property, env) : node.callee.property.name;
       callee = thisContext[prop];
       methodName = prop;
@@ -7504,7 +7510,11 @@ var Interpreter = class _Interpreter {
     const metadata = func.__metadata || func;
     const funcEnv = new Environment(metadata.closure);
     const funcName = metadata.name || func.name || "anonymous";
-    if (thisContext !== void 0) {
+    if (metadata.isArrow) {
+      if (metadata.capturedThis !== void 0) {
+        funcEnv.define("this", metadata.capturedThis);
+      }
+    } else if (thisContext !== void 0) {
       funcEnv.define("this", thisContext);
     }
     for (let i = 0; i < metadata.params.length; i++) {
@@ -7639,13 +7649,24 @@ var Interpreter = class _Interpreter {
     return obj;
   }
   evaluateFunctionExpression(node, env) {
+    const isArrow = node.type === "ArrowFunctionExpression";
+    let capturedThis;
+    if (isArrow) {
+      try {
+        capturedThis = env.get("this");
+      } catch (e) {
+        capturedThis = void 0;
+      }
+    }
     const funcMetadata = {
       __isFunction: true,
       params: node.params,
       body: node.body,
       closure: env,
-      expression: node.type === "ArrowFunctionExpression" && node.expression,
-      async: node.async || false
+      expression: isArrow && node.expression,
+      async: node.async || false,
+      isArrow,
+      capturedThis: isArrow ? capturedThis : void 0
     };
     const interpreter = this;
     const wrappedFunc = funcMetadata.async ? async function(...args) {

package/dist/index.d.cts

@@ -7306,6 +7306,9 @@ class Interpreter {
 
       if (node.callee.type === 'MemberExpression') {
         thisContext = await this.evaluateAsync(node.callee.object, env);
+        if (node.callee.optional && (thisContext === null || thisContext === undefined)) {
+          return undefined;
+        }
         const prop = node.callee.computed
           ? await this.evaluateAsync(node.callee.property, env)
           : node.callee.property.name;
@@ -8395,6 +8398,9 @@ class Interpreter {
     if (node.callee.type === 'MemberExpression') {
       // For method calls like obj.method(), set this to obj
       thisContext = this.evaluate(node.callee.object, env);
+      if (node.callee.optional && (thisContext === null || thisContext === undefined)) {
+        return undefined;
+      }
       const prop = node.callee.computed
         ? this.evaluate(node.callee.property, env)
         : node.callee.property.name;
@@ -8473,8 +8479,14 @@ class Interpreter {
     // Get function name for call stack tracking
     const funcName = metadata.name || func.name || 'anonymous';
 
-    // Bind 'this' if provided (for method calls)
-    if (thisContext !== undefined) {
+    // Bind 'this': for arrow functions use captured this (lexical), for regular functions use call-site this
+    if (metadata.isArrow) {
+      // Arrow functions use lexically captured 'this', ignoring call-site 'this'
+      if (metadata.capturedThis !== undefined) {
+        funcEnv.define('this', metadata.capturedThis);
+      }
+    } else if (thisContext !== undefined) {
+      // Regular functions use 'this' from the call site
       funcEnv.define('this', thisContext);
     }
 
@@ -8655,13 +8667,28 @@ class Interpreter {
   }
 
   evaluateFunctionExpression(node, env) {
+    const isArrow = node.type === 'ArrowFunctionExpression';
+
+    // For arrow functions, capture 'this' lexically from the enclosing scope
+    let capturedThis;
+    if (isArrow) {
+      try {
+        capturedThis = env.get('this');
+      } catch (e) {
+        // 'this' not defined in enclosing scope, leave undefined
+        capturedThis = undefined;
+      }
+    }
+
     const funcMetadata = {
       __isFunction: true,
       params: node.params,
       body: node.body,
       closure: env,
-      expression: node.type === 'ArrowFunctionExpression' && node.expression,
-      async: node.async || false
+      expression: isArrow && node.expression,
+      async: node.async || false,
+      isArrow: isArrow,
+      capturedThis: isArrow ? capturedThis : undefined
     };
 
     // Wrap in actual JavaScript function so it can be called by native code

package/dist/index.d.ts

@@ -7306,6 +7306,9 @@ class Interpreter {
 
       if (node.callee.type === 'MemberExpression') {
         thisContext = await this.evaluateAsync(node.callee.object, env);
+        if (node.callee.optional && (thisContext === null || thisContext === undefined)) {
+          return undefined;
+        }
         const prop = node.callee.computed
           ? await this.evaluateAsync(node.callee.property, env)
           : node.callee.property.name;
@@ -8395,6 +8398,9 @@ class Interpreter {
     if (node.callee.type === 'MemberExpression') {
       // For method calls like obj.method(), set this to obj
       thisContext = this.evaluate(node.callee.object, env);
+      if (node.callee.optional && (thisContext === null || thisContext === undefined)) {
+        return undefined;
+      }
       const prop = node.callee.computed
         ? this.evaluate(node.callee.property, env)
         : node.callee.property.name;
@@ -8473,8 +8479,14 @@ class Interpreter {
     // Get function name for call stack tracking
     const funcName = metadata.name || func.name || 'anonymous';
 
-    // Bind 'this' if provided (for method calls)
-    if (thisContext !== undefined) {
+    // Bind 'this': for arrow functions use captured this (lexical), for regular functions use call-site this
+    if (metadata.isArrow) {
+      // Arrow functions use lexically captured 'this', ignoring call-site 'this'
+      if (metadata.capturedThis !== undefined) {
+        funcEnv.define('this', metadata.capturedThis);
+      }
+    } else if (thisContext !== undefined) {
+      // Regular functions use 'this' from the call site
       funcEnv.define('this', thisContext);
     }
 
@@ -8655,13 +8667,28 @@ class Interpreter {
   }
 
   evaluateFunctionExpression(node, env) {
+    const isArrow = node.type === 'ArrowFunctionExpression';
+
+    // For arrow functions, capture 'this' lexically from the enclosing scope
+    let capturedThis;
+    if (isArrow) {
+      try {
+        capturedThis = env.get('this');
+      } catch (e) {
+        // 'this' not defined in enclosing scope, leave undefined
+        capturedThis = undefined;
+      }
+    }
+
     const funcMetadata = {
       __isFunction: true,
       params: node.params,
       body: node.body,
       closure: env,
-      expression: node.type === 'ArrowFunctionExpression' && node.expression,
-      async: node.async || false
+      expression: isArrow && node.expression,
+      async: node.async || false,
+      isArrow: isArrow,
+      capturedThis: isArrow ? capturedThis : undefined
     };
 
     // Wrap in actual JavaScript function so it can be called by native code

package/dist/index.js

@@ -6545,6 +6545,9 @@ var Interpreter = class _Interpreter {
       let methodName = null;
       if (node.callee.type === "MemberExpression") {
         thisContext = await this.evaluateAsync(node.callee.object, env);
+        if (node.callee.optional && (thisContext === null || thisContext === void 0)) {
+          return void 0;
+        }
         const prop = node.callee.computed ? await this.evaluateAsync(node.callee.property, env) : node.callee.property.name;
         callee = thisContext[prop];
         methodName = prop;
@@ -7413,6 +7416,9 @@ var Interpreter = class _Interpreter {
     let methodName = null;
     if (node.callee.type === "MemberExpression") {
       thisContext = this.evaluate(node.callee.object, env);
+      if (node.callee.optional && (thisContext === null || thisContext === void 0)) {
+        return void 0;
+      }
       const prop = node.callee.computed ? this.evaluate(node.callee.property, env) : node.callee.property.name;
       callee = thisContext[prop];
       methodName = prop;
@@ -7470,7 +7476,11 @@ var Interpreter = class _Interpreter {
     const metadata = func.__metadata || func;
     const funcEnv = new Environment(metadata.closure);
     const funcName = metadata.name || func.name || "anonymous";
-    if (thisContext !== void 0) {
+    if (metadata.isArrow) {
+      if (metadata.capturedThis !== void 0) {
+        funcEnv.define("this", metadata.capturedThis);
+      }
+    } else if (thisContext !== void 0) {
       funcEnv.define("this", thisContext);
     }
     for (let i = 0; i < metadata.params.length; i++) {
@@ -7605,13 +7615,24 @@ var Interpreter = class _Interpreter {
     return obj;
   }
   evaluateFunctionExpression(node, env) {
+    const isArrow = node.type === "ArrowFunctionExpression";
+    let capturedThis;
+    if (isArrow) {
+      try {
+        capturedThis = env.get("this");
+      } catch (e) {
+        capturedThis = void 0;
+      }
+    }
     const funcMetadata = {
       __isFunction: true,
       params: node.params,
       body: node.body,
       closure: env,
-      expression: node.type === "ArrowFunctionExpression" && node.expression,
-      async: node.async || false
+      expression: isArrow && node.expression,
+      async: node.async || false,
+      isArrow,
+      capturedThis: isArrow ? capturedThis : void 0
     };
     const interpreter = this;
     const wrappedFunc = funcMetadata.async ? async function(...args) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jslike",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "description": "Production-ready JavaScript interpreter with full ES6+ support using Acorn parser",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",