securemark 0.277.0 → 0.278.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.278.0
+
+- Extend account syntax.
+
 ## 0.277.0
 
 - Revert emphasis syntax and strong syntax.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.277.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.278.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory(require("Prism"), require("DOMPurify"));
@@ -5856,7 +5856,7 @@ exports.autolink = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(/^(?:
 // Escape unmatched email-like strings.
 (0, source_1.str)(/^[0-9a-z]+(?:[_.+-][0-9a-z]+)*(?:@(?:[0-9a-z]+(?:[.-][0-9a-z]+)*)?)*/i), channel_1.channel, account_1.account,
 // Escape unmatched account-like strings.
-(0, source_1.str)(/^@+[0-9a-z]*(?:-[0-9a-z]+)*/i),
+(0, source_1.str)(/^@+[0-9a-z]*(?:[-.][0-9a-z]+)*/i),
 // Escape invalid leading characters.
 (0, source_1.str)(new RegExp(/^(?:[^\p{C}\p{S}\p{P}\s]|emoji|['_])(?=#)/u.source.replace('emoji', hashtag_1.emoji), 'u')), hashtag_1.hashtag, hashnum_1.hashnum,
 // Escape unmatched hashtag-like strings.
@@ -5881,7 +5881,7 @@ const link_1 = __webpack_require__(9628);
 const source_1 = __webpack_require__(6743);
 const dom_1 = __webpack_require__(3252);
 // https://example/@user must be a user page or a redirect page going there.
-exports.account = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.rewrite)((0, combinator_1.constraint)(1 /* State.shortcut */, false, (0, combinator_1.open)('@', (0, combinator_1.tails)([(0, source_1.str)(/^[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?)*\//i), (0, source_1.str)(/^[a-z][0-9a-z]*(?:-[0-9a-z]+)*/i)]))), (0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `https://${source.slice(1).replace('/', '/@')}` : `/${source}`} }`, (0, combinator_1.union)([link_1.unsafelink]))), ([el]) => [(0, dom_1.define)(el, {
+exports.account = (0, combinator_1.lazy)(() => (0, combinator_1.fmap)((0, combinator_1.rewrite)((0, combinator_1.constraint)(1 /* State.shortcut */, false, (0, combinator_1.open)('@', (0, combinator_1.tails)([(0, source_1.str)(/^[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*\//i), (0, source_1.str)(/^[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*/i)]))), (0, combinator_1.convert)(source => `[${source}]{ ${source.includes('/') ? `https://${source.slice(1).replace('/', '/@')}` : `/${source}`} }`, (0, combinator_1.union)([link_1.unsafelink]))), ([el]) => [(0, dom_1.define)(el, {
   class: 'account'
 })]));
 
@@ -5955,7 +5955,7 @@ const combinator_1 = __webpack_require__(2087);
 const source_1 = __webpack_require__(6743);
 const dom_1 = __webpack_require__(3252);
 // https://html.spec.whatwg.org/multipage/input.html
-exports.email = (0, combinator_1.creation)((0, combinator_1.rewrite)((0, combinator_1.verify)((0, source_1.str)(/^[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z]){0,255}@[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?)*(?![0-9a-z])/i), ([source]) => source.length <= 255), ({
+exports.email = (0, combinator_1.creation)((0, combinator_1.rewrite)((0, combinator_1.verify)((0, source_1.str)(/^[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z]){0,255}@[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*(?![0-9a-z])/i), ([source]) => source.length <= 255), ({
   source
 }) => [[(0, dom_1.html)('a', {
   class: 'email',
@@ -6631,10 +6631,10 @@ function resolve(uri, host, source) {
 exports.resolve = resolve;
 function decode(uri) {
   if (!uri.includes('%')) return uri;
-  const origin = uri.match(/^[a-z](?:[-.](?=\w)|[0-9a-z])*:(?:\/{0,2}[^/?#\s]+|\/\/(?=[/]))/i)?.[0] ?? '';
+  const origin = uri.match(/^[a-z](?:[-.](?=[0-9a-z])|[0-9a-z])*:(?:\/{0,2}[^/?#\s]+|\/\/(?=[/]))/i)?.[0] ?? '';
   try {
     let path = decodeURI(uri.slice(origin.length));
-    if (!origin && /^[a-z](?:[-.](?=\w)|[0-9a-z])*:\/{0,2}\S/i.test(path)) {
+    if (!origin && /^[a-z](?:[-.](?=[0-9a-z])|[0-9a-z])*:\/{0,2}\S/i.test(path)) {
       path = uri.slice(origin.length);
     }
     uri = origin + path;
@@ -7036,13 +7036,14 @@ function* figure(target, notes, opts = {}) {
   const refs = new queue_1.MultiQueue((0, array_1.push)((0, query_1.querySelectorAll)(target, 'a.label:not(.disabled)[data-label]'), notes && (0, query_1.querySelectorAll)(notes.references, 'a.label:not(.disabled)') || []).map(el => [el.getAttribute('data-label'), el]));
   const labels = new Set();
   const numbers = new Map();
+  const scope = target instanceof Element ? ':scope > ' : '';
   let base = '0';
   let bases = base.split('.');
   let index = bases;
-  for (let defs = target.querySelectorAll('figure[data-label], h1, h2'), len = defs.length, i = 0; i < len; ++i) {
+  for (let defs = target.querySelectorAll(`${scope}:is(figure[data-label], h1, h2)`), len = defs.length, i = 0; i < len; ++i) {
     yield;
     const def = defs[i];
-    if (def.parentNode !== target) continue;
+    if (!scope && def.parentNode !== target) continue;
     const {
       tagName
     } = def;
@@ -7199,7 +7200,8 @@ function build(syntax, marker, splitter = '') {
     const defIndexes = new Map();
     const refSubindexes = new Map();
     const defSubindexes = new Map();
-    const splitters = splitter ? target.querySelectorAll(splitter) : [];
+    const scope = target instanceof Element ? ':scope > ' : '';
+    const splitters = splitter ? target.querySelectorAll(`${scope}:is(${splitter})`) : [];
     let iSplitters = 0;
     let total = 0;
     let format;
@@ -7212,7 +7214,7 @@ function build(syntax, marker, splitter = '') {
       }
       if (splitter) for (let el; el = splitters[iSplitters], el?.compareDocumentPosition(ref) & Node.DOCUMENT_POSITION_FOLLOWING; ++iSplitters) {
         if (~iSplitters << 32 - 8 === 0) yield;
-        if (el.parentNode !== target) continue;
+        if (!scope && el.parentNode !== target) continue;
         if (el.tagName === 'OL' && el.nextElementSibling !== splitters[iSplitters + 1]) {
           el.remove();
           continue;
@@ -7284,7 +7286,7 @@ function build(syntax, marker, splitter = '') {
     }
     if (splitter) for (let el; el = splitters[iSplitters]; ++iSplitters) {
       if (~iSplitters << 32 - 8 === 0) yield;
-      if (el.parentNode !== target) continue;
+      if (!scope && el.parentNode !== target) continue;
       if (el.tagName === 'OL') {
         el.remove();
       }
@@ -8155,7 +8157,7 @@ const origins = ['https://twitter.com'];
 function twitter(source, url) {
   if (!origins.includes(url.origin)) return;
   if (url.pathname.split('/').pop().includes('.')) return;
-  if (!url.pathname.match(/^\/\w+\/status\/[0-9]{15,}(?!\w)/)) return;
+  if (!url.pathname.match(/^\/\w+\/status\/[0-9]{15,}\/?$/)) return;
   const el = (0, dom_1.html)('div', {
     class: source.className,
     'data-type': 'twitter'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.277.0",
+  "version": "0.278.0",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",

package/src/parser/inline/autolink/account.test.ts

@@ -33,10 +33,12 @@ describe('Unit: parser/inline/autolink/account', () => {
       assert.deepStrictEqual(inspect(parser('@a-')), [['<a class="account" href="/@a">@a</a>'], '-']);
       assert.deepStrictEqual(inspect(parser('@a-b')), [['<a class="account" href="/@a-b">@a-b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('@a--b')), [['<a class="account" href="/@a">@a</a>'], '--b']);
+      assert.deepStrictEqual(inspect(parser('@a.')), [['<a class="account" href="/@a">@a</a>'], '.']);
+      assert.deepStrictEqual(inspect(parser('@a.domain.com')), [['<a class="account" href="/@a.domain.com">@a.domain.com</a>'], '']);
       assert.deepStrictEqual(inspect(parser('@http://host')), [['<a class="account" href="/@http">@http</a>'], '://host']);
       assert.deepStrictEqual(inspect(parser('@ttp://host')), [['<a class="account" href="/@ttp">@ttp</a>'], '://host']);
       assert.deepStrictEqual(inspect(parser('@domain/a')), [['<a class="account" href="https://domain/@a" target="_blank">@domain/a</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('@domain.co.jp/a')), [['<a class="account" href="https://domain.co.jp/@a" target="_blank">@domain.co.jp/a</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('@domain.com/a')), [['<a class="account" href="https://domain.com/@a" target="_blank">@domain.com/a</a>'], '']);
     });
 
   });

package/src/parser/inline/autolink/account.ts

@@ -12,8 +12,8 @@ export const account: AutolinkParser.AccountParser = lazy(() => fmap(rewrite(
   open(
     '@',
     tails([
-      str(/^[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?)*\//i),
-      str(/^[a-z][0-9a-z]*(?:-[0-9a-z]+)*/i),
+      str(/^[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*\//i),
+      str(/^[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*/i),
     ]))),
   convert(
     source =>

package/src/parser/inline/autolink/email.ts

@@ -6,6 +6,6 @@ import { html } from 'typed-dom/dom';
 // https://html.spec.whatwg.org/multipage/input.html
 
 export const email: AutolinkParser.EmailParser = creation(rewrite(verify(
-  str(/^[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z]){0,255}@[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=\w)){0,61}[0-9a-z])?)*(?![0-9a-z])/i),
+  str(/^[0-9a-z](?:[_.+-](?=[0-9a-z])|[0-9a-z]){0,255}@[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?(?:\.[0-9a-z](?:(?:[0-9a-z]|-(?=[0-9a-z])){0,61}[0-9a-z])?)*(?![0-9a-z])/i),
   ([source]) => source.length <= 255),
   ({ source }) => [[html('a', { class: 'email', href: `mailto:${source}` }, source)], '']));

package/src/parser/inline/autolink.ts

@@ -25,7 +25,7 @@ export const autolink: AutolinkParser = lazy(() =>
       channel,
       account,
       // Escape unmatched account-like strings.
-      str(/^@+[0-9a-z]*(?:-[0-9a-z]+)*/i),
+      str(/^@+[0-9a-z]*(?:[-.][0-9a-z]+)*/i),
       // Escape invalid leading characters.
       str(new RegExp(/^(?:[^\p{C}\p{S}\p{P}\s]|emoji|['_])(?=#)/u.source.replace('emoji', emoji), 'u')),
       hashtag,

package/src/parser/inline/extension/indexee.ts

@@ -34,7 +34,7 @@ assert(identity(undefined, '0'.repeat(41) + '1'.repeat(38) + '2'.repeat(41) + 3,
 assert(identity(undefined, '0'.repeat(81) + '1'.repeat(38) + '2'.repeat(81) + 3, 'mark')!.slice(6) === '0'.repeat(38) + '...' + '1'.repeat(38) + '...' + '2'.repeat(38 - 1) + 3);
 
 export function index(source: Element, optional = false): string {
-  assert(source instanceof DocumentFragment || !source.matches('.indexer'));
+  assert(!source.matches('.indexer'));
   assert(source.querySelectorAll(':scope > .indexer').length <= 1);
   if (!source.firstChild) return '';
   const indexer = source.querySelector(':scope > .indexer');

package/src/parser/inline/link.ts

@@ -203,10 +203,10 @@ export function resolve(uri: string, host: URL | Location, source: URL | Locatio
 
 function decode(uri: string): string {
   if (!uri.includes('%')) return uri;
-  const origin = uri.match(/^[a-z](?:[-.](?=\w)|[0-9a-z])*:(?:\/{0,2}[^/?#\s]+|\/\/(?=[/]))/i)?.[0] ?? '';
+  const origin = uri.match(/^[a-z](?:[-.](?=[0-9a-z])|[0-9a-z])*:(?:\/{0,2}[^/?#\s]+|\/\/(?=[/]))/i)?.[0] ?? '';
   try {
     let path = decodeURI(uri.slice(origin.length));
-    if (!origin && /^[a-z](?:[-.](?=\w)|[0-9a-z])*:\/{0,2}\S/i.test(path)) {
+    if (!origin && /^[a-z](?:[-.](?=[0-9a-z])|[0-9a-z])*:\/{0,2}\S/i.test(path)) {
       path = uri.slice(origin.length);
     }
     uri = origin + path;

package/src/parser/processor/figure.ts

@@ -16,15 +16,16 @@ export function* figure(
     .map(el => [el.getAttribute('data-label')!, el]));
   const labels = new Set<string>();
   const numbers = new Map<string, string>();
+  const scope = target instanceof Element ? ':scope > ' : '';
   let base = '0';
   let bases: readonly string[] = base.split('.');
   let index: readonly string[] = bases;
   for (
-    let defs = target.querySelectorAll('figure[data-label], h1, h2'),
+    let defs = target.querySelectorAll(`${scope}:is(figure[data-label], h1, h2)`),
         len = defs.length, i = 0; i < len; ++i) {
     yield;
     const def = defs[i];
-    if (def.parentNode !== target) continue;
+    if (!scope && def.parentNode !== target) continue;
     const { tagName } = def;
     if (bases.length === 1 && tagName[0] === 'H') continue;
     assert(base === '0' || bases.length > 1);

package/src/parser/processor/note.ts

@@ -67,7 +67,8 @@ function build(
     const defIndexes = new Map<HTMLLIElement, number>();
     const refSubindexes = new Map<string, number>();
     const defSubindexes = new Map<string, number>();
-    const splitters = splitter ? target.querySelectorAll(splitter) : [];
+    const scope = target instanceof Element ? ':scope > ' : '';
+    const splitters = splitter ? target.querySelectorAll(`${scope}:is(${splitter})`) : [];
     let iSplitters = 0;
     let total = 0;
     let format: 'number' | 'abbr';
@@ -84,7 +85,7 @@ function build(
         el?.compareDocumentPosition(ref) & Node.DOCUMENT_POSITION_FOLLOWING;
         ++iSplitters) {
         if (~iSplitters << 32 - 8 === 0) yield;
-        if (el.parentNode !== target) continue;
+        if (!scope && el.parentNode !== target) continue;
         if (el.tagName === 'OL' && el.nextElementSibling !== splitters[iSplitters + 1]) {
           assert(el.matches(`.${syntax}s`));
           el.remove();
@@ -173,7 +174,7 @@ function build(
       el = splitters[iSplitters];
       ++iSplitters) {
       if (~iSplitters << 32 - 8 === 0) yield;
-      if (el.parentNode !== target) continue;
+      if (!scope && el.parentNode !== target) continue;
       if (el.tagName === 'OL') {
         assert(el.matches(`.${syntax}s`));
         el.remove();

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

@@ -19,7 +19,7 @@ const origins = [
 export function twitter(source: HTMLImageElement, url: URL): HTMLElement | undefined {
   if (!origins.includes(url.origin)) return;
   if (url.pathname.split('/').pop()!.includes('.')) return;
-  if (!url.pathname.match(/^\/\w+\/status\/[0-9]{15,}(?!\w)/)) return;
+  if (!url.pathname.match(/^\/\w+\/status\/[0-9]{15,}\/?$/)) return;
   const el = h('div', { class: source.className, 'data-type': 'twitter' }, [
     h('em', `Loading ${source.getAttribute('data-src')}...`),
   ]);