securemark 0.290.1 → 0.290.2

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.290.2
+
+- Refactoring.
+
 ## 0.290.1
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.290.1 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"));
@@ -6129,10 +6129,10 @@ exports.signature = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('|',
   }), []).join('');
   //context.offset -= rest.length;
   const index = (0, indexee_1.identity)('index', undefined, sig)?.slice(7);
-  return [[(0, dom_1.html)('span', {
+  return index ? [[(0, dom_1.html)('span', {
     class: 'indexer',
     'data-index': index
-  })], rest];
+  })], rest] : undefined;
 }, ([as, bs], rest) => [(0, array_1.unshift)(as, bs), rest])));
 function dataindex(ns) {
   if (ns.length === 0) return;
@@ -6532,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);
@@ -6640,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));
@@ -6652,6 +6651,7 @@ function decode(uri) {
     return uri.replace(/\s+/g, encodeURI);
   }
 }
+exports.decode = decode;
 
 /***/ },
 
@@ -6750,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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.290.1",
+  "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/parser/inline/extension/index.ts

@@ -49,7 +49,9 @@ export const signature: IndexParser.SignatureParser = lazy(() => validate('|', s
     const sig = eval(parser({ source: context.recent![1], context }), []).join('');
     //context.offset -= rest.length;
     const index = identity('index', undefined, sig)?.slice(7);
-    return [[html('span', { class: 'indexer', 'data-index': index })], rest];
+    return index
+      ? [[html('span', { class: 'indexer', 'data-index': index })], rest]
+      : undefined;
   },
   ([as, bs], rest) => [unshift(as, bs), rest])));
 

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.ts

@@ -1,7 +1,7 @@
 import { MediaParser } from '../inline';
 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(