sandstone-cli 2.0.8 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sandstone-cli",
-  "version": "2.0.8",
+  "version": "2.1.0",
   "description": "The CLI for Sandstone - the minecraft pack creation library.",
   "type": "module",
   "exports": "./lib/index.js",
@@ -9,7 +9,8 @@
     "create-sandstone": "./lib/create.js"
   },
   "scripts": {
-    "dev:build": "bun tsc"
+    "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"
   },
   "repository": {
     "type": "git",

package/scripts/version.ts

@@ -0,0 +1,4 @@
+import { writeFileSync } from 'fs'
+import pkg from '../package.json'
+
+writeFileSync('src/version.ts', `export const CLI_VERSION = '${pkg.version}'\n`)

package/src/commands/create.ts

@@ -7,6 +7,7 @@ import * as child from 'child_process'
 import { nanoid } from 'nanoid'
 import { confirm, select, input } from '@inquirer/prompts'
 
+import { CLI_VERSION } from '../version.js'
 import { capitalize, getWorldsList, hasBun, hasPnpm, hasYarn } from '../utils.js'
 
 type CreateOptions = {
@@ -42,7 +43,7 @@ export async function createCommand(_project: string, opts: CreateOptions) {
 
   const sv = (v: string) => new SemVer(v)
 
-  const versions = [[sv('1.0.0-beta.1'), sv('2.0.8')]] as const
+  const versions = [[sv('1.0.0-beta.1'), 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

@@ -10,11 +10,12 @@ import { initLogger, log, logError, setLiveLogCallback } from '../ui/logger.js'
 import type { TrackedChange, ChangeCategory } from '../ui/types.js'
 import { hot } from '@sandstone-mc/hot-hook'
 import fs from 'fs-extra'
-import { join } from 'node:path'
+import { join, relative } from 'node:path'
 
 export interface WatchOptions extends BuildOptions {
   manual?: boolean
   library?: boolean
+  ignore?: string[]
 }
 
 export async function watchCommand(opts: WatchOptions) {
@@ -77,7 +78,7 @@ export async function watchCommand(opts: WatchOptions) {
 
     api?.setStatus('building')
     api?.setChangedFiles(changes)
-    log('Building...', changes.map(c => c.path).join(', '))
+    log('Building...', changes.map(c => './' + relative(opts.path, c.path).replace(/\\/g, '/')).join(', '))
 
     const libChanges = opts.library && Object.hasOwn(globalThis, 'Bun') ? changes.filter((change) => !change.path.includes('test/')) : []
 
@@ -283,8 +284,14 @@ export async function watchCommand(opts: WatchOptions) {
       }
 
       if (opts.manual) {
-        // In manual mode, accumulate changes and wait for user input
-        pendingChanges = [...pendingChanges, ...changesToProcess]
+        // In manual mode, accumulate changes and wait for user input (deduplicated)
+        const existingPaths = new Set(pendingChanges.map(c => c.path))
+        for (const change of changesToProcess) {
+          if (!existingPaths.has(change.path)) {
+            pendingChanges.push(change)
+            existingPaths.add(change.path)
+          }
+        }
         getWatchUIAPI()?.setStatus('pending')
         getWatchUIAPI()?.setChangedFiles(pendingChanges)
       } else {
@@ -300,6 +307,10 @@ export async function watchCommand(opts: WatchOptions) {
   // Initial build
   await onFilesChange([])
 
+  const defaultIgnore = ['**/.git/**/*', '**/.sandstone/**/*', '**/resources/cache/**/*', '**/*tmp*', '**/*.swp', 'lib/**/*']
+  const cliIgnore = (opts.ignore ?? []).flatMap(p => p.split(',').filter(Boolean))
+  const ignorePatterns = [...defaultIgnore, ...cliIgnore]
+
   subscription = await subscribe(
     opts.path,
     (err, events) => {
@@ -310,7 +321,7 @@ export async function watchCommand(opts: WatchOptions) {
       handleEvents(events)
     },
     {
-      ignore: ['**/.git/**/*', '**/.sandstone/**/*', '**/resources/cache/**/*', '**/*tmp*', 'lib/**/*'],
+      ignore: ignorePatterns,
     }
   )
 

package/src/create.ts

@@ -1,24 +1,23 @@
 #!/usr/bin/env bun
 import { Argument, Command } from 'commander'
 import figlet from 'figlet'
-import { createCommand } from './commands/index.js'
-import { BuildDeclares } from './shared.js'
+
+import { CLI_VERSION } from './version.js'
+import { createCommand } from './commands/create.js'
+import { BuildOptions } from './shared.js'
 
 const commander = new Command()
 
 console.log(figlet.textSync('Sandstone'));
 
-const createCLI = commander
-  .version('2.0.8')
+commander
+  .version(CLI_VERSION)
   .description('Create a new Sandstone project. ⛏')
+  .addOption(BuildOptions.get('name'))
+  .addOption(BuildOptions.get('namespace'))
+  .addOption(BuildOptions.get('world'))
+  .addOption(BuildOptions.get('clientPath'))
+  .addOption(BuildOptions.get('serverPath'))
   .action(createCommand)
   .addArgument(new Argument('<projectName>', 'Not the name of the output pack'))
-
-createCLI.option.apply(createCLI, BuildDeclares.name)
-  .option.apply(createCLI, BuildDeclares.namespace)
-  .option.apply(createCLI, BuildDeclares.world)
-  .option.apply(createCLI, BuildDeclares.clientPath)
-  .option.apply(createCLI, BuildDeclares.serverPath)
-
-
-createCLI.parse(process.argv)
+  .parse(process.argv)

package/src/index.ts

@@ -1,72 +1,66 @@
 #!/usr/bin/env bun
 import { Argument, Command } from 'commander'
 import figlet from 'figlet'
+
+import { CLI_VERSION } from './version.js'
 import { buildCommand, createCommand, watchCommand, installNativeCommand, installVanillaCommand, uninstallVanillaCommand, refreshCommand } from './commands/index.js'
-import { BuildDeclares } from './shared.js'
+import { BuildOptions } from './shared.js'
 
 const commander = new Command()
 
 console.log(figlet.textSync('Sandstone'));
 
 const CLI = commander
-  .version('2.0.8', '-v, --version')
+  .version(CLI_VERSION, '-v, --version')
   .description('The CLI for Sandstone - the minecraft pack creation library.')
 
-const build = CLI
+CLI
   .command('build')
   .description('Build the pack(s). ⛏')
-
-build.option.apply(build, BuildDeclares.dry)
-  .option.apply(build, BuildDeclares.verbose)
-  .option.apply(build, BuildDeclares.root)
-  .option.apply(build, BuildDeclares.fullTrace)
-  .option.apply(build, BuildDeclares.strictErrors)
-  .option.apply(build, BuildDeclares.production)
-
-  .option.apply(build, BuildDeclares.path)
-  .option.apply(build, BuildDeclares.name)
-  .option.apply(build, BuildDeclares.namespace)
-  .option.apply(build, BuildDeclares.world)
-  .option.apply(build, BuildDeclares.clientPath)
-  .option.apply(build, BuildDeclares.serverPath)
-
-  .option.apply(build, BuildDeclares.enableSymlinks)
+  .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'))
+  .addOption(BuildOptions.get('name'))
+  .addOption(BuildOptions.get('namespace'))
+  .addOption(BuildOptions.get('world'))
+  .addOption(BuildOptions.get('clientPath'))
+  .addOption(BuildOptions.get('serverPath'))
   .action(buildCommand)
 
-const watch = CLI
+CLI
   .command('watch')
   .description('Build the packs, and rebuild them on file change. ⛏')
+  .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'))
+  .addOption(BuildOptions.get('namespace'))
+  .addOption(BuildOptions.get('world'))
+  .addOption(BuildOptions.get('clientPath'))
+  .addOption(BuildOptions.get('serverPath'))
+  .addOption(BuildOptions.get('library'))
+  .addOption(BuildOptions.get('manual'))
+  .addOption(BuildOptions.get('ignore'))
   .action(watchCommand)
 
-watch.option.apply(watch, BuildDeclares.dry)
-  .option.apply(watch, BuildDeclares.verbose)
-  .option.apply(watch, BuildDeclares.root)
-  .option.apply(watch, BuildDeclares.fullTrace)
-  .option.apply(watch, BuildDeclares.strictErrors)
-
-  .option.apply(watch, BuildDeclares.path)
-  .option.apply(watch, BuildDeclares.name)
-  .option.apply(watch, BuildDeclares.namespace)
-  .option.apply(watch, BuildDeclares.world)
-  .option.apply(watch, BuildDeclares.clientPath)
-  .option.apply(watch, BuildDeclares.serverPath)
-
-  .option.apply(watch, BuildDeclares.library)
-  .option.apply(watch, BuildDeclares.manual)
-  .option.apply(watch, BuildDeclares.enableSymlinks)
-
-const create = CLI
+CLI
   .command('create')
   .description('Create a new Sandstone project. ⛏')
+  .addOption(BuildOptions.get('name'))
+  .addOption(BuildOptions.get('namespace'))
+  .addOption(BuildOptions.get('world'))
+  .addOption(BuildOptions.get('clientPath'))
+  .addOption(BuildOptions.get('serverPath'))
   .action(createCommand)
   .addArgument(new Argument('<projectName>', 'Not the name of the output pack'))
 
-create.option.apply(create, BuildDeclares.name)
-  .option.apply(create, BuildDeclares.namespace)
-  .option.apply(create, BuildDeclares.world)
-  .option.apply(create, BuildDeclares.clientPath)
-  .option.apply(create, BuildDeclares.serverPath)
-
 const install = CLI
   .command('install')
   .alias('add')

package/src/shared.ts

@@ -1,23 +1,65 @@
-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.'],
-  } as unknown as Record<string, [string, string, RegExp, boolean]> // Haha TypeScript funny
+import { Option } from 'commander'
+
+interface OptionDef {
+  flags: string
+  description: string
+  default?: unknown
+  env?: string | false  // false to disable auto-env
+}
+
+function opt(flags: string, description: string, config?: { default?: unknown; env?: string | false }): OptionDef {
+  return { flags, description, ...config }
+}
+
+/** Parse --long-name from flags like "-s, --long-name <value>" */
+function parseLongFlag(flags: string): string | undefined {
+  const match = flags.match(/--([a-z-]+)/)
+  return match?.[1]
+}
+
+/** Convert kebab-case to SCREAMING_SNAKE_CASE with SANDSTONE_ prefix */
+function toEnvVar(flagName: string): string {
+  return 'SANDSTONE_' + flagName.toUpperCase().replace(/-/g, '_')
+}
+
+// Option definitions - use BuildOptions.get() to create Commander Option instances
+const options = {
+  // Flags
+  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".'),
+
+  // Values
+  path: opt('-h,--path <path>', 'Path of the folder containing your sandstone workspace.', { default: './' }),
+  name: opt('-n, --name <name>', 'Name of the datapack. Override the value specified in the configuration file.'),
+  namespace: opt('-ns, --namespace <namespace>', 'The default namespace. Override the value specified in the configuration file.'),
+  world: opt('-w, --world <name>', 'The name of the world to save the packs in. Override the value specified in the configuration file.'),
+  clientPath: opt('-c, --client-path <path>', 'Path of the client folder. Override the value specified in the configuration file.'),
+  serverPath: opt('--server-path <path>', 'Path of the server folder. Override the value specified in the configuration file.'),
+
+  // TODO: ssh
+
+  // Watch-specific
+  manual: opt('-m, --manual', 'Manual reload mode - press r or Enter to rebuild after changes.', { env: 'WATCH_MANUAL' }),
+  library: opt('-l, --library', 'Library mode - watches a library workspace based on the library project template.', { env: 'WATCH_LIBRARY' }),
+  ignore: opt('-i, --ignore <globs...>', 'Additional glob patterns to ignore when watching for changes.', { env: 'WATCH_IGNORE_PATTERNS' }),
+} satisfies Record<string, OptionDef>
+
+export type OptionName = keyof typeof options
+
+export const BuildOptions = {
+  /** Get a Commander Option instance for the given option name */
+  get(name: OptionName): Option {
+    const def = options[name]
+    const option = new Option(def.flags, def.description)
+    if (def.default !== undefined) option.default(def.default)
+    // Auto-generate env var from flag unless explicitly disabled (env: false)
+    if (def.env !== false) {
+      option.env(def.env === undefined ? toEnvVar(parseLongFlag(def.flags) ?? name) : `SANDSTONE_${def.env}`)
+    }
+    return option
+  },
+}

package/src/stubs/react-devtools-core.js

@@ -0,0 +1 @@
+export default { initialize() {}, connectToDevTools() {} }

package/src/ui/WatchUI.tsx

@@ -146,6 +146,8 @@ export function WatchUI({ manual, onManualRebuild, exit }: WatchUIProps) {
     setBuildResultState(result)
     if (result.success) {
       setStatusState(manual ? 'pending' : 'watching')
+      // Clear changed files so contentMode switches back to 'logs'
+      setChangedFilesState([])
     } else {
       setStatusState('error')
     }

package/src/version.ts

@@ -0,0 +1 @@
+export const CLI_VERSION = '2.1.0'

package/tsconfig.json

@@ -1,9 +1,11 @@
 {
   "compilerOptions": {
-    "declaration": true,
     "module": "NodeNext",
-    "outDir": "lib",
-    "rootDir": "src",
+    "noEmit": true,
+    "paths": {
+      "*": ["./*"],
+      "react-devtools-core": ["./src/stubs/react-devtools-core.js"]
+    },
     "strict": true,
     "target": "ES2024",
     "lib": [

package/lib/commands/build.d.ts

@@ -1,34 +0,0 @@
-import type { BuildResult } from '../ui/types.js';
-import type * as sandstone from 'sandstone';
-declare global {
-    interface RegExpConstructor {
-        escape(str: string): string;
-    }
-}
-export declare function enableConsoleCapture(): void;
-export declare function disableConsoleCapture(): void;
-export type BuildOptions = {
-    dry?: boolean;
-    verbose?: boolean;
-    root?: boolean;
-    fullTrace?: boolean;
-    strictErrors?: boolean;
-    production?: boolean;
-    path: string;
-    name?: string;
-    namespace?: string;
-    world?: string;
-    clientPath?: string;
-    serverPath?: string;
-    enableSymlinks?: boolean;
-    dependencies?: [string, string][];
-};
-export interface BuildContext {
-    sandstoneConfig: sandstone.SandstoneConfig;
-    sandstonePack: sandstone.SandstonePack;
-    resetSandstonePack: () => void;
-}
-export declare function loadBuildContext(cliOptions: BuildOptions, folder: string): Promise<BuildContext>;
-export declare function _buildCommand(opts: BuildOptions, _folder?: string, existingContext?: BuildContext, watching?: boolean): Promise<BuildResult>;
-export declare function buildCommand(opts: BuildOptions, _?: string): Promise<void>;
-export declare function buildCommand(opts: BuildOptions, _folder: string | undefined, silent: true): Promise<BuildResult>;