@jutge.org/toolkit 4.2.2 → 4.2.4

package/docs/getting-started-guide.md

@@ -69,12 +69,6 @@ Choose the installation instructions for your operating system:
         sudo apt-get install pandoc
         ```
 
-    - **ImageMagick** (for image processing):
-
-        ```bash
-        sudo apt-get install imagemagick
-        ```
-
     - **Python 3** (if using Python in your problems):
 
         ```bash
@@ -141,12 +135,6 @@ Choose the installation instructions for your operating system:
         brew install pandoc
         ```
 
-    - **ImageMagick** (for image processing):
-
-        ```bash
-        brew install imagemagick
-        ```
-
     - **Python 3** (if using Python):
 
         ```bash
@@ -206,12 +194,6 @@ Choose the installation instructions for your operating system:
         winget install --id JohnMacFarlane.Pandoc
         ```
 
-    - **ImageMagick** (for image processing):
-
-        ```powershell
-        winget install --id ImageMagick.ImageMagick
-        ```
-
     - **Python 3** (if using Python):
 
         Install from https://www.python.org/downloads/windows/. Make sure to check "Add Python to PATH" during installation.

package/docs/windows.md

@@ -59,14 +59,6 @@ jtk --version
     winget install --id JohnMacFarlane.Pandoc
     ```
 
-- Image Magick: ImageMagick is required to process images in problem statements. It is not necessary but recommended.
-
-    Install it easily using the Windows Package Manager (`winget`):
-
-    ```powershell
-    winget install --id ImageMagick.ImageMagick
-    ```
-
 - Python 3: You only need Python 3 if you plan to use Python scripts in your problems.
 
     Install Python from https://www.python.org/downloads/windows/. Make sure to check the option to add Python to the system PATH during installation. The toolkit uses `python3` command to run Python scripts.

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@jutge.org/toolkit",
     "description": "Toolkit to prepare problems for Jutge.org",
-    "version": "4.2.2",
+    "version": "4.2.4",
     "homepage": "https://jutge.org",
     "author": {
         "name": "Jutge.org",
@@ -28,13 +28,14 @@
     "type": "module",
     "bin": {
         "jutge-toolkit": "dist/index.js",
-        "jtk": "dist/index.js"
+        "jtk": "dist/index.js",
+        "dev": "toolkit/index.ts"
     },
     "scripts": {
         "lint": "eslint .",
         "format": "bun prettier --write .",
         "depcheck": "bunx depcheck",
-        "dev": "bun build --target bun --minify --outfile dist/index.js ./toolkit --watch",
+        "dev": "bun build --target bun --outfile dist/index.js ./toolkit --watch",
         "build": "bun build --target bun --minify --outfile dist/index.js ./toolkit ",
         "update-jutge-client": "(cd lib ; rm -f jutge_api_client.ts ; https --download https://api.jutge.org/clients/download/typescript)"
     },
@@ -47,15 +48,17 @@
     "dependencies": {
         "@commander-js/extra-typings": "^14.0.0",
         "@eslint/js": "^9.39.2",
-        "@inquirer/prompts": "^8.1.0",
+        "@inquirer/prompts": "^8.2.0",
         "archiver": "^7.0.1",
         "boxen": "^8.0.1",
         "bun-types": "^1.3.5",
         "chalk": "^5.6.2",
+        "cli-highlight": "^2.1.11",
         "commander": "^14.0.2",
         "env-paths": "^3.0.0",
         "eslint": "^9.39.2",
         "execa": "^9.6.1",
+        "extract-zip": "^2.0.1",
         "gpt-tokenizer": "^3.4.0",
         "handlebars": "^4.7.8",
         "image-size": "^2.0.2",
@@ -75,18 +78,18 @@
         "terminal-image": "^4.1.0",
         "terminal-link": "^5.0.0",
         "tree-node-cli": "^1.6.0",
-        "typescript-eslint": "^8.51.0",
         "yaml": "^2.8.2",
         "zod": "^4.3.4",
         "zod-package-json": "^2.1.0",
         "zod-validation-error": "^5.0.0"
     },
     "devDependencies": {
+        "typescript-eslint": "^8.51.0",
         "@types/archiver": "^7.0.0",
         "@types/image-size": "^0.8.0",
         "@types/marked": "^6.0.0",
         "@types/marked-terminal": "^6.1.1",
-        "@types/node": "^25.0.3",
+        "@types/node": "^25.0.7",
         "@types/ora": "^3.2.0",
         "@types/semver": "^7.7.1"
     },

package/toolkit/doctor.ts

@@ -14,8 +14,8 @@ export const doctorCmd = new Command('doctor')
             await tui.section('Checking Java installation', doc.checkJava)
             await tui.section('Checking Rust installation', doc.checkRust)
             await tui.section('Checking XeLaTeX installation', doc.checkXeLaTeX)
+            await tui.section('Checking PdfLaTeX installation', doc.checkPdfLaTeX)
             await tui.section('Checking Pandoc installation', doc.checkPandoc)
-            await tui.section('Checking ImageMagick installation', doc.checkImageMagick)
             await tui.section('Checking AI models', doc.checkAIEnvVars)
             await tui.section('Checking terminal', doc.checkTerminal)
         })

package/toolkit/generate.ts

@@ -161,16 +161,21 @@ Provide an interesting prompt to customize the image content. For example:
     - "A star made of sparkling diamonds on a black background."
     - "A minimalist image with a white background using Van Gogh style."
 
+If no prompt is provided, the original problem title will be used.
+
 The new image will be saved as award.png in the problem directory, overriding any existing file.`,
     )
 
     .option('-d, --directory <path>', 'problem directory', '.')
     .option('-m, --model <model>', 'graphic AI model to use', 'openai/dall-e-3')
-    .argument('[prompt]', 'prompt to generate the image', 'A colorful image on a white background. ')
+    .argument('[prompt]', 'prompt to generate the image', '')
 
     .action(async (prompt, { directory, model }) => {
         const output = join(directory, 'award.png')
         const problem = await newProblem(directory)
+        if (prompt.trim() === '') {
+            prompt = problem.problemLangYmls[problem.originalLanguage!].title || 'A colorful award'
+        }
         const image = await generateImage(model, prompt)
         await sharp(image).resize(512, 512).toFile(output)
         await tui.image(output, 20, 10)

package/toolkit/index.ts

@@ -25,6 +25,7 @@ program.alias(Object.keys(packageJson.bin as Record<string, string>)[1] as strin
 program.version(packageJson.version)
 program.description(packageJson.description!)
 program.helpCommand('help [command]', 'Display help for command') // To get the message with uppercase :-)
+program.addHelpText('after', '\nMore documentation:\n  https://github.com/jutge-org/new-jutge-toolkit/tree/main/docs')
 
 program.addCommand(configCmd)
 program.addCommand(cloneCmd)

package/toolkit/make.ts

@@ -49,7 +49,7 @@ export const makeCmd = new Command('make')
                         await maker.makeExecutables()
                     }
                     if (tasks.includes('cor')) {
-                        await maker.makeCorrects()
+                        await maker.makeCorrectOutputs()
                     }
                     if (tasks.includes('pdf')) {
                         await maker.makePdfStatements()

package/toolkit/upload.ts

@@ -1,6 +1,5 @@
 import { Command } from '@commander-js/extra-typings'
-import { uploadProblem } from '../lib/upload'
-import { newProblem } from '../lib/problem'
+import { uploadProblemInDirectory } from '../lib/upload'
 
 export const uploadCmd = new Command('upload')
     .summary('Upload problem to Jutge.org')
@@ -15,6 +14,5 @@ If problem.yml does not exist, a new problem will be created at Jutge.org and pr
     .option('-d, --directory <directory>', 'problem directory', '.')
 
     .action(async ({ directory }) => {
-        const problem = await newProblem(directory)
-        await uploadProblem(problem)
+        await uploadProblemInDirectory(directory)
     })