securemark 0.294.7 → 0.294.8

package/src/parser/inline/math.ts

@@ -14,7 +14,8 @@ export const math: MathParser = lazy(() => rewrite(
       /\$(?={)/y,
       precedence(4, bracket),
       '$',
-      false, undefined, undefined, [3 | Backtrack.bracket]),
+      false,
+      [3 | Backtrack.bracket]),
     surround(
       /\$(?![\s{}])/y,
       precedence(2, some(union([
@@ -22,7 +23,8 @@ export const math: MathParser = lazy(() => rewrite(
         precedence(4, bracket),
       ]))),
       /\$(?![-0-9A-Za-z])/y,
-      false, undefined, undefined, [3 | Backtrack.bracket]),
+      false,
+      [3 | Backtrack.bracket]),
   ]),
   ({ context: { source, caches: { math: cache } = {} } }) => new List([
     new Data(cache?.get(source)?.cloneNode(true) ||

package/src/parser/inline/media.ts

@@ -1,8 +1,8 @@
 import { MediaParser } from '../inline';
 import { State, Recursion, Backtrack, Command } from '../context';
-import { List, Data, subinput } from '../../combinator/data/parser';
+import { List, Data } from '../../combinator/data/parser';
 import { union, inits, tails, some, creation, recursion, precedence, constraint, surround, open, setBacktrack, dup, lazy, fmap, bind } from '../../combinator';
-import { unsafelink, uri, option as linkoption, resolve, decode } from './link';
+import { uri, option as linkoption, resolve, decode, parse } from './link';
 import { attributes } from './html';
 import { unsafehtmlentity } from './htmlentity';
 import { txt, str } from '../source';
@@ -30,25 +30,24 @@ export const media: MediaParser = lazy(() => constraint(State.media, creation(10
       ]), ']')),
       ']',
       true,
+      [3 | Backtrack.escbracket],
       ([, ns = new List()], context) =>
         context.linebreak === 0
           ? ns
-          : undefined,
-      undefined,
-      [3 | Backtrack.escbracket])),
+          : undefined)),
     dup(surround(
       /{(?![{}])/y,
       inits([uri, some(option)]),
       / ?}/y,
       false,
+      [3 | Backtrack.link],
       undefined,
       ([as, bs], context) => {
         if (!bs) return;
         const head = context.position - context.range!;
         setBacktrack(context, [2 | Backtrack.link], head);
         return as.import(bs).push(new Data(Command.Cancel)) && as;
-      },
-      [3 | Backtrack.link])),
+      })),
   ]),
   nodes =>
     nodes.length === 1
@@ -98,26 +97,26 @@ export const media: MediaParser = lazy(() => constraint(State.media, creation(10
     }
     if (context.state! & State.link) return new List([new Data(el)]);
     if (cache && cache.tagName !== 'IMG') return new List([new Data(el)]);
-    const { source, position } = context;
-    return fmap(
-      unsafelink as MediaParser,
-      ([{ value }]) => {
-        context.source = source;
-        context.position = position;
-        return new List([new Data(define(value, { class: null, target: '_blank' }, [el]))]);
-      })
-      (subinput(`{ ${INSECURE_URI}${linkparams.join('')} }`, context));
+    return new List([new Data(define(
+      parse(
+        new List(),
+        linkparams.reduce(
+          (acc, p) => acc.push(new Data(p)) && acc,
+          new List([new Data(INSECURE_URI)])),
+        context),
+      { class: null, target: '_blank' }, [el]))
+    ]);
   })))));
 
 const bracket: MediaParser.TextParser.BracketParser = lazy(() => recursion(Recursion.terminal, union([
-  surround(str('('), some(union([unsafehtmlentity, bracket, txt]), ')'), str(')'), true,
-    undefined, () => new List(), [3 | Backtrack.escbracket]),
-  surround(str('['), some(union([unsafehtmlentity, bracket, txt]), ']'), str(']'), true,
-    undefined, () => new List(), [3 | Backtrack.escbracket]),
-  surround(str('{'), some(union([unsafehtmlentity, bracket, txt]), '}'), str('}'), true,
-    undefined, () => new List(), [3 | Backtrack.escbracket]),
-  surround(str('"'), precedence(2, some(union([unsafehtmlentity, txt]), '"')), str('"'), true,
-    undefined, () => new List(), [3 | Backtrack.escbracket]),
+  surround(str('('), some(union([unsafehtmlentity, bracket, txt]), ')'), str(')'),
+    true, [3 | Backtrack.escbracket], undefined, () => new List()),
+  surround(str('['), some(union([unsafehtmlentity, bracket, txt]), ']'), str(']'),
+    true, [3 | Backtrack.escbracket], undefined, () => new List()),
+  surround(str('{'), some(union([unsafehtmlentity, bracket, txt]), '}'), str('}'),
+    true, [3 | Backtrack.escbracket], undefined, () => new List()),
+  surround(str('"'), precedence(2, some(union([unsafehtmlentity, txt]), '"')), str('"'),
+    true, [3 | Backtrack.escbracket], undefined, () => new List()),
 ])));
 
 const option: MediaParser.ParameterParser.OptionParser = lazy(() => union([
@@ -125,7 +124,7 @@ const option: MediaParser.ParameterParser.OptionParser = lazy(() => union([
     open(/ /y, str(/[1-9][0-9]*/y)),
     str(/[x:]/y),
     str(/[1-9][0-9]*(?=[ }])/y),
-    false,
+    false, [],
     ([[{ value: a }], [{ value: b }], [{ value: c }]]) =>
       b === 'x'
         ? new List([new Data(`width="${a}"`), new Data(`height="${c}"`)])

package/src/parser/inline/reference.ts

@@ -18,6 +18,7 @@ export const reference: ReferenceParser = lazy(() => constraint(State.reference,
   ]))),
   ']]',
   false,
+  [1 | Backtrack.bracket, 3 | Backtrack.doublebracket],
   ([, ns], context) => {
     const { position, range = 0, linebreak = 0 } = context;
     if (linebreak === 0) {
@@ -69,7 +70,7 @@ export const reference: ReferenceParser = lazy(() => constraint(State.reference,
           '',
           some(inline, ']', [[']', 1]]),
           str(']'),
-          true,
+          true, [],
           ([, cs = new List(), ds]) =>
             cs.import(ds),
           ([, cs = new List()]) => {
@@ -86,15 +87,14 @@ export const reference: ReferenceParser = lazy(() => constraint(State.reference,
     return state & State.annotation
       ? as.import(bs as List<Data<string>>)
       : undefined;
-  },
-  [1 | Backtrack.bracket, 3 | Backtrack.doublebracket])));
+  })));
 
 // Chicago-Style
 const abbr: ReferenceParser.AbbrParser = surround(
   str('^'),
   union([str(/(?=[A-Z])(?:[0-9A-Za-z]'?|(?:[-.:]|\.?\??,? ?)(?!['\-.:?, ]))+/y)]),
   /\|?(?=]])|\|/y,
-  true,
+  true, [],
   ([, ns], context) => {
     const { source, position, range = 0 } = context;
     if (!ns) return new List([new Data(''), new Data(source.slice(position - range, source[position - 1] === '|' ? position - 1 : position))]);

package/src/parser/inline/remark.ts

@@ -11,7 +11,8 @@ export const remark: RemarkParser = lazy(() => fallback(surround(
   str(/\[%(?=[ \n])/y),
   precedence(3, recursion(Recursion.inline,
   some(union([inline]), /[ \n]%\]/y, [[/[ \n]%\]/y, 3]]))),
-  close(text, str(`%]`)), true,
+  close(text, str(`%]`)),
+  true, [],
   ([as, bs = new List(), cs]) => new List([
     new Data(html('span', { class: 'remark' }, [
       html('input', { type: 'checkbox' }),

package/src/parser/inline/ruby.ts

@@ -13,15 +13,14 @@ export const ruby: RubyParser = lazy(() => bind(
     dup(surround(
       '[', text, ']',
       false,
+      [1 | Backtrack.bracket, 3 | Backtrack.ruby],
       ([, ns]) => {
         ns && ns.last?.value === '' && ns.pop();
         return isTightNodeStart(ns) ? ns : undefined;
-      },
-      undefined,
-      [1 | Backtrack.bracket, 3 | Backtrack.ruby])),
+      })),
     dup(surround(
       '(', text, ')',
-      false, undefined, undefined,
+      false,
       [1 | Backtrack.bracket, 3 | Backtrack.ruby])),
   ]),
   ([{ value: texts }, { value: rubies = undefined } = {}], context) => {

package/src/parser/inline/strong.ts

@@ -17,6 +17,7 @@ export const strong: StrongParser = lazy(() => surround(
     some(inline, blankWith('*')),
     open(some(inline, '*'), inline),
   ]))))),
-  str('**'), false,
+  str('**'),
+  false, [],
   ([, bs]) => new List([new Data(html('strong', defrag(unwrap(bs))))]),
   ([as, bs]) => bs && as.import(bs as List<Data<string>>)));

package/src/parser/inline/template.ts

@@ -12,6 +12,7 @@ export const template: TemplateParser = lazy(() => surround(
   some(union([bracket, escsource]), '}')),
   str('}}'),
   true,
+  [3 | Backtrack.doublebracket, 3 | Backtrack.escbracket],
   ([as, bs = new List(), cs]) => new List([
     new Data(html('span', { class: 'template' }, defrag(unwrap(as.import(bs as List<Data<string>>).import(cs)))))
   ]),
@@ -23,25 +24,24 @@ export const template: TemplateParser = lazy(() => surround(
           ...invalid('template', 'syntax', `Missing the closing symbol "}}"`),
         },
         context.source.slice(context.position - context.range!, context.position)))
-    ]),
-  [3 | Backtrack.doublebracket, 3 | Backtrack.escbracket]));
+    ])));
 
 const bracket: TemplateParser.BracketParser = lazy(() => union([
-  surround(str('('), recursion(Recursion.terminal, some(union([bracket, escsource]), ')')), str(')'), true,
-    undefined, () => new List(), [3 | Backtrack.escbracket]),
-  surround(str('['), recursion(Recursion.terminal, some(union([bracket, escsource]), ']')), str(']'), true,
-    undefined, () => new List(), [3 | Backtrack.escbracket]),
-  surround(str('{'), recursion(Recursion.terminal, some(union([bracket, escsource]), '}')), str('}'), true,
-    undefined, () => new List(), [3 | Backtrack.escbracket]),
+  surround(str('('), recursion(Recursion.terminal, some(union([bracket, escsource]), ')')), str(')'),
+    true, [3 | Backtrack.escbracket], undefined, () => new List()),
+  surround(str('['), recursion(Recursion.terminal, some(union([bracket, escsource]), ']')), str(']'),
+    true, [3 | Backtrack.escbracket], undefined, () => new List()),
+  surround(str('{'), recursion(Recursion.terminal, some(union([bracket, escsource]), '}')), str('}'),
+    true, [3 | Backtrack.escbracket], undefined, () => new List()),
   surround(
     str('"'),
     precedence(2, recursion(Recursion.terminal, some(escsource, /["\n]/y, [['"', 2], ['\n', 3]]))),
     str('"'),
     true,
+    [3 | Backtrack.escbracket],
     ([as, bs = new List(), cs], context) =>
       context.linebreak === 0
         ? as.import(bs as List<Data<string>>).import(cs)
         : (context.position -= 1, as.import(bs as List<Data<string>>)),
-    ([as, bs]) => bs && as.import(bs as List<Data<string>>),
-    [3 | Backtrack.escbracket]),
+    ([as, bs]) => bs && as.import(bs as List<Data<string>>)),
 ]));

package/src/parser/segment.ts

@@ -13,6 +13,7 @@ export const MAX_SEGMENT_SIZE = 100_000; // 100,000 bytes (Max value size of FDB
 export const MAX_INPUT_SIZE = MAX_SEGMENT_SIZE * 10;
 
 const parser: SegmentParser = union([
+  some(emptyline),
   input => {
     const { context: { source, position } } = input;
     if (position === source.length) return;
@@ -35,8 +36,7 @@ const parser: SegmentParser = union([
         return extension(input);
     }
   },
-  some(contentline, MAX_SEGMENT_SIZE + 1),
-  some(emptyline, MAX_SEGMENT_SIZE + 1),
+  some(contentline),
 ]) as any;
 
 export function* segment(source: string): Generator<string, undefined, undefined> {

package/src/parser/source/escapable.ts

@@ -14,10 +14,6 @@ export const escsource: EscapableSourceParser = ({ context }) => {
   consume(1, context);
   context.position += 1;
   switch (char) {
-    case '\r':
-      assert(!source.includes('\r', position + 1));
-      consume(-1, context);
-      return new List();
     case Command.Escape:
       consume(1, context);
       context.position += 1;
@@ -33,6 +29,9 @@ export const escsource: EscapableSourceParser = ({ context }) => {
           context.position += 1;
           return new List([new Data(source.slice(position, position + 2))]);
       }
+    case '\r':
+      consume(-1, context);
+      return new List();
     case '\n':
       context.linebreak ||= source.length - position;
       return new List([new Data(html('br'))]);

package/src/parser/source/line.ts

@@ -8,6 +8,7 @@ export const anyline: AnyLineParser = input => {
   context.position = source.indexOf('\n', position) + 1 || source.length;
   return new List();
 };
+
 const regEmptyline = /[^\S\n]*(?:$|\n)/y;
 export const emptyline: EmptyLineParser = input => {
   const { context } = input;
@@ -21,6 +22,7 @@ export const emptyline: EmptyLineParser = input => {
   context.position = i;
   return new List();
 };
+
 const regContentline = /[^\S\n]*\S[^\n]*(?:$|\n)/y;
 export const contentline: ContentLineParser = input => {
   const { context } = input;
@@ -33,4 +35,4 @@ export const contentline: ContentLineParser = input => {
   if (i === 0) return;
   context.position = i;
   return new List();
-}
+};

package/src/parser/source/text.ts

@@ -1,7 +1,7 @@
-import { TextParser, TxtParser, LinebreakParser } from '../source';
+import { TextParser, TxtParser } from '../source';
 import { Command } from '../context';
 import { List, Data } from '../../combinator/data/parser';
-import { union, consume, focus } from '../../combinator';
+import { union, consume } from '../../combinator';
 import { html } from 'typed-dom/dom';
 
 //const delimiter = /(?=[\\!@#$&"`\[\](){}<>（）［］｛｝*%|\r\n]|([+~=])\1|\/{3}|\s(?:\\?(?:$|\s)|[$%])|:\/\/)/g;
@@ -15,10 +15,6 @@ export const text: TextParser = input => {
   consume(1, context);
   context.position += 1;
   switch (char) {
-    case '\r':
-      assert(!source.includes('\r', position + 1));
-      consume(-1, context);
-      return new List();
     case Command.Escape:
     case '\\':
       switch (source[position + 1]) {
@@ -32,6 +28,9 @@ export const text: TextParser = input => {
           context.position += 1;
           return new List([new Data(source.slice(position + 1, context.position))]);
       }
+    case '\r':
+      consume(-1, context);
+      return new List();
     case '\n':
       context.linebreak ||= source.length - position;
       return new List([new Data(html('br'))]);
@@ -64,10 +63,6 @@ export const txt: TxtParser = union([
   text,
 ]) as TxtParser;
 
-export const linebreak: LinebreakParser = focus(/[\r\n]/y, union([
-  text,
-])) as LinebreakParser;
-
 export function canSkip(source: string, position: number): boolean {
   assert(position < source.length);
   if (!isWhitespace(source[position], false)) return false;

package/src/parser/source/unescapable.ts

@@ -14,14 +14,12 @@ export const unescsource: UnescapableSourceParser = ({ context }) => {
   consume(1, context);
   context.position += 1;
   switch (char) {
-    case '\r':
-      assert(!source.includes('\r', position + 1));
-      consume(-1, context);
-      return new List();
     case Command.Escape:
       consume(1, context);
       context.position += 1;
       return new List([new Data(source.slice(position + 1, position + 2))]);
+    case '\r':
+      return new List();
     case '\n':
       context.linebreak ||= source.length - position;
       return new List([new Data(html('br'))]);

package/src/parser/source.ts

@@ -3,7 +3,6 @@ import { MarkdownParser } from '../../markdown';
 import SourceParser = MarkdownParser.SourceParser;
 export import TextParser = SourceParser.TextParser;
 export import TxtParser = SourceParser.TxtParser;
-export import LinebreakParser = SourceParser.LinebreakParser;
 export import EscapableSourceParser = SourceParser.EscapableSourceParser;
 export import UnescapableSourceParser = SourceParser.UnescapableSourceParser;
 export import StrParser = SourceParser.StrParser;
@@ -11,7 +10,7 @@ export import ContentLineParser = SourceParser.ContentLineParser;
 export import EmptyLineParser = SourceParser.EmptyLineParser;
 export import AnyLineParser = SourceParser.AnyLineParser;
 
-export { text, txt, linebreak } from './source/text';
+export { text, txt } from './source/text';
 export { escsource } from './source/escapable';
 export { unescsource } from './source/unescapable';
 export { str, strs } from './source/str';

package/src/parser/inline/autolink/channel.ts

@@ -1,44 +0,0 @@
-import { AutolinkParser } from '../../inline';
-import { State, Backtrack } from '../../context';
-import { List, Data } from '../../../combinator/data/parser';
-import { union, sequence, some, state, constraint, verify, rewrite, surround, convert, fmap, lazy } from '../../../combinator';
-import { unsafelink } from '../link';
-import { emoji } from './hashtag';
-import { str } from '../../source';
-import { define } from 'typed-dom/dom';
-
-// https://example/@user?ch=a+b must be a user channel page or a redirect page going there.
-
-export const channel: AutolinkParser.ChannelParser = lazy(() => rewrite(
-  sequence([
-    surround(
-      /(?<![0-9a-z])@/yi,
-      /[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*\//yi,
-      /[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*(?![-.]?[0-9a-z@]|>>|:\S)/yi,
-      true, undefined, undefined,
-      [3 | Backtrack.autolink]),
-    some(verify(surround(
-      '#',
-      str(new RegExp([
-        /(?!['_])(?:[^\p{C}\p{S}\p{P}\s]|emoji|'(?=[0-9A-Za-z])|_(?=[^\p{C}\p{S}\p{P}\s]|emoji))+/yu.source,
-      ].join('|').replace(/emoji/g, emoji.source), 'yu')),
-      new RegExp([
-        /(?![0-9a-z@]|>>|:\S|[^\p{C}\p{S}\p{P}\s]|emoji)/yu.source,
-      ].join('|').replace(/emoji/g, emoji.source), 'yu'),
-      false, undefined, undefined,
-      [3 | Backtrack.autolink]),
-      ([{ value }]) => !/^[0-9]{1,4}$|^[0-9]{5}/.test(value as string))),
-  ]),
-  constraint(State.autolink, state(State.autolink, fmap(convert(
-    source =>
-      `[${source}]{ ${source.includes('/')
-        ? `https://${source.slice(1, source.indexOf('#')).replace('/', '/@')}`
-        : `/${source.slice(0, source.indexOf('#'))}`
-      } }`,
-    union([unsafelink]),
-    false),
-    ([{ value: el }], { source, position, range = 0 }) => {
-      const src = source.slice(position - range, position);
-      const url = `${el.getAttribute('href')}?ch=${src.slice(src.indexOf('#') + 1).replace(/#/g, '+')}`;
-      return new List([new Data(define(el, { class: 'channel', href: url }, src))]);
-    })))));