securemark 0.248.1 → 0.250.0

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

@@ -18,10 +18,11 @@ describe('Unit: parser/source/unescapable', () => {
 
     it('space', () => {
       assert.deepStrictEqual(inspect(parser(' ')), [[' '], '']);
-      assert.deepStrictEqual(inspect(parser('  ')), [['  '], '']);
-      assert.deepStrictEqual(inspect(parser('   ')), [['   '], '']);
+      assert.deepStrictEqual(inspect(parser('  ')), [[' ', ' '], '']);
+      assert.deepStrictEqual(inspect(parser('   ')), [['  ', ' '], '']);
       assert.deepStrictEqual(inspect(parser(' \n')), [[' ', '\n'], '']);
-      assert.deepStrictEqual(inspect(parser('  \n')), [['  ', '\n'], '']);
+      assert.deepStrictEqual(inspect(parser('  \n')), [[' ', ' ', '\n'], '']);
+      assert.deepStrictEqual(inspect(parser('   \n')), [['  ', ' ', '\n'], '']);
     });
 
     it('linebreak', () => {

package/src/parser/source/unescapable.ts

@@ -1,11 +1,11 @@
 import { UnescapableSourceParser } from '../source';
 import { creator } from '../../combinator';
-import { separator, nonWhitespace, nonAlphanumeric, isAlphanumeric } from './text';
+import { delimiter, nonWhitespace, nonAlphanumeric, isAlphanumeric } from './text';
 
 export const unescsource: UnescapableSourceParser = creator(source => {
   assert(source[0] !== '\x1B');
   if (source === '') return;
-  const i = source.search(separator);
+  const i = source.search(delimiter);
   switch (i) {
     case -1:
       return [[source], ''];
@@ -15,7 +15,7 @@ export const unescsource: UnescapableSourceParser = creator(source => {
         ? source.search(b ? nonWhitespace : nonAlphanumeric) || 1
         : 1;
       assert(i > 0);
-      return [[source.slice(0, i)], source.slice(i)];
+      return [[source.slice(0, i - +b || 1)], source.slice(i - +b || 1)];
     }
     default:
       return [[source.slice(0, i)], source.slice(i)];

package/src/parser/util.ts

@@ -1,19 +1,25 @@
 import { undefined } from 'spica/global';
 import { MarkdownParser } from '../../markdown';
 import { Parser, eval } from '../combinator/data/parser';
-import { union, some, verify, convert } from '../combinator';
+import { union, some, verify, convert, fmap } from '../combinator';
 import { unsafehtmlentity } from './inline/htmlentity';
 import { linebreak, unescsource } from './source';
 import { invisibleHTMLEntityNames } from './api/normalize';
 import { reduce } from 'spica/memoize';
 import { push } from 'spica/array';
 
-export function blank(prefix: '' | RegExp, suffix: string | RegExp): RegExp {
+export const regBlankStart = new RegExp(String.raw
+  `^(?:\\?[^\S\n]|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr>)+`);
+
+export function blankWith(delimiter: string | RegExp): RegExp;
+export function blankWith(starting: '' | '\n', delimiter: string | RegExp): RegExp;
+export function blankWith(starting: '' | '\n', delimiter?: string | RegExp): RegExp {
+  if (delimiter === undefined) return blankWith('', starting);
   return new RegExp(String.raw
-    `^(?:${
-      prefix && prefix.source
-    }(?:\\\s|[^\S\n]|\n|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr>)*)?${
-      typeof suffix === 'string' ? suffix.replace(/[*+()\[\]]/g, '\\$&') : suffix.source
+    `^(?:(?=${
+      starting
+    })(?:\\?\s|&(?:${invisibleHTMLEntityNames.join('|')});|<wbr>)${starting && '+'})?${
+      typeof delimiter === 'string' ? delimiter.replace(/[*+()\[\]]/g, '\\$&') : delimiter.source
     }`);
 }
 
@@ -53,9 +59,10 @@ export function startLoose<T extends HTMLElement | string>(parser: Parser<T>, ex
       ? parser(source, context)
       : undefined;
 }
-export const isStartLoose = reduce((source: string, context: MarkdownParser.Context, except?: string): boolean => {
-  return isStartTight(source.replace(/^[^\S\n]+/, ''), context, except);
+const isStartLoose = reduce((source: string, context: MarkdownParser.Context, except?: string): boolean => {
+  return isStartTight(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) =>
@@ -130,10 +137,16 @@ function isVisible(node: HTMLElement | string, strpos?: number): boolean {
   }
 }
 
-export function trimSpaceStart<P extends Parser<unknown>>(parser: P): P;
-export function trimSpaceStart<T>(parser: Parser<T>): Parser<T> {
+export function trimBlank<P extends Parser<HTMLElement | string>>(parser: P): P;
+export function trimBlank<T extends HTMLElement | string>(parser: Parser<T>): Parser<T> {
+  return fmap(
+    trimBlankStart(parser),
+    trimNodeEnd);
+}
+function trimBlankStart<P extends Parser<unknown>>(parser: P): P;
+function trimBlankStart<T>(parser: Parser<T>): Parser<T> {
   return convert(
-    reduce(source => source.replace(/^[^\S\n]+/, '')),
+    reduce(source => source.replace(regBlankStart, '')),
     parser);
 }
 //export function trimNode(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
@@ -153,7 +166,7 @@ export function trimSpaceStart<T>(parser: Parser<T>): Parser<T> {
 //  }
 //  return nodes;
 //}
-export function trimNodeEnd(nodes: (HTMLElement | string)[]): (HTMLElement | string)[] {
+export function trimNodeEnd<T extends HTMLElement | string>(nodes: T[]): T[] {
   const skip = nodes.length > 0 &&
     typeof nodes[nodes.length - 1] === 'object' &&
     nodes[nodes.length - 1]['className'] === 'indexer'
@@ -163,7 +176,7 @@ export function trimNodeEnd(nodes: (HTMLElement | string)[]): (HTMLElement | str
     if (typeof node === 'string') {
       const pos = node.trimEnd().length;
       if (pos > 0) {
-        nodes[nodes.length - 1] = node.slice(0, pos);
+        nodes[nodes.length - 1] = node.slice(0, pos) as T;
         break;
       }
     }

package/src/renderer/render/media/image.ts

@@ -1,11 +1,11 @@
-import { ObjectFromEntries } from 'spica/alias';
+import { Object } from 'spica/global';
 import { Collection } from 'spica/collection';
 import { define } from 'typed-dom/dom';
 
 export function image(source: HTMLImageElement, url: URL, cache?: Collection<string, HTMLElement>): HTMLImageElement {
   if (cache?.has(url.href)) return define(
     cache.get(url.href)!.cloneNode(true) as HTMLImageElement,
-    ObjectFromEntries([...source.attributes]
+    Object.fromEntries([...source.attributes]
       .map(attr => [attr.name, attr.value])));
   define(source, {
     'data-type': 'image',
@@ -14,7 +14,7 @@ export function image(source: HTMLImageElement, url: URL, cache?: Collection<str
   });
   cache?.set(url.href, define(
     source.cloneNode(true),
-    ObjectFromEntries([...source.attributes]
+    Object.fromEntries([...source.attributes]
       .filter(attr => !['class', 'data-type', 'data-src', 'src', 'loading'].includes(attr.name))
       .map(attr => [attr.name, null]))));
   return source;

package/src/renderer/render/media/video.ts

@@ -1,4 +1,4 @@
-import { ObjectFromEntries } from 'spica/alias';
+import { Object } from 'spica/global';
 import { html } from 'typed-dom/dom';
 
 const extensions = [
@@ -11,7 +11,7 @@ export function video(source: HTMLImageElement, url: URL): HTMLVideoElement | un
   return html('video', {
     src: source.getAttribute('data-src'),
     'data-type': 'video',
-    ...ObjectFromEntries([...source.attributes]
+    ...Object.fromEntries([...source.attributes]
       .map(attr => [attr.name, attr.value])),
     muted: '',
     controls: '',