redscript-mc 1.2.28 → 1.2.29

package/dist/__tests__/cli.test.js

@@ -77,7 +77,7 @@ describe('CLI API', () => {
             const source = fs.readFileSync(mainPath, 'utf-8');
             const result = (0, index_1.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', () => {
             const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'redscript-stdlib-hash-'));
@@ -125,8 +125,8 @@ describe('CLI API', () => {
             const result = (0, index_1.compile)(source, { namespace: 'timernew', filePath: mainPath });
             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', () => {
             const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'redscript-timer-state-'));
@@ -149,9 +149,9 @@ describe('CLI API', () => {
             const startFn = result.files.find(file => file.path.endsWith('/Timer_start.mcfunction'));
             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', () => {
             const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'redscript-timer-done-'));
@@ -174,9 +174,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', () => {
             const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'redscript-timer-tick-'));
@@ -199,10 +199,10 @@ describe('CLI API', () => {
                 .filter(file => file.path.includes('/Timer_tick'))
                 .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 $_');
         });
     });
     describe('compile()', () => {

package/dist/__tests__/optimizer-advanced.test.js

@@ -26,7 +26,7 @@ fn turret_tick() {
         const result = (0, index_1.compile)(source, { namespace: 'test' });
         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);
         expect(parent.indexOf(hoistedRead)).toBeLessThan(parent.indexOf(executeCall));
@@ -48,7 +48,7 @@ fn read_twice() {
         const fn = getFileContent(result.files, 'data/test/function/read_twice.mcfunction');
         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', () => {
         const source = `
@@ -63,9 +63,9 @@ fn math() {
 `;
         const result = (0, index_1.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');
     });
 });
 describe('setblock batching', () => {

package/dist/compile.d.ts

@@ -14,8 +14,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

package/dist/compile.js

@@ -212,7 +212,7 @@ function compile(source, options = {}) {
         // 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}`;
         (0, lowering_1.setScoreboardObjective)(scoreboardObj);
         // Lowering
         const ir = new lowering_1.Lowering(namespace, preprocessed.ranges).lower(ast);

package/dist/index.d.ts

@@ -17,9 +17,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;
 }
 export interface CompileResult {

package/dist/index.js

@@ -69,7 +69,7 @@ function compile(source, options = {}) {
     // 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}`;
     (0, lowering_1.setScoreboardObjective)(scoreboardObj);
     // Lowering to IR
     const lowering = new lowering_1.Lowering(namespace, preprocessed.ranges);