redscript-mc 1.2.30 → 2.1.0

package/dist/src/__tests__/tuple.test.js

@@ -0,0 +1,202 @@
+"use strict";
+/**
+ * Tests for Phase 2b: Multi-return values / Tuple types
+ *
+ * Covers:
+ * - Tuple type parsing: (int, int)
+ * - Tuple literal parsing: (a, b)
+ * - Destructuring let: let (q, r) = ...
+ * - Function return type: fn f(): (int, int)
+ * - Full compilation to scoreboard commands
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const lexer_1 = require("../lexer");
+const parser_1 = require("../parser");
+const compile_1 = require("../emit/compile");
+function parse(source, namespace = 'test') {
+    const tokens = new lexer_1.Lexer(source).tokenize();
+    return new parser_1.Parser(tokens).parse(namespace);
+}
+function parseStmt(source) {
+    const program = parse(`fn _test() { ${source} }`);
+    return program.declarations[0].body[0];
+}
+function getFile(files, pathSubstr) {
+    const f = files.find(f => f.path.includes(pathSubstr));
+    return f?.content;
+}
+// ---------------------------------------------------------------------------
+// Parser tests
+// ---------------------------------------------------------------------------
+describe('Tuple: Parser', () => {
+    it('parses tuple type (int, int) as return type', () => {
+        const program = parse('fn f(a: int, b: int): (int, int) {}');
+        const fn = program.declarations[0];
+        expect(fn.returnType).toEqual({ kind: 'tuple', elements: [
+                { kind: 'named', name: 'int' },
+                { kind: 'named', name: 'int' },
+            ] });
+    });
+    it('parses tuple type with 3 elements', () => {
+        const program = parse('fn f(): (int, bool, int) {}');
+        expect(program.declarations[0].returnType).toEqual({ kind: 'tuple', elements: [
+                { kind: 'named', name: 'int' },
+                { kind: 'named', name: 'bool' },
+                { kind: 'named', name: 'int' },
+            ] });
+    });
+    it('parses tuple literal expression (a, b)', () => {
+        const program = parse(`fn _test(a: int, b: int): (int, int) { return (a, b); }`);
+        const ret = program.declarations[0].body[0];
+        expect(ret.kind).toBe('return');
+        if (ret.kind === 'return' && ret.value) {
+            expect(ret.value.kind).toBe('tuple_lit');
+            if (ret.value.kind === 'tuple_lit') {
+                expect(ret.value.elements).toHaveLength(2);
+                expect(ret.value.elements[0]).toMatchObject({ kind: 'ident', name: 'a' });
+                expect(ret.value.elements[1]).toMatchObject({ kind: 'ident', name: 'b' });
+            }
+        }
+    });
+    it('parses destructuring let statement', () => {
+        const stmt = parseStmt('let (q, r) = divmod(10, 3);');
+        expect(stmt.kind).toBe('let_destruct');
+        if (stmt.kind === 'let_destruct') {
+            expect(stmt.names).toEqual(['q', 'r']);
+            expect(stmt.init).toMatchObject({ kind: 'call', fn: 'divmod' });
+        }
+    });
+    it('parses destructuring with 3 bindings', () => {
+        const stmt = parseStmt('let (a, b, c) = get_triple(1);');
+        expect(stmt.kind).toBe('let_destruct');
+        if (stmt.kind === 'let_destruct') {
+            expect(stmt.names).toEqual(['a', 'b', 'c']);
+        }
+    });
+    it('does not confuse (expr) grouped expression with tuple literal', () => {
+        const program = parse(`fn _test(): int { return (1 + 2); }`);
+        const ret = program.declarations[0].body[0];
+        expect(ret.kind).toBe('return');
+        if (ret.kind === 'return' && ret.value) {
+            expect(ret.value.kind).toBe('binary');
+        }
+    });
+    it('still parses function type (int) -> int correctly', () => {
+        const program = parse('fn apply(f: (int) -> int, x: int): int {}');
+        const param = program.declarations[0].params[0];
+        expect(param.type).toEqual({ kind: 'function_type', params: [{ kind: 'named', name: 'int' }], return: { kind: 'named', name: 'int' } });
+    });
+});
+// ---------------------------------------------------------------------------
+// E2E compilation tests
+// ---------------------------------------------------------------------------
+describe('Tuple: E2E compilation', () => {
+    test('basic divmod function compiles and writes $ret_0 and $ret_1', () => {
+        const source = `
+      fn divmod(a: int, b: int): (int, int) {
+        return (a / b, a % b);
+      }
+    `;
+        const result = (0, compile_1.compile)(source, { namespace: 'test' });
+        const fn = getFile(result.files, 'divmod.mcfunction');
+        expect(fn).toBeDefined();
+        // MIR __rf_0 → LIR $ret_0 (see lir/lower.ts slot() method)
+        expect(fn).toContain('$ret_0');
+        expect(fn).toContain('$ret_1');
+    });
+    test('destructuring let reads from $ret_ slots after call', () => {
+        const source = `
+      fn divmod(a: int, b: int): (int, int) {
+        return (a / b, a % b);
+      }
+      fn use_divmod(): int {
+        let (q, r) = divmod(10, 3);
+        return q + r;
+      }
+    `;
+        const result = (0, compile_1.compile)(source, { namespace: 'test' });
+        const fn = getFile(result.files, 'use_divmod.mcfunction');
+        expect(fn).toBeDefined();
+        // Should call divmod and then read from $ret_ slots
+        expect(fn).toContain('divmod');
+        expect(fn).toContain('$ret_0');
+        expect(fn).toContain('$ret_1');
+    });
+    test('tuple literal assigned directly via destructuring', () => {
+        const source = `
+      fn make_sum(a: int, b: int): int {
+        let (x, y) = (a + 1, b + 2);
+        return x + y;
+      }
+    `;
+        const result = (0, compile_1.compile)(source, { namespace: 'test' });
+        const fn = getFile(result.files, 'make_sum.mcfunction');
+        expect(fn).toBeDefined();
+        expect(fn).toContain('scoreboard players operation');
+    });
+    test('tuple values used in subsequent computation', () => {
+        const source = `
+      fn divmod(a: int, b: int): (int, int) {
+        return (a / b, a % b);
+      }
+      fn compute(): int {
+        let (q, r) = divmod(10, 3);
+        return q + r;
+      }
+    `;
+        const result = (0, compile_1.compile)(source, { namespace: 'test' });
+        const fn = getFile(result.files, 'compute.mcfunction');
+        expect(fn).toBeDefined();
+        expect(fn).toContain('scoreboard players operation');
+    });
+    test('3-tuple return and destructuring', () => {
+        const source = `
+      fn triple(a: int): (int, int, int) {
+        return (a, a + 1, a + 2);
+      }
+      fn use_triple(): int {
+        let (x, y, z) = triple(5);
+        return x + y + z;
+      }
+    `;
+        const result = (0, compile_1.compile)(source, { namespace: 'test' });
+        const tripleFn = getFile(result.files, 'triple.mcfunction');
+        expect(tripleFn).toBeDefined();
+        expect(tripleFn).toContain('$ret_0');
+        expect(tripleFn).toContain('$ret_1');
+        expect(tripleFn).toContain('$ret_2');
+    });
+    test('enum and tuple combined: return (int, Phase)', () => {
+        const source = `
+      enum Phase { Idle, Running, Done }
+      fn get_state(): (int, int) {
+        return (42, Phase::Running);
+      }
+      fn use_state(): int {
+        let (count, phase) = get_state();
+        return count + phase;
+      }
+    `;
+        const result = (0, compile_1.compile)(source, { namespace: 'test' });
+        const fn = getFile(result.files, 'get_state.mcfunction');
+        expect(fn).toBeDefined();
+        expect(fn).toContain('$ret_0');
+        expect(fn).toContain('$ret_1');
+        // Phase::Running = 1
+        expect(fn).toContain('1');
+    });
+    test('tuple return type appears in generated mcfunction with correct objective', () => {
+        const source = `
+      fn minmax(a: int, b: int): (int, int) {
+        return (a, b);
+      }
+    `;
+        const result = (0, compile_1.compile)(source, { namespace: 'ns' });
+        const fn = getFile(result.files, 'minmax.mcfunction');
+        expect(fn).toBeDefined();
+        // MIR __rf_0 → LIR $ret_0
+        expect(fn).toContain('$ret_0');
+        expect(fn).toContain('__ns');
+    });
+});
+//# sourceMappingURL=tuple.test.js.map

package/dist/src/__tests__/typechecker-strict.test.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Phase 6b: TypeChecker strict (error-mode) tests
+ *
+ * Covers:
+ * - Type errors now block compilation (error-mode default)
+ * - --lenient flag demotes type errors to warnings
+ * - int/float implicit conversion detection
+ * - redscript check command correctly reports type errors
+ */
+export {};

package/dist/src/__tests__/typechecker-strict.test.js

@@ -0,0 +1,197 @@
+"use strict";
+/**
+ * Phase 6b: TypeChecker strict (error-mode) tests
+ *
+ * Covers:
+ * - Type errors now block compilation (error-mode default)
+ * - --lenient flag demotes type errors to warnings
+ * - int/float implicit conversion detection
+ * - redscript check command correctly reports type errors
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const compile_1 = require("../emit/compile");
+const lexer_1 = require("../lexer");
+const parser_1 = require("../parser");
+const typechecker_1 = require("../typechecker");
+// Helper: run TypeChecker directly
+function typeCheck(source) {
+    const tokens = new lexer_1.Lexer(source).tokenize();
+    const ast = new parser_1.Parser(tokens).parse('test');
+    const checker = new typechecker_1.TypeChecker(source);
+    return checker.check(ast);
+}
+// Helper: compile in strict mode (default)
+function compileStrict(source) {
+    (0, compile_1.compile)(source, { namespace: 'test' });
+}
+// Helper: compile in lenient mode
+function compileLenient(source) {
+    return (0, compile_1.compile)(source, { namespace: 'test', lenient: true });
+}
+describe('TypeChecker error-mode (Phase 6b)', () => {
+    describe('type errors block compilation', () => {
+        it('throws on undeclared variable usage', () => {
+            expect(() => compileStrict(`
+fn test() {
+    let x: int = undeclared;
+}
+`)).toThrow();
+        });
+        it('throws on return type mismatch', () => {
+            expect(() => compileStrict(`
+fn get_bool() -> bool {
+    return 5;
+}
+`)).toThrow();
+        });
+        it('throws on wrong argument count', () => {
+            expect(() => compileStrict(`
+fn add(a: int, b: int) -> int {
+    return a + b;
+}
+fn test() {
+    let x: int = add(1);
+}
+`)).toThrow();
+        });
+        it('does not throw for valid programs', () => {
+            expect(() => compileStrict(`
+fn add(a: int, b: int) -> int {
+    return a + b;
+}
+fn test() {
+    let x: int = add(1, 2);
+}
+`)).not.toThrow();
+        });
+    });
+    describe('--lenient mode', () => {
+        it('does not throw on type errors in lenient mode', () => {
+            expect(() => compileLenient(`
+fn test() {
+    let x: int = undeclared;
+}
+`)).not.toThrow();
+        });
+        it('returns type errors as warnings in lenient mode', () => {
+            const result = compileLenient(`
+fn test() {
+    let x: int = undeclared;
+}
+`);
+            expect(result.warnings.length).toBeGreaterThan(0);
+            expect(result.warnings[0]).toContain('TypeError');
+        });
+        it('emits no warnings for valid programs in lenient mode', () => {
+            const result = compileLenient(`
+fn test() {
+    let x: int = 5;
+}
+`);
+            expect(result.warnings).toHaveLength(0);
+        });
+    });
+    describe('int/float implicit conversion checks', () => {
+        it('detects int assigned to float variable', () => {
+            // int literal assigned to float — different types
+            const errors = typeCheck(`
+fn test() {
+    let x: float = 5;
+}
+`);
+            expect(errors.length).toBeGreaterThan(0);
+            expect(errors[0].message).toContain('cannot implicitly convert int to float');
+            expect(errors[0].message).toContain('as float');
+        });
+        it('detects float assigned to int variable', () => {
+            const errors = typeCheck(`
+fn get_f() -> float {
+    return 3.14;
+}
+fn test() {
+    let x: int = get_f();
+}
+`);
+            expect(errors.length).toBeGreaterThan(0);
+            expect(errors[0].message).toContain('cannot implicitly convert');
+        });
+        it('detects int/float return type mismatch', () => {
+            const errors = typeCheck(`
+fn get_float() -> float {
+    return 5;
+}
+`);
+            expect(errors.length).toBeGreaterThan(0);
+            expect(errors[0].message).toContain('cannot implicitly convert int to float');
+            expect(errors[0].message).toContain('as float');
+        });
+        it('detects float/int return type mismatch', () => {
+            const errors = typeCheck(`
+fn get_int() -> int {
+    return 3.14;
+}
+`);
+            expect(errors.length).toBeGreaterThan(0);
+            expect(errors[0].message).toContain('cannot implicitly convert float to int');
+            expect(errors[0].message).toContain('as int');
+        });
+        it('allows int assigned to int variable', () => {
+            const errors = typeCheck(`
+fn test() {
+    let x: int = 5;
+}
+`);
+            expect(errors).toHaveLength(0);
+        });
+        it('allows float assigned to float variable', () => {
+            const errors = typeCheck(`
+fn get_f() -> float {
+    return 3.14;
+}
+fn test() {
+    let x: float = get_f();
+}
+`);
+            expect(errors).toHaveLength(0);
+        });
+        it('blocks compilation on int→float mismatch', () => {
+            expect(() => compileStrict(`
+fn get_float() -> float {
+    return 5;
+}
+`)).toThrow();
+        });
+        it('int→float mismatch demoted to warning in lenient mode', () => {
+            const result = compileLenient(`
+fn get_float() -> float {
+    return 5;
+}
+`);
+            expect(result.warnings.length).toBeGreaterThan(0);
+            expect(result.warnings[0]).toContain('TypeError');
+        });
+    });
+    describe('redscript check command behavior', () => {
+        it('TypeChecker check() returns errors for type mismatches', () => {
+            const errors = typeCheck(`
+fn test() {
+    let x: int = undeclared;
+    let y: bool = 1;
+}
+`);
+            expect(errors.length).toBeGreaterThanOrEqual(1);
+        });
+        it('TypeChecker check() returns empty array for valid programs', () => {
+            const errors = typeCheck(`
+struct Point { x: int, y: int }
+
+fn test() {
+    let p: Point = { x: 10, y: 20 };
+    let val: int = p.x;
+}
+`);
+            expect(errors).toHaveLength(0);
+        });
+    });
+});
+//# sourceMappingURL=typechecker-strict.test.js.map

package/dist/src/__tests__/typechecker.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/{ast → src/ast}/types.d.ts

@@ -4,7 +4,8 @@
  * This module defines the Abstract Syntax Tree structure for RedScript.
  * The AST is produced by the parser and consumed by the lowering pass.
  */
-import type { BinOp, CmpOp } from '../ir/types';
+export type BinOp = '+' | '-' | '*' | '/' | '%';
+export type CmpOp = '==' | '!=' | '<' | '<=' | '>' | '>=';
 export interface Span {
     line: number;
     col: number;
@@ -35,6 +36,12 @@ export type TypeNode = {
 } | {
     kind: 'selector';
     entityType?: string;
+} | {
+    kind: 'tuple';
+    elements: TypeNode[];
+} | {
+    kind: 'option';
+    inner: TypeNode;
 };
 export interface LambdaParam {
     name: string;
@@ -190,6 +197,7 @@ export type Expr = {
     kind: 'call';
     fn: string;
     args: Expr[];
+    typeArgs?: TypeNode[];
     span?: Span;
 } | {
     kind: 'invoke';
@@ -230,9 +238,25 @@ export type Expr = {
     method: string;
     args: Expr[];
     span?: Span;
+} | {
+    kind: 'path_expr';
+    enumName: string;
+    variant: string;
+    span?: Span;
 } | (LambdaExpr & {
     span?: Span;
-});
+}) | {
+    kind: 'tuple_lit';
+    elements: Expr[];
+    span?: Span;
+} | {
+    kind: 'some_lit';
+    value: Expr;
+    span?: Span;
+} | {
+    kind: 'none_lit';
+    span?: Span;
+};
 export type LiteralExpr = Extract<Expr, {
     kind: 'int_lit';
 }> | Extract<Expr, {
@@ -344,6 +368,12 @@ export type Stmt = {
     type?: TypeNode;
     init: Expr;
     span?: Span;
+} | {
+    kind: 'let_destruct';
+    names: string[];
+    type?: TypeNode;
+    init: Expr;
+    span?: Span;
 } | {
     kind: 'expr';
     expr: Expr;
@@ -398,6 +428,13 @@ export type Stmt = {
         body: Block;
     }[];
     span?: Span;
+} | {
+    kind: 'if_let_some';
+    binding: string;
+    init: Expr;
+    then: Block;
+    else_?: Block;
+    span?: Span;
 } | {
     kind: 'as_block';
     selector: EntitySelector;
@@ -426,7 +463,7 @@ export type Stmt = {
 };
 export type Block = Stmt[];
 export interface Decorator {
-    name: 'tick' | 'load' | 'on' | 'on_trigger' | 'on_advancement' | 'on_craft' | 'on_death' | 'on_login' | 'on_join_team' | 'keep' | 'require_on_load';
+    name: 'tick' | 'load' | 'on' | 'on_trigger' | 'on_advancement' | 'on_craft' | 'on_death' | 'on_login' | 'on_join_team' | 'keep' | 'require_on_load' | 'coroutine' | 'schedule';
     args?: {
         rate?: number;
         eventType?: string;
@@ -434,6 +471,9 @@ export interface Decorator {
         advancement?: string;
         item?: string;
         team?: string;
+        batch?: number;
+        onDone?: string;
+        ticks?: number;
     };
     /** Raw positional arguments (used by @requires and future generic decorators). */
     rawArgs?: Array<{
@@ -454,7 +494,11 @@ export interface FnDecl {
      *  Library functions are NOT MC entry points — DCE only keeps them if they
      *  are reachable from a non-library (user) entry point. */
     isLibraryFn?: boolean;
+    /** True when declared with `export fn` or `@keep fn` — survives DCE. */
+    isExported?: boolean;
     name: string;
+    /** Generic type parameter names, e.g. ['T'] for fn foo<T>(...) */
+    typeParams?: string[];
     params: Param[];
     returnType: TypeNode;
     decorators: Decorator[];
@@ -499,14 +543,25 @@ export interface GlobalDecl {
     mutable: boolean;
     span?: Span;
 }
+export interface ImportDecl {
+    /** The module being imported from, e.g. "math" in `import math::sin` */
+    moduleName: string;
+    /** The symbol being imported, or '*' for wildcard */
+    symbol: string;
+    span?: Span;
+}
 export interface Program {
     namespace: string;
+    /** Module name declared with `module <name>;` (undefined if no module decl) */
+    moduleName?: string;
     globals: GlobalDecl[];
     declarations: FnDecl[];
     structs: StructDecl[];
     implBlocks: ImplBlock[];
     enums: EnumDecl[];
     consts: ConstDecl[];
+    /** Phase 5b: module imports (`import math::sin;`) */
+    imports: ImportDecl[];
     /** True when the source file declares `module library;`.
      *  Library-mode: all functions are DCE-eligible by default — none are treated
      *  as MC entry points unless they carry @tick / @load / @on / @keep etc. */

package/dist/src/cache/deps.d.ts

@@ -0,0 +1,41 @@
+/**
+ * DependencyGraph — tracks import relationships between .mcrs files.
+ *
+ * Builds a forward dependency map (file → files it imports) and supports
+ * reverse lookups (file → files that depend on it) for change propagation.
+ */
+/**
+ * Parse import statements from a source file's content.
+ * Returns absolute paths of imported files.
+ */
+export declare function parseImports(filePath: string, source?: string): string[];
+export declare class DependencyGraph {
+    /** Forward edges: file → set of files it imports */
+    private deps;
+    /** Add a file and its direct imports to the graph. */
+    addFile(filePath: string, source?: string): void;
+    /** Remove a file from the graph. */
+    removeFile(filePath: string): void;
+    /** Get direct imports of a file. */
+    getDirectDeps(filePath: string): Set<string>;
+    /**
+     * Get transitive dependencies of a file (all files it depends on,
+     * directly or indirectly).
+     */
+    getTransitiveDeps(filePath: string): Set<string>;
+    /**
+     * Get reverse dependents: all files that (transitively) depend on the
+     * given file. Used for change propagation — when `filePath` changes,
+     * all returned files need recompilation.
+     */
+    getDependents(filePath: string): Set<string>;
+    /**
+     * Given a set of changed files, compute the full set of dirty files
+     * (changed files + all their reverse dependents).
+     */
+    computeDirtySet(changedFiles: Set<string>): Set<string>;
+    /** Get all tracked files. */
+    getAllFiles(): string[];
+    /** Clear the graph. */
+    clear(): void;
+}