sandstone-cli 2.0.8 → 2.1.0

package/lib/commands/watch.js

@@ -1,279 +0,0 @@
-import { spawn } from 'node:child_process';
-import { subscribe } from '@parcel/watcher';
-import React from 'react';
-import { render } from 'ink';
-import { normalizePath } from '../utils.js';
-import { _buildCommand, enableConsoleCapture, disableConsoleCapture } from './build.js';
-import { WatchUI, getWatchUIAPI } from '../ui/WatchUI.js';
-import { initLogger, log, logError, setLiveLogCallback } from '../ui/logger.js';
-import { hot } from '@sandstone-mc/hot-hook';
-import fs from 'fs-extra';
-import { join } from 'node:path';
-export async function watchCommand(opts) {
-    let alreadyBuilding = false;
-    let needRebuild = false;
-    let pendingChanges = [];
-    let buildContext;
-    let hotInitialized = false;
-    let lastBuildFailed = false;
-    const folder = opts.library ? join(opts.path, 'test') : opts.path;
-    let subscription;
-    // Initialize logger
-    initLogger(folder);
-    // Set up live log callback to send to UI
-    setLiveLogCallback((level, args) => {
-        getWatchUIAPI()?.setLiveLog(level, args);
-    });
-    // Render Ink UI
-    let unmountInk;
-    const handleManualRebuild = () => {
-        if (pendingChanges.length > 0 && !alreadyBuilding) {
-            log('Manual rebuild triggered');
-            onFilesChange(pendingChanges);
-            pendingChanges = [];
-        }
-    };
-    const { unmount } = render(React.createElement(WatchUI, {
-        manual: opts.manual ?? false,
-        onManualRebuild: handleManualRebuild,
-        // Since this isn't SIGINT, its fine that we don't await this
-        exit: () => exit(subscription, unmountInk)
-    }), { patchConsole: false });
-    unmountInk = unmount;
-    async function onFilesChange(changes) {
-        // Synchronous check-and-set to prevent race conditions
-        if (alreadyBuilding) {
-            needRebuild = true;
-            // Accumulate changes for the next build
-            for (const change of changes) {
-                if (!pendingChanges.some(c => c.path === change.path)) {
-                    pendingChanges.push(change);
-                }
-            }
-            return;
-        }
-        alreadyBuilding = true;
-        const api = getWatchUIAPI();
-        api?.setStatus('building');
-        api?.setChangedFiles(changes);
-        log('Building...', changes.map(c => c.path).join(', '));
-        const libChanges = opts.library && Object.hasOwn(globalThis, 'Bun') ? changes.filter((change) => !change.path.includes('test/')) : [];
-        if (libChanges.length !== 0) {
-            /* @ts-ignore */
-            const CLI = Bun.spawn(['bun', 'dev:build'], {
-                windowsHide: true,
-                windowsVerbatimArguments: true,
-                stdout: 'ignore',
-                stderr: 'ignore',
-            });
-            await CLI.exited;
-        }
-        // Initialize hot-hook only once on the first build
-        if (!hotInitialized) {
-            await hot.init({
-                root: join(folder, JSON.parse(await fs.readFile(join(folder, 'package.json'), 'utf-8'))['module']),
-                // Ensure sandstone remains a singleton so CLI and user code share the same pack instance
-                globalSingletons: ['**/node_modules/sandstone/**', '**/sandstone/dist/**'],
-                // Disable hot-hook's internal watcher - we use parcel watcher and notify hot-hook
-                watch: false,
-            });
-            hotInitialized = true;
-        }
-        if (Object.hasOwn(globalThis, 'Bun') && changes.length > 0) {
-            // Bun ignores query params for module caching and doesn't support MessagePort
-            // in register(), so hot-hook's invalidation mechanism is non-functional.
-            // Instead, clear Bun's module cache for project source files before re-importing.
-            const resolvedFolder = normalizePath(await fs.realpath(folder));
-            const resolvedRoot = opts.library ? normalizePath(await fs.realpath(opts.path)) : resolvedFolder;
-            let clearedCount = 0;
-            for (const key of Object.keys(require.cache)) {
-                const normalizedKey = normalizePath(key);
-                // Only clear modules within the project
-                if (!normalizedKey.startsWith(resolvedFolder) && !normalizedKey.startsWith(resolvedRoot))
-                    continue;
-                // Keep sandstone singleton cached so CLI and user code share the same pack instance
-                if (normalizedKey.includes('/node_modules/sandstone/'))
-                    continue;
-                delete require.cache[key];
-                clearedCount++;
-            }
-            // If recovering from a failed build but no modules were in cache, Bun had a parse error
-            // and won't be able to reimport. Exit and ask user to restart.
-            if (lastBuildFailed && clearedCount === 0) {
-                getWatchUIAPI()?.setStatus('error', 'Parse error - restart required');
-                unmountInk?.();
-                process.stderr.write('\n\x1b[33mBun encountered a parse error and cannot recover. Please restart the watch command.\x1b[0m\n\n');
-                process.exit(1);
-            }
-        }
-        else {
-            // Node.js path: use hot-hook's message port invalidation
-            for (const change of changes) {
-                hot.notifyFileChange(change.path);
-            }
-            if (libChanges.length !== 0) {
-                const libModuleFiles = await fs.readdir(join(opts.path, 'lib'), { recursive: true });
-                for (const file of libModuleFiles) {
-                    hot.notifyFileChange(join(opts.path, 'lib', file));
-                }
-            }
-            // Small delay to let the loader process the invalidations
-            if (changes.length > 0) {
-                await new Promise(resolve => setTimeout(resolve, 10));
-            }
-        }
-        // Replace global console during build to capture user console.log without messing up Ink UI
-        enableConsoleCapture();
-        let result;
-        try {
-            result = await _buildCommand(opts, folder, buildContext, true);
-        }
-        finally {
-            disableConsoleCapture();
-        }
-        // Store context for subsequent builds
-        if (result.success && result.sandstoneConfig !== undefined) {
-            buildContext = {
-                sandstoneConfig: result.sandstoneConfig,
-                sandstonePack: result.sandstonePack,
-                resetSandstonePack: result.resetSandstonePack,
-            };
-        }
-        api?.setBuildResult(result);
-        if (result.success) {
-            log(`Build successful: ${result.resourceCounts.functions} functions, ${result.resourceCounts.other} others`);
-            lastBuildFailed = false;
-        }
-        else {
-            logError(result.error);
-            lastBuildFailed = true;
-        }
-        alreadyBuilding = false;
-        if (needRebuild) {
-            needRebuild = false;
-            // Use accumulated pending changes, then clear them
-            const nextChanges = [...pendingChanges];
-            pendingChanges = [];
-            await onFilesChange(nextChanges);
-        }
-    }
-    let restartTimeout = null;
-    let debouncedChanges = []; // Accumulate changes during debounce period
-    let debounceScheduled = false; // Synchronous flag to prevent multiple timeouts
-    function restart() {
-        log('Restarting watch process...');
-        getWatchUIAPI()?.setStatus('restarting');
-        const [runtime, ...args] = process.argv;
-        const child = spawn(runtime, args, {
-            stdio: 'inherit',
-            detached: true,
-        });
-        child.unref();
-        unmountInk?.();
-        process.exit(0);
-    }
-    const handleEvents = (events) => {
-        // Whether changes require a full process restart
-        let needsRestart = false;
-        // Filter out irrelevant events and categorize
-        const trackedChanges = [];
-        for (const e of events) {
-            const eventPath = normalizePath(e.path);
-            const lockFile = eventPath.endsWith('.lock') ||
-                eventPath.endsWith('-lock.yml') ||
-                eventPath.endsWith('-lock.json');
-            if (lockFile ||
-                eventPath.includes('node_modules/') ||
-                eventPath.endsWith('sandstone.config.ts')) {
-                needsRestart = true;
-            }
-            const inSrc = eventPath.includes('src/');
-            const inResources = eventPath.includes('resources/');
-            const endsJs = eventPath.endsWith('.js');
-            const endsJson = eventPath.endsWith('.json');
-            const endsTs = eventPath.endsWith('.ts');
-            if (inSrc || inResources || endsJs || endsJson || endsTs) {
-                trackedChanges.push({
-                    path: eventPath,
-                    category: categorizeChange(eventPath),
-                });
-            }
-        }
-        if (trackedChanges.length === 0 && !needsRestart) {
-            return;
-        }
-        if (needsRestart) {
-            if (restartTimeout) {
-                clearTimeout(restartTimeout);
-            }
-            // Debounce restart to allow package manager to finish
-            restartTimeout = setTimeout(restart, 500);
-            return;
-        }
-        // Accumulate changes, deduplicating by path
-        for (const change of trackedChanges) {
-            if (!debouncedChanges.some(c => c.path === change.path)) {
-                debouncedChanges.push(change);
-            }
-        }
-        // Use a synchronous flag to ensure only one timeout is scheduled
-        // This prevents race conditions when parcel watcher fires multiple callbacks rapidly
-        if (debounceScheduled)
-            return;
-        debounceScheduled = true;
-        setTimeout(() => {
-            debounceScheduled = false;
-            const changesToProcess = [...debouncedChanges];
-            debouncedChanges = []; // Clear for next batch
-            if (changesToProcess.length === 0) {
-                return;
-            }
-            if (opts.manual) {
-                // In manual mode, accumulate changes and wait for user input
-                pendingChanges = [...pendingChanges, ...changesToProcess];
-                getWatchUIAPI()?.setStatus('pending');
-                getWatchUIAPI()?.setChangedFiles(pendingChanges);
-            }
-            else {
-                // Auto mode - rebuild immediately
-                // onFilesChange handles the "already building" case internally
-                onFilesChange(changesToProcess);
-            }
-        }, 200);
-    };
-    log('Watch started');
-    // Initial build
-    await onFilesChange([]);
-    subscription = await subscribe(opts.path, (err, events) => {
-        if (err) {
-            logError(err);
-            return;
-        }
-        handleEvents(events);
-    }, {
-        ignore: ['**/.git/**/*', '**/.sandstone/**/*', '**/resources/cache/**/*', '**/*tmp*', 'lib/**/*'],
-    });
-    // Handle cleanup on exit
-    process.on('SIGINT', async () => await exit(subscription, unmountInk));
-}
-async function exit(subscription, unmountInk) {
-    log('Watch stopped');
-    unmountInk?.();
-    await subscription.unsubscribe();
-    process.exit(0);
-}
-function categorizeChange(eventPath) {
-    if (eventPath.includes('src/'))
-        return 'src';
-    if (eventPath.includes('resources/'))
-        return 'resources';
-    if (eventPath.endsWith('sandstone.config.ts'))
-        return 'config';
-    if (eventPath.endsWith('.lock') ||
-        eventPath.endsWith('-lock.yml') ||
-        eventPath.endsWith('-lock.json') ||
-        eventPath.includes('node_modules/')) {
-        return 'dependencies';
-    }
-    return 'other';
-}

package/lib/create.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env bun
-export {};

package/lib/index.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env bun
-export {};

package/lib/shared.d.ts

@@ -1 +0,0 @@
-export declare const BuildDeclares: Record<string, [string, string, RegExp, boolean]>;

package/lib/shared.js

@@ -1,20 +0,0 @@
-export const BuildDeclares = {
-    // Flags
-    dry: ['-d, --dry', 'Do not save the pack. Mostly useful with `verbose`.'],
-    verbose: ['-f, --verbose', 'Fully log all resulting resources: functions, advancements...'],
-    root: ['-r, --root', 'Save the pack & resource pack in the .minecraft/datapacks & .minecraft/resource_packs folders. Override the value specified in the configuration file.'],
-    fullTrace: ['-t, --full-trace', 'Show the full stack trace on errors.'],
-    strictErrors: ['-s, --strict-errors', 'Stop pack compilation on type errors.'],
-    production: ['-p, --production', 'Runs Sandstone in production mode. This sets process.env.SANDSTONE_ENV to "production".'],
-    // Values
-    path: ['--path <path>', 'Path of the folder containing your sandstone workspace.', './'],
-    name: ['-n, --name <name>', 'Name of the datapack. Override the value specified in the configuration file.'],
-    namespace: ['-ns, --namespace <namespace>', 'The default namespace. Override the value specified in the configuration file.'],
-    world: ['-w, --world <name>', 'The name of the world to save the packs in. Override the value specified in the configuration file.'],
-    clientPath: ['-c, --client-path <path>', 'Path of the client folder. Override the value specified in the configuration file.'],
-    serverPath: ['--server-path <path>', 'Path of the server folder. Override the value specified in the configuration file.'],
-    // TODO: ssh
-    enableSymlinks: ['--enable-symlinks', 'Force enable/disable symlinks. Defaults to false. Useful if you want to enable symlinks on Windows.'],
-    manual: ['-m, --manual', 'Manual reload mode - press r or Enter to rebuild after changes.'],
-    library: ['-l, --library', 'Library mode - watches a library workspace based on the library project template.'],
-}; // Haha TypeScript funny

package/lib/ui/WatchUI.d.ts

@@ -1,9 +0,0 @@
-import type { WatchUIAPI } from './types.js';
-interface WatchUIProps {
-    manual: boolean;
-    onManualRebuild?: () => void;
-    exit?: () => void;
-}
-export declare function WatchUI({ manual, onManualRebuild, exit }: WatchUIProps): import("react/jsx-runtime").JSX.Element;
-export declare function getWatchUIAPI(): WatchUIAPI | undefined;
-export {};

package/lib/ui/WatchUI.js

@@ -1,183 +0,0 @@
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState, useCallback, useEffect } from 'react';
-import { Box, Text, useInput } from 'ink';
-import Spinner from 'ink-spinner';
-import { format } from 'util';
-import { drainLiveLogBuffer } from './logger.js';
-const CONTENT_LINES = 8;
-function formatChangedFiles(files) {
-    if (files.length === 0)
-        return 'No recent changes';
-    const paths = files.map(f => f.path.split(/[/\\]/).pop() || f.path);
-    if (paths.length <= 3)
-        return paths.join(', ');
-    return `${paths.slice(0, 3).join(', ')} +${paths.length - 3} more`;
-}
-function groupByCategory(files) {
-    const groups = {
-        src: [],
-        resources: [],
-        config: [],
-        dependencies: [],
-        other: [],
-    };
-    for (const file of files) {
-        const name = file.path.split(/[/\\]/).pop() || file.path;
-        groups[file.category].push(name);
-    }
-    return groups;
-}
-const categoryLabels = {
-    src: 'src',
-    resources: 'resources',
-    config: 'config',
-    dependencies: 'dependencies',
-    other: 'other',
-};
-function ContentDisplay({ mode, logLines, errorText, changes, scrollOffset }) {
-    let contentData = [];
-    if (mode === 'error' && errorText) {
-        contentData = errorText.split('\n').map(line => ({ text: line || ' ', color: 'red' }));
-    }
-    else if (mode === 'changes') {
-        const groups = groupByCategory(changes);
-        const nonEmpty = Object.entries(groups).filter(([, files]) => files.length > 0);
-        contentData.push({ text: 'Changes by category:', color: undefined });
-        for (const [category, files] of nonEmpty.slice(0, 4)) {
-            const fileList = files.slice(0, 3).join(', ') + (files.length > 3 ? ` +${files.length - 3} more` : '');
-            const suffix = category === 'dependencies' ? ' (restart required)' : '';
-            contentData.push({ text: `  ${categoryLabels[category]}: ${fileList}${suffix}`, color: 'cyan' });
-        }
-        if (nonEmpty.length === 0) {
-            contentData.push({ text: '  No changes tracked', color: 'gray' });
-        }
-    }
-    else {
-        contentData = logLines.map(line => ({ text: line }));
-    }
-    const totalLines = contentData.length;
-    const hasMore = totalLines > CONTENT_LINES;
-    let visibleLines;
-    let scrollInfo = '';
-    if (mode === 'logs') {
-        const start = Math.max(0, totalLines - scrollOffset - CONTENT_LINES);
-        const end = Math.max(0, totalLines - scrollOffset);
-        visibleLines = contentData.slice(start, end);
-        if (hasMore) {
-            const canUp = scrollOffset < totalLines - CONTENT_LINES;
-            const canDown = scrollOffset > 0;
-            scrollInfo = `${canUp ? '▲' : ''}${canDown ? '▼' : ''} (${start + 1}-${end}/${totalLines})`;
-        }
-    }
-    else {
-        visibleLines = contentData.slice(scrollOffset, scrollOffset + CONTENT_LINES);
-        if (hasMore) {
-            const canUp = scrollOffset > 0;
-            const canDown = scrollOffset + CONTENT_LINES < totalLines;
-            scrollInfo = `${canUp ? '▲' : ''}${canDown ? '▼' : ''} (${scrollOffset + 1}-${scrollOffset + visibleLines.length}/${totalLines})`;
-        }
-    }
-    const padding = CONTENT_LINES - visibleLines.length;
-    const paddingBefore = mode === 'logs' ? padding : 0;
-    const paddingAfter = mode === 'logs' ? 0 : padding;
-    return (_jsxs(_Fragment, { children: [Array.from({ length: paddingBefore }).map((_, i) => (_jsx(Text, { children: " " }, `pad-before-${i}`))), visibleLines.map((line, i) => (_jsx(Text, { color: line.color, children: line.text }, `content-${i}`))), Array.from({ length: paddingAfter }).map((_, i) => (_jsx(Text, { children: " " }, `pad-after-${i}`))), _jsx(Text, { color: "gray", children: scrollInfo || ' ' })] }));
-}
-export function WatchUI({ manual, onManualRebuild, exit }) {
-    const [status, setStatusState] = useState(manual ? 'pending' : 'watching');
-    const [reason, setReason] = useState();
-    const [changedFiles, setChangedFilesState] = useState([]);
-    const [buildResult, setBuildResultState] = useState(null);
-    const [logLines, setLogLinesState] = useState([]);
-    const [scrollOffset, setScrollOffset] = useState(0);
-    const isError = status === 'error' && buildResult?.error;
-    const isManualPending = manual && status === 'pending' && changedFiles.length > 0;
-    const contentMode = isError ? 'error' : isManualPending ? 'changes' : 'logs';
-    useEffect(() => {
-        setScrollOffset(0);
-    }, [contentMode, buildResult?.error]);
-    const setStatus = useCallback((newStatus, newReason) => {
-        setStatusState(newStatus);
-        setReason(newReason);
-    }, []);
-    const setChangedFiles = useCallback((files) => {
-        setChangedFilesState(files);
-    }, []);
-    const setBuildResult = useCallback((result) => {
-        setBuildResultState(result);
-        if (result.success) {
-            setStatusState(manual ? 'pending' : 'watching');
-        }
-        else {
-            setStatusState('error');
-        }
-    }, [manual]);
-    const setLiveLog = useCallback((level, args) => {
-        const formatted = format(...args).split('\n');
-        setLogLinesState((prev) => {
-            const newLines = [...prev];
-            newLines.push(`> ${level !== false ? `[${level}] ` : ''}${formatted[0]}`, ...formatted.slice(1).map((line) => `> ${line}`));
-            return newLines;
-        });
-    }, []);
-    const getMaxScroll = useCallback(() => {
-        if (isError && buildResult?.error) {
-            return Math.max(0, buildResult.error.split('\n').length - CONTENT_LINES);
-        }
-        else if (isManualPending) {
-            return 0;
-        }
-        else {
-            return Math.max(0, logLines.length - CONTENT_LINES);
-        }
-    }, [isError, isManualPending, buildResult?.error, logLines.length]);
-    useInput((input, key) => {
-        if (input === 'q') {
-            exit();
-        }
-        const maxScroll = getMaxScroll();
-        if (key.upArrow) {
-            setScrollOffset(prev => Math.min(maxScroll, prev + 1));
-        }
-        else if (key.downArrow) {
-            setScrollOffset(prev => Math.max(0, prev - 1));
-        }
-        if (manual && status === 'pending') {
-            if (input === 'r' || key.return) {
-                onManualRebuild?.();
-            }
-        }
-    });
-    useEffect(() => {
-        const api = {
-            setStatus,
-            setChangedFiles,
-            setBuildResult,
-            setLiveLog,
-        };
-        globalThis.__watchUIAPI = api;
-        drainLiveLogBuffer();
-        return () => {
-            delete globalThis.__watchUIAPI;
-        };
-    }, [setStatus, setChangedFiles, setBuildResult, setLiveLog]);
-    const statusText = {
-        watching: 'Watching for changes...',
-        building: 'Building...',
-        restarting: 'Restarting...',
-        error: 'Build Error',
-        pending: 'Pending changes',
-    };
-    const showSpinner = status === 'building' || status === 'restarting';
-    const statusColor = status === 'error' ? 'red' : status === 'pending' ? 'yellow' : 'green';
-    const footerParts = [];
-    if (manual)
-        footerParts.push('R/Enter: rebuild');
-    if (logLines.length > CONTENT_LINES || (isError && buildResult?.error && buildResult.error.split('\n').length > CONTENT_LINES)) {
-        footerParts.push('↑↓: scroll');
-    }
-    footerParts.push('Q: exit');
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { bold: true, color: "yellow", children: ["Watch Mode", manual ? _jsx(Text, { color: "cyan", children: " (Manual)" }) : ''] }), _jsxs(Text, { children: [showSpinner && _jsxs(_Fragment, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { children: " " })] }), _jsx(Text, { color: statusColor, children: statusText[status] }), reason && _jsxs(Text, { color: "gray", children: [" (", reason, ")"] })] }), _jsx(Text, { children: " " }), _jsx(ContentDisplay, { mode: contentMode, logLines: logLines, errorText: buildResult?.error ?? null, changes: changedFiles, scrollOffset: scrollOffset }), _jsx(Text, { children: " " }), _jsxs(Text, { color: "gray", children: ["Changed: ", formatChangedFiles(changedFiles)] }), buildResult?.resourceCounts ? (_jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: buildResult.resourceCounts.functions }), " functions | ", _jsx(Text, { color: "cyan", children: buildResult.resourceCounts.other }), " others"] })) : (_jsx(Text, { color: "gray", children: "No build results yet" })), isError ? _jsx(Text, { color: "yellow", children: "Waiting for changes to retry..." }) : _jsx(Text, { children: " " }), _jsx(Text, { color: "gray", children: footerParts.join(' | ') })] }));
-}
-export function getWatchUIAPI() {
-    return globalThis.__watchUIAPI;
-}

package/lib/ui/logger.d.ts

@@ -1,20 +0,0 @@
-declare let liveLogCallback: ((level: string | false, args: unknown[]) => void) | null;
-export declare function initLogger(rootFolder: string): () => Promise<void>;
-/**
- * Initialize the logger without file writing.
- * Use this for `sand build` where we want logging but no persistent log file.
- */
-export declare function initLoggerNoFile(): void;
-/**
- * Set whether the logger should suppress live output.
- */
-export declare function setSilent(value: boolean): void;
-export declare function setLiveLogCallback(callback: typeof liveLogCallback): void;
-export declare function drainLiveLogBuffer(): void;
-export declare function log(...args: unknown[]): void;
-export declare function logInfo(...args: unknown[]): void;
-export declare function logWarn(...args: unknown[]): void;
-export declare function logDebug(...args: unknown[]): void;
-export declare function logTrace(...args: unknown[]): void;
-export declare function logError(error: unknown): void;
-export {};