@jpetit/toolkit 3.0.16 → 3.0.18

package/lib/cleaner.ts

@@ -1,4 +1,4 @@
-import tui from '@/lib/tui'
+import tui from './tui'
 import { confirm } from '@inquirer/prompts'
 import { readdir, rm } from 'fs/promises'
 import { join } from 'path'

package/lib/compilers/base.ts

@@ -1,9 +1,9 @@
-import tui from '@/lib/tui'
+import tui from '..//tui'
 import { execa } from 'execa'
 import { exists, rm } from 'fs/promises'
 import { join, sep } from 'path'
-import { readText } from '@/lib/utils'
-import type { Handler } from '@/lib/types'
+import { readText } from '..//utils'
+import type { Handler } from '..//types'
 
 export type CompilerInfo = {
     compiler_id: string

package/lib/compilers/clojure.ts

@@ -1,7 +1,7 @@
 // TODO: all!
 
-import { type Handler } from '@/lib/types'
-import { nothing } from '@/lib/utils'
+import { type Handler } from '..//types'
+import { nothing } from '..//utils'
 import { Compiler } from './base'
 
 export class Clojure_Compiler extends Compiler {

package/lib/compilers/gcc.ts

@@ -1,5 +1,5 @@
-import { type Handler } from '@/lib/types'
-import tui from '@/lib/tui'
+import { type Handler } from '..//types'
+import tui from '..//tui'
 import { Compiler } from './base'
 import { rm, exists } from 'fs/promises'
 import { join } from 'path'

package/lib/compilers/ghc.ts

@@ -1,5 +1,5 @@
-import { type Handler } from '@/lib/types'
-import tui from '@/lib/tui'
+import { type Handler } from '..//types'
+import tui from '..//tui'
 import { Compiler } from './base'
 import { rm, exists } from 'fs/promises'
 import { join } from 'path'

package/lib/compilers/gxx.ts

@@ -1,10 +1,9 @@
-import { rm, exists } from 'fs/promises'
-import { Compiler } from './base'
-import tui from '@/lib/tui'
-import { join } from 'path'
 import { execa } from 'execa'
-import { type Handler } from '@/lib/types'
-import { stderr } from 'process'
+import { exists, rm } from 'fs/promises'
+import { join } from 'path'
+import tui from '../tui'
+import { type Handler } from '../types'
+import { Compiler } from './base'
 
 export class GXX_Compiler extends Compiler {
     id(): string {

package/lib/compilers/index.ts

@@ -1,4 +1,4 @@
-import { nothing } from '@/lib/utils'
+import { nothing } from '../utils'
 import { Compiler, type CompilerInfo } from './base'
 import { GCC_Compiler } from './gcc'
 import { GXX_Compiler } from './gxx'

package/lib/compilers/python3.ts

@@ -1,10 +1,10 @@
-import tui from '@/lib/tui'
+import tui from '../tui'
 import { execa } from 'execa'
 import { cp, exists, rm } from 'fs/promises'
 import { join } from 'path'
-import { readText, writeText } from '@/lib/utils'
+import { readText, writeText } from '../utils'
 import { Compiler } from './base'
-import type { Handler } from '@/lib/types'
+import type { Handler } from '../types'
 
 export class Python3_Compiler extends Compiler {
     id(): string {

package/lib/compilers/run-haskell.ts

@@ -1,10 +1,10 @@
-import tui from '@/lib/tui'
+import tui from '../tui'
 import { execa } from 'execa'
 import { cp, exists, rm } from 'fs/promises'
 import { join } from 'path'
-import { readText, writeText } from '@/lib/utils'
+import { readText, writeText } from '../utils'
 import { Compiler } from './base'
-import type { Handler } from '@/lib/types'
+import type { Handler } from '../types'
 
 export class RunHaskell_Compiler extends Compiler {
     id(): string {

package/lib/compilers/run-python.ts

@@ -1,10 +1,10 @@
-import tui from '@/lib/tui'
+import tui from '../tui'
 import { execa } from 'execa'
 import { cp, exists, rm } from 'fs/promises'
 import { join } from 'path'
-import { readText, writeText } from '@/lib/utils'
+import { readText, writeText } from '../utils'
 import { Compiler } from './base'
-import type { Handler } from '@/lib/types'
+import type { Handler } from '../types'
 
 export class RunPython_Compiler extends Compiler {
     id(): string {

package/lib/doctor.ts

@@ -1,4 +1,4 @@
-import tui from '@/lib/tui'
+import tui from './tui'
 import { execa } from 'execa'
 import { nothing } from './utils'
 import terminalLink from 'terminal-link'

package/lib/generate.ts

@@ -1,5 +1,5 @@
-import { ChatBot, cleanMardownCodeString, estimatePowerConsumption } from '@/lib/ai'
-import tui from '@/lib/tui'
+import { ChatBot, cleanMardownCodeString, estimatePowerConsumption } from './ai'
+import tui from './tui'
 import chalk from 'chalk'
 import { appendFile, mkdir } from 'fs/promises'
 import { oraPromise } from 'ora'

package/lib/maker.ts

@@ -1,5 +1,5 @@
-import tui from '@/lib/tui'
-import { filesAreEqual, fileSize, nothing, projectDir, readText, readYaml, writeText } from '@/lib/utils'
+import tui from '../lib/tui'
+import { filesAreEqual, fileSize, nothing, projectDir, readText, readYaml, writeText } from '../lib/utils'
 import chalk from 'chalk'
 import { execa } from 'execa'
 import { cp, exists, glob, mkdir, mkdtemp, rename } from 'fs/promises'
@@ -126,6 +126,8 @@ export class Maker {
                 tui.yaml(this.problemYmls[language])
             })
         }
+
+        this.language = basename(this.directory)
     }
 
     private async loadHandler() {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@jpetit/toolkit",
     "description": "Toolkit to prepare problems for Jutge.org",
-    "version": "3.0.16",
+    "version": "3.0.18",
     "publishConfig": {
         "access": "public"
     },
@@ -14,9 +14,8 @@
         "depcheck": "bunx depcheck"
     },
     "files": [
-        "dist",
-        "toolkit",
         "lib",
+        "toolkit",
         "assets"
     ],
     "dependencies": {

package/toolkit/ai.ts

@@ -1,5 +1,5 @@
 import { Command } from '@commander-js/extra-typings'
-import { complete, listModels } from '@/lib/ai.ts'
+import { complete, listModels } from '../lib/ai.ts'
 
 export const ai = new Command('ai').description('Query AI models')
 

package/toolkit/clean.ts

@@ -1,5 +1,5 @@
-import { cleanFiles } from '@/lib/cleaner'
-import tui from '@/lib/tui'
+import { cleanFiles } from '../lib/cleaner'
+import tui from '../lib/tui'
 import { Command, Option } from '@commander-js/extra-typings'
 import { resolve } from 'path'
 

package/toolkit/compilers.ts

@@ -1,4 +1,4 @@
-import { getAvailableCompilers, getCompilersInfo, getDefinedCompilerIds } from '@/lib/compilers'
+import { getAvailableCompilers, getCompilersInfo, getDefinedCompilerIds } from '../lib/compilers'
 import { Command } from '@commander-js/extra-typings'
 
 export const compilers = new Command('compilers')

package/toolkit/create-jutge-ai.ts

@@ -1,7 +1,7 @@
-import { generateProblemWithJutgeAI, type ProblemData } from '@/lib/generate'
-import { guessUserEmail, guessUserName } from '@/lib/utils'
+import { generateProblemWithJutgeAI, type ProblemData } from '../lib/generate'
+import { guessUserEmail, guessUserName } from '../lib/utils'
 import { checkbox, input, select } from '@inquirer/prompts'
-import tui from '@/lib/tui'
+import tui from '../lib/tui'
 import humanId from 'human-id'
 import slug from 'slug'
 

package/toolkit/create-template.ts

@@ -1,5 +1,5 @@
-import tui from '@/lib/tui'
-import { isDirectory, projectDir, readText } from '@/lib/utils'
+import tui from '../lib/tui'
+import { isDirectory, projectDir, readText } from '../lib/utils'
 import { confirm, select, Separator } from '@inquirer/prompts'
 import { cp, glob } from 'fs/promises'
 import { join } from 'path'

package/toolkit/create-wizard.ts

@@ -1,4 +1,4 @@
-import { nothing } from '@/lib/utils'
+import { nothing } from '../lib/utils'
 
 export async function createProblemWithWizard(outputDir: string): Promise<void> {
     await nothing()

package/toolkit/create.ts

@@ -1,4 +1,4 @@
-import tui from '@/lib/tui'
+import tui from '../lib/tui'
 import { Command } from '@commander-js/extra-typings'
 import { confirm, input, select } from '@inquirer/prompts'
 import { exists, mkdir, rm } from 'fs/promises'

package/toolkit/doctor.ts

@@ -1,6 +1,6 @@
-import * as doc from '@/lib/doctor'
+import * as doc from '../lib/doctor'
 import { Command } from '@commander-js/extra-typings'
-import tui from '@/lib/tui'
+import tui from '../lib/tui'
 
 export const doctor = new Command('doctor')
     .description('Diagnose and fix common issues with the project setup')

package/toolkit/generate.ts

@@ -1,11 +1,11 @@
-import tui from '@/lib/tui'
-import { Maker, newMaker, type MakerOptions } from '@/lib/maker'
-import { guessUserEmail, guessUserName, nothing, readText, writeText, writeYaml } from '@/lib/utils'
+import tui from '../lib/tui'
+import { Maker, newMaker, type MakerOptions } from '../lib/maker'
+import { guessUserEmail, guessUserName, nothing, readText, writeText, writeYaml } from '../lib/utils'
 import { Command } from '@commander-js/extra-typings'
-import { languageNames } from '@/lib/data'
+import { languageNames } from '../lib/data'
 import { join } from 'path'
-import { cleanMardownCodeString, complete } from '@/lib/ai'
-import { getTitleFromStatement } from '@/lib/generate'
+import { cleanMardownCodeString, complete } from '../lib/ai'
+import { getTitleFromStatement } from '../lib/generate'
 import { writeFile } from 'fs/promises'
 import * as jdenticon from 'jdenticon'
 

package/toolkit/init.ts

@@ -1,6 +1,6 @@
-import { initializePaths, loadSettings, paths, saveSettings, settingsExist } from '@/lib/settings'
-import tui from '@/lib/tui'
-import { guessUserEmail, guessUserName, nothing } from '@/lib/utils'
+import { initializePaths, loadSettings, paths, saveSettings, settingsExist } from '../lib/settings'
+import tui from '../lib/tui'
+import { guessUserEmail, guessUserName, nothing } from '../lib/utils'
 import { Command } from '@commander-js/extra-typings'
 import { confirm, input } from '@inquirer/prompts'
 import chalk from 'chalk'

package/toolkit/make.ts

@@ -1,9 +1,9 @@
-import tui from '@/lib/tui'
-import { newMaker, type MakerOptions } from '@/lib/maker'
-import { nothing, projectDir } from '@/lib/utils'
+import tui from '../lib/tui'
+import { newMaker, type MakerOptions } from '../lib/maker'
+import { nothing, projectDir } from '../lib/utils'
 import { Command } from '@commander-js/extra-typings'
-import { join, resolve } from 'path'
-import { languageNames } from '@/lib/data'
+import { join, normalize, resolve } from 'path'
+import { languageNames } from '../lib/data'
 import { exists } from 'fs/promises'
 
 /*
@@ -13,7 +13,10 @@ import { exists } from 'fs/promises'
 */
 async function findRealDirectories(directories: string[]): Promise<string[]> {
     const realDirectories: string[] = []
-    for (const dir of directories) {
+    for (let dir of directories) {
+        if (dir === '.') {
+            dir = normalize(resolve(process.cwd()))
+        }
         if (await exists(join(dir, 'handler.yml'))) {
             realDirectories.push(dir)
         } else {

package/toolkit/verify.ts

@@ -1,4 +1,4 @@
-import { newMaker } from '@/lib/maker'
+import { newMaker } from '../lib/maker'
 import { Command } from '@commander-js/extra-typings'
 import { normalize } from 'path'