securemark 0.258.3 → 0.258.6

package/src/parser/inline/link.ts

@@ -1,10 +1,12 @@
 import { undefined, location, encodeURI, decodeURI, Location } from 'spica/global';
+import { MarkdownParser } from '../../../markdown';
 import { LinkParser, TextLinkParser } from '../inline';
 import { Result, eval, exec } from '../../combinator/data/parser';
-import { union, inits, tails, subsequence, some, guard, syntax, creation, precedence, state, validate, surround, open, dup, reverse, lazy, fmap, bind } from '../../combinator';
+import { union, inits, tails, subsequence, some, constraint, syntax, creation, precedence, state, validate, surround, open, dup, reverse, lazy, fmap, bind } from '../../combinator';
 import { inline, media, shortmedia } from '../inline';
 import { attributes } from './html';
 import { autolink } from '../autolink';
+import { bracket } from './bracket';
 import { unescsource, str } from '../source';
 import { Syntax, State } from '../context';
 import { trimNode } from '../visibility';
@@ -18,7 +20,7 @@ const optspec = {
 Object.setPrototypeOf(optspec, null);
 
 export const link: LinkParser = lazy(() => validate(['[', '{'], bind(
-  guard(context => ~context.state! & State.link,
+  constraint(State.link, false,
   syntax(Syntax.link, 2, 10,
   fmap(subsequence([
     state(State.link,
@@ -32,7 +34,7 @@ export const link: LinkParser = lazy(() => validate(['[', '{'], bind(
         ']',
         true,
         undefined,
-        ([, ns = [], rest], next) => next[0] === ']' ? undefined : optimize('[', ns, rest, next)),
+        ([, ns = [], rest], next, context) => next[0] === ']' ? undefined : optimize('[', ns, rest, next, context)),
     ]))),
     dup(surround(/^{(?![{}])/, inits([uri, some(option)]), /^[^\S\n]*}/)),
   ], nodes => nodes[0][0] !== ''),
@@ -59,7 +61,7 @@ export const link: LinkParser = lazy(() => validate(['[', '{'], bind(
         resolve(INSECURE_URI, context.host ?? location, context.url ?? context.host ?? location),
         context.host?.href || location.href),
       context.host?.origin || location.origin);
-    if (el.classList.contains('invalid')) return [[el], rest];
+    if (el.className === 'invalid') return [[el], rest];
     assert(el.classList.length === 0);
     return [[define(el, attributes('link', [], optspec, params))], rest];
   })));
@@ -85,7 +87,7 @@ export const textlink: TextLinkParser = lazy(() => validate(['[', '{'], bind(
         resolve(INSECURE_URI, context.host ?? location, context.url ?? context.host ?? location),
         context.host?.href || location.href),
       context.host?.origin || location.origin);
-    assert(!el.classList.contains('invalid'));
+    assert(el.className !== 'invalid');
     assert(el.classList.length === 0);
     return [[define(el, attributes('link', [], optspec, params))], rest];
   })));
@@ -192,8 +194,19 @@ function decode(uri: string): string {
   }
 }
 
-export function optimize(opener: string, ns: readonly (string | HTMLElement)[], rest: string, next: string): Result<string> {
-  if (next[+(next[0] === '\\')] === '\n') return;
+export function optimize(opener: string, ns: readonly (string | HTMLElement)[], rest: string, next: string, context: MarkdownParser.Context): Result<string> {
+  if (next[+(next[0] === '\\')] === '\n') {
+    if (rest[0] !== opener[0]) return;
+    const delimiters = context.delimiters;
+    delimiters?.push({
+      signature: '!\n',
+      matcher: source => !/^\\?\n/.test(source) && undefined,
+      precedence: 9,
+    });
+    const paired = eval(state(~0, bracket)(rest[0] + rest.slice(rest.search(`[^${rest[0]}]|$`)), context), [])[0] !== '';
+    delimiters?.pop();
+    if (paired) return;
+  }
   let count = 0;
   for (let i = 0; i < ns.length - 1; i += 2) {
     const fst = ns[i];

package/src/parser/inline/media.ts

@@ -1,6 +1,6 @@
 import { undefined, location } from 'spica/global';
 import { MediaParser } from '../inline';
-import { union, inits, tails, some, creation, precedence, guard, syntax, validate, verify, surround, open, dup, lazy, fmap, bind } from '../../combinator';
+import { union, inits, tails, some, syntax, creation, precedence, constraint, validate, verify, surround, open, dup, lazy, fmap, bind } from '../../combinator';
 import { textlink, uri, option as linkoption, resolve } from './link';
 import { attributes } from './html';
 import { unsafehtmlentity } from './htmlentity';
@@ -20,7 +20,7 @@ Object.setPrototypeOf(optspec, null);
 
 export const media: MediaParser = lazy(() => validate(['![', '!{'], bind(verify(fmap(open(
   '!',
-  guard(context => ~context.state! & State.media,
+  constraint(State.media, false,
   syntax(Syntax.media, 2, 10,
   tails([
     dup(surround(

package/src/parser/inline/reference.ts

@@ -1,6 +1,6 @@
 import { undefined } from 'spica/global';
 import { ReferenceParser } from '../inline';
-import { union, subsequence, some, context, creation, guard, syntax, state, surround, open, lazy, bind } from '../../combinator';
+import { union, subsequence, some, context, syntax, creation, constraint, state, surround, open, lazy, bind } from '../../combinator';
 import { inline } from '../inline';
 import { optimize } from './link';
 import { str, stropt } from '../source';
@@ -11,7 +11,7 @@ import { html, defrag } from 'typed-dom/dom';
 
 export const reference: ReferenceParser = lazy(() => surround(
   '[[',
-  guard(context => ~context.state! & State.reference,
+  constraint(State.reference, false,
   syntax(Syntax.reference, 6, 1,
   state(State.annotation | State.reference | State.media,
   startLoose(
@@ -24,7 +24,7 @@ export const reference: ReferenceParser = lazy(() => surround(
   ']]',
   false,
   ([, ns], rest) => [[html('sup', attributes(ns), [html('span', trimNode(defrag(ns)))])], rest],
-  ([, ns, rest], next) => next[0] === ']' ? undefined : optimize('[[', ns, rest, next)));
+  ([, ns, rest], next, context) => next[0] === ']' ? undefined : optimize('[[', ns, rest, next, context)));
 
 const abbr: ReferenceParser.AbbrParser = creation(bind(surround(
   '^',

package/src/parser/inline/shortmedia.ts

@@ -1,11 +1,11 @@
 import { ShortmediaParser } from '../inline';
-import { union, guard, rewrite, open, convert } from '../../combinator';
+import { union, constraint, rewrite, open, convert } from '../../combinator';
 import { url } from './autolink/url';
 import { media } from './media';
 import { State } from '../context';
 
 export const shortmedia: ShortmediaParser = rewrite(
-  guard(context => ~context.state! & State.media,
+  constraint(State.media, false,
   open('!', url)),
   convert(
     source => `!{ ${source.slice(1)} }`,

package/src/parser/inline/template.ts

@@ -10,7 +10,7 @@ import { unshift } from 'spica/array';
 export const template: TemplateParser = lazy(() => surround(
   '{{', syntax(Syntax.none, 2, 1, some(union([bracket, escsource]), '}')), '}}', true,
   ([, ns = []], rest) => [[html('span', { class: 'template' }, `{{${ns.join('').replace(/\x1B/g, '')}}}`)], rest],
-  ([, ns = [], rest], next) => next[0] === '}' ? undefined : optimize('{{', ns, rest, next)));
+  ([, ns = [], rest], next, context) => next[0] === '}' ? undefined : optimize('{{', ns, rest, next, context)));
 
 const bracket: TemplateParser.BracketParser = lazy(() => creation(union([
   surround(str('('), some(union([bracket, escsource]), ')'), str(')'), true, undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),

package/src/parser/inline.test.ts

@@ -110,7 +110,7 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('[@a]')), [['[', '<a href="/@a" class="account">@a</a>', ']'], '']);
       assert.deepStrictEqual(inspect(parser('[#1][#2]')), [['<a class="index" href="#index:1">1</a>', '<a class="index" href="#index:2">2</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[$1]')), [['[', '$', '1', ']'], '']);
-      assert.deepStrictEqual(inspect(parser('[$1-2]')), [['[', '$', '1', '-', '2', ']'], '']);
+      assert.deepStrictEqual(inspect(parser('[$1-2]')), [['[', '$', '1-2', ']'], '']);
       assert.deepStrictEqual(inspect(parser('[$-1][$-2]')), [['<a class="label" data-label="$-1">$-1</a>', '<a class="label" data-label="$-2">$-2</a>'], '']);
       assert.deepStrictEqual(inspect(parser('$-1, $-2')), [['<a class="label" data-label="$-1">$-1</a>', ',', ' ', '<a class="label" data-label="$-2">$-2</a>'], '']);
       assert.deepStrictEqual(inspect(parser('$-1 and $-2')), [['<a class="label" data-label="$-1">$-1</a>', ' ', 'and', ' ', '<a class="label" data-label="$-2">$-2</a>'], '']);
@@ -225,10 +225,10 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('#a\nb\n#c\n[#d]')), [['<a href="/hashtags/a" class="hashtag">#a</a>', '<br>', 'b', '<br>', '<a href="/hashtags/c" class="hashtag">#c</a>', '<br>', '<a class="index" href="#index:d">d</a>'], '']);
       assert.deepStrictEqual(inspect(parser('##a')), [['##a'], '']);
       assert.deepStrictEqual(inspect(parser('a#b')), [['a#b'], '']);
-      assert.deepStrictEqual(inspect(parser('0a#b')), [['0', 'a#b'], '']);
+      assert.deepStrictEqual(inspect(parser('0a#b')), [['0a#b'], '']);
       assert.deepStrictEqual(inspect(parser('あ#b')), [['あ#b'], '']);
       assert.deepStrictEqual(inspect(parser('あい#b')), [['あ', 'い#b'], '']);
-      assert.deepStrictEqual(inspect(parser('0aあ#b')), [['0a', 'あ#b'], '']);
+      assert.deepStrictEqual(inspect(parser('0aあ#b')), [['0aあ#b'], '']);
       assert.deepStrictEqual(inspect(parser('0aあい#b')), [['0a', 'あ', 'い#b'], '']);
       assert.deepStrictEqual(inspect(parser('「#あ」')), [['「', '<a href="/hashtags/あ" class="hashtag">#あ</a>', '」'], '']);
       assert.deepStrictEqual(inspect(parser('a\n#b')), [['a', '<br>', '<a href="/hashtags/b" class="hashtag">#b</a>'], '']);

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

@@ -82,7 +82,7 @@ describe('Unit: parser/text/text', () => {
       assert.deepStrictEqual(inspect(parser('0@0')), [['0', '@', '0'], '']);
       assert.deepStrictEqual(inspect(parser('a@0')), [['a', '@', '0'], '']);
       assert.deepStrictEqual(inspect(parser('A@0')), [['A', '@', '0'], '']);
-      assert.deepStrictEqual(inspect(parser('0aA@0')), [['0aA', '@', '0'], '']);
+      assert.deepStrictEqual(inspect(parser('aA@0')), [['aA', '@', '0'], '']);
       assert.deepStrictEqual(inspect(parser(' @0')), [[' ', '@', '0'], '']);
       assert.deepStrictEqual(inspect(parser('@@0')), [['@', '@', '0'], '']);
     });
@@ -96,10 +96,25 @@ describe('Unit: parser/text/text', () => {
       assert.deepStrictEqual(inspect(parser('0#0')), [['0', '#', '0'], '']);
       assert.deepStrictEqual(inspect(parser('a#0')), [['a', '#', '0'], '']);
       assert.deepStrictEqual(inspect(parser('A#0')), [['A', '#', '0'], '']);
+      assert.deepStrictEqual(inspect(parser('aA#0')), [['a', 'A', '#', '0'], '']);
       assert.deepStrictEqual(inspect(parser(' #0')), [[' ', '#', '0'], '']);
       assert.deepStrictEqual(inspect(parser('##0')), [['#', '#', '0'], '']);
     });
 
+    it('anchor', () => {
+      assert.deepStrictEqual(inspect(parser('>>0')), [['>', '>', '0'], '']);
+      assert.deepStrictEqual(inspect(parser('_>>0')), [['_', '>', '>', '0'], '']);
+      assert.deepStrictEqual(inspect(parser('$>>0')), [['$', '>', '>', '0'], '']);
+      assert.deepStrictEqual(inspect(parser('+>>0')), [['+', '>', '>', '0'], '']);
+      assert.deepStrictEqual(inspect(parser('->>0')), [['-', '>', '>', '0'], '']);
+      assert.deepStrictEqual(inspect(parser('0>>0')), [['0', '>', '>', '0'], '']);
+      assert.deepStrictEqual(inspect(parser('a>>0')), [['a', '>', '>', '0'], '']);
+      assert.deepStrictEqual(inspect(parser('A>>0')), [['A', '>', '>', '0'], '']);
+      assert.deepStrictEqual(inspect(parser('aA>>0')), [['a', 'A', '>', '>', '0'], '']);
+      assert.deepStrictEqual(inspect(parser(' >>0')), [[' ', '>', '>', '0'], '']);
+      assert.deepStrictEqual(inspect(parser('>>>>0')), [['>', '>', '>', '>', '0'], '']);
+    });
+
     it('localize', () => {
       assert.deepStrictEqual(inspect(parser('.\\\n0')), [['.', '<span class="linebreak"> </span>', '0'], '']);
       assert.deepStrictEqual(inspect(parser('。\\\n0')), [['。', '<span class="linebreak"></span>', '0'], '']);

package/src/parser/source/text.ts

@@ -1,15 +1,16 @@
 import { undefined } from 'spica/global';
 import { TextParser, TxtParser, LinebreakParser } from '../source';
-import { union, creation, focus } from '../../combinator';
+import { union, syntax, focus } from '../../combinator';
 import { str } from './str';
+import { Syntax } from '../context';
 import { html } from 'typed-dom/dom';
 
-export const delimiter = /[\s\x00-\x7F]|\S#|[（）、。！？][^\S\n]*(?=\\\n)/;
+export const delimiter = /[\s\x00-\x7F]|\S[#>]|[（）、。！？][^\S\n]*(?=\\\n)/;
 export const nonWhitespace = /[\S\n]|$/;
-export const nonAlphanumeric = /[^0-9A-Za-z]|\S#|$/;
+export const nonAlphanumeric = /[^0-9A-Za-z]|\S[#>]|$/;
 const repeat = str(/^(.)\1*/);
 
-export const text: TextParser = creation((source, context) => {
+export const text: TextParser = syntax(Syntax.none, 1, 1, (source, context) => {
   if (source === '') return;
   const i = source.search(delimiter);
   switch (i) {

package/src/parser/visibility.ts

@@ -12,7 +12,7 @@ import { push } from 'spica/array';
 export function visualize<P extends Parser<HTMLElement | string>>(parser: P): P;
 export function visualize<T extends HTMLElement | string>(parser: Parser<T>): Parser<T> {
   const blankline = new RegExp(
-    /^(?:\\$|\\?[^\S\n]|&IHN;|<wbr>)+$/.source.replace('IHN', `(?:${invisibleHTMLEntityNames.join('|')})`),
+    /^(?:\\$|\\?[^\S\n]|&IHN;|<wbr[^\S\n]*>)+$/.source.replace('IHN', `(?:${invisibleHTMLEntityNames.join('|')})`),
     'gm');
   return union([
     convert(
@@ -40,7 +40,7 @@ function hasVisible(
 }
 
 export const regBlankStart = new RegExp(
-  /^(?:\\?[^\S\n]|&IHN;|<wbr>)+/.source.replace('IHN', `(?:${invisibleHTMLEntityNames.join('|')})`));
+  /^(?:\\?[^\S\n]|&IHN;|<wbr[^\S\n]*>)+/.source.replace('IHN', `(?:${invisibleHTMLEntityNames.join('|')})`));
 
 export function blankWith(delimiter: string | RegExp): RegExp;
 export function blankWith(starting: '' | '\n', delimiter: string | RegExp): RegExp;
@@ -49,7 +49,7 @@ export function blankWith(starting: '' | '\n', delimiter?: string | RegExp): Reg
   return new RegExp(String.raw
     `^(?:(?=${
       starting
-    })(?:\\?\s|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr>)${starting && '+'})?${
+    })(?:\\?\s|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr[^\S\n]*>)${starting && '+'})?${
       typeof delimiter === 'string' ? delimiter.replace(/[*+()\[\]]/g, '\\$&') : delimiter.source
     }`);
 }
@@ -94,8 +94,8 @@ const isStartTight = reduce((source: string, context: MarkdownParser.Context, ex
     case '<':
       switch (true) {
         case source.length >= 5
-          && source[1] === 'w'
-          && source.slice(0, 5) === '<wbr>':
+          && source.slice(0, 4) === '<wbr'
+          && (source[5] === '>' || /^<wbr[^\S\n]*>/.test(source)):
           return false;
       }
       return true;