sandstone-cli 2.0.1 → 2.0.3

package/lib/commands/build.js

@@ -419,7 +419,7 @@ async function _buildProject(cliOptions, folder, silent = false, existingContext
             const outputPath = path.join(outputFolder, packType.type);
             await fs.ensureDir(outputPath);
             if (packType.handleOutput) {
-                await packType.handleOutput('output', async (relativePath, encoding = 'utf8') => await fs.readFile(path.join(outputPath, relativePath), encoding), async (relativePath, contents) => {
+                await packType.handleOutput('output', (async (relativePath, encoding = 'utf8') => await fs.readFile(path.join(outputPath, relativePath), encoding)), async (relativePath, contents) => {
                     if (contents === undefined) {
                         await fs.unlink(path.join(outputPath, relativePath));
                     }
@@ -488,7 +488,7 @@ async function _buildProject(cliOptions, folder, silent = false, existingContext
         for await (const [, packType] of packTypes) {
             const outputPath = path.join(outputFolder, packType.type);
             if (packType.handleOutput) {
-                await packType.handleOutput('output', async (relativePath, encoding = 'utf8') => await fs.readFile(path.join(outputPath, relativePath), encoding), async (relativePath, contents) => {
+                await packType.handleOutput('output', (async (relativePath, encoding = 'utf8') => await fs.readFile(path.join(outputPath, relativePath), encoding)), async (relativePath, contents) => {
                     if (contents === undefined) {
                         await fs.unlink(path.join(outputPath, relativePath));
                     }

package/lib/commands/create.js

@@ -118,7 +118,7 @@ export async function createCommand(_project, opts) {
     const yarn = hasYarn();
     const pnpm = hasPnpm();
     const bun = hasBun();
-    if (yarn || pnpm) {
+    if (yarn || pnpm || bun) {
         const choices = ['npm'];
         if (yarn)
             choices.unshift('yarn');

package/lib/create.d.ts

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

package/lib/create.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env bun
 import { Argument, Command } from 'commander';
 import figlet from 'figlet';
 import { createCommand } from './commands/index.js';

package/lib/index.d.ts

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

package/lib/index.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env bun
 import { Argument, Command } from 'commander';
 import figlet from 'figlet';
 import { buildCommand, createCommand, watchCommand, installNativeCommand, installVanillaCommand, uninstallVanillaCommand, refreshCommand } from './commands/index.js';
@@ -5,7 +6,7 @@ import { BuildDeclares } from './shared.js';
 const commander = new Command();
 console.log(figlet.textSync('Sandstone'));
 const CLI = commander
-    .version('2.0.1')
+    .version('2.0.2', '-v, --version')
     .description('The CLI for Sandstone - the minecraft pack creation library.');
 const build = CLI
     .command('build')

package/lib/shared.js

@@ -1,7 +1,7 @@
 export const BuildDeclares = {
     // Flags
     dry: ['-d, --dry', 'Do not save the pack. Mostly useful with `verbose`.'],
-    verbose: ['-v, --verbose', 'Log all resulting resources: functions, advancements...'],
+    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.'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sandstone-cli",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "The CLI for Sandstone - the minecraft pack creation library.",
   "type": "module",
   "exports": "./lib/index.js",

package/src/commands/build.ts

@@ -12,6 +12,7 @@ import { canUseSymlinks } from '../utils.js'
 import { split } from 'obliterator'
 
 import type * as sandstone from 'sandstone'
+import type { handlerReadFile } from 'sandstone/pack'
 
 type SandstoneContext = ReturnType<typeof sandstone['getSandstoneContext']>
 
@@ -565,8 +566,8 @@ async function _buildProject(
       if (packType.handleOutput) {
         await packType.handleOutput(
           'output',
-          async (relativePath: string, encoding: BufferEncoding = 'utf8') =>
-            await fs.readFile(path.join(outputPath, relativePath), encoding),
+          (async (relativePath: string, encoding: BufferEncoding = 'utf8') =>
+            await fs.readFile(path.join(outputPath, relativePath), encoding)) as unknown as handlerReadFile,
           async (relativePath: string, contents: any) => {
             if (contents === undefined) {
               await fs.unlink(path.join(outputPath, relativePath))
@@ -655,8 +656,8 @@ async function _buildProject(
       if (packType.handleOutput) {
         await packType.handleOutput(
           'output',
-          async (relativePath: string, encoding: BufferEncoding = 'utf8') =>
-            await fs.readFile(path.join(outputPath, relativePath), encoding),
+          (async (relativePath: string, encoding: BufferEncoding = 'utf8') =>
+            await fs.readFile(path.join(outputPath, relativePath), encoding)) as unknown as handlerReadFile,
           async (relativePath: string, contents: any) => {
             if (contents === undefined) {
               await fs.unlink(path.join(outputPath, relativePath))

package/src/commands/create.ts

@@ -152,7 +152,7 @@ export async function createCommand(_project: string, opts: CreateOptions) {
   const pnpm = hasPnpm()
   const bun =  hasBun()
 
-  if (yarn || pnpm) {
+  if (yarn || pnpm || bun) {
     const choices = ['npm']
 
     if (yarn) choices.unshift('yarn')

package/src/create.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env bun
 import { Argument, Command } from 'commander'
 import figlet from 'figlet'
 import { createCommand } from './commands/index.js'

package/src/index.ts

@@ -1,3 +1,4 @@
+#!/usr/bin/env bun
 import { Argument, Command } from 'commander'
 import figlet from 'figlet'
 import { buildCommand, createCommand, watchCommand, installNativeCommand, installVanillaCommand, uninstallVanillaCommand, refreshCommand } from './commands/index.js'
@@ -8,7 +9,7 @@ const commander = new Command()
 console.log(figlet.textSync('Sandstone'));
 
 const CLI = commander
-  .version('2.0.1')
+  .version('2.0.2', '-v, --version')
   .description('The CLI for Sandstone - the minecraft pack creation library.')
 
 const build = CLI

package/src/shared.ts

@@ -1,7 +1,7 @@
 export const BuildDeclares = {
     // Flags
     dry: ['-d, --dry', 'Do not save the pack. Mostly useful with `verbose`.'],
-    verbose: ['-v, --verbose', 'Log all resulting resources: functions, advancements...'],
+    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.'],