redscript-mc 3.0.1 → 3.0.2

package/dist/data/stdlib_queue8_test/function/queue_empty__then_0.mcfunction

@@ -0,0 +1,5 @@
+# Generated from: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:107 (fn queue_empty)
+# Source: fn queue_empty() -> int
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:109
+scoreboard players set $__const_1 __stdlib_queue8_test 1
+scoreboard players operation $ret __stdlib_queue8_test = $__const_1 __stdlib_queue8_test

package/dist/data/stdlib_queue8_test/function/queue_peek__merge_1.mcfunction

@@ -0,0 +1,13 @@
+# Generated from: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:74 (fn queue_peek)
+# Source: fn queue_peek() -> int
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:78
+scoreboard players set $ret __stdlib_queue8_test 0
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:79
+execute store result storage rs:macro_args idx int 1 run scoreboard players get rs.q_head __RS__
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:80
+function stdlib_queue8_test:__queue_peek_apply with storage rs:macro_args
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:81
+return 1
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:82
+scoreboard players set $__const_0 __stdlib_queue8_test 0
+scoreboard players operation $ret __stdlib_queue8_test = $__const_0 __stdlib_queue8_test

package/dist/data/stdlib_queue8_test/function/queue_peek__then_0.mcfunction

@@ -0,0 +1,5 @@
+# Generated from: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:74 (fn queue_peek)
+# Source: fn queue_peek() -> int
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:76
+scoreboard players set $__const_-1 __stdlib_queue8_test -1
+scoreboard players operation $ret __stdlib_queue8_test = $__const_-1 __stdlib_queue8_test

package/dist/data/stdlib_queue8_test/function/queue_pop__merge_1.mcfunction

@@ -0,0 +1,15 @@
+# Generated from: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:51 (fn queue_pop)
+# Source: fn queue_pop() -> int
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:57
+scoreboard players set $ret __stdlib_queue8_test 0
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:58
+execute store result storage rs:macro_args idx int 1 run scoreboard players get rs.q_head __RS__
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:59
+function stdlib_queue8_test:__queue_peek_apply with storage rs:macro_args
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:61
+scoreboard players add rs.q_head __RS__ 1
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:62
+return 1
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:63
+scoreboard players set $__const_0 __stdlib_queue8_test 0
+scoreboard players operation $ret __stdlib_queue8_test = $__const_0 __stdlib_queue8_test

package/dist/data/stdlib_queue8_test/function/queue_pop__then_0.mcfunction

@@ -0,0 +1,5 @@
+# Generated from: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:51 (fn queue_pop)
+# Source: fn queue_pop() -> int
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:54
+scoreboard players set $__const_-1 __stdlib_queue8_test -1
+scoreboard players operation $ret __stdlib_queue8_test = $__const_-1 __stdlib_queue8_test

package/dist/data/stdlib_queue8_test/function/queue_push__const_11.mcfunction

@@ -0,0 +1,6 @@
+# Generated from: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:38 (fn queue_push)
+# Source: fn queue_push(val: int) -> void
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:39
+execute store result storage rs:macro_args val int 1 run scoreboard players get $p0 __stdlib_queue8_test
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:40
+function stdlib_queue8_test:__queue_append_apply with storage rs:macro_args

package/dist/data/stdlib_queue8_test/function/queue_push__const_22.mcfunction

@@ -0,0 +1,6 @@
+# Generated from: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:38 (fn queue_push)
+# Source: fn queue_push(val: int) -> void
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:39
+execute store result storage rs:macro_args val int 1 run scoreboard players get $p0 __stdlib_queue8_test
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:40
+function stdlib_queue8_test:__queue_append_apply with storage rs:macro_args

package/dist/data/stdlib_queue8_test/function/queue_size.mcfunction

@@ -0,0 +1,13 @@
+# Generated from: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:93 (fn queue_size)
+# Source: fn queue_size() -> int
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:94
+scoreboard players set $ret __stdlib_queue8_test 0
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:95
+function stdlib_queue8_test:__queue_size_raw_apply with storage rs:macro_args
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:96
+scoreboard players operation $ret __stdlib_queue8_test -= rs.q_head __RS__
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:97
+return 1
+# src: /Users/yuzhe/projects/redscript/src/stdlib/queue.mcrs:98
+scoreboard players set $__const_0 __stdlib_queue8_test 0
+scoreboard players operation $ret __stdlib_queue8_test = $__const_0 __stdlib_queue8_test

package/dist/data/stdlib_queue8_test/function/test_queue_push_and_size.mcfunction

@@ -0,0 +1,13 @@
+# Generated from: /tmp/queue_test.mcrs:2 (fn test_queue_push_and_size)
+# Source: fn test_queue_push_and_size() -> void
+# src: /tmp/queue_test.mcrs:3
+function stdlib_queue8_test:queue_clear
+# src: /tmp/queue_test.mcrs:4
+function stdlib_queue8_test:queue_push__const_11
+# src: /tmp/queue_test.mcrs:5
+function stdlib_queue8_test:queue_push__const_22
+# src: /tmp/queue_test.mcrs:6
+function stdlib_queue8_test:queue_size
+scoreboard players operation $test_queue_push_and_size_t3 __stdlib_queue8_test = $ret __stdlib_queue8_test
+# src: /tmp/queue_test.mcrs:7
+execute store result score #queue_size sc8_result run scoreboard players get $test_queue_push_and_size_t3 __stdlib_queue8_test

package/dist/data/test/function/load.mcfunction

@@ -0,0 +1 @@
+scoreboard objectives add __test dummy

package/dist/data/test/function/say_at.mcfunction

@@ -0,0 +1,6 @@
+# Generated from: /tmp/test_macro2.mcrs:1 (fn say_at)
+# Source: fn say_at(target: selector) -> void
+# src: /tmp/test_macro2.mcrs:2
+summon minecraft:zombie ~0 ~1 ~0
+# src: /tmp/test_macro2.mcrs:3
+say hello from macro

package/dist/data/test/function/test.mcfunction

@@ -0,0 +1,4 @@
+# Generated from: /tmp/test_macro.mcrs:3 (fn test)
+# Source: fn test() -> void
+# src: /tmp/test_macro.mcrs:5
+tellraw @s {"text":"","extra":[{"text":"Value is "},{"score":{"name":"$counter","objective":"__test"}}]}

package/dist/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 26,
+    "description": "RedScript datapack: impl_test"
+  }
+}

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "redscript-mc",
-    "version": "3.0.1",
+    "version": "3.0.2",
     "description": "A high-level programming language that compiles to Minecraft datapacks",
     "main": "dist/src/index.js",
     "bin": {

package/dist/src/__tests__/formatter-extra.test.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Additional coverage for src/formatter/index.ts
+ *
+ * Targets uncovered branches: string handling, long line wrapping,
+ * comment preservation, CRLF normalization, multiple blank line collapsing.
+ */
+export {};

package/dist/src/__tests__/formatter-extra.test.js

@@ -0,0 +1,123 @@
+"use strict";
+/**
+ * Additional coverage for src/formatter/index.ts
+ *
+ * Targets uncovered branches: string handling, long line wrapping,
+ * comment preservation, CRLF normalization, multiple blank line collapsing.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const formatter_1 = require("../formatter");
+describe('formatter — string literal preservation', () => {
+    it('does not reindent content inside string literals', () => {
+        const input = 'fn test(): void {\nlet s: string = "{ not a block }";\n}';
+        const result = (0, formatter_1.format)(input);
+        expect(result).toContain('"{ not a block }"');
+    });
+    it('handles multiline strings spanning multiple lines', () => {
+        // A string that contains a newline escape
+        const input = 'fn test(): void {\nlet s: string = "line1\\nline2";\n}';
+        const result = (0, formatter_1.format)(input);
+        expect(result).toContain('"line1\\nline2"');
+    });
+    it('handles escaped quotes inside strings', () => {
+        const input = 'fn test(): void {\nlet s: string = "say \\"hello\\"";\n}';
+        const result = (0, formatter_1.format)(input);
+        expect(result).toContain('"say \\"hello\\""');
+    });
+    it('handles string with braces that should not affect indentation', () => {
+        const input = 'fn test(): void {\nlet s: string = "{{{}}} more";\nlet x: int = 1;\n}';
+        const result = (0, formatter_1.format)(input);
+        // x should be indented at 1 level (inside fn), not affected by string braces
+        expect(result).toMatch(/^ {2}let x: int = 1;$/m);
+    });
+});
+describe('formatter — comment handling', () => {
+    it('preserves inline comments', () => {
+        const input = 'fn test(): void {\nlet x: int = 1; // important\n}';
+        const result = (0, formatter_1.format)(input);
+        expect(result).toContain('// important');
+    });
+    it('does not treat braces in comments as code', () => {
+        const input = 'fn test(): void {\n// { this is a comment\nlet x: int = 1;\n}';
+        const result = (0, formatter_1.format)(input);
+        expect(result).toMatch(/^ {2}let x: int = 1;$/m);
+    });
+});
+describe('formatter — CRLF normalization', () => {
+    it('normalizes CRLF to LF', () => {
+        const input = 'fn test(): void {\r\nlet x: int = 1;\r\n}';
+        const result = (0, formatter_1.format)(input);
+        expect(result).not.toContain('\r');
+        expect(result).toBe('fn test(): void {\n  let x: int = 1;\n}\n');
+    });
+});
+describe('formatter — blank line collapsing', () => {
+    it('collapses more than 2 consecutive blank lines', () => {
+        const input = 'fn a(): void {\n}\n\n\n\n\nfn b(): void {\n}';
+        const result = (0, formatter_1.format)(input);
+        // Should have at most 2 blank lines between functions
+        expect(result).not.toMatch(/\n\n\n\n/);
+    });
+    it('strips leading blank lines', () => {
+        const input = '\n\n\nfn test(): void {\n}';
+        const result = (0, formatter_1.format)(input);
+        expect(result).toMatch(/^fn test/);
+    });
+});
+describe('formatter — long line wrapping', () => {
+    it('wraps function calls longer than 80 characters', () => {
+        const inner = 'fn test(): void {\n  some_function(argument_one, argument_two, argument_three, argument_four, argument_five);\n}';
+        const result = (0, formatter_1.format)(inner);
+        // Should be wrapped since the line is > 80 chars
+        const lines = result.split('\n');
+        // After wrapping, should produce more lines than original 3
+        expect(lines.length).toBeGreaterThan(3);
+    });
+    it('does not wrap short function calls', () => {
+        const input = 'fn test(): void {\n  foo(a, b);\n}';
+        const result = (0, formatter_1.format)(input);
+        expect(result).toContain('foo(a, b)');
+    });
+    it('does not wrap lines with comments even if long', () => {
+        const longComment = 'fn test(): void {\n  let x: int = 1; // this is a very long comment that makes the line exceed 80 characters easily\n}';
+        const result = (0, formatter_1.format)(longComment);
+        // Should keep comment line as-is (no wrapping)
+        expect(result).toContain('// this is a very long comment');
+    });
+});
+describe('formatter — brace collapsing', () => {
+    it('puts opening brace on same line as preceding statement', () => {
+        const input = 'if true\n{\nlet x: int = 1;\n}';
+        const result = (0, formatter_1.format)(input);
+        expect(result).toContain('if true {');
+    });
+    it('handles else brace normalization', () => {
+        const input = 'fn test(): void {\nif true {\nlet x: int = 1;\n}else{\nlet y: int = 2;\n}\n}';
+        const result = (0, formatter_1.format)(input);
+        expect(result).toContain('} else {');
+    });
+});
+describe('formatter — deeply nested code', () => {
+    it('indents 3 levels deep correctly', () => {
+        const input = 'fn test(): void {\nif true {\nif false {\nlet x: int = 1;\n}\n}\n}';
+        const result = (0, formatter_1.format)(input);
+        expect(result).toMatch(/^ {6}let x: int = 1;$/m);
+    });
+});
+describe('formatter — edge cases', () => {
+    it('handles single line code', () => {
+        const result = (0, formatter_1.format)('let x: int = 1;');
+        expect(result).toBe('let x: int = 1;\n');
+    });
+    it('handles code with only braces', () => {
+        const result = (0, formatter_1.format)('{}');
+        expect(result).toContain('{');
+        expect(result).toContain('}');
+    });
+    it('handles closing brace followed by opening brace', () => {
+        const input = 'fn a(): void {\n}\nfn b(): void {\n}';
+        const result = (0, formatter_1.format)(input);
+        expect(result).toContain('fn a(): void {\n}\nfn b(): void {\n}\n');
+    });
+});
+//# sourceMappingURL=formatter-extra.test.js.map

package/dist/src/__tests__/global-vars.test.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Integration tests for module-level global variables.
+ *
+ * Covers:
+ * - Global variable assignment and read (score_write / score_read)
+ * - Global variable increment in a loop
+ * - Global variable visible across functions
+ * - Global variable in f-string interpolation (no stray "~")
+ *
+ * These tests compile RedScript source and inspect the generated .mcfunction
+ * content to verify correct scoreboard-based code generation.
+ */
+export {};

package/dist/src/__tests__/global-vars.test.js

@@ -0,0 +1,156 @@
+"use strict";
+/**
+ * Integration tests for module-level global variables.
+ *
+ * Covers:
+ * - Global variable assignment and read (score_write / score_read)
+ * - Global variable increment in a loop
+ * - Global variable visible across functions
+ * - Global variable in f-string interpolation (no stray "~")
+ *
+ * These tests compile RedScript source and inspect the generated .mcfunction
+ * content to verify correct scoreboard-based code generation.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const compile_1 = require("../emit/compile");
+// Helper: find a function's body by name
+function getFunctionBody(files, fnName, ns = 'test') {
+    const target = `data/${ns}/function/${fnName}.mcfunction`;
+    const f = files.find(f => f.path === target || f.path.endsWith(`/${fnName}.mcfunction`));
+    if (!f) {
+        const paths = files.map(f => f.path).join('\n');
+        throw new Error(`Function '${fnName}' not found in output. Files:\n${paths}`);
+    }
+    return f.content;
+}
+// ──────────────────────────────────────────────────────────────
+// Test 1: global variable assignment and read
+// ──────────────────────────────────────────────────────────────
+describe('Global variable: assignment and read', () => {
+    const src = `
+    let counter: int = 0;
+
+    @keep
+    fn set_counter() {
+      counter = 42;
+    }
+
+    @keep
+    fn get_counter() {
+      scoreboard_set("#result", "rs", counter);
+    }
+  `;
+    it('set_counter uses scoreboard players set to write global', () => {
+        const { files } = (0, compile_1.compile)(src, { namespace: 'test' });
+        const body = getFunctionBody(files, 'set_counter');
+        // Should write 42 to the scoreboard for the global variable
+        expect(body).toContain('scoreboard players set');
+        expect(body).toContain('42');
+    });
+    it('get_counter reads global via score_read (not hardcoded 0)', () => {
+        const { files } = (0, compile_1.compile)(src, { namespace: 'test' });
+        const body = getFunctionBody(files, 'get_counter');
+        // Should contain a scoreboard read for the counter variable,
+        // not a hardcoded literal "0" assignment
+        expect(body).toContain('scoreboard players');
+        // The result should not be a constant "0" — it must read the scoreboard
+        // (hardcoded copy t = 0 was the old bug)
+        expect(body).not.toMatch(/scoreboard players set #result rs 0\s*$/);
+    });
+});
+// ──────────────────────────────────────────────────────────────
+// Test 2: global variable increment in a loop
+// ──────────────────────────────────────────────────────────────
+describe('Global variable: increment in a loop', () => {
+    const src = `
+    let running: int = 0;
+
+    @keep
+    fn count_up() {
+      let i: int = 0;
+      while i < 5 {
+        running = running + 1;
+        i = i + 1;
+      }
+    }
+  `;
+    it('count_up reads and writes running (not a no-op)', () => {
+        const { files } = (0, compile_1.compile)(src, { namespace: 'test' });
+        const body = getFunctionBody(files, 'count_up');
+        // Should contain scoreboard operations (not an empty function)
+        expect(body.trim().length).toBeGreaterThan(0);
+        expect(body).toContain('scoreboard players');
+    });
+    it('DCE does not eliminate running = running + 1', () => {
+        const { files } = (0, compile_1.compile)(src, { namespace: 'test' });
+        // The while loop generates sub-functions; check all files
+        const allContent = files.map(f => f.content).join('\n');
+        // There must be a scoreboard add or operation for running
+        const hasAdd = allContent.includes('scoreboard players add') ||
+            allContent.includes('scoreboard players operation');
+        expect(hasAdd).toBe(true);
+    });
+});
+// ──────────────────────────────────────────────────────────────
+// Test 3: global variable visible across functions
+// ──────────────────────────────────────────────────────────────
+describe('Global variable: cross-function visibility', () => {
+    const src = `
+    let x: int = 0;
+
+    @keep
+    fn set_x() {
+      x = 42;
+    }
+
+    @keep
+    fn get_x() {
+      scoreboard_set("#out", "rs", x);
+    }
+  `;
+    it('set_x writes to x (not just a local temp)', () => {
+        const { files } = (0, compile_1.compile)(src, { namespace: 'test' });
+        const body = getFunctionBody(files, 'set_x');
+        expect(body).toContain('scoreboard players set');
+        expect(body).toContain('42');
+        // The write must target the persistent scoreboard name for x, not a temp
+        expect(body).toContain('x');
+    });
+    it('get_x reads x from scoreboard', () => {
+        const { files } = (0, compile_1.compile)(src, { namespace: 'test' });
+        const body = getFunctionBody(files, 'get_x');
+        // Must contain a scoreboard get / operation to read x
+        expect(body).toContain('scoreboard players');
+        expect(body).toContain('x');
+    });
+});
+// ──────────────────────────────────────────────────────────────
+// Test 4: global variable in f-string interpolation
+// ──────────────────────────────────────────────────────────────
+describe('Global variable: f-string interpolation', () => {
+    const src = `
+    let score_val: int = 0;
+
+    @keep
+    fn announce() {
+      say(f"Score: {score_val}");
+    }
+  `;
+    it('announce does not contain stray ~ in tellraw', () => {
+        const { files } = (0, compile_1.compile)(src, { namespace: 'test' });
+        const body = getFunctionBody(files, 'announce');
+        // The generated tellraw must not fall back to "~" (the old default bug)
+        expect(body).not.toContain('"text":"~"');
+        expect(body).not.toContain('"~"');
+    });
+    it('announce reads score_val from scoreboard (not hardcoded)', () => {
+        const { files } = (0, compile_1.compile)(src, { namespace: 'test' });
+        const body = getFunctionBody(files, 'announce');
+        // f-string int interpolation uses macro pattern:
+        // execute store result storage ... run scoreboard players get score_val __test
+        expect(body).toContain('score_val');
+        // Must be a dynamic read, not a constant
+        expect(body).not.toMatch(/say Score: \d+/);
+    });
+});
+//# sourceMappingURL=global-vars.test.js.map

package/dist/src/__tests__/lint/new-rules.test.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Tests for the 5 new redscript lint rules:
+ *   no-dead-assignment
+ *   prefer-match-exhaustive
+ *   no-empty-catch
+ *   naming-convention
+ *   no-magic-numbers
+ */
+export {};