securemark 0.234.1 → 0.235.0

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.234.1",
+  "version": "0.235.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -449,9 +449,9 @@
       },
       "dependencies": {
         "lru-cache": {
-          "version": "7.7.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.1.tgz",
-          "integrity": "sha512-cRffBiTW8s73eH4aTXqBcTLU0xQnwGV3/imttRHGWCrbergmnK4D6JXQd8qin5z43HnDwRI+o7mVW0LEB+tpAw==",
+          "version": "7.7.2",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.2.tgz",
+          "integrity": "sha512-WkdIOIF7HkfVHXxKLjhH6lyAxSFoSO5NZpZS9cH8Oe5rAI2ZDrVmIweDAZUHqIhl0zasQUprVVR8uv2yggYYvw==",
           "dev": true
         },
         "mkdirp": {
@@ -1760,10 +1760,13 @@
       "dev": true
     },
     "builtins": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
-      "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=",
-      "dev": true
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.0.tgz",
+      "integrity": "sha512-aizhtbxgT1Udg0Fj6GssXshAVK+nxbtCV+1OtTrMNy67jffDFBY6CUBAkhO4owbleAx6fdbnWdpsmmcXydbzNw==",
+      "dev": true,
+      "requires": {
+        "semver": "^7.0.0"
+      }
     },
     "bytes": {
       "version": "3.1.2",
@@ -1798,9 +1801,9 @@
       },
       "dependencies": {
         "lru-cache": {
-          "version": "7.7.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.1.tgz",
-          "integrity": "sha512-cRffBiTW8s73eH4aTXqBcTLU0xQnwGV3/imttRHGWCrbergmnK4D6JXQd8qin5z43HnDwRI+o7mVW0LEB+tpAw==",
+          "version": "7.7.2",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.2.tgz",
+          "integrity": "sha512-WkdIOIF7HkfVHXxKLjhH6lyAxSFoSO5NZpZS9cH8Oe5rAI2ZDrVmIweDAZUHqIhl0zasQUprVVR8uv2yggYYvw==",
           "dev": true
         },
         "mkdirp": {
@@ -1924,9 +1927,9 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001320",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001320.tgz",
-      "integrity": "sha512-MWPzG54AGdo3nWx7zHZTefseM5Y1ccM7hlQKHRqJkPozUaw3hNbBTMmLn16GG2FUzjR13Cr3NPfhIieX5PzXDA==",
+      "version": "1.0.30001322",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001322.tgz",
+      "integrity": "sha512-neRmrmIrCGuMnxGSoh+x7zYtQFFgnSY2jaomjU56sCkTA6JINqQrxutF459JpWcWRajvoyn95sOXq4Pqrnyjew==",
       "dev": true
     },
     "chalk": {
@@ -3030,9 +3033,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.4.96",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.96.tgz",
-      "integrity": "sha512-DPNjvNGPabv6FcyjzLAN4C0psN/GgD9rSGvMTuv81SeXG/EX3mCz0wiw9N1tUEnfQXYCJi3H8M0oFPRziZh7rw==",
+      "version": "1.4.100",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.100.tgz",
+      "integrity": "sha512-pNrSE2naf8fizl6/Uxq8UbKb8hU9EiYW4OzCYswosXoLV5NTMOUVKECNzDaHiUubsPq/kAckOzZd7zd8S8CHVw==",
       "dev": true
     },
     "elliptic": {
@@ -4608,9 +4611,9 @@
       "dev": true
     },
     "gauge": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.3.tgz",
-      "integrity": "sha512-ICw1DhAwMtb22rYFwEHgJcx1JCwJGv3x6G0OQUq56Nge+H4Q8JEwr8iveS0XFlsUNSI67F5ffMGK25bK4Pmskw==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
+      "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
       "dev": true,
       "requires": {
         "aproba": "^1.0.3 || ^2.0.0",
@@ -7092,9 +7095,9 @@
       }
     },
     "make-fetch-happen": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.1.0.tgz",
-      "integrity": "sha512-HeP4QlkadP/Op+hE+Une1070kcyN85FshQObku3/rmzRh4zDcKXA19d2L3AQR6UoaX3uZmhSOpTLH15b1vOFvQ==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.1.1.tgz",
+      "integrity": "sha512-3/mCljDQNjmrP7kl0vhS5WVlV+TvSKoZaFhdiYV7MOijEnrhrjaVnqbp/EY/7S+fhUB2KpH7j8c1iRsIOs+kjw==",
       "dev": true,
       "requires": {
         "agentkeepalive": "^4.2.1",
@@ -7116,9 +7119,9 @@
       },
       "dependencies": {
         "lru-cache": {
-          "version": "7.7.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.1.tgz",
-          "integrity": "sha512-cRffBiTW8s73eH4aTXqBcTLU0xQnwGV3/imttRHGWCrbergmnK4D6JXQd8qin5z43HnDwRI+o7mVW0LEB+tpAw==",
+          "version": "7.7.2",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.2.tgz",
+          "integrity": "sha512-WkdIOIF7HkfVHXxKLjhH6lyAxSFoSO5NZpZS9cH8Oe5rAI2ZDrVmIweDAZUHqIhl0zasQUprVVR8uv2yggYYvw==",
           "dev": true
         }
       }
@@ -8128,14 +8131,14 @@
       "dev": true
     },
     "npm-package-arg": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-9.0.1.tgz",
-      "integrity": "sha512-Xs9wznfEAmZAR61qsYH3iN24V/qMYYkvAR5CRQNMvC6PjN2fHtO8y9XP/xdp5K+Icx+u1wMBMgWRPCmAEChSog==",
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-9.0.2.tgz",
+      "integrity": "sha512-v/miORuX8cndiOheW8p2moNuPJ7QhcFh9WGlTorruG8hXSA23vMTEp5hTCmDxic0nD8KHhj/NQgFuySD3GYY3g==",
       "dev": true,
       "requires": {
         "hosted-git-info": "^5.0.0",
         "semver": "^7.3.5",
-        "validate-npm-package-name": "^3.0.0"
+        "validate-npm-package-name": "^4.0.0"
       },
       "dependencies": {
         "hosted-git-info": {
@@ -8148,9 +8151,9 @@
           }
         },
         "lru-cache": {
-          "version": "7.7.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.1.tgz",
-          "integrity": "sha512-cRffBiTW8s73eH4aTXqBcTLU0xQnwGV3/imttRHGWCrbergmnK4D6JXQd8qin5z43HnDwRI+o7mVW0LEB+tpAw==",
+          "version": "7.7.2",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.2.tgz",
+          "integrity": "sha512-WkdIOIF7HkfVHXxKLjhH6lyAxSFoSO5NZpZS9cH8Oe5rAI2ZDrVmIweDAZUHqIhl0zasQUprVVR8uv2yggYYvw==",
           "dev": true
         }
       }
@@ -8918,9 +8921,9 @@
       "dev": true
     },
     "proc-log": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-2.0.0.tgz",
-      "integrity": "sha512-I/35MfCX2H8jBUhKN8JB8nmqvQo/nKdrBodBY7L3RhDSPPyvOHwLYNmPuhwuJq7a7C3vgFKWGQM+ecPStcvOHA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-2.0.1.tgz",
+      "integrity": "sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==",
       "dev": true
     },
     "process": {
@@ -9187,9 +9190,9 @@
           }
         },
         "lru-cache": {
-          "version": "7.7.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.1.tgz",
-          "integrity": "sha512-cRffBiTW8s73eH4aTXqBcTLU0xQnwGV3/imttRHGWCrbergmnK4D6JXQd8qin5z43HnDwRI+o7mVW0LEB+tpAw==",
+          "version": "7.7.2",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.2.tgz",
+          "integrity": "sha512-WkdIOIF7HkfVHXxKLjhH6lyAxSFoSO5NZpZS9cH8Oe5rAI2ZDrVmIweDAZUHqIhl0zasQUprVVR8uv2yggYYvw==",
           "dev": true
         },
         "normalize-package-data": {
@@ -11307,12 +11310,12 @@
       }
     },
     "validate-npm-package-name": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
-      "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz",
+      "integrity": "sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==",
       "dev": true,
       "requires": {
-        "builtins": "^1.0.3"
+        "builtins": "^5.0.0"
       }
     },
     "value-or-function": {

package/package.json

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

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

@@ -6,10 +6,8 @@ export function block<P extends Parser<unknown>>(parser: P, separation?: boolean
 export function block<T>(parser: Parser<T>, separation = true): Parser<T> {
   assert(parser);
   return (source, context) => {
-    assert(!context?.delimiters);
     if (source === '') return;
     const result = parser(source, context);
-    assert(!context?.delimiters);
     if (!result) return;
     const rest = exec(result);
     if (separation && !isEmpty(firstline(rest))) return;

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

@@ -15,7 +15,7 @@ export function validate<T>(patterns: string | RegExp | (string | RegExp)[], has
   if (typeof end === 'function') return validate(patterns, has, '', end);
   if (!isArray(patterns)) return validate([patterns], has, end!, parser!);
   assert(patterns.length > 0);
-  assert(patterns.every(pattern => pattern instanceof RegExp ? !pattern.global && pattern.source.startsWith('^') : true));
+  assert(patterns.every(pattern => pattern instanceof RegExp ? !pattern.flags.match(/[gmy]/) && pattern.source.startsWith('^') : true));
   assert(parser);
   const match: (source: string) => boolean = Function([
     '"use strict";',

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

@@ -17,6 +17,7 @@ export function reset<P extends Parser<unknown>>(context: Context<P>, parser: P)
 export function reset<T>(base: Ctx, parser: Parser<T>): Parser<T> {
   assert(Object.getPrototypeOf(base) === Object.prototype);
   assert(Object.freeze(base));
+  if (isEmpty(base)) return parser;
   return (source, context) =>
     parser(source, inherit(ObjectCreate(context), base));
 }
@@ -25,6 +26,7 @@ export function context<P extends Parser<unknown>>(context: Context<P>, parser:
 export function context<T>(base: Ctx, parser: Parser<T>): Parser<T> {
   assert(Object.getPrototypeOf(base) === Object.prototype);
   assert(Object.freeze(base));
+  if (isEmpty(base)) return parser;
   const override = memoize<Ctx, Ctx>(context => inherit(ObjectCreate(context), base), new WeakMap());
   return (source, context) =>
     parser(source, override(context));
@@ -56,3 +58,8 @@ const inherit = template((prop, target, source) => {
       return target[prop] = source[prop];
   }
 });
+
+function isEmpty(context: Ctx): boolean {
+  for (const _ in context) return false;
+  return true;
+}

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

@@ -3,7 +3,7 @@ import { Parser, exec, check } from '../../data/parser';
 
 export function match<P extends Parser<unknown>>(pattern: RegExp, f: (matched: RegExpMatchArray) => P): P;
 export function match<T>(pattern: RegExp, f: (matched: RegExpMatchArray) => Parser<T>): Parser<T> {
-  assert(!pattern.global && pattern.source.startsWith('^'));
+  assert(!pattern.flags.match(/[gmy]/) && pattern.source.startsWith('^'));
   return (source, context) => {
     if (source === '') return;
     const param = source.match(pattern);

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

@@ -3,7 +3,7 @@ import { Parser, Context, eval, exec, check } from '../../data/parser';
 
 export function focus<P extends Parser<unknown>>(scope: string | RegExp, parser: P): P;
 export function focus<T>(scope: string | RegExp, parser: Parser<T>): Parser<T> {
-  assert(scope instanceof RegExp ? !scope.global && scope.source.startsWith('^') : scope);
+  assert(scope instanceof RegExp ? !scope.flags.match(/[gmy]/) && scope.source.startsWith('^') : scope);
   assert(parser);
   const match: (source: string) => string = typeof scope === 'string'
     ? source => source.slice(0, scope.length) === scope ? scope : ''

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

@@ -14,7 +14,7 @@ export function inits<T, D extends Parser<T>[]>(parsers: D): Parser<T, Ctx, D> {
       const result = parsers[i](rest, context);
       assert(check(rest, result));
       if (!result) break;
-      assert(!context?.delimiters?.some(match => match(rest)));
+      assert(!context?.delimiters?.stack.some(sig => context.delimiters!.matchers[sig](rest)));
       nodes = nodes
         ? push(nodes, eval(result))
         : eval(result);

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

@@ -14,7 +14,7 @@ export function sequence<T, D extends Parser<T>[]>(parsers: D): Parser<T, Ctx, D
       const result = parsers[i](rest, context);
       assert(check(rest, result));
       if (!result) return;
-      assert(!context?.delimiters?.some(match => match(rest)));
+      assert(!context?.delimiters?.stack.some(sig => context.delimiters!.matchers[sig](rest)));
       nodes = nodes
         ? push(nodes, eval(result))
         : eval(result);

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

@@ -1,33 +1,58 @@
 import { undefined } from 'spica/global';
 import { Parser, eval, exec, check } from '../parser';
+import { memoize, reduce } from 'spica/memoize';
 import { push } from 'spica/array';
 
+const signature = (pattern: string | RegExp | undefined): string => {
+  switch (typeof pattern) {
+    case 'undefined':
+      return signature('');
+    case 'string':
+      return `s:${pattern}`;
+    case 'object':
+      return `r/${pattern.source}/${pattern.flags}`;
+  }
+};
+const [matcher, delimiter] = [...Array(2)].map(() =>
+  memoize(
+    (pattern: string | RegExp | undefined): (source: string) => boolean => {
+      switch (typeof pattern) {
+        case 'undefined':
+          return () => false;
+        case 'string':
+          return source => source.slice(0, pattern.length) === pattern;
+        case 'object':
+          return reduce(source => pattern.test(source));
+      }
+    },
+    signature));
+
 export function some<P extends Parser<unknown>>(parser: P, until?: string | RegExp | number, deep?: string | RegExp, limit?: number): P;
 export function some<T>(parser: Parser<T>, until?: string | RegExp | number, deep?: string | RegExp, limit = -1): Parser<T> {
   assert(parser);
-  assert(until instanceof RegExp ? !until.global && until.source.startsWith('^') : true);
+  assert(until instanceof RegExp ? !until.flags.match(/[gmy]/) && until.source.startsWith('^') : true);
+  assert(deep instanceof RegExp ? !deep.flags.match(/[gmy]/) && deep.source.startsWith('^') : true);
   if (typeof until === 'number') return some(parser, undefined, deep, until);
-  const match: (source: string) => boolean = typeof until === 'string' && until !== undefined
-    ? source => source.slice(0, until.length) === until
-    : source => !!until && until.test(source);
-  const delim: (source: string) => boolean = typeof deep === 'string' && deep !== undefined
-    ? source => source.slice(0, deep.length) === deep
-    : source => !!deep && deep.test(source);
-  let memory = '';
+  const match = matcher(until);
+  const delim = delimiter(deep);
+  const sig = signature(deep);
   return (source, context) => {
-    if (source === memory) return;
+    if (source === '') return;
     let rest = source;
     let nodes: T[] | undefined;
     if (context && deep) {
-      context.delimiters
-        ? context.delimiters.push(delim)
-        : context.delimiters = [delim];
-      assert(context.delimiters.length <= 3);
+      // bracket > annotation > bracket > reference > bracket > link > media | bracket
+      // bracket > annotation > bracket > reference > bracket > index > bracket
+      context.delimiters ??= { stack: [], matchers: {} };
+      context.delimiters.stack.push(sig);
+      context.delimiters.matchers[sig] ??= delim;
+      assert(context.delimiters.matchers[sig] === delim);
     }
+    const { stack, matchers } = context.delimiters ?? {};
     while (true) {
       if (rest === '') break;
       if (match(rest)) break;
-      if (context?.delimiters?.some(match => match(rest))) break;
+      if (stack?.some(sig => matchers![sig](rest))) break;
       const result = parser(rest, context);
       assert.doesNotThrow(() => limit < 0 && check(rest, result));
       if (!result) break;
@@ -38,11 +63,8 @@ export function some<T>(parser: Parser<T>, until?: string | RegExp | number, dee
       if (limit >= 0 && source.length - rest.length > limit) break;
     }
     if (context && deep) {
-      context.delimiters?.length! > 1
-        ? context.delimiters?.pop()
-        : context.delimiters = undefined;
+      stack?.pop();
     }
-    memory = limit < 0 && rest || memory;
     assert(rest.length <= source.length);
     return nodes && rest.length < source.length
       ? [nodes, rest]

package/src/combinator/data/parser.ts

@@ -2,7 +2,10 @@ export interface Ctx {
   readonly resources?: {
     budget: number;
   };
-  delimiters?: ((source: string) => boolean)[];
+  delimiters?: {
+    readonly stack: string[];
+    readonly matchers: Record<string, (source: string) => boolean>;
+  };
 }
 
 export type Parser<T, C extends Ctx = Ctx, D extends Parser<unknown, C>[] = any>

package/src/parser/api/normalize.ts

@@ -1,6 +1,5 @@
 import { eval } from '../../combinator/data/parser';
-import { htmlentity } from '../inline/htmlentity';
-import { stringify } from '../util';
+import { unsafehtmlentity } from '../inline/htmlentity';
 
 const UNICODE_REPLACEMENT_CHARACTER = '\uFFFD';
 assert(UNICODE_REPLACEMENT_CHARACTER.trim());
@@ -25,9 +24,9 @@ function sanitize(source: string): string {
 
 // https://dev.w3.org/html5/html-author/charref
 // https://en.wikipedia.org/wiki/Whitespace_character
-const unreadableHTMLEntityNames = [
-  //'Tab',
-  //'NewLine',
+export const invisibleHTMLEntityNames = [
+  'Tab',
+  'NewLine',
   'NonBreakingSpace',
   'nbsp',
   'shy',
@@ -59,8 +58,10 @@ const unreadableHTMLEntityNames = [
   'InvisibleComma',
   'ic',
 ] as const;
+const unreadableHTMLEntityNames: readonly string[] = invisibleHTMLEntityNames.slice(2);
 const unreadableEscapableCharacters = unreadableHTMLEntityNames
-  .map(name => stringify(eval(htmlentity(`&${name};`, {}))!));
+  .map(name => eval(unsafehtmlentity(`&${name};`, {}))![0]);
+assert(unreadableEscapableCharacters.length === unreadableHTMLEntityNames.length);
 assert(unreadableEscapableCharacters.every(c => c.length === 1));
 const unreadableEscapableCharacter = new RegExp(`[${
   [...new Set<string>(unreadableEscapableCharacters)].join('')

package/src/parser/block/heading.test.ts

@@ -74,7 +74,7 @@ describe('Unit: parser/block/heading', () => {
       assert.deepStrictEqual(inspect(parser('# a [#!http://host]')), [['<h1 id="index:!http://host">a<span class="indexer" data-index="!http://host"></span></h1>'], '']);
       assert.deepStrictEqual(inspect(parser('# a [#a((b))]')), [['<h1 id="index:a((b))">a<span class="indexer" data-index="a((b))"></span></h1>'], '']);
       assert.deepStrictEqual(inspect(parser('# a [#a[[b]]]')), [['<h1 id="index:a[[b]]">a<span class="indexer" data-index="a[[b]]"></span></h1>'], '']);
-      assert.deepStrictEqual(inspect(parser('# a [#b|#c]')), [['<h1 id="index:c">a<span class="indexer" data-index="c"></span></h1>'], '']);
+      assert.deepStrictEqual(inspect(parser('# a [#b |#c]')), [['<h1 id="index:c">a<span class="indexer" data-index="c"></span></h1>'], '']);
       assert.deepStrictEqual(inspect(parser('# a [#b] [#c]')), [['<h1 id="index:c">a [#b]<span class="indexer" data-index="c"></span></h1>'], '']);
       assert.deepStrictEqual(inspect(parser('# a  [#b] \n')), [['<h1 id="index:b">a<span class="indexer" data-index="b"></span></h1>'], '']);
       assert.deepStrictEqual(inspect(parser('# a \\[#b]')), [['<h1 id="index:a_[#b]">a [#b]</h1>'], '']);

package/src/parser/block/paragraph.test.ts

@@ -20,6 +20,8 @@ describe('Unit: parser/block/paragraph', () => {
       assert.deepStrictEqual(inspect(parser('a\\ \n')), [['<p>a</p>'], '']);
       assert.deepStrictEqual(inspect(parser('a\\\n')), [['<p>a</p>'], '']);
       assert.deepStrictEqual(inspect(parser('a\\\nb')), [['<p>a<span class="linebreak"> </span>b</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('a&NewLine;b')), [['<p>a&amp;NewLine;b</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('&Tab;&NewLine;')), [['<p>&amp;Tab;&amp;NewLine;</p>'], '']);
       assert.deepStrictEqual(inspect(parser('<wbr>')), [['<p>&lt;wbr&gt;</p>'], '']);
       assert.deepStrictEqual(inspect(parser('<wbr>\n')), [['<p>&lt;wbr&gt;</p>'], '']);
       assert.deepStrictEqual(inspect(parser('<wbr>\na')), [['<p>&lt;wbr&gt;<br>a</p>'], '']);

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

@@ -11,8 +11,8 @@ describe('Unit: parser/inline/emphasis', () => {
       assert.deepStrictEqual(inspect(parser('*a')), [['*', 'a'], '']);
       assert.deepStrictEqual(inspect(parser('*a *')), [['*', 'a', ' ', '*'], '']);
       assert.deepStrictEqual(inspect(parser('*a\n*')), [['*', 'a', '<br>', '*'], '']);
-      assert.deepStrictEqual(inspect(parser('*a\\ *')), [['*', 'a', ' '], '*']);
-      assert.deepStrictEqual(inspect(parser('*a\\\n*')), [['*', 'a', '<span class="linebreak"> </span>'], '*']);
+      assert.deepStrictEqual(inspect(parser('*a\\ *')), [['*', 'a', ' ', '*'], '']);
+      assert.deepStrictEqual(inspect(parser('*a\\\n*')), [['*', 'a', '<span class="linebreak"> </span>', '*'], '']);
       assert.deepStrictEqual(inspect(parser('*a**b')), [['*', 'a', '**', 'b'], '']);
       assert.deepStrictEqual(inspect(parser('*a**b*')), [['*', 'a', '**', 'b', '*'], '']);
       assert.deepStrictEqual(inspect(parser('* *')), undefined);
@@ -37,10 +37,13 @@ describe('Unit: parser/inline/emphasis', () => {
     });
 
     it('nest', () => {
-      assert.deepStrictEqual(inspect(parser('*a**b**c*')), [['<em>a<strong>b</strong>c</em>'], '']);
-      assert.deepStrictEqual(inspect(parser('*a**b**c*d')), [['<em>a<strong>b</strong>c</em>'], 'd']);
       assert.deepStrictEqual(inspect(parser('*a *b**')), [['<em>a <em>b</em></em>'], '']);
       assert.deepStrictEqual(inspect(parser('*a **b***')), [['<em>a <strong>b</strong></em>'], '']);
+      assert.deepStrictEqual(inspect(parser('*a\\ *b**')), [['<em>a <em>b</em></em>'], '']);
+      assert.deepStrictEqual(inspect(parser('*a&Tab;*b**')), [['<em>a\t<em>b</em></em>'], '']);
+      assert.deepStrictEqual(inspect(parser('*a<wbr>*b**')), [['<em>a<wbr><em>b</em></em>'], '']);
+      assert.deepStrictEqual(inspect(parser('*a**b**c*')), [['<em>a<strong>b</strong>c</em>'], '']);
+      assert.deepStrictEqual(inspect(parser('*a**b**c*d')), [['<em>a<strong>b</strong>c</em>'], 'd']);
       assert.deepStrictEqual(inspect(parser('*`a`*')), [['<em><code data-src="`a`">a</code></em>'], '']);
       assert.deepStrictEqual(inspect(parser('*<small>*')), [['<em>&lt;small&gt;</em>'], '']);
       assert.deepStrictEqual(inspect(parser('*(*a*)*')), [['<em><span class="paren">(<em>a</em>)</span></em>'], '']);

package/src/parser/inline/emphasis.ts

@@ -1,19 +1,19 @@
 import { EmphasisParser } from '../inline';
-import { union, sequence, some, creator, surround, close, lazy } from '../../combinator';
+import { union, some, creator, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { strong } from './strong';
 import { str } from '../source';
-import { startTight, isEndTightNodes } from '../util';
+import { startTight, isEndTightNodes, delimiter } from '../util';
 import { html, defrag } from 'typed-dom';
 import { unshift } from 'spica/array';
 
-export const emphasis: EmphasisParser = lazy(() => creator(surround(close(
-  str('*'), /^(?!\*)/),
+export const emphasis: EmphasisParser = lazy(() => creator(surround(
+  str('*'),
   startTight(some(union([
     strong,
-    some(inline, /^\s*\*/),
-    sequence([some(inline, '*'), inline]),
-  ]))),
+    some(inline, delimiter(/\*/)),
+    open(some(inline, '*'), inline),
+  ])), '*'),
   str('*'), false,
   ([as, bs, cs], rest) =>
     isEndTightNodes(bs)

package/src/parser/inline/emstrong.ts

@@ -1,42 +1,37 @@
 import { MarkdownParser } from '../../../markdown';
 import { EmStrongParser, EmphasisParser, StrongParser } from '../inline';
 import { Result, IntermediateParser } from '../../combinator/data/parser';
-import { union, sequence, some, creator, surround, lazy, bind } from '../../combinator';
+import { union, some, creator, surround, open, lazy, bind } from '../../combinator';
 import { inline } from '../inline';
 import { strong } from './strong';
 import { str } from '../source';
-import { startTight, isEndTightNodes } from '../util';
+import { startTight, isEndTightNodes, delimiter } from '../util';
 import { html, defrag } from 'typed-dom';
 import { unshift } from 'spica/array';
 
 const substrong: IntermediateParser<StrongParser> = lazy(() => some(union([
-  some(inline, /^\s*\*\*/),
-  sequence([some(inline, '*'), inline]),
+  some(inline, delimiter(/\*\*/)),
+  open(some(inline, '*'), inline),
 ])));
 const subemphasis: IntermediateParser<EmphasisParser> = lazy(() => some(union([
   strong,
-  some(inline, /^\s*\*/),
-  sequence([some(inline, '*'), inline]),
+  some(inline, delimiter(/\*/)),
+  open(some(inline, '*'), inline),
 ])));
 
 export const emstrong: EmStrongParser = lazy(() => creator(surround(
   str('***'),
   startTight(some(union([
-    some(inline, /^\s*\*/),
-    sequence([some(inline, '*'), inline]),
+    some(inline, delimiter(/\*/)),
+    open(some(inline, '*'), inline),
   ]))),
   str(/^\*{1,3}/), false,
   ([as, bs, cs], rest, context): Result<HTMLElement | string, MarkdownParser.Context> => {
+    assert(cs.length === 1);
     if (!isEndTightNodes(bs)) return [unshift(as, bs), cs[0] + rest];
     switch (cs[0]) {
-      case '*':
-        return bind<StrongParser>(
-          substrong,
-          (ds, rest) =>
-            rest.slice(0, 2) === '**' && isEndTightNodes(ds)
-              ? [[html('strong', unshift([html('em', defrag(bs))], defrag(ds)))], rest.slice(2)]
-              : [unshift(['**', html('em', defrag(bs))], ds), rest])
-          (rest, context) ?? [['**', html('em', defrag(bs))], rest];
+      case '***':
+        return [[html('em', [html('strong', defrag(bs))])], rest];
       case '**':
         return bind<EmphasisParser>(
           subemphasis,
@@ -45,8 +40,14 @@ export const emstrong: EmStrongParser = lazy(() => creator(surround(
               ? [[html('em', unshift([html('strong', defrag(bs))], defrag(ds)))], rest.slice(1)]
               : [unshift(['*', html('strong', defrag(bs))], ds), rest])
           (rest, context) ?? [['*', html('strong', defrag(bs))], rest];
-      case '***':
-        return [[html('em', [html('strong', defrag(bs))])], rest];
+      case '*':
+        return bind<StrongParser>(
+          substrong,
+          (ds, rest) =>
+            rest.slice(0, 2) === '**' && isEndTightNodes(ds)
+              ? [[html('strong', unshift([html('em', defrag(bs))], defrag(ds)))], rest.slice(2)]
+              : [unshift(['**', html('em', defrag(bs))], ds), rest])
+          (rest, context) ?? [['**', html('em', defrag(bs))], rest];
     }
     assert(false);
   },