securemark 0.232.2 → 0.233.0

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/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 #]`);
-    });
-
-  });
-
-});