@jpetit/toolkit 3.1.2 → 3.1.3

package/lib/versions.ts

@@ -1,10 +1,11 @@
 import { execSync } from 'child_process'
 import { join } from 'path'
 import semver from 'semver'
+import { PackageJson } from 'zod-package-json'
 import tui from './tui'
 import { nothing, projectDir, readJson } from './utils'
 
-const packageJson = await readJson(join(projectDir(), 'package.json'))
+export const packageJson = PackageJson.parse(await readJson(join(projectDir(), 'package.json')))
 
 export async function checkVersion(): Promise<void> {
     const currentVersion = await getCurrentVersion()
@@ -20,7 +21,7 @@ export async function checkVersion(): Promise<void> {
 
 export async function getCurrentVersion(): Promise<string> {
     await nothing()
-    return packageJson.version as string
+    return packageJson.version
 }
 
 export async function getLatestPublishedVersion(): Promise<string> {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@jpetit/toolkit",
     "description": "Toolkit to prepare problems for Jutge.org",
-    "version": "3.1.2",
+    "version": "3.1.3",
     "homepage": "https://jutge.org",
     "author": {
         "name": "Jutge.org",

package/toolkit/about.ts

@@ -1,11 +1,8 @@
 import { Command } from '@commander-js/extra-typings'
 import chalk from 'chalk'
-import { nothing, projectDir, readJson } from '../lib/utils.ts'
-import { join } from 'path'
-import { PackageJson } from 'zod-package-json'
 import tui from '../lib/tui.ts'
-
-const packageJson = PackageJson.parse(await readJson(join(projectDir(), 'package.json')))
+import { nothing } from '../lib/utils.ts'
+import { packageJson } from '../lib/versions.ts'
 
 export const aboutCmd = new Command('about')
     .description('Get information about jutge-toolkit')
@@ -13,20 +10,20 @@ export const aboutCmd = new Command('about')
     .action(async () => {
         await nothing()
         tui.print(chalk.bold(`jutge-toolkit ${packageJson.version}`))
-        tui.print(packageJson.description!)
+        tui.print(packageJson.description)
         tui.print('')
         tui.url(packageJson.homepage!)
         tui.print('')
         tui.print('Author:')
-        showperson(packageJson.author!)
+        showPerson(packageJson.author!)
         tui.print('')
         tui.print('Contributors:')
         for (const contributor of packageJson.contributors!) {
-            showperson(contributor)
+            showPerson(contributor)
         }
     })
 
-function showperson(person: string | { name: string; email?: string; url?: string }) {
+function showPerson(person: string | { name: string; email?: string; url?: string }) {
     let line = '    - '
     if (typeof person === 'string') {
         line += person

package/toolkit/index.ts

@@ -18,13 +18,12 @@ import { generateCmd } from './generate'
 import { makeCmd } from './make'
 import { upgradeCmd } from './upgrade'
 import { uploadCmd } from './upload'
+import { packageJson } from '../lib/versions'
 
-const packageJson = await readJson(join(projectDir(), 'package.json'))
-
-program.name('jutge-toolkit')
-program.alias('jtk')
-program.version(packageJson.version as string)
-program.description(packageJson.description as string)
+program.name(Object.keys(packageJson.bin as Record<string, string>)[0] as string)
+program.alias(Object.keys(packageJson.bin as Record<string, string>)[1] as string)
+program.version(packageJson.version)
+program.description(packageJson.description!)
 program.helpCommand('help [command]', 'Display help for command') // To get the message with uppercase :-)
 
 program.addCommand(configCmd)

package/toolkit/upgrade.ts

@@ -1,8 +1,8 @@
 import { Command } from '@commander-js/extra-typings'
-import { upgrade } from 'lib/versions'
+import { upgrade } from '../lib/versions'
 
 export const upgradeCmd = new Command('upgrade')
-    .description('Upgrade Jutge Toolkit to the latest version')
+    .description('Upgrade to the latest version')
 
     .action(async () => {
         await upgrade()

package/toolkit/upload.ts

@@ -7,7 +7,7 @@ export const uploadCmd = new Command('upload')
     .description(
         `Upload problem to Jutge.org
 
-If problem.yml exists, the problem will be updated at Jutge.org using that information.
+If problem.yml exists, the problem will be updated at Jutge.org using that information (which includes its problem id).
 If problem.yml does not exist, a new problem will be created at Jutge.org and problem.yml will be generated.
 `,
     )