redscript-mc 1.2.0 → 1.2.2

package/dist/codegen/structure/index.d.ts

@@ -14,5 +14,8 @@ export interface StructureCompileResult {
     blocks: StructureBlockInfo[];
     stats?: OptimizationStats;
 }
+export interface StructureCompileOptions {
+    dce?: boolean;
+}
 export declare function generateStructure(input: IRModule | DatapackFile[]): StructureCompileResult;
-export declare function compileToStructure(source: string, namespace: string, filePath?: string): StructureCompileResult;
+export declare function compileToStructure(source: string, namespace: string, filePath?: string, options?: StructureCompileOptions): StructureCompileResult;

package/dist/codegen/structure/index.js

@@ -9,6 +9,7 @@ const nbt_1 = require("../../nbt");
 const commands_1 = require("../../optimizer/commands");
 const passes_1 = require("../../optimizer/passes");
 const structure_1 = require("../../optimizer/structure");
+const dce_1 = require("../../optimizer/dce");
 const compile_1 = require("../../compile");
 const types_1 = require("../../events/types");
 const DATA_VERSION = 3953;
@@ -255,10 +256,11 @@ function generateStructure(input) {
         })),
     };
 }
-function compileToStructure(source, namespace, filePath) {
+function compileToStructure(source, namespace, filePath, options = {}) {
     const preprocessedSource = (0, compile_1.preprocessSource)(source, { filePath });
     const tokens = new lexer_1.Lexer(preprocessedSource, filePath).tokenize();
-    const ast = new parser_1.Parser(tokens, preprocessedSource, filePath).parse(namespace);
+    const parsedAst = new parser_1.Parser(tokens, preprocessedSource, filePath).parse(namespace);
+    const ast = options.dce ?? true ? (0, dce_1.eliminateDeadCode)(parsedAst) : parsedAst;
     const ir = new lowering_1.Lowering(namespace).lower(ast);
     const stats = (0, commands_1.createEmptyOptimizationStats)();
     const optimizedIRFunctions = ir.functions.map(fn => {

package/dist/compile.d.ts

@@ -11,6 +11,7 @@ export interface CompileOptions {
     namespace?: string;
     filePath?: string;
     optimize?: boolean;
+    dce?: boolean;
 }
 export interface CompileResult {
     success: boolean;

package/dist/compile.js

@@ -48,6 +48,7 @@ const lexer_1 = require("./lexer");
 const parser_1 = require("./parser");
 const lowering_1 = require("./lowering");
 const passes_1 = require("./optimizer/passes");
+const dce_1 = require("./optimizer/dce");
 const mcfunction_1 = require("./codegen/mcfunction");
 const diagnostics_1 = require("./diagnostics");
 const IMPORT_RE = /^\s*import\s+"([^"]+)"\s*;?\s*$/;
@@ -126,6 +127,7 @@ function preprocessSource(source, options = {}) {
 // ---------------------------------------------------------------------------
 function compile(source, options = {}) {
     const { namespace = 'redscript', filePath, optimize: shouldOptimize = true } = options;
+    const shouldRunDce = options.dce ?? shouldOptimize;
     let sourceLines = source.split('\n');
     try {
         const preprocessed = preprocessSourceWithMetadata(source, { filePath });
@@ -134,7 +136,8 @@ function compile(source, options = {}) {
         // Lexing
         const tokens = new lexer_1.Lexer(preprocessedSource, filePath).tokenize();
         // Parsing
-        const ast = new parser_1.Parser(tokens, preprocessedSource, filePath).parse(namespace);
+        const parsedAst = new parser_1.Parser(tokens, preprocessedSource, filePath).parse(namespace);
+        const ast = shouldRunDce ? (0, dce_1.eliminateDeadCode)(parsedAst) : parsedAst;
         // Lowering
         const ir = new lowering_1.Lowering(namespace, preprocessed.ranges).lower(ast);
         // Optimization

package/dist/index.d.ts

@@ -14,6 +14,7 @@ export interface CompileOptions {
     optimize?: boolean;
     typeCheck?: boolean;
     filePath?: string;
+    dce?: boolean;
 }
 export interface CompileResult {
     files: DatapackFile[];

package/dist/index.js

@@ -13,6 +13,7 @@ const parser_1 = require("./parser");
 const typechecker_1 = require("./typechecker");
 const lowering_1 = require("./lowering");
 const passes_1 = require("./optimizer/passes");
+const dce_1 = require("./optimizer/dce");
 const mcfunction_1 = require("./codegen/mcfunction");
 const compile_1 = require("./compile");
 const commands_1 = require("./optimizer/commands");
@@ -27,13 +28,15 @@ function compile(source, options = {}) {
     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 = (0, compile_1.preprocessSourceWithMetadata)(source, { filePath });
     const preprocessedSource = preprocessed.source;
     // Lexing
     const tokens = new lexer_1.Lexer(preprocessedSource, filePath).tokenize();
     // Parsing
-    const ast = new parser_1.Parser(tokens, preprocessedSource, filePath).parse(namespace);
+    const parsedAst = new parser_1.Parser(tokens, preprocessedSource, filePath).parse(namespace);
+    const ast = shouldRunDce ? (0, dce_1.eliminateDeadCode)(parsedAst) : parsedAst;
     // Type checking (warn mode - collect errors but don't block)
     let typeErrors;
     if (shouldTypeCheck) {

package/dist/lexer/index.d.ts

@@ -5,7 +5,7 @@
  * Handles special cases like entity selectors vs decorators,
  * range literals, and raw commands.
  */
-export type TokenKind = 'fn' | 'let' | 'const' | 'if' | 'else' | 'while' | 'for' | 'foreach' | 'match' | 'return' | 'as' | 'at' | 'in' | 'is' | 'struct' | 'impl' | 'enum' | 'trigger' | 'namespace' | 'execute' | 'run' | 'unless' | 'int' | 'bool' | 'float' | 'string' | 'void' | 'BlockPos' | 'true' | 'false' | 'selector' | 'decorator' | 'int_lit' | 'float_lit' | 'byte_lit' | 'short_lit' | 'long_lit' | 'double_lit' | 'string_lit' | 'range_lit' | '+' | '-' | '*' | '/' | '%' | '~' | '^' | '==' | '!=' | '<' | '<=' | '>' | '>=' | '&&' | '||' | '!' | '=' | '+=' | '-=' | '*=' | '/=' | '%=' | '{' | '}' | '(' | ')' | '[' | ']' | ',' | ';' | ':' | '::' | '->' | '=>' | '.' | 'ident' | 'mc_name' | 'raw_cmd' | 'eof';
+export type TokenKind = 'fn' | 'let' | 'const' | 'if' | 'else' | 'while' | 'for' | 'foreach' | 'match' | 'return' | 'as' | 'at' | 'in' | 'is' | 'struct' | 'impl' | 'enum' | 'trigger' | 'namespace' | 'execute' | 'run' | 'unless' | 'int' | 'bool' | 'float' | 'string' | 'void' | 'BlockPos' | 'true' | 'false' | 'selector' | 'decorator' | 'int_lit' | 'float_lit' | 'byte_lit' | 'short_lit' | 'long_lit' | 'double_lit' | 'string_lit' | 'f_string' | 'range_lit' | 'rel_coord' | 'local_coord' | '+' | '-' | '*' | '/' | '%' | '~' | '^' | '==' | '!=' | '<' | '<=' | '>' | '>=' | '&&' | '||' | '!' | '=' | '+=' | '-=' | '*=' | '/=' | '%=' | '{' | '}' | '(' | ')' | '[' | ']' | ',' | ';' | ':' | '::' | '->' | '=>' | '.' | 'ident' | 'mc_name' | 'raw_cmd' | 'eof';
 export interface Token {
     kind: TokenKind;
     value: string;
@@ -31,6 +31,7 @@ export declare class Lexer {
     private scanAtToken;
     private scanSelectorParams;
     private scanString;
+    private scanFString;
     private scanNumber;
     private scanIdentifier;
 }

package/dist/lexer/index.js

@@ -202,8 +202,50 @@ class Lexer {
             this.addToken('range_lit', value, startLine, startCol);
             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 = ['+', '-', '*', '/', '%', '~', '^', '<', '>', '!', '=',
+        const singleChar = ['+', '-', '*', '/', '%', '<', '>', '!', '=',
             '{', '}', '(', ')', '[', ']', ',', ';', ':', '.'];
         if (singleChar.includes(char)) {
             this.addToken(char, char, startLine, startCol);
@@ -214,6 +256,12 @@ class Lexer {
             this.scanAtToken(startLine, startCol);
             return;
         }
+        // f-string literal
+        if (char === 'f' && this.peek() === '"') {
+            this.advance();
+            this.scanFString(startLine, startCol);
+            return;
+        }
         // String literal
         if (char === '"') {
             this.scanString(startLine, startCol);
@@ -340,6 +388,46 @@ class Lexer {
         this.advance(); // closing quote
         this.addToken('string_lit', value, startLine, startCol);
     }
+    scanFString(startLine, startCol) {
+        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);
+    }
     scanNumber(firstChar, startLine, startCol) {
         let value = firstChar;
         // Consume integer part

package/dist/lowering/index.js

@@ -50,6 +50,7 @@ const types_1 = require("../events/types");
 const BUILTINS = {
     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}"}`,
@@ -1029,6 +1030,7 @@ class Lowering {
                 // MC names (#health, #red) treated as string constants
                 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 };
             case 'range_lit':
@@ -1919,7 +1921,7 @@ class Lowering {
             return null;
         }
         const messageExpr = args[messageArgIndex];
-        if (!messageExpr || messageExpr.kind !== 'str_interp') {
+        if (!messageExpr || (messageExpr.kind !== 'str_interp' && messageExpr.kind !== 'f_string')) {
             return null;
         }
         const json = this.buildRichTextJson(messageExpr);
@@ -1928,6 +1930,7 @@ 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}`;
@@ -1945,6 +1948,7 @@ class Lowering {
             case 'announce':
                 return 0;
             case 'tell':
+            case 'tellraw':
             case 'title':
             case 'actionbar':
             case 'subtitle':
@@ -1955,6 +1959,18 @@ class Lowering {
     }
     buildRichTextJson(expr) {
         const components = [''];
+        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) {
@@ -1998,6 +2014,19 @@ 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;
@@ -2031,6 +2060,10 @@ 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':
@@ -2038,6 +2071,7 @@ 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);
@@ -2328,6 +2362,8 @@ class Lowering {
             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') {

package/dist/optimizer/dce.d.ts

@@ -0,0 +1,23 @@
+import type { Program } from '../ast/types';
+export declare class DeadCodeEliminator {
+    private readonly functionMap;
+    private readonly reachableFunctions;
+    private readonly usedConstants;
+    private readonly localReads;
+    private readonly localDeclIds;
+    private localIdCounter;
+    eliminate(program: Program): Program;
+    private findEntryPoints;
+    private markReachable;
+    private collectFunctionRefs;
+    private collectStmtRefs;
+    private collectStmtRef;
+    private collectNestedStmtRefs;
+    private collectExprRefs;
+    private resolveLocal;
+    private transformFunction;
+    private transformBlock;
+    private transformStmt;
+    private transformExpr;
+}
+export declare function eliminateDeadCode(program: Program): Program;