securemark 0.258.9 → 0.259.2

package/src/parser/locale.test.ts

@@ -4,7 +4,7 @@ import { inspect } from '../debug.test';
 
 describe('Unit: parser/locale', () => {
   describe('locale', () => {
-    const parser = (source: string) => some(block)(source, {});
+    const parser = (source: string) => some(block)({ source, context: {} });
 
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('。\\\n0')), [['<p>。<span class="linebreak"></span>0</p>'], '']);

package/src/parser/segment.ts

@@ -26,7 +26,7 @@ export function* segment(source: string): Generator<string, undefined, undefined
   if (!validate(source, MAX_INPUT_SIZE)) return yield `\x07Too large input over ${MAX_INPUT_SIZE.toLocaleString('en')} bytes.\n${source.slice(0, 1001)}`;
   assert(source.length < Number.MAX_SAFE_INTEGER);
   while (source !== '') {
-    const result = parser(source, {})!;
+    const result = parser({ source, context: {} })!;
     assert(result);
     const rest = exec(result);
     const segs = eval(result).length ? eval(result) : [source.slice(0, source.length - rest.length)];

package/src/parser/source/escapable.test.ts

@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
 
 describe('Unit: parser/source/escsource', () => {
   describe('escsource', () => {
-    const parser = (source: string) => some(escsource)(source, {});
+    const parser = (source: string) => some(escsource)({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('')), undefined);

package/src/parser/source/escapable.ts

@@ -4,7 +4,7 @@ import { nonWhitespace } from './text';
 
 const delimiter = /[\s\x00-\x2F\x3A-\x40\x5B-\x60\x7B-\x7F]/;
 
-export const escsource: EscapableSourceParser = creation(source => {
+export const escsource: EscapableSourceParser = creation(({ source }) => {
   if (source === '') return;
   const i = source.search(delimiter);
   switch (i) {

package/src/parser/source/line.test.ts

@@ -3,7 +3,7 @@ import { inspect } from '../../debug.test';
 
 describe('Unit: parser/source/line', () => {
   describe('contentline', () => {
-    const parser = (source: string) => contentline(source, {});
+    const parser = (source: string) => contentline({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('')), undefined);

package/src/parser/source/line.ts

@@ -3,5 +3,5 @@ import { AnyLineParser, EmptyLineParser, ContentLineParser } from '../source';
 import { line, isEmpty } from '../../combinator';
 
 export const anyline: AnyLineParser = line(() => [[], '']);
-export const emptyline: EmptyLineParser = line(s => isEmpty(s) ? [[], ''] : undefined);
-export const contentline: ContentLineParser = line(s => !isEmpty(s) ? [[], ''] : undefined);
+export const emptyline: EmptyLineParser = line(i => isEmpty(i.source) ? [[], ''] : undefined);
+export const contentline: ContentLineParser = line(i => !isEmpty(i.source) ? [[], ''] : undefined);

package/src/parser/source/str.ts

@@ -7,13 +7,13 @@ export function str(pattern: string | RegExp): StrParser;
 export function str(pattern: string | RegExp): Parser<string, Context<StrParser>, []> {
   assert(pattern);
   return typeof pattern === 'string'
-    ? creation(source => {
+    ? creation(({ source }) => {
         if (source === '') return;
         return source.slice(0, pattern.length) === pattern
           ? [[pattern], source.slice(pattern.length)]
           : undefined;
       })
-    : creation(source => {
+    : creation(({ source }) => {
         if (source === '') return;
         const m = source.match(pattern);
         return m && m[0].length > 0
@@ -26,13 +26,13 @@ export function stropt(pattern: string | RegExp): StrParser;
 export function stropt(pattern: string | RegExp): Parser<string, Context<StrParser>, []> {
   assert(pattern);
   return typeof pattern === 'string'
-    ? creation(source => {
+    ? creation(({ source }) => {
         if (source === '') return;
         return source.slice(0, pattern.length) === pattern
           ? [[pattern], source.slice(pattern.length)]
           : undefined;
       })
-    : creation(source => {
+    : creation(({ source }) => {
         if (source === '') return;
         const m = source.match(pattern);
         return m

package/src/parser/source/text.test.ts

@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
 
 describe('Unit: parser/text/text', () => {
   describe('text', () => {
-    const parser = (source: string) => some(text)(source, {});
+    const parser = (source: string) => some(text)({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('')), undefined);

package/src/parser/source/text.ts

@@ -2,7 +2,7 @@ import { undefined } from 'spica/global';
 import { TextParser, TxtParser, LinebreakParser } from '../source';
 import { union, syntax, focus } from '../../combinator';
 import { str } from './str';
-import { Syntax } from '../context';
+import { Syntax, State } from '../context';
 import { html } from 'typed-dom/dom';
 
 export const delimiter = /[\s\x00-\x7F]|\S[#>]|[（）、。！？][^\S\n]*(?=\\\n)/;
@@ -10,7 +10,7 @@ export const nonWhitespace = /[\S\n]|$/;
 export const nonAlphanumeric = /[^0-9A-Za-z]|\S[#>]|$/;
 const repeat = str(/^(.)\1*/);
 
-export const text: TextParser = syntax(Syntax.none, 1, 1, (source, context) => {
+export const text: TextParser = syntax(Syntax.none, 1, 1, State.none, ({ source, context }) => {
   if (source === '') return;
   const i = source.search(delimiter);
   switch (i) {
@@ -26,7 +26,7 @@ export const text: TextParser = syntax(Syntax.none, 1, 1, (source, context) => {
             case '！':
             case '？':
               assert(source[0] !== '\x1B');
-              return text(source.slice(1), context);
+              return text({ source: source.slice(1), context });
           }
           break;
         case '、':
@@ -57,7 +57,7 @@ export const text: TextParser = syntax(Syntax.none, 1, 1, (source, context) => {
         case '=':
         case '`':
           return source[1] === source[0]
-            ? repeat(source, context)
+            ? repeat({ source, context })
             : [[source[0]], source.slice(1)];
         default:
           assert(source[0] !== '\n');

package/src/parser/source/unescapable.test.ts

@@ -4,7 +4,7 @@ import { inspect } from '../../debug.test';
 
 describe('Unit: parser/source/unescapable', () => {
   describe('unescsource', () => {
-    const parser = (source: string) => some(unescsource)(source, {});
+    const parser = (source: string) => some(unescsource)({ source, context: {} });
 
     it('invalid', () => {
       assert.deepStrictEqual(inspect(parser('')), undefined);

package/src/parser/source/unescapable.ts

@@ -2,7 +2,7 @@ import { UnescapableSourceParser } from '../source';
 import { creation } from '../../combinator';
 import { delimiter, nonWhitespace, nonAlphanumeric, isAlphanumeric } from './text';
 
-export const unescsource: UnescapableSourceParser = creation(source => {
+export const unescsource: UnescapableSourceParser = creation(({ source }) => {
   assert(source[0] !== '\x1B');
   if (source === '') return;
   const i = source.search(delimiter);

package/src/parser/visibility.ts

@@ -1,6 +1,6 @@
 import { undefined } from 'spica/global';
 import { MarkdownParser } from '../../markdown';
-import { Parser, eval } from '../combinator/data/parser';
+import { Parser, Input, eval } from '../combinator/data/parser';
 import { union, some, verify, convert, fmap } from '../combinator';
 import { unsafehtmlentity } from './inline/htmlentity';
 import { linebreak, unescsource } from './source';
@@ -56,23 +56,23 @@ export function blankWith(starting: '' | '\n', delimiter?: string | RegExp): Reg
 
 export function startLoose<P extends Parser<HTMLElement | string>>(parser: P, except?: string): P;
 export function startLoose<T extends HTMLElement | string>(parser: Parser<T>, except?: string): Parser<T> {
-  return (source, context) =>
-    isStartLoose(source, context, except)
-      ? parser(source, context)
+  return input =>
+    isStartLoose(input, except)
+      ? parser(input)
       : undefined;
 }
-const isStartLoose = reduce((source: string, context: MarkdownParser.Context, except?: string): boolean => {
-  return isStartTight(source.replace(regBlankStart, ''), context, except);
-}, (source, _, except = '') => `${source}\x1E${except}`);
+const isStartLoose = reduce(({ source, context }: Input<MarkdownParser.Context>, except?: string): boolean => {
+  return isStartTight({ source: source.replace(regBlankStart, ''), context }, except);
+}, ({ source }, except = '') => `${source}\x1E${except}`);
 
 export function startTight<P extends Parser<unknown>>(parser: P, except?: string): P;
 export function startTight<T>(parser: Parser<T>, except?: string): Parser<T> {
-  return (source, context) =>
-    isStartTight(source, context, except)
-      ? parser(source, context)
+  return input =>
+    isStartTight(input, except)
+      ? parser(input)
       : undefined;
 }
-const isStartTight = reduce((source: string, context: MarkdownParser.Context, except?: string): boolean => {
+const isStartTight = reduce(({ source, context }: Input<MarkdownParser.Context>, except?: string): boolean => {
   if (source === '') return true;
   if (except && source.slice(0, except.length) === except) return false;
   switch (source[0]) {
@@ -87,7 +87,7 @@ const isStartTight = reduce((source: string, context: MarkdownParser.Context, ex
       switch (true) {
         case source.length > 2
           && source[1] !== ' '
-          && eval(unsafehtmlentity(source, context))?.[0]?.trimStart() === '':
+          && eval(unsafehtmlentity({ source, context }))?.[0]?.trimStart() === '':
           return false;
       }
       return true;
@@ -102,7 +102,7 @@ const isStartTight = reduce((source: string, context: MarkdownParser.Context, ex
     default:
       return source[0].trimStart() !== '';
   }
-}, (source, _, except = '') => `${source}\x1E${except}`);
+}, ({ source }, except = '') => `${source}\x1E${except}`);
 
 export function isStartLooseNodes(nodes: readonly (HTMLElement | string)[]): boolean {
   if (nodes.length === 0) return true;

package/src/util/quote.ts

@@ -5,7 +5,7 @@ import { define } from 'typed-dom/dom';
 import { duffEach } from 'spica/duff';
 
 export function quote(anchor: string, range: Range): string {
-  if (exec(cite(`>>${anchor}`, {})) !== '') throw new Error(`Invalid anchor: ${anchor}`);
+  if (exec(cite({ source: `>>${anchor}`, context: {} })) !== '') throw new Error(`Invalid anchor: ${anchor}`);
   fit(range);
   const node = trim(range.cloneContents());
   if (!node.firstChild) return '';