redscript-mc 1.2.0 → 1.2.1

package/src/index.ts

@@ -14,6 +14,7 @@ import {
   copyPropagation,
   deadCodeEliminationWithStats,
 } from './optimizer/passes'
+import { eliminateDeadCode } from './optimizer/dce'
 import {
   countMcfunctionCommands,
   generateDatapackWithStats,
@@ -30,6 +31,7 @@ export interface CompileOptions {
   optimize?: boolean
   typeCheck?: boolean
   filePath?: string
+  dce?: boolean
 }
 
 export interface CompileResult {
@@ -53,6 +55,7 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
   const namespace = options.namespace ?? 'redscript'
   const shouldOptimize = options.optimize ?? true
   const shouldTypeCheck = options.typeCheck ?? true
+  const shouldRunDce = options.dce ?? shouldOptimize
   const filePath = options.filePath
   const preprocessed = preprocessSourceWithMetadata(source, { filePath })
   const preprocessedSource = preprocessed.source
@@ -61,7 +64,8 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
   const tokens = new Lexer(preprocessedSource, filePath).tokenize()
 
   // Parsing
-  const ast = new Parser(tokens, preprocessedSource, filePath).parse(namespace)
+  const parsedAst = new Parser(tokens, preprocessedSource, filePath).parse(namespace)
+  const ast = shouldRunDce ? eliminateDeadCode(parsedAst) : parsedAst
 
   // Type checking (warn mode - collect errors but don't block)
   let typeErrors: DiagnosticError[] | undefined

package/src/lexer/index.ts

@@ -34,7 +34,10 @@ export type TokenKind =
   | 'long_lit'      // 1000L
   | 'double_lit'    // 3.14d
   | 'string_lit'    // "hello"
+  | 'f_string'      // f"hello {name}"
   | 'range_lit'     // ..5  1..  1..10
+  | 'rel_coord'     // ~  ~5  ~-3  (relative coordinate)
+  | 'local_coord'   // ^  ^5  ^-3  (local/facing coordinate)
   // Operators
   | '+' | '-' | '*' | '/' | '%'
   | '~' | '^'
@@ -275,8 +278,52 @@ export class Lexer {
       return
     }
 
+    // Relative coordinate: ~ or ~5 or ~-3 or ~0.5
+    if (char === '~') {
+      let value = '~'
+      // Check for optional sign
+      if (this.peek() === '-' || this.peek() === '+') {
+        value += this.advance()
+      }
+      // Check for number
+      while (/[0-9]/.test(this.peek())) {
+        value += this.advance()
+      }
+      // Check for decimal part
+      if (this.peek() === '.' && /[0-9]/.test(this.peek(1))) {
+        value += this.advance() // .
+        while (/[0-9]/.test(this.peek())) {
+          value += this.advance()
+        }
+      }
+      this.addToken('rel_coord', value, startLine, startCol)
+      return
+    }
+
+    // Local coordinate: ^ or ^5 or ^-3 or ^0.5
+    if (char === '^') {
+      let value = '^'
+      // Check for optional sign
+      if (this.peek() === '-' || this.peek() === '+') {
+        value += this.advance()
+      }
+      // Check for number
+      while (/[0-9]/.test(this.peek())) {
+        value += this.advance()
+      }
+      // Check for decimal part
+      if (this.peek() === '.' && /[0-9]/.test(this.peek(1))) {
+        value += this.advance() // .
+        while (/[0-9]/.test(this.peek())) {
+          value += this.advance()
+        }
+      }
+      this.addToken('local_coord', value, startLine, startCol)
+      return
+    }
+
     // Single-character operators and delimiters
-    const singleChar: TokenKind[] = ['+', '-', '*', '/', '%', '~', '^', '<', '>', '!', '=',
+    const singleChar: TokenKind[] = ['+', '-', '*', '/', '%', '<', '>', '!', '=',
       '{', '}', '(', ')', '[', ']', ',', ';', ':', '.']
     if (singleChar.includes(char as TokenKind)) {
       this.addToken(char as TokenKind, char, startLine, startCol)
@@ -289,6 +336,13 @@ export class Lexer {
       return
     }
 
+    // f-string literal
+    if (char === 'f' && this.peek() === '"') {
+      this.advance()
+      this.scanFString(startLine, startCol)
+      return
+    }
+
     // String literal
     if (char === '"') {
       this.scanString(startLine, startCol)
@@ -432,6 +486,53 @@ export class Lexer {
     this.addToken('string_lit', value, startLine, startCol)
   }
 
+  private scanFString(startLine: number, startCol: number): void {
+    let value = ''
+    let interpolationDepth = 0
+    let interpolationString = false
+
+    while (!this.isAtEnd()) {
+      if (interpolationDepth === 0 && this.peek() === '"') {
+        break
+      }
+
+      if (this.peek() === '\\' && this.peek(1) === '"') {
+        this.advance()
+        value += this.advance()
+        continue
+      }
+
+      if (interpolationDepth === 0 && this.peek() === '{') {
+        value += this.advance()
+        interpolationDepth = 1
+        interpolationString = false
+        continue
+      }
+
+      const char = this.advance()
+      value += char
+
+      if (interpolationDepth === 0) continue
+
+      if (char === '"' && this.source[this.pos - 2] !== '\\') {
+        interpolationString = !interpolationString
+        continue
+      }
+
+      if (interpolationString) continue
+
+      if (char === '{') interpolationDepth++
+      if (char === '}') interpolationDepth--
+    }
+
+    if (this.isAtEnd()) {
+      this.error('Unterminated f-string', startLine, startCol)
+    }
+
+    this.advance() // closing quote
+    this.addToken('f_string', value, startLine, startCol)
+  }
+
   private scanNumber(firstChar: string, startLine: number, startCol: number): void {
     let value = firstChar
 

package/src/lowering/index.ts

@@ -25,6 +25,7 @@ import { EVENT_TYPES, getEventParamSpecs, isEventTypeName } from '../events/type
 const BUILTINS: Record<string, (args: string[]) => string | null> = {
   say:         ([msg]) => `say ${msg}`,
   tell:        ([sel, msg]) => `tellraw ${sel} {"text":"${msg}"}`,
+  tellraw:     ([sel, msg]) => `tellraw ${sel} {"text":"${msg}"}`,
   title:       ([sel, msg]) => `title ${sel} title {"text":"${msg}"}`,
   actionbar:   ([sel, msg]) => `title ${sel} actionbar {"text":"${msg}"}`,
   subtitle:    ([sel, msg]) => `title ${sel} subtitle {"text":"${msg}"}`,
@@ -1234,6 +1235,7 @@ export class Lowering {
         return { kind: 'const', value: 0 } // Handled inline in exprToString
 
       case 'str_interp':
+      case 'f_string':
         // Interpolated strings are handled inline in message builtins.
         return { kind: 'const', value: 0 }
 
@@ -2265,7 +2267,7 @@ export class Lowering {
     }
 
     const messageExpr = args[messageArgIndex]
-    if (!messageExpr || messageExpr.kind !== 'str_interp') {
+    if (!messageExpr || (messageExpr.kind !== 'str_interp' && messageExpr.kind !== 'f_string')) {
       return null
     }
 
@@ -2276,6 +2278,7 @@ export class Lowering {
       case 'announce':
         return `tellraw @a ${json}`
       case 'tell':
+      case 'tellraw':
         return `tellraw ${this.exprToString(args[0])} ${json}`
       case 'title':
         return `title ${this.exprToString(args[0])} title ${json}`
@@ -2294,6 +2297,7 @@ export class Lowering {
       case 'announce':
         return 0
       case 'tell':
+      case 'tellraw':
       case 'title':
       case 'actionbar':
       case 'subtitle':
@@ -2303,9 +2307,22 @@ export class Lowering {
     }
   }
 
-  private buildRichTextJson(expr: Extract<Expr, { kind: 'str_interp' }>): string {
+  private buildRichTextJson(expr: Extract<Expr, { kind: 'str_interp' | 'f_string' }>): string {
     const components: Array<string | Record<string, unknown>> = ['']
 
+    if (expr.kind === 'f_string') {
+      for (const part of expr.parts) {
+        if (part.kind === 'text') {
+          if (part.value.length > 0) {
+            components.push({ text: part.value })
+          }
+          continue
+        }
+        this.appendRichTextExpr(components, part.expr)
+      }
+      return JSON.stringify(components)
+    }
+
     for (const part of expr.parts) {
       if (typeof part === 'string') {
         if (part.length > 0) {
@@ -2354,6 +2371,19 @@ export class Lowering {
       return
     }
 
+    if (expr.kind === 'f_string') {
+      for (const part of expr.parts) {
+        if (part.kind === 'text') {
+          if (part.value.length > 0) {
+            components.push({ text: part.value })
+          }
+        } else {
+          this.appendRichTextExpr(components, part.expr)
+        }
+      }
+      return
+    }
+
     if (expr.kind === 'bool_lit') {
       components.push({ text: expr.value ? 'true' : 'false' })
       return
@@ -2392,6 +2422,10 @@ export class Lowering {
         return `${expr.value}L`
       case 'double_lit':
         return `${expr.value}d`
+      case 'rel_coord':
+        return expr.value   // ~ or ~5 or ~-3 - output as-is for MC commands
+      case 'local_coord':
+        return expr.value   // ^ or ^5 or ^-3 - output as-is for MC commands
       case 'bool_lit':
         return expr.value ? '1' : '0'
       case 'str_lit':
@@ -2399,6 +2433,7 @@ export class Lowering {
       case 'mc_name':
         return expr.value   // #health → "health" (no quotes, used as bare MC name)
       case 'str_interp':
+      case 'f_string':
         return this.buildRichTextJson(expr)
       case 'blockpos':
         return emitBlockPos(expr)
@@ -2732,6 +2767,7 @@ export class Lowering {
     if (expr.kind === 'float_lit') return { kind: 'named', name: 'float' }
     if (expr.kind === 'bool_lit') return { kind: 'named', name: 'bool' }
     if (expr.kind === 'str_lit' || expr.kind === 'str_interp') return { kind: 'named', name: 'string' }
+    if (expr.kind === 'f_string') return { kind: 'named', name: 'format_string' }
     if (expr.kind === 'blockpos') return { kind: 'named', name: 'BlockPos' }
     if (expr.kind === 'ident') {
       const constValue = this.constValues.get(expr.name)