securemark 0.294.10 → 0.295.0

package/src/parser/inline/media.ts

@@ -30,24 +30,22 @@ export const media: MediaParser = lazy(() => constraint(State.media, open(
       ]), ']')),
       ']',
       true,
-      [3 | Backtrack.escbracket],
-      ([, ns = new List()], context) =>
-        context.linebreak === 0
-          ? ns
-          : undefined)),
+      [3 | Backtrack.escapable, 2 | Backtrack.ruby],
+      ([, ns = new List()], context) => {
+        if (context.linebreak !== 0) {
+          const head = context.position - context.range!;
+          return void setBacktrack(context, 2 | Backtrack.link | Backtrack.ruby, head);
+        }
+        return ns;
+      })),
     dup(surround(
       /{(?![{}])/y,
       inits([uri, some(option)]),
       / ?}/y,
-      false,
-      [3 | Backtrack.link],
+      false, [],
       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;
-      })),
+      ([as, bs]) =>
+        bs && as.import(bs).push(new Data(Command.Cancel)) && as)),
   ]),
   nodes =>
     nodes.length === 1
@@ -111,13 +109,13 @@ export const media: MediaParser = lazy(() => constraint(State.media, open(
 
 const bracket: MediaParser.TextParser.BracketParser = lazy(() => recursion(Recursion.terminal, union([
   surround(str('('), some(union([unsafehtmlentity, bracket, txt]), ')'), str(')'),
-    true, [3 | Backtrack.escbracket], undefined, () => new List()),
+    true, [3 | Backtrack.escapable], undefined, () => new List()),
   surround(str('['), some(union([unsafehtmlentity, bracket, txt]), ']'), str(']'),
-    true, [3 | Backtrack.escbracket], undefined, () => new List()),
+    true, [3 | Backtrack.escapable], undefined, () => new List()),
   surround(str('{'), some(union([unsafehtmlentity, bracket, txt]), '}'), str('}'),
-    true, [3 | Backtrack.escbracket], undefined, () => new List()),
+    true, [3 | Backtrack.escapable], undefined, () => new List()),
   surround(str('"'), precedence(2, some(union([unsafehtmlentity, txt]), '"')), str('"'),
-    true, [3 | Backtrack.escbracket], undefined, () => new List()),
+    true, [3 | Backtrack.escapable], undefined, () => new List()),
 ])));
 
 const option: MediaParser.ParameterParser.OptionParser = lazy(() => union([

package/src/parser/inline/reference.ts

@@ -18,7 +18,7 @@ export const reference: ReferenceParser = lazy(() => constraint(State.reference,
   ]))),
   ']]',
   false,
-  [1 | Backtrack.bracket, 3 | Backtrack.doublebracket],
+  [1 | Backtrack.common, 3 | Backtrack.doublebracket],
   ([, ns], context) => {
     const { position, range = 0, linebreak = 0 } = context;
     if (linebreak === 0) {
@@ -26,7 +26,7 @@ export const reference: ReferenceParser = lazy(() => constraint(State.reference,
     }
     else {
       const head = position - range;
-      setBacktrack(context, [2 | Backtrack.link], head, 2);
+      setBacktrack(context, 2 | Backtrack.link, head, 2);
     }
   },
   ([as, bs], context) => {
@@ -34,10 +34,10 @@ export const reference: ReferenceParser = lazy(() => constraint(State.reference,
     const { source, position, range = 0, linebreak = 0, state = 0 } = context;
     const head = position - range;
     if (source[position] !== ']') {
-      setBacktrack(context, [2 | Backtrack.bracket], head, 2);
+      setBacktrack(context, 2 | Backtrack.common, head, 2);
     }
     else if (linebreak !== 0) {
-      setBacktrack(context, [2 | Backtrack.link], head, 2);
+      setBacktrack(context, 2 | Backtrack.link | Backtrack.ruby, head, 2);
     }
     else {
       assert(source[position] === ']');
@@ -47,22 +47,22 @@ export const reference: ReferenceParser = lazy(() => constraint(State.reference,
       context.position += 1;
       let result: ReturnType<typeof textlink>;
       if (source[context.position] !== '{') {
-        setBacktrack(context, [2 | Backtrack.link], head + 1);
+        setBacktrack(context, 2 | Backtrack.link, head + 1);
         result = new List();
       }
       else {
-        result = !isBacktrack(context, [1 | Backtrack.link])
+        result = !isBacktrack(context, 1 | Backtrack.link)
           ? textlink({ context })
           : undefined;
         context.range = range;
         if (!result) {
-          setBacktrack(context, [2 | Backtrack.link], head + 1);
+          setBacktrack(context, 2 | Backtrack.link, head + 1);
           result = new List();
         }
       }
       assert(result);
       if (context.position === source.length) {
-        setBacktrack(context, [2 | Backtrack.link], head);
+        setBacktrack(context, 2 | Backtrack.link, head);
       }
       else {
         assert(state ^ State.link);
@@ -74,7 +74,7 @@ export const reference: ReferenceParser = lazy(() => constraint(State.reference,
           ([, cs = new List(), ds]) =>
             cs.import(ds),
           ([, cs = new List()]) => {
-            setBacktrack(context, [2 | Backtrack.link], head);
+            setBacktrack(context, 2 | Backtrack.link, head);
             return cs;
           })
           ({ context });

package/src/parser/inline/ruby.ts

@@ -13,7 +13,7 @@ export const ruby: RubyParser = lazy(() => bind(
     dup(surround(
       '[', text, ']',
       false,
-      [1 | Backtrack.bracket, 3 | Backtrack.ruby],
+      [1 | Backtrack.common, 3 | Backtrack.ruby],
       ([, ns]) => {
         ns && ns.last?.value === '' && ns.pop();
         return isTightNodeStart(ns) ? ns : undefined;
@@ -21,12 +21,12 @@ export const ruby: RubyParser = lazy(() => bind(
     dup(surround(
       '(', text, ')',
       false,
-      [1 | Backtrack.bracket, 3 | Backtrack.ruby])),
+      [3 | Backtrack.ruby])),
   ]),
   ([{ value: texts }, { value: rubies = undefined } = {}], context) => {
     if (rubies === undefined) {
       const head = context.position - context.range!;
-      return void setBacktrack(context, [2 | Backtrack.ruby], head);
+      return void setBacktrack(context, 2 | Backtrack.ruby, head);
     }
     switch (true) {
       case texts.length >= rubies.length:
@@ -62,7 +62,7 @@ export const ruby: RubyParser = lazy(() => bind(
     }
   }));
 
-const delimiter = /[$"`\[\](){}<>（）［］｛｝]|\\?\n/y;
+const delimiter = /[$"`\[\](){}<>（）［］｛｝|]|\\?\n/y;
 
 const text: RubyParser.TextParser = input => {
   const { context } = input;

package/src/parser/inline/template.ts

@@ -11,8 +11,7 @@ export const template: TemplateParser = lazy(() => surround(
   precedence(1,
   some(union([bracket, escsource]), '}')),
   str('}}'),
-  true,
-  [3 | Backtrack.doublebracket, 3 | Backtrack.escbracket],
+  true, [],
   ([as, bs = new List(), cs]) => new List([
     new Data(html('span', { class: 'template' }, defrag(unwrap(as.import(bs as List<Data<string>>).import(cs)))))
   ]),
@@ -28,20 +27,17 @@ export const template: TemplateParser = lazy(() => surround(
 
 const bracket: TemplateParser.BracketParser = lazy(() => union([
   surround(str('('), recursion(Recursion.terminal, some(union([bracket, escsource]), ')')), str(')'),
-    true, [3 | Backtrack.escbracket], undefined, () => new List()),
+    true, [3 | Backtrack.escapable], undefined, () => new List()),
   surround(str('['), recursion(Recursion.terminal, some(union([bracket, escsource]), ']')), str(']'),
-    true, [3 | Backtrack.escbracket], undefined, () => new List()),
+    true, [3 | Backtrack.escapable], undefined, () => new List()),
   surround(str('{'), recursion(Recursion.terminal, some(union([bracket, escsource]), '}')), str('}'),
-    true, [3 | Backtrack.escbracket], undefined, () => new List()),
+    true, [3 | Backtrack.escapable], 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>>)),
+    [3 | Backtrack.escapable],
+    undefined,
     ([as, bs]) => bs && as.import(bs as List<Data<string>>)),
 ]));

package/src/parser/visibility.ts

@@ -50,7 +50,7 @@ export function blankWith(starts: '' | '\n', delimiter?: string | RegExp): RegEx
 //  return isTightStart({ source: source.replace(blank.start, ''), context }, except);
 //}, ({ source }, except = '') => `${source}${Command.Separator}${except}`);
 
-export function tightStart<P extends Parser<unknown>>(parser: P, except?: string): P;
+export function tightStart<P extends Parser>(parser: P, except?: string): P;
 export function tightStart<N>(parser: Parser<N>, except?: string): Parser<N> {
   return input =>
     isTightStart(input, except)
@@ -140,7 +140,7 @@ export function trimBlank<P extends Parser<HTMLElement | string>>(parser: P): P;
 export function trimBlank<N extends HTMLElement | string>(parser: Parser<N>): Parser<N> {
   return trimBlankStart(trimBlankEnd(parser));
 }
-export function trimBlankStart<P extends Parser<unknown>>(parser: P): P;
+export function trimBlankStart<P extends Parser>(parser: P): P;
 export function trimBlankStart<N>(parser: Parser<N>): Parser<N> {
   return failsafe(input => {
     const { context } = input;