securemark 0.229.0 → 0.231.0

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.229.0",
+  "version": "0.231.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -349,6 +349,12 @@
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@colors/colors": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
+      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
+      "dev": true
+    },
     "@gar/promisify": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
@@ -503,15 +509,15 @@
       }
     },
     "@npmcli/run-script": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-2.0.0.tgz",
-      "integrity": "sha512-fSan/Pu11xS/TdaTpTB0MRn9guwGU8dye+x56mEVgBEd/QsybBbYcAL0phPXi8SGWFEChkQd6M9qL4y6VOpFig==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-3.0.0.tgz",
+      "integrity": "sha512-jIdmUepw+kVP2WEE/+XrBIvrSF5miDutdGBrQ8May6uHVAvpAb0m3NRHcJ0lKWbQ1BxsRFsmTrjkdY99qTTVIw==",
       "dev": true,
       "requires": {
-        "@npmcli/node-gyp": "^1.0.2",
+        "@npmcli/node-gyp": "^1.0.3",
         "@npmcli/promise-spawn": "^1.3.2",
-        "node-gyp": "^8.2.0",
-        "read-package-json-fast": "^2.0.1"
+        "node-gyp": "^8.4.1",
+        "read-package-json-fast": "^2.0.3"
       }
     },
     "@sindresorhus/is": {
@@ -606,9 +612,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "17.0.19",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.19.tgz",
-      "integrity": "sha512-PfeQhvcMR4cPFVuYfBN4ifG7p9c+Dlh3yUZR6k+5yQK7wX3gDgVxBly4/WkBRs9x4dmcy1TVl08SY67wwtEvmA==",
+      "version": "17.0.21",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz",
+      "integrity": "sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ==",
       "dev": true
     },
     "@types/power-assert": {
@@ -2056,14 +2062,6 @@
       "dev": true,
       "requires": {
         "colors": "1.0.3"
-      },
-      "dependencies": {
-        "colors": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-          "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
-          "dev": true
-        }
       }
     },
     "cliui": {
@@ -2164,9 +2162,9 @@
       "dev": true
     },
     "colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+      "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=",
       "dev": true
     },
     "combine-source-map": {
@@ -2927,9 +2925,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.4.71",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.71.tgz",
-      "integrity": "sha512-Hk61vXXKRb2cd3znPE9F+2pLWdIOmP7GjiTj45y6L3W/lO+hSnUSUhq+6lEaERWBdZOHbk2s3YV5c9xVl3boVw==",
+      "version": "1.4.75",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.75.tgz",
+      "integrity": "sha512-LxgUNeu3BVU7sXaKjUDD9xivocQLxFtq6wgERrutdY/yIOps3ODOZExK1jg8DTEg4U8TUCb5MLGeWFOYuxjF3Q==",
       "dev": true
     },
     "elliptic": {
@@ -3036,9 +3034,9 @@
       }
     },
     "engine.io": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.2.tgz",
-      "integrity": "sha512-v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ==",
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.3.tgz",
+      "integrity": "sha512-rqs60YwkvWTLLnfazqgZqLa/aKo+9cueVfEi/dZ8PyGyaf8TLOxj++4QMIgeG3Gn0AhrWiFXvghsoY9L9h25GA==",
       "dev": true,
       "requires": {
         "@types/cookie": "^0.4.1",
@@ -3049,7 +3047,7 @@
         "cookie": "~0.4.1",
         "cors": "~2.8.5",
         "debug": "~4.3.1",
-        "engine.io-parser": "~5.0.0",
+        "engine.io-parser": "~5.0.3",
         "ws": "~8.2.3"
       },
       "dependencies": {
@@ -4125,9 +4123,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 +4176,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": {
@@ -5039,9 +5048,9 @@
       }
     },
     "has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true
     },
     "has-tostringtag": {
@@ -6099,15 +6108,15 @@
       "dev": true
     },
     "karma": {
-      "version": "6.3.16",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.16.tgz",
-      "integrity": "sha512-nEU50jLvDe5yvXqkEJRf8IuvddUkOY2x5Xc4WXHz6dxINgGDrgD2uqQWeVrJs4hbfNaotn+HQ1LZJ4yOXrL7xQ==",
+      "version": "6.3.17",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.17.tgz",
+      "integrity": "sha512-2TfjHwrRExC8yHoWlPBULyaLwAFmXmxQrcuFImt/JsAsSZu1uOWTZ1ZsWjqQtWpHLiatJOHL5jFjXSJIgCd01g==",
       "dev": true,
       "requires": {
+        "@colors/colors": "1.5.0",
         "body-parser": "^1.19.0",
         "braces": "^3.0.2",
         "chokidar": "^3.5.1",
-        "colors": "1.4.0",
         "connect": "^3.7.0",
         "di": "^0.0.1",
         "dom-serialize": "^2.2.1",
@@ -7445,9 +7454,9 @@
       }
     },
     "npm-check-updates": {
-      "version": "12.4.0",
-      "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.4.0.tgz",
-      "integrity": "sha512-X14H74M8SVFkStmP1NDOMh0OjLB3mU2dwUeM71zyITJHkm08MASwwTcydW6YuGcNW1RUlVq1cQY2yWijv4zKUQ==",
+      "version": "12.5.0",
+      "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.5.0.tgz",
+      "integrity": "sha512-nrryXO9IZdJsAIXo8LdtllrsGiTDE4IMAod7fl1jd5C38tOdZZG/crNNii4IkctxltQRmK/ziZwsMDTlhszZXg==",
       "dev": true,
       "requires": {
         "chalk": "^4.1.2",
@@ -7519,9 +7528,9 @@
           }
         },
         "minimatch": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.0.tgz",
-          "integrity": "sha512-EU+GCVjXD00yOUf1TwAHVP7v3fBD3A8RkkPYsWWKGWesxM/572sL53wJQnHxquHlRhYUV36wHkqrN8cdikKc2g==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
+          "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
           "dev": true,
           "requires": {
             "brace-expansion": "^2.0.1"
@@ -7974,15 +7983,15 @@
       }
     },
     "pacote": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-13.0.2.tgz",
-      "integrity": "sha512-3LyfvDk2BSJNFQZIcDqnLNa7IsYb6KwX3H9uZPwaHJFIX6Gv5N9QHU+s7mEs/RbN4/ta6KUT39LAi2l6EkBi5A==",
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-13.0.3.tgz",
+      "integrity": "sha512-8thQ06YoO01O1k5rvSpHS/XPJZucw2DPiiT1jI+ys8QaTN6ifAyxfyoABHBa8nIt/4wPdzly4GEPqshctHFoYA==",
       "dev": true,
       "requires": {
         "@npmcli/git": "^3.0.0",
         "@npmcli/installed-package-contents": "^1.0.7",
         "@npmcli/promise-spawn": "^1.2.0",
-        "@npmcli/run-script": "^2.0.0",
+        "@npmcli/run-script": "^3.0.0",
         "cacache": "^15.3.0",
         "chownr": "^2.0.0",
         "fs-minipass": "^2.1.0",

package/package.json

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

package/src/parser/autolink.test.ts

@@ -13,11 +13,11 @@ describe('Unit: parser/autolink', () => {
       assert.deepStrictEqual(inspect(parser('@a#b')), [['<a href="/@a?ch=b" class="channel">@a#b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('\\\n')), [['\\', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('a#b')), [['a#b'], '']);
-      assert.deepStrictEqual(inspect(parser('0a#b')), [['0a#b'], '']);
+      assert.deepStrictEqual(inspect(parser('0a#b')), [['0', 'a#b'], '']);
       assert.deepStrictEqual(inspect(parser('あ#b')), [['あ#b'], '']);
-      assert.deepStrictEqual(inspect(parser('あい#b')), [['あい#b'], '']);
+      assert.deepStrictEqual(inspect(parser('あい#b')), [['あ', 'い#b'], '']);
       assert.deepStrictEqual(inspect(parser('0aあ#b')), [['0a', 'あ#b'], '']);
-      assert.deepStrictEqual(inspect(parser('0aあい#b')), [['0a', 'あい#b'], '']);
+      assert.deepStrictEqual(inspect(parser('0aあい#b')), [['0a', 'あ', 'い#b'], '']);
       assert.deepStrictEqual(inspect(parser('a\n#b')), [['a', '<br>', '<a href="/hashtags/b" class="hashtag">#b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('a\\\n#b')), [['a', '\\', '<br>', '<a href="/hashtags/b" class="hashtag">#b</a>'], '']);
     });

package/src/parser/block/codeblock.ts

@@ -30,7 +30,7 @@ export const codeblock: CodeBlockParser = block(validate('```', fmap(
       translate: 'no',
       'data-invalid-syntax': 'codeblock',
       'data-invalid-type': !closer ? 'closer' : 'argument',
-      'data-invalid-description': !closer ? `Missing the closing delimiter ${delim}.` : 'Invalid argument.',
+      'data-invalid-description': !closer ? `Missing the closing delimiter "${delim}".` : 'Invalid argument.',
     }, `${opener}${body}${closer}`)];
     const file = path.split('/').pop() ?? '';
     const ext = file && file.includes('.', 1)

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

@@ -13,7 +13,7 @@ export const aside: ExtensionParser.AsideParser = creator(100, block(validate('~
       translate: 'no',
       'data-invalid-syntax': 'aside',
       'data-invalid-type': !closer ? 'closer' : 'argument',
-      'data-invalid-description': !closer ? `Missing the closing delimiter ${delim}.` : 'Invalid argument.',
+      'data-invalid-description': !closer ? `Missing the closing delimiter "${delim}".` : 'Invalid argument.',
     }, `${opener}${body}${closer}`)];
     const annotations = html('ol', { class: 'annotations' });
     const references = html('ol', { class: 'references' });

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

@@ -16,7 +16,7 @@ export const example: ExtensionParser.ExampleParser = creator(100, block(validat
       translate: 'no',
       'data-invalid-syntax': 'example',
       'data-invalid-type': !closer ? 'closer' : 'argument',
-      'data-invalid-description': !closer ? `Missing the closing delimiter ${delim}.` : 'Invalid argument.',
+      'data-invalid-description': !closer ? `Missing the closing delimiter "${delim}".` : 'Invalid argument.',
     }, `${opener}${body}${closer}`)];
     switch (type) {
       case 'markdown': {

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

@@ -25,7 +25,7 @@ export const message: MessageParser = block(validate('~~~', fmap(
       translate: 'no',
       'data-invalid-syntax': 'message',
       'data-invalid-type': !closer ? 'closer' : 'argument',
-      'data-invalid-description': !closer ? `Missing the closing delimiter ${delim}.` : 'Invalid argument.',
+      'data-invalid-description': !closer ? `Missing the closing delimiter "${delim}".` : 'Invalid argument.',
     }, `${opener}${body}${closer}`)];
     switch (type) {
       case 'note':

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

@@ -18,6 +18,6 @@ export const placeholder: ExtensionParser.PlaceholderParser = block(validate('~~
       translate: 'no',
       'data-invalid-syntax': 'extension',
       'data-invalid-type': !closer ? 'closer' : 'syntax',
-      'data-invalid-description': !closer ? `Missing the closing delimiter ${delim}.` : 'Invalid syntax.',
+      'data-invalid-description': !closer ? `Missing the closing delimiter "${delim}".` : 'Invalid syntax.',
     }, `${opener}${body}${closer}`)
   ])));

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', [
@@ -237,6 +234,9 @@ describe('Unit: parser/block/extension/table', () => {
     });
 
     it('head', () => {
+      assert.deepStrictEqual(
+        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', [

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

@@ -32,7 +32,7 @@ export const table: TableParser = block(validate('~~~', recover(bind(
       translate: 'no',
       'data-invalid-syntax': 'table',
       'data-invalid-type': !closer ? 'closer' : 'argument',
-      'data-invalid-description': !closer ? `Missing the closing delimiter ${delim}.` : 'Invalid argument.',
+      'data-invalid-description': !closer ? `Missing the closing delimiter "${delim}".` : 'Invalid argument.',
     }, `${opener}${body}${closer}`)], ''];
     return parser(body, context) ?? [[html('table')], ''];
   }),
@@ -73,10 +73,10 @@ const align: AlignParser = line(fmap(
   union([str(alignment)]),
   ([s]) => s.split('/').map(s => s.split(''))));
 
-const delimiter = /^[-=<>]+(?:\/[-=^v]*)?(?=[^\S\n]*\n)|^[#:](?:(?!:\D|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(/^#(?:(?!:\D|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(/^:(?:(?!:\D|0)\d*:(?!0)\d*)?!*(?=[^\S\n])/),
+  str(/^:(?:(?!:\D|0)\d*:(?!0)\d*)?!*(?=\s)/),
   rewrite(
     inits([
       anyline,
@@ -103,7 +103,7 @@ const dataline: CellParser.DatalineParser = creator(line(
   rewrite(
     contentline,
     union([
-      validate(/^!+[^\S\n]/, convert(source => `:${source}`, data)),
+      validate(/^!+\s/, convert(source => `:${source}`, data)),
       convert(source => `: ${source}`, data),
     ]))));
 

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/mathblock.ts

@@ -23,6 +23,6 @@ export const mathblock: MathBlockParser = block(validate('$$', fmap(
           translate: 'no',
           'data-invalid-syntax': 'mathblock',
           'data-invalid-type': delim.length > 2 ? 'syntax' : !closer ? 'closer' : 'argument',
-          'data-invalid-description': delim.length > 2 ? 'Invalid syntax' : !closer ? `Missing the closing delimiter ${delim}.` : 'Invalid argument.',
+          'data-invalid-description': delim.length > 2 ? 'Invalid syntax' : !closer ? `Missing the closing delimiter "${delim}".` : 'Invalid argument.',
         }, `${opener}${body}${closer}`),
   ])));

package/src/parser/block/olist.test.ts

@@ -50,6 +50,7 @@ describe('Unit: parser/block/olist', () => {
     it('multiple', () => {
       // pending
       assert.deepStrictEqual(inspect(parser('0.\n0')), [['<ol><li></li><li></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser('0.\n0\n')), [['<ol><li></li><li></li></ol>'], '']);
       assert.deepStrictEqual(inspect(parser('0.\n0.')), [['<ol><li></li><li></li></ol>'], '']);
       assert.deepStrictEqual(inspect(parser('0.\n0. ')), [['<ol><li></li><li></li></ol>'], '']);
       assert.deepStrictEqual(inspect(parser('0.\n0.\n')), [['<ol><li></li><li></li></ol>'], '']);
@@ -58,8 +59,11 @@ describe('Unit: parser/block/olist', () => {
       assert.deepStrictEqual(inspect(parser('0. 1\n0. 2\n0. 3')), [['<ol><li>1</li><li>2</li><li>3</li></ol>'], '']);
       // pending
       assert.deepStrictEqual(inspect(parser('(1) \n(')), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser('(1) \n(\n')), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
       assert.deepStrictEqual(inspect(parser('(1) \n(1')), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser('(1) \n(1\n')), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
       assert.deepStrictEqual(inspect(parser('(1) \n(1)')), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser('(1) \n(1)\n')), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
       // filled
       assert.deepStrictEqual(inspect(parser('(1) \n(1) ')), [['<ol data-format="paren"><li></li><li></li></ol>'], '']);
       // invalid

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,51 +9,56 @@ 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([
-        line(open(items[delim], trim(subsequence([checkbox, trimStart(some(inline))])), true)),
+        line(open(heads[delim], trim(subsequence([checkbox, trimStart(some(inline))])), true)),
         indent(union([ulist_, olist_, ilist_])),
       ]),
       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 = {
+const heads = {
   '.': 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)/,
-    (source: string) => [[source.trimEnd().replace(/^\($/, '(1)').replace(/^\((\w+)\)?$/, '($1)')], '']),
+  '(': focus(
+    openers['('],
+    (source: string) => [[source.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', {
     class: 'invalid',
     'data-invalid-syntax': 'listitem',
     'data-invalid-type': 'syntax',
-    'data-invalid-description': 'Fix the indent or the head of list items.',
+    'data-invalid-description': 'Fix the indent or the head of the list item.',
   }, source.replace('\n', ''))
 ], '']);
 

package/src/parser/block/paragraph/mention/quote.ts

@@ -26,7 +26,7 @@ export const quote: ParagraphParser.MentionParser.QuoteParser = lazy(() => creat
             class: 'quote invalid',
             'data-invalid-syntax': 'quote',
             'data-invalid-type': 'syntax',
-            'data-invalid-description': `Missing the whitespace after ${ns[0].split(/[^>]/, 1)[0]}.`,
+            'data-invalid-description': `Missing the whitespace after "${ns[0].split(/[^>]/, 1)[0]}".`,
           },
       ns),
     html('br'),

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,16 +31,12 @@ 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',
     'data-invalid-syntax': 'listitem',
     'data-invalid-type': 'syntax',
-    'data-invalid-description': 'Fix the indent or the head of list items.',
+    'data-invalid-description': 'Fix the indent or the head of the list item.',
   }, source.replace('\n', ''))
 ], '']);
 

package/src/parser/inline/autolink/account.ts

@@ -11,7 +11,7 @@ export const account: AutolinkParser.AccountParser = lazy(() => fmap(rewrite(
     '@',
     tails([
       verify(
-        str(/^[0-9A-Za-z](?:[0-9A-Za-z-]{0,61}[0-9A-Za-z])?(?:\.[0-9A-Za-z](?:[0-9A-Za-z-]{0,61}[0-9A-Za-z])?)*\//),
+        str(/^[0-9A-Za-z](?:(?:[0-9A-Za-z]|-(?=\w)){0,61}[0-9A-Za-z])?(?:\.[0-9A-Za-z](?:(?:[0-9A-Za-z]|-(?=\w)){0,61}[0-9A-Za-z])?)*\//),
         ([source]) => source.length <= 253 + 1),
       verify(
         str(/^[A-Za-z][0-9A-Za-z]*(?:-[0-9A-Za-z]+)*/),

package/src/parser/inline/autolink/email.test.ts

@@ -23,6 +23,7 @@ describe('Unit: parser/inline/autolink/email', () => {
       assert.deepStrictEqual(inspect(parser('a+@b')), undefined);
       assert.deepStrictEqual(inspect(parser('a..b@c')), undefined);
       assert.deepStrictEqual(inspect(parser('a++b@c')), undefined);
+      assert.deepStrictEqual(inspect(parser(`a@${'b'.repeat(64)}`)), [[`a@${'b'.repeat(64)}`], '']);
       assert.deepStrictEqual(inspect(parser(' a@b')), undefined);
     });
 
@@ -36,7 +37,7 @@ describe('Unit: parser/inline/autolink/email', () => {
       assert.deepStrictEqual(inspect(parser('a@b_c')), [['<a class="email" href="mailto:a@b">a@b</a>'], '_c']);
       assert.deepStrictEqual(inspect(parser('a@b-')), [['<a class="email" href="mailto:a@b">a@b</a>'], '-']);
       assert.deepStrictEqual(inspect(parser('a@b-c')), [['<a class="email" href="mailto:a@b-c">a@b-c</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('a@b--c')), [['<a class="email" href="mailto:a@b--c">a@b--c</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('a@b--c')), [['<a class="email" href="mailto:a@b">a@b</a>'], '--c']);
       assert.deepStrictEqual(inspect(parser('a@b.')), [['<a class="email" href="mailto:a@b">a@b</a>'], '.']);
       assert.deepStrictEqual(inspect(parser('a@b.c')), [['<a class="email" href="mailto:a@b.c">a@b.c</a>'], '']);
       assert.deepStrictEqual(inspect(parser('a@b..c')), [['<a class="email" href="mailto:a@b">a@b</a>'], '..c']);