WIP: echo-help.ts and HelpError progress

Author: balupton

commands/echo-help.ts

@@ -11,6 +11,7 @@ class UsageError extends HelpError {
 	override help = [
 		'USAGE:',
 		'`echo-help.ts --test`',
+		'`echo-help.ts --help`',
 		'`echo-help.ts [...<styled error messages>] < template.txt`',
 		'',
 		'NOTE:',
@@ -21,16 +22,14 @@ class UsageError extends HelpError {
 // Execute
 async function main(...args: string[]) {
 	const help = await readStdinWhole()
-	class CustomError extends HelpError {
-		override help: help
-		override code: 0
-	}
-	return new CustomError(...args)
+	throw new HelpError({help, code: 0}, ...args)
 }
 
 // invoke command or tests
 try {
-	if (Deno.args.join('') == '--test' ) {
+	if (Deno.args.join('') == '--help' ) {
+		throw new UsageError()
+	} else if (Deno.args.join('') == '--test' ) {
 		await exec(['eval-tester', '--fixture=echo-help', '--', 'echo-help.ts'])
 	} else {
 		await main(...Deno.args)

commands/eval-tester

@@ -222,8 +222,8 @@ function eval_tester() (
 			if [[ -z $fixture_option_close ]]; then
 				if [[ "${fixture_content:i:split_length}" == "$split" ]]; then
 					i=$((i + split_length - 2)) # include the trailing newline in the next match
-					fixture_count="$((fixture_count + 1))"
 					if [[ ${#fixture_options[@]} -ne 0  ]]; then
+						fixture_count="$((fixture_count + 1))"
 						if [[ -z $fixture_name ]]; then
 							if [[ -n $option_name ]]; then
 								fixture_name="${option_name}: fixture #$fixture_count"

sources/ts.ts

@@ -721,10 +721,21 @@ export class CodeError extends Error {
 export class HelpError extends Error {
 	readonly help: string = ''
 	readonly messages: string[] = []
-	readonly code = 22
-	constructor(...messages: string[]) {
+	readonly code: number = 22
+	constructor(config: { help?: string; code?: number }, ...messages: string[])
+	constructor(...messages: string[])
+	constructor(
+		first?: string | { help?: string; code?: number },
+		...rest: string[]
+	) {
 		super()
-		this.messages = messages
+		if (typeof first === 'object' && first !== null) {
+			if (first.help != null) this.help = first.help
+			if (first.code != null) this.code = first.code
+			this.messages = rest
+		} else if (typeof first === 'string') {
+			this.messages = [first, ...rest]
+		}
 	}
 	public override toString(): string {
 		if (this.messages.length) {
@@ -758,7 +769,7 @@ export async function exec(cmd: string[]): Promise<void> {
 	}
 }
 
-export type AssertValues<T extends readonly unknown[]> = T[number]
+export type AssertFactoryValues<T extends readonly unknown[]> = T[number]
 export function assertFactory<T extends readonly unknown[]>(
 	values: T,
 	typeName: string,
@@ -807,7 +818,7 @@ export function asError(value: unknown): Error {
 
 export async function exitWithError(error?: unknown, status?: number) {
 	if (status == null || status < 0) {
-		if (error instanceof CodeError) {
+		if (error instanceof CodeError || error instanceof HelpError) {
 			status = error.code ?? 1
 		} else {
 			status = 1