securemark 0.299.2 → 0.299.3

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.299.3
+
+- Refactoring.
+
 ## 0.299.2
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.299.2 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.299.3 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"));
@@ -2605,7 +2605,7 @@ function fence(opener, limit, separation = true) {
     opener.lastIndex = position;
     const matches = opener.exec(source);
     if (!matches) return;
-    (0, combinator_1.consume)(matches[0].length, context);
+    (0, combinator_1.spend)(context, matches[0].length);
     const delim = matches[1];
     if (matches[0].includes(delim, delim.length)) return;
     context.position += matches[0].length;
@@ -2727,7 +2727,7 @@ function match(pattern, f) {
     pattern.lastIndex = position;
     const params = pattern.exec(source);
     if (!params) return;
-    count && (0, combinator_1.consume)(params[0].length, context);
+    count && (0, combinator_1.spend)(context, params[0].length);
     const result = f(params)(input);
     context.position += result ? context.position === position ? params[0].length : 0 : context.position - position;
     return result;
@@ -3239,7 +3239,7 @@ function matcher(pattern, advance, after) {
         pos = position;
         if (index === -1) return;
         const src = source.slice(position, index);
-        count && !hit && (0, context_1.consume)(src.length, context);
+        count && !hit && (0, context_1.spend)(context, src.length);
         if (advance) {
           context.position = index;
         }
@@ -3290,7 +3290,7 @@ function tester(pattern, advance, after) {
         pos = position;
         if (index === -1) return;
         const len = index - position;
-        count && !hit && (0, context_1.consume)(len, context);
+        count && !hit && (0, context_1.spend)(context, len);
         if (advance) {
           context.position = index;
         }
@@ -3547,35 +3547,28 @@ exports.failsafe = failsafe;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.constraint = exports.state = exports.precedence = exports.recursions = exports.recursion = exports.consume = exports.creation = void 0;
+exports.constraint = exports.state = exports.precedence = exports.recur = exports.recursion = exports.spend = exports.creation = void 0;
 const alias_1 = __webpack_require__(5413);
 function creation(cost, parser) {
   return input => {
     const context = input;
-    const resources = context.resources ?? {
-      clock: cost || 1,
-      recursions: [1]
-    };
-    const {
-      recursions
-    } = resources;
     const result = parser(input);
     if (result === undefined) return;
-    consume(cost, context);
+    spend(context, cost);
     return result;
   };
 }
 exports.creation = creation;
-function consume(cost, context) {
-  const {
-    resources
-  } = context;
-  if (!resources) return;
+function spend(context, cost) {
+  const resources = context.resources ?? {
+    clock: cost || 1,
+    recursions: [1]
+  };
   if (resources.clock < cost) throw new Error('Too many creations');
   resources.clock -= cost;
 }
-exports.consume = consume;
-function recursion(recursion, parser) {
+exports.spend = spend;
+function recursion(index, parser) {
   return input => {
     const context = input;
     const resources = context.resources ?? {
@@ -3585,41 +3578,19 @@ function recursion(recursion, parser) {
     const {
       recursions
     } = resources;
-    const rec = (0, alias_1.min)(recursion, recursions.length - 1);
-    if (rec >= 0 && recursions[rec] < 1) throw new Error('Too much recursion');
-    rec >= 0 && --recursions[rec];
+    recur(recursions, index, 1);
     const result = parser(input);
-    rec >= 0 && ++recursions[rec];
+    recur(recursions, index, -1);
     return result;
   };
 }
 exports.recursion = recursion;
-function recursions(rs, parser) {
-  return input => {
-    const context = input;
-    const resources = context.resources ?? {
-      clock: 1,
-      recursions: [4]
-    };
-    const {
-      recursions
-    } = resources;
-    for (const recursion of rs) {
-      const rec = (0, alias_1.min)(recursion, recursions.length - 1);
-      if (rec === -1) continue;
-      if (recursions[rec] < 1) throw new Error('Too much recursion');
-      --recursions[rec];
-    }
-    const result = parser(input);
-    for (const recursion of rs) {
-      const rec = (0, alias_1.min)(recursion, recursions.length - 1);
-      if (rec === -1) continue;
-      ++recursions[rec];
-    }
-    return result;
-  };
+function recur(recursions, index, size, force = false) {
+  index = (0, alias_1.min)(index, recursions.length && recursions.length - 1);
+  if (recursions[index] < size - +force) throw new Error('Too much recursion');
+  recursions[index] -= size;
 }
-exports.recursions = recursions;
+exports.recur = recur;
 function precedence(precedence, parser) {
   return input => {
     const context = input;
@@ -3773,7 +3744,6 @@ function some(parser, delimiter, after, delimiters, limit = 0) {
       source,
       position
     } = context;
-    //assert(context.backtracks ??= {});
     let nodes;
     delims && context.delimiters.push(delims);
     // whileは数倍遅い
@@ -4468,7 +4438,7 @@ exports.block = error((0, combinator_1.union)([source_1.emptysegment, input => {
     case '(':
       return (0, olist_1.olist)(input);
     default:
-      if ('0' <= char && char <= '9') return (0, olist_1.olist)(input);
+      if (char <= '9' && '0' <= char) return (0, olist_1.olist)(input);
   }
 }, paragraph_1.paragraph]));
 function error(parser) {
@@ -4512,7 +4482,7 @@ const indent = (0, combinator_1.open)(opener, (0, combinator_1.some)(source_1.co
 const unindent = source => source.replace(/(?<=^|\n)>(?: |(?=>*(?:$|[ \r\n])))|\r?\n$/g, '');
 const source = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.recursion)(1 /* Recursion.blockquote */, (0, combinator_1.some)((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 => new parser_1.List([new parser_1.Node((0, dom_1.html)('pre', (0, dom_1.defrag)((0, util_1.unwrap)(ns))))]))))]))), ns => new parser_1.List([new parser_1.Node((0, dom_1.html)('blockquote', (0, util_1.unwrap)(ns)))])));
 const markdown = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.recursion)(1 /* Recursion.blockquote */, (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.rewrite)(indent, (0, combinator_1.convert)(unindent, markdown)), (0, combinator_1.rewrite)((0, combinator_1.some)(source_1.contentline, opener), (0, combinator_1.convert)(unindent, context => {
-  (0, combinator_1.consume)(10, context);
+  (0, combinator_1.spend)(context, 10);
   const {
     source
   } = context;
@@ -5823,7 +5793,7 @@ exports.MAX_INPUT_SIZE = exports.MAX_SEGMENT_SIZE * 10;
 class Context extends parser_1.Context {
   constructor(options = {}) {
     super(options);
-    this.recursion = new RecursionCounter('annotation', 2);
+    this.recursion = new RecursionCounter(2);
     const {
       segment,
       local,
@@ -5835,7 +5805,7 @@ class Context extends parser_1.Context {
       id,
       caches
     } = options;
-    this.resources ??= {
+    this.resources = options.resources ?? {
       // バックトラックのせいで文字数制限を受けないようにする。
       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 */]
@@ -5853,8 +5823,7 @@ class Context extends parser_1.Context {
 }
 exports.Context = Context;
 class RecursionCounter {
-  constructor(syntax, limit) {
-    this.syntax = syntax;
+  constructor(limit) {
     this.limit = limit;
     this.stack = [];
     this.index = 0;
@@ -5865,7 +5834,7 @@ class RecursionCounter {
     } = this;
     for (; this.index > 0 && stack[this.index - 1] <= depth; --this.index);
     // 内側から数えるので無効化処理できずエラーを投げるしかない。
-    if (this.index === this.limit) throw new Error(`Too much ${this.syntax} recursion`);
+    if (this.index === this.limit) throw new Error(`Too much recursion`);
     stack[this.index] = depth;
     ++this.index;
   }
@@ -6067,7 +6036,7 @@ Object.defineProperty(exports, "lineshortmedia", ({
   }
 }));
 function isAlphabet(char) {
-  return 'a' <= char && char <= 'z';
+  return char <= 'z' && 'a' <= char;
 }
 
 /***/ },
@@ -6105,7 +6074,7 @@ const dom_1 = __webpack_require__(394);
 // 修正する必要があるためほぼ完全な二重処理が必要になり三重以上の注釈という不適切な使用のために
 // 常に非常に非効率な処理を行い常時低速化するより三重以上の注釈を禁止して効率性を維持するのが妥当である。
 const MAX_DEPTH = 20;
-exports.annotation = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(128 /* State.annotation */, (0, repeat_1.repeat)('(', visibility_1.beforeNonblank, ')', [4 /* Recursion.bracket */], (0, combinator_1.precedence)(1, (0, combinator_1.surround)('', (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ')', [[')', 1]]), ')', false, [], ([, bs], {
+exports.annotation = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(128 /* State.annotation */, (0, repeat_1.repeat)('(', visibility_1.beforeNonblank, ')', 4 /* Recursion.bracket */, (0, combinator_1.precedence)(1, (0, combinator_1.surround)('', (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ')', [[')', 1]]), ')', false, [], ([, bs], {
   buffer
 }) => buffer.import(bs), ([, bs], {
   buffer
@@ -6519,7 +6488,7 @@ const repeat_1 = __webpack_require__(8019);
 const visibility_1 = __webpack_require__(6364);
 const util_1 = __webpack_require__(4992);
 const dom_1 = __webpack_require__(394);
-exports.deletion = (0, combinator_1.lazy)(() => (0, repeat_1.repeat)('~~', '', '~~', [3 /* Recursion.inline */], (0, combinator_1.precedence)(0, (0, combinator_1.surround)('', (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, (0, visibility_1.blankWith)('\n', '~~')), (0, combinator_1.open)('\n', (0, combinator_1.some)(inline_1.inline, '~'), true)])), '~~', false, [], ([, bs], {
+exports.deletion = (0, combinator_1.lazy)(() => (0, repeat_1.repeat)('~~', '', '~~', 3 /* Recursion.inline */, (0, combinator_1.precedence)(0, (0, combinator_1.surround)('', (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, (0, visibility_1.blankWith)('\n', '~~')), (0, combinator_1.open)('\n', (0, combinator_1.some)(inline_1.inline, '~'), true)])), '~~', false, [], ([, bs], {
   buffer
 }) => buffer.import(bs), ([, bs], {
   buffer
@@ -6574,7 +6543,7 @@ const subemphasis = (0, combinator_1.lazy)(() => (0, combinator_1.some)((0, comb
 // 開閉が明示的でない構文は開閉の不明確な記号による再帰的適用を行わず
 // 可能な限り早く閉じるよう解析しなければならない。
 // このため終端記号の後ろを見て終端を中止し同じ構文を再帰的に適用してはならない。
-exports.emstrong = (0, combinator_1.lazy)(() => (0, repeat_1.repeat)('***', visibility_1.beforeNonblank, '***', [3 /* Recursion.inline */], (0, combinator_1.precedence)(0, (0, combinator_1.surround)('', (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, '*', visibility_1.afterNonblank)])), (0, source_1.strs)('*', 1, 3), false, [], ([, bs, cs], context) => {
+exports.emstrong = (0, combinator_1.lazy)(() => (0, repeat_1.repeat)('***', visibility_1.beforeNonblank, '***', 3 /* Recursion.inline */, (0, combinator_1.precedence)(0, (0, combinator_1.surround)('', (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, '*', visibility_1.afterNonblank)])), (0, source_1.strs)('*', 1, 3), false, [], ([, bs, cs], context) => {
   const {
     buffer
   } = context;
@@ -7153,7 +7122,7 @@ const repeat_1 = __webpack_require__(8019);
 const visibility_1 = __webpack_require__(6364);
 const util_1 = __webpack_require__(4992);
 const dom_1 = __webpack_require__(394);
-exports.insertion = (0, combinator_1.lazy)(() => (0, repeat_1.repeat)('++', '', '++', [3 /* Recursion.inline */], (0, combinator_1.precedence)(0, (0, combinator_1.surround)('', (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, (0, visibility_1.blankWith)('\n', '++')), (0, combinator_1.open)('\n', (0, combinator_1.some)(inline_1.inline, '+'), true)])), '++', false, [], ([, bs], {
+exports.insertion = (0, combinator_1.lazy)(() => (0, repeat_1.repeat)('++', '', '++', 3 /* Recursion.inline */, (0, combinator_1.precedence)(0, (0, combinator_1.surround)('', (0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, (0, visibility_1.blankWith)('\n', '++')), (0, combinator_1.open)('\n', (0, combinator_1.some)(inline_1.inline, '+'), true)])), '++', false, [], ([, bs], {
   buffer
 }) => buffer.import(bs), ([, bs], {
   buffer
@@ -7181,7 +7150,7 @@ const dom_1 = __webpack_require__(394);
 // 可読性のため実際にはオブリーク体を指定する。
 // 斜体は単語に使うとかえって見づらく読み飛ばしやすくなるため使わないべきであり
 // ある程度の長さのある文に使うのが望ましい。
-exports.italic = (0, combinator_1.lazy)(() => (0, repeat_1.repeat)('///', visibility_1.beforeNonblank, '///', [3 /* Recursion.inline */], (0, combinator_1.precedence)(0, (0, combinator_1.surround)('', (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), '///', visibility_1.afterNonblank), '///', false, [], ([, bs], {
+exports.italic = (0, combinator_1.lazy)(() => (0, repeat_1.repeat)('///', visibility_1.beforeNonblank, '///', 3 /* Recursion.inline */, (0, combinator_1.precedence)(0, (0, combinator_1.surround)('', (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), '///', visibility_1.afterNonblank), '///', false, [], ([, bs], {
   buffer
 }) => buffer.import(bs), ([, bs], {
   buffer
@@ -7256,7 +7225,7 @@ exports.uri = (0, combinator_1.union)([(0, combinator_1.open)(' ', (0, source_1.
 exports.option = (0, combinator_1.union)([(0, combinator_1.fmap)((0, source_1.str)(/ nofollow(?=[ }])/y), () => new parser_1.List([new parser_1.Node(' rel="nofollow"')])), (0, source_1.str)(/ [a-z]+(?:-[a-z]+)*(?:="(?:\\[^\r\n]|[^\\\r\n"])*")?(?=[ }])/yi), (0, source_1.str)(/ [^\s{}]+/y)]);
 function parse(content, params, context) {
   const INSECURE_URI = params.shift().value;
-  (0, combinator_1.consume)(10, context);
+  (0, combinator_1.spend)(context, 10);
   let uri;
   try {
     uri = new url_1.ReadonlyURL(resolve(INSECURE_URI, context.host ?? location, context.url ?? context.host ?? location), context.host?.href || location.href);
@@ -7363,7 +7332,7 @@ const repeat_1 = __webpack_require__(8019);
 const visibility_1 = __webpack_require__(6364);
 const util_1 = __webpack_require__(4992);
 const dom_1 = __webpack_require__(394);
-exports.mark = (0, combinator_1.lazy)(() => (0, repeat_1.repeat)('==', visibility_1.beforeNonblank, '==', [3 /* Recursion.inline */], (0, combinator_1.precedence)(0, (0, combinator_1.surround)('', (0, combinator_1.state)(2 /* State.mark */, (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), '==', visibility_1.afterNonblank)), '==', false, [], ([, bs], {
+exports.mark = (0, combinator_1.lazy)(() => (0, repeat_1.repeat)('==', visibility_1.beforeNonblank, '==', 3 /* Recursion.inline */, (0, combinator_1.precedence)(0, (0, combinator_1.surround)('', (0, combinator_1.state)(2 /* State.mark */, (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), '==', visibility_1.afterNonblank)), '==', false, [], ([, bs], {
   buffer
 }) => buffer.import(bs), ([, bs], {
   buffer
@@ -7465,7 +7434,7 @@ exports.media = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(4 /* S
     text = text.trim();
     if (text === '' || text[0] !== tmp[0]) return;
   }
-  (0, combinator_1.consume)(100, context);
+  (0, combinator_1.spend)(context, 100);
   if (params.last.value === "\u0018" /* Command.Cancel */) {
     params.pop();
     return new parser_1.List([new parser_1.Node((0, dom_1.html)('span', {
@@ -8157,8 +8126,9 @@ Object.defineProperty(exports, "__esModule", ({
 exports.repeat = void 0;
 const parser_1 = __webpack_require__(605);
 const delimiter_1 = __webpack_require__(385);
+const combinator_1 = __webpack_require__(3484);
 const alias_1 = __webpack_require__(5413);
-function repeat(opener, after, closer, rs, parser, cons, termination = (nodes, context, prefix, postfix) => {
+function repeat(opener, after, closer, recursion, parser, cons, termination = (nodes, context, prefix, postfix) => {
   const acc = new parser_1.List();
   if (prefix > 0) {
     acc.push(new parser_1.Node(opener[0].repeat(prefix)));
@@ -8184,7 +8154,7 @@ function repeat(opener, after, closer, rs, parser, cons, termination = (nodes, c
       position,
       resources: {
         recursions
-      } = {}
+      }
     } = context;
     if (!source.startsWith(opener, context.position)) return;
     let nodes = new parser_1.List();
@@ -8196,20 +8166,11 @@ function repeat(opener, after, closer, rs, parser, cons, termination = (nodes, c
       return;
     }
     let depth = i / opener.length + 1 | 0;
-    if (recursions) for (const recursion of rs) {
-      const rec = (0, alias_1.min)(recursion, recursions.length - 1);
-      if (rec === -1) continue;
-      if (recursions[rec] < depth - 1) throw new Error('Too much recursion');
-      recursions[rec] -= depth;
-    }
+    (0, combinator_1.recur)(recursions, recursion, depth, true);
     let state = false;
     let follow = 0;
     for (; i >= opener.length; i -= opener.length, follow -= closer.length) {
-      if (recursions) for (const recursion of rs) {
-        const rec = (0, alias_1.min)(recursion, recursions.length - 1);
-        if (rec === -1) continue;
-        recursions[rec] += 1;
-      }
+      (0, combinator_1.recur)(recursions, recursion, -1);
       depth -= 1;
       const lead = i - opener.length;
       if (source.startsWith(closer, context.position)) {
@@ -8257,11 +8218,7 @@ function repeat(opener, after, closer, rs, parser, cons, termination = (nodes, c
       }
       break;
     }
-    if (recursions) for (let i = 0; i < depth; ++i) for (const recursion of rs) {
-      const rec = (0, alias_1.min)(recursion, recursions.length - 1);
-      if (rec === -1) continue;
-      recursions[rec] += depth;
-    }
+    (0, combinator_1.recur)(recursions, recursion, -depth);
     depth = 0;
     const prefix = i;
     i = 0;
@@ -8448,11 +8405,11 @@ const escsource = context => {
   } = context;
   if (position === source.length) return;
   const char = source[position];
-  (0, combinator_1.consume)(1, context);
+  (0, combinator_1.spend)(context, 1);
   context.position += 1;
   switch (char) {
     case "\u001B" /* Command.Escape */:
-      (0, combinator_1.consume)(1, context);
+      (0, combinator_1.spend)(context, 1);
       context.position += 1;
       return new parser_1.List([new parser_1.Node(source.slice(position + 1, position + 2))]);
     case '\\':
@@ -8462,7 +8419,7 @@ const escsource = context => {
         case '\n':
           return new parser_1.List([new parser_1.Node(char)]);
         default:
-          (0, combinator_1.consume)(1, context);
+          (0, combinator_1.spend)(context, 1);
           context.position += 1;
           return new parser_1.List([new parser_1.Node(source.slice(position, position + 2))]);
       }
@@ -8475,7 +8432,7 @@ const escsource = context => {
       if (context.sequential) return new parser_1.List([new parser_1.Node(char)]);
       let i = seek(source, position);
       i -= position;
-      (0, combinator_1.consume)(i - 1, context);
+      (0, combinator_1.spend)(context, i - 1);
       context.position += i - 1;
       return new parser_1.List([new parser_1.Node(source.slice(position, context.position))]);
   }
@@ -8648,7 +8605,7 @@ const text = input => {
   } = context;
   if (position === source.length) return;
   const char = source[position];
-  (0, combinator_1.consume)(1, context);
+  (0, combinator_1.spend)(context, 1);
   context.position += 1;
   switch (char) {
     case "\u001B" /* Command.Escape */:
@@ -8660,7 +8617,7 @@ const text = input => {
         case '\n':
           return new parser_1.List();
         default:
-          (0, combinator_1.consume)(1, context);
+          (0, combinator_1.spend)(context, 1);
           context.position += 1;
           return new parser_1.List([new parser_1.Node(source.slice(position + 1, context.position))]);
       }
@@ -8677,7 +8634,7 @@ const text = input => {
       const lineend =  false || s && i === source.length || s && source[i] === '\r' || s && source[i] === '\n';
       i -= position;
       i = lineend ? i : i - +s || 1;
-      (0, combinator_1.consume)(i - 1, context);
+      (0, combinator_1.spend)(context, i - 1);
       context.position += i - 1;
       const linestart = position === 0 || source[position - 1] === '\n';
       if (position === context.position || s && !linestart || lineend) return new parser_1.List();
@@ -8707,7 +8664,7 @@ function isWhitespace(char, linebreak) {
 }
 function next(source, position, state) {
   let index = seek(source, position, state);
-  if (index === source.length) return source.length;
+  if (index === source.length) return index;
   const char = source[index];
   switch (char) {
     case '%':
@@ -8771,8 +8728,9 @@ function backToEmailHead(source, position, 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';
+  if (char < '0' || 'z' < char) return false;
+  if (char <= '9' || 'a' <= char) return true;
+  return 'A' <= char && char <= 'Z';
 }
 exports.isAlphanumeric = isAlphanumeric;
 function seek(source, position, state) {
@@ -8878,11 +8836,11 @@ const unescsource = context => {
   } = context;
   if (position === source.length) return;
   const char = source[position];
-  (0, combinator_1.consume)(1, context);
+  (0, combinator_1.spend)(context, 1);
   context.position += 1;
   switch (char) {
     case "\u001B" /* Command.Escape */:
-      (0, combinator_1.consume)(1, context);
+      (0, combinator_1.spend)(context, 1);
       context.position += 1;
       return new parser_1.List([new parser_1.Node(source.slice(position + 1, position + 2))]);
     case '\r':
@@ -8895,7 +8853,7 @@ const unescsource = context => {
       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 : next(source, position, state);
       i -= position;
-      (0, combinator_1.consume)(i - 1, context);
+      (0, combinator_1.spend)(context, i - 1);
       context.position += i - 1;
       return new parser_1.List([new parser_1.Node(source.slice(position, context.position))]);
   }
@@ -8903,7 +8861,7 @@ const unescsource = context => {
 exports.unescsource = unescsource;
 function next(source, position, state) {
   let index = seek(source, position, state);
-  if (index === source.length) return source.length;
+  if (index === source.length) return index;
   const char = source[index];
   switch (char) {
     case ':':
@@ -8972,7 +8930,7 @@ function seek(source, position, state) {
   return source.length;
 }
 function category(char) {
-  return '\x21' <= char && char <= '\x7E';
+  return char <= '\x7E' && '\x21' <= char;
 }
 
 /***/ },

package/package.json

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

package/src/combinator/control/manipulation/fence.ts

@@ -1,5 +1,5 @@
 import { Parser, List, Node, Context, failsafe } from '../../data/parser';
-import { consume } from '../../../combinator';
+import { spend } from '../../../combinator';
 import { firstline, isEmptyline } from '../constraint/line';
 import { push } from 'spica/array';
 
@@ -13,7 +13,7 @@ export function fence<C extends Context, D extends Parser<unknown, C>[]>(opener:
     const matches = opener.exec(source);
     if (!matches) return;
     assert(matches[0] === firstline(source, position));
-    consume(matches[0].length, context);
+    spend(context, matches[0].length);
     const delim = matches[1];
     assert(delim && delim === delim.trim());
     if (matches[0].includes(delim, delim.length)) return;

package/src/combinator/control/manipulation/match.ts

@@ -1,5 +1,5 @@
 import { Parser } from '../../data/parser';
-import { consume } from '../../../combinator';
+import { spend } from '../../../combinator';
 
 export function match<P extends Parser>(pattern: RegExp, f: (matched: RegExpMatchArray) => P): P;
 export function match<N>(pattern: RegExp, f: (matched: RegExpMatchArray) => Parser<N>): Parser<N> {
@@ -15,7 +15,7 @@ export function match<N>(pattern: RegExp, f: (matched: RegExpMatchArray) => Pars
     const params = pattern.exec(source);
     if (!params) return;
     assert(source.startsWith(params[0], position));
-    count && consume(params[0].length, context);
+    count && spend(context, params[0].length);
     const result = f(params)(input);
     context.position += result
       ? context.position === position

package/src/combinator/data/delimiter.ts

@@ -1,5 +1,5 @@
 import { Parser, Input, List, Node, Context } from './parser';
-import { consume } from './parser/context';
+import { spend } from './parser/context';
 
 interface Delimiter {
   readonly memory: Delimiter[];
@@ -199,7 +199,7 @@ export function matcher(pattern: string | RegExp, advance: boolean, after?: Pars
         pos = position;
         if (index === -1) return;
         const src = source.slice(position, index);
-        count && !hit && consume(src.length, context);
+        count && !hit && spend(context, src.length);
         if (advance) {
           context.position = index;
         }
@@ -250,7 +250,7 @@ export function tester(pattern: string | RegExp, advance: boolean, after?: Parse
         pos = position;
         if (index === -1) return;
         const len = index - position;
-        count && !hit && consume(len, context);
+        count && !hit && spend(context, len);
         if (advance) {
           context.position = index;
         }

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

@@ -6,61 +6,35 @@ export function creation(cost: number, parser: Parser): Parser {
   assert(cost >= 0);
   return input => {
     const context = input;
-    const resources = context.resources ?? { clock: cost || 1, recursions: [1] };
-    const { recursions } = resources;
-    assert(recursions.length > 0);
     const result = parser(input);
     if (result === undefined) return;
-    consume(cost, context);
+    spend(context, cost);
     return result;
   };
 }
-export function consume(cost: number, context: Context): void {
-  const { resources } = context;
-  if (!resources) return;
+export function spend(context: Context, cost: number): void {
+  const resources = context.resources ?? { clock: cost || 1, recursions: [1] };
   if (resources.clock < cost) throw new Error('Too many creations');
   resources.clock -= cost;
 }
 
-export function recursion<P extends Parser>(recursion: number, parser: P): P;
-export function recursion(recursion: number, parser: Parser): Parser {
-  assert(recursion >= 0);
+export function recursion<P extends Parser>(index: number, parser: P): P;
+export function recursion(index: number, parser: Parser): Parser {
+  assert(index >= 0);
   return input => {
     const context = input;
     const resources = context.resources ?? { clock: 1, recursions: [1] };
     const { recursions } = resources;
-    assert(recursions.length > 0);
-    const rec = min(recursion, recursions.length - 1);
-    if (rec >= 0 && recursions[rec] < 1) throw new Error('Too much recursion');
-    rec >= 0 && --recursions[rec];
+    recur(recursions, index, 1);
     const result = parser(input);
-    rec >= 0 && ++recursions[rec];
+    recur(recursions, index, -1);
     return result;
   };
 }
-
-export function recursions<P extends Parser>(recursions: readonly number[], parser: P): P;
-export function recursions(rs: readonly number[], parser: Parser): Parser {
-  assert(rs.every(r => r >= 0));
-  return input => {
-    const context = input;
-    const resources = context.resources ?? { clock: 1, recursions: [4] };
-    const { recursions } = resources;
-    assert(recursions.length > 0);
-    for (const recursion of rs) {
-      const rec = min(recursion, recursions.length - 1);
-      if (rec === -1) continue;
-      if (recursions[rec] < 1) throw new Error('Too much recursion');
-      --recursions[rec];
-    }
-    const result = parser(input);
-    for (const recursion of rs) {
-      const rec = min(recursion, recursions.length - 1);
-      if (rec === -1) continue;
-      ++recursions[rec];
-    }
-    return result;
-  };
+export function recur(recursions: number[], index: number, size: number, force: boolean = false): void {
+  index = min(index, recursions.length && recursions.length - 1);
+  if (recursions[index] < size - +force) throw new Error('Too much recursion');
+  recursions[index] -= size;
 }
 
 export function precedence<P extends Parser>(precedence: number, parser: P): P;

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

@@ -38,7 +38,6 @@ export function some<N>(parser: Parser<N>, delimiter?: number | string | RegExp
   return input => {
     const context = input;
     const { source, position } = context;
-    //assert(context.backtracks ??= {});
     let nodes: List<Node<N>> | undefined;
     delims && context.delimiters.push(delims);
     // whileは数倍遅い

package/src/parser/block/blockquote.ts

@@ -1,7 +1,7 @@
 import { BlockquoteParser } from '../block';
 import { Recursion } from '../context';
 import { List, Node } from '../../combinator/data/parser';
-import { union, some, consume, recursion, block, validate, rewrite, open, convert, lazy, fmap } from '../../combinator';
+import { union, some, spend, recursion, block, validate, rewrite, open, convert, lazy, fmap } from '../../combinator';
 import { autolink } from '../autolink';
 import { contentline } from '../source';
 import { unwrap, randomID } from '../util';
@@ -40,7 +40,7 @@ const markdown: BlockquoteParser.MarkdownParser = lazy(() => fmap(
     rewrite(
       some(contentline, opener),
       convert(unindent, context => {
-        consume(10, context);
+        spend(context, 10);
         const { source } = context;
         const references = html('ol', { class: 'references' });
         const document = parse(source, {

package/src/parser/block.ts

@@ -99,7 +99,7 @@ export const block: BlockParser = error(union([
       case '(':
         return olist(input);
       default:
-        if ('0' <= char && char <= '9') return olist(input);
+        if (char <= '9' && '0' <= char) return olist(input);
     }
   },
   paragraph

package/src/parser/context.ts

@@ -20,7 +20,7 @@ export class Context extends Ctx {
       id,
       caches,
     } = options;
-    this.resources ??= {
+    this.resources = options.resources ?? {
       // バックトラックのせいで文字数制限を受けないようにする。
       clock: MAX_SEGMENT_SIZE * (5 + 1),
       recursions: [
@@ -42,7 +42,7 @@ export class Context extends Ctx {
     this.id = id;
     this.caches = caches;
   }
-  public override readonly resources?: {
+  public override readonly resources: {
     clock: number;
     recursions: number[];
   };
@@ -50,7 +50,7 @@ export class Context extends Ctx {
   public local: boolean;
   public sequential: boolean;
   public buffer: List<Node<(string | HTMLElement)>>;
-  public recursion = new RecursionCounter('annotation', 2);
+  public recursion = new RecursionCounter(2);
   public readonly header: boolean;
   public readonly host?: URL;
   public readonly url?: URL;
@@ -65,7 +65,6 @@ export type Options = Partial<Context>;
 
 class RecursionCounter {
   constructor(
-    private readonly syntax: string,
     private readonly limit: number,
   ) {
   }
@@ -75,7 +74,7 @@ class RecursionCounter {
     const { stack } = this
     for (; this.index > 0 && stack[this.index - 1] <= depth; --this.index);
     // 内側から数えるので無効化処理できずエラーを投げるしかない。
-    if (this.index === this.limit) throw new Error(`Too much ${this.syntax} recursion`);
+    if (this.index === this.limit) throw new Error(`Too much recursion`);
     stack[this.index] = depth;
     ++this.index;
   }

package/src/parser/inline/annotation.ts

@@ -25,7 +25,7 @@ import { html, defrag } from 'typed-dom/dom';
 // 常に非常に非効率な処理を行い常時低速化するより三重以上の注釈を禁止して効率性を維持するのが妥当である。
 const MAX_DEPTH = 20;
 export const annotation: AnnotationParser = lazy(() => constraint(State.annotation,
-  repeat('(', beforeNonblank, ')', [Recursion.bracket], precedence(1, surround(
+  repeat('(', beforeNonblank, ')', Recursion.bracket, precedence(1, surround(
     '',
     some(union([inline]), ')', [[')', 1]]),
     ')',

package/src/parser/inline/deletion.ts

@@ -9,7 +9,7 @@ import { unwrap } from '../util';
 import { html, defrag } from 'typed-dom/dom';
 
 export const deletion: DeletionParser = lazy(() =>
-  repeat('~~', '', '~~', [Recursion.inline], precedence(0, surround(
+  repeat('~~', '', '~~', Recursion.inline, precedence(0, surround(
     '',
     some(union([
       some(inline, blankWith('\n', '~~')),

package/src/parser/inline/emstrong.ts

@@ -24,7 +24,7 @@ const subemphasis: Parser.IntermediateParser<EmphasisParser> = lazy(() => some(u
 // 可能な限り早く閉じるよう解析しなければならない。
 // このため終端記号の後ろを見て終端を中止し同じ構文を再帰的に適用してはならない。
 export const emstrong: EmStrongParser = lazy(() =>
-  repeat('***', beforeNonblank, '***', [Recursion.inline], precedence(0, surround(
+  repeat('***', beforeNonblank, '***', Recursion.inline, precedence(0, surround(
     '',
     some(union([some(inline, '*', afterNonblank)])),
     strs('*', 1, 3),

package/src/parser/inline/insertion.ts

@@ -9,7 +9,7 @@ import { unwrap } from '../util';
 import { html, defrag } from 'typed-dom/dom';
 
 export const insertion: InsertionParser = lazy(() =>
-  repeat('++', '', '++', [Recursion.inline], precedence(0, surround(
+  repeat('++', '', '++', Recursion.inline, precedence(0, surround(
     '',
     some(union([
       some(inline, blankWith('\n', '++')),

package/src/parser/inline/italic.ts

@@ -12,7 +12,7 @@ import { html, defrag } from 'typed-dom/dom';
 // 斜体は単語に使うとかえって見づらく読み飛ばしやすくなるため使わないべきであり
 // ある程度の長さのある文に使うのが望ましい。
 export const italic: ItalicParser = lazy(() =>
-  repeat('///', beforeNonblank, '///', [Recursion.inline], precedence(0, surround(
+  repeat('///', beforeNonblank, '///', Recursion.inline, precedence(0, surround(
     '',
     some(union([inline]), '///', afterNonblank),
     '///',

package/src/parser/inline/link.ts

@@ -1,7 +1,7 @@
 import { LinkParser } from '../inline';
 import { Context, State, Backtrack, Command } from '../context';
 import { List, Node } from '../../combinator/data/parser';
-import { union, inits, sequence, subsequence, some, consume, precedence, state, constraint, surround, open, setBacktrack, dup, lazy, fmap, bind } from '../../combinator';
+import { union, inits, sequence, subsequence, some, spend, precedence, state, constraint, surround, open, setBacktrack, dup, lazy, fmap, bind } from '../../combinator';
 import { inline, media, shortmedia } from '../inline';
 import { attributes } from './html';
 import { str } from '../source';
@@ -109,7 +109,7 @@ export function parse(
   const INSECURE_URI = params.shift()!.value;
   assert(INSECURE_URI === INSECURE_URI.trim());
   assert(!INSECURE_URI.match(/\s/));
-  consume(10, context);
+  spend(context, 10);
   let uri: ReadonlyURL | undefined;
   try{
     uri = new ReadonlyURL(

package/src/parser/inline/mark.ts

@@ -10,7 +10,7 @@ import { unwrap } from '../util';
 import { html, define, defrag } from 'typed-dom/dom';
 
 export const mark: MarkParser = lazy(() =>
-  repeat('==', beforeNonblank, '==', [Recursion.inline], precedence(0, surround(
+  repeat('==', beforeNonblank, '==', Recursion.inline, precedence(0, surround(
     '',
     state(State.mark, some(union([inline]), '==', afterNonblank)),
     '==',

package/src/parser/inline/media.ts

@@ -2,7 +2,7 @@ import { MediaParser } from '../inline';
 import { State, Recursion, Backtrack, Command } from '../context';
 import { List, Node } from '../../combinator/data/parser';
 import { Flag } from '../node';
-import { union, inits, tails, some, consume, recursion, precedence, constraint, surround, open, setBacktrack, dup, lazy, fmap, bind } from '../../combinator';
+import { union, inits, tails, some, spend, recursion, precedence, constraint, surround, open, setBacktrack, dup, lazy, fmap, bind } from '../../combinator';
 import { uri, option as linkoption, resolve, decode, parse } from './link';
 import { attributes } from './html';
 import { unsafehtmlentity } from './htmlentity';
@@ -59,7 +59,7 @@ export const media: MediaParser = lazy(() => constraint(State.media, open(
       text = text.trim();
       if (text === '' || text[0] !== tmp[0]) return;
     }
-    consume(100, context);
+    spend(context, 100);
     if (params.last!.value === Command.Cancel) {
       params.pop();
       return new List([

package/src/parser/inline.ts

@@ -135,5 +135,5 @@ export { shortmedia, lineshortmedia } from './inline/shortmedia';
 
 function isAlphabet(char: string): boolean {
   assert(char.length === 1);
-  return 'a' <= char && char <= 'z';
+  return char <= 'z' && 'a' <= char;
 }

package/src/parser/repeat.ts

@@ -1,17 +1,18 @@
 import { Parser, Result, List, Node } from '../combinator/data/parser';
 import { tester } from '../combinator/data/delimiter';
+import { recur } from '../combinator';
 import { Context, Recursion, Command } from './context';
 import { min } from 'spica/alias';
 
 export function repeat<P extends Parser<HTMLElement | string, Context>>(
-  opener: string, after: string | RegExp, closer: string, recursions: readonly Recursion[], parser: P,
+  opener: string, after: string | RegExp, closer: string, recursion: Recursion, parser: P,
   cons: (nodes: List<Node<Parser.Node<P>>>, context: Parser.Context<P>, lead: number, follow: number) =>
     List<Node<Parser.Node<P>>>,
   termination?: (acc: List<Node<Parser.Node<P>>>, context: Context, prefix: number, postfix: number, state: boolean) =>
     Result<string | Parser.Node<P>>,
 ): P;
 export function repeat<N extends HTMLElement | string>(
-  opener: string, after: string | RegExp, closer: string, rs: readonly Recursion[], parser: Parser<N>,
+  opener: string, after: string | RegExp, closer: string, recursion: Recursion, parser: Parser<N>,
   cons: (nodes: List<Node<N>>, context: Context, lead: number, follow: number) =>
     List<Node<N>>,
   termination: (acc: List<Node<N>>, context: Context, prefix: number, postfix: number, state: boolean) =>
@@ -35,7 +36,7 @@ export function repeat<N extends HTMLElement | string>(
   const test = tester(after, false);
   return input => {
     const context = input;
-    const { source, position, resources: { recursions } = {} } = context;
+    const { source, position, resources: { recursions } } = context;
     if (!source.startsWith(opener, context.position)) return;
     let nodes = new List<Node<N>>();
     let i = opener.length;
@@ -46,20 +47,11 @@ export function repeat<N extends HTMLElement | string>(
       return;
     }
     let depth = i / opener.length + 1 | 0;
-    if (recursions) for (const recursion of rs) {
-      const rec = min(recursion, recursions.length - 1);
-      if (rec === -1) continue;
-      if (recursions[rec] < depth - 1) throw new Error('Too much recursion');
-      recursions[rec] -= depth;
-    }
+    recur(recursions, recursion, depth, true);
     let state = false;
     let follow = 0;
     for (; i >= opener.length; i -= opener.length, follow -= closer.length) {
-      if (recursions) for (const recursion of rs) {
-        const rec = min(recursion, recursions.length - 1);
-        if (rec === -1) continue;
-        recursions[rec] += 1;
-      }
+      recur(recursions, recursion, -1);
       depth -= 1;
       const lead = i - opener.length;
       if (source.startsWith(closer, context.position)) {
@@ -109,11 +101,7 @@ export function repeat<N extends HTMLElement | string>(
       }
       break;
     }
-    if (recursions) for (let i = 0; i < depth; ++i) for (const recursion of rs) {
-      const rec = min(recursion, recursions.length - 1);
-      if (rec === -1) continue;
-      recursions[rec] += depth;
-    }
+    recur(recursions, recursion, -depth);
     depth = 0;
     const prefix = i;
     i = 0;

package/src/parser/source/escapable.ts

@@ -2,18 +2,18 @@ import { EscapableSourceParser } from '../source';
 import { Command } from '../context';
 import { Flag } from '../node';
 import { List, Node } from '../../combinator/data/parser';
-import { consume } from '../../combinator';
+import { spend } from '../../combinator';
 import { html } from 'typed-dom/dom';
 
 export const escsource: EscapableSourceParser = context => {
   const { source, position } = context;
   if (position === source.length) return;
   const char = source[position];
-  consume(1, context);
+  spend(context, 1);
   context.position += 1;
   switch (char) {
     case Command.Escape:
-      consume(1, context);
+      spend(context, 1);
       context.position += 1;
       return new List([new Node(source.slice(position + 1, position + 2))]);
     case '\\':
@@ -23,7 +23,7 @@ export const escsource: EscapableSourceParser = context => {
         case '\n':
           return new List([new Node(char)]);
         default:
-          consume(1, context);
+          spend(context, 1);
           context.position += 1;
           return new List([new Node(source.slice(position, position + 2))]);
       }
@@ -38,7 +38,7 @@ export const escsource: EscapableSourceParser = context => {
       let i = seek(source, position);
       assert(i > position);
       i -= position;
-      consume(i - 1, context);
+      spend(context, i - 1);
       context.position += i - 1;
       return new List([new Node(source.slice(position, context.position))]);
   }

package/src/parser/source/text.ts

@@ -2,7 +2,7 @@ import { TextParser, TxtParser } from '../source';
 import { State, Command } from '../context';
 import { Flag } from '../node';
 import { List, Node } from '../../combinator/data/parser';
-import { union, consume } from '../../combinator';
+import { union, spend } from '../../combinator';
 import { html } from 'typed-dom/dom';
 
 export const nonWhitespace = /[^ \t　]/g;
@@ -12,7 +12,7 @@ export const text: TextParser = input => {
   const { source, position, state } = context;
   if (position === source.length) return;
   const char = source[position];
-  consume(1, context);
+  spend(context, 1);
   context.position += 1;
   switch (char) {
     case Command.Escape:
@@ -25,7 +25,7 @@ export const text: TextParser = input => {
           assert(char !== Command.Escape);
           return new List();
         default:
-          consume(1, context);
+          spend(context, 1);
           context.position += 1;
           return new List([new Node(source.slice(position + 1, context.position))]);
       }
@@ -51,7 +51,7 @@ export const text: TextParser = input => {
         || s && source[i] === '\n';
       i -= position;
       i = lineend ? i : i - +s || 1;
-      consume(i - 1, context);
+      spend(context, i - 1);
       context.position += i - 1;
       const linestart = position === 0 || source[position - 1] === '\n';
       if (position === context.position || s && !linestart || lineend) return new List();
@@ -86,7 +86,7 @@ function isWhitespace(char: string, linebreak: boolean): boolean {
 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;
+  if (index === source.length) return index;
   const char = source[index];
   switch (char) {
     case '%':
@@ -163,10 +163,9 @@ export function backToEmailHead(source: string, position: number, index: number)
 }
 export function isAlphanumeric(char: string): boolean {
   assert(char.length === 1);
-  if (char < '0' || '\x7F' < char) return false;
-  return '0' <= char && char <= '9'
-      || 'A' <= char && char <= 'Z'
-      || 'a' <= char && char <= 'z';
+  if (char < '0' || 'z' < char) return false;
+  if (char <= '9' || 'a' <= char) return true;
+  return 'A' <= char && char <= 'Z';
 }
 
 function seek(source: string, position: number, state: number): number {

package/src/parser/source/unescapable.ts

@@ -2,7 +2,7 @@ import { UnescapableSourceParser } from '../source';
 import { State, Command } from '../context';
 import { Flag } from '../node';
 import { List, Node } from '../../combinator/data/parser';
-import { consume } from '../../combinator';
+import { spend } from '../../combinator';
 import { nonWhitespace, canSkip, backToUrlHead, backToEmailHead } from './text';
 import { html } from 'typed-dom/dom';
 
@@ -10,11 +10,11 @@ export const unescsource: UnescapableSourceParser = context => {
   const { source, position, state } = context;
   if (position === source.length) return;
   const char = source[position];
-  consume(1, context);
+  spend(context, 1);
   context.position += 1;
   switch (char) {
     case Command.Escape:
-      consume(1, context);
+      spend(context, 1);
       context.position += 1;
       return new List([new Node(source.slice(position + 1, position + 2))]);
     case '\r':
@@ -33,7 +33,7 @@ export const unescsource: UnescapableSourceParser = context => {
         : next(source, position, state);
       assert(i > position);
       i -= position;
-      consume(i - 1, context);
+      spend(context, i - 1);
       context.position += i - 1;
       return new List([new Node(source.slice(position, context.position))]);
   }
@@ -42,7 +42,7 @@ export const unescsource: UnescapableSourceParser = context => {
 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;
+  if (index === source.length) return index;
   const char = source[index];
   switch (char) {
     case ':':
@@ -119,5 +119,5 @@ function seek(source: string, position: number, state: number): number {
 }
 
 function category(char: string): boolean {
-  return '\x21' <= char && char <= '\x7E';
+  return char <= '\x7E' && '\x21' <= char;
 }