jslike 1.8.2 → 1.8.4

package/dist/index.js

@@ -11514,6 +11514,9 @@ function getPatternName(pattern) {
   if (pattern.type === "TSParameterProperty") return getPatternName(pattern.parameter);
   return pattern.name;
 }
+function unwrapTSParameterProperty(param) {
+  return (param == null ? void 0 : param.type) === "TSParameterProperty" ? param.parameter : param;
+}
 function collectRuntimeIdentifierReferences(node) {
   const references = /* @__PURE__ */ new Set();
   const skipKeys = /* @__PURE__ */ new Set([
@@ -12816,24 +12819,7 @@ var Interpreter = class _Interpreter {
     } else if (thisContext !== void 0) {
       funcEnv.define("this", thisContext);
     }
-    for (let i = 0; i < metadata.params.length; i++) {
-      const param = metadata.params[i].type === "TSParameterProperty" ? metadata.params[i].parameter : metadata.params[i];
-      if (param.type === "Identifier") {
-        funcEnv.define(param.name, args[i]);
-      } else if (param.type === "AssignmentPattern") {
-        const value = args[i] !== void 0 ? args[i] : this.evaluate(param.right, funcEnv);
-        funcEnv.define(param.left.name, value);
-      } else if (param.type === "RestElement") {
-        funcEnv.define(param.argument.name, args.slice(i));
-        break;
-      } else if (param.type === "ObjectPattern") {
-        this.bindObjectPattern(param, args[i], funcEnv);
-      } else if (param.type === "ArrayPattern") {
-        this.bindArrayPattern(param, args[i], funcEnv);
-      } else {
-        funcEnv.define(param.name, args[i]);
-      }
-    }
+    this.bindFunctionParameters(metadata.params, args, funcEnv);
     if (metadata.async) {
       if (this.executionController) {
         this.executionController._pushCall(funcName);
@@ -13098,7 +13084,7 @@ var Interpreter = class _Interpreter {
           env.define(prop.value.name, propValue, isConst);
         } else if (prop.value.type === "AssignmentPattern") {
           const finalValue = propValue !== void 0 ? propValue : this.evaluate(prop.value.right, env);
-          env.define(prop.value.left.name, finalValue, isConst);
+          this.bindPattern(prop.value.left, finalValue, env, isConst);
         } else if (prop.value.type === "ObjectPattern") {
           this.bindObjectPattern(prop.value, propValue, env, isConst);
         } else if (prop.value.type === "ArrayPattern") {
@@ -13122,7 +13108,7 @@ var Interpreter = class _Interpreter {
         env.define(element.name, value[i], isConst);
       } else if (element.type === "AssignmentPattern") {
         const finalValue = value[i] !== void 0 ? value[i] : this.evaluate(element.right, env);
-        env.define(element.left.name, finalValue, isConst);
+        this.bindPattern(element.left, finalValue, env, isConst);
       } else if (element.type === "ObjectPattern") {
         this.bindObjectPattern(element, value[i], env, isConst);
       } else if (element.type === "ArrayPattern") {
@@ -13130,6 +13116,67 @@ var Interpreter = class _Interpreter {
       }
     }
   }
+  bindPattern(pattern, value, env, isConst = false) {
+    if (pattern.type === "Identifier") {
+      env.define(pattern.name, value, isConst);
+    } else if (pattern.type === "ObjectPattern") {
+      this.bindObjectPattern(pattern, value, env, isConst);
+    } else if (pattern.type === "ArrayPattern") {
+      this.bindArrayPattern(pattern, value, env, isConst);
+    } else if (pattern.type === "AssignmentPattern") {
+      const finalValue = value !== void 0 ? value : this.evaluate(pattern.right, env);
+      this.bindPattern(pattern.left, finalValue, env, isConst);
+    } else if (pattern.type === "RestElement") {
+      this.bindPattern(pattern.argument, value, env, isConst);
+    }
+  }
+  bindFunctionParameters(params, args, env, thisContext = null) {
+    for (let i = 0; i < params.length; i++) {
+      const originalParam = params[i];
+      const param = unwrapTSParameterProperty(originalParam);
+      this.bindFunctionParameter(param, args[i], args.slice(i), env);
+      if (originalParam.type === "TSParameterProperty" && thisContext) {
+        const propertyName = getPatternName(originalParam.parameter);
+        if (propertyName) {
+          thisContext[propertyName] = env.get(propertyName);
+        }
+      }
+      if (param.type === "RestElement") {
+        break;
+      }
+    }
+  }
+  bindFunctionParameter(param, arg, restArgs, env) {
+    if (param.type === "Identifier") {
+      this.bindPattern(param, arg, env);
+      return;
+    }
+    if (param.type === "AssignmentPattern") {
+      const value = arg !== void 0 ? arg : this.evaluate(param.right, env);
+      this.bindPattern(param.left, value, env);
+      return;
+    }
+    if (param.type === "RestElement") {
+      const target = param.argument;
+      if (target.type === "Identifier") {
+        env.define(target.name, restArgs);
+      } else if (target.type === "ArrayPattern") {
+        this.bindArrayPattern(target, restArgs, env);
+      } else if (target.type === "ObjectPattern") {
+        this.bindObjectPattern(target, restArgs, env);
+      }
+      return;
+    }
+    if (param.type === "ObjectPattern") {
+      this.bindPattern(param, arg, env);
+      return;
+    }
+    if (param.type === "ArrayPattern") {
+      this.bindPattern(param, arg, env);
+      return;
+    }
+    env.define(param.name, arg);
+  }
   evaluateFunctionDeclaration(node, env) {
     const funcMetadata = {
       __isFunction: true,
@@ -13539,6 +13586,7 @@ var Interpreter = class _Interpreter {
     let constructor = null;
     const methods = {};
     const staticMethods = {};
+    const instanceFields = [];
     for (const member of node.body.body) {
       if (member.type === "MethodDefinition") {
         const methodName = member.key.name || member.key.value;
@@ -13550,23 +13598,26 @@ var Interpreter = class _Interpreter {
         } else {
           methods[methodName] = methodFunc;
         }
+      } else if (member.type === "PropertyDefinition" && !member.static && !member.declare && !member.abstract) {
+        instanceFields.push(member);
       }
     }
     const classConstructor = function(...args) {
       const instance = Object.create(classConstructor.prototype);
-      if (constructor) {
-        const result = interpreter.callMethodFunction(constructor, instance, args, env, superClass);
-        if (result && result.__explicitReturn && result.value && typeof result.value === "object" && result.value !== instance) {
-          return result.value;
-        }
-      } else if (superClass) {
-        superClass.call(instance, ...args);
+      const result = interpreter.constructClassInto(classConstructor, instance, args, env);
+      if (result && result.__explicitReturn && result.value && typeof result.value === "object" && result.value !== instance) {
+        return result.value;
       }
       return instance;
     };
     if (constructor) {
       classConstructor.__constructor = constructor;
     }
+    classConstructor.__instanceFields = instanceFields;
+    classConstructor.__superClass = superClass;
+    classConstructor.__constructInto = (instance, args) => {
+      return interpreter.constructClassInto(classConstructor, instance, args, env);
+    };
     if (superClass) {
       classConstructor.prototype = Object.create(superClass.prototype);
       classConstructor.prototype.constructor = classConstructor;
@@ -13592,6 +13643,59 @@ var Interpreter = class _Interpreter {
     classConstructor.__className = className;
     return classConstructor;
   }
+  constructClassInto(classConstructor, instance, args, env) {
+    const superClass = classConstructor.__superClass;
+    const constructor = classConstructor.__constructor;
+    let fieldsInitialized = false;
+    const initializeOwnFields = () => {
+      if (!fieldsInitialized) {
+        this.initializeClassFields(classConstructor, instance, env);
+        fieldsInitialized = true;
+      }
+    };
+    if (!superClass) {
+      initializeOwnFields();
+      if (constructor) {
+        return this.callMethodFunction(constructor, instance, args, env, null);
+      }
+      return void 0;
+    }
+    if (constructor) {
+      const result = this.callMethodFunction(constructor, instance, args, env, superClass, initializeOwnFields);
+      initializeOwnFields();
+      return result;
+    }
+    this.initializeSuperClass(superClass, instance, args);
+    initializeOwnFields();
+    return void 0;
+  }
+  initializeSuperClass(superClass, instance, args) {
+    if (superClass.__constructInto) {
+      return superClass.__constructInto(instance, args);
+    }
+    const tempInstance = Reflect.construct(superClass, args, instance.constructor);
+    Object.getOwnPropertyNames(tempInstance).forEach((name) => {
+      instance[name] = tempInstance[name];
+    });
+    return void 0;
+  }
+  initializeClassFields(classConstructor, instance, env) {
+    for (const field of classConstructor.__instanceFields || []) {
+      const fieldEnv = new Environment(env);
+      fieldEnv.define("this", instance);
+      const name = this.getClassFieldName(field, fieldEnv);
+      instance[name] = field.value ? this.evaluate(field.value, fieldEnv) : void 0;
+    }
+  }
+  getClassFieldName(field, env) {
+    if (field.computed) {
+      return this.evaluate(field.key, env);
+    }
+    if (field.key.type === "Identifier" || field.key.type === "PrivateIdentifier") {
+      return field.key.name;
+    }
+    return field.key.value;
+  }
   createMethodFunction(funcNode, env, className) {
     const func = {
       __isFunction: true,
@@ -13602,50 +13706,22 @@ var Interpreter = class _Interpreter {
     };
     return func;
   }
-  callMethodFunction(methodFunc, thisContext, args, env, superClass = null) {
+  callMethodFunction(methodFunc, thisContext, args, env, superClass = null, afterSuper = null) {
     const funcEnv = new Environment(methodFunc.__env || env);
     funcEnv.define("this", thisContext);
     if (superClass) {
       const superFunc = (...superArgs) => {
-        if (superClass.__constructor) {
-          this.callMethodFunction(superClass.__constructor, thisContext, superArgs, env, null);
-        } else {
-          const tempInstance = Reflect.construct(superClass, superArgs, thisContext.constructor);
-          Object.getOwnPropertyNames(tempInstance).forEach((name) => {
-            thisContext[name] = tempInstance[name];
-          });
+        const result2 = this.initializeSuperClass(superClass, thisContext, superArgs);
+        if (afterSuper) {
+          afterSuper();
         }
-        return void 0;
+        return result2 && result2.__explicitReturn ? result2.value : void 0;
       };
       superFunc.__isSuperConstructor = true;
       superFunc.__superClass = superClass;
       funcEnv.define("super", superFunc);
     }
-    for (let i = 0; i < methodFunc.__params.length; i++) {
-      const originalParam = methodFunc.__params[i];
-      const param = originalParam.type === "TSParameterProperty" ? originalParam.parameter : originalParam;
-      if (param.type === "Identifier") {
-        funcEnv.define(param.name, args[i]);
-      } else if (param.type === "AssignmentPattern") {
-        const value = args[i] !== void 0 ? args[i] : this.evaluate(param.right, funcEnv);
-        funcEnv.define(param.left.name, value);
-      } else if (param.type === "RestElement") {
-        funcEnv.define(param.argument.name, args.slice(i));
-        break;
-      } else if (param.type === "ObjectPattern") {
-        this.bindObjectPattern(param, args[i], funcEnv);
-      } else if (param.type === "ArrayPattern") {
-        this.bindArrayPattern(param, args[i], funcEnv);
-      } else {
-        funcEnv.define(param.name, args[i]);
-      }
-      if (originalParam.type === "TSParameterProperty") {
-        const propertyName = getPatternName(originalParam.parameter);
-        if (propertyName) {
-          thisContext[propertyName] = funcEnv.get(propertyName);
-        }
-      }
-    }
+    this.bindFunctionParameters(methodFunc.__params, args, funcEnv, thisContext);
     const result = this.evaluate(methodFunc.__body, funcEnv);
     if (result instanceof ReturnValue) {
       return { __explicitReturn: true, value: result.value };

package/package.json

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