securemark 0.235.2 → 0.235.3

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.235.3
+
+- Refactoring.
+
 ## 0.235.2
 
 - Refactoring.

package/dist/securemark.js

@@ -1,4 +1,4 @@
-/*! securemark v0.235.2 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
+/*! securemark v0.235.3 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
 require = function () {
     function r(e, n, t) {
         function o(i, f) {
@@ -2344,6 +2344,7 @@ require = function () {
                         'use strict';
                         Object.defineProperty(exports, '__esModule', { value: true });
                         exports.SVG = exports.HTML = exports.Shadow = exports.API = void 0;
+                        const global_1 = _dereq_('spica/global');
                         const alias_1 = _dereq_('spica/alias');
                         const proxy_1 = _dereq_('./proxy');
                         const dom_1 = _dereq_('./util/dom');
@@ -2363,22 +2364,24 @@ require = function () {
                             };
                             function builder(tag, baseFactory) {
                                 return function build(attrs, children, factory) {
-                                    if (typeof attrs === 'function')
-                                        return build(void 0, void 0, attrs);
                                     if (typeof children === 'function')
                                         return build(attrs, void 0, children);
-                                    if (attrs !== void 0 && isElChildren(attrs))
+                                    if (typeof attrs === 'function')
+                                        return build(void 0, void 0, attrs);
+                                    if (isElChildren(attrs))
                                         return build(void 0, attrs, factory);
                                     const node = formatter(elem(factory, attrs, children));
                                     return node.nodeType === 1 ? new proxy_1.Elem(node, children) : new proxy_1.Elem(node.host, children, node);
                                 };
-                                function isElChildren(children) {
-                                    if (typeof children !== 'object')
+                                function isElChildren(param) {
+                                    if (param === void 0)
+                                        return false;
+                                    if (param[global_1.Symbol.iterator])
                                         return true;
-                                    for (const i in children) {
-                                        if (!(0, alias_1.hasOwnProperty)(children, i))
+                                    for (const i in param) {
+                                        if (!(0, alias_1.hasOwnProperty)(param, i))
                                             continue;
-                                        return typeof children[i] === 'object';
+                                        return typeof param[i] === 'object' && !!param[i];
                                     }
                                     return true;
                                 }
@@ -2394,7 +2397,8 @@ require = function () {
                     {
                         './proxy': 14,
                         './util/dom': 15,
-                        'spica/alias': 4
+                        'spica/alias': 4,
+                        'spica/global': 8
                     }
                 ],
                 14: [
@@ -2808,8 +2812,8 @@ require = function () {
                             node.replaceChildren(...typeof children === 'string' ? [children] : children);
                             return node;
                         }
-                        function isChildren(o) {
-                            return !!(o === null || o === void 0 ? void 0 : o[global_1.Symbol.iterator]);
+                        function isChildren(param) {
+                            return !!(param === null || param === void 0 ? void 0 : param[global_1.Symbol.iterator]);
                         }
                         exports.isChildren = isChildren;
                         function defrag(nodes) {
@@ -6709,7 +6713,7 @@ require = function () {
             const typed_dom_1 = _dereq_('typed-dom');
             const array_1 = _dereq_('spica/array');
             exports.deletion = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.surround)((0, source_1.str)('~~'), (0, combinator_1.some)((0, combinator_1.union)([
-                (0, combinator_1.some)(inline_1.inline, (0, util_1.blank)(/\n?/, /~~/)),
+                (0, combinator_1.some)(inline_1.inline, (0, util_1.blank)(/\n?/, '~~')),
                 (0, combinator_1.open)(/^\n?/, (0, combinator_1.some)(inline_1.inline, '~'), true)
             ])), (0, source_1.str)('~~'), false, ([, bs], rest) => [
                 [(0, typed_dom_1.html)('del', (0, typed_dom_1.defrag)(bs))],
@@ -6742,7 +6746,7 @@ require = function () {
             const array_1 = _dereq_('spica/array');
             exports.emphasis = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.surround)((0, source_1.str)('*'), (0, util_1.startTight)((0, combinator_1.some)((0, combinator_1.union)([
                 strong_1.strong,
-                (0, combinator_1.some)(inline_1.inline, (0, util_1.blank)('', /\*/)),
+                (0, combinator_1.some)(inline_1.inline, (0, util_1.blank)('', '*')),
                 (0, combinator_1.open)((0, combinator_1.some)(inline_1.inline, '*'), inline_1.inline)
             ])), '*'), (0, source_1.str)('*'), false, ([, bs], rest) => [
                 [(0, typed_dom_1.html)('em', (0, typed_dom_1.defrag)(bs))],
@@ -6775,16 +6779,16 @@ require = function () {
             const typed_dom_1 = _dereq_('typed-dom');
             const array_1 = _dereq_('spica/array');
             const substrong = (0, combinator_1.lazy)(() => (0, combinator_1.some)((0, combinator_1.union)([
-                (0, combinator_1.some)(inline_1.inline, (0, util_1.blank)('', /\*\*/)),
+                (0, combinator_1.some)(inline_1.inline, (0, util_1.blank)('', '**')),
                 (0, combinator_1.open)((0, combinator_1.some)(inline_1.inline, '*'), inline_1.inline)
             ])));
             const subemphasis = (0, combinator_1.lazy)(() => (0, combinator_1.some)((0, combinator_1.union)([
                 strong_1.strong,
-                (0, combinator_1.some)(inline_1.inline, (0, util_1.blank)('', /\*/)),
+                (0, combinator_1.some)(inline_1.inline, (0, util_1.blank)('', '*')),
                 (0, combinator_1.open)((0, combinator_1.some)(inline_1.inline, '*'), inline_1.inline)
             ])));
             exports.emstrong = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.surround)((0, source_1.str)('***'), (0, util_1.startTight)((0, combinator_1.some)((0, combinator_1.union)([
-                (0, combinator_1.some)(inline_1.inline, (0, util_1.blank)('', /\*/)),
+                (0, combinator_1.some)(inline_1.inline, (0, util_1.blank)('', '*')),
                 (0, combinator_1.open)((0, combinator_1.some)(inline_1.inline, '*'), inline_1.inline)
             ]))), (0, source_1.str)(/^\*{1,3}/), false, ([, bs, cs], rest, context) => {
                 var _a, _b;
@@ -7309,21 +7313,35 @@ require = function () {
             'use strict';
             Object.defineProperty(exports, '__esModule', { value: true });
             exports.htmlentity = exports.unsafehtmlentity = void 0;
+            const global_1 = _dereq_('spica/global');
             const combinator_1 = _dereq_('../../combinator');
             const typed_dom_1 = _dereq_('typed-dom');
-            exports.unsafehtmlentity = (0, combinator_1.creator)((0, combinator_1.validate)('&', (0, combinator_1.focus)(/^&(?!NewLine;)[0-9A-Za-z]+;/, (parser => entity => (parser.innerHTML = entity, entity = parser.textContent, [
-                [`${ entity[0] !== '&' || entity.length === 1 ? '' : '\0' }${ entity }`],
-                ''
-            ]))((0, typed_dom_1.html)('b')))));
-            exports.htmlentity = (0, combinator_1.fmap)((0, combinator_1.union)([exports.unsafehtmlentity]), ([str]) => [str[0] === '\0' ? (0, typed_dom_1.html)('span', {
+            const memoize_1 = _dereq_('spica/memoize');
+            exports.unsafehtmlentity = (0, combinator_1.creator)((0, combinator_1.validate)('&', (0, combinator_1.focus)(/^&[0-9A-Za-z]+;/, entity => {
+                var _a;
+                return [
+                    [(_a = parse(entity)) !== null && _a !== void 0 ? _a : `\0${ entity }`],
+                    ''
+                ];
+            })));
+            exports.htmlentity = (0, combinator_1.fmap)((0, combinator_1.union)([exports.unsafehtmlentity]), ([test]) => [test[0] === '\0' ? (0, typed_dom_1.html)('span', {
                     class: 'invalid',
                     'data-invalid-syntax': 'htmlentity',
                     'data-invalid-type': 'syntax',
                     'data-invalid-description': 'Invalid HTML entity.'
-                }, str.slice(1)) : str]);
+                }, test.slice(1)) : test]);
+            const parse = (0, memoize_1.reduce)((el => entity => {
+                if (entity === '
')
+                    return ' ';
+                el.innerHTML = entity;
+                const text = el.textContent;
+                return entity === text ? global_1.undefined : text;
+            })((0, typed_dom_1.html)('b')));
         },
         {
             '../../combinator': 27,
+            'spica/global': 15,
+            'spica/memoize': 18,
             'typed-dom': 26
         }
     ],
@@ -7339,7 +7357,7 @@ require = function () {
             const typed_dom_1 = _dereq_('typed-dom');
             const array_1 = _dereq_('spica/array');
             exports.insertion = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.surround)((0, source_1.str)('++'), (0, combinator_1.some)((0, combinator_1.union)([
-                (0, combinator_1.some)(inline_1.inline, (0, util_1.blank)(/\n?/, /\+\+/)),
+                (0, combinator_1.some)(inline_1.inline, (0, util_1.blank)(/\n?/, '++')),
                 (0, combinator_1.open)(/^\n?/, (0, combinator_1.some)(inline_1.inline, '+'), true)
             ])), (0, source_1.str)('++'), false, ([, bs], rest) => [
                 [(0, typed_dom_1.html)('ins', (0, typed_dom_1.defrag)(bs))],
@@ -7513,7 +7531,7 @@ require = function () {
             const typed_dom_1 = _dereq_('typed-dom');
             const array_1 = _dereq_('spica/array');
             exports.mark = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.surround)((0, source_1.str)('=='), (0, util_1.startTight)((0, combinator_1.some)((0, combinator_1.union)([
-                (0, combinator_1.some)(inline_1.inline, (0, util_1.blank)('', /==/)),
+                (0, combinator_1.some)(inline_1.inline, (0, util_1.blank)('', '==')),
                 (0, combinator_1.open)((0, combinator_1.some)(inline_1.inline, '='), inline_1.inline)
             ]))), (0, source_1.str)('=='), false, ([, bs], rest) => [
                 [(0, typed_dom_1.html)('mark', (0, typed_dom_1.defrag)(bs))],
@@ -7873,7 +7891,7 @@ require = function () {
                         rubies
                     ]) {
                     for (let i = 0; i < ss.length; ++i) {
-                        if (!ss[i].includes('\0'))
+                        if (ss[i].indexOf('\0') === -1)
                             continue;
                         ss[i] = ss[i].replace(/\0/g, '');
                         attrs !== null && attrs !== void 0 ? attrs : attrs = {
@@ -7929,7 +7947,7 @@ require = function () {
             const typed_dom_1 = _dereq_('typed-dom');
             const array_1 = _dereq_('spica/array');
             exports.strong = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.surround)((0, source_1.str)('**'), (0, util_1.startTight)((0, combinator_1.some)((0, combinator_1.union)([
-                (0, combinator_1.some)(inline_1.inline, (0, util_1.blank)('', /\*\*/)),
+                (0, combinator_1.some)(inline_1.inline, (0, util_1.blank)('', '**')),
                 (0, combinator_1.open)((0, combinator_1.some)(inline_1.inline, '*'), inline_1.inline)
             ])), '*'), (0, source_1.str)('**'), false, ([, bs], rest) => [
                 [(0, typed_dom_1.html)('strong', (0, typed_dom_1.defrag)(bs))],
@@ -8729,7 +8747,7 @@ require = function () {
             const memoize_1 = _dereq_('spica/memoize');
             const array_1 = _dereq_('spica/array');
             function blank(prefix, suffix) {
-                return new RegExp(String.raw`^${ prefix && prefix.source }(?:\\\s|[^\S\n]+|\n|&(?:${ normalize_1.invisibleHTMLEntityNames.join('|') });|<wbr>)?${ typeof suffix === 'string' ? suffix : suffix.source }`);
+                return new RegExp(String.raw`^${ prefix && prefix.source }(?:\\\s|[^\S\n]+|\n|&(?:${ normalize_1.invisibleHTMLEntityNames.join('|') });|<wbr>)?${ typeof suffix === 'string' ? suffix.replace(/[*+()\[\]]/g, '\\$&') : suffix.source }`);
             }
             exports.blank = blank;
             function visualize(parser) {

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.235.2",
+  "version": "0.235.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -448,12 +448,6 @@
         "which": "^2.0.2"
       },
       "dependencies": {
-        "lru-cache": {
-          "version": "7.7.3",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.3.tgz",
-          "integrity": "sha512-WY9wjJNQt9+PZilnLbuFKM+SwDull9+6IAguOrarOMoOHTcJ9GnXSO11+Gw6c7xtDkBkthR57OZMtZKYr+1CEw==",
-          "dev": true
-        },
         "mkdirp": {
           "version": "1.0.4",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -1800,12 +1794,6 @@
         "unique-filename": "^1.1.1"
       },
       "dependencies": {
-        "lru-cache": {
-          "version": "7.7.3",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.3.tgz",
-          "integrity": "sha512-WY9wjJNQt9+PZilnLbuFKM+SwDull9+6IAguOrarOMoOHTcJ9GnXSO11+Gw6c7xtDkBkthR57OZMtZKYr+1CEw==",
-          "dev": true
-        },
         "mkdirp": {
           "version": "1.0.4",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -7069,13 +7057,10 @@
       "dev": true
     },
     "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "requires": {
-        "yallist": "^4.0.0"
-      }
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.3.tgz",
+      "integrity": "sha512-WY9wjJNQt9+PZilnLbuFKM+SwDull9+6IAguOrarOMoOHTcJ9GnXSO11+Gw6c7xtDkBkthR57OZMtZKYr+1CEw==",
+      "dev": true
     },
     "make-dir": {
       "version": "3.1.0",
@@ -7116,14 +7101,6 @@
         "promise-retry": "^2.0.1",
         "socks-proxy-agent": "^6.1.1",
         "ssri": "^8.0.1"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "7.7.3",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.3.tgz",
-          "integrity": "sha512-WY9wjJNQt9+PZilnLbuFKM+SwDull9+6IAguOrarOMoOHTcJ9GnXSO11+Gw6c7xtDkBkthR57OZMtZKYr+1CEw==",
-          "dev": true
-        }
       }
     },
     "make-iterator": {
@@ -8007,9 +7984,9 @@
       }
     },
     "npm-check-updates": {
-      "version": "12.5.4",
-      "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.5.4.tgz",
-      "integrity": "sha512-4+27zaTdieWgvPLaCZ/A6Q2WC1cYVcrc2SqVmLFYgkWBrKw1QkwpeV16FSvkFGZr3OdFyr7Dpjw8JRn4H2QxFw==",
+      "version": "12.5.5",
+      "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.5.5.tgz",
+      "integrity": "sha512-7LH6KN6F1fZMtY4zNYAQPpJU1ToxZ6sSCxk948vrLIz97aNqmPLSX72MrmbOWwpyBgLCPbFJWY/k3zE18pmxfw==",
       "dev": true,
       "requires": {
         "chalk": "^4.1.2",
@@ -8021,7 +7998,7 @@
         "fp-and-or": "^0.1.3",
         "get-stdin": "^8.0.0",
         "globby": "^11.0.4",
-        "hosted-git-info": "^4.1.0",
+        "hosted-git-info": "^5.0.0",
         "json-parse-helpfulerror": "^1.0.3",
         "jsonlines": "^0.1.1",
         "libnpmconfig": "^1.2.1",
@@ -8063,12 +8040,12 @@
           }
         },
         "hosted-git-info": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-          "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-5.0.0.tgz",
+          "integrity": "sha512-rRnjWu0Bxj+nIfUOkz0695C0H6tRrN5iYIzYejb0tDEefe2AekHu/U5Kn9pEie5vsJqpNQU02az7TGSH3qpz4Q==",
           "dev": true,
           "requires": {
-            "lru-cache": "^6.0.0"
+            "lru-cache": "^7.5.1"
           }
         },
         "locate-path": {
@@ -8149,12 +8126,6 @@
           "requires": {
             "lru-cache": "^7.5.1"
           }
-        },
-        "lru-cache": {
-          "version": "7.7.3",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.3.tgz",
-          "integrity": "sha512-WY9wjJNQt9+PZilnLbuFKM+SwDull9+6IAguOrarOMoOHTcJ9GnXSO11+Gw6c7xtDkBkthR57OZMtZKYr+1CEw==",
-          "dev": true
         }
       }
     },
@@ -9189,12 +9160,6 @@
             "lru-cache": "^7.5.1"
           }
         },
-        "lru-cache": {
-          "version": "7.7.3",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.3.tgz",
-          "integrity": "sha512-WY9wjJNQt9+PZilnLbuFKM+SwDull9+6IAguOrarOMoOHTcJ9GnXSO11+Gw6c7xtDkBkthR57OZMtZKYr+1CEw==",
-          "dev": true
-        },
         "normalize-package-data": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-4.0.0.tgz",
@@ -9787,6 +9752,17 @@
       "dev": true,
       "requires": {
         "lru-cache": "^6.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        }
       }
     },
     "semver-diff": {
@@ -10940,9 +10916,9 @@
       "dev": true
     },
     "typed-dom": {
-      "version": "0.0.249",
-      "resolved": "https://registry.npmjs.org/typed-dom/-/typed-dom-0.0.249.tgz",
-      "integrity": "sha512-9SS9P99g+/FKWgAYVjHjlhkgX31RXKBzwfI75DfHQPRXDPnl00rupgixuNqWiVIfniT/vy/yRSflc/zR7JRJaQ==",
+      "version": "0.0.250",
+      "resolved": "https://registry.npmjs.org/typed-dom/-/typed-dom-0.0.250.tgz",
+      "integrity": "sha512-hjCpUI+E7St1bGVgyjYZww0ruhXLbPrcih6puElqXTIGHG9JHqd70p94RVilWup/mKoLnzeIdbFDYHLuloCfdQ==",
       "dev": true
     },
     "typedarray": {
@@ -10961,9 +10937,9 @@
       }
     },
     "typescript": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz",
-      "integrity": "sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==",
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz",
+      "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==",
       "dev": true
     },
     "ua-parser-js": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.235.2",
+  "version": "0.235.3",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",
@@ -63,8 +63,8 @@
     "semver": "^7.3.5",
     "spica": "0.0.515",
     "tsify": "^5.0.4",
-    "typed-dom": "0.0.249",
-    "typescript": "4.6.2",
+    "typed-dom": "0.0.250",
+    "typescript": "4.6.3",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0"
   },

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

@@ -20,7 +20,7 @@ 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('a&NewLine;b')), [['<p>a 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>'], '']);

package/src/parser/inline/deletion.ts

@@ -9,7 +9,7 @@ import { unshift } from 'spica/array';
 export const deletion: DeletionParser = lazy(() => creator(surround(
   str('~~'),
   some(union([
-    some(inline, blank(/\n?/, /~~/)),
+    some(inline, blank(/\n?/, '~~')),
     open(/^\n?/, some(inline, '~'), true),
   ])),
   str('~~'), false,

package/src/parser/inline/emphasis.ts

@@ -11,7 +11,7 @@ export const emphasis: EmphasisParser = lazy(() => creator(surround(
   str('*'),
   startTight(some(union([
     strong,
-    some(inline, blank('', /\*/)),
+    some(inline, blank('', '*')),
     open(some(inline, '*'), inline),
   ])), '*'),
   str('*'), false,

package/src/parser/inline/emstrong.ts

@@ -10,19 +10,19 @@ import { html, defrag } from 'typed-dom';
 import { unshift } from 'spica/array';
 
 const substrong: IntermediateParser<StrongParser> = lazy(() => some(union([
-  some(inline, blank('', /\*\*/)),
+  some(inline, blank('', '**')),
   open(some(inline, '*'), inline),
 ])));
 const subemphasis: IntermediateParser<EmphasisParser> = lazy(() => some(union([
   strong,
-  some(inline, blank('', /\*/)),
+  some(inline, blank('', '*')),
   open(some(inline, '*'), inline),
 ])));
 
 export const emstrong: EmStrongParser = lazy(() => creator(surround(
   str('***'),
   startTight(some(union([
-    some(inline, blank('', /\*/)),
+    some(inline, blank('', '*')),
     open(some(inline, '*'), inline),
   ]))),
   str(/^\*{1,3}/), false,

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

@@ -14,7 +14,6 @@ describe('Unit: parser/inline/htmlentity', () => {
       assert.deepStrictEqual(inspect(parser('& ;')), undefined);
       assert.deepStrictEqual(inspect(parser('&\n;')), undefined);
       assert.deepStrictEqual(inspect(parser('&a;')), [['<span class="invalid">&amp;a;</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('&NewLine;')), undefined);
       assert.deepStrictEqual(inspect(parser('&#;')), undefined);
       assert.deepStrictEqual(inspect(parser('&#g;')), undefined);
       assert.deepStrictEqual(inspect(parser('&#x;')), undefined);
@@ -36,6 +35,7 @@ describe('Unit: parser/inline/htmlentity', () => {
     });
 
     it('entity', () => {
+      assert.deepStrictEqual(inspect(parser('&NewLine;')), [[' '], '']);
       assert.deepStrictEqual(inspect(parser('&nbsp;')), [['\u00A0'], '']);
       assert.deepStrictEqual(inspect(parser('&amp;')), [['&'], '']);
       assert.deepStrictEqual(inspect(parser('&copy;')), [['©'], '']);

package/src/parser/inline/htmlentity.ts

@@ -1,24 +1,31 @@
+import { undefined } from 'spica/global';
 import { HTMLEntityParser, UnsafeHTMLEntityParser } from '../inline';
 import { union, validate, focus, creator, fmap } from '../../combinator';
 import { html } from 'typed-dom';
+import { reduce } from 'spica/memoize';
 
 export const unsafehtmlentity: UnsafeHTMLEntityParser = creator(validate('&', focus(
-  /^&(?!NewLine;)[0-9A-Za-z]+;/,
-  (parser => entity => (
-    parser.innerHTML = entity,
-    entity = parser.textContent!,
-    [[`${entity[0] !== '&' || entity.length === 1 ? '' : '\0'}${entity}`], '']
-  ))(html('b')))));
+  /^&[0-9A-Za-z]+;/,
+  entity => [[parse(entity) ?? `\0${entity}`], ''])));
 
 export const htmlentity: HTMLEntityParser = fmap(
   union([unsafehtmlentity]),
-  ([str]) => [
-    str[0] === '\0'
+  ([test]) => [
+    test[0] === '\0'
       ? html('span', {
           class: 'invalid',
           'data-invalid-syntax': 'htmlentity',
           'data-invalid-type': 'syntax',
           'data-invalid-description': 'Invalid HTML entity.',
-        }, str.slice(1))
-      : str,
+        }, test.slice(1))
+      : test,
   ]);
+
+const parse = reduce((el => (entity: string): string | undefined => {
+  if (entity === '
') return ' ';
+  el.innerHTML = entity;
+  const text = el.textContent!;
+  return entity === text
+    ? undefined
+    : text;
+})(html('b')));

package/src/parser/inline/insertion.ts

@@ -9,7 +9,7 @@ import { unshift } from 'spica/array';
 export const insertion: InsertionParser = lazy(() => creator(surround(
   str('++'),
   some(union([
-    some(inline, blank(/\n?/, /\+\+/)),
+    some(inline, blank(/\n?/, '++')),
     open(/^\n?/, some(inline, '+'), true),
   ])),
   str('++'), false,

package/src/parser/inline/mark.ts

@@ -9,7 +9,7 @@ import { unshift } from 'spica/array';
 export const mark: MarkParser = lazy(() => creator(surround(
   str('=='),
   startTight(some(union([
-    some(inline, blank('', /==/)),
+    some(inline, blank('', '==')),
     open(some(inline, '='), inline),
   ]))),
   str('=='), false,

package/src/parser/inline/ruby.ts

@@ -83,7 +83,7 @@ function attributes(texts: string[], rubies: string[]): Record<string, string> {
   let attrs: Record<string, string> | undefined;
   for (const ss of [texts, rubies]) {
     for (let i = 0; i < ss.length; ++i) {
-      if (!ss[i].includes('\0')) continue;
+      if (ss[i].indexOf('\0') === -1) continue;
       ss[i] = ss[i].replace(/\0/g, '');
       attrs ??= {
         class: 'invalid',

package/src/parser/inline/strong.ts

@@ -9,7 +9,7 @@ import { unshift } from 'spica/array';
 export const strong: StrongParser = lazy(() => creator(surround(
   str('**'),
   startTight(some(union([
-    some(inline, blank('', /\*\*/)),
+    some(inline, blank('', '**')),
     open(some(inline, '*'), inline),
   ])), '*'),
   str('**'), false,

package/src/parser/util.ts

@@ -13,7 +13,7 @@ export function blank(prefix: '' | RegExp, suffix: string | RegExp): RegExp {
     `^${
       prefix && prefix.source
     }(?:\\\s|[^\S\n]+|\n|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr>)?${
-      typeof suffix === 'string' ? suffix : suffix.source
+      typeof suffix === 'string' ? suffix.replace(/[*+()\[\]]/g, '\\$&') : suffix.source
     }`);
 }