securemark 0.223.0 → 0.225.1

package/src/parser/util.ts

@@ -70,16 +70,18 @@ function hasVisible(
   return false;
 }
 
-export function startLoose<P extends Parser<HTMLElement | string>>(parser: P): P;
-export function startLoose<T extends HTMLElement | string>(parser: Parser<T>): Parser<T> {
+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)
+    isStartLoose(source, context, except)
       ? parser(source, context)
       : undefined;
 }
-function isStartLoose(source: string, context: MarkdownParser.Context): boolean {
+export function isStartLoose(source: string, context: MarkdownParser.Context, except?: string): boolean {
+  source &&= source.replace(/^[^\S\n]+/, '');
   if (source === '') return true;
-  return isStartTight(source.replace(/^[^\S\n]+/, ''), context);
+  return source.slice(0, except?.length ?? 0) !== except
+      && isStartTight(source, context);
 }
 export function startTight<P extends Parser<unknown>>(parser: P): P;
 export function startTight<T>(parser: Parser<T>): Parser<T> {
@@ -88,7 +90,7 @@ export function startTight<T>(parser: Parser<T>): Parser<T> {
       ? parser(source, context)
       : undefined;
 }
-export function isStartTight(source: string, context: MarkdownParser.Context): boolean {
+function isStartTight(source: string, context: MarkdownParser.Context): boolean {
   if (source === '') return true;
   switch (source[0]) {
     case ' ':
@@ -133,22 +135,7 @@ export function isStartTightNodes(nodes: readonly (HTMLElement | string)[]): boo
 }
 export function isEndTightNodes(nodes: readonly (HTMLElement | string)[]): boolean {
   if (nodes.length === 0) return true;
-  const last = nodes.length - 1;
-  return typeof nodes[last] === 'string' && (nodes[last] as string).length > 1
-    ? isVisible(nodes[last], -1) ||
-      isVisible(nodes[last], -2)
-    : isVisible(nodes[last], -1) || last === 0 ||
-      isVisible(nodes[last - 1], -1);
-}
-export function visible<P extends Parser<HTMLElement | string>>(parser: P): P;
-export function visible<T extends HTMLElement | string>(parser: Parser<T>): Parser<T> {
-  return verify(parser, nodes => {
-    if (nodes.length === 0) return true;
-    for (let i = 0; i < nodes.length; ++i) {
-      if (isVisible(nodes[i])) return true;
-    }
-    return false;
-  });
+  return isVisible(nodes[nodes.length - 1], -1);
 }
 function isVisible(node: HTMLElement | string, position?: number): boolean {
   if (!node) return false;
@@ -185,28 +172,19 @@ export function trimNode(nodes: (HTMLElement | string)[]): (HTMLElement | string
   return trimNodeStart(trimNodeEnd(nodes));
 }
 function trimNodeStart(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
-  const skip = nodes.length > 0 &&
-    typeof nodes[nodes.length - 1] === 'object' &&
-    nodes[nodes.length - 1]['className'] === 'indexer'
-    ? [nodes.pop()!]
-    : [];
-  for (
-    let first = nodes[0];
-    nodes.length > 0 &&
-    !isVisible(first, 0) &&
-    !(typeof first === 'object' && first.className === 'comment');
-  ) {
-    assert(nodes.length > 0);
-    if (typeof first === 'string') {
-      const pos = first.length - first.trimStart().length;
+  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 === 'object' && node.className === 'comment') break;
+    if (typeof node === 'string') {
+      const pos = node.length - node.trimStart().length;
       if (pos > 0) {
-        nodes[0] = first.slice(pos);
+        nodes[0] = node.slice(pos);
         break;
       }
     }
-    nodes.pop();
+    nodes.shift();
   }
-  return push(nodes, skip);
+  return nodes;
 }
 export function trimNodeEnd(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
   const skip = nodes.length > 0 &&
@@ -214,17 +192,12 @@ export function trimNodeEnd(nodes: (HTMLElement | string)[]): (HTMLElement | str
     nodes[nodes.length - 1]['className'] === 'indexer'
     ? [nodes.pop()!]
     : [];
-  for (
-    let last = nodes[0];
-    nodes.length > 0 &&
-    !isVisible(last = nodes[nodes.length - 1], -1) &&
-    !(typeof last === 'object' && last.className === 'comment');
-  ) {
-    assert(nodes.length > 0);
-    if (typeof last === 'string') {
-      const pos = last.trimEnd().length;
+  for (let node = nodes[0]; nodes.length > 0 && !isVisible(node = nodes[nodes.length - 1], -1);) {
+    if (typeof node === 'object' && node.className === 'comment') break;
+    if (typeof node === 'string') {
+      const pos = node.trimEnd().length;
       if (pos > 0) {
-        nodes[nodes.length - 1] = last.slice(0, pos);
+        nodes[nodes.length - 1] = node.slice(0, pos);
         break;
       }
     }
@@ -232,8 +205,8 @@ export function trimNodeEnd(nodes: (HTMLElement | string)[]): (HTMLElement | str
   }
   return push(nodes, skip);
 }
-export function trimEndBR<T extends HTMLElement | string>(nodes: T[]): T[];
-export function trimEndBR(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
+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'

package/src/renderer/render.ts

@@ -12,7 +12,6 @@ const extend = reduce((opts: RenderingOptions): RenderingOptions =>
 
 export function render(source: HTMLElement, opts: RenderingOptions = {}): void {
   opts = extend(opts);
-  if (source.classList.contains('invalid')) return;
   const base = location.href;
   if (source.matches(selector)) return void render_(base, source, opts);
   for (
@@ -23,7 +22,7 @@ export function render(source: HTMLElement, opts: RenderingOptions = {}): void {
 }
 
 function render_(base: string, source: HTMLElement, opts: RenderingOptions): void {
-  assert(!source.matches('.invalid'));
+  if (source.classList.contains('invalid')) return;
   try {
     switch (true) {
       case !!opts.code