securemark 0.290.0 → 0.290.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.290.2
+
+- Refactoring.
+
+## 0.290.1
+
+- Refactoring.
+
 ## 0.290.0
 
 - Change template syntax to allow linebreaks.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.290.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.290.2 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"));
@@ -2997,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 = {},
@@ -3016,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 = {},
@@ -5480,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__) {
 
@@ -5965,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', {
@@ -6136,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);
+  //context.offset -= rest.length;
+  const index = (0, indexee_1.identity)('index', undefined, sig)?.slice(7);
   return index ? [[(0, dom_1.html)('span', {
     class: 'indexer',
     'data-index': index
-  })], rest] : [(0, array_1.unshift)(as, bs), rest];
+  })], rest] : undefined;
 }, ([as, bs], rest) => [(0, array_1.unshift)(as, bs), rest])));
 function dataindex(ns) {
   if (ns.length === 0) return;
@@ -6477,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;
@@ -6545,7 +6532,7 @@ exports.italic = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('///',
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.resolve = exports.option = exports.uri = exports.unsafelink = exports.linemedialink = exports.medialink = exports.textlink = void 0;
+exports.decode = exports.resolve = exports.option = exports.uri = exports.unsafelink = exports.linemedialink = exports.medialink = exports.textlink = void 0;
 const combinator_1 = __webpack_require__(3484);
 const inline_1 = __webpack_require__(7973);
 const html_1 = __webpack_require__(5013);
@@ -6653,7 +6640,6 @@ function resolve(uri, host, source) {
 }
 exports.resolve = resolve;
 function decode(uri) {
-  if (!uri.includes('%')) return uri;
   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));
@@ -6665,6 +6651,7 @@ function decode(uri) {
     return uri.replace(/\s+/g, encodeURI);
   }
 }
+exports.decode = decode;
 
 /***/ },
 
@@ -6744,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);
@@ -6764,7 +6750,7 @@ 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();
   // altが空だとエラーが見えないため埋める。
-  text ||= INSECURE_URI;
+  text ||= (0, link_1.decode)(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);
@@ -6775,7 +6761,7 @@ exports.media = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(4 /* S
     'data-src': uri?.source
   });
   el.setAttribute('alt', text);
-  if (!sanitize(el, uri, text)) return [[el], rest];
+  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')) {
@@ -6794,10 +6780,10 @@ 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) {
+function sanitize(target, uri) {
   let type;
   let message;
-  if (!alt.includes("\u0007" /* Command.Error */)) switch (uri?.protocol) {
+  switch (uri?.protocol) {
     case undefined:
       type = 'argument';
       message = 'Invalid URI';
@@ -6811,11 +6797,12 @@ function sanitize(target, uri, alt) {
     default:
       type = 'argument';
       message = 'Invalid protocol';
-  } else {
-    target.setAttribute('alt', alt.replace(context_1.CmdRegExp.Error, ''));
-    type = 'argument';
-    message = `Invalid HTML entitiy "${alt.match(/&[0-9A-Za-z]+;/)[0]}"`;
   }
+  //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',
@@ -6908,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 '&':
@@ -6960,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
@@ -6977,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 ?? {};
+//}
 
 /***/ },
 
@@ -7056,8 +7035,10 @@ const array_1 = __webpack_require__(6876);
 const dom_1 = __webpack_require__(394);
 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'
-}, (0, dom_1.defrag)((0, array_1.push)((0, array_1.unshift)(as, bs), cs)))], rest], 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 */])]));
 
 /***/ },
 

package/markdown.d.ts

@@ -951,7 +951,7 @@ export namespace MarkdownParser {
     export namespace RubyParser {
       export interface TextParser extends
         Inline<'ruby/text'>,
-        Parser<string[], Context, []> {
+        Parser<string, Context, []> {
       }
     }
     export interface HTMLParser extends

package/package.json

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

package/src/combinator/control/manipulation/surround.ts

@@ -123,9 +123,9 @@ export function getBacktrack(
   context: Ctx,
   backtracks: readonly number[],
   source: string,
-  length: number,
+  length: number = 1,
 ): boolean {
-  for (const backtrack of backtracks) {
+  if (length > 0) for (const backtrack of backtracks) {
     if (backtrack & 1) {
       const { backtracks = {}, offset = 0 } = context;
       for (let i = 0; i < length; ++i) {
@@ -145,7 +145,7 @@ export function setBacktrack(
   position: number,
   length: number = 1,
 ): void {
-  for (const backtrack of backtracks) {
+  if (length > 0) for (const backtrack of backtracks) {
     if (backtrack & 2) {
       const { backtracks = {}, offset = 0 } = context;
       for (let i = 0; i < length; ++i) {

package/src/parser/api/parse.test.ts

@@ -351,7 +351,7 @@ describe('Unit: parser/api/parse', () => {
     it('backtrack', function () {
       this.timeout(5000);
       // 8n = template + link + annotation/reference + link + code + url + ruby + text
-      const source = `${'.'.repeat(1 + 0)}{{(([[[\`http://[${'.'.repeat(12493)}`;
+      const source = `${'.'.repeat(0 + 0)}{{{((([[[\`http://[${'.'.repeat(12493)}`;
       assert.deepStrictEqual(
         [...parse(source).children].map(el => el.outerHTML.replace(/:\w+/, ':rnd')),
         [`<p>${source}</p>`]);
@@ -359,7 +359,7 @@ describe('Unit: parser/api/parse', () => {
 
     it('backtrack error', function () {
       this.timeout(5000);
-      const source = `${'.'.repeat(1 + 1)}{{(([[[\`http://[${'.'.repeat(12493)}`;
+      const source = `${'.'.repeat(0 + 1)}{{{((([[[\`http://[${'.'.repeat(12493)}`;
       assert.deepStrictEqual(
         [...parse(source).children].map(el => el.outerHTML.replace(/:\w+/, ':rnd')),
         [

package/src/parser/inline/code.ts

@@ -6,7 +6,7 @@ import { html } from 'typed-dom/dom';
 export const code: CodeParser = validate(
   ({ source, context }) =>
     source[0] === '`' &&
-    !getBacktrack(context, [1 | Backtrack.bracket], source, source.length - 1),
+    !getBacktrack(context, [1 | Backtrack.bracket], source),
   match(
     /^(`+)(?!`)([^\n]*?)(?:((?<!`)\1(?!`))|$|\n)/,
     ([whole, , body, closer]) => ({ source, context }) =>

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

@@ -1,5 +1,5 @@
 import { ExtensionParser } from '../../inline';
-import { State, Backtrack, Command } from '../../context';
+import { State, Backtrack } from '../../context';
 import { eval } from '../../../combinator/data/parser';
 import { union, inits, some, precedence, state, constraint, validate, surround, lazy, fmap } from '../../../combinator';
 import { inline } from '../../inline';
@@ -43,14 +43,15 @@ export const signature: IndexParser.SignatureParser = lazy(() => validate('|', s
   tightStart(some(union([inline]), ']')),
   /^(?=])/,
   false,
-  ([as, bs], rest, { recent = [] }) => {
-    const sig = eval(parser({ source: recent[1], context: {} }), []).join('');
-    const index = sig.includes(Command.Error)
-      ? undefined
-      : identity('index', undefined, sig)?.slice(7);
+  (_, rest, context) => {
+    //context.offset ??= 0;
+    //context.offset += rest.length;
+    const sig = eval(parser({ source: context.recent![1], context }), []).join('');
+    //context.offset -= rest.length;
+    const index = identity('index', undefined, sig)?.slice(7);
     return index
       ? [[html('span', { class: 'indexer', 'data-index': index })], rest]
-      : [unshift(as, bs), rest];
+      : undefined;
   },
   ([as, bs], rest) => [unshift(as, bs), rest])));
 

package/src/parser/inline/htmlentity.ts

@@ -1,22 +1,22 @@
 import { HTMLEntityParser, UnsafeHTMLEntityParser } from '../inline';
-import { Command } from '../context';
 import { union, validate, focus, fmap } from '../../combinator';
 import { invalid } from '../util';
 import { html } from 'typed-dom/dom';
 
 export const unsafehtmlentity: UnsafeHTMLEntityParser = validate('&', focus(
   /^&[0-9A-Za-z]{1,99};/,
-  ({ source }) => [[parser(source) ?? `${Command.Error}${source}`], '']));
+  //({ source }) => [[parser(source) ?? `${Command.Error}${source}`], '']));
+  ({ source }) => [[parser(source) ?? source], '']));
 
 export const htmlentity: HTMLEntityParser = fmap(
   union([unsafehtmlentity]),
   ([text]) => [
-    text[0] === Command.Error
-      ? html('span', {
+    text.length === 1 || text[0] !== '&'
+      ? text
+      : html('span', {
           class: 'invalid',
           ...invalid('htmlentity', 'syntax', 'Invalid HTML entity'),
-        }, text.slice(1))
-      : text,
+      }, text)
   ]);
 
 const parser = (el => (entity: string): string | undefined => {

package/src/parser/inline/link.ts

@@ -226,8 +226,7 @@ export function resolve(uri: string, host: URL | Location, source: URL | Locatio
   }
 }
 
-function decode(uri: string): string {
-  if (!uri.includes('%')) return uri;
+export function decode(uri: string): string {
   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));

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

@@ -43,7 +43,7 @@ describe('Unit: parser/inline/media', () => {
       assert.deepStrictEqual(inspect(parser('![\\ ]{b}')), undefined);
       assert.deepStrictEqual(inspect(parser('![\\\n]{b}')), undefined);
       assert.deepStrictEqual(inspect(parser('![	]{b}')), undefined);
-      assert.deepStrictEqual(inspect(parser('![&a;]{b}')), [['<img class="invalid" alt="&amp;a;">'], '']);
+      assert.deepStrictEqual(inspect(parser('![&a;]{b}')), [['<a href="b" target="_blank"><img class="media" data-src="b" alt="&amp;a;"></a>'], '']);
       assert.deepStrictEqual(inspect(parser('![[]{b}')), undefined);
       assert.deepStrictEqual(inspect(parser('![]]{b}')), undefined);
       assert.deepStrictEqual(inspect(parser('![a]{}')), undefined);

package/src/parser/inline/media.ts

@@ -1,7 +1,7 @@
 import { MediaParser } from '../inline';
-import { State, Recursion, Backtrack, Command, CmdRegExp } from '../context';
+import { State, Recursion, Backtrack } from '../context';
 import { union, inits, tails, some, creation, recursion, precedence, constraint, validate, verify, surround, open, dup, lazy, fmap, bind } from '../../combinator';
-import { unsafelink, uri, option as linkoption, resolve } from './link';
+import { unsafelink, uri, option as linkoption, resolve, decode } from './link';
 import { attributes } from './html';
 import { unsafehtmlentity } from './htmlentity';
 import { txt, linebreak, str } from '../source';
@@ -51,7 +51,7 @@ export const media: MediaParser = lazy(() => constraint(State.media, false, vali
     assert(INSECURE_URI === INSECURE_URI.trim());
     assert(!INSECURE_URI.match(/\s/));
     // altが空だとエラーが見えないため埋める。
-    text ||= INSECURE_URI;
+    text ||= decode(INSECURE_URI);
     let uri: ReadonlyURL | undefined;
     try {
       uri = new ReadonlyURL(
@@ -66,7 +66,7 @@ export const media: MediaParser = lazy(() => constraint(State.media, false, vali
       || html('img', { class: 'media', 'data-src': uri?.source });
     assert(!el.matches('.invalid'));
     el.setAttribute('alt', text);
-    if (!sanitize(el, uri, text)) return [[el], rest];
+    if (!sanitize(el, uri)) return [[el], rest];
     assert(!el.matches('.invalid'));
     define(el, attributes('media', push([], el.classList), optspec, params));
     assert(el.matches('img') || !el.matches('.invalid'));
@@ -104,12 +104,12 @@ const option: MediaParser.ParameterParser.OptionParser = lazy(() => union([
   linkoption,
 ]));
 
-function sanitize(target: HTMLElement, uri: ReadonlyURL | undefined, alt: string): boolean {
+function sanitize(target: HTMLElement, uri: ReadonlyURL | undefined): boolean {
   assert(target.tagName === 'IMG');
   assert(!target.matches('.invalid'));
   let type: string;
   let message: string;
-  if (!alt.includes(Command.Error)) switch (uri?.protocol) {
+  switch (uri?.protocol) {
     case undefined:
       type = 'argument';
       message = 'Invalid URI';
@@ -125,11 +125,11 @@ function sanitize(target: HTMLElement, uri: ReadonlyURL | undefined, alt: string
       type = 'argument';
       message = 'Invalid protocol';
   }
-  else {
-    target.setAttribute('alt', alt.replace(CmdRegExp.Error, ''));
-    type = 'argument';
-    message = `Invalid HTML entitiy "${alt.match(/&[0-9A-Za-z]+;/)![0]}"`;
-  }
+  //else {
+  //  target.setAttribute('alt', alt.replace(CmdRegExp.Error, ''));
+  //  type = 'argument';
+  //  message = `Invalid HTML entitiy "${alt.match(/&[0-9A-Za-z]+;/)![0]}"`;
+  //}
   define(target, {
     'data-src': null,
     class: 'invalid',

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

@@ -15,8 +15,8 @@ describe('Unit: parser/inline/ruby', () => {
       assert.deepStrictEqual(inspect(parser('[ a](b)')), undefined);
       assert.deepStrictEqual(inspect(parser('[	a](b)')), undefined);
       assert.deepStrictEqual(inspect(parser('[	 a](b)')), undefined);
-      assert.deepStrictEqual(inspect(parser('[&a;](b)')), [['<ruby class="invalid">&amp;a;<rp>(</rp><rt>b</rt><rp>)</rp></ruby>'], '']);
-      assert.deepStrictEqual(inspect(parser('[a](&a;)')), [['<ruby class="invalid">a<rp>(</rp><rt>&amp;a;</rt><rp>)</rp></ruby>'], '']);
+      assert.deepStrictEqual(inspect(parser('[&a;](b)')), [['<ruby>&amp;a;<rp>(</rp><rt>b</rt><rp>)</rp></ruby>'], '']);
+      assert.deepStrictEqual(inspect(parser('[a](&a;)')), [['<ruby>a<rp>(</rp><rt>&amp;a;</rt><rp>)</rp></ruby>'], '']);
       assert.deepStrictEqual(inspect(parser('[<wbr>](a)')), undefined);
       assert.deepStrictEqual(inspect(parser('[a](<wbr>)')), undefined);
       assert.deepStrictEqual(inspect(parser('[a]()')), undefined);

package/src/parser/inline/ruby.ts

@@ -1,34 +1,27 @@
 import { RubyParser } from '../inline';
-import { Backtrack, Command, CmdRegExp } from '../context';
+import { Backtrack } from '../context';
 import { eval, exec } from '../../combinator/data/parser';
 import { inits, surround, setBacktrack, dup, lazy, bind } from '../../combinator';
 import { unsafehtmlentity } from './htmlentity';
-import { text as txt, str } from '../source';
+import { text } from '../source';
 import { isTightNodeStart } from '../visibility';
-import { invalid } from '../util';
 import { unshift, push } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
 
 export const ruby: RubyParser = lazy(() => bind(
   inits([
     dup(surround(
-      '[', str(/^(?:\\[^\n]|[^\\[\](){}<>"\n])+/), ']',
+      '[', rtext, ']',
       false,
-      ([, [source]], rest, context) => {
-        const ns = eval(text({ source, context }), [undefined])[0];
+      ([, ns], rest) => {
         ns && ns.at(-1) === '' && ns.pop();
-        return ns && isTightNodeStart(ns) ? [ns, rest] : undefined;
+        return isTightNodeStart(ns) ? [ns, rest] : undefined;
       },
       undefined,
       [3 | Backtrack.ruby | 1, Backtrack.link, 1 | Backtrack.bracket])),
     dup(surround(
-      '(', str(/^(?:\\[^\n]|[^\\[\](){}<>"\n])+/), ')',
-      false,
-      ([, [source]], rest, context) => {
-        const ns = eval(text({ source, context }), [undefined])[0];
-        return ns && [ns, rest];
-      },
-      undefined,
+      '(', rtext, ')',
+      false, undefined, undefined,
       [3 | Backtrack.ruby | 1, Backtrack.link, 1 | Backtrack.bracket])),
   ]),
   ([texts, rubies], rest, context) => {
@@ -38,7 +31,7 @@ export const ruby: RubyParser = lazy(() => bind(
     switch (true) {
       case rubies.length <= texts.length:
         return [[
-          html('ruby', attributes(texts, rubies), defrag(texts
+          html('ruby', defrag(texts
             .reduce((acc, _, i) =>
               push(acc, unshift(
                 [texts[i]],
@@ -49,7 +42,7 @@ export const ruby: RubyParser = lazy(() => bind(
         ], rest];
       case texts.length === 1 && [...texts[0]].length >= rubies.length:
         return [[
-          html('ruby', attributes(texts, rubies), defrag([...texts[0]]
+          html('ruby', defrag([...texts[0]]
             .reduce((acc, _, i, texts) =>
               push(acc, unshift(
                 [texts[i]],
@@ -61,16 +54,18 @@ export const ruby: RubyParser = lazy(() => bind(
       default:
         assert(rubies.length > 0);
         return [[
-          html('ruby', attributes(texts, rubies), defrag(unshift(
+          html('ruby', defrag(unshift(
             [texts.join(' ')],
             [html('rp', '('), html('rt', rubies.join(' ').trim()), html('rp', ')')]))),
         ], rest];
     }
   }));
 
-const text: RubyParser.TextParser = ({ source, context }) => {
+const rtext: RubyParser.TextParser = ({ source, context }) => {
   const acc = [''];
+  let state = false;
   while (source !== '') {
+    if (!/^(?:\\[^\n]|[^\\[\](){}<>"\n])/.test(source)) break;
     assert(source[0] !== '\n');
     switch (source[0]) {
       // @ts-expect-error
@@ -79,6 +74,7 @@ const text: RubyParser.TextParser = ({ source, context }) => {
         if (result) {
           acc[acc.length - 1] += eval(result)[0];
           source = exec(result, source.slice(1));
+          state ||= acc.at(-1)!.trimStart() !== '';
           continue;
         }
         // fallthrough
@@ -89,30 +85,31 @@ const text: RubyParser.TextParser = ({ source, context }) => {
           source = source.slice(1);
           continue;
         }
-        const result = txt({ source, context })!;
+        const result = text({ source, context })!;
         assert(result);
         acc[acc.length - 1] += eval(result)[0] ?? source.slice(0, source.length - exec(result).length);
         source = exec(result);
+        state ||= acc.at(-1)!.trimStart() !== '';
         continue;
       }
     }
   }
-  return acc.join('').trimStart()
-    ? [[acc], '']
+  return state
+    ? [acc, source]
     : undefined;
 };
 
-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 ?? {};
-}
+//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 ?? {};
+//}

package/src/parser/inline/template.ts

@@ -14,7 +14,7 @@ export const template: TemplateParser = lazy(() => surround(
   ([as, bs = [], cs], rest) =>
     [[html('span', { class: 'template' }, defrag(push(unshift(as, bs), cs)))], rest],
   undefined,
-  [3 | Backtrack.doublebracket, 1 | Backtrack.bracket]));
+  [3 | Backtrack.doublebracket, 3 | Backtrack.escbracket]));
 
 const bracket: TemplateParser.BracketParser = lazy(() => union([
   surround(str('('), recursion(Recursion.terminal, some(union([bracket, escsource]), ')')), str(')'), true,
@@ -23,6 +23,15 @@ const bracket: TemplateParser.BracketParser = lazy(() => union([
     undefined, () => [[], ''], [3 | Backtrack.escbracket]),
   surround(str('{'), recursion(Recursion.terminal, some(union([bracket, escsource]), '}')), str('}'), true,
     undefined, () => [[], ''], [3 | Backtrack.escbracket]),
-  surround(str('"'), precedence(2, recursion(Recursion.terminal, some(escsource, '"'))), str('"'), true,
-    undefined, () => [[], ''], [3 | Backtrack.escbracket]),
+  surround(
+    str('"'),
+    precedence(2, recursion(Recursion.terminal, some(escsource, '"', [['"', 2, false]]))),
+    str('"'),
+    true,
+    ([as, bs = [], cs], rest, { linebreak = 0 }) =>
+      linebreak > rest.length
+        ? [unshift(as, bs), cs[0] + rest]
+        : [push(unshift(as, bs), cs), rest],
+    ([as, bs = []], rest) => [unshift(as, bs), rest],
+    [3 | Backtrack.escbracket]),
 ]));