1- import { Logger } from "../tools/logger" ;
2- import { OffsetException } from "./OffsetException" ;
3- import { TEvent } from "./TEvent" ;
1+ import { Logger } from "../../ tools/logger" ;
2+ import { OffsetException } from "../RunTime /OffsetException" ;
3+ import { TEvent } from "../RunTime /TEvent" ;
44
55let logger = new Logger ( "CommandSystem" ) ;
66
77export namespace TMBotCmd {
8+ let ACCEPT_SYMBOL = Symbol ( Math . floor ( Math . random ( ) * 1000 ) ) ;
89 export namespace CommandParams {
910 /**
1011 * 父
@@ -65,6 +66,7 @@ export namespace TMBotCmd {
6566 super ( ) ;
6667 }
6768 _paramIsThis ( str : string ) {
69+ if ( typeof ( str ) != "string" ) { return false ; }
6870 this . content = str ;
6971 return true ;
7072 }
@@ -115,6 +117,7 @@ export namespace TMBotCmd {
115117 private rawText : string | undefined ;
116118 constructor ( public name : string ) { super ( ) ; }
117119 _paramIsThis ( _str : string , oriRes : string [ ] , index : number ) {
120+ if ( typeof ( _str ) != "string" ) { return false ; }
118121 this . rawText = oriRes . slice ( index ) . join ( " " ) ;
119122 return true ;
120123 }
@@ -302,7 +305,7 @@ export namespace TMBotCmd {
302305 * @param perm 运行所需权限
303306 */
304307 newCommand ( cmd : string , description : string , perm : RunCmdNeedPerm ) {
305- let obj = new this . cmdClass ( cmd , description , perm , this ) ;
308+ let obj = new this . cmdClass ( cmd , description , perm , this , ACCEPT_SYMBOL ) ;
306309 return obj ;
307310 }
308311
@@ -386,9 +389,9 @@ export namespace TMBotCmd {
386389 }
387390
388391 /**
389- * 单个命令
392+ * 单个命令,只作为父类存在
390393 */
391- class TMBotCommand <
394+ export class TMBotCommand <
392395 RunCmdNeedPerm extends TMBotCommandPerm < any > ,
393396 CmdRunner extends TMBotCommandRunner < RunCmdNeedPerm > ,
394397 CmdOutput extends TMBotCommandOutput > {
@@ -432,7 +435,10 @@ export namespace TMBotCmd {
432435 params : CommandParams . Param < unknown > [ ]
433436 ) => void
434437 } [ ] = [ ] ;
435- constructor ( private cmd_ : string , private _description : string , private needPerm : RunCmdNeedPerm , private cmdSystem : TMBotCommandSystem < RunCmdNeedPerm , CmdRunner , CmdOutput > ) {
438+ constructor ( private cmd_ : string , private _description : string , private needPerm : RunCmdNeedPerm , private cmdSystem : TMBotCommandSystem < RunCmdNeedPerm , CmdRunner , CmdOutput > , accept_sym : Symbol ) {
439+ if ( accept_sym != ACCEPT_SYMBOL ) {
440+ throw new OffsetException ( 1 , `单个命令无法被直接构建出来` ) ;
441+ }
436442 if ( cmd_ . indexOf ( " " ) != - 1 ) {
437443 throw new OffsetException ( 3 , `主命令不得含有空格字符` ) ;
438444 } else if ( cmd_ == "" ) {
@@ -541,13 +547,11 @@ export namespace TMBotCmd {
541547 if ( canHasMandatory ) {
542548 canHasMandatory = param . isMandatory ;
543549 } else if ( param . isMandatory ) {
544- logger . warn ( `命令: "${ this . cmd } ) ;
545- return undefined ;
550+ throw new OffsetException ( 1 , `命令: "${ this . cmd } ) ;
546551 }
547552 if ( param instanceof CommandParams . RawText ) {
548553 if ( ! ! params [ ( i + 1 ) ] ) {
549- logger . warn ( `命令: "${ this . cmd } ) ;
550- return undefined ;
554+ throw new OffsetException ( 1 , `命令: "${ this . cmd } ) ;
551555 }
552556 }
553557 i ++ ;
@@ -652,7 +656,7 @@ export namespace TMBotCmd {
652656 this . helpCmd = cmdSystem . newCommand ( `help` , `命令帮助` , { "isEligible" : ( ) => true } as TMBotCommandPerm < any > ) ;
653657 this . helpCmd . setAlias ( "?" ) ;
654658
655- this . helpCmd . overload ( [ ] ) ! ( ( cmd , _runner , out , _params ) => {
659+ this . helpCmd . overload ( [ ] ) ( ( cmd , _runner , out , _params ) => {
656660 let arr = MapMap ( this . cache ) [ 1 ] ;
657661 let content = ( [ ] as string [ ] ) . concat ( ...arr ) ;
658662 let pages = splitArr ( content , 7 ) ;
@@ -665,7 +669,7 @@ export namespace TMBotCmd {
665669 cmd . RunningCompleted ( ) ;
666670 } ) ;
667671
668- this . helpCmd . overload ( [ new CommandParams . Number ( "Page" , false ) ] ) ! ( ( cmd , _runner , out , params ) => {
672+ this . helpCmd . overload ( [ new CommandParams . Number ( "Page" , false ) ] ) ( ( cmd , _runner , out , params ) => {
669673 let arr = MapMap ( this . cache ) [ 1 ] ;
670674 let content = ( [ ] as string [ ] ) . concat ( ...arr ) ;
671675 let pages = splitArr ( content , 7 ) ;
@@ -682,7 +686,7 @@ export namespace TMBotCmd {
682686 cmd . RunningCompleted ( ) ;
683687 } ) ;
684688
685- this . helpCmd . overload ( [ new CommandParams . String ( "cmd" ) ] ) ! ( ( cmd , _runner , out , params ) => {
689+ this . helpCmd . overload ( [ new CommandParams . String ( "cmd" ) ] ) ( ( cmd , _runner , out , params ) => {
686690 let nowSelCmd = params [ 0 ] . value ! ;
687691 let res = this . list . get ( nowSelCmd ) ;
688692 if ( ! res ) {
0 commit comments