securemark 0.291.0 → 0.291.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.291.1
+
+- Refactoring.
+
 ## 0.291.0
 
 - Fix backtracking control.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.291.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.291.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"));
@@ -2742,8 +2742,12 @@ const bind_1 = __webpack_require__(994);
 const match_1 = __webpack_require__(1638);
 const surround_1 = __webpack_require__(5781);
 const memoize_1 = __webpack_require__(6925);
-function indent(opener, parser, separation = false) {
-  if (typeof opener === 'function') return indent(/^([ \t])\1*/, opener, parser);
+function indent(opener, parser = false, separation = false) {
+  if (typeof opener === 'function') {
+    separation = parser;
+    parser = opener;
+    opener = /^([ \t])\1*/;
+  }
   return (0, bind_1.bind)((0, block_1.block)((0, match_1.match)(opener, (0, memoize_1.memoize)(([indent]) => (0, some_1.some)((0, line_1.line)((0, surround_1.open)(indent, ({
     source
   }) => [[source], '']))), ([indent]) => indent.length * 2 + +(indent[0] === ' '), {})), separation), (lines, rest, context) => {
@@ -2979,7 +2983,7 @@ function surround(opener, parser, closer, optional = false, f, g, backtracks = [
     if (!nodesM && !optional) return void revert(context, linebreak);
     if (rest.length === sme_.length) return void revert(context, linebreak);
     context.recent = [sme_.slice(0, sme_.length - me_.length), me_.slice(0, me_.length - e_.length), e_.slice(0, e_.length - rest.length)];
-    const result = nodesE ? f ? f([nodesS, nodesM, nodesE], rest, context) : [(0, array_1.push)((0, array_1.unshift)(nodesS, nodesM ?? []), nodesE), rest] : g ? g([nodesS, nodesM, me_], rest, context) : undefined;
+    const result = nodesE ? f ? f([nodesS, nodesM, nodesE], rest, context) : [(0, array_1.push)((0, array_1.unshift)(nodesS, nodesM ?? []), nodesE), rest] : g ? g([nodesS, nodesM], rest, context) : undefined;
     if (result) {
       context.linebreak ||= linebreak;
     } else {
@@ -5428,9 +5432,9 @@ const row = (parser, optional) => (0, combinator_1.fallback)((0, combinator_1.fm
 }, [(0, dom_1.html)('td', source.replace('\n', ''))])], '']));
 const align = (0, combinator_1.fmap)((0, combinator_1.open)('|', (0, combinator_1.union)([(0, combinator_1.focus)(/^:-+:?/, ({
   source
-}) => [[source[source.length - 1] === ':' ? 'center' : 'start'], ''], false), (0, combinator_1.focus)(/^-+:?/, ({
+}) => [[source.at(-1) === ':' ? 'center' : 'start'], ''], false), (0, combinator_1.focus)(/^-+:?/, ({
   source
-}) => [[source[source.length - 1] === ':' ? 'end' : ''], ''], false)])), ns => [(0, dom_1.html)('td', (0, dom_1.defrag)(ns))]);
+}) => [[source.at(-1) === ':' ? 'end' : ''], ''], false)])), ns => [(0, dom_1.html)('td', (0, dom_1.defrag)(ns))]);
 const cell = (0, combinator_1.surround)(/^\|\s*(?=\S)/, (0, combinator_1.trimStart)((0, combinator_1.union)([(0, combinator_1.close)(inline_1.medialink, /^\s*(?=\||$)/), (0, combinator_1.close)(inline_1.media, /^\s*(?=\||$)/), (0, combinator_1.close)(inline_1.shortmedia, /^\s*(?=\||$)/), (0, visibility_1.trimBlank)((0, combinator_1.some)(inline_1.inline, /^\|/, [[/^[|\\]?\s*$/, 9]]))])), /^[^|]*/, true);
 const head = (0, combinator_1.fmap)(cell, ns => [(0, dom_1.html)('th', (0, dom_1.defrag)(ns))]);
 const data = (0, combinator_1.fmap)(cell, ns => [(0, dom_1.html)('td', (0, dom_1.defrag)(ns))]);
@@ -6929,7 +6933,7 @@ exports.reference = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(64
   return context.state & 128 /* State.annotation */ ? [(0, array_1.unshift)(as, bs), rest] : undefined;
 }, [3 | 16 /* Backtrack.doublebracket */, 1 | 8 /* Backtrack.bracket */])));
 // Chicago-Style
-const abbr = (0, combinator_1.surround)('^', (0, combinator_1.union)([(0, source_1.str)(/^(?=[A-Z])(?:[0-9A-Za-z]'?|(?:[-.:]|\.?\??,? ?)(?!['\-.:?, ]))+/)]), /^\|?(?=]])|^\|[^\S\n]*/, true, ([, ns], rest) => ns ? [["\u001B" /* Command.Escape */, ns[0].trimEnd()], rest.replace(visibility_1.blank.start, '')] : [[''], `^${rest}`], ([,, rest]) => [[''], `^${rest}`]);
+const abbr = (0, combinator_1.surround)((0, source_1.str)('^'), (0, combinator_1.union)([(0, source_1.str)(/^(?=[A-Z])(?:[0-9A-Za-z]'?|(?:[-.:]|\.?\??,? ?)(?!['\-.:?, ]))+/)]), /^\|?(?=]])|^\|[^\S\n]*/, true, ([, ns], rest) => ns ? [["\u001B" /* Command.Escape */, ns[0].trimEnd()], rest.replace(visibility_1.blank.start, '')] : [[''], `^${rest}`], ([as, bs = ['']], rest) => [[''], as[0] + bs[0] + rest]);
 function attributes(ns) {
   switch (ns[0]) {
     case '':
@@ -6994,10 +6998,10 @@ const source_1 = __webpack_require__(8745);
 const visibility_1 = __webpack_require__(6364);
 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)('[', rtext, ']', false, ([, ns], rest) => {
+exports.ruby = (0, combinator_1.lazy)(() => (0, combinator_1.bind)((0, combinator_1.inits)([(0, combinator_1.dup)((0, combinator_1.surround)('[', text, ']', false, ([, ns], rest) => {
   ns && ns.at(-1) === '' && ns.pop();
   return (0, visibility_1.isTightNodeStart)(ns) ? [ns, rest] : undefined;
-}, undefined, [3 | 32 /* Backtrack.ruby */, 1 | 8 /* Backtrack.bracket */])), (0, combinator_1.dup)((0, combinator_1.surround)('(', rtext, ')', false, undefined, undefined, [3 | 32 /* Backtrack.ruby */, 1 | 8 /* Backtrack.bracket */]))]), ([texts, rubies], rest, context) => {
+}, undefined, [3 | 32 /* Backtrack.ruby */, 1 | 8 /* Backtrack.bracket */])), (0, combinator_1.dup)((0, combinator_1.surround)('(', text, ')', false, undefined, undefined, [3 | 32 /* Backtrack.ruby */, 1 | 8 /* Backtrack.bracket */]))]), ([texts, rubies], rest, context) => {
   if (rubies === undefined) {
     const head = context.recent.reduce((a, b) => a + b.length, rest.length);
     return void (0, combinator_1.setBacktrack)(context, [2 | 32 /* Backtrack.ruby */], head);
@@ -7011,7 +7015,7 @@ exports.ruby = (0, combinator_1.lazy)(() => (0, combinator_1.bind)((0, combinato
       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 rtext = ({
+const text = ({
   source,
   context
 }) => {
@@ -7030,7 +7034,6 @@ const rtext = ({
           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
@@ -7038,21 +7041,22 @@ const rtext = ({
       default:
         {
           if (source[0].trimStart() === '') {
+            state ||= acc.at(-1).trimStart() !== '';
             acc.push('');
             source = source.slice(1);
             continue;
           }
-          const result = (0, source_1.text)({
+          const result = (0, source_1.txt)({
             source,
             context
           });
           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;
         }
     }
   }
+  state ||= acc.at(-1).trimStart() !== '';
   return state ? [acc, source] : undefined;
 };
 //function attributes(texts: string[], rubies: string[]): Record<string, string> {

package/package.json

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

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

@@ -9,8 +9,12 @@ import { memoize } from 'spica/memoize';
 
 export function indent<P extends Parser<unknown>>(parser: P, separation?: boolean): P;
 export function indent<P extends Parser<unknown>>(opener: RegExp, parser: P, separation?: boolean): P;
-export function indent<N>(opener: RegExp | Parser<N>, parser?: Parser<N> | boolean, separation = false): Parser<N> {
-  if (typeof opener === 'function') return indent(/^([ \t])\1*/, opener, parser as boolean);
+export function indent<N>(opener: RegExp | Parser<N>, parser: Parser<N> | boolean = false, separation = false): Parser<N> {
+  if (typeof opener === 'function') {
+    separation = parser as boolean;
+    parser = opener;
+    opener = /^([ \t])\1*/;
+  }
   assert(parser);
   return bind(block(match(
     opener,

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

@@ -6,35 +6,35 @@ export function surround<P extends Parser<unknown>, S = string>(
   opener: string | RegExp | Parser<S, Context<P>>, parser: IntermediateParser<P>, closer: string | RegExp | Parser<S, Context<P>>,
   optional?: false,
   f?: (rss: [S[], SubNode<P>[], S[]], rest: string, context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
-  g?: (rss: [S[], SubNode<P>[], string], rest: string, context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
+  g?: (rss: [S[], SubNode<P>[]], rest: string, context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
   backtracks?: readonly number[],
 ): P;
 export function surround<P extends Parser<unknown>, S = string>(
   opener: string | RegExp | Parser<S, Context<P>>, parser: IntermediateParser<P>, closer: string | RegExp | Parser<S, Context<P>>,
   optional?: boolean,
   f?: (rss: [S[], SubNode<P>[] | undefined, S[]], rest: string, context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
-  g?: (rss: [S[], SubNode<P>[] | undefined, string], rest: string, context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
+  g?: (rss: [S[], SubNode<P>[] | undefined], rest: string, context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
   backtracks?: readonly number[],
 ): P;
 export function surround<P extends Parser<unknown>, S = string>(
   opener: string | RegExp | Parser<S, Context<P>>, parser: P, closer: string | RegExp | Parser<S, Context<P>>,
   optional?: false,
   f?: (rss: [S[], Node<P>[], S[]], rest: string, context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
-  g?: (rss: [S[], Node<P>[], string], rest: string, context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
+  g?: (rss: [S[], Node<P>[]], rest: string, context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
   backtracks?: readonly number[],
 ): P;
 export function surround<P extends Parser<unknown>, S = string>(
   opener: string | RegExp | Parser<S, Context<P>>, parser: P, closer: string | RegExp | Parser<S, Context<P>>,
   optional?: boolean,
   f?: (rss: [S[], Node<P>[] | undefined, S[]], rest: string, context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
-  g?: (rss: [S[], Node<P>[] | undefined, string], rest: string, context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
+  g?: (rss: [S[], Node<P>[] | undefined], rest: string, context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
   backtracks?: readonly number[],
 ): P;
 export function surround<N>(
   opener: string | RegExp | Parser<N>, parser: Parser<N>, closer: string | RegExp | Parser<N>,
   optional: boolean = false,
   f?: (rss: [N[], N[], N[]], rest: string, context: Ctx) => Result<N>,
-  g?: (rss: [N[], N[], string], rest: string, context: Ctx) => Result<N>,
+  g?: (rss: [N[], N[]], rest: string, context: Ctx) => Result<N>,
   backtracks: readonly number[] = [],
 ): Parser<N> {
   switch (typeof opener) {
@@ -79,7 +79,7 @@ export function surround<N>(
         ? f([nodesS, nodesM!, nodesE], rest, context)
         : [push(unshift(nodesS, nodesM ?? []), nodesE), rest] satisfies [N[], string]
       : g
-        ? g([nodesS, nodesM!, me_], rest, context)
+        ? g([nodesS, nodesM!], rest, context)
         : undefined;
     if (result) {
       context.linebreak ||= linebreak;

package/src/parser/block/table.ts

@@ -40,9 +40,9 @@ const align: AlignParser = fmap(open(
   '|',
   union([
     focus(/^:-+:?/, ({ source }) =>
-      [[source[source.length - 1] === ':' ? 'center' : 'start'], ''], false),
+      [[source.at(-1) === ':' ? 'center' : 'start'], ''], false),
     focus(/^-+:?/, ({ source }) =>
-      [[source[source.length - 1] === ':' ? 'end' : ''], ''], false),
+      [[source.at(-1) === ':' ? 'end' : ''], ''], false),
   ])),
   ns => [html('td', defrag(ns))]);
 

package/src/parser/inline/reference.ts

@@ -91,12 +91,12 @@ export const reference: ReferenceParser = lazy(() => constraint(State.reference,
 
 // Chicago-Style
 const abbr: ReferenceParser.AbbrParser = surround(
-  '^',
+  str('^'),
   union([str(/^(?=[A-Z])(?:[0-9A-Za-z]'?|(?:[-.:]|\.?\??,? ?)(?!['\-.:?, ]))+/)]),
   /^\|?(?=]])|^\|[^\S\n]*/,
   true,
   ([, ns], rest) => ns ? [[Command.Escape, ns[0].trimEnd()], rest.replace(blank.start, '')] : [[''], `^${rest}`],
-  ([, , rest]) => [[''], `^${rest}`]);
+  ([as, bs = ['']], rest) => [[''], as[0] + bs[0] + rest]);
 
 function attributes(ns: (string | HTMLElement)[]): Record<string, string | undefined> {
   switch (ns[0]) {

package/src/parser/inline/ruby.ts

@@ -3,7 +3,7 @@ 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 } from '../source';
+import { txt } from '../source';
 import { isTightNodeStart } from '../visibility';
 import { unshift, push } from 'spica/array';
 import { html, defrag } from 'typed-dom/dom';
@@ -11,7 +11,7 @@ import { html, defrag } from 'typed-dom/dom';
 export const ruby: RubyParser = lazy(() => bind(
   inits([
     dup(surround(
-      '[', rtext, ']',
+      '[', text, ']',
       false,
       ([, ns], rest) => {
         ns && ns.at(-1) === '' && ns.pop();
@@ -20,7 +20,7 @@ export const ruby: RubyParser = lazy(() => bind(
       undefined,
       [3 | Backtrack.ruby, 1 | Backtrack.bracket])),
     dup(surround(
-      '(', rtext, ')',
+      '(', text, ')',
       false, undefined, undefined,
       [3 | Backtrack.ruby, 1 | Backtrack.bracket])),
   ]),
@@ -62,7 +62,7 @@ export const ruby: RubyParser = lazy(() => bind(
     }
   }));
 
-const rtext: RubyParser.TextParser = ({ source, context }) => {
+const text: RubyParser.TextParser = ({ source, context }) => {
   const acc = [''];
   let state = false;
   while (source !== '') {
@@ -75,26 +75,26 @@ const rtext: 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
       }
       default: {
         if (source[0].trimStart() === '') {
+          state ||= acc.at(-1)!.trimStart() !== '';
           acc.push('');
           source = source.slice(1);
           continue;
         }
-        const result = text({ source, context })!;
+        const result = txt({ 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;
       }
     }
   }
+  state ||= acc.at(-1)!.trimStart() !== '';
   return state
     ? [acc, source]
     : undefined;