redscript-mc 2.0.0 → 2.1.1

package/dist/src/cache/incremental.js

@@ -0,0 +1,165 @@
+"use strict";
+/**
+ * Incremental compilation — only recompile files whose content (or
+ * dependencies) has changed since the last build.
+ */
+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 });
+exports.compileIncremental = compileIncremental;
+exports.resetCompileCache = resetCompileCache;
+const path = __importStar(require("path"));
+const compile_1 = require("../emit/compile");
+const fs = __importStar(require("fs"));
+const compiledCache = new Map();
+/**
+ * Compile a set of entry files incrementally.
+ *
+ * For each file:
+ * - Compute content hash of the file and all its transitive imports
+ * - If all hashes match the previous build → skip (cache hit)
+ * - If any hash changed → recompile from scratch
+ */
+function compileIncremental(files, cache, depGraph, options) {
+    const result = {
+        recompiled: 0,
+        cached: 0,
+        errors: new Map(),
+        results: new Map(),
+    };
+    // Phase 1: Update dependency graph for all files
+    for (const file of files) {
+        const absFile = path.resolve(file);
+        try {
+            const source = fs.readFileSync(absFile, 'utf-8');
+            depGraph.addFile(absFile, source);
+        }
+        catch {
+            // File might have been deleted
+            depGraph.removeFile(absFile);
+        }
+    }
+    // Phase 2: Detect all changed source files BEFORE recompiling anything.
+    // This prevents cache.update() during one file's recompile from hiding
+    // changes needed by another file that shares the same dependency.
+    const changedSourceFiles = new Set();
+    const allSourceFiles = new Set();
+    for (const file of files) {
+        const absFile = path.resolve(file);
+        const allDeps = depGraph.getTransitiveDeps(absFile);
+        allSourceFiles.add(absFile);
+        for (const dep of allDeps)
+            allSourceFiles.add(dep);
+    }
+    for (const sourceFile of allSourceFiles) {
+        if (cache.hasChanged(sourceFile)) {
+            changedSourceFiles.add(sourceFile);
+        }
+    }
+    // Phase 3: For each entry file, check if it or any dep changed → recompile
+    for (const file of files) {
+        const absFile = path.resolve(file);
+        // Collect all files in this compilation unit (entry + transitive deps)
+        const allDeps = depGraph.getTransitiveDeps(absFile);
+        const unitFiles = [absFile, ...allDeps];
+        // Check if any file in the unit has changed
+        let needsRecompile = false;
+        const prevEntry = compiledCache.get(absFile);
+        if (!prevEntry) {
+            needsRecompile = true;
+        }
+        else {
+            for (const unitFile of unitFiles) {
+                if (changedSourceFiles.has(unitFile)) {
+                    needsRecompile = true;
+                    break;
+                }
+            }
+            // Also check if the set of dependencies changed
+            if (!needsRecompile && prevEntry.depHashes.size !== unitFiles.length) {
+                needsRecompile = true;
+            }
+        }
+        if (!needsRecompile) {
+            // Cache hit — write cached result to output
+            const cached = compiledCache.get(absFile);
+            writeBuildOutput(cached.result, options.output);
+            result.cached++;
+            continue;
+        }
+        // Cache miss — recompile
+        try {
+            const source = fs.readFileSync(absFile, 'utf-8');
+            const ns = options.namespace ?? deriveNamespace(absFile);
+            const compileResult = (0, compile_1.compile)(source, { namespace: ns, filePath: absFile });
+            // Update caches
+            const depHashes = new Map();
+            for (const unitFile of unitFiles) {
+                cache.update(unitFile);
+                const entry = cache.get(unitFile);
+                if (entry)
+                    depHashes.set(unitFile, entry.hash);
+            }
+            compiledCache.set(absFile, { result: compileResult, depHashes });
+            writeBuildOutput(compileResult, options.output);
+            result.recompiled++;
+            result.results.set(absFile, compileResult);
+        }
+        catch (err) {
+            result.errors.set(absFile, err.message);
+        }
+    }
+    return result;
+}
+/** Write compile output files to the output directory. */
+function writeBuildOutput(compileResult, output) {
+    fs.mkdirSync(output, { recursive: true });
+    for (const dataFile of compileResult.files) {
+        const filePath = path.join(output, dataFile.path);
+        const dir = path.dirname(filePath);
+        fs.mkdirSync(dir, { recursive: true });
+        fs.writeFileSync(filePath, dataFile.content);
+    }
+}
+function deriveNamespace(filePath) {
+    const basename = path.basename(filePath, path.extname(filePath));
+    return basename.toLowerCase().replace(/[^a-z0-9]/g, '_');
+}
+/**
+ * Reset the in-memory compile cache. Useful for testing.
+ */
+function resetCompileCache() {
+    compiledCache.clear();
+}
+//# sourceMappingURL=incremental.js.map

package/dist/src/cache/index.d.ts

@@ -0,0 +1,37 @@
+/**
+ * FileCache — content-hash-based compilation cache for incremental builds.
+ *
+ * Stores per-file content hashes and optional cached HIR modules.
+ * Persists to `.redscript-cache/` as JSON.
+ */
+import type { HIRModule } from '../hir/types';
+export interface CacheEntry {
+    hash: string;
+    mtime: number;
+    hir?: HIRModule;
+}
+export declare class FileCache {
+    private entries;
+    private cacheDir;
+    constructor(cacheDir: string);
+    /** Get cached entry for a file (by absolute path). */
+    get(filePath: string): CacheEntry | undefined;
+    /** Set cache entry for a file. */
+    set(filePath: string, entry: CacheEntry): void;
+    /** Check if a file's content has changed since last cache. */
+    hasChanged(filePath: string): boolean;
+    /** Update the cache entry for a file from disk. Returns true if content changed. */
+    update(filePath: string, hir?: HIRModule): boolean;
+    /** Remove a file from the cache. */
+    delete(filePath: string): void;
+    /** Clear all cache entries. */
+    clear(): void;
+    /** Number of cached entries. */
+    get size(): number;
+    /** Persist cache to disk (`.redscript-cache/cache.json`). */
+    save(): void;
+    /** Load cache from disk. */
+    load(): void;
+}
+/** SHA-256 hash of a file's content. */
+export declare function hashFile(filePath: string): string;

package/dist/src/cache/index.js

@@ -0,0 +1,152 @@
+"use strict";
+/**
+ * FileCache — content-hash-based compilation cache for incremental builds.
+ *
+ * Stores per-file content hashes and optional cached HIR modules.
+ * Persists to `.redscript-cache/` as JSON.
+ */
+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 });
+exports.FileCache = void 0;
+exports.hashFile = hashFile;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const crypto = __importStar(require("crypto"));
+class FileCache {
+    constructor(cacheDir) {
+        this.entries = new Map();
+        this.cacheDir = cacheDir;
+    }
+    /** Get cached entry for a file (by absolute path). */
+    get(filePath) {
+        return this.entries.get(path.resolve(filePath));
+    }
+    /** Set cache entry for a file. */
+    set(filePath, entry) {
+        this.entries.set(path.resolve(filePath), entry);
+    }
+    /** Check if a file's content has changed since last cache. */
+    hasChanged(filePath) {
+        const absPath = path.resolve(filePath);
+        const cached = this.entries.get(absPath);
+        if (!cached)
+            return true;
+        // Quick mtime check first
+        try {
+            const stat = fs.statSync(absPath);
+            if (stat.mtimeMs === cached.mtime)
+                return false;
+        }
+        catch {
+            return true;
+        }
+        // mtime changed — compare content hash
+        const currentHash = hashFile(absPath);
+        return currentHash !== cached.hash;
+    }
+    /** Update the cache entry for a file from disk. Returns true if content changed. */
+    update(filePath, hir) {
+        const absPath = path.resolve(filePath);
+        const changed = this.hasChanged(absPath);
+        if (changed) {
+            try {
+                const stat = fs.statSync(absPath);
+                this.entries.set(absPath, {
+                    hash: hashFile(absPath),
+                    mtime: stat.mtimeMs,
+                    hir,
+                });
+            }
+            catch {
+                this.entries.delete(absPath);
+            }
+        }
+        else if (hir) {
+            // Update HIR even if hash didn't change
+            const entry = this.entries.get(absPath);
+            if (entry)
+                entry.hir = hir;
+        }
+        return changed;
+    }
+    /** Remove a file from the cache. */
+    delete(filePath) {
+        this.entries.delete(path.resolve(filePath));
+    }
+    /** Clear all cache entries. */
+    clear() {
+        this.entries.clear();
+    }
+    /** Number of cached entries. */
+    get size() {
+        return this.entries.size;
+    }
+    /** Persist cache to disk (`.redscript-cache/cache.json`). */
+    save() {
+        fs.mkdirSync(this.cacheDir, { recursive: true });
+        const serialized = {
+            version: 1,
+            entries: {},
+        };
+        for (const [filePath, entry] of this.entries) {
+            // Don't persist HIR — it contains non-serializable references
+            serialized.entries[filePath] = { hash: entry.hash, mtime: entry.mtime };
+        }
+        const cachePath = path.join(this.cacheDir, 'cache.json');
+        fs.writeFileSync(cachePath, JSON.stringify(serialized, null, 2));
+    }
+    /** Load cache from disk. */
+    load() {
+        const cachePath = path.join(this.cacheDir, 'cache.json');
+        try {
+            const data = JSON.parse(fs.readFileSync(cachePath, 'utf-8'));
+            if (data.version !== 1)
+                return;
+            for (const [filePath, entry] of Object.entries(data.entries)) {
+                this.entries.set(filePath, { hash: entry.hash, mtime: entry.mtime });
+            }
+        }
+        catch {
+            // No cache or corrupt — start fresh
+        }
+    }
+}
+exports.FileCache = FileCache;
+/** SHA-256 hash of a file's content. */
+function hashFile(filePath) {
+    const content = fs.readFileSync(filePath);
+    return crypto.createHash('sha256').update(content).digest('hex');
+}
+//# sourceMappingURL=index.js.map

package/dist/src/cli.js

@@ -45,8 +45,12 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 const index_1 = require("./index");
 const diagnostics_1 = require("./diagnostics");
+const mc_version_1 = require("./types/mc-version");
 const repl_1 = require("./repl");
 const metadata_1 = require("./builtins/metadata");
+const index_2 = require("./cache/index");
+const deps_1 = require("./cache/deps");
+const incremental_1 = require("./cache/incremental");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const https = __importStar(require("https"));
@@ -81,6 +85,11 @@ Options:
   --namespace <ns>       Datapack namespace (default: derived from filename)
   --hot-reload <url>     After each successful compile, POST to <url>/reload
                          (use with redscript-testharness; e.g. http://localhost:25561)
+  --source-map           Generate .sourcemap.json files alongside .mcfunction output
+  --mc-version <ver>     Target Minecraft version (default: 1.21). Affects codegen features.
+                         e.g. --mc-version 1.20.2, --mc-version 1.19
+  --lenient              Treat type errors as warnings instead of blocking compilation
+  --include <dir>        Add a directory to the import search path (repeatable)
   -h, --help             Show this help message
 `);
 }
@@ -190,6 +199,24 @@ function parseArgs(args) {
             result.hotReload = args[++i];
             i++;
         }
+        else if (arg === '--source-map') {
+            result.sourceMap = true;
+            i++;
+        }
+        else if (arg === '--mc-version') {
+            result.mcVersionStr = args[++i];
+            i++;
+        }
+        else if (arg === '--lenient') {
+            result.lenient = true;
+            i++;
+        }
+        else if (arg === '--include') {
+            if (!result.includeDirs)
+                result.includeDirs = [];
+            result.includeDirs.push(args[++i]);
+            i++;
+        }
         else if (!result.command) {
             result.command = arg;
             i++;
@@ -209,15 +236,25 @@ function deriveNamespace(filePath) {
     // Convert to valid identifier: lowercase, replace non-alphanumeric with underscore
     return basename.toLowerCase().replace(/[^a-z0-9]/g, '_');
 }
-function compileCommand(file, output, namespace) {
+function compileCommand(file, output, namespace, sourceMap = false, mcVersionStr, lenient = false, includeDirs) {
     // Read source file
     if (!fs.existsSync(file)) {
         console.error(`Error: File not found: ${file}`);
         process.exit(1);
     }
+    let mcVersion = mc_version_1.DEFAULT_MC_VERSION;
+    if (mcVersionStr) {
+        try {
+            mcVersion = (0, mc_version_1.parseMcVersion)(mcVersionStr);
+        }
+        catch (e) {
+            console.error(`Error: ${e.message}`);
+            process.exit(1);
+        }
+    }
     const source = fs.readFileSync(file, 'utf-8');
     try {
-        const result = (0, index_1.compile)(source, { namespace, filePath: file });
+        const result = (0, index_1.compile)(source, { namespace, filePath: file, generateSourceMap: sourceMap, mcVersion, lenient, includeDirs });
         for (const w of result.warnings) {
             console.error(`Warning: ${w}`);
         }
@@ -235,23 +272,27 @@ function compileCommand(file, output, namespace) {
         console.log(`  Files: ${result.files.length}`);
     }
     catch (err) {
-        console.error((0, diagnostics_1.formatError)(err, source));
+        console.error((0, diagnostics_1.formatError)(err, source, file));
         process.exit(1);
     }
 }
-function checkCommand(file) {
+function checkCommand(file, namespace) {
     // Read source file
     if (!fs.existsSync(file)) {
         console.error(`Error: File not found: ${file}`);
         process.exit(1);
     }
     const source = fs.readFileSync(file, 'utf-8');
-    const error = (0, index_1.check)(source, 'redscript', file);
-    if (error) {
-        console.error((0, diagnostics_1.formatError)(error, source));
+    const ns = namespace ?? deriveNamespace(file);
+    const result = (0, index_1.checkWithWarnings)(source, ns, file);
+    for (const w of result.warnings) {
+        console.error(`Warning: ${w}`);
+    }
+    if (result.error) {
+        console.error((0, diagnostics_1.formatError)(result.error, source, file));
         process.exit(1);
     }
-    console.log(`✓ ${file} is valid`);
+    console.log(`✓ No errors found`);
 }
 async function hotReload(url) {
     try {
@@ -282,49 +323,46 @@ function watchCommand(dir, output, namespace, hotReloadUrl) {
     console.log(`   Output: ${output}`);
     if (hotReloadUrl)
         console.log(`   Hot reload: ${hotReloadUrl}`);
+    console.log(`   Incremental compilation enabled`);
     console.log(`   Press Ctrl+C to stop\n`);
+    // Set up incremental compilation infrastructure
+    const cacheDir = path.join(dir, '.redscript-cache');
+    const cache = new index_2.FileCache(cacheDir);
+    cache.load();
+    const depGraph = new deps_1.DependencyGraph();
     // Debounce timer
     let debounceTimer = null;
-    // Compile all .mcrs files in directory
-    async function compileAll() {
+    // Compile all .mcrs files in directory (incrementally)
+    async function compileAllIncremental() {
         const files = findRsFiles(dir);
         if (files.length === 0) {
             console.log(`⚠  No .mcrs files found in ${dir}`);
             return;
         }
-        let hasErrors = false;
-        for (const file of files) {
-            let source = '';
-            try {
-                source = fs.readFileSync(file, 'utf-8');
-                const ns = namespace ?? deriveNamespace(file);
-                const result = (0, index_1.compile)(source, { namespace: ns, filePath: file });
-                for (const w of result.warnings) {
-                    console.error(`Warning: ${w}`);
-                }
-                // Create output directory
-                fs.mkdirSync(output, { recursive: true });
-                // Write all files
-                for (const dataFile of result.files) {
-                    const filePath = path.join(output, dataFile.path);
-                    const fileDir = path.dirname(filePath);
-                    fs.mkdirSync(fileDir, { recursive: true });
-                    fs.writeFileSync(filePath, dataFile.content);
-                }
-                const timestamp = new Date().toLocaleTimeString();
-                console.log(`✓ [${timestamp}] Compiled ${file} (${result.files.length} files)`);
-            }
-            catch (err) {
-                hasErrors = true;
-                const timestamp = new Date().toLocaleTimeString();
-                console.error(`✗ [${timestamp}] ${(0, diagnostics_1.formatError)(err, source)}`);
+        const incResult = (0, incremental_1.compileIncremental)(files, cache, depGraph, {
+            namespace,
+            output,
+        });
+        const timestamp = new Date().toLocaleTimeString();
+        // Print warnings from recompiled files
+        for (const [file, compileResult] of incResult.results) {
+            for (const w of compileResult.warnings) {
+                console.error(`Warning: ${w}`);
             }
+            console.log(`✓ [${timestamp}] Compiled ${path.relative(dir, file)} (${compileResult.files.length} files)`);
+        }
+        if (incResult.cached > 0) {
+            console.log(`  [${timestamp}] ${incResult.cached} file(s) unchanged (cached)`);
         }
-        if (!hasErrors) {
-            if (hotReloadUrl)
-                await hotReload(hotReloadUrl);
-            console.log('');
+        // Print errors
+        for (const [file, errMsg] of incResult.errors) {
+            console.error(`✗ [${timestamp}] ${path.relative(dir, file)}: ${errMsg}`);
         }
+        // Persist cache
+        cache.save();
+        if (incResult.errors.size === 0 && hotReloadUrl)
+            await hotReload(hotReloadUrl);
+        console.log('');
     }
     // Find all .mcrs files recursively
     function findRsFiles(directory) {
@@ -332,7 +370,7 @@ function watchCommand(dir, output, namespace, hotReloadUrl) {
         const entries = fs.readdirSync(directory, { withFileTypes: true });
         for (const entry of entries) {
             const fullPath = path.join(directory, entry.name);
-            if (entry.isDirectory()) {
+            if (entry.isDirectory() && entry.name !== '.redscript-cache') {
                 results.push(...findRsFiles(fullPath));
             }
             else if (entry.isFile() && entry.name.endsWith('.mcrs')) {
@@ -342,7 +380,7 @@ function watchCommand(dir, output, namespace, hotReloadUrl) {
         return results;
     }
     // Initial compile
-    void compileAll();
+    void compileAllIncremental();
     // Watch for changes
     fs.watch(dir, { recursive: true }, (eventType, filename) => {
         if (filename && filename.endsWith('.mcrs')) {
@@ -352,7 +390,7 @@ function watchCommand(dir, output, namespace, hotReloadUrl) {
             }
             debounceTimer = setTimeout(() => {
                 console.log(`📝 Change detected: ${filename}`);
-                void compileAll();
+                void compileAllIncremental();
             }, 100);
         }
     });
@@ -380,7 +418,7 @@ async function main() {
             {
                 const namespace = parsed.namespace ?? deriveNamespace(parsed.file);
                 const output = parsed.output ?? './dist';
-                compileCommand(parsed.file, output, namespace);
+                compileCommand(parsed.file, output, namespace, parsed.sourceMap, parsed.mcVersionStr, parsed.lenient, parsed.includeDirs);
             }
             break;
         case 'watch':
@@ -397,7 +435,7 @@ async function main() {
                 printUsage();
                 process.exit(1);
             }
-            checkCommand(parsed.file);
+            checkCommand(parsed.file, parsed.namespace);
             break;
         case 'fmt':
         case 'format': {

package/dist/src/compile.d.ts

@@ -3,8 +3,8 @@
  *
  * Preprocessing utilities and v2 compile re-export.
  */
-export { compile, CompileOptions, CompileResult } from '../src2/emit/compile';
-export type { DatapackFile } from '../src2/emit/index';
+export { compile, CompileOptions, CompileResult } from './emit/compile';
+export type { DatapackFile } from './emit/index';
 export interface SourceRange {
     startLine: number;
     endLine: number;
@@ -32,6 +32,7 @@ export declare function resolveSourceLine(combinedLine: number, ranges: SourceRa
 interface PreprocessOptions {
     filePath?: string;
     seen?: Set<string>;
+    includeDirs?: string[];
 }
 export declare function preprocessSourceWithMetadata(source: string, options?: PreprocessOptions): PreprocessedSource;
 export declare function preprocessSource(source: string, options?: PreprocessOptions): string;