securemark 0.299.0 → 0.299.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.299.2
+
+- Refactoring.
+
+## 0.299.1
+
+- Refactoring.
+
 ## 0.299.0
 
 - Add support for CRLF linebreaks.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.299.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.299.2 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"));
@@ -3745,16 +3745,21 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.some = void 0;
 const delimiter_1 = __webpack_require__(385);
-function some(parser, delimiter, after, delimiters, limit = -1) {
+function some(parser, delimiter, after, delimiters, limit = 0) {
   if (typeof delimiter === 'number') {
     limit = delimiter;
+    delimiters = undefined;
     delimiter = undefined;
   } else if (Array.isArray(delimiter)) {
+    limit = after;
     delimiters = delimiter;
     delimiter = undefined;
   } else if (after === undefined || Array.isArray(after)) {
+    limit = delimiters;
     delimiters = after;
     after = undefined;
+  } else {
+    delimiters = delimiters;
   }
   const match = delimiter_1.Delimiters.tester(delimiter, after);
   const delims = delimiters?.map(([delimiter, precedence]) => ({
@@ -3780,7 +3785,8 @@ function some(parser, delimiter, after, delimiters, limit = -1) {
       if (result === undefined) break;
       if (context.position === pos) break;
       nodes = nodes?.import(result) ?? result;
-      if (limit >= 0 && context.position - position > limit) break;
+      // 次にパースに成功すれば確実に制限値を超えるので制限値ちょうどでも中止する
+      if (limit > 0 && context.position - position >= limit) break;
     }
     delims && context.delimiters.pop(delims.length);
     return context.position > position ? nodes : undefined;
@@ -4201,7 +4207,11 @@ function header(source) {
 exports.header = header;
 function headers(source) {
   const [el] = parse(source);
-  return el?.textContent.trimEnd().slice(el.firstChild.firstChild.textContent.length).split(/\r?\n/) ?? [];
+  const acc = [];
+  for (let field = el?.firstChild?.firstChild; field = field?.nextSibling;) {
+    acc.push(field.textContent);
+  }
+  return acc;
 }
 exports.headers = headers;
 function parse(source) {
@@ -4224,7 +4234,7 @@ function parse(source) {
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.escape = exports.invisibleGraphHTMLEntityNames = exports.invisibleBlankCharacters = exports.invisibleBlankHTMLEntityNames = exports.normalize = void 0;
+exports.escape = exports.invisibleGraphHTMLEntityNames = exports.invisibleBlankHTMLEntityNames = exports.normalize = void 0;
 const dom_1 = __webpack_require__(394);
 const UNICODE_REPLACEMENT_CHARACTER = '\uFFFD';
 function normalize(source) {
@@ -4251,7 +4261,6 @@ const parser = (el => entity => {
   return el.textContent;
 })((0, dom_1.html)('span'));
 exports.invisibleBlankHTMLEntityNames = invisibleHTMLEntityNames.filter(name => parser(`&${name};`).trimStart() === '');
-exports.invisibleBlankCharacters = exports.invisibleBlankHTMLEntityNames.map(name => parser(`&${name};`));
 exports.invisibleGraphHTMLEntityNames = invisibleHTMLEntityNames.filter(name => parser(`&${name};`).trimStart() !== '');
 const unreadableEscapeHTMLEntityNames = invisibleHTMLEntityNames.filter(name => !['Tab', 'NewLine', 'NonBreakingSpace', 'nbsp', 'zwj', 'zwnj'].includes(name));
 const unreadableEscapeCharacters = unreadableEscapeHTMLEntityNames.map(name => parser(`&${name};`));
@@ -5828,7 +5837,7 @@ class Context extends parser_1.Context {
     } = options;
     this.resources ??= {
       // バックトラックのせいで文字数制限を受けないようにする。
-      clock: exports.MAX_SEGMENT_SIZE * (6 + 1),
+      clock: exports.MAX_SEGMENT_SIZE * (5 + 1),
       recursions: [5 || 0 /* Recursion.block */, 20 || 0 /* Recursion.blockquote */, 40 || 0 /* Recursion.listitem */, 20 || 0 /* Recursion.inline */, 20 || 0 /* Recursion.bracket */, 20 || 0 /* Recursion.terminal */]
     };
     this.segment = segment ?? 0 /* Segment.unknown */;
@@ -5882,7 +5891,7 @@ const combinator_1 = __webpack_require__(3484);
 const source_1 = __webpack_require__(8745);
 const util_1 = __webpack_require__(4992);
 const dom_1 = __webpack_require__(394);
-exports.header = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(/---+[^\S\r\n]*\r?\n(?=\S)/y, (0, combinator_1.inits)([(0, combinator_1.block)((0, combinator_1.union)([(0, combinator_1.validate)(context => context.header, (0, combinator_1.focus)(/(---+)[^\S\r\n]*\r?\n(?:[a-z][0-9a-z]*(?:-[0-9a-z]+)*:[ \t]+\S[^\r\n]*\r?\n){1,100}\1[^\S\r\n]*(?:$|\r?\n)/yi, (0, combinator_1.convert)(source => source.slice(source.indexOf('\n') + 1, source.trimEnd().lastIndexOf('\n')), (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.union)([field])), ns => new parser_1.List([new parser_1.Node((0, dom_1.html)('aside', {
+exports.header = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(/---+[^\S\r\n]*\r?\n(?=\S)/y, (0, combinator_1.inits)([(0, combinator_1.block)((0, combinator_1.union)([(0, combinator_1.validate)(context => context.header, (0, combinator_1.focus)(/(---+)[^\S\r\n]*\r?\n(?:[a-z][0-9a-z]*(?:-[0-9a-z]+)*:[ \t]+\S[^\r\n]*\r?\n){1,32}\1[^\S\r\n]*(?:$|\r?\n)/yi, (0, combinator_1.convert)(source => source.slice(source.indexOf('\n') + 1, source.trimEnd().lastIndexOf('\n')), (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.union)([field])), ns => new parser_1.List([new parser_1.Node((0, dom_1.html)('aside', {
   class: 'header'
 }, [(0, dom_1.html)('details', {
   open: ''
@@ -5904,7 +5913,7 @@ const field = (0, combinator_1.line)(({
 }) => {
   const name = source.slice(position, source.indexOf(':', position));
   const value = source.slice(position + name.length + 1).trim();
-  return new parser_1.List([new parser_1.Node((0, dom_1.html)('span', {
+  return new parser_1.List([new parser_1.Node((0, dom_1.html)('div', {
     class: 'field',
     'data-name': name.toLowerCase(),
     'data-value': value
@@ -5912,7 +5921,7 @@ const field = (0, combinator_1.line)(({
     class: 'field-name'
   }, name), ': ', (0, dom_1.html)('span', {
     class: 'field-value'
-  }, value), '\n']))]);
+  }, value)]))]);
 });
 
 /***/ },
@@ -6360,10 +6369,9 @@ 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, /(?<![-+*=~^_,.;:!?]|\/{3})(?:[-+*=~^_,.;:!?]|\/{3,}(?!\/))*(?=[\\$"`\[\](){}<>（）［］｛｝|]|[^\x21-\x7E]|$)/y), (0, combinator_1.precedence)(1, bracket)]), [[/[^\x21-\x7E]|\$/y, 9]])), false, [3 | 8 /* Backtrack.unescapable */]), (0, combinator_1.union)([(0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, context => new parser_1.List([new parser_1.Node((0, link_1.parse)(new parser_1.List(), new parser_1.List([new parser_1.Node(context.source)]), context))]))), (0, combinator_1.open)((0, source_1.str)(/[^:]+/y), (0, combinator_1.some)(inline_1.inline))])));
+exports.url = (0, combinator_1.lazy)(() => (0, combinator_1.rewrite)((0, combinator_1.open)(/(?<![0-9A-Za-z][.+-]?|[@#])https?:\/\/(?=[[0-9A-Za-z])/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, bracket)]), [[/[^\x21-\x7E]|\$/y, 9]])), false, [3 | 8 /* Backtrack.unescapable */]), (0, combinator_1.union)([(0, combinator_1.constraint)(1 /* State.autolink */, (0, combinator_1.state)(1 /* State.autolink */, context => new parser_1.List([new parser_1.Node((0, link_1.parse)(new parser_1.List(), new parser_1.List([new parser_1.Node(context.source)]), context))]))), context => new parser_1.List([new parser_1.Node(context.source)])])));
 exports.lineurl = (0, combinator_1.lazy)(() => (0, combinator_1.focus)(/(?<=^|[\r\n])!?https?:\/\/\S+(?=[^\S\r\n]*(?=$|\r?\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 */, context => {
   const {
     source,
@@ -6371,7 +6379,7 @@ exports.lineurl = (0, combinator_1.lazy)(() => (0, combinator_1.focus)(/(?<=^|[\
   } = context;
   context.position -= source[0] === '!' ? 1 : 0;
   return new parser_1.List([new parser_1.Node((0, link_1.parse)(new parser_1.List(), new parser_1.List([new parser_1.Node(source.slice(position))]), context))]);
-})), (0, source_1.str)(/[^:]+/y)])])));
+})), context => new parser_1.List([new parser_1.Node(context.source)])])])));
 const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.recursion)(5 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.unescsource]), ')')), (0, source_1.str)(')'), true, [3 | 8 /* Backtrack.unescapable */]), (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.recursion)(5 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.unescsource]), ']')), (0, source_1.str)(']'), true, [3 | 8 /* Backtrack.unescapable */]), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.recursion)(5 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.unescsource]), '}')), (0, source_1.str)('}'), true, [3 | 8 /* Backtrack.unescapable */]), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.precedence)(2, (0, combinator_1.recursion)(5 /* Recursion.terminal */, (0, combinator_1.some)(source_1.unescsource, '"'))), (0, source_1.str)('"'), true, [3 | 8 /* Backtrack.unescapable */])]));
 
 /***/ },
@@ -7390,8 +7398,8 @@ const combinator_1 = __webpack_require__(3484);
 const source_1 = __webpack_require__(8745);
 const util_1 = __webpack_require__(4992);
 const dom_1 = __webpack_require__(394);
-const forbiddenCommand = /\\(?:begin|tiny|huge|large)(?![a-z])|:\/\//i;
-exports.math = (0, combinator_1.lazy)(() => (0, combinator_1.rewrite)((0, combinator_1.union)([(0, combinator_1.surround)(/\$(?={)/y, (0, combinator_1.precedence)(4, bracket), '$', false, [3 | 16 /* Backtrack.escapable */]), (0, combinator_1.surround)(/\$(?![\s{}])/y, (0, combinator_1.precedence)(2, (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(source_1.escsource, /\$|[`"{}\r\n]/y), (0, combinator_1.precedence)(4, bracket)]))), /(?<!\s)\$(?![-0-9A-Za-z])/y, false, [3 | 16 /* Backtrack.escapable */])]), ({
+const forbiddenCommand = /\\(?:begin|tiny|huge|large)(?![a-z])/i;
+exports.math = (0, combinator_1.lazy)(() => (0, combinator_1.rewrite)((0, combinator_1.union)([(0, combinator_1.surround)(/\$(?={)/y, (0, combinator_1.precedence)(4, bracket), '$', false, [3 | 16 /* Backtrack.escapable */]), (0, combinator_1.surround)(/\$(?![\s{}])/y, (0, combinator_1.precedence)(2, (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(source_1.escsource, /[`"{}$\r\n]|(?<=[0-9A-Za-z]):\/\/[[0-9A-Za-z]/y), (0, combinator_1.precedence)(4, bracket)]))), /(?<!\s)\$(?![-0-9A-Za-z])/y, false, [3 | 16 /* Backtrack.escapable */])]), ({
   source,
   caches: {
     math: cache
@@ -7405,7 +7413,7 @@ exports.math = (0, combinator_1.lazy)(() => (0, combinator_1.rewrite)((0, combin
   translate: 'no',
   ...(0, util_1.invalid)('math', 'content', `"${source.match(forbiddenCommand)[0]}" command is forbidden`)
 }, source))])));
-const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.recursion)(5 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, (0, combinator_1.some)(source_1.escsource, /[{}$\r\n]/y)]))), (0, source_1.str)('}'), true));
+const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.recursion)(5 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, (0, combinator_1.some)(source_1.escsource, /[{}$\r\n]|(?<=[0-9A-Za-z]):\/\/[[0-9A-Za-z]/y)]))), (0, source_1.str)('}'), true));
 
 /***/ },
 
@@ -7667,14 +7675,14 @@ const dom_1 = __webpack_require__(394);
 exports.ruby = (0, combinator_1.lazy)(() => (0, combinator_1.bind)((0, combinator_1.inits)([(0, combinator_1.dup)((0, combinator_1.surround)('[', text, ']', false, [1 | 4 /* Backtrack.common */, 3 | 32 /* Backtrack.ruby */], ([, ns]) => {
   ns && ns.last?.value === '' && ns.pop();
   return (0, visibility_1.isNonblankNodeStart)(ns) ? ns : undefined;
-})), (0, combinator_1.dup)((0, combinator_1.surround)('(', text, ')', false, [3 | 32 /* Backtrack.ruby */]))]), ([{
+})), (0, combinator_1.dup)((0, combinator_1.surround)('(', text, ')', false))]), ([{
   value: texts
 }, {
   value: rubies = undefined
 } = {}], context) => {
   if (rubies === undefined) {
     const head = context.position - context.range;
-    return void (0, combinator_1.setBacktrack)(context, 2 | 32 /* Backtrack.ruby */, head);
+    return void (0, combinator_1.setBacktrack)(context, 2 | 64 /* Backtrack.link */ | 32 /* Backtrack.ruby */, head);
   }
   switch (true) {
     case texts.length >= rubies.length:
@@ -8210,10 +8218,10 @@ function repeat(opener, after, closer, rs, parser, cons, termination = (nodes, c
         follow = follow > 0 ? follow : countFollows(source, pos, closer, lead / opener.length | 0);
         nodes = cons(nodes, context, lead, follow);
         if (context.position > pos) {
-          const advance = opener.length * (context.position - pos) / closer.length | 0;
+          const advance = context.position - pos;
           i -= advance;
           follow -= advance;
-          depth -= advance;
+          depth -= advance / closer.length | 0;
         }
         continue;
       }
@@ -8240,10 +8248,10 @@ function repeat(opener, after, closer, rs, parser, cons, termination = (nodes, c
           nodes = cons(nodes, context, lead, follow);
           state = true;
           if (context.position > pos) {
-            const advance = opener.length * (context.position - pos) / closer.length | 0;
+            const advance = context.position - pos;
             i -= advance;
             follow -= advance;
-            depth -= advance;
+            depth -= advance / closer.length | 0;
           }
           continue;
       }
@@ -8432,14 +8440,11 @@ Object.defineProperty(exports, "__esModule", ({
 exports.escsource = void 0;
 const parser_1 = __webpack_require__(605);
 const combinator_1 = __webpack_require__(3484);
-const text_1 = __webpack_require__(5655);
 const dom_1 = __webpack_require__(394);
-const delimiter = /(?=[\\$"`\[\](){}\r\n]|\s\$|:\/\/)/g;
 const escsource = context => {
   const {
     source,
-    position,
-    state
+    position
   } = context;
   if (position === source.length) return;
   const char = source[position];
@@ -8468,7 +8473,7 @@ const escsource = context => {
       return new parser_1.List([new parser_1.Node((0, dom_1.html)('br'), 1 /* Flag.blank */)]);
     default:
       if (context.sequential) return new parser_1.List([new parser_1.Node(char)]);
-      let i = (0, text_1.next)(source, position, state, delimiter);
+      let i = seek(source, position);
       i -= position;
       (0, combinator_1.consume)(i - 1, context);
       context.position += i - 1;
@@ -8476,6 +8481,30 @@ const escsource = context => {
   }
 };
 exports.escsource = escsource;
+function seek(source, position) {
+  for (let i = position + 1; i < source.length; ++i) {
+    const char = source[i];
+    switch (char) {
+      case '\\':
+      case '$':
+      case '"':
+      case '`':
+      case ':':
+      case '[':
+      case ']':
+      case '(':
+      case ')':
+      case '{':
+      case '}':
+      case '\r':
+      case '\n':
+        return i;
+      default:
+        continue;
+    }
+  }
+  return source.length;
+}
 
 /***/ },
 
@@ -8605,7 +8634,7 @@ exports.strs = strs;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.isAlphanumeric = exports.next = exports.canSkip = exports.txt = exports.text = exports.nonWhitespace = void 0;
+exports.isAlphanumeric = exports.backToEmailHead = exports.backToUrlHead = exports.canSkip = exports.txt = exports.text = exports.nonWhitespace = void 0;
 const parser_1 = __webpack_require__(605);
 const combinator_1 = __webpack_require__(3484);
 const dom_1 = __webpack_require__(394);
@@ -8676,23 +8705,16 @@ function isWhitespace(char, linebreak) {
       return false;
   }
 }
-function next(source, position, state, delimiter) {
-  let index;
-  if (delimiter) {
-    delimiter.lastIndex = position + 1;
-    delimiter.test(source);
-    index = delimiter.lastIndex || position;
-  } else {
-    index = seek(source, position, state);
-  }
-  if (index === position || index === source.length) return source.length;
+function next(source, position, state) {
+  let index = seek(source, position, state);
+  if (index === source.length) return source.length;
   const char = source[index];
   switch (char) {
     case '%':
-      index += !delimiter && index - 1 > position ? -1 : 0;
+      index += index - 1 > position ? -1 : 0;
       break;
     case '[':
-      index += !delimiter && index - 1 > position && source.startsWith(' [|', index - 1) ? -1 : 0;
+      index += index - 1 > position && source.startsWith(' [|', index - 1) ? -1 : 0;
       break;
     case ':':
       index = source.startsWith('//', index + 1) ? backToUrlHead(source, position, index) : index;
@@ -8703,7 +8725,6 @@ function next(source, position, state, delimiter) {
   }
   return index;
 }
-exports.next = next;
 function backToUrlHead(source, position, index) {
   const delim = index;
   let state = false;
@@ -8725,6 +8746,7 @@ function backToUrlHead(source, position, index) {
   }
   return index === position || source[index] !== 'h' ? delim : index;
 }
+exports.backToUrlHead = backToUrlHead;
 function backToEmailHead(source, position, index) {
   const delim = index;
   let state = false;
@@ -8747,6 +8769,7 @@ function backToEmailHead(source, position, index) {
   }
   return index === position ? delim : index;
 }
+exports.backToEmailHead = backToEmailHead;
 function isAlphanumeric(char) {
   if (char < '0' || '\x7F' < char) return false;
   return '0' <= char && char <= '9' || 'A' <= char && char <= 'Z' || 'a' <= char && char <= 'z';
@@ -8842,12 +8865,11 @@ function seek(source, position, state) {
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.unescsource = exports.delimiter = void 0;
+exports.unescsource = void 0;
 const parser_1 = __webpack_require__(605);
 const combinator_1 = __webpack_require__(3484);
 const text_1 = __webpack_require__(5655);
 const dom_1 = __webpack_require__(394);
-exports.delimiter = /(?=(?=[\x00-\x7F])[^0-9A-Za-z]|(?<=[\x00-\x7F])[^\x00-\x7F])/g;
 const unescsource = context => {
   const {
     source,
@@ -8871,7 +8893,7 @@ const unescsource = context => {
     default:
       if (context.sequential) return new parser_1.List([new parser_1.Node(char)]);
       text_1.nonWhitespace.lastIndex = position + 1;
-      let i = (0, text_1.canSkip)(source, position) ? text_1.nonWhitespace.test(source) ? text_1.nonWhitespace.lastIndex - 1 : source.length : (0, text_1.next)(source, position, state, exports.delimiter);
+      let i = (0, text_1.canSkip)(source, position) ? text_1.nonWhitespace.test(source) ? text_1.nonWhitespace.lastIndex - 1 : source.length : next(source, position, state);
       i -= position;
       (0, combinator_1.consume)(i - 1, context);
       context.position += i - 1;
@@ -8879,6 +8901,79 @@ const unescsource = context => {
   }
 };
 exports.unescsource = unescsource;
+function next(source, position, state) {
+  let index = seek(source, position, state);
+  if (index === source.length) return source.length;
+  const char = source[index];
+  switch (char) {
+    case ':':
+      index = source.startsWith('//', index + 1) ? (0, text_1.backToUrlHead)(source, position, index) : index;
+      break;
+    case '@':
+      index = ~state & 1 /* State.autolink */ ? (0, text_1.backToEmailHead)(source, position, index) : index;
+      break;
+  }
+  return index;
+}
+function seek(source, position, state) {
+  const cat = category(source[position]);
+  for (let i = position + 1; i < source.length; ++i) {
+    const char = source[i];
+    switch (char) {
+      case '\\':
+      case '!':
+      case '$':
+      case '"':
+      case '`':
+      case '[':
+      case ']':
+      case '(':
+      case ')':
+      case '{':
+      case '}':
+      case '<':
+      case '>':
+      case '（':
+      case '）':
+      case '［':
+      case '］':
+      case '｛':
+      case '｝':
+      case '-':
+      case '+':
+      case '*':
+      case '=':
+      case '~':
+      case '^':
+      case '_':
+      case ',':
+      case '.':
+      case ';':
+      case ':':
+      case '!':
+      case '?':
+      case '/':
+      case '|':
+      case '\r':
+      case '\n':
+        return i;
+      case '@':
+      case '#':
+        if (~state & 1 /* State.autolink */) return i;
+        continue;
+      case ':':
+        if (source[i + 1] === '/' && source[i + 2] === '/') return i;
+        continue;
+      default:
+        if (cat && !category(char)) return i;
+        continue;
+    }
+  }
+  return source.length;
+}
+function category(char) {
+  return '\x21' <= char && char <= '\x7E';
+}
 
 /***/ },
 
@@ -8962,9 +9057,9 @@ const combinator_1 = __webpack_require__(3484);
 const normalize_1 = __webpack_require__(4490);
 var blank;
 (function (blank) {
-  blank.line = new RegExp(/((?:^|\n)[^\S\r\n]*(?=\S))((?:[^\S\r\n]|\\(?=$|\s)|&IBHN;|[IBC]|<wbr ?>)+(?=$|\r?\n))/g.source.replace('IBHN', `(?:${normalize_1.invisibleBlankHTMLEntityNames.join('|')})`).replace('IBC', `${normalize_1.invisibleBlankCharacters.join('')}`), 'g');
-  blank.start = new RegExp(/(?:[^\S\r\n]|\\(?=$|\s)|&IBHN;|[IBC]|<wbr ?>)+/y.source.replace('IBHN', `(?:${normalize_1.invisibleBlankHTMLEntityNames.join('|')})`).replace('IBC', `${normalize_1.invisibleBlankCharacters.join('')}`), 'y');
-  blank.unit = new RegExp(/(?:[^\S\r\n]|\\(?=$|\s)|&IBHN;|[IBC]|<wbr ?>)/y.source.replace('IBHN', `(?:${normalize_1.invisibleBlankHTMLEntityNames.join('|')})`).replace('IBC', `${normalize_1.invisibleBlankCharacters.join('')}`), 'y');
+  blank.line = new RegExp(/((?:^|\n)[^\S\r\n]*(?=\S))((?:[^\S\r\n]|\\(?=$|\s)|&IBHN;|<wbr ?>)+(?=$|\r?\n))/g.source.replace('IBHN', `(?:${normalize_1.invisibleBlankHTMLEntityNames.join('|')})`), 'g');
+  blank.start = new RegExp(/(?:[^\S\r\n]|\\(?=$|\s)|&IBHN;|<wbr ?>)+/y.source.replace('IBHN', `(?:${normalize_1.invisibleBlankHTMLEntityNames.join('|')})`), 'y');
+  blank.unit = new RegExp(/(?:[^\S\r\n]|\\(?=$|\s)|&IBHN;|<wbr ?>)/y.source.replace('IBHN', `(?:${normalize_1.invisibleBlankHTMLEntityNames.join('|')})`), 'y');
 })(blank || (blank = {}));
 function visualize(parser) {
   return (0, combinator_1.convert)(source => source.replace(blank.line, `$1${"\u001B" /* Command.Escape */}$2`), parser);
@@ -8976,15 +9071,15 @@ function blankWith(starts, delimiter) {
   return new RegExp([
   // 空行除去
   // 完全な空行はエスケープ済みなので再帰的バックトラックにはならない。
-  String.raw`(?:${starts}(?:\\?\s|&(?:${normalize_1.invisibleBlankHTMLEntityNames.join('|')});|[${normalize_1.invisibleBlankCharacters.join('')}]|<wbr ?>)*)?`, typeof delimiter === 'string' ? delimiter.replace(/[*+()\[\]]/g, '\\$&') : delimiter.source].join(''), 'y');
+  String.raw`(?:${starts}(?:\\?\s|&(?:${normalize_1.invisibleBlankHTMLEntityNames.join('|')});|<wbr ?>)*)?`, typeof delimiter === 'string' ? delimiter.replace(/[*+()\[\]]/g, '\\$&') : delimiter.source].join(''), 'y');
 }
 exports.blankWith = blankWith;
 function beforeNonblankWith(delimiter) {
-  return new RegExp([typeof delimiter === 'string' ? delimiter.replace(/[*+()\[\]]/g, '\\$&') : delimiter.source, String.raw`(?!\\?\s|&(?:${normalize_1.invisibleBlankHTMLEntityNames.join('|')});|[${normalize_1.invisibleBlankCharacters.join('')}]|<wbr ?>)`].join(''), 'y');
+  return new RegExp([typeof delimiter === 'string' ? delimiter.replace(/[*+()\[\]]/g, '\\$&') : delimiter.source, String.raw`(?!\\?\s|&(?:${normalize_1.invisibleBlankHTMLEntityNames.join('|')});|<wbr ?>)`].join(''), 'y');
 }
 exports.beforeNonblankWith = beforeNonblankWith;
 function afterNonblankWith(delimiter) {
-  return new RegExp([String.raw`(?<!\s|&(?:${normalize_1.invisibleBlankHTMLEntityNames.join('|')});|[${normalize_1.invisibleBlankCharacters.join('')}]|<wbr ?>)`, typeof delimiter === 'string' ? delimiter.replace(/[*+()\[\]]/g, '\\$&') : delimiter.source].join(''), 'y');
+  return new RegExp([String.raw`(?<!\s|&(?:${normalize_1.invisibleBlankHTMLEntityNames.join('|')});|<wbr ?>)`, typeof delimiter === 'string' ? delimiter.replace(/[*+()\[\]]/g, '\\$&') : delimiter.source].join(''), 'y');
 }
 function isNonblankFirstLine(nodes) {
   if (nodes.length === 0) return true;

package/markdown.d.ts

@@ -1082,7 +1082,7 @@ export namespace MarkdownParser {
         Inline<'url'>,
         Parser<string | HTMLElement, Context, [
           Parser<HTMLAnchorElement, Context, []>,
-          InlineParser,
+          Parser<string, Context, []>,
         ]> {
       }
       export namespace UrlParser {
@@ -1092,7 +1092,7 @@ export namespace MarkdownParser {
             SourceParser.StrParser,
             Parser<string | HTMLElement, Context, [
               Parser<HTMLAnchorElement, Context, []>,
-              SourceParser.StrParser,
+              Parser<string, Context, []>,
             ]>,
           ]> {
         }

package/package.json

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

package/src/combinator/data/delimiter.ts

@@ -37,6 +37,8 @@ export class Delimiters {
         assert(pattern !== '');
         return index(`'${pattern}`);
       case 'object':
+        assert(pattern.flags.includes('y'));
+        assert(/^yu?$/.test(pattern.flags));
         return index(`/${pattern.source}`);
     }
   }

package/src/combinator/data/parser/some.ts

@@ -4,24 +4,31 @@ import { Delimiters } from '../delimiter';
 type DelimiterOption = readonly [delimiter: string | RegExp, precedence: number];
 
 export function some<P extends Parser>(parser: P, limit?: number): P;
-export function some<P extends Parser>(parser: P, delimiters?: readonly DelimiterOption[]): P;
-export function some<P extends Parser>(parser: P, delimiter: string | RegExp, delimiters?: readonly DelimiterOption[]): P;
-export function some<P extends Parser>(parser: P, delimiter: string | RegExp, after: string | RegExp, delimiters?: readonly DelimiterOption[]): P;
-export function some<N>(parser: Parser<N>, delimiter?: number | string | RegExp | readonly DelimiterOption[], after?: string | RegExp | readonly DelimiterOption[], delimiters?: readonly DelimiterOption[], limit = -1): Parser<N> {
+export function some<P extends Parser>(parser: P, delimiters?: readonly DelimiterOption[], limit?: number): P;
+export function some<P extends Parser>(parser: P, delimiter: string | RegExp, delimiters?: readonly DelimiterOption[], limit?: number): P;
+export function some<P extends Parser>(parser: P, delimiter: string | RegExp, after: string | RegExp, delimiters?: readonly DelimiterOption[], limit?: number): P;
+export function some<N>(parser: Parser<N>, delimiter?: number | string | RegExp | readonly DelimiterOption[], after?: number | string | RegExp | readonly DelimiterOption[], delimiters?: number | readonly DelimiterOption[], limit = 0): Parser<N> {
   if (typeof delimiter === 'number') {
     limit = delimiter;
+    delimiters = undefined;
     delimiter = undefined;
   }
   else if (Array.isArray(delimiter)) {
+    limit = after as number;
     delimiters = delimiter;
     delimiter = undefined;
   }
   else if (after === undefined || Array.isArray(after)) {
+    limit = delimiters as number;
     delimiters = after;
     after = undefined;
   }
+  else {
+    delimiters = delimiters as readonly DelimiterOption[];
+  }
   assert(parser);
   assert(delimiter !== '');
+  assert(delimiters === undefined || Array.isArray(delimiters));
   const match = Delimiters.tester(delimiter as string, after as string);
   const delims = delimiters?.map(([delimiter, precedence]) => ({
     signature: Delimiters.signature(delimiter),
@@ -43,7 +50,8 @@ export function some<N>(parser: Parser<N>, delimiter?: number | string | RegExp
       if (result === undefined) break;
       if (context.position === pos) break;
       nodes = nodes?.import(result) ?? result;
-      if (limit >= 0 && context.position - position > limit) break;
+      // 次にパースに成功すれば確実に制限値を超えるので制限値ちょうどでも中止する
+      if (limit > 0 && context.position - position >= limit) break;
     }
     delims && context.delimiters.pop(delims.length);
     assert(context.position >= position);

package/src/parser/api/header.ts

@@ -8,7 +8,11 @@ export function header(source: string): string {
 
 export function headers(source: string): string[] {
   const [el] = parse(source);
-  return el?.textContent!.trimEnd().slice(el.firstChild!.firstChild!.textContent!.length).split(/\r?\n/) ?? [];
+  const acc = [];
+  for (let field = el?.firstChild?.firstChild; field = field?.nextSibling;) {
+    acc.push(field.textContent!);
+  }
+  return acc;
 }
 
 function parse(source: string): [HTMLElement, number] | [] {

package/src/parser/api/normalize.ts

@@ -65,8 +65,7 @@ const parser = (el => (entity: string): string => {
 })(html('span'));
 export const invisibleBlankHTMLEntityNames: readonly string[] = invisibleHTMLEntityNames
   .filter(name => parser(`&${name};`).trimStart() === '');
-export const invisibleBlankCharacters: readonly string[] = invisibleBlankHTMLEntityNames
-  .map(name => parser(`&${name};`));
+assert(invisibleBlankHTMLEntityNames.every(name => /^\s$/.test(parser(`&${name};`))));
 export const invisibleGraphHTMLEntityNames: readonly string[] = invisibleHTMLEntityNames
   .filter(name => parser(`&${name};`).trimStart() !== '');
 const unreadableEscapeHTMLEntityNames = invisibleHTMLEntityNames.filter(name => ![

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

@@ -125,7 +125,7 @@ describe('Unit: parser/api/parse', () => {
           '!{../../a}',
         ].join('\n\n'), { host: new URL(`${location.origin}/z`) }).children].map(el => el.outerHTML),
         [
-          '<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="url" data-value="https://source/x/y"><span class="field-name">URL</span>: <span class="field-value">https://source/x/y</span>\n</span></details></aside>',
+          '<aside class="header"><details open=""><summary>Header</summary><div class="field" data-name="url" data-value="https://source/x/y"><span class="field-name">URL</span>: <span class="field-value">https://source/x/y</span></div></details></aside>',
           '<p><a class="account" href="https://source/@a" target="_blank">@a</a></p>',
           '<p><a class="account" href="https://domain/@a" target="_blank">@domain/a</a></p>',
           '<p><a class="channel" href="https://source/@a?ch=b" target="_blank">@a#b</a></p>',
@@ -158,7 +158,7 @@ describe('Unit: parser/api/parse', () => {
           '{./a}',
         ].join('\n\n'), { host: new URL(`${location.origin}/index.md`) }).children].map(el => el.outerHTML),
         [
-          '<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="url" data-value="https://source/x/y"><span class="field-name">URL</span>: <span class="field-value">https://source/x/y</span>\n</span></details></aside>',
+          '<aside class="header"><details open=""><summary>Header</summary><div class="field" data-name="url" data-value="https://source/x/y"><span class="field-name">URL</span>: <span class="field-value">https://source/x/y</span></div></details></aside>',
           '<p><a class="url" href="/a">^/a</a></p>',
           '<p><a class="url" href="https://source/x/a" target="_blank">./a</a></p>',
         ]);
@@ -173,7 +173,7 @@ describe('Unit: parser/api/parse', () => {
           '{./a}',
         ].join('\n\n'), { host: new URL(`${location.origin}/z`) }).children].map(el => el.outerHTML),
         [
-          `<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="url" data-value="${location.origin}/x/y"><span class="field-name">URL</span>: <span class="field-value">${location.origin}/x/y</span>\n</span></details></aside>`,
+          `<aside class="header"><details open=""><summary>Header</summary><div class="field" data-name="url" data-value="${location.origin}/x/y"><span class="field-name">URL</span>: <span class="field-value">${location.origin}/x/y</span></div></details></aside>`,
           '<p><a class="url" href="/z/a">^/a</a></p>',
           '<p><a class="url" href="/x/a">./a</a></p>',
         ]);
@@ -204,9 +204,9 @@ describe('Unit: parser/api/parse', () => {
           '{#}',
         ].join('\n\n'), { host: new URL(`${location.origin}/z`) }).children].map(el => normalize(el.outerHTML)),
         [
-          `<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="url" data-value="https://example/x"><span class="field-name">URL</span>: <span class="field-value">https://example/x</span>\n</span></details></aside>`,
+          `<aside class="header"><details open=""><summary>Header</summary><div class="field" data-name="url" data-value="https://example/x"><span class="field-name">URL</span>: <span class="field-value">https://example/x</span></div></details></aside>`,
           '<pre class="invalid" translate="no">---\nURL: https://example/y\n---\n</pre>',
-          '<aside class="example" data-type="markdown"><pre translate="no">---\nURL: https://example/y\n---\n\n{#}</pre><hr><section><aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="url" data-value="https://example/y"><span class="field-name">URL</span>: <span class="field-value">https://example/y</span>\n</span></details></aside><p><a class="url" href="https://example/y#" target="_blank">#</a></p><h2>References</h2><ol class="references"></ol></section></aside>',
+          '<aside class="example" data-type="markdown"><pre translate="no">---\nURL: https://example/y\n---\n\n{#}</pre><hr><section><aside class="header"><details open=""><summary>Header</summary><div class="field" data-name="url" data-value="https://example/y"><span class="field-name">URL</span>: <span class="field-value">https://example/y</span></div></details></aside><p><a class="url" href="https://example/y#" target="_blank">#</a></p><h2>References</h2><ol class="references"></ol></section></aside>',
           '<p><a class="url" href="https://example/x#" target="_blank">#</a></p>',
         ]);
     });
@@ -380,28 +380,28 @@ describe('Unit: parser/api/parse', () => {
       // 最悪計算量での実行速度はCommonMarkの公式JS実装の32nに対して1-4倍程度。
       // 5n = reference + link + url/math + ruby + text
       assert.deepStrictEqual(
-        [...parse(`((([[[[#$[${'.'.repeat(19998)}`, {}, new Context({ resources: { clock: 100000, recursions: [100] } })).children]
+        [...parse(`((([[[[#$http://[${'.'.repeat(19992)}`, {}, new Context({ resources: { clock: 100000, recursions: [100] } })).children]
           .map(el => el.tagName),
         ['P']);
     });
 
     it('backtrack 1 error', () => {
       assert.deepStrictEqual(
-        [...parse(`((([[[[#$[${'.'.repeat(19998 + 1)}`, {}, new Context({ resources: { clock: 100000, recursions: [100] } })).children]
+        [...parse(`((([[[[#$http://[${'.'.repeat(19992 + 1)}`, {}, new Context({ resources: { clock: 100000, recursions: [100] } })).children]
           .map(el => el.tagName),
         ['H1', 'PRE']);
     });
 
     it('backtrack 2', () => {
       assert.deepStrictEqual(
-        [...parse(`((([[[[#$[${'.'.repeat(19998)}]]]`, {}, new Context({ resources: { clock: 100000, recursions: [100] } })).children]
+        [...parse(`((([[[[#$http://[${'.'.repeat(33324)}]]]`, {}, new Context({ resources: { clock: 100000, recursions: [100] } })).children]
           .map(el => el.tagName),
         ['P', 'OL']);
     });
 
     it('backtrack 2 error', () => {
       assert.deepStrictEqual(
-        [...parse(`((([[[[#$[${'.'.repeat(19998 + 1)}]]]`, {}, new Context({ resources: { clock: 100000, recursions: [100] } })).children]
+        [...parse(`((([[[[#$http://[${'.'.repeat(33324 + 1)}]]]`, {}, new Context({ resources: { clock: 100000, recursions: [100] } })).children]
           .map(el => el.tagName),
         ['H1', 'PRE']);
     });

package/src/parser/context.ts

@@ -22,7 +22,7 @@ export class Context extends Ctx {
     } = options;
     this.resources ??= {
       // バックトラックのせいで文字数制限を受けないようにする。
-      clock: MAX_SEGMENT_SIZE * (6 + 1),
+      clock: MAX_SEGMENT_SIZE * (5 + 1),
       recursions: [
         5 || Recursion.block,
         20 || Recursion.blockquote,

package/src/parser/header.test.ts

@@ -24,11 +24,11 @@ describe('Unit: parser/header', () => {
     });
 
     it('basic', () => {
-      assert.deepStrictEqual(inspect(parser, input('---\na: b\n---', new Context())), [['<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="a" data-value="b"><span class="field-name">a</span>: <span class="field-value">b</span>\n</span></details></aside>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('---\na: b\n---\n', new Context())), [['<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="a" data-value="b"><span class="field-name">a</span>: <span class="field-value">b</span>\n</span></details></aside>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('---\na: b\nC: D e\n---\n', new Context())), [['<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="a" data-value="b"><span class="field-name">a</span>: <span class="field-value">b</span>\n</span><span class="field" data-name="c" data-value="D e"><span class="field-name">C</span>: <span class="field-value">D e</span>\n</span></details></aside>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('---\r\na: b\r\nC: D e\r\n---\r\n', new Context())), [['<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="a" data-value="b"><span class="field-name">a</span>: <span class="field-value">b</span>\n</span><span class="field" data-name="c" data-value="D e"><span class="field-name">C</span>: <span class="field-value">D e</span>\n</span></details></aside>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('----\na: b\n----', new Context())), [['<aside class="header"><details open=""><summary>Header</summary><span class="field" data-name="a" data-value="b"><span class="field-name">a</span>: <span class="field-value">b</span>\n</span></details></aside>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('---\na: b\n---', new Context())), [['<aside class="header"><details open=""><summary>Header</summary><div class="field" data-name="a" data-value="b"><span class="field-name">a</span>: <span class="field-value">b</span></div></details></aside>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('---\na: b\n---\n', new Context())), [['<aside class="header"><details open=""><summary>Header</summary><div class="field" data-name="a" data-value="b"><span class="field-name">a</span>: <span class="field-value">b</span></div></details></aside>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('---\na: b\nC: D e\n---\n', new Context())), [['<aside class="header"><details open=""><summary>Header</summary><div class="field" data-name="a" data-value="b"><span class="field-name">a</span>: <span class="field-value">b</span></div><div class="field" data-name="c" data-value="D e"><span class="field-name">C</span>: <span class="field-value">D e</span></div></details></aside>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('---\r\na: b\r\nC: D e\r\n---\r\n', new Context())), [['<aside class="header"><details open=""><summary>Header</summary><div class="field" data-name="a" data-value="b"><span class="field-name">a</span>: <span class="field-value">b</span></div><div class="field" data-name="c" data-value="D e"><span class="field-name">C</span>: <span class="field-value">D e</span></div></details></aside>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('----\na: b\n----', new Context())), [['<aside class="header"><details open=""><summary>Header</summary><div class="field" data-name="a" data-value="b"><span class="field-name">a</span>: <span class="field-value">b</span></div></details></aside>'], '']);
     });
 
   });

package/src/parser/header.ts

@@ -11,7 +11,7 @@ export const header: MarkdownParser.HeaderParser = lazy(() => validate(
     block(
       union([
         validate(context => context.header,
-        focus(/(---+)[^\S\r\n]*\r?\n(?:[a-z][0-9a-z]*(?:-[0-9a-z]+)*:[ \t]+\S[^\r\n]*\r?\n){1,100}\1[^\S\r\n]*(?:$|\r?\n)/yi,
+        focus(/(---+)[^\S\r\n]*\r?\n(?:[a-z][0-9a-z]*(?:-[0-9a-z]+)*:[ \t]+\S[^\r\n]*\r?\n){1,32}\1[^\S\r\n]*(?:$|\r?\n)/yi,
         convert(source =>
           source.slice(source.indexOf('\n') + 1, source.trimEnd().lastIndexOf('\n')),
           fmap(
@@ -42,11 +42,10 @@ const field: MarkdownParser.HeaderParser.FieldParser = line(({ source, position
   const name = source.slice(position, source.indexOf(':', position));
   const value = source.slice(position + name.length + 1).trim();
   return new List([
-    new Node(html('span', { class: 'field', 'data-name': name.toLowerCase(), 'data-value': value }, [
+    new Node(html('div', { class: 'field', 'data-name': name.toLowerCase(), 'data-value': value }, [
       html('span', { class: 'field-name' }, name),
       ': ',
       html('span', { class: 'field-value' }, value),
-      '\n',
     ])),
   ]);
 });

package/src/parser/inline/annotation.ts

@@ -41,17 +41,22 @@ export const annotation: AnnotationParser = lazy(() => constraint(State.annotati
           new Node(html('span', { class: bracketname(context, 1, 1) }, defrag(unwrap(nodes))))
         ]);
       }
-      recursion.add(MAX_DEPTH - (resources?.recursions[Recursion.bracket] ?? resources?.recursions.at(-1) ?? MAX_DEPTH));
+      recursion.add(
+        MAX_DEPTH - (resources?.recursions[Recursion.bracket] ?? resources?.recursions.at(-1) ?? MAX_DEPTH));
       context.position += 1;
       return new List([
-        new Node(html('sup', { class: 'annotation' }, [html('span', defrag(unwrap(trimBlankNodeEnd(nodes))))]))
+        new Node(html('sup', { class: 'annotation' }, [
+          html('span', defrag(unwrap(trimBlankNodeEnd(nodes))))
+        ]))
       ]);
     },
     (nodes, context, prefix, postfix) => {
       assert(postfix === 0);
       for (let i = 0; i < prefix; ++i) {
         nodes.unshift(new Node('('));
-        nodes = new List([new Node(html('span', { class: bracketname(context, 0, 0) }, defrag(unwrap(nodes))))]);
+        nodes = new List([
+          new Node(html('span', { class: bracketname(context, 0, 0) }, defrag(unwrap(nodes))))
+        ]);
         context.range += 1;
       }
       return nodes;

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

@@ -2,13 +2,12 @@ import { AutolinkParser } from '../../inline';
 import { State, Recursion, Backtrack } from '../../context';
 import { List, Node } from '../../../combinator/data/parser';
 import { union, tails, some, recursion, precedence, state, constraint, focus, rewrite, surround, open, lazy } from '../../../combinator';
-import { inline } from '../../inline';
 import { parse } 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?:\/\/(?=[[0-9A-Za-z])/y,
     precedence(0, some(union([
       some(unescsource, /(?<![-+*=~^_,.;:!?]|\/{3})(?:[-+*=~^_,.;:!?]|\/{3,}(?!\/))*(?=[\\$"`\[\](){}<>（）［］｛｝|]|[^\x21-\x7E]|$)/y),
       precedence(1, bracket),
@@ -18,7 +17,7 @@ export const url: AutolinkParser.UrlParser = lazy(() => rewrite(
   union([
     constraint(State.autolink, state(State.autolink, context =>
       new List([new Node(parse(new List(), new List([new Node(context.source)]), context))]))),
-    open(str(/[^:]+/y), some(inline)),
+    context => new List([new Node(context.source)]),
   ])));
 
 export const lineurl: AutolinkParser.UrlParser.LineUrlParser = lazy(() => focus(
@@ -36,7 +35,7 @@ export const lineurl: AutolinkParser.UrlParser.LineUrlParser = lazy(() => focus(
             context))
         ]);
       })),
-      str(/[^:]+/y),
+      context => new List([new Node(context.source)]),
     ]),
   ])));
 

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

@@ -93,8 +93,8 @@ describe('Unit: parser/inline/math', () => {
       assert.deepStrictEqual(inspect(parser, input('$\\Begin$', new Context())), [['<span class="invalid" translate="no">$\\Begin$</span>'], '']);
       assert.deepStrictEqual(inspect(parser, input('$\\begin{}$', new Context())), [['<span class="invalid" translate="no">$\\begin{}$</span>'], '']);
       assert.deepStrictEqual(inspect(parser, input('${\\begin}$', new Context())), [['<span class="invalid" translate="no">${\\begin}$</span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('$http://host$', new Context())), [['<span class="invalid" translate="no">$http://host$</span>'], '']);
-      assert.deepStrictEqual(inspect(parser, input('${http://host}$', new Context())), [['<span class="invalid" translate="no">${http://host}$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser, input('$http://host$', new Context())), undefined);
+      assert.deepStrictEqual(inspect(parser, input('${http://host}$', new Context())), undefined);
       assert.deepStrictEqual(inspect(parser, input(' ${a}$', new Context())), undefined);
     });
 

package/src/parser/inline/math.ts

@@ -6,7 +6,7 @@ import { escsource, str } from '../source';
 import { invalid } from '../util';
 import { html } from 'typed-dom/dom';
 
-const forbiddenCommand = /\\(?:begin|tiny|huge|large)(?![a-z])|:\/\//i;
+const forbiddenCommand = /\\(?:begin|tiny|huge|large)(?![a-z])/i;
 
 export const math: MathParser = lazy(() => rewrite(
   union([
@@ -19,7 +19,7 @@ export const math: MathParser = lazy(() => rewrite(
     surround(
       /\$(?![\s{}])/y,
       precedence(2, some(union([
-        some(escsource, /\$|[`"{}\r\n]/y),
+        some(escsource, /[`"{}$\r\n]|(?<=[0-9A-Za-z]):\/\/[[0-9A-Za-z]/y),
         precedence(4, bracket),
       ]))),
       /(?<!\s)\$(?![-0-9A-Za-z])/y,
@@ -45,7 +45,7 @@ const bracket: MathParser.BracketParser = lazy(() => surround(
   recursion(Recursion.terminal,
   some(union([
     bracket,
-    some(escsource, /[{}$\r\n]/y),
+    some(escsource, /[{}$\r\n]|(?<=[0-9A-Za-z]):\/\/[[0-9A-Za-z]/y),
   ]))),
   str('}'),
   true));

package/src/parser/inline/ruby.ts

@@ -20,13 +20,12 @@ export const ruby: RubyParser = lazy(() => bind(
       })),
     dup(surround(
       '(', text, ')',
-      false,
-      [3 | Backtrack.ruby])),
+      false)),
   ]),
   ([{ value: texts }, { value: rubies = undefined } = {}], context) => {
     if (rubies === undefined) {
       const head = context.position - context.range;
-      return void setBacktrack(context, 2 | Backtrack.ruby, head);
+      return void setBacktrack(context, 2 | Backtrack.link | Backtrack.ruby, head);
     }
     switch (true) {
       case texts.length >= rubies.length:

package/src/parser/inline.test.ts

@@ -167,7 +167,7 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser, input('"[% "*"* %]', new Context())), [['"', '<span class="remark"><input type="checkbox"><span>[% "*"* %]</span></span>'], '']);
       assert.deepStrictEqual(inspect(parser, input('"{{""}}', new Context())), [['"', '{', '<a class="url" href="&quot;&quot;">""</a>', '}'], '']);
       assert.deepStrictEqual(inspect(parser, input('[#http://host/(<bdi>)]</bdi>', new Context())), [['<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, input('[#@a/http://host/(<bdi>)]</bdi>', new Context())), [['<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, input('[#@a/http://host/(<bdi>)]</bdi>', new Context())), [['<a class="index" href="#index::@a/http://host/(&lt;bdi&gt;)">@a/http://host/(&lt;bdi&gt;)</a>', '</bdi', '>'], '']);
       assert.deepStrictEqual(inspect(parser, input('[#a|<bdi>]</bdi>', new Context())), [['<a class="index" href="#index::a|&lt;bdi&gt;">a|<span class="invalid">&lt;bdi&gt;</span></a>', '</bdi', '>'], '']);
       assert.deepStrictEqual(inspect(parser, input('[[#a|<bdi>]</bdi>', new Context())), [['[', '<a class="index" href="#index::a|&lt;bdi&gt;">a|<span class="invalid">&lt;bdi&gt;</span></a>', '</bdi', '>'], '']);
       assert.deepStrictEqual(inspect(parser, input('[*==*]{a}', new Context())), [['<a class="link" href="a">*==*</a>'], '']);

package/src/parser/repeat.ts

@@ -68,10 +68,10 @@ export function repeat<N extends HTMLElement | string>(
         follow = follow > 0 ? follow : countFollows(source, pos, closer, lead / opener.length | 0);
         nodes = cons(nodes, context, lead, follow);
         if (context.position > pos) {
-          const advance = opener.length * (context.position - pos) / closer.length | 0;
+          const advance = context.position - pos;
           i -= advance;
           follow -= advance;
-          depth -= advance;
+          depth -= advance / closer.length | 0;
         }
         continue;
       }
@@ -100,10 +100,10 @@ export function repeat<N extends HTMLElement | string>(
           nodes = cons(nodes, context, lead, follow);
           state = true;
           if (context.position > pos) {
-            const advance = opener.length * (context.position - pos) / closer.length | 0;
+            const advance = context.position - pos;
             i -= advance;
             follow -= advance;
-            depth -= advance;
+            depth -= advance / closer.length | 0;
           }
           continue;
       }

package/src/parser/source/escapable.ts

@@ -3,13 +3,10 @@ import { Command } from '../context';
 import { Flag } from '../node';
 import { List, Node } from '../../combinator/data/parser';
 import { consume } from '../../combinator';
-import { next } from './text';
 import { html } from 'typed-dom/dom';
 
-const delimiter = /(?=[\\$"`\[\](){}\r\n]|\s\$|:\/\/)/g;
-
 export const escsource: EscapableSourceParser = context => {
-  const { source, position, state } = context;
+  const { source, position } = context;
   if (position === source.length) return;
   const char = source[position];
   consume(1, context);
@@ -38,7 +35,7 @@ export const escsource: EscapableSourceParser = context => {
     default:
       assert(char !== '\n');
       if (context.sequential) return new List([new Node(char)]);
-      let i = next(source, position, state, delimiter);
+      let i = seek(source, position);
       assert(i > position);
       i -= position;
       consume(i - 1, context);
@@ -46,3 +43,29 @@ export const escsource: EscapableSourceParser = context => {
       return new List([new Node(source.slice(position, context.position))]);
   }
 };
+
+function seek(source: string, position: number): number {
+  for (let i = position + 1; i < source.length; ++i) {
+    const char = source[i];
+    switch (char) {
+      case '\\':
+      case '$':
+      case '"':
+      case '`':
+      case ':':
+      case '[':
+      case ']':
+      case '(':
+      case ')':
+      case '{':
+      case '}':
+      case '\r':
+      case '\n':
+        return i;
+      default:
+        continue;
+    }
+    assert(false);
+  }
+  return source.length;
+}

package/src/parser/source/text.ts

@@ -83,28 +83,20 @@ function isWhitespace(char: string, linebreak: boolean): boolean {
   }
 }
 
-export function next(source: string, position: number, state: number, delimiter?: RegExp): number {
-  let index: number;
-  if (delimiter) {
-    delimiter.lastIndex = position + 1;
-    delimiter.test(source);
-    index = delimiter.lastIndex || position;
-  }
-  else {
-    index = seek(source, position, state);
-  }
-  if (index === position || index === source.length) return source.length;
+function next(source: string, position: number, state: number): number {
+  let index= seek(source, position, state);
   assert(index > position);
+  if (index === source.length) return source.length;
   const char = source[index];
   switch (char) {
     case '%':
-      assert(source.startsWith('%]', index) && isWhitespace(source[index - 1], true) || delimiter);
-      index += !delimiter && index - 1 > position
+      assert(source.startsWith('%]', index) && isWhitespace(source[index - 1], true));
+      index += index - 1 > position
         ? -1
         : 0;
       break;
     case '[':
-      index += !delimiter && index - 1 > position && source.startsWith(' [|', index - 1)
+      index += index - 1 > position && source.startsWith(' [|', index - 1)
         ? -1
         : 0;
       break;
@@ -122,7 +114,7 @@ export function next(source: string, position: number, state: number, delimiter?
   assert(index > position);
   return index;
 }
-function backToUrlHead(source: string, position: number, index: number): number {
+export function backToUrlHead(source: string, position: number, index: number): number {
   const delim = index;
   let state = false;
   for (let i = index - 1; i >= position; --i) {
@@ -145,7 +137,7 @@ function backToUrlHead(source: string, position: number, index: number): number
     ? delim
     : index;
 }
-function backToEmailHead(source: string, position: number, index: number): number {
+export function backToEmailHead(source: string, position: number, index: number): number {
   const delim = index;
   let state = false;
   for (let i = index - 1; i >= position; --i) {

package/src/parser/source/unescapable.test.ts

@@ -15,7 +15,7 @@ describe('Unit: parser/source/unescapable', () => {
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser, input('a', new Context())), [['a'], '']);
       assert.deepStrictEqual(inspect(parser, input('ab', new Context())), [['ab'], '']);
-      assert.deepStrictEqual(inspect(parser, input('a b c', new Context())), [['a', ' b', ' c'], '']);
+      assert.deepStrictEqual(inspect(parser, input('a b c', new Context())), [['a', ' b c'], '']);
       assert.deepStrictEqual(inspect(parser, input('09あいAZaz', new Context())), [['09', 'あいAZaz'], '']);
     });
 

package/src/parser/source/unescapable.ts

@@ -1,13 +1,11 @@
 import { UnescapableSourceParser } from '../source';
-import { Command } from '../context';
+import { State, Command } from '../context';
 import { Flag } from '../node';
 import { List, Node } from '../../combinator/data/parser';
 import { consume } from '../../combinator';
-import { nonWhitespace, canSkip, next } from './text';
+import { nonWhitespace, canSkip, backToUrlHead, backToEmailHead } from './text';
 import { html } from 'typed-dom/dom';
 
-export const delimiter = /(?=(?=[\x00-\x7F])[^0-9A-Za-z]|(?<=[\x00-\x7F])[^\x00-\x7F])/g;
-
 export const unescsource: UnescapableSourceParser = context => {
   const { source, position, state } = context;
   if (position === source.length) return;
@@ -32,7 +30,7 @@ export const unescsource: UnescapableSourceParser = context => {
         ? nonWhitespace.test(source)
           ? nonWhitespace.lastIndex - 1
           : source.length
-        : next(source, position, state, delimiter);
+        : next(source, position, state);
       assert(i > position);
       i -= position;
       consume(i - 1, context);
@@ -40,3 +38,86 @@ export const unescsource: UnescapableSourceParser = context => {
       return new List([new Node(source.slice(position, context.position))]);
   }
 };
+
+function next(source: string, position: number, state: number): number {
+  let index= seek(source, position, state);
+  assert(index > position);
+  if (index === source.length) return source.length;
+  const char = source[index];
+  switch (char) {
+    case ':':
+      index = source.startsWith('//', index + 1)
+        ? backToUrlHead(source, position, index)
+        : index;
+      break;
+    case '@':
+      index = ~state & State.autolink
+        ? backToEmailHead(source, position, index)
+        : index;
+      break;
+  }
+  assert(index > position);
+  return index;
+}
+
+function seek(source: string, position: number, state: number): number {
+  const cat = category(source[position]);
+  for (let i = position + 1; i < source.length; ++i) {
+    const char = source[i];
+    switch (char) {
+      case '\\':
+      case '!':
+      case '$':
+      case '"':
+      case '`':
+      case '[':
+      case ']':
+      case '(':
+      case ')':
+      case '{':
+      case '}':
+      case '<':
+      case '>':
+      case '（':
+      case '）':
+      case '［':
+      case '］':
+      case '｛':
+      case '｝':
+      case '-':
+      case '+':
+      case '*':
+      case '=':
+      case '~':
+      case '^':
+      case '_':
+      case ',':
+      case '.':
+      case ';':
+      case ':':
+      case '!':
+      case '?':
+      case '/':
+      case '|':
+      case '\r':
+      case '\n':
+        return i;
+      case '@':
+      case '#':
+        if (~state & State.autolink) return i;
+        continue;
+      case ':':
+        if (source[i + 1] === '/' && source[i + 2] === '/') return i;
+        continue;
+      default:
+        if (cat && !category(char)) return i;
+        continue;
+    }
+    assert(false);
+  }
+  return source.length;
+}
+
+function category(char: string): boolean {
+  return '\x21' <= char && char <= '\x7E';
+}

package/src/parser/visibility.ts

@@ -2,23 +2,20 @@ import { Parser, List, Node } from '../combinator/data/parser';
 import { Command } from './context';
 import { Flag } from './node';
 import { convert, fmap } from '../combinator';
-import { invisibleBlankHTMLEntityNames, invisibleBlankCharacters } from './api/normalize';
+import { invisibleBlankHTMLEntityNames } from './api/normalize';
 
 namespace blank {
   export const line = new RegExp(
-    /((?:^|\n)[^\S\r\n]*(?=\S))((?:[^\S\r\n]|\\(?=$|\s)|&IBHN;|[IBC]|<wbr ?>)+(?=$|\r?\n))/g.source
-      .replace('IBHN', `(?:${invisibleBlankHTMLEntityNames.join('|')})`)
-      .replace('IBC', `${invisibleBlankCharacters.join('')}`),
+    /((?:^|\n)[^\S\r\n]*(?=\S))((?:[^\S\r\n]|\\(?=$|\s)|&IBHN;|<wbr ?>)+(?=$|\r?\n))/g.source
+      .replace('IBHN', `(?:${invisibleBlankHTMLEntityNames.join('|')})`),
     'g');
   export const start = new RegExp(
-    /(?:[^\S\r\n]|\\(?=$|\s)|&IBHN;|[IBC]|<wbr ?>)+/y.source
-      .replace('IBHN', `(?:${invisibleBlankHTMLEntityNames.join('|')})`)
-      .replace('IBC', `${invisibleBlankCharacters.join('')}`),
+    /(?:[^\S\r\n]|\\(?=$|\s)|&IBHN;|<wbr ?>)+/y.source
+      .replace('IBHN', `(?:${invisibleBlankHTMLEntityNames.join('|')})`),
     'y');
   export const unit = new RegExp(
-    /(?:[^\S\r\n]|\\(?=$|\s)|&IBHN;|[IBC]|<wbr ?>)/y.source
-      .replace('IBHN', `(?:${invisibleBlankHTMLEntityNames.join('|')})`)
-      .replace('IBC', `${invisibleBlankCharacters.join('')}`),
+    /(?:[^\S\r\n]|\\(?=$|\s)|&IBHN;|<wbr ?>)/y.source
+      .replace('IBHN', `(?:${invisibleBlankHTMLEntityNames.join('|')})`),
     'y');
 }
 
@@ -34,7 +31,7 @@ export function blankWith(starts: '\n', delimiter: string | RegExp): RegExp {
   return new RegExp([
     // 空行除去
     // 完全な空行はエスケープ済みなので再帰的バックトラックにはならない。
-    String.raw`(?:${starts}(?:\\?\s|&(?:${invisibleBlankHTMLEntityNames.join('|')});|[${invisibleBlankCharacters.join('')}]|<wbr ?>)*)?`,
+    String.raw`(?:${starts}(?:\\?\s|&(?:${invisibleBlankHTMLEntityNames.join('|')});|<wbr ?>)*)?`,
     typeof delimiter === 'string'
       ? delimiter.replace(/[*+()\[\]]/g, '\\$&')
       : delimiter.source,
@@ -45,12 +42,12 @@ export function beforeNonblankWith(delimiter: string | RegExp): RegExp {
     typeof delimiter === 'string'
       ? delimiter.replace(/[*+()\[\]]/g, '\\$&')
       : delimiter.source,
-    String.raw`(?!\\?\s|&(?:${invisibleBlankHTMLEntityNames.join('|')});|[${invisibleBlankCharacters.join('')}]|<wbr ?>)`,
+    String.raw`(?!\\?\s|&(?:${invisibleBlankHTMLEntityNames.join('|')});|<wbr ?>)`,
   ].join(''), 'y');
 }
 function afterNonblankWith(delimiter: string | RegExp): RegExp {
   return new RegExp([
-    String.raw`(?<!\s|&(?:${invisibleBlankHTMLEntityNames.join('|')});|[${invisibleBlankCharacters.join('')}]|<wbr ?>)`,
+    String.raw`(?<!\s|&(?:${invisibleBlankHTMLEntityNames.join('|')});|<wbr ?>)`,
     typeof delimiter === 'string'
       ? delimiter.replace(/[*+()\[\]]/g, '\\$&')
       : delimiter.source,