securemark 0.234.1 → 0.235.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.235.0
+
+- Change signature syntax to require leading whitespace.
+
+## 0.234.3
+
+- Refactoring.
+
+## 0.234.2
+
+- Refactoring.
+
 ## 0.234.1
 
 - Fix emstrong parser, emphasis parser, strong parser, and mark parser.

package/dist/securemark.js

@@ -1,4 +1,4 @@
-/*! securemark v0.234.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
+/*! securemark v0.235.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
 require = function () {
     function r(e, n, t) {
         function o(i, f) {
@@ -3318,10 +3318,14 @@ require = function () {
             }
             exports.guard = guard;
             function reset(base, parser) {
+                if (isEmpty(base))
+                    return parser;
                 return (source, context) => parser(source, inherit((0, alias_1.ObjectCreate)(context), base));
             }
             exports.reset = reset;
             function context(base, parser) {
+                if (isEmpty(base))
+                    return parser;
                 const override = (0, memoize_1.memoize)(context => inherit((0, alias_1.ObjectCreate)(context), base), new global_1.WeakMap());
                 return (source, context) => parser(source, override(context));
             }
@@ -3347,6 +3351,11 @@ require = function () {
                     return target[prop] = source[prop];
                 }
             });
+            function isEmpty(context) {
+                for (const _ in context)
+                    return false;
+                return true;
+            }
         },
         {
             'spica/alias': 5,
@@ -3906,28 +3915,56 @@ require = function () {
             exports.some = void 0;
             const global_1 = _dereq_('spica/global');
             const parser_1 = _dereq_('../parser');
+            const memoize_1 = _dereq_('spica/memoize');
             const array_1 = _dereq_('spica/array');
+            const signature = pattern => {
+                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(() => (0, memoize_1.memoize)(pattern => {
+                switch (typeof pattern) {
+                case 'undefined':
+                    return () => false;
+                case 'string':
+                    return source => source.slice(0, pattern.length) === pattern;
+                case 'object':
+                    return (0, memoize_1.reduce)(source => pattern.test(source));
+                }
+            }, signature));
             function some(parser, until, deep, limit = -1) {
                 if (typeof until === 'number')
                     return some(parser, global_1.undefined, deep, until);
-                const match = typeof until === 'string' && until !== global_1.undefined ? source => source.slice(0, until.length) === until : source => !!until && until.test(source);
-                const delim = typeof deep === 'string' && deep !== global_1.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) => {
                     var _a, _b, _c;
-                    if (source === memory)
+                    var _d;
+                    if (source === '')
                         return;
                     let rest = source;
                     let nodes;
                     if (context && deep) {
-                        context.delimiters ? context.delimiters.push(delim) : context.delimiters = [delim];
+                        (_a = context.delimiters) !== null && _a !== void 0 ? _a : context.delimiters = {
+                            stack: [],
+                            matchers: {}
+                        };
+                        context.delimiters.stack.push(sig);
+                        (_b = (_d = context.delimiters.matchers)[sig]) !== null && _b !== void 0 ? _b : _d[sig] = delim;
                     }
+                    const {stack, matchers} = (_c = context.delimiters) !== null && _c !== void 0 ? _c : {};
                     while (true) {
                         if (rest === '')
                             break;
                         if (match(rest))
                             break;
-                        if ((_a = context === null || context === void 0 ? void 0 : context.delimiters) === null || _a === void 0 ? void 0 : _a.some(match => match(rest)))
+                        if (stack === null || stack === void 0 ? void 0 : stack.some(sig => matchers[sig](rest)))
                             break;
                         const result = parser(rest, context);
                         if (!result)
@@ -3938,9 +3975,8 @@ require = function () {
                             break;
                     }
                     if (context && deep) {
-                        ((_b = context.delimiters) === null || _b === void 0 ? void 0 : _b.length) > 1 ? (_c = context.delimiters) === null || _c === void 0 ? void 0 : _c.pop() : context.delimiters = global_1.undefined;
+                        stack === null || stack === void 0 ? void 0 : stack.pop();
                     }
-                    memory = limit < 0 && rest || memory;
                     return nodes && rest.length < source.length ? [
                         nodes,
                         rest
@@ -3952,7 +3988,8 @@ require = function () {
         {
             '../parser': 47,
             'spica/array': 6,
-            'spica/global': 15
+            'spica/global': 15,
+            'spica/memoize': 18
         }
     ],
     51: [
@@ -4373,10 +4410,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 +4424,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 +4458,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 +4484,7 @@ require = function () {
         },
         {
             '../../combinator/data/parser': 47,
-            '../inline/htmlentity': 112,
-            '../util': 134
+            '../inline/htmlentity': 112
         }
     ],
     61: [
@@ -6672,14 +6710,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, /^\s*\*/),
-                (0, combinator_1.sequence)([
-                    (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, 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)('em', (0, typed_dom_1.defrag)(bs))],
                 rest
             ] : [
@@ -6713,26 +6748,17 @@ 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, /^\s*\*\*/),
-                (0, combinator_1.sequence)([
-                    (0, combinator_1.some)(inline_1.inline, '*'),
-                    inline_1.inline
-                ])
+                (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)
             ])));
             const subemphasis = (0, combinator_1.lazy)(() => (0, combinator_1.some)((0, combinator_1.union)([
                 strong_1.strong,
-                (0, combinator_1.some)(inline_1.inline, /^\s*\*/),
-                (0, combinator_1.sequence)([
-                    (0, combinator_1.some)(inline_1.inline, '*'),
-                    inline_1.inline
-                ])
+                (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)
             ])));
             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, /^\s*\*/),
-                (0, combinator_1.sequence)([
-                    (0, combinator_1.some)(inline_1.inline, '*'),
-                    inline_1.inline
-                ])
+                (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)(/^\*{1,3}/), false, ([as, bs, cs], rest, context) => {
                 var _a, _b;
                 if (!(0, util_1.isEndTightNodes)(bs))
@@ -6741,25 +6767,13 @@ require = function () {
                         cs[0] + rest
                     ];
                 switch (cs[0]) {
-                case '*':
-                    return (_a = (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 && _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)(subemphasis, (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)
                     ] : [
@@ -6768,16 +6782,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
                     ];
                 }
@@ -6881,18 +6907,18 @@ require = function () {
                         autolink: false
                     }
                 }
-            }, (0, combinator_1.open)((0, source_1.str)(/^\|?/, false), (0, combinator_1.some)((0, combinator_1.union)([
+            }, (0, combinator_1.some)((0, combinator_1.union)([
                 signature,
                 inline_1.inline
-            ]), ']', /^\\?\n/), true)))), ']'), ns => [(0, typed_dom_1.html)('a', (0, util_1.trimNodeEnd)((0, typed_dom_1.defrag)(ns)))])), ([el]) => [(0, typed_dom_1.define)(el, {
+            ]), ']', /^\\?\n/)))), ']'), ns => [(0, typed_dom_1.html)('a', (0, util_1.trimNodeEnd)((0, typed_dom_1.defrag)(ns)))])), ([el]) => [(0, typed_dom_1.define)(el, {
                     id: el.id ? null : global_1.undefined,
                     class: 'index',
                     href: el.id ? `#${ el.id }` : global_1.undefined
                 }, el.childNodes)]))));
-            const signature = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.fmap)((0, combinator_1.open)('|#', (0, util_1.startTight)((0, combinator_1.some)((0, combinator_1.union)([
+            const signature = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.fmap)((0, combinator_1.open)(/^\s+\|#/, (0, util_1.startTight)((0, combinator_1.some)((0, combinator_1.union)([
                 bracket,
                 source_1.txt
-            ]), ']', /^\\?\n/))), ns => [(0, typed_dom_1.html)('span', {
+            ]), ']'))), ns => [(0, typed_dom_1.html)('span', {
                     class: 'indexer',
                     'data-index': (0, indexee_1.identity)((0, array_1.join)(ns)).slice(6)
                 })])));
@@ -7125,8 +7151,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)((() => {
@@ -7249,17 +7275,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,
@@ -7312,10 +7337,10 @@ require = function () {
             const url_1 = _dereq_('spica/url');
             const optspec = { rel: ['nofollow'] };
             (0, alias_1.ObjectSetPrototypeOf)(optspec, null);
-            exports.link = (0, combinator_1.lazy)(() => (0, combinator_1.creator)(10, (0, combinator_1.bind)((0, combinator_1.validate)([
+            exports.link = (0, combinator_1.lazy)(() => (0, combinator_1.creator)(10, (0, combinator_1.validate)([
                 '[',
                 '{'
-            ], '}', '\n', (0, combinator_1.guard)(context => {
+            ], '}', '\n', (0, combinator_1.bind)((0, combinator_1.guard)(context => {
                 var _a, _b, _c;
                 return (_c = (_b = (_a = context.syntax) === null || _a === void 0 ? void 0 : _a.inline) === null || _b === void 0 ? void 0 : _b.link) !== null && _c !== void 0 ? _c : true;
             }, (0, combinator_1.reverse)((0, combinator_1.tails)([
@@ -7339,7 +7364,7 @@ require = function () {
                     exports.uri,
                     (0, combinator_1.some)(exports.option)
                 ]), /^[^\S\n]?}/))
-            ])))), ([params, content = []], rest, context) => {
+            ]))), ([params, content = []], rest, context) => {
                 var _a, _b, _c, _d, _e, _f;
                 if ((_a = (0, parser_1.eval)((0, combinator_1.some)(autolink_1.autolink)((0, util_1.stringify)(content), context))) === null || _a === void 0 ? void 0 : _a.some(node => typeof node === 'object'))
                     return;
@@ -7354,7 +7379,7 @@ require = function () {
                     [(0, typed_dom_1.define)(el, (0, html_1.attributes)('link', [], optspec, params))],
                     rest
                 ];
-            })));
+            }))));
             exports.uri = (0, combinator_1.union)([
                 (0, combinator_1.open)(/^[^\S\n]/, (0, source_1.str)(/^\S+/)),
                 (0, source_1.str)(/^[^\s{}]+/)
@@ -7450,11 +7475,8 @@ 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, /^\s*==/),
-                (0, combinator_1.sequence)([
-                    (0, combinator_1.some)(inline_1.inline, '='),
-                    inline_1.inline
-                ])
+                (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
@@ -7539,10 +7561,10 @@ require = function () {
                 rel: global_1.undefined
             };
             (0, alias_1.ObjectSetPrototypeOf)(optspec, null);
-            exports.media = (0, combinator_1.lazy)(() => (0, combinator_1.creator)(10, (0, combinator_1.bind)((0, combinator_1.verify)((0, combinator_1.fmap)((0, combinator_1.open)('!', (0, combinator_1.validate)([
-                '[',
-                '{'
-            ], '}', '\n', (0, combinator_1.guard)(context => {
+            exports.media = (0, combinator_1.lazy)(() => (0, combinator_1.creator)(10, (0, combinator_1.validate)([
+                '![',
+                '!{'
+            ], '}', '\n', (0, combinator_1.bind)((0, combinator_1.verify)((0, combinator_1.fmap)((0, combinator_1.open)('!', (0, combinator_1.guard)(context => {
                 var _a, _b, _c;
                 return (_c = (_b = (_a = context.syntax) === null || _a === void 0 ? void 0 : _a.inline) === null || _b === void 0 ? void 0 : _b.media) !== null && _c !== void 0 ? _c : true;
             }, (0, combinator_1.tails)([
@@ -7555,7 +7577,7 @@ require = function () {
                     link_1.uri,
                     (0, combinator_1.some)(option)
                 ]), /^[^\S\n]?}/))
-            ])))), ([as, bs]) => bs ? [
+            ]))), ([as, bs]) => bs ? [
                 [(0, array_1.join)(as).trim() || (0, array_1.join)(as)],
                 bs
             ] : [
@@ -7584,7 +7606,7 @@ require = function () {
                         rest
                     ];
                 return (0, combinator_1.fmap)(link_1.link, ([link]) => [(0, typed_dom_1.define)(link, { target: '_blank' }, [el])])(`{ ${ INSECURE_URI }${ (0, array_1.join)(params) } }${ rest }`, context);
-            })));
+            }))));
             const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.union)([
                 (0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.some)((0, combinator_1.union)([
                     htmlentity_1.unsafehtmlentity,
@@ -7742,10 +7764,10 @@ require = function () {
             const util_1 = _dereq_('../util');
             const typed_dom_1 = _dereq_('typed-dom');
             const array_1 = _dereq_('spica/array');
-            exports.ruby = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.bind)((0, combinator_1.verify)((0, combinator_1.validate)('[', ')', '\n', (0, combinator_1.sequence)([
+            exports.ruby = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.validate)('[', ')', '\n', (0, combinator_1.bind)((0, combinator_1.verify)((0, combinator_1.sequence)([
                 (0, combinator_1.surround)('[', (0, combinator_1.focus)(/^(?:\\[^\n]|[^\\\[\]\n])+(?=]\()/, text), ']'),
                 (0, combinator_1.surround)('(', (0, combinator_1.focus)(/^(?:\\[^\n]|[^\\\(\)\n])+(?=\))/, text), ')')
-            ])), ([texts]) => (0, util_1.isStartTightNodes)(texts)), ([texts, rubies], rest) => {
+            ]), ([texts]) => (0, util_1.isStartTightNodes)(texts)), ([texts, rubies], rest) => {
                 const tail = typeof texts[texts.length - 1] === 'object' ? [texts.pop()] : [];
                 tail.length === 0 && texts[texts.length - 1] === '' && texts.pop();
                 switch (true) {
@@ -7777,7 +7799,7 @@ require = function () {
                         rest
                     ];
                 }
-            })));
+            }))));
             const text = (0, combinator_1.creator)((source, context) => {
                 var _a;
                 const acc = [''];
@@ -7871,13 +7893,10 @@ require = function () {
             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)([
-                (0, combinator_1.some)(inline_1.inline, /^\s*\*\*/),
-                (0, combinator_1.sequence)([
-                    (0, combinator_1.some)(inline_1.inline, '*'),
-                    inline_1.inline
-                ])
-            ]))), (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)(/\*\*/)),
+                (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
             ] : [
@@ -8668,49 +8687,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.source }`);
+            }
+            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)([
@@ -8746,21 +8736,22 @@ 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':
@@ -8880,6 +8871,7 @@ require = function () {
         {
             '../combinator': 27,
             '../combinator/data/parser': 47,
+            './api/normalize': 60,
             './inline/htmlentity': 112,
             './source': 128,
             'spica/array': 6,

package/markdown.d.ts

@@ -970,10 +970,7 @@ export namespace MarkdownParser {
       Inline<'mark'>,
       Parser<HTMLElement | string, Context, [
         InlineParser,
-        Parser<HTMLElement | string, Context, [
-          InlineParser,
-          InlineParser,
-        ]>,
+        InlineParser,
       ]> {
     }
     export interface EmStrongParser extends
@@ -981,10 +978,7 @@ export namespace MarkdownParser {
       Inline<'emstrong'>,
       Parser<HTMLElement | string, Context, [
         InlineParser,
-        Parser<HTMLElement | string, Context, [
-          InlineParser,
-          InlineParser,
-        ]>,
+        InlineParser,
       ]> {
     }
     export interface StrongParser extends
@@ -992,10 +986,7 @@ export namespace MarkdownParser {
       Inline<'strong'>,
       Parser<HTMLElement | string, Context, [
         InlineParser,
-        Parser<HTMLElement | string, Context, [
-          InlineParser,
-          InlineParser,
-        ]>,
+        InlineParser,
       ]> {
     }
     export interface EmphasisParser extends
@@ -1004,10 +995,7 @@ export namespace MarkdownParser {
       Parser<HTMLElement | string, Context, [
         StrongParser,
         InlineParser,
-        Parser<HTMLElement | string, Context, [
-          InlineParser,
-          InlineParser,
-        ]>,
+        InlineParser,
       ]> {
     }
     export interface CodeParser extends