securemark 0.280.0 → 0.280.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.280.1
+
+- Refactoring.
+
 ## 0.280.0
 
 - Decrease resource size to 20,000.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.280.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.280.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"));
@@ -3547,7 +3547,7 @@ class Delimiters {
         return `r/${pattern.source}/${pattern.flags}`;
     }
   }
-  push(...delims) {
+  push(delims) {
     const {
       registry,
       delimiters,
@@ -3781,7 +3781,7 @@ function some(parser, end, delimiters = [], limit = -1) {
     let nodes;
     if (delims.length > 0) {
       context.delimiters ??= new delimiter_1.Delimiters();
-      context.delimiters.push(...delims);
+      context.delimiters.push(delims);
     }
     while (true) {
       if (rest === '') break;
@@ -5254,7 +5254,7 @@ const dom_1 = __webpack_require__(3252);
 exports.segment = (0, combinator_1.block)((0, combinator_1.validate)('#', (0, combinator_1.focus)(/^#+[^\S\n]+\S[^\n]*(?:\n#+(?!\S)[^\n]*)*(?:$|\n)/, (0, combinator_1.some)((0, combinator_1.line)(({
   source
 }) => [[source], ''])))));
-exports.heading = (0, combinator_1.block)((0, combinator_1.rewrite)(exports.segment, (0, combinator_1.state)(256 /* State.annotation */ | 128 /* State.reference */ | 64 /* State.index */ | 32 /* State.label */ | 16 /* State.link */ | 8 /* State.media */, (0, combinator_1.line)((0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.union)([(0, combinator_1.open)((0, source_1.str)(/^##+/), (0, visibility_1.visualize)((0, visibility_1.trimBlankStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline])))), true), (0, combinator_1.open)((0, source_1.str)('#'), (0, combinator_1.state)(2 /* State.autolink */, (0, visibility_1.visualize)((0, visibility_1.trimBlankStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline]))))), true)]), ([h, ...ns]) => [h.length <= 6 ? (0, dom_1.html)(`h${h.length}`, (0, visibility_1.trimNodeEnd)((0, dom_1.defrag)(ns))) : (0, dom_1.html)(`h6`, {
+exports.heading = (0, combinator_1.block)((0, combinator_1.rewrite)(exports.segment, (0, combinator_1.state)(256 /* State.annotation */ | 128 /* State.reference */ | 64 /* State.index */ | 32 /* State.label */ | 16 /* State.link */ | 8 /* State.media */, (0, combinator_1.line)((0, inline_1.indexee)((0, combinator_1.fmap)((0, combinator_1.union)([(0, combinator_1.open)((0, source_1.str)(/^##+/), (0, visibility_1.visualize)((0, visibility_1.trimBlankStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline])))), true), (0, combinator_1.open)((0, source_1.str)('#'), (0, combinator_1.state)(502 /* State.linkers */, (0, visibility_1.visualize)((0, visibility_1.trimBlankStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.indexer, inline_1.inline]))))), true)]), ([h, ...ns]) => [h.length <= 6 ? (0, dom_1.html)(`h${h.length}`, (0, visibility_1.trimNodeEnd)((0, dom_1.defrag)(ns))) : (0, dom_1.html)(`h6`, {
   class: 'invalid',
   'data-invalid-syntax': 'heading',
   'data-invalid-type': 'syntax',
@@ -5586,7 +5586,6 @@ Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
 exports.quote = exports.syntax = void 0;
-const parser_1 = __webpack_require__(6728);
 const combinator_1 = __webpack_require__(2087);
 const math_1 = __webpack_require__(8946);
 const autolink_1 = __webpack_require__(6051);
@@ -5601,42 +5600,7 @@ exports.quote = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(1, false
   'data-invalid-type': 'syntax',
   'data-invalid-message': `Missing the whitespace after "${ns[0].split(/[^>]/, 1)[0]}"`
 }, (0, dom_1.defrag)(ns)), (0, dom_1.html)('br')]), false)));
-const qblock = ({
-  source,
-  context
-}) => {
-  source = source.replace(/\n$/, '');
-  const lines = source.match(/^.*\n?/mg);
-  const quotes = source.match(/^>+[^\S\n]/mg);
-  const content = lines.reduce((acc, line, i) => acc + line.slice(quotes[i].length), '');
-  const nodes = (0, parser_1.eval)(text({
-    source: `\r${content}`,
-    context
-  }), []);
-  nodes.unshift(quotes.shift());
-  for (let i = 0; i < nodes.length; ++i) {
-    const child = nodes[i];
-    if (typeof child === 'string') continue;
-    if ('wholeText' in child) {
-      nodes[i] = child.data;
-      continue;
-    }
-    if (child.tagName === 'BR') {
-      nodes.splice(i + 1, 0, quotes.shift());
-      ++i;
-      continue;
-    }
-    if (child.className === 'cite' || child.classList.contains('quote')) {
-      context.resources && (context.resources.clock -= child.childNodes.length);
-      nodes.splice(i, 1, ...child.childNodes);
-      --i;
-      continue;
-    }
-  }
-  nodes.unshift('');
-  return [nodes, ''];
-};
-const text = (0, combinator_1.some)((0, combinator_1.union)([math_1.math, autolink_1.autolink, source_1.linebreak, source_1.unescsource]));
+const qblock = (0, combinator_1.convert)(source => source.replace(/\n$/, '').replace(/(?<=^>+[^\S\n])/mg, '\r'), (0, combinator_1.some)((0, combinator_1.union)([math_1.math, autolink_1.autolink, source_1.linebreak, source_1.unescsource])));
 
 /***/ }),
 
@@ -8564,7 +8528,7 @@ function level(h) {
 function unlink(h) {
   for (let es = h.getElementsByTagName('a'), len = es.length, i = 0; i < len; ++i) {
     const el = es[i];
-    el.replaceWith(...el.childNodes);
+    el.firstChild ? el.replaceWith(el.firstChild) : el.remove();
   }
   return h.childNodes;
 }

package/markdown.d.ts

@@ -631,12 +631,6 @@ export namespace MarkdownParser {
       export namespace QuoteParser {
         export interface BlockParser extends
           Block<'reply/quote/block'>,
-          Parser<string | HTMLElement, Context, [
-            TextParser,
-          ]> {
-        }
-        export interface TextParser extends
-          Block<'reply/quote/text'>,
           Parser<string | HTMLElement, Context, [
             InlineParser.MathParser,
             InlineParser.AutolinkParser,

package/package.json

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

package/src/combinator/data/parser/context/delimiter.ts

@@ -34,7 +34,7 @@ export class Delimiters {
   private readonly delimiters: Delimiter[] = [];
   private readonly order: number[] = [];
   public push(
-    ...delims: readonly {
+    delims: readonly {
       readonly signature: string;
       readonly matcher: (source: string) => boolean | undefined;
       readonly precedence?: number;

package/src/combinator/data/parser/some.ts

@@ -22,7 +22,7 @@ export function some<T>(parser: Parser<T>, end?: string | RegExp | number, delim
     let nodes: T[] | undefined;
     if (delims.length > 0) {
       context.delimiters ??= new Delimiters();
-      context.delimiters.push(...delims);
+      context.delimiters.push(delims);
     }
     while (true) {
       if (rest === '') break;

package/src/parser/api/bind.ts

@@ -26,9 +26,12 @@ export function bind(target: DocumentFragment | HTMLElement | ShadowRoot, settin
     host: settings.host ?? new ReadonlyURL(location.pathname, location.origin),
     memo: new Memo({ targets: State.backtrackers }),
   };
+  assert(!context.offset);
+  assert(!context.precedence);
+  assert(!context.delimiters);
+  assert(!context.state);
   if (context.id?.match(/[^0-9a-z/-]/i)) throw new Error('Invalid ID: ID must be alphanumeric');
   if (context.host?.origin === 'null') throw new Error(`Invalid host: ${context.host.href}`);
-  assert(!settings.id);
   type Block = readonly [segment: string, blocks: readonly HTMLElement[], url: string];
   const blocks: Block[] = [];
   const adds: [HTMLElement, Node | null][] = [];

package/src/parser/api/parse.ts

@@ -21,7 +21,6 @@ export function parse(source: string, opts: Options = {}, context?: MarkdownPars
   if (!validate(source, MAX_SEGMENT_SIZE)) throw new Error(`Too large input over ${MAX_SEGMENT_SIZE.toLocaleString('en')} bytes`);
   const url = headers(source).find(field => field.toLowerCase().startsWith('url:'))?.slice(4).trim() ?? '';
   source = !context ? normalize(source) : source;
-  assert(!context?.delimiters);
   context = {
     host: opts.host ?? context?.host ?? new ReadonlyURL(location.pathname, location.origin),
     url: url ? new ReadonlyURL(url as ':') : context?.url,
@@ -32,6 +31,10 @@ export function parse(source: string, opts: Options = {}, context?: MarkdownPars
     },
     memo: new Memo({ targets: State.backtrackers }),
   };
+  assert(!context.offset);
+  assert(!context.precedence);
+  assert(!context.delimiters);
+  assert(!context.state);
   if (context.id?.match(/[^0-9a-z/-]/i)) throw new Error('Invalid ID: ID must be alphanumeric');
   if (context.host?.origin === 'null') throw new Error(`Invalid host: ${context.host.href}`);
   const node = frag();

package/src/parser/block/heading.ts

@@ -18,7 +18,7 @@ export const heading: HeadingParser = block(rewrite(segment,
       visualize(trimBlankStart(some(union([indexer, inline])))), true),
     open(
       str('#'),
-      state(State.autolink,
+      state(State.linkers,
       visualize(trimBlankStart(some(union([indexer, inline]))))), true),
   ]),
   ([h, ...ns]: [string, ...(HTMLElement | string)[]]) => [

package/src/parser/block/reply/quote.ts

@@ -1,6 +1,5 @@
 import { ReplyParser } from '../../block';
-import { eval } from '../../../combinator/data/parser';
-import { union, some, creation, block, line, validate, rewrite, lazy, fmap } from '../../../combinator';
+import { union, some, creation, block, line, validate, rewrite, convert, lazy, fmap } from '../../../combinator';
 import { math } from '../../inline/math';
 import { autolink } from '../../inline/autolink';
 import { linebreak, unescsource, str, anyline } from '../../source';
@@ -33,47 +32,11 @@ export const quote: ReplyParser.QuoteParser = lazy(() => creation(1, false, bloc
   ]),
   false)));
 
-const qblock: ReplyParser.QuoteParser.BlockParser = ({ source, context }) => {
-  source = source.replace(/\n$/, '');
-  const lines = source.match(/^.*\n?/mg)!;
-  assert(lines);
-  const quotes = source.match(/^>+[^\S\n]/mg)!;
-  assert(quotes);
-  assert(quotes.length > 0);
-  const content = lines.reduce((acc, line, i) => acc + line.slice(quotes[i].length), '');
-  const nodes = eval(text({ source: `\r${content}`, context }), []);
-  nodes.unshift(quotes.shift()!);
-  for (let i = 0; i < nodes.length; ++i) {
-    const child = nodes[i] as string | Text | Element;
-    if (typeof child === 'string') continue;
-    if ('wholeText' in child) {
-      nodes[i] = child.data;
-      continue;
-    }
-    assert(child instanceof HTMLElement);
-    if (child.tagName === 'BR') {
-      assert(quotes.length > 0);
-      nodes.splice(i + 1, 0, quotes.shift()!);
-      ++i;
-      continue;
-    }
-    if (child.className === 'cite' || child.classList.contains('quote')) {
-      context.resources && (context.resources.clock -= child.childNodes.length);
-      nodes.splice(i, 1, ...child.childNodes as NodeListOf<HTMLElement>);
-      --i;
-      continue;
-    }
-  }
-  nodes.unshift('');
-  assert(nodes.length > 1);
-  assert(nodes.every(n => typeof n === 'string' || n instanceof HTMLElement));
-  assert(quotes.length === 0);
-  return [nodes, ''];
-};
-
-const text: ReplyParser.QuoteParser.TextParser = some(union([
-  math, // quote補助関数が残した数式をパースする。他の構文で数式を残す場合はソーステキストを直接使用する。
-  autolink,
-  linebreak,
-  unescsource,
-]));
+const qblock: ReplyParser.QuoteParser.BlockParser = convert(
+  source => source.replace(/\n$/, '').replace(/(?<=^>+[^\S\n])/mg, '\r'),
+  some(union([
+    math, // quote補助関数が残した数式をパースする。他の構文で数式を残す場合はソーステキストを直接使用する。
+    autolink,
+    linebreak,
+    unescsource,
+  ])));

package/src/util/toc.ts

@@ -61,7 +61,10 @@ function level(h: HTMLHeadingElement): number {
 function unlink(h: HTMLHeadingElement): Iterable<Node> {
   for (let es = h.getElementsByTagName('a'), len = es.length, i = 0; i < len; ++i) {
     const el = es[i];
-    el.replaceWith(...el.childNodes);
+    assert(el.childNodes.length <= 1);
+    el.firstChild
+      ? el.replaceWith(el.firstChild)
+      : el.remove();
   }
   return h.childNodes;
 }