sandstone-cli 1.2.4 → 2.0.0

package/src/commands/create.ts

@@ -5,8 +5,9 @@ import chalk from 'chalk-template'
 import util from 'util'
 import * as child from 'child_process'
 import { nanoid } from 'nanoid'
+import { confirm, select, input } from '@inquirer/prompts'
 
-import { capitalize, getWorldsList, hasPnpm, hasYarn } from '../utils.js'
+import { capitalize, getWorldsList, hasBun, hasPnpm, hasYarn } from '../utils.js'
 
 type CreateOptions = {
   // Flags
@@ -34,24 +35,16 @@ export async function createCommand(_project: string, opts: CreateOptions) {
   const projectPath = path.resolve(_project)
   const projectName = path.basename(projectPath)
 
-  const inquirer = (await import("inquirer")).default
-
-  const projectType = Boolean((await inquirer.prompt({
-    name: 'projectType',
+  const projectType = (await confirm({
     message: 'Whether your project will be a library for use in other Sandstone projects >',
-    type: 'confirm',
     default: false,
-  })).projectType) === true ? 'library' : 'pack'
+  })) === true ? 'library' : 'pack'
 
   const sv = (v: string) => new SemVer(v)
 
-  const versions = [[sv('0.13.6'), sv('0.5.4')], [sv('1.0.0-beta.0'), sv('1.1.11')]] as const
-
-  const stableIndex = 0
+  const versions = [[sv('1.0.0-beta.1'), sv('2.0.0')]] as const
 
-  const { version } = await inquirer.prompt({
-    name: 'version',
-    type: 'list',
+  const version = await select({
     message: 'Which version of Sandstone do you want to use? These are the only supported versions for new projects.',
     choices: versions.map((v) => {
       const { prerelease, major, minor } = v[0]
@@ -66,29 +59,23 @@ export async function createCommand(_project: string, opts: CreateOptions) {
         short: v[0].toString(),
       }
     }),
-    default: stableIndex,
-  }) as {
-    version: typeof versions[any]
-  }
+    default: versions[0],
+  })
 
   let packName = projectName
 
   let namespace = projectName.replace(RegExp(/ /g), '_')
 
   if (projectType === 'pack') {
-    packName = (await inquirer.prompt({
-      name: 'projectType',
+    packName = (await input({
       message: 'Name of your output pack(s) (can be changed later) >',
       default: projectName,
-      type: 'input',
-    })).projectType
+    }))
 
-    namespace = (await inquirer.prompt({
-      name: 'namespace',
+    namespace = (await input({
       message: 'Default namespace (can be changed later) >',
       default: namespace,
-      type: 'input',
-    })).namespace
+    }))
   } else {
     packName += '-testing'
     namespace += '_test'
@@ -103,6 +90,10 @@ export async function createCommand(_project: string, opts: CreateOptions) {
   } = {}
 
   if (version[0].major === 1) {
+    if (opts.clientPath) {
+      saveOptions.clientPath = opts.clientPath
+    }
+
     if (opts.root) {
       saveOptions.root = true
     } else if (opts.world) {
@@ -111,9 +102,7 @@ export async function createCommand(_project: string, opts: CreateOptions) {
       saveOptions.serverPath = opts.serverPath
     } else { // TODO: Add support for ssh
       // User didn't specify a way to save the file. Ask them.
-      const { saveChoice }: { saveChoice: 'root' | 'world' | 'server-path' | 'none' } = await inquirer.prompt({
-        name: 'saveChoice',
-        type: 'list',
+      const saveChoice = await select<'root' | 'world' | 'server-path' | 'none'>({
         message: 'Where do you want your pack(s) to be exported to (can be changed later)?',
         choices: [{
           name: 'In the root client (.minecraft/datapacks & .minecraft/resourcepacks) folder(s)',
@@ -139,19 +128,15 @@ export async function createCommand(_project: string, opts: CreateOptions) {
           saveOptions.root = true
           break
         case 'world':
-          const { world }: { world: string } = await inquirer.prompt({
-            name: 'world',
+          const world = await select({
             message: 'What world do you want to save the packs in? >',
-            type: 'list',
-            choices: () => getWorldsList(saveOptions.clientPath),
+            choices: getWorldsList(saveOptions.clientPath),
           })
           saveOptions.world = world
           break
         case 'server-path':
-          const { serverPath }: { serverPath: string } = await inquirer.prompt({
-            name: 'serverPath',
+          const serverPath = await input({
             message: 'Where is the server to save the packs in? Relative paths are accepted. >',
-            type: 'input',
           })
 
           saveOptions.serverPath = serverPath
@@ -159,34 +144,31 @@ export async function createCommand(_project: string, opts: CreateOptions) {
         case 'none': break
       }
     }
-    if (opts.clientPath) {
-      saveOptions.clientPath = opts.clientPath
-    }
   }
 
   let packageManager = 'npm'
 
   const yarn = hasYarn()
   const pnpm = hasPnpm()
+  const bun =  hasBun()
 
   if (yarn || pnpm) {
     const choices = ['npm']
 
     if (yarn) choices.unshift('yarn')
     if (pnpm) choices.unshift('pnpm')
+    if (bun)  choices.unshift('bun')
 
-    packageManager = (await inquirer.prompt({
-      name: 'packageManager',
-      message: 'What package manager do you want to use? >',
-      type: 'list',
-      choices: choices,
-    })).packageManager
+    packageManager = (await select({
+      message: 'What package manager do you want to use? (For now you have to use Bun) >',
+      choices: choices
+    }))
   }
 
   fs.mkdirSync(projectPath)
 
   // Create project & install dependencies
-  console.log(chalk`Installing {rgb(229,193,0) sandstone@${version[0]}}, {rgb(229,193,0) sandstone-cli@${version[1]}} and {cyan typescript} using {cyan ${packageManager}}.`)
+  console.log(chalk`Installing {rgb(229, 193, 0) sandstone@${version[0]}}, {rgb(229, 193, 0) sandstone-cli@${version[1]}} and {cyan typescript} using {cyan ${packageManager}}.`)
 
   const exec = (cmd: string) => child.execSync(cmd, { cwd: projectPath })
 

package/src/commands/dependency.ts

@@ -2,7 +2,7 @@ import fs from 'fs-extra'
 import path from 'path'
 import { exec } from 'child_process'
 import { buildCommand } from './build.js'
-import inquirer from 'inquirer'
+import { checkbox } from '@inquirer/prompts'
 
 const _fetch = import('node-fetch')
 
@@ -23,17 +23,13 @@ export async function installNativeCommand(_libraries: string[]) {
   const manifest = await (await fetch('https://raw.githubusercontent.com/sandstone-mc/sandstone-libraries/main/manifest.json')).json() as LibraryManifest
 
   const search = async () => {
-    const { selected } = await inquirer.prompt({
-      name: 'selected',
-      type: 'checkbox',
+    const selected = await checkbox({
       message: 'Which libraries to add?',
       choices: manifest.libraries.map((library) => ({
         name: library.name,
         value: library.package,
       })),
-    }) as {
-      selected: string[]
-    }
+    })
 
     if (selected && selected.length !== 0) {
       libraries.push(...selected.map((lib) => [lib, true] as [string, boolean]))
@@ -124,7 +120,7 @@ export async function installVanillaCommand(_libraries: string[]) {
         description: data.display.description,
       }
 
-      if (manifest && !manifest[id] && !manifest[meta.rawId]) {
+      if (!manifest || !(manifest[id] || manifest[meta.rawId])) {
         
         if (option.name.length > optionColumn[0]) optionColumn[0] = option.name.length
 
@@ -151,24 +147,19 @@ export async function installVanillaCommand(_libraries: string[]) {
     if (options.length === 0) {
       console.log('No results found!')
     } else {
-      const { selected } = await inquirer.prompt({
-        name: 'selected',
-        type: 'checkbox',
+      const selected = await checkbox({
         message: 'Which libraries to add?',
         choices: options.map((option) => ({
           name: `${option.name}${space(0, option.name)}by ${option.owner}${space(1, option.owner)}${option.downloads} downloads${space(2, option.downloads)}${option.description}`,
-          short: `${option.name} - by ${option.owner} - ${option.downloads} downloads - ${option.description}`,
-          value: [option.id, true],
+          value: [option.id, true] as [string, true],
         })),
-      }) as {
-        selected: [string, true][]
-      }
-  
+      })
+
       if (selected && selected.length !== 0) {
         libraries.push(...selected)
-  
+
         count += selected.length
-  
+
         return true
       }
     }
@@ -180,34 +171,32 @@ export async function installVanillaCommand(_libraries: string[]) {
   }
 
   if (count > 0) {
-
     let adding: [string, string][] | false = false
 
     for await (const [library, searched] of libraries) {
       const version = library.includes('@') ? library.split('@')[1] : 'latest'
 
+      if (searched) {
+        if (!adding) adding = []
+        adding.push([library, version])
+      }
       if (!manifest || !(manifest[library] || manifest[library] === version)) {
-        if (searched) {
+        let exists = false
+        try {
+          /* @ts-ignore */
+          exists = (await (await fetch(`${base}/packs/${library}/meta`)).json()).statusCode !== 404
+        } catch (e) {}
+
+        if (exists) {
           if (!adding) adding = []
           adding.push([library, version])
         } else {
-          let exists = false
-          try {
-            /* @ts-ignore */
-            exists = (await (await fetch(`${base}/packs/${library}/meta`)).json()).statusCode !== 404
-          } catch (e) {}
-
-          if (exists) {
-            if (!adding) adding = []
-            adding.push([library, version])
-          } else {
-            count--
+          count--
 
-            console.log(`${library} doesn't exist! Searching...`)
+          console.log(`${library} doesn't exist! Searching...`)
 
-            if (await search(library)) {
-              if (!adding) adding = []
-            }
+          if (await search(library)) {
+            if (!adding) adding = []
           }
         }
       } else {
@@ -216,14 +205,12 @@ export async function installVanillaCommand(_libraries: string[]) {
     }
     if (adding) {
       await buildCommand({
-        path: './src',
-        configPath: './',
+        path: './',
         dependencies: adding
       })
     }
   }
 
-  console.log
   console.log(`${count} libraries added`)
 }
 
@@ -247,17 +234,13 @@ export async function uninstallVanillaCommand(_libraries: string[]) {
 
   if (manifest) {
     if (count === 0) {
-      const { selected } = await inquirer.prompt({
-        name: 'selected',
-        type: 'checkbox',
+      const selected = await checkbox({
         message: 'Which libraries to remove?',
         choices: Object.entries(manifest).map(([name]) => ({
           short: name,
           value: name,
         })),
-      }) as {
-        selected: string[]
-      }
+      })
 
       if (selected && selected.length !== 0) {
         count = selected.length
@@ -315,8 +298,7 @@ export async function refreshCommand() {
     await fs.writeFile(lockFilePath, '{}')
 
     await buildCommand({
-      path: './src',
-      configPath: './'
+      path: './',
     })
   } else {
     console.log('No libraries to refresh')

package/src/commands/index.ts

@@ -1,4 +1,4 @@
-export { buildCommand } from './build.js';
-export { createCommand } from './create.js';
+export { buildCommand } from './build.js'
+export { createCommand } from './create.js'
 export { installNativeCommand, installVanillaCommand, uninstallVanillaCommand, refreshCommand } from './dependency.js'
-export { watchCommand } from './watch.js';
+export { watchCommand, type WatchOptions } from './watch.js'