securemark 0.294.9 → 0.294.11

package/src/parser/inline/extension/index.ts

@@ -22,7 +22,7 @@ export const index: IndexParser = lazy(() => constraint(State.index, fmap(indexe
   ]), ']', [[']', 1]])))),
   str(']'),
   false,
-  [3 | Backtrack.bracket],
+  [3 | Backtrack.common],
   ([, bs], context) =>
     context.linebreak === 0 && trimBlankNodeEnd(bs).length > 0
       ? new List([new Data(html('a', { 'data-index': dataindex(bs) }, defrag(unwrap(bs))))])
@@ -50,11 +50,11 @@ export const signature: IndexParser.SignatureParser = lazy(() => validate('|', s
   str(/\|(?!\\?\s)/y),
   some(union([
     unsafehtmlentity,
-    some(txt, /(?:[$"`\[\](){}<>（）［］｛｝])/y),
+    some(txt, /(?:[$"`\[\](){}<>（）［］｛｝|])/y),
   ]), ']'),
   /(?=])/y,
   false,
-  [3 | Backtrack.bracket],
+  [3 | Backtrack.escapable],
   ([, ns], context) => {
     const index = identity('index', undefined, ns.foldl((acc, { value }) => acc + value, ''))?.slice(7);
     return index && context.linebreak === 0

package/src/parser/inline/extension/label.ts

@@ -14,7 +14,7 @@ export const segment: ExtensionParser.LabelParser.SegmentParser = clear(union([
 
 export const label: ExtensionParser.LabelParser = constraint(State.label, fmap(
   union([
-    surround('[', body, ']', false, [1 | Backtrack.bracket, 1]),
+    surround('[', body, ']', false, [1 | Backtrack.common]),
     body,
   ]),
   ([{ value }]) => new List([

package/src/parser/inline/extension/placeholder.ts

@@ -19,7 +19,7 @@ export const placeholder: ExtensionParser.PlaceholderParser = lazy(() => surroun
   tightStart(some(union([inline]), ']', [[']', 1]])))),
   str(']'),
   false,
-  [3 | Backtrack.bracket],
+  [3 | Backtrack.common],
   (_, context) => new List([
     new Data(html('span',
       {

package/src/parser/inline/htmlentity.ts

@@ -9,7 +9,7 @@ import { html } from 'typed-dom/dom';
 export const unsafehtmlentity: UnsafeHTMLEntityParser = surround(
   str('&'), str(/[0-9A-Za-z]+/y), str(';'),
   false,
-  [3 | Backtrack.bracket],
+  [3 | Backtrack.unescapable],
   ([as, bs, cs]) =>
     new List([new Data(parser(as.head!.value + bs.head!.value + cs.head!.value))]),
   ([as, bs]) =>

package/src/parser/inline/link.ts

@@ -24,26 +24,24 @@ export const textlink: LinkParser.TextLinkParser = lazy(() => constraint(State.l
       trimBlankStart(some(union([inline]), ']', [[']', 1]])),
       ']',
       true,
-      [3 | Backtrack.bracket, 3 | Backtrack.link, 2 | Backtrack.ruby],
-      ([, ns = new List()], context) =>
-        context.linebreak === 0
-          ? ns.push(new Data(Command.Separator)) && ns
-          : undefined)),
+      [3 | Backtrack.common, 3 | Backtrack.link, 2 | Backtrack.ruby],
+      ([, ns = new List()], context) => {
+        if (context.linebreak !== 0) {
+          const head = context.position - context.range!;
+          return void setBacktrack(context, [2 | Backtrack.link, 2 | Backtrack.ruby], head);
+        }
+        return ns.push(new Data(Command.Separator)) && ns;
+      })),
     // `{ `と`{`で個別にバックトラックが発生し+1nされる。
     // 自己再帰的にパースしてもオプションの不要なパースによる計算量の増加により相殺される。
     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)),
   ]),
   ([{ value: content }, { value: params = undefined } = {}], context) => {
     if (content.last!.value === Command.Separator) {

package/src/parser/inline/math.ts

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

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, 2 | 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) {
@@ -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, 2 | Backtrack.ruby], head, 2);
     }
     else {
       assert(source[position] === ']');

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,7 +21,7 @@ export const ruby: RubyParser = lazy(() => bind(
     dup(surround(
       '(', text, ')',
       false,
-      [1 | Backtrack.bracket, 3 | Backtrack.ruby])),
+      [1 | Backtrack.common, 3 | Backtrack.ruby])),
   ]),
   ([{ value: texts }, { value: rubies = undefined } = {}], context) => {
     if (rubies === undefined) {
@@ -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/shortmedia.ts

@@ -8,12 +8,10 @@ export const shortmedia: ShortMediaParser = constraint(State.media, rewrite(
   open('!', url),
   convert(
     source => `!{ ${source.slice(1)} }`,
-    union([media]),
-    false)));
+    union([media]))));
 
-export const lineshortmedia: ShortMediaParser.LineShortMediaParser = focus(
+export const lineshortmedia: ShortMediaParser.LineShortMediaParser = constraint(State.media, focus(
   /(?<=^|[\r\n])!https?:\/\/\S+(?=[^\S\n]*(?:$|\n))/y,
   convert(
     source => `!{ ${source.slice(1)} }`,
-    union([media]),
-    false));
+    union([media]))));

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

@@ -5,41 +5,23 @@ import { convert, fmap } from '../combinator';
 import { unsafehtmlentity } from './inline/htmlentity';
 import { invisibleHTMLEntityNames } from './api/normalize';
 
-export namespace blank {
+namespace blank {
   export const line = new RegExp(
-    // TODO: 行全体をエスケープ
-    /^(\\?[^\S\r\n]|&IHN;|<wbr ?>|\\$)+$/mg.source
+    /((?:^|\n)[^\S\n]*(?=\S))((?:[^\S\n]|\\(?=$|\s)|&IHN;|<wbr ?>)+(?=$|\n))/g.source
       .replace('IHN', `(?:${invisibleHTMLEntityNames.join('|')})`),
-    'gm');
+    'g');
   export const start = new RegExp(
-    /(?:\\?[^\S\r\n]|&IHN;|<wbr ?>)+/y.source
-      .replace('IHN', `(?:${invisibleHTMLEntityNames.join('|')})`), 'y');
+    /(?:[^\S\n]|\\(?=$|\s)|&IHN;|<wbr ?>)+/y.source
+      .replace('IHN', `(?:${invisibleHTMLEntityNames.join('|')})`),
+    'y');
 }
 
 export function visualize<P extends Parser<HTMLElement | string>>(parser: P): P;
 export function visualize<N extends HTMLElement | string>(parser: Parser<N>): Parser<N> {
   return convert(
-    source => source.replace(blank.line, `${Command.Escape}$1`),
-    parser,
-    false);
+    source => source.replace(blank.line, `$1${Command.Escape}$2`),
+    parser);
 }
-//function hasVisible(
-//  nodes: readonly (HTMLElement | string)[],
-//): boolean {
-//  for (let i = 0; i < nodes.length; ++i) {
-//    const node = nodes[i];
-//    if (typeof node === 'string') {
-//      if (node && node.trimStart()) return true;
-//    }
-//    else {
-//      if (node.innerText.trimStart()) return true;
-//      if (node.classList.contains('reference')) return true;
-//      //if (state & State.media ^ State.media &&
-//      //    (node.classList.contains('media') || node.getElementsByClassName('media')[0])) return true;
-//    }
-//  }
-//  return false;
-//}
 
 export function blankWith(delimiter: string | RegExp): RegExp;
 export function blankWith(starts: '' | '\n', delimiter: string | RegExp): RegExp;