jslike 1.8.4 → 1.8.5

package/dist/esm/interpreter/interpreter.js

@@ -2768,7 +2768,7 @@ export class Interpreter {
     // Add methods to prototype
     for (const [name, method] of Object.entries(methods)) {
       classConstructor.prototype[name] = function(...args) {
-        const result = interpreter.callMethodFunction(method, this, args, env);
+        const result = interpreter.callMethodFunction(method, this, args, env, superClass);
         // Unwrap explicit return marker
         if (result && result.__explicitReturn) {
           return result.value;
@@ -2841,6 +2841,9 @@ export class Interpreter {
     for (const field of classConstructor.__instanceFields || []) {
       const fieldEnv = new Environment(env);
       fieldEnv.define('this', instance);
+      if (classConstructor.__superClass) {
+        fieldEnv.define('super', this.createSuperBinding(classConstructor.__superClass, instance, false));
+      }
       const name = this.getClassFieldName(field, fieldEnv);
       instance[name] = field.value ? this.evaluate(field.value, fieldEnv) : undefined;
     }
@@ -2856,6 +2859,38 @@ export class Interpreter {
     return field.key.value;
   }
 
+  createSuperBinding(superClass, thisContext, allowConstructor = false, afterSuper = null) {
+    const superConstructor = (...superArgs) => {
+      if (!allowConstructor) {
+        throw new ReferenceError("'super' keyword is unexpected here");
+      }
+      const result = this.initializeSuperClass(superClass, thisContext, superArgs);
+      if (afterSuper) {
+        afterSuper();
+      }
+      return result && result.__explicitReturn ? result.value : undefined;
+    };
+
+    superConstructor.__isSuperConstructor = true;
+    superConstructor.__superClass = superClass;
+
+    return new Proxy(superConstructor, {
+      get(target, prop, receiver) {
+        if (prop in target) {
+          return Reflect.get(target, prop, receiver);
+        }
+
+        const prototype = superClass?.prototype;
+        if (!prototype) {
+          return undefined;
+        }
+
+        const value = Reflect.get(prototype, prop, thisContext);
+        return typeof value === 'function' ? value.bind(thisContext) : value;
+      }
+    });
+  }
+
   createMethodFunction(funcNode, env, className) {
     const func = {
       __isFunction: true,
@@ -2875,18 +2910,7 @@ export class Interpreter {
 
     // Bind 'super' if superClass exists
     if (superClass) {
-      // Create a super function that calls the parent constructor
-      const superFunc = (...superArgs) => {
-        const result = this.initializeSuperClass(superClass, thisContext, superArgs);
-        if (afterSuper) {
-          afterSuper();
-        }
-        return result && result.__explicitReturn ? result.value : undefined;
-      };
-      // Store both the function and mark it as super
-      superFunc.__isSuperConstructor = true;
-      superFunc.__superClass = superClass;
-      funcEnv.define('super', superFunc);
+      funcEnv.define('super', this.createSuperBinding(superClass, thisContext, true, afterSuper));
     }
 
     this.bindFunctionParameters(methodFunc.__params, args, funcEnv, thisContext);

package/dist/index.cjs

@@ -13658,7 +13658,7 @@ var Interpreter = class _Interpreter {
     }
     for (const [name, method] of Object.entries(methods)) {
       classConstructor.prototype[name] = function(...args) {
-        const result = interpreter.callMethodFunction(method, this, args, env);
+        const result = interpreter.callMethodFunction(method, this, args, env, superClass);
         if (result && result.__explicitReturn) {
           return result.value;
         }
@@ -13717,6 +13717,9 @@ var Interpreter = class _Interpreter {
     for (const field of classConstructor.__instanceFields || []) {
       const fieldEnv = new Environment(env);
       fieldEnv.define("this", instance);
+      if (classConstructor.__superClass) {
+        fieldEnv.define("super", this.createSuperBinding(classConstructor.__superClass, instance, false));
+      }
       const name = this.getClassFieldName(field, fieldEnv);
       instance[name] = field.value ? this.evaluate(field.value, fieldEnv) : void 0;
     }
@@ -13730,6 +13733,33 @@ var Interpreter = class _Interpreter {
     }
     return field.key.value;
   }
+  createSuperBinding(superClass, thisContext, allowConstructor = false, afterSuper = null) {
+    const superConstructor = (...superArgs) => {
+      if (!allowConstructor) {
+        throw new ReferenceError("'super' keyword is unexpected here");
+      }
+      const result = this.initializeSuperClass(superClass, thisContext, superArgs);
+      if (afterSuper) {
+        afterSuper();
+      }
+      return result && result.__explicitReturn ? result.value : void 0;
+    };
+    superConstructor.__isSuperConstructor = true;
+    superConstructor.__superClass = superClass;
+    return new Proxy(superConstructor, {
+      get(target, prop, receiver) {
+        if (prop in target) {
+          return Reflect.get(target, prop, receiver);
+        }
+        const prototype = superClass == null ? void 0 : superClass.prototype;
+        if (!prototype) {
+          return void 0;
+        }
+        const value = Reflect.get(prototype, prop, thisContext);
+        return typeof value === "function" ? value.bind(thisContext) : value;
+      }
+    });
+  }
   createMethodFunction(funcNode, env, className) {
     const func = {
       __isFunction: true,
@@ -13744,16 +13774,7 @@ var Interpreter = class _Interpreter {
     const funcEnv = new Environment(methodFunc.__env || env);
     funcEnv.define("this", thisContext);
     if (superClass) {
-      const superFunc = (...superArgs) => {
-        const result2 = this.initializeSuperClass(superClass, thisContext, superArgs);
-        if (afterSuper) {
-          afterSuper();
-        }
-        return result2 && result2.__explicitReturn ? result2.value : void 0;
-      };
-      superFunc.__isSuperConstructor = true;
-      superFunc.__superClass = superClass;
-      funcEnv.define("super", superFunc);
+      funcEnv.define("super", this.createSuperBinding(superClass, thisContext, true, afterSuper));
     }
     this.bindFunctionParameters(methodFunc.__params, args, funcEnv, thisContext);
     const result = this.evaluate(methodFunc.__body, funcEnv);

package/dist/index.d.cts

@@ -14961,7 +14961,7 @@ class Interpreter {
     // Add methods to prototype
     for (const [name, method] of Object.entries(methods)) {
       classConstructor.prototype[name] = function(...args) {
-        const result = interpreter.callMethodFunction(method, this, args, env);
+        const result = interpreter.callMethodFunction(method, this, args, env, superClass);
         // Unwrap explicit return marker
         if (result && result.__explicitReturn) {
           return result.value;
@@ -15034,6 +15034,9 @@ class Interpreter {
     for (const field of classConstructor.__instanceFields || []) {
       const fieldEnv = new Environment(env);
       fieldEnv.define('this', instance);
+      if (classConstructor.__superClass) {
+        fieldEnv.define('super', this.createSuperBinding(classConstructor.__superClass, instance, false));
+      }
       const name = this.getClassFieldName(field, fieldEnv);
       instance[name] = field.value ? this.evaluate(field.value, fieldEnv) : undefined;
     }
@@ -15049,6 +15052,38 @@ class Interpreter {
     return field.key.value;
   }
 
+  createSuperBinding(superClass, thisContext, allowConstructor = false, afterSuper = null) {
+    const superConstructor = (...superArgs) => {
+      if (!allowConstructor) {
+        throw new ReferenceError("'super' keyword is unexpected here");
+      }
+      const result = this.initializeSuperClass(superClass, thisContext, superArgs);
+      if (afterSuper) {
+        afterSuper();
+      }
+      return result && result.__explicitReturn ? result.value : undefined;
+    };
+
+    superConstructor.__isSuperConstructor = true;
+    superConstructor.__superClass = superClass;
+
+    return new Proxy(superConstructor, {
+      get(target, prop, receiver) {
+        if (prop in target) {
+          return Reflect.get(target, prop, receiver);
+        }
+
+        const prototype = superClass?.prototype;
+        if (!prototype) {
+          return undefined;
+        }
+
+        const value = Reflect.get(prototype, prop, thisContext);
+        return typeof value === 'function' ? value.bind(thisContext) : value;
+      }
+    });
+  }
+
   createMethodFunction(funcNode, env, className) {
     const func = {
       __isFunction: true,
@@ -15068,18 +15103,7 @@ class Interpreter {
 
     // Bind 'super' if superClass exists
     if (superClass) {
-      // Create a super function that calls the parent constructor
-      const superFunc = (...superArgs) => {
-        const result = this.initializeSuperClass(superClass, thisContext, superArgs);
-        if (afterSuper) {
-          afterSuper();
-        }
-        return result && result.__explicitReturn ? result.value : undefined;
-      };
-      // Store both the function and mark it as super
-      superFunc.__isSuperConstructor = true;
-      superFunc.__superClass = superClass;
-      funcEnv.define('super', superFunc);
+      funcEnv.define('super', this.createSuperBinding(superClass, thisContext, true, afterSuper));
     }
 
     this.bindFunctionParameters(methodFunc.__params, args, funcEnv, thisContext);

package/dist/index.d.ts

@@ -14961,7 +14961,7 @@ class Interpreter {
     // Add methods to prototype
     for (const [name, method] of Object.entries(methods)) {
       classConstructor.prototype[name] = function(...args) {
-        const result = interpreter.callMethodFunction(method, this, args, env);
+        const result = interpreter.callMethodFunction(method, this, args, env, superClass);
         // Unwrap explicit return marker
         if (result && result.__explicitReturn) {
           return result.value;
@@ -15034,6 +15034,9 @@ class Interpreter {
     for (const field of classConstructor.__instanceFields || []) {
       const fieldEnv = new Environment(env);
       fieldEnv.define('this', instance);
+      if (classConstructor.__superClass) {
+        fieldEnv.define('super', this.createSuperBinding(classConstructor.__superClass, instance, false));
+      }
       const name = this.getClassFieldName(field, fieldEnv);
       instance[name] = field.value ? this.evaluate(field.value, fieldEnv) : undefined;
     }
@@ -15049,6 +15052,38 @@ class Interpreter {
     return field.key.value;
   }
 
+  createSuperBinding(superClass, thisContext, allowConstructor = false, afterSuper = null) {
+    const superConstructor = (...superArgs) => {
+      if (!allowConstructor) {
+        throw new ReferenceError("'super' keyword is unexpected here");
+      }
+      const result = this.initializeSuperClass(superClass, thisContext, superArgs);
+      if (afterSuper) {
+        afterSuper();
+      }
+      return result && result.__explicitReturn ? result.value : undefined;
+    };
+
+    superConstructor.__isSuperConstructor = true;
+    superConstructor.__superClass = superClass;
+
+    return new Proxy(superConstructor, {
+      get(target, prop, receiver) {
+        if (prop in target) {
+          return Reflect.get(target, prop, receiver);
+        }
+
+        const prototype = superClass?.prototype;
+        if (!prototype) {
+          return undefined;
+        }
+
+        const value = Reflect.get(prototype, prop, thisContext);
+        return typeof value === 'function' ? value.bind(thisContext) : value;
+      }
+    });
+  }
+
   createMethodFunction(funcNode, env, className) {
     const func = {
       __isFunction: true,
@@ -15068,18 +15103,7 @@ class Interpreter {
 
     // Bind 'super' if superClass exists
     if (superClass) {
-      // Create a super function that calls the parent constructor
-      const superFunc = (...superArgs) => {
-        const result = this.initializeSuperClass(superClass, thisContext, superArgs);
-        if (afterSuper) {
-          afterSuper();
-        }
-        return result && result.__explicitReturn ? result.value : undefined;
-      };
-      // Store both the function and mark it as super
-      superFunc.__isSuperConstructor = true;
-      superFunc.__superClass = superClass;
-      funcEnv.define('super', superFunc);
+      funcEnv.define('super', this.createSuperBinding(superClass, thisContext, true, afterSuper));
     }
 
     this.bindFunctionParameters(methodFunc.__params, args, funcEnv, thisContext);

package/dist/index.js

@@ -13624,7 +13624,7 @@ var Interpreter = class _Interpreter {
     }
     for (const [name, method] of Object.entries(methods)) {
       classConstructor.prototype[name] = function(...args) {
-        const result = interpreter.callMethodFunction(method, this, args, env);
+        const result = interpreter.callMethodFunction(method, this, args, env, superClass);
         if (result && result.__explicitReturn) {
           return result.value;
         }
@@ -13683,6 +13683,9 @@ var Interpreter = class _Interpreter {
     for (const field of classConstructor.__instanceFields || []) {
       const fieldEnv = new Environment(env);
       fieldEnv.define("this", instance);
+      if (classConstructor.__superClass) {
+        fieldEnv.define("super", this.createSuperBinding(classConstructor.__superClass, instance, false));
+      }
       const name = this.getClassFieldName(field, fieldEnv);
       instance[name] = field.value ? this.evaluate(field.value, fieldEnv) : void 0;
     }
@@ -13696,6 +13699,33 @@ var Interpreter = class _Interpreter {
     }
     return field.key.value;
   }
+  createSuperBinding(superClass, thisContext, allowConstructor = false, afterSuper = null) {
+    const superConstructor = (...superArgs) => {
+      if (!allowConstructor) {
+        throw new ReferenceError("'super' keyword is unexpected here");
+      }
+      const result = this.initializeSuperClass(superClass, thisContext, superArgs);
+      if (afterSuper) {
+        afterSuper();
+      }
+      return result && result.__explicitReturn ? result.value : void 0;
+    };
+    superConstructor.__isSuperConstructor = true;
+    superConstructor.__superClass = superClass;
+    return new Proxy(superConstructor, {
+      get(target, prop, receiver) {
+        if (prop in target) {
+          return Reflect.get(target, prop, receiver);
+        }
+        const prototype = superClass == null ? void 0 : superClass.prototype;
+        if (!prototype) {
+          return void 0;
+        }
+        const value = Reflect.get(prototype, prop, thisContext);
+        return typeof value === "function" ? value.bind(thisContext) : value;
+      }
+    });
+  }
   createMethodFunction(funcNode, env, className) {
     const func = {
       __isFunction: true,
@@ -13710,16 +13740,7 @@ var Interpreter = class _Interpreter {
     const funcEnv = new Environment(methodFunc.__env || env);
     funcEnv.define("this", thisContext);
     if (superClass) {
-      const superFunc = (...superArgs) => {
-        const result2 = this.initializeSuperClass(superClass, thisContext, superArgs);
-        if (afterSuper) {
-          afterSuper();
-        }
-        return result2 && result2.__explicitReturn ? result2.value : void 0;
-      };
-      superFunc.__isSuperConstructor = true;
-      superFunc.__superClass = superClass;
-      funcEnv.define("super", superFunc);
+      funcEnv.define("super", this.createSuperBinding(superClass, thisContext, true, afterSuper));
     }
     this.bindFunctionParameters(methodFunc.__params, args, funcEnv, thisContext);
     const result = this.evaluate(methodFunc.__body, funcEnv);

package/package.json

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