@duplojs/server 0.1.0-beta.1 → 0.1.0-beta.10

package/dist/command/help.cjs

@@ -1,19 +1,21 @@
 const require_runtime = require("../_virtual/_rolldown/runtime.cjs");
-const require_exist = require("../dataStructure/constraint/exist.cjs");
+const require_fileExist = require("../dataStructure/constraint/fileExist.cjs");
+const require_folderExist = require("../dataStructure/constraint/folderExist.cjs");
 const require_mimeType = require("../dataStructure/constraint/mimeType.cjs");
 const require_size = require("../dataStructure/constraint/size.cjs");
 const require_file = require("../dataStructure/type/file.cjs");
+const require_folder = require("../dataStructure/type/folder.cjs");
 const require_array = require("./options/defaults/array.cjs");
 const require_boolean = require("./options/defaults/boolean.cjs");
 const require_simple = require("./options/defaults/simple.cjs");
 let _duplojs_lang_common = require("@duplojs/lang/common");
 _duplojs_lang_common = require_runtime.__toESM(_duplojs_lang_common, 1);
+let _duplojs_lang_pattern = require("@duplojs/lang/pattern");
+_duplojs_lang_pattern = require_runtime.__toESM(_duplojs_lang_pattern, 1);
 let _duplojs_lang_dataStructure = require("@duplojs/lang/dataStructure");
 _duplojs_lang_dataStructure = require_runtime.__toESM(_duplojs_lang_dataStructure, 1);
 let _duplojs_lang_array = require("@duplojs/lang/array");
 _duplojs_lang_array = require_runtime.__toESM(_duplojs_lang_array, 1);
-let _duplojs_lang_pattern = require("@duplojs/lang/pattern");
-_duplojs_lang_pattern = require_runtime.__toESM(_duplojs_lang_pattern, 1);
 let _duplojs_lang_string = require("@duplojs/lang/string");
 _duplojs_lang_string = require_runtime.__toESM(_duplojs_lang_string, 1);
 let _duplojs_lang_printer = require("@duplojs/lang/printer");
@@ -28,8 +30,12 @@ const literal = (input) => _duplojs_lang_printer.colorized(input, "yellow");
 const marker = (input) => _duplojs_lang_printer.colorized(input, "yellow");
 const secondary = (input) => _duplojs_lang_printer.colorized(input, "gray");
 const constraintLabel = (input) => _duplojs_lang_printer.colorized(input, "magenta");
-function renderInline(input) {
-	return _duplojs_lang_printer.render(input, "");
+function renderInline(input, depth = 0) {
+	return _duplojs_lang_printer.renderLine(input, {
+		joinCharacter: "",
+		indent: _duplojs_lang_printer.Indent.tab,
+		indentLevel: depth
+	});
 }
 function formatLiteral(value) {
 	if (typeof value === "string") return JSON.stringify(value);
@@ -53,7 +59,7 @@ function formatBytes(value) {
 	return `${Number.isInteger(size) ? size : size.toFixed(1)} ${units[index]}`;
 }
 function renderType(type) {
-	return _duplojs_lang_pattern.match(type).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.stringLiteralTypeKind), ({ definition }) => [literal(formatLiteral(definition.value))]).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.numberLiteralTypeKind), ({ definition }) => [literal(formatLiteral(definition.value))]).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.bigintLiteralTypeKind), ({ definition }) => [literal(formatLiteral(definition.value))]).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.booleanLiteralTypeKind), ({ definition }) => [literal(formatLiteral(definition.value))]).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.nullTypeKind), _duplojs_lang_common.justReturn([literal("null")])).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.undefinedTypeKind), _duplojs_lang_common.justReturn([literal("undefined")])).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.stringTypeKind), _duplojs_lang_common.justReturn([typeLabel("string")])).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.numberTypeKind), _duplojs_lang_common.justReturn([typeLabel("number")])).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.bigintTypeKind), _duplojs_lang_common.justReturn([typeLabel("bigint")])).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.booleanTypeKind), _duplojs_lang_common.justReturn([typeLabel("boolean")])).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.dateTypeKind), _duplojs_lang_common.justReturn([typeLabel("date")])).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.timeTypeKind), _duplojs_lang_common.justReturn([typeLabel("time")])).when(_duplojs_lang_dataStructure.typeIdentifier(require_file.fileTypeKind), _duplojs_lang_common.justReturn([typeLabel("file")])).otherwise(_duplojs_lang_common.justReturn([typeLabel("unknown")]));
+	return _duplojs_lang_pattern.match(type).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.stringLiteralTypeKind), ({ definition }) => [literal(formatLiteral(definition.value))]).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.numberLiteralTypeKind), ({ definition }) => [literal(formatLiteral(definition.value))]).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.bigintLiteralTypeKind), ({ definition }) => [literal(formatLiteral(definition.value))]).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.booleanLiteralTypeKind), ({ definition }) => [literal(formatLiteral(definition.value))]).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.nullTypeKind), _duplojs_lang_common.justReturn([literal("null")])).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.undefinedTypeKind), _duplojs_lang_common.justReturn([literal("undefined")])).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.stringTypeKind), _duplojs_lang_common.justReturn([typeLabel("string")])).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.numberTypeKind), _duplojs_lang_common.justReturn([typeLabel("number")])).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.bigintTypeKind), _duplojs_lang_common.justReturn([typeLabel("bigint")])).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.booleanTypeKind), _duplojs_lang_common.justReturn([typeLabel("boolean")])).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.dateTypeKind), _duplojs_lang_common.justReturn([typeLabel("date")])).when(_duplojs_lang_dataStructure.typeIdentifier(_duplojs_lang_dataStructure.timeTypeKind), _duplojs_lang_common.justReturn([typeLabel("time")])).when(_duplojs_lang_dataStructure.typeIdentifier(require_file.fileTypeKind), _duplojs_lang_common.justReturn([typeLabel("file")])).when(_duplojs_lang_dataStructure.typeIdentifier(require_folder.folderTypeKind), _duplojs_lang_common.justReturn([typeLabel("folder")])).otherwise(_duplojs_lang_common.justReturn([typeLabel("unknown")]));
 }
 function renderStringLength(constraints) {
 	const equal = _duplojs_lang_array.find(constraints, _duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.stringLengthEqualConstraintKind));
@@ -83,7 +89,7 @@ function renderNumberBounds(constraints) {
 	return _duplojs_lang_array.filter([greaterThan ? [constraintLabel("> "), literal(String(greaterThan.definition.threshold))] : greaterThanOrEqual ? [constraintLabel("min "), literal(String(greaterThanOrEqual.definition.threshold))] : null, lessThan ? [constraintLabel("< "), literal(String(lessThan.definition.threshold))] : lessThanOrEqual ? [constraintLabel("max "), literal(String(lessThanOrEqual.definition.threshold))] : null], _duplojs_lang_common.truthy);
 }
 function renderSimpleConstraint(constraint) {
-	return _duplojs_lang_pattern.match(constraint).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.emailConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("email")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.urlConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("url")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.uuidConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("uuid")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.integerConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("integer")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.trimmedConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("trimmed")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.notEmptyConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("not empty")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.numberInStringConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("number in string")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.evenConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("even")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.oddConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("odd")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.positiveConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("positive")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.negativeConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("negative")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.notZeroConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("not zero")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.safeConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("safe number")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.pathConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("path")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.absolutePathConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("absolute path")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.segmentPathConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("path segment")])).when(_duplojs_lang_dataStructure.constraintIdentifier(require_exist.existConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("exists")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.strictPositiveConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("> "), literal("0")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.strictNegativeConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("< "), literal("0")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.betweenThanConstraintKind), ({ definition }) => [
+	return _duplojs_lang_pattern.match(constraint).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.emailConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("email")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.urlConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("url")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.uuidConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("uuid")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.integerConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("integer")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.trimmedConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("trimmed")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.notEmptyConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("not empty")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.numberInStringConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("number in string")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.evenConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("even")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.oddConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("odd")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.positiveConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("positive")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.negativeConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("negative")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.notZeroConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("not zero")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.safeConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("safe number")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.pathConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("path")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.absolutePathConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("absolute path")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.segmentPathConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("path segment")])).when(_duplojs_lang_dataStructure.constraintIdentifier(require_fileExist.fileExistConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("exists")])).when(_duplojs_lang_dataStructure.constraintIdentifier(require_folderExist.folderExistConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("exists")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.strictPositiveConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("> "), literal("0")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.strictNegativeConstraintKind), _duplojs_lang_common.justReturn([constraintLabel("< "), literal("0")])).when(_duplojs_lang_dataStructure.constraintIdentifier(_duplojs_lang_dataStructure.betweenThanConstraintKind), ({ definition }) => [
 		constraintLabel("> "),
 		literal(String(definition.greater)),
 		secondary(" and "),
@@ -157,14 +163,10 @@ function renderMetadata(help, markerValue) {
 	]);
 }
 function renderConstraintLines(constraints, depth) {
-	return _duplojs_lang_array.map(constraints, (constraint) => renderInline([
-		_duplojs_lang_printer.indent(depth),
-		secondary("↳ "),
-		constraint
-	]));
+	return _duplojs_lang_array.map(constraints, (constraint) => renderInline([secondary("↳ "), constraint], depth));
 }
 function renderDescriptionLine(description, depth) {
-	return description ? renderInline([_duplojs_lang_printer.indent(depth), secondary(description)]) : null;
+	return description ? renderInline([secondary(description)], depth) : null;
 }
 function renderUsage(command) {
 	const args = command.subject?.type === "argument" ? _duplojs_lang_array.map(command.subject.args, (argument) => argument.optional ? `[${argument.name}]` : `<${argument.name}>`) : command.subject?.type === "subCommand" ? ["<command>"] : [];
@@ -191,48 +193,39 @@ function renderOptionDetails(option, depth) {
 	if (require_simple.simpleOptionKind.has(option) || require_array.arrayOptionKind.has(option)) {
 		const help = renderDataStructure(option.dataStructure);
 		return _duplojs_lang_array.filter([
-			renderInline([_duplojs_lang_printer.indent(depth), renderMetadata(help, option.required ? "required" : "optional")]),
-			renderDescriptionLine(option.description, depth),
-			...renderConstraintLines(help.constraints, depth)
+			renderInline([renderMetadata(help, option.required ? "required" : "optional")], depth),
+			...renderConstraintLines(help.constraints, depth),
+			renderDescriptionLine(option.description, depth)
 		], _duplojs_lang_common.truthy);
 	}
-	if (require_boolean.booleanOptionKind.has(option)) return _duplojs_lang_array.filter([renderInline([_duplojs_lang_printer.indent(depth), typeLabel("boolean")]), renderDescriptionLine(option.description, depth)], _duplojs_lang_common.truthy);
+	if (require_boolean.booleanOptionKind.has(option)) return _duplojs_lang_array.filter([renderInline([typeLabel("boolean")], depth), renderDescriptionLine(option.description, depth)], _duplojs_lang_common.truthy);
 	return _duplojs_lang_array.filter([renderDescriptionLine(option.description, depth)], _duplojs_lang_common.truthy);
 }
 function renderOptionsHelp(options, depth) {
-	return _duplojs_lang_printer.renderParagraph([renderInline([_duplojs_lang_printer.indent(depth), section("OPTIONS", "magenta")]), _duplojs_lang_array.map(options, (option) => _duplojs_lang_printer.renderParagraph([renderInline([_duplojs_lang_printer.indent(depth + 1), renderOptionSignature(option)]), renderOptionDetails(option, depth + 2)]))]);
+	return _duplojs_lang_printer.renderParagraph([renderInline([section("OPTIONS", "magenta")], depth), _duplojs_lang_array.map(options, (option) => _duplojs_lang_printer.renderParagraph([renderInline([renderOptionSignature(option)], depth + 1), renderOptionDetails(option, depth + 2)]))]);
 }
 function renderArgumentsHelp(args, depth) {
-	return _duplojs_lang_printer.renderParagraph([renderInline([_duplojs_lang_printer.indent(depth), section("ARGUMENTS", "cyan")]), _duplojs_lang_array.map(args, (argument) => {
+	return _duplojs_lang_printer.renderParagraph([renderInline([section("ARGUMENTS", "cyan")], depth), _duplojs_lang_array.map(args, (argument) => {
 		const help = renderDataStructure(argument.dataStructure);
 		return _duplojs_lang_printer.renderParagraph([
-			renderInline([
-				_duplojs_lang_printer.indent(depth + 1),
-				name(argument.name.padEnd(12)),
-				renderMetadata(help, argument.optional ? "optional" : "required")
-			]),
-			renderDescriptionLine(argument.description, depth + 2),
-			renderConstraintLines(help.constraints, depth + 2)
+			renderInline([name(argument.name.padEnd(12)), renderMetadata(help, argument.optional ? "optional" : "required")], depth + 1),
+			renderConstraintLines(help.constraints, depth + 2),
+			renderDescriptionLine(argument.description, depth + 2)
 		]);
 	})]);
 }
 function renderSubCommandsHelp(commands, depth) {
-	return _duplojs_lang_printer.renderParagraph([renderInline([_duplojs_lang_printer.indent(depth), section("COMMANDS", "green")]), _duplojs_lang_array.map(commands, (command) => renderInline([
-		_duplojs_lang_printer.indent(depth + 1),
-		name(command.name.padEnd(16)),
-		command.description ? secondary(command.description) : null
-	]))]);
+	return _duplojs_lang_printer.renderParagraph([renderInline([section("COMMANDS", "green")], depth), _duplojs_lang_array.map(commands, (command) => renderInline([name(command.name.padEnd(16)), command.description ? secondary(command.description) : null], depth + 1))]);
 }
 function renderCommandHelp(command, depth) {
 	return [..._duplojs_lang_array.filter([
 		renderInline([
-			_duplojs_lang_printer.indent(depth),
 			section("COMMAND", "green"),
 			"  ",
 			_duplojs_lang_printer.colorizedBold(command.name, "cyan")
-		]),
+		], depth),
 		renderDescriptionLine(command.description, depth + 1),
-		_duplojs_lang_printer.renderParagraph([renderInline([_duplojs_lang_printer.indent(depth), section("USAGE", "blue")]), renderInline([_duplojs_lang_printer.indent(depth + 1), syntax(renderUsage(command))])]),
+		_duplojs_lang_printer.renderParagraph([renderInline([section("USAGE", "blue")], depth), renderInline([syntax(renderUsage(command))], depth + 1)]),
 		command.subject?.type === "argument" ? renderArgumentsHelp(command.subject.args, depth) : null,
 		command.subject?.type === "subCommand" ? renderSubCommandsHelp(command.subject.subCommands, depth) : null,
 		_duplojs_lang_array.minElements(command.options, 1) ? renderOptionsHelp(command.options, depth) : null
@@ -242,7 +235,7 @@ function logCommandHelp(command) {
 	console.log(_duplojs_lang_printer.renderParagraph(renderCommandHelp(command, 0)));
 }
 function renderExecOptionHelp(options, depth) {
-	return [renderInline([_duplojs_lang_printer.indent(depth), section("EXEC OPTIONS", "green")]), renderOptionsHelp(options, depth)];
+	return [renderInline([section("EXEC OPTIONS", "green")], depth), renderOptionsHelp(options, depth)];
 }
 function logExecOptionHelp(options) {
 	console.log(_duplojs_lang_printer.renderParagraph(renderExecOptionHelp(options, 0)));

package/dist/command/help.d.ts

@@ -1,7 +1,7 @@
 import { Command } from './create';
 import { Argument } from './argument';
 import { Options } from './options';
-export declare const helpOption: NoInfer<import('./options').BooleanOption<"help">>;
+export declare const helpOption: import('./options').BooleanOption<"help">;
 export declare function renderOptionsHelp(options: readonly Options[], depth: number): string;
 export declare function renderArgumentsHelp(args: readonly Argument[], depth: number): string;
 export declare function renderCommandHelp(command: Command, depth: number): string[];

package/dist/command/help.mjs

@@ -1,14 +1,16 @@
-import { existConstraintKind } from "../dataStructure/constraint/exist.mjs";
+import { fileExistConstraintKind } from "../dataStructure/constraint/fileExist.mjs";
+import { folderExistConstraintKind } from "../dataStructure/constraint/folderExist.mjs";
 import { mimeTypeConstraintKind } from "../dataStructure/constraint/mimeType.mjs";
 import { sizeConstraintKind } from "../dataStructure/constraint/size.mjs";
 import { fileTypeKind } from "../dataStructure/type/file.mjs";
+import { folderTypeKind } from "../dataStructure/type/folder.mjs";
 import { arrayOptionKind } from "./options/defaults/array.mjs";
 import { booleanOptionKind, createBooleanOption } from "./options/defaults/boolean.mjs";
 import { simpleOptionKind } from "./options/defaults/simple.mjs";
 import * as DCommon from "@duplojs/lang/common";
+import * as DPattern from "@duplojs/lang/pattern";
 import * as DDataStructure from "@duplojs/lang/dataStructure";
 import * as DArray from "@duplojs/lang/array";
-import * as DPattern from "@duplojs/lang/pattern";
 import * as DString from "@duplojs/lang/string";
 import * as DPrinter from "@duplojs/lang/printer";
 //#region scripts/command/help.ts
@@ -21,8 +23,12 @@ const literal = (input) => DPrinter.colorized(input, "yellow");
 const marker = (input) => DPrinter.colorized(input, "yellow");
 const secondary = (input) => DPrinter.colorized(input, "gray");
 const constraintLabel = (input) => DPrinter.colorized(input, "magenta");
-function renderInline(input) {
-	return DPrinter.render(input, "");
+function renderInline(input, depth = 0) {
+	return DPrinter.renderLine(input, {
+		joinCharacter: "",
+		indent: DPrinter.Indent.tab,
+		indentLevel: depth
+	});
 }
 function formatLiteral(value) {
 	if (typeof value === "string") return JSON.stringify(value);
@@ -46,7 +52,7 @@ function formatBytes(value) {
 	return `${Number.isInteger(size) ? size : size.toFixed(1)} ${units[index]}`;
 }
 function renderType(type) {
-	return DPattern.match(type).when(DDataStructure.typeIdentifier(DDataStructure.stringLiteralTypeKind), ({ definition }) => [literal(formatLiteral(definition.value))]).when(DDataStructure.typeIdentifier(DDataStructure.numberLiteralTypeKind), ({ definition }) => [literal(formatLiteral(definition.value))]).when(DDataStructure.typeIdentifier(DDataStructure.bigintLiteralTypeKind), ({ definition }) => [literal(formatLiteral(definition.value))]).when(DDataStructure.typeIdentifier(DDataStructure.booleanLiteralTypeKind), ({ definition }) => [literal(formatLiteral(definition.value))]).when(DDataStructure.typeIdentifier(DDataStructure.nullTypeKind), DCommon.justReturn([literal("null")])).when(DDataStructure.typeIdentifier(DDataStructure.undefinedTypeKind), DCommon.justReturn([literal("undefined")])).when(DDataStructure.typeIdentifier(DDataStructure.stringTypeKind), DCommon.justReturn([typeLabel("string")])).when(DDataStructure.typeIdentifier(DDataStructure.numberTypeKind), DCommon.justReturn([typeLabel("number")])).when(DDataStructure.typeIdentifier(DDataStructure.bigintTypeKind), DCommon.justReturn([typeLabel("bigint")])).when(DDataStructure.typeIdentifier(DDataStructure.booleanTypeKind), DCommon.justReturn([typeLabel("boolean")])).when(DDataStructure.typeIdentifier(DDataStructure.dateTypeKind), DCommon.justReturn([typeLabel("date")])).when(DDataStructure.typeIdentifier(DDataStructure.timeTypeKind), DCommon.justReturn([typeLabel("time")])).when(DDataStructure.typeIdentifier(fileTypeKind), DCommon.justReturn([typeLabel("file")])).otherwise(DCommon.justReturn([typeLabel("unknown")]));
+	return DPattern.match(type).when(DDataStructure.typeIdentifier(DDataStructure.stringLiteralTypeKind), ({ definition }) => [literal(formatLiteral(definition.value))]).when(DDataStructure.typeIdentifier(DDataStructure.numberLiteralTypeKind), ({ definition }) => [literal(formatLiteral(definition.value))]).when(DDataStructure.typeIdentifier(DDataStructure.bigintLiteralTypeKind), ({ definition }) => [literal(formatLiteral(definition.value))]).when(DDataStructure.typeIdentifier(DDataStructure.booleanLiteralTypeKind), ({ definition }) => [literal(formatLiteral(definition.value))]).when(DDataStructure.typeIdentifier(DDataStructure.nullTypeKind), DCommon.justReturn([literal("null")])).when(DDataStructure.typeIdentifier(DDataStructure.undefinedTypeKind), DCommon.justReturn([literal("undefined")])).when(DDataStructure.typeIdentifier(DDataStructure.stringTypeKind), DCommon.justReturn([typeLabel("string")])).when(DDataStructure.typeIdentifier(DDataStructure.numberTypeKind), DCommon.justReturn([typeLabel("number")])).when(DDataStructure.typeIdentifier(DDataStructure.bigintTypeKind), DCommon.justReturn([typeLabel("bigint")])).when(DDataStructure.typeIdentifier(DDataStructure.booleanTypeKind), DCommon.justReturn([typeLabel("boolean")])).when(DDataStructure.typeIdentifier(DDataStructure.dateTypeKind), DCommon.justReturn([typeLabel("date")])).when(DDataStructure.typeIdentifier(DDataStructure.timeTypeKind), DCommon.justReturn([typeLabel("time")])).when(DDataStructure.typeIdentifier(fileTypeKind), DCommon.justReturn([typeLabel("file")])).when(DDataStructure.typeIdentifier(folderTypeKind), DCommon.justReturn([typeLabel("folder")])).otherwise(DCommon.justReturn([typeLabel("unknown")]));
 }
 function renderStringLength(constraints) {
 	const equal = DArray.find(constraints, DDataStructure.constraintIdentifier(DDataStructure.stringLengthEqualConstraintKind));
@@ -76,7 +82,7 @@ function renderNumberBounds(constraints) {
 	return DArray.filter([greaterThan ? [constraintLabel("> "), literal(String(greaterThan.definition.threshold))] : greaterThanOrEqual ? [constraintLabel("min "), literal(String(greaterThanOrEqual.definition.threshold))] : null, lessThan ? [constraintLabel("< "), literal(String(lessThan.definition.threshold))] : lessThanOrEqual ? [constraintLabel("max "), literal(String(lessThanOrEqual.definition.threshold))] : null], DCommon.truthy);
 }
 function renderSimpleConstraint(constraint) {
-	return DPattern.match(constraint).when(DDataStructure.constraintIdentifier(DDataStructure.emailConstraintKind), DCommon.justReturn([constraintLabel("email")])).when(DDataStructure.constraintIdentifier(DDataStructure.urlConstraintKind), DCommon.justReturn([constraintLabel("url")])).when(DDataStructure.constraintIdentifier(DDataStructure.uuidConstraintKind), DCommon.justReturn([constraintLabel("uuid")])).when(DDataStructure.constraintIdentifier(DDataStructure.integerConstraintKind), DCommon.justReturn([constraintLabel("integer")])).when(DDataStructure.constraintIdentifier(DDataStructure.trimmedConstraintKind), DCommon.justReturn([constraintLabel("trimmed")])).when(DDataStructure.constraintIdentifier(DDataStructure.notEmptyConstraintKind), DCommon.justReturn([constraintLabel("not empty")])).when(DDataStructure.constraintIdentifier(DDataStructure.numberInStringConstraintKind), DCommon.justReturn([constraintLabel("number in string")])).when(DDataStructure.constraintIdentifier(DDataStructure.evenConstraintKind), DCommon.justReturn([constraintLabel("even")])).when(DDataStructure.constraintIdentifier(DDataStructure.oddConstraintKind), DCommon.justReturn([constraintLabel("odd")])).when(DDataStructure.constraintIdentifier(DDataStructure.positiveConstraintKind), DCommon.justReturn([constraintLabel("positive")])).when(DDataStructure.constraintIdentifier(DDataStructure.negativeConstraintKind), DCommon.justReturn([constraintLabel("negative")])).when(DDataStructure.constraintIdentifier(DDataStructure.notZeroConstraintKind), DCommon.justReturn([constraintLabel("not zero")])).when(DDataStructure.constraintIdentifier(DDataStructure.safeConstraintKind), DCommon.justReturn([constraintLabel("safe number")])).when(DDataStructure.constraintIdentifier(DDataStructure.pathConstraintKind), DCommon.justReturn([constraintLabel("path")])).when(DDataStructure.constraintIdentifier(DDataStructure.absolutePathConstraintKind), DCommon.justReturn([constraintLabel("absolute path")])).when(DDataStructure.constraintIdentifier(DDataStructure.segmentPathConstraintKind), DCommon.justReturn([constraintLabel("path segment")])).when(DDataStructure.constraintIdentifier(existConstraintKind), DCommon.justReturn([constraintLabel("exists")])).when(DDataStructure.constraintIdentifier(DDataStructure.strictPositiveConstraintKind), DCommon.justReturn([constraintLabel("> "), literal("0")])).when(DDataStructure.constraintIdentifier(DDataStructure.strictNegativeConstraintKind), DCommon.justReturn([constraintLabel("< "), literal("0")])).when(DDataStructure.constraintIdentifier(DDataStructure.betweenThanConstraintKind), ({ definition }) => [
+	return DPattern.match(constraint).when(DDataStructure.constraintIdentifier(DDataStructure.emailConstraintKind), DCommon.justReturn([constraintLabel("email")])).when(DDataStructure.constraintIdentifier(DDataStructure.urlConstraintKind), DCommon.justReturn([constraintLabel("url")])).when(DDataStructure.constraintIdentifier(DDataStructure.uuidConstraintKind), DCommon.justReturn([constraintLabel("uuid")])).when(DDataStructure.constraintIdentifier(DDataStructure.integerConstraintKind), DCommon.justReturn([constraintLabel("integer")])).when(DDataStructure.constraintIdentifier(DDataStructure.trimmedConstraintKind), DCommon.justReturn([constraintLabel("trimmed")])).when(DDataStructure.constraintIdentifier(DDataStructure.notEmptyConstraintKind), DCommon.justReturn([constraintLabel("not empty")])).when(DDataStructure.constraintIdentifier(DDataStructure.numberInStringConstraintKind), DCommon.justReturn([constraintLabel("number in string")])).when(DDataStructure.constraintIdentifier(DDataStructure.evenConstraintKind), DCommon.justReturn([constraintLabel("even")])).when(DDataStructure.constraintIdentifier(DDataStructure.oddConstraintKind), DCommon.justReturn([constraintLabel("odd")])).when(DDataStructure.constraintIdentifier(DDataStructure.positiveConstraintKind), DCommon.justReturn([constraintLabel("positive")])).when(DDataStructure.constraintIdentifier(DDataStructure.negativeConstraintKind), DCommon.justReturn([constraintLabel("negative")])).when(DDataStructure.constraintIdentifier(DDataStructure.notZeroConstraintKind), DCommon.justReturn([constraintLabel("not zero")])).when(DDataStructure.constraintIdentifier(DDataStructure.safeConstraintKind), DCommon.justReturn([constraintLabel("safe number")])).when(DDataStructure.constraintIdentifier(DDataStructure.pathConstraintKind), DCommon.justReturn([constraintLabel("path")])).when(DDataStructure.constraintIdentifier(DDataStructure.absolutePathConstraintKind), DCommon.justReturn([constraintLabel("absolute path")])).when(DDataStructure.constraintIdentifier(DDataStructure.segmentPathConstraintKind), DCommon.justReturn([constraintLabel("path segment")])).when(DDataStructure.constraintIdentifier(fileExistConstraintKind), DCommon.justReturn([constraintLabel("exists")])).when(DDataStructure.constraintIdentifier(folderExistConstraintKind), DCommon.justReturn([constraintLabel("exists")])).when(DDataStructure.constraintIdentifier(DDataStructure.strictPositiveConstraintKind), DCommon.justReturn([constraintLabel("> "), literal("0")])).when(DDataStructure.constraintIdentifier(DDataStructure.strictNegativeConstraintKind), DCommon.justReturn([constraintLabel("< "), literal("0")])).when(DDataStructure.constraintIdentifier(DDataStructure.betweenThanConstraintKind), ({ definition }) => [
 		constraintLabel("> "),
 		literal(String(definition.greater)),
 		secondary(" and "),
@@ -150,14 +156,10 @@ function renderMetadata(help, markerValue) {
 	]);
 }
 function renderConstraintLines(constraints, depth) {
-	return DArray.map(constraints, (constraint) => renderInline([
-		DPrinter.indent(depth),
-		secondary("↳ "),
-		constraint
-	]));
+	return DArray.map(constraints, (constraint) => renderInline([secondary("↳ "), constraint], depth));
 }
 function renderDescriptionLine(description, depth) {
-	return description ? renderInline([DPrinter.indent(depth), secondary(description)]) : null;
+	return description ? renderInline([secondary(description)], depth) : null;
 }
 function renderUsage(command) {
 	const args = command.subject?.type === "argument" ? DArray.map(command.subject.args, (argument) => argument.optional ? `[${argument.name}]` : `<${argument.name}>`) : command.subject?.type === "subCommand" ? ["<command>"] : [];
@@ -184,48 +186,39 @@ function renderOptionDetails(option, depth) {
 	if (simpleOptionKind.has(option) || arrayOptionKind.has(option)) {
 		const help = renderDataStructure(option.dataStructure);
 		return DArray.filter([
-			renderInline([DPrinter.indent(depth), renderMetadata(help, option.required ? "required" : "optional")]),
-			renderDescriptionLine(option.description, depth),
-			...renderConstraintLines(help.constraints, depth)
+			renderInline([renderMetadata(help, option.required ? "required" : "optional")], depth),
+			...renderConstraintLines(help.constraints, depth),
+			renderDescriptionLine(option.description, depth)
 		], DCommon.truthy);
 	}
-	if (booleanOptionKind.has(option)) return DArray.filter([renderInline([DPrinter.indent(depth), typeLabel("boolean")]), renderDescriptionLine(option.description, depth)], DCommon.truthy);
+	if (booleanOptionKind.has(option)) return DArray.filter([renderInline([typeLabel("boolean")], depth), renderDescriptionLine(option.description, depth)], DCommon.truthy);
 	return DArray.filter([renderDescriptionLine(option.description, depth)], DCommon.truthy);
 }
 function renderOptionsHelp(options, depth) {
-	return DPrinter.renderParagraph([renderInline([DPrinter.indent(depth), section("OPTIONS", "magenta")]), DArray.map(options, (option) => DPrinter.renderParagraph([renderInline([DPrinter.indent(depth + 1), renderOptionSignature(option)]), renderOptionDetails(option, depth + 2)]))]);
+	return DPrinter.renderParagraph([renderInline([section("OPTIONS", "magenta")], depth), DArray.map(options, (option) => DPrinter.renderParagraph([renderInline([renderOptionSignature(option)], depth + 1), renderOptionDetails(option, depth + 2)]))]);
 }
 function renderArgumentsHelp(args, depth) {
-	return DPrinter.renderParagraph([renderInline([DPrinter.indent(depth), section("ARGUMENTS", "cyan")]), DArray.map(args, (argument) => {
+	return DPrinter.renderParagraph([renderInline([section("ARGUMENTS", "cyan")], depth), DArray.map(args, (argument) => {
 		const help = renderDataStructure(argument.dataStructure);
 		return DPrinter.renderParagraph([
-			renderInline([
-				DPrinter.indent(depth + 1),
-				name(argument.name.padEnd(12)),
-				renderMetadata(help, argument.optional ? "optional" : "required")
-			]),
-			renderDescriptionLine(argument.description, depth + 2),
-			renderConstraintLines(help.constraints, depth + 2)
+			renderInline([name(argument.name.padEnd(12)), renderMetadata(help, argument.optional ? "optional" : "required")], depth + 1),
+			renderConstraintLines(help.constraints, depth + 2),
+			renderDescriptionLine(argument.description, depth + 2)
 		]);
 	})]);
 }
 function renderSubCommandsHelp(commands, depth) {
-	return DPrinter.renderParagraph([renderInline([DPrinter.indent(depth), section("COMMANDS", "green")]), DArray.map(commands, (command) => renderInline([
-		DPrinter.indent(depth + 1),
-		name(command.name.padEnd(16)),
-		command.description ? secondary(command.description) : null
-	]))]);
+	return DPrinter.renderParagraph([renderInline([section("COMMANDS", "green")], depth), DArray.map(commands, (command) => renderInline([name(command.name.padEnd(16)), command.description ? secondary(command.description) : null], depth + 1))]);
 }
 function renderCommandHelp(command, depth) {
 	return [...DArray.filter([
 		renderInline([
-			DPrinter.indent(depth),
 			section("COMMAND", "green"),
 			"  ",
 			DPrinter.colorizedBold(command.name, "cyan")
-		]),
+		], depth),
 		renderDescriptionLine(command.description, depth + 1),
-		DPrinter.renderParagraph([renderInline([DPrinter.indent(depth), section("USAGE", "blue")]), renderInline([DPrinter.indent(depth + 1), syntax(renderUsage(command))])]),
+		DPrinter.renderParagraph([renderInline([section("USAGE", "blue")], depth), renderInline([syntax(renderUsage(command))], depth + 1)]),
 		command.subject?.type === "argument" ? renderArgumentsHelp(command.subject.args, depth) : null,
 		command.subject?.type === "subCommand" ? renderSubCommandsHelp(command.subject.subCommands, depth) : null,
 		DArray.minElements(command.options, 1) ? renderOptionsHelp(command.options, depth) : null
@@ -235,7 +228,7 @@ function logCommandHelp(command) {
 	console.log(DPrinter.renderParagraph(renderCommandHelp(command, 0)));
 }
 function renderExecOptionHelp(options, depth) {
-	return [renderInline([DPrinter.indent(depth), section("EXEC OPTIONS", "green")]), renderOptionsHelp(options, depth)];
+	return [renderInline([section("EXEC OPTIONS", "green")], depth), renderOptionsHelp(options, depth)];
 }
 function logExecOptionHelp(options) {
 	console.log(DPrinter.renderParagraph(renderExecOptionHelp(options, 0)));

package/dist/command/index.cjs

@@ -25,12 +25,14 @@ var command_exports = /* @__PURE__ */ require_runtime.__exportAll({
 	createOption: () => require_simple.createOption,
 	exec: () => require_exec.exec,
 	execOptions: () => require_execOptions.execOptions,
+	findOptionToken: () => require_base.findOptionToken,
 	helpOption: () => require_help.helpOption,
 	interpretDataStructureError: () => require_error.interpretDataStructureError,
 	interpretErrorIssues: () => require_error.interpretErrorIssues,
 	interpretExecCommandError: () => require_error.interpretExecCommandError,
 	interpretExecOptionsError: () => require_error.interpretExecOptionsError,
 	isCommands: () => require_create.isCommands,
+	isOptionToken: () => require_base.isOptionToken,
 	logCommandHelp: () => require_help.logCommandHelp,
 	logExecOptionHelp: () => require_help.logExecOptionHelp,
 	optionIdentifier: () => require_identifier.optionIdentifier,
@@ -61,12 +63,14 @@ exports.createError = require_error.createError;
 exports.createOption = require_simple.createOption;
 exports.exec = require_exec.exec;
 exports.execOptions = require_execOptions.execOptions;
+exports.findOptionToken = require_base.findOptionToken;
 exports.helpOption = require_help.helpOption;
 exports.interpretDataStructureError = require_error.interpretDataStructureError;
 exports.interpretErrorIssues = require_error.interpretErrorIssues;
 exports.interpretExecCommandError = require_error.interpretExecCommandError;
 exports.interpretExecOptionsError = require_error.interpretExecOptionsError;
 exports.isCommands = require_create.isCommands;
+exports.isOptionToken = require_base.isOptionToken;
 exports.logCommandHelp = require_help.logCommandHelp;
 exports.logExecOptionHelp = require_help.logExecOptionHelp;
 exports.optionIdentifier = require_identifier.optionIdentifier;

package/dist/command/index.mjs

@@ -1,7 +1,7 @@
 import { __exportAll } from "../_virtual/_rolldown/runtime.mjs";
 import { argumentKind, createArgument } from "./argument.mjs";
 import { SymbolCommandError, createError, interpretDataStructureError, interpretErrorIssues, interpretExecCommandError, interpretExecOptionsError } from "./error.mjs";
-import { constructOption, optionKind } from "./options/base.mjs";
+import { constructOption, findOptionToken, isOptionToken, optionKind } from "./options/base.mjs";
 import { arrayOptionKind, createArrayOption } from "./options/defaults/array.mjs";
 import { booleanOptionKind, createBooleanOption } from "./options/defaults/boolean.mjs";
 import { createOption, simpleOptionKind } from "./options/defaults/simple.mjs";
@@ -25,12 +25,14 @@ var command_exports = /* @__PURE__ */ __exportAll({
 	createOption: () => createOption,
 	exec: () => exec,
 	execOptions: () => execOptions,
+	findOptionToken: () => findOptionToken,
 	helpOption: () => helpOption,
 	interpretDataStructureError: () => interpretDataStructureError,
 	interpretErrorIssues: () => interpretErrorIssues,
 	interpretExecCommandError: () => interpretExecCommandError,
 	interpretExecOptionsError: () => interpretExecOptionsError,
 	isCommands: () => isCommands,
+	isOptionToken: () => isOptionToken,
 	logCommandHelp: () => logCommandHelp,
 	logExecOptionHelp: () => logExecOptionHelp,
 	optionIdentifier: () => optionIdentifier,
@@ -42,4 +44,4 @@ var command_exports = /* @__PURE__ */ __exportAll({
 	simpleOptionKind: () => simpleOptionKind
 });
 //#endregion
-export { SymbolCommandError, argumentKind, arrayOptionKind, booleanOptionKind, command_exports, constructOption, create, createArgument, createArrayOption, createBooleanOption, createError, createOption, exec, execOptions, helpOption, interpretDataStructureError, interpretErrorIssues, interpretExecCommandError, interpretExecOptionsError, isCommands, logCommandHelp, logExecOptionHelp, optionIdentifier, optionKind, renderArgumentsHelp, renderCommandHelp, renderExecOptionHelp, renderOptionsHelp, simpleOptionKind };
+export { SymbolCommandError, argumentKind, arrayOptionKind, booleanOptionKind, command_exports, constructOption, create, createArgument, createArrayOption, createBooleanOption, createError, createOption, exec, execOptions, findOptionToken, helpOption, interpretDataStructureError, interpretErrorIssues, interpretExecCommandError, interpretExecOptionsError, isCommands, isOptionToken, logCommandHelp, logExecOptionHelp, optionIdentifier, optionKind, renderArgumentsHelp, renderCommandHelp, renderExecOptionHelp, renderOptionsHelp, simpleOptionKind };

package/dist/command/options/base.cjs

@@ -9,24 +9,30 @@ let _duplojs_lang_string = require("@duplojs/lang/string");
 _duplojs_lang_string = require_runtime.__toESM(_duplojs_lang_string, 1);
 //#region scripts/command/options/base.ts
 const optionKind = require_kind.createKind("command-option");
-const regexOption = /^(?<dashes>-{1,2})(?<key>[A-Za-z0-9][A-Za-z0-9_-]*)(?:=(?<value>.*))?$/;
+const regexOption = /^(?<dashes>-{1,2})(?<key>(?![0-9]+(?:=|$))[A-Za-z0-9][A-Za-z0-9_-]*)(?:=(?<value>.*))?$/;
+function isOptionToken(input) {
+	return _duplojs_lang_string.test(input, regexOption);
+}
+function findOptionToken(args, option) {
+	return _duplojs_lang_array.reduce(args, _duplojs_lang_array.reduceFrom(null), ({ element, next, exit, index }) => {
+		const extractResult = _duplojs_lang_string.extract(element, regexOption);
+		if (!extractResult) return next(null);
+		const key = extractResult.namedGroups.key;
+		if (option.name !== key && (!_duplojs_lang_array.includes(option.aliases, key) || extractResult.namedGroups?.dashes !== "-")) return next(null);
+		return exit({
+			key,
+			value: extractResult.namedGroups?.value,
+			index
+		});
+	});
+}
 function constructOption(kindHandler, createConstructor) {
 	return createConstructor({ init: (name, execute, params, ...rest) => {
 		const self = {
 			...Object.fromEntries(Object.entries(rest[0] ?? {}).map(([key, prop]) => typeof prop === "function" ? [key, (...args) => prop(self, ...args)] : [key, prop])),
 			name,
 			execute: async (args, error) => {
-				const result = _duplojs_lang_array.reduce(args, _duplojs_lang_array.reduceFrom(null), ({ element, next, exit, index }) => {
-					const extractResult = _duplojs_lang_string.extract(element, regexOption);
-					if (!extractResult) return next(null);
-					const result = {
-						key: extractResult.namedGroups.key,
-						value: extractResult.namedGroups?.value,
-						index
-					};
-					if (self.name !== result.key && (!_duplojs_lang_array.includes(self.aliases, result.key) || extractResult.namedGroups?.dashes !== "-")) return next(null);
-					return exit(result);
-				});
+				const result = findOptionToken(args, self);
 				const { value, argumentRest } = _duplojs_lang_common.justExec(() => {
 					if (!result) return {
 						value: null,
@@ -34,7 +40,7 @@ function constructOption(kindHandler, createConstructor) {
 					};
 					if (result.value === void 0) {
 						const nextArg = args[result.index + 1];
-						if (nextArg === void 0 || _duplojs_lang_string.test(nextArg, regexOption)) return {
+						if (nextArg === void 0 || isOptionToken(nextArg)) return {
 							value: void 0,
 							argumentRest: _duplojs_lang_array.spliceDelete(args, result.index, 1)
 						};
@@ -65,4 +71,6 @@ function constructOption(kindHandler, createConstructor) {
 }
 //#endregion
 exports.constructOption = constructOption;
+exports.findOptionToken = findOptionToken;
+exports.isOptionToken = isOptionToken;
 exports.optionKind = optionKind;

package/dist/command/options/base.d.ts

@@ -2,6 +2,12 @@ import { Error, SymbolCommandError } from '../error';
 import * as DCommon from "@duplojs/lang/common";
 import type * as DKind from "@duplojs/lang/kind";
 export declare const optionKind: DKind.Handler<DKind.Definition<"@DuplojsServerCommand/command-option", unknown>>;
+export declare function isOptionToken(input: string): boolean;
+export declare function findOptionToken(args: readonly string[], option: Pick<Option, "name" | "aliases">): {
+    key: string;
+    value: string | undefined;
+    index: number;
+} | null;
 export interface Option<GenericName extends string = string, GenericValue extends unknown = unknown> extends DKind.Kind<typeof optionKind> {
     readonly name: GenericName;
     readonly description: string | null;

package/dist/command/options/base.mjs

@@ -5,24 +5,30 @@ import * as DArray from "@duplojs/lang/array";
 import * as DString from "@duplojs/lang/string";
 //#region scripts/command/options/base.ts
 const optionKind = createKind("command-option");
-const regexOption = /^(?<dashes>-{1,2})(?<key>[A-Za-z0-9][A-Za-z0-9_-]*)(?:=(?<value>.*))?$/;
+const regexOption = /^(?<dashes>-{1,2})(?<key>(?![0-9]+(?:=|$))[A-Za-z0-9][A-Za-z0-9_-]*)(?:=(?<value>.*))?$/;
+function isOptionToken(input) {
+	return DString.test(input, regexOption);
+}
+function findOptionToken(args, option) {
+	return DArray.reduce(args, DArray.reduceFrom(null), ({ element, next, exit, index }) => {
+		const extractResult = DString.extract(element, regexOption);
+		if (!extractResult) return next(null);
+		const key = extractResult.namedGroups.key;
+		if (option.name !== key && (!DArray.includes(option.aliases, key) || extractResult.namedGroups?.dashes !== "-")) return next(null);
+		return exit({
+			key,
+			value: extractResult.namedGroups?.value,
+			index
+		});
+	});
+}
 function constructOption(kindHandler, createConstructor) {
 	return createConstructor({ init: (name, execute, params, ...rest) => {
 		const self = {
 			...Object.fromEntries(Object.entries(rest[0] ?? {}).map(([key, prop]) => typeof prop === "function" ? [key, (...args) => prop(self, ...args)] : [key, prop])),
 			name,
 			execute: async (args, error) => {
-				const result = DArray.reduce(args, DArray.reduceFrom(null), ({ element, next, exit, index }) => {
-					const extractResult = DString.extract(element, regexOption);
-					if (!extractResult) return next(null);
-					const result = {
-						key: extractResult.namedGroups.key,
-						value: extractResult.namedGroups?.value,
-						index
-					};
-					if (self.name !== result.key && (!DArray.includes(self.aliases, result.key) || extractResult.namedGroups?.dashes !== "-")) return next(null);
-					return exit(result);
-				});
+				const result = findOptionToken(args, self);
 				const { value, argumentRest } = DCommon.justExec(() => {
 					if (!result) return {
 						value: null,
@@ -30,7 +36,7 @@ function constructOption(kindHandler, createConstructor) {
 					};
 					if (result.value === void 0) {
 						const nextArg = args[result.index + 1];
-						if (nextArg === void 0 || DString.test(nextArg, regexOption)) return {
+						if (nextArg === void 0 || isOptionToken(nextArg)) return {
 							value: void 0,
 							argumentRest: DArray.spliceDelete(args, result.index, 1)
 						};
@@ -60,4 +66,4 @@ function constructOption(kindHandler, createConstructor) {
 	} });
 }
 //#endregion
-export { constructOption, optionKind };
+export { constructOption, findOptionToken, isOptionToken, optionKind };

package/dist/command/options/defaults/array.d.ts

@@ -1,5 +1,5 @@
 import { Option } from '../base';
-import { EligibleType } from '../../types';
+import { EligibleType, ForbiddenInvalidIdentifier } from '../../types';
 import * as DCommon from "@duplojs/lang/common";
 import type * as DKind from "@duplojs/lang/kind";
 import * as DDataStructure from "@duplojs/lang/dataStructure";
@@ -13,12 +13,14 @@ export interface ArrayOption<GenericName extends string = string, GenericValue e
     readonly min?: number;
     readonly max?: number;
 }
-export interface CreateArrayOptionParams {
+export interface CreateArrayOptionParams<GenericAliases extends readonly string[] = readonly string[]> {
     description?: string;
-    aliases?: readonly string[];
+    aliases?: (GenericAliases & {
+        readonly [Index in keyof GenericAliases]: ForbiddenInvalidIdentifier<GenericAliases[Index]>;
+    });
     min?: number;
     max?: number;
     required?: boolean;
     separator?: string;
 }
-export declare const createArrayOption: <GenericName extends string, GenericStructure extends DDataStructure.Structure<EligibleType>, GenericValue extends DDataStructure.StructureValue<GenericStructure>, const GenericParams extends CreateArrayOptionParams = {}>(name: GenericName, dataStructure: GenericStructure, params?: GenericParams & CreateArrayOptionParams) => ArrayOption<GenericName, ((readonly GenericValue[] & (DNumber.IsLiteral<Extract<GenericParams["min"], number>> extends true ? DArray.MinElements<Extract<GenericParams["min"], number>> : unknown) & (DNumber.IsLiteral<Extract<GenericParams["max"], number>> extends true ? DArray.MaxElements<Extract<GenericParams["max"], number>> : unknown)) | (DCommon.IsEqual<GenericParams["required"], true> extends true ? never : undefined))>;
+export declare const createArrayOption: <GenericName extends string, GenericStructure extends DDataStructure.Structure<EligibleType>, GenericValue extends DDataStructure.StructureValue<GenericStructure>, const GenericAliases extends readonly string[] = readonly string[], const GenericParams extends CreateArrayOptionParams<GenericAliases> = {}>(name: GenericName & ForbiddenInvalidIdentifier<GenericName>, dataStructure: GenericStructure, params?: GenericParams & CreateArrayOptionParams<GenericAliases>) => ArrayOption<GenericName, ((readonly GenericValue[] & (DNumber.IsLiteral<Extract<GenericParams["min"], number>> extends true ? DArray.MinElements<Extract<GenericParams["min"], number>> : unknown) & (DNumber.IsLiteral<Extract<GenericParams["max"], number>> extends true ? DArray.MaxElements<Extract<GenericParams["max"], number>> : unknown)) | (DCommon.IsEqual<GenericParams["required"], true> extends true ? never : undefined))>;

package/dist/command/options/defaults/boolean.cjs

@@ -1,14 +1,28 @@
+const require_runtime = require("../../../_virtual/_rolldown/runtime.cjs");
 const require_kind = require("../../kind.cjs");
 const require_base = require("../base.cjs");
+let _duplojs_lang_array = require("@duplojs/lang/array");
+_duplojs_lang_array = require_runtime.__toESM(_duplojs_lang_array, 1);
 //#region scripts/command/options/defaults/boolean.ts
 const booleanOptionKind = require_kind.createKind("command-boolean-option");
-const createBooleanOption = require_base.constructOption(booleanOptionKind, ({ init }) => (name, params) => init(name, (self, value, error) => {
-	if (typeof value === "string") return error.addUnexpectedOptionValueIssue(self.name, value);
-	return value !== null;
-}, {
-	description: params?.description ?? null,
-	aliases: params?.aliases ?? []
-}));
+function createBooleanOption(name, params) {
+	const self = {
+		name,
+		description: params?.description ?? null,
+		aliases: params?.aliases ?? [],
+		execute: (args, error) => {
+			const token = require_base.findOptionToken(args, self);
+			if (token?.value !== void 0) return Promise.resolve(error.addUnexpectedOptionValueIssue(self.name, token.value));
+			return Promise.resolve({
+				result: token !== null,
+				argumentRest: token ? _duplojs_lang_array.spliceDelete(args, token.index, 1) : args
+			});
+		},
+		[require_base.optionKind.runTimeKey]: null,
+		[booleanOptionKind.runTimeKey]: null
+	};
+	return self;
+}
 //#endregion
 exports.booleanOptionKind = booleanOptionKind;
 exports.createBooleanOption = createBooleanOption;

package/dist/command/options/defaults/boolean.d.ts

@@ -1,11 +1,14 @@
 import { Option } from '../base';
+import { ForbiddenInvalidIdentifier } from '../../types';
 import type * as DCommon from "@duplojs/lang/common";
 import type * as DKind from "@duplojs/lang/kind";
 export declare const booleanOptionKind: DKind.Handler<DKind.Definition<"@DuplojsServerCommand/command-boolean-option", unknown>>;
 export interface BooleanOption<GenericName extends string = string> extends DCommon.Forward<Option<GenericName, boolean> & DKind.Kind<typeof booleanOptionKind>> {
 }
-export interface CreateBooleanOptionParams {
+export interface CreateBooleanOptionParams<GenericAliases extends readonly string[] = readonly string[]> {
     description?: string;
-    aliases?: readonly string[];
+    aliases?: (GenericAliases & {
+        readonly [Index in keyof GenericAliases]: ForbiddenInvalidIdentifier<GenericAliases[Index]>;
+    });
 }
-export declare const createBooleanOption: <GenericName extends string>(name: GenericName, params?: CreateBooleanOptionParams) => NoInfer<BooleanOption<GenericName>>;
+export declare function createBooleanOption<GenericName extends string, const GenericAliases extends readonly string[] = readonly string[]>(name: GenericName & ForbiddenInvalidIdentifier<GenericName>, params?: CreateBooleanOptionParams<GenericAliases>): BooleanOption<GenericName>;