sandstone-cli 2.4.0 → 2.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sandstone-cli",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "The CLI for Sandstone - the minecraft pack creation library.",
   "type": "module",
   "exports": "./lib/index.js",
@@ -70,7 +70,7 @@
     "@types/semver": "^7.5.3",
     "bun-types": "^1.3.9",
     "node-pty": "^1.1.0",
-    "sandstone": "^1.0.0-beta.4",
+    "sandstone": "^1.0.0-beta.5",
     "typescript": "^5.2.2"
   },
   "trustedDependencies": [

package/src/commands/build/index.ts

@@ -515,7 +515,7 @@ export async function _buildCommand(
     const stackTrace = traceStart >= 0 ? stackLines.slice(traceStart).join('\n') : ''
 
     // Resolve source maps for better error locations
-    const resolvedStackTrace = stackTrace ? await resolveStackTrace(stackTrace) : ''
+    const resolvedStackTrace = stackTrace ? resolveStackTrace(stackTrace) : ''
     const formattedError = resolvedStackTrace ? `${errorMessage}\n${resolvedStackTrace}` : errorMessage
     return {
       success: false,
@@ -559,7 +559,7 @@ export async function buildCommand(opts: BuildOptions, _folder?: string, silent
     const stackTrace = traceStart >= 0 ? stackLines.slice(traceStart).join('\n') : ''
 
     // Resolve source maps for better error locations
-    const resolvedStackTrace = stackTrace ? await resolveStackTrace(stackTrace) : ''
+    const resolvedStackTrace = stackTrace ? resolveStackTrace(stackTrace) : ''
     const formattedError = resolvedStackTrace ? `${errorMessage}\n${resolvedStackTrace}` : errorMessage
     if (!silent) {
       log(chalk.bgRed.white('BuildError') + chalk.gray(':'), formattedError)

package/src/commands/create.ts

@@ -130,7 +130,7 @@ export async function createCommand(_project: string, opts: CreateOptions) {
 
   const sv = (v: string) => new SemVer(v)
 
-  const versions = [[sv('1.0.0-beta.4'), sv(CLI_VERSION)], [sv('1.0.0-beta.3'), sv('2.3.2')]] as const
+  const versions = [[sv('1.0.0-beta.5'), sv(CLI_VERSION)]] as const
 
   const version = await select({
     message: 'Which version of Sandstone do you want to use? These are the only supported versions for new projects.',

package/src/commands/watch.ts

@@ -9,6 +9,7 @@ import { WatchUI, getWatchUIAPI } from '../ui/WatchUI.js'
 import { initLogger, log, logInfo, logWarn, logError, logDebug, logTrace, setLiveLogCallback } from '../ui/logger.js'
 import type { TrackedChange, ChangeCategory } from '../ui/types.js'
 import { hot } from '@sandstone-mc/hot-hook'
+import { resolveStackTrace } from '../utils/source-map.js'
 import fs from 'fs-extra'
 import { join, relative } from 'node:path'
 
@@ -33,7 +34,14 @@ function enableConsoleCapture() {
       .replace(/^Error\n/, '')
       .replace(/\?hot-hook=\d+/g, '')
       .replace(/file:\/\/\/?/g, '')
-    logTrace(...args, '\n' + cleanedStack)
+
+    // Resolve source maps for stack frames
+    const stackLines = cleanedStack.split('\n')
+    const traceStart = stackLines.findIndex(line => line.trimStart().startsWith('at '))
+    const stackTrace = traceStart >= 0 ? stackLines.slice(traceStart).join('\n') : ''
+    const resolvedStack = stackTrace ? resolveStackTrace(stackTrace) : cleanedStack
+
+    logTrace(...args, '\n' + resolvedStack)
   }
 }
 

package/src/ui/logger.ts

@@ -88,13 +88,14 @@ async function logWorkerMain(level: string | false, ...args: unknown[]) {
   const chunks: (string | Buffer | Uint8Array)[] = []
 
   // Timestamp and level prefix
-  chunks.push(`[${new Date().toISOString()}]${level !== false ? ` [${level}]` : ''} `)
+  const prefix = `[${new Date().toISOString()}]${level !== false ? ` [${level}]` : ''} `
+  chunks.push(prefix)
 
   // Process each argument
   for (let i = 0; i < args.length; i++) {
     const arg = args[i]
     if (typeof arg === 'string') {
-      chunks.push(stripVTControlCharacters(arg))
+      chunks.push(stripVTControlCharacters(arg).replaceAll('\n', `\n${' '.repeat(prefix.length)}`))
     } else if (Buffer.isBuffer(arg) || arg instanceof Uint8Array) {
       chunks.push(arg)
     } else if (arg instanceof ArrayBuffer) {
@@ -103,7 +104,7 @@ async function logWorkerMain(level: string | false, ...args: unknown[]) {
       chunks.push(new Uint8Array(await arg.arrayBuffer()))
     } else {
       // Use util.format for objects, numbers, etc.
-      chunks.push(format('%O', arg))
+      chunks.push(stripVTControlCharacters(format('%O', arg)).replaceAll('\n', `\n${' '.repeat(prefix.length)}`))
     }
     // Add space between args (but not after last)
     if (i < args.length - 1) {

package/src/utils/source-map.ts

@@ -6,17 +6,17 @@
  */
 
 import { SourceMapConsumer, type RawSourceMap } from 'source-map-js'
-import { readFile } from 'fs/promises'
-import { dirname, join, resolve } from 'path'
+import { readFileSync } from 'fs'
+import { dirname, resolve } from 'path'
 
 // Cache for loaded source map consumers
 const sourceMapCache = new Map<string, SourceMapConsumer | null>()
 
 /**
- * Try to load a source map for a given JS file.
+ * Synchronously load a source map for a given JS file.
  * Returns null if no source map is found or it's invalid.
  */
-async function loadSourceMap(jsFilePath: string): Promise<SourceMapConsumer | null> {
+function loadSourceMapSync(jsFilePath: string): SourceMapConsumer | null {
   // Check cache first
   if (sourceMapCache.has(jsFilePath)) {
     return sourceMapCache.get(jsFilePath) ?? null
@@ -24,7 +24,7 @@ async function loadSourceMap(jsFilePath: string): Promise<SourceMapConsumer | nu
 
   try {
     // Read the JS file to find the sourceMappingURL
-    const jsContent = await readFile(jsFilePath, 'utf8')
+    const jsContent = readFileSync(jsFilePath, 'utf8')
 
     // Look for sourceMappingURL comment
     const match = jsContent.match(/\/\/[#@]\s*sourceMappingURL=(.+)$/m)
@@ -35,6 +35,7 @@ async function loadSourceMap(jsFilePath: string): Promise<SourceMapConsumer | nu
 
     const sourceMappingURL = match[1].trim()
     let mapPath: string
+    let mapContent: string
 
     if (sourceMappingURL.startsWith('data:')) {
       // Inline source map (base64 encoded)
@@ -43,17 +44,13 @@ async function loadSourceMap(jsFilePath: string): Promise<SourceMapConsumer | nu
         sourceMapCache.set(jsFilePath, null)
         return null
       }
-      const mapContent = Buffer.from(base64Match[1], 'base64').toString('utf8')
-      const rawMap: RawSourceMap = JSON.parse(mapContent)
-      const consumer = new SourceMapConsumer(rawMap)
-      sourceMapCache.set(jsFilePath, consumer)
-      return consumer
+      mapContent = Buffer.from(base64Match[1], 'base64').toString('utf8')
     } else {
       // External source map file
       mapPath = resolve(dirname(jsFilePath), sourceMappingURL)
+      mapContent = readFileSync(mapPath, 'utf8')
     }
 
-    const mapContent = await readFile(mapPath, 'utf8')
     const rawMap: RawSourceMap = JSON.parse(mapContent)
     const consumer = new SourceMapConsumer(rawMap)
     sourceMapCache.set(jsFilePath, consumer)
@@ -117,9 +114,9 @@ function parseStackLine(line: string): StackFrame {
 }
 
 /**
- * Resolve a stack frame using source maps.
+ * Resolve a stack frame using source maps (synchronous).
  */
-async function resolveStackFrame(frame: StackFrame): Promise<string> {
+function resolveStackFrame(frame: StackFrame): string {
   if (!frame.filePath || !frame.line || !frame.column) {
     return frame.original
   }
@@ -130,7 +127,7 @@ async function resolveStackFrame(frame: StackFrame): Promise<string> {
   }
 
   try {
-    const consumer = await loadSourceMap(frame.filePath)
+    const consumer = loadSourceMapSync(frame.filePath)
     if (!consumer) {
       return frame.original
     }
@@ -164,10 +161,10 @@ async function resolveStackFrame(frame: StackFrame): Promise<string> {
 }
 
 /**
- * Resolve source maps in a stack trace string.
+ * Resolve source maps in a stack trace string (synchronous).
  * Returns the stack trace with original source locations where possible.
  */
-export async function resolveStackTrace(stack: string): Promise<string> {
+export function resolveStackTrace(stack: string): string {
   const lines = stack.split('\n')
   const resolvedLines: string[] = []
 
@@ -175,7 +172,7 @@ export async function resolveStackTrace(stack: string): Promise<string> {
     // Only process lines that look like stack frames
     if (line.trimStart().startsWith('at ')) {
       const frame = parseStackLine(line)
-      const resolved = await resolveStackFrame(frame)
+      const resolved = resolveStackFrame(frame)
       resolvedLines.push(resolved)
     } else {
       resolvedLines.push(line)

package/src/version.ts

@@ -1 +1 @@
-export const CLI_VERSION = '2.4.0'
+export const CLI_VERSION = '2.4.1'