redscript-mc 1.2.26 → 1.2.28

package/src/compile.ts

@@ -9,7 +9,7 @@ import * as path from 'path'
 
 import { Lexer } from './lexer'
 import { Parser } from './parser'
-import { Lowering } from './lowering'
+import { Lowering, setScoreboardObjective } from './lowering'
 import { optimize } from './optimizer/passes'
 import { eliminateDeadCode } from './optimizer/dce'
 import { generateDatapackWithStats, DatapackFile } from './codegen/mcfunction'
@@ -27,6 +27,10 @@ export interface CompileOptions {
   optimize?: boolean
   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. */
+  scoreboardObjective?: string
   /** Additional source files that should be treated as *library* code.
    *  Functions in these files are DCE-eligible: they are only compiled into
    *  the datapack when actually called from user code.  Each string is parsed
@@ -262,6 +266,12 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
     const dceResult = shouldRunDce ? eliminateDeadCode(parsedAst) : { program: parsedAst, warnings: [] }
     const ast = dceResult.program
 
+    // 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
+    setScoreboardObjective(scoreboardObj)
+
     // Lowering
     const ir = new Lowering(namespace, preprocessed.ranges).lower(ast)
 
@@ -272,7 +282,10 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
 
     // Code generation — mangle=true by default to prevent cross-function
     // scoreboard variable collisions in the global MC scoreboard namespace.
-    const generated = generateDatapackWithStats(optimized, { mangle: options.mangle ?? true })
+    const generated = generateDatapackWithStats(optimized, {
+      mangle: options.mangle ?? true,
+      scoreboardObjective: scoreboardObj,
+    })
 
     return {
       success: true,

package/src/index.ts

@@ -10,7 +10,7 @@ export const version = '1.2.11'
 import { Lexer } from './lexer'
 import { Parser } from './parser'
 import { TypeChecker } from './typechecker'
-import { Lowering } from './lowering'
+import { Lowering, setScoreboardObjective } from './lowering'
 import type { Warning } from './lowering'
 import {
   constantFoldingWithStats,
@@ -36,6 +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. */
+  scoreboardObjective?: string
 }
 
 export interface CompileResult {
@@ -101,12 +105,18 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
     typeErrors = checker.check(ast)
   }
 
+  // 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
+  setScoreboardObjective(scoreboardObj)
+
   // Lowering to IR
   const lowering = new Lowering(namespace, preprocessed.ranges)
   const ir = lowering.lower(ast)
 
   let optimizedIR: IRModule = ir
-  let generated = generateDatapackWithStats(ir, { optimizeCommands: shouldOptimize, mangle })
+  let generated = generateDatapackWithStats(ir, { optimizeCommands: shouldOptimize, mangle, scoreboardObjective: scoreboardObj })
   let optimizationStats: OptimizationStats | undefined
 
   if (shouldOptimize) {
@@ -128,10 +138,10 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
     const copyPropagatedIR: IRModule = { ...ir, functions: copyPropagatedFunctions }
     optimizedIR = { ...ir, functions: deadCodeEliminatedFunctions }
 
-    const baselineGenerated = generateDatapackWithStats(ir, { optimizeCommands: false, mangle })
-    const beforeDceGenerated = generateDatapackWithStats(copyPropagatedIR, { optimizeCommands: false, mangle })
-    const afterDceGenerated = generateDatapackWithStats(optimizedIR, { optimizeCommands: false, mangle })
-    generated = generateDatapackWithStats(optimizedIR, { optimizeCommands: true, mangle })
+    const baselineGenerated = generateDatapackWithStats(ir, { optimizeCommands: false, mangle, scoreboardObjective: scoreboardObj })
+    const beforeDceGenerated = generateDatapackWithStats(copyPropagatedIR, { optimizeCommands: false, mangle, scoreboardObjective: scoreboardObj })
+    const afterDceGenerated = generateDatapackWithStats(optimizedIR, { optimizeCommands: false, mangle, scoreboardObjective: scoreboardObj })
+    generated = generateDatapackWithStats(optimizedIR, { optimizeCommands: true, mangle, scoreboardObjective: scoreboardObj })
 
     stats.deadCodeRemoved =
       countMcfunctionCommands(beforeDceGenerated.files) - countMcfunctionCommands(afterDceGenerated.files)
@@ -147,7 +157,7 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
     optimizationStats = stats
   } else {
     optimizedIR = ir
-    generated = generateDatapackWithStats(ir, { optimizeCommands: false, mangle })
+    generated = generateDatapackWithStats(ir, { optimizeCommands: false, mangle, scoreboardObjective: scoreboardObj })
   }
 
   return {