securemark 0.294.0 → 0.294.1

package/src/parser/segment.ts

@@ -1,6 +1,6 @@
 import { MarkdownParser } from '../../markdown';
 import { Command } from './context';
-import { clean, eval } from '../combinator/data/parser';
+import { clean } from '../combinator/data/parser';
 import { union, some } from '../combinator';
 import { segment as heading } from './block/heading';
 import { segment as codeblock } from './block/codeblock';
@@ -48,13 +48,13 @@ export function* segment(source: string): Generator<string, undefined, undefined
     position: 0,
   };
   const input = { context };
-  while (context.position < source.length) {
+  for (; context.position < source.length;) {
     const { position } = context;
     const result = parser(input)!;
     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) {

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,11 +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> {
-  for (const node of nodes) {
+export function* unwrap<N>(nodes: List<Data<N>> | undefined): Iterable<N> {
+  for (const node of nodes ?? []) {
     yield node.value;
   }
 }
@@ -30,7 +30,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 +44,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;
       }