securemark 0.237.1 → 0.239.0

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

@@ -3,7 +3,7 @@ import { ExtensionParser } from '../../inline';
 import { union, some, validate, guard, context, creator, surround, open, lazy, fmap } from '../../../combinator';
 import { inline } from '../../inline';
 import { indexee, identity } from './indexee';
-import { txt, str } from '../../source';
+import { txt, str, stropt } from '../../source';
 import { startTight, trimNodeEnd } from '../../util';
 import { html, define, defrag } from 'typed-dom';
 import { join } from 'spica/array';
@@ -23,10 +23,11 @@ export const index: IndexParser = lazy(() => creator(validate('[#', ']', '\n', f
     media: false,
     autolink: false,
   }}},
+  open(stropt('|'),
   some(union([
     signature,
     inline,
-  ]), ']', /^\\?\n/)))),
+  ]), ']', /^\\?\n/), true)))),
   ']'),
   ns => [html('a', trimNodeEnd(defrag(ns)))])),
   ([el]: [HTMLAnchorElement]) => [
@@ -40,7 +41,7 @@ export const index: IndexParser = lazy(() => creator(validate('[#', ']', '\n', f
   ]))));
 
 const signature: IndexParser.SignatureParser = lazy(() => creator(fmap(open(
-  /^\s+\|#/,
+  '|#',
   startTight(some(union([bracket, txt]), ']'))),
   ns => [
     html('span', { class: 'indexer', 'data-index': identity(join(ns)).slice(6) }),

package/src/parser/inline/extension/indexee.ts

@@ -22,12 +22,13 @@ export function text(source: HTMLElement | DocumentFragment, optional = false):
   assert(source instanceof DocumentFragment || !source.matches('.indexer'));
   assert(source.querySelectorAll(':scope > .indexer').length <= 1);
   const indexer = source.querySelector(':scope > .indexer');
-  if (indexer) return indexer.getAttribute('data-index')!;
-  if (optional) return '';
+  if (!indexer && optional) return '';
+  const index = indexer?.getAttribute('data-index');
+  if (index) return index;
   assert(!source.querySelector('.annotation, br'));
   const target = source.cloneNode(true) as typeof source;
   for (
-    let es = target.querySelectorAll('code[data-src], .math[data-src], .comment, rt, rp, .reference'),
+    let es = target.querySelectorAll('code[data-src], .math[data-src], .comment, rt, rp, .reference, .checkbox, ul, ol'),
         i = 0, len = es.length; i < len; ++i) {
     const el = es[i];
     switch (el.tagName) {
@@ -36,6 +37,8 @@ export function text(source: HTMLElement | DocumentFragment, optional = false):
         continue;
       case 'RT':
       case 'RP':
+      case 'UL':
+      case 'OL':
         el.remove();
         continue;
     }
@@ -44,6 +47,7 @@ export function text(source: HTMLElement | DocumentFragment, optional = false):
         define(el, el.getAttribute('data-src')!);
         continue;
       case 'comment':
+      case 'checkbox':
         el.remove();
         continue;
       case 'reference':

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

@@ -12,13 +12,14 @@ describe('Unit: parser/inline/extension/indexer', () => {
       assert.deepStrictEqual(inspect(parser(' ')), undefined);
       assert.deepStrictEqual(inspect(parser(' #')), undefined);
       assert.deepStrictEqual(inspect(parser(' #a')), undefined);
-      assert.deepStrictEqual(inspect(parser(' [#]')), undefined);
+      assert.deepStrictEqual(inspect(parser(' [# ]')), undefined);
       assert.deepStrictEqual(inspect(parser(' [#]]')), undefined);
       assert.deepStrictEqual(inspect(parser(' [#a]]')), undefined);
       assert.deepStrictEqual(inspect(parser(' [#&a;]')), undefined);
     });
 
     it('valid', () => {
+      assert.deepStrictEqual(inspect(parser(' [#]')), [['<span class="indexer" data-index=""></span>'], '']);
       assert.deepStrictEqual(inspect(parser(' [#a]')), [['<span class="indexer" data-index="a"></span>'], '']);
       assert.deepStrictEqual(inspect(parser(' [#a] ')), [['<span class="indexer" data-index="a"></span>'], '']);
       assert.deepStrictEqual(inspect(parser(' [#a ]')), [['<span class="indexer" data-index="a"></span>'], '']);

package/src/parser/inline/extension/indexer.ts

@@ -1,14 +1,17 @@
 import { ExtensionParser } from '../../inline';
-import { union, verify, creator, context, surround, fmap } from '../../../combinator';
+import { union, verify, focus, creator, context, surround, fmap } from '../../../combinator';
 import { index } from './index';
 import { html } from 'typed-dom';
 
 export const indexer: ExtensionParser.IndexerParser = creator(fmap(verify(surround(
-  /^\s+(?=\[#[^\s\]])/,
+  /^\s+(?=\[#\S)/,
   context({ syntax: { inline: {
     index: true,
   }}},
-  union([index])),
+  union([
+    focus('[#]', () => [[html('a', { href: '#' })], '']),
+    index,
+  ])),
   /^\s*$/),
   // Indexer is invisible but invalids must be visible.
   ([el]) => el.getElementsByClassName('invalid').length === 0),

package/src/parser/inline/htmlentity.ts

@@ -6,12 +6,12 @@ import { reduce } from 'spica/memoize';
 
 export const unsafehtmlentity: UnsafeHTMLEntityParser = creator(validate('&', focus(
   /^&[0-9A-Za-z]+;/,
-  entity => [[parse(entity) ?? `\0${entity}`], ''])));
+  entity => [[parse(entity) ?? `\x1B${entity}`], ''])));
 
 export const htmlentity: HTMLEntityParser = fmap(
   union([unsafehtmlentity]),
   ([test]) => [
-    test[0] === '\0'
+    test[0] === '\x1B'
       ? html('span', {
           class: 'invalid',
           'data-invalid-syntax': 'htmlentity',

package/src/parser/inline/media.ts

@@ -95,13 +95,13 @@ function sanitize(target: HTMLElement, uri: ReadonlyURL, alt: string): boolean {
       });
       return false;
   }
-  if (alt.includes('\0')) {
+  if (alt.includes('\x1B')) {
     define(target, {
       class: void target.classList.add('invalid'),
       'data-invalid-syntax': 'media',
       'data-invalid-type': 'content',
       'data-invalid-message': `Cannot use invalid HTML entitiy "${alt.match(/&[0-9A-Za-z]+;/)![0]}"`,
-      alt: target.getAttribute('alt')?.replace(/\0/g, ''),
+      alt: target.getAttribute('alt')?.replace(/\x1B/g, ''),
     });
     return false;
   }

package/src/parser/inline/ruby.ts

@@ -83,8 +83,8 @@ function attributes(texts: string[], rubies: string[]): Record<string, string> {
   let attrs: Record<string, string> | undefined;
   for (const ss of [texts, rubies]) {
     for (let i = 0; i < ss.length; ++i) {
-      if (ss[i].indexOf('\0') === -1) continue;
-      ss[i] = ss[i].replace(/\0/g, '');
+      if (ss[i].indexOf('\x1B') === -1) continue;
+      ss[i] = ss[i].replace(/\x1B/g, '');
       attrs ??= {
         class: 'invalid',
         'data-invalid-syntax': 'ruby',

package/src/parser/processor/figure.test.ts

@@ -21,6 +21,7 @@ describe('Unit: parser/processor/figure', () => {
       const target = parse([
         '$fig-a\n> ',
         '$fig-a',
+        '$fig-b',
         '$fig-a',
       ].join('\n\n'));
       for (let i = 0; i < 3; ++i) {
@@ -30,6 +31,7 @@ describe('Unit: parser/processor/figure', () => {
           [
             '<figure data-type="quote" data-label="fig-a" data-group="fig" data-number="1" id="label:fig-a"><div><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 1. </span></figcaption></figure>',
             '<p><a class="label" data-label="fig-a" href="#label:fig-a">Fig. 1</a></p>',
+            '<p><a class="label invalid" data-label="fig-b" data-invalid-syntax="label" data-invalid-type="reference" data-invalid-message="Missing the target figure">$fig-b</a></p>',
             '<p><a class="label" data-label="fig-a" href="#label:fig-a">Fig. 1</a></p>',
           ]);
       }
@@ -98,7 +100,7 @@ describe('Unit: parser/processor/figure', () => {
             '<figure data-type="quote" data-label="fig-a" data-group="fig" data-number="1" id="label:fig-a"><div><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 1. </span></figcaption></figure>',
             '<p><a class="label" data-label="fig-2" href="#label:fig-2">Fig. 2</a></p>',
             '<p><a class="label" data-label="$-4.1.1" href="#label:$-4.1.1">(4.1.1)</a></p>',
-            '<p><a class="label disabled invalid" data-label="fig-1" data-invalid-syntax="label" data-invalid-type="reference" data-invalid-message="Missing the target figure">$fig-1</a></p>',
+            '<p><a class="label invalid" data-label="fig-1" data-invalid-syntax="label" data-invalid-type="reference" data-invalid-message="Missing the target figure">$fig-1</a></p>',
           ]);
       }
     });
@@ -181,7 +183,7 @@ describe('Unit: parser/processor/figure', () => {
             '<h2 id="index:0">0</h2>',
             '<figure data-label="$-0.1.0" data-group="$" class="invalid" data-invalid-syntax="figure" data-invalid-type="argument" data-invalid-message="Base index must be $-x.0 format"></figure>',
             '<figure data-type="quote" data-label="fig-d" data-group="fig" data-number="4.1" id="label:fig-d"><div><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 4.1. </span></figcaption></figure>',
-            '<figure data-label="$-0.0" data-group="$" class="invalid" data-invalid-syntax="figure" data-invalid-type="position" data-invalid-message="Base index declarations must be after level 1 or 2 headings"></figure>',
+            '<figure data-label="$-0.0" data-group="$" class="invalid" data-invalid-syntax="figure" data-invalid-type="position" data-invalid-message="Base index declarations must be after level 1 to 6 headings"></figure>',
             '<figure data-label="$-0.1.0" data-group="$" class="invalid" data-invalid-syntax="figure" data-invalid-type="argument" data-invalid-message="Base index must be $-x.0 format"></figure>',
             '<figure data-label="$-0.4.0" data-group="$" class="invalid" data-invalid-syntax="figure" data-invalid-type="argument" data-invalid-message="Base index must be $-x.0 format"></figure>',
             '<figure data-label="$-0.1.0" data-group="$" class="invalid" data-invalid-syntax="figure" data-invalid-type="argument" data-invalid-message="Base index must be $-x.0 format"></figure>',
@@ -232,17 +234,17 @@ describe('Unit: parser/processor/figure', () => {
         assert.deepStrictEqual(
           [...target.children].map(el => normalize(el.outerHTML)),
           [
-            '<figure data-label="$-0.0" data-group="$" class="invalid" data-invalid-syntax="figure" data-invalid-type="position" data-invalid-message="Base index declarations must be after level 1 or 2 headings"></figure>',
+            '<figure data-label="$-0.0" data-group="$" class="invalid" data-invalid-syntax="figure" data-invalid-type="position" data-invalid-message="Base index declarations must be after level 1 to 6 headings"></figure>',
             '<h2 id="index:0">0</h2>',
             '<figure data-label="$-0.0" data-group="$" hidden="" data-number="0.0"></figure>',
             '<figure data-type="quote" data-label="fig-a" data-group="fig" data-number="0.1" id="label:fig-a"><div><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 0.1. </span></figcaption></figure>',
-            '<figure data-label="$-0.0" data-group="$" class="invalid" data-invalid-syntax="figure" data-invalid-type="position" data-invalid-message="Base index declarations must be after level 1 or 2 headings"></figure>',
+            '<figure data-label="$-0.0" data-group="$" class="invalid" data-invalid-syntax="figure" data-invalid-type="position" data-invalid-message="Base index declarations must be after level 1 to 6 headings"></figure>',
             '<h2 id="index:0">0</h2>',
             '<figure data-type="quote" data-label="fig-b" data-group="fig" data-number="1.1" id="label:fig-b"><div><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 1.1. </span></figcaption></figure>',
-            '<figure data-label="$-0.0" data-group="$" class="invalid" data-invalid-syntax="figure" data-invalid-type="position" data-invalid-message="Base index declarations must be after level 1 or 2 headings"></figure>',
+            '<figure data-label="$-0.0" data-group="$" class="invalid" data-invalid-syntax="figure" data-invalid-type="position" data-invalid-message="Base index declarations must be after level 1 to 6 headings"></figure>',
             '<h3 id="index:0">0</h3>',
             '<figure data-type="quote" data-label="fig-c" data-group="fig" data-number="1.2" id="label:fig-c"><div><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 1.2. </span></figcaption></figure>',
-            '<figure data-label="$-1.0" data-group="$" class="invalid" data-invalid-syntax="figure" data-invalid-type="position" data-invalid-message="Base index declarations must be after level 1 or 2 headings"></figure>',
+            '<figure data-label="$-1.0" data-group="$" class="invalid" data-invalid-syntax="figure" data-invalid-type="position" data-invalid-message="Base index declarations must be after level 1 to 6 headings"></figure>',
             '<h2 id="index:0">0</h2>',
             '<figure data-label="$-0.0" data-group="$" hidden="" data-number="2.0"></figure>',
             '<figure data-type="quote" data-label="fig-d" data-group="fig" data-number="2.1" id="label:fig-d"><div><blockquote></blockquote></div><figcaption><span class="figindex">Fig. 2.1. </span></figcaption></figure>',

package/src/parser/processor/figure.ts

@@ -29,7 +29,7 @@ export function* figure(
     yield;
     const def = defs[i];
     if (def.parentNode !== target) continue;
-    const { tagName, classList } = def;
+    const { tagName } = def;
     if (bases.length === 1 && tagName[0] === 'H') continue;
     assert(base === '0' || bases.length > 1);
     const label = tagName === 'FIGURE'
@@ -38,7 +38,7 @@ export function* figure(
     if (label.endsWith('-')) continue;
     if (label.endsWith('-0')) {
       define(def, {
-        class: void classList.add('invalid'),
+        class: void def.classList.add('invalid'),
         'data-invalid-syntax': 'figure',
         'data-invalid-type': 'argument',
         'data-invalid-message': 'Invalid base index',
@@ -50,7 +50,7 @@ export function* figure(
       // $-x.x.0 is disabled.
       if (label.lastIndexOf('.', label.length - 3) !== -1) {
         define(def, {
-          class: void classList.add('invalid'),
+          class: void def.classList.add('invalid'),
           'data-invalid-syntax': 'figure',
           'data-invalid-type': 'argument',
           'data-invalid-message': 'Base index must be $-x.0 format',
@@ -61,17 +61,17 @@ export function* figure(
       // $-x.0 after h1-h6.
       if (!/^H[1-6]$/.test(def.previousElementSibling?.tagName ?? '')) {
         define(def, {
-          class: void classList.add('invalid'),
+          class: void def.classList.add('invalid'),
           'data-invalid-syntax': 'figure',
           'data-invalid-type': 'position',
-          'data-invalid-message': 'Base index declarations must be after level 1 or 2 headings',
+          'data-invalid-message': messages.declaration,
           hidden: null,
         });
         continue;
       }
-      else {
-        classList.contains('invalid') && define(def, {
-          class: void classList.remove('invalid'),
+      else if (def.getAttribute('data-invalid-message') === messages.declaration) {
+        define(def, {
+          class: void def.classList.remove('invalid'),
           'data-invalid-syntax': null,
           'data-invalid-type': null,
           'data-invalid-message': null,
@@ -118,7 +118,6 @@ export function* figure(
     assert(number.split('.').pop() !== '0');
     !isFixed(label) && numbers.set(group, number);
     assert(!+def.setAttribute('data-number', number));
-    opts.id !== '' && def.setAttribute('id', `label:${opts.id ? `${opts.id}:` : ''}${label}`);
     const figindex = group === '$'
       ? `(${number})`
       : `${capitalize(group)}${group === 'fig' ? '.' : ''} ${number}`;
@@ -126,27 +125,35 @@ export function* figure(
       def.querySelector(':scope > figcaption > .figindex')!,
       group === '$' ? figindex : `${figindex}. `);
     if (labels.has(label)) {
-      if (classList.contains('invalid') &&
-          def.getAttribute('data-invalid-message') !== 'Duplicate label') continue;
+      if (def.classList.contains('invalid')) continue;
       define(def, {
         id: null,
-        class: void classList.add('invalid'),
+        class: void def.classList.add('invalid'),
         'data-invalid-syntax': 'figure',
         'data-invalid-type': 'argument',
-        'data-invalid-message': 'Duplicate label',
+        'data-invalid-message': messages.duplicate,
       });
       continue;
     }
-    else {
-      labels.add(label);
+    else if (def.getAttribute('data-invalid-message') === messages.duplicate) {
       define(def, {
-        class: void classList.remove('invalid'),
+        class: void def.classList.remove('invalid'),
         'data-invalid-syntax': null,
         'data-invalid-type': null,
         'data-invalid-message': null,
       });
     }
+    labels.add(label);
+    opts.id !== '' && def.setAttribute('id', `label:${opts.id ? `${opts.id}:` : ''}${label}`);
     for (const ref of refs.take(label, Infinity)) {
+      if (ref.getAttribute('data-invalid-message') === messages.reference) {
+        define(ref, {
+          class: void ref.classList.remove('invalid'),
+          'data-invalid-syntax': null,
+          'data-invalid-type': null,
+          'data-invalid-message': null,
+        });
+      }
       if (ref.hash.slice(1) === def.id && ref.innerText === figindex) continue;
       yield define(ref,
         opts.id !== '' ? { href: `#${def.id}` } : { class: `${ref.className} disabled` },
@@ -154,12 +161,12 @@ export function* figure(
     }
   }
   for (const [, ref] of refs) {
-    if (opts.id !== '') {
+    if (opts.id !== '' && !ref.classList.contains('invalid')) {
       define(ref, {
-        class: `${ref.className} disabled invalid`,
+        class: void ref.classList.add('invalid'),
         'data-invalid-syntax': 'label',
         'data-invalid-type': 'reference',
-        'data-invalid-message': 'Missing the target figure',
+        'data-invalid-message': messages.reference,
       });
     }
     yield ref;
@@ -167,6 +174,12 @@ export function* figure(
   return;
 }
 
+const messages = {
+  declaration: 'Base index declarations must be after level 1 to 6 headings',
+  duplicate: 'Duplicate label',
+  reference: 'Missing the target figure',
+} as const;
+
 function increment(bases: readonly string[], el: HTMLHeadingElement): string {
   const index = (+el.tagName[1] - 1 || 1) - 1;
   assert(index >= 0);

package/src/parser/segment.test.ts

@@ -4,12 +4,12 @@ describe('Unit: parser/segment', () => {
   describe('segment', () => {
     it('huge input', () => {
       const result = segment(`${'\n'.repeat(10 * 1000 ** 2)}`).next().value?.split('\n', 1)[0];
-      assert(result?.startsWith('\0Too large input'));
+      assert(result?.startsWith('\x07Too large input'));
     });
 
     it('huge segment', () => {
       const result = segment(`${'\n'.repeat(1000 ** 2 - 1)}`).next().value?.split('\n', 1)[0];
-      assert(result?.startsWith('\0Too large segment'));
+      assert(result?.startsWith('\x07Too large segment'));
     });
 
     it('basic', () => {

package/src/parser/segment.ts

@@ -23,7 +23,7 @@ const parser: SegmentParser = union([
 ]);
 
 export function* segment(source: string): Generator<string, undefined, undefined> {
-  if (!validate(source, MAX_INPUT_SIZE)) return yield `\0Too large input over ${MAX_INPUT_SIZE.toLocaleString('en')} bytes.\n${source.slice(0, 1001)}`;
+  if (!validate(source, MAX_INPUT_SIZE)) return yield `\x07Too large input over ${MAX_INPUT_SIZE.toLocaleString('en')} bytes.\n${source.slice(0, 1001)}`;
   assert(source.length < Number.MAX_SAFE_INTEGER);
   while (source !== '') {
     const result = parser(source, {})!;
@@ -36,7 +36,7 @@ export function* segment(source: string): Generator<string, undefined, undefined
       const seg = segs[i];
       validate(seg, MAX_SEGMENT_SIZE)
         ? yield seg
-        : yield `\0Too large segment over ${MAX_SEGMENT_SIZE.toLocaleString('en')} bytes.\n${seg}`
+        : yield `\x07Too large segment over ${MAX_SEGMENT_SIZE.toLocaleString('en')} bytes.\n${seg}`
     }
     source = rest;
   }

package/src/parser/source/str.ts

@@ -3,8 +3,8 @@ import { StrParser } from '../source';
 import { Parser, Context } from '../../combinator/data/parser';
 import { creator } from '../../combinator';
 
-export function str(pattern: string | RegExp, mustConsume?: boolean): StrParser;
-export function str(pattern: string | RegExp, mustConsume = true): Parser<string, Context<StrParser>, []> {
+export function str(pattern: string | RegExp): StrParser;
+export function str(pattern: string | RegExp): Parser<string, Context<StrParser>, []> {
   assert(pattern);
   return typeof pattern === 'string'
     ? creator(source => {
@@ -16,8 +16,27 @@ export function str(pattern: string | RegExp, mustConsume = true): Parser<string
     : creator(source => {
         if (source === '') return;
         const m = source.match(pattern);
-        return m && (!mustConsume || m[0].length > 0)
+        return m && m[0].length > 0
           ? [[m[0]], source.slice(m[0].length)]
           : undefined;
       });
-};
+}
+
+export function stropt(pattern: string | RegExp): StrParser;
+export function stropt(pattern: string | RegExp): Parser<string, Context<StrParser>, []> {
+  assert(pattern);
+  return typeof pattern === 'string'
+    ? creator(source => {
+        if (source === '') return;
+        return source.slice(0, pattern.length) === pattern
+          ? [[pattern], source.slice(pattern.length)]
+          : [[], source];
+      })
+    : creator(source => {
+        if (source === '') return;
+        const m = source.match(pattern);
+        return m
+          ? [[m[0]], source.slice(m[0].length)]
+          : [[], source];
+      });
+}

package/src/parser/source/text.ts

@@ -24,6 +24,7 @@ export const text: TextParser = creator((source, context) => {
             case '。':
             case '！':
             case '？':
+              assert(source[0] !== '\x1B');
               return text(source.slice(1), context);
           }
           break;
@@ -39,8 +40,10 @@ export const text: TextParser = creator((source, context) => {
         case '\\':
           switch (source[1]) {
             case undefined:
+              assert(source[0] !== '\x1B');
               return [[], ''];
             case '\n':
+              assert(source[0] !== '\x1B');
               return [[html('span', { class: 'linebreak' }, ' ')], source.slice(2)];
             default:
               return [[source.slice(1, 2)], source.slice(2)];

package/src/parser/source.ts

@@ -14,5 +14,5 @@ export import AnyLineParser = SourceParser.AnyLineParser;
 export { text, txt, linebreak } from './source/text';
 export { escsource } from './source/escapable';
 export { unescsource } from './source/unescapable';
-export { str } from './source/str';
+export { str, stropt } from './source/str';
 export { contentline, emptyline, anyline } from './source/line';

package/src/parser/util.ts

@@ -55,7 +55,7 @@ export function startLoose<T extends HTMLElement | string>(parser: Parser<T>, ex
 }
 export const isStartLoose = reduce((source: string, context: MarkdownParser.Context, except?: string): boolean => {
   return isStartTight(source.replace(/^[^\S\n]+/, ''), context, except);
-}, (source, _, except = '') => `${source}\0${except}`);
+}, (source, _, except = '') => `${source}\x1E${except}`);
 export function startTight<P extends Parser<unknown>>(parser: P, except?: string): P;
 export function startTight<T>(parser: Parser<T>, except?: string): Parser<T> {
   return (source, context) =>
@@ -93,7 +93,7 @@ const isStartTight = reduce((source: string, context: MarkdownParser.Context, ex
     default:
       return source[0].trimStart() !== '';
   }
-}, (source, _, except = '') => `${source}\0${except}`);
+}, (source, _, except = '') => `${source}\x1E${except}`);
 export function isStartTightNodes(nodes: readonly (HTMLElement | string)[]): boolean {
   if (nodes.length === 0) return true;
   return isVisible(nodes[0], 0);