securemark 0.294.2 → 0.294.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.294.4
+
+- Refactoring.
+
+## 0.294.3
+
+- Refactoring.
+
 ## 0.294.2
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.294.2 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.294.4 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory(require("Prism"), require("DOMPurify"));
@@ -5705,7 +5705,7 @@ const source_1 = __webpack_require__(8745);
 const util_1 = __webpack_require__(4992);
 const dom_1 = __webpack_require__(394);
 exports.syntax = />*(?=>>[^>\s]\S*[^\S\n]*(?:$|\n))/y;
-exports.cite = (0, combinator_1.line)((0, combinator_1.fmap)((0, combinator_1.open)((0, source_1.str)(exports.syntax), (0, combinator_1.union)([anchor_1.anchor,
+exports.cite = (0, combinator_1.line)((0, combinator_1.fmap)((0, combinator_1.open)((0, source_1.str)(exports.syntax), (0, combinator_1.union)([(0, combinator_1.line)(anchor_1.anchor),
 // Subject page representation.
 // リンクの実装は後で検討
 (0, combinator_1.focus)(/>>#\S*(?=\s*$)/y, ({
@@ -6160,14 +6160,16 @@ const account_1 = __webpack_require__(4107);
 const hashtag_1 = __webpack_require__(5764);
 const hashnum_1 = __webpack_require__(8684);
 const anchor_1 = __webpack_require__(8535);
-const source_1 = __webpack_require__(8745);
-exports.autolink = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(new RegExp([/(?<![0-9a-z])@/yi.source, /(?<![^\p{C}\p{S}\p{P}\s]|emoji)#/yiu.source, /(?<![0-9a-z])>>/yi.source, /(?<![0-9a-z][.+-]?)!?[0-9a-z]/yi.source].join('|').replace(/emoji/g, hashtag_1.emoji), 'yiu'), (0, combinator_1.state)(~1 /* State.autolink */, (0, combinator_1.union)([url_1.lineurl, url_1.url, email_1.email,
+exports.autolink = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(new RegExp([/(?<![0-9a-z])@/yi.source, /(?<![^\p{C}\p{S}\p{P}\s]|emoji)#/yiu.source, /(?<![0-9a-z])>>/yi.source, /(?<![0-9a-z][.+-]?|[@#])!?[0-9a-z]/yi.source].join('|').replace(/emoji/g, hashtag_1.emoji), 'yiu'), (0, combinator_1.state)(~1 /* State.autolink */, (0, combinator_1.union)([url_1.lineurl, url_1.url, email_1.email,
 // Escape unmatched email-like strings.
-(0, source_1.str)(/[0-9a-z]+(?:[_.+-][0-9a-z]+[:@]?|:|@(?=@))*/yi), channel_1.channel, account_1.account,
+//str(/[0-9a-z]+(?:[_.+-][0-9a-z]+[:@]?|:|@(?=@))*/yi),
+channel_1.channel, account_1.account,
 // Escape unmatched account-like strings.
-(0, source_1.str)(/@+(?:[0-9a-z]+(?:[_.+-][0-9a-z]+)*)?/yi), hashtag_1.hashtag, hashnum_1.hashnum,
+//str(/@+(?:[0-9a-z]+(?:[_.+-][0-9a-z]+)*)?/yi),
+hashtag_1.hashtag, hashnum_1.hashnum,
 // Escape unmatched hashtag-like strings.
-(0, source_1.str)(new RegExp(/#+(?:(?:[^\p{C}\p{S}\p{P}\s]|emoji)+(?:['_.+-](?:[^\p{C}\p{S}\p{P}\s]|emoji)+)*)?/yu.source.replace(/emoji/g, hashtag_1.emoji), 'yu')), anchor_1.anchor]))));
+//str(new RegExp(/#+(?:(?:[^\p{C}\p{S}\p{P}\s]|emoji)+(?:['_.+-](?:[^\p{C}\p{S}\p{P}\s]|emoji)+)*)?/yu.source.replace(/emoji/g, emoji), 'yu')),
+anchor_1.anchor]))));
 
 /***/ },
 
@@ -6187,15 +6189,11 @@ const link_1 = __webpack_require__(3628);
 const source_1 = __webpack_require__(8745);
 const dom_1 = __webpack_require__(394);
 // https://example/@user must be a user page or a redirect page going there.
-exports.account = (0, combinator_1.lazy)(() => (0, combinator_1.rewrite)((0, combinator_1.open)(/(?<![0-9a-z])@/yi, (0, combinator_1.tails)([(0, source_1.str)(/[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*\//yi), (0, source_1.str)(/[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*(?![0-9a-z@#]|>>|:\S)/yi)]), false, [3 | 0 /* Backtrack.autolink */]), (0, combinator_1.union)([(0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.fmap)((0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `https://${source.slice(1).replace('/', '/@')}` : `/${source}`} }`, link_1.unsafelink, false), ([{
+exports.account = (0, combinator_1.lazy)(() => (0, combinator_1.rewrite)((0, combinator_1.open)(/(?<![0-9a-z])@/yi, (0, combinator_1.tails)([(0, source_1.str)(/[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*\//yi), (0, source_1.str)(/[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*(?![-.]?[0-9a-z@#]|>>|:\S)/yi)]), false, [3 | 0 /* Backtrack.autolink */]), (0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.fmap)((0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `https://${source.slice(1).replace('/', '/@')}` : `/${source}`} }`, (0, combinator_1.union)([link_1.unsafelink]), false), ([{
   value
 }]) => new parser_1.List([new parser_1.Data((0, dom_1.define)(value, {
   class: 'account'
-}))])))), ({
-  context: {
-    source
-  }
-}) => new parser_1.List([new parser_1.Data(source)])])));
+}))]))))));
 
 /***/ },
 
@@ -6221,15 +6219,11 @@ const dom_1 = __webpack_require__(394);
 // cid: YYYY-MMDD-HHMM-SSmmm
 // 内部表現はUnixTimeに統一する(時系列順)
 // 外部表現は投稿ごとに投稿者の投稿時のタイムゾーンに統一する(非時系列順)
-exports.anchor = (0, combinator_1.lazy)(() => (0, combinator_1.rewrite)((0, combinator_1.open)(/(?<![0-9a-z])>>/yi, (0, source_1.str)(/(?:[a-z][0-9a-z]*(?:-[0-9a-z]+)*\/)?[0-9a-z]+(?:-[0-9a-z]+)*(?![0-9a-z@#]|>>|:\S)/yi), false, [3 | 0 /* Backtrack.autolink */]), (0, combinator_1.union)([(0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.fmap)((0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `/@${source.slice(2).replace('/', '/timeline?at=')}` : `?at=${source.slice(2)}`} }`, link_1.unsafelink, false), ([{
+exports.anchor = (0, combinator_1.lazy)(() => (0, combinator_1.rewrite)((0, combinator_1.open)(/(?<![0-9a-z])>>/yi, (0, source_1.str)(/(?:[a-z][0-9a-z]*(?:-[0-9a-z]+)*\/)?[0-9a-z]+(?:-[0-9a-z]+)*(?!-?[0-9a-z@#]|>>|:\S)/yi), false, [3 | 0 /* Backtrack.autolink */]), (0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.fmap)((0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `/@${source.slice(2).replace('/', '/timeline?at=')}` : `?at=${source.slice(2)}`} }`, (0, combinator_1.union)([link_1.unsafelink]), false), ([{
   value
 }]) => new parser_1.List([new parser_1.Data((0, dom_1.define)(value, {
   class: 'anchor'
-}))])))), ({
-  context: {
-    source
-  }
-}) => new parser_1.List([new parser_1.Data(source)])])));
+}))]))))));
 
 /***/ },
 
@@ -6250,9 +6244,9 @@ const hashtag_1 = __webpack_require__(5764);
 const source_1 = __webpack_require__(8745);
 const dom_1 = __webpack_require__(394);
 // https://example/@user?ch=a+b must be a user channel page or a redirect page going there.
-exports.channel = (0, combinator_1.lazy)(() => (0, combinator_1.rewrite)((0, combinator_1.sequence)([(0, combinator_1.open)(/(?<![0-9a-z])@/yi, (0, combinator_1.tails)([(0, source_1.str)(/[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*\//yi), (0, source_1.str)(/[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*(?![0-9a-z@]|>>|:\S)/yi)]), false, [3 | 0 /* Backtrack.autolink */]), (0, combinator_1.some)((0, combinator_1.open)('#', (0, combinator_1.verify)((0, source_1.str)(new RegExp([/(?!['_])(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^'\p{C}\p{S}\p{P}\s]|emoji))+(?![0-9a-z@]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source].join('').replace(/emoji/g, hashtag_1.emoji), 'yu')), ([{
+exports.channel = (0, combinator_1.lazy)(() => (0, combinator_1.rewrite)((0, combinator_1.sequence)([(0, combinator_1.open)(/(?<![0-9a-z])@/yi, (0, combinator_1.tails)([(0, source_1.str)(/[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*\//yi), (0, source_1.str)(/[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*(?![-.]?[0-9a-z@]|>>|:\S)/yi)]), false, [3 | 0 /* Backtrack.autolink */]), (0, combinator_1.some)((0, combinator_1.open)('#', (0, combinator_1.verify)((0, source_1.str)(new RegExp([/(?!['_])(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^'\p{C}\p{S}\p{P}\s]|emoji))+(?![0-9a-z@]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source].join('').replace(/emoji/g, hashtag_1.emoji), 'yu')), ([{
   value
-}]) => !/^[0-9]{1,4}$|^[0-9]{5}/.test(value)), false, [3 | 0 /* Backtrack.autolink */]))]), (0, combinator_1.union)([(0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.fmap)((0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `https://${source.slice(1, source.indexOf('#')).replace('/', '/@')}` : `/${source.slice(0, source.indexOf('#'))}`} }`, link_1.unsafelink, false), ([{
+}]) => !/^[0-9]{1,4}$|^[0-9]{5}/.test(value)), false, [3 | 0 /* Backtrack.autolink */]))]), (0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.fmap)((0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `https://${source.slice(1, source.indexOf('#')).replace('/', '/@')}` : `/${source.slice(0, source.indexOf('#'))}`} }`, (0, combinator_1.union)([link_1.unsafelink]), false), ([{
   value: el
 }], {
   source,
@@ -6265,11 +6259,7 @@ exports.channel = (0, combinator_1.lazy)(() => (0, combinator_1.rewrite)((0, com
     class: 'channel',
     href: url
   }, src))]);
-}))), ({
-  context: {
-    source
-  }
-}) => new parser_1.List([new parser_1.Data(source)])])));
+})))));
 
 /***/ },
 
@@ -6288,20 +6278,16 @@ const combinator_1 = __webpack_require__(3484);
 const source_1 = __webpack_require__(8745);
 const dom_1 = __webpack_require__(394);
 // https://html.spec.whatwg.org/multipage/input.html
-exports.email = (0, combinator_1.rewrite)((0, combinator_1.open)(/(?<![0-9a-z][_.+-]?)(?=[0-9a-z])/yi, (0, combinator_1.verify)((0, source_1.str)(/[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z]){0,255}@[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*(?![0-9a-z@#]|>>|:\S)/yi), ([{
+exports.email = (0, combinator_1.rewrite)((0, combinator_1.open)(/(?<![0-9a-z][_.+-]?|[@#])(?=[0-9a-z])/yi, (0, combinator_1.verify)((0, source_1.str)(/[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z]){0,255}@[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*(?![.-]?[0-9a-z@#]|>>|:\S)/yi), ([{
   value
-}]) => value.length <= 255), false, [3 | 0 /* Backtrack.autolink */]), (0, combinator_1.union)([(0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, ({
+}]) => value.length <= 255), false, [3 | 0 /* Backtrack.autolink */]), (0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.union)([({
   context: {
     source
   }
 }) => new parser_1.List([new parser_1.Data((0, dom_1.html)('a', {
   class: 'email',
   href: `mailto:${source}`
-}, source))]))), ({
-  context: {
-    source
-  }
-}) => new parser_1.List([new parser_1.Data(source)])]));
+}, source))])]))));
 
 /***/ },
 
@@ -6321,16 +6307,12 @@ const link_1 = __webpack_require__(3628);
 const hashtag_1 = __webpack_require__(5764);
 const source_1 = __webpack_require__(8745);
 const dom_1 = __webpack_require__(394);
-exports.hashnum = (0, combinator_1.lazy)(() => (0, combinator_1.rewrite)((0, combinator_1.open)(new RegExp([/(?<![^\p{C}\p{S}\p{P}\s]|emoji)#/yiu.source].join('').replace(/emoji/g, hashtag_1.emoji), 'yu'), (0, source_1.str)(new RegExp([/[0-9]{1,9}(?![0-9a-z@#]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source].join('').replace(/emoji/g, hashtag_1.emoji), 'yu')), false, [1 | 0 /* Backtrack.autolink */]), (0, combinator_1.union)([(0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.fmap)((0, combinator_1.convert)(source => `[${source}]{ ${source.slice(1)} }`, link_1.unsafelink, false), ([{
+exports.hashnum = (0, combinator_1.lazy)(() => (0, combinator_1.rewrite)((0, combinator_1.open)(new RegExp([/(?<![^\p{C}\p{S}\p{P}\s]|emoji)#/yiu.source].join('').replace(/emoji/g, hashtag_1.emoji), 'yu'), (0, source_1.str)(new RegExp([/[0-9]{1,9}(?![0-9a-z@#]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source].join('').replace(/emoji/g, hashtag_1.emoji), 'yu')), false, [1 | 0 /* Backtrack.autolink */]), (0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.fmap)((0, combinator_1.convert)(source => `[${source}]{ ${source.slice(1)} }`, (0, combinator_1.union)([link_1.unsafelink]), false), ([{
   value
 }]) => new parser_1.List([new parser_1.Data((0, dom_1.define)(value, {
   class: 'hashnum',
   href: null
-}))])))), ({
-  context: {
-    source
-  }
-}) => new parser_1.List([new parser_1.Data(source)])])));
+}))]))))));
 
 /***/ },
 
@@ -6354,15 +6336,11 @@ const dom_1 = __webpack_require__(394);
 exports.emoji = String.raw`\p{Emoji_Modifier_Base}\p{Emoji_Modifier}?|\p{Emoji_Presentation}|\p{Emoji}\uFE0F`;
 exports.hashtag = (0, combinator_1.lazy)(() => (0, combinator_1.rewrite)((0, combinator_1.open)(new RegExp([/(?<![^\p{C}\p{S}\p{P}\s]|emoji)#/yiu.source].join('').replace(/emoji/g, exports.emoji), 'yu'), (0, combinator_1.verify)((0, source_1.str)(new RegExp([/(?!['_])(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^'\p{C}\p{S}\p{P}\s]|emoji))+(?![0-9a-z@#]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source].join('').replace(/emoji/g, exports.emoji), 'yu')), ([{
   value
-}]) => !/^[0-9]{1,4}$|^[0-9]{5}/.test(value)), false, [3 | 0 /* Backtrack.autolink */]), (0, combinator_1.union)([(0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.fmap)((0, combinator_1.convert)(source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`, link_1.unsafelink, false), ([{
+}]) => !/^[0-9]{1,4}$|^[0-9]{5}/.test(value)), false, [3 | 0 /* Backtrack.autolink */]), (0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.fmap)((0, combinator_1.convert)(source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`, (0, combinator_1.union)([link_1.unsafelink]), false), ([{
   value
 }]) => new parser_1.List([new parser_1.Data((0, dom_1.define)(value, {
   class: 'hashtag'
-}))])))), ({
-  context: {
-    source
-  }
-}) => new parser_1.List([new parser_1.Data(source)])])));
+}))]))))));
 
 /***/ },
 
@@ -6378,18 +6356,11 @@ Object.defineProperty(exports, "__esModule", ({
 exports.lineurl = exports.url = void 0;
 const parser_1 = __webpack_require__(605);
 const combinator_1 = __webpack_require__(3484);
+const inline_1 = __webpack_require__(7973);
 const link_1 = __webpack_require__(3628);
 const source_1 = __webpack_require__(8745);
-exports.url = (0, combinator_1.lazy)(() => (0, combinator_1.rewrite)((0, combinator_1.open)(/(?<![0-9A-Za-z][.+-]?)https?:\/\/(?=[\x21-\x7E])/y, (0, combinator_1.precedence)(0, (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(source_1.unescsource, /(?<![-+*=~^_,.;:!?])[-+*=~^_,.;:!?]*(?=[\\$"`\[\](){}<>（）［］｛｝|]|[^\x21-\x7E]|$)/y), (0, combinator_1.precedence)(1, (0, combinator_1.verify)(bracket, ns => ns.length > 0))]), undefined, [[/[^\x21-\x7E]|\$/y, 9]])), false, [3 | 0 /* Backtrack.autolink */]), (0, combinator_1.union)([(0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.convert)(url => `{ ${url} }`, link_1.unsafelink, false))), ({
-  context: {
-    source
-  }
-}) => new parser_1.List([new parser_1.Data(source)])])));
-exports.lineurl = (0, combinator_1.lazy)(() => (0, combinator_1.focus)(/(?<=^|[\r\n])!?https?:\/\/\S+(?=[^\S\n]*(?=$|\n))/y, (0, combinator_1.tails)([(0, source_1.str)('!'), (0, combinator_1.union)([(0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.convert)(url => `{ ${url} }`, link_1.unsafelink, false))), ({
-  context: {
-    source
-  }
-}) => new parser_1.List([new parser_1.Data(source)])])])));
+exports.url = (0, combinator_1.lazy)(() => (0, combinator_1.rewrite)((0, combinator_1.open)(/(?<![0-9A-Za-z][.+-]?|[@#])https?:\/\/(?=[\x21-\x7E])/y, (0, combinator_1.precedence)(0, (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(source_1.unescsource, /(?<![-+*=~^_,.;:!?]|\/{3})(?:[-+*=~^_,.;:!?]|\/{3,}(?!\/))*(?=[\\$"`\[\](){}<>（）［］｛｝|]|[^\x21-\x7E]|$)/y), (0, combinator_1.precedence)(1, (0, combinator_1.verify)(bracket, ns => ns.length > 0))]), undefined, [[/[^\x21-\x7E]|\$/y, 9]])), false, [3 | 0 /* Backtrack.autolink */]), (0, combinator_1.union)([(0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.convert)(url => `{ ${url} }`, link_1.unsafelink, false))), (0, combinator_1.open)((0, source_1.str)(/[^:]+/y), (0, combinator_1.some)(inline_1.inline))])));
+exports.lineurl = (0, combinator_1.lazy)(() => (0, combinator_1.focus)(/(?<=^|[\r\n])!?https?:\/\/\S+(?=[^\S\n]*(?=$|\n))/y, (0, combinator_1.tails)([(0, source_1.str)('!'), (0, combinator_1.union)([(0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, (0, combinator_1.convert)(url => `{ ${url} }`, link_1.unsafelink, false))), (0, combinator_1.open)((0, source_1.str)(/[^:]+/y), (0, combinator_1.some)(inline_1.inline))])])));
 const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.unescsource]), ')')), (0, source_1.str)(')'), true, undefined, () => new parser_1.List(), [3 | 0 /* Backtrack.autolink */]), (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.unescsource]), ']')), (0, source_1.str)(']'), true, undefined, () => new parser_1.List(), [3 | 0 /* Backtrack.autolink */]), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.unescsource]), '}')), (0, source_1.str)('}'), true, undefined, () => new parser_1.List(), [3 | 0 /* Backtrack.autolink */]), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.precedence)(2, (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)(source_1.unescsource, '"'))), (0, source_1.str)('"'), true, undefined, () => new parser_1.List(), [3 | 0 /* Backtrack.autolink */])]));
 
 /***/ },
@@ -8971,8 +8942,8 @@ var blank;
 (function (blank) {
   blank.line = new RegExp(
   // TODO: 行全体をエスケープ
-  /^(?:[^\S\r\n])*(?!\s)(\\?[^\S\r\n]|&IHN;|<wbr[^\S\n]*>|\\$)+$/mg.source.replace('IHN', `(?:${normalize_1.invisibleHTMLEntityNames.join('|')})`), 'gm');
-  blank.start = new RegExp(/(?:\\?[^\S\r\n]|&IHN;|<wbr[^\S\n]*>)+/y.source.replace('IHN', `(?:${normalize_1.invisibleHTMLEntityNames.join('|')})`), 'y');
+  /^(?:[^\S\r\n])*(?!\s)(\\?[^\S\r\n]|&IHN;|<wbr ?>|\\$)+$/mg.source.replace('IHN', `(?:${normalize_1.invisibleHTMLEntityNames.join('|')})`), 'gm');
+  blank.start = new RegExp(/(?:\\?[^\S\r\n]|&IHN;|<wbr ?>)+/y.source.replace('IHN', `(?:${normalize_1.invisibleHTMLEntityNames.join('|')})`), 'y');
 })(blank || (exports.blank = blank = {}));
 function visualize(parser) {
   return (0, combinator_1.convert)(source => source.replace(blank.line, `${"\u001B" /* Command.Escape */}$1`), parser, false);
@@ -8980,7 +8951,7 @@ function visualize(parser) {
 exports.visualize = visualize;
 function blankWith(starts, delimiter) {
   if (delimiter === undefined) return blankWith('', starts);
-  return new RegExp(String.raw`(?:(?=${starts})(?:\\?\s|&(?:${normalize_1.invisibleHTMLEntityNames.join('|')});|<wbr[^\S\n]*>)${
+  return new RegExp(String.raw`(?:(?=${starts})(?:\\?\s|&(?:${normalize_1.invisibleHTMLEntityNames.join('|')});|<wbr ?>)${
   // 空行除去
   // 完全な空行はエスケープ済みなので再帰的バックトラックにはならない。
   starts && '+'})?${typeof delimiter === 'string' ? delimiter.replace(/[*+()\[\]]/g, '\\$&') : delimiter.source}`, 'y');
@@ -8990,7 +8961,6 @@ function tightStart(parser, except) {
   return input => isTightStart(input, except) ? parser(input) : undefined;
 }
 exports.tightStart = tightStart;
-const wbr = /<wbr[^\S\n]*>/y;
 function isTightStart(input, except) {
   const {
     context
@@ -9018,9 +8988,8 @@ function isTightStart(input, except) {
       context.position = position;
       return true;
     case '<':
-      wbr.lastIndex = position;
       switch (true) {
-        case source.length - position >= 5 && source.startsWith('<wbr', position) && (source[position + 5] === '>' || wbr.test(source)):
+        case source.length - position >= 5 && source.startsWith('<wbr', position) && (source[position + 4] === '>' || source.startsWith(' >', position + 4)):
           return false;
       }
       return true;

package/markdown.d.ts

@@ -1096,13 +1096,10 @@ export namespace MarkdownParser {
         AutolinkParser.UrlParser.LineUrlParser,
         AutolinkParser.UrlParser,
         AutolinkParser.EmailParser,
-        SourceParser.StrParser,
         AutolinkParser.ChannelParser,
         AutolinkParser.AccountParser,
-        SourceParser.StrParser,
         AutolinkParser.HashtagParser,
         AutolinkParser.HashnumParser,
-        SourceParser.StrParser,
         AutolinkParser.AnchorParser,
       ]> {
     }
@@ -1110,9 +1107,9 @@ export namespace MarkdownParser {
       export interface UrlParser extends
         // https://host
         Inline<'url'>,
-        Parser<string | HTMLAnchorElement, Context, [
+        Parser<string | HTMLElement, Context, [
           LinkParser.UnsafeLinkParser,
-          Parser<string, Context, []>,
+          InlineParser,
         ]> {
       }
       export namespace UrlParser {
@@ -1122,7 +1119,7 @@ export namespace MarkdownParser {
             SourceParser.StrParser,
             Parser<string | HTMLElement, Context, [
               InlineParser.LinkParser.UnsafeLinkParser,
-              Parser<string, Context, []>,
+              InlineParser,
             ]>,
           ]> {
         }
@@ -1150,7 +1147,6 @@ export namespace MarkdownParser {
         Inline<'email'>,
         Parser<string | HTMLAnchorElement, Context, [
           Parser<HTMLAnchorElement, Context, []>,
-          Parser<string, Context, []>,
         ]> {
       }
       export interface ChannelParser extends
@@ -1158,7 +1154,6 @@ export namespace MarkdownParser {
         Inline<'channel'>,
         Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
-          Parser<string, Context, []>,
         ]> {
       }
       export interface AccountParser extends
@@ -1166,7 +1161,6 @@ export namespace MarkdownParser {
         Inline<'account'>,
         Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
-          Parser<string, Context, []>,
         ]> {
       }
       export interface HashtagParser extends
@@ -1174,7 +1168,6 @@ export namespace MarkdownParser {
         Inline<'hashtag'>,
         Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
-          Parser<string, Context, []>,
         ]> {
       }
       export interface HashnumParser extends
@@ -1182,7 +1175,6 @@ export namespace MarkdownParser {
         Inline<'hashnum'>,
         Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
-          Parser<string, Context, []>,
         ]> {
       }
       export interface AnchorParser extends
@@ -1190,7 +1182,6 @@ export namespace MarkdownParser {
         Inline<'anchor'>,
         Parser<string | HTMLAnchorElement, Context, [
           LinkParser.UnsafeLinkParser,
-          Parser<string, Context, []>,
         ]> {
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.294.2",
+  "version": "0.294.4",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",

package/src/parser/block/reply/cite.ts

@@ -12,7 +12,7 @@ export const cite: ReplyParser.CiteParser = line(fmap(
   open(
     str(syntax),
     union([
-      anchor,
+      line(anchor),
       // Subject page representation.
       // リンクの実装は後で検討
       focus(/>>#\S*(?=\s*$)/y, ({ context: { source } }) => new List([new Data(html('a', { class: 'anchor' }, source))])),

package/src/parser/inline/autolink/account.test.ts

@@ -10,21 +10,24 @@ describe('Unit: parser/inline/autolink/account', () => {
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
-      assert.deepStrictEqual(inspect(parser('@'), ctx), [['@'], '']);
-      assert.deepStrictEqual(inspect(parser('@+'), ctx), [['@'], '+']);
-      assert.deepStrictEqual(inspect(parser('@_'), ctx), [['@'], '_']);
-      assert.deepStrictEqual(inspect(parser('@-'), ctx), [['@'], '-']);
-      assert.deepStrictEqual(inspect(parser('@.'), ctx), [['@'], '.']);
-      assert.deepStrictEqual(inspect(parser('@0'), ctx), [['@0'], '']);
-      assert.deepStrictEqual(inspect(parser('@a@'), ctx), [['@a'], '@']);
-      assert.deepStrictEqual(inspect(parser('@a@b'), ctx), [['@a'], '@b']);
-      assert.deepStrictEqual(inspect(parser('@a@b@c'), ctx), [['@a'], '@b@c']);
-      assert.deepStrictEqual(inspect(parser('@ab@'), ctx), [['@ab'], '@']);
-      assert.deepStrictEqual(inspect(parser('@@'), ctx), [['@@'], '']);
-      assert.deepStrictEqual(inspect(parser('@@a'), ctx), [['@@a'], '']);
-      assert.deepStrictEqual(inspect(parser('@@@a'), ctx), [['@@@a'], '']);
-      assert.deepStrictEqual(inspect(parser('@#'), ctx), [['@', '#'], '']);
-      assert.deepStrictEqual(inspect(parser('@#a'), ctx), [['@', '<a class="hashtag" href="/hashtags/a">#a</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@+'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@_'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@-'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@.'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@0'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@a@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@a@b'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@a@b@c'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@ab@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@@a'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@@@a'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@#'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@#a'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@a.b:c'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@a.domain.com:b'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@http://host'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser(' @a'), ctx), undefined);
     });
 
@@ -38,8 +41,6 @@ describe('Unit: parser/inline/autolink/account', () => {
       assert.deepStrictEqual(inspect(parser('@a--b'), ctx), [['<a class="account" href="/@a">@a</a>'], '--b']);
       assert.deepStrictEqual(inspect(parser('@a.'), ctx), [['<a class="account" href="/@a">@a</a>'], '.']);
       assert.deepStrictEqual(inspect(parser('@a.domain.com'), ctx), [['<a class="account" href="/@a.domain.com">@a.domain.com</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('@http://host'), ctx), [['@http'], '://host']);
-      assert.deepStrictEqual(inspect(parser('@ttp://host'), ctx), [ [ '@ttp' ], '://host' ]);
       assert.deepStrictEqual(inspect(parser('@domain/a'), ctx), [['<a class="account" href="https://domain/@a" target="_blank">@domain/a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('@domain.com/a'), ctx), [['<a class="account" href="https://domain.com/@a" target="_blank">@domain.com/a</a>'], '']);
     });

package/src/parser/inline/autolink/account.ts

@@ -13,20 +13,16 @@ export const account: AutolinkParser.AccountParser = lazy(() => rewrite(
     /(?<![0-9a-z])@/yi,
     tails([
       str(/[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*\//yi),
-      str(/[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*(?![0-9a-z@#]|>>|:\S)/yi),
+      str(/[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*(?![-.]?[0-9a-z@#]|>>|:\S)/yi),
     ]),
     false,
     [3 | Backtrack.autolink]),
-  union([
-    constraint(State.autolink, state(State.autolink, fmap(convert(
-      source =>
-        `[${source}]{ ${
-          source.includes('/')
-            ? `https://${source.slice(1).replace('/', '/@')}`
-            : `/${source}`
-        } }`,
-      unsafelink,
-      false),
-      ([{ value }]) => new List([new Data(define(value, { class: 'account' }))])))),
-    ({ context: { source } }) => new List([new Data(source)]),
-  ])));
+  constraint(State.autolink, state(State.autolink, fmap(convert(
+    source =>
+      `[${source}]{ ${source.includes('/')
+        ? `https://${source.slice(1).replace('/', '/@')}`
+        : `/${source}`
+      } }`,
+    union([unsafelink]),
+    false),
+    ([{ value }]) => new List([new Data(define(value, { class: 'account' }))]))))));

package/src/parser/inline/autolink/anchor.test.ts

@@ -15,10 +15,11 @@ describe('Unit: parser/inline/autolink/anchor', () => {
       assert.deepStrictEqual(inspect(parser('>>-0'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('>>01#'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('>>01@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('>>0-1:2'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('>>https://host'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('>>tel:1234567890'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('>>>'), ctx), undefined);
-      assert.deepStrictEqual(inspect(parser('a>>0'), ctx), [['a'], '>>0']);
+      assert.deepStrictEqual(inspect(parser('a>>0'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser(' >>0'), ctx), undefined);
     });
 

package/src/parser/inline/autolink/anchor.ts

@@ -19,18 +19,15 @@ import { define } from 'typed-dom/dom';
 export const anchor: AutolinkParser.AnchorParser = lazy(() => rewrite(
   open(
     /(?<![0-9a-z])>>/yi,
-    str(/(?:[a-z][0-9a-z]*(?:-[0-9a-z]+)*\/)?[0-9a-z]+(?:-[0-9a-z]+)*(?![0-9a-z@#]|>>|:\S)/yi),
+    str(/(?:[a-z][0-9a-z]*(?:-[0-9a-z]+)*\/)?[0-9a-z]+(?:-[0-9a-z]+)*(?!-?[0-9a-z@#]|>>|:\S)/yi),
     false,
     [3 | Backtrack.autolink]),
-  union([
-    constraint(State.autolink, state(State.autolink, fmap(convert(
-      source =>
-        `[${source}]{ ${source.includes('/')
-          ? `/@${source.slice(2).replace('/', '/timeline?at=')}`
-          : `?at=${source.slice(2)}`
-        } }`,
-      unsafelink,
-      false),
-      ([{ value }]) => new List([new Data(define(value, { class: 'anchor' }))])))),
-    ({ context: { source } }) => new List([new Data(source)]),
-  ])));
+  constraint(State.autolink, state(State.autolink, fmap(convert(
+    source =>
+      `[${source}]{ ${source.includes('/')
+        ? `/@${source.slice(2).replace('/', '/timeline?at=')}`
+        : `?at=${source.slice(2)}`
+      } }`,
+    union([unsafelink]),
+    false),
+    ([{ value }]) => new List([new Data(define(value, { class: 'anchor' }))]))))));

package/src/parser/inline/autolink/channel.test.ts

@@ -10,12 +10,12 @@ describe('Unit: parser/inline/autolink/channel', () => {
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
-      assert.deepStrictEqual(inspect(parser('@a@'), ctx), [['@a'], '@']);
-      assert.deepStrictEqual(inspect(parser('@a@b'), ctx), [['@a'], '@b']);
-      assert.deepStrictEqual(inspect(parser('@a#'), ctx), [['@a'], '#']);
-      assert.deepStrictEqual(inspect(parser('@a#1'), ctx), [['@a'], '#1']);
-      assert.deepStrictEqual(inspect(parser('@a#b@'), ctx), [['@a'], '#b@']);
-      assert.deepStrictEqual(inspect(parser('@a#1@b'), ctx), [['@a'], '#1@b']);
+      assert.deepStrictEqual(inspect(parser('@a@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@a@b'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@a#'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@a#1'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@a#b@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('@a#1@b'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser(' @a#b'), ctx), undefined);
     });
 

package/src/parser/inline/autolink/channel.ts

@@ -15,7 +15,7 @@ export const channel: AutolinkParser.ChannelParser = lazy(() => rewrite(
       /(?<![0-9a-z])@/yi,
       tails([
         str(/[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*\//yi),
-        str(/[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*(?![0-9a-z@]|>>|:\S)/yi),
+        str(/[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*(?![-.]?[0-9a-z@]|>>|:\S)/yi),
       ]),
       false,
       [3 | Backtrack.autolink]),
@@ -29,20 +29,16 @@ export const channel: AutolinkParser.ChannelParser = lazy(() => rewrite(
       false,
       [3 | Backtrack.autolink])),
   ]),
-  union([
-    constraint(State.autolink, state(State.autolink, fmap(convert(
-      source =>
-        `[${source}]{ ${
-          source.includes('/')
-            ? `https://${source.slice(1, source.indexOf('#')).replace('/', '/@')}`
-            : `/${source.slice(0, source.indexOf('#'))}`
-        } }`,
-      unsafelink,
-      false),
-      ([{ value: el }], { source, position, range = 0 }) => {
-        const src = source.slice(position - range, position);
-        const url = `${el.getAttribute('href')}?ch=${src.slice(src.indexOf('#') + 1).replace(/#/g, '+')}`;
-        return new List([new Data(define(el, { class: 'channel', href: url }, src))]);
-      }))),
-    ({ context: { source } }) => new List([new Data(source)]),
-  ])));
+  constraint(State.autolink, state(State.autolink, fmap(convert(
+    source =>
+      `[${source}]{ ${source.includes('/')
+        ? `https://${source.slice(1, source.indexOf('#')).replace('/', '/@')}`
+        : `/${source.slice(0, source.indexOf('#'))}`
+      } }`,
+    union([unsafelink]),
+    false),
+    ([{ value: el }], { source, position, range = 0 }) => {
+      const src = source.slice(position - range, position);
+      const url = `${el.getAttribute('href')}?ch=${src.slice(src.indexOf('#') + 1).replace(/#/g, '+')}`;
+      return new List([new Data(define(el, { class: 'channel', href: url }, src))]);
+    })))));

package/src/parser/inline/autolink/email.test.ts

@@ -10,25 +10,25 @@ describe('Unit: parser/inline/autolink/email', () => {
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
-      assert.deepStrictEqual(inspect(parser('a@'), ctx), [['a'], '@']);
-      assert.deepStrictEqual(inspect(parser('a@+'), ctx), [['a'], '@+']);
-      assert.deepStrictEqual(inspect(parser('a@_'), ctx), [['a'], '@_']);
-      assert.deepStrictEqual(inspect(parser('a@-'), ctx), [['a'], '@-']);
-      assert.deepStrictEqual(inspect(parser('a@.'), ctx), [['a'], '@.']);
-      assert.deepStrictEqual(inspect(parser('a@b@'), ctx), [['a'], '@b@']);
-      assert.deepStrictEqual(inspect(parser('a@bc@'), ctx), [['a'], '@bc@']);
-      assert.deepStrictEqual(inspect(parser('a@b@c'), ctx), [['a'], '@b@c']);
-      assert.deepStrictEqual(inspect(parser('a@b#'), ctx), [['a'], '@b#']);
-      assert.deepStrictEqual(inspect(parser('a@b#1'), ctx), [['a'], '@b#1']);
-      assert.deepStrictEqual(inspect(parser('a@@'), ctx), [['a@', '@'], '']);
-      assert.deepStrictEqual(inspect(parser('a@@b'), ctx), [['a@', '<a class="account" href="/@b">@b</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('a+@b'), ctx), [['a'], '+@b']);
-      assert.deepStrictEqual(inspect(parser('a__b@c'), ctx), [['a'], '__b@c']);
-      assert.deepStrictEqual(inspect(parser('a..b@c'), ctx), [['a'], '..b@c']);
-      assert.deepStrictEqual(inspect(parser('a++b@c'), ctx), [['a'], '++b@c']);
-      assert.deepStrictEqual(inspect(parser('a@http://host'), ctx), [['a'], '@http://host']);
-      assert.deepStrictEqual(inspect(parser('a@ttp://host'), ctx), [['a'], '@ttp://host']);
-      assert.deepStrictEqual(inspect(parser(`a@${'b'.repeat(64)}`), ctx), [['a'], `@${'b'.repeat(64)}`]);
+      assert.deepStrictEqual(inspect(parser('a@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@+'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@_'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@-'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@.'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@b@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@bc@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@b@c'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@b#'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@b#1'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@@b'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a+@b'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a__b@c'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a..b@c'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a++b@c'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@b.c:d'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('a@http://host'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(`a@${'b'.repeat(64)}`), ctx), undefined);
       assert.deepStrictEqual(inspect(parser(' a@b'), ctx), undefined);
     });
 

package/src/parser/inline/autolink/email.ts

@@ -8,14 +8,14 @@ import { html } from 'typed-dom/dom';
 // https://html.spec.whatwg.org/multipage/input.html
 
 export const email: AutolinkParser.EmailParser = rewrite(
-  open(/(?<![0-9a-z][_.+-]?)(?=[0-9a-z])/yi,
+  open(/(?<![0-9a-z][_.+-]?|[@#])(?=[0-9a-z])/yi,
     verify(
-      str(/[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z]){0,255}@[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*(?![0-9a-z@#]|>>|:\S)/yi),
+      str(/[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z]){0,255}@[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*(?![.-]?[0-9a-z@#]|>>|:\S)/yi),
       ([{ value }]) => value.length <= 255),
     false,
     [3 | Backtrack.autolink]),
-  union([
-    constraint(State.autolink, state(State.autolink,
-      ({ context: { source } }) => new List([new Data(html('a', { class: 'email', href: `mailto:${source}` }, source))]))),
-    ({ context: { source } }) => new List([new Data(source)]),
-  ]));
+  constraint(State.autolink, state(State.autolink,
+    union([
+      ({ context: { source } }) =>
+        new List([new Data(html('a', { class: 'email', href: `mailto:${source}` }, source))])
+    ]))));

package/src/parser/inline/autolink/hashnum.test.ts

@@ -10,27 +10,27 @@ describe('Unit: parser/inline/autolink/hashnum', () => {
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
-      assert.deepStrictEqual(inspect(parser('#'), ctx), [['#'], '']);
-      assert.deepStrictEqual(inspect(parser('# '), ctx), [['#'], ' ']);
-      assert.deepStrictEqual(inspect(parser('#1#'), ctx), [['#1'], '#']);
-      assert.deepStrictEqual(inspect(parser('#1#2'), ctx), [['#1'], '#2']);
-      assert.deepStrictEqual(inspect(parser('#1#2#3'), ctx), [['#1'], '#2#3']);
-      assert.deepStrictEqual(inspect(parser('#1@2'), ctx), [['#1'], '@2']);
-      assert.deepStrictEqual(inspect(parser('#\\'), ctx), [['#'], '\\']);
-      assert.deepStrictEqual(inspect(parser('#\\ '), ctx), [['#'], '\\ ']);
-      assert.deepStrictEqual(inspect(parser('#\\\n'), ctx), [['#'], '\\\n']);
-      assert.deepStrictEqual(inspect(parser('##'), ctx), [['##'], '']);
-      assert.deepStrictEqual(inspect(parser('##1'), ctx), [['##1'], '']);
-      assert.deepStrictEqual(inspect(parser('###1'), ctx), [['###1'], '']);
-      assert.deepStrictEqual(inspect(parser('#{}'), ctx), [['#'], '{}']);
-      assert.deepStrictEqual(inspect(parser('#{{}'), ctx), [['#'], '{{}']);
-      assert.deepStrictEqual(inspect(parser('#{}}'), ctx), [['#'], '{}}']);
-      assert.deepStrictEqual(inspect(parser('#{#}'), ctx), [['#'], '{#}']);
-      assert.deepStrictEqual(inspect(parser('#{1}'), ctx), [['#'], '{1}']);
-      assert.deepStrictEqual(inspect(parser('#　'), ctx), [['#'], '　']);
+      assert.deepStrictEqual(inspect(parser('#'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('# '), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#1#'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#1#2'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#1#2#3'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#1@2'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#\\'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#\\ '), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#\\\n'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('##'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('##1'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('###1'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#{}'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#{{}'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#{}}'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#{#}'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#{1}'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(10)}`), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(10)}a`), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#　'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser(' #1'), ctx), undefined);
-      assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(10)}`), ctx), [[`#${'1'.repeat(10)}`], '']);
-      assert.deepStrictEqual(inspect(parser(`#${'1'.repeat(10)}a`), ctx), [[`#${'1'.repeat(10)}a`], '']);
     });
 
     it('valid', () => {

package/src/parser/inline/autolink/hashnum.ts

@@ -17,11 +17,9 @@ export const hashnum: AutolinkParser.HashnumParser = lazy(() => rewrite(
     ].join('').replace(/emoji/g, emoji), 'yu')),
     false,
     [1 | Backtrack.autolink]),
-  union([
-    constraint(State.autolink, state(State.autolink, fmap(convert(
-      source => `[${source}]{ ${source.slice(1)} }`,
-      unsafelink,
-      false),
-      ([{ value }]) => new List([new Data(define(value, { class: 'hashnum', href: null }))])))),
-    ({ context: { source } }) => new List([new Data(source)]),
-  ])));
+  constraint(State.autolink, state(State.autolink, fmap(convert(
+    source => `[${source}]{ ${source.slice(1)} }`,
+    union([unsafelink]),
+    false),
+    ([{ value }]) => new List([new Data(define(value, { class: 'hashnum', href: null }))])))),
+  ));

package/src/parser/inline/autolink/hashtag.test.ts

@@ -10,33 +10,33 @@ describe('Unit: parser/inline/autolink/hashtag', () => {
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
-      assert.deepStrictEqual(inspect(parser('#'), ctx), [['#'], '']);
-      assert.deepStrictEqual(inspect(parser('# '), ctx), [['#'], ' ']);
-      assert.deepStrictEqual(inspect(parser('#a#'), ctx), [['#a'], '#']);
-      assert.deepStrictEqual(inspect(parser('#a#b'), ctx), [['#a'], '#b']);
-      assert.deepStrictEqual(inspect(parser('#a#b#c'), ctx), [['#a'], '#b#c']);
-      assert.deepStrictEqual(inspect(parser('#a@b'), ctx), [['#a'], '@b']);
-      assert.deepStrictEqual(inspect(parser('#@'), ctx), [['#', '@'], '']);
-      assert.deepStrictEqual(inspect(parser('#@a'), ctx), [['#', '<a class="account" href="/@a">@a</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('#\\'), ctx), [['#'], '\\']);
-      assert.deepStrictEqual(inspect(parser('#\\ '), ctx), [['#'], '\\ ']);
-      assert.deepStrictEqual(inspect(parser('#\\\n'), ctx), [['#'], '\\\n']);
-      assert.deepStrictEqual(inspect(parser('##'), ctx), [['##'], '']);
-      assert.deepStrictEqual(inspect(parser('##a'), ctx), [['##a'], '']);
-      assert.deepStrictEqual(inspect(parser('###a'), ctx), [['###a'], '']);
-      assert.deepStrictEqual(inspect(parser(`#'`), ctx), [['#'], `'`]);
-      assert.deepStrictEqual(inspect(parser(`#'0`), ctx), [[`#`], `'0`]);
-      assert.deepStrictEqual(inspect(parser(`#'00`), ctx), [[`#`], `'00`]);
-      assert.deepStrictEqual(inspect(parser('#_'), ctx), [['#'], '_']);
-      assert.deepStrictEqual(inspect(parser('#_a'), ctx), [['#'], '_a']);
-      assert.deepStrictEqual(inspect(parser('#(a)'), ctx), [['#'], '(a)']);
-      assert.deepStrictEqual(inspect(parser('#{}'), ctx), [['#'], '{}']);
-      assert.deepStrictEqual(inspect(parser('#{{}'), ctx), [['#'], '{{}']);
-      assert.deepStrictEqual(inspect(parser('#{}}'), ctx), [['#'], '{}}']);
-      assert.deepStrictEqual(inspect(parser('#{#}'), ctx), [['#'], '{#}']);
-      assert.deepStrictEqual(inspect(parser('#{a}'), ctx), [['#'], '{a}']);
-      assert.deepStrictEqual(inspect(parser('#12345a'), ctx), [['#12345a'], '']);
-      assert.deepStrictEqual(inspect(parser('#　'), ctx), [['#'], '　']);
+      assert.deepStrictEqual(inspect(parser('#'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('# '), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#a#'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#a#b'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#a#b#c'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#a@b'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#@'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#@a'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#\\'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#\\ '), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#\\\n'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('##'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('##a'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('###a'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(`#'`), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(`#'0`), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(`#'00`), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#_'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#_a'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#(a)'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#{}'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#{{}'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#{}}'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#{#}'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#{a}'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#12345a'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser('#　'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser(' #a'), ctx), undefined);
     });
 

package/src/parser/inline/autolink/hashtag.ts

@@ -23,11 +23,8 @@ export const hashtag: AutolinkParser.HashtagParser = lazy(() => rewrite(
       ([{ value }]) => !/^[0-9]{1,4}$|^[0-9]{5}/.test(value)),
     false,
     [3 | Backtrack.autolink]),
-  union([
-    constraint(State.autolink, state(State.autolink, fmap(convert(
-      source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`,
-      unsafelink,
-      false),
-      ([{ value }]) => new List([new Data(define(value, { class: 'hashtag' }))])))),
-    ({ context: { source } }) => new List([new Data(source)]),
-  ])));
+  constraint(State.autolink, state(State.autolink, fmap(convert(
+    source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`,
+    union([unsafelink]),
+    false),
+    ([{ value }]) => new List([new Data(define(value, { class: 'hashtag' }))]))))));

package/src/parser/inline/autolink/url.test.ts

@@ -10,12 +10,12 @@ describe('Unit: parser/inline/autolink/url', () => {
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser(''), ctx), undefined);
-      assert.deepStrictEqual(inspect(parser(' http'), ctx), [['http'], '']);
-      assert.deepStrictEqual(inspect(parser(' ttp'), ctx), [['ttp'], '']);
-      assert.deepStrictEqual(inspect(parser(' http://'), ctx), [['http:'], '//']);
-      assert.deepStrictEqual(inspect(parser(' http://['), ctx), [['http:'], '//[']);
-      assert.deepStrictEqual(inspect(parser(' http://]'), ctx), [['http:'], '//]']);
-      assert.deepStrictEqual(inspect(parser(' Http://host'), ctx), [['Http:'], '//host']);
+      assert.deepStrictEqual(inspect(parser(' '), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(' http'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(' http://'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(' http://['), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(' http://]'), ctx), undefined);
+      assert.deepStrictEqual(inspect(parser(' Http://host'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser(' http://[::ffff:0:0%1]'), ctx), [['<a class="invalid">http://[::ffff:0:0%1]</a>'], '']);
       assert.deepStrictEqual(inspect(parser(' http://[::ffff:0:0/96]'), ctx), [['<a class="invalid">http://[::ffff:0:0/96]</a>'], '']);
     });
@@ -60,7 +60,9 @@ describe('Unit: parser/inline/autolink/url', () => {
       assert.deepStrictEqual(inspect(parser(' http://host^'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '^']);
       assert.deepStrictEqual(inspect(parser(' http://host_'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '_']);
       assert.deepStrictEqual(inspect(parser(' http://host/'), ctx), [['<a class="url" href="http://host/" target="_blank">http://host/</a>'], '']);
-      assert.deepStrictEqual(inspect(parser(` http://host'`), ctx), [['<a class="url" href="http://host\'" target="_blank">http://host\'</a>'], '']);
+      assert.deepStrictEqual(inspect(parser(' http://host//'), ctx), [['<a class="url" href="http://host//" target="_blank">http://host//</a>'], '']);
+      assert.deepStrictEqual(inspect(parser(' http://host///'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '///']);
+      assert.deepStrictEqual(inspect(parser(` http://host'`), ctx), [[`<a class="url" href="http://host'" target="_blank">http://host'</a>`], '']);
       assert.deepStrictEqual(inspect(parser(' http://host"'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '"']);
       assert.deepStrictEqual(inspect(parser(' http://host`'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '`']);
       assert.deepStrictEqual(inspect(parser(' http://host|'), ctx), [['<a class="url" href="http://host" target="_blank">http://host</a>'], '|']);

package/src/parser/inline/autolink/url.ts

@@ -1,15 +1,16 @@
 import { AutolinkParser } from '../../inline';
 import { State, Recursion, Backtrack } from '../../context';
-import { List, Data } from '../../../combinator/data/parser';
+import { List } from '../../../combinator/data/parser';
 import { union, tails, some, recursion, precedence, state, constraint, verify, focus, rewrite, convert, surround, open, lazy } from '../../../combinator';
+import { inline } from '../../inline';
 import { unsafelink } from '../link';
 import { unescsource, str } from '../../source';
 
 export const url: AutolinkParser.UrlParser = lazy(() => rewrite(
   open(
-    /(?<![0-9A-Za-z][.+-]?)https?:\/\/(?=[\x21-\x7E])/y,
+    /(?<![0-9A-Za-z][.+-]?|[@#])https?:\/\/(?=[\x21-\x7E])/y,
     precedence(0, some(union([
-      some(unescsource, /(?<![-+*=~^_,.;:!?])[-+*=~^_,.;:!?]*(?=[\\$"`\[\](){}<>（）［］｛｝|]|[^\x21-\x7E]|$)/y),
+      some(unescsource, /(?<![-+*=~^_,.;:!?]|\/{3})(?:[-+*=~^_,.;:!?]|\/{3,}(?!\/))*(?=[\\$"`\[\](){}<>（）［］｛｝|]|[^\x21-\x7E]|$)/y),
       precedence(1, verify(bracket, ns => ns.length > 0)),
     ]), undefined, [[/[^\x21-\x7E]|\$/y, 9]])),
     false,
@@ -19,7 +20,7 @@ export const url: AutolinkParser.UrlParser = lazy(() => rewrite(
       url => `{ ${url} }`,
       unsafelink,
       false))),
-    ({ context: { source } }) => new List([new Data(source)]),
+    open(str(/[^:]+/y), some(inline)),
   ])));
 
 export const lineurl: AutolinkParser.UrlParser.LineUrlParser = lazy(() => focus(
@@ -31,7 +32,7 @@ export const lineurl: AutolinkParser.UrlParser.LineUrlParser = lazy(() => focus(
         url => `{ ${url} }`,
         unsafelink,
         false))),
-      ({ context: { source } }) => new List([new Data(source)]),
+      open(str(/[^:]+/y), some(inline)),
     ]),
   ])));
 

package/src/parser/inline/autolink.ts

@@ -8,14 +8,13 @@ import { account } from './autolink/account';
 import { hashtag, emoji } from './autolink/hashtag';
 import { hashnum } from './autolink/hashnum';
 import { anchor } from './autolink/anchor';
-import { str } from '../source';
 
 export const autolink: AutolinkParser = lazy(() =>
   validate(new RegExp([
     /(?<![0-9a-z])@/yi.source,
     /(?<![^\p{C}\p{S}\p{P}\s]|emoji)#/yiu.source,
     /(?<![0-9a-z])>>/yi.source,
-    /(?<![0-9a-z][.+-]?)!?[0-9a-z]/yi.source,
+    /(?<![0-9a-z][.+-]?|[@#])!?[0-9a-z]/yi.source,
   ].join('|').replace(/emoji/g, emoji), 'yiu'),
   state(~State.autolink,
   union([
@@ -23,14 +22,14 @@ export const autolink: AutolinkParser = lazy(() =>
     url,
     email,
     // Escape unmatched email-like strings.
-    str(/[0-9a-z]+(?:[_.+-][0-9a-z]+[:@]?|:|@(?=@))*/yi),
+    //str(/[0-9a-z]+(?:[_.+-][0-9a-z]+[:@]?|:|@(?=@))*/yi),
     channel,
     account,
     // Escape unmatched account-like strings.
-    str(/@+(?:[0-9a-z]+(?:[_.+-][0-9a-z]+)*)?/yi),
+    //str(/@+(?:[0-9a-z]+(?:[_.+-][0-9a-z]+)*)?/yi),
     hashtag,
     hashnum,
     // Escape unmatched hashtag-like strings.
-    str(new RegExp(/#+(?:(?:[^\p{C}\p{S}\p{P}\s]|emoji)+(?:['_.+-](?:[^\p{C}\p{S}\p{P}\s]|emoji)+)*)?/yu.source.replace(/emoji/g, emoji), 'yu')),
+    //str(new RegExp(/#+(?:(?:[^\p{C}\p{S}\p{P}\s]|emoji)+(?:['_.+-](?:[^\p{C}\p{S}\p{P}\s]|emoji)+)*)?/yu.source.replace(/emoji/g, emoji), 'yu')),
     anchor,
   ]))));

package/src/parser/inline/deletion.test.ts

@@ -13,7 +13,7 @@ describe('Unit: parser/inline/deletion', () => {
       assert.deepStrictEqual(inspect(parser('~'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('~~'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('~~a'), ctx), [['~~', 'a'], '']);
-      assert.deepStrictEqual(inspect(parser('~~a~'), ctx), [['~~', 'a', '~'], '']);
+      assert.deepStrictEqual(inspect(parser('~~a~'), ctx), [['~~', 'a~'], '']);
       assert.deepStrictEqual(inspect(parser(' ~~a~~'), ctx), undefined);
     });
 

package/src/parser/inline/html.test.ts

@@ -65,6 +65,7 @@ describe('Unit: parser/inline/html', () => {
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('<wbr>'), ctx), [['<wbr>'], '']);
       assert.deepStrictEqual(inspect(parser('<wbr >'), ctx), [['<wbr>'], '']);
+      assert.deepStrictEqual(inspect(parser('<wbr  >'), ctx), [['<span class="invalid">&lt;wbr </span>'], ' >']);
       assert.deepStrictEqual(inspect(parser('<wbr>a'), ctx), [['<wbr>'], 'a']);
       assert.deepStrictEqual(inspect(parser('<bdi >a</bdi>'), ctx), [['<bdi>a</bdi>'], '']);
       assert.deepStrictEqual(inspect(parser('<bdi  >a</bdi>'), ctx), [['<span class="invalid">&lt;bdi  &gt;a&lt;/bdi&gt;</span>'], '']);

package/src/parser/inline/insertion.test.ts

@@ -13,7 +13,7 @@ describe('Unit: parser/inline/insertion', () => {
       assert.deepStrictEqual(inspect(parser('+'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('++'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('++a'), ctx), [['++', 'a'], '']);
-      assert.deepStrictEqual(inspect(parser('++a+'), ctx), [['++', 'a', '+'], '']);
+      assert.deepStrictEqual(inspect(parser('++a+'), ctx), [['++', 'a+'], '']);
       assert.deepStrictEqual(inspect(parser(' ++a++'), ctx), undefined);
     });
 

package/src/parser/inline/italic.test.ts

@@ -16,8 +16,8 @@ describe('Unit: parser/inline/italic', () => {
       assert.deepStrictEqual(inspect(parser('///a\n///'), ctx), [['///', 'a', '<br>', '///'], '']);
       assert.deepStrictEqual(inspect(parser('///a\\ ///'), ctx), [['///', 'a', ' ', '///'], '']);
       assert.deepStrictEqual(inspect(parser('///a\\\n///'), ctx), [['///', 'a', '<br>', '///'], '']);
-      assert.deepStrictEqual(inspect(parser('///a/b'), ctx), [['///', 'a', '/b'], '']);
-      assert.deepStrictEqual(inspect(parser('///a//b'), ctx), [['///', 'a', '//b'], '']);
+      assert.deepStrictEqual(inspect(parser('///a/b'), ctx), [['///', 'a/b'], '']);
+      assert.deepStrictEqual(inspect(parser('///a//b'), ctx), [['///', 'a//b'], '']);
       assert.deepStrictEqual(inspect(parser('///a*b///'), ctx), [['///', 'a', '*', 'b', '///'], '']);
       assert.deepStrictEqual(inspect(parser('/// ///'), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('/// a///'), ctx), undefined);

package/src/parser/inline/link.test.ts

@@ -180,7 +180,6 @@ describe('Unit: parser/inline/link', () => {
       assert.deepStrictEqual(inspect(parser('[[![]{a}]{b}]{b}'), ctx), [['<a class="link" href="b">[![]{a}]{b}</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[((a))]{b}'), ctx), [['<a class="link" href="b"><span class="paren">((a))</span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[[[a]]]{b}'), ctx), [['<a class="link" href="b">[[a]]</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[!http://host]{/}'), ctx), [['<a class="link" href="/" target="_blank"><img class="media" data-src="http://host" alt="http://host"></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a]{b}'), ctx), [['<a class="link" href="b">#a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[@a]{b}'), ctx), [['<a class="link" href="b">@a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[@a@b]{c}'), ctx), [['<a class="link" href="c">@a@b</a>'], '']);

package/src/parser/inline/mark.test.ts

@@ -13,7 +13,7 @@ describe('Unit: parser/inline/mark', () => {
       assert.deepStrictEqual(inspect(parser('='), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('=='), ctx), undefined);
       assert.deepStrictEqual(inspect(parser('==a'), ctx), [['==', 'a'], '']);
-      assert.deepStrictEqual(inspect(parser('==a='), ctx), [['==', 'a', '='], '']);
+      assert.deepStrictEqual(inspect(parser('==a='), ctx), [['==', 'a='], '']);
       assert.deepStrictEqual(inspect(parser('==a =='), ctx), [['==', 'a', ' ', '=='], '']);
       assert.deepStrictEqual(inspect(parser('==a  =='), ctx), [['==', 'a', ' ', '=='], '']);
       assert.deepStrictEqual(inspect(parser('==a\n=='), ctx), [['==', 'a', '<br>', '=='], '']);

package/src/parser/inline.test.ts

@@ -165,19 +165,19 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('"[% *"*"*'), ctx), [['"', '[%', ' ', '*', '"', '*', '"', '*'], '']);
       assert.deepStrictEqual(inspect(parser('"[% "*"* %]'), ctx), [['"', '<span class="remark"><input type="checkbox"><span>[% "*"* %]</span></span>'], '']);
       assert.deepStrictEqual(inspect(parser('"{{""}}'), ctx), [['"', '{', '{', '"', '"', '}', '}'], '']);
-      assert.deepStrictEqual(inspect(parser('[#http://host/(<bdi>)]</bdi>'), ctx), [['<a class="index" href="#index::http://host/(&lt;bdi&gt;)">http://host/(&lt;bdi&gt;)</a>', '</bdi', '>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#@a/http://host/(<bdi>)]</bdi>'), ctx), [['<a class="index" href="#index::@a/http://host/(&lt;bdi&gt;)">@a/http://host/(&lt;bdi&gt;)</a>', '</bdi', '>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#http://host/(<bdi>)]</bdi>'), ctx), [['<a class="index" href="#index::http://host/(&lt;bdi&gt;)">http://host/<span class="paren">(<span class="invalid">&lt;bdi&gt;</span>)</span></a>', '</bdi', '>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#@a/http://host/(<bdi>)]</bdi>'), ctx), [['<a class="index" href="#index::@a/http://host/(&lt;bdi&gt;)">@a/http://host/<span class="paren">(<span class="invalid">&lt;bdi&gt;</span>)</span></a>', '</bdi', '>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a|<bdi>]</bdi>'), ctx), [['<a class="index" href="#index::a|&lt;bdi&gt;">a|<span class="invalid">&lt;bdi&gt;</span></a>', '</bdi', '>'], '']);
       assert.deepStrictEqual(inspect(parser('[[#a|<bdi>]</bdi>'), ctx), [['[', '<a class="index" href="#index::a|&lt;bdi&gt;">a|<span class="invalid">&lt;bdi&gt;</span></a>', '</bdi', '>'], '']);
     });
 
     it('uri', () => {
       assert.deepStrictEqual(inspect(parser('\nhttp://host'), ctx), [['<br>', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('0http://host'), ctx), [['0http:', '//host'], '']);
-      assert.deepStrictEqual(inspect(parser('0aAhttp://host'), ctx), [['0aAhttp:', '//host'], '']);
+      assert.deepStrictEqual(inspect(parser('0http://host'), ctx), [['0http', '://host'], '']);
+      assert.deepStrictEqual(inspect(parser('0aAhttp://host'), ctx), [['0aAhttp', '://host'], '']);
       assert.deepStrictEqual(inspect(parser('?http://host'), ctx), [['?', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
       assert.deepStrictEqual(inspect(parser('0!http://host'), ctx), [['0', '!', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('0?http://host'), ctx), [['0', '?', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('0?http://host'), ctx), [['0?', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
       assert.deepStrictEqual(inspect(parser('_http://host'), ctx), [['_', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
       assert.deepStrictEqual(inspect(parser('_http://host_'), ctx), [['_', '<a class="url" href="http://host" target="_blank">http://host</a>', '_'], '']);
       assert.deepStrictEqual(inspect(parser('*http://host*'), ctx), [['<em><a class="url" href="http://host" target="_blank">http://host</a></em>'], '']);
@@ -210,7 +210,7 @@ describe('Unit: parser/inline', () => {
 
     it('account', () => {
       assert.deepStrictEqual(inspect(parser('@a'), ctx), [['<a class="account" href="/@a">@a</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('@http://host'), ctx), [['@http', '://host'], '']);
+      assert.deepStrictEqual(inspect(parser('@http://host'), ctx), [['@', 'http', '://host'], '']);
       assert.deepStrictEqual(inspect(parser('_@a'), ctx), [['_', '<a class="account" href="/@a">@a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('_@a_'), ctx), [['_', '<a class="account" href="/@a">@a</a>', '_'], '']);
       assert.deepStrictEqual(inspect(parser('*@a*'), ctx), [['<em><a class="account" href="/@a">@a</a></em>'], '']);
@@ -222,9 +222,9 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('#a#'), ctx), [['#a', '#'], '']);
       assert.deepStrictEqual(inspect(parser('#a#b'), ctx), [['#a', '#b'], '']);
       assert.deepStrictEqual(inspect(parser('#a'), ctx), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('#http://host'), ctx), [['#http', '://host'], '']);
+      assert.deepStrictEqual(inspect(parser('#http://host'), ctx), [['#', 'http', '://host'], '']);
       assert.deepStrictEqual(inspect(parser('#a\nb\n#c\n[#d]'), ctx), [['<a class="hashtag" href="/hashtags/a">#a</a>', '<br>', 'b', '<br>', '<a class="hashtag" href="/hashtags/c">#c</a>', '<br>', '<a class="index" href="#index::d">d</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('##a'), ctx), [['##a'], '']);
+      assert.deepStrictEqual(inspect(parser('##a'), ctx), [['#', '<a class="hashtag" href="/hashtags/a">#a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('_#a'), ctx), [['_', '<a class="hashtag" href="/hashtags/a">#a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('_#a_'), ctx), [['_', '<a class="hashtag" href="/hashtags/a">#a</a>', '_'], '']);
       assert.deepStrictEqual(inspect(parser('_#a_b'), ctx), [['_', '<a class="hashtag" href="/hashtags/a_b">#a_b</a>'], '']);
@@ -233,8 +233,8 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('0a#b'), ctx), [['0a', '#b'], '']);
       assert.deepStrictEqual(inspect(parser('あ#b'), ctx), [['あ', '#b'], '']);
       assert.deepStrictEqual(inspect(parser('あい#b'), ctx), [['あい', '#b'], '']);
-      assert.deepStrictEqual(inspect(parser('0aあ#b'), ctx), [['0a', 'あ', '#b'], '']);
-      assert.deepStrictEqual(inspect(parser('0aあい#b'), ctx), [['0a', 'あい', '#b'], '']);
+      assert.deepStrictEqual(inspect(parser('0aあ#b'), ctx), [['0aあ', '#b'], '']);
+      assert.deepStrictEqual(inspect(parser('0aあい#b'), ctx), [['0aあい', '#b'], '']);
       assert.deepStrictEqual(inspect(parser('「#あ」'), ctx), [['「', '<a class="hashtag" href="/hashtags/あ">#あ</a>', '」'], '']);
       assert.deepStrictEqual(inspect(parser('a\n#b'), ctx), [['a', '<br>', '<a class="hashtag" href="/hashtags/b">#b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('a\\\n#b'), ctx), [['a', '<br>', '<a class="hashtag" href="/hashtags/b">#b</a>'], '']);
@@ -248,7 +248,7 @@ describe('Unit: parser/inline', () => {
     it('hashnum', () => {
       assert.deepStrictEqual(inspect(parser('#1'), ctx), [['<a class="hashnum">#1</a>'], '']);
       assert.deepStrictEqual(inspect(parser(`#1'`), ctx), [[`<a class="hashnum">#1</a>`, `'`], '']);
-      assert.deepStrictEqual(inspect(parser('#1234567890@a'), ctx), [['#1234567890', '@a'], '']);
+      assert.deepStrictEqual(inspect(parser('#1234567890@a'), ctx), [['#', '1234567890', '@a'], '']);
       assert.deepStrictEqual(inspect(parser('_#1'), ctx), [['_', '<a class="hashnum">#1</a>'], '']);
       assert.deepStrictEqual(inspect(parser('_#1_'), ctx), [['_', '<a class="hashnum">#1</a>', '_'], '']);
       assert.deepStrictEqual(inspect(parser('_#1_0'), ctx), [['_', '<a class="hashtag" href="/hashtags/1_0">#1_0</a>'], '']);

package/src/parser/visibility.ts

@@ -8,11 +8,11 @@ import { invisibleHTMLEntityNames } from './api/normalize';
 export namespace blank {
   export const line = new RegExp(
     // TODO: 行全体をエスケープ
-    /^(?:[^\S\r\n])*(?!\s)(\\?[^\S\r\n]|&IHN;|<wbr[^\S\n]*>|\\$)+$/mg.source
+    /^(?:[^\S\r\n])*(?!\s)(\\?[^\S\r\n]|&IHN;|<wbr ?>|\\$)+$/mg.source
       .replace('IHN', `(?:${invisibleHTMLEntityNames.join('|')})`),
     'gm');
   export const start = new RegExp(
-    /(?:\\?[^\S\r\n]|&IHN;|<wbr[^\S\n]*>)+/y.source
+    /(?:\\?[^\S\r\n]|&IHN;|<wbr ?>)+/y.source
       .replace('IHN', `(?:${invisibleHTMLEntityNames.join('|')})`), 'y');
 }
 
@@ -46,7 +46,7 @@ export function blankWith(starts: '' | '\n', delimiter: string | RegExp): RegExp
 export function blankWith(starts: '' | '\n', delimiter?: string | RegExp): RegExp {
   if (delimiter === undefined) return blankWith('', starts);
   return new RegExp(String.raw
-    `(?:(?=${starts})(?:\\?\s|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr[^\S\n]*>)${
+    `(?:(?=${starts})(?:\\?\s|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr ?>)${
       // 空行除去
       // 完全な空行はエスケープ済みなので再帰的バックトラックにはならない。
       starts && '+'
@@ -75,7 +75,6 @@ export function tightStart<N>(parser: Parser<N>, except?: string): Parser<N> {
       ? parser(input)
       : undefined;
 }
-const wbr = /<wbr[^\S\n]*>/y;
 function isTightStart(input: Input<MarkdownParser.Context>, except?: string): boolean {
   const { context } = input;
   const { source, position } = context;
@@ -100,11 +99,10 @@ function isTightStart(input: Input<MarkdownParser.Context>, except?: string): bo
       context.position = position;
       return true;
     case '<':
-      wbr.lastIndex = position;
       switch (true) {
         case source.length - position >= 5
           && source.startsWith('<wbr', position)
-          && (source[position + 5] === '>' || wbr.test(source)):
+          && (source[position + 4] === '>' || source.startsWith(' >', position + 4)):
           return false;
       }
       return true;