securemark 0.299.3 → 0.299.4

package/index.ts

@@ -1,5 +1,5 @@
 import 'spica/global';
 
-export * from './src/parser';
-export * from './src/util';
+export * from './src/api';
 export * from './src/renderer';
+export * from './src/util';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.299.3",
+  "version": "0.299.4",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",

package/src/{parser/api → api}/bind.test.ts

@@ -1,8 +1,8 @@
-import { Progress } from '../../..';
+import { Progress } from '../..';
 import { bind } from './bind';
 import { frag, html } from 'typed-dom/dom';
 
-describe('Unit: parser/api/bind', () => {
+describe('Unit: api/bind', () => {
   describe('bind', () => {
     function inspect(iter: IterableIterator<Progress>, count = Infinity) {
       const acc: (string | undefined)[] = [];

package/src/{parser/api → api}/bind.ts

@@ -1,8 +1,8 @@
-import { ParserSettings, Progress } from '../../..';
-import { Context, Options, Segment } from '../context';
-import { input } from '../../combinator/data/parser';
-import { segment } from '../segment';
-import { block } from '../block';
+import { ParserSettings, Progress } from '../..';
+import { Context, Options, Segment } from '../parser/context';
+import { input } from '../combinator/data/parser';
+import { segment } from '../parser/segment';
+import { block } from '../parser/block';
 import { headers } from './header';
 import { figure } from '../processor/figure';
 import { note } from '../processor/note';

package/src/{parser/api → api}/body.test.ts

@@ -1,6 +1,6 @@
 import { body } from './body';
 
-describe('Unit: parser/api/body', () => {
+describe('Unit: api/body', () => {
   describe('body', () => {
     it('basic', () => {
       assert.deepStrictEqual(body(''), '');

package/src/{parser/api → api}/cache.ts

@@ -1,4 +1,4 @@
-import { Caches } from '../../..';
+import { Caches } from '../..';
 import { TClock } from 'spica/tclock';
 import { TLRU } from 'spica/tlru';
 

package/src/{parser/api → api}/header.test.ts

@@ -1,6 +1,6 @@
 import { headers } from './header';
 
-describe('Unit: parser/api/header', () => {
+describe('Unit: api/header', () => {
   describe('headers', () => {
     it('basic', () => {
       assert.deepStrictEqual(headers(''), []);

package/src/{parser/api → api}/header.ts

@@ -1,5 +1,5 @@
-import { Context } from '../context';
-import { header as h } from '../header';
+import { Context } from '../parser/context';
+import { header as h } from '../parser/header';
 
 export function header(source: string): string {
   const [, pos = 0] = parse(source);

package/src/{parser/api → api}/normalize.test.ts

@@ -1,6 +1,6 @@
 import { normalize, escape } from './normalize';
 
-describe('Unit: parser/normalize', () => {
+describe('Unit: normalize', () => {
   describe('normalize', () => {
     it('controls', () => {
       assert(normalize('\r') === '\n');

package/src/{parser/api → api}/parse.test.ts

@@ -1,9 +1,9 @@
 import { parse } from './parse';
-import { Context } from '../context';
+import { Context } from '../parser/context';
 import { html } from 'typed-dom/dom';
-import { normalize } from '../../debug.test';
+import { normalize } from '../debug.test';
 
-describe('Unit: parser/api/parse', () => {
+describe('Unit: api/parse', () => {
   describe('parse', () => {
     it('huge input', () => {
       assert.deepStrictEqual(

package/src/{parser/api → api}/parse.ts

@@ -1,8 +1,8 @@
-import { ParserOptions } from '../../..';
-import { input } from '../../combinator/data/parser';
-import { Context, Options, Segment } from '../context';
-import { segment } from '../segment';
-import { block } from '../block';
+import { ParserOptions } from '../..';
+import { input } from '../combinator/data/parser';
+import { Context, Options, Segment } from '../parser/context';
+import { segment } from '../parser/segment';
+import { block } from '../parser/block';
 import { headers } from './header';
 import { figure } from '../processor/figure';
 import { note } from '../processor/note';

package/src/combinator/data/{node.ts → list/list.ts}

@@ -1,4 +1,4 @@
-import { Parser, Context } from './parser';
+import { Parser, Context } from '../parser';
 
 export class List<N extends List.Node = List.Node, C extends Context = Context, D extends Parser<unknown, C>[] = any> {
   constructor(nodes?: ArrayLike<N>) {
@@ -134,8 +134,8 @@ export class List<N extends List.Node = List.Node, C extends Context = Context,
   }
 }
 export namespace List {
-  export class Node {
-    public next?: this = undefined;
-    public prev?: this = undefined;
+  export interface Node {
+    next?: this;
+    prev?: this;
   }
 }

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

@@ -1,7 +1,7 @@
 import { Parser, List, Node, Context } from '../parser';
 
-export function inits<P extends Parser>(parsers: Parser.SubParsers<P>): Parser.SubNode<P> extends Parser.Node<P> ? P : Parser<Parser.SubNode<P>, Parser.Context<P>, Parser.SubParsers<P>>;
-export function inits<N, D extends Parser<N>[]>(parsers: D): Parser<N, Context, D> {
+export function inits<P extends Parser>(parsers: Parser.SubParsers<P>, delimitation?: boolean): Parser.SubNode<P> extends Parser.Node<P> ? P : Parser<Parser.SubNode<P>, Parser.Context<P>, Parser.SubParsers<P>>;
+export function inits<N, D extends Parser<N>[]>(parsers: D, delimitation = false): Parser<N, Context, D> {
   assert(parsers.every(f => f));
   if (parsers.length === 1) return parsers[0];
   return input => {
@@ -10,7 +10,7 @@ export function inits<N, D extends Parser<N>[]>(parsers: D): Parser<N, Context,
     let nodes: List<Node<N>> | undefined;
     for (let len = parsers.length, i = 0; i < len; ++i) {
       if (context.position === source.length) break;
-      if (context.delimiters.test(input)) break;
+      if (delimitation && context.delimiters.test(input)) break;
       const result = parsers[i](input);
       if (result === undefined) break;
       nodes = nodes?.import(result) ?? result;

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

@@ -1,7 +1,7 @@
 import { Parser, List, Node, Context, failsafe } from '../parser';
 
-export function sequence<P extends Parser>(parsers: Parser.SubParsers<P>): Parser.SubNode<P> extends Parser.Node<P> ? P : Parser<Parser.SubNode<P>, Parser.Context<P>, Parser.SubParsers<P>>;
-export function sequence<N, D extends Parser<N>[]>(parsers: D): Parser<N, Context, D> {
+export function sequence<P extends Parser>(parsers: Parser.SubParsers<P>, delimitation?: boolean): Parser.SubNode<P> extends Parser.Node<P> ? P : Parser<Parser.SubNode<P>, Parser.Context<P>, Parser.SubParsers<P>>;
+export function sequence<N, D extends Parser<N>[]>(parsers: D, delimitation = false): Parser<N, Context, D> {
   assert(parsers.every(f => f));
   if (parsers.length === 1) return parsers[0];
   return failsafe(input => {
@@ -10,7 +10,7 @@ export function sequence<N, D extends Parser<N>[]>(parsers: D): Parser<N, Contex
     let nodes: List<Node<N>> | undefined;
     for (let len = parsers.length, i = 0; i < len; ++i) {
       if (context.position === source.length) return;
-      if (context.delimiters.test(input)) return;
+      if (delimitation && context.delimiters.test(input)) return;
       const result = parsers[i](input);
       if (result === undefined) return;
       nodes = nodes?.import(result) ?? result;

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

@@ -2,12 +2,12 @@ import { Parser, Context } from '../parser';
 import { union } from './union';
 import { inits } from './inits';
 
-export function subsequence<P extends Parser>(parsers: Parser.SubParsers<P>): Parser.SubNode<P> extends Parser.Node<P> ? P : Parser<Parser.SubNode<P>, Parser.Context<P>, Parser.SubParsers<P>>;
-export function subsequence<N, D extends Parser<N>[]>(parsers: D): Parser<N, Context, D> {
+export function subsequence<P extends Parser>(parsers: Parser.SubParsers<P>, delimitation?: boolean): Parser.SubNode<P> extends Parser.Node<P> ? P : Parser<Parser.SubNode<P>, Parser.Context<P>, Parser.SubParsers<P>>;
+export function subsequence<N, D extends Parser<N>[]>(parsers: D, delimitation = false): Parser<N, Context, D> {
   assert(parsers.every(f => f));
   return union(
     parsers.map((_, i) =>
       i + 1 < parsers.length
-        ? inits([parsers[i], subsequence(parsers.slice(i + 1))])
+        ? inits([parsers[i], subsequence(parsers.slice(i + 1), delimitation)], delimitation)
         : parsers[i]) as D);
 }

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

@@ -2,7 +2,7 @@ import { Parser, Context } from '../parser';
 import { union } from './union';
 import { sequence } from './sequence';
 
-export function tails<P extends Parser>(parsers: Parser.SubParsers<P>): Parser.SubNode<P> extends Parser.Node<P> ? P : Parser<Parser.SubNode<P>, Parser.Context<P>, Parser.SubParsers<P>>;
-export function tails<N, D extends Parser<N>[]>(parsers: D): Parser<N, Context, D> {
-  return union(parsers.map((_, i) => sequence(parsers.slice(i))) as D);
+export function tails<P extends Parser>(parsers: Parser.SubParsers<P>, delimitation?: boolean): Parser.SubNode<P> extends Parser.Node<P> ? P : Parser<Parser.SubNode<P>, Parser.Context<P>, Parser.SubParsers<P>>;
+export function tails<N, D extends Parser<N>[]>(parsers: D, delimitation?: boolean): Parser<N, Context, D> {
+  return union(parsers.map((_, i) => sequence(parsers.slice(i), delimitation)) as D);
 }

package/src/combinator/data/parser.ts

@@ -1,4 +1,4 @@
-import { List } from './node';
+import { List } from './list/list';
 import { Delimiters } from './delimiter';
 
 export type Parser<N = unknown, C extends Context = Context, D extends Parser<unknown, C>[] = any>

package/src/parser/block/blockquote.ts

@@ -5,7 +5,7 @@ import { union, some, spend, recursion, block, validate, rewrite, open, convert,
 import { autolink } from '../autolink';
 import { contentline } from '../source';
 import { unwrap, randomID } from '../util';
-import { parse } from '../api/parse';
+import { parse } from '../../api/parse';
 import { html, defrag } from 'typed-dom/dom';
 
 export const segment: BlockquoteParser.SegmentParser = block(union([

package/src/parser/block/extension/aside.ts

@@ -4,7 +4,7 @@ import { List, Node } from '../../../combinator/data/parser';
 import { recursion, block, fence, fmap } from '../../../combinator';
 import { identity } from '../../inline/extension/indexee';
 import { unwrap, invalid, randomID } from '../../util';
-import { parse } from '../../api/parse';
+import { parse } from '../../../api/parse';
 import { html } from 'typed-dom/dom';
 
 export const aside: ExtensionParser.AsideParser = block(recursion(Recursion.block, fmap(

package/src/parser/block/extension/example.ts

@@ -4,7 +4,7 @@ import { List, Node, subinput } from '../../../combinator/data/parser';
 import { recursion, block, fence, fmap } from '../../../combinator';
 import { mathblock } from '../mathblock';
 import { unwrap, invalid, randomID } from '../../util';
-import { parse } from '../../api/parse';
+import { parse } from '../../../api/parse';
 import { html } from 'typed-dom/dom';
 
 export const example: ExtensionParser.ExampleParser = block(recursion(Recursion.block, fmap(

package/src/parser/inline/link.ts

@@ -35,7 +35,7 @@ export const textlink: LinkParser.TextLinkParser = lazy(() => bind(
     // 自己再帰的にパースしてもオプションの不要なパースによる計算量の増加により相殺される。
     dup(surround(
       /{(?![{}])/y,
-      precedence(9, inits([uri, some(option)])),
+      inits([uri, some(option)]),
       / ?}/y,
       false, [],
       undefined,
@@ -83,7 +83,7 @@ export const medialink: LinkParser.MediaLinkParser = lazy(() => constraint(State
       ']')),
     dup(surround(
       /{(?![{}])/y,
-      precedence(9, inits([uri, some(option)])),
+      inits([uri, some(option)]),
       / ?}/y)),
   ]),
   ([{ value: content }, { value: params }], context) =>

package/src/parser/inline/media.ts

@@ -41,7 +41,7 @@ export const media: MediaParser = lazy(() => constraint(State.media, open(
       })),
     dup(surround(
       /{(?![{}])/y,
-      precedence(9, inits([uri, some(option)])),
+      inits([uri, some(option)]),
       / ?}/y,
       false, [],
       undefined,

package/src/parser/node.ts

@@ -1,4 +1,4 @@
-import { invisibleBlankHTMLEntityNames } from './api/normalize';
+import { invisibleBlankHTMLEntityNames } from '../api/normalize';
 
 export const enum Flag {
   none,

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';