starlight-cli 1.0.31 → 1.0.33

package/dist/index.js

@@ -1497,14 +1497,33 @@ async evaluate(node, env = this.global) {
       return val;
     }
     case 'NewExpression': {
-      const fn = await this.evaluate(node.callee, env); // the class or constructor
-      if (typeof fn !== 'function') {
-        throw new Error('NewExpression callee is not a function');
+  const callee = await this.evaluate(node.callee, env);
+
+  if (typeof callee === 'object' && callee.body) {
+    const evaluator = this; // <- capture the current evaluator
+    const Constructor = function(...args) {
+      const newEnv = new Environment(callee.env);
+      newEnv.define('this', this);
+      for (let i = 0; i < callee.params.length; i++) {
+        newEnv.define(callee.params[i], args[i]);
       }
-      const args = [];
-      for (const a of node.arguments) args.push(await this.evaluate(a, env));
-      return new fn(...args);
-    }
+      return evaluator.evaluate(callee.body, newEnv); // use captured evaluator
+    };
+
+    const args = [];
+    for (const a of node.arguments) args.push(await this.evaluate(a, env));
+    return new Constructor(...args);
+  }
+
+  if (typeof callee !== 'function') {
+    throw new Error('NewExpression callee is not a function');
+  }
+
+  const args = [];
+  for (const a of node.arguments) args.push(await this.evaluate(a, env));
+  return new callee(...args);
+}
+
     default:
       throw new Error(`Unknown node type in evaluator: ${node.type}`);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starlight-cli",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "description": "Starlight Programming Language CLI",
   "bin": {
     "starlight": "index.js"

package/src/evaluator.js

@@ -154,14 +154,33 @@ async evaluate(node, env = this.global) {
       return val;
     }
     case 'NewExpression': {
-      const fn = await this.evaluate(node.callee, env); // the class or constructor
-      if (typeof fn !== 'function') {
-        throw new Error('NewExpression callee is not a function');
+  const callee = await this.evaluate(node.callee, env);
+
+  if (typeof callee === 'object' && callee.body) {
+    const evaluator = this; // <- capture the current evaluator
+    const Constructor = function(...args) {
+      const newEnv = new Environment(callee.env);
+      newEnv.define('this', this);
+      for (let i = 0; i < callee.params.length; i++) {
+        newEnv.define(callee.params[i], args[i]);
       }
-      const args = [];
-      for (const a of node.arguments) args.push(await this.evaluate(a, env));
-      return new fn(...args);
-    }
+      return evaluator.evaluate(callee.body, newEnv); // use captured evaluator
+    };
+
+    const args = [];
+    for (const a of node.arguments) args.push(await this.evaluate(a, env));
+    return new Constructor(...args);
+  }
+
+  if (typeof callee !== 'function') {
+    throw new Error('NewExpression callee is not a function');
+  }
+
+  const args = [];
+  for (const a of node.arguments) args.push(await this.evaluate(a, env));
+  return new callee(...args);
+}
+
     default:
       throw new Error(`Unknown node type in evaluator: ${node.type}`);
   }