redscript-mc 1.2.28 → 1.2.29

package/editors/vscode/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "redscript-vscode",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "redscript-vscode",
-      "version": "1.0.35",
+      "version": "1.0.37",
       "license": "MIT",
       "dependencies": {
         "redscript": "file:../../"
@@ -23,7 +23,7 @@
     },
     "../..": {
       "name": "redscript-mc",
-      "version": "1.2.27",
+      "version": "1.2.28",
       "license": "MIT",
       "bin": {
         "redscript": "dist/cli.js",

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.35",
+  "version": "1.0.37",
   "publisher": "bkmashiro",
   "icon": "icon.png",
   "license": "MIT",

package/editors/vscode/src/hover.ts

@@ -1009,6 +1009,24 @@ export function registerHoverProvider(context: vscode.ExtensionContext): void {
       provideHover(document, position) {
         const line = document.lineAt(position.line).text
 
+        // ── #rs — special compiler token ────────────────────────
+        const rsRange = document.getWordRangeAtPosition(position, /#rs\b/)
+        if (rsRange) {
+          const md = new vscode.MarkdownString('', true)
+          md.isTrusted = true
+          md.appendCodeblock('#rs', 'redscript')
+          md.appendMarkdown('**RS Internal Scoreboard Objective** *(compiler token)*\n\n')
+          md.appendMarkdown('Resolves to the current datapack\'s internal scoreboard objective at compile time.\n\n')
+          md.appendMarkdown('Default: `__<namespace>` (e.g. `__mygame` for namespace `mygame`).\n\n')
+          md.appendMarkdown('Use `#rs` in `scoreboard_get` / `scoreboard_set` when you need to read or write\n')
+          md.appendMarkdown('the compiler\'s own variable slots — such as in stdlib implementations.\n\n')
+          md.appendMarkdown('> ⚠️ Unlike other `#name` tokens, `#rs` does **not** compile to the literal string `rs`.\n')
+          md.appendMarkdown('> It tracks the `--scoreboard` flag or the `__<namespace>` default.\n\n')
+          md.appendMarkdown('**Example:**\n')
+          md.appendCodeblock('scoreboard_set("timer_ticks", #rs, 0);\n// compiles to: scoreboard players set timer_ticks __mygame 0', 'redscript')
+          return new vscode.Hover(md, rsRange)
+        }
+
         // ── #mc_name hover ──────────────────────────────────────
         const mcRange = document.getWordRangeAtPosition(position, /#[a-zA-Z_][a-zA-Z0-9_]*/)
         if (mcRange) {

package/editors/vscode/syntaxes/redscript.tmLanguage.json

@@ -307,9 +307,18 @@
     },
 
     "mc-name": {
-      "comment": "#objective, #tag, #team — unquoted MC identifier literal",
-      "name": "variable.other.mc-name.redscript",
-      "match": "#[a-zA-Z_][a-zA-Z0-9_]*"
+      "comment": "#objective, #tag, #team — unquoted MC identifier literal. #rs is the special RS-internal scoreboard objective token.",
+      "patterns": [
+        {
+          "comment": "#rs — special compiler token: resolves to the current datapack's internal scoreboard objective (__<namespace>)",
+          "name": "support.constant.rs-objective.redscript",
+          "match": "#rs\\b"
+        },
+        {
+          "name": "variable.other.mc-name.redscript",
+          "match": "#[a-zA-Z_][a-zA-Z0-9_]*"
+        }
+      ]
     },
 
     "operators": {

package/package.json

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

package/src/__tests__/cli.test.ts

@@ -55,7 +55,7 @@ describe('CLI API', () => {
       const result = compile(source, { namespace: 'mygame', filePath: mainPath })
       const tickTimer = result.files.find(file => file.path.endsWith('/tick_timer.mcfunction'))
 
-      expect(tickTimer?.content).toContain('scoreboard players set #rs mygame.timer_ticks 1')
+      expect(tickTimer?.content).toContain('scoreboard players set #rs __mygame.timer_ticks 1')
     })
 
     it('adds a call-site hash for stdlib internal scoreboard objectives', () => {
@@ -113,8 +113,8 @@ describe('CLI API', () => {
 
       expect(result.typeErrors).toEqual([])
       const newFn = result.files.find(file => file.path.endsWith('/Timer_new.mcfunction'))
-      expect(newFn?.content).toContain('scoreboard players set timer_ticks timernew 0')
-      expect(newFn?.content).toContain('scoreboard players set timer_active timernew 0')
+      expect(newFn?.content).toContain('scoreboard players set timer_ticks __timernew 0')
+      expect(newFn?.content).toContain('scoreboard players set timer_active __timernew 0')
     })
 
     it('Timer.start/pause/reset', () => {
@@ -142,9 +142,9 @@ describe('CLI API', () => {
       const pauseFn = result.files.find(file => file.path.endsWith('/Timer_pause.mcfunction'))
       const resetFn = result.files.find(file => file.path.endsWith('/Timer_reset.mcfunction'))
 
-      expect(startFn?.content).toContain('scoreboard players set timer_active timerstate 1')
-      expect(pauseFn?.content).toContain('scoreboard players set timer_active timerstate 0')
-      expect(resetFn?.content).toContain('scoreboard players set timer_ticks timerstate 0')
+      expect(startFn?.content).toContain('scoreboard players set timer_active __timerstate 1')
+      expect(pauseFn?.content).toContain('scoreboard players set timer_active __timerstate 0')
+      expect(resetFn?.content).toContain('scoreboard players set timer_ticks __timerstate 0')
     })
 
     it('Timer.done returns bool', () => {
@@ -171,9 +171,9 @@ describe('CLI API', () => {
       expect(result.typeErrors).toEqual([])
       const doneFn = result.files.find(file => file.path.endsWith('/Timer_done.mcfunction'))
       const mainFn = result.files.find(file => file.path.endsWith('/main.mcfunction'))
-      expect(doneFn?.content).toContain('scoreboard players get timer_ticks timerdone')
+      expect(doneFn?.content).toContain('scoreboard players get timer_ticks __timerdone')
       expect(doneFn?.content).toContain('return run scoreboard players get')
-      expect(mainFn?.content).toContain('execute if score $main_finished timerdone matches 1..')
+      expect(mainFn?.content).toContain('execute if score $main_finished __timerdone matches 1..')
     })
 
     it('Timer.tick increments', () => {
@@ -201,10 +201,10 @@ describe('CLI API', () => {
         .map(file => file.content)
         .join('\n')
 
-      expect(tickOutput).toContain('scoreboard players get timer_active timertick')
-      expect(tickOutput).toContain('scoreboard players get timer_ticks timertick')
-      expect(tickOutput).toContain(' += $const_1 timertick')
-      expect(tickOutput).toContain('execute store result score timer_ticks timertick run scoreboard players get $_')
+      expect(tickOutput).toContain('scoreboard players get timer_active __timertick')
+      expect(tickOutput).toContain('scoreboard players get timer_ticks __timertick')
+      expect(tickOutput).toContain(' += $const_1 __timertick')
+      expect(tickOutput).toContain('execute store result score timer_ticks __timertick run scoreboard players get $_')
     })
   })
 

package/src/__tests__/optimizer-advanced.test.ts

@@ -28,7 +28,7 @@ fn turret_tick() {
     const parent = getFileContent(result.files, 'data/test/function/turret_tick.mcfunction')
     const loopBody = getFileContent(result.files, 'data/test/function/turret_tick/foreach_0.mcfunction')
 
-    const hoistedRead = 'execute store result score $_0 test run scoreboard players get config test.turret_range'
+    const hoistedRead = 'execute store result score $_0 __test run scoreboard players get config test.turret_range'
     const executeCall = 'execute as @e[tag=turret] run function test:turret_tick/foreach_0'
 
     expect(parent).toContain(hoistedRead)
@@ -54,7 +54,7 @@ fn read_twice() {
     const readMatches = fn.match(/scoreboard players get @s test\.coins/g) ?? []
 
     expect(readMatches).toHaveLength(1)
-    expect(fn).toContain('scoreboard players operation $_1 test = $_0 test')
+    expect(fn).toContain('scoreboard players operation $_1 __test = $_0 __test')
   })
 
   test('reuses duplicate arithmetic sequences', () => {
@@ -71,10 +71,10 @@ fn math() {
 
     const result = compile(source, { namespace: 'test' })
     const fn = getFileContent(result.files, 'data/test/function/math.mcfunction')
-    const addMatches = fn.match(/\+= \$const_2 test/g) ?? []
+    const addMatches = fn.match(/\+= \$const_2 __test/g) ?? []
 
     expect(addMatches).toHaveLength(1)
-    expect(fn).toContain('scoreboard players operation $_1 test = $_0 test')
+    expect(fn).toContain('scoreboard players operation $_1 __test = $_0 __test')
   })
 })
 

package/src/compile.ts

@@ -28,8 +28,9 @@ export interface CompileOptions {
   dce?: boolean
   mangle?: boolean
   /** Scoreboard objective used for all variable slots.
-   *  Defaults to 'rs'. Set to a unique value (e.g. 'mypack_rs') when loading
-   *  multiple RedScript datapacks simultaneously to avoid variable collisions. */
+   *  Defaults to '__<namespace>' (e.g. '__mathshow') — the double-underscore
+   *  prefix signals compiler-internal and avoids occupying the user's namespace.
+   *  Each datapack gets a unique objective automatically; no manual setup needed. */
   scoreboardObjective?: string
   /** Additional source files that should be treated as *library* code.
    *  Functions in these files are DCE-eligible: they are only compiled into
@@ -269,7 +270,7 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
     // Configure scoreboard objective for this compilation.
     // Default: use the datapack namespace so each datapack gets its own objective
     // automatically, preventing variable collisions when multiple datapacks coexist.
-    const scoreboardObj = options.scoreboardObjective ?? namespace
+    const scoreboardObj = options.scoreboardObjective ?? `__${namespace}`
     setScoreboardObjective(scoreboardObj)
 
     // Lowering

package/src/index.ts

@@ -36,9 +36,10 @@ export interface CompileOptions {
   filePath?: string
   dce?: boolean
   mangle?: boolean
-  /** Scoreboard objective used for all variable slots (default: 'rs').
-   *  Set a unique value per datapack to avoid collisions when multiple
-   *  RedScript datapacks are loaded simultaneously. */
+  /** Scoreboard objective used for all variable slots.
+   *  Defaults to '__<namespace>' (e.g. '__mathshow') to avoid collisions when
+   *  multiple RedScript datapacks are loaded simultaneously, without occupying
+   *  the user's own namespace. Override only if you need a specific name. */
   scoreboardObjective?: string
 }
 
@@ -108,7 +109,7 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
   // Configure scoreboard objective for this compilation.
   // Default: use the datapack namespace so each datapack gets its own objective
   // automatically, preventing variable collisions when multiple datapacks coexist.
-  const scoreboardObj = options.scoreboardObjective ?? namespace
+  const scoreboardObj = options.scoreboardObjective ?? `__${namespace}`
   setScoreboardObjective(scoreboardObj)
 
   // Lowering to IR