npm - securemark - Versions diffs - 0.234.0 → 0.234.3 - Mend

securemark 0.234.0 → 0.234.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

package/CHANGELOG.md +12 -0
package/dist/securemark.js +77 -92
package/markdown.d.ts +4 -2
package/package-lock.json +20 -20
package/package.json +1 -1
package/src/combinator/data/parser.ts +2 -1
package/src/parser/api/normalize.ts +7 -6
package/src/parser/block/paragraph.test.ts +8 -0
package/src/parser/inline/emphasis.test.ts +9 -4
package/src/parser/inline/emphasis.ts +9 -5
package/src/parser/inline/emstrong.ts +34 -17
package/src/parser/inline/html.ts +4 -8
package/src/parser/inline/htmlentity.test.ts +1 -0
package/src/parser/inline/htmlentity.ts +9 -12
package/src/parser/inline/mark.test.ts +8 -4
package/src/parser/inline/mark.ts +6 -3
package/src/parser/inline/math.ts +8 -11
package/src/parser/inline/strong.test.ts +8 -5
package/src/parser/inline/strong.ts +8 -6
package/src/parser/inline.test.ts +49 -2
package/src/parser/util.ts +11 -43

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,17 @@
 # Changelog
+## 0.234.3
+- Refactoring.
+## 0.234.2
+- Refactoring.
+## 0.234.1
+- Fix emstrong parser, emphasis parser, strong parser, and mark parser.
 ## 0.234.0
 - Extend anchor syntax.

package/dist/securemark.js CHANGED Viewed

@@ -1,4 +1,4 @@
-/*! securemark v0.234.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
+/*! securemark v0.234.3 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
 require = function () {
     function r(e, n, t) {
         function o(i, f) {
@@ -4373,10 +4373,9 @@ require = function () {
         function (_dereq_, module, exports) {
             'use strict';
             Object.defineProperty(exports, '__esModule', { value: true });
-            exports.escape = exports.normalize = void 0;
+            exports.escape = exports.invisibleHTMLEntityNames = exports.normalize = void 0;
             const parser_1 = _dereq_('../../combinator/data/parser');
             const htmlentity_1 = _dereq_('../inline/htmlentity');
-            const util_1 = _dereq_('../util');
             const UNICODE_REPLACEMENT_CHARACTER = '\uFFFD';
             function normalize(source) {
                 return sanitize(format(source));
@@ -4388,7 +4387,9 @@ require = function () {
             function sanitize(source) {
                 return source.replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]|[\u2006\u200B-\u200F\u202A-\u202F\u2060\uFEFF]|(^|[^\u1820\u1821])\u180E/g, `$1${ UNICODE_REPLACEMENT_CHARACTER }`).replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]?|[\uDC00-\uDFFF]/g, char => char.length === 1 ? UNICODE_REPLACEMENT_CHARACTER : char);
             }
-            const unreadableHTMLEntityNames = [
+            exports.invisibleHTMLEntityNames = [
+                'Tab',
+                'NewLine',
                 'NonBreakingSpace',
                 'nbsp',
                 'shy',
@@ -4420,7 +4421,8 @@ require = function () {
                 'InvisibleComma',
                 'ic'
             ];
-            const unreadableEscapableCharacters = unreadableHTMLEntityNames.map(name => (0, util_1.stringify)((0, parser_1.eval)((0, htmlentity_1.htmlentity)(`&${ name };`, {}))));
+            const unreadableHTMLEntityNames = exports.invisibleHTMLEntityNames.slice(2);
+            const unreadableEscapableCharacters = unreadableHTMLEntityNames.map(name => (0, parser_1.eval)((0, htmlentity_1.unsafehtmlentity)(`&${ name };`, {}))[0]);
             const unreadableEscapableCharacter = new RegExp(`[${ [...new Set(unreadableEscapableCharacters)].join('') }]`, 'g');
             const unreadableSpecialCharacters = [
                 '\u2006',
@@ -4445,8 +4447,7 @@ require = function () {
         },
         {
             '../../combinator/data/parser': 47,
-            '../inline/htmlentity': 112,
-            '../util': 134
+            '../inline/htmlentity': 112
         }
     ],
     61: [
@@ -6672,10 +6673,11 @@ require = function () {
             const util_1 = _dereq_('../util');
             const typed_dom_1 = _dereq_('typed-dom');
             const array_1 = _dereq_('spica/array');
-            exports.emphasis = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.surround)((0, combinator_1.close)((0, source_1.str)('*'), /^(?!\*)/), (0, util_1.startTight)((0, combinator_1.some)((0, combinator_1.union)([
+            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, source_1.str)('*'), false, ([as, bs, cs], rest) => (0, util_1.isEndTightNodes)(bs) ? [
+                (0, combinator_1.some)(inline_1.inline, (0, util_1.delimiter)(String.raw`\*`)),
+                (0, combinator_1.open)((0, combinator_1.some)(inline_1.inline, '*'), inline_1.inline)
+            ])), '*'), (0, source_1.str)('*'), false, ([as, bs, cs], rest) => (0, util_1.isEndTightNodes)(bs) ? [
                 [(0, typed_dom_1.html)('em', (0, typed_dom_1.defrag)(bs))],
                 rest
             ] : [
@@ -6703,11 +6705,24 @@ require = function () {
             exports.emstrong = void 0;
             const combinator_1 = _dereq_('../../combinator');
             const inline_1 = _dereq_('../inline');
+            const strong_1 = _dereq_('./strong');
             const source_1 = _dereq_('../source');
             const util_1 = _dereq_('../util');
             const typed_dom_1 = _dereq_('typed-dom');
             const array_1 = _dereq_('spica/array');
-            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.union)([(0, combinator_1.some)(inline_1.inline, '*')])), (0, source_1.str)(/^\*{1,3}/), false, ([as, bs, cs], rest, context) => {
+            const substrong = (0, combinator_1.lazy)(() => (0, combinator_1.some)((0, combinator_1.union)([
+                (0, combinator_1.some)(inline_1.inline, (0, util_1.delimiter)(String.raw`\*\*`)),
+                (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.delimiter)(String.raw`\*`)),
+                (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.delimiter)(String.raw`\*`)),
+                (0, combinator_1.open)((0, combinator_1.some)(inline_1.inline, '*'), inline_1.inline)
+            ]))), (0, source_1.str)(/^\*{1,3}/), false, ([as, bs, cs], rest, context) => {
                 var _a, _b;
                 if (!(0, util_1.isEndTightNodes)(bs))
                     return [
@@ -6715,25 +6730,13 @@ require = function () {
                         cs[0] + rest
                     ];
                 switch (cs[0]) {
-                case '*':
-                    return (_a = (0, combinator_1.bind)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, '**')]), (ds, rest) => rest.slice(0, 2) === '**' && (0, util_1.isEndTightNodes)(ds) ? [
-                        [(0, typed_dom_1.html)('strong', (0, array_1.unshift)([(0, typed_dom_1.html)('em', (0, typed_dom_1.defrag)(bs))], (0, typed_dom_1.defrag)(ds)))],
-                        rest.slice(2)
-                    ] : [
-                        (0, array_1.unshift)([
-                            '**',
-                            (0, typed_dom_1.html)('em', (0, typed_dom_1.defrag)(bs))
-                        ], ds),
-                        rest
-                    ])(rest, context)) !== null && _a !== void 0 ? _a : [
-                        [
-                            '**',
-                            (0, typed_dom_1.html)('em', (0, typed_dom_1.defrag)(bs))
-                        ],
+                case '***':
+                    return [
+                        [(0, typed_dom_1.html)('em', [(0, typed_dom_1.html)('strong', (0, typed_dom_1.defrag)(bs))])],
                         rest
                     ];
                 case '**':
-                    return (_b = (0, combinator_1.bind)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, '*')]), (ds, rest) => rest.slice(0, 1) === '*' && (0, util_1.isEndTightNodes)(ds) ? [
+                    return (_a = (0, combinator_1.bind)(subemphasis, (ds, rest) => rest.slice(0, 1) === '*' && (0, util_1.isEndTightNodes)(ds) ? [
                         [(0, typed_dom_1.html)('em', (0, array_1.unshift)([(0, typed_dom_1.html)('strong', (0, typed_dom_1.defrag)(bs))], (0, typed_dom_1.defrag)(ds)))],
                         rest.slice(1)
                     ] : [
@@ -6742,16 +6745,28 @@ require = function () {
                             (0, typed_dom_1.html)('strong', (0, typed_dom_1.defrag)(bs))
                         ], ds),
                         rest
-                    ])(rest, context)) !== null && _b !== void 0 ? _b : [
+                    ])(rest, context)) !== null && _a !== void 0 ? _a : [
                         [
                             '*',
                             (0, typed_dom_1.html)('strong', (0, typed_dom_1.defrag)(bs))
                         ],
                         rest
                     ];
-                case '***':
-                    return [
-                        [(0, typed_dom_1.html)('em', [(0, typed_dom_1.html)('strong', (0, typed_dom_1.defrag)(bs))])],
+                case '*':
+                    return (_b = (0, combinator_1.bind)(substrong, (ds, rest) => rest.slice(0, 2) === '**' && (0, util_1.isEndTightNodes)(ds) ? [
+                        [(0, typed_dom_1.html)('strong', (0, array_1.unshift)([(0, typed_dom_1.html)('em', (0, typed_dom_1.defrag)(bs))], (0, typed_dom_1.defrag)(ds)))],
+                        rest.slice(2)
+                    ] : [
+                        (0, array_1.unshift)([
+                            '**',
+                            (0, typed_dom_1.html)('em', (0, typed_dom_1.defrag)(bs))
+                        ], ds),
+                        rest
+                    ])(rest, context)) !== null && _b !== void 0 ? _b : [
+                        [
+                            '**',
+                            (0, typed_dom_1.html)('em', (0, typed_dom_1.defrag)(bs))
+                        ],
                         rest
                     ];
                 }
@@ -6765,6 +6780,7 @@ require = function () {
             '../inline': 88,
             '../source': 128,
             '../util': 134,
+            './strong': 121,
             'spica/array': 6,
             'typed-dom': 26
         }
@@ -7098,8 +7114,8 @@ require = function () {
             (0, alias_1.ObjectSetPrototypeOf)(attrspec, null);
             (0, alias_1.ObjectValues)(attrspec).forEach(o => (0, alias_1.ObjectSetPrototypeOf)(o, null));
             exports.html = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.validate)('<', (0, combinator_1.validate)(/^<[a-z]+(?=[^\S\n]|>)/, (0, combinator_1.union)([
-                (0, combinator_1.match)(/^(?=<(wbr)(?=[^\S\n]|>))/, (0, memoize_1.memoize)(([, tag]) => (0, combinator_1.surround)((0, source_1.str)(`<${ tag }`), (0, combinator_1.some)((0, combinator_1.union)([exports.attribute])), (0, source_1.str)('>'), true, ([, as = []], rest) => [
-                    [(0, typed_dom_1.html)(tag, attributes('html', [], attrspec[tag], as))],
+                (0, combinator_1.match)(/^(?=<(wbr)(?=[^\S\n]|>))/, (0, memoize_1.memoize)(([, tag]) => (0, combinator_1.surround)(`<${ tag }`, (0, combinator_1.some)((0, combinator_1.union)([exports.attribute])), '>', true, ([, bs = []], rest) => [
+                    [(0, typed_dom_1.html)(tag, attributes('html', [], attrspec[tag], bs))],
                     rest
                 ]), ([, tag]) => tag)),
                 (0, combinator_1.match)(/^(?=<(sup|sub|small|bdo|bdi)(?=[^\S\n]|>))/, (0, memoize_1.memoize)(([, tag]) => (0, combinator_1.validate)(`<${ tag }`, `</${ tag }>`, (0, combinator_1.surround)((0, combinator_1.surround)((0, source_1.str)(`<${ tag }`), (0, combinator_1.some)(exports.attribute), (0, source_1.str)('>'), true), (0, util_1.startLoose)((0, combinator_1.context)((() => {
@@ -7222,17 +7238,16 @@ require = function () {
             exports.htmlentity = exports.unsafehtmlentity = void 0;
             const combinator_1 = _dereq_('../../combinator');
             const typed_dom_1 = _dereq_('typed-dom');
-            const parser = (0, typed_dom_1.html)('textarea');
-            exports.unsafehtmlentity = (0, combinator_1.creator)((0, combinator_1.validate)('&', (0, combinator_1.fmap)((0, combinator_1.focus)(/^&[0-9A-Za-z]+;/, entity => [
-                [(parser.innerHTML = entity, parser.value)],
+            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 }`],
                 ''
-            ]), ([str]) => [str[0] !== '&' || str.length < 3 ? str : `\0${ str }`])));
-            exports.htmlentity = (0, combinator_1.creator)((0, combinator_1.validate)('&', (0, combinator_1.fmap)((0, combinator_1.union)([exports.unsafehtmlentity]), ([str]) => [str[0] === '\0' ? (0, typed_dom_1.html)('span', {
+            ]))((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', {
                     class: 'invalid',
                     'data-invalid-syntax': 'htmlentity',
                     'data-invalid-type': 'syntax',
                     'data-invalid-description': 'Invalid HTML entity.'
-                }, str.slice(1)) : str])));
+                }, str.slice(1)) : str]);
         },
         {
             '../../combinator': 27,
@@ -7422,7 +7437,10 @@ require = function () {
             const util_1 = _dereq_('../util');
             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.union)([(0, combinator_1.some)(inline_1.inline, '==')])), (0, source_1.str)('=='), false, ([as, bs, cs], rest) => (0, util_1.isEndTightNodes)(bs) ? [
+            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.delimiter)('==')),
+                (0, combinator_1.open)((0, combinator_1.some)(inline_1.inline, '='), inline_1.inline)
+            ]))), (0, source_1.str)('=='), false, ([as, bs, cs], rest) => (0, util_1.isEndTightNodes)(bs) ? [
                 [(0, typed_dom_1.html)('mark', (0, typed_dom_1.defrag)(bs))],
                 rest
             ] : [
@@ -7449,11 +7467,10 @@ require = function () {
             exports.math = void 0;
             const combinator_1 = _dereq_('../../combinator');
             const source_1 = _dereq_('../source');
-            const util_1 = _dereq_('../util');
             const typed_dom_1 = _dereq_('typed-dom');
             const disallowedCommand = /\\(?:begin|tiny|huge|large)(?![0-9a-z])/i;
             exports.math = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.validate)('$', (0, combinator_1.rewrite)((0, combinator_1.union)([
-                (0, combinator_1.surround)('$', (0, combinator_1.verify)((0, source_1.str)(/^(?![\s{}#$%&]|\d+(?:[,.]\d+)*[^-+*/=<>^_~\\$]|-[\da-z]|[a-z]+-)(?:\\\$|[\x20-\x23\x25-\x7E])+/i), util_1.isEndTightNodes), /^\$(?![0-9a-z])/i),
+                (0, combinator_1.surround)('$', (0, source_1.str)(/^(?![\s{}#$%&]|\d+(?:[,.]\d+)*[^-+*/=<>^_~\\$]|-[\da-z]|[a-z]+-)(?:\\\$|\x20(?!\$)|[\x21-\x23\x25-\x7E])+/i), /^\$(?![0-9a-z])/i),
                 (0, combinator_1.surround)('$', bracket, '$')
             ]), (source, {
                 caches: {math: cache} = {}
@@ -7482,7 +7499,6 @@ require = function () {
         {
             '../../combinator': 27,
             '../source': 128,
-            '../util': 134,
             'typed-dom': 26
         }
     ],
@@ -7836,16 +7852,14 @@ require = function () {
             exports.strong = void 0;
             const combinator_1 = _dereq_('../../combinator');
             const inline_1 = _dereq_('../inline');
-            const emphasis_1 = _dereq_('./emphasis');
             const source_1 = _dereq_('../source');
             const util_1 = _dereq_('../util');
             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, combinator_1.close)((0, source_1.str)('**'), /^(?!\*)/), (0, util_1.startTight)((0, combinator_1.some)((0, combinator_1.union)([
-                emphasis_1.emphasis,
-                (0, combinator_1.some)(inline_1.inline, '*'),
-                (0, source_1.str)('*')
-            ]), '**')), (0, source_1.str)('**'), false, ([as, bs, cs], rest) => (0, util_1.isEndTightNodes)(bs) ? [
+            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.delimiter)(String.raw`\*\*`)),
+                (0, combinator_1.open)((0, combinator_1.some)(inline_1.inline, '*'), inline_1.inline)
+            ])), '*'), (0, source_1.str)('**'), false, ([as, bs, cs], rest) => (0, util_1.isEndTightNodes)(bs) ? [
                 [(0, typed_dom_1.html)('strong', (0, typed_dom_1.defrag)(bs))],
                 rest
             ] : [
@@ -7861,7 +7875,6 @@ require = function () {
             '../inline': 88,
             '../source': 128,
             '../util': 134,
-            './emphasis': 102,
             'spica/array': 6,
             'typed-dom': 26
         }
@@ -8637,49 +8650,20 @@ require = function () {
         function (_dereq_, module, exports) {
             'use strict';
             Object.defineProperty(exports, '__esModule', { value: true });
-            exports.stringify = exports.trimNodeEndBR = exports.trimNodeEnd = exports.trimNode = exports.isEndTightNodes = exports.isStartTightNodes = exports.startTight = exports.isStartLoose = exports.startLoose = exports.visualize = void 0;
+            exports.stringify = exports.trimNodeEndBR = exports.trimNodeEnd = exports.trimNode = exports.isEndTightNodes = exports.isStartTightNodes = exports.startTight = exports.isStartLoose = exports.startLoose = exports.visualize = exports.delimiter = void 0;
             const global_1 = _dereq_('spica/global');
             const parser_1 = _dereq_('../combinator/data/parser');
             const combinator_1 = _dereq_('../combinator');
             const htmlentity_1 = _dereq_('./inline/htmlentity');
             const source_1 = _dereq_('./source');
+            const normalize_1 = _dereq_('./api/normalize');
             const array_1 = _dereq_('spica/array');
-            const invisibleHTMLEntityNames = [
-                'Tab',
-                'NewLine',
-                'NonBreakingSpace',
-                'nbsp',
-                'shy',
-                'ensp',
-                'emsp',
-                'emsp13',
-                'emsp14',
-                'numsp',
-                'puncsp',
-                'ThinSpace',
-                'thinsp',
-                'VeryThinSpace',
-                'hairsp',
-                'ZeroWidthSpace',
-                'NegativeVeryThinSpace',
-                'NegativeThinSpace',
-                'NegativeMediumSpace',
-                'NegativeThickSpace',
-                'zwj',
-                'zwnj',
-                'lrm',
-                'rlm',
-                'MediumSpace',
-                'NoBreak',
-                'ApplyFunction',
-                'af',
-                'InvisibleTimes',
-                'it',
-                'InvisibleComma',
-                'ic'
-            ];
-            const blankline = new RegExp(String.raw`^(?!$)(?:\\$|\\?[^\S\n]|&(?:${ invisibleHTMLEntityNames.join('|') });|<wbr>)+$`, 'gm');
+            function delimiter(opener) {
+                return new RegExp(String.raw`^(?:\s+|\\\s|&(?:${ normalize_1.invisibleHTMLEntityNames.join('|') });|<wbr>)?${ opener }`);
+            }
+            exports.delimiter = delimiter;
             function visualize(parser) {
+                const blankline = new RegExp(String.raw`^(?:\\$|\\?[^\S\n]|&(?:${ normalize_1.invisibleHTMLEntityNames.join('|') });|<wbr>)+$`, 'gm');
                 return (0, combinator_1.union)([
                     (0, combinator_1.convert)(source => source.replace(blankline, line => line.replace(/[\\&<]/g, '\x1B$&')), (0, combinator_1.verify)(parser, (ns, rest, context) => !rest && hasVisible(ns, context))),
                     (0, combinator_1.some)((0, combinator_1.union)([
@@ -8715,28 +8699,28 @@ require = function () {
             }
             exports.startLoose = startLoose;
             function isStartLoose(source, context, except) {
-                var _a;
                 source && (source = source.replace(/^[^\S\n]+/, ''));
                 if (source === '')
                     return true;
-                return source.slice(0, (_a = except === null || except === void 0 ? void 0 : except.length) !== null && _a !== void 0 ? _a : 0) !== except && isStartTight(source, context);
+                return isStartTight(source, context, except);
             }
             exports.isStartLoose = isStartLoose;
-            function startTight(parser) {
-                return (source, context) => isStartTight(source, context) ? parser(source, context) : global_1.undefined;
+            function startTight(parser, except) {
+                return (source, context) => isStartTight(source, context, except) ? parser(source, context) : global_1.undefined;
             }
             exports.startTight = startTight;
-            function isStartTight(source, context) {
+            function isStartTight(source, context, except) {
                 var _a, _b, _c;
                 if (source === '')
                     return true;
+                if (except && source.slice(0, except.length) === except)
+                    return false;
                 switch (source[0]) {
                 case ' ':
                 case '\u3000':
                 case '\t':
                 case '\n':
                     return false;
-                case '\x1B':
                 case '\\':
                     return ((_a = source[1]) === null || _a === void 0 ? void 0 : _a.trimStart()) !== '';
                 case '&':
@@ -8850,6 +8834,7 @@ require = function () {
         {
             '../combinator': 27,
             '../combinator/data/parser': 47,
+            './api/normalize': 60,
             './inline/htmlentity': 112,
             './source': 128,
             'spica/array': 6,

package/markdown.d.ts CHANGED Viewed

@@ -970,6 +970,7 @@ export namespace MarkdownParser {
       Inline<'mark'>,
       Parser<HTMLElement | string, Context, [
         InlineParser,
+        InlineParser,
       ]> {
     }
     export interface EmStrongParser extends
@@ -977,15 +978,15 @@ export namespace MarkdownParser {
       Inline<'emstrong'>,
       Parser<HTMLElement | string, Context, [
         InlineParser,
+        InlineParser,
       ]> {
     }
     export interface StrongParser extends
       // **abc**
       Inline<'strong'>,
       Parser<HTMLElement | string, Context, [
-        EmphasisParser,
         InlineParser,
-        SourceParser.StrParser,
+        InlineParser,
       ]> {
     }
     export interface EmphasisParser extends
@@ -994,6 +995,7 @@ export namespace MarkdownParser {
       Parser<HTMLElement | string, Context, [
         StrongParser,
         InlineParser,
+        InlineParser,
       ]> {
     }
     export interface CodeParser extends

package/package-lock.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.234.0",
+  "version": "0.234.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1924,9 +1924,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 +3030,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.98",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.98.tgz",
+      "integrity": "sha512-1IdsuSAnIGVxoYT1LkcUFb9MfjRxdHhCU9qiaDzhl1XvYgK9c8E2O9aJOPgGMQ68CSI8NxmLwrYhjvGauT8yuw==",
       "dev": true
     },
     "elliptic": {
@@ -3210,9 +3210,9 @@
       }
     },
     "es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.2.tgz",
+      "integrity": "sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
@@ -3221,15 +3221,15 @@
         "get-intrinsic": "^1.1.1",
         "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
+        "has-symbols": "^1.0.3",
         "internal-slot": "^1.0.3",
         "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.1",
+        "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
         "is-shared-array-buffer": "^1.0.1",
         "is-string": "^1.0.7",
-        "is-weakref": "^1.0.1",
-        "object-inspect": "^1.11.0",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.0",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.2",
         "string.prototype.trimend": "^1.0.4",
@@ -4608,9 +4608,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",
@@ -8918,9 +8918,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": {

package/package.json CHANGED Viewed

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

package/src/combinator/data/parser.ts CHANGED Viewed

@@ -8,7 +8,8 @@ export interface Ctx {
 export type Parser<T, C extends Ctx = Ctx, D extends Parser<unknown, C>[] = any>
   = (source: string, context: C) => Result<T, C, D>;
 export type Result<T, C extends Ctx = Ctx, D extends Parser<unknown, C>[] = any>
-  = readonly [T[], string, C?, D?]
+  = readonly [T[], string, C, D]
+  | readonly [T[], string]
   | undefined;
 export type Tree<P extends Parser<unknown>> = P extends Parser<infer T> ? T : never;
 export type SubParsers<P extends Parser<unknown>> = P extends Parser<unknown, any, infer D> ? D : never;

package/src/parser/api/normalize.ts CHANGED Viewed

@@ -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/paragraph.test.ts CHANGED Viewed

@@ -20,11 +20,19 @@ 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>'], '']);
       assert.deepStrictEqual(inspect(parser('a\n<wbr>\n')), [['<p>a<br>&lt;wbr&gt;</p>'], '']);
       assert.deepStrictEqual(inspect(parser('a\n<wbr>\nb')), [['<p>a<br>&lt;wbr&gt;<br>b</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('*a\n<wbr>*\nb')), [['<p>*a<br><wbr>*<br>b</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('**a\n<wbr>**\nb')), [['<p>**a<br><wbr>**<br>b</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('***a\n<wbr>***\nb')), [['<p>***a<br><wbr>***<br>b</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('***a*b\n<wbr>**\nc')), [['<p>**<em>a</em>b<br><wbr>**<br>c</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('***a**b\n<wbr>*\nc')), [['<p>*<strong>a</strong>b<br><wbr>*<br>c</p>'], '']);
+      assert.deepStrictEqual(inspect(parser('==a\n<wbr>==\nb')), [['<p>==a<br><wbr>==<br>b</p>'], '']);
       assert.deepStrictEqual(inspect(parser(' a')), [['<p>a</p>'], '']);
     });

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

@@ -9,10 +9,10 @@ describe('Unit: parser/inline/emphasis', () => {
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('*')), undefined);
       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', '<br>', '*'], '']);
+      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,6 +37,11 @@ describe('Unit: parser/inline/emphasis', () => {
     });
     it('nest', () => {
+      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>'], '']);

package/src/parser/inline/emphasis.ts CHANGED Viewed

@@ -1,15 +1,19 @@
 import { EmphasisParser } from '../inline';
-import { union, 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('*'), /^(?!\*)/),
-  startTight(some(union([strong, some(inline, '*')]))),
+export const emphasis: EmphasisParser = lazy(() => creator(surround(
+  str('*'),
+  startTight(some(union([
+    strong,
+    some(inline, delimiter(String.raw`\*`)),
+    open(some(inline, '*'), inline),
+  ])), '*'),
   str('*'), false,
   ([as, bs, cs], rest) =>
     isEndTightNodes(bs)

package/src/parser/inline/emstrong.ts CHANGED Viewed

@@ -1,36 +1,53 @@
-import { EmStrongParser } from '../inline';
-import { union, some, creator, surround, lazy, bind } from '../../combinator';
+import { MarkdownParser } from '../../../markdown';
+import { EmStrongParser, EmphasisParser, StrongParser } from '../inline';
+import { Result, IntermediateParser } from '../../combinator/data/parser';
+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, delimiter(String.raw`\*\*`)),
+  open(some(inline, '*'), inline),
+])));
+const subemphasis: IntermediateParser<EmphasisParser> = lazy(() => some(union([
+  strong,
+  some(inline, delimiter(String.raw`\*`)),
+  open(some(inline, '*'), inline),
+])));
 export const emstrong: EmStrongParser = lazy(() => creator(surround(
   str('***'),
-  startTight(union([some(inline, '*')])),
+  startTight(some(union([
+    some(inline, delimiter(String.raw`\*`)),
+    open(some(inline, '*'), inline),
+  ]))),
   str(/^\*{1,3}/), false,
-  ([as, bs, cs], rest, context) => {
+  ([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<EmStrongParser>(
-          union([some(inline, '**')]),
-          (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<EmStrongParser>(
-          union([some(inline, '*')]),
+        return bind<EmphasisParser>(
+          subemphasis,
           (ds, rest) =>
             rest.slice(0, 1) === '*' && isEndTightNodes(ds)
               ? [[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);
   },

package/src/parser/inline/html.ts CHANGED Viewed

@@ -26,11 +26,9 @@ export const html: HTMLParser = lazy(() => creator(validate('<', validate(/^<[a-
     memoize(
     ([, tag]) =>
       surround(
-        str(`<${tag}`), some(union([attribute])), str('>'), true,
-        ([, as = []], rest) => [
-          [h(tag as 'span', attributes('html', [], attrspec[tag], as))],
-          rest
-        ]),
+        `<${tag}`, some(union([attribute])), '>', true,
+        ([, bs = []], rest) =>
+          [[h(tag as 'span', attributes('html', [], attrspec[tag], bs))], rest]),
     ([, tag]) => tag)),
   match(
     /^(?=<(sup|sub|small|bdo|bdi)(?=[^\S\n]|>))/,
@@ -80,9 +78,7 @@ export const html: HTMLParser = lazy(() => creator(validate('<', validate(/^<[a-
         ([as, bs, cs], rest) =>
           [[elem(tag, as, trimNodeEndBR(defrag(bs)), cs, {})], rest],
         ([as, bs], rest) =>
-          as.length === 1
-            ? [unshift(as, bs), rest]
-            : undefined)),
+          as.length === 1 ? [unshift(as, bs), rest] : undefined)),
     ([, tag]) => tag,
     new Cache(1000))),
 ])))));

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

@@ -14,6 +14,7 @@ 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);

package/src/parser/inline/htmlentity.ts CHANGED Viewed

@@ -2,18 +2,15 @@ import { HTMLEntityParser, UnsafeHTMLEntityParser } from '../inline';
 import { union, validate, focus, creator, fmap } from '../../combinator';
 import { html } from 'typed-dom';
-const parser = html('textarea');
+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')))));
-export const unsafehtmlentity: UnsafeHTMLEntityParser = creator(validate('&', fmap(focus(
-  /^&[0-9A-Za-z]+;/,
-  entity => [[(parser.innerHTML = entity, parser.value)], '']),
-  ([str]) => [
-    str[0] !== '&' || str.length < 3
-      ? str
-      : `\0${str}`,
-  ])));
-export const htmlentity: HTMLEntityParser = creator(validate('&', fmap(
+export const htmlentity: HTMLEntityParser = fmap(
   union([unsafehtmlentity]),
   ([str]) => [
     str[0] === '\0'
@@ -24,4 +21,4 @@ export const htmlentity: HTMLEntityParser = creator(validate('&', fmap(
           'data-invalid-description': 'Invalid HTML entity.',
         }, str.slice(1))
       : str,
-  ])));
+  ]);

package/src/parser/inline/mark.test.ts CHANGED Viewed

@@ -12,10 +12,10 @@ describe('Unit: parser/inline/mark', () => {
       assert.deepStrictEqual(inspect(parser('==')), undefined);
       assert.deepStrictEqual(inspect(parser('==a')), [['==', 'a'], '']);
       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', '<br>', '=='], '']);
+      assert.deepStrictEqual(inspect(parser('==a\\ ==')), [['==', 'a', ' ', '=='], '']);
+      assert.deepStrictEqual(inspect(parser('==a\\\n==')), [['==', 'a', '<span class="linebreak"> </span>', '=='], '']);
       assert.deepStrictEqual(inspect(parser('== ==')), undefined);
       assert.deepStrictEqual(inspect(parser('== a==')), undefined);
       assert.deepStrictEqual(inspect(parser('== a ==')), undefined);
@@ -35,6 +35,10 @@ describe('Unit: parser/inline/mark', () => {
     });
     it('nest', () => {
+      assert.deepStrictEqual(inspect(parser('==a ==b====')), [['<mark>a <mark>b</mark></mark>'], '']);
+      assert.deepStrictEqual(inspect(parser('==a\\ ==b====')), [['<mark>a <mark>b</mark></mark>'], '']);
+      assert.deepStrictEqual(inspect(parser('==a&Tab;==b====')), [['<mark>a\t<mark>b</mark></mark>'], '']);
+      assert.deepStrictEqual(inspect(parser('==a<wbr>==b====')), [['<mark>a<wbr><mark>b</mark></mark>'], '']);
       assert.deepStrictEqual(inspect(parser('==*==a==*==')), [['<mark><em><mark>a</mark></em></mark>'], '']);
     });

package/src/parser/inline/mark.ts CHANGED Viewed

@@ -1,14 +1,17 @@
 import { MarkParser } from '../inline';
-import { union, some, creator, surround, lazy } from '../../combinator';
+import { union, some, creator, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
 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 mark: MarkParser = lazy(() => creator(surround(
   str('=='),
-  startTight(union([some(inline, '==')])),
+  startTight(some(union([
+    some(inline, delimiter('==')),
+    open(some(inline, '='), inline),
+  ]))),
   str('=='), false,
   ([as, bs, cs], rest) =>
     isEndTightNodes(bs)

package/src/parser/inline/math.ts CHANGED Viewed

@@ -1,7 +1,6 @@
 import { MathParser } from '../inline';
-import { union, some, validate, verify, rewrite, creator, surround, lazy } from '../../combinator';
+import { union, some, validate, rewrite, creator, surround, lazy } from '../../combinator';
 import { escsource, str } from '../source';
-import { isEndTightNodes } from '../util';
 import { html } from 'typed-dom';
 const disallowedCommand = /\\(?:begin|tiny|huge|large)(?![0-9a-z])/i;
@@ -10,15 +9,13 @@ export const math: MathParser = lazy(() => creator(validate('$', rewrite(
   union([
     surround(
       '$',
-      verify(
-        // Latex's reserved characters: # $ % ^ & _ { } ~ \
-        // $[0-9]+                    : Dollar
-        // $[A-z]*-                   : Label
-        // $[A-z]*(?!-)               : Math
-        // $[\^_[({|]                 : Math
-        // $[#$%&]                    : Invalid first character in Latex syntax
-        str(/^(?![\s{}#$%&]|\d+(?:[,.]\d+)*[^-+*/=<>^_~\\$]|-[\da-z]|[a-z]+-)(?:\\\$|[\x20-\x23\x25-\x7E])+/i),
-        isEndTightNodes),
+      // Latex's reserved characters: # $ % ^ & _ { } ~ \
+      // $[0-9]+                    : Dollar
+      // $[A-z]*-                   : Label
+      // $[A-z]*(?!-)               : Math
+      // $[\^_[({|]                 : Math
+      // $[#$%&]                    : Invalid first character in Latex syntax
+      str(/^(?![\s{}#$%&]|\d+(?:[,.]\d+)*[^-+*/=<>^_~\\$]|-[\da-z]|[a-z]+-)(?:\\\$|\x20(?!\$)|[\x21-\x23\x25-\x7E])+/i),
       /^\$(?![0-9a-z])/i),
     surround('$', bracket, '$'),
   ]),

package/src/parser/inline/strong.test.ts CHANGED Viewed

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

package/src/parser/inline/strong.ts CHANGED Viewed

@@ -1,15 +1,17 @@
 import { StrongParser } from '../inline';
-import { union, some, creator, surround, close, lazy } from '../../combinator';
+import { union, some, creator, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
-import { emphasis } from './emphasis';
 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 strong: StrongParser = lazy(() => creator(surround(close(
-  str('**'), /^(?!\*)/),
-  startTight(some(union([emphasis, some(inline, '*'), str('*')]), '**')),
+export const strong: StrongParser = lazy(() => creator(surround(
+  str('**'),
+  startTight(some(union([
+    some(inline, delimiter(String.raw`\*\*`)),
+    open(some(inline, '*'), inline),
+  ])), '*'),
   str('**'), false,
   ([as, bs, cs], rest) =>
     isEndTightNodes(bs)

package/src/parser/inline.test.ts CHANGED Viewed

@@ -26,26 +26,73 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('*** a***')), [['***', ' ', 'a', '***'], '']);
       assert.deepStrictEqual(inspect(parser('**** a****')), [['****', ' ', 'a', '****'], '']);
       assert.deepStrictEqual(inspect(parser('*a**')), [['<em>a</em>', '*'], '']);
+      assert.deepStrictEqual(inspect(parser('*a**b')), [['*', 'a', '**', 'b'], '']);
       assert.deepStrictEqual(inspect(parser('*a**b*')), [['*', 'a', '**', 'b', '*'], '']);
       assert.deepStrictEqual(inspect(parser('*a**b*c')), [['*', 'a', '**', 'b', '*', 'c'], '']);
       assert.deepStrictEqual(inspect(parser('*a**b*c*')), [['*', 'a', '**', 'b', '<em>c</em>'], '']);
       assert.deepStrictEqual(inspect(parser('*a**b**')), [['*', 'a', '<strong>b</strong>'], '']);
+      assert.deepStrictEqual(inspect(parser('*a**b**c')), [['*', 'a', '<strong>b</strong>', 'c'], '']);
+      assert.deepStrictEqual(inspect(parser('*a**b***')), [['<em>a<strong>b</strong></em>'], '']);
+      assert.deepStrictEqual(inspect(parser('*a**b***c')), [['<em>a<strong>b</strong></em>', 'c'], '']);
+      assert.deepStrictEqual(inspect(parser('*a**b****')), [['<em>a<strong>b</strong></em>', '*'], '']);
+      assert.deepStrictEqual(inspect(parser('*a**b****c')), [['*', 'a', '<strong>b</strong>', '**', 'c'], '']);
+      assert.deepStrictEqual(inspect(parser('*a***b****')), [['<em>a</em>', '<strong>b</strong>', '**'], '']);
+      assert.deepStrictEqual(inspect(parser('*a***b****c')), [['<em>a</em>', '<strong>b</strong>', '**', 'c'], '']);
+      assert.deepStrictEqual(inspect(parser('*a *b**')), [['<em>a <em>b</em></em>'], '']);
+      assert.deepStrictEqual(inspect(parser('*a *b**c')), [['*', 'a', ' ', '*', 'b', '**', 'c'], '']);
       assert.deepStrictEqual(inspect(parser('*a **b***')), [['<em>a <strong>b</strong></em>'], '']);
       assert.deepStrictEqual(inspect(parser('*a **b***c')), [['<em>a <strong>b</strong></em>', 'c'], '']);
+      assert.deepStrictEqual(inspect(parser('*a ***b****')), [['<em>a <em><strong>b</strong></em></em>'], '']);
+      assert.deepStrictEqual(inspect(parser('*a ***b****c')), [['<em>a <em><strong>b</strong></em></em>', 'c'], '']);
       assert.deepStrictEqual(inspect(parser('**a*')), [['**', 'a', '*'], '']);
       assert.deepStrictEqual(inspect(parser('**a*b**')), [['**', 'a', '<em>b</em>', '*'], '']);
       assert.deepStrictEqual(inspect(parser('**a*b**c')), [['**', 'a', '*', 'b', '**', 'c'], '']);
+      assert.deepStrictEqual(inspect(parser('**a*b***')), [['<strong>a<em>b</em></strong>'], '']);
+      assert.deepStrictEqual(inspect(parser('**a*b***c')), [['<strong>a<em>b</em></strong>', 'c'], '']);
+      assert.deepStrictEqual(inspect(parser('**a**b****')), [['<strong>a</strong>', 'b', '****'], '']);
+      assert.deepStrictEqual(inspect(parser('**a**b****c')), [['<strong>a</strong>', 'b', '****', 'c'], '']);
+      assert.deepStrictEqual(inspect(parser('**a***b*****')), [['<strong>a</strong>', '<em>b</em>', '****'], '']);
+      assert.deepStrictEqual(inspect(parser('**a***b*****c')), [['<strong>a</strong>', '<em>b</em>', '****', 'c'], '']);
       assert.deepStrictEqual(inspect(parser('**a *b***')), [['<strong>a <em>b</em></strong>'], '']);
       assert.deepStrictEqual(inspect(parser('**a *b***c')), [['<strong>a <em>b</em></strong>', 'c'], '']);
+      assert.deepStrictEqual(inspect(parser('**a **b****')), [['<strong>a <strong>b</strong></strong>'], '']);
+      assert.deepStrictEqual(inspect(parser('**a **b****c')), [['<strong>a <strong>b</strong></strong>', 'c'], '']);
+      assert.deepStrictEqual(inspect(parser('**a ***b*****')), [['<strong>a <em><strong>b</strong></em></strong>'], '']);
+      assert.deepStrictEqual(inspect(parser('**a ***b*****c')), [['<strong>a <em><strong>b</strong></em></strong>', 'c'], '']);
       assert.deepStrictEqual(inspect(parser('***a*b**')), [['<strong><em>a</em>b</strong>'], '']);
-      assert.deepStrictEqual(inspect(parser('***a* b**')), [['<strong><em>a</em> b</strong>'], '']);
+      assert.deepStrictEqual(inspect(parser('***a*b**c')), [['<strong><em>a</em>b</strong>', 'c'], '']);
+      assert.deepStrictEqual(inspect(parser('***a*b*c***')), [['<strong><em>a</em>b<em>c</em></strong>'], '']);
+      assert.deepStrictEqual(inspect(parser('***a*b*c***d')), [['<strong><em>a</em>b<em>c</em></strong>', 'd'], '']);
+      assert.deepStrictEqual(inspect(parser('***a*b**c****')), [['<strong><em>a</em>b</strong>', 'c', '****'], '']);
+      assert.deepStrictEqual(inspect(parser('***a* **b****')), [['<strong><em>a</em> <strong>b</strong></strong>'], '']);
+      assert.deepStrictEqual(inspect(parser('***a*\\ **b****')), [['<strong><em>a</em> <strong>b</strong></strong>'], '']);
+      assert.deepStrictEqual(inspect(parser('***a*&Tab;**b****')), [['<strong><em>a</em>\t<strong>b</strong></strong>'], '']);
+      assert.deepStrictEqual(inspect(parser('***a*<wbr>**b****')), [['<strong><em>a</em><wbr><strong>b</strong></strong>'], '']);
+      assert.deepStrictEqual(inspect(parser('***a *b****')), [['<em><strong>a <em>b</em></strong></em>'], '']);
+      assert.deepStrictEqual(inspect(parser('***a\\ *b****')), [['<em><strong>a <em>b</em></strong></em>'], '']);
+      assert.deepStrictEqual(inspect(parser('***a&Tab;*b****')), [['<em><strong>a\t<em>b</em></strong></em>'], '']);
+      assert.deepStrictEqual(inspect(parser('***a<wbr>*b****')), [['<em><strong>a<wbr><em>b</em></strong></em>'], '']);
+      assert.deepStrictEqual(inspect(parser('***a*b **')), [['**', '<em>a</em>', 'b', ' ', '**'], '']);
+      assert.deepStrictEqual(inspect(parser('***a*b\\ **')), [['**', '<em>a</em>', 'b', ' ', '**'], '']);
       assert.deepStrictEqual(inspect(parser('***a**b*')), [['<em><strong>a</strong>b</em>'], '']);
-      assert.deepStrictEqual(inspect(parser('***a** b*')), [['<em><strong>a</strong> b</em>'], '']);
+      assert.deepStrictEqual(inspect(parser('***a**b*c')), [['<em><strong>a</strong>b</em>', 'c'], '']);
+      assert.deepStrictEqual(inspect(parser('***a**b*c**')), [['<em><strong>a</strong>b</em>', 'c', '**'], '']);
+      assert.deepStrictEqual(inspect(parser('***a**b**c***')), [['<em><strong>a</strong>b<strong>c</strong></em>'], '']);
+      assert.deepStrictEqual(inspect(parser('***a**b**c***d')), [['<em><strong>a</strong>b<strong>c</strong></em>', 'd'], '']);
+      assert.deepStrictEqual(inspect(parser('***a** *b**')), [['<em><strong>a</strong> <em>b</em></em>'], '']);
+      assert.deepStrictEqual(inspect(parser('***a**\\ *b**')), [['<em><strong>a</strong> <em>b</em></em>'], '']);
+      assert.deepStrictEqual(inspect(parser('***a**&Tab;*b**')), [['<em><strong>a</strong>\t<em>b</em></em>'], '']);
+      assert.deepStrictEqual(inspect(parser('***a**<wbr>*b**')), [['<em><strong>a</strong><wbr><em>b</em></em>'], '']);
+      assert.deepStrictEqual(inspect(parser('***a **b*')), [['***', 'a', ' ', '**', 'b', '*'], '']);
+      assert.deepStrictEqual(inspect(parser('***a\\ **b*')), [['***', 'a', ' ', '**', 'b', '*'], '']);
+      assert.deepStrictEqual(inspect(parser('***a**b *')), [['*', '<strong>a</strong>', 'b', ' ', '*'], '']);
+      assert.deepStrictEqual(inspect(parser('***a**b\\ *')), [['*', '<strong>a</strong>', 'b', ' ', '*'], '']);
       assert.deepStrictEqual(inspect(parser('***a*')), [['**', '<em>a</em>'], '']);
       assert.deepStrictEqual(inspect(parser('***a**')), [['*', '<strong>a</strong>'], '']);
       assert.deepStrictEqual(inspect(parser('***a***')), [['<em><strong>a</strong></em>'], '']);
       assert.deepStrictEqual(inspect(parser('***a***b')), [['<em><strong>a</strong></em>', 'b'], '']);
       assert.deepStrictEqual(inspect(parser('***a****')), [['<em><strong>a</strong></em>', '*'], '']);
+      assert.deepStrictEqual(inspect(parser('***a *b****')), [['<em><strong>a <em>b</em></strong></em>'], '']);
       assert.deepStrictEqual(inspect(parser('****a***')), [['****', 'a', '***'], '']);
       assert.deepStrictEqual(inspect(parser('****a****')), [['****', 'a', '****'], '']);
       assert.deepStrictEqual(inspect(parser('*(*a*)*')), [['<em><span class="paren">(<em>a</em>)</span></em>'], '']);

package/src/parser/util.ts CHANGED Viewed

@@ -4,47 +4,16 @@ import { Parser, eval } from '../combinator/data/parser';
 import { union, some, verify, convert } from '../combinator';
 import { unsafehtmlentity } from './inline/htmlentity';
 import { linebreak, unescsource } from './source';
+import { invisibleHTMLEntityNames } from './api/normalize';
 import { push, pop } from 'spica/array';
-// https://dev.w3.org/html5/html-author/charref
-const invisibleHTMLEntityNames = [
-  'Tab',
-  'NewLine',
-  'NonBreakingSpace',
-  'nbsp',
-  'shy',
-  'ensp',
-  'emsp',
-  'emsp13',
-  'emsp14',
-  'numsp',
-  'puncsp',
-  'ThinSpace',
-  'thinsp',
-  'VeryThinSpace',
-  'hairsp',
-  'ZeroWidthSpace',
-  'NegativeVeryThinSpace',
-  'NegativeThinSpace',
-  'NegativeMediumSpace',
-  'NegativeThickSpace',
-  'zwj',
-  'zwnj',
-  'lrm',
-  'rlm',
-  'MediumSpace',
-  'NoBreak',
-  'ApplyFunction',
-  'af',
-  'InvisibleTimes',
-  'it',
-  'InvisibleComma',
-  'ic',
-];
-const blankline = new RegExp(String.raw`^(?!$)(?:\\$|\\?[^\S\n]|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr>)+$`, 'gm');
+export function delimiter(opener: string): RegExp {
+  return new RegExp(String.raw`^(?:\s+|\\\s|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr>)?${opener}`);
+}
 export function visualize<P extends Parser<HTMLElement | string>>(parser: P): P;
 export function visualize<T extends HTMLElement | string>(parser: Parser<T>): Parser<T> {
+  const blankline = new RegExp(String.raw`^(?:\\$|\\?[^\S\n]|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr>)+$`, 'gm');
   return union([
     convert(
       source => source.replace(blankline, line => line.replace(/[\\&<]/g, '\x1B$&')),
@@ -79,25 +48,24 @@ export function startLoose<T extends HTMLElement | string>(parser: Parser<T>, ex
 export function isStartLoose(source: string, context: MarkdownParser.Context, except?: string): boolean {
   source &&= source.replace(/^[^\S\n]+/, '');
   if (source === '') return true;
-  return source.slice(0, except?.length ?? 0) !== except
-      && isStartTight(source, context);
+  return isStartTight(source, context, except);
 }
-export function startTight<P extends Parser<unknown>>(parser: P): P;
-export function startTight<T>(parser: Parser<T>): Parser<T> {
+export function startTight<P extends Parser<unknown>>(parser: P, except?: string): P;
+export function startTight<T>(parser: Parser<T>, except?: string): Parser<T> {
   return (source, context) =>
-    isStartTight(source, context)
+    isStartTight(source, context, except)
       ? parser(source, context)
       : undefined;
 }
-function isStartTight(source: string, context: MarkdownParser.Context): boolean {
+function isStartTight(source: string, context: MarkdownParser.Context, except?: string): boolean {
   if (source === '') return true;
+  if (except && source.slice(0, except.length) === except) return false;
   switch (source[0]) {
     case ' ':
     case '　':
     case '\t':
     case '\n':
       return false;
-    case '\x1B':
     case '\\':
       return source[1]?.trimStart() !== '';
     case '&':