securemark 0.232.1 → 0.233.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.233.1
+
+- Refactoring.
+
+## 0.233.0
+
+- Refine comment parser.
+
+## 0.232.2
+
+- Refactoring.
+
 ## 0.232.1
 
 - Refactoring.

package/design.md

@@ -293,3 +293,7 @@ MarkdownはGFMのように最初から高機能で完成度の高い拡張不要
 ### トランスクルージョン
 
 分散的に管理される情報のトランスクルージョンは権利関係の不明瞭さおよびリンク先の消失によりリンク元の情報に欠損が生じるなどの脆さから壊れやすいウェブ上の情報を扱う方法として既存の方法より劣っておりWikipediaのように中央集権的管理を実施できる場合にのみ有用となる。
+
+### Data URI
+
+Data URIは保存および転送容量削減ならびに集約的管理のためサポートしない。

package/dist/securemark.js

@@ -1,4 +1,4 @@
-/*! securemark v0.232.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
+/*! securemark v0.233.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
 require = function () {
     function r(e, n, t) {
         function o(i, f) {
@@ -427,7 +427,7 @@ require = function () {
                     this.indexes = {
                         LRU: new invlist_1.List(),
                         LFU: new invlist_1.List(),
-                        OVF: new invlist_1.List()
+                        OVL: new invlist_1.List()
                     };
                     this.stats = {
                         LRU: (0, tuple_1.tuple)(0, 0),
@@ -470,7 +470,7 @@ require = function () {
                     callback && (callback = !!this.settings.disposer);
                     record = callback ? record !== null && record !== void 0 ? record : this.memory.get(index.key) : record;
                     node.delete();
-                    (_a = node.value.overflow) === null || _a === void 0 ? void 0 : _a.delete();
+                    (_a = node.value.overlap) === null || _a === void 0 ? void 0 : _a.delete();
                     this.memory.delete(index.key);
                     this.SIZE -= index.size;
                     callback && ((_c = (_b = this.settings).disposer) === null || _c === void 0 ? void 0 : _c.call(_b, record.value, index.key));
@@ -484,25 +484,30 @@ require = function () {
                     let size = (_a = skip === null || skip === void 0 ? void 0 : skip.value.size) !== null && _a !== void 0 ? _a : 0;
                     if (margin - size <= 0)
                         return;
-                    const {LRU, LFU, OVF} = this.indexes;
+                    const {LRU, LFU, OVL} = this.indexes;
                     while (this.length === this.capacity || this.size + margin - size > this.space) {
-                        const lastNode = (_b = OVF.last) !== null && _b !== void 0 ? _b : LFU.last;
+                        const lastNode = (_b = OVL.last) !== null && _b !== void 0 ? _b : LFU.last;
                         const lastIndex = lastNode === null || lastNode === void 0 ? void 0 : lastNode.value;
                         let target;
                         switch (true) {
                         case lastIndex && lastIndex.clock < this.clock - this.life:
                         case lastIndex && lastIndex.expiry !== global_1.Infinity && lastIndex.expiry < (0, clock_1.now)():
-                            target = lastNode.list === OVF ? lastNode.value.parent : lastNode;
+                            target = lastNode.list === OVL ? lastNode.value.node : lastNode;
                             break;
                         case LRU.length === 0:
                             target = LFU.last !== skip ? LFU.last : LFU.last.prev;
                             break;
                         case LFU.length > this.capacity * this.ratio / 100:
-                            LRU.unshiftNode(LFU.last);
-                            LRU.head.value.parent = LRU.head;
-                            LRU.head.value.overflow = OVF.unshift(LRU.head.value);
+                            target = LFU.last !== skip ? LFU.last : LFU.length >= 2 ? LFU.last.prev : skip;
+                            if (target !== skip) {
+                                if (this.ratio > 50)
+                                    break;
+                                LRU.unshiftNode(target);
+                                LRU.head.value.node = LRU.head;
+                                LRU.head.value.overlap = OVL.unshift(LRU.head.value);
+                            }
                         default:
-                            target = LRU.last !== skip ? LRU.last : LRU.last.prev !== skip ? LRU.last.prev : LFU.last;
+                            target = LRU.last !== skip ? LRU.last : LRU.length >= 2 ? LRU.last.prev : LFU.last;
                         }
                         this.evict(target, void 0, true);
                         skip = (skip === null || skip === void 0 ? void 0 : skip.list) && skip;
@@ -593,7 +598,7 @@ require = function () {
                     this.stats.clear();
                     this.indexes.LRU.clear();
                     this.indexes.LFU.clear();
-                    this.indexes.OVF.clear();
+                    this.indexes.OVL.clear();
                     if (!this.settings.disposer || !this.settings.capture.clear)
                         return void this.memory.clear();
                     const memory = this.memory;
@@ -620,7 +625,7 @@ require = function () {
                         return;
                     const lenR = indexes.LRU.length;
                     const lenF = indexes.LFU.length;
-                    const lenV = indexes.OVF.length;
+                    const lenV = indexes.OVL.length;
                     const r = (lenF + lenV) * 1000 / (lenR + lenF) | 0;
                     const rateR0 = rate(window, LRU[0], LRU[0] + LFU[0], LRU[1], LRU[1] + LFU[1], 0) * (1 + r);
                     const rateF0 = rate(window, LFU[0], LRU[0] + LFU[0], LFU[1], LRU[1] + LFU[1], 0) * (1001 - r);
@@ -643,14 +648,14 @@ require = function () {
                     const index = node.value;
                     const {LRU, LFU} = this.indexes;
                     ++this.stats[index.region][0];
-                    if (!index.overflow && index.clock >= this.clockR - LRU.length / 3 && this.capacity > 3) {
+                    if (!index.overlap && index.clock >= this.clockR - LRU.length / 3 && this.capacity > 3) {
                         index.clock = ++this.clockR;
                         node.moveToHead();
                         return true;
                     }
                     index.clock = ++this.clock;
                     index.region = 'LFU';
-                    (_a = index.overflow) === null || _a === void 0 ? void 0 : _a.delete();
+                    (_a = index.overlap) === null || _a === void 0 ? void 0 : _a.delete();
                     LFU.unshiftNode(node);
                     return true;
                 }
@@ -3651,6 +3656,7 @@ require = function () {
             const global_1 = _dereq_('spica/global');
             const parser_1 = _dereq_('../../data/parser');
             const fmap_1 = _dereq_('../monad/fmap');
+            const resource_1 = _dereq_('./resource');
             const array_1 = _dereq_('spica/array');
             function surround(opener, parser, closer, optional = false, f, g) {
                 switch (typeof opener) {
@@ -3698,18 +3704,18 @@ require = function () {
             function match(pattern) {
                 switch (typeof pattern) {
                 case 'string':
-                    return source => source.slice(0, pattern.length) === pattern ? [
+                    return (0, resource_1.creator)(source => source.slice(0, pattern.length) === pattern ? [
                         [],
                         source.slice(pattern.length)
-                    ] : global_1.undefined;
+                    ] : global_1.undefined);
                 case 'object':
-                    return source => {
+                    return (0, resource_1.creator)(source => {
                         const m = source.match(pattern);
                         return m ? [
                             [],
                             source.slice(m[0].length)
                         ] : global_1.undefined;
-                    };
+                    });
                 }
             }
             function open(opener, parser, optional = false) {
@@ -3728,6 +3734,7 @@ require = function () {
         {
             '../../data/parser': 47,
             '../monad/fmap': 46,
+            './resource': 40,
             'spica/array': 6,
             'spica/global': 15
         }
@@ -4854,7 +4861,7 @@ require = function () {
                             'data-invalid-description': 'Missing the title at the first line.'
                         }, `${ opener }${ body }${ closer }`)];
                 return [(0, typed_dom_1.html)('aside', {
-                        id: (0, indexee_1.identity)(heading),
+                        id: (0, indexee_1.identity)((0, indexee_1.text)(heading)),
                         class: 'aside'
                     }, [
                         document,
@@ -5300,9 +5307,9 @@ require = function () {
                 let [, rowspan = global_1.undefined, colspan = global_1.undefined, highlight = global_1.undefined] = (_a = source.match(/^.(?:(\d+)?:(\d+)?)?(!+)?$/)) !== null && _a !== void 0 ? _a : [];
                 rowspan === '1' ? rowspan = global_1.undefined : global_1.undefined;
                 colspan === '1' ? colspan = global_1.undefined : global_1.undefined;
-                rowspan && (rowspan = (0, alias_1.max)(0, (0, alias_1.min)(+rowspan, 65534)) + '');
-                colspan && (colspan = (0, alias_1.max)(0, (0, alias_1.min)(+colspan, 1000)) + '');
-                highlight && (highlight = highlight.length > 0 ? highlight.length + '' : global_1.undefined);
+                rowspan && (rowspan = `${ (0, alias_1.max)(0, (0, alias_1.min)(+rowspan, 65534)) }`);
+                colspan && (colspan = `${ (0, alias_1.max)(0, (0, alias_1.min)(+colspan, 1000)) }`);
+                highlight && (highlight = highlight.length > 0 ? `${ highlight.length }` : global_1.undefined);
                 const valid = !highlight || source[0] === '#' && +highlight <= 1 || source[0] === ':' && +highlight <= 6;
                 return {
                     class: valid ? highlight && 'highlight' : 'invalid',
@@ -5844,7 +5851,7 @@ require = function () {
                 (0, combinator_1.validate)(new RegExp(`${ anchor_1.syntax.source }[^\S\n]*(?:$|\n)`), anchor_1.anchor)
             ]))), ([el, quotes = '']) => [
                 (0, typed_dom_1.html)('span', { class: 'cite' }, (0, typed_dom_1.defrag)([
-                    quotes + '>',
+                    `${ quotes }>`,
                     (0, typed_dom_1.define)(el, { 'data-depth': `${ quotes.length + 1 }` }, el.innerText.slice(1))
                 ])),
                 (0, typed_dom_1.html)('br')
@@ -6139,11 +6146,11 @@ require = function () {
             const annotation_1 = _dereq_('./inline/annotation');
             const reference_1 = _dereq_('./inline/reference');
             const template_1 = _dereq_('./inline/template');
+            const comment_1 = _dereq_('./inline/comment');
             const extension_1 = _dereq_('./inline/extension');
             const ruby_1 = _dereq_('./inline/ruby');
             const link_1 = _dereq_('./inline/link');
             const html_1 = _dereq_('./inline/html');
-            const comment_1 = _dereq_('./inline/comment');
             const insertion_1 = _dereq_('./inline/insertion');
             const deletion_1 = _dereq_('./inline/deletion');
             const mark_1 = _dereq_('./inline/mark');
@@ -6163,12 +6170,12 @@ require = function () {
                 annotation_1.annotation,
                 reference_1.reference,
                 template_1.template,
+                comment_1.comment,
                 extension_1.extension,
                 ruby_1.ruby,
                 link_1.link,
                 media_1.media,
                 html_1.html,
-                comment_1.comment,
                 insertion_1.insertion,
                 deletion_1.deletion,
                 mark_1.mark,
@@ -6599,52 +6606,28 @@ require = function () {
             'use strict';
             Object.defineProperty(exports, '__esModule', { value: true });
             exports.comment = void 0;
-            const combinator_1 = _dereq_('../../combinator');
             const parser_1 = _dereq_('../../combinator/data/parser');
-            const htmlentity_1 = _dereq_('./htmlentity');
+            const combinator_1 = _dereq_('../../combinator');
+            const inline_1 = _dereq_('../inline');
             const source_1 = _dereq_('../source');
             const typed_dom_1 = _dereq_('typed-dom');
-            exports.comment = (0, combinator_1.creator)((0, combinator_1.validate)('[#', (0, combinator_1.match)(/^\[(#+)(?!\S|\s+\1\]|\s*\[\1(?:$|\s))((?:\s+\S+)+?)(?:\s+(\1\])|\s*(?=\[\1(?:$|\s)))/, ([whole, , body, closer]) => (rest, context) => {
-                [whole, body] = `${ whole }\0${ body.trimStart() }`.replace(/\x1B/g, '').split('\0', 2);
-                if (!closer)
-                    return [
-                        [(0, typed_dom_1.html)('sup', {
-                                class: 'comment invalid',
-                                'data-invalid-syntax': 'comment',
-                                'data-invalid-type': 'content',
-                                'data-invalid-description': 'Comment syntax using the same level cannot start in another comment syntax.'
-                            }, whole)],
-                        rest
-                    ];
-                const title = (0, parser_1.eval)((0, combinator_1.some)(text)(body, context), []).join('').trim();
-                if (title.includes('\0'))
-                    return [
-                        [(0, typed_dom_1.html)('sup', {
-                                class: 'comment invalid',
-                                'data-invalid-syntax': 'comment',
-                                'data-invalid-type': 'content',
-                                'data-invalid-description': `Invalid HTML entitiy "${ title.match(/\0&[0-9A-Za-z]+;/)[0].slice(1) }".`
-                            }, whole)],
-                        rest
-                    ];
-                return [
-                    [(0, typed_dom_1.html)('sup', {
-                            class: 'comment',
-                            title
-                        })],
-                    rest
-                ];
-            })));
-            const text = (0, combinator_1.union)([
-                htmlentity_1.unsafehtmlentity,
-                source_1.unescsource
-            ]);
+            const memoize_1 = _dereq_('spica/memoize');
+            const array_1 = _dereq_('spica/array');
+            exports.comment = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.validate)('[#', (0, combinator_1.match)(/^(?=\[(#+)\s)/, (0, memoize_1.memoize)(([, fence], closer = new RegExp(String.raw`^\s+${ fence }\]`)) => (0, combinator_1.surround)((0, source_1.str)(/^\[(\S+)\s+(?!\1\])/), (0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, closer)]), (0, source_1.str)(closer), true, ([, bs = []], rest) => [
+                [(0, typed_dom_1.html)('span', { class: 'comment' }, (0, typed_dom_1.defrag)((0, array_1.push)((0, array_1.unshift)([`[${ fence } `], bs), [` ${ fence }]`])))],
+                rest
+            ], ([as, bs = []], rest, context) => [
+                (0, array_1.unshift)((0, array_1.pop)((0, parser_1.eval)((0, combinator_1.some)(source_1.text)(`${ as[0] }!`, context)))[0], bs),
+                rest
+            ]), ([, fence]) => fence)))));
         },
         {
             '../../combinator': 27,
             '../../combinator/data/parser': 47,
+            '../inline': 88,
             '../source': 128,
-            './htmlentity': 112,
+            'spica/array': 6,
+            'spica/memoize': 18,
             'typed-dom': 26
         }
     ],
@@ -6883,7 +6866,7 @@ require = function () {
                 source_1.txt
             ]), ']', /^\\?\n/))), ns => [(0, typed_dom_1.html)('span', {
                     class: 'indexer',
-                    'data-index': (0, indexee_1.identify)((0, array_1.join)(ns).trim()).slice(6)
+                    'data-index': (0, indexee_1.identity)((0, array_1.join)(ns)).slice(6)
                 })])));
             const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.union)([
                 (0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.some)((0, combinator_1.union)([
@@ -6916,45 +6899,51 @@ require = function () {
         function (_dereq_, module, exports) {
             'use strict';
             Object.defineProperty(exports, '__esModule', { value: true });
-            exports.identify = exports.text = exports.identity = exports.indexee = void 0;
+            exports.text = exports.identity = exports.indexee = void 0;
             const global_1 = _dereq_('spica/global');
             const combinator_1 = _dereq_('../../../combinator');
             const typed_dom_1 = _dereq_('typed-dom');
             function indexee(parser) {
-                return (0, combinator_1.fmap)(parser, ([el], _, {id}) => [(0, typed_dom_1.define)(el, { id: id !== '' && identity(el) || global_1.undefined })]);
+                return (0, combinator_1.fmap)(parser, ([el], _, {id}) => [(0, typed_dom_1.define)(el, { id: id !== '' && identity(text(el)) || global_1.undefined })]);
             }
             exports.indexee = indexee;
-            function identity(source) {
-                return identify(text(source).trim());
+            function identity(text) {
+                text && (text = text.trim());
+                return text && `index:${ text.replace(/\s+/g, '_').slice(0, 101).replace(/^(.{97}).{4}$/, '$1...') }`;
             }
             exports.identity = identity;
             function text(source) {
+                var _a;
                 const indexer = source.querySelector('.indexer');
                 if (indexer)
                     return indexer.getAttribute('data-index');
                 const target = source.cloneNode(true);
-                for (let es = target.querySelectorAll('code[data-src], .math[data-src], rt, rp, .reference'), i = 0, len = es.length; i < len; ++i) {
+                for (let es = target.querySelectorAll('code[data-src], .math[data-src], .comment, rt, rp, .reference'), i = 0, len = es.length; i < len; ++i) {
                     const el = es[i];
                     switch (el.tagName) {
+                    case 'CODE':
+                        (0, typed_dom_1.define)(el, el.getAttribute('data-src'));
+                        continue;
                     case 'RT':
                     case 'RP':
                         el.remove();
                         continue;
-                    case 'SUP':
-                        el.firstChild.remove();
-                        continue;
-                    default:
+                    }
+                    switch (el.className) {
+                    case 'math':
                         (0, typed_dom_1.define)(el, el.getAttribute('data-src'));
                         continue;
+                    case 'comment':
+                        el.remove();
+                        continue;
+                    case 'reference':
+                        el.firstChild.remove();
+                        continue;
                     }
                 }
                 return target.textContent;
             }
             exports.text = text;
-            function identify(index) {
-                return index ? `index:${ index.replace(/\s+/g, '_').slice(0, 101).replace(/^(.{97}).{4}$/, '$1...') }` : '';
-            }
-            exports.identify = identify;
         },
         {
             '../../../combinator': 27,
@@ -7607,6 +7596,15 @@ require = function () {
                 switch (uri.protocol) {
                 case 'http:':
                 case 'https:':
+                    if (/\/\.\.?(?:\/|$)/.test('/' + uri.source.slice(0, uri.source.search(/[?#]|$/)))) {
+                        (0, typed_dom_1.define)(target, {
+                            class: void target.classList.add('invalid'),
+                            'data-invalid-syntax': 'media',
+                            'data-invalid-type': 'argument',
+                            'data-invalid-description': 'Dot-segments cannot be used in media paths; use subresource paths instead.'
+                        });
+                        return false;
+                    }
                     break;
                 default:
                     (0, typed_dom_1.define)(target, {
@@ -7617,15 +7615,6 @@ require = function () {
                     });
                     return false;
                 }
-                if (/\/\.\.?(?:\/|$)/.test('/' + uri.source.slice(0, uri.source.search(/[?#]|$/)))) {
-                    (0, typed_dom_1.define)(target, {
-                        class: void target.classList.add('invalid'),
-                        'data-invalid-syntax': 'media',
-                        'data-invalid-type': 'argument',
-                        'data-invalid-description': 'Dot-segments cannot be used in media paths; use subresource paths instead.'
-                    });
-                    return false;
-                }
                 if (alt.includes('\0')) {
                     (0, typed_dom_1.define)(target, {
                         class: void target.classList.add('invalid'),
@@ -7692,7 +7681,7 @@ require = function () {
                     class: 'reference',
                     'data-abbr': (0, util_1.stringify)([ns.shift()]).trimEnd()
                 } : ns[0] === '' ? {
-                    class: 'reference invalid',
+                    class: 'invalid',
                     'data-invalid-syntax': 'reference',
                     'data-invalid-type': 'syntax',
                     'data-invalid-description': 'Invalid abbr.'
@@ -8075,7 +8064,7 @@ require = function () {
                     !(0, label_1.isFixed)(label) && numbers.set(group, number);
                     opts.id !== '' && def.setAttribute('id', `label:${ opts.id ? `${ opts.id }:` : '' }${ label }`);
                     const figindex = group === '$' ? `(${ number })` : `${ capitalize(group) }${ group === 'fig' ? '.' : '' } ${ number }`;
-                    (0, typed_dom_1.define)(def.querySelector(':scope > .figindex'), group === '$' ? figindex : `${ figindex }: `);
+                    (0, typed_dom_1.define)(def.querySelector(':scope > .figindex'), group === '$' ? figindex : `${ figindex }. `);
                     for (const ref of refs.take(label, global_1.Infinity)) {
                         if (ref.hash.slice(1) === def.id && ref.innerText === figindex)
                             continue;
@@ -8171,7 +8160,7 @@ require = function () {
                         } else {
                             (_b = ref.lastChild) === null || _b === void 0 ? void 0 : _b.remove();
                         }
-                        const title = global_1.undefined || titles.get(identifier) || +identifier[0] && ref.title || (0, indexee_1.text)(content).trim() || global_1.undefined;
+                        const title = global_1.undefined || titles.get(identifier) || +identifier[0] && ref.title || (0, indexee_1.text)(content).trim() || content.textContent.trim() || global_1.undefined;
                         title ? !titles.has(identifier) && titles.set(identifier, title) : buffer.set(identifier, ref);
                         const blank = !!abbr && !content.firstChild;
                         const refIndex = i + 1;
@@ -8651,7 +8640,6 @@ require = function () {
             const global_1 = _dereq_('spica/global');
             const parser_1 = _dereq_('../combinator/data/parser');
             const combinator_1 = _dereq_('../combinator');
-            const comment_1 = _dereq_('./inline/comment');
             const htmlentity_1 = _dereq_('./inline/htmlentity');
             const source_1 = _dereq_('./source');
             const array_1 = _dereq_('spica/array');
@@ -8689,10 +8677,10 @@ require = function () {
                 'InvisibleComma',
                 'ic'
             ];
-            const blankline = new RegExp(String.raw`^(?!$)(?:\\$|\\?[^\S\n]|&(?:${ invisibleHTMLEntityNames.join('|') });|<wbr>|\[(#+)(?!\S|\s+\1\]|\s*\[\1(?:$|\s))((?:\s+\S+)+?)(?:\s+(\1\])|\s*(?=\[\1(?:$|\s))))+(?=$|(\S))`, 'gm');
+            const blankline = new RegExp(String.raw`^(?!$)(?:\\$|\\?[^\S\n]|&(?:${ invisibleHTMLEntityNames.join('|') });|<wbr>)+$`, 'gm');
             function visualize(parser) {
                 return (0, combinator_1.union)([
-                    (0, combinator_1.convert)(source => source.replace(blankline, (line, ...$) => !$[3] ? line.replace(/[\\&<\[]/g, '\x1B$&') : line), (0, combinator_1.verify)(parser, (ns, rest, context) => !rest && hasVisible(ns, context))),
+                    (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)([
                         source_1.linebreak,
                         source_1.unescsource
@@ -8738,7 +8726,7 @@ require = function () {
             }
             exports.startTight = startTight;
             function isStartTight(source, context) {
-                var _a, _b, _c, _d, _e;
+                var _a, _b, _c;
                 if (source === '')
                     return true;
                 switch (source[0]) {
@@ -8762,12 +8750,6 @@ require = function () {
                         return false;
                     }
                     return true;
-                case '[':
-                    switch (true) {
-                    case source.length >= 7 && source[1] === '#' && ((_d = (0, parser_1.eval)((0, comment_1.comment)(source, context))) === null || _d === void 0 ? void 0 : _d[0].className) === 'comment':
-                        return false;
-                    }
-                    return true;
                 default:
                     return source[0].trimStart() !== '';
                 }
@@ -8783,8 +8765,6 @@ require = function () {
                     return true;
                 for (let i = nodes.length; i--;) {
                     const node = nodes[i];
-                    if (typeof node === 'object' && node.className === 'comment')
-                        continue;
                     return isVisible(node, -1);
                 }
                 return false;
@@ -8810,8 +8790,6 @@ require = function () {
                         return false;
                     case 'SPAN':
                         return node.className !== 'linebreak';
-                    case 'SUP':
-                        return node.className !== 'comment';
                     default:
                         return true;
                     }
@@ -8825,8 +8803,6 @@ require = function () {
                 for (let node = nodes[0]; nodes.length > 0 && !isVisible(node = nodes[0], 0);) {
                     if (nodes.length === 1 && typeof node === 'object' && node.className === 'indexer')
                         break;
-                    if (typeof node === 'object' && node.className === 'comment')
-                        break;
                     if (typeof node === 'string') {
                         const pos = node.length - node.trimStart().length;
                         if (pos > 0) {
@@ -8841,8 +8817,6 @@ require = function () {
             function trimNodeEnd(nodes) {
                 const skip = nodes.length > 0 && typeof nodes[nodes.length - 1] === 'object' && nodes[nodes.length - 1]['className'] === 'indexer' ? [nodes.pop()] : [];
                 for (let node = nodes[0]; nodes.length > 0 && !isVisible(node = nodes[nodes.length - 1], -1);) {
-                    if (typeof node === 'object' && node.className === 'comment')
-                        break;
                     if (typeof node === 'string') {
                         const pos = node.trimEnd().length;
                         if (pos > 0) {
@@ -8879,7 +8853,6 @@ require = function () {
         {
             '../combinator': 27,
             '../combinator/data/parser': 47,
-            './inline/comment': 100,
             './inline/htmlentity': 112,
             './source': 128,
             'spica/array': 6,

package/markdown.d.ts

@@ -557,11 +557,11 @@ export namespace MarkdownParser {
       // abc
       Block<'reply'>,
       Parser<HTMLParagraphElement, Context, [
-        Parser<string | HTMLElement, Context, [
+        Parser<HTMLElement, Context, [
           ReplyParser.CiteParser,
           ReplyParser.QuoteParser,
         ]>,
-        Parser<string | HTMLElement, Context, [
+        Parser<HTMLElement | string, Context, [
           ReplyParser.QuoteParser,
           InlineParser,
         ]>,
@@ -619,12 +619,12 @@ export namespace MarkdownParser {
       InlineParser.AnnotationParser,
       InlineParser.ReferenceParser,
       InlineParser.TemplateParser,
+      InlineParser.CommentParser,
       InlineParser.ExtensionParser,
       InlineParser.RubyParser,
       InlineParser.LinkParser,
       InlineParser.MediaParser,
       InlineParser.HTMLParser,
-      InlineParser.CommentParser,
       InlineParser.InsertionParser,
       InlineParser.DeletionParser,
       InlineParser.MarkParser,
@@ -709,6 +709,13 @@ export namespace MarkdownParser {
         ]> {
       }
     }
+    export interface CommentParser extends
+      // [# comment #]
+      Inline<'comment'>,
+      Parser<HTMLElement | string, Context, [
+        InlineParser,
+      ]> {
+    }
     export interface ExtensionParser extends
       // [#abc]
       Inline<'extension'>,
@@ -941,22 +948,6 @@ export namespace MarkdownParser {
         }
       }
     }
-    export interface CommentParser extends
-      // [# comment #]
-      Inline<'comment'>,
-      Parser<HTMLElement, Context, [
-        CommentParser.TextParser,
-      ]> {
-    }
-    export namespace CommentParser {
-      export interface TextParser extends
-        Inline<'comment/text'>,
-        Parser<string, Context, [
-          UnsafeHTMLEntityParser,
-          SourceParser.UnescapableSourceParser,
-        ]> {
-      }
-    }
     export interface InsertionParser extends
       // ++abc++
       Inline<'insertion'>,
@@ -1030,7 +1021,7 @@ export namespace MarkdownParser {
     export interface HTMLEntityParser extends
       // &copy;
       Inline<'htmlentity'>,
-      Parser<HTMLSpanElement | string, Context, [
+      Parser<string | HTMLSpanElement, Context, [
         UnsafeHTMLEntityParser,
       ]> {
     }
@@ -1153,7 +1144,7 @@ export namespace MarkdownParser {
   }
   export interface AutolinkParser extends
     Markdown<'autolink'>,
-    Parser<HTMLElement | string, Context, [
+    Parser<string | HTMLElement, Context, [
       InlineParser.AutolinkParser,
       SourceParser.LinebreakParser,
       SourceParser.UnescapableSourceParser,
@@ -1164,7 +1155,7 @@ export namespace MarkdownParser {
     export interface TextParser extends
       // abc
       Source<'text'>,
-      Parser<HTMLBRElement | HTMLSpanElement | string, Context, []> {
+      Parser<string | HTMLBRElement | HTMLSpanElement, Context, []> {
     }
     export interface TxtParser extends
       // abc