securemark 0.241.0 → 0.242.0

package/src/parser/block/extension/figure.ts

@@ -6,11 +6,12 @@ import { label } from '../../inline/extension/label';
 import { ulist } from '../ulist';
 import { olist } from '../olist';
 import { table as styled_table } from '../table';
+import { indentblock } from '../indentblock';
 import { codeblock, segment_ as seg_code } from '../codeblock';
 import { mathblock, segment_ as seg_math } from '../mathblock';
-import { blockquote, segment as seg_blockquote } from '../blockquote';
 import { example } from './example';
 import { table, segment_ as seg_table } from './table';
+import { blockquote, segment as seg_blockquote } from '../blockquote';
 import { placeholder, segment_ as seg_placeholder } from './placeholder';
 import { inline, media, shortmedia } from '../../inline';
 import { localize } from '../../locale';
@@ -57,11 +58,12 @@ export const figure: FigureParser = block(rewrite(segment, fmap(
         ulist,
         olist,
         styled_table,
+        indentblock,
         codeblock,
         mathblock,
-        blockquote,
         example,
         table,
+        blockquote,
         placeholder,
         line(media),
         line(shortmedia),

package/src/parser/block/extension/message.test.ts

@@ -15,13 +15,13 @@ describe('Unit: parser/block/extension/message', () => {
     });
 
     it('valid', () => {
-      assert.deepStrictEqual(inspect(parser('~~~message/note\n~~~')), [['<div class="message type-note"><h6>Note</h6></div>'], '']);
-      assert.deepStrictEqual(inspect(parser('~~~message/note\n\n~~~')), [['<div class="message type-note"><h6>Note</h6></div>'], '']);
-      assert.deepStrictEqual(inspect(parser('~~~message/note\na\n~~~')), [['<div class="message type-note"><h6>Note</h6><p>a</p></div>'], '']);
-      assert.deepStrictEqual(inspect(parser('~~~message/note\na\n\n- \n~~~')), [['<div class="message type-note"><h6>Note</h6><p>a</p><ul><li></li></ul></div>'], '']);
-      assert.deepStrictEqual(inspect(parser('~~~message/note\n# a\n~~~')), [['<div class="message type-note"><h6>Note</h6><p># a</p></div>'], '']);
-      assert.deepStrictEqual(inspect(parser('~~~message/caution\n~~~')), [['<div class="message type-caution"><h6>Caution!</h6></div>'], '']);
-      assert.deepStrictEqual(inspect(parser('~~~message/warning\n~~~')), [['<div class="message type-warning"><h6>WARNING!!</h6></div>'], '']);
+      assert.deepStrictEqual(inspect(parser('~~~message/note\n~~~')), [['<div class="message" data-type="note"><h6>Note</h6></div>'], '']);
+      assert.deepStrictEqual(inspect(parser('~~~message/note\n\n~~~')), [['<div class="message" data-type="note"><h6>Note</h6></div>'], '']);
+      assert.deepStrictEqual(inspect(parser('~~~message/note\na\n~~~')), [['<div class="message" data-type="note"><h6>Note</h6><p>a</p></div>'], '']);
+      assert.deepStrictEqual(inspect(parser('~~~message/note\na\n\n- \n~~~')), [['<div class="message" data-type="note"><h6>Note</h6><p>a</p><ul><li></li></ul></div>'], '']);
+      assert.deepStrictEqual(inspect(parser('~~~message/note\n# a\n~~~')), [['<div class="message" data-type="note"><h6>Note</h6><p># a</p></div>'], '']);
+      assert.deepStrictEqual(inspect(parser('~~~message/caution\n~~~')), [['<div class="message" data-type="caution"><h6>Caution!</h6></div>'], '']);
+      assert.deepStrictEqual(inspect(parser('~~~message/warning\n~~~')), [['<div class="message" data-type="warning"><h6>WARNING!!</h6></div>'], '']);
     });
 
   });

package/src/parser/block/extension/message.ts

@@ -7,6 +7,7 @@ import { ulist } from '../ulist';
 import { olist } from '../olist';
 import { ilist } from '../ilist';
 import { table } from '../table';
+import { indentblock } from '../indentblock';
 import { codeblock } from '../codeblock';
 import { mathblock } from '../mathblock';
 import { blockquote } from '../blockquote';
@@ -41,7 +42,7 @@ export const message: MessageParser = block(validate('~~~', fmap(
         }, `${opener}${body}${closer}`)];
     }
     return [
-      html('div', { class: `message type-${type}` }, unshift(
+      html('div', { class: `message`, 'data-type': type }, unshift(
         [html('h6', title(type))],
         [...segment(body)].reduce((acc, seg) => push(acc, eval(content(seg, context), [])), []))),
     ];
@@ -65,6 +66,7 @@ const content: MessageParser.ContentParser = union([
   olist,
   ilist,
   table,
+  indentblock,
   codeblock,
   mathblock,
   blockquote,

package/src/parser/block/indentblock.test.ts

@@ -0,0 +1,30 @@
+import { indentblock } from './indentblock';
+import { some } from '../../combinator';
+import { inspect } from '../../debug.test';
+
+describe('Unit: parser/block/indentblock', () => {
+  describe('indentblock', () => {
+    const parser = (source: string) => some(indentblock)(source, {});
+
+    it('invalid', () => {
+      assert.deepStrictEqual(inspect(parser('')), undefined);
+      assert.deepStrictEqual(inspect(parser('\na')), undefined);
+      assert.deepStrictEqual(inspect(parser(' a')), undefined);
+      assert.deepStrictEqual(inspect(parser(' \ta')), undefined);
+      assert.deepStrictEqual(inspect(parser('  a\nb')), undefined);
+      assert.deepStrictEqual(inspect(parser('  a\n b')), undefined);
+    });
+
+    it('valid', () => {
+      assert.deepStrictEqual(inspect(parser('  a')), [['<pre class="text">a</pre>'], '']);
+      assert.deepStrictEqual(inspect(parser('  a ')), [['<pre class="text">a </pre>'], '']);
+      assert.deepStrictEqual(inspect(parser('  a \n')), [['<pre class="text">a </pre>'], '']);
+      assert.deepStrictEqual(inspect(parser('  a \n    b')), [['<pre class="text">a <br>  b</pre>'], '']);
+      assert.deepStrictEqual(inspect(parser('  a\\\n  b')), [['<pre class="text">a\\<br>b</pre>'], '']);
+      assert.deepStrictEqual(inspect(parser('\ta')), [['<pre class="text">a</pre>'], '']);
+      assert.deepStrictEqual(inspect(parser('\t a')), [['<pre class="text"> a</pre>'], '']);
+    });
+
+  });
+
+});

package/src/parser/block/indentblock.ts

@@ -0,0 +1,13 @@
+import { IndentBlockParser } from '../block';
+import { union, block, validate, indent, convert } from '../../combinator';
+import { codeblock } from './codeblock';
+
+// 空行を含むインデントブロックはインデントの違いによるセグメント分割の境界が視認不能となるため採用しない
+
+export const indentblock: IndentBlockParser = block(validate(/^(?:  |\t)/, indent(convert(
+  source => {
+    const fence = (source.match(/^`{3,}(?=[^\S\n]*$)/mg) ?? [])
+      .reduce((max, fence) => fence > max ? fence : max, '``') + '`';
+    return `${fence}\n${source}\n${fence}`;
+  },
+  union([codeblock])), true)));

package/src/parser/block.ts

@@ -9,10 +9,11 @@ import { olist } from './block/olist';
 import { ilist } from './block/ilist';
 import { dlist } from './block/dlist';
 import { table } from './block/table';
-import { blockquote } from './block/blockquote';
+import { indentblock } from './block/indentblock';
 import { codeblock } from './block/codeblock';
 import { mathblock } from './block/mathblock';
 import { extension } from './block/extension';
+import { blockquote } from './block/blockquote';
 import { reply } from './block/reply';
 import { paragraph } from './block/paragraph';
 import { html } from 'typed-dom/dom';
@@ -26,6 +27,7 @@ export import OListParser = BlockParser.OListParser;
 export import IListParser = BlockParser.IListParser;
 export import DListParser = BlockParser.DListParser;
 export import TableParser = BlockParser.TableParser;
+export import IndentBlockParser = BlockParser.IndentBlockParser;
 export import CodeBlockParser = BlockParser.CodeBlockParser;
 export import MathBlockParser = BlockParser.MathBlockParser;
 export import ExtensionParser = BlockParser.ExtensionParser;
@@ -44,6 +46,7 @@ export const block: BlockParser = creator(error(
     ilist,
     dlist,
     table,
+    indentblock,
     codeblock,
     mathblock,
     extension,

package/src/parser/processor/figure.ts

@@ -12,9 +12,9 @@ export function* figure(
   }> = {},
 ): Generator<HTMLAnchorElement | undefined, undefined, undefined> {
   const refs = new MultiMap<string, HTMLAnchorElement>(push(push(push([],
-    target.querySelectorAll<HTMLAnchorElement>('a.label:not(.disabled)[data-label]')),
-    footnotes?.annotations.querySelectorAll<HTMLAnchorElement>('a.label:not(.disabled)') ?? []),
-    footnotes?.references.querySelectorAll<HTMLAnchorElement>('a.label:not(.disabled)') ?? [])
+    target.querySelectorAll('a.label:not(.disabled)[data-label]')),
+    footnotes?.annotations.querySelectorAll('a.label:not(.disabled)') ?? []),
+    footnotes?.references.querySelectorAll('a.label:not(.disabled)') ?? [])
     .map(el => [el.getAttribute('data-label')!, el]));
   const labels = new Set<string>();
   const numbers = new Map<string, string>();

package/src/parser/processor/footnote.ts

@@ -42,7 +42,7 @@ function build(
     const check = footnotes.some(el => target.contains(el));
     let style: 'count' | 'abbr';
     for (
-      let refs = target.querySelectorAll<HTMLElement>(`sup.${syntax}:not(.disabled)`),
+      let refs = target.querySelectorAll(`sup.${syntax}:not(.disabled)`),
           i = 0, len = refs.length; i < len; ++i) {
       yield;
       const ref = refs[i];

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

@@ -1,6 +1,6 @@
 import { window, document } from 'spica/global';
 import { parse } from '../../../parser';
-import { html, define } from 'typed-dom/dom';
+import { html as h, define } from 'typed-dom/dom';
 import { sanitize } from 'dompurify';
 
 declare global {
@@ -21,8 +21,8 @@ export function twitter(source: HTMLImageElement, url: URL): HTMLElement | undef
   if (!origins.includes(url.origin)) return;
   if (url.pathname.split('/').pop()!.includes('.')) return;
   if (!url.pathname.match(/^\/\w+\/status\/[0-9]{15,}(?!\w)/)) return;
-  const el = html('div', { class: source.className, 'data-type': 'twitter' }, [
-    html('em', `Loading ${source.getAttribute('data-src')}...`),
+  const el = h('div', { class: source.className, 'data-type': 'twitter' }, [
+    h('em', `Loading ${source.getAttribute('data-src')}...`),
   ]);
   $.ajax(`https://publish.twitter.com/oembed?url=${url.href.replace('?', '&')}&omit_script=true`, {
     dataType: 'jsonp',
@@ -33,7 +33,7 @@ export function twitter(source: HTMLImageElement, url: URL): HTMLElement | undef
       if (window.twttr) return void window.twttr.widgets.load(el);
       const id = 'twitter-wjs';
       if (document.getElementById(id)) return;
-      document.body.appendChild(html('script', { id, src: 'https://platform.twitter.com/widgets.js' }));
+      document.body.appendChild(h('script', { id, src: 'https://platform.twitter.com/widgets.js' }));
     },
     error({ status, statusText }) {
       assert(Number.isSafeInteger(status));

package/src/renderer/render.ts

@@ -3,6 +3,7 @@ import { RenderingOptions } from '../../';
 import { code } from './render/code';
 import { math } from './render/math';
 import { media } from './render/media';
+import { querySelectorAll } from 'typed-dom/query';
 import { reduce } from 'spica/memoize';
 
 const selector = 'img.media:not(.invalid):not([src])[data-src], a > :not(img).media:not(.invalid), pre.code:not(.invalid), .math:not(.invalid)';
@@ -13,11 +14,8 @@ const extend = reduce((opts: RenderingOptions): RenderingOptions =>
 export function render(source: HTMLElement, opts: RenderingOptions = {}): void {
   opts = extend(opts);
   const base = location.href;
-  if (source.matches(selector)) return void render_(base, source, opts);
-  for (
-    let es = source.querySelectorAll<HTMLElement>(selector),
-        i = 0, len = es.length; i < len; ++i) {
-    render_(base, es[i], opts);
+  for (const el of querySelectorAll<HTMLElement>(source, selector)) {
+    render_(base, el, opts);
   }
 }
 

package/src/util/info.ts

@@ -1,5 +1,6 @@
 import { Info } from '../..';
 import { scope } from './scope';
+import { querySelectorAll } from 'typed-dom/query';
 
 export function info(source: DocumentFragment | HTMLElement | ShadowRoot): Info {
   const match = scope(source, '.invalid');
@@ -19,12 +20,7 @@ export function info(source: DocumentFragment | HTMLElement | ShadowRoot): Info
   };
 
   function find<T extends HTMLElement>(selector: string): T[] {
-    const acc: T[] = [];
-    for (let es = source.querySelectorAll<T>(selector), i = 0, len = es.length; i < len; ++i) {
-      const el = es[i];
-      if (!match(el)) continue;
-      acc.push(el);
-    }
-    return acc;
+    return querySelectorAll<T>(source, selector)
+      .filter(match);
   }
 }