securemark 0.268.2 → 0.269.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.269.1
+
+- Refactoring.
+
+## 0.269.0
+
+- Change media syntax to line-level syntax.
+
 ## 0.268.2
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.268.2 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.269.1 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"));
@@ -4274,14 +4274,11 @@ exports.parse = parse;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.lineurl = exports.autolink = void 0;
+exports.autolink = void 0;
 const combinator_1 = __webpack_require__(2087);
-const link_1 = __webpack_require__(9628);
 const autolink_1 = __webpack_require__(6051);
 const source_1 = __webpack_require__(6743);
-const util_1 = __webpack_require__(9437);
-exports.autolink = (0, combinator_1.lazy)(() => (0, combinator_1.some)((0, combinator_1.line)((0, combinator_1.subsequence)([exports.lineurl, (0, combinator_1.some)((0, combinator_1.union)([autolink_1.autolink, source_1.linebreak, source_1.unescsource]))]))));
-exports.lineurl = (0, combinator_1.lazy)(() => (0, combinator_1.focus)(/^!?https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/, (0, util_1.format)((0, combinator_1.tails)([(0, source_1.str)('!'), link_1.link]))));
+exports.autolink = (0, combinator_1.lazy)(() => (0, combinator_1.convert)(source => `\r${source}`, (0, combinator_1.some)((0, combinator_1.union)([autolink_1.autolink, source_1.linebreak, source_1.unescsource]))));
 
 /***/ }),
 
@@ -5378,7 +5375,7 @@ const combinator_1 = __webpack_require__(2087);
 const inline_1 = __webpack_require__(1160);
 const visibility_1 = __webpack_require__(7618);
 const dom_1 = __webpack_require__(3252);
-exports.paragraph = (0, combinator_1.block)((0, combinator_1.fmap)((0, visibility_1.visualize)((0, combinator_1.trimEnd)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline])))), ns => [(0, dom_1.html)('p', (0, dom_1.defrag)(ns))]));
+exports.paragraph = (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.convert)(source => `\r${source}`, (0, visibility_1.visualize)((0, combinator_1.trimEnd)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]))))), ns => [(0, dom_1.html)('p', (0, dom_1.defrag)(ns))]));
 
 /***/ }),
 
@@ -5462,7 +5459,6 @@ const combinator_1 = __webpack_require__(2087);
 const math_1 = __webpack_require__(8946);
 const autolink_1 = __webpack_require__(6051);
 const source_1 = __webpack_require__(6743);
-const autolink_2 = __webpack_require__(7185);
 const dom_1 = __webpack_require__(3252);
 exports.syntax = /^>+(?=[^\S\n])|^>(?=[^\s>])|^>+(?=[^\s>])(?![0-9a-z]+(?:-[0-9a-z]+)*(?![0-9A-Za-z@#:]))/;
 exports.quote = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(1, false, (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)('>', (0, combinator_1.union)([(0, combinator_1.rewrite)((0, combinator_1.some)((0, combinator_1.validate)(new RegExp(exports.syntax.source.split('|')[0]), source_1.anyline)), qblock), (0, combinator_1.rewrite)((0, combinator_1.validate)(new RegExp(exports.syntax.source.split('|').slice(1).join('|')), source_1.anyline), (0, combinator_1.line)((0, combinator_1.union)([(0, source_1.str)(/^.+/)])))])), ns => [(0, dom_1.html)('span', ns.length > 1 ? {
@@ -5482,7 +5478,7 @@ const qblock = ({
   const quotes = source.match(/^>+[^\S\n]/mg);
   const content = lines.reduce((acc, line, i) => acc + line.slice(quotes[i].length), '');
   const nodes = (0, parser_1.eval)(text({
-    source: content,
+    source: `\r${content}`,
     context
   }), []);
   nodes.unshift(quotes.shift());
@@ -5508,7 +5504,7 @@ const qblock = ({
   nodes.unshift('');
   return [nodes, ''];
 };
-const text = (0, combinator_1.some)((0, combinator_1.line)((0, combinator_1.subsequence)([autolink_2.lineurl, (0, combinator_1.some)((0, combinator_1.union)([math_1.math, autolink_1.autolink, source_1.linebreak, source_1.unescsource]))])));
+const text = (0, combinator_1.some)((0, combinator_1.union)([math_1.math, autolink_1.autolink, source_1.linebreak, source_1.unescsource]));
 
 /***/ }),
 
@@ -5702,7 +5698,7 @@ const shortmedia_1 = __webpack_require__(4189);
 const autolink_1 = __webpack_require__(6051);
 const bracket_1 = __webpack_require__(5196);
 const source_1 = __webpack_require__(6743);
-exports.inline = (0, combinator_1.union)([annotation_1.annotation, reference_1.reference, template_1.template, comment_1.comment, math_1.math, extension_1.extension, ruby_1.ruby, link_1.link, media_1.media, html_1.html, insertion_1.insertion, deletion_1.deletion, mark_1.mark, strong_1.strong, emphasis_1.emphasis, code_1.code, htmlentity_1.htmlentity, shortmedia_1.shortmedia, autolink_1.autolink, bracket_1.bracket, source_1.text]);
+exports.inline = (0, combinator_1.union)([annotation_1.annotation, reference_1.reference, template_1.template, comment_1.comment, math_1.math, extension_1.extension, ruby_1.ruby, link_1.textlink, link_1.linemedialink, media_1.linemedia, html_1.html, insertion_1.insertion, deletion_1.deletion, mark_1.mark, strong_1.strong, emphasis_1.emphasis, code_1.code, htmlentity_1.htmlentity, shortmedia_1.lineshortmedia, autolink_1.autolink, bracket_1.bracket, source_1.text]);
 var indexee_1 = __webpack_require__(1269);
 Object.defineProperty(exports, "indexee", ({
   enumerable: true,
@@ -5776,7 +5772,7 @@ const hashnum_1 = __webpack_require__(5631);
 const anchor_1 = __webpack_require__(6495);
 const source_1 = __webpack_require__(6743);
 const util_1 = __webpack_require__(9437);
-exports.autolink = (0, combinator_1.fmap)((0, combinator_1.validate)(/^(?:[@#>0-9a-z]|\S[#>])/i, (0, combinator_1.constraint)(2 /* State.autolink */, false, (0, combinator_1.syntax)(2 /* Syntax.autolink */, 1, 1, ~1 /* State.shortcut */, (0, combinator_1.some)((0, combinator_1.union)([url_1.url, email_1.email,
+exports.autolink = (0, combinator_1.validate)(/^(?:[@#>0-9a-z\r\n]|\S[#>])/i, (0, combinator_1.constraint)(2 /* State.autolink */, false, (0, combinator_1.syntax)(2 /* Syntax.autolink */, 1, 1, ~1 /* State.shortcut */, (0, combinator_1.union)([(0, combinator_1.some)((0, combinator_1.union)([url_1.lineurl])), (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.union)([url_1.url, email_1.email,
 // Escape unmatched email-like strings.
 (0, combinator_1.focus)(/^[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z])*(?:@(?:[0-9a-z]+(?:[.-][0-9a-z]+)*)?)*/i, ({
   source
@@ -5793,7 +5789,7 @@ exports.autolink = (0, combinator_1.fmap)((0, combinator_1.validate)(/^(?:[@#>0-
 // Escape unmatched hashtag-like strings.
 (0, source_1.str)(new RegExp(/^#+(?:[^\p{C}\p{S}\p{P}\s]|emoji|')*/u.source.replace('emoji', hashtag_1.emoji), 'u')),
 // Escape invalid leading characters.
-(0, source_1.str)(/^[0-9\p{Sc}](?=>)/u), anchor_1.anchor]))))), ns => ns.length === 1 ? ns : [(0, util_1.stringify)(ns)]);
+(0, source_1.str)(/^[0-9\p{Sc}](?=>)/u), anchor_1.anchor])), ns => ns.length === 1 ? ns : [(0, util_1.stringify)(ns)])]))));
 
 /***/ }),
 
@@ -5949,12 +5945,13 @@ exports.hashtag = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combin
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.url = void 0;
+exports.lineurl = exports.url = void 0;
 const combinator_1 = __webpack_require__(2087);
 const link_1 = __webpack_require__(9628);
 const source_1 = __webpack_require__(6743);
 const closer = /^[-+*=~^_,.;:!?]*(?=[\\"`|\[\](){}<>]|$)/;
 exports.url = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['http://', 'https://'], (0, combinator_1.rewrite)((0, combinator_1.open)(/^https?:\/\/(?=[\x21-\x7E])/, (0, combinator_1.focus)(/^[\x21-\x7E]+/, (0, combinator_1.some)((0, combinator_1.union)([bracket, (0, combinator_1.some)(source_1.unescsource, closer)])))), (0, combinator_1.convert)(url => `{ ${url} }`, (0, combinator_1.union)([link_1.unsafelink])))));
+exports.lineurl = (0, combinator_1.open)(source_1.linebreak, (0, combinator_1.tails)([(0, source_1.str)('!'), (0, combinator_1.focus)(/^https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/, (0, combinator_1.convert)(url => `{ ${url} }`, link_1.unsafelink))]));
 const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creation)((0, combinator_1.precedence)(2, (0, combinator_1.union)([(0, combinator_1.surround)('(', (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.unescsource]), ')'), ')', true), (0, combinator_1.surround)('[', (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.unescsource]), ']'), ']', true), (0, combinator_1.surround)('{', (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.unescsource]), '}'), '}', true), (0, combinator_1.surround)('"', (0, combinator_1.precedence)(8, (0, combinator_1.some)(source_1.unescsource, '"')), '"', true)]))));
 
 /***/ }),
@@ -6149,6 +6146,7 @@ function identity(id, text, name = 'index') {
     case 'index':
       return `${name}:${id ?? ''}:${cs.slice(0, 97).join('')}...`;
     case 'mark':
+    case 'note':
       return `${name}:${id ?? ''}:${cs.slice(0, 50).join('')}...${cs.slice(-47).join('')}`;
   }
 }
@@ -6419,7 +6417,7 @@ exports.insertion = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0,
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.resolve = exports.option = exports.uri = exports.unsafelink = exports.link = void 0;
+exports.resolve = exports.option = exports.uri = exports.unsafelink = exports.linemedialink = exports.medialink = exports.textlink = exports.link = void 0;
 const combinator_1 = __webpack_require__(2087);
 const inline_1 = __webpack_require__(1160);
 const html_1 = __webpack_require__(5994);
@@ -6432,11 +6430,12 @@ const optspec = {
   rel: ['nofollow']
 };
 Object.setPrototypeOf(optspec, null);
-exports.link = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['[', '{'], (0, combinator_1.union)([medialink, textlink])));
-const textlink = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(16 /* State.link */, false, (0, combinator_1.syntax)(16 /* Syntax.link */, 2, 10, 502 /* State.linkers */ | 8 /* State.media */, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ']', [[/^\\?\n/, 9], [']', 2]]), ']', true)), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => {
+exports.link = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['[', '{'], (0, combinator_1.union)([exports.medialink, exports.textlink])));
+exports.textlink = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(16 /* State.link */, false, (0, combinator_1.syntax)(16 /* Syntax.link */, 2, 10, 502 /* State.linkers */ | 8 /* State.media */, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ']', [[/^\\?\n/, 9], [']', 2]]), ']', true)), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => {
   return parse(content, params, rest, context);
 }))));
-const medialink = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(16 /* State.link */ | 8 /* State.media */, false, (0, combinator_1.syntax)(16 /* Syntax.link */, 2, 10, 502 /* State.linkers */, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.sequence)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.union)([inline_1.media, inline_1.shortmedia]), ']')), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => parse(content, params, rest, context)))));
+exports.medialink = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(16 /* State.link */ | 8 /* State.media */, false, (0, combinator_1.syntax)(16 /* Syntax.link */, 2, 10, 502 /* State.linkers */, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.sequence)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.union)([inline_1.media, inline_1.shortmedia]), ']')), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => parse(content, params, rest, context)))));
+exports.linemedialink = (0, combinator_1.surround)(source_1.linebreak, (0, combinator_1.union)([exports.medialink]), /^(?=[^\S\n]*(?:$|\n))/);
 exports.unsafelink = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(10, (0, combinator_1.precedence)(2, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.some)((0, combinator_1.union)([source_1.unescsource]), ']'), ']')), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => parse(content, params, rest, context)))));
 exports.uri = (0, combinator_1.union)([(0, combinator_1.open)(/^[^\S\n]+/, (0, source_1.str)(/^\S+/)), (0, source_1.str)(/^[^\s{}]+/)]);
 exports.option = (0, combinator_1.union)([(0, combinator_1.fmap)((0, source_1.str)(/^[^\S\n]+nofollow(?=[^\S\n]|})/), () => [` rel="nofollow"`]), (0, source_1.str)(/^[^\S\n]+[a-z]+(?:-[a-z]+)*(?:="(?:\\[^\n]|[^\\\n"])*")?(?=[^\S\n]|})/), (0, combinator_1.fmap)((0, source_1.str)(/^[^\S\n]+[^\s{}]+/), opt => [` \\${opt.slice(1)}`])]);
@@ -6601,7 +6600,7 @@ const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creation)((0, comb
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.media = void 0;
+exports.linemedia = exports.media = void 0;
 const combinator_1 = __webpack_require__(2087);
 const link_1 = __webpack_require__(9628);
 const html_1 = __webpack_require__(5994);
@@ -6646,6 +6645,7 @@ exports.media = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['![', '
     context
   });
 }))))));
+exports.linemedia = (0, combinator_1.surround)(source_1.linebreak, (0, combinator_1.union)([exports.media]), /^(?=[^\S\n]*(?:$|\n))/);
 const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creation)((0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), ')'), (0, source_1.str)(')'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), ']'), (0, source_1.str)(']'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), '}'), (0, source_1.str)('}'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest]), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.precedence)(8, (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, source_1.txt]), '"')), (0, source_1.str)('"'), true)])));
 const option = (0, combinator_1.union)([(0, combinator_1.fmap)((0, source_1.str)(/^[^\S\n]+[1-9][0-9]*x[1-9][0-9]*(?=[^\S\n]|})/), ([opt]) => [` width="${opt.slice(1).split('x')[0]}"`, ` height="${opt.slice(1).split('x')[1]}"`]), (0, combinator_1.fmap)((0, source_1.str)(/^[^\S\n]+[1-9][0-9]*:[1-9][0-9]*(?=[^\S\n]|})/), ([opt]) => [` aspect-ratio="${opt.slice(1).split(':').join('/')}"`]), link_1.option]);
 function sanitize(target, uri, alt) {
@@ -6825,11 +6825,13 @@ function attributes(texts, rubies) {
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.shortmedia = void 0;
+exports.lineshortmedia = exports.shortmedia = void 0;
 const combinator_1 = __webpack_require__(2087);
 const url_1 = __webpack_require__(4318);
 const media_1 = __webpack_require__(1303);
+const source_1 = __webpack_require__(6743);
 exports.shortmedia = (0, combinator_1.rewrite)((0, combinator_1.constraint)(8 /* State.media */, false, (0, combinator_1.open)('!', url_1.url)), (0, combinator_1.convert)(source => `!{ ${source.slice(1)} }`, (0, combinator_1.union)([media_1.media])));
+exports.lineshortmedia = (0, combinator_1.open)(source_1.linebreak, (0, combinator_1.focus)(/^!https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/, (0, combinator_1.convert)(source => `!{ ${source.slice(1)} }`, (0, combinator_1.union)([media_1.media]))));
 
 /***/ }),
 
@@ -7084,7 +7086,9 @@ function build(syntax, marker, splitter = '_') {
       const ref = refs[i];
       const identifier = ref.getAttribute('data-abbr') || ` ${ref.firstElementChild.innerHTML}`;
       if (titles.has(identifier)) continue;
-      const content = (0, dom_1.frag)(ref.firstElementChild.cloneNode(true).childNodes);
+      const content = (0, dom_1.html)('span', {
+        id: (0, indexee_1.identity)(opts.id, (0, indexee_1.text)(ref.firstElementChild), 'note')
+      }, ref.firstElementChild.cloneNode(true).childNodes);
       const title = (0, indexee_1.text)(content).trim();
       if (!title) continue;
       titles.set(identifier, title);
@@ -7130,7 +7134,6 @@ function build(syntax, marker, splitter = '_') {
         ref.lastChild?.remove();
       }
       const title = titles.get(identifier);
-      const content = (0, dom_1.frag)(ref.firstElementChild.cloneNode(true).childNodes);
       const refIndex = ++count;
       const refId = opts.id !== '' ? `${syntax}:${opts.id ?? ''}:ref:${refIndex}` : undefined;
       const def =  false || defs.get(identifier) || defs.set(identifier, (0, dom_1.html)('li', {
@@ -7156,7 +7159,7 @@ function build(syntax, marker, splitter = '_') {
       }, marker(defIndex, abbr)));
       def.lastChild.appendChild((0, dom_1.html)('a', {
         href: refId && `#${refId}`,
-        title: abbr && (0, indexee_1.text)(content).trim() || undefined
+        title: abbr && (0, indexee_1.text)((0, dom_1.frag)(ref.firstElementChild.cloneNode(true).childNodes)).trim() || undefined
       }, `^${refIndex}`));
     }
     if (defs.size > 0 || footnote) {
@@ -7336,7 +7339,8 @@ const combinator_1 = __webpack_require__(2087);
 const text_1 = __webpack_require__(7763);
 const delimiter = /[\s\x00-\x2F\x3A-\x40\x5B-\x60\x7B-\x7F]/;
 exports.escsource = (0, combinator_1.creation)(1, false, ({
-  source
+  source,
+  context
 }) => {
   if (source === '') return;
   const i = source.search(delimiter);
@@ -7345,6 +7349,9 @@ exports.escsource = (0, combinator_1.creation)(1, false, ({
       return [[source], ''];
     case 0:
       switch (source[0]) {
+        case '\r':
+          context.resources && ++context.resources.clock;
+          return [[], source.slice(1)];
         case '\x1B':
           return [[source.slice(1, 2)], source.slice(2)];
         case '\\':
@@ -7458,6 +7465,9 @@ exports.text = (0, combinator_1.creation)(1, false, ({
       return [[source], ''];
     case 0:
       switch (source[0]) {
+        case '\r':
+          context.resources && ++context.resources.clock;
+          return [[], source.slice(1)];
         case '\x1B':
         case '\\':
           switch (source[1]) {
@@ -7489,7 +7499,7 @@ exports.text = (0, combinator_1.creation)(1, false, ({
   }
 });
 exports.txt = (0, combinator_1.union)([exports.text]);
-exports.linebreak = (0, combinator_1.focus)('\n', (0, combinator_1.union)([exports.text]));
+exports.linebreak = (0, combinator_1.focus)(/^[\r\n]/, (0, combinator_1.union)([exports.text]));
 function isAlphanumeric(char) {
   if (char < '0' || '\x7F' < char) return false;
   return '0' <= char && char <= '9' || 'a' <= char && char <= 'z' || 'A' <= char && char <= 'Z';
@@ -7511,7 +7521,8 @@ exports.unescsource = void 0;
 const combinator_1 = __webpack_require__(2087);
 const text_1 = __webpack_require__(7763);
 exports.unescsource = (0, combinator_1.creation)(1, false, ({
-  source
+  source,
+  context
 }) => {
   if (source === '') return;
   const i = source.search(text_1.delimiter);
@@ -7520,6 +7531,11 @@ exports.unescsource = (0, combinator_1.creation)(1, false, ({
       return [[source], ''];
     case 0:
       {
+        switch (source[0]) {
+          case '\r':
+            context.resources && ++context.resources.clock;
+            return [[], source.slice(1)];
+        }
         const b = source[0] !== '\n' && source[0].trimStart() === '';
         const i = b || (0, text_1.isAlphanumeric)(source[0]) ? source.search(b ? text_1.nonWhitespace : text_1.nonAlphanumeric) || 1 : 1;
         return [[source.slice(0, i - +b || 1)], source.slice(i - +b || 1)];
@@ -7532,7 +7548,7 @@ exports.unescsource = (0, combinator_1.creation)(1, false, ({
 /***/ }),
 
 /***/ 9437:
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
 
@@ -7540,12 +7556,7 @@ exports.unescsource = (0, combinator_1.creation)(1, false, ({
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.stringify = exports.format = void 0;
-const combinator_1 = __webpack_require__(2087);
-function format(parser) {
-  return (0, combinator_1.convert)(source => source.replace(/(?<=^!?)https?:\/\/(?:[[]|[^\p{C}\p{S}\p{P}\s])\S*(?=[^\S\n]*(?:$|\n))/gm, '{ $& }'), parser);
-}
-exports.format = format;
+exports.stringify = void 0;
 function stringify(nodes) {
   let acc = '';
   for (let i = 0; i < nodes.length; ++i) {
@@ -7577,13 +7588,12 @@ const parser_1 = __webpack_require__(6728);
 const combinator_1 = __webpack_require__(2087);
 const htmlentity_1 = __webpack_require__(1562);
 const source_1 = __webpack_require__(6743);
-const util_1 = __webpack_require__(9437);
 const normalize_1 = __webpack_require__(185);
 const memoize_1 = __webpack_require__(1808);
 const array_1 = __webpack_require__(8112);
 function visualize(parser) {
   const blankline = new RegExp(/^(?:\\$|\\?[^\S\n]|&IHN;|<wbr[^\S\n]*>)+$/.source.replace('IHN', `(?:${normalize_1.invisibleHTMLEntityNames.join('|')})`), 'gm');
-  return (0, combinator_1.union)([(0, combinator_1.convert)(source => source.replace(blankline, line => line.replace(/[\\&<]/g, '\x1B$&')), (0, combinator_1.verify)((0, util_1.format)(parser), (ns, rest, context) => !rest && hasVisible(ns, context))), (0, combinator_1.some)((0, combinator_1.union)([source_1.linebreak, source_1.unescsource]))]);
+  return (0, combinator_1.union)([(0, combinator_1.convert)(source => source.replace(blankline, line => line.replace(/[\\&<]/g, '\x1B$&')), (0, combinator_1.verify)(parser, (ns, rest, context) => !rest && hasVisible(ns, context))), (0, combinator_1.some)((0, combinator_1.union)([source_1.linebreak, source_1.unescsource]))]);
 }
 exports.visualize = visualize;
 function hasVisible(nodes, {

package/markdown.d.ts

@@ -346,7 +346,7 @@ export namespace MarkdownParser {
               BlockquoteParser,
               PlaceholderParser,
               InlineParser.MediaParser,
-              InlineParser.ShortmediaParser,
+              InlineParser.ShortMediaParser,
             ]>,
             SourceParser.EmptyLineParser,
             InlineParser,
@@ -598,13 +598,10 @@ export namespace MarkdownParser {
         export interface TextParser extends
           Block<'reply/quote/text'>,
           Parser<string | HTMLElement, Context, [
-            AutolinkParser.LineUrlParser,
-            Parser<string | HTMLElement, Context, [
-              InlineParser.MathParser,
-              InlineParser.AutolinkParser,
-              SourceParser.LinebreakParser,
-              SourceParser.UnescapableSourceParser,
-            ]>,
+            InlineParser.MathParser,
+            InlineParser.AutolinkParser,
+            SourceParser.LinebreakParser,
+            SourceParser.UnescapableSourceParser,
           ]> {
         }
         export interface PlaceholderParser extends
@@ -633,8 +630,9 @@ export namespace MarkdownParser {
       InlineParser.MathParser,
       InlineParser.ExtensionParser,
       InlineParser.RubyParser,
-      InlineParser.LinkParser,
-      InlineParser.MediaParser,
+      InlineParser.LinkParser.TextLinkParser,
+      InlineParser.LinkParser.LineMediaLinkParser,
+      InlineParser.MediaParser.LineMediaParser,
       InlineParser.HTMLParser,
       InlineParser.InsertionParser,
       InlineParser.DeletionParser,
@@ -643,7 +641,7 @@ export namespace MarkdownParser {
       InlineParser.EmphasisParser,
       InlineParser.CodeParser,
       InlineParser.HTMLEntityParser,
-      InlineParser.ShortmediaParser,
+      InlineParser.ShortMediaParser.LineShortMediaParser,
       InlineParser.AutolinkParser,
       InlineParser.BracketParser,
       SourceParser.TextParser,
@@ -842,6 +840,12 @@ export namespace MarkdownParser {
       ]> {
     }
     export namespace LinkParser {
+      export interface LineMediaLinkParser extends
+        Inline<'link/linemedialink'>,
+        Parser<HTMLElement, Context, [
+          LinkParser.MediaLinkParser,
+        ]> {
+      }
       export interface TextLinkParser extends
         Inline<'link/textlink'>,
         Parser<HTMLAnchorElement, Context, [
@@ -856,7 +860,7 @@ export namespace MarkdownParser {
         Parser<HTMLAnchorElement, Context, [
           Parser<HTMLElement[], Context, [
             MediaParser,
-            ShortmediaParser,
+            ShortMediaParser,
           ]>,
           LinkParser.ParameterParser,
         ]> {
@@ -872,7 +876,7 @@ export namespace MarkdownParser {
         Inline<'link/content'>,
         Parser<(HTMLElement | string)[], Context, [
           MediaParser,
-          ShortmediaParser,
+          ShortMediaParser,
           InlineParser,
         ]> {
       }
@@ -917,6 +921,12 @@ export namespace MarkdownParser {
       ]> {
     }
     export namespace MediaParser {
+      export interface LineMediaParser extends
+        Inline<'media/linemedia'>,
+        Parser<HTMLElement, Context, [
+          MediaParser,
+        ]> {
+      }
       export interface TextParser extends
         Inline<'media/text'>,
         Parser<string[], Context, [
@@ -1060,28 +1070,41 @@ export namespace MarkdownParser {
       Inline<'unsafehtmlentity'>,
       Parser<string, Context, []> {
     }
-    export interface ShortmediaParser extends
+    export interface ShortMediaParser extends
       // !https://host
       Inline<'shortmedia'>,
       Parser<HTMLElement, Context, [
         MediaParser,
       ]> {
     }
+    export namespace ShortMediaParser {
+      export interface LineShortMediaParser extends
+        Inline<'shortmedia/lineshortmedia'>,
+        Parser<HTMLElement, Context, [
+          MediaParser,
+        ]> {
+      }
+    }
     export interface AutolinkParser extends
       Inline<'autolink'>,
       Parser<HTMLElement | string, Context, [
-        AutolinkParser.UrlParser,
-        AutolinkParser.EmailParser,
-        SourceParser.StrParser,
-        AutolinkParser.ChannelParser,
-        AutolinkParser.AccountParser,
-        SourceParser.StrParser,
-        SourceParser.StrParser,
-        AutolinkParser.HashtagParser,
-        AutolinkParser.HashnumParser,
-        SourceParser.StrParser,
-        SourceParser.StrParser,
-        AutolinkParser.AnchorParser,
+        Parser<HTMLElement | string, Context, [
+          AutolinkParser.UrlParser.LineUrlParser,
+        ]>,
+        Parser<HTMLElement | string, Context, [
+          AutolinkParser.UrlParser,
+          AutolinkParser.EmailParser,
+          SourceParser.StrParser,
+          AutolinkParser.ChannelParser,
+          AutolinkParser.AccountParser,
+          SourceParser.StrParser,
+          SourceParser.StrParser,
+          AutolinkParser.HashtagParser,
+          AutolinkParser.HashnumParser,
+          SourceParser.StrParser,
+          SourceParser.StrParser,
+          AutolinkParser.AnchorParser,
+        ]>,
       ]> {
     }
     export namespace AutolinkParser {
@@ -1093,6 +1116,13 @@ export namespace MarkdownParser {
         ]> {
       }
       export namespace UrlParser {
+        export interface LineUrlParser extends
+          Inline<'url/lineurl'>,
+          Parser<string | HTMLElement, Context, [
+            SourceParser.StrParser,
+            InlineParser.LinkParser.UnsafeLinkParser,
+          ]> {
+        }
         export interface BracketParser extends
           Inline<'url/bracket'>,
           Parser<string, Context, [
@@ -1176,23 +1206,11 @@ export namespace MarkdownParser {
   export interface AutolinkParser extends
     Markdown<'autolink'>,
     Parser<string | HTMLElement, Context, [
-      AutolinkParser.LineUrlParser,
-      Parser<string | HTMLElement, Context, [
-        InlineParser.AutolinkParser,
-        SourceParser.LinebreakParser,
-        SourceParser.UnescapableSourceParser,
-      ]>,
+      InlineParser.AutolinkParser,
+      SourceParser.LinebreakParser,
+      SourceParser.UnescapableSourceParser,
     ]> {
   }
-  export namespace AutolinkParser {
-    export interface LineUrlParser extends
-      Markdown<'autolink/lineurl'>,
-      Parser<string | HTMLElement, Context, [
-        SourceParser.StrParser,
-        InlineParser.LinkParser,
-      ]> {
-    }
-  }
   export namespace SourceParser {
     interface Source<T extends string> extends Markdown<`source/${T}`> { }
     export interface TextParser extends

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.268.2",
+  "version": "0.269.1",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",
@@ -28,17 +28,17 @@
     "LICENSE"
   ],
   "devDependencies": {
-    "@types/dompurify": "2.4.0",
+    "@types/dompurify": "3.0.0",
     "@types/jquery": "3.5.16",
     "@types/mathjax": "0.0.37",
     "@types/mocha": "10.0.1",
     "@types/power-assert": "1.5.8",
     "@types/prismjs": "1.26.0",
-    "@typescript-eslint/parser": "^5.54.0",
+    "@typescript-eslint/parser": "^5.55.0",
     "babel-loader": "^9.1.2",
     "babel-plugin-unassert": "^3.2.0",
     "concurrently": "^7.6.0",
-    "eslint": "^8.35.0",
+    "eslint": "^8.36.0",
     "eslint-plugin-redos": "^4.4.5",
     "eslint-webpack-plugin": "^4.0.0",
     "glob": "^8.1.0",
@@ -49,13 +49,13 @@
     "karma-mocha": "^2.0.1",
     "karma-power-assert": "^1.0.0",
     "mocha": "^10.2.0",
-    "npm-check-updates": "^16.7.10",
+    "npm-check-updates": "^16.7.12",
     "semver": "^7.3.8",
     "spica": "0.0.719",
     "ts-loader": "^9.4.2",
     "typed-dom": "^0.0.317",
     "typescript": "4.9.5",
-    "webpack": "^5.75.0",
+    "webpack": "^5.76.1",
     "webpack-cli": "^5.0.1",
     "webpack-merge": "^5.8.0"
   },

package/src/parser/api/bind.test.ts

@@ -214,15 +214,15 @@ describe('Unit: parser/api/bind', () => {
         cfgs.footnotes.references?.outerHTML,
         html('ol', [
           html('li', { id: 'reference::def:1' }, [
-            '1',
+            html('span', { id: 'note::1' }, '1'),
             html('sup', [html('a', { href: '#reference::ref:1' }, '^1')]),
           ]),
           html('li', { id: 'reference::def:2' }, [
-            '2',
+            html('span', { id: 'note::2' }, '2'),
             html('sup', [html('a', { href: '#reference::ref:2' }, '^2')]),
           ]),
           html('li', { id: 'reference::def:3' }, [
-            '3',
+            html('span', { id: 'note::3' }, '3'),
             html('sup', [html('a', { href: '#reference::ref:3' }, '^3')]),
           ]),
         ]).outerHTML);

package/src/parser/api/parse.test.ts

@@ -135,7 +135,7 @@ describe('Unit: parser/api/parse', () => {
           '<p><a href="https://source/x/a" target="_blank"><img class="media" data-src="https://source/x/a" alt=""></a></p>',
           '<p><a href="/z/a" target="_blank"><img class="media" data-src="/z/a" alt=""></a></p>',
           '<p><a href="https://source/a" target="_blank"><img class="media" data-src="https://source/a" alt=""></a></p>',
-          '<ol class="annotations"><li id="annotation::def:1" data-marker="*1">a<sup><a href="#annotation::ref:1">^1</a></sup></li></ol>',
+          '<ol class="annotations"><li id="annotation::def:1" data-marker="*1"><span id="note::a">a</span><sup><a href="#annotation::ref:1">^1</a></sup></li></ol>',
         ]);
       assert.deepStrictEqual(
         [...parse([
@@ -208,11 +208,11 @@ describe('Unit: parser/api/parse', () => {
         [
           '<figure data-type="math" data-label="$-a" data-group="$" data-number="1" id="label:$-a"><figcaption><span class="figindex">(1)</span><span class="figtext"></span></figcaption><div><div class="math" translate="no">$$\n$$</div></div></figure>',
           '<p><sup class="annotation" id="annotation::ref:1" title="(1)"><span hidden=""><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" id="reference::ref:1" title="b"><span hidden="">b</span><a href="#reference::def:1">[1]</a></sup><sup class="reference" id="reference::ref:2" title="cd"><span hidden="">c<em>d</em></span><a href="#reference::def:2">[2]</a></sup></span><a href="#annotation::def:1">*1</a></sup></p>',
-          '<ol class="annotations"><li id="annotation::def:1" data-marker="*1"><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" id="reference::ref:1" title="b"><span hidden="">b</span><a href="#reference::def:1">[1]</a></sup><sup class="reference" id="reference::ref:2" title="cd"><span hidden="">c<em>d</em></span><a href="#reference::def:2">[2]</a></sup><sup><a href="#annotation::ref:1">^1</a></sup></li></ol>',
+          '<ol class="annotations"><li id="annotation::def:1" data-marker="*1"><span id="note::(1)"><a class="label" data-label="$-a" href="#label:$-a">(1)</a><sup class="reference" id="reference::ref:1" title="b"><span hidden="">b</span><a href="#reference::def:1">[1]</a></sup><sup class="reference" id="reference::ref:2" title="cd"><span hidden="">c<em>d</em></span><a href="#reference::def:2">[2]</a></sup></span><sup><a href="#annotation::ref:1">^1</a></sup></li></ol>',
         ]);
       assert.deepStrictEqual(
         footnotes.references.outerHTML,
-        '<ol><li id="reference::def:1">b<sup><a href="#reference::ref:1">^1</a></sup></li><li id="reference::def:2">c<em>d</em><sup><a href="#reference::ref:2">^2</a></sup></li></ol>');
+        '<ol><li id="reference::def:1"><span id="note::b">b</span><sup><a href="#reference::ref:1">^1</a></sup></li><li id="reference::def:2"><span id="note::cd">c<em>d</em></span><sup><a href="#reference::ref:2">^2</a></sup></li></ol>');
     });
 
     it('normalize', () => {

package/src/parser/autolink.test.ts

@@ -6,8 +6,8 @@ describe('Unit: parser/autolink', () => {
     const parser = (source: string) => autolink({ source, context: {} });
 
     it('basic', () => {
-      assert.deepStrictEqual(inspect(parser(' http://host')), [[' ', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('!http://host')), [['!', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('http://host#\\')), [['<a class="url" href="http://host#\\" target="_blank">http://host#\\</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('!http://host#\\')), [['!', '<a class="url" href="http://host#\\" target="_blank">http://host#\\</a>'], '']);
       assert.deepStrictEqual(inspect(parser('#a')), [['<a class="hashtag" href="/hashtags/a">#a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('@a#b')), [['<a class="channel" href="/@a?ch=b">@a#b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('\\\n')), [['\\', '<br>'], '']);

package/src/parser/autolink.ts

@@ -1,21 +1,14 @@
 import { MarkdownParser } from '../../markdown';
-import { union, tails, subsequence, some, line, focus, lazy } from '../combinator';
-import { link } from './inline/link';
+import { union, some, convert, lazy } from '../combinator';
 import { autolink as autolink_ } from './inline/autolink';
-import { linebreak, unescsource, str } from './source';
-import { format } from './util';
+import { linebreak, unescsource } from './source';
 
 export import AutolinkParser = MarkdownParser.AutolinkParser;
 
-export const autolink: AutolinkParser = lazy(() => some(line(subsequence([
-  lineurl,
+export const autolink: AutolinkParser = lazy(() =>
+  convert(source => `\r${source}`,
   some(union([
     autolink_,
     linebreak,
     unescsource,
-  ])),
-]))));
-
-export const lineurl: AutolinkParser.LineUrlParser = lazy(() => focus(
-  /^!?https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/,
-  format(tails([str('!'), link]))));
+  ]))));