securemark 0.227.1 → 0.230.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 0.230.0
+
+- Change table syntax's cell syntax not to depend on trailing whitespace.
+
+## 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.
+
 ## 0.227.1
 
 - Update dependencies.

package/dist/securemark.js

@@ -1,4 +1,4 @@
-/*! securemark v0.227.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
+/*! securemark v0.230.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
 require = function () {
     function r(e, n, t) {
         function o(i, f) {
@@ -5257,24 +5257,23 @@ 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]*)?|\/[-=^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]*)?|\/[-=^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)/;
+            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)/), (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)/), (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.validate)(/^!+\s/, (0, combinator_1.convert)(source => `:${ source }`, data)),
                 (0, combinator_1.convert)(source => `: ${ source }`, data)
             ]))));
             function attributes(source) {
@@ -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) {
@@ -5559,7 +5555,8 @@ require = function () {
             const inline_1 = _dereq_('../inline');
             const source_1 = _dereq_('../source');
             const typed_dom_1 = _dereq_('typed-dom');
-            exports.ilist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)(/^[-+*](?=[^\S\n]|\n[^\S\n]*\S)/, (0, combinator_1.context)({ syntax: { inline: { media: false } } }, (0, combinator_1.some)((0, combinator_1.creator)((0, combinator_1.union)([(0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([
+            exports.ilist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.validate)(/^[-+*](?=[^\S\n]|\n[^\S\n]*\S)/, (0, combinator_1.context)({ syntax: { inline: { media: false } } }, exports.ilist_))));
+            exports.ilist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)(/^[-+*](?:$|\s)/, (0, combinator_1.some)((0, combinator_1.creator)((0, combinator_1.union)([(0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([
                     (0, combinator_1.line)((0, combinator_1.open)(/^[-+*](?:$|\s)/, (0, combinator_1.trim)((0, combinator_1.some)(inline_1.inline)), true)),
                     (0, combinator_1.indent)((0, combinator_1.union)([
                         ulist_1.ulist_,
@@ -5569,13 +5566,12 @@ require = function () {
                 ]), (0, combinator_1.rewrite)(source_1.contentline, source => [
                     [(0, typed_dom_1.html)('span', source.replace('\n', ''))],
                     ''
-                ])), ns => [(0, typed_dom_1.html)('li', (0, typed_dom_1.defrag)((0, ulist_1.fillFirstLine)(ns)))])]))))), es => [(0, typed_dom_1.html)('ul', {
+                ])), ns => [(0, typed_dom_1.html)('li', (0, typed_dom_1.defrag)((0, ulist_1.fillFirstLine)(ns)))])])))), es => [(0, typed_dom_1.html)('ul', {
                     class: 'invalid',
                     'data-invalid-syntax': 'list',
                     'data-invalid-type': 'syntax',
                     'data-invalid-description': 'Use "-" instead of "+" or "*".'
                 }, es)])));
-            exports.ilist_ = (0, combinator_1.convert)(source => source.replace(/^[-+*](?=$|\n)/, `$& `), exports.ilist);
         },
         {
             '../../combinator': 27,
@@ -5635,8 +5631,19 @@ require = function () {
             const typed_dom_1 = _dereq_('typed-dom');
             const memoize_1 = _dereq_('spica/memoize');
             const array_1 = _dereq_('spica/array');
-            exports.olist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.match)(/^(?=(?:([0-9]+|[a-z]+|[A-Z]+)(?:-[0-9]+)*(\.)|\(([0-9]+|[a-z]+)(\))(?:-[0-9]+)*)(?=[^\S\n]|\n[^\S\n]*\S))/, (0, memoize_1.memoize)(ms => list(type(ms[1] || ms[3]), ms[2] || ms[4]), ms => type(ms[1] || ms[3]) + (ms[2] || ms[4])))));
-            const list = (type, delim) => (0, combinator_1.fmap)((0, combinator_1.context)({ syntax: { inline: { media: false } } }, (0, combinator_1.some)((0, combinator_1.creator)((0, combinator_1.union)([(0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([
+            const openers = {
+                '.': /^(?:[0-9]+|[a-z]+|[A-Z]+)(?:-(?!-)[0-9]*)*(?![^\S\n])\.?(?=$|\s)/,
+                '(': /^\((?:[0-9]*|[a-z]*)(?![^)\n])\)?(?:-(?!-)[0-9]*)*(?=$|\s)/
+            };
+            exports.olist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.validate)([
+                /^(?=([0-9]+|[a-z]+|[A-Z]+)(?:-[0-9]+)*\.(?=[^\S\n]|\n[^\S\n]*\S))/,
+                /^(?=\(([0-9]+|[a-z]+)\)(?:-[0-9]+)*(?=[^\S\n]|\n[^\S\n]*\S))/
+            ], (0, combinator_1.context)({ syntax: { inline: { media: false } } }, exports.olist_))));
+            exports.olist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.union)([
+                (0, combinator_1.match)(new RegExp(`^(?=${ openers['.'].source.replace('?:', '') })`), (0, memoize_1.memoize)(ms => list(type(ms[1]), '.'), ms => type(ms[1]))),
+                (0, combinator_1.match)(new RegExp(`^(?=${ openers['('].source.replace('?:', '') })`), (0, memoize_1.memoize)(ms => list(type(ms[1]), '('), ms => type(ms[1])))
+            ])));
+            const list = (type, delim) => (0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.creator)((0, combinator_1.union)([(0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([
                     (0, combinator_1.line)((0, combinator_1.open)(items[delim], (0, combinator_1.trim)((0, combinator_1.subsequence)([
                         ulist_1.checkbox,
                         (0, combinator_1.trimStart)((0, combinator_1.some)(inline_1.inline))
@@ -5646,18 +5653,17 @@ require = function () {
                         exports.olist_,
                         ilist_1.ilist_
                     ]))
-                ]), iitem), ns => [(0, typed_dom_1.html)('li', { 'data-marker': ns[0] }, (0, typed_dom_1.defrag)((0, ulist_1.fillFirstLine)((0, array_1.shift)(ns)[1])))])])))), es => [format((0, typed_dom_1.html)('ol', es), type, delim)]);
+                ]), iitem), ns => [(0, typed_dom_1.html)('li', { 'data-marker': ns[0] }, (0, typed_dom_1.defrag)((0, ulist_1.fillFirstLine)((0, array_1.shift)(ns)[1])))])]))), es => [format((0, typed_dom_1.html)('ol', es), type, delim)]);
             const items = {
-                '.': (0, combinator_1.focus)(/^(?:[0-9]+|[a-z]+|[A-Z]+)(?:-(?!-)[0-9]*)*(?![^\S\n])\.?(?=$|\s)/, source => [
+                '.': (0, combinator_1.focus)(openers['.'], source => [
                     [`${ source.split('.', 1)[0] }.`],
                     ''
                 ]),
-                ')': (0, combinator_1.focus)(/^\((?:[0-9]*|[a-z]*)(?![^)\n])\)?(?:-(?!-)[0-9]*)*(?=$|\s)/, source => [
+                '(': (0, combinator_1.focus)(openers['('], source => [
                     [source.trimEnd().replace(/^\($/, '(1)').replace(/^\((\w+)\)?$/, '($1)')],
                     ''
                 ])
             };
-            exports.olist_ = (0, combinator_1.convert)(source => source[0] !== '(' ? source.replace(/^((?:[0-9]+|[a-z]+|[A-Z]+)(?:-(?!-)[0-9]*)*)\.?(?=$|\n)/, `$1. `) : source.replace(/^\((?=$|\n)/, `(1) `).replace(/^\(((?:[0-9]+|[a-z]+))\)?((?:-(?!-)[0-9]*)*(?=$|\n))/, `($1)$2 `), exports.olist);
             const iitem = (0, combinator_1.rewrite)(source_1.contentline, source => [
                 [
                     '',
@@ -5974,7 +5980,7 @@ require = function () {
         function (_dereq_, module, exports) {
             'use strict';
             Object.defineProperty(exports, '__esModule', { value: true });
-            exports.fillFirstLine = exports.ulist_ = exports.checkbox = exports.ulist = void 0;
+            exports.fillFirstLine = exports.checkbox = exports.ulist_ = exports.ulist = void 0;
             const combinator_1 = _dereq_('../../combinator');
             const olist_1 = _dereq_('./olist');
             const ilist_1 = _dereq_('./ilist');
@@ -5982,7 +5988,8 @@ require = function () {
             const typed_dom_1 = _dereq_('typed-dom');
             const array_1 = _dereq_('spica/array');
             const source_1 = _dereq_('../source');
-            exports.ulist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)(/^-(?=[^\S\n]|\n[^\S\n]*\S)/, (0, combinator_1.context)({ syntax: { inline: { media: false } } }, (0, combinator_1.some)((0, combinator_1.creator)((0, combinator_1.union)([(0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([
+            exports.ulist = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.validate)(/^-(?=[^\S\n]|\n[^\S\n]*\S)/, (0, combinator_1.context)({ syntax: { inline: { media: false } } }, exports.ulist_))));
+            exports.ulist_ = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, combinator_1.fmap)((0, combinator_1.validate)(/^-(?=$|\s)/, (0, combinator_1.some)((0, combinator_1.creator)((0, combinator_1.union)([(0, combinator_1.fmap)((0, combinator_1.fallback)((0, combinator_1.inits)([
                     (0, combinator_1.line)((0, combinator_1.open)(/^-(?:$|\s)/, (0, combinator_1.trim)((0, combinator_1.subsequence)([
                         exports.checkbox,
                         (0, combinator_1.trimStart)((0, combinator_1.some)(inline_1.inline))
@@ -5992,12 +5999,11 @@ require = function () {
                         olist_1.olist_,
                         ilist_1.ilist_
                     ]))
-                ]), iitem), ns => [(0, typed_dom_1.html)('li', (0, typed_dom_1.defrag)(fillFirstLine(ns)))])]))))), es => [format((0, typed_dom_1.html)('ul', es))])));
+                ]), iitem), ns => [(0, typed_dom_1.html)('li', (0, typed_dom_1.defrag)(fillFirstLine(ns)))])])))), es => [format((0, typed_dom_1.html)('ul', es))])));
             exports.checkbox = (0, combinator_1.focus)(/^\[[xX ]\](?=$|\s)/, source => [
                 [(0, typed_dom_1.html)('span', { class: 'checkbox' }, source[1].trimStart() ? '\u2611' : '\u2610')],
                 ''
             ]);
-            exports.ulist_ = (0, combinator_1.convert)(source => source.replace(/^-(?=$|\n)/, `$& `), exports.ulist);
             const iitem = (0, combinator_1.rewrite)(source_1.contentline, source => [
                 [(0, typed_dom_1.html)('span', {
                         class: 'invalid',

package/markdown.d.ts

@@ -123,12 +123,12 @@ export namespace MarkdownParser {
       // - item
       Block<'ulist'>,
       Parser<HTMLUListElement, Context, [
-        UListParser.ListItemParser,
+        UListParser.ItemParser,
       ]> {
     }
     export namespace UListParser {
-      export interface ListItemParser extends
-        Block<'ulist/listitem'>,
+      export interface ItemParser extends
+        Block<'ulist/item'>,
         Parser<HTMLLIElement, Context, [
           Parser<HTMLElement | string, Context, [
             InlineParser,
@@ -148,12 +148,19 @@ export namespace MarkdownParser {
       // (a)-1 item
       Block<'olist'>,
       Parser<HTMLOListElement, Context, [
-        OListParser.ListItemParser,
+        OListParser.ListParser,
+        OListParser.ListParser,
       ]> {
     }
     export namespace OListParser {
-      export interface ListItemParser extends
-        Block<'olist/listitem'>,
+      export interface ListParser extends
+        Block<'olist/list'>,
+        Parser<HTMLOListElement, Context, [
+          OListParser.ItemParser,
+        ]> {
+      }
+      export interface ItemParser extends
+        Block<'olist/item'>,
         Parser<HTMLLIElement, Context, [
           Parser<HTMLElement | string, Context, [
             InlineParser,
@@ -172,12 +179,12 @@ export namespace MarkdownParser {
       // * item
       Block<'ilist'>,
       Parser<HTMLUListElement, Context, [
-        IListParser.ListItemParser,
+        IListParser.ItemParser,
       ]> {
     }
     export namespace IListParser {
-      export interface ListItemParser extends
-        Block<'ilist/listitem'>,
+      export interface ItemParser extends
+        Block<'ilist/item'>,
         Parser<HTMLLIElement, Context, [
           InlineParser,
           Parser<HTMLUListElement | HTMLOListElement, Context, [
@@ -455,8 +462,8 @@ export namespace MarkdownParser {
             Parser<HTMLTableCellElement, Context, [
               CellParser.HeadParser,
               CellParser.DataParser,
-              SourceParser.EmptyLineParser,
               CellParser.DatalineParser,
+              SourceParser.EmptyLineParser,
             ]>,
           ]> {
         }
@@ -484,7 +491,6 @@ export namespace MarkdownParser {
             Parser<HTMLTableCellElement, Context, [
               DataParser,
               DataParser,
-              DataParser,
             ]> {
           }
         }

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.227.1",
+  "version": "0.230.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",
@@ -4125,9 +4125,9 @@
       }
     },
     "fs-extra": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
-      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
+      "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.2.0",
@@ -4178,20 +4178,31 @@
       "dev": true
     },
     "gauge": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.1.tgz",
-      "integrity": "sha512-zJ4jePUHR8cceduZ53b6temRalyGpkC2Kc2r3ecNphmL+uWNoJ3YcOcUjpbG6WwoE/Ef6/+aEZz63neI2WIa1Q==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.2.tgz",
+      "integrity": "sha512-aSPRm2CvA9R8QyU5eXMFPd+cYkyxLsXHd2l5/FOH2V/eml//M04G6KZOmTap07O1PvEwNcl2NndyLfK8g3QrKA==",
       "dev": true,
       "requires": {
         "ansi-regex": "^5.0.1",
         "aproba": "^1.0.3 || ^2.0.0",
-        "color-support": "^1.1.2",
-        "console-control-strings": "^1.0.0",
+        "color-support": "^1.1.3",
+        "console-control-strings": "^1.1.0",
         "has-unicode": "^2.0.1",
-        "signal-exit": "^3.0.0",
+        "signal-exit": "^3.0.7",
         "string-width": "^4.2.3",
         "strip-ansi": "^6.0.1",
-        "wide-align": "^1.1.2"
+        "wide-align": "^1.1.5"
+      },
+      "dependencies": {
+        "wide-align": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+          "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+          "dev": true,
+          "requires": {
+            "string-width": "^1.0.2 || 2 || 3 || 4"
+          }
+        }
       }
     },
     "gensync": {
@@ -7656,9 +7667,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.227.1",
+  "version": "0.230.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

@@ -42,12 +42,9 @@ describe('Unit: parser/block/extension/table', () => {
       assert.deepStrictEqual(
         inspect(parser('~~~table\n0\n\n~~~')),
         [[html('table', [html('thead'), html('tbody', [html('tr', [html('td', '0')])]), html('tfoot')]).outerHTML], '']);
-      assert.deepStrictEqual(
-        inspect(parser('~~~table\n#\n~~~')),
-        [[html('table', [html('thead'), html('tbody', [html('tr', [html('td', '#')])]), html('tfoot'),]).outerHTML], '']);
       assert.deepStrictEqual(
         inspect(parser('~~~table\n:\n~~~')),
-        [[html('table', [html('thead'), html('tbody', [html('tr', [html('td', ':')])]), html('tfoot'),]).outerHTML], '']);
+        [[html('table', [html('thead'), html('tbody', [html('tr', [html('td')])]), html('tfoot'),]).outerHTML], '']);
       assert.deepStrictEqual(
         inspect(parser('~~~table\n1.1\n~~~')),
         [[html('table', [
@@ -108,7 +105,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], '']);
@@ -140,7 +137,7 @@ describe('Unit: parser/block/extension/table', () => {
         inspect(parser('~~~table\n-=<>/-=^v\n~~~')),
         [[html('table', [html('thead', [html('tr')]), html('tbody'), html('tfoot')]).outerHTML], '']);
       assert.deepStrictEqual(
-        inspect(parser('~~~table\n/-=^v\n~~~')),
+        inspect(parser('~~~table\n-/-=^v\n~~~')),
         [[html('table', [html('thead', [html('tr')]), html('tbody'), html('tfoot')]).outerHTML], '']);
       assert.deepStrictEqual(
         inspect(parser('~~~table\n-=^v\n~~~')),
@@ -206,7 +203,7 @@ describe('Unit: parser/block/extension/table', () => {
           html('tfoot'),
         ]).outerHTML], '']);
       assert.deepStrictEqual(
-        inspect(parser('~~~table\n/=-^v\n1.1\n1.2\n1.3\n1.4\n1.5\n1.6\n~~~')),
+        inspect(parser('~~~table\n-/=-^v\n1.1\n1.2\n1.3\n1.4\n1.5\n1.6\n~~~')),
         [[html('table', [
           html('thead'),
           html('tbody', [
@@ -222,7 +219,7 @@ describe('Unit: parser/block/extension/table', () => {
           html('tfoot'),
         ]).outerHTML], '']);
       assert.deepStrictEqual(
-        inspect(parser('~~~table\n/=^\n/-\n2.1\n2.2\n2.3\n~~~')),
+        inspect(parser('~~~table\n-/=^\n-/-\n2.1\n2.2\n2.3\n~~~')),
         [[html('table', [
           html('thead', [html('tr')]),
           html('tbody', [
@@ -238,18 +235,21 @@ describe('Unit: parser/block/extension/table', () => {
 
     it('head', () => {
       assert.deepStrictEqual(
-        inspect(parser('~~~table\n#-\n1.1\n~~~')),
+        inspect(parser('~~~table\n#\n~~~')),
+        [[html('table', [html('thead', [html('tr', [html('th')])]), html('tbody'), html('tfoot'),]).outerHTML], '']);
+      assert.deepStrictEqual(
+        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]*)?|\/[-=^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]*)?|\/[-=^v]+)(?=[^\S\n]*\n)|^[#:](?:(?!:!*[^\S\n]|0)\d*:(?!0)\d*)?!*(?=[^\S\n])/;
+const delimiter = /^[-=<>]+(?:\/[-=^v]*)?(?=[^\S\n]*\n)|^[#:](?:(?!:\D|0)\d*:(?!0)\d*)?!*(?=\s)/;
 
 const head: CellParser.HeadParser = creator(block(fmap(open(
-  str(/^#(?:(?!:!*[^\S\n]|0)\d*:(?!0)\d*)?!*(?=[^\S\n])/),
+  str(/^#(?:(?!:\D|0)\d*:(?!0)\d*)?!*(?=\s)/),
   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)/),
   rewrite(
     inits([
       anyline,
@@ -103,8 +103,7 @@ const dataline: CellParser.DatalineParser = creator(line(
   rewrite(
     contentline,
     union([
-      validate(/^:!*[^\S\n]/, data),
-      validate(/^!+[^\S\n]/, convert(source => `:${source}`, data)),
+      validate(/^!+\s/, 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) {

package/src/parser/block/ilist.ts

@@ -1,14 +1,18 @@
 import { IListParser } from '../block';
-import { union, inits, some, block, line, validate, indent, rewrite, context, creator, open, convert, trim, fallback, lazy, fmap } from '../../combinator';
+import { union, inits, some, block, line, validate, indent, rewrite, context, creator, open, trim, fallback, lazy, fmap } from '../../combinator';
 import { ulist_, fillFirstLine } from './ulist';
 import { olist_ } from './olist';
 import { inline } from '../inline';
 import { contentline } from '../source';
 import { html, defrag } from 'typed-dom';
 
-export const ilist: IListParser = lazy(() => block(fmap(validate(
+export const ilist: IListParser = lazy(() => block(validate(
   /^[-+*](?=[^\S\n]|\n[^\S\n]*\S)/,
   context({ syntax: { inline: { media: false } } },
+  ilist_))));
+
+export const ilist_: IListParser = lazy(() => block(fmap(validate(
+  /^[-+*](?:$|\s)/,
   some(creator(union([
     fmap(fallback(
       inits([
@@ -17,7 +21,7 @@ export const ilist: IListParser = lazy(() => block(fmap(validate(
       ]),
       rewrite(contentline, source => [[html('span', source.replace('\n', ''))], ''])),
       ns => [html('li', defrag(fillFirstLine(ns)))]),
-  ]))))),
+  ])))),
   es => [
     html('ul', {
       class: 'invalid',
@@ -26,7 +30,3 @@ export const ilist: IListParser = lazy(() => block(fmap(validate(
       'data-invalid-description': 'Use "-" instead of "+" or "*".',
     }, es),
   ])));
-
-export const ilist_: IListParser = convert(
-  source => source.replace(/^[-+*](?=$|\n)/, `$& `),
-  ilist);

package/src/parser/block/olist.ts

@@ -1,6 +1,6 @@
 import { undefined } from 'spica/global';
 import { OListParser } from '../block';
-import { union, inits, subsequence, some, block, line, indent, focus, rewrite, context, creator, open, match, convert, trim, trimStart, fallback, lazy, fmap } from '../../combinator';
+import { union, inits, subsequence, some, block, line, validate, indent, focus, rewrite, context, creator, open, match, trim, trimStart, fallback, lazy, fmap } from '../../combinator';
 import { checkbox, ulist_, fillFirstLine } from './ulist';
 import { ilist_ } from './ilist';
 import { inline } from '../inline';
@@ -9,14 +9,29 @@ import { html, define, defrag } from 'typed-dom';
 import { memoize } from 'spica/memoize';
 import { shift } from 'spica/array';
 
-export const olist: OListParser = lazy(() => block(match(
-  /^(?=(?:([0-9]+|[a-z]+|[A-Z]+)(?:-[0-9]+)*(\.)|\(([0-9]+|[a-z]+)(\))(?:-[0-9]+)*)(?=[^\S\n]|\n[^\S\n]*\S))/,
-  memoize(
-  ms => list(type(ms[1] || ms[3]), ms[2] || ms[4]),
-  ms => type(ms[1] || ms[3]) + (ms[2] || ms[4])))));
+const openers = {
+  '.': /^(?:[0-9]+|[a-z]+|[A-Z]+)(?:-(?!-)[0-9]*)*(?![^\S\n])\.?(?=$|\s)/,
+  '(': /^\((?:[0-9]*|[a-z]*)(?![^)\n])\)?(?:-(?!-)[0-9]*)*(?=$|\s)/,
+} as const;
 
-const list = (type: string, delim: string): OListParser => fmap(
+export const olist: OListParser = lazy(() => block(validate(
+  [
+    /^(?=([0-9]+|[a-z]+|[A-Z]+)(?:-[0-9]+)*\.(?=[^\S\n]|\n[^\S\n]*\S))/,
+    /^(?=\(([0-9]+|[a-z]+)\)(?:-[0-9]+)*(?=[^\S\n]|\n[^\S\n]*\S))/,
+  ],
   context({ syntax: { inline: { media: false } } },
+  olist_))));
+
+export const olist_: OListParser = lazy(() => block(union([
+  match(
+    new RegExp(`^(?=${openers['.'].source.replace('?:', '')})`),
+    memoize(ms => list(type(ms[1]), '.'), ms => type(ms[1]))),
+  match(
+    new RegExp(`^(?=${openers['('].source.replace('?:', '')})`),
+    memoize(ms => list(type(ms[1]), '('), ms => type(ms[1]))),
+])));
+
+const list = (type: string, delim: string): OListParser.ListParser => fmap(
   some(creator(union([
     fmap(fallback(
       inits([
@@ -25,28 +40,18 @@ const list = (type: string, delim: string): OListParser => fmap(
       ]),
       iitem),
       (ns: [string, ...(HTMLElement | string)[]]) => [html('li', { 'data-marker': ns[0] }, defrag(fillFirstLine(shift(ns)[1])))]),
-  ])))),
+  ]))),
   es => [format(html('ol', es), type, delim)]);
 
 const items = {
   '.': focus(
-    /^(?:[0-9]+|[a-z]+|[A-Z]+)(?:-(?!-)[0-9]*)*(?![^\S\n])\.?(?=$|\s)/,
+    openers['.'],
     (source: string) => [[`${source.split('.', 1)[0]}.`], '']),
-  ')': focus(
-    /^\((?:[0-9]*|[a-z]*)(?![^)\n])\)?(?:-(?!-)[0-9]*)*(?=$|\s)/,
+  '(': focus(
+    openers['('],
     (source: string) => [[source.trimEnd().replace(/^\($/, '(1)').replace(/^\((\w+)\)?$/, '($1)')], '']),
 } as const;
 
-export const olist_: OListParser = convert(
-  source =>
-    source[0] !== '('
-      ? source
-          .replace(/^((?:[0-9]+|[a-z]+|[A-Z]+)(?:-(?!-)[0-9]*)*)\.?(?=$|\n)/, `$1. `)
-      : source
-          .replace(/^\((?=$|\n)/, `(1) `)
-          .replace(/^\(((?:[0-9]+|[a-z]+))\)?((?:-(?!-)[0-9]*)*(?=$|\n))/, `($1)$2 `),
-  olist);
-
 const iitem = rewrite(contentline, source => [[
   '',
   html('span', {

package/src/parser/block/ulist.ts

@@ -1,5 +1,5 @@
 import { UListParser } from '../block';
-import { union, inits, subsequence, some, block, line, validate, indent, focus, rewrite, context, creator, open, convert, trim, trimStart, fallback, lazy, fmap } from '../../combinator';
+import { union, inits, subsequence, some, block, line, validate, indent, focus, rewrite, context, creator, open, trim, trimStart, fallback, lazy, fmap } from '../../combinator';
 import { olist_ } from './olist';
 import { ilist_ } from './ilist';
 import { inline } from '../inline';
@@ -7,9 +7,13 @@ import { html, defrag } from 'typed-dom';
 import { unshift } from 'spica/array';
 import { contentline } from '../source';
 
-export const ulist: UListParser = lazy(() => block(fmap(validate(
+export const ulist: UListParser = lazy(() => block(validate(
   /^-(?=[^\S\n]|\n[^\S\n]*\S)/,
   context({ syntax: { inline: { media: false } } },
+  ulist_))));
+
+export const ulist_: UListParser = lazy(() => block(fmap(validate(
+  /^-(?=$|\s)/,
   some(creator(union([
     fmap(fallback(
       inits([
@@ -18,7 +22,7 @@ export const ulist: UListParser = lazy(() => block(fmap(validate(
       ]),
       iitem),
       ns => [html('li', defrag(fillFirstLine(ns)))]),
-  ]))))),
+  ])))),
   es => [format(html('ul', es))])));
 
 export const checkbox = focus(
@@ -27,10 +31,6 @@ export const checkbox = focus(
     html('span', { class: 'checkbox' }, source[1].trimStart() ? '☑' : '☐'),
   ], '']);
 
-export const ulist_: UListParser = convert(
-  source => source.replace(/^-(?=$|\n)/, `$& `),
-  ulist);
-
 const iitem = rewrite(contentline, source => [[
   html('span', {
     class: 'invalid',