securemark 0.295.0 → 0.295.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.295.1
+
+- Refactoring.
+
 ## 0.295.0
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.295.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.295.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"));
@@ -3111,7 +3111,7 @@ function surround(opener, parser, closer, optional = false, backtracks = [], f,
     case 'object':
       closer = (0, combinator_1.clear)((0, combinator_1.matcher)(closer, true));
   }
-  const [rbs, wbs] = reduce(backtracks);
+  const [blen, rbs, wbs] = reduce(backtracks);
   return (0, parser_1.failsafe)(input => {
     const {
       context
@@ -3129,7 +3129,7 @@ function surround(opener, parser, closer, optional = false, backtracks = [], f,
     if (!nodesO) {
       return void revert(context, linebreak);
     }
-    if (rbs && isBacktrack(context, rbs, position, context.position - position || 1)) {
+    if (rbs && isBacktrack(context, rbs, position, blen)) {
       return void revert(context, linebreak);
     }
     const nodesM = context.position < source.length ? parser(input) : undefined;
@@ -3158,30 +3158,22 @@ function surround(opener, parser, closer, optional = false, backtracks = [], f,
   });
 }
 exports.surround = surround;
-function open(opener, parser, optional, backtracks) {
+function open(opener, parser, optional, backtracks = []) {
   return surround(opener, parser, '', optional, backtracks);
 }
 exports.open = open;
-function close(parser, closer, optional, backtracks) {
+function close(parser, closer, optional, backtracks = []) {
   return surround('', parser, closer, optional, backtracks);
 }
 exports.close = close;
 const commandsize = 2;
 function isBacktrack(context, backtrack, position = context.position, length = 1) {
-  if (length === 0) return false;
-  const {
-    source
-  } = context;
-  if (position === source.length) return false;
   const {
     backtracks = {},
     offset = 0
   } = context;
   for (let i = 0; i < length; ++i) {
-    if (position + i === source.length) break;
-    if (i > 0 && source[position + i] !== source[position]) break;
-    const pos = position + i + offset;
-    if (backtracks[pos] & backtrack >>> commandsize) return true;
+    if (backtracks[position + i + offset] & backtrack >>> commandsize) return true;
   }
   return false;
 }
@@ -3189,34 +3181,32 @@ exports.isBacktrack = isBacktrack;
 function setBacktrack(context, backtrack, position, length = 1) {
   // バックトラックの可能性がなく記録不要の場合もあるが判別が面倒なので省略
 
-  if (length === 0) return;
-  const {
-    source
-  } = context;
-  if (position === source.length) return;
   const {
     backtracks = {},
     offset = 0
   } = context;
   for (let i = 0; i < length; ++i) {
-    if (position + i === source.length) break;
-    const pos = position + i + offset;
-    backtracks[pos] |= backtrack >>> commandsize;
+    backtracks[position + i + offset] |= backtrack >>> commandsize;
   }
 }
 exports.setBacktrack = setBacktrack;
 function reduce(backtracks) {
+  let len = 1;
   let rbs = 0;
   let wbs = 0;
   for (const backtrack of backtracks) {
-    if (backtrack & 1) {
+    if (backtrack >>> commandsize === 0) {
+      len = backtrack;
+      continue;
+    }
+    if (1 & backtrack) {
       rbs |= backtrack;
     }
-    if (backtrack & 2) {
+    if (2 & backtrack) {
       wbs |= backtrack;
     }
   }
-  return [rbs, wbs];
+  return [len, rbs, wbs];
 }
 function revert(context, linebreak) {
   context.linebreak = linebreak;
@@ -6195,7 +6185,7 @@ const inline_1 = __webpack_require__(7973);
 const visibility_1 = __webpack_require__(6364);
 const util_1 = __webpack_require__(4992);
 const dom_1 = __webpack_require__(394);
-exports.annotation = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(128 /* State.annotation */, (0, combinator_1.surround)('((', (0, combinator_1.precedence)(1, (0, combinator_1.state)(128 /* State.annotation */, (0, visibility_1.trimBlankStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ')', [[')', 1]])))), '))', false, [1 | 4 /* Backtrack.common */, 3 | 128 /* Backtrack.doublebracket */], ([, ns], context) => context.linebreak === 0 ? new parser_1.List([new parser_1.Data((0, dom_1.html)('sup', {
+exports.annotation = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(128 /* State.annotation */, (0, combinator_1.surround)('((', (0, combinator_1.precedence)(1, (0, combinator_1.state)(128 /* State.annotation */, (0, visibility_1.trimBlankStart)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ')', [[')', 1]])))), '))', false, [2, 1 | 4 /* Backtrack.common */, 3 | 128 /* Backtrack.doublebracket */], ([, ns], context) => context.linebreak === 0 ? new parser_1.List([new parser_1.Data((0, dom_1.html)('sup', {
   class: 'annotation'
 }, [(0, dom_1.html)('span', (0, dom_1.defrag)((0, util_1.unwrap)((0, visibility_1.trimBlankNodeEnd)(ns))))]))]) : undefined)));
 
@@ -7625,7 +7615,7 @@ const source_1 = __webpack_require__(8745);
 const visibility_1 = __webpack_require__(6364);
 const util_1 = __webpack_require__(4992);
 const dom_1 = __webpack_require__(394);
-exports.reference = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(64 /* State.reference */, (0, combinator_1.surround)((0, source_1.str)('[['), (0, combinator_1.precedence)(1, (0, combinator_1.state)(128 /* State.annotation */ | 64 /* State.reference */, (0, combinator_1.subsequence)([abbr, (0, visibility_1.trimBlankStart)((0, combinator_1.some)(inline_1.inline, ']', [[']', 1]]))]))), ']]', false, [1 | 4 /* Backtrack.common */, 3 | 128 /* Backtrack.doublebracket */], ([, ns], context) => {
+exports.reference = (0, combinator_1.lazy)(() => (0, combinator_1.constraint)(64 /* State.reference */, (0, combinator_1.surround)((0, source_1.str)('[['), (0, combinator_1.precedence)(1, (0, combinator_1.state)(128 /* State.annotation */ | 64 /* State.reference */, (0, combinator_1.subsequence)([abbr, (0, visibility_1.trimBlankStart)((0, combinator_1.some)(inline_1.inline, ']', [[']', 1]]))]))), ']]', false, [2, 1 | 4 /* Backtrack.common */, 3 | 128 /* Backtrack.doublebracket */], ([, ns], context) => {
   const {
     position,
     range = 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.295.0",
+  "version": "0.295.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/surround.ts

@@ -4,49 +4,49 @@ import { matcher, clear } from '../../../combinator';
 export function surround<P extends Parser, S = string>(
   opener: string | RegExp | Parser<S, Context<P>>, parser: IntermediateParser<P>, closer: string | RegExp | Parser<S, Context<P>>,
   optional?: false,
-  backtracks?: readonly [] | readonly [number] | readonly [number, number],
+  backtracks?: readonly number[],
   f?: (rss: [List<Data<S>>, List<Data<SubNode<P>>>, List<Data<S>>], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
   g?: (rss: [List<Data<S>>, List<Data<SubNode<P>>> | undefined], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
 ): P;
 export function surround<P extends Parser, S = string>(
   opener: string | RegExp | Parser<S, Context<P>>, parser: IntermediateParser<P>, closer: string | RegExp | Parser<S, Context<P>>,
   optional?: boolean,
-  backtracks?: readonly [] | readonly [number] | readonly [number, number],
+  backtracks?: readonly number[],
   f?: (rss: [List<Data<S>>, List<Data<SubNode<P>>> | undefined, List<Data<S>>], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
   g?: (rss: [List<Data<S>>, List<Data<SubNode<P>>> | undefined], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
 ): P;
 export function surround<P extends Parser, S = string>(
   opener: string | RegExp | Parser<S, Context<P>>, parser: P, closer: string | RegExp | Parser<S, Context<P>>,
   optional?: false,
-  backtracks?: readonly [] | readonly [number] | readonly [number, number],
+  backtracks?: readonly number[],
   f?: (rss: [List<Data<S>>, List<Data<Node<P>>>, List<Data<S>>], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
   g?: (rss: [List<Data<S>>, List<Data<Node<P>>> | undefined], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
 ): P;
 export function surround<P extends Parser, S = string>(
   opener: string | RegExp | Parser<S, Context<P>>, parser: P, closer: string | RegExp | Parser<S, Context<P>>,
   optional?: boolean,
-  backtracks?: readonly [] | readonly [number] | readonly [number, number],
+  backtracks?: readonly number[],
   f?: (rss: [List<Data<S>>, List<Data<Node<P>>> | undefined, List<Data<S>>], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
   g?: (rss: [List<Data<S>>, List<Data<Node<P>>> | undefined], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
 ): P;
 export function surround<P extends Parser<string>, S = string>(
   opener: string | RegExp | Parser<S, Context<P>>, parser: string | RegExp | P, closer: string | RegExp | Parser<S, Context<P>>,
   optional?: false,
-  backtracks?: readonly [] | readonly [number] | readonly [number, number],
+  backtracks?: readonly number[],
   f?: (rss: [List<Data<S>>, List<Data<Node<P>>>, List<Data<S>>], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
   g?: (rss: [List<Data<S>>, List<Data<Node<P>>> | undefined], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
 ): P;
 export function surround<P extends Parser<string>, S = string>(
   opener: string | RegExp | Parser<S, Context<P>>, parser: string | RegExp | P, closer: string | RegExp | Parser<S, Context<P>>,
   optional?: boolean,
-  backtracks?: readonly [] | readonly [number] | readonly [number, number],
+  backtracks?: readonly number[],
   f?: (rss: [List<Data<S>>, List<Data<Node<P>>> | undefined, List<Data<S>>], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
   g?: (rss: [List<Data<S>>, List<Data<Node<P>>> | undefined], context: Context<P>) => Result<Node<P>, Context<P>, SubParsers<P>>,
 ): P;
 export function surround<N>(
   opener: string | RegExp | Parser<N>, parser: string | RegExp | Parser<N>, closer: string | RegExp | Parser<N>,
   optional: boolean = false,
-  backtracks: readonly [] | readonly [number] | readonly [number, number] = [],
+  backtracks: readonly number[] = [],
   f?: (rss: [List<Data<N>>, List<Data<N>>, List<Data<N>>], context: Ctx) => Result<N>,
   g?: (rss: [List<Data<N>>, List<Data<N>> | undefined], context: Ctx) => Result<N>,
 ): Parser<N> {
@@ -68,7 +68,7 @@ export function surround<N>(
       closer = clear(matcher(closer, true));
   }
   assert(closer);
-  const [rbs, wbs] = reduce(backtracks);
+  const [blen, rbs, wbs] = reduce(backtracks);
   return failsafe(input => {
     const { context } = input;
     const { source, position } = context;
@@ -79,7 +79,7 @@ export function surround<N>(
     if (!nodesO) {
       return void revert(context, linebreak);
     }
-    if (rbs && isBacktrack(context, rbs, position, context.position - position || 1)) {
+    if (rbs && isBacktrack(context, rbs, position, blen)) {
       return void revert(context, linebreak);
     }
     const nodesM = context.position < source.length ? parser(input) : undefined;
@@ -113,19 +113,19 @@ export function open<P extends Parser>(
   opener: string | RegExp | Parser<Node<P>, Context<P>>,
   parser: P,
   optional?: boolean,
-  backtracks?: readonly [] | readonly [number] | readonly [number, number],
+  backtracks?: readonly number[],
 ): P;
 export function open<P extends Parser<string>>(
   opener: string | RegExp | Parser<Node<P>, Context<P>>,
   parser: string | RegExp | P,
   optional?: boolean,
-  backtracks?: readonly [] | readonly [number] | readonly [number, number],
+  backtracks?: readonly number[],
 ): P;
 export function open<N>(
   opener: string | RegExp | Parser<N, Ctx>,
   parser: string | RegExp | Parser<N>,
   optional?: boolean,
-  backtracks?: readonly [] | readonly [number] | readonly [number, number],
+  backtracks: readonly number[] = [],
 ): Parser<N> {
   return surround(opener, parser as Parser<N>, '', optional, backtracks);
 }
@@ -133,19 +133,19 @@ export function close<P extends Parser>(
   parser: P,
   closer: string | RegExp | Parser<Node<P>, Context<P>>,
   optional?: boolean,
-  backtracks?: readonly [] | readonly [number] | readonly [number, number],
+  backtracks?: readonly number[],
 ): P;
 export function close<P extends Parser<string>>(
   parser: string | RegExp | P,
   closer: string | RegExp | Parser<Node<P>, Context<P>>,
   optional?: boolean,
-  backtracks?: readonly [] | readonly [number] | readonly [number, number],
+  backtracks?: readonly number[],
 ): P;
 export function close<N>(
   parser: string | RegExp | Parser<N>,
   closer: string | RegExp | Parser<N, Ctx>,
   optional?: boolean,
-  backtracks?: readonly [] | readonly [number] | readonly [number, number],
+  backtracks: readonly number[] = [],
 ): Parser<N> {
   return surround('', parser as Parser<N>, closer, optional, backtracks);
 }
@@ -157,16 +157,12 @@ export function isBacktrack(
   position: number = context.position,
   length: number = 1,
 ): boolean {
-  assert(backtrack & 1);
-  if (length === 0) return false;
-  const { source } = context;
-  if (position === source.length) return false;
+  assert(1 & backtrack);
+  assert(backtrack >>> commandsize);
+  assert(0 < length && length < 3);
   const { backtracks = {}, offset = 0 } = context;
   for (let i = 0; i < length; ++i) {
-    if (position + i === source.length) break;
-    if (i > 0 && source[position + i] !== source[position]) break;
-    const pos = position + i + offset;
-    if (backtracks[pos] & backtrack >>> commandsize) return true;
+    if (backtracks[position + i + offset] & backtrack >>> commandsize) return true;
   }
   return false;
 }
@@ -177,29 +173,33 @@ export function setBacktrack(
   length: number = 1,
 ): void {
   // バックトラックの可能性がなく記録不要の場合もあるが判別が面倒なので省略
-  assert(backtrack & 2);
-  if (length === 0) return;
-  const { source } = context;
-  if (position === source.length) return;
+  assert(2 & backtrack);
+  assert(backtrack >>> commandsize);
+  assert(0 < length && length < 3);
   const { backtracks = {}, offset = 0 } = context;
   for (let i = 0; i < length; ++i) {
-    if (position + i === source.length) break;
-    const pos = position + i + offset;
-    backtracks[pos] |= backtrack >>> commandsize;
+    backtracks[position + i + offset] |= backtrack >>> commandsize;
   }
 }
-function reduce(backtracks: readonly number[]): readonly [number, number] {
+function reduce(backtracks: readonly number[]): readonly [number, number, number] {
+  let len = 1;
   let rbs = 0;
   let wbs = 0;
   for (const backtrack of backtracks) {
-    if (backtrack & 1) {
+    if (backtrack >>> commandsize === 0) {
+      len = backtrack;
+      assert(len > 0);
+      continue;
+    }
+    assert(backtrack >>> commandsize);
+    if (1 & backtrack) {
       rbs |= backtrack;
     }
-    if (backtrack & 2) {
+    if (2 & backtrack) {
       wbs |= backtrack;
     }
   }
-  return [rbs, wbs];
+  return [len, rbs, wbs];
 }
 
 function revert(context: Ctx, linebreak: number | undefined): void {

package/src/parser/inline/annotation.ts

@@ -13,7 +13,7 @@ export const annotation: AnnotationParser = lazy(() => constraint(State.annotati
   trimBlankStart(some(union([inline]), ')', [[')', 1]])))),
   '))',
   false,
-  [1 | Backtrack.common, 3 | Backtrack.doublebracket],
+  [2, 1 | Backtrack.common, 3 | Backtrack.doublebracket],
   ([, ns], context) =>
     context.linebreak === 0
       ? new List([new Data(html('sup', { class: 'annotation' }, [html('span', defrag(unwrap(trimBlankNodeEnd(ns))))]))])

package/src/parser/inline/reference.ts

@@ -18,7 +18,7 @@ export const reference: ReferenceParser = lazy(() => constraint(State.reference,
   ]))),
   ']]',
   false,
-  [1 | Backtrack.common, 3 | Backtrack.doublebracket],
+  [2, 1 | Backtrack.common, 3 | Backtrack.doublebracket],
   ([, ns], context) => {
     const { position, range = 0, linebreak = 0 } = context;
     if (linebreak === 0) {