securemark 0.294.0 → 0.294.2

package/src/parser/inline/emstrong.ts

@@ -1,6 +1,6 @@
 import { EmStrongParser, EmphasisParser, StrongParser } from '../inline';
 import { Recursion, Command } from '../context';
-import { Result, List, Data, Node, Context, IntermediateParser, eval } from '../../combinator/data/parser';
+import { Result, List, Data, Node, Context, IntermediateParser } from '../../combinator/data/parser';
 import { union, some, recursion, precedence, validate, surround, open, lazy, bind } from '../../combinator';
 import { inline } from '../inline';
 import { strong } from './strong';
@@ -105,7 +105,7 @@ export const emstrong: EmStrongParser = lazy(() => validate('***',
           case 0:
             break;
           case 1:
-            nodes = eval(bind<EmphasisParser>(
+            nodes = bind<EmphasisParser>(
               subemphasis,
               ds => {
                 const { source } = context;
@@ -117,11 +117,11 @@ export const emstrong: EmStrongParser = lazy(() => validate('***',
                   return prepend('*', nodes.import(ds));
                 }
               })
-              ({ context })) ?? prepend('*', nodes);
+              ({ context }) ?? prepend('*', nodes);
             prefix -= 1;
             break;
           case 2:
-            nodes = eval(bind<StrongParser>(
+            nodes = bind<StrongParser>(
               substrong,
               ds => {
                 const { source } = context;
@@ -133,7 +133,7 @@ export const emstrong: EmStrongParser = lazy(() => validate('***',
                   return prepend('**', nodes.import(ds));
                 }
               })
-              ({ context })) ?? prepend('**', nodes);
+              ({ context }) ?? prepend('**', nodes);
             prefix -= 2;
             break;
         }

package/src/parser/inline/reference.ts

@@ -1,6 +1,6 @@
 import { ReferenceParser } from '../inline';
 import { State, Backtrack, Command } from '../context';
-import { List, Data, eval } from '../../combinator/data/parser';
+import { List, Data } from '../../combinator/data/parser';
 import { union, subsequence, some, precedence, state, constraint, surround, isBacktrack, setBacktrack, lazy } from '../../combinator';
 import { inline } from '../inline';
 import { textlink } from './link';
@@ -78,7 +78,7 @@ export const reference: ReferenceParser = lazy(() => constraint(State.reference,
           })
           ({ context });
         if (state & State.annotation && next) {
-          return (as as List<Data<string | HTMLElement>>).import(bs).import(eval(result!)).import(eval(next));
+          return (as as List<Data<string | HTMLElement>>).import(bs).import(result).import(next);
         }
       }
       context.position = position;

package/src/parser/inline/ruby.ts

@@ -1,6 +1,6 @@
 import { RubyParser } from '../inline';
 import { Backtrack } from '../context';
-import { List, Data, eval } from '../../combinator/data/parser';
+import { List, Data } from '../../combinator/data/parser';
 import { inits, surround, setBacktrack, dup, lazy, bind } from '../../combinator';
 import { unsafehtmlentity } from './htmlentity';
 import { txt } from '../source';
@@ -76,7 +76,7 @@ const text: RubyParser.TextParser = input => {
       case '&': {
         const result = unsafehtmlentity(input) ?? txt(input)!;
         assert(result);
-        acc.last!.value += eval(result).head!.value;
+        acc.last!.value += result.head!.value;
         continue;
       }
       default: {
@@ -88,7 +88,7 @@ const text: RubyParser.TextParser = input => {
         }
         const result = txt(input)!;
         assert(result);
-        acc.last!.value += eval(result).head?.value ?? '';
+        acc.last!.value += result.head?.value ?? '';
         continue;
       }
     }
@@ -103,7 +103,7 @@ const text: RubyParser.TextParser = input => {
 function* zip<N extends List.Node>(a: List<N>, b: List<N>): Iterable<[N | undefined, N | undefined]> {
   const ia = a[Symbol.iterator]();
   const ib = b[Symbol.iterator]();
-  while (true) {
+  for (; ;) {
     const ra = ia.next();
     const rb = ib.next();
     if (ra.done) break;

package/src/parser/processor/note.ts

@@ -191,7 +191,7 @@ function* proc(defs: Map<string, HTMLLIElement>, note: HTMLOListElement): Genera
   for (const [key, def] of defs) {
     defs.delete(key);
     ++count;
-    while (length > size) {
+    for (; length > size;) {
       const node = children[count - 1] as HTMLLIElement;
       if (equal(node, def)) continue I;
       yield note.removeChild(node);
@@ -207,7 +207,7 @@ function* proc(defs: Map<string, HTMLLIElement>, note: HTMLOListElement): Genera
     ++length;
     assert(children.length === length);
   }
-  while (length > size) {
+  for (; length > size;) {
     yield note.removeChild(children[size] as HTMLLIElement);
     --length;
     assert(children.length === length);

package/src/parser/segment.ts

@@ -1,6 +1,5 @@
 import { MarkdownParser } from '../../markdown';
 import { Command } from './context';
-import { clean, eval } from '../combinator/data/parser';
 import { union, some } from '../combinator';
 import { segment as heading } from './block/heading';
 import { segment as codeblock } from './block/codeblock';
@@ -43,18 +42,13 @@ const parser: SegmentParser = union([
 export function* segment(source: string): Generator<string, undefined, undefined> {
   if (!validate(source, MAX_INPUT_SIZE)) return yield `${Command.Error}Too large input over ${MAX_INPUT_SIZE.toLocaleString('en')} bytes.\n${source.slice(0, 1001)}`;
   assert(source.length < Number.MAX_SAFE_INTEGER);
-  const context = {
-    source,
-    position: 0,
-  };
-  const input = { context };
-  while (context.position < source.length) {
-    const { position } = context;
-    const result = parser(input)!;
+  for (let position = 0; position < source.length;) {
+    const context = { source, position };
+    const result = parser({ context })!;
     assert(result);
     assert(context.position > position);
-    const segs = eval(result).length > 0
-      ? eval(result).foldl<string[]>((acc, { value }) => void acc.push(value) || acc, [])
+    const segs = result.length > 0
+      ? result.foldl<string[]>((acc, { value }) => void acc.push(value) || acc, [])
       : [source.slice(position, context.position)];
     assert(segs.join('') === source.slice(position, context.position));
     for (let i = 0; i < segs.length; ++i) {
@@ -63,7 +57,7 @@ export function* segment(source: string): Generator<string, undefined, undefined
         ? yield seg
         : yield `${Command.Error}Too large segment over ${MAX_SEGMENT_SIZE.toLocaleString('en')} bytes.\n${seg}`
     }
-    clean(context);
+    position = context.position;
   }
 }
 

package/src/parser/source/line.ts

@@ -4,6 +4,7 @@ import { List } from '../../combinator/data/parser';
 export const anyline: AnyLineParser = input => {
   const { context } = input;
   const { source, position } = context;
+  if (position === source.length) return;
   context.position = source.indexOf('\n', position) + 1 || source.length;
   return new List();
 };
@@ -11,6 +12,8 @@ const regEmptyline = /[^\S\n]*(?:$|\n)/y;
 export const emptyline: EmptyLineParser = input => {
   const { context } = input;
   const { source, position } = context;
+  if (position === source.length) return;
+  if (source[position] === '\n') return ++context.position, new List();
   regEmptyline.lastIndex = position;
   regEmptyline.test(source);
   const i = regEmptyline.lastIndex;
@@ -22,6 +25,8 @@ const regContentline = /[^\S\n]*\S[^\n]*(?:$|\n)/y;
 export const contentline: ContentLineParser = input => {
   const { context } = input;
   const { source, position } = context;
+  if (position === source.length) return;
+  if (source[position] === '\n') return;
   regContentline.lastIndex = position;
   regContentline.test(source);
   const i = regContentline.lastIndex;

package/src/parser/source/str.ts

@@ -13,7 +13,7 @@ export function strs(pattern: string): Parser<string> {
   return ({ context }) => {
     const { source } = context;
     let acc = '';
-    while (context.position < source.length && source.startsWith(pattern, context.position)) {
+    for (; context.position < source.length && source.startsWith(pattern, context.position);) {
       acc += pattern;
       context.position += pattern.length;
     }

package/src/parser/util.ts

@@ -1,10 +1,11 @@
 import { min } from 'spica/alias';
 import { MarkdownParser } from '../../markdown';
 import { Command } from './context';
-import { Parser, Result, List, Data, Ctx, Node, Context, eval, failsafe } from '../combinator/data/parser';
+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>>): Iterable<N> {
+export function* unwrap<N>(nodes: List<Data<N>> | undefined): Iterable<N> {
+  if (nodes === undefined) return;
   for (const node of nodes) {
     yield node.value;
   }
@@ -30,7 +31,7 @@ export function repeat<N extends HTMLElement | string>(symbol: string, parser: P
     assert(source.startsWith(symbol, context.position));
     let nodes = new List<Data<N>>();
     let i = symbol.length;
-    while (source[context.position + i] === source[context.position]) ++i;
+    for (; source[context.position + i] === source[context.position];) ++i;
     context.position += i;
     let state = false;
     for (; i >= symbol.length; i -= symbol.length) {
@@ -44,7 +45,7 @@ export function repeat<N extends HTMLElement | string>(symbol: string, parser: P
       const result = parser(input);
       context.buffer = buf;
       if (result === undefined) break;
-      nodes = eval(result);
+      nodes = result;
       switch (nodes.last?.value) {
         case Command.Cancel:
           assert(!source.startsWith(symbol, context.position));

package/src/parser/visibility.ts

@@ -1,6 +1,6 @@
 import { MarkdownParser } from '../../markdown';
 import { Command } from './context';
-import { Parser, Input, List, Data, eval, failsafe } from '../combinator/data/parser';
+import { Parser, Input, List, Data, failsafe } from '../combinator/data/parser';
 import { convert, fmap } from '../combinator';
 import { unsafehtmlentity } from './inline/htmlentity';
 import { invisibleHTMLEntityNames } from './api/normalize';
@@ -93,7 +93,7 @@ function isTightStart(input: Input<MarkdownParser.Context>, except?: string): bo
       switch (true) {
         case source.length - position > 2
           && source[position + 1] !== ' '
-          && eval(unsafehtmlentity(input))?.head?.value.trimStart() === '':
+          && unsafehtmlentity(input)?.head?.value.trimStart() === '':
           context.position = position;
           return false;
       }