securemark 0.235.0 → 0.235.3

package/src/parser/processor/figure.ts

@@ -85,7 +85,7 @@ export function* figure(
       ? `(${number})`
       : `${capitalize(group)}${group === 'fig' ? '.' : ''} ${number}`;
     define(
-      def.querySelector(':scope > .figindex')!,
+      def.querySelector(':scope > figcaption > .figindex')!,
       group === '$' ? figindex : `${figindex}. `);
     for (const ref of refs.take(label, Infinity)) {
       if (ref.hash.slice(1) === def.id && ref.innerText === figindex) continue;

package/src/parser/util.ts

@@ -5,15 +5,23 @@ import { union, some, verify, convert } from '../combinator';
 import { unsafehtmlentity } from './inline/htmlentity';
 import { linebreak, unescsource } from './source';
 import { invisibleHTMLEntityNames } from './api/normalize';
-import { push, pop } from 'spica/array';
+import { reduce } from 'spica/memoize';
+import { push } from 'spica/array';
 
-export function delimiter(opener: RegExp): RegExp {
-  return new RegExp(String.raw`^(?:\s+|\\\s|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr>)?${opener.source}`);
+export function blank(prefix: '' | RegExp, suffix: string | RegExp): RegExp {
+  return new RegExp(String.raw
+    `^${
+      prefix && prefix.source
+    }(?:\\\s|[^\S\n]+|\n|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr>)?${
+      typeof suffix === 'string' ? suffix.replace(/[*+()\[\]]/g, '\\$&') : suffix.source
+    }`);
 }
 
 export function visualize<P extends Parser<HTMLElement | string>>(parser: P): P;
 export function visualize<T extends HTMLElement | string>(parser: Parser<T>): Parser<T> {
-  const blankline = new RegExp(String.raw`^(?:\\$|\\?[^\S\n]|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr>)+$`, 'gm');
+  const blankline = new RegExp(String.raw
+    `^(?:\\$|\\?[^\S\n]|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr>)+$`,
+    'gm');
   return union([
     convert(
       source => source.replace(blankline, line => line.replace(/[\\&<]/g, '\x1B$&')),
@@ -45,11 +53,9 @@ export function startLoose<T extends HTMLElement | string>(parser: Parser<T>, ex
       ? parser(source, context)
       : undefined;
 }
-export function isStartLoose(source: string, context: MarkdownParser.Context, except?: string): boolean {
-  source &&= source.replace(/^[^\S\n]+/, '');
-  if (source === '') return true;
-  return isStartTight(source, context, except);
-}
+export const isStartLoose = reduce((source: string, context: MarkdownParser.Context, except?: string): boolean => {
+  return isStartTight(source.replace(/^[^\S\n]+/, ''), context, except);
+}, (source, _, except = '') => `${source}\0${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) =>
@@ -57,7 +63,7 @@ export function startTight<T>(parser: Parser<T>, except?: string): Parser<T> {
       ? parser(source, context)
       : undefined;
 }
-function isStartTight(source: string, context: MarkdownParser.Context, except?: string): boolean {
+const isStartTight = reduce((source: string, context: MarkdownParser.Context, except?: string): boolean => {
   if (source === '') return true;
   if (except && source.slice(0, except.length) === except) return false;
   switch (source[0]) {
@@ -87,15 +93,15 @@ function isStartTight(source: string, context: MarkdownParser.Context, except?:
     default:
       return source[0].trimStart() !== '';
   }
-}
+}, (source, _, except = '') => `${source}\0${except}`);
 export function isStartTightNodes(nodes: readonly (HTMLElement | string)[]): boolean {
   if (nodes.length === 0) return true;
   return isVisible(nodes[0], 0);
 }
-export function isEndTightNodes(nodes: readonly (HTMLElement | string)[]): boolean {
-  if (nodes.length === 0) return true;
-  return isVisible(nodes[nodes.length - 1], -1);
-}
+//export function isEndTightNodes(nodes: readonly (HTMLElement | string)[]): boolean {
+//  if (nodes.length === 0) return true;
+//  return isVisible(nodes[nodes.length - 1], -1);
+//}
 function isVisible(node: HTMLElement | string, strpos?: number): boolean {
   switch (typeof node) {
     case 'string':
@@ -124,23 +130,29 @@ function isVisible(node: HTMLElement | string, strpos?: number): boolean {
   }
 }
 
-export function trimNode(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
-  return trimNodeStart(trimNodeEnd(nodes));
-}
-function trimNodeStart(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
-  for (let node = nodes[0]; nodes.length > 0 && !isVisible(node = nodes[0], 0);) {
-    if (nodes.length === 1 && typeof node === 'object' && node.className === 'indexer') break;
-    if (typeof node === 'string') {
-      const pos = node.length - node.trimStart().length;
-      if (pos > 0) {
-        nodes[0] = node.slice(pos);
-        break;
-      }
-    }
-    nodes.shift();
-  }
-  return nodes;
+export function trimSpaceStart<P extends Parser<unknown>>(parser: P): P;
+export function trimSpaceStart<T>(parser: Parser<T>): Parser<T> {
+  return convert(
+    reduce(source => source.replace(/^[^\S\n]+/, '')),
+    parser);
 }
+//export function trimNode(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
+//  return trimNodeStart(trimNodeEnd(nodes));
+//}
+//function trimNodeStart(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
+//  for (let node = nodes[0]; nodes.length > 0 && !isVisible(node = nodes[0], 0);) {
+//    if (nodes.length === 1 && typeof node === 'object' && node.className === 'indexer') break;
+//    if (typeof node === 'string') {
+//      const pos = node.length - node.trimStart().length;
+//      if (pos > 0) {
+//        nodes[0] = node.slice(pos);
+//        break;
+//      }
+//    }
+//    nodes.shift();
+//  }
+//  return nodes;
+//}
 export function trimNodeEnd(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
   const skip = nodes.length > 0 &&
     typeof nodes[nodes.length - 1] === 'object' &&
@@ -159,14 +171,6 @@ export function trimNodeEnd(nodes: (HTMLElement | string)[]): (HTMLElement | str
   }
   return push(nodes, skip);
 }
-export function trimNodeEndBR<T extends HTMLElement | string>(nodes: T[]): T[];
-export function trimNodeEndBR(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
-  if (nodes.length === 0) return nodes;
-  const node = nodes[nodes.length - 1];
-  return typeof node === 'object' && node.tagName === 'BR'
-    ? pop(nodes)[0]
-    : nodes;
-}
 
 export function stringify(nodes: readonly (HTMLElement | string)[]): string {
   let acc = '';