securemark 0.230.0 → 0.230.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.230.1
+
+- Refactoring.
+
 ## 0.230.0
 
 - Change table syntax's cell syntax not to depend on trailing whitespace.

package/dist/securemark.js

@@ -1,4 +1,4 @@
-/*! securemark v0.230.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
+/*! securemark v0.230.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
 require = function () {
     function r(e, n, t) {
         function o(i, f) {
@@ -4676,7 +4676,7 @@ require = function () {
                             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 = (_a = path.split('/').pop()) !== null && _a !== void 0 ? _a : '';
                 const ext = file && file.includes('.', 1) ? file.split('.').pop() : '';
@@ -4814,7 +4814,7 @@ require = function () {
                             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 = (0, typed_dom_1.html)('ol', { class: 'annotations' });
                 const references = (0, typed_dom_1.html)('ol', { class: 'references' });
@@ -4869,7 +4869,7 @@ require = function () {
                             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': {
@@ -5126,7 +5126,7 @@ require = function () {
                             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':
@@ -5197,7 +5197,7 @@ require = function () {
                     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 }`)])));
         },
         {
@@ -5231,7 +5231,7 @@ require = function () {
                                 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 }`)],
                         ''
                     ];
@@ -5607,7 +5607,7 @@ require = function () {
                         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 }`)];
             })));
         },
@@ -5636,15 +5636,15 @@ require = function () {
                 '(': /^\((?:[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-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)([
+                    (0, combinator_1.line)((0, combinator_1.open)(heads[delim], (0, combinator_1.trim)((0, combinator_1.subsequence)([
                         ulist_1.checkbox,
                         (0, combinator_1.trimStart)((0, combinator_1.some)(inline_1.inline))
                     ])), true)),
@@ -5654,13 +5654,13 @@ require = function () {
                         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)]);
-            const items = {
+            const heads = {
                 '.': (0, combinator_1.focus)(openers['.'], source => [
                     [`${ source.split('.', 1)[0] }.`],
                     ''
                 ]),
                 '(': (0, combinator_1.focus)(openers['('], source => [
-                    [source.trimEnd().replace(/^\($/, '(1)').replace(/^\((\w+)\)?$/, '($1)')],
+                    [source.replace(/^\($/, '(1)').replace(/^\((\w+)$/, '($1)')],
                     ''
                 ])
             };
@@ -5671,7 +5671,7 @@ require = function () {
                         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', ''))
                 ],
                 ''
@@ -5854,7 +5854,7 @@ require = function () {
                     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),
                 (0, typed_dom_1.html)('br')
             ]), false)));
@@ -6009,7 +6009,7 @@ require = function () {
                         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', ''))],
                 ''
             ]);
@@ -6247,22 +6247,20 @@ require = function () {
             const anchor_1 = _dereq_('./autolink/anchor');
             const source_1 = _dereq_('../source');
             const util_1 = _dereq_('../util');
-            exports.autolink = (0, combinator_1.fmap)((0, combinator_1.validate)(/^(?:[@#>0-9A-Za-z]|[^\x00-\x7F\s])/, (0, combinator_1.guard)(context => {
+            exports.autolink = (0, combinator_1.fmap)((0, combinator_1.validate)(/^(?:[@#>0-9A-Za-z]|\S#)/, (0, combinator_1.guard)(context => {
                 var _a, _b, _c;
                 return (_c = (_b = (_a = context.syntax) === null || _a === void 0 ? void 0 : _a.inline) === null || _b === void 0 ? void 0 : _b.autolink) !== null && _c !== void 0 ? _c : true;
             }, (0, combinator_1.some)((0, combinator_1.union)([
                 url_1.url,
                 email_1.email,
                 (0, source_1.str)(/^[0-9A-Za-z]+(?:[.+_-][0-9A-Za-z]+)*(?:@(?:[0-9A-Za-z]+(?:[.-][0-9A-Za-z]+)*)?)+/),
-                (0, source_1.str)(/^@+(?![0-9A-Za-z]|[^\x00-\x7F\s])/),
-                (0, source_1.str)(/^#+(?![0-9A-Za-z'_]|[^\x00-\x7F\s])/),
                 channel_1.channel,
                 account_1.account,
-                (0, source_1.str)(/^@[0-9A-Za-z]+(?:-[0-9A-Za-z]+)*/),
-                (0, source_1.str)(/^[0-9A-Za-z]+(?=#)|^[^\x00-\x7F\s]+(?=#)/),
+                (0, source_1.str)(/^@+[0-9A-Za-z]*(?:-[0-9A-Za-z]+)*/),
+                (0, source_1.str)(/^(?:[0-9A-Za-z]|[^\x00-\x7F\s])(?=#)/u),
                 hashtag_1.hashtag,
                 hashnum_1.hashnum,
-                (0, source_1.str)(/^#(?:[0-9A-Za-z'_]|[^\x00-\x7F\s])+/),
+                (0, source_1.str)(/^#+(?:[0-9A-Za-z'_]|[^\x00-\x7F\s])*/),
                 anchor_1.anchor
             ])))), ns => ns.length === 1 ? ns : [(0, util_1.stringify)(ns)]);
         },
@@ -8469,9 +8467,9 @@ require = function () {
             const combinator_1 = _dereq_('../../combinator');
             const str_1 = _dereq_('./str');
             const typed_dom_1 = _dereq_('typed-dom');
-            exports.separator = /[\s\x00-\x7F]|[、。！？][^\S\n]*(?=\\\n)/;
+            exports.separator = /[\s\x00-\x7F]|\S#|[、。！？][^\S\n]*(?=\\\n)/;
             exports.nonWhitespace = /[\S\n]|$/;
-            exports.nonAlphanumeric = /[^0-9A-Za-z]|$/;
+            exports.nonAlphanumeric = /[^0-9A-Za-z]|\S#|$/;
             const repeat = (0, str_1.str)(/^(.)\1*/);
             exports.text = (0, combinator_1.creator)((source, context) => {
                 if (source === '')
@@ -8545,7 +8543,7 @@ require = function () {
                         ];
                     default:
                         const b = source[0].trimStart() === '';
-                        const i = b || isAlphanumeric(source[0]) ? source.search(b ? exports.nonWhitespace : exports.nonAlphanumeric) : 1;
+                        const i = b || isAlphanumeric(source[0]) ? source.search(b ? exports.nonWhitespace : exports.nonAlphanumeric) || 1 : 1;
                         return b && i === source.length || b && source[i] === '\n' || b && source[i] === '\\' && source[i + 1] === '\n' ? [
                             [],
                             source.slice(i)
@@ -8596,7 +8594,7 @@ require = function () {
                     ];
                 case 0: {
                         const b = source[0] !== '\n' && source[0].trimStart() === '';
-                        const i = b || (0, text_1.isAlphanumeric)(source[0]) ? source.search(b ? text_1.nonWhitespace : text_1.nonAlphanumeric) : 1;
+                        const i = b || (0, text_1.isAlphanumeric)(source[0]) ? source.search(b ? text_1.nonWhitespace : text_1.nonAlphanumeric) || 1 : 1;
                         return [
                             [source.slice(0, i)],
                             source.slice(i)

package/markdown.d.ts

@@ -1050,8 +1050,6 @@ export namespace MarkdownParser {
         AutolinkParser.UrlParser,
         AutolinkParser.EmailParser,
         SourceParser.StrParser,
-        SourceParser.StrParser,
-        SourceParser.StrParser,
         AutolinkParser.ChannelParser,
         AutolinkParser.AccountParser,
         SourceParser.StrParser,

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.230.0",
+  "version": "0.230.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -503,15 +503,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 +606,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": {
@@ -2927,9 +2927,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.73",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.73.tgz",
+      "integrity": "sha512-RlCffXkE/LliqfA5m29+dVDPB2r72y2D2egMMfIy3Le8ODrxjuZNVo4NIC2yPL01N4xb4nZQLwzi6Z5tGIGLnA==",
       "dev": true
     },
     "elliptic": {
@@ -3036,9 +3036,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 +3049,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": {
@@ -7530,9 +7530,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"
@@ -7985,15 +7985,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.230.0",
+  "version": "0.230.1",
   "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.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')], ''];
   }),

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

@@ -16,8 +16,8 @@ const openers = {
 
 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))/,
+    /^([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_))));
@@ -35,7 +35,7 @@ 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),
@@ -43,13 +43,13 @@ const list = (type: string, delim: string): OListParser.ListParser => fmap(
   ]))),
   es => [format(html('ol', es), type, delim)]);
 
-const items = {
+const heads = {
   '.': focus(
     openers['.'],
     (source: string) => [[`${source.split('.', 1)[0]}.`], '']),
   '(': focus(
     openers['('],
-    (source: string) => [[source.trimEnd().replace(/^\($/, '(1)').replace(/^\((\w+)\)?$/, '($1)')], '']),
+    (source: string) => [[source.replace(/^\($/, '(1)').replace(/^\((\w+)$/, '($1)')], '']),
 } as const;
 
 const iitem = rewrite(contentline, source => [[
@@ -58,7 +58,7 @@ const iitem = rewrite(contentline, source => [[
     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

@@ -36,7 +36,7 @@ const iitem = rewrite(contentline, source => [[
     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.ts

@@ -11,26 +11,23 @@ import { str } from '../source';
 import { stringify } from '../util';
 
 export const autolink: AutolinkParser = fmap(
-  validate(/^(?:[@#>0-9A-Za-z]|[^\x00-\x7F\s])/,
+  validate(/^(?:[@#>0-9A-Za-z]|\S#)/,
   guard(context => context.syntax?.inline?.autolink ?? true,
   some(union([
     url,
     email,
     // Escape unmatched email-like strings.
     str(/^[0-9A-Za-z]+(?:[.+_-][0-9A-Za-z]+)*(?:@(?:[0-9A-Za-z]+(?:[.-][0-9A-Za-z]+)*)?)+/),
-    // Escape repeated symbols.
-    str(/^@+(?![0-9A-Za-z]|[^\x00-\x7F\s])/),
-    str(/^#+(?![0-9A-Za-z'_]|[^\x00-\x7F\s])/),
     channel,
     account,
     // Escape unmatched account-like strings.
-    str(/^@[0-9A-Za-z]+(?:-[0-9A-Za-z]+)*/),
+    str(/^@+[0-9A-Za-z]*(?:-[0-9A-Za-z]+)*/),
     // Escape invalid leading characters.
-    str(/^[0-9A-Za-z]+(?=#)|^[^\x00-\x7F\s]+(?=#)/),
+    str(/^(?:[0-9A-Za-z]|[^\x00-\x7F\s])(?=#)/u),
     hashtag,
     hashnum,
     // Escape unmatched hashtag-like strings.
-    str(/^#(?:[0-9A-Za-z'_]|[^\x00-\x7F\s])+/),
+    str(/^#+(?:[0-9A-Za-z'_]|[^\x00-\x7F\s])*/),
     anchor,
   ])))),
   ns => ns.length === 1 ? ns : [stringify(ns)]);

package/src/parser/inline.test.ts

@@ -168,11 +168,11 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('#a\nb\n#c\n[#d]')), [['<a href="/hashtags/a" class="hashtag">#a</a>', '<br>', 'b', '<br>', '<a href="/hashtags/c" class="hashtag">#c</a>', '<br>', '<a class="index" href="#index:d">d</a>'], '']);
       assert.deepStrictEqual(inspect(parser('##a')), [['##a'], '']);
       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', '<span class="linebreak"> </span>', '<a href="/hashtags/b" class="hashtag">#b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('*a*#b')), [['<em>a</em>', '<a href="/hashtags/b" class="hashtag">#b</a>'], '']);

package/src/parser/source/text.ts

@@ -4,9 +4,9 @@ import { union, focus, creator } from '../../combinator';
 import { str } from './str';
 import { html } from 'typed-dom';
 
-export const separator = /[\s\x00-\x7F]|[、。！？][^\S\n]*(?=\\\n)/;
+export const separator = /[\s\x00-\x7F]|\S#|[、。！？][^\S\n]*(?=\\\n)/;
 export const nonWhitespace = /[\S\n]|$/;
-export const nonAlphanumeric = /[^0-9A-Za-z]|$/;
+export const nonAlphanumeric = /[^0-9A-Za-z]|\S#|$/;
 const repeat = str(/^(.)\1*/);
 
 export const text: TextParser = creator((source, context) => {
@@ -59,7 +59,7 @@ export const text: TextParser = creator((source, context) => {
           assert(source[0] !== '\n');
           const b = source[0].trimStart() === '';
           const i = b || isAlphanumeric(source[0])
-            ? source.search(b ? nonWhitespace : nonAlphanumeric)
+            ? source.search(b ? nonWhitespace : nonAlphanumeric) || 1
             : 1;
           assert(i > 0);
           assert(!['\\', '\n'].includes(source[0]));

package/src/parser/source/unescapable.ts

@@ -12,7 +12,7 @@ export const unescsource: UnescapableSourceParser = creator(source => {
     case 0: {
       const b = source[0] !== '\n' && source[0].trimStart() === '';
       const i = b || isAlphanumeric(source[0])
-        ? source.search(b ? nonWhitespace : nonAlphanumeric)
+        ? source.search(b ? nonWhitespace : nonAlphanumeric) || 1
         : 1;
       assert(i > 0);
       return [[source.slice(0, i)], source.slice(i)];