securemark 0.237.1 → 0.239.0

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.237.1",
+  "version": "0.239.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -432,13 +432,13 @@
       }
     },
     "@npmcli/git": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-3.0.0.tgz",
-      "integrity": "sha512-xfSBJ+KBMZWWqRHFbEgIaXG/LtELHrQZMJ72Gkb3yWdHysu/7+VGOs8ME0c3td7QNQX57Ggo3kYL6ylcd70/kA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-3.0.1.tgz",
+      "integrity": "sha512-UU85F/T+F1oVn3IsB/L6k9zXIMpXBuUBE25QDH0SsURwT6IOBqkC7M16uqo2vVZIyji3X1K4XH9luip7YekH1A==",
       "dev": true,
       "requires": {
-        "@npmcli/promise-spawn": "^1.3.2",
-        "lru-cache": "^7.3.1",
+        "@npmcli/promise-spawn": "^3.0.0",
+        "lru-cache": "^7.4.4",
         "mkdirp": "^1.0.4",
         "npm-pick-manifest": "^7.0.0",
         "proc-log": "^2.0.0",
@@ -476,9 +476,9 @@
       }
     },
     "@npmcli/move-file": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
-      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.0.tgz",
+      "integrity": "sha512-UR6D5f4KEGWJV6BGPH3Qb2EtgH+t+1XQ1Tt85c7qicN6cezzuHPdZwwAxqZr4JLtnQu0LZsTza/5gmNmSl8XLg==",
       "dev": true,
       "requires": {
         "mkdirp": "^1.0.4",
@@ -494,28 +494,28 @@
       }
     },
     "@npmcli/node-gyp": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz",
-      "integrity": "sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz",
+      "integrity": "sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==",
       "dev": true
     },
     "@npmcli/promise-spawn": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz",
-      "integrity": "sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-3.0.0.tgz",
+      "integrity": "sha512-s9SgS+p3a9Eohe68cSI3fi+hpcZUmXq5P7w0kMlAsWVtR7XbK3ptkZqKT2cK1zLDObJ3sR+8P59sJE0w/KTL1g==",
       "dev": true,
       "requires": {
         "infer-owner": "^1.0.4"
       }
     },
     "@npmcli/run-script": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-3.0.1.tgz",
-      "integrity": "sha512-o2fkld5hYwu9sKYzoXTpqEocMnDLaigobaPzLaGB63k/ExmLBTaB+KpfKlpcIePPnuP8RFR+0GDI4KopJCM6Xg==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-3.0.2.tgz",
+      "integrity": "sha512-vdjD/PMBl+OX9j9C9irx5sCCIKfp2PWkpPNH9zxvlJAfSZ3Qp5aU412v+O3PFJl3R1PFNwuyChCqHg4ma6ci2Q==",
       "dev": true,
       "requires": {
-        "@npmcli/node-gyp": "^1.0.3",
-        "@npmcli/promise-spawn": "^1.3.2",
+        "@npmcli/node-gyp": "^2.0.0",
+        "@npmcli/promise-spawn": "^3.0.0",
         "node-gyp": "^9.0.0",
         "read-package-json-fast": "^2.0.3"
       }
@@ -1777,13 +1777,13 @@
       "dev": true
     },
     "cacache": {
-      "version": "16.0.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.0.3.tgz",
-      "integrity": "sha512-eC7wYodNCVb97kuHGk5P+xZsvUJHkhSEOyNwkenqQPAsOtrTjvWOE5vSPNBpz9d8X3acIf6w2Ub5s4rvOCTs4g==",
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.0.4.tgz",
+      "integrity": "sha512-U0D4wF3/W8ZgK4qDA5fTtOVSr0gaDfd5aa7tUdAV0uukVWKsAIn6SzXQCoVlg7RWZiJa+bcsM3/pXLumGaL2Ug==",
       "dev": true,
       "requires": {
         "@npmcli/fs": "^2.1.0",
-        "@npmcli/move-file": "^1.1.2",
+        "@npmcli/move-file": "^2.0.0",
         "chownr": "^2.0.0",
         "fs-minipass": "^2.1.0",
         "glob": "^7.2.0",
@@ -1797,7 +1797,7 @@
         "p-map": "^4.0.0",
         "promise-inflight": "^1.0.1",
         "rimraf": "^3.0.2",
-        "ssri": "^8.0.1",
+        "ssri": "^9.0.0",
         "tar": "^6.1.11",
         "unique-filename": "^1.1.1"
       },
@@ -1923,9 +1923,9 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001324",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001324.tgz",
-      "integrity": "sha512-/eYp1J6zYh1alySQB4uzYFkLmxxI8tk0kxldbNHXp8+v+rdMKdUBNjRLz7T7fz6Iox+1lIdYpc7rq6ZcXfTukg==",
+      "version": "1.0.30001325",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001325.tgz",
+      "integrity": "sha512-sB1bZHjseSjDtijV1Hb7PB2Zd58Kyx+n/9EotvZ4Qcz2K3d0lWB8dB4nb8wN/TsOGFq3UuAm0zQZNQ4SoR7TrQ==",
       "dev": true
     },
     "chalk": {
@@ -4915,9 +4915,9 @@
       }
     },
     "graceful-fs": {
-      "version": "4.2.9",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
-      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
       "dev": true
     },
     "growl": {
@@ -7114,9 +7114,9 @@
       }
     },
     "make-fetch-happen": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.1.1.tgz",
-      "integrity": "sha512-3/mCljDQNjmrP7kl0vhS5WVlV+TvSKoZaFhdiYV7MOijEnrhrjaVnqbp/EY/7S+fhUB2KpH7j8c1iRsIOs+kjw==",
+      "version": "10.1.2",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.1.2.tgz",
+      "integrity": "sha512-GWMGiZsKVeJACQGJ1P3Z+iNec7pLsU6YW1q11eaPn3RR8nRXHppFWfP7Eu0//55JK3hSjrAQRl8sDa5uXpq1Ew==",
       "dev": true,
       "requires": {
         "agentkeepalive": "^4.2.1",
@@ -7134,7 +7134,7 @@
         "negotiator": "^0.6.3",
         "promise-retry": "^2.0.1",
         "socks-proxy-agent": "^6.1.1",
-        "ssri": "^8.0.1"
+        "ssri": "^9.0.0"
       }
     },
     "make-iterator": {
@@ -8127,9 +8127,9 @@
       }
     },
     "npm-install-checks": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-4.0.0.tgz",
-      "integrity": "sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-5.0.0.tgz",
+      "integrity": "sha512-65lUsMI8ztHCxFz5ckCEC44DRvEGdZX5usQFriauxHEwt7upv1FKaQEmAtU0YnOAdwuNWCmk64xYiQABNrEyLA==",
       "dev": true,
       "requires": {
         "semver": "^7.1.1"
@@ -8176,12 +8176,12 @@
       }
     },
     "npm-pick-manifest": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-7.0.0.tgz",
-      "integrity": "sha512-njM1AcdioFaKd0JSGtLO09YA1WRwctjGQJbnHGmKS+u+uwP8oFvtZtOQWPYdxrnY5eJud3wn8OpH4sEIx6+GEQ==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-7.0.1.tgz",
+      "integrity": "sha512-IA8+tuv8KujbsbLQvselW2XQgmXWS47t3CB0ZrzsRZ82DbDfkcFunOaPm4X7qNuhMfq+FmV7hQT4iFVpHqV7mg==",
       "dev": true,
       "requires": {
-        "npm-install-checks": "^4.0.0",
+        "npm-install-checks": "^5.0.0",
         "npm-normalize-package-bin": "^1.0.1",
         "npm-package-arg": "^9.0.0",
         "semver": "^7.3.5"
@@ -8497,14 +8497,14 @@
       }
     },
     "pacote": {
-      "version": "13.0.5",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-13.0.5.tgz",
-      "integrity": "sha512-6CYfot3/rUAn3qqzF2d/jrrXm5HlBtvaSgfmg0VtOUAdJ8fbSq21BJwftMGArkL71yXHIbUJ7Bt5B04547HELA==",
+      "version": "13.1.0",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-13.1.0.tgz",
+      "integrity": "sha512-Ns2chroFx26U4Bd+qm/ETxHGv+HLafoy5TVAcYHigIqANZ+kkk6PANMr1KAugNYecnrN+5lwwiWyBeu40nuU7Q==",
       "dev": true,
       "requires": {
         "@npmcli/git": "^3.0.0",
         "@npmcli/installed-package-contents": "^1.0.7",
-        "@npmcli/promise-spawn": "^1.2.0",
+        "@npmcli/promise-spawn": "^3.0.0",
         "@npmcli/run-script": "^3.0.1",
         "cacache": "^16.0.0",
         "chownr": "^2.0.0",
@@ -8521,7 +8521,7 @@
         "read-package-json": "^5.0.0",
         "read-package-json-fast": "^2.0.3",
         "rimraf": "^3.0.2",
-        "ssri": "^8.0.1",
+        "ssri": "^9.0.0",
         "tar": "^6.1.11"
       },
       "dependencies": {
@@ -10327,9 +10327,9 @@
       "dev": true
     },
     "ssri": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
-      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.0.tgz",
+      "integrity": "sha512-Y1Z6J8UYnexKFN1R/hxUaYoY2LVdKEzziPmVAFKiKX8fiwvCJTVzn/xYE9TEWod5OVyNfIHHuVfIEuBClL/uJQ==",
       "dev": true,
       "requires": {
         "minipass": "^3.1.1"

package/package.json

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

package/src/combinator/data/parser/subsequence.ts

@@ -5,13 +5,9 @@ import { inits } from './inits';
 export function subsequence<P extends Parser<unknown>>(parsers: SubParsers<P>): SubTree<P> extends Tree<P> ? P : Parser<SubTree<P>, Context<P>, SubParsers<P>>;
 export function subsequence<T, D extends Parser<T>[]>(parsers: D): Parser<T, Ctx, D> {
   assert(parsers.every(f => f));
-  switch (parsers.length) {
-    case 0:
-    case 1:
-      return union(parsers);
-    case 2:
-      return union([inits(parsers), parsers[1]] as unknown as D);
-    default:
-      return subsequence([parsers[0], subsequence(parsers.slice(1))] as unknown as D);
-  }
+  return union(
+    parsers.map((_, i) =>
+      i < parsers.length - 1
+        ? inits([parsers[i], subsequence(parsers.slice(i + 1))])
+        : parsers[i]) as D);
 }

package/src/combinator/data/parser/tails.ts

@@ -4,5 +4,5 @@ import { sequence } from './sequence';
 
 export function tails<P extends Parser<unknown>>(parsers: SubParsers<P>): SubTree<P> extends Tree<P> ? P : Parser<SubTree<P>, Context<P>, SubParsers<P>>;
 export function tails<T, D extends Parser<T>[]>(parsers: D): Parser<T, Ctx, D> {
-  return union(parsers.map((_, i) => sequence(parsers.slice(i))) as unknown as D);
+  return union(parsers.map((_, i) => sequence(parsers.slice(i))) as D);
 }

package/src/combinator/data/parser/union.ts

@@ -15,6 +15,6 @@ export function union<T, D extends Parser<T>[]>(parsers: D): Parser<T, Ctx, D> {
         'return (source, context) =>',
         '0',
         ...parsers.map((_, i) => `|| parsers[${i}](source, context)`),
-      ].join(''))(parsers);
+      ].join('\n'))(parsers);
   }
 }

package/src/debug.test.ts

@@ -19,7 +19,7 @@ export function inspect(result: Result<HTMLElement | string>, until: number | st
         ? until
         : ~(~node.outerHTML.indexOf(until) || -Infinity) + until.length;
       const el = html('div');
-      assert(!node.outerHTML.match(/[\0\x7F]/));
+      assert(!node.outerHTML.match(/[\x00-\x08\x0B-\x1F\x7F]/));
       el.innerHTML = node.outerHTML.slice(0, until);
       if (node.outerHTML.length <= until) {
         assert(node.outerHTML === el.innerHTML);

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

@@ -47,7 +47,7 @@ describe('Unit: parser/block/codeblock', () => {
     it('attribute', () => {
       assert.deepStrictEqual(inspect(parser('```0\n```')), [['<pre class="code language-0" translate="no" data-lang="0"></pre>'], '']);
       assert.deepStrictEqual(inspect(parser('```a\n```')), [['<pre class="code language-a" translate="no" data-lang="a"></pre>'], '']);
-      assert.deepStrictEqual(inspect(parser('```A\n```')), [['<pre class="text" translate="no" data-path="A"></pre>'], '']);
+      assert.deepStrictEqual(inspect(parser('```A\n```')), [['<pre class="code language-a" translate="no" data-lang="a"></pre>'], '']);
       assert.deepStrictEqual(inspect(parser('```a-b\n```')), [['<pre class="code language-a-b" translate="no" data-lang="a-b"></pre>'], '']);
       assert.deepStrictEqual(inspect(parser('```a-b0\n```')), [['<pre class="code language-a-b0" translate="no" data-lang="a-b0"></pre>'], '']);
       assert.deepStrictEqual(inspect(parser('```a--b\n```')), [['<pre class="text" translate="no" data-path="a--b"></pre>'], '']);
@@ -62,7 +62,10 @@ describe('Unit: parser/block/codeblock', () => {
       assert.deepStrictEqual(inspect(parser('```.b\n```')), [['<pre class="text" translate="no" data-path=".b"></pre>'], '']);
       assert.deepStrictEqual(inspect(parser('```b.c\n```')), [['<pre class="code language-c" translate="no" data-lang="c" data-path="b.c"></pre>'], '']);
       assert.deepStrictEqual(inspect(parser('```a b.c\n```')), [['<pre class="code language-a" translate="no" data-lang="a" data-path="b.c"></pre>'], '']);
-      assert.deepStrictEqual(inspect(parser('```A b.c\n```')), [['<pre class="invalid" translate="no">```A b.c\n```</pre>'], '']);
+      assert.deepStrictEqual(inspect(parser('```a 1\n```')), [['<pre class="code language-a" translate="no" data-lang="a" data-line="1"></pre>'], '']);
+      assert.deepStrictEqual(inspect(parser('``` 1\n```')), [['<pre class="text" translate="no" data-line="1"></pre>'], '']);
+      assert.deepStrictEqual(inspect(parser('``` 1,2-3\n```')), [['<pre class="text" translate="no" data-line="1,2-3"></pre>'], '']);
+      assert.deepStrictEqual(inspect(parser('``` 1 b.c\n```')), [['<pre class="code language-c" translate="no" data-lang="c" data-line="1" data-path="b.c"></pre>'], '']);
     });
 
   });

package/src/parser/block/codeblock.ts

@@ -3,12 +3,10 @@ import { CodeBlockParser } from '../block';
 import { eval } from '../../combinator/data/parser';
 import { some, block, validate, fence, clear, fmap } from '../../combinator';
 import { autolink } from '../autolink';
-import { escsource } from '../source';
 import { html, defrag } from 'typed-dom';
-import { join } from 'spica/array';
 
-const opener = /^(`{3,})(?!`)(\S*)([^\n]*)(?:$|\n)/;
-const language = /^[0-9a-z]+(?:-[a-z][0-9a-z]*)*$/;
+const opener = /^(`{3,})(?!`)([^\n]*)(?:$|\n)/;
+const language = /^[0-9a-z]+(?:-[a-z][0-9a-z]*)*$/i;
 
 export const segment: CodeBlockParser.SegmentParser = block(validate('```',
   clear(fence(opener, 300))));
@@ -19,35 +17,55 @@ export const segment_: CodeBlockParser.SegmentParser = block(validate('```',
 export const codeblock: CodeBlockParser = block(validate('```', fmap(
   fence(opener, 300),
   // Bug: Type mismatch between outer and inner.
-  ([body, closer, opener, delim, lang, param]: string[], _, context) => {
-    [lang, param] = language.test(lang)
-      ? [lang, param]
-      : ['', lang + param];
-    param = param.trim();
-    const path = join(eval(some(escsource, /^\s/)(param, context), []));
-    if (!closer || param !== path) return [html('pre', {
+  ([body, closer, opener, delim, param]: string[], _, context) => {
+    const params = param.match(/(?:\\.?|\S)+/g)?.reduce<{
+      lang?: string;
+      path?: string;
+      line?: string;
+      invalid?: string;
+    }>((params, value, i) => {
+      let name: string;
+      switch (true) {
+        case i === 0
+          && value[0] === param[0]
+          && language.test(value):
+          name = 'lang';
+          value = value.toLowerCase();
+          break;
+        case /^\d+(?:[,-]\d+)*$/.test(value):
+          name = 'line';
+          break;
+        default:
+          name = 'path';
+          if (!params.lang) {
+            const file = value.split('/').pop() ?? '';
+            params.lang = file && file.includes('.', 1)
+              ? file.split('.').pop()?.match(language)?.[0].toLowerCase()
+              : params.lang;
+          }
+      }
+      name in params
+        ? params.invalid = `Duplicate ${name} value`
+        : params[name] = value;
+      return params;
+    }, {}) ?? {};
+    if (!closer || params.invalid) return [html('pre', {
       class: 'invalid',
       translate: 'no',
       'data-invalid-syntax': 'codeblock',
       'data-invalid-type': !closer ? 'fence' : 'argument',
-      'data-invalid-message': !closer ? `Missing the closing delimiter "${delim}"` : 'Invalid argument',
+      'data-invalid-message': !closer ? `Missing the closing delimiter "${delim}"` : params.invalid,
     }, `${opener}${body}${closer}`)];
-    const file = path.split('/').pop() ?? '';
-    const ext = file && file.includes('.', 1)
-      ? file.split('.').pop()!
-      : '';
-    lang = language.test(lang || ext)
-      ? lang || ext
-      : lang && 'invalid';
     const el = html('pre',
       {
-        class: lang ? `code language-${lang}` : 'text',
+        class: params.lang ? `code language-${params.lang}` : 'text',
         translate: 'no',
-        'data-lang': lang || undefined,
-        'data-path': path || undefined,
+        'data-lang': params.lang || undefined,
+        'data-line': params.line || undefined,
+        'data-path': params.path || undefined,
       },
-      lang
-        ? context.caches?.code?.get(`${lang}\n${body.slice(0, -1)}`)?.cloneNode(true).childNodes ||
+      params.lang
+        ? context.caches?.code?.get(`${params.lang ?? ''}\n${body.slice(0, -1)}`)?.cloneNode(true).childNodes ||
           body.slice(0, -1) || undefined
         : defrag(eval(some(autolink)(body.slice(0, -1), context), [])));
     return [el];

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

@@ -14,7 +14,7 @@ describe('Unit: parser/block/extension/fig', () => {
       assert.deepStrictEqual(inspect(parser('[$group-name]\n !https://host')), undefined);
       assert.deepStrictEqual(inspect(parser('[$group-name]\n\n!https://host')), undefined);
       assert.deepStrictEqual(inspect(parser('[$group-name]a\nhttps://host')), undefined);
-      assert.deepStrictEqual(inspect(parser('[$group-name]a\n!https://host')), [['<figure data-type="media" data-label="group-name" data-group="group" class="invalid"><div><a href="https://host" target="_blank"><img class="media" data-src="https://host" alt=""></a></div><figcaption><span class="figindex"></span></figcaption></figure>'], '']);
+      assert.deepStrictEqual(inspect(parser('[$group-name]a\n!https://host')), undefined);
       assert.deepStrictEqual(inspect(parser('[$group-name] a\nhttps://host')), undefined);
       assert.deepStrictEqual(inspect(parser('[$group-name] a\n!https://host')), [['<figure data-type="media" data-label="group-name" data-group="group" class="invalid"><div><a href="https://host" target="_blank"><img class="media" data-src="https://host" alt=""></a></div><figcaption><span class="figindex"></span></figcaption></figure>'], '']);
       assert.deepStrictEqual(inspect(parser('$-a\n$-b')), undefined);

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

@@ -13,7 +13,7 @@ import FigParser = ExtensionParser.FigParser;
 
 export const segment: FigParser.SegmentParser = block(validate(['[$', '$'],
   sequence([
-    line(close(seg_label, /^.*\n/)),
+    line(close(seg_label, /^(?=\s).*\n/)),
     union([
       seg_code,
       seg_math,

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

@@ -24,6 +24,8 @@ describe('Unit: parser/block/extension/figure', () => {
       assert.deepStrictEqual(inspect(parser('~~~figure [$group-name]a\n!https://host\n~~~')), [['<figure data-type="media" data-label="group-name" data-group="group" class="invalid"><div><a href="https://host" target="_blank"><img class="media" data-src="https://host" alt=""></a></div><figcaption><span class="figindex"></span></figcaption></figure>'], '']);
       assert.deepStrictEqual(inspect(parser('~~~figure [$group-name] a\nhttps://host\n~~~')), undefined);
       assert.deepStrictEqual(inspect(parser('~~~figure [$group-name] a\n!https://host\n~~~')), [['<figure data-type="media" data-label="group-name" data-group="group" class="invalid"><div><a href="https://host" target="_blank"><img class="media" data-src="https://host" alt=""></a></div><figcaption><span class="figindex"></span></figcaption></figure>'], '']);
+      assert.deepStrictEqual(inspect(parser('~~~figure a[$group-name]\n!https://host\n~~~')), undefined);
+      assert.deepStrictEqual(inspect(parser('~~~figure a [$group-name]\n!https://host\n~~~')), undefined);
       assert.deepStrictEqual(inspect(parser('~~~ [$group-name]\n!https://host\n~~~')), undefined);
       assert.deepStrictEqual(inspect(parser('~~~ $group-name\n!https://host\n~~~')), undefined);
       assert.deepStrictEqual(inspect(parser(' ~~~figure [$group-name]\n!https://host\n~~~')), undefined);

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

@@ -2,7 +2,7 @@ import { undefined } from 'spica/global';
 import { ExtensionParser } from '../../block';
 import { union, inits, sequence, some, block, line, rewrite, context, close, match, convert, trim, fmap } from '../../../combinator';
 import { str, contentline, emptyline } from '../../source';
-import { label, segment as seg_label } from '../../inline/extension/label';
+import { label } from '../../inline/extension/label';
 import { ulist } from '../ulist';
 import { olist } from '../olist';
 import { table as styled_table } from '../table';
@@ -27,7 +27,7 @@ export const segment: FigureParser.SegmentParser = block(match(
   ([, fence], closer = new RegExp(String.raw`^${fence}[^\S\n]*(?:$|\n)`)) =>
     close(
       sequence([
-        line(close(seg_label, /^.*\n/)),
+        contentline,
         inits([
           // All parsers which can include closing terms.
           union([
@@ -85,10 +85,6 @@ export const figure: FigureParser = block(rewrite(segment, fmap(
 
 function attributes(label: string, param: string, content: HTMLElement, caption: readonly HTMLElement[]): Record<string, string | undefined> {
   const group = label.split('-', 1)[0];
-  const invalidLabel = /^[^-]+-(?:[0-9]+\.)*0$/.test(label);
-  const invalidParam = param.trimStart() !== '';
-  const invalidContent = group === '$' && (!content.classList.contains('math') || caption.length > 0);
-  const invalid = invalidLabel || invalidParam || invalidContent || undefined;
   let type: string = content.className.split(/\s/)[0];
   switch (type || content.tagName) {
     case 'UL':
@@ -113,27 +109,28 @@ function attributes(label: string, param: string, content: HTMLElement, caption:
     default:
       assert(false);
   }
+  const invalid =
+    /^[^-]+-(?:[0-9]+\.)*0$/.test(label) && {
+      'data-invalid-type': 'label',
+      'data-invalid-message': 'The last part of the fixed label numbers must not be 0',
+    } ||
+    param.trimStart() !== '' && {
+      'data-invalid-type': 'argument',
+      'data-invalid-message': 'Invalid argument',
+    } ||
+    group === '$' && (!content.classList.contains('math') || caption.length > 0) && {
+      'data-invalid-type': 'content',
+      'data-invalid-message': 'A figure labeled to define a formula number can contain only a math formula and no caption',
+    } ||
+    undefined;
   return {
     'data-type': type,
     'data-label': label,
     'data-group': group,
-    class: invalid && 'invalid',
-    ...
-      invalidLabel && {
-        'data-invalid-syntax': 'figure',
-        'data-invalid-type': 'label',
-        'data-invalid-message': 'The last part of the fixed label numbers must not be 0',
-      } ||
-      invalidParam && {
-        'data-invalid-syntax': 'figure',
-        'data-invalid-type': 'argument',
-        'data-invalid-message': 'Invalid argument',
-      } ||
-      invalidContent && {
-        'data-invalid-syntax': 'figure',
-        'data-invalid-type': 'content',
-        'data-invalid-message': 'A figure labeled to define a formula number can contain only a math formula and no caption',
-      } ||
-      undefined,
+    ...invalid && {
+      class: 'invalid',
+      'data-invalid-syntax': 'figure',
+      ...invalid,
+    },
   };
 }

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

@@ -126,9 +126,11 @@ describe('Unit: parser/block/olist', () => {
 
     it('indexer', () => {
       assert.deepStrictEqual(inspect(parser('1. [#a]')), [['<ol><li><a class="index" href="#index:a">a</a></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser('1. a [#]')), [['<ol><li id="index:a">a<span class="indexer" data-index=""></span></li></ol>'], '']);
       assert.deepStrictEqual(inspect(parser('1. a [#b]')), [['<ol><li id="index:b">a<span class="indexer" data-index="b"></span></li></ol>'], '']);
       assert.deepStrictEqual(inspect(parser('1. [ ] [#a]')), [['<ol class="checklist"><li><span class="checkbox">☐</span><a class="index" href="#index:a">a</a></li></ol>'], '']);
       assert.deepStrictEqual(inspect(parser('1. [ ] a [#b]')), [['<ol class="checklist"><li id="index:b"><span class="checkbox">☐</span>a<span class="indexer" data-index="b"></span></li></ol>'], '']);
+      assert.deepStrictEqual(inspect(parser('1. a [#]\n 1. c [#d]')), [['<ol><li id="index:a">a<span class="indexer" data-index=""></span><ol><li id="index:d">c<span class="indexer" data-index="d"></span></li></ol></li></ol>'], '']);
       assert.deepStrictEqual(inspect(parser('1. a [#b]\n 1. c [#d]')), [['<ol><li id="index:b">a<span class="indexer" data-index="b"></span><ol><li id="index:d">c<span class="indexer" data-index="d"></span></li></ol></li></ol>'], '']);
     });
 

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

@@ -68,9 +68,11 @@ describe('Unit: parser/block/ulist', () => {
 
     it('indexer', () => {
       assert.deepStrictEqual(inspect(parser('- [#a]')), [['<ul><li><a class="index" href="#index:a">a</a></li></ul>'], '']);
+      assert.deepStrictEqual(inspect(parser('- a [#]')), [['<ul><li id="index:a">a<span class="indexer" data-index=""></span></li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- a [#b]')), [['<ul><li id="index:b">a<span class="indexer" data-index="b"></span></li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- [ ] [#a]')), [['<ul class="checklist"><li><span class="checkbox">☐</span><a class="index" href="#index:a">a</a></li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- [ ] a [#b]')), [['<ul class="checklist"><li id="index:b"><span class="checkbox">☐</span>a<span class="indexer" data-index="b"></span></li></ul>'], '']);
+      assert.deepStrictEqual(inspect(parser('- a [#]\n - c [#d]')), [['<ul><li id="index:a">a<span class="indexer" data-index=""></span><ul><li id="index:d">c<span class="indexer" data-index="d"></span></li></ul></li></ul>'], '']);
       assert.deepStrictEqual(inspect(parser('- a [#b]\n - c [#d]')), [['<ul><li id="index:b">a<span class="indexer" data-index="b"></span><ul><li id="index:d">c<span class="indexer" data-index="d"></span></li></ul></li></ul>'], '']);
     });
 

package/src/parser/block.ts

@@ -54,7 +54,7 @@ export const block: BlockParser = creator(error(
 
 function error(parser: BlockParser): BlockParser {
   return recover<BlockParser>(fallback(
-    open('\0', source => { throw new Error(source.split('\n', 1)[0]); }),
+    open('\x07', source => { throw new Error(source.split('\n', 1)[0]); }),
     parser),
     (source, { id }, reason) => [[
       html('h1',
@@ -71,7 +71,7 @@ function error(parser: BlockParser): BlockParser {
           translate: 'no',
         },
         source
-          .replace(/^\0.*\n/, '')
+          .replace(/^\x07.*\n/, '')
           .slice(0, 1001)
           .replace(/^(.{997}).{4}$/s, '$1...') || undefined),
     ], '']);

package/src/parser/inline/comment.ts

@@ -21,4 +21,4 @@ export const comment: CommentParser = lazy(() => creator(validate('[#', match(
         ]),
       ], rest],
       ([as, bs = []], rest) => [unshift(as, bs), rest]),
-  ([, fence]) => fence)))));
+  ([, fence]) => fence.length)))));

package/src/parser/inline/extension/index.test.ts

@@ -42,6 +42,7 @@ describe('Unit: parser/inline/extension/index', () => {
       assert.deepStrictEqual(inspect(parser('[#a  ]')), [['<a class="index" href="#index:a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a b]')), [['<a class="index" href="#index:a_b">a b</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a  b]')), [['<a class="index" href="#index:a_b">a  b</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a \\ ]')), [['<a class="index" href="#index:a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a &nbsp;]')), [['<a class="index" href="#index:a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a <wbr>]')), [['<a class="index" href="#index:a">a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a [# b #]]')), [['<a class="index" href="#index:a">a <span class="comment"><input type="checkbox"><span>[# b #]</span></span></a>'], '']);
@@ -70,21 +71,26 @@ describe('Unit: parser/inline/extension/index', () => {
       assert.deepStrictEqual(inspect(parser('[#|]')), [['<a class="index" href="#index:|">|</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#|#]')), [['<a class="index" href="#index:|#">|#</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#|#b]')), [['<a class="index" href="#index:|#b">|#b</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#a|#b]')), [['<a class="index" href="#index:a|#b">a|#b</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#a |]')), [['<a class="index" href="#index:a_|">a |</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#a |#]')), [['<a class="index" href="#index:a_|#">a |#</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#a |# ]')), [['<a class="index" href="#index:a_|#">a |#</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#a |#\\ ]')), [['<a class="index" href="#index:a_|#">a |#</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a|]')), [['<a class="index" href="#index:a|">a|</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a|#]')), [['<a class="index" href="#index:a|#">a|#</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a|# ]')), [['<a class="index" href="#index:a|#">a|#</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a|#\\ ]')), [['<a class="index" href="#index:a|#">a|#</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a|#b]')), [['<a class="index" href="#index:b">a<span class="indexer" data-index="b"></span></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a|#b ]')), [['<a class="index" href="#index:b">a<span class="indexer" data-index="b"></span></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a|#b  ]')), [['<a class="index" href="#index:b">a<span class="indexer" data-index="b"></span></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a|#\\b]')), [['<a class="index" href="#index:b">a<span class="indexer" data-index="b"></span></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a|#*b*]')), [['<a class="index" href="#index:*b*">a<span class="indexer" data-index="*b*"></span></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a|#b c]')), [['<a class="index" href="#index:b_c">a<span class="indexer" data-index="b_c"></span></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a|#b  c]')), [['<a class="index" href="#index:b_c">a<span class="indexer" data-index="b_c"></span></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a|#[]]')), [['<a class="index" href="#index:[]">a<span class="indexer" data-index="[]"></span></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a|#&copy;]')), [['<a class="index" href="#index:&amp;copy;">a<span class="indexer" data-index="&amp;copy;"></span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a |#b]')), [['<a class="index" href="#index:b">a<span class="indexer" data-index="b"></span></a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#a |#b ]')), [['<a class="index" href="#index:b">a<span class="indexer" data-index="b"></span></a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#a |#b  ]')), [['<a class="index" href="#index:b">a<span class="indexer" data-index="b"></span></a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#a |#\\b]')), [['<a class="index" href="#index:b">a<span class="indexer" data-index="b"></span></a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#a |#*b*]')), [['<a class="index" href="#index:*b*">a<span class="indexer" data-index="*b*"></span></a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#a |#b c]')), [['<a class="index" href="#index:b_c">a<span class="indexer" data-index="b_c"></span></a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#a |#b  c]')), [['<a class="index" href="#index:b_c">a<span class="indexer" data-index="b_c"></span></a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#a |#[]]')), [['<a class="index" href="#index:[]">a<span class="indexer" data-index="[]"></span></a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#a |#&copy;]')), [['<a class="index" href="#index:&amp;copy;">a<span class="indexer" data-index="&amp;copy;"></span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a  |#b]')), [['<a class="index" href="#index:b">a<span class="indexer" data-index="b"></span></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a \\ |#b]')), [['<a class="index" href="#index:b">a<span class="indexer" data-index="b"></span></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a &nbsp;|#b]')), [['<a class="index" href="#index:b">a<span class="indexer" data-index="b"></span></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a <wbr>|#b]')), [['<a class="index" href="#index:b">a<span class="indexer" data-index="b"></span></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a [# b #]|#c]')), [['<a class="index" href="#index:c">a <span class="comment"><input type="checkbox"><span>[# b #]</span></span><span class="indexer" data-index="c"></span></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#a\\ |#b]')), [['<a class="index" href="#index:b">a<span class="indexer" data-index="b"></span></a>'], '']);
     });
 
   });