redscript-mc 1.2.30 → 2.1.0

package/dist/compile.js

@@ -1,266 +1,2 @@
-"use strict";
-/**
- * RedScript Compile API
- *
- * Main compile function with proper error handling and diagnostics.
- */
-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.resolveSourceLine = resolveSourceLine;
-exports.preprocessSourceWithMetadata = preprocessSourceWithMetadata;
-exports.preprocessSource = preprocessSource;
-exports.compile = compile;
-exports.formatCompileError = formatCompileError;
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const lexer_1 = require("./lexer");
-const parser_1 = require("./parser");
-const lowering_1 = require("./lowering");
-const passes_1 = require("./optimizer/passes");
-const dce_1 = require("./optimizer/dce");
-const mcfunction_1 = require("./codegen/mcfunction");
-const diagnostics_1 = require("./diagnostics");
-/**
- * Resolve a combined-source line number back to the original file and line.
- * Returns { filePath, line } if a mapping is found, otherwise returns the input unchanged.
- */
-function resolveSourceLine(combinedLine, ranges, fallbackFile) {
-    for (const range of ranges) {
-        if (combinedLine >= range.startLine && combinedLine <= range.endLine) {
-            const localLine = combinedLine - range.startLine + 1;
-            return { filePath: range.filePath, line: localLine };
-        }
-    }
-    return { filePath: fallbackFile, line: combinedLine };
-}
-const IMPORT_RE = /^\s*import\s+"([^"]+)"\s*;?\s*$/;
-/** Returns true if the source file declares `module library;` at its top
- *  (before any non-comment/non-blank lines). */
-function isLibrarySource(source) {
-    for (const line of source.split('\n')) {
-        const trimmed = line.trim();
-        if (!trimmed || trimmed.startsWith('//'))
-            continue;
-        return /^module\s+library\s*;/.test(trimmed);
-    }
-    return false;
-}
-function countLines(source) {
-    return source === '' ? 0 : source.split('\n').length;
-}
-function offsetRanges(ranges, lineOffset) {
-    return ranges.map(range => ({
-        startLine: range.startLine + lineOffset,
-        endLine: range.endLine + lineOffset,
-        filePath: range.filePath,
-    }));
-}
-function preprocessSourceWithMetadata(source, options = {}) {
-    const { filePath } = options;
-    const seen = options.seen ?? new Set();
-    if (filePath) {
-        seen.add(path.resolve(filePath));
-    }
-    const lines = source.split('\n');
-    const imports = [];
-    /** Library imports: `module library;` files routed here instead of concatenated. */
-    const libraryImports = [];
-    const bodyLines = [];
-    let parsingHeader = true;
-    for (let i = 0; i < lines.length; i++) {
-        const line = lines[i];
-        const trimmed = line.trim();
-        const match = line.match(IMPORT_RE);
-        if (parsingHeader && match) {
-            if (!filePath) {
-                throw new diagnostics_1.DiagnosticError('ParseError', 'Import statements require a file path', { line: i + 1, col: 1 }, lines);
-            }
-            const importPath = path.resolve(path.dirname(filePath), match[1]);
-            if (!seen.has(importPath)) {
-                seen.add(importPath);
-                let importedSource;
-                try {
-                    importedSource = fs.readFileSync(importPath, 'utf-8');
-                }
-                catch {
-                    throw new diagnostics_1.DiagnosticError('ParseError', `Cannot import '${match[1]}'`, { file: filePath, line: i + 1, col: 1 }, lines);
-                }
-                if (isLibrarySource(importedSource)) {
-                    // Library file: parse separately so its functions are DCE-eligible.
-                    // Also collect any transitive library imports inside it.
-                    const nested = preprocessSourceWithMetadata(importedSource, { filePath: importPath, seen });
-                    libraryImports.push({ source: importedSource, filePath: importPath });
-                    // Propagate transitive library imports (e.g. math.mcrs imports vec.mcrs)
-                    if (nested.libraryImports)
-                        libraryImports.push(...nested.libraryImports);
-                }
-                else {
-                    imports.push(preprocessSourceWithMetadata(importedSource, { filePath: importPath, seen }));
-                }
-            }
-            continue;
-        }
-        if (parsingHeader && (trimmed === '' || trimmed.startsWith('//'))) {
-            bodyLines.push(line);
-            continue;
-        }
-        parsingHeader = false;
-        bodyLines.push(line);
-    }
-    const body = bodyLines.join('\n');
-    const parts = [...imports.map(entry => entry.source), body].filter(Boolean);
-    const combined = parts.join('\n');
-    const ranges = [];
-    let lineOffset = 0;
-    for (const entry of imports) {
-        ranges.push(...offsetRanges(entry.ranges, lineOffset));
-        lineOffset += countLines(entry.source);
-    }
-    if (filePath && body) {
-        ranges.push({
-            startLine: lineOffset + 1,
-            endLine: lineOffset + countLines(body),
-            filePath: path.resolve(filePath),
-        });
-    }
-    return {
-        source: combined,
-        ranges,
-        libraryImports: libraryImports.length > 0 ? libraryImports : undefined,
-    };
-}
-function preprocessSource(source, options = {}) {
-    return preprocessSourceWithMetadata(source, options).source;
-}
-// ---------------------------------------------------------------------------
-// Main Compile Function
-// ---------------------------------------------------------------------------
-function compile(source, options = {}) {
-    const { namespace = 'redscript', filePath, optimize: shouldOptimize = true } = options;
-    const shouldRunDce = options.dce ?? shouldOptimize;
-    let sourceLines = source.split('\n');
-    try {
-        const preprocessed = preprocessSourceWithMetadata(source, { filePath });
-        const preprocessedSource = preprocessed.source;
-        sourceLines = preprocessedSource.split('\n');
-        // Lexing
-        const tokens = new lexer_1.Lexer(preprocessedSource, filePath).tokenize();
-        // Parsing — user source
-        const parsedAst = new parser_1.Parser(tokens, preprocessedSource, filePath).parse(namespace);
-        // Collect all library sources: explicit `librarySources` option +
-        // auto-detected imports (files with `module library;` pulled out by the
-        // preprocessor rather than concatenated).
-        const allLibrarySources = [];
-        for (const libSrc of options.librarySources ?? []) {
-            allLibrarySources.push({ src: libSrc });
-        }
-        for (const li of preprocessed.libraryImports ?? []) {
-            allLibrarySources.push({ src: li.source, fp: li.filePath });
-        }
-        // Parse library sources independently (fresh Parser per source) so that
-        // `inLibraryMode` never bleeds into user code.  All resulting functions get
-        // isLibraryFn=true (either via `module library;` in the source, or forced below).
-        for (const { src, fp } of allLibrarySources) {
-            const libPreprocessed = preprocessSourceWithMetadata(src, fp ? { filePath: fp } : {});
-            const libTokens = new lexer_1.Lexer(libPreprocessed.source, fp).tokenize();
-            const libAst = new parser_1.Parser(libTokens, libPreprocessed.source, fp).parse(namespace);
-            // Force all functions to library mode (even if source lacks `module library;`)
-            for (const fn of libAst.declarations)
-                fn.isLibraryFn = true;
-            // Merge into main AST
-            parsedAst.declarations.push(...libAst.declarations);
-            parsedAst.structs.push(...libAst.structs);
-            parsedAst.implBlocks.push(...libAst.implBlocks);
-            parsedAst.enums.push(...libAst.enums);
-            parsedAst.consts.push(...libAst.consts);
-            parsedAst.globals.push(...libAst.globals);
-        }
-        const dceResult = shouldRunDce ? (0, dce_1.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}`;
-        (0, lowering_1.setScoreboardObjective)(scoreboardObj);
-        // Lowering
-        const ir = new lowering_1.Lowering(namespace, preprocessed.ranges).lower(ast);
-        // Optimization
-        const optimized = shouldOptimize
-            ? { ...ir, functions: ir.functions.map(fn => (0, passes_1.optimize)(fn)) }
-            : ir;
-        // Code generation — mangle=true by default to prevent cross-function
-        // scoreboard variable collisions in the global MC scoreboard namespace.
-        const generated = (0, mcfunction_1.generateDatapackWithStats)(optimized, {
-            mangle: options.mangle ?? true,
-            scoreboardObjective: scoreboardObj,
-        });
-        return {
-            success: true,
-            files: [...generated.files, ...generated.advancements],
-            advancements: generated.advancements,
-            ast,
-            ir: optimized,
-        };
-    }
-    catch (err) {
-        // Already a DiagnosticError
-        if (err instanceof diagnostics_1.DiagnosticError) {
-            return { success: false, error: err };
-        }
-        // Try to parse the error message for line/col info
-        if (err instanceof Error) {
-            const diagnostic = (0, diagnostics_1.parseErrorMessage)('ParseError', err.message, sourceLines, filePath);
-            return { success: false, error: diagnostic };
-        }
-        // Unknown error
-        return {
-            success: false,
-            error: new diagnostics_1.DiagnosticError('ParseError', String(err), { file: filePath, line: 1, col: 1 }, sourceLines)
-        };
-    }
-}
-// ---------------------------------------------------------------------------
-// Format Compile Error
-// ---------------------------------------------------------------------------
-function formatCompileError(result) {
-    if (result.success) {
-        return 'Compilation successful';
-    }
-    if (result.error) {
-        return (0, diagnostics_1.formatError)(result.error, result.error.sourceLines?.join('\n'));
-    }
-    return 'Unknown error';
-}
-//# sourceMappingURL=compile.js.map
+// shim — delegates to dist/src/
+module.exports = require('./src/compile');

package/dist/index.js

@@ -1,159 +1,2 @@
-"use strict";
-/**
- * RedScript Compiler
- *
- * Main entry point for programmatic usage.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MCCommandValidator = exports.generateDatapack = exports.optimize = exports.Lowering = exports.TypeChecker = exports.Parser = exports.Lexer = exports.version = void 0;
-exports.compile = compile;
-exports.check = check;
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-exports.version = '1.2.11';
-const lexer_1 = require("./lexer");
-const parser_1 = require("./parser");
-const typechecker_1 = require("./typechecker");
-const lowering_1 = require("./lowering");
-const passes_1 = require("./optimizer/passes");
-const dce_1 = require("./optimizer/dce");
-const mcfunction_1 = require("./codegen/mcfunction");
-const compile_1 = require("./compile");
-const commands_1 = require("./optimizer/commands");
-/**
- * Compile RedScript source code to a Minecraft datapack.
- *
- * @param source - The RedScript source code
- * @param options - Compilation options
- * @returns Compiled datapack files
- */
-function compile(source, options = {}) {
-    const namespace = options.namespace ?? 'redscript';
-    const shouldOptimize = options.optimize ?? true;
-    const shouldTypeCheck = options.typeCheck ?? true;
-    const shouldRunDce = options.dce ?? shouldOptimize;
-    const mangle = options.mangle ?? false;
-    const filePath = options.filePath;
-    const preprocessed = (0, compile_1.preprocessSourceWithMetadata)(source, { filePath });
-    const preprocessedSource = preprocessed.source;
-    // Lexing
-    const tokens = new lexer_1.Lexer(preprocessedSource, filePath).tokenize();
-    // Parsing — user source
-    const parsedAst = new parser_1.Parser(tokens, preprocessedSource, filePath).parse(namespace);
-    // Library imports: files that declared `module library;` are parsed independently
-    // (fresh Parser per file) so their functions are DCE-eligible but never bleed into user code.
-    const allLibrarySources = [];
-    for (const li of preprocessed.libraryImports ?? []) {
-        allLibrarySources.push({ src: li.source, fp: li.filePath });
-    }
-    for (const { src, fp } of allLibrarySources) {
-        const libPreprocessed = (0, compile_1.preprocessSourceWithMetadata)(src, fp ? { filePath: fp } : {});
-        const libTokens = new lexer_1.Lexer(libPreprocessed.source, fp).tokenize();
-        const libAst = new parser_1.Parser(libTokens, libPreprocessed.source, fp).parse(namespace);
-        for (const fn of libAst.declarations)
-            fn.isLibraryFn = true;
-        parsedAst.declarations.push(...libAst.declarations);
-        parsedAst.structs.push(...libAst.structs);
-        parsedAst.implBlocks.push(...libAst.implBlocks);
-        parsedAst.enums.push(...libAst.enums);
-        parsedAst.consts.push(...libAst.consts);
-        parsedAst.globals.push(...libAst.globals);
-    }
-    const dceResult = shouldRunDce ? (0, dce_1.eliminateDeadCode)(parsedAst, preprocessed.ranges) : { program: parsedAst, warnings: [] };
-    const ast = dceResult.program;
-    // Type checking (warn mode - collect errors but don't block)
-    let typeErrors;
-    if (shouldTypeCheck) {
-        const checker = new typechecker_1.TypeChecker(preprocessedSource, filePath);
-        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}`;
-    (0, lowering_1.setScoreboardObjective)(scoreboardObj);
-    // Lowering to IR
-    const lowering = new lowering_1.Lowering(namespace, preprocessed.ranges);
-    const ir = lowering.lower(ast);
-    let optimizedIR = ir;
-    let generated = (0, mcfunction_1.generateDatapackWithStats)(ir, { optimizeCommands: shouldOptimize, mangle, scoreboardObjective: scoreboardObj });
-    let optimizationStats;
-    if (shouldOptimize) {
-        const stats = (0, commands_1.createEmptyOptimizationStats)();
-        const copyPropagatedFunctions = [];
-        const deadCodeEliminatedFunctions = [];
-        for (const fn of ir.functions) {
-            const folded = (0, passes_1.constantFoldingWithStats)(fn);
-            stats.constantFolds += folded.stats.constantFolds ?? 0;
-            const propagated = (0, passes_1.copyPropagation)(folded.fn);
-            copyPropagatedFunctions.push(propagated);
-            const dce = (0, passes_1.deadCodeEliminationWithStats)(propagated);
-            deadCodeEliminatedFunctions.push(dce.fn);
-        }
-        const copyPropagatedIR = { ...ir, functions: copyPropagatedFunctions };
-        optimizedIR = { ...ir, functions: deadCodeEliminatedFunctions };
-        const baselineGenerated = (0, mcfunction_1.generateDatapackWithStats)(ir, { optimizeCommands: false, mangle, scoreboardObjective: scoreboardObj });
-        const beforeDceGenerated = (0, mcfunction_1.generateDatapackWithStats)(copyPropagatedIR, { optimizeCommands: false, mangle, scoreboardObjective: scoreboardObj });
-        const afterDceGenerated = (0, mcfunction_1.generateDatapackWithStats)(optimizedIR, { optimizeCommands: false, mangle, scoreboardObjective: scoreboardObj });
-        generated = (0, mcfunction_1.generateDatapackWithStats)(optimizedIR, { optimizeCommands: true, mangle, scoreboardObjective: scoreboardObj });
-        stats.deadCodeRemoved =
-            (0, mcfunction_1.countMcfunctionCommands)(beforeDceGenerated.files) - (0, mcfunction_1.countMcfunctionCommands)(afterDceGenerated.files);
-        stats.licmHoists = generated.stats.licmHoists;
-        stats.licmLoopBodies = generated.stats.licmLoopBodies;
-        stats.cseRedundantReads = generated.stats.cseRedundantReads;
-        stats.cseArithmetic = generated.stats.cseArithmetic;
-        stats.setblockMergedCommands = generated.stats.setblockMergedCommands;
-        stats.setblockFillCommands = generated.stats.setblockFillCommands;
-        stats.setblockSavedCommands = generated.stats.setblockSavedCommands;
-        stats.totalCommandsBefore = (0, mcfunction_1.countMcfunctionCommands)(baselineGenerated.files);
-        stats.totalCommandsAfter = (0, mcfunction_1.countMcfunctionCommands)(generated.files);
-        optimizationStats = stats;
-    }
-    else {
-        optimizedIR = ir;
-        generated = (0, mcfunction_1.generateDatapackWithStats)(ir, { optimizeCommands: false, mangle, scoreboardObjective: scoreboardObj });
-    }
-    return {
-        files: [...generated.files, ...generated.advancements],
-        advancements: generated.advancements,
-        ast,
-        ir: optimizedIR,
-        typeErrors,
-        warnings: [...dceResult.warnings, ...lowering.warnings],
-        stats: optimizationStats,
-        sourceMap: generated.sourceMap,
-    };
-}
-/**
- * Check RedScript source code for errors without generating output.
- *
- * @param source - The RedScript source code
- * @param namespace - Optional namespace
- * @returns null if no errors, or an error object
- */
-function check(source, namespace = 'redscript', filePath) {
-    try {
-        const preprocessedSource = (0, compile_1.preprocessSource)(source, { filePath });
-        const tokens = new lexer_1.Lexer(preprocessedSource, filePath).tokenize();
-        new parser_1.Parser(tokens, preprocessedSource, filePath).parse(namespace);
-        return null;
-    }
-    catch (err) {
-        return err;
-    }
-}
-// Re-export types and classes for advanced usage
-var lexer_2 = require("./lexer");
-Object.defineProperty(exports, "Lexer", { enumerable: true, get: function () { return lexer_2.Lexer; } });
-var parser_2 = require("./parser");
-Object.defineProperty(exports, "Parser", { enumerable: true, get: function () { return parser_2.Parser; } });
-var typechecker_2 = require("./typechecker");
-Object.defineProperty(exports, "TypeChecker", { enumerable: true, get: function () { return typechecker_2.TypeChecker; } });
-var lowering_2 = require("./lowering");
-Object.defineProperty(exports, "Lowering", { enumerable: true, get: function () { return lowering_2.Lowering; } });
-var passes_2 = require("./optimizer/passes");
-Object.defineProperty(exports, "optimize", { enumerable: true, get: function () { return passes_2.optimize; } });
-var mcfunction_2 = require("./codegen/mcfunction");
-Object.defineProperty(exports, "generateDatapack", { enumerable: true, get: function () { return mcfunction_2.generateDatapack; } });
-var mc_validator_1 = require("./mc-validator");
-Object.defineProperty(exports, "MCCommandValidator", { enumerable: true, get: function () { return mc_validator_1.MCCommandValidator; } });
-//# sourceMappingURL=index.js.map
+// shim — delegates to dist/src/
+module.exports = require('./src/index');