securemark 0.289.2 → 0.289.3

package/src/parser/block/olist.ts

@@ -24,10 +24,10 @@ export const olist: OListParser = lazy(() => block(validate(
 export const olist_: OListParser = lazy(() => block(union([
   match(
     openers['.'],
-    memoize(ms => list(type(ms[1]), '.'), ms => idx(ms[1]), []), false),
+    memoize(ms => list(type(ms[1]), '.'), ms => idx(ms[1]), [])),
   match(
     openers['('],
-    memoize(ms => list(type(ms[1]), '('), ms => idx(ms[1]), []), false),
+    memoize(ms => list(type(ms[1]), '('), ms => idx(ms[1]), [])),
 ])));
 
 const list = (type: string, form: string): OListParser.ListParser => fmap(
@@ -47,10 +47,10 @@ const list = (type: string, form: string): OListParser.ListParser => fmap(
 const heads = {
   '.': focus(
     openers['.'],
-    ({ source }) => [[source.trimEnd().split('.', 1)[0] + '.'], ''], false),
+    ({ source }) => [[source.trimEnd().split('.', 1)[0] + '.'], '']),
   '(': focus(
     openers['('],
-    ({ source }) => [[source.trimEnd().replace(/^\($/, '(1)').replace(/^\((\w+)$/, '($1)')], ''], false),
+    ({ source }) => [[source.trimEnd().replace(/^\($/, '(1)').replace(/^\((\w+)$/, '($1)')], '']),
 } as const;
 
 function idx(value: string): number {

package/src/parser/block/reply/cite.ts

@@ -15,9 +15,9 @@ export const cite: ReplyParser.CiteParser = line(fmap(validate(
       anchor,
       // Subject page representation.
       // リンクの実装は後で検討
-      focus(/^>>#\S*(?=\s*$)/, ({ source }) => [[html('a', { class: 'anchor' }, source)], ''], false),
-      focus(/^>>https?:\/\/\S+(?=\s*$)/, ({ source }) => [[html('a', { class: 'anchor', href: source.slice(2).trimEnd(), target: '_blank' }, source)], ''], false),
-      focus(/^>>.+(?=\s*$)/, ({ source }) => [[source], ''], false),
+      focus(/^>>#\S*(?=\s*$)/, ({ source }) => [[html('a', { class: 'anchor' }, source)], '']),
+      focus(/^>>https?:\/\/\S+(?=\s*$)/, ({ source }) => [[html('a', { class: 'anchor', href: source.slice(2).trimEnd(), target: '_blank' }, source)], '']),
+      focus(/^>>.+(?=\s*$)/, ({ source }) => [[source], '']),
     ]),
   )),
   ([quotes, node]: [string, HTMLElement | string]) => [

package/src/parser/block/ulist.ts

@@ -33,7 +33,7 @@ export const checkbox = focus(
   /^\[[xX ]\](?=$|\s)/,
   ({ source }) => [[
     html('span', { class: 'checkbox' }, source[1].trimStart() ? '☑' : '☐'),
-  ], ''], false);
+  ], '']);
 
 export function fillFirstLine(ns: (HTMLElement | string)[]): (HTMLElement | string)[] {
   return ns.length === 1

package/src/parser/inline/autolink/hashnum.ts

@@ -7,7 +7,11 @@ import { str } from '../../source';
 import { define } from 'typed-dom/dom';
 
 export const hashnum: AutolinkParser.HashnumParser = lazy(() => rewrite(
-  open('#', str(new RegExp(/^[0-9]{1,9}(?![^\p{C}\p{S}\p{P}\s]|emoji)/u.source.replace(/emoji/, emoji), 'u'))),
+  open(
+    '#',
+    str(new RegExp([
+      /^[0-9]{1,9}(?![^\p{C}\p{S}\p{P}\s]|emoji)/u.source,
+    ].join('').replace(/emoji/, emoji), 'u'))),
   union([
     constraint(State.autolink, false, state(State.autolink, fmap(convert(
       source => `[${source}]{ ${source.slice(1)} }`,

package/src/parser/inline/code.ts

@@ -5,7 +5,8 @@ import { html } from 'typed-dom/dom';
 export const code: CodeParser = match(
   /^(`+)(?!`)([^\n]*?[^`\n])\1(?!`)/,
   ([whole, , body]) => ({ source }) =>
-    [[html('code', { 'data-src': whole }, format(body))], source.slice(whole.length)]);
+    [[html('code', { 'data-src': whole }, format(body))], source.slice(whole.length)],
+  true);
 
 function format(text: string): string {
   assert(text.length > 0);

package/src/parser/inline/extension/label.ts

@@ -1,6 +1,6 @@
 import { ExtensionParser } from '../../inline';
 import { State, Backtrack } from '../../context';
-import { union, constraint, surround, clear, fmap } from '../../../combinator';
+import { union, constraint, clear, surround, fmap } from '../../../combinator';
 import { str } from '../../source';
 import { html } from 'typed-dom/dom';
 

package/src/parser/util.ts

@@ -1,19 +1,19 @@
 import { min } from 'spica/alias';
 import { Command } from './context';
-import { Parser, Result, Ctx, Tree, Context, eval, exec } from '../combinator/data/parser';
+import { Parser, Result, Ctx, Node, Context, eval, exec } from '../combinator/data/parser';
 import { convert } from '../combinator';
 import { define } from 'typed-dom/dom';
 
 export function lineable<P extends Parser<HTMLElement | string>>(parser: P, fillTrailingLinebreak?: boolean): P;
-export function lineable<T extends HTMLElement | string>(parser: Parser<T>, fillTrailingLinebreak = false): Parser<T> {
+export function lineable<N extends HTMLElement | string>(parser: Parser<N>, fillTrailingLinebreak = false): Parser<N> {
   return convert(
     source => `\r${source}${fillTrailingLinebreak && source.at(-1) !== '\n' ? '\n' : ''}`,
     parser,
     !fillTrailingLinebreak);
 }
 
-export function repeat<P extends Parser<HTMLElement | string>>(symbol: string, parser: P, cons: (nodes: Tree<P>[], context: Context<P>) => Tree<P>[], termination?: (acc: Tree<P>[][], rest: string, prefix: number, postfix: number, state: boolean) => Result<string | Tree<P>>): P;
-export function repeat<T extends HTMLElement | string>(symbol: string, parser: Parser<T>, cons: (nodes: T[], context: Ctx) => T[], termination: (acc: T[][], rest: string, prefix: number, postfix: number, state: boolean) => Result<string | T> = (acc, rest, prefix, postfix) => {
+export function repeat<P extends Parser<HTMLElement | string>>(symbol: string, parser: P, cons: (nodes: Node<P>[], context: Context<P>) => Node<P>[], termination?: (acc: Node<P>[][], rest: string, prefix: number, postfix: number, state: boolean) => Result<string | Node<P>>): P;
+export function repeat<N extends HTMLElement | string>(symbol: string, parser: Parser<N>, cons: (nodes: N[], context: Ctx) => N[], termination: (acc: N[][], rest: string, prefix: number, postfix: number, state: boolean) => Result<string | N> = (acc, rest, prefix, postfix) => {
   const nodes = [];
   if (prefix > 0) {
     nodes.push(symbol[0].repeat(prefix));
@@ -26,11 +26,11 @@ export function repeat<T extends HTMLElement | string>(symbol: string, parser: P
     rest = rest.slice(postfix);
   }
   return [nodes, rest];
-}): Parser<string | T> {
+}): Parser<string | N> {
   return input => {
     const { source, context } = input;
     assert(source.startsWith(symbol));
-    let acc: T[][] = [];
+    let acc: N[][] = [];
     let i = symbol.length;
     while (source[i] === source[0]) ++i;
     let rest = source.slice(i);
@@ -87,12 +87,12 @@ export function invalid(
   };
 }
 
-export function markInvalid<T extends Element>(
-  el: T,
+export function markInvalid<N extends HTMLElement>(
+  el: N,
   syntax: string,
   type: string,
   message: string,
-): T {
+): N {
   assert(!message.endsWith('.'));
   return define(el, {
     class: void el.classList.add('invalid'),
@@ -102,7 +102,7 @@ export function markInvalid<T extends Element>(
   });
 }
 
-export function unmarkInvalid<T extends Element>(el: T): T {
+export function unmarkInvalid<N extends HTMLElement>(el: N): N {
   return define(el, {
     class: void el.classList.remove('invalid'),
     'data-invalid-syntax': null,

package/src/parser/visibility.ts

@@ -18,7 +18,7 @@ export namespace blank {
 }
 
 export function visualize<P extends Parser<HTMLElement | string>>(parser: P): P;
-export function visualize<T extends HTMLElement | string>(parser: Parser<T>): Parser<T> {
+export function visualize<N extends HTMLElement | string>(parser: Parser<N>): Parser<N> {
   return union([
     convert(
       source => source.replace(blank.line, line => line.replace(/[\\&<]/g, `${Command.Escape}$&`)),
@@ -60,7 +60,7 @@ export function blankWith(starts: '' | '\n', delimiter?: string | RegExp): RegEx
 }
 
 //export function looseStart<P extends Parser<HTMLElement | string>>(parser: P, except?: string): P;
-//export function looseStart<T extends HTMLElement | string>(parser: Parser<T>, except?: string): Parser<T> {
+//export function looseStart<N extends HTMLElement | string>(parser: Parser<N>, except?: string): Parser<N> {
 //  return input =>
 //    isLooseStart(input, except)
 //      ? parser(input)
@@ -71,7 +71,7 @@ export function blankWith(starts: '' | '\n', delimiter?: string | RegExp): RegEx
 //}, ({ source }, except = '') => `${source}${Command.Separator}${except}`);
 
 export function tightStart<P extends Parser<unknown>>(parser: P, except?: string): P;
-export function tightStart<T>(parser: Parser<T>, except?: string): Parser<T> {
+export function tightStart<N>(parser: Parser<N>, except?: string): Parser<N> {
   return input =>
     isTightStart(input, except)
       ? parser(input)
@@ -155,31 +155,31 @@ function isVisible(node: HTMLElement | string, strpos?: number): boolean {
 
 // デフラグ前の非効率な後方トリムを避けるため必要のない限りtrimBlankStart+trimNodeEndで処理する。
 export function trimBlank<P extends Parser<HTMLElement | string>>(parser: P): P;
-export function trimBlank<T extends HTMLElement | string>(parser: Parser<T>): Parser<T> {
+export function trimBlank<N extends HTMLElement | string>(parser: Parser<N>): Parser<N> {
   return trimBlankStart(trimBlankEnd(parser));
 }
 export function trimBlankStart<P extends Parser<unknown>>(parser: P): P;
-export function trimBlankStart<T>(parser: Parser<T>): Parser<T> {
+export function trimBlankStart<N>(parser: Parser<N>): Parser<N> {
   return convert(
     source => source.replace(blank.start, ''),
     parser,
     true);
 }
 export function trimBlankEnd<P extends Parser<HTMLElement | string>>(parser: P): P;
-export function trimBlankEnd<T extends HTMLElement | string>(parser: Parser<T>): Parser<T> {
+export function trimBlankEnd<N extends HTMLElement | string>(parser: Parser<N>): Parser<N> {
   return fmap(
     parser,
     trimBlankNodeEnd);
 }
-//export function trimBlankNode<T extends HTMLElement | string>(nodes: T[]): T[] {
+//export function trimBlankNode<N extends HTMLElement | string>(nodes: N[]): N[] {
 //  return trimBlankNodeStart(trimBlankNodeEnd(nodes));
 //}
-//function trimBlankNodeStart<T extends HTMLElement | string>(nodes: T[]): T[] {
+//function trimBlankNodeStart<N extends HTMLElement | string>(nodes: N[]): N[] {
 //  for (let node = nodes[0]; nodes.length > 0 && !isVisible(node = nodes[0], 0);) {
 //    if (typeof node === 'string') {
 //      const pos = node.trimStart().length;
 //      if (pos > 0) {
-//        nodes[0] = node.slice(-pos) as T;
+//        nodes[0] = node.slice(-pos) as N;
 //        break;
 //      }
 //    }
@@ -190,7 +190,7 @@ export function trimBlankEnd<T extends HTMLElement | string>(parser: Parser<T>):
 //  }
 //  return nodes;
 //}
-export function trimBlankNodeEnd<T extends HTMLElement | string>(nodes: T[]): T[] {
+export function trimBlankNodeEnd<N extends HTMLElement | string>(nodes: N[]): N[] {
   const skip = nodes.length > 0 &&
     typeof nodes.at(-1) === 'object' &&
     nodes.at(-1)!['className'] === 'indexer'
@@ -200,7 +200,7 @@ export function trimBlankNodeEnd<T extends HTMLElement | string>(nodes: T[]): T[
     if (typeof node === 'string') {
       const len = node.trimEnd().length;
       if (len > 0) {
-        nodes[nodes.length - 1] = node.slice(0, len) as T;
+        nodes[nodes.length - 1] = node.slice(0, len) as N;
         break;
       }
     }

package/src/util/quote.ts

@@ -82,7 +82,7 @@ function fit(range: Range): void {
   }
 }
 
-function trim<T extends Node>(node: T): T {
+function trim<N extends Node>(node: N): N {
   for (let child: ChildNode & Node | null; child = node.firstChild;) {
     if (child.textContent) break;
     child.remove();