securemark 0.294.11 → 0.295.1

package/src/combinator/data/parser/union.ts

@@ -1,6 +1,6 @@
 import { Parser, Ctx, Node, Context, SubParsers, SubNode } from '../parser';
 
-export function union<P extends Parser<unknown>>(parsers: SubParsers<P>): SubNode<P> extends Node<P> ? P : Parser<SubNode<P>, Context<P>, SubParsers<P>>;
+export function union<P extends Parser>(parsers: SubParsers<P>): SubNode<P> extends Node<P> ? P : Parser<SubNode<P>, Context<P>, SubParsers<P>>;
 export function union<N, D extends Parser<N>[]>(parsers: D): Parser<N, Ctx, D> {
   assert(parsers.every(f => f));
   switch (parsers.length) {

package/src/combinator/data/parser.ts

@@ -1,7 +1,7 @@
 import { List } from './data';
 import { Delimiters } from './parser/context/delimiter';
 
-export type Parser<N, C extends Ctx = Ctx, D extends Parser<unknown, C>[] = any>
+export type Parser<N = unknown, C extends Ctx = Ctx, D extends Parser<unknown, C>[] = any>
   = (input: Input<C>) => Result<N, C, D>;
 export interface Input<C extends Ctx = Ctx> {
   readonly context: C;
@@ -35,6 +35,7 @@ export interface CtxOptions {
   // 最大セグメントサイズ10KB内で探索コストが平均実行性能を圧迫するほど大きくなるとは考えにくいが
   // 探索コストを減らすにはバックトラック位置数が規定数を超えた場合一定区間ごとに探索木を分割する方法が考えられる。
   // 10KBの入力すべてを保持する探索木を1024文字ごとに分割するために必要なテーブルサイズは64bit*98=784byteとなる。
+  // 128文字ごとでもテーブルサイズは入力全体の1%未満であるため無視でき16文字ごとでさえ6.25%に過ぎない。
   // 探索木のポインタによるオーバーヘッドを考慮すれば一定サイズ以上ではテーブルのほうが効率的となる。
   // 区間別テーブルは固定サイズであるためプールして再使用できる。
   // 従って分割時のデータ構造は区間ごとに探索木を動的に生成しデータ数に応じてテーブルに移行するのが最も効率的である。
@@ -64,13 +65,13 @@ export interface CtxOptions {
   linebreak?: number;
   range?: number;
 }
-export type Node<P extends Parser<unknown>> = P extends Parser<infer N> ? N : never;
-export type SubParsers<P extends Parser<unknown>> = P extends Parser<unknown, Ctx, infer D> ? D : never;
-export type Context<P extends Parser<unknown>> = P extends Parser<unknown, infer C> ? C : never;
-export type SubNode<P extends Parser<unknown>> = ExtractSubNode<SubParsers<P>>;
-export type IntermediateParser<P extends Parser<unknown>> = Parser<SubNode<P>, Context<P>, SubParsers<P>>;
-type ExtractSubNode<D extends Parser<unknown>[]> = ExtractSubParser<D> extends infer N ? N extends Parser<infer U> ? U : never : never;
-type ExtractSubParser<D extends Parser<unknown>[]> = D extends (infer P)[] ? P extends Parser<unknown> ? P : never : never;
+export type Node<P extends Parser> = P extends Parser<infer N> ? N : never;
+export type SubParsers<P extends Parser> = P extends Parser<unknown, Ctx, infer D> ? D : never;
+export type Context<P extends Parser> = P extends Parser<unknown, infer C> ? C : never;
+export type SubNode<P extends Parser> = ExtractSubNode<SubParsers<P>>;
+export type IntermediateParser<P extends Parser> = Parser<SubNode<P>, Context<P>, SubParsers<P>>;
+type ExtractSubNode<D extends Parser[]> = ExtractSubParser<D> extends infer N ? N extends Parser<infer U> ? U : never : never;
+type ExtractSubParser<D extends Parser[]> = D extends (infer P)[] ? P extends Parser ? P : never : never;
 
 export function input<C extends CtxOptions>(source: string, context: C): Input<C & Ctx> {
   // @ts-expect-error
@@ -95,7 +96,7 @@ export function subinput<C extends Ctx>(source: string, context: C): Input<C> {
   };
 }
 
-export function failsafe<P extends Parser<unknown>>(parser: P): P;
+export function failsafe<P extends Parser>(parser: P): P;
 export function failsafe<N>(parser: Parser<N>): Parser<N> {
   assert(parser);
   return input => {

package/src/parser/context.ts

@@ -29,14 +29,14 @@ export const enum Recursion {
 
 export const enum Backtrack {
   // 構文
-  doublebracket = 1 << 6,
-  link = 1 << 5,
-  ruby = 1 << 4,
+  doublebracket = 1 << 7,
+  link = 1 << 6,
+  ruby = 1 << 5,
   // 特殊構造
-  escapable = 1 << 3,
-  unescapable = 1 << 2,
+  escapable = 1 << 4,
+  unescapable = 1 << 3,
   // 共通構造
-  common = 0 << 2,
+  common = 1 << 2,
 }
 
 export const enum Command {

package/src/parser/inline/annotation.ts

@@ -13,7 +13,7 @@ export const annotation: AnnotationParser = lazy(() => constraint(State.annotati
   trimBlankStart(some(union([inline]), ')', [[')', 1]])))),
   '))',
   false,
-  [1 | Backtrack.common, 3 | Backtrack.doublebracket],
+  [2, 1 | Backtrack.common, 3 | Backtrack.doublebracket],
   ([, ns], context) =>
     context.linebreak === 0
       ? new List([new Data(html('sup', { class: 'annotation' }, [html('span', defrag(unwrap(trimBlankNodeEnd(ns))))]))])

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

@@ -47,7 +47,7 @@ export const account: AutolinkParser.AccountParser = lazy(() => constraint(State
     ([[{ value: host }, { value: account }]], context) => {
       if (context.source[context.position] === '#') {
         assert(context.source[context.position - context.range!] === '@');
-        return void setBacktrack(context, [2 | Backtrack.unescapable], context.position - context.range!);
+        return void setBacktrack(context, 2 | Backtrack.unescapable, context.position - context.range!);
       }
       return new List([
         new Data(define(

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

@@ -27,19 +27,18 @@ export const lineurl: AutolinkParser.UrlParser.LineUrlParser = lazy(() => focus(
     str('!'),
     union([
       constraint(State.autolink, state(State.autolink, ({ context }) => {
-        const { source, position, range = 0 } = context;
-        context.position -= position > 0 && source[position - 1] === '!' ? 1 : 0;
-        context.position += range;
+        const { source, position } = context;
+        context.position -= source[0] === '!' ? 1 : 0;
         return new List([
           new Data(parse(
             new List(),
-            new List([new Data(source.slice(position, context.position))]),
+            new List([new Data(source.slice(position))]),
             context))
         ]);
       })),
       str(/[^:]+/y),
     ]),
-  ]), false));
+  ])));
 
 const bracket: AutolinkParser.UrlParser.BracketParser = lazy(() => union([
   surround(str('('), recursion(Recursion.terminal, some(union([bracket, unescsource]), ')')), str(')'),

package/src/parser/inline/bracket.ts

@@ -38,22 +38,32 @@ const p1 = lazy(() => surround(
   str('('),
   precedence(1, recursion(Recursion.bracket, some(inline, ')', [[')', 1]]))),
   str(')'),
-  true,
-  [2 | Backtrack.common],
-  ([as, bs = new List(), cs], { source, position, range = 0 }) => {
+  true, [],
+  ([as, bs = new List(), cs], context) => {
+    const { source, position, range = 0 } = context;
+    const head = position - range;
+    if (context.linebreak !== 0 || source[position - 2] !== ')' || source[head + 1] !== '(') {
+      setBacktrack(context, 2 | Backtrack.doublebracket, head);
+    }
     const str = source.slice(position - range + 1, position - 1);
     return indexA.test(str)
       ? new List([new Data(as.head!.value), new Data(str), new Data(cs.head!.value)])
       : new List([new Data(html('span', { class: 'paren' }, defrag(unwrap(as.import(bs as List<Data<string>>).import(cs)))))]);
   },
-  ([as, bs = new List()]) => as.import(bs as List<Data<string>>)));
+  ([as, bs = new List()], context) => {
+    const { source, position, range = 0 } = context;
+    const head = position - range;
+    if (context.linebreak !== 0 || source[head + 1] !== '(') {
+      setBacktrack(context, 2 | Backtrack.doublebracket, head);
+    }
+    return as.import(bs as List<Data<string>>);
+  }));
 
 const p2 = lazy(() => surround(
   str('（'),
   precedence(1, recursion(Recursion.bracket, some(inline, '）', [['）', 1]]))),
   str('）'),
-  true,
-  [2 | Backtrack.common],
+  true, [],
   ([as, bs = [], cs], { source, position, range = 0 }) => {
     const str = source.slice(position - range + 1, position - 1);
     return indexF.test(str)
@@ -72,20 +82,23 @@ const s1 = lazy(() => surround(
     if (context.state! & State.link) {
       const { source, position, range = 0 } = context;
       const head = position - range;
+      if (context.linebreak !== 0 || source[position - 2] !== ']' || source[head + 1] !== '[') {
+        setBacktrack(context, 2 | Backtrack.doublebracket, head);
+      }
       if (context.linebreak !== 0) {
-        setBacktrack(context, [2 | Backtrack.link, 2 | Backtrack.ruby], head);
+        setBacktrack(context, 2 | Backtrack.doublebracket | Backtrack.link | Backtrack.ruby, head);
       }
       else if (source[position] !== '{') {
-        setBacktrack(context, [2 | Backtrack.link], head);
+        setBacktrack(context, 2 | Backtrack.link, head);
       }
       else {
         context.state! ^= State.link;
-        const result = !isBacktrack(context, [1 | Backtrack.link])
+        const result = !isBacktrack(context, 1 | Backtrack.link)
           ? textlink({ context })
           : undefined;
         context.position = position;
         if (!result) {
-          setBacktrack(context, [2 | Backtrack.link], head);
+          setBacktrack(context, 2 | Backtrack.link, head);
         }
         context.state! ^= State.link;
         context.range = range;
@@ -99,8 +112,7 @@ const s2 = lazy(() => surround(
   str('［'),
   precedence(1, recursion(Recursion.bracket, some(inline, '］', [['］', 1]]))),
   str('］'),
-  true,
-  [2 | Backtrack.common],
+  true, [],
   undefined,
   ([as, bs = new List()]) => as.import(bs as List<Data<string>>)));
 
@@ -108,8 +120,7 @@ const c1 = lazy(() => surround(
   str('{'),
   precedence(1, recursion(Recursion.bracket, some(inline, '}', [['}', 1]]))),
   str('}'),
-  true,
-  [2 | Backtrack.common],
+  true, [],
   undefined,
   ([as, bs = new List()]) => as.import(bs as List<Data<string>>)));
 
@@ -117,8 +128,7 @@ const c2 = lazy(() => surround(
   str('｛'),
   precedence(1, recursion(Recursion.bracket, some(inline, '｝', [['｝', 1]]))),
   str('｝'),
-  true,
-  [2 | Backtrack.common],
+  true, [],
   undefined,
   ([as, bs = new List()]) => as.import(bs as List<Data<string>>)));
 
@@ -127,7 +137,6 @@ const d1 = lazy(() => surround(
   // 改行の優先度を構文ごとに変える場合シグネチャの優先度対応が必要
   precedence(2, recursion(Recursion.bracket, some(inline, /["\n]/y, [['"', 2], ['\n', 3]]))),
   str('"'),
-  true,
-  [2 | Backtrack.common],
+  true, [],
   undefined,
   ([as, bs = new List()]) => as.import(bs as List<Data<string>>)));

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

@@ -3,7 +3,7 @@ import { Parser, List, Data } from '../../../combinator/data/parser';
 import { fmap } from '../../../combinator';
 import { define } from 'typed-dom/dom';
 
-export function indexee<P extends Parser<unknown, MarkdownParser.Context>>(parser: P): P;
+export function indexee<P extends Parser<HTMLElement, MarkdownParser.Context>>(parser: P): P;
 export function indexee(parser: Parser<HTMLElement, MarkdownParser.Context>): Parser<HTMLElement> {
   return fmap(parser, (ns, { id }) =>
     ns.length === 1

package/src/parser/inline/link.ts

@@ -24,11 +24,11 @@ export const textlink: LinkParser.TextLinkParser = lazy(() => constraint(State.l
       trimBlankStart(some(union([inline]), ']', [[']', 1]])),
       ']',
       true,
-      [3 | Backtrack.common, 3 | Backtrack.link, 2 | Backtrack.ruby],
+      [3 | Backtrack.common | 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 void setBacktrack(context, 2 | Backtrack.link | Backtrack.ruby, head);
         }
         return ns.push(new Data(Command.Separator)) && ns;
       })),
@@ -48,7 +48,7 @@ export const textlink: LinkParser.TextLinkParser = lazy(() => constraint(State.l
       content.pop();
       if (params === undefined) {
         const head = context.position - context.range!;
-        return void setBacktrack(context, [2 | Backtrack.link], head);
+        return void setBacktrack(context, 2 | Backtrack.link, head);
       }
     }
     else {

package/src/parser/inline/media.ts

@@ -34,7 +34,7 @@ export const media: MediaParser = lazy(() => constraint(State.media, open(
       ([, 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 void setBacktrack(context, 2 | Backtrack.link | Backtrack.ruby, head);
         }
         return ns;
       })),

package/src/parser/inline/reference.ts

@@ -18,7 +18,7 @@ export const reference: ReferenceParser = lazy(() => constraint(State.reference,
   ]))),
   ']]',
   false,
-  [1 | Backtrack.common, 3 | Backtrack.doublebracket],
+  [2, 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.common], head, 2);
+      setBacktrack(context, 2 | Backtrack.common, head, 2);
     }
     else if (linebreak !== 0) {
-      setBacktrack(context, [2 | Backtrack.link, 2 | Backtrack.ruby], 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

@@ -21,12 +21,12 @@ export const ruby: RubyParser = lazy(() => bind(
     dup(surround(
       '(', text, ')',
       false,
-      [1 | Backtrack.common, 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:

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;