sandstone-cli 2.1.0 → 2.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sandstone-cli",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "The CLI for Sandstone - the minecraft pack creation library.",
   "type": "module",
   "exports": "./lib/index.js",
@@ -9,8 +9,8 @@
     "create-sandstone": "./lib/create.js"
   },
   "scripts": {
-    "build": "bun scripts/version.ts && bun build src/index.ts --outfile=lib/index.js --target=node --external=@parcel/watcher --external=figlet && bun build src/create.ts --outfile=lib/create.js --target=node --external=@parcel/watcher --external=figlet",
-    "dev:build": "tsc && bun run build"
+    "bundle": "bun scripts/version.ts && bun build src/index.ts --outfile=lib/index.js --target=bun --external=@parcel/watcher --external=figlet --external=@inquirer/prompts && bun build src/create.ts --outfile=lib/create.js --target=bun --external=@parcel/watcher --external=figlet --external=@inquirer/prompts",
+    "dev:build": "tsc && bun bundle"
   },
   "repository": {
     "type": "git",

package/src/commands/build.ts

@@ -65,7 +65,6 @@ export type BuildOptions = {
   dry?: boolean
   verbose?: boolean
   root?: boolean
-  fullTrace?: boolean
   strictErrors?: boolean
   production?: boolean
 
@@ -385,11 +384,12 @@ async function _buildProject(
       }
     }
   } catch (e: any) {
-    const errorMsg = `While loading "${entrypointPath}":\n${cliOptions.fullTrace ? e : (e.message || e)}`
-    if (!silent) {
+    const errorMsg = `While loading "${entrypointPath}":\n${e.stack || e.message || e}`
+    if (silent) {
+      log('BuildError:', errorMsg)
+    } else {
       console.error(chalk.bgRed.white('BuildError') + chalk.gray(':'), errorMsg)
     }
-    log('BuildError:', errorMsg)
     throw e  // Re-throw for buildCommand to handle
   }
 
@@ -438,6 +438,22 @@ async function _buildProject(
   // Run beforeSave script
   await scripts?.beforeSave?.()
 
+  // Auto-register pack types if existing resources are present
+  // This ensures handleResources() is called even when no resources are created programmatically
+  const resourcesFolder = path.join(folder, 'resources')
+  if (await fs.pathExists(path.join(resourcesFolder, 'resourcepack'))) {
+    const files = await fs.readdir(path.join(resourcesFolder, 'resourcepack'))
+    if (files.length > 0) {
+      sandstonePack.resourcePack()
+    }
+  }
+  if (await fs.pathExists(path.join(resourcesFolder, 'datapack'))) {
+    const files = await fs.readdir(path.join(resourcesFolder, 'datapack'))
+    if (files.length > 0) {
+      sandstonePack.dataPack()
+    }
+  }
+
   // File exclusion setup
   const excludeOption = resources?.exclude
   const fileExclusions = excludeOption
@@ -839,19 +855,15 @@ export async function buildCommand(opts: BuildOptions, _folder?: string, silent
   } catch (err: any) {
     const errorMessage = err.message || String(err)
     if (!silent) {
-      console.error(chalk.red('Build failed:'), errorMessage)
-      if (opts.fullTrace) {
-        console.error(err)
-      }
+      // Error already logged by _buildProject with highlighting
+      process.exit(1)
     }
     log('Build failed:', errorMessage)
-    if (silent) {
-      return {
-        success: false,
-        error: opts.fullTrace ? String(err) : errorMessage,
-        resourceCounts: { functions: 0, other: 0 },
-        timestamp: Date.now(),
-      }
+    return {
+      success: false,
+      error: err.stack || errorMessage,
+      resourceCounts: { functions: 0, other: 0 },
+      timestamp: Date.now(),
     }
   }
 }

package/src/commands/watch.ts

@@ -56,7 +56,7 @@ export async function watchCommand(opts: WatchOptions) {
       // Since this isn't SIGINT, its fine that we don't await this
       exit: () => exit(subscription, unmountInk)
     }),
-    { patchConsole: false }
+    { patchConsole: false, exitOnCtrlC: false }
   )
   unmountInk = unmount
 

package/src/index.ts

@@ -20,7 +20,6 @@ CLI
   .addOption(BuildOptions.get('dry'))
   .addOption(BuildOptions.get('verbose'))
   .addOption(BuildOptions.get('root'))
-  .addOption(BuildOptions.get('fullTrace'))
   .addOption(BuildOptions.get('strictErrors'))
   .addOption(BuildOptions.get('production'))
   .addOption(BuildOptions.get('path'))
@@ -37,7 +36,6 @@ CLI
   .addOption(BuildOptions.get('dry'))
   .addOption(BuildOptions.get('verbose'))
   .addOption(BuildOptions.get('root'))
-  .addOption(BuildOptions.get('fullTrace'))
   .addOption(BuildOptions.get('strictErrors'))
   .addOption(BuildOptions.get('path'))
   .addOption(BuildOptions.get('name'))

package/src/shared.ts

@@ -28,7 +28,6 @@ const options = {
   dry: opt('-d, --dry', 'Do not save the pack. Mostly useful with `verbose`.'),
   verbose: opt('-f, --verbose', 'Fully log all resulting resources: functions, advancements...'),
   root: opt('-r, --root', 'Save the pack & resource pack in the .minecraft/datapacks & .minecraft/resource_packs folders. Override the value specified in the configuration file.'),
-  fullTrace: opt('-t, --full-trace', 'Show the full stack trace on errors.'),
   strictErrors: opt('-e, --strict-errors', 'Stop pack compilation on type errors.'),
   production: opt('-p, --production', 'Runs Sandstone in production mode. This sets process.env.SANDSTONE_ENV to "production".'),
 

package/src/ui/WatchUI.tsx

@@ -176,7 +176,7 @@ export function WatchUI({ manual, onManualRebuild, exit }: WatchUIProps) {
   }, [isError, isManualPending, buildResult?.error, logLines.length])
 
   useInput((input, key) => {
-    if (input === 'q') {
+    if (input === 'q' || (key.ctrl && input === 'c')) {
       exit!()
     }
 

package/src/version.ts

@@ -1 +1 @@
-export const CLI_VERSION = '2.1.0'
+export const CLI_VERSION = '2.1.2'