securemark 0.276.1 → 0.276.2

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.276.2
+
+- Refactoring.
+
 ## 0.276.1
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.276.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.276.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"));
@@ -2860,7 +2860,7 @@ function fence(opener, limit, separation = true) {
     const matches = source.match(opener);
     if (!matches) return;
     const delim = matches[1];
-    if (matches[0].indexOf(delim, delim.length) !== -1) return;
+    if (matches[0].includes(delim, delim.length)) return;
     let rest = source.slice(matches[0].length);
     // Prevent annoying parsing in editing.
     if ((0, line_1.isBlank)((0, line_1.firstline)(rest)) && (0, line_1.firstline)(rest.slice((0, line_1.firstline)(rest).length)).trimEnd() !== delim) return;
@@ -6506,21 +6506,20 @@ const optspec = {
 };
 Object.setPrototypeOf(optspec, null);
 exports.link = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['[', '{'], (0, combinator_1.union)([exports.medialink, exports.textlink])));
-exports.textlink = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(16 /* State.link */, false, (0, combinator_1.syntax)(16 /* Syntax.link */, 2, 10, 502 /* State.linkers */ | 8 /* State.media */, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ']', [[/^\\?\n/, 9], [']', 2]]), ']', true)), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => {
-  return parse(content, params, rest, context);
+exports.textlink = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(16 /* State.link */, false, (0, combinator_1.syntax)(16 /* Syntax.link */, 2, 10, 502 /* State.linkers */ | 8 /* State.media */, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, visibility_1.trimBlankStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ']', [[/^\\?\n/, 9], [']', 2]])), ']', true)), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => {
+  if (content.length !== 0 && (0, visibility_1.trimNodeEnd)(content = (0, dom_1.defrag)(content)).length === 0) return;
+  return [[parse(content, params, context)], rest];
 }))));
-exports.medialink = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(16 /* State.link */ | 8 /* State.media */, false, (0, combinator_1.syntax)(16 /* Syntax.link */, 2, 10, 502 /* State.linkers */, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.sequence)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.union)([inline_1.media, inline_1.shortmedia]), ']')), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => parse(content, params, rest, context)))));
+exports.medialink = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(16 /* State.link */ | 8 /* State.media */, false, (0, combinator_1.syntax)(16 /* Syntax.link */, 2, 10, 502 /* State.linkers */, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.sequence)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.union)([inline_1.media, inline_1.shortmedia]), ']')), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => [[parse((0, dom_1.defrag)(content), params, context)], rest]))));
 exports.linemedialink = (0, combinator_1.surround)(source_1.linebreak, (0, combinator_1.union)([exports.medialink]), /^(?=[^\S\n]*(?:$|\n))/);
-exports.unsafelink = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(10, (0, combinator_1.precedence)(2, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.some)((0, combinator_1.union)([source_1.unescsource]), ']'), ']')), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => parse(content, params, rest, context)))));
+exports.unsafelink = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(10, (0, combinator_1.precedence)(2, (0, combinator_1.bind)((0, combinator_1.reverse)((0, combinator_1.tails)([(0, combinator_1.dup)((0, combinator_1.surround)('[', (0, combinator_1.some)((0, combinator_1.union)([source_1.unescsource]), ']'), ']')), (0, combinator_1.dup)((0, combinator_1.surround)(/^{(?![{}])/, (0, combinator_1.inits)([exports.uri, (0, combinator_1.some)(exports.option)]), /^[^\S\n]*}/))])), ([params, content = []], rest, context) => [[parse((0, dom_1.defrag)(content), params, context)], rest]))));
 exports.uri = (0, combinator_1.union)([(0, combinator_1.open)(/^[^\S\n]+/, (0, source_1.str)(/^\S+/)), (0, source_1.str)(/^[^\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, rest, context) {
-  if (content.length !== 0 && (0, visibility_1.trimNode)(content).length === 0) return;
+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);
-  const el = elem(INSECURE_URI, (0, dom_1.defrag)(content), uri, context.host?.origin || location.origin);
-  if (el.className === 'invalid') return [[el], rest];
-  return [[(0, dom_1.define)(el, (0, html_1.attributes)('link', [], optspec, params))], rest];
+  const el = elem(INSECURE_URI, content, uri, context.host?.origin || location.origin);
+  return el.className === 'invalid' ? el : (0, dom_1.define)(el, (0, html_1.attributes)('link', [], optspec, params));
 }
 function elem(INSECURE_URI, content, uri, origin) {
   let type;
@@ -6871,7 +6870,7 @@ function attributes(texts, rubies) {
   let attrs;
   for (const ss of [texts, rubies]) {
     for (let i = 0; i < ss.length; ++i) {
-      if (ss[i].indexOf('\x1B') === -1) continue;
+      if (!ss[i].includes('\x1B')) continue;
       ss[i] = ss[i].replace(/\x1B/g, '');
       attrs ??= {
         class: 'invalid',
@@ -7629,7 +7628,7 @@ exports.stringify = stringify;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.trimNodeEnd = exports.trimNode = exports.trimBlankStart = exports.trimBlank = exports.isStartTightNodes = exports.isStartLooseNodes = exports.startTight = exports.blankWith = exports.visualize = exports.blank = void 0;
+exports.trimNodeEnd = exports.trimBlankStart = exports.trimBlank = exports.isStartTightNodes = exports.isStartLooseNodes = exports.startTight = exports.blankWith = exports.visualize = exports.blank = void 0;
 const parser_1 = __webpack_require__(6728);
 const combinator_1 = __webpack_require__(2087);
 const htmlentity_1 = __webpack_require__(1562);
@@ -7757,24 +7756,23 @@ exports.trimBlankStart = trimBlankStart;
 function trimBlankEnd(parser) {
   return (0, combinator_1.fmap)(parser, trimNodeEnd);
 }
-function trimNode(nodes) {
-  return trimNodeStart(trimNodeEnd(nodes));
-}
-exports.trimNode = trimNode;
-function trimNodeStart(nodes) {
-  for (let node = nodes[0]; nodes.length > 0 && !isVisible(node = nodes[0], 0);) {
-    if (nodes.length === 1 && typeof node === 'object' && node.className === 'indexer') break;
-    if (typeof node === 'string') {
-      const pos = node.trimStart().length;
-      if (pos > 0) {
-        nodes[0] = node.slice(-pos);
-        break;
-      }
-    }
-    nodes.shift();
-  }
-  return nodes;
-}
+//export function trimNode<T extends HTMLElement | string>(nodes: T[]): T[] {
+//  return trimNodeStart(trimNodeEnd(nodes));
+//}
+//function trimNodeStart<T extends HTMLElement | string>(nodes: T[]): T[] {
+//  for (let node = nodes[0]; nodes.length > 0 && !isVisible(node = nodes[0], 0);) {
+//    if (nodes.length === 1 && typeof node === 'object' && node.className === 'indexer') break;
+//    if (typeof node === 'string') {
+//      const pos = node.trimStart().length;
+//      if (pos > 0) {
+//        nodes[0] = node.slice(-pos) as T;
+//        break;
+//      }
+//    }
+//    nodes.shift();
+//  }
+//  return nodes;
+//}
 function trimNodeEnd(nodes) {
   const skip = nodes.length > 0 && typeof nodes[nodes.length - 1] === 'object' && nodes[nodes.length - 1]['className'] === 'indexer' ? [nodes.pop()] : [];
   for (let node = nodes[0]; nodes.length > 0 && !isVisible(node = nodes[nodes.length - 1], -1);) {
@@ -8433,7 +8431,7 @@ function unlink(h) {
 /***/ 3252:
 /***/ (function(module) {
 
-/*! typed-dom v0.0.333 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
+/*! typed-dom v0.0.334 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(true)
 		module.exports = factory();
@@ -8710,15 +8708,14 @@ exports.prepend = prepend;
 function defrag(nodes) {
   const acc = [];
   let appendable = false;
-  for (let i = 0; i < nodes.length; ++i) {
+  for (let i = 0, len = nodes.length; i < len; ++i) {
     const node = nodes[i];
-    if (node === '') continue;
-    if (typeof node === 'string') {
-      appendable ? acc[acc.length - 1] += node : acc.push(node);
-      appendable = true;
-    } else {
+    if (typeof node === 'object') {
       acc.push(node);
       appendable = false;
+    } else if (node !== '') {
+      appendable ? acc[acc.length - 1] += node : acc.push(node);
+      appendable = true;
     }
   }
   return acc;
@@ -8733,7 +8730,7 @@ exports.defrag = defrag;
 /******/ 	var __webpack_module_cache__ = {};
 /******/ 	
 /******/ 	// The require function
-/******/ 	function __nested_webpack_require_11657__(moduleId) {
+/******/ 	function __nested_webpack_require_11654__(moduleId) {
 /******/ 		// Check if module is in cache
 /******/ 		var cachedModule = __webpack_module_cache__[moduleId];
 /******/ 		if (cachedModule !== undefined) {
@@ -8747,7 +8744,7 @@ exports.defrag = defrag;
 /******/ 		};
 /******/ 	
 /******/ 		// Execute the module function
-/******/ 		__webpack_modules__[moduleId](module, module.exports, __nested_webpack_require_11657__);
+/******/ 		__webpack_modules__[moduleId](module, module.exports, __nested_webpack_require_11654__);
 /******/ 	
 /******/ 		// Return the exports of the module
 /******/ 		return module.exports;
@@ -8758,7 +8755,7 @@ exports.defrag = defrag;
 /******/ 	// startup
 /******/ 	// Load entry module and return exports
 /******/ 	// This entry module is referenced by other modules so it can't be inlined
-/******/ 	var __nested_webpack_exports__ = __nested_webpack_require_11657__(7521);
+/******/ 	var __nested_webpack_exports__ = __nested_webpack_require_11654__(7521);
 /******/ 	
 /******/ 	return __nested_webpack_exports__;
 /******/ })()
@@ -8770,7 +8767,7 @@ exports.defrag = defrag;
 /***/ 6120:
 /***/ (function(module) {
 
-/*! typed-dom v0.0.333 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
+/*! typed-dom v0.0.334 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(true)
 		module.exports = factory();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.276.1",
+  "version": "0.276.2",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",
@@ -50,12 +50,12 @@
     "karma-power-assert": "^1.0.0",
     "mocha": "^10.2.0",
     "npm-check-updates": "^16.10.12",
-    "semver": "^7.5.0",
+    "semver": "^7.5.1",
     "spica": "0.0.721",
     "ts-loader": "^9.4.2",
-    "typed-dom": "^0.0.333",
+    "typed-dom": "0.0.334",
     "typescript": "5.0.4",
-    "webpack": "^5.82.0",
+    "webpack": "^5.82.1",
     "webpack-cli": "^5.1.1",
     "webpack-merge": "^5.8.0"
   },

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

@@ -10,7 +10,7 @@ export function fence<C extends Ctx, D extends Parser<unknown, C>[]>(opener: Reg
     assert(matches[0] === firstline(source));
     const delim = matches[1];
     assert(delim && delim === delim.trim());
-    if (matches[0].indexOf(delim, delim.length) !== -1) return;
+    if (matches[0].includes(delim, delim.length)) return;
     let rest = source.slice(matches[0].length);
     // Prevent annoying parsing in editing.
     if (isBlank(firstline(rest)) && firstline(rest.slice(firstline(rest).length)).trimEnd() !== delim) return;

package/src/parser/inline/link.ts

@@ -1,12 +1,11 @@
 import { MarkdownParser } from '../../../markdown';
 import { LinkParser } from '../inline';
-import { Result } from '../../combinator/data/parser';
 import { union, inits, tails, sequence, some, constraint, syntax, creation, precedence, validate, surround, open, dup, reverse, lazy, fmap, bind } from '../../combinator';
 import { inline, media, shortmedia } from '../inline';
 import { attributes } from './html';
 import { linebreak, unescsource, str } from '../source';
 import { Syntax, State } from '../context';
-import { trimNode } from '../visibility';
+import { trimBlankStart, trimNodeEnd } from '../visibility';
 import { stringify } from '../util';
 import { ReadonlyURL } from 'spica/url';
 import { html, define, defrag } from 'typed-dom/dom';
@@ -27,14 +26,16 @@ export const textlink: LinkParser.TextLinkParser = lazy(() =>
   bind(reverse(tails([
     dup(surround(
       '[',
-      some(union([inline]), ']', [[/^\\?\n/, 9], [']', 2]]),
+      trimBlankStart(some(union([inline]), ']', [[/^\\?\n/, 9], [']', 2]])),
       ']',
       true)),
     dup(surround(/^{(?![{}])/, inits([uri, some(option)]), /^[^\S\n]*}/)),
   ])),
   ([params, content = []]: [string[], (HTMLElement | string)[]], rest, context) => {
     assert(!html('div', content).querySelector('a, .media, .annotation, .reference'));
-    return parse(content, params, rest, context);
+    assert(content[0] !== '');
+    if (content.length !== 0 && trimNodeEnd(content = defrag(content)).length === 0) return;
+    return [[parse(content, params, context)], rest];
   }))));
 
 export const medialink: LinkParser.MediaLinkParser = lazy(() =>
@@ -48,7 +49,7 @@ export const medialink: LinkParser.MediaLinkParser = lazy(() =>
     dup(surround(/^{(?![{}])/, inits([uri, some(option)]), /^[^\S\n]*}/)),
   ])),
   ([params, content = []]: [string[], (HTMLElement | string)[]], rest, context) =>
-    parse(content, params, rest, context)))));
+    [[parse(defrag(content), params, context)], rest]))));
 
 export const linemedialink: LinkParser.LineMediaLinkParser = surround(
   linebreak,
@@ -65,7 +66,7 @@ export const unsafelink: LinkParser.UnsafeLinkParser = lazy(() =>
     dup(surround(/^{(?![{}])/, inits([uri, some(option)]), /^[^\S\n]*}/)),
   ])),
   ([params, content = []], rest, context) =>
-    parse(content, params, rest, context)))));
+    [[parse(defrag(content), params, context)], rest]))));
 
 export const uri: LinkParser.ParameterParser.UriParser = union([
   open(/^[^\S\n]+/, str(/^\S+/)),
@@ -79,14 +80,12 @@ export const option: LinkParser.ParameterParser.OptionParser = union([
 ]);
 
 function parse(
-  content: (string | HTMLElement)[],
+  content: readonly (string | HTMLElement)[],
   params: string[],
-  rest: string,
   context: MarkdownParser.Context,
-): Result<HTMLAnchorElement, MarkdownParser.Context> {
+): HTMLAnchorElement {
   assert(params.length > 0);
   assert(params.every(p => typeof p === 'string'));
-  if (content.length !== 0 && trimNode(content).length === 0) return;
   const INSECURE_URI = params.shift()!;
   assert(INSECURE_URI === INSECURE_URI.trim());
   assert(!INSECURE_URI.match(/\s/));
@@ -95,11 +94,12 @@ function parse(
     context.host?.href || location.href);
   const el = elem(
     INSECURE_URI,
-    defrag(content),
+    content,
     uri,
     context.host?.origin || location.origin);
-  if (el.className === 'invalid') return [[el], rest];
-  return [[define(el, attributes('link', [], optspec, params))], rest];
+  return el.className === 'invalid'
+    ? el
+    : define(el, attributes('link', [], optspec, params));
 }
 
 function elem(

package/src/parser/inline/ruby.ts

@@ -89,7 +89,7 @@ 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].indexOf('\x1B') === -1) continue;
+      if (!ss[i].includes('\x1B')) continue;
       ss[i] = ss[i].replace(/\x1B/g, '');
       attrs ??= {
         class: 'invalid',

package/src/parser/visibility.ts

@@ -167,23 +167,23 @@ function trimBlankEnd<T extends HTMLElement | string>(parser: Parser<T>): Parser
     parser,
     trimNodeEnd);
 }
-export function trimNode<T extends HTMLElement | string>(nodes: T[]): T[] {
-  return trimNodeStart(trimNodeEnd(nodes));
-}
-function trimNodeStart<T extends HTMLElement | string>(nodes: T[]): T[] {
-  for (let node = nodes[0]; nodes.length > 0 && !isVisible(node = nodes[0], 0);) {
-    if (nodes.length === 1 && typeof node === 'object' && node.className === 'indexer') break;
-    if (typeof node === 'string') {
-      const pos = node.trimStart().length;
-      if (pos > 0) {
-        nodes[0] = node.slice(-pos) as T;
-        break;
-      }
-    }
-    nodes.shift();
-  }
-  return nodes;
-}
+//export function trimNode<T extends HTMLElement | string>(nodes: T[]): T[] {
+//  return trimNodeStart(trimNodeEnd(nodes));
+//}
+//function trimNodeStart<T extends HTMLElement | string>(nodes: T[]): T[] {
+//  for (let node = nodes[0]; nodes.length > 0 && !isVisible(node = nodes[0], 0);) {
+//    if (nodes.length === 1 && typeof node === 'object' && node.className === 'indexer') break;
+//    if (typeof node === 'string') {
+//      const pos = node.trimStart().length;
+//      if (pos > 0) {
+//        nodes[0] = node.slice(-pos) as T;
+//        break;
+//      }
+//    }
+//    nodes.shift();
+//  }
+//  return nodes;
+//}
 export function trimNodeEnd<T extends HTMLElement | string>(nodes: T[]): T[] {
   const skip = nodes.length > 0 &&
     typeof nodes[nodes.length - 1] === 'object' &&