securemark 0.242.0 → 0.243.2

package/src/parser/inline/html.ts

@@ -1,5 +1,5 @@
 import { undefined } from 'spica/global';
-import { isFrozen, ObjectEntries, ObjectFreeze, ObjectSetPrototypeOf, ObjectValues } from 'spica/alias';
+import { isFrozen, ObjectEntries } from 'spica/alias';
 import { MarkdownParser } from '../../../markdown';
 import { HTMLParser } from '../inline';
 import { union, some, validate, context, creator, surround, open, match, lazy } from '../../combinator';
@@ -11,14 +11,14 @@ import { memoize } from 'spica/memoize';
 import { Cache } from 'spica/cache';
 import { unshift, push, splice, join } from 'spica/array';
 
-const tags = ObjectFreeze(['sup', 'sub', 'small', 'bdo', 'bdi']);
+const tags = Object.freeze(['wbr', 'sup', 'sub', 'small', 'bdo', 'bdi']);
 const attrspec = {
   bdo: {
-    dir: ObjectFreeze(['ltr', 'rtl'] as const),
+    dir: Object.freeze(['ltr', 'rtl'] as const),
   },
 } as const;
-ObjectSetPrototypeOf(attrspec, null);
-ObjectValues(attrspec).forEach(o => ObjectSetPrototypeOf(o, null));
+Object.setPrototypeOf(attrspec, null);
+Object.values(attrspec).forEach(o => Object.setPrototypeOf(o, null));
 
 export const html: HTMLParser = lazy(() => creator(validate('<', validate(/^<[a-z]+(?=[^\S\n]|>)/, union([
   match(
@@ -29,7 +29,7 @@ export const html: HTMLParser = lazy(() => creator(validate('<', validate(/^<[a-
         `<${tag}`, some(union([attribute])), /^\s*>/, true,
         ([, bs = []], rest) =>
           [[h(tag as 'span', attributes('html', [], attrspec[tag], bs))], rest]),
-    ([, tag]) => tag)),
+    ([, tag]) => tags.indexOf(tag), [])),
   match(
     /^(?=<(sup|sub|small)(?=[^\S\n]|>))/,
     memoize(
@@ -69,7 +69,7 @@ export const html: HTMLParser = lazy(() => creator(validate('<', validate(/^<[a-
         str(`</${tag}>`), false,
         ([as, bs, cs], rest, context) =>
           [[elem(tag, as, defrag(bs), cs, context)], rest])),
-      ([, tag]) => tag)),
+    ([, tag]) => tags.indexOf(tag), [])),
   match(
     /^(?=<(bdo|bdi)(?=[^\S\n]|>))/,
     memoize(
@@ -82,11 +82,11 @@ export const html: HTMLParser = lazy(() => creator(validate('<', validate(/^<[a-
           open(/^\n?/, some(inline, '</'), true),
         ]), `</${tag}>`), `</${tag}>`),
         str(`</${tag}>`), false,
-        ([as, bs, cs], rest) =>
-          [[elem(tag, as, defrag(bs), cs, {})], rest],
+        ([as, bs, cs], rest, context) =>
+          [[elem(tag, as, defrag(bs), cs, context)], rest],
         ([as, bs], rest) =>
           as.length === 1 ? [unshift(as, bs), rest] : undefined)),
-    ([, tag]) => tag)),
+    ([, tag]) => tags.indexOf(tag), [])),
   match(
     /^(?=<([a-z]+)(?=[^\S\n]|>))/,
     memoize(
@@ -99,12 +99,12 @@ export const html: HTMLParser = lazy(() => creator(validate('<', validate(/^<[a-
           open(/^\n?/, some(inline, '</'), true),
         ]), `</${tag}>`), `</${tag}>`),
         str(`</${tag}>`), false,
-        ([as, bs, cs], rest) =>
-          [[elem(tag, as, defrag(bs), cs, {})], rest],
+        ([as, bs, cs], rest, context) =>
+          [[elem(tag, as, defrag(bs), cs, context)], rest],
         ([as, bs], rest) =>
           as.length === 1 ? [unshift(as, bs), rest] : undefined)),
     ([, tag]) => tag,
-    new Cache(1000))),
+    new Cache(10000))),
 ])))));
 
 export const attribute: HTMLParser.TagParser.AttributeParser = union([
@@ -133,12 +133,11 @@ function elem(tag: string, as: string[], bs: (HTMLElement | string)[], cs: strin
       }
       break;
   }
-  let attrs: Record<string, string | undefined> | undefined;
+  const attrs = attributes('html', [], attrspec[tag], as.slice(1, -1));
   switch (true) {
-    case 'data-invalid-syntax' in (attrs = attributes('html', [], attrspec[tag], as.slice(1, -1) as string[])):
+    case 'data-invalid-syntax' in attrs:
       return invalid('attribute', 'Invalid HTML attribute', as, bs, cs);
     default:
-      assert(attrs);
       return h(tag as 'span', attrs, bs);
   }
 }
@@ -158,7 +157,7 @@ const requiredAttributes = memoize(
 
 export function attributes(
   syntax: string,
-  classes: string[],
+  classes: readonly string[],
   spec: Readonly<Record<string, readonly (string | undefined)[] | undefined>> | undefined,
   params: string[],
 ): Record<string, string | undefined> {
@@ -183,8 +182,7 @@ export function attributes(
   }
   invalid ||= !!spec && !requiredAttributes(spec).every(name => name in attrs);
   if (invalid) {
-    !classes.includes('invalid') && classes.push('invalid');
-    attrs['class'] = join(classes, ' ');
+    attrs['class'] = join(classes.includes('invalid') ? classes : unshift(classes, ['invalid']), ' ');
     attrs['data-invalid-syntax'] = syntax;
     attrs['data-invalid-type'] = 'argument';
     attrs['data-invalid-message'] = 'Invalid argument';

package/src/parser/inline/link.ts

@@ -1,5 +1,4 @@
 import { location, encodeURI, decodeURI, Location } from 'spica/global';
-import { ObjectSetPrototypeOf } from 'spica/alias';
 import { LinkParser } from '../inline';
 import { eval } from '../../combinator/data/parser';
 import { union, inits, tails, some, validate, guard, context, creator, surround, open, dup, reverse, lazy, fmap, bind } from '../../combinator';
@@ -14,7 +13,7 @@ import { ReadonlyURL } from 'spica/url';
 const optspec = {
   rel: ['nofollow'],
 } as const;
-ObjectSetPrototypeOf(optspec, null);
+Object.setPrototypeOf(optspec, null);
 
 export const link: LinkParser = lazy(() => creator(10, validate(['[', '{'], '}', '\n', bind(
   guard(context => context.syntax?.inline?.link ?? true,

package/src/parser/inline/media.ts

@@ -1,5 +1,4 @@
 import { undefined, location } from 'spica/global';
-import { ObjectSetPrototypeOf } from 'spica/alias';
 import { MediaParser } from '../inline';
 import { union, inits, tails, some, validate, verify, guard, creator, surround, open, dup, lazy, fmap, bind } from '../../combinator';
 import { link, uri, option as linkoption, resolve } from './link';
@@ -16,7 +15,7 @@ const optspec = {
   'aspect-ratio': [],
   rel: undefined,
 } as const;
-ObjectSetPrototypeOf(optspec, null);
+Object.setPrototypeOf(optspec, null);
 
 export const media: MediaParser = lazy(() => creator(10, validate(['![', '!{'], '}', '\n', bind(verify(fmap(open(
   '!',