securemark 0.253.0 → 0.253.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.253.1
+
+- Refactoring.
+
 ## 0.253.0
 
 - Change annotation processing.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.253.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.253.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory(require("DOMPurify"), require("Prism"));
@@ -758,7 +758,26 @@ function run() {
 
 /***/ }),
 
-/***/ 413:
+/***/ 5529:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.equal = void 0;
+
+function equal(a, b) {
+  return a === a ? a === b : b !== b;
+}
+
+exports.equal = equal;
+
+/***/ }),
+
+/***/ 5084:
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -863,25 +882,6 @@ exports.MultiMap = MultiMap;
 
 /***/ }),
 
-/***/ 5529:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports.equal = void 0;
-
-function equal(a, b) {
-  return a === a ? a === b : b !== b;
-}
-
-exports.equal = equal;
-
-/***/ }),
-
 /***/ 7822:
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
@@ -1417,7 +1417,7 @@ Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
 
-__exportStar(__webpack_require__(413), exports);
+__exportStar(__webpack_require__(5084), exports);
 
 /***/ }),
 
@@ -3314,7 +3314,7 @@ function bind(target, settings) {
       };
     }
 
-    for (const el of (0, footnote_1.footnote)(next(0)?.parentNode ?? target, settings.footnotes, context)) {
+    for (const el of (0, footnote_1.footnote)(next(0)?.parentNode ?? target, settings.footnotes, context, bottom)) {
       el ? yield {
         type: 'footnote',
         value: el
@@ -4289,10 +4289,10 @@ exports.message = (0, combinator_1.block)((0, combinator_1.validate)('~~~', (0,
       }, `${opener}${body}${closer}`)];
   }
 
-  return [(0, dom_1.html)('div', {
+  return [(0, dom_1.html)('section', {
     class: `message`,
     'data-type': type
-  }, (0, array_1.unshift)([(0, dom_1.html)('h6', title(type))], [...(0, segment_1.segment)(body)].reduce((acc, seg) => (0, array_1.push)(acc, (0, parser_1.eval)(content(seg, context), [])), [])))];
+  }, (0, array_1.unshift)([(0, dom_1.html)('h1', title(type))], [...(0, segment_1.segment)(body)].reduce((acc, seg) => (0, array_1.push)(acc, (0, parser_1.eval)(content(seg, context), [])), [])))];
 })));
 
 function title(type) {
@@ -6997,7 +6997,7 @@ const multimap_1 = __webpack_require__(940);
 const array_1 = __webpack_require__(8112);
 
 function* figure(target, footnotes, opts = {}) {
-  const refs = new multimap_1.MultiMap((0, array_1.push)((0, array_1.push)((0, array_1.push)([], target.querySelectorAll('a.label:not(.disabled)[data-label]')), footnotes?.annotations?.querySelectorAll('a.label:not(.disabled)') ?? []), footnotes?.references.querySelectorAll('a.label:not(.disabled)') ?? []).map(el => [el.getAttribute('data-label'), el]));
+  const refs = new multimap_1.MultiMap((0, array_1.push)((0, array_1.push)([], target.querySelectorAll('a.label:not(.disabled)[data-label]')), footnotes?.references.querySelectorAll('a.label:not(.disabled)') ?? []).map(el => [el.getAttribute('data-label'), el]));
   const labels = new global_1.Set();
   const numbers = new global_1.Map();
   let base = '0';
@@ -7191,9 +7191,9 @@ const multimap_1 = __webpack_require__(940);
 
 const array_1 = __webpack_require__(8112);
 
-function* footnote(target, footnotes, opts = {}) {
-  yield* (0, exports.reference)(target, footnotes?.references, opts);
-  yield* (0, exports.annotation)(target, footnotes?.annotations, opts);
+function* footnote(target, footnotes, opts = {}, bottom = null) {
+  yield* (0, exports.reference)(target, footnotes?.references, opts, bottom);
+  yield* (0, exports.annotation)(target, footnotes?.annotations, opts, bottom);
   return;
 }
 
@@ -7204,8 +7204,7 @@ exports.reference = build('reference', (n, abbr) => `[${abbr || n}]`);
 function build(syntax, marker, splitter) {
   // Referenceを含むAnnotationの重複排除は両構文が互いに処理済みであることを必要とするため
   // 構文ごとに各1回の処理では不可能
-  return function* (target, footnote, opts = {}) {
-    //assert(syntax !== 'annotation' || !footnote);
+  return function* (target, footnote, opts = {}, bottom = null) {
     const defs = new global_1.Map();
     const buffer = new multimap_1.MultiMap();
     const titles = new global_1.Map(); // Bug: Firefox
@@ -7312,7 +7311,7 @@ function build(syntax, marker, splitter) {
     if (defs.size > 0 || footnote) {
       yield* proc(defs, footnote ?? target.insertBefore((0, dom_1.html)('ol', {
         class: `${syntax}s`
-      }), splitters[0] ?? target.querySelector(':scope > :is(#annotations, #references)')));
+      }), splitters[0] ?? bottom));
     }
 
     return;
@@ -8740,7 +8739,7 @@ function fix(h) {
 /***/ 3252:
 /***/ (function(module) {
 
-/*! typed-dom v0.0.298 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
+/*! typed-dom v0.0.299 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(true)
 		module.exports = factory();
@@ -9174,7 +9173,7 @@ exports.defrag = defrag;
 /***/ 6120:
 /***/ (function(module) {
 
-/*! typed-dom v0.0.298 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
+/*! typed-dom v0.0.299 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(true)
 		module.exports = factory();

package/index.d.ts

@@ -5,7 +5,7 @@
 * @author falsandtru https://github.com/falsandtru/securemark
 */
 
-import { Collection } from 'spica/collection';
+import { Dict } from 'spica/dict';
 
 export function parse(source: string, options?: ParserOptions): DocumentFragment;
 export function bind(target: DocumentFragment | HTMLElement | ShadowRoot, settings: ParserSettings): {
@@ -33,7 +33,6 @@ export interface ParserSettings {
   // For editing.
   readonly caches?: Partial<Caches>;
   readonly footnotes: {
-    readonly annotations?: HTMLOListElement;
     readonly references: HTMLOListElement;
   };
   readonly chunk?: boolean;
@@ -48,23 +47,23 @@ export type Progress =
   | { type: 'cancel' };
 
 export interface RenderingOptions {
-  readonly code?: (target: HTMLElement, cache?: Collection<string, HTMLElement>) => void;
-  readonly math?: (target: HTMLElement, cache?: Collection<string, HTMLElement>) => void;
+  readonly code?: (target: HTMLElement, cache?: Dict<string, HTMLElement>) => void;
+  readonly math?: (target: HTMLElement, cache?: Dict<string, HTMLElement>) => void;
   readonly media?: {
     readonly twitter?: (source: HTMLImageElement, url: URL) => HTMLElement | undefined;
     readonly youtube?: (source: HTMLImageElement, url: URL) => HTMLElement | undefined;
     readonly pdf?: (source: HTMLImageElement, url: URL) => HTMLElement | undefined;
     readonly video?: (source: HTMLImageElement, url: URL) => HTMLVideoElement | undefined;
     readonly audio?: (source: HTMLImageElement, url: URL) => HTMLAudioElement | undefined;
-    readonly image?: (source: HTMLImageElement, url: URL, cache?: Collection<string, HTMLElement>) => HTMLImageElement;
+    readonly image?: (source: HTMLImageElement, url: URL, cache?: Dict<string, HTMLElement>) => HTMLImageElement;
   };
   readonly caches?: Partial<Caches>;
 }
 
 export interface Caches {
-  readonly code: Collection<string, HTMLElement>;
-  readonly math: Collection<string, HTMLElement>;
-  readonly media: Collection<string, HTMLElement>;
+  readonly code: Dict<string, HTMLElement>;
+  readonly math: Dict<string, HTMLElement>;
+  readonly media: Dict<string, HTMLElement>;
 }
 
 export interface Info {

package/markdown.d.ts

@@ -1,5 +1,5 @@
 import { Parser, Ctx } from './src/combinator/data/parser';
-import { Collection } from 'spica/collection';
+import { Dict } from 'spica/dict';
 
 declare abstract class Markdown<T> {
   private parser?: T;
@@ -29,9 +29,9 @@ export namespace MarkdownParser {
       };
     };
     readonly caches?: {
-      readonly code?: Collection<string, HTMLElement>;
-      readonly math?: Collection<string, HTMLElement>;
-      readonly media?: Collection<string, HTMLElement>;
+      readonly code?: Dict<string, HTMLElement>;
+      readonly math?: Dict<string, HTMLElement>;
+      readonly media?: Dict<string, HTMLElement>;
     };
   }
   export interface SegmentParser extends

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.253.0",
+  "version": "0.253.1",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",
@@ -34,29 +34,29 @@
     "@types/mocha": "9.1.1",
     "@types/power-assert": "1.5.8",
     "@types/prismjs": "1.26.0",
-    "@typescript-eslint/parser": "^5.27.1",
+    "@typescript-eslint/parser": "^5.28.0",
     "babel-loader": "^8.2.5",
     "babel-plugin-unassert": "^3.2.0",
-    "concurrently": "^7.2.1",
+    "concurrently": "^7.2.2",
     "eslint": "^8.17.0",
     "eslint-plugin-redos": "^4.4.0",
     "eslint-webpack-plugin": "^3.1.1",
     "glob": "^8.0.3",
-    "karma": "^6.3.20",
+    "karma": "^6.4.0",
     "karma-chrome-launcher": "^3.1.1",
     "karma-coverage": "^2.2.0",
     "karma-firefox-launcher": "^2.1.2",
     "karma-mocha": "^2.0.1",
     "karma-power-assert": "^1.0.0",
     "mocha": "^10.0.0",
-    "npm-check-updates": "^13.1.2",
+    "npm-check-updates": "^13.1.5",
     "semver": "^7.3.7",
-    "spica": "0.0.567",
+    "spica": "0.0.570",
     "ts-loader": "^9.3.0",
-    "typed-dom": "^0.0.298",
+    "typed-dom": "^0.0.299",
     "typescript": "4.7.3",
     "webpack": "^5.73.0",
-    "webpack-cli": "^4.9.2",
+    "webpack-cli": "^4.10.0",
     "webpack-merge": "^5.8.0"
   },
   "scripts": {

package/src/parser/api/bind.test.ts

@@ -1,4 +1,4 @@
-import { ParserSettings, Progress } from '../../..';
+import { Progress } from '../../..';
 import { bind } from './bind';
 import { frag, html } from 'typed-dom/dom';
 
@@ -27,7 +27,7 @@ describe('Unit: parser/api/bind', () => {
       return acc;
     }
 
-    const cfgs: ParserSettings = { footnotes: { annotations: html('ol'), references: html('ol') } };
+    const cfgs = { footnotes: { annotations: html('ol'), references: html('ol') } };
 
     it('huge input', () => {
       const iter = bind(html('div'), { ...cfgs, id: '' }).parse(`${'\n'.repeat(10 * 1000 ** 2)}`);

package/src/parser/api/bind.ts

@@ -122,7 +122,7 @@ export function bind(target: DocumentFragment | HTMLElement | ShadowRoot, settin
         : yield { type: 'break' };
       if (rev !== revision) return yield { type: 'cancel' };
     }
-    for (const el of footnote(next(0)?.parentNode ?? target, settings.footnotes, context)) {
+    for (const el of footnote(next(0)?.parentNode ?? target, settings.footnotes, context, bottom)) {
       assert(rev === revision);
       el
         ? yield { type: 'footnote', value: el }

package/src/parser/api/parse.ts

@@ -40,7 +40,6 @@ export function parse(source: string, opts: Options = {}, context?: MarkdownPars
   for (const _ of figure(node, opts.footnotes, context));
   for (const _ of footnote(node, opts.footnotes, context));
   assert(opts.id !== '' || !node.querySelector('[id], .index[href], .label[href], .annotation > a[href], .reference > a[href]'));
-  assert(opts.id !== '' || !opts.footnotes?.annotations?.querySelector('[id], .index[href], .label[href]'));
   assert(opts.id !== '' || !opts.footnotes?.references.querySelector('[id], .index[href], .label[href]'));
   return node;
 }

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

@@ -15,13 +15,13 @@ describe('Unit: parser/block/extension/message', () => {
     });
 
     it('valid', () => {
-      assert.deepStrictEqual(inspect(parser('~~~message/note\n~~~')), [['<div class="message" data-type="note"><h6>Note</h6></div>'], '']);
-      assert.deepStrictEqual(inspect(parser('~~~message/note\n\n~~~')), [['<div class="message" data-type="note"><h6>Note</h6></div>'], '']);
-      assert.deepStrictEqual(inspect(parser('~~~message/note\na\n~~~')), [['<div class="message" data-type="note"><h6>Note</h6><p>a</p></div>'], '']);
-      assert.deepStrictEqual(inspect(parser('~~~message/note\na\n\n- \n~~~')), [['<div class="message" data-type="note"><h6>Note</h6><p>a</p><ul><li></li></ul></div>'], '']);
-      assert.deepStrictEqual(inspect(parser('~~~message/note\n# a\n~~~')), [['<div class="message" data-type="note"><h6>Note</h6><p># a</p></div>'], '']);
-      assert.deepStrictEqual(inspect(parser('~~~message/caution\n~~~')), [['<div class="message" data-type="caution"><h6>Caution!</h6></div>'], '']);
-      assert.deepStrictEqual(inspect(parser('~~~message/warning\n~~~')), [['<div class="message" data-type="warning"><h6>WARNING!!</h6></div>'], '']);
+      assert.deepStrictEqual(inspect(parser('~~~message/note\n~~~')), [['<section class="message" data-type="note"><h1>Note</h1></section>'], '']);
+      assert.deepStrictEqual(inspect(parser('~~~message/note\n\n~~~')), [['<section class="message" data-type="note"><h1>Note</h1></section>'], '']);
+      assert.deepStrictEqual(inspect(parser('~~~message/note\na\n~~~')), [['<section class="message" data-type="note"><h1>Note</h1><p>a</p></section>'], '']);
+      assert.deepStrictEqual(inspect(parser('~~~message/note\na\n\n- \n~~~')), [['<section class="message" data-type="note"><h1>Note</h1><p>a</p><ul><li></li></ul></section>'], '']);
+      assert.deepStrictEqual(inspect(parser('~~~message/note\n# a\n~~~')), [['<section class="message" data-type="note"><h1>Note</h1><p># a</p></section>'], '']);
+      assert.deepStrictEqual(inspect(parser('~~~message/caution\n~~~')), [['<section class="message" data-type="caution"><h1>Caution!</h1></section>'], '']);
+      assert.deepStrictEqual(inspect(parser('~~~message/warning\n~~~')), [['<section class="message" data-type="warning"><h1>WARNING!!</h1></section>'], '']);
     });
 
   });

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

@@ -46,8 +46,8 @@ export const message: MessageParser = block(validate('~~~', fmap(
         }, `${opener}${body}${closer}`)];
     }
     return [
-      html('div', { class: `message`, 'data-type': type }, unshift(
-        [html('h6', title(type))],
+      html('section', { class: `message`, 'data-type': type }, unshift(
+        [html('h1', title(type))],
         [...segment(body)].reduce((acc, seg) => push(acc, eval(content(seg, context), [])), []))),
     ];
   })));

package/src/parser/processor/figure.ts

@@ -6,14 +6,11 @@ import { push } from 'spica/array';
 
 export function* figure(
   target: ParentNode & Node,
-  footnotes?: Readonly<{ annotations?: HTMLOListElement; references: HTMLOListElement; }>,
-  opts: Readonly<{
-    id?: string;
-  }> = {},
+  footnotes?: { readonly references: HTMLOListElement; },
+  opts: { readonly id?: string; } = {},
 ): Generator<HTMLAnchorElement | undefined, undefined, undefined> {
-  const refs = new MultiMap<string, HTMLAnchorElement>(push(push(push([],
+  const refs = new MultiMap<string, HTMLAnchorElement>(push(push([],
     target.querySelectorAll('a.label:not(.disabled)[data-label]')),
-    footnotes?.annotations?.querySelectorAll('a.label:not(.disabled)') ?? []),
     footnotes?.references.querySelectorAll('a.label:not(.disabled)') ?? [])
     .map(el => [el.getAttribute('data-label')!, el]));
   const labels = new Set<string>();

package/src/parser/processor/footnote.ts

@@ -6,11 +6,12 @@ import { push } from 'spica/array';
 
 export function* footnote(
   target: ParentNode & Node,
-  footnotes?: Readonly<{ annotations?: HTMLOListElement; references: HTMLOListElement; }>,
-  opts: Readonly<{ id?: string; }> = {},
+  footnotes?: { readonly annotations?: HTMLOListElement; readonly references: HTMLOListElement; },
+  opts: { readonly id?: string; } = {},
+  bottom: Node | null = null,
 ): Generator<HTMLAnchorElement | HTMLLIElement | undefined, undefined, undefined> {
-  yield* reference(target, footnotes?.references, opts);
-  yield* annotation(target, footnotes?.annotations, opts);
+  yield* reference(target, footnotes?.references, opts, bottom);
+  yield* annotation(target, footnotes?.annotations, opts, bottom);
   return;
 }
 
@@ -28,9 +29,9 @@ function build(
   return function* (
     target: ParentNode & Node,
     footnote?: HTMLOListElement,
-    opts: Readonly<{ id?: string }> = {},
+    opts: { readonly id?: string } = {},
+    bottom: Node | null = null,
   ): Generator<HTMLAnchorElement | HTMLLIElement | undefined, undefined, undefined> {
-    //assert(syntax !== 'annotation' || !footnote);
     const defs = new Map<string, HTMLLIElement>();
     const buffer = new MultiMap<string, HTMLElement>();
     const titles = new Map<string, string>();
@@ -148,7 +149,7 @@ function build(
           `^${refIndex}`));
     }
     if (defs.size > 0 || footnote) {
-      yield* proc(defs, footnote ?? target.insertBefore(html('ol', { class: `${syntax}s` }), splitters[0] ?? target.querySelector(':scope > :is(#annotations, #references)')));
+      yield* proc(defs, footnote ?? target.insertBefore(html('ol', { class: `${syntax}s` }), splitters[0] ?? bottom));
     }
     return;
   }

package/src/renderer/render/code.ts

@@ -1,7 +1,7 @@
 import Prism from 'prismjs';
-import { Collection } from 'spica/collection';
+import { Dict } from 'spica/dict';
 
-export function code(target: HTMLElement, cache?: Collection<string, HTMLElement>): void {
+export function code(target: HTMLElement, cache?: Dict<string, HTMLElement>): void {
   assert(target.children.length === 0);
   const source = target.textContent!;
   Prism.highlightElement(target, false, () =>

package/src/renderer/render/math.ts

@@ -1,8 +1,8 @@
 import { undefined } from 'spica/global';
-import { Collection } from 'spica/collection';
+import { Dict } from 'spica/dict';
 import { html, define } from 'typed-dom/dom';
 
-export function math(target: HTMLElement, cache?: Collection<string, HTMLElement>): void {
+export function math(target: HTMLElement, cache?: Dict<string, HTMLElement>): void {
   assert(target.children.length === 0);
   const source = target.textContent!;
   queue(target, () => {

package/src/renderer/render/media/image.ts

@@ -1,8 +1,8 @@
 import { Object } from 'spica/global';
-import { Collection } from 'spica/collection';
+import { Dict } from 'spica/dict';
 import { define } from 'typed-dom/dom';
 
-export function image(source: HTMLImageElement, url: URL, cache?: Collection<string, HTMLElement>): HTMLImageElement {
+export function image(source: HTMLImageElement, url: URL, cache?: Dict<string, HTMLElement>): HTMLImageElement {
   if (cache?.has(url.href)) return define(
     cache.get(url.href)!.cloneNode(true) as HTMLImageElement,
     Object.fromEntries([...source.attributes]

package/src/renderer/render/media.ts

@@ -5,7 +5,7 @@ import { pdf } from './media/pdf';
 import { video } from './media/video';
 import { audio } from './media/audio';
 import { image } from './media/image';
-import { Collection } from 'spica/collection';
+import { Dict } from 'spica/dict';
 import { ReadonlyURL } from 'spica/url';
 import { reduce } from 'spica/memoize';
 
@@ -14,7 +14,7 @@ type MediaOptions = NonNullable<RenderingOptions['media']>;
 const extend = reduce((opts: MediaOptions): MediaOptions =>
   ({ twitter, youtube, pdf, video, audio, image, ...opts }));
 
-export function media(base: string, source: HTMLImageElement, opts: MediaOptions, cache?: Collection<string, HTMLElement>): HTMLElement | undefined {
+export function media(base: string, source: HTMLImageElement, opts: MediaOptions, cache?: Dict<string, HTMLElement>): HTMLElement | undefined {
   assert(source.matches('img:not([src])[data-src]'));
   opts = extend(opts);
   const url = new ReadonlyURL(source.getAttribute('data-src')!, base);