securemark 0.232.2 → 0.233.2

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

@@ -16,20 +16,18 @@ describe('Unit: parser/inline/mark', () => {
       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);
       assert.deepStrictEqual(inspect(parser('==\na==')), undefined);
       assert.deepStrictEqual(inspect(parser('==\\\na==')), undefined);
       assert.deepStrictEqual(inspect(parser('==<wbr>a==')), undefined);
-      assert.deepStrictEqual(inspect(parser('==[# a #]b==')), undefined);
       assert.deepStrictEqual(inspect(parser(' ==a==')), undefined);
     });
 
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('==a==')), [['<mark>a</mark>'], '']);
-      assert.deepStrictEqual(inspect(parser('==ab==')), [['<mark>ab</mark>'], '']);
+      assert.deepStrictEqual(inspect(parser('==a=b==')), [['<mark>a=b</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>'], '']);
@@ -37,7 +35,6 @@ describe('Unit: parser/inline/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/reference.test.ts

@@ -18,15 +18,14 @@ describe('Unit: parser/inline/reference', () => {
       assert.deepStrictEqual(inspect(parser('[[\na]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[\\ a]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[\\\na]]')), undefined);
+      assert.deepStrictEqual(inspect(parser('[[<wbr>a]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[a\n]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[a\\\n]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[a\nb]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[a\\\nb]]')), undefined);
-      assert.deepStrictEqual(inspect(parser('[[<wbr>a]]')), undefined);
-      assert.deepStrictEqual(inspect(parser('[[[# a #]b]]')), undefined);
-      assert.deepStrictEqual(inspect(parser('[[a]b]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[*a\nb*]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[\\]]')), undefined);
+      assert.deepStrictEqual(inspect(parser('[[a]b]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[[a]]')), undefined);
       assert.deepStrictEqual(inspect(parser(' [[a]]')), undefined);
     });
@@ -39,7 +38,6 @@ describe('Unit: parser/inline/reference', () => {
       assert.deepStrictEqual(inspect(parser('[[a  ]]')), [['<sup class="reference">a</sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[a &nbsp;]]')), [['<sup class="reference">a</sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[a <wbr>]]')), [['<sup class="reference">a</sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[a [# b #]]]')), [['<sup class="reference">a <sup class="comment" title="b"></sup></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[ab]]')), [['<sup class="reference">ab</sup>'], '']);
     });
 
@@ -55,46 +53,46 @@ describe('Unit: parser/inline/reference', () => {
     });
 
     it('abbr', () => {
-      assert.deepStrictEqual(inspect(parser('[[^]]')), [['<sup class="reference invalid">^</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[^]]')), [['<sup class="invalid">^</sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^a]]')), [['<sup class="reference" data-abbr="a"></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^a,]]')), [['<sup class="reference" data-abbr="a,"></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^a, ]]')), [['<sup class="reference" data-abbr="a,"></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^a ]]')), [['<sup class="reference" data-abbr="a"></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[^a  ]]')), [['<sup class="reference invalid">^a</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[^a  ]]')), [['<sup class="invalid">^a</sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^a b]]')), [['<sup class="reference" data-abbr="a b"></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[^a  b]]')), [['<sup class="reference invalid">^a  b</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[^a  b]]')), [['<sup class="invalid">^a  b</sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^a|]]')), [['<sup class="reference" data-abbr="a"></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^a,|]]')), [['<sup class="reference" data-abbr="a,"></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^a |]]')), [['<sup class="reference" data-abbr="a"></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[^a|b]]')), [['<sup class="reference invalid">^a|b</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[^a|b]]')), [['<sup class="invalid">^a|b</sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^a| ]]')), [['<sup class="reference" data-abbr="a"></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^a| b]]')), [['<sup class="reference" data-abbr="a">b</sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^a| b ]]')), [['<sup class="reference" data-abbr="a">b</sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^a| b  ]]')), [['<sup class="reference" data-abbr="a">b</sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^a|  ]]')), [['<sup class="reference" data-abbr="a"></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^a|  b]]')), [['<sup class="reference" data-abbr="a">b</sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[^a| <wbr>]]')), [['<sup class="reference invalid">^a|</sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[^a| <wbr>b]]')), [['<sup class="reference invalid">^a| <wbr>b</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[^a| <wbr>]]')), [['<sup class="invalid">^a|</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[^a| <wbr>b]]')), [['<sup class="invalid">^a| <wbr>b</sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^a| ^b]]')), [['<sup class="reference" data-abbr="a">^b</sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[^1]]')), [['<sup class="reference invalid">^1</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[^1]]')), [['<sup class="invalid">^1</sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^1a]]')), [['<sup class="reference" data-abbr="1a"></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[^1 ]]')), [['<sup class="reference invalid">^1</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[^1 ]]')), [['<sup class="invalid">^1</sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^1 a]]')), [['<sup class="reference" data-abbr="1 a"></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[^1|]]')), [['<sup class="reference invalid">^1|</sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[^1 |]]')), [['<sup class="reference invalid">^1 |</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[^1|]]')), [['<sup class="invalid">^1|</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[^1 |]]')), [['<sup class="invalid">^1 |</sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^Xyz2020]]')), [['<sup class="reference" data-abbr="Xyz2020"></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^Xyz 2020]]')), [['<sup class="reference" data-abbr="Xyz 2020"></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^Xyz, 2020, p1-2]]')), [['<sup class="reference" data-abbr="Xyz, 2020, p1-2"></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[^X. Y., Z et al., 2020, p1-2]]')), [['<sup class="reference" data-abbr="X. Y., Z et al., 2020, p1-2"></sup>'], '']);
       assert.deepStrictEqual(inspect(parser(`[[^A's, Aces']]`)), [[`<sup class="reference" data-abbr="A's, Aces'"></sup>`], '']);
-      assert.deepStrictEqual(inspect(parser('[[^^]]')), [['<sup class="reference invalid">^^</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[^^]]')), [['<sup class="invalid">^^</sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[\\^]]')), [['<sup class="reference">^</sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[^ ]]')), [['<sup class="reference invalid">^</sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[^ a]]')), [['<sup class="reference invalid">^ a</sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[^ |]]')), [['<sup class="reference invalid">^ |</sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[^ |b]]')), [['<sup class="reference invalid">^ |b</sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[^ | ]]')), [['<sup class="reference invalid">^ |</sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[^ | b]]')), [['<sup class="reference invalid">^ | b</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[^ ]]')), [['<sup class="invalid">^</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[^ a]]')), [['<sup class="invalid">^ a</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[^ |]]')), [['<sup class="invalid">^ |</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[^ |b]]')), [['<sup class="invalid">^ |b</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[^ | ]]')), [['<sup class="invalid">^ |</sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[^ | b]]')), [['<sup class="invalid">^ | b</sup>'], '']);
     });
 
   });

package/src/parser/inline/reference.ts

@@ -43,7 +43,7 @@ function attributes(ns: (string | HTMLElement)[]): Record<string, string | undef
       }
     : ns[0] === ''
       ? {
-          class: 'reference invalid',
+          class: 'invalid',
           'data-invalid-syntax': 'reference',
           'data-invalid-type': 'syntax',
           'data-invalid-description': 'Invalid abbr.',

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

@@ -15,7 +15,6 @@ describe('Unit: parser/inline/strong', () => {
       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);
@@ -24,7 +23,6 @@ describe('Unit: parser/inline/strong', () => {
       assert.deepStrictEqual(inspect(parser('**\\ a**')), undefined);
       assert.deepStrictEqual(inspect(parser('**\\\na**')), undefined);
       assert.deepStrictEqual(inspect(parser('**<wbr>a**')), undefined);
-      assert.deepStrictEqual(inspect(parser('**[# a #]b**')), undefined);
       assert.deepStrictEqual(inspect(parser('***a***')), undefined);
       assert.deepStrictEqual(inspect(parser(' **a**')), undefined);
     });
@@ -40,7 +38,6 @@ describe('Unit: parser/inline/strong', () => {
       assert.deepStrictEqual(inspect(parser('**a*b*c**')), [['<strong>a<em>b</em>c</strong>'], '']);
       assert.deepStrictEqual(inspect(parser('**a*b*c**d')), [['<strong>a<em>b</em>c</strong>'], 'd']);
       assert.deepStrictEqual(inspect(parser('**a *b***')), [['<strong>a <em>b</em></strong>'], '']);
-      assert.deepStrictEqual(inspect(parser('**a[# 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/template.test.ts

@@ -11,8 +11,8 @@ describe('Unit: parser/inline/template', () => {
       assert.deepStrictEqual(inspect(parser('{')), undefined);
       assert.deepStrictEqual(inspect(parser('{}')), undefined);
       assert.deepStrictEqual(inspect(parser('{{')), undefined);
-      assert.deepStrictEqual(inspect(parser('{{a}b}}')), undefined);
       assert.deepStrictEqual(inspect(parser('{{\\}}')), undefined);
+      assert.deepStrictEqual(inspect(parser('{{a}b}')), undefined);
       assert.deepStrictEqual(inspect(parser('{{{a}}')), undefined);
       assert.deepStrictEqual(inspect(parser(' {{}}')), undefined);
     });

package/src/parser/inline.ts

@@ -4,11 +4,11 @@ import { escape } from './inline/escape';
 import { annotation } from './inline/annotation';
 import { reference } from './inline/reference';
 import { template } from './inline/template';
+import { comment } from './inline/comment';
 import { extension } from './inline/extension';
 import { ruby } from './inline/ruby';
 import { link } from './inline/link';
 import { html } from './inline/html';
-import { comment } from './inline/comment';
 import { insertion } from './inline/insertion';
 import { deletion } from './inline/deletion';
 import { mark } from './inline/mark';
@@ -29,11 +29,11 @@ export import EscapeParser = InlineParser.EscapeParser;
 export import AnnotationParser = InlineParser.AnnotationParser;
 export import ReferenceParser = InlineParser.ReferenceParser;
 export import TemplateParser = InlineParser.TemplateParser;
+export import CommentParser = InlineParser.CommentParser;
 export import ExtensionParser = InlineParser.ExtensionParser;
 export import RubyParser = InlineParser.RubyParser;
 export import LinkParser = InlineParser.LinkParser;
 export import HTMLParser = InlineParser.HTMLParser;
-export import CommentParser = InlineParser.CommentParser;
 export import InsertionParser = InlineParser.InsertionParser;
 export import DeletionParser = InlineParser.DeletionParser;
 export import MarkParser = InlineParser.MarkParser;
@@ -54,12 +54,12 @@ export const inline: InlineParser = union([
   annotation,
   reference,
   template,
+  comment,
   extension,
   ruby,
   link,
   media,
   html,
-  comment,
   insertion,
   deletion,
   mark,

package/src/parser/processor/footnote.ts

@@ -22,8 +22,8 @@ function build(
   marker: (index: number, abbr: string | undefined) => string,
 ) {
   assert(syntax.match(/^[a-z]+$/));
-  // Referenceを含むAnnotationの重複排除は両構文が互いに処理済みである必要があるため
-  // 事後の補正処理が必要となり各1回の処理では不可能
+  // Referenceを含むAnnotationの重複排除は両構文が互いに処理済みであることを必要とするため
+  // 構文ごとに各1回の処理では不可能
   const identify = memoize<HTMLElement, string>(
     ref => `${+!ref.querySelector('.label')}:${ref.getAttribute('data-abbr') || '_' + ref.innerHTML}`,
     new WeakMap());
@@ -69,6 +69,7 @@ function build(
         || titles.get(identifier)
         || +identifier[0] && ref.title
         || text(content).trim()
+        || content.textContent!.trim()
         || undefined;
       title
         ? !titles.has(identifier) && titles.set(identifier, title)

package/src/parser/util.ts

@@ -2,7 +2,6 @@ import { undefined } from 'spica/global';
 import { MarkdownParser } from '../../markdown';
 import { Parser, eval } from '../combinator/data/parser';
 import { union, some, verify, convert } from '../combinator';
-import { comment } from './inline/comment';
 import { unsafehtmlentity } from './inline/htmlentity';
 import { linebreak, unescsource } from './source';
 import { push, pop } from 'spica/array';
@@ -42,13 +41,13 @@ const invisibleHTMLEntityNames = [
   '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');
 
 export function visualize<P extends Parser<HTMLElement | string>>(parser: P): P;
 export function visualize<T extends HTMLElement | string>(parser: Parser<T>): Parser<T> {
   return union([
     convert(
-      source => source.replace(blankline, (line, ...$) => !$[3] ? line.replace(/[\\&<\[]/g, '\x1B$&') : line),
+      source => source.replace(blankline, line => line.replace(/[\\&<]/g, '\x1B$&')),
       verify(parser, (ns, rest, context) => !rest && hasVisible(ns, context))),
     some(union([linebreak, unescsource])),
   ]);
@@ -117,15 +116,6 @@ function isStartTight(source: string, context: MarkdownParser.Context): boolean
           return false;
       }
       return true;
-    case '[':
-      switch (true) {
-        case source.length >= 7
-          && source[1] === '#'
-          && eval(comment(source, context))?.[0].className === 'comment':
-          assert(!eval(comment(source, context))?.[0].matches('.invalid'));
-          return false;
-      }
-      return true;
     default:
       return source[0].trimStart() !== '';
   }
@@ -138,7 +128,6 @@ export function isEndTightNodes(nodes: readonly (HTMLElement | string)[]): boole
   if (nodes.length === 0) 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;
@@ -165,8 +154,6 @@ function isVisible(node: HTMLElement | string, strpos?: number): boolean {
           return false;
         case 'SPAN':
           return node.className !== 'linebreak';
-        case 'SUP':
-          return node.className !== 'comment';
         default:
           return true;
       }
@@ -179,7 +166,6 @@ export function trimNode(nodes: (HTMLElement | string)[]): (HTMLElement | string
 function trimNodeStart(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
   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) {
@@ -198,7 +184,6 @@ export function trimNodeEnd(nodes: (HTMLElement | string)[]): (HTMLElement | str
     ? [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) {

package/src/parser/util.test.ts

@@ -1,14 +0,0 @@
-import { visualize } from './util';
-
-describe('Unit: parser/util', () => {
-  describe('visualize', () => {
-    it('stress', () => {
-      visualize(s => [[s], ''])(`[# ${'a'.repeat(100000 - 6)} #]`);
-      visualize(s => [[s], ''])(`[# ${'a\n'.repeat(100000 / 2 - 6 / 2)} #]`);
-      visualize(s => [[s], ''])(`[# a${' '.repeat(100000 - 6)} #`);
-      visualize(s => [[s], ''])(`${'[# '.repeat(100000 - 2)}a #]`);
-    });
-
-  });
-
-});