redscript-mc 1.2.17 → 1.2.18

package/dist/__tests__/compile-all.test.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Compile-all smoke test
+ *
+ * Finds every .mcrs file in the repo (excluding declaration files and node_modules)
+ * and verifies that each one compiles without throwing an error.
+ *
+ * This catches regressions where a language change breaks existing source files.
+ */
+export {};

package/dist/__tests__/compile-all.test.js

@@ -0,0 +1,90 @@
+"use strict";
+/**
+ * Compile-all smoke test
+ *
+ * Finds every .mcrs file in the repo (excluding declaration files and node_modules)
+ * and verifies that each one compiles without throwing an error.
+ *
+ * This catches regressions where a language change breaks existing source files.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const compile_1 = require("../compile");
+const REPO_ROOT = path.resolve(__dirname, '../../');
+/** Patterns to skip */
+const SKIP_GLOBS = [
+    'node_modules',
+    '.git',
+    'builtins.d.mcrs', // declaration-only file, not valid source
+    'editors/', // copy of builtins.d.mcrs
+];
+function shouldSkip(filePath) {
+    const rel = path.relative(REPO_ROOT, filePath);
+    return SKIP_GLOBS.some(pat => rel.includes(pat));
+}
+function findMcrsFiles(dir) {
+    const results = [];
+    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+        const fullPath = path.join(dir, entry.name);
+        if (shouldSkip(fullPath))
+            continue;
+        if (entry.isDirectory()) {
+            results.push(...findMcrsFiles(fullPath));
+        }
+        else if (entry.isFile() && entry.name.endsWith('.mcrs')) {
+            results.push(fullPath);
+        }
+    }
+    return results;
+}
+const mcrsFiles = findMcrsFiles(REPO_ROOT);
+describe('compile-all: every .mcrs file should compile without errors', () => {
+    test('found at least one .mcrs file', () => {
+        expect(mcrsFiles.length).toBeGreaterThan(0);
+    });
+    for (const filePath of mcrsFiles) {
+        const label = path.relative(REPO_ROOT, filePath);
+        test(label, () => {
+            const source = fs.readFileSync(filePath, 'utf8');
+            // Should not throw
+            expect(() => {
+                (0, compile_1.compile)(source, { namespace: 'smoke_test', optimize: false });
+            }).not.toThrow();
+        });
+    }
+});
+//# sourceMappingURL=compile-all.test.js.map

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' | 'break' | 'continue' | '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 type TokenKind = 'fn' | 'let' | 'const' | 'if' | 'else' | 'while' | 'for' | 'foreach' | 'match' | 'return' | 'break' | 'continue' | 'as' | 'at' | 'in' | 'is' | 'struct' | 'impl' | 'enum' | 'trigger' | 'namespace' | 'execute' | 'run' | 'unless' | 'declare' | '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;

package/dist/lexer/index.js

@@ -37,6 +37,7 @@ const KEYWORDS = {
     execute: 'execute',
     run: 'run',
     unless: 'unless',
+    declare: 'declare',
     int: 'int',
     bool: 'bool',
     float: 'float',

package/dist/lowering/index.js

@@ -372,7 +372,26 @@ class Lowering {
         if (macroParam) {
             return { str: `$(${macroParam})`, macroParam };
         }
-        // Handle ~ident (e.g. ~height) - relative coord with variable offset
+        // Handle ~ident / ^ident syntax — relative/local coord with a VARIABLE offset.
+        //
+        // WHY macros are required here:
+        //   Minecraft's ~N and ^N coordinate syntax requires N to be a compile-time
+        //   literal number. There is no command that accepts a scoreboard value as a
+        //   relative offset. Therefore `~height` (where height is a runtime int) can
+        //   only be expressed at the MC level via the 1.20.2+ function macro system,
+        //   which substitutes $(height) into the command text at call time.
+        //
+        //   Contrast with absolute coords: `tp(target, x, y, z)` where x/y/z are
+        //   plain ints — those become $(x) etc. as literal replacements, same mechanism,
+        //   but the distinction matters to callers: ~$(height) means "relative by height
+        //   blocks from current pos", not "teleport to absolute scoreboard value".
+        //
+        //   Example:
+        //     fn launch_up(target: selector, height: int) {
+        //       tp(target, ~0, ~height, ~0);   // "~height" parsed as rel_coord
+        //     }
+        //   Emits:  $tp $(target) ~0 ~$(height) ~0
+        //   Called: function ns:launch_up with storage rs:macro_args
         if (expr.kind === 'rel_coord' || expr.kind === 'local_coord') {
             const val = expr.value; // e.g. "~height" or "^depth"
             const prefix = val[0]; // ~ or ^

package/dist/parser/index.d.ts

@@ -27,6 +27,8 @@ export declare class Parser {
     private parseConstDecl;
     private parseGlobalDecl;
     private parseFnDecl;
+    /** Parse a `declare fn name(params): returnType;` stub — no body, just discard. */
+    private parseDeclareStub;
     private parseDecorators;
     private parseDecoratorValue;
     private parseParams;

package/dist/parser/index.js

@@ -149,6 +149,11 @@ class Parser {
             else if (this.check('const')) {
                 consts.push(this.parseConstDecl());
             }
+            else if (this.check('declare')) {
+                // Declaration-only stub (e.g. from builtins.d.mcrs) — parse and discard
+                this.advance(); // consume 'declare'
+                this.parseDeclareStub();
+            }
             else {
                 declarations.push(this.parseFnDecl());
             }
@@ -254,6 +259,26 @@ class Parser {
         const body = this.parseBlock();
         return this.withLoc({ name, params, returnType, decorators, body }, fnToken);
     }
+    /** Parse a `declare fn name(params): returnType;` stub — no body, just discard. */
+    parseDeclareStub() {
+        this.expect('fn');
+        this.expect('ident'); // name
+        this.expect('(');
+        // consume params until ')'
+        let depth = 1;
+        while (!this.check('eof') && depth > 0) {
+            const t = this.advance();
+            if (t.kind === '(')
+                depth++;
+            else if (t.kind === ')')
+                depth--;
+        }
+        // optional return type annotation `: type` or `-> type`
+        if (this.match(':') || this.match('->')) {
+            this.parseType();
+        }
+        this.match(';'); // consume trailing semicolon
+    }
     parseDecorators() {
         const decorators = [];
         while (this.check('decorator')) {

package/editors/vscode/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "redscript-vscode",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "redscript-vscode",
-      "version": "1.0.7",
+      "version": "1.0.9",
       "license": "MIT",
       "dependencies": {
         "redscript": "file:../../"

package/editors/vscode/package.json

@@ -2,7 +2,7 @@
   "name": "redscript-vscode",
   "displayName": "RedScript for Minecraft",
   "description": "Syntax highlighting, error diagnostics, and language support for RedScript — a compiler targeting Minecraft Java Edition",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "publisher": "bkmashiro",
   "icon": "icon.png",
   "license": "MIT",

package/package.json

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

package/src/__tests__/compile-all.test.ts

@@ -0,0 +1,60 @@
+/**
+ * Compile-all smoke test
+ *
+ * Finds every .mcrs file in the repo (excluding declaration files and node_modules)
+ * and verifies that each one compiles without throwing an error.
+ *
+ * This catches regressions where a language change breaks existing source files.
+ */
+
+import * as fs from 'fs'
+import * as path from 'path'
+import { compile } from '../compile'
+
+const REPO_ROOT = path.resolve(__dirname, '../../')
+
+/** Patterns to skip */
+const SKIP_GLOBS = [
+  'node_modules',
+  '.git',
+  'builtins.d.mcrs',   // declaration-only file, not valid source
+  'editors/',          // copy of builtins.d.mcrs
+]
+
+function shouldSkip(filePath: string): boolean {
+  const rel = path.relative(REPO_ROOT, filePath)
+  return SKIP_GLOBS.some(pat => rel.includes(pat))
+}
+
+function findMcrsFiles(dir: string): string[] {
+  const results: string[] = []
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    const fullPath = path.join(dir, entry.name)
+    if (shouldSkip(fullPath)) continue
+    if (entry.isDirectory()) {
+      results.push(...findMcrsFiles(fullPath))
+    } else if (entry.isFile() && entry.name.endsWith('.mcrs')) {
+      results.push(fullPath)
+    }
+  }
+  return results
+}
+
+const mcrsFiles = findMcrsFiles(REPO_ROOT)
+
+describe('compile-all: every .mcrs file should compile without errors', () => {
+  test('found at least one .mcrs file', () => {
+    expect(mcrsFiles.length).toBeGreaterThan(0)
+  })
+
+  for (const filePath of mcrsFiles) {
+    const label = path.relative(REPO_ROOT, filePath)
+    test(label, () => {
+      const source = fs.readFileSync(filePath, 'utf8')
+      // Should not throw
+      expect(() => {
+        compile(source, { namespace: 'smoke_test', optimize: false })
+      }).not.toThrow()
+    })
+  }
+})

package/src/lexer/index.ts

@@ -16,7 +16,7 @@ export type TokenKind =
   // Keywords
   | 'fn' | 'let' | 'const' | 'if' | 'else' | 'while' | 'for' | 'foreach' | 'match'
   | 'return' | 'break' | 'continue' | 'as' | 'at' | 'in' | 'is' | 'struct' | 'impl' | 'enum' | 'trigger' | 'namespace'
-  | 'execute' | 'run' | 'unless'
+  | 'execute' | 'run' | 'unless' | 'declare'
   // Types
   | 'int' | 'bool' | 'float' | 'string' | 'void'
   | 'BlockPos'
@@ -89,6 +89,7 @@ const KEYWORDS: Record<string, TokenKind> = {
   execute: 'execute',
   run: 'run',
   unless: 'unless',
+  declare: 'declare',
   int: 'int',
   bool: 'bool',
   float: 'float',

package/src/lowering/index.ts

@@ -387,7 +387,26 @@ export class Lowering {
     if (macroParam) {
       return { str: `$(${macroParam})`, macroParam }
     }
-    // Handle ~ident (e.g. ~height) - relative coord with variable offset
+    // Handle ~ident / ^ident syntax — relative/local coord with a VARIABLE offset.
+    //
+    // WHY macros are required here:
+    //   Minecraft's ~N and ^N coordinate syntax requires N to be a compile-time
+    //   literal number. There is no command that accepts a scoreboard value as a
+    //   relative offset. Therefore `~height` (where height is a runtime int) can
+    //   only be expressed at the MC level via the 1.20.2+ function macro system,
+    //   which substitutes $(height) into the command text at call time.
+    //
+    //   Contrast with absolute coords: `tp(target, x, y, z)` where x/y/z are
+    //   plain ints — those become $(x) etc. as literal replacements, same mechanism,
+    //   but the distinction matters to callers: ~$(height) means "relative by height
+    //   blocks from current pos", not "teleport to absolute scoreboard value".
+    //
+    //   Example:
+    //     fn launch_up(target: selector, height: int) {
+    //       tp(target, ~0, ~height, ~0);   // "~height" parsed as rel_coord
+    //     }
+    //   Emits:  $tp $(target) ~0 ~$(height) ~0
+    //   Called: function ns:launch_up with storage rs:macro_args
     if (expr.kind === 'rel_coord' || expr.kind === 'local_coord') {
       const val = expr.value  // e.g. "~height" or "^depth"
       const prefix = val[0]   // ~ or ^

package/src/parser/index.ts

@@ -180,6 +180,10 @@ export class Parser {
         enums.push(this.parseEnumDecl())
       } else if (this.check('const')) {
         consts.push(this.parseConstDecl())
+      } else if (this.check('declare')) {
+        // Declaration-only stub (e.g. from builtins.d.mcrs) — parse and discard
+        this.advance() // consume 'declare'
+        this.parseDeclareStub()
       } else {
         declarations.push(this.parseFnDecl())
       }
@@ -311,6 +315,25 @@ export class Parser {
     return this.withLoc({ name, params, returnType, decorators, body }, fnToken)
   }
 
+  /** Parse a `declare fn name(params): returnType;` stub — no body, just discard. */
+  private parseDeclareStub(): void {
+    this.expect('fn')
+    this.expect('ident') // name
+    this.expect('(')
+    // consume params until ')'
+    let depth = 1
+    while (!this.check('eof') && depth > 0) {
+      const t = this.advance()
+      if (t.kind === '(') depth++
+      else if (t.kind === ')') depth--
+    }
+    // optional return type annotation `: type` or `-> type`
+    if (this.match(':') || this.match('->')) {
+      this.parseType()
+    }
+    this.match(';') // consume trailing semicolon
+  }
+
   private parseDecorators(): Decorator[] {
     const decorators: Decorator[] = []