@jpetit/toolkit 3.0.4 → 3.0.5

package/lib/doctor.ts

@@ -45,9 +45,9 @@ export async function checkPython3(): Promise<void> {
     if (await probePython3(true)) {
         tui.success('Python3 seems installed')
     } else {
-        tui.error('Python3 does not appear to be installed')
-        tui.warning('This is not a problem if you do not plan to use Python solutions.')
-        tui.warning('See https://www.python.org/downloads/')
+        tui.warning('Python3 does not appear to be installed')
+        tui.print('This is not a problem if you do not plan to use Python solutions')
+        tui.print('See https://www.python.org/downloads/')
     }
 }
 
@@ -55,9 +55,9 @@ export async function checkGCC(): Promise<void> {
     if (await probeGCC(true)) {
         tui.success('C/C++ seems installed')
     } else {
-        tui.error('C/C++ does not appear to be installed')
-        tui.warning('This is not a problem if you do not plan to use C or C++ solutions.')
-        tui.warning('Please install GCC or Clang.')
+        tui.warning('C/C++ does not appear to be installed')
+        tui.print('This is not a problem if you do not plan to use C or C++ solutions')
+        tui.print('Please install GCC or Clang')
     }
 }
 
@@ -65,9 +65,9 @@ export async function checkLaTeX(): Promise<void> {
     if (await probeLaTeX(true)) {
         tui.success('LaTeX seems installed')
     } else {
-        tui.error('LaTeX does not appear to be installed')
-        tui.warning('You will not be able to generate PDF statements.')
-        tui.warning('TODO: Provide instructions for installing LaTeX')
+        tui.warning('LaTeX does not appear to be installed')
+        tui.print('You will not be able to generate PDF statements')
+        tui.print('TODO: Provide instructions for installing LaTeX')
     }
 }
 
@@ -75,9 +75,9 @@ export async function checkPandoc(): Promise<void> {
     if (await probePandoc(true)) {
         tui.success('Pandoc with Lua support seems installed')
     } else {
-        tui.error('Pandoc with Lua support does not appear to be installed')
-        tui.warning('You will not be able to generate text statements (HTML, TXT, MD).')
-        tui.warning('See https://pandoc.org/installing.html')
+        tui.warning('Pandoc with Lua support does not appear to be installed')
+        tui.print('You will not be able to generate text statements (HTML, TXT, MD)')
+        tui.print('See https://pandoc.org/installing.html')
     }
 }
 
@@ -85,9 +85,9 @@ export async function checkImageMagick(): Promise<void> {
     if (await probeImageMagick(true)) {
         tui.success('ImageMagick seems installed')
     } else {
-        tui.error('ImageMagick does not appear to be installed')
-        tui.warning('You will not be able to convert images for text statements.')
-        tui.warning('See https://imagemagick.org/script/download.php')
+        tui.warning('ImageMagick does not appear to be installed')
+        tui.print('You will not be able to convert images for text statements')
+        tui.print('See https://imagemagick.org/script/download.php')
     }
 }
 
@@ -98,7 +98,8 @@ export async function checkEnvVars(): Promise<void> {
         if (process.env[v]) {
             tui.success(`${v} is set`)
         } else {
-            tui.error(`${v} is not set`)
+            tui.warning(`${v} is not set`)
+            tui.print(`You will not be able to use related AI models`)
         }
     }
 }

package/lib/maker.ts

@@ -60,13 +60,7 @@ export class Maker {
     private async loadHandler() {
         await tui.section('Loading handler.yml', async () => {
             const data = await readYaml(`${this.directory}/handler.yml`)
-            try {
-                this.handler = ZHandler.parse(data)
-            } catch (e) {
-                tui.error(`Invalid handler.yml format`)
-                console.dir(e)
-                process.exit(1)
-            }
+            this.handler = ZHandler.parse(data)
             tui.print(Bun.YAML.stringify(this.handler, null, 2))
         })
     }
@@ -108,14 +102,12 @@ export class Maker {
             const solutionProglang = this.handler.solution
             const extension = proglangExtensions[solutionProglang]
             if (!extension) {
-                tui.error(`Unknown programming language '${solutionProglang}' for solution`)
-                process.exit(1)
+                throw new Error(`Unknown programming language '${solutionProglang}' for solution`)
             }
             const goldenSolutionPath = join(this.directory, `solution.${extension}`)
             const fileExists = await exists(goldenSolutionPath)
             if (!fileExists) {
-                tui.error(`Golden solution file '${goldenSolutionPath}' not found`)
-                process.exit(1)
+                throw new Error(`Golden solution file '${goldenSolutionPath}' not found`)
             }
             this.goldenSolution = `solution.${extension}`
             tui.print(this.goldenSolution)
@@ -155,9 +147,7 @@ export class Maker {
             try {
                 await compiler.compile(this.directory, program)
             } catch (error) {
-                tui.error(`Compilation failed`)
-                console.error(error)
-                process.exit(1)
+                throw new Error(`Compilation failed`)
             }
         })
     }
@@ -224,8 +214,7 @@ export class Maker {
 
                 const errors = results.filter((result) => result.error).length
                 if (errors > 0) {
-                    tui.error(`${errors} errors occurred while making correct answers`)
-                    process.exit(1)
+                    throw new Error(`${errors} errors occurred while making correct answers`)
                 }
             })
         })
@@ -489,8 +478,7 @@ Draft generated with \\textbf{new-jutge-toolkit}.
                 try {
                     await compiler.compile(this.directory, program)
                 } catch (error) {
-                    tui.error(`Compilation failed`)
-                    process.exit(1)
+                    throw new Error(`Compilation failed`)
                 }
             })
 

package/lib/tui.ts

@@ -2,6 +2,7 @@ import boxen from 'boxen'
 import chalk from 'chalk'
 import { marked } from 'marked'
 import { markedTerminal } from 'marked-terminal'
+import { th } from 'zod/locales'
 
 let indentation = 0
 
@@ -39,15 +40,15 @@ export function command(text: string) {
 }
 
 export function warning(text: string) {
-    console.log(chalk.yellow(`Warning: ${text}`))
+    console.log(chalk.yellow(text))
 }
 
 export function error(text: string) {
-    console.log(chalk.red(`Error: ${text}`))
+    console.log(chalk.red(text))
 }
 
 export function success(text: string) {
-    console.log(chalk.green(`Success: ${text}`))
+    console.log(chalk.green(text))
 }
 
 export function action(text: string) {

package/package.json

@@ -1,12 +1,11 @@
 {
     "name": "@jpetit/toolkit",
-    "version": "3.0.4",
+    "version": "3.0.5",
     "publishConfig": {
         "access": "public"
     },
     "module": "index.ts",
     "type": "module",
-    "private": false,
     "bin": "toolkit/index.ts",
     "scripts": {
         "build": "bun run build-assets && bun build toolkit --compile --outfile toolkit.exe",

package/toolkit/ai.ts

@@ -4,7 +4,7 @@ import { complete, listModels } from '@/lib/ai.ts'
 export const ai = new Command('ai').description('Query AI models')
 
 ai.command('complete')
-    .description('Complete a prompt')
+    .description('Complete a prompt using an AI model')
 
     .argument('prompt', 'the user prompt to complete')
     .option('-s, --system-prompt <system>', 'the system prompt to use', 'You are a helpful assistant.')

package/toolkit/create-wizard.ts

@@ -1,4 +1,4 @@
 export async function createProblemWithWizard(outputDir: string): Promise<void> {
     await Bun.sleep(0) // to ignore warning
-    console.error('Wizard method is not yet implemented.')
+    throw new Error('Wizard method is not yet implemented.')
 }

package/toolkit/create.ts

@@ -33,13 +33,8 @@ async function selectOutputDir(): Promise<string> {
                 default: false,
             })
             if (!remove) continue
-            try {
-                tui.action(`Removing directory ${dir}`)
-                await rm(dir, { recursive: true, force: true })
-            } catch (err) {
-                tui.warning(`Failed to remove directory ${dir}. Please try again.`)
-                continue
-            }
+            tui.action(`Removing directory ${dir}`)
+            await rm(dir, { recursive: true, force: true })
             tui.success(`Removed directory ${dir}`)
         }
         if (!dir.endsWith('.pbm')) {
@@ -47,12 +42,7 @@ async function selectOutputDir(): Promise<string> {
             dir += '.pbm'
             continue
         }
-        try {
-            await mkdir(dir, { recursive: true })
-        } catch (err) {
-            tui.warning(`Failed to create directory ${dir}. Please try again.`)
-            continue
-        }
+        await mkdir(dir, { recursive: true })
         tui.success(`Created directory ${dir}`)
         return dir
     }

package/toolkit/doctor.ts

@@ -13,5 +13,5 @@ export const doctor = new Command('doctor')
         await tui.section('Checking LaTeX installation', doc.checkLaTeX)
         await tui.section('Checking Pandoc installation', doc.checkPandoc)
         await tui.section('Checking ImageMagick installation', doc.checkImageMagick)
-        await tui.section('Checking environment variables', doc.checkEnvVars)
+        await tui.section('Checking AI models', doc.checkEnvVars)
     })

package/toolkit/index.ts

@@ -1,5 +1,7 @@
 #!/usr/bin/env bun
 
+import { confirm } from '@inquirer/prompts'
+
 import { program } from '@commander-js/extra-typings'
 import { ai } from './ai'
 import { compilers } from './compilers'
@@ -25,4 +27,19 @@ program.addCommand(compilers)
 program.addCommand(doctor)
 program.addCommand(ai)
 
-await program.parseAsync()
+try {
+    await program.parseAsync()
+} catch (error) {
+    console.error('An unexpected error occurred:')
+    if (error instanceof Error) {
+        if (error.name === 'ExitPromptError') {
+            console.error('Operation cancelled by the user')
+        } else {
+            console.error(error.message)
+            const showTrace = await confirm({ message: 'Show stack trace?', default: false })
+            if (showTrace) console.error(error)
+        }
+    } else {
+        console.error(error)
+    }
+}

package/toolkit/init.ts

@@ -2,7 +2,7 @@ import { decompressAssets } from '@/lib/assets'
 import { initializePaths, loadSettings, paths, saveSettings, settingsExist } from '@/lib/settings'
 import { guessUserEmail, guessUserName } from '@/lib/utils'
 import { Command } from '@commander-js/extra-typings'
-import { input, select } from '@inquirer/prompts'
+import { input, confirm } from '@inquirer/prompts'
 import chalk from 'chalk'
 import * as tui from '@/lib/tui.js'
 
@@ -10,9 +10,10 @@ async function initialize() {
     await tui.section('Initialize', async () => {
         let name = (await guessUserName()) || 'John Doe'
         let email = (await guessUserEmail()) || 'john.doe@example.com'
+
         name = await input({ message: 'What is your name?', default: name })
         email = await input({ message: 'What is your email?', default: email })
-        const notifications = true
+        const notifications = await confirm({ message: 'Enable notifications?', default: true })
 
         await initializePaths()
         await saveSettings({ name, email, notifications })
@@ -27,15 +28,7 @@ async function configure() {
 
         const name = await input({ message: 'What is your name?', default: settings.name })
         const email = await input({ message: 'What is your email?', default: settings.email })
-        const notificationsInput = await select({
-            message: 'Enable notifications?',
-            choices: [
-                { name: 'Yes', value: 'yes' },
-                { name: 'No', value: 'no' },
-            ],
-            default: settings.notifications ? 'yes' : 'no',
-        })
-        const notifications = notificationsInput === 'yes'
+        const notifications = await confirm({ message: 'Enable notifications?', default: settings.notifications })
 
         await saveSettings({ name, email, notifications })
 

package/toolkit/verify.ts

@@ -1,5 +1,5 @@
+import { newMaker } from '@/lib/maker'
 import { Command } from '@commander-js/extra-typings'
-import { newMaker, type MakerOptions } from '@/lib/maker'
 import { normalize } from 'path'
 
 export const verify = new Command('verify')