versia-pub/server
2
0
Fork 0
mirror of https://github.com/versia-pub/server.git synced 2025-12-06 16:38:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug with ANSI color codes messing up help display

Browse source
This commit is contained in:
Jesse Wierzbinski 2024-03-11 18:06:58 -10:00
parent 8016a04e8f
commit cbc6f46103
No known key found for this signature in database
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
packages/cli-parser/index.ts
View file

@ -1,5 +1,6 @@
import { CliParameterType, type CliParameter } from "./cli-builder.type"; import { CliParameterType, type CliParameter } from "./cli-builder.type";
import chalk from "chalk"; import chalk from "chalk";
import strip from "strip-ansi";
export function startsWithArray(fullArray: any[], startArray: any[]) { export function startsWithArray(fullArray: any[], startArray: any[]) {
if (startArray.length > fullArray.length) { if (startArray.length > fullArray.length) {
@ -103,7 +104,7 @@ export class CliBuilder {
* Turn raw system args into a CLI command and run it * Turn raw system args into a CLI command and run it
* @param args Args directly from process.argv * @param args Args directly from process.argv
*/ */
processArgs(args: string[]) { async processArgs(args: string[]) {
const revelantArgs = this.getRelevantArgs(args); const revelantArgs = this.getRelevantArgs(args);
// Find revelant command // Find revelant command
// Search for a command with as many categories matching args as possible // Search for a command with as many categories matching args as possible
@ -116,9 +117,9 @@ export class CliBuilder {
prev.categories.length > current.categories.length ? prev : current prev.categories.length > current.categories.length ? prev : current
); );
const argsWithoutCategories = args.slice(command.categories.length - 1); const argsWithoutCategories = revelantArgs.slice(command.categories.length);
command.run(argsWithoutCategories); return await command.run(argsWithoutCategories);
} }
/** /**
@ -237,17 +238,21 @@ export class CliBuilder {
: 0; : 0;
if (!current.includes("|")) return prev; if (!current.includes("|")) return prev;
const [left] = current.split("|"); const [left] = current.split("|");
return Math.max(Number(prev), left.length); // Strip ANSI color codes or they mess up the length
return Math.max(Number(prev), strip(left).length);
}) })
); );
console.log(optimal_length)
for (const line of writeBuffer.split("\n")) { for (const line of writeBuffer.split("\n")) {
const [left, right] = line.split("|"); const [left, right] = line.split("|");
if (!right) { if (!right) {
console.log(left); console.log(left);
continue; continue;
} }
const dots = ".".repeat(optimal_length + 5 - left.length); // Strip ANSI color codes or they mess up the length
const dots = ".".repeat(optimal_length + 5 - strip(left).length);
console.log(`${left}${dots}${right}`); console.log(`${left}${dots}${right}`);
} }
} }
@ -256,7 +261,7 @@ export class CliBuilder {
type ExecuteFunction<T> = ( type ExecuteFunction<T> = (
instance: CliCommand, instance: CliCommand,
args: Partial<T> args: Partial<T>
) => Promise<void> | void; ) => Promise<number> | Promise<void> | number | void;
/** /**
* A command that can be executed from the command line * A command that can be executed from the command line
@ -391,8 +396,8 @@ ${unpositionedArgs
/** /**
* Runs the execute function with the parsed parameters as an argument * Runs the execute function with the parsed parameters as an argument
*/ */
run(argsWithoutCategories: string[]) { async run(argsWithoutCategories: string[]) {
const args = this.parseArgs(argsWithoutCategories); const args = this.parseArgs(argsWithoutCategories);
void this.execute(this, args as any); return await this.execute(this, args as any);
} }
} }