npm - securemark - Versions diffs - 0.224.1 → 0.226.0 - Mend

securemark 0.224.1 → 0.226.0

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 (29) hide show

package/CHANGELOG.md +16 -0
package/design.md +5 -11
package/dist/securemark.js +61 -46
package/markdown.d.ts +1 -0
package/package-lock.json +1 -1
package/package.json +1 -1
package/src/combinator/control/manipulation/scope.ts +1 -0
package/src/parser/api/parse.test.ts +0 -3
package/src/parser/inline/deletion.test.ts +0 -2
package/src/parser/inline/deletion.ts +2 -2
package/src/parser/inline/emphasis.test.ts +8 -5
package/src/parser/inline/emphasis.ts +2 -2
package/src/parser/inline/emstrong.ts +8 -8
package/src/parser/inline/html.ts +3 -3
package/src/parser/inline/insertion.test.ts +0 -2
package/src/parser/inline/insertion.ts +2 -2
package/src/parser/inline/mark.test.ts +6 -5
package/src/parser/inline/mark.ts +2 -2
package/src/parser/inline/math.test.ts +43 -33
package/src/parser/inline/math.ts +5 -7
package/src/parser/inline/ruby.ts +5 -5
package/src/parser/inline/strong.test.ts +9 -7
package/src/parser/inline/strong.ts +2 -2
package/src/parser/inline.test.ts +4 -6
package/src/parser/source/escapable.test.ts +9 -1
package/src/parser/source/escapable.ts +7 -1
package/src/parser/source/text.test.ts +2 -3
package/src/parser/source/unescapable.test.ts +9 -0
package/src/parser/util.ts +26 -41

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,21 @@
 # Changelog
+## 0.226.0
+- Improve math parser.
+## 0.225.2
+- Refactoring.
+## 0.225.1
+- Refactoring.
+## 0.225.0
+- Refine some parsers to disallow trailing whitespace.
 ## 0.224.1
 - Refactoring.

package/design.md CHANGED Viewed

@@ -69,7 +69,7 @@
 ### 自己完結性
-ドキュメントはすべて初期構成の閲覧環境で閲覧できなければならない。
+ドキュメントはすべて初期(共通)構成の閲覧環境で閲覧できなければならない。
 よって閲覧に拡張機能等の追加が必要となってはならない
 ゆえにドキュメントはサードパーティツールなど自己完結性を損なうツールの使用をサポートしない。
@@ -139,7 +139,7 @@
 オートリンクは原則としてコピー＆ペーストによる引用等を経た際にその解釈が変わってはならない。
-ゆえにハッシュタグ構文は構文が表示文字列と一致する構文であるオートリンク構文としてのみ構文化され、表示文字列からの構文の範囲の特定が不可能である通常の構文を持たない。
+ゆえにハッシュタグ構文は構文が表示文字列と一致する構文であるオートリンク構文としてのみ構文化され、表示文字列からの構文の範囲の特定が不可能となる通常の構文を持たない。
 ### 自動附番
@@ -148,12 +148,6 @@
 ゆえに参照箇所に実体を記述する注釈構文および識別に文字列を使用する図表構文を採用し、その表示方法は任意とする。
 脚注構文は附番が手作業となり参照と実体の対応の管理が困難であるため不採用とし注釈構文により生成可能とする。
-### 羅列的知識への非依存
-構文はその使用のために羅列的知識を求めてはならない。
-ゆえに構文はHTMLエンティティの参照の有効性を検査しない。
 ### テンプレート対応
 ソーステキストは自身をテンプレートとして別のソーステキストを生成するための構文を使用できなければならない。
@@ -277,7 +271,7 @@ CodeMirrorが素では速いがVimModeでは数万文字程度でも耐え難く
 ### バックトラック
 SecuremarkのAnnotation構文に典型的であるようにスコープの生成規則を変える構文が存在する場合文脈の相違から解析結果を再利用不能な(`αA'β | αAB`)バックトラックが再帰的に生じ、このような言語を線形時間で解析することは基本的に不可能であり直ちに文脈を確定する任意の構文または記号の前に文脈の差異が生じない(`αAβ | αAB`)場合のみ再利用可能なバックトラックにより線形時間で解析できると思われる。
-このため線形時間で解析可能な文法に制約されるCommonMarkがこの制約を破らずこのような文脈不確定文法を導入することは不可能であり一例としてSecuremarkにおけるAnnotation構文のような文脈独立の構文とHTML構文のような構文の再帰または特定の包含関係での使用の禁止等の再帰制御の両立ができないという拡張性の限界が存在する。なおLink構文は自身を始めとするリンクを生成する構文を包含できないためリンクを生成するAnnotation構文との関係においてこの問題を生じない。
+このため線形時間で解析可能な文法に制約されるCommonMarkがこの制約を破らずこのような文脈不確定文法を導入することは不可能であるという拡張性の限界が存在する。
 ### 標準化
@@ -285,8 +279,8 @@ Markdownのように自然言語と自身の文法を分離する汎用構造が
 このためCommonMarkは拡張構文を標準化した次期標準仕様との互換性を確保する役には立たずその有用性は構文の拡張を考慮しない範囲での効率的な実装方法の例示およびテストケースの集積による個別実装の支援ならびにその結果としての限定的互換性にとどまる。
 さらにCommonMarkは前述の解析時間の制約から拡張性が低く、高度な構文や機能の実装可能性を考慮していないことから拡張仕様において準拠すべき技術的正当性もない。
-よってMarkdownの標準化は後方互換性確保が不可能であることから発展性がなくスナップショット以上の意味を持たない。
-MarkdownはGFMのように最初から高機能で完成度の高い拡張不要な独自実装のほうが標準としての互換性を確保でき、構文に曖昧さがない形式言語と異なり最小限の標準仕様を策定し拡張していく通常の標準化方法が適さない特殊な言語である。
+よってMarkdownの標準化は後方互換性確保が不可能であることから発展性がなくスナップショット以上の技術的意味を持たない。
+MarkdownはGFMのように最初から高機能で完成度の高い拡張不要な独自実装のほうが標準としての互換性を確保でき、構文に曖昧さがない形式言語と異なりまず最小限の標準仕様を策定しのちに拡張していく通常の標準化方法が適さない特殊な言語である。
 ### トランスクルージョン

package/dist/securemark.js CHANGED Viewed

@@ -1,4 +1,4 @@
-/*! securemark v0.224.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
+/*! securemark v0.226.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
 require = function () {
     function r(e, n, t) {
         function o(i, f) {
@@ -6966,7 +6966,7 @@ require = function () {
             const typed_dom_1 = _dereq_('typed-dom');
             const array_1 = _dereq_('spica/array');
             exports.deletion = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.surround)((0, source_1.str)('~~'), (0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, '~~')]), (0, source_1.str)('~~'), false, ([, bs], rest) => [
-                [(0, typed_dom_1.html)('del', (0, typed_dom_1.defrag)((0, util_1.trimEndBR)(bs)))],
+                [(0, typed_dom_1.html)('del', (0, typed_dom_1.defrag)((0, util_1.trimNodeEndBR)(bs)))],
                 rest
             ], ([as, bs], rest) => [
                 (0, array_1.unshift)(as, bs),
@@ -6998,7 +6998,7 @@ require = function () {
                 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, typed_dom_1.html)('em', (0, typed_dom_1.defrag)((0, util_1.trimEndBR)(bs)))],
+                [(0, typed_dom_1.html)('em', (0, typed_dom_1.defrag)(bs))],
                 rest
             ] : [
                 (0, array_1.unshift)(as, bs),
@@ -7039,41 +7039,41 @@ require = function () {
                 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)((0, util_1.trimEndBR)(bs)))], (0, typed_dom_1.defrag)((0, util_1.trimEndBR)(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)((0, util_1.trimEndBR)(bs)))
+                            (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)((0, util_1.trimEndBR)(bs)))
+                            (0, typed_dom_1.html)('em', (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) ? [
-                        [(0, typed_dom_1.html)('em', (0, array_1.unshift)([(0, typed_dom_1.html)('strong', (0, typed_dom_1.defrag)((0, util_1.trimEndBR)(bs)))], (0, typed_dom_1.defrag)((0, util_1.trimEndBR)(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)
                     ] : [
                         (0, array_1.unshift)([
                             '*',
-                            (0, typed_dom_1.html)('strong', (0, typed_dom_1.defrag)((0, util_1.trimEndBR)(bs)))
+                            (0, typed_dom_1.html)('strong', (0, typed_dom_1.defrag)(bs))
                         ], ds),
                         rest
                     ])(rest, context)) !== null && _b !== void 0 ? _b : [
                         [
                             '*',
-                            (0, typed_dom_1.html)('strong', (0, typed_dom_1.defrag)((0, util_1.trimEndBR)(bs)))
+                            (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)((0, util_1.trimEndBR)(bs)))])],
+                        [(0, typed_dom_1.html)('em', [(0, typed_dom_1.html)('strong', (0, typed_dom_1.defrag)(bs))])],
                         rest
                     ];
                 }
@@ -7441,11 +7441,11 @@ require = function () {
                         return {};
                     }
                 })(), (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), `</${ tag }>`)), `</${ tag }>`), (0, source_1.str)(`</${ tag }>`), false, ([as, bs, cs], rest, context) => [
-                    [elem(tag, as, (0, util_1.trimEndBR)((0, typed_dom_1.defrag)(bs)), cs, context)],
+                    [elem(tag, as, (0, util_1.trimNodeEndBR)((0, typed_dom_1.defrag)(bs)), cs, context)],
                     rest
                 ])), ([, tag]) => tag)),
                 (0, combinator_1.match)(/^(?=<([a-z]+)(?=[^\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.some)((0, combinator_1.union)([inline_1.inline]), `</${ tag }>`), `</${ tag }>`), (0, source_1.str)(`</${ tag }>`), false, ([as, bs, cs], rest) => [
-                    [elem(tag, as, (0, util_1.trimEndBR)((0, typed_dom_1.defrag)(bs)), cs, {})],
+                    [elem(tag, as, (0, util_1.trimNodeEndBR)((0, typed_dom_1.defrag)(bs)), cs, {})],
                     rest
                 ], ([as, bs], rest) => as.length === 1 ? [
                     (0, array_1.unshift)(as, bs),
@@ -7561,7 +7561,7 @@ require = function () {
             const typed_dom_1 = _dereq_('typed-dom');
             const array_1 = _dereq_('spica/array');
             exports.insertion = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.surround)((0, source_1.str)('++'), (0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, '++')]), (0, source_1.str)('++'), false, ([, bs], rest) => [
-                [(0, typed_dom_1.html)('ins', (0, typed_dom_1.defrag)((0, util_1.trimEndBR)(bs)))],
+                [(0, typed_dom_1.html)('ins', (0, typed_dom_1.defrag)((0, util_1.trimNodeEndBR)(bs)))],
                 rest
             ], ([as, bs], rest) => [
                 (0, array_1.unshift)(as, bs),
@@ -7733,7 +7733,7 @@ require = function () {
             const typed_dom_1 = _dereq_('typed-dom');
             const array_1 = _dereq_('spica/array');
             exports.mark = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.surround)((0, source_1.str)('=='), (0, util_1.startTight)((0, combinator_1.union)([(0, combinator_1.some)(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)((0, util_1.trimEndBR)(bs)))],
+                [(0, typed_dom_1.html)('mark', (0, typed_dom_1.defrag)(bs))],
                 rest
             ] : [
                 (0, array_1.unshift)(as, bs),
@@ -7763,8 +7763,8 @@ require = function () {
             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)('$', '$', '\n', (0, combinator_1.rewrite)((0, combinator_1.union)([
-                (0, combinator_1.surround)('$', bracket, '$'),
-                (0, combinator_1.surround)('$', (0, combinator_1.verify)((0, source_1.str)(/^(?=[\\^_[(|]|[A-Za-z][0-9A-Za-z]*'*[ ~]?(?:\$|([\\^_(|:=<>])(?!\1)))(?:\\\$|[\x20-\x23\x25-\x7E])*/), util_1.isEndTightNodes), /^\$(?![0-9A-Za-z])/)
+                (0, combinator_1.surround)('$', (0, combinator_1.verify)((0, source_1.str)(/^(?![\s{}#$%&]|\d+(?:[,.]\d+)*(?:[\s,.!?()[\]{}]|[^\x00-\x7F])|-[\da-z]|[a-z]+-)(?:\\\$|[\x20-\x23\x25-\x7E])*/i), util_1.isEndTightNodes), /^\$(?![0-9a-z])/i),
+                (0, combinator_1.surround)('$', bracket, '$')
             ]), (source, {
                 caches: {math: cache} = {}
             }) => {
@@ -7786,7 +7786,7 @@ require = function () {
             }))));
             const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.surround)('{', (0, combinator_1.some)((0, combinator_1.union)([
                 bracket,
-                (0, combinator_1.some)(source_1.escsource, /^[{}]/)
+                (0, combinator_1.some)(source_1.escsource, /^(?:[{}]|\\?\n)/)
             ])), '}', true)));
         },
         {
@@ -8051,11 +8051,6 @@ require = function () {
                 const acc = [''];
                 while (source !== '') {
                     switch (source[0]) {
-                    case ' ':
-                    case '\u3000':
-                        acc.push('');
-                        source = source.slice(1);
-                        continue;
                     case '&': {
                             const result = (0, htmlentity_1.htmlentity)(source, context);
                             acc[acc.length - 1] += (0, parser_1.eval)(result, [source[0]])[0];
@@ -8063,6 +8058,11 @@ require = function () {
                             continue;
                         }
                     default: {
+                            if (source[0].trimStart() === '') {
+                                acc.push('');
+                                source = source.slice(1);
+                                continue;
+                            }
                             const result = (0, source_1.text)(source, context);
                             acc[acc.length - 1] += (_a = (0, parser_1.eval)(result)[0]) !== null && _a !== void 0 ? _a : source.slice(0, source.length - (0, parser_1.exec)(result).length);
                             source = (0, parser_1.exec)(result);
@@ -8123,7 +8123,7 @@ require = function () {
                 (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) ? [
-                [(0, typed_dom_1.html)('strong', (0, typed_dom_1.defrag)((0, util_1.trimEndBR)(bs)))],
+                [(0, typed_dom_1.html)('strong', (0, typed_dom_1.defrag)(bs))],
                 rest
             ] : [
                 (0, array_1.unshift)(as, bs),
@@ -8642,6 +8642,7 @@ require = function () {
             Object.defineProperty(exports, '__esModule', { value: true });
             exports.escsource = void 0;
             const combinator_1 = _dereq_('../../combinator');
+            const text_1 = _dereq_('./text');
             const separator = /[\s\x00-\x2F\x3A-\x40\x5B-\x60\x7B-\x7F]/;
             exports.escsource = (0, combinator_1.creator)(source => {
                 if (source === '')
@@ -8661,9 +8662,11 @@ require = function () {
                             source.slice(2)
                         ];
                     default:
+                        const b = source[0] !== '\n' && source[0].trimStart() === '';
+                        const i = b ? source.search(text_1.nonWhitespace) : 1;
                         return [
-                            [source.slice(0, 1)],
-                            source.slice(1)
+                            [source.slice(0, i)],
+                            source.slice(i)
                         ];
                     }
                 default:
@@ -8674,7 +8677,10 @@ require = function () {
                 }
             });
         },
-        { '../../combinator': 30 }
+        {
+            '../../combinator': 30,
+            './text': 135
+        }
     ],
     133: [
         function (_dereq_, module, exports) {
@@ -8886,7 +8892,7 @@ require = function () {
         function (_dereq_, module, exports) {
             'use strict';
             Object.defineProperty(exports, '__esModule', { value: true });
-            exports.stringify = exports.trimEndBR = 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 = void 0;
             const global_1 = _dereq_('spica/global');
             const parser_1 = _dereq_('../combinator/data/parser');
             const combinator_1 = _dereq_('../combinator');
@@ -9020,17 +9026,21 @@ require = function () {
             function isEndTightNodes(nodes) {
                 if (nodes.length === 0)
                     return true;
-                const last = nodes.length - 1;
-                return typeof nodes[last] === 'string' && nodes[last].length > 1 ? isVisible(nodes[last], -1) || isVisible(nodes[last], -2) : isVisible(nodes[last], -1) || last === 0 || isVisible(nodes[last - 1], -1);
+                for (let i = nodes.length; i--;) {
+                    const node = nodes[i];
+                    if (typeof node === 'object' && node.className === 'comment')
+                        continue;
+                    return isVisible(node, -1);
+                }
+                return false;
             }
             exports.isEndTightNodes = isEndTightNodes;
-            function isVisible(node, position) {
-                if (!node)
-                    return false;
+            function isVisible(node, strpos) {
                 switch (typeof node) {
                 case 'string':
-                    const char = position === global_1.undefined ? node : node[position >= 0 ? position : node.length + position];
+                    const char = node && strpos !== global_1.undefined ? node[strpos >= 0 ? strpos : node.length + strpos] : node;
                     switch (char) {
+                    case '':
                     case ' ':
                     case '\t':
                     case '\n':
@@ -9057,26 +9067,31 @@ require = function () {
             }
             exports.trimNode = trimNode;
             function trimNodeStart(nodes) {
-                const skip = nodes.length > 0 && typeof nodes[nodes.length - 1] === 'object' && nodes[nodes.length - 1]['className'] === 'indexer' ? [nodes.pop()] : [];
-                for (let first = nodes[0]; nodes.length > 0 && !isVisible(first, 0) && !(typeof first === 'object' && first.className === 'comment');) {
-                    if (typeof first === 'string') {
-                        const pos = first.length - first.trimStart().length;
+                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) {
-                            nodes[0] = first.slice(pos);
+                            nodes[0] = node.slice(pos);
                             break;
                         }
                     }
-                    nodes.pop();
+                    nodes.shift();
                 }
-                return (0, array_1.push)(nodes, skip);
+                return nodes;
             }
             function trimNodeEnd(nodes) {
                 const skip = nodes.length > 0 && typeof nodes[nodes.length - 1] === 'object' && nodes[nodes.length - 1]['className'] === 'indexer' ? [nodes.pop()] : [];
-                for (let last = nodes[0]; nodes.length > 0 && !isVisible(last = nodes[nodes.length - 1], -1) && !(typeof last === 'object' && last.className === 'comment');) {
-                    if (typeof last === 'string') {
-                        const pos = last.trimEnd().length;
+                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) {
-                            nodes[nodes.length - 1] = last.slice(0, pos);
+                            nodes[nodes.length - 1] = node.slice(0, pos);
                             break;
                         }
                     }
@@ -9085,13 +9100,13 @@ require = function () {
                 return (0, array_1.push)(nodes, skip);
             }
             exports.trimNodeEnd = trimNodeEnd;
-            function trimEndBR(nodes) {
+            function trimNodeEndBR(nodes) {
                 if (nodes.length === 0)
                     return nodes;
                 const node = nodes[nodes.length - 1];
                 return typeof node === 'object' && node.tagName === 'BR' ? (0, array_1.pop)(nodes)[0] : nodes;
             }
-            exports.trimEndBR = trimEndBR;
+            exports.trimNodeEndBR = trimNodeEndBR;
             function stringify(nodes) {
                 let acc = '';
                 for (let i = 0; i < nodes.length; ++i) {

package/markdown.d.ts CHANGED Viewed

@@ -988,6 +988,7 @@ export namespace MarkdownParser {
       Inline<'math'>,
       Parser<HTMLElement, Context, [
         SourceParser.StrParser,
+        MathParser.BracketParser,
       ]> {
     }
     export namespace MathParser {

package/package-lock.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.224.1",
+  "version": "0.226.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json CHANGED Viewed

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

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

@@ -23,6 +23,7 @@ export function focus<T>(scope: string | RegExp, parser: Parser<T>): Parser<T> {
   };
 }
+//export function rewrite<T, C extends Ctx, D extends Parser<unknown, C>[]>(scope: Parser<unknown, C, D>, parser: Parser<T, C, never>): Parser<T, C, D>;
 export function rewrite<P extends Parser<unknown>>(scope: Parser<unknown, Context<P>>, parser: P): P;
 export function rewrite<T>(scope: Parser<unknown>, parser: Parser<T>): Parser<T> {
   assert(scope);

package/src/parser/api/parse.test.ts CHANGED Viewed

@@ -60,9 +60,6 @@ describe('Unit: parser/api/parse', () => {
     });
     it('linebreak', () => {
-      assert.deepStrictEqual(
-        [...parse('*a\n*\nb').children].map(el => el.outerHTML),
-        ['<p><em>a</em><br>b</p>']);
       assert.deepStrictEqual(
         [...parse('\\ ').children].map(el => el.outerHTML),
         ['<p>\\</p>']);

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

@@ -32,8 +32,6 @@ describe('Unit: parser/inline/deletion', () => {
       assert.deepStrictEqual(inspect(parser('~~a\\\nb~~')), [['<del>a<span class="linebreak"> </span>b</del>'], '']);
       assert.deepStrictEqual(inspect(parser('~~\\~~~')), [['<del>~</del>'], '']);
       assert.deepStrictEqual(inspect(parser('~~a~~~')), [['<del>a</del>'], '~']);
-      assert.deepStrictEqual(inspect(parser('~~~a~~')), [['<del>~a</del>'], '']);
-      assert.deepStrictEqual(inspect(parser('~~~a~~~')), [['<del>~a</del>'], '~']);
     });
     it('nest', () => {

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

@@ -2,7 +2,7 @@ import { DeletionParser } from '../inline';
 import { union, some, creator, surround, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { str } from '../source';
-import { trimEndBR } from '../util';
+import { trimNodeEndBR } from '../util';
 import { html, defrag } from 'typed-dom';
 import { unshift } from 'spica/array';
@@ -10,5 +10,5 @@ export const deletion: DeletionParser = lazy(() => creator(surround(
   str('~~'),
   union([some(inline, '~~')]),
   str('~~'), false,
-  ([, bs], rest) => [[html('del', defrag(trimEndBR(bs)))], rest],
+  ([, bs], rest) => [[html('del', defrag(trimNodeEndBR(bs)))], rest],
   ([as, bs], rest) => [unshift(as, bs), rest])));

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

@@ -9,9 +9,13 @@ 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 *')), [['*', '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('*a [# b #]*')), [['*', 'a', ' ', '<sup class="comment" title="b"></sup>'], '*']);
       assert.deepStrictEqual(inspect(parser('* *')), undefined);
       assert.deepStrictEqual(inspect(parser('* a*')), undefined);
       assert.deepStrictEqual(inspect(parser('* a *')), undefined);
@@ -28,17 +32,16 @@ describe('Unit: parser/inline/emphasis', () => {
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('*a*')), [['<em>a</em>'], '']);
-      assert.deepStrictEqual(inspect(parser('*a *')), [['<em>a </em>'], '']);
-      assert.deepStrictEqual(inspect(parser('*a\n*')), [['<em>a</em>'], '']);
-      assert.deepStrictEqual(inspect(parser('*a\\\n*')), [['<em>a<span class="linebreak"> </span></em>'], '']);
       assert.deepStrictEqual(inspect(parser('*ab*')), [['<em>ab</em>'], '']);
       assert.deepStrictEqual(inspect(parser('*a\nb*')), [['<em>a<br>b</em>'], '']);
       assert.deepStrictEqual(inspect(parser('*a\\\nb*')), [['<em>a<span class="linebreak"> </span>b</em>'], '']);
       assert.deepStrictEqual(inspect(parser('*a**')), [['<em>a</em>'], '*']);
-      assert.deepStrictEqual(inspect(parser('*a**b**c*')), [['<em>a<strong>b</strong>c</em>'], '']);
     });
     it('nest', () => {
+      assert.deepStrictEqual(inspect(parser('*a**b**c*')), [['<em>a<strong>b</strong>c</em>'], '']);
+      assert.deepStrictEqual(inspect(parser('*a**b**c*d')), [['<em>a<strong>b</strong>c</em>'], 'd']);
+      assert.deepStrictEqual(inspect(parser('*a[# b #]*')), [['<em>a<sup class="comment" title="b"></sup></em>'], '']);
       assert.deepStrictEqual(inspect(parser('*`a`*')), [['<em><code data-src="`a`">a</code></em>'], '']);
       assert.deepStrictEqual(inspect(parser('*<small>*')), [['<em>&lt;small&gt;</em>'], '']);
       assert.deepStrictEqual(inspect(parser('*(*a*)*')), [['<em><span class="paren">(<em>a</em>)</span></em>'], '']);

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

@@ -3,7 +3,7 @@ import { union, some, creator, surround, close, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { strong } from './strong';
 import { str } from '../source';
-import { startTight, isEndTightNodes, trimEndBR } from '../util';
+import { startTight, isEndTightNodes } from '../util';
 import { html, defrag } from 'typed-dom';
 import { unshift } from 'spica/array';
@@ -13,6 +13,6 @@ export const emphasis: EmphasisParser = lazy(() => creator(surround(close(
   str('*'), false,
   ([as, bs, cs], rest) =>
     isEndTightNodes(bs)
-      ? [[html('em', defrag(trimEndBR(bs)))], rest]
+      ? [[html('em', defrag(bs))], rest]
       : [unshift(as, bs), cs[0] + rest],
   ([as, bs], rest) => [unshift(as, bs), rest])));

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

@@ -2,7 +2,7 @@ import { EmStrongParser } from '../inline';
 import { union, some, creator, surround, lazy, bind } from '../../combinator';
 import { inline } from '../inline';
 import { str } from '../source';
-import { startTight, isEndTightNodes, trimEndBR } from '../util';
+import { startTight, isEndTightNodes } from '../util';
 import { html, defrag } from 'typed-dom';
 import { unshift } from 'spica/array';
@@ -18,19 +18,19 @@ export const emstrong: EmStrongParser = lazy(() => creator(surround(
           union([some(inline, '**')]),
           (ds, rest) =>
             rest.slice(0, 2) === '**' && isEndTightNodes(ds)
-              ? [[html('strong', unshift([html('em', defrag(trimEndBR(bs)))], defrag(trimEndBR(ds))))], rest.slice(2)]
-              : [unshift(['**', html('em', defrag(trimEndBR(bs)))], ds), rest])
-          (rest, context) ?? [['**', html('em', defrag(trimEndBR(bs)))], rest];
+              ? [[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 bind<EmStrongParser>(
           union([some(inline, '*')]),
           (ds, rest) =>
             rest.slice(0, 1) === '*' && isEndTightNodes(ds)
-              ? [[html('em', unshift([html('strong', defrag(trimEndBR(bs)))], defrag(trimEndBR(ds))))], rest.slice(1)]
-              : [unshift(['*', html('strong', defrag(trimEndBR(bs)))], ds), rest])
-          (rest, context) ?? [['*', html('strong', defrag(trimEndBR(bs)))], rest];
+              ? [[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(trimEndBR(bs)))])], rest];
+        return [[html('em', [html('strong', defrag(bs))])], rest];
     }
     assert(false);
   },

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

@@ -5,7 +5,7 @@ import { HTMLParser } from '../inline';
 import { union, some, validate, context, creator, surround, match, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { str } from '../source';
-import { startLoose, trimEndBR } from '../util';
+import { startLoose, trimNodeEndBR } from '../util';
 import { html as h, defrag } from 'typed-dom';
 import { memoize } from 'spica/memoize';
 import { Cache } from 'spica/cache';
@@ -66,7 +66,7 @@ export const html: HTMLParser = lazy(() => creator(validate('<', '>', '\n', vali
         some(union([inline]), `</${tag}>`)), `</${tag}>`),
         str(`</${tag}>`), false,
         ([as, bs, cs], rest, context) =>
-          [[elem(tag, as, trimEndBR(defrag(bs)), cs, context)], rest])),
+          [[elem(tag, as, trimNodeEndBR(defrag(bs)), cs, context)], rest])),
       ([, tag]) => tag)),
   match(
     /^(?=<([a-z]+)(?=[^\S\n]|>))/,
@@ -78,7 +78,7 @@ export const html: HTMLParser = lazy(() => creator(validate('<', '>', '\n', vali
         startLoose(some(union([inline]), `</${tag}>`), `</${tag}>`),
         str(`</${tag}>`), false,
         ([as, bs, cs], rest) =>
-          [[elem(tag, as, trimEndBR(defrag(bs)), cs, {})], rest],
+          [[elem(tag, as, trimNodeEndBR(defrag(bs)), cs, {})], rest],
         ([as, bs], rest) =>
           as.length === 1
             ? [unshift(as, bs), rest]

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

@@ -32,8 +32,6 @@ describe('Unit: parser/inline/insertion', () => {
       assert.deepStrictEqual(inspect(parser('++a\\\nb++')), [['<ins>a<span class="linebreak"> </span>b</ins>'], '']);
       assert.deepStrictEqual(inspect(parser('++\\+++')), [['<ins>+</ins>'], '']);
       assert.deepStrictEqual(inspect(parser('++a+++')), [['<ins>a</ins>'], '+']);
-      assert.deepStrictEqual(inspect(parser('+++a++')), [['<ins>+a</ins>'], '']);
-      assert.deepStrictEqual(inspect(parser('+++a+++')), [['<ins>+a</ins>'], '+']);
     });
     it('nest', () => {

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

@@ -2,7 +2,7 @@ import { InsertionParser } from '../inline';
 import { union, some, creator, surround, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { str } from '../source';
-import { trimEndBR } from '../util';
+import { trimNodeEndBR } from '../util';
 import { html, defrag } from 'typed-dom';
 import { unshift } from 'spica/array';
@@ -10,5 +10,5 @@ export const insertion: InsertionParser = lazy(() => creator(surround(
   str('++'),
   union([some(inline, '++')]),
   str('++'), false,
-  ([, bs], rest) => [[html('ins', defrag(trimEndBR(bs)))], rest],
+  ([, bs], rest) => [[html('ins', defrag(trimNodeEndBR(bs)))], rest],
   ([as, bs], rest) => [unshift(as, bs), rest])));

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

@@ -12,7 +12,11 @@ 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 ==')), [['==', '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', ' ', '<sup class="comment" title="b"></sup>'], '==']);
       assert.deepStrictEqual(inspect(parser('== ==')), undefined);
       assert.deepStrictEqual(inspect(parser('== a==')), undefined);
       assert.deepStrictEqual(inspect(parser('== a ==')), undefined);
@@ -26,17 +30,14 @@ describe('Unit: parser/inline/mark', () => {
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('==a==')), [['<mark>a</mark>'], '']);
       assert.deepStrictEqual(inspect(parser('==ab==')), [['<mark>ab</mark>'], '']);
-      assert.deepStrictEqual(inspect(parser('==a ==')), [['<mark>a </mark>'], '']);
-      assert.deepStrictEqual(inspect(parser('==a\n==')), [['<mark>a</mark>'], '']);
       assert.deepStrictEqual(inspect(parser('==a\nb==')), [['<mark>a<br>b</mark>'], '']);
       assert.deepStrictEqual(inspect(parser('==a\\\nb==')), [['<mark>a<span class="linebreak"> </span>b</mark>'], '']);
       assert.deepStrictEqual(inspect(parser('==\\===')), [['<mark>=</mark>'], '']);
       assert.deepStrictEqual(inspect(parser('==a===')), [['<mark>a</mark>'], '=']);
-      assert.deepStrictEqual(inspect(parser('===a==')), [['<mark>=a</mark>'], '']);
-      assert.deepStrictEqual(inspect(parser('===a===')), [['<mark>=a</mark>'], '=']);
     });
     it('nest', () => {
+      assert.deepStrictEqual(inspect(parser('==a[# b #]==')), [['<mark>a<sup class="comment" title="b"></sup></mark>'], '']);
       assert.deepStrictEqual(inspect(parser('==*==a==*==')), [['<mark><em><mark>a</mark></em></mark>'], '']);
     });

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

@@ -2,7 +2,7 @@ import { MarkParser } from '../inline';
 import { union, some, creator, surround, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { str } from '../source';
-import { startTight, isEndTightNodes, trimEndBR } from '../util';
+import { startTight, isEndTightNodes } from '../util';
 import { html, defrag } from 'typed-dom';
 import { unshift } from 'spica/array';
@@ -12,6 +12,6 @@ export const mark: MarkParser = lazy(() => creator(surround(
   str('=='), false,
   ([as, bs, cs], rest) =>
     isEndTightNodes(bs)
-      ? [[html('mark', defrag(trimEndBR(bs)))], rest]
+      ? [[html('mark', defrag(bs))], rest]
       : [unshift(as, bs), cs[0] + rest],
   ([as, bs], rest) => [unshift(as, bs), rest])));

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

@@ -11,31 +11,29 @@ describe('Unit: parser/inline/math', () => {
       assert.deepStrictEqual(inspect(parser('$')), undefined);
       assert.deepStrictEqual(inspect(parser('$$')), undefined);
       assert.deepStrictEqual(inspect(parser('$$$')), undefined);
-      assert.deepStrictEqual(inspect(parser('$0$')), undefined);
-      assert.deepStrictEqual(inspect(parser('$0-$')), undefined);
-      assert.deepStrictEqual(inspect(parser('$0-$1')), undefined);
-      assert.deepStrictEqual(inspect(parser('$0 - $1')), undefined);
-      assert.deepStrictEqual(inspect(parser('$0+$1')), undefined);
-      assert.deepStrictEqual(inspect(parser('$0 + $1')), undefined);
-      assert.deepStrictEqual(inspect(parser('$0-1$')), undefined);
-      assert.deepStrictEqual(inspect(parser('$0+1$')), undefined);
+      assert.deepStrictEqual(inspect(parser('$0 $')), undefined);
+      assert.deepStrictEqual(inspect(parser('$0.$')), undefined);
+      assert.deepStrictEqual(inspect(parser('$1,000.99.$')), undefined);
+      assert.deepStrictEqual(inspect(parser('$0(a)$')), undefined);
+      assert.deepStrictEqual(inspect(parser('$0[a]$')), undefined);
+      assert.deepStrictEqual(inspect(parser('$0{a}$')), undefined);
+      assert.deepStrictEqual(inspect(parser('$0 - $')), undefined);
+      assert.deepStrictEqual(inspect(parser('$0 + $')), undefined);
       assert.deepStrictEqual(inspect(parser('$-0$')), undefined);
       assert.deepStrictEqual(inspect(parser('$-0$-1')), undefined);
       assert.deepStrictEqual(inspect(parser('$-a$')), undefined);
       assert.deepStrictEqual(inspect(parser('$-a$-b')), undefined);
+      assert.deepStrictEqual(inspect(parser('$a $')), undefined);
       assert.deepStrictEqual(inspect(parser('$a-b$')), undefined);
       assert.deepStrictEqual(inspect(parser('$a-b$c-d')), undefined);
-      assert.deepStrictEqual(inspect(parser('$a+b$')), undefined);
-      assert.deepStrictEqual(inspect(parser('$a*b$')), undefined);
-      assert.deepStrictEqual(inspect(parser('$a/b$')), undefined);
-      assert.deepStrictEqual(inspect(parser('$a[b]$')), undefined);
-      assert.deepStrictEqual(inspect(parser('$a{b}$')), undefined);
       assert.deepStrictEqual(inspect(parser('$a$b')), undefined);
       assert.deepStrictEqual(inspect(parser('$a$b$')), undefined);
       assert.deepStrictEqual(inspect(parser('$ $')), undefined);
+      assert.deepStrictEqual(inspect(parser('$ a$')), undefined);
+      assert.deepStrictEqual(inspect(parser('$ a $')), undefined);
       assert.deepStrictEqual(inspect(parser('$\n$')), undefined);
-      assert.deepStrictEqual(inspect(parser('$a\nb$')), undefined);
-      assert.deepStrictEqual(inspect(parser('$a\\\nb$')), undefined);
+      assert.deepStrictEqual(inspect(parser('$a\\$\nb$')), undefined);
+      assert.deepStrictEqual(inspect(parser('$a\\$\\\nb$')), undefined);
       assert.deepStrictEqual(inspect(parser('${')), undefined);
       assert.deepStrictEqual(inspect(parser('${a')), undefined);
       assert.deepStrictEqual(inspect(parser('${$')), undefined);
@@ -47,8 +45,8 @@ describe('Unit: parser/inline/math', () => {
       assert.deepStrictEqual(inspect(parser('${a}b}$')), undefined);
       assert.deepStrictEqual(inspect(parser('${\\}$')), undefined);
       assert.deepStrictEqual(inspect(parser('${\n}$')), undefined);
-      assert.deepStrictEqual(inspect(parser('${a\nb}$')), undefined);
-      assert.deepStrictEqual(inspect(parser('${a\\\nb}$')), undefined);
+      assert.deepStrictEqual(inspect(parser('${a\\$\nb}$')), undefined);
+      assert.deepStrictEqual(inspect(parser('${a\\$\\\nb}$')), undefined);
       assert.deepStrictEqual(inspect(parser('${\\begin}$')), [['<span class="invalid" translate="no">${\\begin}$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('${\\Huge}$')), [['<span class="invalid" translate="no">${\\Huge}$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('${a}b$')), undefined);
@@ -56,29 +54,26 @@ describe('Unit: parser/inline/math', () => {
     });
     it('basic', () => {
-      assert.deepStrictEqual(inspect(parser('${}$')), [['<span class="math" translate="no" data-src="${}$">${}$</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('${ }$')), [['<span class="math" translate="no" data-src="${ }$">${ }$</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('${a}$')), [['<span class="math" translate="no" data-src="${a}$">${a}$</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('${a}$0')), [['<span class="math" translate="no" data-src="${a}$">${a}$</span>'], '0']);
-      assert.deepStrictEqual(inspect(parser('${a}$b')), [['<span class="math" translate="no" data-src="${a}$">${a}$</span>'], 'b']);
-      assert.deepStrictEqual(inspect(parser('${ab}$')), [['<span class="math" translate="no" data-src="${ab}$">${ab}$</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('${a b}$')), [['<span class="math" translate="no" data-src="${a b}$">${a b}$</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('${a }$')), [['<span class="math" translate="no" data-src="${a }$">${a }$</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('${ a}$')), [['<span class="math" translate="no" data-src="${ a}$">${ a}$</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('${ a }$')), [['<span class="math" translate="no" data-src="${ a }$">${ a }$</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('${$}$')), [['<span class="math" translate="no" data-src="${$}$">${$}$</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('${\\a}$')), [['<span class="math" translate="no" data-src="${\\a}$">${\\a}$</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('${\\$}$')), [['<span class="math" translate="no" data-src="${\\$}$">${\\$}$</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('${\\\\}$')), [['<span class="math" translate="no" data-src="${\\\\}$">${\\\\}$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$0$')), [['<span class="math" translate="no" data-src="$0$">$0$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$0$$')), [['<span class="math" translate="no" data-src="$0$">$0$</span>'], '$']);
+      assert.deepStrictEqual(inspect(parser('$0-1$')), [['<span class="math" translate="no" data-src="$0-1$">$0-1$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$0+1$')), [['<span class="math" translate="no" data-src="$0+1$">$0+1$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$0*1$')), [['<span class="math" translate="no" data-src="$0*1$">$0*1$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$0/1$')), [['<span class="math" translate="no" data-src="$0/1$">$0/1$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$a$')), [['<span class="math" translate="no" data-src="$a$">$a$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$a$$')), [['<span class="math" translate="no" data-src="$a$">$a$</span>'], '$']);
+      assert.deepStrictEqual(inspect(parser('$a -b$')), [['<span class="math" translate="no" data-src="$a -b$">$a -b$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$a+b$')), [['<span class="math" translate="no" data-src="$a+b$">$a+b$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$a*b$')), [['<span class="math" translate="no" data-src="$a*b$">$a*b$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$a/b$')), [['<span class="math" translate="no" data-src="$a/b$">$a/b$</span>'], '']);
       assert.deepStrictEqual(inspect(parser(`$a'$`)), [[`<span class="math" translate="no" data-src="$a'$">$a'$</span>`], '']);
       assert.deepStrictEqual(inspect(parser(`$a''$`)), [[`<span class="math" translate="no" data-src="$a''$">$a''$</span>`], '']);
       assert.deepStrictEqual(inspect(parser('$a$[A](a)')), [['<span class="math" translate="no" data-src="$a$">$a$</span>'], '[A](a)']);
-      assert.deepStrictEqual(inspect(parser('$a$$')), [['<span class="math" translate="no" data-src="$a$">$a$</span>'], '$']);
       assert.deepStrictEqual(inspect(parser('$A$')), [['<span class="math" translate="no" data-src="$A$">$A$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$\\$$')), [['<span class="math" translate="no" data-src="$\\$$">$\\$$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$\\Pi$')), [['<span class="math" translate="no" data-src="$\\Pi$">$\\Pi$</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('$\\Pi $')), [['<span class="math" translate="no" data-src="$\\Pi $">$\\Pi $</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$\\ 0$')), [['<span class="math" translate="no" data-src="$\\ 0$">$\\ 0$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$\\\\0$')), [['<span class="math" translate="no" data-src="$\\\\0$">$\\\\0$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$|1|$')), [['<span class="math" translate="no" data-src="$|1|$">$|1|$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$[0,1)$]')), [['<span class="math" translate="no" data-src="$[0,1)$">$[0,1)$</span>'], ']']);
       assert.deepStrictEqual(inspect(parser('$(0, 1]$)')), [['<span class="math" translate="no" data-src="$(0, 1]$">$(0, 1]$</span>'], ')']);
@@ -90,6 +85,21 @@ describe('Unit: parser/inline/math', () => {
       assert.deepStrictEqual(inspect(parser('$f(x)$')), [['<span class="math" translate="no" data-src="$f(x)$">$f(x)$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$f: x \\to y$')), [['<span class="math" translate="no" data-src="$f: x \\to y$">$f: x \\to y$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$k$-space')), [['<span class="math" translate="no" data-src="$k$">$k$</span>'], '-space']);
+      assert.deepStrictEqual(inspect(parser('${}$')), [['<span class="math" translate="no" data-src="${}$">${}$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('${ }$')), [['<span class="math" translate="no" data-src="${ }$">${ }$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('${a}$')), [['<span class="math" translate="no" data-src="${a}$">${a}$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('${a}$$')), [['<span class="math" translate="no" data-src="${a}$">${a}$</span>'], '$']);
+      assert.deepStrictEqual(inspect(parser('${a}$0')), [['<span class="math" translate="no" data-src="${a}$">${a}$</span>'], '0']);
+      assert.deepStrictEqual(inspect(parser('${a}$b')), [['<span class="math" translate="no" data-src="${a}$">${a}$</span>'], 'b']);
+      assert.deepStrictEqual(inspect(parser('${ab}$')), [['<span class="math" translate="no" data-src="${ab}$">${ab}$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('${a b}$')), [['<span class="math" translate="no" data-src="${a b}$">${a b}$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('${a }$')), [['<span class="math" translate="no" data-src="${a }$">${a }$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('${ a}$')), [['<span class="math" translate="no" data-src="${ a}$">${ a}$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('${ a }$')), [['<span class="math" translate="no" data-src="${ a }$">${ a }$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('${$}$')), [['<span class="math" translate="no" data-src="${$}$">${$}$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('${\\a}$')), [['<span class="math" translate="no" data-src="${\\a}$">${\\a}$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('${\\$}$')), [['<span class="math" translate="no" data-src="${\\$}$">${\\$}$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('${\\\\}$')), [['<span class="math" translate="no" data-src="${\\\\}$">${\\\\}$</span>'], '']);
     });
     it('nest', () => {

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

@@ -8,7 +8,6 @@ const disallowedCommand = /\\(?:begin|tiny|huge|large)(?![0-9a-z])/i;
 export const math: MathParser = lazy(() => creator(validate('$', '$', '\n', rewrite(
   union([
-    surround('$', bracket, '$'),
     surround(
       '$',
       verify(
@@ -17,12 +16,11 @@ export const math: MathParser = lazy(() => creator(validate('$', '$', '\n', rewr
         // $[A-z]*-                   : Label
         // $[A-z]*(?!-)               : Math
         // $[\^_[({|]                 : Math
-        // $[#$%&]                    : Invalid first character in latex syntax
-        // $[A-z]*[,.!?()]            : Incomplete syntax before texts
-        // $[A-z]*\s?[!@#&*+~=`$[]{<] : Incomplete syntax in or around another syntax
-        str(/^(?=[\\^_[(|]|[A-Za-z][0-9A-Za-z]*'*[ ~]?(?:\$|([\\^_(|:=<>])(?!\1)))(?:\\\$|[\x20-\x23\x25-\x7E])*/),
+        // $[#$%&]                    : Invalid first character in Latex syntax
+        str(/^(?![\s{}#$%&]|\d+(?:[,.]\d+)*(?:[\s,.!?()[\]{}]|[^\x00-\x7F])|-[\da-z]|[a-z]+-)(?:\\\$|[\x20-\x23\x25-\x7E])*/i),
         isEndTightNodes),
-      /^\$(?![0-9A-Za-z])/),
+      /^\$(?![0-9a-z])/i),
+    surround('$', bracket, '$'),
   ]),
   (source, { caches: { math: cache } = {} }) => [[
     cache?.get(source)?.cloneNode(true) ||
@@ -43,7 +41,7 @@ const bracket: MathParser.BracketParser = lazy(() => creator(surround(
   '{',
   some(union([
     bracket,
-    some(escsource, /^[{}]/),
+    some(escsource, /^(?:[{}]|\\?\n)/),
   ])),
   '}',
   true)));

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

@@ -51,11 +51,6 @@ const text: RubyParser.TextParser = creator((source, context) => {
   while (source !== '') {
     assert(source[0] !== '\n');
     switch (source[0]) {
-      case ' ':
-      case '　':
-        acc.push('');
-        source = source.slice(1);
-        continue;
       case '&': {
         const result = htmlentity(source, context);
         acc[acc.length - 1] += eval(result, [source[0]])[0];
@@ -63,6 +58,11 @@ const text: RubyParser.TextParser = creator((source, context) => {
         continue;
       }
       default: {
+        if (source[0].trimStart() === '') {
+          acc.push('');
+          source = source.slice(1);
+          continue;
+        }
         const result = txt(source, context)!;
         assert(result);
         acc[acc.length - 1] += eval(result)[0] ?? source.slice(0, source.length - exec(result).length);

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

@@ -10,8 +10,12 @@ 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 **')), [['**', '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('**a [# b #]**')), [['**', 'a', ' ', '<sup class="comment" title="b"></sup>'], '**']);
       assert.deepStrictEqual(inspect(parser('** **')), undefined);
       assert.deepStrictEqual(inspect(parser('** a**')), undefined);
       assert.deepStrictEqual(inspect(parser('** a **')), undefined);
@@ -27,18 +31,16 @@ describe('Unit: parser/inline/strong', () => {
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('**a**')), [['<strong>a</strong>'], '']);
-      assert.deepStrictEqual(inspect(parser('**a **')), [['<strong>a </strong>'], '']);
-      assert.deepStrictEqual(inspect(parser('**a\n**')), [['<strong>a</strong>'], '']);
-      assert.deepStrictEqual(inspect(parser('**a\\\n**')), [['<strong>a<span class="linebreak"> </span></strong>'], '']);
       assert.deepStrictEqual(inspect(parser('**ab**')), [['<strong>ab</strong>'], '']);
       assert.deepStrictEqual(inspect(parser('**a\nb**')), [['<strong>a<br>b</strong>'], '']);
       assert.deepStrictEqual(inspect(parser('**a\\\nb**')), [['<strong>a<span class="linebreak"> </span>b</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>'], '']);
     });
     it('nest', () => {
+      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[# b #]**')), [['<strong>a<sup class="comment" title="b"></sup></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

@@ -3,7 +3,7 @@ import { union, some, creator, surround, close, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { emphasis } from './emphasis';
 import { str } from '../source';
-import { startTight, isEndTightNodes, trimEndBR } from '../util';
+import { startTight, isEndTightNodes } from '../util';
 import { html, defrag } from 'typed-dom';
 import { unshift } from 'spica/array';
@@ -13,6 +13,6 @@ export const strong: StrongParser = lazy(() => creator(surround(close(
   str('**'), false,
   ([as, bs, cs], rest) =>
     isEndTightNodes(bs)
-      ? [[html('strong', defrag(trimEndBR(bs)))], rest]
+      ? [[html('strong', defrag(bs))], rest]
       : [unshift(as, bs), cs[0] + rest],
   ([as, bs], rest) => [unshift(as, bs), rest])));

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

@@ -30,18 +30,16 @@ describe('Unit: parser/inline', () => {
       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***')), [['<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')), [['<em>a <strong>b</strong></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 <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><em>a</em>b</strong>'], '']);
-      assert.deepStrictEqual(inspect(parser('***a*b  **')), [['**', '<em>a</em>', 'b', '  ', '**'], '']);
       assert.deepStrictEqual(inspect(parser('***a* b**')), [['<strong><em>a</em> b</strong>'], '']);
       assert.deepStrictEqual(inspect(parser('***a**b*')), [['<em><strong>a</strong>b</em>'], '']);
-      assert.deepStrictEqual(inspect(parser('***a**b  *')), [['*', '<strong>a</strong>', 'b', '  ', '*'], '']);
       assert.deepStrictEqual(inspect(parser('***a** b*')), [['<em><strong>a</strong> b</em>'], '']);
       assert.deepStrictEqual(inspect(parser('***a*')), [['**', '<em>a</em>'], '']);
       assert.deepStrictEqual(inspect(parser('***a**')), [['*', '<strong>a</strong>'], '']);

package/src/parser/source/escapable.test.ts CHANGED Viewed

@@ -13,7 +13,15 @@ describe('Unit: parser/source/escsource', () => {
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('a')), [['a'], '']);
       assert.deepStrictEqual(inspect(parser('ab')), [['ab'], '']);
-      assert.deepStrictEqual(inspect(parser('09AZaz')), [['09AZaz'], '']);
+      assert.deepStrictEqual(inspect(parser('09あいAZaz')), [['09あいAZaz'], '']);
+    });
+    it('space', () => {
+      assert.deepStrictEqual(inspect(parser(' ')), [[' '], '']);
+      assert.deepStrictEqual(inspect(parser('  ')), [['  '], '']);
+      assert.deepStrictEqual(inspect(parser('   ')), [['   '], '']);
+      assert.deepStrictEqual(inspect(parser(' \n')), [[' ', '\n'], '']);
+      assert.deepStrictEqual(inspect(parser('  \n')), [['  ', '\n'], '']);
     });
     it('linebreak', () => {

package/src/parser/source/escapable.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import { EscapableSourceParser } from '../source';
 import { creator } from '../../combinator';
+import { nonWhitespace } from './text';
 const separator = /[\s\x00-\x2F\x3A-\x40\x5B-\x60\x7B-\x7F]/;
@@ -15,7 +16,12 @@ export const escsource: EscapableSourceParser = creator(source => {
         case '\\':
           return [[source.slice(0, 2)], source.slice(2)];
         default:
-          return [[source.slice(0, 1)], source.slice(1)];
+          const b = source[0] !== '\n' && source[0].trimStart() === '';
+          const i = b
+            ? source.search(nonWhitespace)
+            : 1;
+          assert(i > 0);
+          return [[source.slice(0, i)], source.slice(i)];
       }
     default:
       return [[source.slice(0, i)], source.slice(i)];

package/src/parser/source/text.test.ts CHANGED Viewed

@@ -12,9 +12,8 @@ describe('Unit: parser/text/text', () => {
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('a')), [['a'], '']);
-      assert.deepStrictEqual(inspect(parser('az')), [['az'], '']);
-      assert.deepStrictEqual(inspect(parser('09')), [['09'], '']);
-      assert.deepStrictEqual(inspect(parser('azあい09')), [['az', 'あい', '09'], '']);
+      assert.deepStrictEqual(inspect(parser('ab')), [['ab'], '']);
+      assert.deepStrictEqual(inspect(parser('09あいAZaz')), [['09', 'あい', 'AZaz'], '']);
       assert.deepStrictEqual(inspect(parser('a\nb')), [['a', '<br>', 'b'], '']);
     });

package/src/parser/source/unescapable.test.ts CHANGED Viewed

@@ -13,6 +13,15 @@ describe('Unit: parser/source/unescapable', () => {
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('a')), [['a'], '']);
       assert.deepStrictEqual(inspect(parser('ab')), [['ab'], '']);
+      assert.deepStrictEqual(inspect(parser('09あいAZaz')), [['09', 'あい', 'AZaz'], '']);
+    });
+    it('space', () => {
+      assert.deepStrictEqual(inspect(parser(' ')), [[' '], '']);
+      assert.deepStrictEqual(inspect(parser('  ')), [['  '], '']);
+      assert.deepStrictEqual(inspect(parser('   ')), [['   '], '']);
+      assert.deepStrictEqual(inspect(parser(' \n')), [[' ', '\n'], '']);
+      assert.deepStrictEqual(inspect(parser('  \n')), [['  ', '\n'], '']);
     });
     it('linebreak', () => {

package/src/parser/util.ts CHANGED Viewed

@@ -135,22 +135,21 @@ export function isStartTightNodes(nodes: readonly (HTMLElement | string)[]): boo
 }
 export function isEndTightNodes(nodes: readonly (HTMLElement | string)[]): boolean {
   if (nodes.length === 0) return true;
-  const last = nodes.length - 1;
-  return typeof nodes[last] === 'string' && (nodes[last] as string).length > 1
-    ? isVisible(nodes[last], -1) ||
-      isVisible(nodes[last], -2)
-    : isVisible(nodes[last], -1) || last === 0 ||
-      isVisible(nodes[last - 1], -1);
+  for (let i = nodes.length; i--;) {
+    const node = nodes[i];
+    if (typeof node === 'object' && node.className === 'comment') continue;
+    return isVisible(node, -1);
+  }
+  return false;
 }
-function isVisible(node: HTMLElement | string, position?: number): boolean {
-  if (!node) return false;
+function isVisible(node: HTMLElement | string, strpos?: number): boolean {
   switch (typeof node) {
     case 'string':
-      const char = position === undefined
-        ? node
-        : node[position >= 0 ? position : node.length + position];
-      assert(char);
+      const char = node && strpos !== undefined
+        ? node[strpos >= 0 ? strpos : node.length + strpos]
+        : node;
       switch (char) {
+        case '':
         case ' ':
         case '\t':
         case '\n':
@@ -177,28 +176,19 @@ export function trimNode(nodes: (HTMLElement | string)[]): (HTMLElement | string
   return trimNodeStart(trimNodeEnd(nodes));
 }
 function trimNodeStart(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
-  const skip = nodes.length > 0 &&
-    typeof nodes[nodes.length - 1] === 'object' &&
-    nodes[nodes.length - 1]['className'] === 'indexer'
-    ? [nodes.pop()!]
-    : [];
-  for (
-    let first = nodes[0];
-    nodes.length > 0 &&
-    !isVisible(first, 0) &&
-    !(typeof first === 'object' && first.className === 'comment');
-  ) {
-    assert(nodes.length > 0);
-    if (typeof first === 'string') {
-      const pos = first.length - first.trimStart().length;
+  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) {
-        nodes[0] = first.slice(pos);
+        nodes[0] = node.slice(pos);
         break;
       }
     }
-    nodes.pop();
+    nodes.shift();
   }
-  return push(nodes, skip);
+  return nodes;
 }
 export function trimNodeEnd(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
   const skip = nodes.length > 0 &&
@@ -206,17 +196,12 @@ export function trimNodeEnd(nodes: (HTMLElement | string)[]): (HTMLElement | str
     nodes[nodes.length - 1]['className'] === 'indexer'
     ? [nodes.pop()!]
     : [];
-  for (
-    let last = nodes[0];
-    nodes.length > 0 &&
-    !isVisible(last = nodes[nodes.length - 1], -1) &&
-    !(typeof last === 'object' && last.className === 'comment');
-  ) {
-    assert(nodes.length > 0);
-    if (typeof last === 'string') {
-      const pos = last.trimEnd().length;
+  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) {
-        nodes[nodes.length - 1] = last.slice(0, pos);
+        nodes[nodes.length - 1] = node.slice(0, pos);
         break;
       }
     }
@@ -224,8 +209,8 @@ export function trimNodeEnd(nodes: (HTMLElement | string)[]): (HTMLElement | str
   }
   return push(nodes, skip);
 }
-export function trimEndBR<T extends HTMLElement | string>(nodes: T[]): T[];
-export function trimEndBR(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
+export function trimNodeEndBR<T extends HTMLElement | string>(nodes: T[]): T[];
+export function trimNodeEndBR(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
   if (nodes.length === 0) return nodes;
   const node = nodes[nodes.length - 1];
   return typeof node === 'object' && node.tagName === 'BR'