securemark 0.276.4 → 0.276.5

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.276.5
+
+- Refactoring.
+
 ## 0.276.4
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.276.4 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.276.5 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("Prism"), require("DOMPurify"));
@@ -2219,7 +2219,7 @@ function xorshift(seed = xorshift.seed()) {
     let x = seed;
     x ^= x << 13;
     x ^= x >> 17;
-    x ^= x << 5;
+    x ^= x << 15;
     return seed = x >>> 0;
   };
 }
@@ -7140,8 +7140,8 @@ function* note(target, notes, opts = {}, bottom = null) {
 exports.note = note;
 exports.annotation = build('annotation', n => `*${n}`, 'h1, h2, h3, h4, h5, h6, aside.aside, hr');
 exports.reference = build('reference', (n, abbr) => `[${abbr || n}]`);
-function build(syntax, marker, splitter) {
-  splitter = splitter?.concat(`, .${syntax}s`) ?? `.${syntax}s`;
+function build(syntax, marker, splitter = '') {
+  splitter &&= `${splitter}, .${syntax}s`;
   // Referenceを含むAnnotationの重複排除は両構文が互いに処理済みであることを必要とするため
   // 構文ごとに各1回の処理では不可能
   const memory = (0, memoize_1.memoize)(ref => {
@@ -7163,8 +7163,7 @@ function build(syntax, marker, splitter) {
     const defIndexes = new Map();
     const refSubindexes = new Map();
     const defSubindexes = new Map();
-    const split = splitter.includes(',');
-    const splitters = split ? target.querySelectorAll(splitter) : [];
+    const splitters = splitter ? target.querySelectorAll(splitter) : [];
     let iSplitters = 0;
     let total = 0;
     let format;
@@ -7175,7 +7174,7 @@ function build(syntax, marker, splitter) {
         yield;
         continue;
       }
-      if (split) for (let el; el = splitters[iSplitters], el?.compareDocumentPosition(ref) & Node.DOCUMENT_POSITION_FOLLOWING; ++iSplitters) {
+      if (splitter) for (let el; el = splitters[iSplitters], el?.compareDocumentPosition(ref) & Node.DOCUMENT_POSITION_FOLLOWING; ++iSplitters) {
         if (~iSplitters << 32 - 8 === 0) yield;
         if (el.parentNode !== target) continue;
         if (el.tagName === 'OL' && el.nextElementSibling !== splitters[iSplitters + 1]) {
@@ -7199,10 +7198,10 @@ function build(syntax, marker, splitter) {
       const refSubindex = refSubindexes.get(identifier) + 1 || 1;
       refSubindexes.set(identifier, refSubindex);
       const refId = opts.id !== '' ? `${syntax}:${opts.id ?? ''}:ref:${identifier}:${refSubindex}` : undefined;
-      const initial = split ? !defs.has(identifier) : refSubindex === 1;
+      const initial = splitter ? !defs.has(identifier) : refSubindex === 1;
       const defSubindex = defSubindexes?.get(identifier) + +initial || 1;
       initial && defSubindexes?.set(identifier, defSubindex);
-      const defId = opts.id !== '' ? `${syntax}:${opts.id ?? ''}:def:${identifier}${split ? `:${defSubindex}` : ''}` : undefined;
+      const defId = opts.id !== '' ? `${syntax}:${opts.id ?? ''}:def:${identifier}${splitter && `:${defSubindex}`}` : undefined;
       const def = initial ? (0, dom_1.html)('li', {
         id: defId,
         'data-marker': note ? undefined : marker(total + defs.size + 1, abbr)
@@ -7247,7 +7246,7 @@ function build(syntax, marker, splitter) {
       }), splitters[iSplitters] ?? bottom);
       yield* proc(defs, note);
     }
-    if (split) for (let el; el = splitters[iSplitters]; ++iSplitters) {
+    if (splitter) for (let el; el = splitters[iSplitters]; ++iSplitters) {
       if (~iSplitters << 32 - 8 === 0) yield;
       if (el.parentNode !== target) continue;
       if (el.tagName === 'OL') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.276.4",
+  "version": "0.276.5",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",
@@ -51,12 +51,12 @@
     "mocha": "^10.2.0",
     "npm-check-updates": "^16.10.12",
     "semver": "^7.5.1",
-    "spica": "0.0.730",
+    "spica": "0.0.731",
     "ts-loader": "^9.4.3",
     "typed-dom": "0.0.335",
     "typescript": "5.1.3",
     "webpack": "^5.85.0",
-    "webpack-cli": "^5.1.2",
+    "webpack-cli": "^5.1.3",
     "webpack-merge": "^5.9.0"
   },
   "scripts": {

package/src/parser/processor/note.ts

@@ -23,10 +23,10 @@ export const reference = build('reference', (n, abbr) => `[${abbr || n}]`);
 function build(
   syntax: 'annotation' | 'reference',
   marker: (index: number, abbr: string) => string,
-  splitter?: string,
+  splitter: string = '',
 ) {
   assert(syntax.match(/^[a-z]+$/));
-  splitter = splitter?.concat(`, .${syntax}s`) ?? `.${syntax}s`;
+  splitter &&= `${splitter}, .${syntax}s`;
   // Referenceを含むAnnotationの重複排除は両構文が互いに処理済みであることを必要とするため
   // 構文ごとに各1回の処理では不可能
   const memory = memoize((ref: HTMLElement): {
@@ -61,15 +61,13 @@ function build(
     opts: { readonly id?: string } = {},
     bottom: Node | null = null,
   ): Generator<HTMLAnchorElement | HTMLLIElement | undefined, undefined, undefined> {
-    assert(splitter = splitter!);
     const defs = new Map<string, HTMLLIElement>();
     const refs = target.querySelectorAll(`sup.${syntax}:not(.disabled)`);
     const titles = new Map<string, string>();
     const defIndexes = new Map<HTMLLIElement, number>();
     const refSubindexes = new Map<string, number>();
     const defSubindexes = new Map<string, number>();
-    const split = splitter.includes(',');
-    const splitters = split ? target.querySelectorAll(splitter) : [];
+    const splitters = splitter ? target.querySelectorAll(splitter) : [];
     let iSplitters = 0;
     let total = 0;
     let format: 'number' | 'abbr';
@@ -80,7 +78,7 @@ function build(
         yield;
         continue;
       }
-      if (split) for (
+      if (splitter) for (
         let el: Element;
         el = splitters[iSplitters],
         el?.compareDocumentPosition(ref) & Node.DOCUMENT_POSITION_FOLLOWING;
@@ -108,13 +106,13 @@ function build(
       const refId = opts.id !== ''
         ? `${syntax}:${opts.id ?? ''}:ref:${identifier}:${refSubindex}`
         : undefined;
-      const initial = split
+      const initial = splitter
         ? !defs.has(identifier)
         : refSubindex === 1;
       const defSubindex = defSubindexes?.get(identifier)! + +initial || 1;
       initial && defSubindexes?.set(identifier, defSubindex);
       const defId = opts.id !== ''
-        ? `${syntax}:${opts.id ?? ''}:def:${identifier}${split ? `:${defSubindex}` : ''}`
+        ? `${syntax}:${opts.id ?? ''}:def:${identifier}${splitter && `:${defSubindex}`}`
         : undefined;
       const def = initial
         ? html('li',
@@ -170,7 +168,7 @@ function build(
         : target.insertBefore(html('ol', { class: `${syntax}s` }), splitters[iSplitters] ?? bottom);
       yield* proc(defs, note);
     }
-    if (split) for (
+    if (splitter) for (
       let el: Element;
       el = splitters[iSplitters];
       ++iSplitters) {