securemark 0.295.0 → 0.295.2

package/src/parser/util.ts

@@ -1,35 +1,34 @@
+import { Parser, Result, List, Node, failsafe } from '../combinator/data/parser';
+import { Context, Command } from './context';
 import { min } from 'spica/alias';
-import { MarkdownParser } from '../../markdown';
-import { Command } from './context';
-import { Parser, Result, List, Data, Ctx, Node, Context, failsafe } from '../combinator/data/parser';
 import { define } from 'typed-dom/dom';
 
-export function* unwrap<N>(nodes: List<Data<N>> | undefined): Iterable<N> {
+export function* unwrap<N>(nodes: List<Node<N>> | undefined): Iterable<N> {
   if (nodes === undefined) return;
   for (const node of nodes) {
     yield node.value;
   }
 }
 
-export function repeat<P extends Parser<HTMLElement | string, MarkdownParser.Context>>(symbol: string, parser: P, cons: (nodes: List<Data<Node<P>>>, context: Context<P>) => List<Data<Node<P>>>, termination?: (acc: List<Data<Node<P>>>, context: Ctx, prefix: number, postfix: number, state: boolean) => Result<string | Node<P>>): P;
-export function repeat<N extends HTMLElement | string>(symbol: string, parser: Parser<N>, cons: (nodes: List<Data<N>>, context: MarkdownParser.Context) => List<Data<N>>, termination: (acc: List<Data<N>>, context: Ctx, prefix: number, postfix: number, state: boolean) => Result<string | N, MarkdownParser.Context> = (nodes, context, prefix, postfix) => {
-  const acc = new List<Data<string | N>>();
+export function repeat<P extends Parser<HTMLElement | string, Context>>(symbol: string, parser: P, cons: (nodes: List<Node<Parser.Node<P>>>, context: Parser.Context<P>) => List<Node<Parser.Node<P>>>, termination?: (acc: List<Node<Parser.Node<P>>>, context: Context, prefix: number, postfix: number, state: boolean) => Result<string | Parser.Node<P>>): P;
+export function repeat<N extends HTMLElement | string>(symbol: string, parser: Parser<N>, cons: (nodes: List<Node<N>>, context: Context) => List<Node<N>>, termination: (acc: List<Node<N>>, context: Context, prefix: number, postfix: number, state: boolean) => Result<string | N, Context> = (nodes, context, prefix, postfix) => {
+  const acc = new List<Node<string | N>>();
   if (prefix > 0) {
-    acc.push(new Data(symbol[0].repeat(prefix)));
+    acc.push(new Node(symbol[0].repeat(prefix)));
   }
   acc.import(nodes);
   if (postfix > 0) {
     const { source, position } = context;
-    acc.push(new Data(source.slice(position, position + postfix)));
+    acc.push(new Node(source.slice(position, position + postfix)));
     context.position += postfix;
   }
   return acc;
-}): Parser<string | N, MarkdownParser.Context> {
+}): Parser<string | N, Context> {
   return failsafe(input => {
     const { context } = input;
     const { source, position } = context;
     if (!source.startsWith(symbol, context.position)) return;
-    let nodes = new List<Data<N>>();
+    let nodes = new List<Node<N>>();
     let i = symbol.length;
     for (; source[context.position + i] === source[context.position];) ++i;
     context.position += i;

package/src/parser/visibility.ts

@@ -1,6 +1,5 @@
-import { MarkdownParser } from '../../markdown';
-import { Command } from './context';
-import { Parser, Input, List, Data, failsafe } from '../combinator/data/parser';
+import { Parser, Input, List, Node, failsafe } from '../combinator/data/parser';
+import { Context, Command } from './context';
 import { convert, fmap } from '../combinator';
 import { unsafehtmlentity } from './inline/htmlentity';
 import { invisibleHTMLEntityNames } from './api/normalize';
@@ -46,18 +45,18 @@ export function blankWith(starts: '' | '\n', delimiter?: string | RegExp): RegEx
 //      ? parser(input)
 //      : undefined;
 //}
-//const isLooseStart = reduce(({ source, context }: Input<MarkdownParser.Context>, except?: string): boolean => {
+//const isLooseStart = reduce(({ source, context }: Input<Context>, except?: string): boolean => {
 //  return isTightStart({ source: source.replace(blank.start, ''), context }, except);
 //}, ({ source }, except = '') => `${source}${Command.Separator}${except}`);
 
 export function tightStart<P extends Parser>(parser: P, except?: string): P;
-export function tightStart<N>(parser: Parser<N>, except?: string): Parser<N> {
+export function tightStart<N>(parser: Parser<N>, except?: string): Parser<N, Context> {
   return input =>
     isTightStart(input, except)
       ? parser(input)
       : undefined;
 }
-function isTightStart(input: Input<MarkdownParser.Context>, except?: string): boolean {
+function isTightStart(input: Input<Context>, except?: string): boolean {
   const { context } = input;
   const { source, position } = context;
   if (position === source.length) return true;
@@ -93,7 +92,7 @@ function isTightStart(input: Input<MarkdownParser.Context>, except?: string): bo
   }
 }
 
-export function isLooseNodeStart(nodes: List<Data<HTMLElement | string>>): boolean {
+export function isLooseNodeStart(nodes: List<Node<HTMLElement | string>>): boolean {
   if (nodes.length === 0) return true;
   for (const { value: node } of nodes) {
     if (isVisible(node)) return true;
@@ -101,7 +100,7 @@ export function isLooseNodeStart(nodes: List<Data<HTMLElement | string>>): boole
   }
   return false;
 }
-export function isTightNodeStart(nodes: List<Data<HTMLElement | string>>): boolean {
+export function isTightNodeStart(nodes: List<Node<HTMLElement | string>>): boolean {
   if (nodes.length === 0) return true;
   return isVisible(nodes.head!.value, 0);
 }
@@ -178,7 +177,7 @@ export function trimBlankEnd<N extends HTMLElement>(parser: Parser<N>): Parser<s
 //  }
 //  return nodes;
 //}
-export function trimBlankNodeEnd<N extends HTMLElement>(nodes: List<Data<string | N>>): List<Data<string | N>> {
+export function trimBlankNodeEnd<N extends HTMLElement>(nodes: List<Node<string | N>>): List<Node<string | N>> {
   const skip = nodes.length > 0 &&
     typeof nodes.last?.value === 'object' &&
     nodes.last.value.className === 'indexer'

package/src/util/quote.ts

@@ -1,8 +1,9 @@
 import { input } from '../combinator/data/parser';
+import { Context } from '../parser/context';
 import { cite } from '../parser/block/reply/cite';
 
 export function quote(anchor: string, range: Range): string {
-  const { context } = input('', {});
+  const { context } = input('', new Context());
   cite(input(`>>${anchor}`, context));
   if (context.position !== context.source.length) throw new Error(`Invalid anchor: ${anchor}`);
   fit(range);