@wq2/brigadier-ts 1.0.2 → 1.0.3

package/src/exceptions/CommandErrorType.ts

@@ -1,6 +1,7 @@
-import { CommandSyntaxError, type StringReader } from "..";
+import type { StringReader } from "../StringReader";
+import { CommandSyntaxError } from "./CommandSyntaxError";
 
-type CommandErrorFunction = (...args: any[]) => string;
+type CommandErrorFunction = <A = unknown>(...args: A[]) => string;
 
 export class CommandErrorType {
 	private func: CommandErrorFunction;

package/src/exceptions/CommandSyntaxError.ts

@@ -1,4 +1,4 @@
-import { CommandErrorType } from "..";
+import { CommandErrorType } from "./CommandErrorType";
 
 const CONTEXT_AMOUNT = 10;
 

package/src/index.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/src/suggestion/Suggestion.ts

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

package/src/suggestion/Suggestions.ts

@@ -1,4 +1,5 @@
-import { StringRange, type Suggestion } from "..";
+import { StringRange } from "../context/StringRange";
+import type { Suggestion } from "./Suggestion";
 
 export class Suggestions {
 	static EMPTY = new Suggestions(StringRange.at(0), []);

package/src/suggestion/SuggestionsBuilder.ts

@@ -1,4 +1,6 @@
-import { Suggestion, Suggestions, StringRange } from "..";
+import { StringRange } from "../context/StringRange";
+import { Suggestion } from "./Suggestion";
+import { Suggestions } from "./Suggestions";
 
 export class SuggestionsBuilder {
 	private input: string;

package/src/tree/ArgumentCommandNode.ts

@@ -1,16 +1,14 @@
-import {
-	type ArgumentType,
-	CommandNode,
-	type StringReader,
-	type Command,
-	type CommandContext,
-	type CommandContextBuilder,
-	type Predicate,
-	type RedirectModifier,
-	ParsedArgument,
-	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 { ParsedArgument } from "../context/ParsedArgument";
+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 class ArgumentCommandNode<S, T> extends CommandNode<S> {
 	name: string;

package/src/tree/CommandNode.ts

@@ -1,20 +1,17 @@
-import {
-	type StringReader,
-	type Command,
-	LiteralCommandNode,
-	ArgumentCommandNode,
-	type CommandContext,
-	type CommandContextBuilder,
-	type Predicate,
-	type RedirectModifier,
-	type SuggestionsBuilder,
-	type Suggestions,
-} from "..";
+import { ArgumentCommandNode, LiteralCommandNode } 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 abstract class CommandNode<S> {
 	private children: Map<string, CommandNode<S>>;
 	private literals: Map<string, LiteralCommandNode<S>>;
-	private arguments: Map<string, ArgumentCommandNode<S, any>>;
+	private arguments: Map<string, ArgumentCommandNode<S, unknown>>;
 	private command: Command<S>;
 	private requirement: Predicate<S>;
 	private redirect: CommandNode<S>;

package/src/tree/LiteralCommandNode.ts

@@ -1,16 +1,14 @@
-import {
-	CommandNode,
-	type StringReader,
-	type Command,
-	StringRange,
-	type CommandContext,
-	type CommandContextBuilder,
-	type Predicate,
-	type RedirectModifier,
-	CommandSyntaxError,
-	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 { StringRange } from "../context/StringRange";
+import { CommandSyntaxError } from "../exceptions/CommandSyntaxError";
+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 class LiteralCommandNode<S> extends CommandNode<S> {
 	private literal: string;

package/src/tree/RootCommandNode.ts

@@ -1,11 +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 class RootCommandNode<S> extends CommandNode<S> {
 	constructor() {

package/test/Arguments.test.ts

@@ -1,11 +1,10 @@
 import {
 	argument,
-	bool,
 	CommandDispatcher,
 	FloatArgumentType,
 	IntegerArgumentType,
-	literal,
 	LongArgumentType,
+	literal,
 } from "../src";
 
 describe("Arguments", () => {
@@ -14,7 +13,7 @@ describe("Arguments", () => {
 		dispatcher.register(
 			literal("foo").then(
 				argument("bar", new IntegerArgumentType()).executes(
-					async (ctx) => ctx.get("bar") * 2,
+					async (ctx) => ctx.get<number>("bar") * 2,
 				),
 			),
 		);
@@ -27,7 +26,7 @@ describe("Arguments", () => {
 		dispatcher.register(
 			literal("foo").then(
 				argument("bar", new LongArgumentType()).executes(
-					async (ctx) => ctx.get("bar").toString().length,
+					async (ctx) => ctx.get<bigint>("bar").toString().length,
 				),
 			),
 		);