@wq2/brigadier-ts 1.0.4 → 1.0.6

package/dist/CommandDispatcher.d.ts

@@ -1,4 +1,10 @@
-import { type CommandNode, type LiteralArgumentBuilder, type LiteralCommandNode, ParseResults, RootCommandNode, StringReader, Suggestions } from ".";
+import type { LiteralArgumentBuilder } from "./builder/LiteralArgumentBuilder";
+import { ParseResults } from "./ParseResults";
+import { StringReader } from "./StringReader";
+import { Suggestions } from "./suggestion/Suggestions";
+import type { CommandNode } from "./tree/CommandNode";
+import type { LiteralCommandNode } from "./tree/LiteralCommandNode";
+import { RootCommandNode } from "./tree/RootCommandNode";
 export declare class CommandDispatcher<S> {
     private root;
     private static USAGE_OPTIONAL_OPEN;

package/dist/CommandDispatcher.js

@@ -1,10 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandDispatcher = void 0;
-const _1 = require(".");
+const CommandContextBuilder_1 = require("./context/CommandContextBuilder");
+const CommandSyntaxError_1 = require("./exceptions/CommandSyntaxError");
+const StandardErrorTypes_1 = require("./exceptions/StandardErrorTypes");
+const ParseResults_1 = require("./ParseResults");
+const StringReader_1 = require("./StringReader");
+const Suggestions_1 = require("./suggestion/Suggestions");
+const SuggestionsBuilder_1 = require("./suggestion/SuggestionsBuilder");
+const RootCommandNode_1 = require("./tree/RootCommandNode");
 class CommandDispatcher {
     constructor() {
-        this.root = new _1.RootCommandNode();
+        this.root = new RootCommandNode_1.RootCommandNode();
     }
     register(command) {
         const build = command.build();
@@ -13,17 +20,17 @@ class CommandDispatcher {
     }
     async execute(parse, source) {
         if (typeof parse === "string") {
-            parse = await this.parse(new _1.StringReader(parse), source);
+            parse = await this.parse(new StringReader_1.StringReader(parse), source);
         }
         if (parse.getReader().canRead()) {
             if (parse.getErrors().size === 1) {
                 throw parse.getErrors().values().next();
             }
             else if (parse.getContext().getRange().isEmpty()) {
-                throw _1.CommandSyntaxError.DISPATCHER_UNKNOWN_COMMAND.createWithContext(parse.getReader());
+                throw StandardErrorTypes_1.DISPATCHER_UNKNOWN_COMMAND.createWithContext(parse.getReader());
             }
             else {
-                throw _1.CommandSyntaxError.DISPATCHER_UNKNOWN_ARGUMENT.createWithContext(parse.getReader());
+                throw StandardErrorTypes_1.DISPATCHER_UNKNOWN_ARGUMENT.createWithContext(parse.getReader());
             }
         }
         let result = 0;
@@ -78,13 +85,13 @@ class CommandDispatcher {
             next = [];
         }
         if (!foundCommand) {
-            throw _1.CommandSyntaxError.DISPATCHER_UNKNOWN_COMMAND.createWithContext(parse.getReader());
+            throw StandardErrorTypes_1.DISPATCHER_UNKNOWN_COMMAND.createWithContext(parse.getReader());
         }
         return forked ? successfulForks : result;
     }
     async parse(reader, source) {
-        reader = new _1.StringReader(reader);
-        const context = new _1.CommandContextBuilder(this, source, this.root, reader.getCursor());
+        reader = new StringReader_1.StringReader(reader);
+        const context = new CommandContextBuilder_1.CommandContextBuilder(this, source, this.root, reader.getCursor());
         return this.parseNodes(this.root, reader, context);
     }
     async parseNodes(node, originalReader, contextSoFar) {
@@ -97,25 +104,25 @@ class CommandDispatcher {
                 continue;
             }
             const context = contextSoFar.copy();
-            const reader = new _1.StringReader(originalReader);
+            const reader = new StringReader_1.StringReader(originalReader);
             try {
                 try {
                     child.parse(reader, context);
                 }
                 catch (e) {
-                    if (e instanceof _1.CommandSyntaxError) {
+                    if (e instanceof CommandSyntaxError_1.CommandSyntaxError) {
                         throw e;
                     }
                     else {
-                        throw _1.CommandSyntaxError.DISPATCHER_PARSE_ERROR.createWithContext(reader, e.message);
+                        throw StandardErrorTypes_1.DISPATCHER_PARSE_ERROR.createWithContext(reader, e.message);
                     }
                 }
                 if (reader.canRead() && reader.peek() !== " ") {
-                    throw _1.CommandSyntaxError.DISPATCHER_EXPECTED_ARGUMENT_SEPARATOR.createWithContext(reader);
+                    throw StandardErrorTypes_1.DISPATCHER_EXPECTED_ARGUMENT_SEPARATOR.createWithContext(reader);
                 }
             }
             catch (e) {
-                if (e instanceof _1.CommandSyntaxError) {
+                if (e instanceof CommandSyntaxError_1.CommandSyntaxError) {
                     errors.set(child, e);
                     reader.setCursor(cursor);
                     continue;
@@ -128,21 +135,21 @@ class CommandDispatcher {
             if (reader.canRead(child.getRedirect() === null ? 2 : 1)) {
                 reader.skip();
                 if (child.getRedirect()) {
-                    const childContext = new _1.CommandContextBuilder(this, source, child.getRedirect(), reader.getCursor());
+                    const childContext = new CommandContextBuilder_1.CommandContextBuilder(this, source, child.getRedirect(), reader.getCursor());
                     const parse = await this.parseNodes(child.getRedirect(), reader, childContext);
                     context.withChild(parse.getContext());
-                    return new _1.ParseResults(context, parse.getReader(), parse.getErrors());
+                    return new ParseResults_1.ParseResults(context, parse.getReader(), parse.getErrors());
                 }
                 else {
                     potentials.push(this.parseNodes(child, reader, context));
                 }
             }
             else {
-                potentials.push(new _1.ParseResults(context, reader, new Map()));
+                potentials.push(new ParseResults_1.ParseResults(context, reader, new Map()));
             }
         }
         if (potentials.length === 0) {
-            potentials.push(new _1.ParseResults(contextSoFar, originalReader, errors));
+            potentials.push(new ParseResults_1.ParseResults(contextSoFar, originalReader, errors));
         }
         return potentials[0];
     }
@@ -187,9 +194,9 @@ class CommandDispatcher {
         const truncatedInput = fullInput.substring(0, cursor);
         const promises = [];
         for (const node of parent.getChildren()) {
-            let promise = _1.Suggestions.empty();
+            let promise = Suggestions_1.Suggestions.empty();
             try {
-                promise = node.listSuggestions(context.build(truncatedInput), new _1.SuggestionsBuilder(truncatedInput, start));
+                promise = node.listSuggestions(context.build(truncatedInput), new SuggestionsBuilder_1.SuggestionsBuilder(truncatedInput, start));
             }
             catch (ignored) {
                 console.log("???", ignored);
@@ -197,7 +204,7 @@ class CommandDispatcher {
             promises.push(promise);
         }
         const suggestions = await Promise.all(promises);
-        return _1.Suggestions.merge(fullInput, suggestions);
+        return Suggestions_1.Suggestions.merge(fullInput, suggestions);
     }
     getSmartUsage(node, source, optional, deep) {
         if (optional === undefined && deep === undefined) {

package/dist/StringReader.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StringReader = void 0;
-const CommandSyntaxError_1 = require("./exceptions/CommandSyntaxError");
+const StandardErrorTypes_1 = require("./exceptions/StandardErrorTypes");
 class StringReader {
     constructor(string) {
         if (string instanceof StringReader) {
@@ -58,7 +58,7 @@ class StringReader {
         }
         const number = this.string.substring(start, this.cursor);
         if (number.length === 0) {
-            throw CommandSyntaxError_1.CommandSyntaxError.READER_EXPECTED_INT.createWithContext(this);
+            throw StandardErrorTypes_1.READER_EXPECTED_INT.createWithContext(this);
         }
         try {
             const value = Number(number);
@@ -69,7 +69,7 @@ class StringReader {
         }
         catch (_) {
             this.cursor = start;
-            throw CommandSyntaxError_1.CommandSyntaxError.READER_INVALID_INT.createWithContext(this, number);
+            throw StandardErrorTypes_1.READER_INVALID_INT.createWithContext(this, number);
         }
     }
     readLong() {
@@ -79,14 +79,14 @@ class StringReader {
         }
         const number = this.string.substring(start, this.cursor);
         if (number.length === 0) {
-            throw CommandSyntaxError_1.CommandSyntaxError.READER_EXPECTED_INT.createWithContext(this);
+            throw StandardErrorTypes_1.READER_EXPECTED_INT.createWithContext(this);
         }
         try {
             return BigInt(number);
         }
         catch (_) {
             this.cursor = start;
-            throw CommandSyntaxError_1.CommandSyntaxError.READER_INVALID_INT.createWithContext(this, number);
+            throw StandardErrorTypes_1.READER_INVALID_INT.createWithContext(this, number);
         }
     }
     readFloat() {
@@ -96,7 +96,7 @@ class StringReader {
         }
         const number = this.string.substring(start, this.cursor);
         if (number.length === 0) {
-            throw CommandSyntaxError_1.CommandSyntaxError.READER_EXPECTED_FLOAT.createWithContext(this);
+            throw StandardErrorTypes_1.READER_EXPECTED_FLOAT.createWithContext(this);
         }
         try {
             const value = Number(number);
@@ -107,7 +107,7 @@ class StringReader {
         }
         catch (_e) {
             this.cursor = start;
-            throw CommandSyntaxError_1.CommandSyntaxError.READER_INVALID_FLOAT.createWithContext(this, number);
+            throw StandardErrorTypes_1.READER_INVALID_FLOAT.createWithContext(this, number);
         }
     }
     isAllowedInUnquotedString(c) {
@@ -141,7 +141,7 @@ class StringReader {
                 }
                 else {
                     this.setCursor(this.cursor - 1);
-                    throw CommandSyntaxError_1.CommandSyntaxError.READER_INVALID_ESCAPE.createWithContext(this, c);
+                    throw StandardErrorTypes_1.READER_INVALID_ESCAPE.createWithContext(this, c);
                 }
             }
             else if (c === "\\") {
@@ -154,7 +154,7 @@ class StringReader {
                 result.push(c);
             }
         }
-        throw CommandSyntaxError_1.CommandSyntaxError.READER_EXPECTED_END_OF_QUOTE.createWithContext(this);
+        throw StandardErrorTypes_1.READER_EXPECTED_END_OF_QUOTE.createWithContext(this);
     }
     readString() {
         if (!this.canRead()) {
@@ -170,7 +170,7 @@ class StringReader {
     readBoolean() {
         const value = this.readUnquotedString();
         if (value.length === 0) {
-            throw CommandSyntaxError_1.CommandSyntaxError.READER_EXPECTED_BOOL.createWithContext(this);
+            throw StandardErrorTypes_1.READER_EXPECTED_BOOL.createWithContext(this);
         }
         if (value === "true") {
             return true;
@@ -179,7 +179,7 @@ class StringReader {
             return false;
         }
         else {
-            throw CommandSyntaxError_1.CommandSyntaxError.READER_INVALID_BOOL.createWithContext(this, value);
+            throw StandardErrorTypes_1.READER_INVALID_BOOL.createWithContext(this, value);
         }
     }
 }

package/dist/arguments/FloatArgumentType.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FloatArgumentType = void 0;
-const CommandSyntaxError_1 = require("../exceptions/CommandSyntaxError");
+const StandardErrorTypes_1 = require("../exceptions/StandardErrorTypes");
 const NumberArgumentType_1 = require("./NumberArgumentType");
 class FloatArgumentType extends NumberArgumentType_1.NumberArgumentType {
     constructor(minimum = -Infinity, maximum = Infinity) {
@@ -11,10 +11,10 @@ class FloatArgumentType extends NumberArgumentType_1.NumberArgumentType {
         return reader.readFloat();
     }
     getTooSmallError() {
-        return CommandSyntaxError_1.CommandSyntaxError.FLOAT_TOO_SMALL;
+        return StandardErrorTypes_1.FLOAT_TOO_SMALL;
     }
     getTooBigError() {
-        return CommandSyntaxError_1.CommandSyntaxError.FLOAT_TOO_BIG;
+        return StandardErrorTypes_1.FLOAT_TOO_BIG;
     }
 }
 exports.FloatArgumentType = FloatArgumentType;

package/dist/arguments/IntegerArgumentType.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IntegerArgumentType = void 0;
-const CommandSyntaxError_1 = require("../exceptions/CommandSyntaxError");
+const StandardErrorTypes_1 = require("../exceptions/StandardErrorTypes");
 const NumberArgumentType_1 = require("./NumberArgumentType");
 class IntegerArgumentType extends NumberArgumentType_1.NumberArgumentType {
     constructor(minimum = -2147483648, maximum = 2147483647) {
@@ -11,10 +11,10 @@ class IntegerArgumentType extends NumberArgumentType_1.NumberArgumentType {
         return reader.readInt();
     }
     getTooSmallError() {
-        return CommandSyntaxError_1.CommandSyntaxError.INTEGER_TOO_SMALL;
+        return StandardErrorTypes_1.INTEGER_TOO_SMALL;
     }
     getTooBigError() {
-        return CommandSyntaxError_1.CommandSyntaxError.INTEGER_TOO_BIG;
+        return StandardErrorTypes_1.INTEGER_TOO_BIG;
     }
 }
 exports.IntegerArgumentType = IntegerArgumentType;

package/dist/arguments/LongArgumentType.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LongArgumentType = void 0;
-const CommandSyntaxError_1 = require("../exceptions/CommandSyntaxError");
+const StandardErrorTypes_1 = require("../exceptions/StandardErrorTypes");
 const NumberArgumentType_1 = require("./NumberArgumentType");
 class LongArgumentType extends NumberArgumentType_1.NumberArgumentType {
     constructor(minimum = LongArgumentType.MIN, maximum = LongArgumentType.MAX) {
@@ -11,10 +11,10 @@ class LongArgumentType extends NumberArgumentType_1.NumberArgumentType {
         return reader.readLong();
     }
     getTooSmallError() {
-        return CommandSyntaxError_1.CommandSyntaxError.LONG_TOO_SMALL;
+        return StandardErrorTypes_1.LONG_TOO_SMALL;
     }
     getTooBigError() {
-        return CommandSyntaxError_1.CommandSyntaxError.LONG_TOO_BIG;
+        return StandardErrorTypes_1.LONG_TOO_BIG;
     }
 }
 exports.LongArgumentType = LongArgumentType;

package/dist/exceptions/CommandSyntaxError.d.ts

@@ -1,28 +1,5 @@
-import { CommandErrorType } from "./CommandErrorType";
 export declare class CommandSyntaxError extends Error {
     private input;
     private cursor;
     constructor(message: string, input?: string, cursor?: number);
-    static DOUBLE_TOO_SMALL: CommandErrorType;
-    static DOUBLE_TOO_BIG: CommandErrorType;
-    static FLOAT_TOO_SMALL: CommandErrorType;
-    static FLOAT_TOO_BIG: CommandErrorType;
-    static INTEGER_TOO_SMALL: CommandErrorType;
-    static INTEGER_TOO_BIG: CommandErrorType;
-    static LONG_TOO_SMALL: CommandErrorType;
-    static LONG_TOO_BIG: CommandErrorType;
-    static LITERAL_INCORRECT: CommandErrorType;
-    static READER_EXPECTED_START_OF_QUOTE: CommandErrorType;
-    static READER_EXPECTED_END_OF_QUOTE: CommandErrorType;
-    static READER_INVALID_ESCAPE: CommandErrorType;
-    static READER_INVALID_BOOL: CommandErrorType;
-    static READER_EXPECTED_BOOL: CommandErrorType;
-    static READER_INVALID_INT: CommandErrorType;
-    static READER_EXPECTED_INT: CommandErrorType;
-    static READER_INVALID_FLOAT: CommandErrorType;
-    static READER_EXPECTED_FLOAT: CommandErrorType;
-    static DISPATCHER_UNKNOWN_COMMAND: CommandErrorType;
-    static DISPATCHER_UNKNOWN_ARGUMENT: CommandErrorType;
-    static DISPATCHER_EXPECTED_ARGUMENT_SEPARATOR: CommandErrorType;
-    static DISPATCHER_PARSE_ERROR: CommandErrorType;
 }

package/dist/exceptions/CommandSyntaxError.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandSyntaxError = void 0;
-const CommandErrorType_1 = require("./CommandErrorType");
 const CONTEXT_AMOUNT = 10;
 class CommandSyntaxError extends Error {
     constructor(message, input, cursor) {
@@ -19,25 +18,3 @@ class CommandSyntaxError extends Error {
     }
 }
 exports.CommandSyntaxError = CommandSyntaxError;
-CommandSyntaxError.DOUBLE_TOO_SMALL = new CommandErrorType_1.CommandErrorType((found, min) => `Double must not be less than ${min}, found ${found}`);
-CommandSyntaxError.DOUBLE_TOO_BIG = new CommandErrorType_1.CommandErrorType((found, max) => `Double must not be more than ${max}, found ${found}`);
-CommandSyntaxError.FLOAT_TOO_SMALL = new CommandErrorType_1.CommandErrorType((found, min) => `Float must not be less than ${min}, found ${found}`);
-CommandSyntaxError.FLOAT_TOO_BIG = new CommandErrorType_1.CommandErrorType((found, max) => `Float must not be more than ${max}, found ${found}`);
-CommandSyntaxError.INTEGER_TOO_SMALL = new CommandErrorType_1.CommandErrorType((found, min) => `Integer must not be less than ${min}, found ${found}`);
-CommandSyntaxError.INTEGER_TOO_BIG = new CommandErrorType_1.CommandErrorType((found, max) => `Integer must not be more than ${max}, found ${found}`);
-CommandSyntaxError.LONG_TOO_SMALL = new CommandErrorType_1.CommandErrorType((found, min) => `Long must not be less than ${min}, found ${found}`);
-CommandSyntaxError.LONG_TOO_BIG = new CommandErrorType_1.CommandErrorType((found, max) => `Long must not be more than ${max}, found ${found}`);
-CommandSyntaxError.LITERAL_INCORRECT = new CommandErrorType_1.CommandErrorType((expected) => `Expected literal ${expected}`);
-CommandSyntaxError.READER_EXPECTED_START_OF_QUOTE = new CommandErrorType_1.CommandErrorType(() => `Expected quote to start a string`);
-CommandSyntaxError.READER_EXPECTED_END_OF_QUOTE = new CommandErrorType_1.CommandErrorType(() => `Unclosed quoted string`);
-CommandSyntaxError.READER_INVALID_ESCAPE = new CommandErrorType_1.CommandErrorType((character) => `Invalid escape sequence '${character}' in quoted string`);
-CommandSyntaxError.READER_INVALID_BOOL = new CommandErrorType_1.CommandErrorType((value) => `Invalid bool, expected true or false but found '${value}'`);
-CommandSyntaxError.READER_EXPECTED_BOOL = new CommandErrorType_1.CommandErrorType(() => `Expected bool`);
-CommandSyntaxError.READER_INVALID_INT = new CommandErrorType_1.CommandErrorType((value) => `Invalid integer '${value}'`);
-CommandSyntaxError.READER_EXPECTED_INT = new CommandErrorType_1.CommandErrorType(() => `Expected integer`);
-CommandSyntaxError.READER_INVALID_FLOAT = new CommandErrorType_1.CommandErrorType((value) => `Invalid float '${value}'`);
-CommandSyntaxError.READER_EXPECTED_FLOAT = new CommandErrorType_1.CommandErrorType(() => `Expected float`);
-CommandSyntaxError.DISPATCHER_UNKNOWN_COMMAND = new CommandErrorType_1.CommandErrorType(() => `Unknown Command`);
-CommandSyntaxError.DISPATCHER_UNKNOWN_ARGUMENT = new CommandErrorType_1.CommandErrorType(() => `Incorrect argument for command`);
-CommandSyntaxError.DISPATCHER_EXPECTED_ARGUMENT_SEPARATOR = new CommandErrorType_1.CommandErrorType(() => `Expected whitespace to end one argument, but found trailing data`);
-CommandSyntaxError.DISPATCHER_PARSE_ERROR = new CommandErrorType_1.CommandErrorType((message) => `Could not parse command: ${message}`);

package/dist/exceptions/StandardErrorTypes.d.ts

@@ -0,0 +1,23 @@
+import { CommandErrorType } from "./CommandErrorType";
+export declare const DOUBLE_TOO_SMALL: CommandErrorType;
+export declare const DOUBLE_TOO_BIG: CommandErrorType;
+export declare const FLOAT_TOO_SMALL: CommandErrorType;
+export declare const FLOAT_TOO_BIG: CommandErrorType;
+export declare const INTEGER_TOO_SMALL: CommandErrorType;
+export declare const INTEGER_TOO_BIG: CommandErrorType;
+export declare const LONG_TOO_SMALL: CommandErrorType;
+export declare const LONG_TOO_BIG: CommandErrorType;
+export declare const LITERAL_INCORRECT: CommandErrorType;
+export declare const READER_EXPECTED_START_OF_QUOTE: CommandErrorType;
+export declare const READER_EXPECTED_END_OF_QUOTE: CommandErrorType;
+export declare const READER_INVALID_ESCAPE: CommandErrorType;
+export declare const READER_INVALID_BOOL: CommandErrorType;
+export declare const READER_EXPECTED_BOOL: CommandErrorType;
+export declare const READER_INVALID_INT: CommandErrorType;
+export declare const READER_EXPECTED_INT: CommandErrorType;
+export declare const READER_INVALID_FLOAT: CommandErrorType;
+export declare const READER_EXPECTED_FLOAT: CommandErrorType;
+export declare const DISPATCHER_UNKNOWN_COMMAND: CommandErrorType;
+export declare const DISPATCHER_UNKNOWN_ARGUMENT: CommandErrorType;
+export declare const DISPATCHER_EXPECTED_ARGUMENT_SEPARATOR: CommandErrorType;
+export declare const DISPATCHER_PARSE_ERROR: CommandErrorType;

package/dist/exceptions/StandardErrorTypes.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DISPATCHER_PARSE_ERROR = exports.DISPATCHER_EXPECTED_ARGUMENT_SEPARATOR = exports.DISPATCHER_UNKNOWN_ARGUMENT = exports.DISPATCHER_UNKNOWN_COMMAND = exports.READER_EXPECTED_FLOAT = exports.READER_INVALID_FLOAT = exports.READER_EXPECTED_INT = exports.READER_INVALID_INT = exports.READER_EXPECTED_BOOL = exports.READER_INVALID_BOOL = exports.READER_INVALID_ESCAPE = exports.READER_EXPECTED_END_OF_QUOTE = exports.READER_EXPECTED_START_OF_QUOTE = exports.LITERAL_INCORRECT = exports.LONG_TOO_BIG = exports.LONG_TOO_SMALL = exports.INTEGER_TOO_BIG = exports.INTEGER_TOO_SMALL = exports.FLOAT_TOO_BIG = exports.FLOAT_TOO_SMALL = exports.DOUBLE_TOO_BIG = exports.DOUBLE_TOO_SMALL = void 0;
+const CommandErrorType_1 = require("./CommandErrorType");
+exports.DOUBLE_TOO_SMALL = new CommandErrorType_1.CommandErrorType((found, min) => `Double must not be less than ${min}, found ${found}`);
+exports.DOUBLE_TOO_BIG = new CommandErrorType_1.CommandErrorType((found, max) => `Double must not be more than ${max}, found ${found}`);
+exports.FLOAT_TOO_SMALL = new CommandErrorType_1.CommandErrorType((found, min) => `Float must not be less than ${min}, found ${found}`);
+exports.FLOAT_TOO_BIG = new CommandErrorType_1.CommandErrorType((found, max) => `Float must not be more than ${max}, found ${found}`);
+exports.INTEGER_TOO_SMALL = new CommandErrorType_1.CommandErrorType((found, min) => `Integer must not be less than ${min}, found ${found}`);
+exports.INTEGER_TOO_BIG = new CommandErrorType_1.CommandErrorType((found, max) => `Integer must not be more than ${max}, found ${found}`);
+exports.LONG_TOO_SMALL = new CommandErrorType_1.CommandErrorType((found, min) => `Long must not be less than ${min}, found ${found}`);
+exports.LONG_TOO_BIG = new CommandErrorType_1.CommandErrorType((found, max) => `Long must not be more than ${max}, found ${found}`);
+exports.LITERAL_INCORRECT = new CommandErrorType_1.CommandErrorType((expected) => `Expected literal ${expected}`);
+exports.READER_EXPECTED_START_OF_QUOTE = new CommandErrorType_1.CommandErrorType(() => `Expected quote to start a string`);
+exports.READER_EXPECTED_END_OF_QUOTE = new CommandErrorType_1.CommandErrorType(() => `Unclosed quoted string`);
+exports.READER_INVALID_ESCAPE = new CommandErrorType_1.CommandErrorType((character) => `Invalid escape sequence '${character}' in quoted string`);
+exports.READER_INVALID_BOOL = new CommandErrorType_1.CommandErrorType((value) => `Invalid bool, expected true or false but found '${value}'`);
+exports.READER_EXPECTED_BOOL = new CommandErrorType_1.CommandErrorType(() => `Expected bool`);
+exports.READER_INVALID_INT = new CommandErrorType_1.CommandErrorType((value) => `Invalid integer '${value}'`);
+exports.READER_EXPECTED_INT = new CommandErrorType_1.CommandErrorType(() => `Expected integer`);
+exports.READER_INVALID_FLOAT = new CommandErrorType_1.CommandErrorType((value) => `Invalid float '${value}'`);
+exports.READER_EXPECTED_FLOAT = new CommandErrorType_1.CommandErrorType(() => `Expected float`);
+exports.DISPATCHER_UNKNOWN_COMMAND = new CommandErrorType_1.CommandErrorType(() => `Unknown Command`);
+exports.DISPATCHER_UNKNOWN_ARGUMENT = new CommandErrorType_1.CommandErrorType(() => `Incorrect argument for command`);
+exports.DISPATCHER_EXPECTED_ARGUMENT_SEPARATOR = new CommandErrorType_1.CommandErrorType(() => `Expected whitespace to end one argument, but found trailing data`);
+exports.DISPATCHER_PARSE_ERROR = new CommandErrorType_1.CommandErrorType((message) => `Could not parse command: ${message}`);

package/dist/tree/LiteralCommandNode.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LiteralCommandNode = void 0;
 const StringRange_1 = require("../context/StringRange");
-const CommandSyntaxError_1 = require("../exceptions/CommandSyntaxError");
+const StandardErrorTypes_1 = require("../exceptions/StandardErrorTypes");
 const Suggestions_1 = require("../suggestion/Suggestions");
 const CommandNode_1 = require("./CommandNode");
 const internal2_1 = require("./internal2");
@@ -19,7 +19,7 @@ class LiteralCommandNode extends CommandNode_1.CommandNode {
             contextBuilder.withNode(this, new StringRange_1.StringRange(start, end));
             return;
         }
-        throw CommandSyntaxError_1.CommandSyntaxError.LITERAL_INCORRECT.createWithContext(reader, this.literal);
+        throw StandardErrorTypes_1.LITERAL_INCORRECT.createWithContext(reader, this.literal);
     }
     parseInternal(reader) {
         const start = reader.getCursor();

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/Command.ts","../src/CommandDispatcher.ts","../src/ParseResults.ts","../src/Predicate.ts","../src/StringReader.ts","../src/index.ts","../src/arguments/ArgumentType.ts","../src/arguments/BoolArgumentType.ts","../src/arguments/FloatArgumentType.ts","../src/arguments/IntegerArgumentType.ts","../src/arguments/LongArgumentType.ts","../src/arguments/NumberArgumentType.ts","../src/arguments/StringArgumentType.ts","../src/builder/ArgumentBuilder.ts","../src/builder/LiteralArgumentBuilder.ts","../src/builder/RequiredArgumentBuilder.ts","../src/context/CommandContext.ts","../src/context/CommandContextBuilder.ts","../src/context/ParsedArgument.ts","../src/context/ParsedCommandNode.ts","../src/context/StringRange.ts","../src/context/SuggestionContext.ts","../src/exceptions/CommandErrorType.ts","../src/exceptions/CommandSyntaxError.ts","../src/suggestion/Suggestion.ts","../src/suggestion/Suggestions.ts","../src/suggestion/SuggestionsBuilder.ts","../src/tree/ArgumentCommandNode.ts","../src/tree/CommandNode.ts","../src/tree/LiteralCommandNode.ts","../src/tree/RootCommandNode.ts","../src/tree/internal.ts","../src/tree/internal2.ts"],"version":"5.9.3"}
+{"root":["../src/Command.ts","../src/CommandDispatcher.ts","../src/ParseResults.ts","../src/Predicate.ts","../src/StringReader.ts","../src/index.ts","../src/arguments/ArgumentType.ts","../src/arguments/BoolArgumentType.ts","../src/arguments/FloatArgumentType.ts","../src/arguments/IntegerArgumentType.ts","../src/arguments/LongArgumentType.ts","../src/arguments/NumberArgumentType.ts","../src/arguments/StringArgumentType.ts","../src/builder/ArgumentBuilder.ts","../src/builder/LiteralArgumentBuilder.ts","../src/builder/RequiredArgumentBuilder.ts","../src/context/CommandContext.ts","../src/context/CommandContextBuilder.ts","../src/context/ParsedArgument.ts","../src/context/ParsedCommandNode.ts","../src/context/StringRange.ts","../src/context/SuggestionContext.ts","../src/exceptions/CommandErrorType.ts","../src/exceptions/CommandSyntaxError.ts","../src/exceptions/StandardErrorTypes.ts","../src/suggestion/Suggestion.ts","../src/suggestion/Suggestions.ts","../src/suggestion/SuggestionsBuilder.ts","../src/tree/ArgumentCommandNode.ts","../src/tree/CommandNode.ts","../src/tree/LiteralCommandNode.ts","../src/tree/RootCommandNode.ts","../src/tree/internal.ts","../src/tree/internal2.ts"],"version":"5.9.3"}

package/package.json

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

package/src/CommandDispatcher.ts

@@ -1,15 +1,14 @@
-import {
-	CommandContextBuilder,
-	type CommandNode,
-	CommandSyntaxError,
-	type LiteralArgumentBuilder,
-	type LiteralCommandNode,
-	ParseResults,
-	RootCommandNode,
-	StringReader,
-	Suggestions,
-	SuggestionsBuilder,
-} from ".";
+import type { LiteralArgumentBuilder } from "./builder/LiteralArgumentBuilder";
+import { CommandContextBuilder } from "./context/CommandContextBuilder";
+import { CommandSyntaxError } from "./exceptions/CommandSyntaxError";
+import { DISPATCHER_EXPECTED_ARGUMENT_SEPARATOR, DISPATCHER_PARSE_ERROR, DISPATCHER_UNKNOWN_ARGUMENT, DISPATCHER_UNKNOWN_COMMAND } from "./exceptions/StandardErrorTypes";
+import { ParseResults } from "./ParseResults";
+import { StringReader } from "./StringReader";
+import { Suggestions } from "./suggestion/Suggestions";
+import { SuggestionsBuilder } from "./suggestion/SuggestionsBuilder";
+import type { CommandNode } from "./tree/CommandNode";
+import type { LiteralCommandNode } from "./tree/LiteralCommandNode";
+import { RootCommandNode } from "./tree/RootCommandNode";
 
 export class CommandDispatcher<S> {
 	private root: RootCommandNode<S>;
@@ -39,13 +38,9 @@ export class CommandDispatcher<S> {
 			if (parse.getErrors().size === 1) {
 				throw parse.getErrors().values().next();
 			} else if (parse.getContext().getRange().isEmpty()) {
-				throw CommandSyntaxError.DISPATCHER_UNKNOWN_COMMAND.createWithContext(
-					parse.getReader(),
-				);
+				throw DISPATCHER_UNKNOWN_COMMAND.createWithContext(parse.getReader());
 			} else {
-				throw CommandSyntaxError.DISPATCHER_UNKNOWN_ARGUMENT.createWithContext(
-					parse.getReader(),
-				);
+				throw DISPATCHER_UNKNOWN_ARGUMENT.createWithContext(parse.getReader());
 			}
 		}
 
@@ -97,9 +92,7 @@ export class CommandDispatcher<S> {
 		}
 
 		if (!foundCommand) {
-			throw CommandSyntaxError.DISPATCHER_UNKNOWN_COMMAND.createWithContext(
-				parse.getReader(),
-			);
+			throw DISPATCHER_UNKNOWN_COMMAND.createWithContext(parse.getReader());
 		}
 		return forked ? successfulForks : result;
 	}
@@ -142,14 +135,11 @@ export class CommandDispatcher<S> {
 					if (e instanceof CommandSyntaxError) {
 						throw e;
 					} else {
-						throw CommandSyntaxError.DISPATCHER_PARSE_ERROR.createWithContext(
-							reader,
-							e.message,
-						);
+						throw DISPATCHER_PARSE_ERROR.createWithContext(reader, e.message);
 					}
 				}
 				if (reader.canRead() && reader.peek() !== " ") {
-					throw CommandSyntaxError.DISPATCHER_EXPECTED_ARGUMENT_SEPARATOR.createWithContext(
+					throw DISPATCHER_EXPECTED_ARGUMENT_SEPARATOR.createWithContext(
 						reader,
 					);
 				}

package/src/StringReader.ts

@@ -1,4 +1,4 @@
-import { CommandSyntaxError } from "./exceptions/CommandSyntaxError";
+import { READER_EXPECTED_BOOL, READER_EXPECTED_END_OF_QUOTE, READER_EXPECTED_FLOAT, READER_EXPECTED_INT, READER_INVALID_BOOL, READER_INVALID_ESCAPE, READER_INVALID_FLOAT, READER_INVALID_INT } from "./exceptions/StandardErrorTypes";
 
 export class StringReader {
 	private string: string;
@@ -71,7 +71,7 @@ export class StringReader {
 		}
 		const number = this.string.substring(start, this.cursor);
 		if (number.length === 0) {
-			throw CommandSyntaxError.READER_EXPECTED_INT.createWithContext(this);
+			throw READER_EXPECTED_INT.createWithContext(this);
 		}
 		try {
 			const value = Number(number);
@@ -81,10 +81,7 @@ export class StringReader {
 			return value;
 		} catch (_) {
 			this.cursor = start;
-			throw CommandSyntaxError.READER_INVALID_INT.createWithContext(
-				this,
-				number,
-			);
+			throw READER_INVALID_INT.createWithContext(this, number);
 		}
 	}
 
@@ -95,16 +92,13 @@ export class StringReader {
 		}
 		const number = this.string.substring(start, this.cursor);
 		if (number.length === 0) {
-			throw CommandSyntaxError.READER_EXPECTED_INT.createWithContext(this);
+			throw READER_EXPECTED_INT.createWithContext(this);
 		}
 		try {
 			return BigInt(number);
 		} catch (_) {
 			this.cursor = start;
-			throw CommandSyntaxError.READER_INVALID_INT.createWithContext(
-				this,
-				number,
-			);
+			throw READER_INVALID_INT.createWithContext(this, number);
 		}
 	}
 
@@ -115,7 +109,7 @@ export class StringReader {
 		}
 		const number = this.string.substring(start, this.cursor);
 		if (number.length === 0) {
-			throw CommandSyntaxError.READER_EXPECTED_FLOAT.createWithContext(this);
+			throw READER_EXPECTED_FLOAT.createWithContext(this);
 		}
 		try {
 			const value = Number(number);
@@ -125,10 +119,7 @@ export class StringReader {
 			return value;
 		} catch (_e) {
 			this.cursor = start;
-			throw CommandSyntaxError.READER_INVALID_FLOAT.createWithContext(
-				this,
-				number,
-			);
+			throw READER_INVALID_FLOAT.createWithContext(this, number);
 		}
 	}
 
@@ -167,10 +158,7 @@ export class StringReader {
 					escaped = false;
 				} else {
 					this.setCursor(this.cursor - 1);
-					throw CommandSyntaxError.READER_INVALID_ESCAPE.createWithContext(
-						this,
-						c,
-					);
+					throw READER_INVALID_ESCAPE.createWithContext(this, c);
 				}
 			} else if (c === "\\") {
 				escaped = true;
@@ -180,9 +168,7 @@ export class StringReader {
 				result.push(c);
 			}
 		}
-		throw CommandSyntaxError.READER_EXPECTED_END_OF_QUOTE.createWithContext(
-			this,
-		);
+		throw READER_EXPECTED_END_OF_QUOTE.createWithContext(this);
 	}
 
 	readString(): string {
@@ -200,17 +186,14 @@ export class StringReader {
 	readBoolean(): boolean {
 		const value = this.readUnquotedString();
 		if (value.length === 0) {
-			throw CommandSyntaxError.READER_EXPECTED_BOOL.createWithContext(this);
+			throw READER_EXPECTED_BOOL.createWithContext(this);
 		}
 		if (value === "true") {
 			return true;
 		} else if (value === "false") {
 			return false;
 		} else {
-			throw CommandSyntaxError.READER_INVALID_BOOL.createWithContext(
-				this,
-				value,
-			);
+			throw READER_INVALID_BOOL.createWithContext(this, value);
 		}
 	}
 }

package/src/arguments/FloatArgumentType.ts

@@ -1,4 +1,4 @@
-import { CommandSyntaxError } from "../exceptions/CommandSyntaxError";
+import { FLOAT_TOO_BIG, FLOAT_TOO_SMALL } from "../exceptions/StandardErrorTypes";
 import type { StringReader } from "../StringReader";
 import { NumberArgumentType } from "./NumberArgumentType";
 
@@ -12,10 +12,10 @@ export class FloatArgumentType extends NumberArgumentType {
 	}
 
 	getTooSmallError() {
-		return CommandSyntaxError.FLOAT_TOO_SMALL;
+		return FLOAT_TOO_SMALL;
 	}
 
 	getTooBigError() {
-		return CommandSyntaxError.FLOAT_TOO_BIG;
+		return FLOAT_TOO_BIG;
 	}
 }

package/src/arguments/IntegerArgumentType.ts

@@ -1,4 +1,4 @@
-import { CommandSyntaxError } from "../exceptions/CommandSyntaxError";
+import { INTEGER_TOO_BIG, INTEGER_TOO_SMALL } from "../exceptions/StandardErrorTypes";
 import type { StringReader } from "../StringReader";
 import { NumberArgumentType } from "./NumberArgumentType";
 
@@ -12,10 +12,10 @@ export class IntegerArgumentType extends NumberArgumentType {
 	}
 
 	getTooSmallError() {
-		return CommandSyntaxError.INTEGER_TOO_SMALL;
+		return INTEGER_TOO_SMALL;
 	}
 
 	getTooBigError() {
-		return CommandSyntaxError.INTEGER_TOO_BIG;
+		return INTEGER_TOO_BIG;
 	}
 }

package/src/arguments/LongArgumentType.ts

@@ -1,4 +1,4 @@
-import { CommandSyntaxError } from "../exceptions/CommandSyntaxError";
+import { LONG_TOO_BIG, LONG_TOO_SMALL } from "../exceptions/StandardErrorTypes";
 import type { StringReader } from "../StringReader";
 import { NumberArgumentType } from "./NumberArgumentType";
 
@@ -15,10 +15,10 @@ export class LongArgumentType extends NumberArgumentType<bigint> {
 	}
 
 	getTooSmallError() {
-		return CommandSyntaxError.LONG_TOO_SMALL;
+		return LONG_TOO_SMALL;
 	}
 
 	getTooBigError() {
-		return CommandSyntaxError.LONG_TOO_BIG;
+		return LONG_TOO_BIG;
 	}
 }

package/src/exceptions/CommandSyntaxError.ts

@@ -1,5 +1,3 @@
-import { CommandErrorType } from "./CommandErrorType";
-
 const CONTEXT_AMOUNT = 10;
 
 export class CommandSyntaxError extends Error {
@@ -23,67 +21,4 @@ export class CommandSyntaxError extends Error {
 			this.message += "<--[HERE]";
 		}
 	}
-
-	static DOUBLE_TOO_SMALL = new CommandErrorType(
-		(found, min) => `Double must not be less than ${min}, found ${found}`,
-	);
-	static DOUBLE_TOO_BIG = new CommandErrorType(
-		(found, max) => `Double must not be more than ${max}, found ${found}`,
-	);
-	static FLOAT_TOO_SMALL = new CommandErrorType(
-		(found, min) => `Float must not be less than ${min}, found ${found}`,
-	);
-	static FLOAT_TOO_BIG = new CommandErrorType(
-		(found, max) => `Float must not be more than ${max}, found ${found}`,
-	);
-	static INTEGER_TOO_SMALL = new CommandErrorType(
-		(found, min) => `Integer must not be less than ${min}, found ${found}`,
-	);
-	static INTEGER_TOO_BIG = new CommandErrorType(
-		(found, max) => `Integer must not be more than ${max}, found ${found}`,
-	);
-	static LONG_TOO_SMALL = new CommandErrorType(
-		(found, min) => `Long must not be less than ${min}, found ${found}`,
-	);
-	static LONG_TOO_BIG = new CommandErrorType(
-		(found, max) => `Long must not be more than ${max}, found ${found}`,
-	);
-	static LITERAL_INCORRECT = new CommandErrorType(
-		(expected) => `Expected literal ${expected}`,
-	);
-
-	static READER_EXPECTED_START_OF_QUOTE = new CommandErrorType(
-		() => `Expected quote to start a string`,
-	);
-	static READER_EXPECTED_END_OF_QUOTE = new CommandErrorType(
-		() => `Unclosed quoted string`,
-	);
-	static READER_INVALID_ESCAPE = new CommandErrorType(
-		(character) => `Invalid escape sequence '${character}' in quoted string`,
-	);
-	static READER_INVALID_BOOL = new CommandErrorType(
-		(value) => `Invalid bool, expected true or false but found '${value}'`,
-	);
-	static READER_EXPECTED_BOOL = new CommandErrorType(() => `Expected bool`);
-	static READER_INVALID_INT = new CommandErrorType(
-		(value) => `Invalid integer '${value}'`,
-	);
-	static READER_EXPECTED_INT = new CommandErrorType(() => `Expected integer`);
-	static READER_INVALID_FLOAT = new CommandErrorType(
-		(value) => `Invalid float '${value}'`,
-	);
-	static READER_EXPECTED_FLOAT = new CommandErrorType(() => `Expected float`);
-
-	static DISPATCHER_UNKNOWN_COMMAND = new CommandErrorType(
-		() => `Unknown Command`,
-	);
-	static DISPATCHER_UNKNOWN_ARGUMENT = new CommandErrorType(
-		() => `Incorrect argument for command`,
-	);
-	static DISPATCHER_EXPECTED_ARGUMENT_SEPARATOR = new CommandErrorType(
-		() => `Expected whitespace to end one argument, but found trailing data`,
-	);
-	static DISPATCHER_PARSE_ERROR = new CommandErrorType(
-		(message) => `Could not parse command: ${message}`,
-	);
 }

package/src/exceptions/StandardErrorTypes.ts

@@ -0,0 +1,68 @@
+import { CommandErrorType } from "./CommandErrorType";
+
+export const DOUBLE_TOO_SMALL = new CommandErrorType(
+	(found, min) => `Double must not be less than ${min}, found ${found}`,
+);
+export const DOUBLE_TOO_BIG = new CommandErrorType(
+	(found, max) => `Double must not be more than ${max}, found ${found}`,
+);
+export const FLOAT_TOO_SMALL = new CommandErrorType(
+	(found, min) => `Float must not be less than ${min}, found ${found}`,
+);
+export const FLOAT_TOO_BIG = new CommandErrorType(
+	(found, max) => `Float must not be more than ${max}, found ${found}`,
+);
+export const INTEGER_TOO_SMALL = new CommandErrorType(
+	(found, min) => `Integer must not be less than ${min}, found ${found}`,
+);
+export const INTEGER_TOO_BIG = new CommandErrorType(
+	(found, max) => `Integer must not be more than ${max}, found ${found}`,
+);
+export const LONG_TOO_SMALL = new CommandErrorType(
+	(found, min) => `Long must not be less than ${min}, found ${found}`,
+);
+export const LONG_TOO_BIG = new CommandErrorType(
+	(found, max) => `Long must not be more than ${max}, found ${found}`,
+);
+export const LITERAL_INCORRECT = new CommandErrorType(
+	(expected) => `Expected literal ${expected}`,
+);
+
+export const READER_EXPECTED_START_OF_QUOTE = new CommandErrorType(
+	() => `Expected quote to start a string`,
+);
+export const READER_EXPECTED_END_OF_QUOTE = new CommandErrorType(
+	() => `Unclosed quoted string`,
+);
+export const READER_INVALID_ESCAPE = new CommandErrorType(
+	(character) => `Invalid escape sequence '${character}' in quoted string`,
+);
+export const READER_INVALID_BOOL = new CommandErrorType(
+	(value) => `Invalid bool, expected true or false but found '${value}'`,
+);
+export const READER_EXPECTED_BOOL = new CommandErrorType(() => `Expected bool`);
+export const READER_INVALID_INT = new CommandErrorType(
+	(value) => `Invalid integer '${value}'`,
+);
+export const READER_EXPECTED_INT = new CommandErrorType(
+	() => `Expected integer`,
+);
+export const READER_INVALID_FLOAT = new CommandErrorType(
+	(value) => `Invalid float '${value}'`,
+);
+export const READER_EXPECTED_FLOAT = new CommandErrorType(
+	() => `Expected float`,
+);
+
+export const DISPATCHER_UNKNOWN_COMMAND = new CommandErrorType(
+	() => `Unknown Command`,
+);
+export const DISPATCHER_UNKNOWN_ARGUMENT = new CommandErrorType(
+	() => `Incorrect argument for command`,
+);
+export const DISPATCHER_EXPECTED_ARGUMENT_SEPARATOR = new CommandErrorType(
+	() => `Expected whitespace to end one argument, but found trailing data`,
+);
+export const DISPATCHER_PARSE_ERROR = new CommandErrorType(
+	(message) => `Could not parse command: ${message}`,
+);

package/src/tree/LiteralCommandNode.ts

@@ -3,7 +3,7 @@ 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 { LITERAL_INCORRECT } from "../exceptions/StandardErrorTypes";
 import type { Predicate } from "../Predicate";
 import type { StringReader } from "../StringReader";
 import { Suggestions } from "../suggestion/Suggestions";
@@ -34,7 +34,7 @@ export class LiteralCommandNode<S> extends CommandNode<S> {
 			contextBuilder.withNode(this, new StringRange(start, end));
 			return;
 		}
-		throw CommandSyntaxError.LITERAL_INCORRECT.createWithContext(
+		throw LITERAL_INCORRECT.createWithContext(
 			reader,
 			this.literal,
 		);