securemark 0.300.1 → 0.300.2

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.300.2
+
+- Refactoring.
+
 ## 0.300.1
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.300.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.300.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"));
@@ -2463,7 +2463,8 @@ function bind(target, settings) {
       options.segment = sourceSegmentAttrs[index] | 1 /* Segment.write */;
       for (const _ of (0, parser_1.run)(block_1.block, new context_1.Input(options, seg), output)) {
         yield {
-          type: 'break'
+          type: 'break',
+          value: 'block'
         };
       }
       const es = output.pop().foldl((acc, {
@@ -2519,7 +2520,8 @@ function bind(target, settings) {
       };
     }
     yield {
-      type: 'break'
+      type: 'break',
+      value: 'parser'
     };
     if (rev !== revision) return yield {
       type: 'cancel'
@@ -2529,7 +2531,8 @@ function bind(target, settings) {
         type: 'figure',
         value: el
       } : yield {
-        type: 'break'
+        type: 'break',
+        value: 'figure'
       };
       if (rev !== revision) return yield {
         type: 'cancel'
@@ -2540,7 +2543,8 @@ function bind(target, settings) {
         type: 'note',
         value: el
       } : yield {
-        type: 'break'
+        type: 'break',
+        value: 'note'
       };
       if (rev !== revision) return yield {
         type: 'cancel'
@@ -4256,11 +4260,10 @@ const line_1 = __webpack_require__(1599);
 function fence(opener, write, separation = true) {
   return (input, output) => {
     const {
-      source,
-      position
+      source
     } = input;
-    if (position === source.length) return;
-    opener.lastIndex = position;
+    if (input.position === source.length) return;
+    opener.lastIndex = input.position;
     const matches = opener.exec(source);
     if (!matches) return;
     (0, clock_1.spend)(input, output, matches[0].length);
@@ -4273,34 +4276,26 @@ function fence(opener, write, separation = true) {
       input.position -= matches[0].length;
       return;
     }
+    const {
+      position
+    } = input;
     let body = '';
     let closer = '';
-    let overflow = '';
-    for (let count = 1;; ++count) {
-      if (input.position === source.length) break;
-      const line = (0, line_1.firstline)(source, input.position);
-      if (closer && (0, line_1.isEmptyline)(line, 0)) break;
-      if (closer) {
-        overflow += line;
-      }
-      if (!closer && line.startsWith(delim) && line.trimEnd() === delim) {
-        closer = line;
-        if ((0, line_1.isEmptyline)(source, input.position + line.length)) {
-          input.position += line.length;
-          break;
-        }
-        if (!separation) {
-          input.position += line.length;
-          break;
-        }
-        overflow = line;
-      }
-      if (!overflow) {
-        body += line;
-      }
-      input.position += line.length;
+    for (input.position -= 1;;) {
+      input.position = source.indexOf(`\n${delim}`, input.position) + 1 || source.length;
+      if (!(0, line_1.isEmptyline)(source, input.position + delim.length)) continue;
+      body = source.slice(position, input.position);
+      closer = (0, line_1.firstline)(source, input.position);
+      input.position += closer.length;
+      break;
+    }
+    if (separation) for (; !(0, line_1.isEmptyline)(source, input.position);) {
+      input.position = source.indexOf('\n', input.position) + 1 || source.length;
+    }
+    if (write) {
+      const overflow = source.slice(position + body.length + closer.length, input.position);
+      output.push(new parser_1.List([body, overflow, closer].map(str => new parser_1.Node(str))).import(new parser_1.List(matches.map(str => new parser_1.Node(str)))));
     }
-    write && output.push(new parser_1.List([body, overflow, closer].map(str => new parser_1.Node(str))).import(new parser_1.List(matches.map(str => new parser_1.Node(str)))));
     return output.context;
   };
 }
@@ -4445,7 +4440,7 @@ exports.firstline = firstline;
 const emptyline = /[^\S\r\n]*(?:$|\r?\n)/y;
 function isEmptyline(source, position) {
   emptyline.lastIndex = position;
-  return source.length === position || source[position] === '\n' || emptyline.test(source);
+  return position >= source.length || source[position] === '\n' || emptyline.test(source);
 }
 exports.isEmptyline = isEmptyline;
 
@@ -5014,7 +5009,7 @@ exports.codeblock = (0, combinator_1.block)((0, combinator_1.inits)([(0, combina
       class: 'invalid',
       translate: 'no',
       ...(0, util_1.invalid)('codeblock', !closer || overflow ? 'fence' : 'argument', !closer ? `Missing the closing delimiter "${delim}"` : overflow ? `Invalid trailing line after the closing delimiter "${delim}"` : params.invalid)
-    }, `${opener}${body}${overflow || closer}`)));
+    }, `${opener}${body}${closer}${overflow}`)));
     return;
   }
   const src = body.slice(0, body.at(-2) === '\r' ? -2 : -1);
@@ -5085,7 +5080,7 @@ const message_1 = __webpack_require__(3949);
 const aside_1 = __webpack_require__(6150);
 const example_1 = __webpack_require__(6624);
 const placeholder_1 = __webpack_require__(4091);
-exports.segment = (0, combinator_1.union)([fig_1.segment, figure_1.segment, table_1.segment, placeholder_1.segment]);
+exports.segment = (0, combinator_1.union)([fig_1.segment, figure_1.segment, placeholder_1.segment]);
 exports.extension = (0, combinator_1.lazy)(() => (0, combinator_1.union)([
 //figbase,
 //fig,
@@ -5116,7 +5111,7 @@ exports.aside = (0, combinator_1.block)((0, combinator_1.recursion)(1 /* Recursi
       class: 'invalid',
       translate: 'no',
       ...(0, util_1.invalid)('aside', !closer || overflow ? 'fence' : 'argument', !closer ? `Missing the closing delimiter "${delim}"` : overflow ? `Invalid trailing line after the closing delimiter "${delim}"` : 'Invalid argument')
-    }, `${opener}${body}${overflow || closer}`)));
+    }, `${opener}${body}${closer}${overflow}`)));
     return;
   }
   input.memory = {
@@ -5185,7 +5180,7 @@ exports.example = (0, combinator_1.block)((0, combinator_1.recursion)(1 /* Recur
     class: 'invalid',
     translate: 'no',
     ...(0, util_1.invalid)('example', !closer || overflow ? 'fence' : 'argument', !closer ? `Missing the closing delimiter "${delim}"` : overflow ? `Invalid trailing line after the closing delimiter "${delim}"` : 'Invalid argument')
-  }, `${opener}${body}${overflow || closer}`)));
+  }, `${opener}${body}${closer}${overflow}`)));
   switch (type) {
     case 'markdown':
       {
@@ -5263,10 +5258,9 @@ const figure_1 = __webpack_require__(4248);
 const label_1 = __webpack_require__(2178);
 const codeblock_1 = __webpack_require__(9194);
 const mathblock_1 = __webpack_require__(4903);
-const table_1 = __webpack_require__(3646);
-const blockquote_1 = __webpack_require__(5885);
 const placeholder_1 = __webpack_require__(4091);
-exports.segment = (0, combinator_1.backtrack)((0, combinator_1.block)((0, combinator_1.sequence)([(0, combinator_1.line)((0, combinator_1.close)(label_1.segment, /(?!\S)[^\r\n]*\r?\n/y), false), (0, combinator_1.union)([codeblock_1.segment, mathblock_1.segment, table_1.segment, blockquote_1.segment, placeholder_1.segment, (0, combinator_1.some)(source_1.contentline)])]), true, 6 /* Segment.fig */));
+const blockquote_1 = __webpack_require__(5885);
+exports.segment = (0, combinator_1.block)((0, combinator_1.sequence)([(0, combinator_1.line)((0, combinator_1.close)(label_1.segment, /(?!\S)[^\r\n]*\r?\n/y), false), (0, combinator_1.union)([codeblock_1.segment, mathblock_1.segment, placeholder_1.segment, blockquote_1.segment, (0, combinator_1.some)(source_1.contentline)])]), true, 6 /* Segment.fig */);
 exports.fig = (0, combinator_1.block)((0, combinator_1.rewrite)(exports.segment, (0, combinator_1.always)([(input, output) => {
   const {
     source
@@ -5333,8 +5327,8 @@ const codeblock_1 = __webpack_require__(9194);
 const mathblock_1 = __webpack_require__(4903);
 const example_1 = __webpack_require__(6624);
 const table_2 = __webpack_require__(3646);
-const blockquote_1 = __webpack_require__(5885);
 const placeholder_1 = __webpack_require__(4091);
+const blockquote_1 = __webpack_require__(5885);
 const inline_1 = __webpack_require__(7973);
 const visibility_1 = __webpack_require__(6364);
 const util_1 = __webpack_require__(4992);
@@ -5342,10 +5336,10 @@ const memoize_1 = __webpack_require__(6925);
 const dom_1 = __webpack_require__(394);
 exports.segment = (0, combinator_1.block)((0, combinator_1.match)(/(~{3,})(?:figure )?(?=\[?\$)/y, (0, memoize_1.memoize)(([, fence], closer = new RegExp(String.raw`${fence}[^\S\r\n]*(?:$|\r?\n)`, 'y')) => (0, combinator_1.close)((0, combinator_1.sequence)([source_1.contentline, (0, combinator_1.inits)([
 // All parsers which can include closing terms.
-(0, combinator_1.union)([codeblock_1.segment_, mathblock_1.segment_, table_2.segment_, blockquote_1.segment, placeholder_1.segment_, (0, combinator_1.some)(source_1.contentline, closer)]), source_1.emptyline, (0, combinator_1.union)([source_1.emptyline, (0, combinator_1.some)(source_1.contentline, closer)])])]), closer), ([, fence]) => fence.length - 1, [], 2 ** 4 - 1)), true, 8 /* Segment.figure */);
+(0, combinator_1.union)([codeblock_1.segment_, mathblock_1.segment_, placeholder_1.segment_, blockquote_1.segment, (0, combinator_1.some)(source_1.contentline, closer)]), source_1.emptyline, (0, combinator_1.union)([source_1.emptyline, (0, combinator_1.some)(source_1.contentline, closer)])])]), closer), ([, fence]) => fence.length - 1, [], 2 ** 4 - 1)), true, 8 /* Segment.figure */);
 exports.figure = (0, combinator_1.block)((0, combinator_1.fallback)((0, combinator_1.rewrite)(exports.segment, (0, combinator_1.fmap)((0, combinator_1.scope)(({
   source
-}) => source.slice(source.match(/^~+(?:\w+\s+)?/)[0].length, source.trimEnd().lastIndexOf('\n')), (0, combinator_1.sequence)([(0, combinator_1.line)((0, combinator_1.sequence)([label_1.label, (0, source_1.str)(/(?!\S)[^\r\n]*\r?\n/y)]), false), (0, combinator_1.inits)([(0, combinator_1.block)((0, combinator_1.union)([ulist_1.ulist, olist_1.olist, table_1.table, codeblock_1.codeblock, mathblock_1.mathblock, example_1.example, table_2.table, blockquote_1.blockquote, placeholder_1.placeholder, (0, combinator_1.line)(inline_1.media, false), (0, combinator_1.line)(inline_1.lineshortmedia, false)])), source_1.emptyline, (0, combinator_1.block)((0, visibility_1.visualize)((0, visibility_1.trimBlank)((0, combinator_1.some)(inline_1.inline))))])]), false), nodes => {
+}) => source.slice(source.match(/^~+(?:\w+\s+)?/)[0].length, source.trimEnd().lastIndexOf('\n')), (0, combinator_1.sequence)([(0, combinator_1.line)((0, combinator_1.sequence)([label_1.label, (0, source_1.str)(/(?!\S)[^\r\n]*\r?\n/y)]), false), (0, combinator_1.inits)([(0, combinator_1.block)((0, combinator_1.union)([ulist_1.ulist, olist_1.olist, table_1.table, codeblock_1.codeblock, mathblock_1.mathblock, example_1.example, table_2.table, placeholder_1.placeholder, blockquote_1.blockquote, (0, combinator_1.line)(inline_1.media, false), (0, combinator_1.line)(inline_1.lineshortmedia, false)])), source_1.emptyline, (0, combinator_1.block)((0, visibility_1.visualize)((0, visibility_1.trimBlank)((0, combinator_1.some)(inline_1.inline))))])]), false), nodes => {
   const [label, param, content, ...caption] = (0, util_1.unwrap)(nodes);
   return new parser_1.List([new parser_1.Node((0, dom_1.html)('figure', attributes(label.getAttribute('data-label'), param, content, caption), [(0, dom_1.html)('figcaption', [(0, dom_1.html)('span', {
     class: 'figindex'
@@ -5359,7 +5353,7 @@ exports.figure = (0, combinator_1.block)((0, combinator_1.fallback)((0, combinat
     class: 'invalid',
     translate: 'no',
     ...(0, util_1.invalid)('figure', violation[0], violation[1])
-  }, `${opener}${body}${overflow || closer}`)));
+  }, `${opener}${body}${closer}${overflow}`)));
 }])));
 function attributes(label, param, content, caption) {
   const group = label.split('-', 1)[0];
@@ -5435,7 +5429,7 @@ exports.message = (0, combinator_1.block)((0, combinator_1.inits)([(0, combinato
       class: 'invalid',
       translate: 'no',
       ...(0, util_1.invalid)('message', !closer || overflow ? 'fence' : 'argument', !closer ? `Missing the closing delimiter "${delim}"` : overflow ? `Invalid trailing line after the closing delimiter "${delim}"` : 'Invalid argument')
-    }, `${opener}${body}${overflow || closer}`)));
+    }, `${opener}${body}${closer}${overflow}`)));
     return;
   }
   switch (type) {
@@ -5503,7 +5497,7 @@ exports.placeholder = (0, combinator_1.block)((0, combinator_1.inits)([(0, combi
     class: 'invalid',
     translate: 'no',
     ...(0, util_1.invalid)('extension', 'fence', !closer ? `Missing the closing delimiter "${delim}"` : overflow ? `Invalid trailing line after the closing delimiter "${delim}"` : 'Invalid argument')
-  }, `${opener}${body}${overflow || closer}`)));
+  }, `${opener}${body}${closer}${overflow}`)));
 }]));
 
 /***/ },
@@ -5517,7 +5511,7 @@ exports.placeholder = (0, combinator_1.block)((0, combinator_1.inits)([(0, combi
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.table = exports.segment_ = exports.segment = void 0;
+exports.table = void 0;
 const parser_1 = __webpack_require__(3360);
 const combinator_1 = __webpack_require__(3484);
 const inline_1 = __webpack_require__(7973);
@@ -5528,15 +5522,13 @@ const alias_1 = __webpack_require__(5413);
 const array_1 = __webpack_require__(6876);
 const dom_1 = __webpack_require__(394);
 const opener = /(~{3,})table(?:\/(\S+))?(?!\S)([^\r\n]*)(?:$|\r?\n)/y;
-exports.segment = (0, combinator_1.block)((0, combinator_1.fence)(opener, false));
-exports.segment_ = (0, combinator_1.block)((0, combinator_1.fence)(opener, false, false), false);
 exports.table = (0, combinator_1.block)((0, combinator_1.inits)([(0, combinator_1.fence)(opener, true), (_, output) => {
   const [body, overflow, closer, opener, delim, type, param] = (0, util_1.unwrap)(output.pop());
   if (!closer || overflow || param.trimStart()) return output.append(new parser_1.Node((0, dom_1.html)('pre', {
     class: 'invalid',
     translate: 'no',
     ...(0, util_1.invalid)('table', !closer || overflow ? 'fence' : 'argument', !closer ? `Missing the closing delimiter "${delim}"` : overflow ? `Invalid trailing line after the closing delimiter "${delim}"` : 'Invalid argument')
-  }, `${opener}${body}${overflow || closer}`)));
+  }, `${opener}${body}${closer}${overflow}`)));
   switch (type) {
     case undefined:
     case 'grid':
@@ -5888,7 +5880,7 @@ exports.mathblock = (0, combinator_1.block)((0, combinator_1.inits)([(0, combina
     class: 'invalid',
     translate: 'no',
     ...(0, util_1.invalid)('mathblock', delim.length > 2 ? 'syntax' : !closer || overflow ? 'fence' : 'argument', delim.length > 2 ? 'Invalid syntax' : !closer ? `Missing the closing delimiter "${delim}"` : overflow ? `Invalid trailing line after the closing delimiter "${delim}"` : 'Invalid argument')
-  }, `${opener}${body}${overflow || closer}`)));
+  }, `${opener}${body}${closer}${overflow}`)));
 }]));
 
 /***/ },

package/index.d.ts

@@ -44,7 +44,7 @@ export type Progress =
   | { readonly type: 'block'; readonly value: HTMLElement; }
   | { readonly type: 'figure'; readonly value: HTMLAnchorElement; }
   | { readonly type: 'note'; readonly value: HTMLLIElement | HTMLElement; }
-  | { readonly type: 'break'; }
+  | { readonly type: 'break'; readonly value: 'segment' | 'block' | 'parser' | 'figure' | 'note'; }
   | { readonly type: 'cancel'; };
 
 export interface RenderingOptions {

package/markdown.d.ts

@@ -325,7 +325,6 @@ export namespace MarkdownParser {
         Parser<string, Input, [
           FigParser.SegmentParser,
           FigureParser.SegmentParser,
-          TableParser.SegmentParser,
           PlaceholderParser.SegmentParser,
         ]> {
       }
@@ -350,8 +349,8 @@ export namespace MarkdownParser {
               MathBlockParser,
               ExampleParser,
               TableParser,
-              BlockquoteParser,
               PlaceholderParser,
+              BlockquoteParser,
               InlineParser.MediaParser,
               InlineParser.ShortMediaParser.LineShortMediaParser,
             ]>,
@@ -369,9 +368,8 @@ export namespace MarkdownParser {
               Parser<never, Input, [
                 CodeBlockParser.SegmentParser,
                 MathBlockParser.SegmentParser,
-                TableParser.SegmentParser,
-                BlockquoteParser.SegmentParser,
                 PlaceholderParser.SegmentParser,
+                BlockquoteParser.SegmentParser,
                 SourceParser.ContentLineParser,
               ]>,
               SourceParser.EmptyLineParser,
@@ -399,9 +397,8 @@ export namespace MarkdownParser {
             Parser<never, Input, [
               CodeBlockParser.SegmentParser,
               MathBlockParser.SegmentParser,
-              TableParser.SegmentParser,
-              BlockquoteParser.SegmentParser,
               PlaceholderParser.SegmentParser,
+              BlockquoteParser.SegmentParser,
               SourceParser.ContentLineParser,
             ]>,
           ]> {
@@ -427,10 +424,6 @@ export namespace MarkdownParser {
         ]> {
       }
       export namespace TableParser {
-        export interface SegmentParser extends
-          Block<'extension/table/segment'>,
-          Parser<never, Input, []> {
-        }
         export interface GridTableParser extends
           Block<'extension/table/gridtable'>,
           Parser<HTMLElement, Input, [

package/package.json

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

package/src/api/bind.ts

@@ -75,7 +75,7 @@ export function bind(target: DocumentFragment | HTMLElement | ShadowRoot, settin
       const seg = sourceSegments[index];
       options.segment = sourceSegmentAttrs[index] | Segment.write;
       for (const _ of run(block, new Input(options, seg), output)) {
-        yield { type: 'break' };
+        yield { type: 'break', value: 'block' };
       }
       assert(output.data.length === 1);
       const es = output.pop()
@@ -124,20 +124,20 @@ export function bind(target: DocumentFragment | HTMLElement | ShadowRoot, settin
       yield { type: 'block', value: el };
       if (rev !== revision) return yield { type: 'cancel' };
     }
-    yield { type: 'break' };
+    yield { type: 'break', value: 'parser' };
     if (rev !== revision) return yield { type: 'cancel' };
     for (const el of figure(next(0)?.parentNode ?? target, settings.notes, options)) {
       assert(rev === revision);
       el
         ? yield { type: 'figure', value: el }
-        : yield { type: 'break' };
+        : yield { type: 'break', value: 'figure' };
       if (rev !== revision) return yield { type: 'cancel' };
     }
     for (const el of note(next(0)?.parentNode ?? target, settings.notes, options, bottom)) {
       assert(rev === revision);
       el
         ? yield { type: 'note', value: el }
-        : yield { type: 'break' };
+        : yield { type: 'break', value: 'note' };
       if (rev !== revision) return yield { type: 'cancel' };
     }
   }

package/src/combinator/process/fence.ts

@@ -5,12 +5,12 @@ import { firstline, isEmptyline } from './line';
 export function fence<I extends Input, S extends SubParsers<never, I>>(opener: RegExp, write: boolean, separation = true): Parser<string, I, S> {
   assert(!opener.flags.match(/[gm]/) && opener.sticky && !opener.source.startsWith('^'));
   return (input, output) => {
-    const { source, position } = input;
-    if (position === source.length) return;
-    opener.lastIndex = position;
+    const { source } = input;
+    if (input.position === source.length) return;
+    opener.lastIndex = input.position;
     const matches = opener.exec(source);
     if (!matches) return;
-    assert(matches[0] === firstline(source, position));
+    assert(matches[0] === firstline(source, input.position));
     spend(input, output, matches[0].length);
     const delim = matches[1];
     assert(delim && delim === delim.trim());
@@ -23,37 +23,27 @@ export function fence<I extends Input, S extends SubParsers<never, I>>(opener: R
       input.position -= matches[0].length;
       return;
     }
+    const { position } = input;
     let body = '';
     let closer = '';
-    let overflow = '';
-    for (let count = 1; ; ++count) {
-      if (input.position === source.length) break;
-      const line = firstline(source, input.position);
-      if (closer && isEmptyline(line, 0)) break;
-      if(closer) {
-        overflow += line;
-      }
-      if (!closer && line.startsWith(delim) && line.trimEnd() === delim) {
-        closer = line;
-        if (isEmptyline(source, input.position + line.length)) {
-          input.position += line.length;
-          break;
-        }
-        if (!separation) {
-          input.position += line.length;
-          break;
-        }
-        assert(!overflow);
-        overflow = line;
-      }
-      if (!overflow) {
-        body += line;
-      }
-      input.position += line.length;
+    assert(matches[0].endsWith('\n'));
+    for (input.position -= 1; ;) {
+      input.position = source.indexOf(`\n${delim}`, input.position) + 1 || source.length;
+      if (!isEmptyline(source, input.position + delim.length)) continue;
+      body = source.slice(position, input.position);
+      closer = firstline(source, input.position);
+      input.position += closer.length;
+      break;
+    }
+    if (separation) for (; !isEmptyline(source, input.position);) {
+      input.position = source.indexOf('\n', input.position) + 1 || source.length;
+    }
+    if (write) {
+      const overflow = source.slice(position + body.length + closer.length, input.position);
+      output.push(
+        new List([body, overflow, closer].map(str => new Node(str)))
+          .import(new List(matches.map(str => new Node(str)))));
     }
-    write && output.push(
-      new List([body, overflow, closer].map(str => new Node(str)))
-        .import(new List(matches.map(str => new Node(str)))));
     return output.context;
   };
 }

package/src/combinator/process/line.ts

@@ -49,7 +49,7 @@ export function firstline(source: string, position: number): string {
 const emptyline = /[^\S\r\n]*(?:$|\r?\n)/y;
 export function isEmptyline(source: string, position: number): boolean {
   emptyline.lastIndex = position;
-  return source.length === position
+  return position >= source.length
       || source[position] === '\n'
       || emptyline.test(source);
 }

package/src/parser/block/codeblock.ts

@@ -64,7 +64,7 @@ export const codeblock: CodeBlockParser = block(inits([
                   ? `Invalid trailing line after the closing delimiter "${delim}"`
                   : params.invalid!),
           },
-          `${opener}${body}${overflow || closer}`)));
+          `${opener}${body}${closer}${overflow}`)));
       return;
     }
     const src = body.slice(0, body.at(-2) === '\r' ? -2 : -1);

package/src/parser/block/extension/aside.ts

@@ -30,7 +30,7 @@ export const aside: ExtensionParser.AsideParser = block(recursion(Recursion.bloc
                 overflow ? `Invalid trailing line after the closing delimiter "${delim}"` :
                   'Invalid argument'),
           },
-          `${opener}${body}${overflow || closer}`)));
+          `${opener}${body}${closer}${overflow}`)));
       return;
     }
     input.memory = {

package/src/parser/block/extension/example.ts

@@ -27,7 +27,7 @@ export const example: ExtensionParser.ExampleParser = block(recursion(Recursion.
               overflow ? `Invalid trailing line after the closing delimiter "${delim}"` :
                 'Invalid argument'),
         },
-        `${opener}${body}${overflow || closer}`)));
+        `${opener}${body}${closer}${overflow}`)));
     switch (type) {
       case 'markdown': {
         input.memory = {

package/src/parser/block/extension/fig.ts

@@ -1,30 +1,28 @@
 import { ExtensionParser } from '../../block';
 import { Segment } from '../../context';
 import { Result } from '../../../combinator/parser';
-import { union, sequence, some, always, backtrack, block, line, rewrite, close } from '../../../combinator';
+import { union, sequence, some, always, block, line, rewrite, close } from '../../../combinator';
 import { contentline } from '../../source';
 import { figure } from './figure';
 import { segment as seg_label } from '../../inline/extension/label';
 import { segment as seg_code } from '../codeblock';
 import { segment as seg_math } from '../mathblock';
-import { segment as seg_table } from './table';
-import { segment as seg_blockquote } from '../blockquote';
 import { segment as seg_placeholder } from './placeholder';
+import { segment as seg_blockquote } from '../blockquote';
 
 import FigParser = ExtensionParser.FigParser;
 
-export const segment: FigParser.SegmentParser = backtrack(block(
+export const segment: FigParser.SegmentParser = block(
   sequence([
     line(close(seg_label, /(?!\S)[^\r\n]*\r?\n/y), false),
     union([
       seg_code,
       seg_math,
-      seg_table,
-      seg_blockquote,
       seg_placeholder,
+      seg_blockquote,
       some(contentline),
     ]),
-  ]), true, Segment.fig));
+  ]), true, Segment.fig);
 
 export const fig: FigParser = block(rewrite(segment, always([
   (input, output) => {

package/src/parser/block/extension/figure.ts

@@ -10,9 +10,9 @@ import { table as styled_table } from '../table';
 import { codeblock, segment_ as seg_code } from '../codeblock';
 import { mathblock, segment_ as seg_math } from '../mathblock';
 import { example } from './example';
-import { table, segment_ as seg_table } from './table';
-import { blockquote, segment as seg_blockquote } from '../blockquote';
+import { table } from './table';
 import { placeholder, segment_ as seg_placeholder } from './placeholder';
+import { blockquote, segment as seg_blockquote } from '../blockquote';
 import { inline, media, lineshortmedia } from '../../inline';
 import { visualize, trimBlank } from '../../visibility';
 import { unwrap, invalid } from '../../util';
@@ -32,9 +32,8 @@ export const segment: FigureParser.SegmentParser = block(match(
         union([
           seg_code,
           seg_math,
-          seg_table,
-          seg_blockquote,
           seg_placeholder,
+          seg_blockquote,
           some(contentline, closer),
         ]),
         emptyline,
@@ -60,8 +59,8 @@ export const figure: FigureParser = block(fallback(rewrite(segment, fmap(
         mathblock,
         example,
         table,
-        blockquote,
         placeholder,
+        blockquote,
         line(media, false),
         line(lineshortmedia, false),
       ])),
@@ -115,7 +114,7 @@ export const figure: FigureParser = block(fallback(rewrite(segment, fmap(
             translate: 'no',
             ...invalid('figure', violation[0], violation[1]),
           },
-          `${opener}${body}${overflow || closer}`)));
+          `${opener}${body}${closer}${overflow}`)));
     },
   ])));
 

package/src/parser/block/extension/message.ts

@@ -36,7 +36,7 @@ export const message: MessageParser = block(inits([
                 overflow ? `Invalid trailing line after the closing delimiter "${delim}"` :
                   'Invalid argument'),
           },
-          `${opener}${body}${overflow || closer}`)));
+          `${opener}${body}${closer}${overflow}`)));
       return;
     }
     switch (type) {

package/src/parser/block/extension/placeholder.ts

@@ -28,6 +28,6 @@ export const placeholder: ExtensionParser.PlaceholderParser = block(inits([
               overflow ? `Invalid trailing line after the closing delimiter "${delim}"` :
                 'Invalid argument'),
         },
-        `${opener}${body}${overflow || closer}`)));
+        `${opener}${body}${closer}${overflow}`)));
   },
 ]));

package/src/parser/block/extension/table.ts

@@ -17,12 +17,6 @@ import CellParser = TableParser.CellParser;
 
 const opener = /(~{3,})table(?:\/(\S+))?(?!\S)([^\r\n]*)(?:$|\r?\n)/y;
 
-export const segment: TableParser.SegmentParser = block(
-  fence(opener, false));
-
-export const segment_: TableParser.SegmentParser = block(
-  fence(opener, false, false), false);
-
 export const table: TableParser = block(inits([
   fence(opener, true),
   (_, output) => {
@@ -37,7 +31,7 @@ export const table: TableParser = block(inits([
           !closer ? `Missing the closing delimiter "${delim}"` :
             overflow ? `Invalid trailing line after the closing delimiter "${delim}"` :
               'Invalid argument'),
-      }, `${opener}${body}${overflow || closer}`)));
+      }, `${opener}${body}${closer}${overflow}`)));
     switch (type) {
       case undefined:
       case 'grid':

package/src/parser/block/extension.ts

@@ -2,7 +2,7 @@ import { ExtensionParser } from '../block';
 import { union, lazy } from '../../combinator';
 import { segment as seg_fig } from './extension/fig';
 import { figure, segment as seg_figure } from './extension/figure';
-import { table, segment as seg_table } from './extension/table';
+import { table } from './extension/table';
 import { message } from './extension/message';
 import { aside } from './extension/aside';
 import { example } from './extension/example';
@@ -11,7 +11,6 @@ import { placeholder, segment as seg_placeholder } from './extension/placeholder
 export const segment: ExtensionParser.SegmentParser = union([
   seg_fig,
   seg_figure,
-  seg_table,
   seg_placeholder,
 ]);
 

package/src/parser/block/mathblock.ts

@@ -32,6 +32,6 @@ export const mathblock: MathBlockParser = block(inits([
                     overflow ? `Invalid trailing line after the closing delimiter "${delim}"` :
                       'Invalid argument'),
             },
-            `${opener}${body}${overflow || closer}`)));
+            `${opener}${body}${closer}${overflow}`)));
   },
 ]));