starlight-cli 1.0.18 → 1.0.19

package/dist/index.js

@@ -1457,9 +1457,20 @@ class Evaluator {
     return result;
   }
 
-  evalTemplateLiteral(node, env) {
-    return node.value;
+ evalTemplateLiteral(node, env) {
+  // node.parts is an array from parser: Literal or expression nodes
+  let result = '';
+  for (const part of node.parts) {
+    if (part.type === 'Literal') {
+      result += part.value;
+    } else {
+      const val = this.evaluate(part, env);
+      result += val != null ? val.toString() : '';
+    }
   }
+  return result;
+}
+
 
   evalImport(node, env) {
     const spec = node.path;
@@ -1826,38 +1837,45 @@ class Lexer {
   }
 
   templateString() {
-    this.advance(); 
-    let result = '';
-    while (this.currentChar && this.currentChar !== '`') {
-      if (this.currentChar === '$' && this.peek() === '{') {
-        this.advance(); this.advance(); // skip ${
-        result += '${'; // we leave the interpolation as-is for parser
-        continue;
-      }
-
-      if (this.currentChar === '\\') {
-        this.advance();
-        switch (this.currentChar) {
-          case 'n': result += '\n'; break;
-          case 't': result += '\t'; break;
-          case '`': result += '`'; break;
-          case '\\': result += '\\'; break;
-          default: result += this.currentChar;
-        }
-      } else {
-        result += this.currentChar;
+  this.advance(); // skip initial backtick `
+  let buffer = '';
+  const tokens = [];
+
+  while (this.currentChar && this.currentChar !== '`') {
+    if (this.currentChar === '$' && this.peek() === '{') {
+      if (buffer.length > 0) {
+        tokens.push({ type: 'TEMPLATE_STRING', value: buffer });
+        buffer = '';
       }
-      this.advance();
+      tokens.push({ type: 'DOLLAR_LBRACE' }); // ${
+      this.advance(); this.advance();
+      continue;
     }
 
-    if (this.currentChar !== '`') {
-      this.error('Unterminated template string');
+    if (this.currentChar === '\\') {
+      this.advance();
+      switch (this.currentChar) {
+        case 'n': buffer += '\n'; break;
+        case 't': buffer += '\t'; break;
+        case '`': buffer += '`'; break;
+        case '\\': buffer += '\\'; break;
+        default: buffer += this.currentChar;
+      }
+    } else {
+      buffer += this.currentChar;
     }
-
     this.advance();
-    return { type: 'TEMPLATE_STRING', value: result };
   }
 
+  if (buffer.length > 0) tokens.push({ type: 'TEMPLATE_STRING', value: buffer });
+
+  if (this.currentChar !== '`') this.error('Unterminated template string');
+  this.advance(); // skip closing backtick
+
+  return tokens; // return array of tokens
+}
+
+
   getTokens() {
     const tokens = [];
 
@@ -1867,7 +1885,12 @@ class Lexer {
       if (/[0-9]/.test(this.currentChar)) { tokens.push(this.number()); continue; }
       if (/[A-Za-z_]/.test(this.currentChar)) { tokens.push(this.identifier()); continue; }
       if (this.currentChar === '"' || this.currentChar === "'") { tokens.push(this.string()); continue; }
-      if (this.currentChar === '`') { tokens.push(this.templateString()); continue; }
+      if (this.currentChar === '`') {
+  const tTokens = this.templateString();
+  tokens.push(...tTokens); // push all tokens returned from templateString
+  continue;
+}
+
 
       const char = this.currentChar;
       const next = this.peek();
@@ -2142,6 +2165,23 @@ class Parser {
     if (this.current.type === 'SEMICOLON') this.eat('SEMICOLON');
     return { type: 'ExpressionStatement', expression: expr };
   }
+  parseTemplateLiteral() {
+  const parts = [];
+  while (true) {
+    if (this.current.type === 'TEMPLATE_STRING') {
+      parts.push({ type: 'Literal', value: this.current.value });
+      this.eat('TEMPLATE_STRING');
+    } else if (this.current.type === 'DOLLAR_LBRACE') {
+      this.eat('DOLLAR_LBRACE');
+      const expr = this.expression();
+      parts.push(expr);
+      this.eat('RBRACE');
+    } else {
+      break;
+    }
+  }
+  return { type: 'TemplateLiteral', parts };
+}
 
   expression() {
     return this.assignment();
@@ -2289,7 +2329,10 @@ class Parser {
 
     if (t.type === 'NUMBER') { this.eat('NUMBER'); return { type: 'Literal', value: t.value }; }
     if (t.type === 'STRING') { this.eat('STRING'); return { type: 'Literal', value: t.value }; }
-    if (t.type === 'TEMPLATE_STRING') { this.eat('TEMPLATE_STRING'); return { type: 'TemplateLiteral', value: t.value }; }
+    if (t.type === 'TEMPLATE_STRING' || t.type === 'DOLLAR_LBRACE') {
+  return this.parseTemplateLiteral();
+}
+
     if (t.type === 'TRUE') { this.eat('TRUE'); return { type: 'Literal', value: true }; }
     if (t.type === 'FALSE') { this.eat('FALSE'); return { type: 'Literal', value: false }; }
     if (t.type === 'NULL') { this.eat('NULL'); return { type: 'Literal', value: null }; }
@@ -2461,7 +2504,7 @@ const Lexer = __nccwpck_require__(211);
 const Parser = __nccwpck_require__(222);
 const Evaluator = __nccwpck_require__(112);
 
-const VERSION = '1.0.18';
+const VERSION = '1.0.19';
 
 const COLOR = {
     reset: '\x1b[0m',

package/package.json

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

package/src/evaluator.js

@@ -114,9 +114,20 @@ class Evaluator {
     return result;
   }
 
-  evalTemplateLiteral(node, env) {
-    return node.value;
+ evalTemplateLiteral(node, env) {
+  // node.parts is an array from parser: Literal or expression nodes
+  let result = '';
+  for (const part of node.parts) {
+    if (part.type === 'Literal') {
+      result += part.value;
+    } else {
+      const val = this.evaluate(part, env);
+      result += val != null ? val.toString() : '';
+    }
   }
+  return result;
+}
+
 
   evalImport(node, env) {
     const spec = node.path;

package/src/lexer.js

@@ -121,38 +121,45 @@ class Lexer {
   }
 
   templateString() {
-    this.advance(); 
-    let result = '';
-    while (this.currentChar && this.currentChar !== '`') {
-      if (this.currentChar === '$' && this.peek() === '{') {
-        this.advance(); this.advance(); // skip ${
-        result += '${'; // we leave the interpolation as-is for parser
-        continue;
-      }
-
-      if (this.currentChar === '\\') {
-        this.advance();
-        switch (this.currentChar) {
-          case 'n': result += '\n'; break;
-          case 't': result += '\t'; break;
-          case '`': result += '`'; break;
-          case '\\': result += '\\'; break;
-          default: result += this.currentChar;
-        }
-      } else {
-        result += this.currentChar;
+  this.advance(); // skip initial backtick `
+  let buffer = '';
+  const tokens = [];
+
+  while (this.currentChar && this.currentChar !== '`') {
+    if (this.currentChar === '$' && this.peek() === '{') {
+      if (buffer.length > 0) {
+        tokens.push({ type: 'TEMPLATE_STRING', value: buffer });
+        buffer = '';
       }
-      this.advance();
+      tokens.push({ type: 'DOLLAR_LBRACE' }); // ${
+      this.advance(); this.advance();
+      continue;
     }
 
-    if (this.currentChar !== '`') {
-      this.error('Unterminated template string');
+    if (this.currentChar === '\\') {
+      this.advance();
+      switch (this.currentChar) {
+        case 'n': buffer += '\n'; break;
+        case 't': buffer += '\t'; break;
+        case '`': buffer += '`'; break;
+        case '\\': buffer += '\\'; break;
+        default: buffer += this.currentChar;
+      }
+    } else {
+      buffer += this.currentChar;
     }
-
     this.advance();
-    return { type: 'TEMPLATE_STRING', value: result };
   }
 
+  if (buffer.length > 0) tokens.push({ type: 'TEMPLATE_STRING', value: buffer });
+
+  if (this.currentChar !== '`') this.error('Unterminated template string');
+  this.advance(); // skip closing backtick
+
+  return tokens; // return array of tokens
+}
+
+
   getTokens() {
     const tokens = [];
 
@@ -162,7 +169,12 @@ class Lexer {
       if (/[0-9]/.test(this.currentChar)) { tokens.push(this.number()); continue; }
       if (/[A-Za-z_]/.test(this.currentChar)) { tokens.push(this.identifier()); continue; }
       if (this.currentChar === '"' || this.currentChar === "'") { tokens.push(this.string()); continue; }
-      if (this.currentChar === '`') { tokens.push(this.templateString()); continue; }
+      if (this.currentChar === '`') {
+  const tTokens = this.templateString();
+  tokens.push(...tTokens); // push all tokens returned from templateString
+  continue;
+}
+
 
       const char = this.currentChar;
       const next = this.peek();

package/src/parser.js

@@ -224,6 +224,23 @@ class Parser {
     if (this.current.type === 'SEMICOLON') this.eat('SEMICOLON');
     return { type: 'ExpressionStatement', expression: expr };
   }
+  parseTemplateLiteral() {
+  const parts = [];
+  while (true) {
+    if (this.current.type === 'TEMPLATE_STRING') {
+      parts.push({ type: 'Literal', value: this.current.value });
+      this.eat('TEMPLATE_STRING');
+    } else if (this.current.type === 'DOLLAR_LBRACE') {
+      this.eat('DOLLAR_LBRACE');
+      const expr = this.expression();
+      parts.push(expr);
+      this.eat('RBRACE');
+    } else {
+      break;
+    }
+  }
+  return { type: 'TemplateLiteral', parts };
+}
 
   expression() {
     return this.assignment();
@@ -371,7 +388,10 @@ class Parser {
 
     if (t.type === 'NUMBER') { this.eat('NUMBER'); return { type: 'Literal', value: t.value }; }
     if (t.type === 'STRING') { this.eat('STRING'); return { type: 'Literal', value: t.value }; }
-    if (t.type === 'TEMPLATE_STRING') { this.eat('TEMPLATE_STRING'); return { type: 'TemplateLiteral', value: t.value }; }
+    if (t.type === 'TEMPLATE_STRING' || t.type === 'DOLLAR_LBRACE') {
+  return this.parseTemplateLiteral();
+}
+
     if (t.type === 'TRUE') { this.eat('TRUE'); return { type: 'Literal', value: true }; }
     if (t.type === 'FALSE') { this.eat('FALSE'); return { type: 'Literal', value: false }; }
     if (t.type === 'NULL') { this.eat('NULL'); return { type: 'Literal', value: null }; }

package/src/starlight.js

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