securemark 0.245.0 → 0.246.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.246.0
+
+- Extend table syntax to add grid type.
+
 ## 0.245.0
 
 - Use webpack.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.245.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.246.0 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("DOMPurify"), require("Prism"));
@@ -4307,11 +4307,11 @@ const dom_1 = __webpack_require__(3252);
 
 const array_1 = __webpack_require__(8112);
 
-const opener = /^(~{3,})table(?!\S)([^\n]*)(?:$|\n)/;
+const opener = /^(~{3,})table(?:\/(\S+))?(?!\S)([^\n]*)(?:$|\n)/;
 exports.segment = (0, combinator_1.block)((0, combinator_1.validate)('~~~', (0, combinator_1.clear)((0, combinator_1.fence)(opener, 10000))));
 exports.segment_ = (0, combinator_1.block)((0, combinator_1.validate)('~~~', (0, combinator_1.clear)((0, combinator_1.fence)(opener, 10000, false))), false);
 exports.table = (0, combinator_1.block)((0, combinator_1.validate)('~~~', (0, combinator_1.fmap)((0, combinator_1.fence)(opener, 10000), // Bug: Type mismatch between outer and inner.
-([body, overflow, closer, opener, delim, param], _, context) => {
+([body, overflow, closer, opener, delim, type, param], _, context) => {
   if (!closer || overflow || param.trimStart()) return [(0, dom_1.html)('pre', {
     class: 'invalid',
     translate: 'no',
@@ -4319,7 +4319,23 @@ exports.table = (0, combinator_1.block)((0, combinator_1.validate)('~~~', (0, co
     'data-invalid-type': !closer || overflow ? 'fence' : 'argument',
     'data-invalid-message': !closer ? `Missing the closing delimiter "${delim}"` : overflow ? `Invalid trailing line after the closing delimiter "${delim}"` : 'Invalid argument'
   }, `${opener}${body}${overflow || closer}`)];
-  return (0, parser_1.eval)(parser(body, context)) ?? [(0, dom_1.html)('table')];
+
+  switch (type) {
+    case 'grid':
+    case global_1.undefined:
+      return ((0, parser_1.eval)(parser(body, context)) ?? [(0, dom_1.html)('table')]).map(el => (0, dom_1.define)(el, {
+        'data-type': type
+      }));
+
+    default:
+      return [(0, dom_1.html)('pre', {
+        class: 'invalid',
+        translate: 'no',
+        'data-invalid-syntax': 'table',
+        'data-invalid-type': 'argument',
+        'data-invalid-message': 'Invalid table type'
+      }, `${opener}${body}${closer}`)];
+  }
 })));
 const parser = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, locale_1.localize)((0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.union)([row])), rows => [(0, dom_1.html)('table', format(rows))]))));
 const row = (0, combinator_1.lazy)(() => (0, combinator_1.dup)((0, combinator_1.fmap)((0, combinator_1.subsequence)([(0, combinator_1.dup)((0, combinator_1.union)([align])), (0, combinator_1.some)((0, combinator_1.union)([head, data, (0, combinator_1.some)(dataline, alignment), source_1.emptyline]))]), ns => !(0, alias_1.isArray)(ns[0]) ? (0, array_1.unshift)([[[]]], ns) : ns)));

package/package.json

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

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

@@ -654,6 +654,15 @@ describe('Unit: parser/block/extension/table', () => {
         ]).outerHTML], '']);
     });
 
+    it('type', () => {
+      assert.deepStrictEqual(
+        inspect(parser('~~~table/invalid\n~~~')),
+        [['<pre class="invalid" translate="no">~~~table/invalid\n~~~</pre>'], '']);
+      assert.deepStrictEqual(
+        inspect(parser('~~~table/grid\n~~~')),
+        [[html('table', { 'data-type': 'grid' }).outerHTML], '']);
+    });
+
   });
 
 });

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

@@ -7,7 +7,7 @@ import { inline } from '../../inline';
 import { str, anyline, emptyline, contentline } from '../../source';
 import { localize } from '../../locale';
 import { visualize } from '../../util';
-import { html, defrag } from 'typed-dom/dom';
+import { html, define, defrag } from 'typed-dom/dom';
 import { unshift, splice } from 'spica/array';
 
 import TableParser = ExtensionParser.TableParser;
@@ -15,7 +15,7 @@ import RowParser = TableParser.RowParser;
 import AlignParser = TableParser.AlignParser;
 import CellParser = TableParser.CellParser;
 
-const opener = /^(~{3,})table(?!\S)([^\n]*)(?:$|\n)/;
+const opener = /^(~{3,})table(?:\/(\S+))?(?!\S)([^\n]*)(?:$|\n)/;
 
 export const segment: TableParser.SegmentParser = block(validate('~~~',
   clear(fence(opener, 10000))));
@@ -26,7 +26,7 @@ export const segment_: TableParser.SegmentParser = block(validate('~~~',
 export const table: TableParser = block(validate('~~~', fmap(
   fence(opener, 10000),
   // Bug: Type mismatch between outer and inner.
-  ([body, overflow, closer, opener, delim, param]: string[], _, context) => {
+  ([body, overflow, closer, opener, delim, type, param]: string[], _, context) => {
     if (!closer || overflow || param.trimStart()) return [html('pre', {
       class: 'invalid',
       translate: 'no',
@@ -37,7 +37,20 @@ export const table: TableParser = block(validate('~~~', fmap(
         overflow ?  `Invalid trailing line after the closing delimiter "${delim}"` :
         'Invalid argument',
     }, `${opener}${body}${overflow || closer}`)];
-    return eval(parser(body, context)) ?? [html('table')];
+    switch (type) {
+      case 'grid':
+      case undefined:
+        return (eval(parser(body, context)) ?? [html('table')])
+          .map(el => define(el, { 'data-type': type }));
+      default:
+        return [html('pre', {
+          class: 'invalid',
+          translate: 'no',
+          'data-invalid-syntax': 'table',
+          'data-invalid-type': 'argument',
+          'data-invalid-message': 'Invalid table type',
+        }, `${opener}${body}${closer}`)];
+    }
   })));
 
 const parser: TableParser = lazy(() => block(localize(fmap(