@wq2/brigadier-ts 1.0.1 → 1.0.3

package/dist/index.d.ts

@@ -1,30 +1,30 @@
-export * from "./Command";
-export * from "./Predicate";
-export * from "./context/StringRange";
-export * from "./exceptions/CommandErrorType";
-export * from "./exceptions/CommandSyntaxError";
-export * from "./StringReader";
-export * from "./suggestion/Suggestion";
-export * from "./suggestion/Suggestions";
-export * from "./suggestion/SuggestionsBuilder";
-export * from "./tree/CommandNode";
-export * from "./tree/LiteralCommandNode";
-export * from "./tree/ArgumentCommandNode";
-export * from "./tree/RootCommandNode";
 export * from "./arguments/ArgumentType";
-export * from "./arguments/NumberArgumentType";
+export * from "./arguments/BoolArgumentType";
 export * from "./arguments/FloatArgumentType";
 export * from "./arguments/IntegerArgumentType";
 export * from "./arguments/LongArgumentType";
-export * from "./arguments/BoolArgumentType";
+export * from "./arguments/NumberArgumentType";
 export * from "./arguments/StringArgumentType";
 export * from "./builder/ArgumentBuilder";
 export * from "./builder/LiteralArgumentBuilder";
 export * from "./builder/RequiredArgumentBuilder";
-export * from "./context/ParsedArgument";
-export * from "./context/ParsedCommandNode";
+export * from "./Command";
+export * from "./CommandDispatcher";
 export * from "./context/CommandContext";
 export * from "./context/CommandContextBuilder";
+export * from "./context/ParsedArgument";
+export * from "./context/ParsedCommandNode";
+export * from "./context/StringRange";
 export * from "./context/SuggestionContext";
+export * from "./exceptions/CommandErrorType";
+export * from "./exceptions/CommandSyntaxError";
 export * from "./ParseResults";
-export * from "./CommandDispatcher";
+export * from "./Predicate";
+export * from "./StringReader";
+export * from "./suggestion/Suggestion";
+export * from "./suggestion/Suggestions";
+export * from "./suggestion/SuggestionsBuilder";
+export * from "./tree/ArgumentCommandNode";
+export * from "./tree/CommandNode";
+export * from "./tree/LiteralCommandNode";
+export * from "./tree/RootCommandNode";

package/dist/index.js

@@ -14,33 +14,33 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./Command"), exports);
-__exportStar(require("./Predicate"), exports);
-__exportStar(require("./context/StringRange"), exports);
-__exportStar(require("./exceptions/CommandErrorType"), exports);
-__exportStar(require("./exceptions/CommandSyntaxError"), exports);
-__exportStar(require("./StringReader"), exports);
-__exportStar(require("./suggestion/Suggestion"), exports);
-__exportStar(require("./suggestion/Suggestions"), exports);
-__exportStar(require("./suggestion/SuggestionsBuilder"), exports);
-__exportStar(require("./tree/CommandNode"), exports);
-__exportStar(require("./tree/LiteralCommandNode"), exports);
-__exportStar(require("./tree/ArgumentCommandNode"), exports);
-__exportStar(require("./tree/RootCommandNode"), exports);
 __exportStar(require("./arguments/ArgumentType"), exports);
-__exportStar(require("./arguments/NumberArgumentType"), exports);
+__exportStar(require("./arguments/BoolArgumentType"), exports);
 __exportStar(require("./arguments/FloatArgumentType"), exports);
 __exportStar(require("./arguments/IntegerArgumentType"), exports);
 __exportStar(require("./arguments/LongArgumentType"), exports);
-__exportStar(require("./arguments/BoolArgumentType"), exports);
+__exportStar(require("./arguments/NumberArgumentType"), exports);
 __exportStar(require("./arguments/StringArgumentType"), exports);
 __exportStar(require("./builder/ArgumentBuilder"), exports);
 __exportStar(require("./builder/LiteralArgumentBuilder"), exports);
 __exportStar(require("./builder/RequiredArgumentBuilder"), exports);
-__exportStar(require("./context/ParsedArgument"), exports);
-__exportStar(require("./context/ParsedCommandNode"), exports);
+__exportStar(require("./Command"), exports);
+__exportStar(require("./CommandDispatcher"), exports);
 __exportStar(require("./context/CommandContext"), exports);
 __exportStar(require("./context/CommandContextBuilder"), exports);
+__exportStar(require("./context/ParsedArgument"), exports);
+__exportStar(require("./context/ParsedCommandNode"), exports);
+__exportStar(require("./context/StringRange"), exports);
 __exportStar(require("./context/SuggestionContext"), exports);
+__exportStar(require("./exceptions/CommandErrorType"), exports);
+__exportStar(require("./exceptions/CommandSyntaxError"), exports);
 __exportStar(require("./ParseResults"), exports);
-__exportStar(require("./CommandDispatcher"), exports);
+__exportStar(require("./Predicate"), exports);
+__exportStar(require("./StringReader"), exports);
+__exportStar(require("./suggestion/Suggestion"), exports);
+__exportStar(require("./suggestion/Suggestions"), exports);
+__exportStar(require("./suggestion/SuggestionsBuilder"), exports);
+__exportStar(require("./tree/ArgumentCommandNode"), exports);
+__exportStar(require("./tree/CommandNode"), exports);
+__exportStar(require("./tree/LiteralCommandNode"), exports);
+__exportStar(require("./tree/RootCommandNode"), exports);

package/dist/suggestion/Suggestion.d.ts

@@ -1,4 +1,4 @@
-import type { StringRange } from "..";
+import type { StringRange } from "../context/StringRange";
 export declare class Suggestion {
     private range;
     private text;

package/dist/suggestion/Suggestions.d.ts

@@ -1,4 +1,5 @@
-import { StringRange, type Suggestion } from "..";
+import { StringRange } from "../context/StringRange";
+import type { Suggestion } from "./Suggestion";
 export declare class Suggestions {
     static EMPTY: Suggestions;
     private range;

package/dist/suggestion/Suggestions.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Suggestions = void 0;
-const __1 = require("..");
+const StringRange_1 = require("../context/StringRange");
 class Suggestions {
     constructor(range, suggestions) {
         this.range = range;
@@ -44,7 +44,7 @@ class Suggestions {
             start = Math.min(suggestion.getRange().getStart(), start);
             end = Math.max(suggestion.getRange().getEnd(), end);
         }
-        const range = new __1.StringRange(start, end);
+        const range = new StringRange_1.StringRange(start, end);
         const texts = [];
         for (const suggestion of suggestions) {
             texts.push(suggestion.expand(command, range));
@@ -53,4 +53,4 @@ class Suggestions {
     }
 }
 exports.Suggestions = Suggestions;
-Suggestions.EMPTY = new Suggestions(__1.StringRange.at(0), []);
+Suggestions.EMPTY = new Suggestions(StringRange_1.StringRange.at(0), []);

package/dist/suggestion/SuggestionsBuilder.d.ts

@@ -1,4 +1,4 @@
-import { Suggestions } from "..";
+import { Suggestions } from "./Suggestions";
 export declare class SuggestionsBuilder {
     private input;
     private start;

package/dist/suggestion/SuggestionsBuilder.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SuggestionsBuilder = void 0;
-const __1 = require("..");
+const StringRange_1 = require("../context/StringRange");
+const Suggestion_1 = require("./Suggestion");
+const Suggestions_1 = require("./Suggestions");
 class SuggestionsBuilder {
     constructor(input, start) {
         this.input = input;
@@ -19,7 +21,7 @@ class SuggestionsBuilder {
         return this.remaining;
     }
     build() {
-        return __1.Suggestions.create(this.input, this.result);
+        return Suggestions_1.Suggestions.create(this.input, this.result);
     }
     buildPromise() {
         return Promise.resolve(this.build());
@@ -28,7 +30,7 @@ class SuggestionsBuilder {
         if (text === this.remaining) {
             return this;
         }
-        this.result.push(new __1.Suggestion(new __1.StringRange(this.start, this.input.length), text, tooltip));
+        this.result.push(new Suggestion_1.Suggestion(new StringRange_1.StringRange(this.start, this.input.length), text, tooltip));
         return this;
     }
     add(other) {

package/dist/tree/ArgumentCommandNode.d.ts

@@ -1,4 +1,13 @@
-import { type ArgumentType, CommandNode, type StringReader, type Command, type CommandContext, type CommandContextBuilder, type Predicate, type RedirectModifier, type Suggestions, type SuggestionsBuilder } from "..";
+import type { ArgumentType } from "../arguments/ArgumentType";
+import type { RedirectModifier } from "../builder/ArgumentBuilder";
+import type { Command } from "../Command";
+import type { CommandContext } from "../context/CommandContext";
+import type { CommandContextBuilder } from "../context/CommandContextBuilder";
+import type { Predicate } from "../Predicate";
+import type { StringReader } from "../StringReader";
+import type { Suggestions } from "../suggestion/Suggestions";
+import type { SuggestionsBuilder } from "../suggestion/SuggestionsBuilder";
+import { CommandNode } from "./CommandNode";
 export declare class ArgumentCommandNode<S, T> extends CommandNode<S> {
     name: string;
     type: ArgumentType<T>;

package/dist/tree/ArgumentCommandNode.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArgumentCommandNode = void 0;
-const __1 = require("..");
-class ArgumentCommandNode extends __1.CommandNode {
+const ParsedArgument_1 = require("../context/ParsedArgument");
+const CommandNode_1 = require("./CommandNode");
+class ArgumentCommandNode extends CommandNode_1.CommandNode {
     constructor(name, type, command, requirement, redirect, modifier, forks) {
         super(command, requirement, redirect, modifier, forks);
         this.name = name;
@@ -14,7 +15,7 @@ class ArgumentCommandNode extends __1.CommandNode {
     parse(reader, contextBuilder) {
         const start = reader.getCursor();
         const result = this.type.parse(reader);
-        const parsed = new __1.ParsedArgument(start, reader.getCursor(), result);
+        const parsed = new ParsedArgument_1.ParsedArgument(start, reader.getCursor(), result);
         contextBuilder.withArgument(this.name, parsed);
         contextBuilder.withNode(this, parsed.getRange());
     }

package/dist/tree/CommandNode.d.ts

@@ -1,4 +1,11 @@
-import { type StringReader, type Command, type CommandContext, type CommandContextBuilder, type Predicate, type RedirectModifier, type SuggestionsBuilder, type Suggestions } from "..";
+import type { RedirectModifier } from "../builder/ArgumentBuilder";
+import type { Command } from "../Command";
+import type { CommandContext } from "../context/CommandContext";
+import type { CommandContextBuilder } from "../context/CommandContextBuilder";
+import type { Predicate } from "../Predicate";
+import type { StringReader } from "../StringReader";
+import type { Suggestions } from "../suggestion/Suggestions";
+import type { SuggestionsBuilder } from "../suggestion/SuggestionsBuilder";
 export declare abstract class CommandNode<S> {
     private children;
     private literals;

package/dist/tree/LiteralCommandNode.d.ts

@@ -1,4 +1,12 @@
-import { CommandNode, type StringReader, type Command, type CommandContext, type CommandContextBuilder, type Predicate, type RedirectModifier, Suggestions, type SuggestionsBuilder } from "..";
+import type { RedirectModifier } from "../builder/ArgumentBuilder";
+import type { Command } from "../Command";
+import type { CommandContext } from "../context/CommandContext";
+import type { CommandContextBuilder } from "../context/CommandContextBuilder";
+import type { Predicate } from "../Predicate";
+import type { StringReader } from "../StringReader";
+import { Suggestions } from "../suggestion/Suggestions";
+import type { SuggestionsBuilder } from "../suggestion/SuggestionsBuilder";
+import { CommandNode } from "./CommandNode";
 export declare class LiteralCommandNode<S> extends CommandNode<S> {
     private literal;
     constructor(literal: string, command: Command<S>, requirement: Predicate<S>, redirect: CommandNode<S>, modifier: RedirectModifier<S>, forks: boolean);

package/dist/tree/LiteralCommandNode.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LiteralCommandNode = void 0;
-const __1 = require("..");
-class LiteralCommandNode extends __1.CommandNode {
+const StringRange_1 = require("../context/StringRange");
+const CommandSyntaxError_1 = require("../exceptions/CommandSyntaxError");
+const Suggestions_1 = require("../suggestion/Suggestions");
+const CommandNode_1 = require("./CommandNode");
+class LiteralCommandNode extends CommandNode_1.CommandNode {
     constructor(literal, command, requirement, redirect, modifier, forks) {
         super(command, requirement, redirect, modifier, forks);
         this.literal = literal;
@@ -11,10 +14,10 @@ class LiteralCommandNode extends __1.CommandNode {
         const start = reader.getCursor();
         const end = this.parseInternal(reader);
         if (end > -1) {
-            contextBuilder.withNode(this, new __1.StringRange(start, end));
+            contextBuilder.withNode(this, new StringRange_1.StringRange(start, end));
             return;
         }
-        throw __1.CommandSyntaxError.LITERAL_INCORRECT.createWithContext(reader, this.literal);
+        throw CommandSyntaxError_1.CommandSyntaxError.LITERAL_INCORRECT.createWithContext(reader, this.literal);
     }
     parseInternal(reader) {
         const start = reader.getCursor();
@@ -48,7 +51,7 @@ class LiteralCommandNode extends __1.CommandNode {
             return builder.suggest(this.literal).buildPromise();
         }
         else {
-            return __1.Suggestions.empty();
+            return Suggestions_1.Suggestions.empty();
         }
     }
 }

package/dist/tree/RootCommandNode.d.ts

@@ -1,4 +1,9 @@
-import { CommandNode, type StringReader, type CommandContextBuilder, type CommandContext, Suggestions, type SuggestionsBuilder } from "..";
+import type { CommandContext } from "../context/CommandContext";
+import type { CommandContextBuilder } from "../context/CommandContextBuilder";
+import type { StringReader } from "../StringReader";
+import { Suggestions } from "../suggestion/Suggestions";
+import type { SuggestionsBuilder } from "../suggestion/SuggestionsBuilder";
+import { CommandNode } from "./CommandNode";
 export declare class RootCommandNode<S> extends CommandNode<S> {
     constructor();
     parse(reader: StringReader, contextBuilder: CommandContextBuilder<S>): void;

package/dist/tree/RootCommandNode.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RootCommandNode = void 0;
-const __1 = require("..");
-class RootCommandNode extends __1.CommandNode {
+const Suggestions_1 = require("../suggestion/Suggestions");
+const CommandNode_1 = require("./CommandNode");
+class RootCommandNode extends CommandNode_1.CommandNode {
     constructor() {
         super(null, async (_) => true, null, (_) => null, false);
     }
@@ -19,7 +20,7 @@ class RootCommandNode extends __1.CommandNode {
     context, 
     // biome-ignore lint/correctness/noUnusedFunctionParameters: no-op
     builder) {
-        return __1.Suggestions.empty();
+        return Suggestions_1.Suggestions.empty();
     }
 }
 exports.RootCommandNode = RootCommandNode;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wq2/brigadier-ts",
-	"version": "1.0.1",
+	"version": "1.0.3",
 	"description": "Fork of brigadier-ts with some extra changes",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

package/src/Command.ts

@@ -1,3 +1,4 @@
-import type { CommandContext } from "./";
+import type { CommandContext } from "./context/CommandContext";
 
-export type Command<S> = (c: CommandContext<S>) => Promise<number | undefined>;
+// biome-ignore lint/suspicious/noConfusingVoidType: `return undefined` :sob:
+export type Command<S> = (c: CommandContext<S>) => Promise<number | void>;

package/src/CommandDispatcher.ts

@@ -1,12 +1,12 @@
 import {
-	RootCommandNode,
-	type LiteralCommandNode,
-	StringReader,
-	type LiteralArgumentBuilder,
 	CommandContextBuilder,
 	type CommandNode,
-	ParseResults,
 	CommandSyntaxError,
+	type LiteralArgumentBuilder,
+	type LiteralCommandNode,
+	ParseResults,
+	RootCommandNode,
+	StringReader,
 	Suggestions,
 	SuggestionsBuilder,
 } from ".";

package/src/ParseResults.ts

@@ -1,8 +1,8 @@
 import type {
 	CommandContextBuilder,
-	StringReader,
 	CommandNode,
 	CommandSyntaxError,
+	StringReader,
 } from ".";
 
 export class ParseResults<S> {

package/src/arguments/ArgumentType.ts

@@ -1,16 +1,14 @@
-import {
-	type StringReader,
-	type CommandContext,
-	Suggestions,
-	type SuggestionsBuilder,
-} from "..";
+import type { CommandContext } from "../context/CommandContext";
+import type { StringReader } from "../StringReader";
+import { Suggestions } from "../suggestion/Suggestions";
+import type { SuggestionsBuilder } from "../suggestion/SuggestionsBuilder";
 
 export abstract class ArgumentType<T> {
 	abstract parse(reader: StringReader): T;
 
 	listSuggestions(
 		// biome-ignore lint/correctness/noUnusedFunctionParameters: optional override
-		context: CommandContext<any>,
+		context: CommandContext<unknown>,
 		// biome-ignore lint/correctness/noUnusedFunctionParameters: optional override
 		builder: SuggestionsBuilder,
 	): Promise<Suggestions> {

package/src/arguments/BoolArgumentType.ts

@@ -1,8 +1,8 @@
-import { ArgumentType } from "./ArgumentType";
-import type { StringReader } from "../StringReader";
 import type { CommandContext } from "../context/CommandContext";
-import type { SuggestionsBuilder } from "../suggestion/SuggestionsBuilder";
+import type { StringReader } from "../StringReader";
 import type { Suggestions } from "../suggestion/Suggestions";
+import type { SuggestionsBuilder } from "../suggestion/SuggestionsBuilder";
+import { ArgumentType } from "./ArgumentType";
 
 export class BoolArgumentType extends ArgumentType<boolean> {
 	parse(reader: StringReader): boolean {
@@ -10,15 +10,14 @@ export class BoolArgumentType extends ArgumentType<boolean> {
 	}
 
 	listSuggestions(
-		// biome-ignore lint/correctness/noUnusedFunctionParameters: optional override
-		context: CommandContext<any>,
+		_ctx: CommandContext<unknown>,
 		builder: SuggestionsBuilder,
 	): Promise<Suggestions> {
 		if ("true".startsWith(builder.getRemaining().toLowerCase())) {
-			builder.suggest("true");
+			return builder.suggest("true").buildPromise();
 		}
 		if ("false".startsWith(builder.getRemaining().toLowerCase())) {
-			builder.suggest("false");
+			return builder.suggest("false").buildPromise();
 		}
 		return builder.buildPromise();
 	}

package/src/arguments/FloatArgumentType.ts

@@ -1,4 +1,6 @@
-import { type StringReader, NumberArgumentType, CommandSyntaxError } from "..";
+import { CommandSyntaxError } from "../exceptions/CommandSyntaxError";
+import type { StringReader } from "../StringReader";
+import { NumberArgumentType } from "./NumberArgumentType";
 
 export class FloatArgumentType extends NumberArgumentType {
 	constructor(minimum = -Infinity, maximum = Infinity) {

package/src/arguments/IntegerArgumentType.ts

@@ -1,4 +1,6 @@
-import { type StringReader, NumberArgumentType, CommandSyntaxError } from "..";
+import { CommandSyntaxError } from "../exceptions/CommandSyntaxError";
+import type { StringReader } from "../StringReader";
+import { NumberArgumentType } from "./NumberArgumentType";
 
 export class IntegerArgumentType extends NumberArgumentType {
 	constructor(minimum = -2147483648, maximum = 2147483647) {

package/src/arguments/LongArgumentType.ts

@@ -1,4 +1,6 @@
-import { type StringReader, NumberArgumentType, CommandSyntaxError } from "..";
+import { CommandSyntaxError } from "../exceptions/CommandSyntaxError";
+import type { StringReader } from "../StringReader";
+import { NumberArgumentType } from "./NumberArgumentType";
 
 export class LongArgumentType extends NumberArgumentType<bigint> {
 	private static readonly MIN = -9223372036854775808n;

package/src/arguments/NumberArgumentType.ts

@@ -1,4 +1,6 @@
-import { ArgumentType, type StringReader, type CommandErrorType } from "..";
+import type { CommandErrorType } from "../exceptions/CommandErrorType";
+import type { StringReader } from "../StringReader";
+import { ArgumentType } from "./ArgumentType";
 
 export abstract class NumberArgumentType<
 	N extends number | bigint = number,

package/src/arguments/StringArgumentType.ts

@@ -1,4 +1,5 @@
-import { ArgumentType, type StringReader } from "..";
+import type { StringReader } from "../StringReader";
+import { ArgumentType } from "./ArgumentType";
 
 type StringType = "single_word" | "quotable_phrase" | "greedy_phrase";
 

package/src/builder/ArgumentBuilder.ts

@@ -1,10 +1,8 @@
-import {
-	CommandNode,
-	RootCommandNode,
-	type Command,
-	type Predicate,
-	type CommandContext,
-} from "..";
+import type { Command } from "../Command";
+import type { CommandContext } from "../context/CommandContext";
+import type { Predicate } from "../Predicate";
+import { CommandNode } from "../tree/CommandNode";
+import { RootCommandNode } from "../tree/RootCommandNode";
 
 export type RedirectModifier<S> = (context: CommandContext<S>) => S | S[];
 
@@ -24,7 +22,7 @@ export abstract class ArgumentBuilder<S, T extends ArgumentBuilder<S, T>> {
 	abstract getThis(): T;
 
 	// biome-ignore lint/suspicious/noThenProperty: proof?
-	then(argument: ArgumentBuilder<S, any> | CommandNode<S>): T {
+	then<A extends ArgumentBuilder<S, A>>(argument: ArgumentBuilder<S, A> | CommandNode<S>): T {
 		const child = argument instanceof CommandNode ? argument : argument.build();
 		this.arguments.addChild(child);
 		return this.getThis();

package/src/builder/LiteralArgumentBuilder.ts

@@ -1,4 +1,5 @@
-import { ArgumentBuilder, LiteralCommandNode } from "..";
+import { LiteralCommandNode } from "../tree/LiteralCommandNode";
+import { ArgumentBuilder } from "./ArgumentBuilder";
 
 export class LiteralArgumentBuilder<S> extends ArgumentBuilder<
 	S,
@@ -35,6 +36,6 @@ export class LiteralArgumentBuilder<S> extends ArgumentBuilder<
 	}
 }
 
-export function literal<S = any>(name: string): LiteralArgumentBuilder<S> {
+export function literal<S = unknown>(name: string): LiteralArgumentBuilder<S> {
 	return new LiteralArgumentBuilder(name);
 }

package/src/builder/RequiredArgumentBuilder.ts

@@ -1,4 +1,6 @@
-import { ArgumentBuilder, type ArgumentType, ArgumentCommandNode } from "..";
+import type { ArgumentType } from "../arguments/ArgumentType";
+import { ArgumentCommandNode } from "../tree/ArgumentCommandNode";
+import { ArgumentBuilder } from "./ArgumentBuilder";
 
 export class RequiredArgumentBuilder<S, T> extends ArgumentBuilder<
 	S,
@@ -42,7 +44,7 @@ export class RequiredArgumentBuilder<S, T> extends ArgumentBuilder<
 	}
 }
 
-export function argument<S = any, T = any>(
+export function argument<S = unknown, T = unknown>(
 	name: string,
 	type: ArgumentType<T>,
 ): RequiredArgumentBuilder<S, T> {

package/src/context/CommandContext.ts

@@ -1,16 +1,14 @@
-import type {
-	Command,
-	CommandNode,
-	StringRange,
-	ParsedArgument,
-	ParsedCommandNode,
-	RedirectModifier,
-} from "..";
+import type { RedirectModifier } from "../builder/ArgumentBuilder";
+import type { Command } from "../Command";
+import type { CommandNode } from "../tree/CommandNode";
+import type { ParsedArgument } from "./ParsedArgument";
+import type { ParsedCommandNode } from "./ParsedCommandNode";
+import type { StringRange } from "./StringRange";
 
 export class CommandContext<S> {
 	private source: S;
 	private input: string;
-	private arguments: Map<string, ParsedArgument<any>>;
+	private arguments: Map<string, ParsedArgument<unknown>>;
 	private nodes: ParsedCommandNode<S>[];
 	private command: Command<S>;
 	private rootNode: CommandNode<S>;
@@ -22,7 +20,7 @@ export class CommandContext<S> {
 	constructor(
 		source: S,
 		input: string,
-		parsedArguments: Map<string, ParsedArgument<any>>,
+		parsedArguments: Map<string, ParsedArgument<unknown>>,
 		command: Command<S>,
 		rootNode: CommandNode<S>,
 		nodes: ParsedCommandNode<S>[],
@@ -85,10 +83,10 @@ export class CommandContext<S> {
 		return this.rootNode;
 	}
 
-	get(name: string): any {
+	get<R = unknown>(name: string): R {
 		const argument = this.arguments.get(name);
 		// TODO: Throw exception when argument is null
-		return argument.getResult();
+		return argument.getResult() as R;
 	}
 
 	getRedirectModifier(): RedirectModifier<S> {

package/src/context/CommandContextBuilder.ts

@@ -1,18 +1,16 @@
-import {
-	type CommandNode,
-	type CommandDispatcher,
-	type Command,
-	CommandContext,
-	StringRange,
-	ParsedCommandNode,
-	type ParsedArgument,
-	type RedirectModifier,
-	SuggestionContext,
-} from "..";
+import type { RedirectModifier } from "../builder/ArgumentBuilder";
+import type { Command } from "../Command";
+import type { CommandDispatcher } from "../CommandDispatcher";
+import type { CommandNode } from "../tree/CommandNode";
+import { CommandContext } from "./CommandContext";
+import type { ParsedArgument } from "./ParsedArgument";
+import { ParsedCommandNode } from "./ParsedCommandNode";
+import { StringRange } from "./StringRange";
+import { SuggestionContext } from "./SuggestionContext";
 
 export class CommandContextBuilder<S> {
 	private source: S;
-	private arguments: Map<string, ParsedArgument<any>>;
+	private arguments: Map<string, ParsedArgument<unknown>>;
 	private rootNode: CommandNode<S>;
 	private dispatcher: CommandDispatcher<S>;
 	private command: Command<S>;
@@ -51,13 +49,13 @@ export class CommandContextBuilder<S> {
 
 	withArgument(
 		name: string,
-		argument: ParsedArgument<any>,
+		argument: ParsedArgument<unknown>,
 	): CommandContextBuilder<S> {
 		this.arguments.set(name, argument);
 		return this;
 	}
 
-	getArguments(): Map<string, ParsedArgument<any>> {
+	getArguments(): Map<string, ParsedArgument<unknown>> {
 		return this.arguments;
 	}
 

package/src/context/ParsedArgument.ts

@@ -1,4 +1,4 @@
-import { StringRange } from "..";
+import { StringRange } from "./StringRange";
 
 export class ParsedArgument<T> {
 	private range: StringRange;

package/src/context/ParsedCommandNode.ts

@@ -1,4 +1,5 @@
-import type { CommandNode, StringRange } from "..";
+import type { CommandNode } from "../tree/CommandNode";
+import type { StringRange } from "./StringRange";
 
 export class ParsedCommandNode<S> {
 	private node: CommandNode<S>;

package/src/context/SuggestionContext.ts

@@ -1,4 +1,4 @@
-import type { CommandNode } from "..";
+import type { CommandNode } from "../tree/CommandNode";
 
 export class SuggestionContext<S> {
 	parent: CommandNode<S>;