securemark 0.260.0 → 0.260.3

package/src/parser/inline/link.ts

@@ -36,12 +36,6 @@ const textlink: LinkParser.TextLinkParser = lazy(() =>
   ])),
   ([params, content = []]: [string[], (HTMLElement | string)[]], rest, context) => {
     assert(!html('div', content).querySelector('a, .media, .annotation, .reference'));
-    if (content.length !== 0 && trimNode(content).length === 0) return;
-    for (let source = stringify(content); source;) {
-      const result = autolink({ source, context });
-      if (typeof eval(result, [])[0] === 'object') return;
-      source = exec(result, '');
-    }
     return parse(content, params, rest, context);
   }))));
 
@@ -91,42 +85,45 @@ function parse(
 ): Result<HTMLAnchorElement, MarkdownParser.Context> {
   assert(params.length > 0);
   assert(params.every(p => typeof p === 'string'));
+  if (content.length !== 0 && trimNode(content).length === 0) return;
+  content = defrag(content);
+  for (let source = stringify(content); source;) {
+    if (/^[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*:\/\/[^/?#]/i.test(source)) return;
+    const result = autolink({ source, context });
+    if (typeof eval(result, [])[0] === 'object') return;
+    source = exec(result, '');
+  }
   const INSECURE_URI = params.shift()!;
   assert(INSECURE_URI === INSECURE_URI.trim());
   assert(!INSECURE_URI.match(/\s/));
+  const uri = new ReadonlyURL(
+    resolve(INSECURE_URI, context.host ?? location, context.url ?? context.host ?? location),
+    context.host?.href || location.href);
+  switch (uri.protocol) {
+    case 'tel:': {
+      const tel = content.length === 0
+        ? INSECURE_URI
+        : content[0];
+      const pattern = /^(?:tel:)?(?:\+(?!0))?\d+(?:-\d+)*$/i;
+      if (content.length <= 1 &&
+          typeof tel === 'string' &&
+          pattern.test(tel) &&
+          pattern.test(INSECURE_URI) &&
+          tel.replace(/[^+\d]/g, '') === INSECURE_URI.replace(/[^+\d]/g, '')) {
+        break;
+      }
+      return;
+    }
+  }
   const el = elem(
     INSECURE_URI,
-    defrag(content),
-    new ReadonlyURL(
-      resolve(INSECURE_URI, context.host ?? location, context.url ?? context.host ?? location),
-      context.host?.href || location.href),
+    content,
+    uri,
     context.host?.origin || location.origin);
   if (el.className === 'invalid') return [[el], rest];
   return [[define(el, attributes('link', [], optspec, params))], rest];
 }
 
-export function resolve(uri: string, host: URL | Location, source: URL | Location): string {
-  assert(uri);
-  assert(uri === uri.trim());
-  switch (true) {
-    case uri.slice(0, 2) === '^/':
-      const last = host.pathname.slice(host.pathname.lastIndexOf('/') + 1);
-      return last.includes('.') // isFile
-          && /^[0-9]*[A-Za-z][0-9A-Za-z]*$/.test(last.slice(last.lastIndexOf('.') + 1))
-        ? `${host.pathname.slice(0, -last.length)}${uri.slice(2)}`
-        : `${host.pathname.replace(/\/?$/, '/')}${uri.slice(2)}`;
-    case host.origin === source.origin
-      && host.pathname === source.pathname:
-    case uri.slice(0, 2) === '//':
-      return uri;
-    default:
-      const target = new ReadonlyURL(uri, source.href);
-      return target.origin === host.origin
-        ? target.href.slice(target.origin.length)
-        : target.href;
-  }
-}
-
 function elem(
   INSECURE_URI: string,
   content: readonly (string | HTMLElement)[],
@@ -147,7 +144,7 @@ function elem(
       }
       return html('a',
         {
-          class: 'link',
+          class: content.length === 0 ? 'url' : 'link',
           href: uri.source,
           target: undefined
             || uri.origin !== origin
@@ -159,21 +156,15 @@ function elem(
           ? decode(INSECURE_URI)
           : content);
     case 'tel:':
-      if (content.length === 0) {
-        content = [INSECURE_URI];
-      }
-      const pattern = /^(?:tel:)?(?:\+(?!0))?\d+(?:-\d+)*$/i;
-      switch (true) {
-        case content.length === 1
-          && typeof content[0] === 'string'
-          && pattern.test(INSECURE_URI)
-          && pattern.test(content[0])
-          && INSECURE_URI.replace(/[^+\d]/g, '') === content[0].replace(/[^+\d]/g, ''):
-          return html('a', { class: 'tel', href: uri.source }, content);
-      }
-      type = 'content';
-      message = 'Invalid phone number';
-      break;
+      assert(content.length <= 1);
+      return html('a',
+        {
+          class: 'tel',
+          href: uri.source,
+        },
+        content.length === 0
+          ? [INSECURE_URI]
+          : content);
   }
   return html('a',
     {
@@ -187,10 +178,37 @@ function elem(
       : content);
 }
 
+export function resolve(uri: string, host: URL | Location, source: URL | Location): string {
+  assert(uri);
+  assert(uri === uri.trim());
+  switch (true) {
+    case uri.slice(0, 2) === '^/':
+      const last = host.pathname.slice(host.pathname.lastIndexOf('/') + 1);
+      return last.includes('.') // isFile
+          && /^[0-9]*[a-z][0-9a-z]*$/i.test(last.slice(last.lastIndexOf('.') + 1))
+        ? `${host.pathname.slice(0, -last.length)}${uri.slice(2)}`
+        : `${host.pathname.replace(/\/?$/, '/')}${uri.slice(2)}`;
+    case host.origin === source.origin
+      && host.pathname === source.pathname:
+    case uri.slice(0, 2) === '//':
+      return uri;
+    default:
+      const target = new ReadonlyURL(uri, source.href);
+      return target.origin === host.origin
+        ? target.href.slice(target.origin.length)
+        : target.href;
+  }
+}
+
 function decode(uri: string): string {
   if (!uri.includes('%')) return uri;
+  const origin = uri.match(/^[a-z](?:[-.](?=\w)|[0-9a-z])*:\/\/[^/?#]*/i)?.[0] ?? '';
   try {
-    uri = decodeURI(uri);
+    let path = decodeURI(uri.slice(origin.length));
+    if (!origin && /^[a-z](?:[-.](?=\w)|[0-9a-z])*:\/\/[^/?#]/i.test(path)) {
+      path = uri.slice(origin.length);
+    }
+    uri = origin + path;
   }
   finally {
     return uri.replace(/\s+/g, encodeURI);

package/src/parser/inline/reference.test.ts

@@ -46,7 +46,7 @@ describe('Unit: parser/inline/reference', () => {
       assert.deepStrictEqual(inspect(parser('[[`a`]]')), [['<sup class="reference"><span><code data-src="`a`">a</code></span></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[@a]]')), [['<sup class="reference"><span><a class="account" href="/@a">@a</a></span></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[http://host]]')), [['<sup class="reference"><span><a class="url" href="http://host" target="_blank">http://host</a></span></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[![]{a}]]')), [['<sup class="reference"><span>!<a class="link" href="a">a</a></span></sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[![]{a}]]')), [['<sup class="reference"><span>!<a class="url" href="a">a</a></span></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[[a]]]')), [['<sup class="reference"><span>[a]</span></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[[[a]]]]')), [['<sup class="reference"><span>[[a]]</span></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[((a))]]')), [['<sup class="reference"><span><span class="paren">((a))</span></span></sup>'], '']);

package/src/parser/inline/ruby.ts

@@ -48,7 +48,7 @@ export const ruby: RubyParser = lazy(() => validate('[', syntax(Syntax.none, 2,
     }
   }))));
 
-const text: RubyParser.TextParser = creation(({ source, context }) => {
+const text: RubyParser.TextParser = creation(1, false, ({ source, context }) => {
   const acc = [''];
   while (source !== '') {
     assert(source[0] !== '\n');

package/src/parser/inline.test.ts

@@ -117,27 +117,27 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('$$-1')), [['$', '<a class="label" data-label="$-1">$-1</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[[#a]]')), [['<sup class="reference"><span><a class="hashtag" href="/hashtags/a">#a</a></span></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[$-1]]')), [['<sup class="reference"><span><a class="label" data-label="$-1">$-1</a></span></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[#-1]]{b}')), [['<sup class="reference"><span>#-1</span></sup>', '<a class="link" href="b">b</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[#-1]]{b}')), [['<sup class="reference"><span>#-1</span></sup>', '<a class="url" href="b">b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[[#-1]](b)')), [['<sup class="reference"><span>#-1</span></sup>', '(', 'b', ')'], '']);
       assert.deepStrictEqual(inspect(parser('[[#-1]a]{b}')), [['<a class="link" href="b">[#-1]a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[[#-1]a](b)')), [['[', '<a class="index" href="#index:-1">-1</a>', 'a', ']', '(', 'b', ')'], '']);
-      assert.deepStrictEqual(inspect(parser('[#a]{b}')), [['<a class="index" href="#index:a">a</a>', '<a class="link" href="b">b</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a]{b}')), [['<a class="index" href="#index:a">a</a>', '<a class="url" href="b">b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[@a]{b}')), [['<a class="link" href="b">@a</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[http://host]{http://evil}')), [['[', '<a class="url" href="http://host" target="_blank">http://host</a>', ']', '<a class="link" href="http://evil" target="_blank">http://evil</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[http://host]{http://host}')), [['[', '<a class="url" href="http://host" target="_blank">http://host</a>', ']', '<a class="link" href="http://host" target="_blank">http://host</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[http://host]{http://evil}')), [['[', '<a class="url" href="http://host" target="_blank">http://host</a>', ']', '<a class="url" href="http://evil" target="_blank">http://evil</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[http://host]{http://host}')), [['[', '<a class="url" href="http://host" target="_blank">http://host</a>', ']', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[]{{a}}')), [['[', ']', '<span class="template">{{a}}</span>'], '']);
       assert.deepStrictEqual(inspect(parser('![]{{a}}')), [['!', '[', ']', '<span class="template">{{a}}</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('[\n]{a}')), [['[', '<br>', ']', '<a class="link" href="a">a</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[\\\n]{a}')), [['[', '<span class="linebreak"> </span>', ']', '<a class="link" href="a">a</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[\n]{a}')), [['[', '<br>', ']', '<a class="url" href="a">a</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[\\\n]{a}')), [['[', '<span class="linebreak"> </span>', ']', '<a class="url" href="a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('{}')), [['{', '}'], '']);
-      assert.deepStrictEqual(inspect(parser('{a}')), [['<a class="link" href="a">a</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('{a}')), [['<a class="url" href="a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('{{a}}')), [['<span class="template">{{a}}</span>'], '']);
       assert.deepStrictEqual(inspect(parser('!{}')), [['!', '{', '}'], '']);
       assert.deepStrictEqual(inspect(parser('!{a}')), [['<a href="a" target="_blank"><img class="media" data-src="a" alt=""></a>'], '']);
       assert.deepStrictEqual(inspect(parser('!{{a}}')), [['!', '<span class="template">{{a}}</span>'], '']);
       assert.deepStrictEqual(inspect(parser('!{{{a}}}')), [['!', '<span class="template">{{{a}}}</span>'], '']);
       assert.deepStrictEqual(inspect(parser('!!{a}')), [['!', '<a href="a" target="_blank"><img class="media" data-src="a" alt=""></a>'], '']);
-      assert.deepStrictEqual(inspect(parser('${a}')), [['$', '<a class="link" href="a">a</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('${a}')), [['$', '<a class="url" href="a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('${{a}}')), [['$', '<span class="template">{{a}}</span>'], '']);
       assert.deepStrictEqual(inspect(parser('${{{a}}}')), [['$', '<span class="template">{{{a}}}</span>'], '']);
       assert.deepStrictEqual(inspect(parser('Di$ney Micro$oft')), [['Di', '$', 'ney', ' ', 'Micro', '$', 'oft'], '']);
@@ -152,14 +152,14 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('[[[[a]]')), [['', '[', '', '[', '<sup class="reference"><span>a</span></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[[[a]]]]')), [['<sup class="reference"><span>[[a]]</span></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[[$-1]]]')), [['<sup class="reference"><span><a class="label" data-label="$-1">$-1</a></span></sup>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[[]{a}]]')), [['<sup class="reference"><span><a class="link" href="a">a</a></span></sup>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[[]{a}]]')), [['<sup class="reference"><span><a class="url" href="a">a</a></span></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[[a]{b}]]')), [['<sup class="reference"><span><a class="link" href="b">a</a></span></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[(([a]{#}))]{#}')), [['<a class="link" href="#"><span class="paren">(<span class="paren">([a]{#})</span>)</span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[[<bdi>]]')), [['<sup class="reference"><span><span class="invalid">&lt;bdi&gt;</span></span></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[${]]}$')), [['', '[', '', '[', '<span class="math" translate="no" data-src="${]]}$">${]]}$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('"[[""]]')), [['"', '<sup class="reference"><span>""</span></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[a](b)]{c}')), [['<a class="link" href="c"><ruby>a<rp>(</rp><rt>b</rt><rp>)</rp></ruby></a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[[[[[[[{a}')), [['', '[', '', '[', '', '[', '', '[', '', '[', '', '[', '', '[', '<a class="link" href="a">a</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[[[[[[[{a}')), [['', '[', '', '[', '', '[', '', '[', '', '[', '', '[', '', '[', '<a class="url" href="a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('<http://host>')), [['<', '<a class="url" href="http://host" target="_blank">http://host</a>', '>'], '']);
       assert.deepStrictEqual(inspect(parser('[~http://host')), [['', '[', '~', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[~a@b')), [['', '[', '~', '<a class="email" href="mailto:a@b">a@b</a>'], '']);
@@ -167,7 +167,7 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('[^http://host')), [['[^', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[^a@b')), [['[^', '<a class="email" href="mailto:a@b">a@b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a*b\nc*]')), [['[', '<a class="hashtag" href="/hashtags/a">#a</a>', '<em>b<br>c</em>', ']'], '']);
-      assert.deepStrictEqual(inspect(parser('[*a\nb*]{/}')), [['[', '<em>a<br>b</em>', ']', '<a class="link" href="/">/</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[*a\nb*]{/}')), [['[', '<em>a<br>b</em>', ']', '<a class="url" href="/">/</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[*a\nb]*')), [['[', '*', 'a', '<br>', 'b', ']', '*'], '']);
       assert.deepStrictEqual(inspect(parser('[*[a\nb*]')), [['', '[', '*', '[', 'a', '<br>', 'b', '*', ']'], '']);
       assert.deepStrictEqual(inspect(parser('[[*a\nb*]]')), [['[', '[', '<em>a<br>b</em>', ']', ']'], '']);

package/src/parser/source/escapable.ts

@@ -4,7 +4,7 @@ import { nonWhitespace } from './text';
 
 const delimiter = /[\s\x00-\x2F\x3A-\x40\x5B-\x60\x7B-\x7F]/;
 
-export const escsource: EscapableSourceParser = creation(({ source }) => {
+export const escsource: EscapableSourceParser = creation(1, false, ({ source }) => {
   if (source === '') return;
   const i = source.search(delimiter);
   switch (i) {

package/src/parser/source/str.ts

@@ -7,13 +7,13 @@ export function str(pattern: string | RegExp): StrParser;
 export function str(pattern: string | RegExp): Parser<string, Context<StrParser>, []> {
   assert(pattern);
   return typeof pattern === 'string'
-    ? creation(({ source }) => {
+    ? creation(1, false, ({ source }) => {
         if (source === '') return;
         return source.slice(0, pattern.length) === pattern
           ? [[pattern], source.slice(pattern.length)]
           : undefined;
       })
-    : creation(({ source }) => {
+    : creation(1, false, ({ source }) => {
         if (source === '') return;
         const m = source.match(pattern);
         return m && m[0].length > 0
@@ -26,13 +26,13 @@ export function stropt(pattern: string | RegExp): StrParser;
 export function stropt(pattern: string | RegExp): Parser<string, Context<StrParser>, []> {
   assert(pattern);
   return typeof pattern === 'string'
-    ? creation(({ source }) => {
+    ? creation(1, false, ({ source }) => {
         if (source === '') return;
         return source.slice(0, pattern.length) === pattern
           ? [[pattern], source.slice(pattern.length)]
           : undefined;
       })
-    : creation(({ source }) => {
+    : creation(1, false, ({ source }) => {
         if (source === '') return;
         const m = source.match(pattern);
         return m

package/src/parser/source/text.ts

@@ -1,8 +1,7 @@
 import { undefined } from 'spica/global';
 import { TextParser, TxtParser, LinebreakParser } from '../source';
-import { union, syntax, focus } from '../../combinator';
+import { union, creation, focus } from '../../combinator';
 import { str } from './str';
-import { Syntax, State } from '../context';
 import { html } from 'typed-dom/dom';
 
 export const delimiter = /[\s\x00-\x7F]|\S[#>]|[（）、。！？][^\S\n]*(?=\\\n)/;
@@ -10,7 +9,7 @@ export const nonWhitespace = /[\S\n]|$/;
 export const nonAlphanumeric = /[^0-9A-Za-z]|\S[#>]|$/;
 const repeat = str(/^(.)\1*/);
 
-export const text: TextParser = syntax(Syntax.none, 1, 1, State.none, ({ source, context }) => {
+export const text: TextParser = creation(1, false, ({ source, context }) => {
   if (source === '') return;
   const i = source.search(delimiter);
   switch (i) {

package/src/parser/source/unescapable.ts

@@ -2,7 +2,7 @@ import { UnescapableSourceParser } from '../source';
 import { creation } from '../../combinator';
 import { delimiter, nonWhitespace, nonAlphanumeric, isAlphanumeric } from './text';
 
-export const unescsource: UnescapableSourceParser = creation(({ source }) => {
+export const unescsource: UnescapableSourceParser = creation(1, false, ({ source }) => {
   assert(source[0] !== '\x1B');
   if (source === '') return;
   const i = source.search(delimiter);

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

@@ -37,7 +37,13 @@ export function twitter(source: HTMLImageElement, url: URL): HTMLElement | undef
     },
     error({ status, statusText }) {
       assert(Number.isSafeInteger(status));
-      define(el, [parse(`*{ ${source.getAttribute('data-src')} }*\n\n\`\`\`\n${status}\n${statusText}\n\`\`\``)]);
+      define(el, [
+        define(parse(`{ ${source.getAttribute('data-src')} }`).querySelector('a')!, {
+          class: null,
+          target: '_blank',
+        }),
+        h('pre', `${status}\n${statusText}`),
+      ]);
     },
   });
   return el;