securemark 0.289.6 → 0.290.1

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.289.6 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.290.1 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"));
@@ -322,250 +322,6 @@ __exportStar(__webpack_require__(1311), exports);
 
 /***/ },
 
-/***/ 8663
-(__unused_webpack_module, exports) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports.Clock = void 0;
-const BASE = 32;
-const DIGIT = Math.log2(BASE);
-const MASK = BASE - 1;
-const empty = Symbol('empty');
-class Clock {
-  // Capacity is rounded up to multiples of 32.
-  constructor(capacity,
-  // ヒット率99%で平均100bitの走査となるためこれを極端に超えない走査数に制限
-  limit = BASE * 10) {
-    this.capacity = capacity;
-    this.limit = limit;
-    this.dict = new Map();
-    this.keys = [];
-    this.values = [];
-    this.hand = 0;
-    this.$length = 0;
-    this.initial = 1;
-    this.capacity = ((capacity - 1 | MASK) >>> 0) + 1;
-    this.refs = new Int32Array(this.capacity >>> DIGIT);
-  }
-  get length() {
-    return this.$length;
-  }
-  get size() {
-    return this.$length;
-  }
-  mark(index) {
-    const i = index >>> DIGIT;
-    const before = this.refs[i];
-    const after = before | 1 << (index & MASK);
-    if (after === before) return;
-    this.refs[i] = after;
-  }
-  unmark(index) {
-    const i = index >>> DIGIT;
-    const before = this.refs[i];
-    const after = before & ~(1 << (index & MASK));
-    if (after === before) return;
-    this.refs[i] = after;
-  }
-  locate(hand, key, value) {
-    const {
-      capacity,
-      dict,
-      keys,
-      values
-    } = this;
-    this.$length === capacity || this.initial === 0 && values[hand] !== empty ? dict.delete(keys[hand]) : ++this.$length;
-    dict.set(key, hand);
-    keys[hand] = key;
-    values[hand] = value;
-    this.hand = ++hand === capacity ? this.initial = 0 : hand;
-  }
-  add(key, value) {
-    const {
-      capacity,
-      limit,
-      refs
-    } = this;
-    for (let {
-        hand
-      } = this, i = hand >>> DIGIT, r = hand & MASK, c = 0;;) {
-      const b = refs[i];
-      if (b >>> r === ~0 >>> r && c < limit) {
-        const d = BASE - r;
-        c += d;
-        hand += d;
-        refs[i] = b & (1 << r) - 1;
-        r = 0;
-        if (hand < capacity) {
-          ++i;
-        } else {
-          hand -= capacity;
-          i = 0;
-        }
-        continue;
-      }
-      const l = c < limit ? search(b, r) : r;
-      if (l !== r) {
-        hand += l - r;
-        refs[i] = b & ~((1 << l) - 1 >>> r << r);
-      }
-      this.locate(hand, key, value);
-      return hand;
-    }
-  }
-  put(key, value) {
-    const index = this.dict.get(key);
-    if (index === undefined) return this.add(key, value);
-    this.values[index] = value;
-    return index;
-  }
-  set(key, value) {
-    this.put(key, value);
-    return this;
-  }
-  get(key) {
-    const index = this.dict.get(key);
-    if (index === undefined) return;
-    this.mark(index);
-    return this.values[index];
-  }
-  has(key) {
-    return this.dict.has(key);
-  }
-  delete(key) {
-    const index = this.dict.get(key);
-    if (index === undefined) return false;
-    // 末尾と削除対象を交換して削除する。
-    // 次の挿入の前に次の削除が行われると交換できないが稀なため対処しない。
-    const {
-      hand,
-      dict,
-      keys,
-      values,
-      refs
-    } = this;
-    dict.delete(key);
-    --this.$length;
-    const k = keys[index] = keys[hand];
-    const v = values[index] = values[hand];
-    keys[hand] = undefined;
-    values[hand] = empty;
-    if (index !== hand && v !== empty) {
-      dict.set(k, index);
-      (refs[hand >>> DIGIT] & 1 << (hand & MASK)) === 0 ? this.unmark(index) : this.mark(index);
-    }
-    this.unmark(hand);
-    return true;
-  }
-  clear() {
-    this.dict = new Map();
-    this.keys = [];
-    this.values = [];
-    this.refs.fill(0);
-    this.hand = 0;
-    this.$length = 0;
-    this.initial = 1;
-  }
-  *[Symbol.iterator]() {
-    const {
-      keys,
-      values
-    } = this;
-    for (const index of this.dict.values()) {
-      yield [keys[index], values[index]];
-    }
-  }
-}
-exports.Clock = Clock;
-function search(b, r) {
-  for (let l = r;; ++l) {
-    if ((b & 1 << l) === 0) return l;
-  }
-}
-function bsearch(b, r) {
-  const n = ~b >>> r << r >>> 0;
-  const l = potision(0x05f66a47 * (n & -n) >>> 27);
-  return l;
-}
-//const potisions = new Uint8Array([
-//  0, 1, 2, 26, 23, 3, 15, 27, 24, 21, 19, 4, 12, 16, 28, 6, 31, 25, 22, 14, 20, 18, 11, 5, 30, 13, 17, 10, 29, 9, 8, 7,
-//]);
-function potision(n) {
-  switch (n) {
-    case 0:
-      return 0;
-    case 1:
-      return 1;
-    case 2:
-      return 2;
-    case 3:
-      return 26;
-    case 4:
-      return 23;
-    case 5:
-      return 3;
-    case 6:
-      return 15;
-    case 7:
-      return 27;
-    case 8:
-      return 24;
-    case 9:
-      return 21;
-    case 10:
-      return 19;
-    case 11:
-      return 4;
-    case 12:
-      return 12;
-    case 13:
-      return 16;
-    case 14:
-      return 28;
-    case 15:
-      return 6;
-    case 16:
-      return 31;
-    case 17:
-      return 25;
-    case 18:
-      return 22;
-    case 19:
-      return 14;
-    case 20:
-      return 20;
-    case 21:
-      return 18;
-    case 22:
-      return 11;
-    case 23:
-      return 5;
-    case 24:
-      return 30;
-    case 25:
-      return 13;
-    case 26:
-      return 17;
-    case 27:
-      return 10;
-    case 28:
-      return 29;
-    case 29:
-      return 9;
-    case 30:
-      return 8;
-    default:
-      return 7;
-  }
-}
-
-/***/ },
-
 /***/ 1934
 (__unused_webpack_module, exports) {
 
@@ -3241,8 +2997,8 @@ function close(parser, closer, optional, backtracks) {
 }
 exports.close = close;
 const statesize = 2;
-function getBacktrack(context, backtracks, source, length) {
-  for (const backtrack of backtracks) {
+function getBacktrack(context, backtracks, source, length = 1) {
+  if (length > 0) for (const backtrack of backtracks) {
     if (backtrack & 1) {
       const {
         backtracks = {},
@@ -3260,7 +3016,7 @@ function getBacktrack(context, backtracks, source, length) {
 }
 exports.getBacktrack = getBacktrack;
 function setBacktrack(context, backtracks, position, length = 1) {
-  for (const backtrack of backtracks) {
+  if (length > 0) for (const backtrack of backtracks) {
     if (backtrack & 2) {
       const {
         backtracks = {},
@@ -5724,22 +5480,6 @@ function format(list) {
 
 /***/ },
 
-/***/ 8669
-(__unused_webpack_module, exports) {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports.CmdRegExp = void 0;
-exports.CmdRegExp = {
-  Error: /\x07/g
-};
-
-/***/ },
-
 /***/ 3009
 (__unused_webpack_module, exports, __webpack_require__) {
 
@@ -6209,7 +5949,7 @@ const dom_1 = __webpack_require__(394);
 exports.code = (0, combinator_1.validate)(({
   source,
   context
-}) => source[0] === '`' && !(0, combinator_1.getBacktrack)(context, [1 | 8 /* Backtrack.bracket */], source, source.length - 1), (0, combinator_1.match)(/^(`+)(?!`)([^\n]*?)(?:((?<!`)\1(?!`))|$|\n)/, ([whole,, body, closer]) => ({
+}) => source[0] === '`' && !(0, combinator_1.getBacktrack)(context, [1 | 8 /* Backtrack.bracket */], source), (0, combinator_1.match)(/^(`+)(?!`)([^\n]*?)(?:((?<!`)\1(?!`))|$|\n)/, ([whole,, body, closer]) => ({
   source,
   context
 }) => closer ? [[(0, dom_1.html)('code', {
@@ -6380,18 +6120,19 @@ exports.index = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(32 /*
   class: 'index',
   href: el.id ? `#${el.id}` : undefined
 })])));
-exports.signature = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('|', (0, combinator_1.surround)((0, source_1.str)(/^\|(?!\\?\s)/), (0, visibility_1.tightStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ']')), /^(?=])/, false, ([as, bs], rest, {
-  recent = []
-}) => {
+exports.signature = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('|', (0, combinator_1.surround)((0, source_1.str)(/^\|(?!\\?\s)/), (0, visibility_1.tightStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ']')), /^(?=])/, false, (_, rest, context) => {
+  //context.offset ??= 0;
+  //context.offset += rest.length;
   const sig = (0, parser_1.eval)(parser({
-    source: recent[1],
-    context: {}
+    source: context.recent[1],
+    context
   }), []).join('');
-  const index = sig.includes("\u0007" /* Command.Error */) ? undefined : (0, indexee_1.identity)('index', undefined, sig)?.slice(7);
-  return index ? [[(0, dom_1.html)('span', {
+  //context.offset -= rest.length;
+  const index = (0, indexee_1.identity)('index', undefined, sig)?.slice(7);
+  return [[(0, dom_1.html)('span', {
     class: 'indexer',
     'data-index': index
-  })], rest] : [(0, array_1.unshift)(as, bs), rest];
+  })], rest];
 }, ([as, bs], rest) => [(0, array_1.unshift)(as, bs), rest])));
 function dataindex(ns) {
   if (ns.length === 0) return;
@@ -6651,7 +6392,6 @@ const source_1 = __webpack_require__(8745);
 const visibility_1 = __webpack_require__(6364);
 const util_1 = __webpack_require__(4992);
 const memoize_1 = __webpack_require__(6925);
-const clock_1 = __webpack_require__(8663);
 const array_1 = __webpack_require__(6876);
 const dom_1 = __webpack_require__(394);
 const tags = Object.freeze(['bdo', 'bdi']);
@@ -6662,9 +6402,11 @@ const attrspecs = {
 };
 Object.setPrototypeOf(attrspecs, null);
 Object.values(attrspecs).forEach(o => Object.setPrototypeOf(o, null));
-exports.html = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(/^<[a-z]+(?=[^\S\n]|>)/i, (0, combinator_1.union)([(0, combinator_1.focus)(/^<wbr[^\S\n]*>/i, () => [[(0, dom_1.html)('wbr')], '']), (0, combinator_1.surround)(
+exports.html = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(/^<[a-z]+(?=[^\S\n]|>)/i, (0, combinator_1.union)([(0, combinator_1.surround)(
+// https://html.spec.whatwg.org/multipage/syntax.html#void-elements
+(0, source_1.str)(/^<(?:area|base|br|col|embed|hr|img|input|link|meta|source|track|wbr)(?=[^\S\n]|>)/i), (0, combinator_1.some)((0, combinator_1.union)([exports.attribute])), (0, source_1.str)(/^[^\S\n]*>/), true, ([as, bs = [], cs], rest) => as[0].slice(1) === 'wbr' && bs.length === 0 ? [[(0, dom_1.html)(as[0].slice(1))], rest] : [[elem(as[0].slice(1), (0, array_1.push)((0, array_1.unshift)(as, bs), cs), [], [])], rest], undefined, [3 | 8 /* Backtrack.bracket */]), (0, combinator_1.match)(new RegExp(String.raw`^<(${TAGS.join('|')})(?=[^\S\n]|>)`), (0, memoize_1.memoize)(([, tag]) => (0, combinator_1.surround)((0, combinator_1.surround)((0, source_1.str)(`<${tag}`), (0, combinator_1.some)(exports.attribute), (0, source_1.str)(/^[^\S\n]*>/), true, undefined, undefined, [3 | 8 /* Backtrack.bracket */]), (0, combinator_1.precedence)(3, (0, combinator_1.recursion)(4 /* Recursion.inline */, (0, combinator_1.subsequence)([(0, combinator_1.focus)(/^[^\S\n]*\n/, (0, combinator_1.some)(inline_1.inline)), (0, combinator_1.some)((0, combinator_1.open)(/^\n?/, (0, combinator_1.some)(inline_1.inline, (0, visibility_1.blankWith)('\n', `</${tag}>`), [[(0, visibility_1.blankWith)('\n', `</${tag}>`), 3]]), true))]))), (0, source_1.str)(`</${tag}>`), true, ([as, bs = [], cs], rest) => [[elem(tag, as, bs, cs)], rest], ([as, bs = []], rest) => [[elem(tag, as, bs, [])], rest]), ([, tag]) => tag, new Map())), (0, combinator_1.surround)(
 // https://html.spec.whatwg.org/multipage/syntax.html#void-elements
-(0, source_1.str)(/^<(?:area|base|br|col|embed|hr|img|input|link|meta|source|track|wbr)(?=[^\S\n]|>)/i), (0, combinator_1.some)((0, combinator_1.union)([exports.attribute])), (0, source_1.str)(/^[^\S\n]*>/), true, ([as, bs = [], cs], rest) => [[elem(as[0].slice(1), (0, array_1.push)((0, array_1.unshift)(as, bs), cs), [], [])], rest], undefined, [3 | 8 /* Backtrack.bracket */]), (0, combinator_1.match)(new RegExp(String.raw`^<(${TAGS.join('|')})(?=[^\S\n]|>)`), (0, memoize_1.memoize)(([, tag]) => (0, combinator_1.surround)((0, combinator_1.surround)((0, source_1.str)(`<${tag}`), (0, combinator_1.some)(exports.attribute), (0, source_1.str)(/^[^\S\n]*>/), true, undefined, undefined, [3 | 8 /* Backtrack.bracket */]), (0, combinator_1.precedence)(3, (0, combinator_1.recursion)(4 /* Recursion.inline */, (0, combinator_1.subsequence)([(0, combinator_1.focus)(/^[^\S\n]*\n/, (0, combinator_1.some)(inline_1.inline)), (0, combinator_1.some)((0, combinator_1.open)(/^\n?/, (0, combinator_1.some)(inline_1.inline, (0, visibility_1.blankWith)('\n', `</${tag}>`), [[(0, visibility_1.blankWith)('\n', `</${tag}>`), 3]]), true))]))), (0, source_1.str)(`</${tag}>`), true, ([as, bs = [], cs], rest) => [[elem(tag, as, bs, cs)], rest], ([as, bs = []], rest) => [[elem(tag, as, bs, [])], rest]), ([, tag]) => tag, new Map())), (0, combinator_1.match)(/^<([a-z]+)(?=[^\S\n]|>)/i, (0, memoize_1.memoize)(([, tag]) => (0, combinator_1.surround)((0, combinator_1.surround)((0, source_1.str)(`<${tag}`), (0, combinator_1.some)(exports.attribute), (0, source_1.str)(/^[^\S\n]*>/), true, undefined, undefined, [3 | 8 /* Backtrack.bracket */]), (0, combinator_1.precedence)(3, (0, combinator_1.recursion)(4 /* Recursion.inline */, (0, combinator_1.subsequence)([(0, combinator_1.focus)(/^[^\S\n]*\n/, (0, combinator_1.some)(inline_1.inline)), (0, combinator_1.some)(inline_1.inline, `</${tag}>`, [[`</${tag}>`, 3]])]))), (0, source_1.str)(`</${tag}>`), true, ([as, bs = [], cs], rest) => [[elem(tag, as, bs, cs)], rest], ([as, bs = []], rest) => [[elem(tag, as, bs, [])], rest]), ([, tag]) => tag, new clock_1.Clock(10000)))])));
+(0, source_1.str)(/^<[a-z]+(?=[^\S\n]|>)/i), (0, combinator_1.some)((0, combinator_1.union)([exports.attribute])), (0, source_1.str)(/^[^\S\n]*>/), true, ([as, bs = [], cs], rest) => [[elem(as[0].slice(1), (0, array_1.push)((0, array_1.unshift)(as, bs), cs), [], [])], rest], undefined, [3 | 8 /* Backtrack.bracket */])])));
 exports.attribute = (0, combinator_1.union)([(0, source_1.str)(/^[^\S\n]+[a-z]+(?:-[a-z]+)*(?:="[^"\n]*")?(?=[^\S\n]|>)/i)]);
 // https://developer.mozilla.org/en-US/docs/Web/HTML/Element
 // [...document.querySelectorAll('tbody > tr > td:first-child')].map(el => el.textContent.slice(1, -1))
@@ -6720,13 +6462,15 @@ exports.htmlentity = exports.unsafehtmlentity = void 0;
 const combinator_1 = __webpack_require__(3484);
 const util_1 = __webpack_require__(4992);
 const dom_1 = __webpack_require__(394);
-exports.unsafehtmlentity = (0, combinator_1.validate)('&', (0, combinator_1.focus)(/^&[0-9A-Za-z]{1,99};/, ({
+exports.unsafehtmlentity = (0, combinator_1.validate)('&', (0, combinator_1.focus)(/^&[0-9A-Za-z]{1,99};/,
+//({ source }) => [[parser(source) ?? `${Command.Error}${source}`], '']));
+({
   source
-}) => [[parser(source) ?? `${"\u0007" /* Command.Error */}${source}`], '']));
-exports.htmlentity = (0, combinator_1.fmap)((0, combinator_1.union)([exports.unsafehtmlentity]), ([text]) => [text[0] === "\u0007" /* Command.Error */ ? (0, dom_1.html)('span', {
+}) => [[parser(source) ?? source], '']));
+exports.htmlentity = (0, combinator_1.fmap)((0, combinator_1.union)([exports.unsafehtmlentity]), ([text]) => [text.length === 1 || text[0] !== '&' ? text : (0, dom_1.html)('span', {
   class: 'invalid',
   ...(0, util_1.invalid)('htmlentity', 'syntax', 'Invalid HTML entity')
-}, text.slice(1)) : text]);
+}, text)]);
 const parser = (el => entity => {
   if (entity === '&NewLine;') return ' ';
   el.innerHTML = entity;
@@ -6822,14 +6566,21 @@ exports.uri = (0, combinator_1.union)([(0, combinator_1.open)(/^[^\S\n]+/, (0, s
 exports.option = (0, combinator_1.union)([(0, combinator_1.fmap)((0, source_1.str)(/^[^\S\n]+nofollow(?=[^\S\n]|})/), () => [` rel="nofollow"`]), (0, source_1.str)(/^[^\S\n]+[a-z]+(?:-[a-z]+)*(?:="(?:\\[^\n]|[^\\\n"])*")?(?=[^\S\n]|})/), (0, combinator_1.fmap)((0, source_1.str)(/^[^\S\n]+[^\s{}]+/), opt => [` \\${opt.slice(1)}`])]);
 function parse(content, params, context) {
   const INSECURE_URI = params.shift();
-  const uri = new url_1.ReadonlyURL(resolve(INSECURE_URI, context.host ?? location, context.url ?? context.host ?? location), context.host?.href || location.href);
+  let uri;
+  try {
+    uri = new url_1.ReadonlyURL(resolve(INSECURE_URI, context.host ?? location, context.url ?? context.host ?? location), context.host?.href || location.href);
+  } catch {}
   const el = elem(INSECURE_URI, content, uri, context.host?.origin || location.origin);
   return el.classList.contains('invalid') ? el : (0, dom_1.define)(el, (0, html_1.attributes)('link', [], optspec, params));
 }
 function elem(INSECURE_URI, content, uri, origin) {
   let type;
   let message;
-  switch (uri.protocol) {
+  switch (uri?.protocol) {
+    case undefined:
+      type = 'argument';
+      message = 'Invalid URI';
+      break;
     case 'http:':
     case 'https:':
       switch (true) {
@@ -6863,10 +6614,13 @@ function elem(INSECURE_URI, content, uri, origin) {
           message = 'Invalid content';
       }
       break;
+    default:
+      type = 'argument';
+      message = 'Invalid protocol';
   }
   return (0, dom_1.html)('a', {
     class: 'invalid',
-    ...(0, util_1.invalid)('link', type ??= 'argument', message ??= 'Invalid protocol')
+    ...(0, util_1.invalid)('link', type, message)
   }, content.length === 0 ? INSECURE_URI : content);
 }
 function resolve(uri, host, source) {
@@ -6977,7 +6731,6 @@ Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
 exports.linemedia = exports.media = void 0;
-const context_1 = __webpack_require__(8669);
 const combinator_1 = __webpack_require__(3484);
 const link_1 = __webpack_require__(3628);
 const html_1 = __webpack_require__(5013);
@@ -6996,15 +6749,19 @@ const optspec = {
 Object.setPrototypeOf(optspec, null);
 exports.media = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(4 /* State.media */, false, (0, combinator_1.validate)(['![', '!{'], (0, combinator_1.creation)(10, (0, combinator_1.open)('!', (0, combinator_1.bind)((0, combinator_1.verify)((0, combinator_1.fmap)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.precedence)(1, (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), ']')), ']', true, ([, ns = []], rest, context) => context.linebreak === undefined ? [ns, rest] : undefined, undefined, [3 | 4 /* Backtrack.escbracket */])), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([link_1.uri, (0, combinator_1.some)(option)]), /^[^\S\n]*}/, false, undefined, undefined, [3 | 64 /* Backtrack.link */]))]), ([as, bs]) => bs ? [[as.join('').trim() || as.join('')], bs] : [[''], as]), ([[text]]) => text === '' || text.trim() !== ''), ([[text], params], rest, context) => {
   const INSECURE_URI = params.shift();
-  const url = new url_1.ReadonlyURL((0, link_1.resolve)(INSECURE_URI, context.host ?? location, context.url ?? context.host ?? location), context.host?.href || location.href);
+  // altが空だとエラーが見えないため埋める。
+  text ||= INSECURE_URI;
+  let uri;
+  try {
+    uri = new url_1.ReadonlyURL((0, link_1.resolve)(INSECURE_URI, context.host ?? location, context.url ?? context.host ?? location), context.host?.href || location.href);
+  } catch {}
   let cache;
-  const el =  false || (cache = context.caches?.media?.get(url.href)?.cloneNode(true)) || (0, dom_1.html)('img', {
+  const el =  false || uri && (cache = context.caches?.media?.get(uri.href)?.cloneNode(true)) || (0, dom_1.html)('img', {
     class: 'media',
-    'data-src': url.source,
-    alt: text
+    'data-src': uri?.source
   });
-  cache?.hasAttribute('alt') && cache.setAttribute('alt', text);
-  if (!sanitize(el, url, text)) return [[el], rest];
+  el.setAttribute('alt', text);
+  if (!sanitize(el, uri)) return [[el], rest];
   (0, dom_1.define)(el, (0, html_1.attributes)('media', (0, array_1.push)([], el.classList), optspec, params));
   // Awaiting the generic support for attr().
   if (el.hasAttribute('aspect-ratio')) {
@@ -7023,34 +6780,35 @@ exports.media = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(4 /* S
 exports.linemedia = (0, combinator_1.surround)(source_1.linebreak, (0, combinator_1.union)([exports.media]), /^(?=[^\S\n]*(?:$|\n))/);
 const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), ')'), (0, source_1.str)(')'), true, undefined, () => [[], ''], [3 | 4 /* Backtrack.escbracket */]), (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), ']'), (0, source_1.str)(']'), true, undefined, () => [[], ''], [3 | 4 /* Backtrack.escbracket */]), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, bracket, source_1.txt]), '}'), (0, source_1.str)('}'), true, undefined, () => [[], ''], [3 | 4 /* Backtrack.escbracket */]), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.precedence)(2, (0, combinator_1.some)((0, combinator_1.union)([htmlentity_1.unsafehtmlentity, source_1.txt]), '"')), (0, source_1.str)('"'), true, undefined, () => [[], ''], [3 | 4 /* Backtrack.escbracket */])])));
 const option = (0, combinator_1.lazy)(() => (0, combinator_1.union)([(0, combinator_1.fmap)((0, source_1.str)(/^[^\S\n]+[1-9][0-9]*x[1-9][0-9]*(?=[^\S\n]|})/), ([opt]) => [` width="${opt.slice(1).split('x')[0]}"`, ` height="${opt.slice(1).split('x')[1]}"`]), (0, combinator_1.fmap)((0, source_1.str)(/^[^\S\n]+[1-9][0-9]*:[1-9][0-9]*(?=[^\S\n]|})/), ([opt]) => [` aspect-ratio="${opt.slice(1).split(':').join('/')}"`]), link_1.option]));
-function sanitize(target, uri, alt) {
-  switch (uri.protocol) {
+function sanitize(target, uri) {
+  let type;
+  let message;
+  switch (uri?.protocol) {
+    case undefined:
+      type = 'argument';
+      message = 'Invalid URI';
+      break;
     case 'http:':
     case 'https:':
-      if (/\/\.\.?(?:\/|$)/.test('/' + uri.source.slice(0, uri.source.search(/[?#]|$/)))) {
-        (0, dom_1.define)(target, {
-          class: 'invalid',
-          ...(0, util_1.invalid)('media', 'argument', 'Dot-segments cannot be used in media paths; use subresource paths instead')
-        });
-        return false;
-      }
+      if (!/\/\.\.?(?:\/|$)/.test('/' + uri.source.slice(0, uri.source.search(/[?#]|$/)))) return true;
+      type = 'argument';
+      message = 'Dot-segments cannot be used in media paths; use subresource paths instead';
       break;
     default:
-      (0, dom_1.define)(target, {
-        class: 'invalid',
-        ...(0, util_1.invalid)('media', 'argument', 'Invalid protocol')
-      });
-      return false;
+      type = 'argument';
+      message = 'Invalid protocol';
   }
-  if (alt.includes("\u0007" /* Command.Error */)) {
-    (0, dom_1.define)(target, {
-      class: 'invalid',
-      alt: target.getAttribute('alt')?.replace(context_1.CmdRegExp.Error, ''),
-      ...(0, util_1.invalid)('media', 'argument', `Cannot use invalid HTML entitiy "${alt.match(/&[0-9A-Za-z]+;/)[0]}"`)
-    });
-    return false;
-  }
-  return true;
+  //else {
+  //  target.setAttribute('alt', alt.replace(CmdRegExp.Error, ''));
+  //  type = 'argument';
+  //  message = `Invalid HTML entitiy "${alt.match(/&[0-9A-Za-z]+;/)![0]}"`;
+  //}
+  (0, dom_1.define)(target, {
+    'data-src': null,
+    class: 'invalid',
+    ...(0, util_1.invalid)('link', type, message)
+  });
+  return false;
 }
 
 /***/ },
@@ -7137,47 +6895,37 @@ Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
 exports.ruby = void 0;
-const context_1 = __webpack_require__(8669);
 const parser_1 = __webpack_require__(605);
 const combinator_1 = __webpack_require__(3484);
 const htmlentity_1 = __webpack_require__(470);
 const source_1 = __webpack_require__(8745);
 const visibility_1 = __webpack_require__(6364);
-const util_1 = __webpack_require__(4992);
 const array_1 = __webpack_require__(6876);
 const dom_1 = __webpack_require__(394);
-exports.ruby = (0, combinator_1.lazy)(() => (0, combinator_1.bind)((0, combinator_1.inits)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, source_1.str)(/^(?:\\[^\n]|[^\\[\](){}<>"\n])+/), ']', false, ([, [source]], rest, context) => {
-  const ns = (0, parser_1.eval)(text({
-    source,
-    context
-  }), [undefined])[0];
+exports.ruby = (0, combinator_1.lazy)(() => (0, combinator_1.bind)((0, combinator_1.inits)([(0, combinator_1.dup)((0, combinator_1.surround)('[', rtext, ']', false, ([, ns], rest) => {
   ns && ns.at(-1) === '' && ns.pop();
-  return ns && (0, visibility_1.isTightNodeStart)(ns) ? [ns, rest] : undefined;
-}, undefined, [3 | 32 /* Backtrack.ruby */ | 1, 64 /* Backtrack.link */, 1 | 8 /* Backtrack.bracket */])), (0, combinator_1.dup)((0, combinator_1.surround)('(', (0, source_1.str)(/^(?:\\[^\n]|[^\\[\](){}<>"\n])+/), ')', false, ([, [source]], rest, context) => {
-  const ns = (0, parser_1.eval)(text({
-    source,
-    context
-  }), [undefined])[0];
-  return ns && [ns, rest];
-}, undefined, [3 | 32 /* Backtrack.ruby */ | 1, 64 /* Backtrack.link */, 1 | 8 /* Backtrack.bracket */]))]), ([texts, rubies], rest, context) => {
+  return (0, visibility_1.isTightNodeStart)(ns) ? [ns, rest] : undefined;
+}, undefined, [3 | 32 /* Backtrack.ruby */ | 1, 64 /* Backtrack.link */, 1 | 8 /* Backtrack.bracket */])), (0, combinator_1.dup)((0, combinator_1.surround)('(', rtext, ')', false, undefined, undefined, [3 | 32 /* Backtrack.ruby */ | 1, 64 /* Backtrack.link */, 1 | 8 /* Backtrack.bracket */]))]), ([texts, rubies], rest, context) => {
   if (rubies === undefined) {
     return void (0, combinator_1.setBacktrack)(context, [2 | 32 /* Backtrack.ruby */], context.recent.reduce((a, b) => a + b.length, 0));
   }
   switch (true) {
     case rubies.length <= texts.length:
-      return [[(0, dom_1.html)('ruby', attributes(texts, rubies), (0, dom_1.defrag)(texts.reduce((acc, _, i) => (0, array_1.push)(acc, (0, array_1.unshift)([texts[i]], i < rubies.length && rubies[i] ? [(0, dom_1.html)('rp', '('), (0, dom_1.html)('rt', rubies[i]), (0, dom_1.html)('rp', ')')] : [(0, dom_1.html)('rt')])), [])))], rest];
+      return [[(0, dom_1.html)('ruby', (0, dom_1.defrag)(texts.reduce((acc, _, i) => (0, array_1.push)(acc, (0, array_1.unshift)([texts[i]], i < rubies.length && rubies[i] ? [(0, dom_1.html)('rp', '('), (0, dom_1.html)('rt', rubies[i]), (0, dom_1.html)('rp', ')')] : [(0, dom_1.html)('rt')])), [])))], rest];
     case texts.length === 1 && [...texts[0]].length >= rubies.length:
-      return [[(0, dom_1.html)('ruby', attributes(texts, rubies), (0, dom_1.defrag)([...texts[0]].reduce((acc, _, i, texts) => (0, array_1.push)(acc, (0, array_1.unshift)([texts[i]], i < rubies.length && rubies[i] ? [(0, dom_1.html)('rp', '('), (0, dom_1.html)('rt', rubies[i]), (0, dom_1.html)('rp', ')')] : [(0, dom_1.html)('rt')])), [])))], rest];
+      return [[(0, dom_1.html)('ruby', (0, dom_1.defrag)([...texts[0]].reduce((acc, _, i, texts) => (0, array_1.push)(acc, (0, array_1.unshift)([texts[i]], i < rubies.length && rubies[i] ? [(0, dom_1.html)('rp', '('), (0, dom_1.html)('rt', rubies[i]), (0, dom_1.html)('rp', ')')] : [(0, dom_1.html)('rt')])), [])))], rest];
     default:
-      return [[(0, dom_1.html)('ruby', attributes(texts, rubies), (0, dom_1.defrag)((0, array_1.unshift)([texts.join(' ')], [(0, dom_1.html)('rp', '('), (0, dom_1.html)('rt', rubies.join(' ').trim()), (0, dom_1.html)('rp', ')')])))], rest];
+      return [[(0, dom_1.html)('ruby', (0, dom_1.defrag)((0, array_1.unshift)([texts.join(' ')], [(0, dom_1.html)('rp', '('), (0, dom_1.html)('rt', rubies.join(' ').trim()), (0, dom_1.html)('rp', ')')])))], rest];
   }
 }));
-const text = ({
+const rtext = ({
   source,
   context
 }) => {
   const acc = [''];
+  let state = false;
   while (source !== '') {
+    if (!/^(?:\\[^\n]|[^\\[\](){}<>"\n])/.test(source)) break;
     switch (source[0]) {
       // @ts-expect-error
       case '&':
@@ -7189,6 +6937,7 @@ const text = ({
           if (result) {
             acc[acc.length - 1] += (0, parser_1.eval)(result)[0];
             source = (0, parser_1.exec)(result, source.slice(1));
+            state ||= acc.at(-1).trimStart() !== '';
             continue;
           }
           // fallthrough
@@ -7206,26 +6955,27 @@ const text = ({
           });
           acc[acc.length - 1] += (0, parser_1.eval)(result)[0] ?? source.slice(0, source.length - (0, parser_1.exec)(result).length);
           source = (0, parser_1.exec)(result);
+          state ||= acc.at(-1).trimStart() !== '';
           continue;
         }
     }
   }
-  return acc.join('').trimStart() ? [[acc], ''] : undefined;
+  return state ? [acc, source] : undefined;
 };
-function attributes(texts, rubies) {
-  let attrs;
-  for (const ss of [texts, rubies]) {
-    for (let i = 0; i < ss.length; ++i) {
-      if (!ss[i].includes("\u0007" /* Command.Error */)) continue;
-      ss[i] = ss[i].replace(context_1.CmdRegExp.Error, '');
-      attrs ??= {
-        class: 'invalid',
-        ...(0, util_1.invalid)('ruby', ss === texts ? 'content' : 'argument', 'Invalid HTML entity')
-      };
-    }
-  }
-  return attrs ?? {};
-}
+//function attributes(texts: string[], rubies: string[]): Record<string, string> {
+//  let attrs: Record<string, string> | undefined;
+//  for (const ss of [texts, rubies]) {
+//    for (let i = 0; i < ss.length; ++i) {
+//      if (!ss[i].includes(Command.Error)) continue;
+//      ss[i] = ss[i].replace(CmdRegExp.Error, '');
+//      attrs ??= {
+//        class: 'invalid',
+//        ...invalid('ruby', ss === texts ? 'content' : 'argument', 'Invalid HTML entity'),
+//      };
+//    }
+//  }
+//  return attrs ?? {};
+//}
 
 /***/ },
 
@@ -7281,11 +7031,14 @@ Object.defineProperty(exports, "__esModule", ({
 exports.template = void 0;
 const combinator_1 = __webpack_require__(3484);
 const source_1 = __webpack_require__(8745);
+const array_1 = __webpack_require__(6876);
 const dom_1 = __webpack_require__(394);
-exports.template = (0, combinator_1.lazy)(() => (0, combinator_1.surround)('{{', (0, combinator_1.precedence)(1, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), '}')), '}}', true, ([, ns = []], rest, context) => context.linebreak === undefined ? [[(0, dom_1.html)('span', {
+exports.template = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('{{'), (0, combinator_1.precedence)(1, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), '}')), (0, source_1.str)('}}'), true, ([as, bs = [], cs], rest) => [[(0, dom_1.html)('span', {
   class: 'template'
-}, `{{${ns.join('')}}}`)], rest] : undefined, undefined, [3 | 16 /* Backtrack.doublebracket */, 1 | 8 /* Backtrack.bracket */]));
-const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), ')')), (0, source_1.str)(')'), true, undefined, () => [[], ''], [3 | 4 /* Backtrack.escbracket */]), (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), ']')), (0, source_1.str)(']'), true, undefined, () => [[], ''], [3 | 4 /* Backtrack.escbracket */]), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), '}')), (0, source_1.str)('}'), true, undefined, () => [[], ''], [3 | 4 /* Backtrack.escbracket */]), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.precedence)(2, (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)(source_1.escsource, '"'))), (0, source_1.str)('"'), true, undefined, () => [[], ''], [3 | 4 /* Backtrack.escbracket */])]));
+}, (0, dom_1.defrag)((0, array_1.push)((0, array_1.unshift)(as, bs), cs)))], rest], undefined, [3 | 16 /* Backtrack.doublebracket */, 3 | 4 /* Backtrack.escbracket */]));
+const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), ')')), (0, source_1.str)(')'), true, undefined, () => [[], ''], [3 | 4 /* Backtrack.escbracket */]), (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), ']')), (0, source_1.str)(']'), true, undefined, () => [[], ''], [3 | 4 /* Backtrack.escbracket */]), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), '}')), (0, source_1.str)('}'), true, undefined, () => [[], ''], [3 | 4 /* Backtrack.escbracket */]), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.precedence)(2, (0, combinator_1.recursion)(6 /* Recursion.terminal */, (0, combinator_1.some)(source_1.escsource, '"', [['"', 2, false]]))), (0, source_1.str)('"'), true, ([as, bs = [], cs], rest, {
+  linebreak = 0
+}) => linebreak > rest.length ? [(0, array_1.unshift)(as, bs), cs[0] + rest] : [(0, array_1.push)((0, array_1.unshift)(as, bs), cs), rest], ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest], [3 | 4 /* Backtrack.escbracket */])]));
 
 /***/ },
 
@@ -7724,6 +7477,7 @@ Object.defineProperty(exports, "__esModule", ({
 exports.escsource = void 0;
 const combinator_1 = __webpack_require__(3484);
 const text_1 = __webpack_require__(5655);
+const dom_1 = __webpack_require__(394);
 const delimiter = /[\s\x00-\x2F\x3A-\x40\x5B-\x60\x7B-\x7F]/;
 const escsource = ({
   source,
@@ -7756,7 +7510,7 @@ const escsource = ({
           }
         case '\n':
           context.linebreak ??= source.length;
-          return [[source[0]], source.slice(1)];
+          return [[(0, dom_1.html)('br')], source.slice(1)];
         default:
           const b = source[0].trimStart() === '';
           const i = b ? source.search(text_1.nonWhitespace) : 1;
@@ -7911,6 +7665,7 @@ Object.defineProperty(exports, "__esModule", ({
 exports.unescsource = void 0;
 const combinator_1 = __webpack_require__(3484);
 const text_1 = __webpack_require__(5655);
+const dom_1 = __webpack_require__(394);
 const unescsource = ({
   source,
   context
@@ -7933,7 +7688,7 @@ const unescsource = ({
             return [[source.slice(1, 2)], source.slice(2)];
           case '\n':
             context.linebreak ??= source.length;
-            return [[source[0]], source.slice(1)];
+            return [[(0, dom_1.html)('br')], source.slice(1)];
           default:
             const b = source[0].trimStart() === '';
             const i = b || (0, text_1.isAlphanumeric)(source[0]) ? source.search(b ? text_1.nonWhitespace : text_1.nonAlphanumeric) || 1 : 1;