securemark 0.266.0 → 0.268.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.268.0
+
+- Add lineurl syntax.
+
+## 0.267.0
+
+- Change horizontalrule syntax to pagebreak syntax.
+
 ## 0.266.0
 
 - Change index schemas.

package/README.md

@@ -50,7 +50,7 @@ https://falsandtru.github.io/securemark/
 - Table (| |)
 - Blockquote (>, !>)
 - Preformattedtext (```)
-- HorizontalRule (---)
+- Pagebreak (===)
 - Inline markups (_, *, `, []{}, {}, ![]{}, !{}, \[](), ++, ~~, (()), ...)
 - Inline HTML tags (\<bdi>, \<bdo>)
 - Autolink (https://host, user@host, @user)

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.266.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.268.0 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"));
@@ -2653,7 +2653,7 @@ function block(parser, separation = true) {
     });
     if (result === undefined) return;
     const rest = (0, parser_1.exec)(result);
-    if (separation && !(0, line_1.isEmpty)((0, line_1.firstline)(rest))) return;
+    if (separation && !(0, line_1.isBlank)((0, line_1.firstline)(rest))) return;
     return rest === '' || source[source.length - rest.length - 1] === '\n' ? result : undefined;
   };
 }
@@ -2721,7 +2721,7 @@ exports.verify = verify;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.isEmpty = exports.firstline = exports.line = void 0;
+exports.isBlank = exports.firstline = exports.line = void 0;
 const parser_1 = __webpack_require__(6728);
 const memo_1 = __webpack_require__(1090);
 function line(parser) {
@@ -2740,7 +2740,7 @@ function line(parser) {
     });
     context.offset -= source.length - line.length;
     if (result === undefined) return;
-    return isEmpty((0, parser_1.exec)(result)) ? [(0, parser_1.eval)(result), source.slice(line.length)] : undefined;
+    return isBlank((0, parser_1.exec)(result)) ? [(0, parser_1.eval)(result), source.slice(line.length)] : undefined;
   };
 }
 exports.line = line;
@@ -2756,10 +2756,10 @@ function firstline(source) {
   }
 }
 exports.firstline = firstline;
-function isEmpty(line) {
+function isBlank(line) {
   return line === '' || line === '\n' || line.trimStart() === '';
 }
-exports.isEmpty = isEmpty;
+exports.isBlank = isBlank;
 
 /***/ }),
 
@@ -2855,20 +2855,20 @@ function fence(opener, limit, separation = true) {
     if (matches[0].indexOf(delim, delim.length) !== -1) return;
     let rest = source.slice(matches[0].length);
     // Prevent annoying parsing in editing.
-    if ((0, line_1.isEmpty)((0, line_1.firstline)(rest)) && (0, line_1.firstline)(rest.slice((0, line_1.firstline)(rest).length)).trimEnd() !== delim) return;
+    if ((0, line_1.isBlank)((0, line_1.firstline)(rest)) && (0, line_1.firstline)(rest.slice((0, line_1.firstline)(rest).length)).trimEnd() !== delim) return;
     let block = '';
     let closer = '';
     let overflow = '';
     for (let count = 1;; ++count) {
       if (rest === '') break;
       const line = (0, line_1.firstline)(rest);
-      if ((closer || count > limit + 1) && (0, line_1.isEmpty)(line)) break;
+      if ((closer || count > limit + 1) && (0, line_1.isBlank)(line)) break;
       if (closer) {
         overflow += line;
       }
       if (!closer && count <= limit + 1 && line.slice(0, delim.length) === delim && line.trimEnd() === delim) {
         closer = line;
-        if ((0, line_1.isEmpty)((0, line_1.firstline)(rest.slice(line.length)))) {
+        if ((0, line_1.isBlank)((0, line_1.firstline)(rest.slice(line.length)))) {
           rest = rest.slice(line.length);
           break;
         }
@@ -3908,7 +3908,7 @@ function bind(target, settings) {
     })
   };
 
-  if (context.id?.includes(':')) throw new Error('ID must not contain ":"');
+  if (context.id?.match(/[^0-9a-z/-]/i)) throw new Error('Invalid ID: ID must be alphanumeric');
   if (context.host?.origin === 'null') throw new Error(`Invalid host: ${context.host.href}`);
   const blocks = [];
   const adds = [];
@@ -4226,7 +4226,6 @@ const url_1 = __webpack_require__(2261);
 const dom_1 = __webpack_require__(3252);
 function parse(source, opts = {}, context) {
   if (!(0, segment_1.validate)(source, segment_1.MAX_SEGMENT_SIZE)) throw new Error(`Too large input over ${segment_1.MAX_SEGMENT_SIZE.toLocaleString('en')} bytes`);
-  if (context?.id?.includes(':')) throw new Error('ID must not contain ":"');
   const url = (0, header_2.headers)(source).find(field => field.toLowerCase().startsWith('url:'))?.slice(4).trim() ?? '';
   source = !context ? (0, normalize_1.normalize)(source) : source;
   context = {
@@ -4242,6 +4241,7 @@ function parse(source, opts = {}, context) {
     })
   };
 
+  if (context.id?.match(/[^0-9a-z/-]/i)) throw new Error('Invalid ID: ID must be alphanumeric');
   if (context.host?.origin === 'null') throw new Error(`Invalid host: ${context.host.href}`);
   const node = (0, dom_1.frag)();
   let index = 0;
@@ -4274,31 +4274,14 @@ exports.parse = parse;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.autolink = void 0;
+exports.lineurl = 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 delimiter = /[@#>0-9A-Za-z\n]|\S[#>]/;
-const autolink = ({
-  source,
-  context
-}) => {
-  if (source === '') return;
-  const i = source.search(delimiter);
-  switch (i) {
-    case -1:
-      return [[source], ''];
-    case 0:
-      return parser({
-        source,
-        context
-      });
-    default:
-      return [[source.slice(0, i)], source.slice(i)];
-  }
-};
-exports.autolink = autolink;
-const parser = (0, combinator_1.lazy)(() => (0, combinator_1.union)([autolink_1.autolink, source_1.linebreak, source_1.unescsource]));
+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]))));
 
 /***/ }),
 
@@ -4314,7 +4297,7 @@ Object.defineProperty(exports, "__esModule", ({
 exports.block = void 0;
 const combinator_1 = __webpack_require__(2087);
 const source_1 = __webpack_require__(6743);
-const horizontalrule_1 = __webpack_require__(9967);
+const pagebreak_1 = __webpack_require__(4107);
 const heading_1 = __webpack_require__(4623);
 const ulist_1 = __webpack_require__(5425);
 const olist_1 = __webpack_require__(7471);
@@ -4335,7 +4318,7 @@ exports.block = (0, combinator_1.creation)(1, false, error((0, combinator_1.rese
     clock: 50 * 1000,
     recursion: 20
   }
-}, (0, combinator_1.union)([source_1.emptyline, horizontalrule_1.horizontalrule, heading_1.heading, ulist_1.ulist, olist_1.olist, ilist_1.ilist, dlist_1.dlist, table_1.table, codeblock_1.codeblock, mathblock_1.mathblock, extension_1.extension, sidefence_1.sidefence, blockquote_1.blockquote, reply_1.reply, paragraph_1.paragraph]))));
+}, (0, combinator_1.union)([source_1.emptyline, pagebreak_1.pagebreak, heading_1.heading, ulist_1.ulist, olist_1.olist, ilist_1.ilist, dlist_1.dlist, table_1.table, codeblock_1.codeblock, mathblock_1.mathblock, extension_1.extension, sidefence_1.sidefence, blockquote_1.blockquote, reply_1.reply, paragraph_1.paragraph]))));
 function error(parser) {
   return (0, combinator_1.recover)((0, combinator_1.fallback)((0, combinator_1.open)('\x07', ({
     source
@@ -4377,7 +4360,7 @@ exports.blockquote = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, co
 const opener = /^(?=>>+(?:$|\s))/;
 const indent = (0, combinator_1.block)((0, combinator_1.open)(opener, (0, combinator_1.some)(source_1.contentline, /^>(?:$|\s)/)), false);
 const unindent = source => source.replace(/(?<=^|\n)>(?:[^\S\n]|(?=>*(?:$|\s)))|\n$/g, '');
-const source = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.creation)(1, false, (0, combinator_1.union)([(0, combinator_1.rewrite)(indent, (0, combinator_1.convert)(unindent, source)), (0, combinator_1.rewrite)((0, combinator_1.some)(source_1.contentline, opener), (0, combinator_1.convert)(unindent, (0, combinator_1.fmap)((0, combinator_1.some)(autolink_1.autolink), ns => [(0, dom_1.html)('pre', (0, dom_1.defrag)(ns))])))]))), ns => [(0, dom_1.html)('blockquote', ns)]));
+const source = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.creation)(1, false, (0, combinator_1.union)([(0, combinator_1.rewrite)(indent, (0, combinator_1.convert)(unindent, source)), (0, combinator_1.rewrite)((0, combinator_1.some)(source_1.contentline, opener), (0, combinator_1.convert)(unindent, (0, combinator_1.fmap)(autolink_1.autolink, ns => [(0, dom_1.html)('pre', (0, dom_1.defrag)(ns))])))]))), ns => [(0, dom_1.html)('blockquote', ns)]));
 const markdown = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.creation)(1, false, (0, combinator_1.union)([(0, combinator_1.rewrite)(indent, (0, combinator_1.convert)(unindent, markdown)), (0, combinator_1.creation)(99, false, (0, combinator_1.rewrite)((0, combinator_1.some)(source_1.contentline, opener), (0, combinator_1.convert)(unindent, ({
   source,
   context
@@ -4450,7 +4433,7 @@ exports.codeblock = (0, combinator_1.block)((0, combinator_1.validate)('```', (0
     'data-lang': params.lang || undefined,
     'data-line': params.line || undefined,
     'data-path': params.path || undefined
-  }, params.lang ? context.caches?.code?.get(`${params.lang ?? ''}\n${body.slice(0, -1)}`)?.cloneNode(true).childNodes || body.slice(0, -1) || undefined : (0, dom_1.defrag)((0, parser_1.eval)((0, combinator_1.some)(autolink_1.autolink)({
+  }, params.lang ? context.caches?.code?.get(`${params.lang ?? ''}\n${body.slice(0, -1)}`)?.cloneNode(true).childNodes || body.slice(0, -1) || undefined : (0, dom_1.defrag)((0, parser_1.eval)((0, autolink_1.autolink)({
     source: body.slice(0, -1),
     context
   }), [])));
@@ -5168,22 +5151,6 @@ exports.heading = (0, combinator_1.block)((0, combinator_1.rewrite)(exports.segm
 
 /***/ }),
 
-/***/ 9967:
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports.horizontalrule = void 0;
-const combinator_1 = __webpack_require__(2087);
-const dom_1 = __webpack_require__(3252);
-exports.horizontalrule = (0, combinator_1.block)((0, combinator_1.line)((0, combinator_1.focus)(/^-{3,}[^\S\n]*(?:$|\n)/, () => [[(0, dom_1.html)('hr')], ''])));
-
-/***/ }),
-
 /***/ 238:
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
@@ -5268,7 +5235,7 @@ const openers = {
 };
 exports.olist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.validate)(new RegExp([/^([0-9]+|[a-z]+|[A-Z]+)(?:-[0-9]+)*\.(?=[^\S\n]|\n[^\S\n]*\S)/.source, /^\(([0-9]+|[a-z]+)\)(?:-[0-9]+)*(?=[^\S\n]|\n[^\S\n]*\S)/.source].join('|')), (0, combinator_1.state)(8 /* State.media */, exports.olist_))));
 exports.olist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.union)([(0, combinator_1.match)(openers['.'], (0, memoize_1.memoize)(ms => list(type(ms[1]), '.'), ms => type(ms[1]).charCodeAt(0) || 0, [])), (0, combinator_1.match)(openers['('], (0, memoize_1.memoize)(ms => list(type(ms[1]), '('), ms => type(ms[1]).charCodeAt(0) || 0, []))])));
-const list = (type, form) => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.creation)(1, false, (0, combinator_1.union)([(0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([(0, combinator_1.line)((0, combinator_1.open)(heads[form], (0, combinator_1.subsequence)([ulist_1.checkbox, (0, visibility_1.trimBlank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline])))]), true)), (0, combinator_1.indent)((0, combinator_1.union)([ulist_1.ulist_, exports.olist_, ilist_1.ilist_]))]), exports.invalid), ns => [(0, dom_1.html)('li', {
+const list = (type, form) => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.creation)(1, false, (0, combinator_1.union)([(0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([(0, combinator_1.line)((0, combinator_1.open)(heads[form], (0, combinator_1.subsequence)([ulist_1.checkbox, (0, visibility_1.trimBlank)((0, visibility_1.visualize)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline]))))]), true)), (0, combinator_1.indent)((0, combinator_1.union)([ulist_1.ulist_, exports.olist_, ilist_1.ilist_]))]), exports.invalid), ns => [(0, dom_1.html)('li', {
   'data-marker': ns[0] || undefined
 }, (0, dom_1.defrag)((0, ulist_1.fillFirstLine)((0, array_1.shift)(ns)[1])))]), true)]))), es => [format((0, dom_1.html)('ol', es), type, form)]);
 const heads = {
@@ -5356,6 +5323,22 @@ function format(el, type, form) {
 
 /***/ }),
 
+/***/ 4107:
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.pagebreak = void 0;
+const combinator_1 = __webpack_require__(2087);
+const dom_1 = __webpack_require__(3252);
+exports.pagebreak = (0, combinator_1.block)((0, combinator_1.line)((0, combinator_1.focus)(/^={3,}[^\S\n]*(?:$|\n)/, () => [[(0, dom_1.html)('hr')], ''])));
+
+/***/ }),
+
 /***/ 6457:
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
@@ -5425,9 +5408,7 @@ exports.cite = (0, combinator_1.creation)(1, false, (0, combinator_1.line)((0, c
   source
 }) => [[(0, dom_1.html)('a', {
   class: 'anchor'
-}, source)], '']),
-// Support all domains, but don't support IP(v6) addresses.
-(0, combinator_1.focus)(/^>>https?:\/\/[^\p{C}\p{S}\p{P}\s]\S*(?=\s*$)/u, ({
+}, source)], '']), (0, combinator_1.focus)(/^>>https?:\/\/(?:[[]|[^\p{C}\p{S}\p{P}\s])\S*(?=\s*$)/u, ({
   source
 }) => [[(0, dom_1.html)('a', {
   class: 'anchor',
@@ -5454,8 +5435,9 @@ exports.quote = exports.syntax = void 0;
 const parser_1 = __webpack_require__(6728);
 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_1 = __webpack_require__(7185);
+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 ? {
@@ -5473,8 +5455,8 @@ const qblock = ({
   source = source.replace(/\n$/, '');
   const lines = source.match(/^.*\n?/mg);
   const quotes = source.match(/^>+[^\S\n]/mg);
-  const content = lines.reduce((acc, line, row) => acc + line.slice(quotes[row].length), '');
-  const nodes = (0, parser_1.eval)((0, combinator_1.some)(text)({
+  const content = lines.reduce((acc, line, i) => acc + line.slice(quotes[i].length), '');
+  const nodes = (0, parser_1.eval)(text({
     source: content,
     context
   }), []);
@@ -5501,7 +5483,7 @@ const qblock = ({
   nodes.unshift('');
   return [nodes, ''];
 };
-const text = (0, combinator_1.union)([math_1.math, autolink_1.autolink]);
+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]))])));
 
 /***/ }),
 
@@ -5527,7 +5509,7 @@ exports.sidefence = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, com
 })])));
 const opener = /^(?=\|\|+(?:$|\s))/;
 const unindent = source => source.replace(/(?<=^|\n)\|(?:[^\S\n]|(?=\|*(?:$|\s)))|\n$/g, '');
-const source = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.creation)(1, false, (0, combinator_1.union)([(0, combinator_1.focus)(/^(?:\|\|+(?:[^\S\n][^\n]*)?(?:$|\n))+/, (0, combinator_1.convert)(unindent, source)), (0, combinator_1.rewrite)((0, combinator_1.some)(source_1.contentline, opener), (0, combinator_1.convert)(unindent, (0, combinator_1.fmap)((0, combinator_1.some)(autolink_1.autolink), ns => [(0, dom_1.html)('pre', (0, dom_1.defrag)(ns))])))]))), ns => [(0, dom_1.html)('blockquote', ns)]));
+const source = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.creation)(1, false, (0, combinator_1.union)([(0, combinator_1.focus)(/^(?:\|\|+(?:[^\S\n][^\n]*)?(?:$|\n))+/, (0, combinator_1.convert)(unindent, source)), (0, combinator_1.rewrite)((0, combinator_1.some)(source_1.contentline, opener), (0, combinator_1.convert)(unindent, (0, combinator_1.fmap)(autolink_1.autolink, ns => [(0, dom_1.html)('pre', (0, dom_1.defrag)(ns))])))]))), ns => [(0, dom_1.html)('blockquote', ns)]));
 
 /***/ }),
 
@@ -5595,7 +5577,7 @@ const visibility_1 = __webpack_require__(7618);
 const array_1 = __webpack_require__(8112);
 const dom_1 = __webpack_require__(3252);
 exports.ulist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.validate)(/^-(?=[^\S\n]|\n[^\S\n]*\S)/, (0, combinator_1.state)(8 /* State.media */, exports.ulist_))));
-exports.ulist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)(/^-(?=$|\s)/, (0, combinator_1.some)((0, combinator_1.creation)(1, false, (0, combinator_1.union)([(0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([(0, combinator_1.line)((0, combinator_1.open)(/^-(?:$|\s)/, (0, combinator_1.subsequence)([exports.checkbox, (0, visibility_1.trimBlank)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline])))]), true)), (0, combinator_1.indent)((0, combinator_1.union)([exports.ulist_, olist_1.olist_, ilist_1.ilist_]))]), olist_1.invalid), ns => [(0, dom_1.html)('li', (0, dom_1.defrag)(fillFirstLine(ns)))]), true)])))), es => [format((0, dom_1.html)('ul', es))])));
+exports.ulist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)(/^-(?=$|\s)/, (0, combinator_1.some)((0, combinator_1.creation)(1, false, (0, combinator_1.union)([(0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([(0, combinator_1.line)((0, combinator_1.open)(/^-(?:$|\s)/, (0, combinator_1.subsequence)([exports.checkbox, (0, visibility_1.trimBlank)((0, visibility_1.visualize)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline]))))]), true)), (0, combinator_1.indent)((0, combinator_1.union)([exports.ulist_, olist_1.olist_, ilist_1.ilist_]))]), olist_1.invalid), ns => [(0, dom_1.html)('li', (0, dom_1.defrag)(fillFirstLine(ns)))]), true)])))), es => [format((0, dom_1.html)('ul', es))])));
 exports.checkbox = (0, combinator_1.creation)(1, false, (0, combinator_1.focus)(/^\[[xX ]\](?=$|\s)/, ({
   source
 }) => [[(0, dom_1.html)('span', {
@@ -5805,7 +5787,7 @@ const link_1 = __webpack_require__(9628);
 const source_1 = __webpack_require__(6743);
 const dom_1 = __webpack_require__(3252);
 // https://example/@user must be a user page or a redirect page going there.
-exports.account = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.rewrite)((0, combinator_1.constraint)(1 /* State.shortcut */, false, (0, combinator_1.open)('@', (0, combinator_1.tails)([(0, combinator_1.verify)((0, source_1.str)(/^[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?)*\//i), ([source]) => source.length <= 253 + 1), (0, source_1.str)(/^[a-z](?:-(?=[0-9a-z])|[0-9a-z]){0,63}/i)]))), (0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `https://${source.slice(1).replace('/', '/@')}` : `/${source}`} }`, (0, combinator_1.union)([link_1.unsafelink]))), ([el]) => [(0, dom_1.define)(el, {
+exports.account = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.rewrite)((0, combinator_1.constraint)(1 /* State.shortcut */, false, (0, combinator_1.open)('@', (0, combinator_1.tails)([(0, source_1.str)(/^[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?)*\//i), (0, source_1.str)(/^[a-z][0-9a-z]*(?:-[0-9a-z]+)*/i)]))), (0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `https://${source.slice(1).replace('/', '/@')}` : `/${source}`} }`, (0, combinator_1.union)([link_1.unsafelink]))), ([el]) => [(0, dom_1.define)(el, {
   class: 'account'
 })]));
 
@@ -5826,11 +5808,12 @@ const link_1 = __webpack_require__(9628);
 const dom_1 = __webpack_require__(3252);
 // Timeline(pseudonym): user/tid
 // Thread(anonymous): cid
-// tid: YYYY-MM-DD-HH-MM-SS-TMZ
-// cid: YYYY-MM-DD-HH-MM-SS-mmm-TMZ
+// UTC
+// tid: YYYY-MMDD-HHMM-SS
+// cid: YYYY-MMDD-HHMM-SSmmm
 // 内部表現はUnixTimeに統一する(時系列順)
 // 外部表現は投稿ごとに投稿者の投稿時のタイムゾーンに統一する(非時系列順)
-exports.anchor = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('>>', (0, combinator_1.fmap)((0, combinator_1.constraint)(1 /* State.shortcut */, false, (0, combinator_1.focus)(/^>>(?:[a-z][0-9a-z]*(?:-[0-9a-z]+)*\/)?[0-9a-z]+(?:-[0-9a-z]+)*(?![0-9a-z@#:])/i, (0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `/@${source.slice(2).replace('/', '/timeline/')}` : `?at=${source.slice(2)}`} }`, (0, combinator_1.union)([link_1.unsafelink])))), ([el]) => [(0, dom_1.define)(el, {
+exports.anchor = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('>>', (0, combinator_1.fmap)((0, combinator_1.constraint)(1 /* State.shortcut */, false, (0, combinator_1.focus)(/^>>(?:[a-z][0-9a-z]*(?:-[0-9a-z]+)*\/)?[0-9a-z]+(?:-[0-9a-z]+)*(?![0-9a-z@#:])/i, (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])))), ([el]) => [(0, dom_1.define)(el, {
   class: 'anchor'
 })])));
 
@@ -5854,7 +5837,6 @@ const dom_1 = __webpack_require__(3252);
 // https://example/@user?ch=a+b must be a user channel page or a redirect page going there.
 exports.channel = (0, combinator_1.validate)('@', (0, combinator_1.bind)((0, combinator_1.sequence)([account_1.account, (0, combinator_1.some)(hashtag_1.hashtag)]), (es, rest) => {
   const source = (0, util_1.stringify)(es);
-  if (source.includes('/', source.indexOf('#'))) return;
   const el = es[0];
   const url = `${el.getAttribute('href')}?ch=${source.slice(source.indexOf('#') + 1).replace(/#/g, '+')}`;
   return [[(0, dom_1.define)(el, {
@@ -5927,9 +5909,9 @@ const dom_1 = __webpack_require__(3252);
 // https://example/hashtags/a must be a hashtag page or a redirect page going there.
 // https://github.com/tc39/proposal-regexp-unicode-property-escapes#matching-emoji
 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.fmap)((0, combinator_1.rewrite)((0, combinator_1.constraint)(1 /* State.shortcut */, false, (0, combinator_1.open)('#', (0, combinator_1.tails)([(0, combinator_1.verify)((0, source_1.str)(/^[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?)*\//i), ([source]) => source.length <= 253 + 1), (0, combinator_1.verify)((0, source_1.str)(new RegExp([/^(?=(?:[0-9]{1,127}_?)?(?:[^\d\p{C}\p{S}\p{P}\s]|emoji|'))/u.source, /(?:[^\p{C}\p{S}\p{P}\s]|emoji|(?<!')'|_(?=[^\p{C}\p{S}\p{P}\s]|emoji|')){1,128}/u.source, /(?!_?(?:[^\p{C}\p{S}\p{P}\s]|emoji|(?<!')'))/u.source].join('').replace(/emoji/g, exports.emoji), 'u')), ([source]) => source.length <= 128)]))), (0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `https://${source.slice(1).replace('/', '/hashtags/')}` : `/hashtags/${source.slice(1)}`} }`, (0, combinator_1.union)([link_1.unsafelink]))), ([el]) => [(0, dom_1.define)(el, {
+exports.hashtag = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.rewrite)((0, combinator_1.constraint)(1 /* State.shortcut */, false, (0, combinator_1.open)('#', (0, source_1.str)(new RegExp([/^(?=(?:[0-9]{1,15})?(?:[^\d\p{C}\p{S}\p{P}\s]|emoji|'))/u.source, /(?:[^\p{C}\p{S}\p{P}\s]|emoji|(?<!')'|_(?=[^\p{C}\p{S}\p{P}\s]|emoji|'))+/u.source].join('').replace(/emoji/g, exports.emoji), 'u')))), (0, combinator_1.convert)(source => `[${source}]{ ${`/hashtags/${source.slice(1)}`} }`, (0, combinator_1.union)([link_1.unsafelink]))), ([el]) => [(0, dom_1.define)(el, {
   class: 'hashtag'
-}, el.innerText)]));
+})]));
 
 /***/ }),
 
@@ -6099,7 +6081,7 @@ const indexee_1 = __webpack_require__(1269);
 const source_1 = __webpack_require__(6743);
 const visibility_1 = __webpack_require__(7618);
 const dom_1 = __webpack_require__(3252);
-exports.index = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[#', (0, combinator_1.fmap)((0, indexee_1.indexee)((0, combinator_1.surround)('[#', (0, combinator_1.constraint)(64 /* State.index */, false, (0, combinator_1.syntax)(128 /* Syntax.index */, 2, 1, 502 /* State.linkers */ | 8 /* State.media */, (0, visibility_1.startTight)((0, combinator_1.open)((0, source_1.stropt)(/^\|?/), (0, visibility_1.trimBlankEnd)((0, combinator_1.some)((0, combinator_1.union)([signature, inline_1.inline]), ']', [[/^\\?\n/, 9], [']', 2]])), true)))), ']', false, ([, ns], rest) => [[(0, dom_1.html)('a', (0, dom_1.defrag)(ns))], rest])), ([el]) => [(0, dom_1.define)(el, {
+exports.index = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('[#', (0, combinator_1.fmap)((0, indexee_1.indexee)((0, combinator_1.surround)('[#', (0, combinator_1.constraint)(64 /* State.index */, false, (0, combinator_1.syntax)(128 /* Syntax.index */, 2, 1, 502 /* State.linkers */ | 8 /* State.media */, (0, visibility_1.startTight)((0, combinator_1.open)((0, source_1.stropt)('|'), (0, visibility_1.trimBlankEnd)((0, combinator_1.some)((0, combinator_1.union)([signature, inline_1.inline]), ']', [[/^\\?\n/, 9], [']', 2]])), true)))), ']', false, ([, ns], rest) => [[(0, dom_1.html)('a', (0, dom_1.defrag)(ns))], rest])), ([el]) => [(0, dom_1.define)(el, {
   id: el.id ? null : undefined,
   class: 'index',
   href: el.id ? `#${el.id}` : undefined
@@ -6489,6 +6471,7 @@ function resolve(uri, host, source) {
     case uri.slice(0, 2) === '^/':
       const last = host.pathname.slice(host.pathname.lastIndexOf('/') + 1);
       return last.includes('.') // isFile
+      // Exclude ISO 6709.
       && /^[0-9]*[a-z][0-9a-z]*$/i.test(last.slice(last.lastIndexOf('.') + 1)) ? `${host.pathname.slice(0, -last.length)}${uri.slice(2)}` : `${host.pathname.replace(/\/?$/, '/')}${uri.slice(2)}`;
     case host.origin === source.origin && host.pathname === source.pathname:
     case uri.slice(0, 2) === '//':
@@ -7375,8 +7358,8 @@ Object.defineProperty(exports, "__esModule", ({
 exports.contentline = exports.emptyline = exports.anyline = void 0;
 const combinator_1 = __webpack_require__(2087);
 exports.anyline = (0, combinator_1.line)(() => [[], '']);
-exports.emptyline = (0, combinator_1.line)(i => (0, combinator_1.isEmpty)(i.source) ? [[], ''] : undefined);
-exports.contentline = (0, combinator_1.line)(i => !(0, combinator_1.isEmpty)(i.source) ? [[], ''] : undefined);
+exports.emptyline = (0, combinator_1.line)(i => (0, combinator_1.isBlank)(i.source) ? [[], ''] : undefined);
+exports.contentline = (0, combinator_1.line)(i => !(0, combinator_1.isBlank)(i.source) ? [[], ''] : undefined);
 
 /***/ }),
 
@@ -7413,7 +7396,7 @@ function stropt(pattern) {
     source
   }) => {
     if (source === '') return;
-    return source.slice(0, pattern.length) === pattern ? [[pattern], source.slice(pattern.length)] : undefined;
+    return source.slice(0, pattern.length) === pattern ? [[pattern], source.slice(pattern.length)] : [[''], source];
   }) : (0, combinator_1.creation)(1, false, ({
     source
   }) => {
@@ -7528,7 +7511,7 @@ exports.unescsource = (0, combinator_1.creation)(1, false, ({
 /***/ }),
 
 /***/ 9437:
-/***/ ((__unused_webpack_module, exports) => {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
@@ -7536,7 +7519,12 @@ exports.unescsource = (0, combinator_1.creation)(1, false, ({
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.stringify = void 0;
+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;
 function stringify(nodes) {
   let acc = '';
   for (let i = 0; i < nodes.length; ++i) {
@@ -7568,12 +7556,13 @@ 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)(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)((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]))]);
 }
 exports.visualize = visualize;
 function hasVisible(nodes, {
@@ -8200,7 +8189,7 @@ Object.defineProperty(exports, "__esModule", ({
 exports.quote = void 0;
 const parser_1 = __webpack_require__(6728);
 const cite_1 = __webpack_require__(6315);
-const dom_1 = __webpack_require__(3252);
+//import { url } from '../parser/inline/autolink/url';
 function quote(anchor, range) {
   if ((0, parser_1.exec)((0, cite_1.cite)({
     source: `>>${anchor}`,
@@ -8214,8 +8203,15 @@ function quote(anchor, range) {
     switch (true) {
       case el.matches('code'):
       case el.matches('.math'):
-        (0, dom_1.define)(el, el.getAttribute('data-src'));
+        el.replaceWith(el.getAttribute('data-src'));
         continue;
+      //case el.matches('.url'):
+      //  if (exec(url({ source: el.getAttribute('href')!, context: {} })) === '') continue;
+      //  el.replaceWith(
+      //    /[\s{}]/.test(el.getAttribute('href')!)
+      //      ? `{ ${el.getAttribute('href')} }`
+      //      : `{${el.getAttribute('href')}}`);
+      //  continue;
       case el.matches('.media'):
         el.replaceWith(/[\s{}]/.test(el.getAttribute('data-src')) ? `!{ ${el.getAttribute('data-src')} }` : `!{${el.getAttribute('data-src')}}`);
         continue;

package/index.d.ts

@@ -28,8 +28,7 @@ export type ParserOptions = Omit<Partial<ParserSettings>, 'chunk'>;
 export interface ParserSettings {
   // Host URL.
   readonly host?: URL;
-  // ID of comments and timelines.
-  // Must not contain ":".
+  // Alphanumeric ID of comments and timelines.
   readonly id?: string;
   // For editing.
   readonly caches?: Partial<Caches>;
@@ -40,12 +39,12 @@ export interface ParserSettings {
 }
 
 export type Progress =
-  | { type: 'segment', value: string; }
-  | { type: 'block', value: HTMLElement }
-  | { type: 'figure', value: HTMLAnchorElement }
-  | { type: 'footnote', value: HTMLLIElement | HTMLElement }
-  | { type: 'break' }
-  | { type: 'cancel' };
+  | { readonly type: 'segment'; readonly value: string; }
+  | { readonly type: 'block'; readonly value: HTMLElement; }
+  | { readonly type: 'figure'; readonly value: HTMLAnchorElement; }
+  | { readonly type: 'footnote'; readonly value: HTMLLIElement | HTMLElement; }
+  | { readonly type: 'break'; }
+  | { readonly type: 'cancel'; };
 
 export interface RenderingOptions {
   readonly code?: (target: HTMLElement, cache?: Dict<string, HTMLElement>) => void;

package/markdown.d.ts

@@ -59,7 +59,7 @@ export namespace MarkdownParser {
     Markdown<'block'>,
     Parser<HTMLElement, Context, [
       SourceParser.EmptyLineParser,
-      BlockParser.HorizontalRuleParser,
+      BlockParser.PagebreakParser,
       BlockParser.HeadingParser,
       BlockParser.UListParser,
       BlockParser.OListParser,
@@ -77,9 +77,9 @@ export namespace MarkdownParser {
   }
   export namespace BlockParser {
     interface Block<T extends string> extends Markdown<`block/${T}`> { }
-    export interface HorizontalRuleParser extends
-      // ---
-      Block<'horizontalrule'>,
+    export interface PagebreakParser extends
+      // ===
+      Block<'pagebreak'>,
       Parser<HTMLHRElement, Context, [
         SourceParser.StrParser,
       ]> {
@@ -598,8 +598,13 @@ export namespace MarkdownParser {
         export interface TextParser extends
           Block<'reply/quote/text'>,
           Parser<string | HTMLElement, Context, [
-            InlineParser.MathParser,
-            AutolinkParser,
+            AutolinkParser.LineUrlParser,
+            Parser<string | HTMLElement, Context, [
+              InlineParser.MathParser,
+              InlineParser.AutolinkParser,
+              SourceParser.LinebreakParser,
+              SourceParser.UnescapableSourceParser,
+            ]>,
           ]> {
         }
         export interface PlaceholderParser extends
@@ -1171,11 +1176,23 @@ export namespace MarkdownParser {
   export interface AutolinkParser extends
     Markdown<'autolink'>,
     Parser<string | HTMLElement, Context, [
-      InlineParser.AutolinkParser,
-      SourceParser.LinebreakParser,
-      SourceParser.UnescapableSourceParser,
+      AutolinkParser.LineUrlParser,
+      Parser<string | HTMLElement, Context, [
+        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.266.0",
+  "version": "0.268.0",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",
@@ -34,13 +34,13 @@
     "@types/mocha": "10.0.1",
     "@types/power-assert": "1.5.8",
     "@types/prismjs": "1.26.0",
-    "@typescript-eslint/parser": "^5.49.0",
+    "@typescript-eslint/parser": "^5.52.0",
     "babel-loader": "^9.1.2",
     "babel-plugin-unassert": "^3.2.0",
     "concurrently": "^7.6.0",
-    "eslint": "^8.32.0",
-    "eslint-plugin-redos": "^4.4.3",
-    "eslint-webpack-plugin": "^3.2.0",
+    "eslint": "^8.34.0",
+    "eslint-plugin-redos": "^4.4.5",
+    "eslint-webpack-plugin": "^4.0.0",
     "glob": "^8.1.0",
     "karma": "^6.4.1",
     "karma-chrome-launcher": "^3.1.1",
@@ -49,12 +49,12 @@
     "karma-mocha": "^2.0.1",
     "karma-power-assert": "^1.0.0",
     "mocha": "^10.2.0",
-    "npm-check-updates": "^16.6.3",
+    "npm-check-updates": "^16.7.4",
     "semver": "^7.3.8",
     "spica": "0.0.719",
     "ts-loader": "^9.4.2",
     "typed-dom": "^0.0.315",
-    "typescript": "4.9.4",
+    "typescript": "4.9.5",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1",
     "webpack-merge": "^5.8.0"

package/src/combinator/control/constraint/block.ts

@@ -1,6 +1,6 @@
 import { Parser, exec } from '../../data/parser';
 import { Memo } from '../../data/parser/context/memo';
-import { firstline, isEmpty } from './line';
+import { firstline, isBlank } from './line';
 
 export function block<P extends Parser<unknown>>(parser: P, separation?: boolean): P;
 export function block<T>(parser: Parser<T>, separation = true): Parser<T> {
@@ -11,7 +11,7 @@ export function block<T>(parser: Parser<T>, separation = true): Parser<T> {
     const result = parser({ source, context });
     if (result === undefined) return;
     const rest = exec(result);
-    if (separation && !isEmpty(firstline(rest))) return;
+    if (separation && !isBlank(firstline(rest))) return;
     assert(rest === '' || source[source.length - rest.length - 1] === '\n');
     return rest === '' || source[source.length - rest.length - 1] === '\n'
       ? result

package/src/combinator/control/constraint/line.ts

@@ -14,7 +14,7 @@ export function line<T>(parser: Parser<T>): Parser<T> {
     assert(check(line, result));
     context.offset -= source.length - line.length;
     if (result === undefined) return;
-    return isEmpty(exec(result))
+    return isBlank(exec(result))
       ? [eval(result), source.slice(line.length)]
       : undefined;
   };
@@ -32,7 +32,7 @@ export function firstline(source: string): string {
   }
 }
 
-export function isEmpty(line: string): boolean {
+export function isBlank(line: string): boolean {
   return line === ''
       || line === '\n'
       || line.trimStart() === '';