starlight-cli 1.0.38 → 1.0.40

package/dist/index.js

@@ -1468,7 +1468,12 @@ async evaluate(node, env = this.global) {
     case 'Identifier': return env.get(node.name);
     case 'IfStatement': return await this.evalIf(node, env);
     case 'WhileStatement': return await this.evalWhile(node, env);
-    case 'ForStatement': return await this.evalFor(node, env);
+    case 'ForStatement':
+case 'ForInStatement':
+  return await this.evalFor(node, env);
+case 'DoTrackStatement':
+  return await this.evalDoTrack(node, env);
+
     case 'BreakStatement': throw new BreakSignal();
     case 'ContinueStatement': throw new ContinueSignal();
     case 'ImportStatement': return await this.evalImport(node, env);
@@ -1484,12 +1489,14 @@ async evaluate(node, env = this.global) {
       return await Promise.all(node.elements.map(el => this.evaluate(el, env)));
     case 'IndexExpression': return await this.evalIndex(node, env);
     case 'ObjectExpression': {
-      const out = {};
-      for (const p of node.props) {
-        out[p.key] = await this.evaluate(p.value, env);
-      }
-      return out;
-    }
+  const out = {};
+  for (const p of node.props) {
+    const key = await this.evaluate(p.key, env);
+    out[key] = await this.evaluate(p.value, env);
+  }
+  return out;
+}
+
     case 'MemberExpression': return await this.evalMember(node, env);
     case 'UpdateExpression': return await this.evalUpdate(node, env);
     case 'AwaitExpression': {
@@ -1537,6 +1544,18 @@ async evalProgram(node, env) {
   return result;
 }
 
+async evalDoTrack(node, env) {
+  try {
+    return await this.evaluate(node.body, env);
+  } catch (err) {
+    if (!node.handler) throw err;
+
+    const trackEnv = new Environment(env);
+    trackEnv.define('error', err);
+
+    return await this.evaluate(node.handler, trackEnv);
+  }
+}
 
 async evalImport(node, env) {
   const spec = node.path;
@@ -2002,7 +2021,7 @@ class Lexer {
   'break', 'continue', 'func', 'return',
   'true', 'false', 'null',
   'ask', 'define', 'import', 'from', 'as',
-  'async', 'await', 'new', 'in'
+  'async', 'await', 'new', 'in', 'do', 'track'
 ];
 
 
@@ -2156,6 +2175,7 @@ class Parser {
       case 'IF': return this.ifStatement();
       case 'WHILE': return this.whileStatement();
       case 'FOR': return this.forStatement();
+      case 'DO': return this.doTrackStatement();
       case 'BREAK': return this.breakStatement();
       case 'CONTINUE': return this.continueStatement();
       case 'FUNC': return this.funcDeclaration();
@@ -2190,6 +2210,23 @@ sldeployStatement() {
   if (this.current.type === 'SEMICOLON') this.eat('SEMICOLON');
   return { type: 'SldeployStatement', expr };
 }
+doTrackStatement() {
+  this.eat('DO');
+
+  const body = this.block();
+
+  let handler = null;
+  if (this.current.type === 'TRACK') {
+    this.eat('TRACK');
+    handler = this.block();
+  }
+
+  return {
+    type: 'DoTrackStatement',
+    body,
+    handler
+  };
+}
 
 defineStatement() {
   this.eat('DEFINE');

package/package.json

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

package/src/evaluator.js

@@ -125,7 +125,12 @@ async evaluate(node, env = this.global) {
     case 'Identifier': return env.get(node.name);
     case 'IfStatement': return await this.evalIf(node, env);
     case 'WhileStatement': return await this.evalWhile(node, env);
-    case 'ForStatement': return await this.evalFor(node, env);
+    case 'ForStatement':
+case 'ForInStatement':
+  return await this.evalFor(node, env);
+case 'DoTrackStatement':
+  return await this.evalDoTrack(node, env);
+
     case 'BreakStatement': throw new BreakSignal();
     case 'ContinueStatement': throw new ContinueSignal();
     case 'ImportStatement': return await this.evalImport(node, env);
@@ -141,12 +146,14 @@ async evaluate(node, env = this.global) {
       return await Promise.all(node.elements.map(el => this.evaluate(el, env)));
     case 'IndexExpression': return await this.evalIndex(node, env);
     case 'ObjectExpression': {
-      const out = {};
-      for (const p of node.props) {
-        out[p.key] = await this.evaluate(p.value, env);
-      }
-      return out;
-    }
+  const out = {};
+  for (const p of node.props) {
+    const key = await this.evaluate(p.key, env);
+    out[key] = await this.evaluate(p.value, env);
+  }
+  return out;
+}
+
     case 'MemberExpression': return await this.evalMember(node, env);
     case 'UpdateExpression': return await this.evalUpdate(node, env);
     case 'AwaitExpression': {
@@ -194,6 +201,18 @@ async evalProgram(node, env) {
   return result;
 }
 
+async evalDoTrack(node, env) {
+  try {
+    return await this.evaluate(node.body, env);
+  } catch (err) {
+    if (!node.handler) throw err;
+
+    const trackEnv = new Environment(env);
+    trackEnv.define('error', err);
+
+    return await this.evaluate(node.handler, trackEnv);
+  }
+}
 
 async evalImport(node, env) {
   const spec = node.path;

package/src/lexer.js

@@ -83,7 +83,7 @@ class Lexer {
   'break', 'continue', 'func', 'return',
   'true', 'false', 'null',
   'ask', 'define', 'import', 'from', 'as',
-  'async', 'await', 'new', 'in'
+  'async', 'await', 'new', 'in', 'do', 'track'
 ];
 
 

package/src/parser.js

@@ -43,6 +43,7 @@ class Parser {
       case 'IF': return this.ifStatement();
       case 'WHILE': return this.whileStatement();
       case 'FOR': return this.forStatement();
+      case 'DO': return this.doTrackStatement();
       case 'BREAK': return this.breakStatement();
       case 'CONTINUE': return this.continueStatement();
       case 'FUNC': return this.funcDeclaration();
@@ -77,6 +78,23 @@ sldeployStatement() {
   if (this.current.type === 'SEMICOLON') this.eat('SEMICOLON');
   return { type: 'SldeployStatement', expr };
 }
+doTrackStatement() {
+  this.eat('DO');
+
+  const body = this.block();
+
+  let handler = null;
+  if (this.current.type === 'TRACK') {
+    this.eat('TRACK');
+    handler = this.block();
+  }
+
+  return {
+    type: 'DoTrackStatement',
+    body,
+    handler
+  };
+}
 
 defineStatement() {
   this.eat('DEFINE');