@@ -38,72 +38,63 @@ export enum Type {
3838 RoomAlias = "roomalias" ,
3939}
4040
41- // Linkify stuff doesn't type scanner/parser/utils properly :/
4241function matrixOpaqueIdLinkifyParser ( {
4342 scanner,
4443 parser,
45- utils,
4644 token,
4745 name,
4846} : {
49- scanner : any ;
50- parser : any ;
51- utils : any ;
47+ scanner : linkifyjs . ScannerInit ;
48+ parser : linkifyjs . ParserInit ;
5249 token : "#" | "+" | "@" ;
5350 name : Type ;
5451} ) : void {
5552 const {
5653 DOT ,
5754 // IPV4 necessity
5855 NUM ,
59- TLD ,
6056 COLON ,
6157 SYM ,
6258 SLASH ,
6359 EQUALS ,
6460 HYPHEN ,
6561 UNDERSCORE ,
66- // because 'localhost' is tokenised to the localhost token,
67- // usernames @localhost :foo.com are otherwise not matched!
68- LOCALHOST ,
69- domain,
7062 } = scanner . tokens ;
7163
72- const S_START = parser . start ;
73- const matrixSymbol = utils . createTokenClass ( name , { isLink : true } ) ;
64+ // Contains NUM, WORD, UWORD, EMOJI, TLD, UTLD, SCHEME, SLASH_SCHEME and LOCALHOST plus custom protocols (e.g. "matrix")
65+ const { domain } = scanner . tokens . groups ;
7466
75- const localpartTokens = [ domain , TLD , DOT , LOCALHOST , SYM , SLASH , EQUALS , UNDERSCORE , HYPHEN ] ;
76- const domainpartTokens = [ domain , TLD , LOCALHOST , HYPHEN ] ;
67+ // Tokens we need that are not contained in the domain group
68+ const additionalLocalpartTokens = [ DOT , SYM , SLASH , EQUALS , UNDERSCORE , HYPHEN ] ;
69+ const additionalDomainpartTokens = [ HYPHEN ] ;
7770
78- const INITIAL_STATE = S_START . tt ( token ) ;
71+ const matrixToken = linkifyjs . createTokenClass ( name , { isLink : true } ) ;
72+ const matrixTokenState = new linkifyjs . State ( matrixToken ) as any as linkifyjs . State < linkifyjs . MultiToken > ; // linkify doesn't appear to type this correctly
7973
80- const LOCALPART_STATE = INITIAL_STATE . tt ( domain ) ;
81- for ( const token of localpartTokens ) {
82- INITIAL_STATE . tt ( token , LOCALPART_STATE ) ;
83- LOCALPART_STATE . tt ( token , LOCALPART_STATE ) ;
84- }
85- const LOCALPART_STATE_DOT = LOCALPART_STATE . tt ( DOT ) ;
86- for ( const token of localpartTokens ) {
87- LOCALPART_STATE_DOT . tt ( token , LOCALPART_STATE ) ;
88- }
74+ const matrixTokenWithPort = linkifyjs . createTokenClass ( name , { isLink : true } ) ;
75+ const matrixTokenWithPortState = new linkifyjs . State (
76+ matrixTokenWithPort ,
77+ ) as any as linkifyjs . State < linkifyjs . MultiToken > ; // linkify doesn't appear to type this correctly
8978
90- const DOMAINPART_STATE_DOT = LOCALPART_STATE . tt ( COLON ) ;
91- const DOMAINPART_STATE = DOMAINPART_STATE_DOT . tt ( domain ) ;
92- DOMAINPART_STATE . tt ( DOT , DOMAINPART_STATE_DOT ) ;
93- for ( const token of domainpartTokens ) {
94- DOMAINPART_STATE . tt ( token , DOMAINPART_STATE ) ;
95- // we are done if we have a domain
96- DOMAINPART_STATE . tt ( token , matrixSymbol ) ;
97- }
98-
99- // accept repeated TLDs (e.g .org.uk) but do not accept double dots: ..
100- for ( const token of domainpartTokens ) {
101- DOMAINPART_STATE_DOT . tt ( token , DOMAINPART_STATE ) ;
102- }
79+ const INITIAL_STATE = parser . start . tt ( token ) ;
10380
104- const PORT_STATE = DOMAINPART_STATE . tt ( COLON ) ;
81+ // Localpart
82+ const LOCALPART_STATE = new linkifyjs . State < linkifyjs . MultiToken > ( ) ;
83+ INITIAL_STATE . ta ( domain , LOCALPART_STATE ) ;
84+ INITIAL_STATE . ta ( additionalLocalpartTokens , LOCALPART_STATE ) ;
85+ LOCALPART_STATE . ta ( domain , LOCALPART_STATE ) ;
86+ LOCALPART_STATE . ta ( additionalLocalpartTokens , LOCALPART_STATE ) ;
10587
106- PORT_STATE . tt ( NUM , matrixSymbol ) ;
88+ // Domainpart
89+ const DOMAINPART_STATE_DOT = LOCALPART_STATE . tt ( COLON ) ;
90+ DOMAINPART_STATE_DOT . ta ( domain , matrixTokenState ) ;
91+ DOMAINPART_STATE_DOT . ta ( additionalDomainpartTokens , matrixTokenState ) ;
92+ matrixTokenState . ta ( domain , matrixTokenState ) ;
93+ matrixTokenState . ta ( additionalDomainpartTokens , matrixTokenState ) ;
94+ matrixTokenState . tt ( DOT , DOMAINPART_STATE_DOT ) ;
95+
96+ // Port suffixes
97+ matrixTokenState . tt ( COLON ) . tt ( NUM , matrixTokenWithPortState ) ;
10798}
10899
109100function onUserClick ( event : MouseEvent , userId : string ) : void {
@@ -231,23 +222,21 @@ export const options: Opts = {
231222} ;
232223
233224// Run the plugins
234- registerPlugin ( Type . RoomAlias , ( { scanner, parser, utils } : any ) => {
225+ registerPlugin ( Type . RoomAlias , ( { scanner, parser } ) => {
235226 const token = scanner . tokens . POUND as "#" ;
236227 matrixOpaqueIdLinkifyParser ( {
237228 scanner,
238229 parser,
239- utils,
240230 token,
241231 name : Type . RoomAlias ,
242232 } ) ;
243233} ) ;
244234
245- registerPlugin ( Type . UserId , ( { scanner, parser, utils } : any ) => {
235+ registerPlugin ( Type . UserId , ( { scanner, parser } ) => {
246236 const token = scanner . tokens . AT as "@" ;
247237 matrixOpaqueIdLinkifyParser ( {
248238 scanner,
249239 parser,
250- utils,
251240 token,
252241 name : Type . UserId ,
253242 } ) ;
0 commit comments