securemark 0.279.1 → 0.280.0

package/src/parser/inline/insertion.ts

@@ -1,5 +1,5 @@
 import { InsertionParser } from '../inline';
-import { union, some, syntax, surround, open, lazy } from '../../combinator';
+import { union, some, syntax, creation, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { str } from '../source';
 import { Syntax, State } from '../context';
@@ -7,13 +7,13 @@ import { blankWith } from '../visibility';
 import { unshift } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
 
-export const insertion: InsertionParser = lazy(() => surround(
+export const insertion: InsertionParser = lazy(() => creation(surround(
   str('++', '+'),
-  syntax(Syntax.none, 1, 1, State.none,
+  syntax(Syntax.none, 1, State.none,
   some(union([
     some(inline, blankWith('\n', '++')),
     open('\n', some(inline, '+'), true),
   ]))),
   str('++'), false,
   ([, bs], rest) => [[html('ins', defrag(bs))], rest],
-  ([as, bs], rest) => [unshift(as, bs), rest]));
+  ([as, bs], rest) => [unshift(as, bs), rest])));

package/src/parser/inline/link.ts

@@ -20,9 +20,9 @@ export const link: LinkParser = lazy(() => validate(['[', '{'], union([
   textlink,
 ])));
 
-export const textlink: LinkParser.TextLinkParser = lazy(() =>
+export const textlink: LinkParser.TextLinkParser = lazy(() => creation(10,
   constraint(State.link, false,
-  syntax(Syntax.link, 2, 10, State.linkers | State.media,
+  syntax(Syntax.link, 2, State.linkers | State.media,
   bind(reverse(tails([
     dup(surround(
       '[',
@@ -36,11 +36,11 @@ export const textlink: LinkParser.TextLinkParser = lazy(() =>
     assert(content[0] !== '');
     if (content.length !== 0 && trimNodeEnd(content = defrag(content)).length === 0) return;
     return [[parse(content, params, context)], rest];
-  }))));
+  })))));
 
-export const medialink: LinkParser.MediaLinkParser = lazy(() =>
+export const medialink: LinkParser.MediaLinkParser = lazy(() => creation(10,
   constraint(State.link | State.media, false,
-  syntax(Syntax.link, 2, 10, State.linkers,
+  syntax(Syntax.link, 2, State.linkers,
   bind(reverse(sequence([
     dup(surround(
       '[',
@@ -49,7 +49,7 @@ export const medialink: LinkParser.MediaLinkParser = lazy(() =>
     dup(surround(/^{(?![{}])/, inits([uri, some(option)]), /^[^\S\n]*}/)),
   ])),
   ([params, content = []]: [string[], (HTMLElement | string)[]], rest, context) =>
-    [[parse(defrag(content), params, context)], rest]))));
+    [[parse(defrag(content), params, context)], rest])))));
 
 export const linemedialink: LinkParser.LineMediaLinkParser = surround(
   linebreak,

package/src/parser/inline/mark.ts

@@ -1,5 +1,5 @@
 import { MarkParser } from '../inline';
-import { union, some, syntax, constraint, surround, open, lazy } from '../../combinator';
+import { union, some, syntax, creation, constraint, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { identity, signature } from './extension/indexee';
 import { str } from '../source';
@@ -8,10 +8,10 @@ import { Syntax, State } from '../context';
 import { unshift } from 'spica/array';
 import { html, define, defrag } from 'typed-dom/dom';
 
-export const mark: MarkParser = lazy(() => surround(
+export const mark: MarkParser = lazy(() => creation(surround(
   str('==', '='),
   constraint(State.mark, false,
-  syntax(Syntax.none, 1, 1, State.none,
+  syntax(Syntax.none, 1, State.none,
   startTight(some(union([
     some(inline, blankWith('=='), [[/^\\?\n/, 9]]),
     open(some(inline, '=', [[/^\\?\n/, 9]]), mark),
@@ -24,4 +24,4 @@ export const mark: MarkParser = lazy(() => surround(
       el.id && html('a', { href: `#${el.id}` }),
     ], rest];
   },
-  ([as, bs], rest) => [unshift(as, bs), rest]));
+  ([as, bs], rest) => [unshift(as, bs), rest])));

package/src/parser/inline/media.ts

@@ -18,10 +18,10 @@ const optspec = {
 } as const;
 Object.setPrototypeOf(optspec, null);
 
-export const media: MediaParser = lazy(() => validate(['![', '!{'], open(
+export const media: MediaParser = lazy(() => validate(['![', '!{'], creation(10, open(
   '!',
   constraint(State.media, false,
-  syntax(Syntax.media, 2, 10, ~State.link,
+  syntax(Syntax.media, 2, ~State.link,
   bind(verify(fmap(tails([
     dup(surround(
       '[',
@@ -60,7 +60,7 @@ export const media: MediaParser = lazy(() => validate(['![', '!{'], open(
       unsafelink as MediaParser,
       ([link]) => [define(link, { class: null, target: '_blank' }, [el])])
       ({ source: `{ ${INSECURE_URI}${params.join('')} }${rest}`, context });
-  }))))));
+  })))))));
 
 export const linemedia: MediaParser.LineMediaParser = surround(
   linebreak,
@@ -71,7 +71,7 @@ const bracket: MediaParser.TextParser.BracketParser = lazy(() => creation(union(
   surround(str('('), some(union([unsafehtmlentity, bracket, txt]), ')'), str(')'), true, undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),
   surround(str('['), some(union([unsafehtmlentity, bracket, txt]), ']'), str(']'), true, undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),
   surround(str('{'), some(union([unsafehtmlentity, bracket, txt]), '}'), str('}'), true, undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  surround(str('"'), precedence(8, some(union([unsafehtmlentity, txt]), '"')), str('"'), true),
+  surround(str('"'), precedence(3, some(union([unsafehtmlentity, txt]), '"')), str('"'), true),
 ])));
 
 const option: MediaParser.ParameterParser.OptionParser = lazy(() => union([

package/src/parser/inline/reference.ts

@@ -6,17 +6,17 @@ import { Syntax, State } from '../context';
 import { blank, trimBlankStart, trimNodeEnd } from '../visibility';
 import { html, defrag } from 'typed-dom/dom';
 
-export const reference: ReferenceParser = lazy(() => surround(
+export const reference: ReferenceParser = lazy(() => creation(surround(
   '[[',
   constraint(State.reference, false,
-  syntax(Syntax.reference, 6, 1, State.annotation | State.reference | State.media,
+  syntax(Syntax.reference, 6, State.annotation | State.reference | State.media,
   subsequence([
     abbr,
     trimBlankStart(some(inline, ']', [[/^\\?\n/, 9], [']', 2], [']]', 6]])),
   ]))),
   ']]',
   false,
-  ([, ns], rest) => [[html('sup', attributes(ns), [html('span', trimNodeEnd(defrag(ns)))])], rest]));
+  ([, ns], rest) => [[html('sup', attributes(ns), [html('span', trimNodeEnd(defrag(ns)))])], rest])));
 
 // Chicago-Style
 const abbr: ReferenceParser.AbbrParser = creation(surround(

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

@@ -58,6 +58,7 @@ describe('Unit: parser/inline/remark', () => {
       assert.deepStrictEqual(inspect(parser('[% [ %]')), [['<span class="remark"><input type="checkbox"><span>[% [ %]</span></span>'], '']);
       assert.deepStrictEqual(inspect(parser('[% \\ a %]')), [['<span class="remark"><input type="checkbox"><span>[%  a %]</span></span>'], '']);
       assert.deepStrictEqual(inspect(parser('[% $-a %]$')), [['<span class="remark"><input type="checkbox"><span>[% <a class="label" data-label="$-a">$-a</a> %]</span></span>'], '$']);
+      assert.deepStrictEqual(inspect(parser('[% <bdi> %]')), [['<span class="remark"><input type="checkbox"><span>[% <span class="invalid">&lt;bdi&gt;</span> %]</span></span>'], '']);
     });
 
   });

package/src/parser/inline/remark.ts

@@ -1,5 +1,5 @@
 import { RemarkParser } from '../inline';
-import { union, some, syntax, validate, surround, open, close, match, lazy } from '../../combinator';
+import { union, some, syntax, creation, validate, surround, open, close, match, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { text, str } from '../source';
 import { Syntax, State } from '../context';
@@ -7,13 +7,13 @@ import { memoize } from 'spica/memoize';
 import { unshift, push } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
 
-export const remark: RemarkParser = lazy(() => validate('[%', syntax(Syntax.none, 4, 1, State.none, match(
+export const remark: RemarkParser = lazy(() => validate('[%', creation(syntax(Syntax.none, 5, State.none, match(
   /^\[(%+)\s/,
   memoize(
   ([, fence]) =>
     surround(
       open(str(`[${fence}`), some(text, new RegExp(String.raw`^\s+${fence}\]|^\S`)), true),
-      some(union([inline]), new RegExp(String.raw`^\s+${fence}\]`), [[new RegExp(String.raw`^\s+${fence}\]`), 4]]),
+      some(union([inline]), new RegExp(String.raw`^\s+${fence}\]`), [[new RegExp(String.raw`^\s+${fence}\]`), 5]]),
       close(some(text, /^\S/), str(`${fence}]`)), true,
       ([as, bs = [], cs], rest) => [[
         html('span', { class: 'remark' }, [
@@ -22,4 +22,4 @@ export const remark: RemarkParser = lazy(() => validate('[%', syntax(Syntax.none
         ]),
       ], rest],
       ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  ([, fence]) => fence.length, {})))));
+  ([, fence]) => fence.length, {}))))));

package/src/parser/inline/ruby.ts

@@ -8,7 +8,7 @@ import { isStartTightNodes } from '../visibility';
 import { unshift, push } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
 
-export const ruby: RubyParser = lazy(() => validate('[', syntax(Syntax.ruby, 2, 1, State.all, fmap(verify(fmap(
+export const ruby: RubyParser = lazy(() => validate('[', creation(syntax(Syntax.ruby, 2, State.all, fmap(verify(fmap(
   sequence([
     surround('[', str(/^(?:\\[^\n]|[^\\[\](){}"\n])+/), ']'),
     surround('(', str(/^(?:\\[^\n]|[^\\[\](){}"\n])+/), ')'),
@@ -49,7 +49,7 @@ export const ruby: RubyParser = lazy(() => validate('[', syntax(Syntax.ruby, 2,
             [html('rp', '('), html('rt', rubies.join(' ').trim()), html('rp', ')')]))),
         ];
     }
-  }))));
+  })))));
 
 const text: RubyParser.TextParser = creation(1, false, ({ source, context }) => {
   const acc = [''];

package/src/parser/inline/strong.ts

@@ -1,5 +1,5 @@
 import { StrongParser } from '../inline';
-import { union, some, syntax, surround, open, lazy } from '../../combinator';
+import { union, some, syntax, creation, surround, open, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { emstrong } from './emstrong';
 import { str } from '../source';
@@ -8,9 +8,9 @@ import { startTight, blankWith } from '../visibility';
 import { unshift } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
 
-export const strong: StrongParser = lazy(() => surround(
+export const strong: StrongParser = lazy(() => creation(surround(
   str('**', '*'),
-  syntax(Syntax.none, 1, 1, State.none,
+  syntax(Syntax.none, 1, State.none,
   startTight(some(union([
     some(inline, blankWith('**'), [[/^\\?\n/, 9]]),
     open(some(inline, '*', [[/^\\?\n/, 9]]), union([
@@ -20,4 +20,4 @@ export const strong: StrongParser = lazy(() => surround(
   ])))),
   str('**'), false,
   ([, bs], rest) => [[html('strong', defrag(bs))], rest],
-  ([as, bs], rest) => [unshift(as, bs), rest]));
+  ([as, bs], rest) => [unshift(as, bs), rest])));

package/src/parser/inline/template.ts

@@ -5,13 +5,16 @@ import { Syntax, State } from '../context';
 import { unshift } from 'spica/array';
 import { html } from 'typed-dom/dom';
 
-export const template: TemplateParser = lazy(() => surround(
-  '{{', syntax(Syntax.none, 2, 1, State.all, some(union([bracket, escsource]), '}')), '}}', true,
-  ([, ns = []], rest) => [[html('span', { class: 'template' }, `{{${ns.join('').replace(/\x1B/g, '')}}}`)], rest]));
+export const template: TemplateParser = lazy(() => creation(surround(
+  '{{',
+  syntax(Syntax.none, 6, State.all, some(union([bracket, escsource]), '}', [['}}', 6]])),
+  '}}',
+  true,
+  ([, ns = []], rest) => [[html('span', { class: 'template' }, `{{${ns.join('').replace(/\x1B/g, '')}}}`)], rest])));
 
 const bracket: TemplateParser.BracketParser = lazy(() => creation(union([
   surround(str('('), some(union([bracket, escsource]), ')'), str(')'), true, undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),
   surround(str('['), some(union([bracket, escsource]), ']'), str(']'), true, undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),
   surround(str('{'), some(union([bracket, escsource]), '}'), str('}'), true, undefined, ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  surround(str('"'), precedence(8, some(escsource, /^"|^\\?\n/)), str('"'), true),
+  surround(str('"'), precedence(3, some(escsource, /^"|^\\?\n/)), str('"'), true),
 ])));

package/src/parser/inline.test.ts

@@ -18,6 +18,8 @@ describe('Unit: parser/inline', () => {
     });
 
     it('nest', () => {
+      assert.deepStrictEqual(inspect(parser('あ（Ａ）')), [['あ', '（', 'Ａ', '）'], '']);
+      assert.deepStrictEqual(inspect(parser('あ（い）')), [['あ', '<span class="paren">（い）</span>'], '']);
       assert.deepStrictEqual(inspect(parser('+++a+++')), [['+++', 'a', '+++'], '']);
       assert.deepStrictEqual(inspect(parser('~~~a~~~')), [['~~~', 'a', '~~~'], '']);
       assert.deepStrictEqual(inspect(parser('===a===')), [['===', 'a', '==='], '']);
@@ -168,11 +170,6 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('[~~a~~]')), [['[', '<del>a</del>', ']'], '']);
       assert.deepStrictEqual(inspect(parser('[^http://host')), [['[^', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[^a@b')), [['[^', '<a class="email" href="mailto:a@b">a@b</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#a++b\nc++]')), [['[', '<a class="hashtag" href="/hashtags/a">#a</a>', '<ins>b<br>c</ins>', ']'], '']);
-      assert.deepStrictEqual(inspect(parser('[++a\nb++]{/}')), [['[', '<ins>a<br>b</ins>', ']', '<a class="url" href="/">/</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[++a\nb]++')), [['[', '++', 'a', '<br>', 'b', ']', '++'], '']);
-      assert.deepStrictEqual(inspect(parser('[++[a\nb++]')), [['[', '++', '[', 'a', '<br>', 'b', '++', ']'], '']);
-      assert.deepStrictEqual(inspect(parser('[[++a\nb++]]')), [['[', '[', '<ins>a<br>b</ins>', ']', ']'], '']);
       assert.deepStrictEqual(inspect(parser('"[% *"*"*')), [['"', '[%', ' ', '*', '"', '*', '"', '*'], '']);
       assert.deepStrictEqual(inspect(parser('"[% "*"* %]')), [['"', '<span class="remark"><input type="checkbox"><span>[% "*"* %]</span></span>'], '']);
     });

package/src/parser/source/str.ts

@@ -22,22 +22,3 @@ export function str(pattern: string | RegExp, not?: string): Parser<string, Cont
           : undefined;
       });
 }
-
-export function stropt(pattern: string | RegExp): StrParser;
-export function stropt(pattern: string | RegExp): Parser<string, Context<StrParser>, []> {
-  assert(pattern);
-  return typeof pattern === 'string'
-    ? creation(1, false, ({ source }) => {
-        if (source === '') return;
-        return source.slice(0, pattern.length) === pattern
-          ? [[pattern], source.slice(pattern.length)]
-          : [[''], source];
-      })
-    : creation(1, false, ({ source }) => {
-        if (source === '') return;
-        const m = source.match(pattern);
-        return m
-          ? [[m[0]], source.slice(m[0].length)]
-          : undefined;
-      });
-}

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

@@ -2,7 +2,7 @@ import { text } from './text';
 import { some } from '../../combinator';
 import { inspect } from '../../debug.test';
 
-describe('Unit: parser/text/text', () => {
+describe('Unit: parser/source/text', () => {
   describe('text', () => {
     const parser = (source: string) => some(text)({ source, context: {} });
 

package/src/parser/source/text.ts

@@ -3,9 +3,9 @@ import { union, creation, focus } from '../../combinator';
 import { str } from './str';
 import { html } from 'typed-dom/dom';
 
-export const delimiter = /[\s\x00-\x7F]|\S[#>]/u;
-export const nonWhitespace = /[\S\n]|$/;
-export const nonAlphanumeric = /[^0-9A-Za-z]|\S[#>]|$/;
+export const delimiter = /[\s\x00-\x7F（）]|\S[#>]/u;
+export const nonWhitespace = /[\S\n]|$/u;
+export const nonAlphanumeric = /[^0-9A-Za-z]|\S[#>]|$/u;
 const repeat = str(/^(.)\1*/);
 
 export const text: TextParser = creation(1, false, ({ source, context }) => {

package/src/parser/source.ts

@@ -14,5 +14,5 @@ export import AnyLineParser = SourceParser.AnyLineParser;
 export { text, txt, linebreak } from './source/text';
 export { escsource } from './source/escapable';
 export { unescsource } from './source/unescapable';
-export { str, stropt } from './source/str';
+export { str } from './source/str';
 export { contentline, emptyline, anyline } from './source/line';

package/src/parser/visibility.ts

@@ -170,7 +170,6 @@ function trimBlankEnd<T extends HTMLElement | string>(parser: Parser<T>): Parser
 //}
 //function trimNodeStart<T extends HTMLElement | string>(nodes: T[]): T[] {
 //  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 === 'string') {
 //      const pos = node.trimStart().length;
 //      if (pos > 0) {
@@ -178,6 +177,9 @@ function trimBlankEnd<T extends HTMLElement | string>(parser: Parser<T>): Parser
 //        break;
 //      }
 //    }
+//    else if (nodes.length === 1 && node.className === 'indexer') {
+//      break;
+//    }
 //    nodes.shift();
 //  }
 //  return nodes;