securemark 0.228.0 → 0.229.0

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.229.0
+
+- Change table syntax's alignment syntax to remove cell type declaration.
+- Change table syntax's dataline syntax.
+
 ## 0.228.0
 
 - Change table syntax to require horizontal alignment in alignment syntax.

package/dist/securemark.js

@@ -1,4 +1,4 @@
-/*! securemark v0.228.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
+/*! securemark v0.229.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
 require = function () {
     function r(e, n, t) {
         function o(i, f) {
@@ -5257,23 +5257,22 @@ require = function () {
                 (0, combinator_1.some)((0, combinator_1.union)([
                     head,
                     data,
-                    source_1.emptyline,
-                    (0, combinator_1.some)(dataline, alignment)
+                    (0, combinator_1.some)(dataline, alignment),
+                    source_1.emptyline
                 ]))
             ]), ns => !(0, alias_1.isArray)(ns[0]) ? (0, array_1.unshift)([[[]]], ns) : ns)));
-            const alignment = /^[#:]?[-=<>]+(?:\/[-=^v]*)?(?=[^\S\n]*\n)/;
+            const alignment = /^[-=<>]+(?:\/[-=^v]*)?(?=[^\S\n]*\n)/;
             const align = (0, combinator_1.line)((0, combinator_1.fmap)((0, combinator_1.union)([(0, source_1.str)(alignment)]), ([s]) => s.split('/').map(s => s.split(''))));
-            const delimiter = /^[#:]?[-=<>]+(?:\/[-=^v]*)?(?=[^\S\n]*\n)|^[#:](?:(?!:!*[^\S\n]|0)\d*:(?!0)\d*)?!*(?=[^\S\n])/;
-            const head = (0, combinator_1.creator)((0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.open)((0, source_1.str)(/^#(?:(?!:!*[^\S\n]|0)\d*:(?!0)\d*)?!*(?=[^\S\n])/), (0, combinator_1.rewrite)((0, combinator_1.inits)([
+            const delimiter = /^[-=<>]+(?:\/[-=^v]*)?(?=[^\S\n]*\n)|^[#:](?:(?!:\D|0)\d*:(?!0)\d*)?!*(?=[^\S\n])/;
+            const head = (0, combinator_1.creator)((0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.open)((0, source_1.str)(/^#(?:(?!:\D|0)\d*:(?!0)\d*)?!*(?=[^\S\n])/), (0, combinator_1.rewrite)((0, combinator_1.inits)([
                 source_1.anyline,
                 (0, combinator_1.some)(source_1.contentline, delimiter)
             ]), (0, combinator_1.trim)((0, util_1.visualize)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]))))), true), ns => [(0, typed_dom_1.html)('th', attributes(ns.shift()), (0, typed_dom_1.defrag)(ns))]), false));
-            const data = (0, combinator_1.creator)((0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.open)((0, source_1.str)(/^:(?:(?!:!*[^\S\n]|0)\d*:(?!0)\d*)?!*(?=[^\S\n])/), (0, combinator_1.rewrite)((0, combinator_1.inits)([
+            const data = (0, combinator_1.creator)((0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.open)((0, source_1.str)(/^:(?:(?!:\D|0)\d*:(?!0)\d*)?!*(?=[^\S\n])/), (0, combinator_1.rewrite)((0, combinator_1.inits)([
                 source_1.anyline,
                 (0, combinator_1.some)(source_1.contentline, delimiter)
             ]), (0, combinator_1.trim)((0, util_1.visualize)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]))))), true), ns => [(0, typed_dom_1.html)('td', attributes(ns.shift()), (0, typed_dom_1.defrag)(ns))]), false));
             const dataline = (0, combinator_1.creator)((0, combinator_1.line)((0, combinator_1.rewrite)(source_1.contentline, (0, combinator_1.union)([
-                (0, combinator_1.validate)(/^:!*[^\S\n]/, data),
                 (0, combinator_1.validate)(/^!+[^\S\n]/, (0, combinator_1.convert)(source => `:${ source }`, data)),
                 (0, combinator_1.convert)(source => `: ${ source }`, data)
             ]))));
@@ -5310,10 +5309,7 @@ require = function () {
                 ROW:
                     for (let i = 0; i < rows.length; ++i) {
                         const [[[...as], [...vs] = []], ...cells] = rows[i];
-                        let isBody = target === tfoot ? false : [
-                            as[0] === '#' ? !as.shift() : global_1.undefined,
-                            as[0] === ':' ? !!as.shift() : global_1.undefined
-                        ].reduce((a, b) => a !== null && a !== void 0 ? a : b);
+                        let isBody = target === tfoot ? false : global_1.undefined;
                         as.length === 0 && as.push('-');
                         ALIGN_H:
                             for (let j = 0, update = false; j < as.length || j < aligns.length; ++j) {

package/markdown.d.ts

@@ -455,8 +455,8 @@ export namespace MarkdownParser {
             Parser<HTMLTableCellElement, Context, [
               CellParser.HeadParser,
               CellParser.DataParser,
-              SourceParser.EmptyLineParser,
               CellParser.DatalineParser,
+              SourceParser.EmptyLineParser,
             ]>,
           ]> {
         }
@@ -484,7 +484,6 @@ export namespace MarkdownParser {
             Parser<HTMLTableCellElement, Context, [
               DataParser,
               DataParser,
-              DataParser,
             ]> {
           }
         }

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.228.0",
+  "version": "0.229.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -168,9 +168,9 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz",
-      "integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==",
+      "version": "7.17.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz",
+      "integrity": "sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==",
       "dev": true,
       "requires": {
         "@babel/helper-environment-visitor": "^7.16.7",
@@ -179,8 +179,8 @@
         "@babel/helper-split-export-declaration": "^7.16.7",
         "@babel/helper-validator-identifier": "^7.16.7",
         "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/traverse": "^7.17.3",
+        "@babel/types": "^7.17.0"
       }
     },
     "@babel/helper-simple-access": {
@@ -437,9 +437,9 @@
       },
       "dependencies": {
         "lru-cache": {
-          "version": "7.3.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.3.1.tgz",
-          "integrity": "sha512-nX1x4qUrKqwbIAhv4s9et4FIUVzNOpeY07bsjGUy8gwJrXH/wScImSQqXErmo/b2jZY2r0mohbLA9zVj7u1cNw==",
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.4.0.tgz",
+          "integrity": "sha512-YOfuyWa/Ee+PXbDm40j9WXyJrzQUynVbgn4Km643UYcWNcrSfRkKL0WaiUcxcIbkXcVTgNpDqSnPXntWXT75cw==",
           "dev": true
         },
         "mkdirp": {
@@ -606,9 +606,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "17.0.18",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.18.tgz",
-      "integrity": "sha512-eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA==",
+      "version": "17.0.19",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.19.tgz",
+      "integrity": "sha512-PfeQhvcMR4cPFVuYfBN4ifG7p9c+Dlh3yUZR6k+5yQK7wX3gDgVxBly4/WkBRs9x4dmcy1TVl08SY67wwtEvmA==",
       "dev": true
     },
     "@types/power-assert": {
@@ -752,9 +752,9 @@
       }
     },
     "agentkeepalive": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.0.tgz",
-      "integrity": "sha512-0PhAp58jZNw13UJv7NVdTGb0ZcghHUb3DrZ046JiiJY/BOaTTpbwdHq2VObPCBV8M2GPh7sgrJ3AQ8Ey468LJw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz",
+      "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==",
       "dev": true,
       "requires": {
         "debug": "^4.1.0",
@@ -7656,9 +7656,9 @@
           }
         },
         "lru-cache": {
-          "version": "7.3.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.3.1.tgz",
-          "integrity": "sha512-nX1x4qUrKqwbIAhv4s9et4FIUVzNOpeY07bsjGUy8gwJrXH/wScImSQqXErmo/b2jZY2r0mohbLA9zVj7u1cNw==",
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.4.0.tgz",
+          "integrity": "sha512-YOfuyWa/Ee+PXbDm40j9WXyJrzQUynVbgn4Km643UYcWNcrSfRkKL0WaiUcxcIbkXcVTgNpDqSnPXntWXT75cw==",
           "dev": true
         },
         "make-fetch-happen": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.228.0",
+  "version": "0.229.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

@@ -108,7 +108,7 @@ describe('Unit: parser/block/extension/table', () => {
         [[html('table', [
           html('thead'),
           html('tbody', [
-            html('tr', [html('td', '1.1'), html('td', '1.2'), html('td', ':1:1 1.3'), html('td', '1.4')]),
+            html('tr', [html('td', '1.1'), html('td', ': 1.2'), html('td', ':1:1 1.3'), html('td', '1.4')]),
           ]),
           html('tfoot'),
         ]).outerHTML], '']);
@@ -238,18 +238,18 @@ describe('Unit: parser/block/extension/table', () => {
 
     it('head', () => {
       assert.deepStrictEqual(
-        inspect(parser('~~~table\n#-\n1.1\n~~~')),
+        inspect(parser('~~~table\n-\n# 1.1\n~~~')),
         [[html('table', [
           html('thead', [
-            html('tr', [html('td', '1.1')]),
+            html('tr', [html('th', '1.1')]),
           ]),
           html('tbody'),
           html('tfoot')]).outerHTML], '']);
       assert.deepStrictEqual(
-        inspect(parser('~~~table\n#-/-\n1.1\n~~~')),
+        inspect(parser('~~~table\n-/-\n# 1.1\n~~~')),
         [[html('table', [
           html('thead', [
-            html('tr', [html('td', '1.1')]),
+            html('tr', [html('th', '1.1')]),
           ]),
           html('tbody'),
           html('tfoot')]).outerHTML], '']);
@@ -269,14 +269,6 @@ describe('Unit: parser/block/extension/table', () => {
             html('tr', [html('th', '1.1'), html('td', '1.2')]),
           ]),
           html('tfoot')]).outerHTML], '']);
-      assert.deepStrictEqual(
-        inspect(parser('~~~table\n:-\n# 1.1\n~~~')),
-        [[html('table', [
-          html('thead'),
-          html('tbody', [
-            html('tr', [html('th', '1.1')]),
-          ]),
-          html('tfoot')]).outerHTML], '']);
     });
 
     it('foot', () => {
@@ -408,11 +400,11 @@ describe('Unit: parser/block/extension/table', () => {
           html('tfoot'),
         ]).outerHTML], '']);
       assert.deepStrictEqual(
-        inspect(parser('~~~table\n#-\n: \n#! 1.2\n-\n#! 2.1\n: 2.2\n~~~')),
+        inspect(parser('~~~table\n-\n# \n#! 1.2\n-\n#! 2.1\n: 2.2\n~~~')),
         [[html('table', [
           html('thead', [
             html('tr', [
-              html('td'),
+              html('th'),
               html('th', { class: 'highlight' }, '1.2'),
             ]),
           ]),
@@ -425,11 +417,11 @@ describe('Unit: parser/block/extension/table', () => {
           html('tfoot'),
         ]).outerHTML], '']);
       assert.deepStrictEqual(
-        inspect(parser('~~~table\n#-\n: \n#! 1.2\n-\n#! 2.1\n:! 2.2\n~~~')),
+        inspect(parser('~~~table\n-\n# \n#! 1.2\n-\n#! 2.1\n:! 2.2\n~~~')),
         [[html('table', [
           html('thead', [
             html('tr', [
-              html('td'),
+              html('th'),
               html('th', { class: 'highlight' }, '1.2'),
             ]),
           ]),

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

@@ -61,22 +61,22 @@ const row: RowParser = lazy(() => dup(fmap(
     some(union([
       head,
       data,
-      emptyline,
       some(dataline, alignment),
+      emptyline,
     ])),
   ]),
   ns => !isArray(ns[0]) ? unshift([[[]]], ns) : ns)));
 
-const alignment = /^[#:]?[-=<>]+(?:\/[-=^v]*)?(?=[^\S\n]*\n)/;
+const alignment = /^[-=<>]+(?:\/[-=^v]*)?(?=[^\S\n]*\n)/;
 
 const align: AlignParser = line(fmap(
   union([str(alignment)]),
   ([s]) => s.split('/').map(s => s.split(''))));
 
-const delimiter = /^[#:]?[-=<>]+(?:\/[-=^v]*)?(?=[^\S\n]*\n)|^[#:](?:(?!:!*[^\S\n]|0)\d*:(?!0)\d*)?!*(?=[^\S\n])/;
+const delimiter = /^[-=<>]+(?:\/[-=^v]*)?(?=[^\S\n]*\n)|^[#:](?:(?!:\D|0)\d*:(?!0)\d*)?!*(?=[^\S\n])/;
 
 const head: CellParser.HeadParser = creator(block(fmap(open(
-  str(/^#(?:(?!:!*[^\S\n]|0)\d*:(?!0)\d*)?!*(?=[^\S\n])/),
+  str(/^#(?:(?!:\D|0)\d*:(?!0)\d*)?!*(?=[^\S\n])/),
   rewrite(
     inits([
       anyline,
@@ -88,7 +88,7 @@ const head: CellParser.HeadParser = creator(block(fmap(open(
   false));
 
 const data: CellParser.DataParser = creator(block(fmap(open(
-  str(/^:(?:(?!:!*[^\S\n]|0)\d*:(?!0)\d*)?!*(?=[^\S\n])/),
+  str(/^:(?:(?!:\D|0)\d*:(?!0)\d*)?!*(?=[^\S\n])/),
   rewrite(
     inits([
       anyline,
@@ -103,7 +103,6 @@ const dataline: CellParser.DatalineParser = creator(line(
   rewrite(
     contentline,
     union([
-      validate(/^:!*[^\S\n]/, data),
       validate(/^!+[^\S\n]/, convert(source => `:${source}`, data)),
       convert(source => `: ${source}`, data),
     ]))));
@@ -152,10 +151,7 @@ function format(rows: Tree<RowParser>[]): HTMLTableSectionElement[] {
     assert(cells !== rows[i]);
     let isBody = target === tfoot
       ? false
-      : [
-          as[0] === '#' ? !as.shift() : undefined,
-          as[0] === ':' ? !!as.shift() : undefined,
-        ].reduce((a, b) => a ?? b);
+      : undefined;
     as.length === 0 && as.push('-');
     ALIGN_H:
     for (let j = 0, update = false; j < as.length || j < aligns.length; ++j) {