@jutge.org/toolkit 4.4.9 → 4.4.17

package/toolkit/make.ts

@@ -243,27 +243,27 @@ async function runWatch(maker: Maker): Promise<void> {
         tui.print('╭───╮ ╭───╮ ╭───╮ ╭───╮ ')
         tui.print(
             '│ ' +
-            chalk.bold('A') +
-            ' │ │ ' +
-            chalk.bold('L') +
-            ' │ │ ' +
-            chalk.bold('H') +
-            ' │ │ ' +
-            chalk.bold('Q') +
-            ' │ ',
+                chalk.bold('A') +
+                ' │ │ ' +
+                chalk.bold('L') +
+                ' │ │ ' +
+                chalk.bold('H') +
+                ' │ │ ' +
+                chalk.bold('Q') +
+                ' │ ',
         )
         tui.print('╰───╯ ╰───╯ ╰───╯ ╰───╯ ')
         tui.print('  ♻️     🔍    ❓    🚫')
         tui.print(
             ' ' +
-            chalk.blue('All') +
-            '  ' +
-            chalk.blue('Lint') +
-            '   ' +
-            chalk.blue('Help') +
-            '  ' +
-            chalk.blue('Quit') +
-            ' ',
+                chalk.blue('All') +
+                '  ' +
+                chalk.blue('Lint') +
+                '   ' +
+                chalk.blue('Help') +
+                '  ' +
+                chalk.blue('Quit') +
+                ' ',
         )
         tui.print(chalk.gray('Waiting for changes or keypress...'))
     }
@@ -291,11 +291,7 @@ async function runWatch(maker: Maker): Promise<void> {
             }
         } else if (/^problem\.\w+\.tex$/.test(name)) {
             pending.statementTex = true
-        } else if (
-            name === 'handler.yml' ||
-            name === 'problem.yml' ||
-            /^problem\.\w+\.yml$/.test(name)
-        ) {
+        } else if (name === 'handler.yml' || name === 'problem.yml' || /^problem\.\w+\.yml$/.test(name)) {
             pending.ymlSchema = true
         }
         scheduleRun()
@@ -309,7 +305,9 @@ async function runWatch(maker: Maker): Promise<void> {
     await new Promise<void>((resolveExit, rejectExit) => {
         function printHelp() {
             tui.print()
-            tui.print('Under watch mode, the toolkit automatically rebuilds the necessary files in the problem directory when you make changes to your files.')
+            tui.print(
+                'Under watch mode, the toolkit automatically rebuilds the necessary files in the problem directory when you make changes to your files.',
+            )
             tui.print(
                 [
                     'Key bindings:',
@@ -320,7 +318,6 @@ async function runWatch(maker: Maker): Promise<void> {
                     '  Q     Quit watch mode',
                     '',
                 ].join('\n'),
-
             )
             tui.print('The watch mode is under development. Please report any issues to the developers.')
             printIdleMessage()

package/toolkit/quiz.ts

@@ -1,44 +1,52 @@
 import { Command } from '@commander-js/extra-typings'
-import { makeQuiz, validateQuiz } from '../lib/quiz'
+import { runQuiz, lintQuiz } from '../lib/quiz'
 import tui from '../lib/tui'
 import { findRealDirectories } from '../lib/helpers'
 import { random } from 'radash'
 
 export const quizCmd = new Command('quiz')
-    .description('Commands related to quizzes')
+    .summary('Commands related to quizzes')
 
     .action(() => {
         quizCmd.help()
     })
 
 quizCmd
-    .command('validate')
-    .description('Validate a quiz problem')
+    .command('lint')
+    .summary('Lint a quiz problem')
 
     .option('-d, --directory <directory>', 'problem directory', '.')
 
     .action(async ({ directory }) => {
         const realDirectories = await findRealDirectories([directory])
         for (const directory of realDirectories) {
-            await tui.section(`Validating quiz in directory ${tui.hyperlink(directory)}`, async () => {
-                await validateQuiz(directory)
+            await tui.section(`Linting quiz in directory ${tui.hyperlink(directory)}`, async () => {
+                await lintQuiz(directory)
             })
         }
     })
 
 quizCmd
-    .command('make')
-    .description('Make a quiz problem')
+    .command('run')
+    .summary('Run a quiz problem')
+    .description(
+        `Run a quiz problem. This command is work-in-progress and may not work as expected yet.
+
+This command will run the quiz problem and print the resulting object to stdout.
+A random seed will be generated if not provided.
+`,
+    )
 
     .option('-d, --directory <directory>', 'problem directory', '.')
     .option('-s, --seed <seed>', 'random seed')
+    .option('-f, --format <format>', 'output format (json|yaml)', 'json')
 
-    .action(async ({ directory, seed }) => {
-        tui.warning('The quiz make command is work-in-progress and may not work as expected yet.')
-        const realDirectories = await findRealDirectories([directory])
+    .action(async ({ directory, seed, format }) => {
         const seedValue = seed ? parseInt(seed, 10) : random(1000000, 9999999)
-        for (const directory of realDirectories) {
-            await makeQuiz(directory, seedValue)
-            return // in this case we only process one directory as quizzes should only have one language
+        const object = await runQuiz(directory, seedValue)
+        if (format === 'json') {
+            tui.json(object)
+        } else {
+            tui.yaml(object)
         }
     })

package/toolkit/share.ts

@@ -2,11 +2,11 @@ import { password } from '@inquirer/prompts'
 import { Command } from '@commander-js/extra-typings'
 import { updateSharingSettings } from '../lib/share'
 
-
 export const cmdShare = new Command('share')
     .summary('Update and show sharing settings')
 
-    .description(`Update and show sharing settings
+    .description(
+        `Update and show sharing settings
 
 First, this command updates the sharing settings in problem.yml file with the ones on Jutge.org to ensure they are consistent.
 
@@ -18,7 +18,8 @@ Then, it updates the sharing settings in Jutge.org with the requested changes. T
     --solutions Share solutions
     --no-solutions Stop sharing solutions
 
-Finally, it updates problem.yml file with the current sharing settings and shows them.`)
+Finally, it updates problem.yml file with the current sharing settings and shows them.`,
+    )
 
     .option('-d, --directory <directory>', 'problem directory', '.')
     .option('--passcode [code]', 'Set a passcode (prompted if omitted)')
@@ -46,4 +47,4 @@ Finally, it updates problem.yml file with the current sharing settings and shows
         const solutions = this.getOptionValueSource('solutions') !== 'default' ? opts.solutions : undefined
 
         await updateSharingSettings(opts.directory, { passcode, testcases, solutions })
-    })
+    })

package/toolkit/submit.ts

@@ -10,7 +10,10 @@ export const submitCmd = new Command('submit')
     .option('-c, --compiler <id>', 'compiler to use (default: auto-detect from file extension)', 'auto')
     .option('-l, --language <code>', 'language code (ca, es, en, ...)', 'en')
     .option('-n, --no-wait', 'do not wait for submissions to be judged')
-    .option('--no-browser', 'do not open the submission URL in the browser (only print URL and/or wait for verdict in terminal)')
+    .option(
+        '--no-browser',
+        'do not open the submission URL in the browser (only print URL and/or wait for verdict in terminal)',
+    )
     .option('-a, --annotation <annotation>', "annotation for the submission (default: 'jtk-submit-<nanoid16>')")
 
     .action(async (programs, { directory, compiler, language, wait, browser, annotation }) => {