starlight-cli 1.0.48 → 1.0.50

package/dist/index.js

@@ -1388,12 +1388,13 @@ class Environment {
     return false;
   }
 
-  get(name, node) {
+  get(name, node, source) {
   if (name in this.store) return this.store[name];
-  if (this.parent) return this.parent.get(name, node);
-  throw new RuntimeError(`Undefined variable: ${name}`, node);
+  if (this.parent) return this.parent.get(name, node, source);
+  throw new RuntimeError(`Undefined variable: ${name}`, node, source);
 }
 
+
   set(name, value) {
     if (name in this.store) { this.store[name] = value; return value; }
     if (this.parent && this.parent.has(name)) { return this.parent.set(name, value); }
@@ -1577,7 +1578,7 @@ async evaluate(node, env = this.global) {
     case 'LogicalExpression': return await this.evalLogical(node, env);
     case 'UnaryExpression': return await this.evalUnary(node, env);
     case 'Literal': return node.value;
-    case 'Identifier': return env.get(node.name, node);
+    case 'Identifier': return env.get(node.name, node, this.source);
     case 'IfStatement': return await this.evalIf(node, env);
     case 'WhileStatement': return await this.evalWhile(node, env);
     case 'ForStatement':
@@ -1740,15 +1741,27 @@ async evalBlock(node, env) {
     try {
       result = await this.evaluate(stmt, env);
     } catch (e) {
-      if (e instanceof ReturnValue || e instanceof BreakSignal || e instanceof ContinueSignal) throw e;
-      // Wrap any other error in RuntimeError with the current block node
-      throw new RuntimeError(e.message || 'Error in block', stmt, this.source);
+      if (
+        e instanceof RuntimeError ||
+        e instanceof ReturnValue ||
+        e instanceof BreakSignal ||
+        e instanceof ContinueSignal
+      ) {
+        throw e; 
+      }
+
+      throw new RuntimeError(
+        e.message || 'Error in block',
+        stmt,
+        this.source
+      );
     }
   }
   return result;
 }
 
 
+
 async evalVarDeclaration(node, env) {
   if (!node.expr) {
     throw new RuntimeError('Variable declaration requires an initializer', node, this.source);
@@ -1805,7 +1818,7 @@ async evalCompoundAssignment(node, env) {
   const left = node.left;
   let current;
 
-  if (left.type === 'Identifier') current = env.get(left.name);
+  if (left.type === 'Identifier') current = env.get(left.name, left, this.source);
   else if (left.type === 'MemberExpression') current = await this.evalMember(left, env);
   else if (left.type === 'IndexExpression') current = await this.evalIndex(left, env);
   else throw new RuntimeError('Invalid compound assignment target', node, this.source);
@@ -2056,9 +2069,15 @@ async evalCall(node, env) {
   const callEnv = new Environment(fn.env);
 
   for (let i = 0; i < fn.params.length; i++) {
-    const argVal = node.arguments[i] ? await this.evaluate(node.arguments[i], env) : null;
-    callEnv.define(fn.params[i], argVal);
-  }
+  const argVal = node.arguments[i]
+    ? await this.evaluate(node.arguments[i], env)
+    : null;
+
+  const param = fn.params[i];
+  const paramName = typeof param === 'string' ? param : param.name;
+
+  callEnv.define(paramName, argVal);
+}
 
   try {
     const result = await this.evaluate(fn.body, callEnv);
@@ -2109,7 +2128,7 @@ if (!(node.property in obj)) throw new RuntimeError(`Property '${node.property}'
 async evalUpdate(node, env) {
   const arg = node.argument;
   const getCurrent = async () => {
-    if (arg.type === 'Identifier') return env.get(arg.name);
+    if (arg.type === 'Identifier') return env.get(arg.name, arg, this.source);
     if (arg.type === 'MemberExpression') return await this.evalMember(arg, env);
     if (arg.type === 'IndexExpression') return await this.evalIndex(arg, env);
     throw new RuntimeError('Invalid update target', node, this.source);
@@ -3300,7 +3319,7 @@ const Lexer = __nccwpck_require__(211);
 const Parser = __nccwpck_require__(222);
 const Evaluator = __nccwpck_require__(112);
 
-const VERSION = '1.0.48';
+const VERSION = '1.0.50';
 
 const COLOR = {
     reset: '\x1b[0m',

package/package.json

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

package/src/evaluator.js

@@ -45,12 +45,13 @@ class Environment {
     return false;
   }
 
-  get(name, node) {
+  get(name, node, source) {
   if (name in this.store) return this.store[name];
-  if (this.parent) return this.parent.get(name, node);
-  throw new RuntimeError(`Undefined variable: ${name}`, node);
+  if (this.parent) return this.parent.get(name, node, source);
+  throw new RuntimeError(`Undefined variable: ${name}`, node, source);
 }
 
+
   set(name, value) {
     if (name in this.store) { this.store[name] = value; return value; }
     if (this.parent && this.parent.has(name)) { return this.parent.set(name, value); }
@@ -234,7 +235,7 @@ async evaluate(node, env = this.global) {
     case 'LogicalExpression': return await this.evalLogical(node, env);
     case 'UnaryExpression': return await this.evalUnary(node, env);
     case 'Literal': return node.value;
-    case 'Identifier': return env.get(node.name, node);
+    case 'Identifier': return env.get(node.name, node, this.source);
     case 'IfStatement': return await this.evalIf(node, env);
     case 'WhileStatement': return await this.evalWhile(node, env);
     case 'ForStatement':
@@ -397,15 +398,27 @@ async evalBlock(node, env) {
     try {
       result = await this.evaluate(stmt, env);
     } catch (e) {
-      if (e instanceof ReturnValue || e instanceof BreakSignal || e instanceof ContinueSignal) throw e;
-      // Wrap any other error in RuntimeError with the current block node
-      throw new RuntimeError(e.message || 'Error in block', stmt, this.source);
+      if (
+        e instanceof RuntimeError ||
+        e instanceof ReturnValue ||
+        e instanceof BreakSignal ||
+        e instanceof ContinueSignal
+      ) {
+        throw e; 
+      }
+
+      throw new RuntimeError(
+        e.message || 'Error in block',
+        stmt,
+        this.source
+      );
     }
   }
   return result;
 }
 
 
+
 async evalVarDeclaration(node, env) {
   if (!node.expr) {
     throw new RuntimeError('Variable declaration requires an initializer', node, this.source);
@@ -462,7 +475,7 @@ async evalCompoundAssignment(node, env) {
   const left = node.left;
   let current;
 
-  if (left.type === 'Identifier') current = env.get(left.name);
+  if (left.type === 'Identifier') current = env.get(left.name, left, this.source);
   else if (left.type === 'MemberExpression') current = await this.evalMember(left, env);
   else if (left.type === 'IndexExpression') current = await this.evalIndex(left, env);
   else throw new RuntimeError('Invalid compound assignment target', node, this.source);
@@ -713,9 +726,15 @@ async evalCall(node, env) {
   const callEnv = new Environment(fn.env);
 
   for (let i = 0; i < fn.params.length; i++) {
-    const argVal = node.arguments[i] ? await this.evaluate(node.arguments[i], env) : null;
-    callEnv.define(fn.params[i], argVal);
-  }
+  const argVal = node.arguments[i]
+    ? await this.evaluate(node.arguments[i], env)
+    : null;
+
+  const param = fn.params[i];
+  const paramName = typeof param === 'string' ? param : param.name;
+
+  callEnv.define(paramName, argVal);
+}
 
   try {
     const result = await this.evaluate(fn.body, callEnv);
@@ -766,7 +785,7 @@ if (!(node.property in obj)) throw new RuntimeError(`Property '${node.property}'
 async evalUpdate(node, env) {
   const arg = node.argument;
   const getCurrent = async () => {
-    if (arg.type === 'Identifier') return env.get(arg.name);
+    if (arg.type === 'Identifier') return env.get(arg.name, arg, this.source);
     if (arg.type === 'MemberExpression') return await this.evalMember(arg, env);
     if (arg.type === 'IndexExpression') return await this.evalIndex(arg, env);
     throw new RuntimeError('Invalid update target', node, this.source);

package/src/starlight.js

@@ -9,7 +9,7 @@ const Lexer = require('./lexer');
 const Parser = require('./parser');
 const Evaluator = require('./evaluator');
 
-const VERSION = '1.0.48';
+const VERSION = '1.0.50';
 
 const COLOR = {
     reset: '\x1b[0m',