securemark 0.299.2 → 0.299.4

package/src/parser/repeat.ts

@@ -1,17 +1,18 @@
 import { Parser, Result, List, Node } from '../combinator/data/parser';
 import { tester } from '../combinator/data/delimiter';
+import { recur } from '../combinator';
 import { Context, Recursion, Command } from './context';
 import { min } from 'spica/alias';
 
 export function repeat<P extends Parser<HTMLElement | string, Context>>(
-  opener: string, after: string | RegExp, closer: string, recursions: readonly Recursion[], parser: P,
+  opener: string, after: string | RegExp, closer: string, recursion: Recursion, parser: P,
   cons: (nodes: List<Node<Parser.Node<P>>>, context: Parser.Context<P>, lead: number, follow: number) =>
     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>(
-  opener: string, after: string | RegExp, closer: string, rs: readonly Recursion[], parser: Parser<N>,
+  opener: string, after: string | RegExp, closer: string, recursion: Recursion, parser: Parser<N>,
   cons: (nodes: List<Node<N>>, context: Context, lead: number, follow: number) =>
     List<Node<N>>,
   termination: (acc: List<Node<N>>, context: Context, prefix: number, postfix: number, state: boolean) =>
@@ -35,7 +36,7 @@ export function repeat<N extends HTMLElement | string>(
   const test = tester(after, false);
   return input => {
     const context = input;
-    const { source, position, resources: { recursions } = {} } = context;
+    const { source, position, resources: { recursions } } = context;
     if (!source.startsWith(opener, context.position)) return;
     let nodes = new List<Node<N>>();
     let i = opener.length;
@@ -46,20 +47,11 @@ export function repeat<N extends HTMLElement | string>(
       return;
     }
     let depth = i / opener.length + 1 | 0;
-    if (recursions) for (const recursion of rs) {
-      const rec = min(recursion, recursions.length - 1);
-      if (rec === -1) continue;
-      if (recursions[rec] < depth - 1) throw new Error('Too much recursion');
-      recursions[rec] -= depth;
-    }
+    recur(recursions, recursion, depth, true);
     let state = false;
     let follow = 0;
     for (; i >= opener.length; i -= opener.length, follow -= closer.length) {
-      if (recursions) for (const recursion of rs) {
-        const rec = min(recursion, recursions.length - 1);
-        if (rec === -1) continue;
-        recursions[rec] += 1;
-      }
+      recur(recursions, recursion, -1);
       depth -= 1;
       const lead = i - opener.length;
       if (source.startsWith(closer, context.position)) {
@@ -109,11 +101,7 @@ export function repeat<N extends HTMLElement | string>(
       }
       break;
     }
-    if (recursions) for (let i = 0; i < depth; ++i) for (const recursion of rs) {
-      const rec = min(recursion, recursions.length - 1);
-      if (rec === -1) continue;
-      recursions[rec] += depth;
-    }
+    recur(recursions, recursion, -depth);
     depth = 0;
     const prefix = i;
     i = 0;

package/src/parser/source/escapable.ts

@@ -2,18 +2,18 @@ import { EscapableSourceParser } from '../source';
 import { Command } from '../context';
 import { Flag } from '../node';
 import { List, Node } from '../../combinator/data/parser';
-import { consume } from '../../combinator';
+import { spend } from '../../combinator';
 import { html } from 'typed-dom/dom';
 
 export const escsource: EscapableSourceParser = context => {
   const { source, position } = context;
   if (position === source.length) return;
   const char = source[position];
-  consume(1, context);
+  spend(context, 1);
   context.position += 1;
   switch (char) {
     case Command.Escape:
-      consume(1, context);
+      spend(context, 1);
       context.position += 1;
       return new List([new Node(source.slice(position + 1, position + 2))]);
     case '\\':
@@ -23,7 +23,7 @@ export const escsource: EscapableSourceParser = context => {
         case '\n':
           return new List([new Node(char)]);
         default:
-          consume(1, context);
+          spend(context, 1);
           context.position += 1;
           return new List([new Node(source.slice(position, position + 2))]);
       }
@@ -38,7 +38,7 @@ export const escsource: EscapableSourceParser = context => {
       let i = seek(source, position);
       assert(i > position);
       i -= position;
-      consume(i - 1, context);
+      spend(context, i - 1);
       context.position += i - 1;
       return new List([new Node(source.slice(position, context.position))]);
   }

package/src/parser/source/text.ts

@@ -2,7 +2,7 @@ import { TextParser, TxtParser } from '../source';
 import { State, Command } from '../context';
 import { Flag } from '../node';
 import { List, Node } from '../../combinator/data/parser';
-import { union, consume } from '../../combinator';
+import { union, spend } from '../../combinator';
 import { html } from 'typed-dom/dom';
 
 export const nonWhitespace = /[^ \t　]/g;
@@ -12,7 +12,7 @@ export const text: TextParser = input => {
   const { source, position, state } = context;
   if (position === source.length) return;
   const char = source[position];
-  consume(1, context);
+  spend(context, 1);
   context.position += 1;
   switch (char) {
     case Command.Escape:
@@ -25,7 +25,7 @@ export const text: TextParser = input => {
           assert(char !== Command.Escape);
           return new List();
         default:
-          consume(1, context);
+          spend(context, 1);
           context.position += 1;
           return new List([new Node(source.slice(position + 1, context.position))]);
       }
@@ -51,7 +51,7 @@ export const text: TextParser = input => {
         || s && source[i] === '\n';
       i -= position;
       i = lineend ? i : i - +s || 1;
-      consume(i - 1, context);
+      spend(context, i - 1);
       context.position += i - 1;
       const linestart = position === 0 || source[position - 1] === '\n';
       if (position === context.position || s && !linestart || lineend) return new List();
@@ -86,7 +86,7 @@ function isWhitespace(char: string, linebreak: boolean): boolean {
 function next(source: string, position: number, state: number): number {
   let index= seek(source, position, state);
   assert(index > position);
-  if (index === source.length) return source.length;
+  if (index === source.length) return index;
   const char = source[index];
   switch (char) {
     case '%':
@@ -163,10 +163,9 @@ export function backToEmailHead(source: string, position: number, index: number)
 }
 export function isAlphanumeric(char: string): boolean {
   assert(char.length === 1);
-  if (char < '0' || '\x7F' < char) return false;
-  return '0' <= char && char <= '9'
-      || 'A' <= char && char <= 'Z'
-      || 'a' <= char && char <= 'z';
+  if (char < '0' || 'z' < char) return false;
+  if (char <= '9' || 'a' <= char) return true;
+  return 'A' <= char && char <= 'Z';
 }
 
 function seek(source: string, position: number, state: number): number {

package/src/parser/source/unescapable.ts

@@ -2,7 +2,7 @@ import { UnescapableSourceParser } from '../source';
 import { State, Command } from '../context';
 import { Flag } from '../node';
 import { List, Node } from '../../combinator/data/parser';
-import { consume } from '../../combinator';
+import { spend } from '../../combinator';
 import { nonWhitespace, canSkip, backToUrlHead, backToEmailHead } from './text';
 import { html } from 'typed-dom/dom';
 
@@ -10,11 +10,11 @@ export const unescsource: UnescapableSourceParser = context => {
   const { source, position, state } = context;
   if (position === source.length) return;
   const char = source[position];
-  consume(1, context);
+  spend(context, 1);
   context.position += 1;
   switch (char) {
     case Command.Escape:
-      consume(1, context);
+      spend(context, 1);
       context.position += 1;
       return new List([new Node(source.slice(position + 1, position + 2))]);
     case '\r':
@@ -33,7 +33,7 @@ export const unescsource: UnescapableSourceParser = context => {
         : next(source, position, state);
       assert(i > position);
       i -= position;
-      consume(i - 1, context);
+      spend(context, i - 1);
       context.position += i - 1;
       return new List([new Node(source.slice(position, context.position))]);
   }
@@ -42,7 +42,7 @@ export const unescsource: UnescapableSourceParser = context => {
 function next(source: string, position: number, state: number): number {
   let index= seek(source, position, state);
   assert(index > position);
-  if (index === source.length) return source.length;
+  if (index === source.length) return index;
   const char = source[index];
   switch (char) {
     case ':':
@@ -119,5 +119,5 @@ function seek(source: string, position: number, state: number): number {
 }
 
 function category(char: string): boolean {
-  return '\x21' <= char && char <= '\x7E';
+  return char <= '\x7E' && '\x21' <= char;
 }

package/src/parser/visibility.ts

@@ -2,7 +2,7 @@ import { Parser, List, Node } from '../combinator/data/parser';
 import { Command } from './context';
 import { Flag } from './node';
 import { convert, fmap } from '../combinator';
-import { invisibleBlankHTMLEntityNames } from './api/normalize';
+import { invisibleBlankHTMLEntityNames } from '../api/normalize';
 
 namespace blank {
   export const line = new RegExp(

package/src/{parser/processor → processor}/figure.test.ts

@@ -1,12 +1,12 @@
 import { figure } from './figure';
-import { ParserOptions } from '../../..';
-import { parse as parse_ } from '../../parser';
+import { ParserOptions } from '../..';
+import { parse as parse_ } from '../api';
 import { html } from 'typed-dom/dom';
-import { normalize } from '../../debug.test';
+import { normalize } from '../debug.test';
 
 const parse = (s: string, o?: ParserOptions) => parse_(s, { test: true, ...o });
 
-describe('Unit: parser/processor/figure', () => {
+describe('Unit: processor/figure', () => {
   describe('figure', () => {
     it('empty', () => {
       const target = parse('');

package/src/{parser/processor → processor}/figure.ts

@@ -1,5 +1,5 @@
-import { number as calculate, isFixed } from '../inline/extension/label';
-import { markInvalid, unmarkInvalid } from '../util';
+import { number as calculate, isFixed } from '../parser/inline/extension/label';
+import { markInvalid, unmarkInvalid } from '../parser/util';
 import { MultiQueue } from 'spica/queue';
 import { push } from 'spica/array';
 import { define } from 'typed-dom/dom';

package/src/{parser/processor → processor}/note.test.ts

@@ -1,11 +1,11 @@
 import { note } from './note';
-import { parse as parse_ } from '../../parser';
+import { parse as parse_ } from '../api';
 import { html } from 'typed-dom/dom';
-import { normalize } from '../../debug.test';
+import { normalize } from '../debug.test';
 
 const parse = (s: string) => parse_(s, { test: true });
 
-describe('Unit: parser/processor/note', () => {
+describe('Unit: processor/note', () => {
   describe('annotation', () => {
     it('empty', () => {
       const target = parse('');

package/src/{parser/processor → processor}/note.ts

@@ -1,5 +1,5 @@
-import { identity, signature, text } from '../inline/extension/indexee';
-import { markInvalid, unmarkInvalid } from '../util';
+import { identity, signature, text } from '../parser/inline/extension/indexee';
+import { markInvalid, unmarkInvalid } from '../parser/util';
 import { memoize } from 'spica/memoize';
 import { html, define } from 'typed-dom/dom';
 

package/src/renderer/render/media/pdf.ts

@@ -1,4 +1,4 @@
-import { parse } from '../../../parser';
+import { parse } from '../../../api';
 import { html, define } from 'typed-dom/dom';
 
 const extensions = [

package/src/renderer/render/media/twitter.ts

@@ -1,4 +1,4 @@
-import { parse } from '../../../parser';
+import { parse } from '../../../api';
 import { html as h, define } from 'typed-dom/dom';
 import DOMPurify from 'dompurify';
 

package/src/renderer/render/media.test.ts

@@ -1,7 +1,6 @@
 import { media } from './media';
-import { parse } from '../../parser';
+import { parse, caches } from '../../api';
 import { html } from 'typed-dom/dom';
-import { caches } from '../../parser/api';
 
 describe('Unit: renderer/render/media', () => {
 

package/src/renderer/render.test.ts

@@ -1,6 +1,6 @@
 import { render as render_ } from './render';
 import { RenderingOptions } from '../../';
-import { parse } from '../parser/api/parse';
+import { parse } from '../api/parse';
 
 function render(target: HTMLElement, opts: RenderingOptions = {}): HTMLElement {
   render_(target, opts);

package/src/util/info.test.ts

@@ -1,5 +1,5 @@
 import { info } from './info';
-import { parse } from '../parser';
+import { parse } from '../api';
 
 describe('Unit: util/info', () => {
   describe('info', () => {

package/src/util/quote.test.ts

@@ -1,5 +1,5 @@
 import { quote } from './quote';
-import { parse } from '../parser';
+import { parse } from '../api';
 
 describe('Unit: util/quote', () => {
   describe('quote', () => {

package/src/util/toc.test.ts

@@ -1,5 +1,5 @@
 import { toc } from './toc';
-import { parse } from '../parser';
+import { parse } from '../api';
 import { html } from 'typed-dom/dom';
 
 describe('Unit: util/toc', () => {

package/src/parser.ts

@@ -1 +0,0 @@
-export * from './parser/api';