Improvements and fixes

Author: hyperupcall

.lefthook.yaml

@@ -1,2 +1,5 @@
----
 assert_lefthook_installed: true
+pre-commit:
+  commands:
+    deno-lint:
+      run: deno lint

.mise.toml

@@ -1,3 +1,3 @@
 [tools]
 node = "23.6.1"
-deno = "2.2.4"
+deno = "2.4.5"

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
+	"window.title": "${folderName} ${separator}${activeRepositoryBranchName}${separator}${remoteName} (python)",
 	"files.exclude": {
 		"**/.git": true,
 		"**/.data": true,

commands/install.ts

@@ -167,7 +167,7 @@ async function renderMainScreen(char: string) {
 		process.stdout.write(ansiEscapes.cursorRestorePosition)
 		process.stdout.write(ansiEscapes.cursorShow)
 		process.stdout.write(ansiEscapes.exitAlternativeScreen)
-		process.exit()
+		Deno.exit()
 	} else if (char === 'j') {
 		const idx = Projects.findIndex((project) => project.name === Ctx.currentProject)
 		const newIdx = Math.min(Projects.length - 1, idx + 1)
@@ -339,7 +339,7 @@ async function renderUpdateVersionScreen(char: string) {
 	}
 
 	if (char === '\x1B' || char === 'q') {
-		process.exit()
+		Deno.exit()
 	} else if (char === 'j') {
 		currentVersion = Math.min(project.data.versions.length - 1, currentVersion + 1)
 	} else if (char === 'k') {

commands/lint.ts

@@ -10,6 +10,9 @@ import toml from 'smol-toml'
 import { execa } from 'execa'
 import { globby } from 'globby'
 import ansiEscapes from 'ansi-escapes'
+import * as jsonc from 'jsonc-parser'
+import { xdgConfig } from 'xdg-basedir'
+import { getEcosystems } from '../devutils/index.ts'
 
 import type { CommandFixOptions, Config, Issue, Project } from '#types'
 import type { PackageJson } from 'type-fest'
@@ -64,6 +67,35 @@ export async function run(options: CommandFixOptions, positionals: string[]) {
 		return
 	}
 
+	// FIX EDITOR SETTINGS
+	if (await fileExists('.vscode/settings.json')) {
+		const userSettingsJsonFile = path.join(xdgConfig, 'Code/User/settings.json')
+		const defaultTitle =
+			jsonc.parse(await fs.readFile(userSettingsJsonFile, 'utf-8'))['window.title']
+
+		const settingsText = await fs.readFile('.vscode/settings.json', 'utf-8')
+		const settingsJson = jsonc.parse(settingsText)
+		const ecosystem = (await getEcosystems(Deno.cwd()))[0]
+		if (settingsJson['window.title']) {
+			const output = settingsText.replace(
+				/"window\.title"[ \t]*:[ \t]*".*?"/m,
+				`"window.title": "${defaultTitle} (${ecosystem})"`,
+			)
+			await fs.writeFile('.vscode/settings.json', output)
+		} else if (Object.keys(settingsJson).length === 0) {
+			const output = `{
+	"window.title": "${defaultTitle} (${ecosystem})"
+}`
+			await fs.writeFile('.vscode/settings.json', output)
+		} else {
+			const output = settingsText.replace(
+				/[ \t]*{/m,
+				`{\n\t"window.title": "${defaultTitle} (${ecosystem})",`,
+			)
+			await fs.writeFile('.vscode/settings.json', output)
+		}
+	}
+
 	const ruleFiles: string[] = []
 	const collect = async (pattern: string) => {
 		const matches = await globby(pattern, {
@@ -255,34 +287,31 @@ async function fixFromFile(
 			if (shouldRunFix) {
 				await issue.fix()
 			} else {
-				printWithTips(`[${styleText('red', 'FAIL')}] ${fixId}`, [
-					'Failed because the fix function was not executed',
-				])
-				failed = true
-				break
+				console.info(`[${styleText('yellow', 'SKIP')}] ${fixId}`)
+				return
 			}
 		}
 
 		if (!failed) {
 			console.info(`[${styleText('green', 'PASS')}] ${fixId}`)
 		} else {
-			process.exit(1)
+			Deno.exit(1)
 		}
 	} catch (err) {
 		printWithTips(`[${styleText('red', 'FAIL')}] ${fixId}`, [
 			'Failed because an error was caught',
 		])
 		console.error(err)
-		process.exit(1)
+		Deno.exit(1)
 	}
 }
 
 async function getProject(): Promise<Project> {
 	if (!(await fileExists('.git'))) {
 		return {
 			type: 'only-directory',
-			rootDir: process.cwd(),
-			name: path.basename(process.cwd()),
+			rootDir: Deno.cwd(),
+			name: path.basename(Deno.cwd()),
 		}
 	}
 
@@ -321,8 +350,8 @@ async function getProject(): Promise<Project> {
 	if (!remoteName) {
 		return {
 			type: 'under-version-control',
-			rootDir: process.cwd(),
-			name: path.basename(process.cwd()),
+			rootDir: Deno.cwd(),
+			name: path.basename(Deno.cwd()),
 			branchName,
 		}
 	}
@@ -337,12 +366,12 @@ async function getProject(): Promise<Project> {
 			`Failed to extract repository name and owner for remote name "${remoteName}"`,
 			[`Remote name has URL of "${remoteUrl}"`],
 		)
-		process.exit(1)
+		Deno.exit(1)
 	}
 
 	return {
 		type: 'with-remote-url',
-		rootDir: process.cwd(),
+		rootDir: Deno.cwd(),
 		name: match.groups.name,
 		branchName,
 		remoteName,
@@ -351,64 +380,6 @@ async function getProject(): Promise<Project> {
 	}
 }
 
-export async function getEcosystems(rootDir: string): Promise<string[]> {
-	using _ = ((origDir: string) => ({
-		[Symbol.dispose]: () => Deno.chdir(origDir),
-	}))(Deno.cwd())
-	Deno.chdir(rootDir)
-
-	const ecosystems: string[] = []
-
-	if (await fileExists('package.json')) {
-		ecosystems.push('nodejs')
-
-		const content: PackageJson = JSON.parse(
-			await fs.readFile('package.json', 'utf-8'),
-		)
-		if (content.displayName) {
-			ecosystems.push('vscode-extension')
-		}
-	}
-
-	if ((await fileExists('deno.jsonc')) || (await fileExists('deno.json'))) {
-		ecosystems.push('deno')
-	}
-
-	if ((await globby('*.c')).length > 0) {
-		ecosystems.push('c')
-	}
-
-	// https://cmake.org/cmake/help/latest/command/project.html
-	if (await fileExists('CMakeLists.txt')) {
-		const content = await fs.readFile('CMakeLists.txt', 'utf-8')
-		const language = content.match(
-			/project\((?:.*? (?<lang>[a-zA-Z]+)\)|.*?LANGUAGES[ \t]+(?<lang>[a-zA-Z]+))/,
-		)
-		if (language?.groups?.lang === 'C') {
-			ecosystems.push('c')
-		} else if (language?.groups?.lang === 'CXX') {
-			ecosystems.push('cpp')
-		} else {
-			// TODO
-			console.error(
-				`CMAkeLists.txt should have language defined in project()`,
-			)
-			process.exit(1)
-		}
-	}
-
-	if (await fileExists('basalt.toml')) {
-		ecosystems.push('bash')
-	}
-
-	// https://zed.dev/docs/extensions/developing-extensions
-	if (await fileExists('extension.toml')) {
-		ecosystems.push('zed-extension')
-	}
-
-	return ecosystems
-}
-
 function printWithTips(str: string, tips: string[]) {
 	console.info(str)
 	for (const tip of tips) {

commands/new.ts

@@ -1,18 +1,34 @@
 import * as fs from 'node:fs/promises'
 import * as path from 'node:path'
-import * as util from 'node:util'
-import { existsSync } from 'node:fs'
 
-import * as ejs from 'ejs'
-import { globby } from 'globby'
 import { execa } from 'execa'
 import Handlebars from 'handlebars'
 import { fileExists } from '#common'
 import * as inquirer from '@inquirer/prompts'
 
 import type { CommandNewOptions } from '#types'
+import { existsSync } from 'node:fs'
+
+const _dirname = import.meta.dirname
 
 export async function run(values: CommandNewOptions, positionals: string[]) {
+	if (!positionals[0]) {
+		const input = await inquirer.input({
+			message: 'Choose a directory',
+		})
+		positionals = [input]
+	}
+
+	if (!existsSync(positionals[0])) {
+		const input = await inquirer.confirm({
+			message: 'Would you like to create the directory?',
+		})
+
+		if (input) {
+			await fs.mkdir(positionals[0], { recursive: true })
+		}
+	}
+
 	if (!values.ecosystem) {
 		const input = await inquirer.select({
 			message: 'Choose an ecosystem',
@@ -35,7 +51,7 @@ export async function run(values: CommandNewOptions, positionals: string[]) {
 		}
 
 		const value = await inquirer.select({
-			message: `Choose a "${values.ecosystem}" template`,
+			message: `Choose a template`,
 			choices: Object.entries(parameters).map(([id, { name }]) => ({
 				name,
 				value: id,
@@ -58,7 +74,7 @@ export async function run(values: CommandNewOptions, positionals: string[]) {
 		ecosystem: values.ecosystem,
 		templateName: values.templateName,
 		projectName: values.projectName,
-		forceTemplate: values.force,
+		forceTemplate: values.force ?? false,
 		options: (values.options ?? '').split(','),
 	})
 }
@@ -73,7 +89,9 @@ type Context = Readonly<{
 }>
 
 export async function createProject(ctx: Context) {
-	const outputDir = path.resolve(process.cwd(), ctx.dir)
+	if (!_dirname) throw new TypeError('Variable "import.meta.dirname" is not truthy')
+
+	const outputDir = path.resolve(Deno.cwd(), ctx.dir)
 
 	if (!(await fileExists(outputDir))) {
 		await fs.mkdir(outputDir, { recursive: true })
@@ -82,12 +100,12 @@ export async function createProject(ctx: Context) {
 	if (!ctx.forceTemplate) {
 		if ((await fs.readdir(outputDir)).length > 0) {
 			console.error(`Error: Directory must be empty: "${outputDir}"`)
-			process.exit(1)
+			Deno.exit(1)
 		}
 	}
 
 	const templateDir = path.join(
-		import.meta.dirname,
+		_dirname,
 		'../config/templates',
 		ctx.ecosystem,
 		`${ctx.ecosystem}-${ctx.templateName}`,
@@ -107,16 +125,24 @@ export async function createProject(ctx: Context) {
 				const rel = inputFile.slice(templateDir.length + 1)
 				const outputFile = path.join(outputDir, rel)
 
-				let outputContent = ''
-				{
+				try {
 					const template = await fs.readFile(inputFile, 'utf-8')
 					const runtimeTemplate = Handlebars.compile(template)
-					outputContent = runtimeTemplate({
+					const outputContent = runtimeTemplate({
 						key: 'value',
+					}, {
+						helpers: {
+							'raw': function (options: any) {
+								return options.fn()
+							},
+						},
 					})
+					await fs.mkdir(path.dirname(outputFile), { recursive: true })
+					await fs.writeFile(outputFile, outputContent)
+				} catch (err) {
+					console.error(`Failed to template file "${inputFile}"`)
+					throw err
 				}
-				await fs.mkdir(path.dirname(outputFile), { recursive: true })
-				await fs.writeFile(outputFile, outputContent)
 			}
 		}
 	}
@@ -137,8 +163,8 @@ function getTemplateData(): Record<
 				cli: {
 					name: 'CLI',
 				},
-				'web-server': {
-					name: 'Web Server',
+				'web-server-express': {
+					name: 'Web Server (Express)',
 				},
 			},
 			async onRun(ctx) {
@@ -199,11 +225,6 @@ function getTemplateData(): Record<
 					name: 'Playground',
 				},
 			},
-			async onRun(ctx) {
-				await execa('c++', ['run', '.'], {
-					stdio: 'inherit',
-				})
-			},
 		},
 	}
 }