securemark 0.262.2 → 0.263.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.263.0
+
+- Extend fig syntax to set the caption only for inline syntax such as media syntax.
+
 ## 0.262.2
 
 - Refactoring.
@@ -1676,7 +1680,7 @@
 
 ## 0.99.2
 
-- Fix figure syntax to disallow to set a caption with formula number.
+- Fix figure syntax to disallow to set the caption with formula number.
 
 ## 0.99.1
 

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.262.2 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.263.0 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"));
@@ -180,7 +180,7 @@ function splice(as, index, count, ...values) {
 
   switch (values.length) {
     case 0:
-      return count !== undefined || arguments.length > 1 ? as.splice(index, count) : as.splice(index);
+      return arguments.length > 2 ? as.splice(index, count) : as.splice(index);
 
     case 1:
       return as.splice(index, count, values[0]);
@@ -198,7 +198,7 @@ function splice(as, index, count, ...values) {
       return as.splice(index, count, values[0], values[1], values[2], values[3], values[4]);
 
     default:
-      return count !== undefined || arguments.length > 1 ? as.splice(index, count, ...values) : as.splice(index);
+      return as.splice(index, count, ...values);
   }
 }
 
@@ -388,18 +388,19 @@ class Cache {
   constructor(capacity, opts = {}) {
     this.settings = {
       capacity: 0,
+      window: 100,
       age: global_1.Infinity,
       earlyExpiring: false,
       capture: {
         delete: true,
         clear: true
       },
-      window: 0,
       resolution: 1,
       offset: 0,
-      block: 20,
+      entrance: 50,
+      threshold: 20,
       sweep: 10,
-      limit: 950
+      test: false
     };
     this.overlap = 0;
     this.SIZE = 0;
@@ -423,14 +424,15 @@ class Cache {
     });
     this.capacity = settings.capacity;
     if (this.capacity >= 1 === false) throw new Error(`Spica: Cache: Capacity must be 1 or more.`);
-    this.window = settings.window || this.capacity;
+    this.window = settings.window * this.capacity / 100 >>> 0 || this.capacity;
     if (this.window * 1000 >= this.capacity === false) throw new Error(`Spica: Cache: Window must be 0.1% of capacity or more.`);
-    this.block = settings.block;
-    this.limit = settings.limit;
+    this.threshold = settings.threshold;
+    this.limit = 1000 - settings.entrance;
     this.age = settings.age;
     this.earlyExpiring = settings.earlyExpiring;
     this.disposer = settings.disposer;
-    this.stats = new Stats(this.window, settings.resolution, settings.offset);
+    this.stats = opts.resolution || opts.offset ? new StatsExperimental(this.window, settings.resolution, settings.offset) : new Stats(this.window);
+    this.test = settings.test;
   }
 
   get length() {
@@ -488,8 +490,8 @@ class Cache {
         // fallthrough
 
         default:
-          if (this.misses * 100 > LRU.length * this.block) {
-            this.sweep ||= LRU.length * this.settings.sweep / 100 + 1 | 0;
+          if (this.misses * 100 > LRU.length * this.threshold) {
+            this.sweep ||= LRU.length * this.settings.sweep / 100 + 1 >>> 0;
 
             if (this.sweep > 0) {
               LRU.head = LRU.head.next.next;
@@ -590,7 +592,7 @@ class Cache {
     this.misses &&= 0;
     this.sweep &&= 0; // Optimization for memoize.
 
-    if (this.capacity > 3 && node === node.list.head) return node.value.value;
+    if (!this.test && node === node.list.head) return node.value.value;
     this.access(node);
     this.adjust();
     return node.value.value;
@@ -675,13 +677,15 @@ class Cache {
       stats,
       indexes
     } = this;
-    if (stats.subtotal() * 1000 % capacity || !stats.full()) return;
+    if (stats.subtotal() * 1000 % capacity || !stats.isFull()) return;
     const lenR = indexes.LRU.length;
     const lenF = indexes.LFU.length;
     const lenO = this.overlap;
     const leverage = (lenF + lenO) * 1000 / (lenR + lenF) | 0;
-    const rateR0 = stats.rateLRU() * leverage;
-    const rateF0 = stats.rateLFU() * (1000 - leverage);
+    const rateR = stats.rateLRU();
+    const rateF = 10000 - rateR;
+    const rateR0 = rateR * leverage;
+    const rateF0 = rateF * (1000 - leverage);
     const rateF1 = stats.offset && stats.rateLFU(true) * (1000 - leverage); // 操作頻度を超えてキャッシュ比率を増減させても余剰比率の消化が追いつかず無駄
     // LRUの下限設定ではLRU拡大の要否を迅速に判定できないためLFUのヒット率低下の検出で代替する
 
@@ -725,53 +729,51 @@ class Cache {
 exports.Cache = Cache;
 
 class Stats {
-  constructor(window, resolution, offset) {
+  constructor(window) {
     this.window = window;
-    this.resolution = resolution;
-    this.offset = offset;
-    this.max = (0, alias_1.ceil)(this.resolution * (100 + this.offset) / 100) + 1;
+    this.offset = 0;
+    this.max = 2;
     this.LRU = [0];
     this.LFU = [0];
   }
 
+  static rate(window, hits1, hits2, offset) {
+    const currTotal = hits1[0] + hits2[0];
+    const prevTotal = hits1[1] + hits2[1];
+    const currHits = hits1[0];
+    const prevHits = hits1[1];
+    const prevRate = prevHits * 100 / (prevTotal || 1);
+    const currRatio = currTotal * 100 / window - offset;
+    if (currRatio <= 0) return prevRate * 100 | 0;
+    const currRate = currHits * 100 / (currTotal || 1);
+    const prevRatio = 100 - currRatio;
+    return currRate * currRatio + prevRate * prevRatio | 0;
+  }
+
   get length() {
     return this.LRU.length;
   }
 
-  full() {
+  isFull() {
     return this.length === this.max;
   }
 
   rateLRU(offset = false) {
-    return rate(this.window, this.LRU, this.LFU, +offset && this.offset);
+    return Stats.rate(this.window, this.LRU, this.LFU, +offset & 0);
   }
 
   rateLFU(offset = false) {
-    return rate(this.window, this.LFU, this.LRU, +offset && this.offset);
+    return Stats.rate(this.window, this.LFU, this.LRU, +offset & 0);
   }
 
   subtotal() {
     const {
       LRU,
       LFU,
-      window,
-      resolution,
-      offset
+      window
     } = this;
-
-    if (offset && LRU[0] + LFU[0] >= window * offset / 100) {
-      if (this.length === 1) {
-        this.slide();
-      } else {
-        LRU[1] += LRU[0];
-        LFU[1] += LFU[0];
-        LRU[0] = 0;
-        LFU[0] = 0;
-      }
-    }
-
-    const subtotal = LRU[+offset && 1] + LFU[+offset && 1] || 0;
-    subtotal >= window / resolution && this.slide();
+    const subtotal = LRU[0] + LFU[0];
+    subtotal >= window && this.slide();
     return LRU[0] + LFU[0];
   }
 
@@ -798,26 +800,69 @@ class Stats {
 
 }
 
-function rate(window, hits1, hits2, offset) {
-  let total = 0;
-  let hits = 0;
-  let ratio = 100;
+class StatsExperimental extends Stats {
+  constructor(window, resolution, offset) {
+    super(window);
+    this.resolution = resolution;
+    this.offset = offset;
+    this.max = (0, alias_1.ceil)(this.resolution * (100 + this.offset) / 100) + 1;
+  }
+
+  static rate(window, hits1, hits2, offset) {
+    let total = 0;
+    let hits = 0;
+    let ratio = 100;
+
+    for (let len = hits1.length, i = 0; i < len; ++i) {
+      const subtotal = hits1[i] + hits2[i];
+      if (subtotal === 0) continue;
+      offset = i + 1 === len ? 0 : offset;
+      const subratio = (0, alias_1.min)(subtotal * 100 / window, ratio) - offset;
+      offset = offset && subratio < 0 ? -subratio : 0;
+      if (subratio <= 0) continue;
+      const rate = window * subratio / subtotal;
+      total += subtotal * rate;
+      hits += hits1[i] * rate;
+      ratio -= subratio;
+      if (ratio <= 0) break;
+    }
+
+    return hits * 10000 / total | 0;
+  }
+
+  rateLRU(offset = false) {
+    return StatsExperimental.rate(this.window, this.LRU, this.LFU, +offset && this.offset);
+  }
+
+  rateLFU(offset = false) {
+    return StatsExperimental.rate(this.window, this.LFU, this.LRU, +offset && this.offset);
+  }
+
+  subtotal() {
+    const {
+      LRU,
+      LFU,
+      window,
+      resolution,
+      offset
+    } = this;
+
+    if (offset && LRU[0] + LFU[0] >= window * offset / 100) {
+      if (this.length === 1) {
+        this.slide();
+      } else {
+        LRU[1] += LRU[0];
+        LFU[1] += LFU[0];
+        LRU[0] = 0;
+        LFU[0] = 0;
+      }
+    }
 
-  for (let len = hits1.length, i = 0; i < len; ++i) {
-    const subtotal = hits1[i] + hits2[i];
-    if (subtotal === 0) continue;
-    offset = i + 1 === len ? 0 : offset;
-    const subratio = (0, alias_1.min)(subtotal * 100 / window, ratio) - offset;
-    offset = offset && subratio < 0 ? -subratio : 0;
-    if (subratio <= 0) continue;
-    const rate = window * subratio / subtotal;
-    total += subtotal * rate;
-    hits += hits1[i] * rate;
-    ratio -= subratio;
-    if (ratio <= 0) break;
+    const subtotal = LRU[offset && 1] + LFU[offset && 1] || 0;
+    subtotal >= window / resolution && this.slide();
+    return LRU[0] + LFU[0];
   }
 
-  return hits * 10000 / total | 0;
 }
 
 /***/ }),
@@ -831,7 +876,7 @@ function rate(window, hits1, hits2, offset) {
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.tick = exports.promise = exports.clock = exports.now = void 0;
+exports.clock = exports.now = void 0;
 
 const global_1 = __webpack_require__(4128);
 
@@ -845,7 +890,7 @@ let count = 0;
 
 function now(nocache) {
   if (time === undefined) {
-    tick(() => time = undefined);
+    exports.clock.now(() => time = undefined);
   } else if (!nocache && count++ !== 20) {
     return time;
   }
@@ -855,32 +900,45 @@ function now(nocache) {
 }
 
 exports.now = now;
-exports.clock = global_1.Promise.resolve(undefined);
+exports.clock = new class Clock extends global_1.Promise {
+  constructor() {
+    super(resolve => resolve(undefined)); // Promise subclass is slow.
 
-function promise(cb) {
-  global_1.Promise.resolve().then(cb);
-}
+    const clock = global_1.Promise.resolve();
+    clock.next = this.next;
+    clock.now = this.now;
+    return clock;
+  }
 
-exports.promise = promise;
+  next(callback) {
+    scheduled || schedule();
+    exports.clock.then(callback);
+  }
+
+  now(callback) {
+    scheduled || schedule();
+    queue.push(callback);
+  }
+
+}();
 const queue = new queue_1.Queue();
-const scheduler = global_1.Promise.resolve();
+let scheduled = false;
 
-function tick(cb) {
-  queue.isEmpty() && scheduler.then(run);
-  queue.push(cb);
+function schedule() {
+  scheduled = true;
+  exports.clock.then(run);
 }
 
-exports.tick = tick;
-
 function run() {
-  for (let count = queue.length; count--;) {
+  for (let cb; cb = queue.pop();) {
     try {
-      // @ts-expect-error
-      (0, queue.pop())();
+      cb();
     } catch (reason) {
       (0, exception_1.causeAsyncException)(reason);
     }
   }
+
+  scheduled = false;
 }
 
 /***/ }),
@@ -1072,16 +1130,36 @@ exports.duffReduce = duffReduce;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.causeAsyncException = void 0;
+exports.suppressAsyncException = exports.causeAsyncException = void 0;
 
 const global_1 = __webpack_require__(4128);
 
+const stack_1 = __webpack_require__(5352);
+
+const stack = new stack_1.Stack();
+
 function causeAsyncException(reason) {
-  global_1.Promise.reject(reason);
+  if (stack.isEmpty()) {
+    global_1.Promise.reject(reason);
+  } else {
+    stack.peek().push(reason);
+  }
 }
 
 exports.causeAsyncException = causeAsyncException;
 
+function suppressAsyncException(test) {
+  return done => {
+    stack.push([]);
+    return test(err => {
+      stack.pop();
+      done(err);
+    });
+  };
+}
+
+exports.suppressAsyncException = suppressAsyncException;
+
 /***/ }),
 
 /***/ 4128:
@@ -1186,8 +1264,7 @@ class Heap {
     const array = this.array;
     const index = node[2];
     if (array[index] !== node) throw new Error('Invalid node');
-    swap(array, index, --this.$length); // @ts-expect-error
-
+    swap(array, index, --this.$length);
     array[this.$length] = undefined;
     index < this.$length && sort(this.cmp, array, index, this.$length, this.stable);
     return node[1];
@@ -1496,8 +1573,7 @@ class List {
     if (node.list === this) return node.moveTo(before), node;
     node.delete();
     ++this.$length;
-    this.head ??= node; // @ts-expect-error
-
+    this.head ??= node;
     node.list = this;
     const next = node.next = before ?? node;
     const prev = node.prev = next.prev ?? node;
@@ -1555,21 +1631,26 @@ class Node {
     this.value = value;
     this.next = next;
     this.prev = prev;
-    ++list.$length;
+    ++list['$length'];
     list.head ??= this;
     next && prev ? next.prev = prev.next = this : this.next = this.prev = this;
   }
 
+  get alive() {
+    return this.list !== undefined;
+  }
+
   delete() {
-    if (!this.list) return this.value;
-    --this.list.$length;
+    const list = this.list;
+    if (!list) return this.value;
+    --list['$length'];
     const {
       next,
       prev
     } = this;
 
-    if (this.list.head === this) {
-      this.list.head = next === this ? undefined : next;
+    if (list.head === this) {
+      list.head = next === this ? undefined : next;
     }
 
     if (next) {
@@ -1578,11 +1659,9 @@ class Node {
 
     if (prev) {
       prev.next = next;
-    } // @ts-expect-error
-
-
-    this.list = undefined; // @ts-expect-error
+    }
 
+    this.list = undefined;
     this.next = this.prev = undefined;
     return this.value;
   }
@@ -2030,7 +2109,7 @@ exports.MultiQueue = MultiQueue;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.unique = exports.rndAf = exports.rndAP = exports.rnd0_ = exports.rnd0Z = exports.rnd0v = exports.rnd0f = exports.rnd64 = exports.rnd62 = exports.rnd32 = exports.rnd16 = void 0;
+exports.pcg32 = exports.xorshift = exports.unique = exports.rndAf = exports.rndAP = exports.rnd0_ = exports.rnd0Z = exports.rnd0v = exports.rnd0f = exports.rnd64 = exports.rnd62 = exports.rnd32 = exports.rnd16 = void 0;
 
 const global_1 = __webpack_require__(4128);
 
@@ -2115,27 +2194,185 @@ function conv(rnd, dict) {
 const buffer = new Uint16Array(512);
 const digit = 16;
 let index = buffer.length;
+let rnd = 2 ** digit;
 let offset = digit;
 
 function random(len) {
-  if (index === buffer.length) {
+  if (rnd === 2 ** digit) {
     global_1.crypto.getRandomValues(buffer);
     index = 0;
+    rnd = buffer[index];
   }
 
   if (offset === len) {
     offset = digit;
-    return buffer[index++] & masks[len];
+    const r = rnd & masks[len];
+    rnd = buffer[++index] ?? 2 ** digit;
+    return r;
   } else if (offset > len) {
     offset -= len;
-    return buffer[index] >> offset & masks[len];
+    return rnd >> offset & masks[len];
   } else {
     offset = digit;
-    ++index;
+    rnd = buffer[++index] ?? 2 ** digit;
     return random(len);
   }
 }
 
+function xorshift(seed = xorshift.seed()) {
+  return () => {
+    let x = seed;
+    x ^= x << 13;
+    x ^= x >> 17;
+    x ^= x << 5;
+    return seed = x >>> 0;
+  };
+}
+
+exports.xorshift = xorshift;
+
+(function (xorshift) {
+  const max = -1 >>> 0;
+
+  function seed() {
+    return global_1.Math.random() * max + 1 >>> 0;
+  }
+
+  xorshift.seed = seed;
+
+  function random(seed) {
+    const rnd = xorshift(seed);
+    return () => rnd() / (max + 1);
+  }
+
+  xorshift.random = random;
+})(xorshift = exports.xorshift || (exports.xorshift = {}));
+
+const uint32n = n => n & 2n ** 32n - 1n;
+
+const uint64n = n => n & 2n ** 64n - 1n; // https://www.pcg-random.org/download.html
+// https://github.com/imneme/pcg-c/blob/master/include/pcg_variants.h
+
+
+function pcg32(seed = pcg32.seed()) {
+  return () => pcg32.next(seed);
+}
+
+exports.pcg32 = pcg32;
+
+(function (pcg32) {
+  const MULT = 6364136223846793005n;
+
+  function random(seed) {
+    const rnd = pcg32(seed);
+    return () => rnd() / 2 ** 32;
+  }
+
+  pcg32.random = random;
+
+  function seed(state = BigInt(xorshift.seed()) << 32n | BigInt(xorshift.seed()), inc = BigInt(xorshift.seed()) << 32n | BigInt(xorshift.seed())) {
+    const seed = [0n, uint64n(inc << 1n | 1n)];
+    seed[0] = uint64n(seed[0] * MULT + seed[1]);
+    seed[0] = uint64n(seed[0] + state);
+    seed[0] = uint64n(seed[0] * MULT + seed[1]);
+    return seed;
+  }
+
+  pcg32.seed = seed;
+
+  function next(seed) {
+    const oldstate = seed[0];
+    seed[0] = uint64n(oldstate * MULT + seed[1]);
+    const xorshifted = uint32n((oldstate >> 18n ^ oldstate) >> 27n);
+    const rot = oldstate >> 59n;
+    return (0, global_1.Number)(uint32n(xorshifted >> rot | xorshifted << (-rot & 31n)));
+  }
+
+  pcg32.next = next;
+
+  function advance(seed, delta) {
+    while (delta < 0) {
+      delta = 2n ** 64n + delta;
+    }
+
+    delta = uint64n(delta);
+    let acc_mult = 1n;
+    let acc_plus = 0n;
+    let cur_mult = MULT;
+    let cur_plus = seed[1];
+
+    while (delta > 0) {
+      if (delta & 1n) {
+        acc_mult = uint64n(acc_mult * cur_mult);
+        acc_plus = uint64n(acc_plus * cur_mult + cur_plus);
+      }
+
+      cur_plus = uint64n((cur_mult + 1n) * cur_plus);
+      cur_mult = uint64n(cur_mult * cur_mult);
+      delta /= 2n;
+    }
+
+    seed[0] = uint64n(acc_mult * seed[0] + acc_plus);
+    return seed;
+  }
+
+  pcg32.advance = advance;
+})(pcg32 = exports.pcg32 || (exports.pcg32 = {}));
+
+/***/ }),
+
+/***/ 5352:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.Stack = void 0;
+
+class Stack {
+  constructor() {
+    this.array = [];
+  }
+
+  get length() {
+    return this.array.length;
+  }
+
+  isEmpty() {
+    return this.length === 0;
+  }
+
+  peek(index = 0) {
+    return index === 0 ? this.array[this.array.length - 1] : this.array[0];
+  }
+
+  push(value) {
+    this.array.push(value);
+  }
+
+  pop() {
+    return this.array.pop();
+  }
+
+  clear() {
+    this.array = [];
+  }
+
+  *[Symbol.iterator]() {
+    while (!this.isEmpty()) {
+      yield this.pop();
+    }
+
+    return;
+  }
+
+}
+
+exports.Stack = Stack;
+
 /***/ }),
 
 /***/ 5177:
@@ -2176,7 +2413,7 @@ function type(value) {
           return 'Object';
 
         default:
-          return (0, alias_1.toString)(value).slice(8, -1);
+          return value?.constructor?.name || (0, alias_1.toString)(value).slice(8, -1);
       }
 
     default:
@@ -2760,7 +2997,7 @@ function convert(conv, parser) {
     context
   }) => {
     if (source === '') return;
-    const src = conv(source);
+    const src = conv(source, context);
     if (src === '') return [[], ''];
     context.offset ??= 0;
     context.offset += source.length - src.length;
@@ -5012,11 +5249,17 @@ const blockquote_1 = __webpack_require__(7859);
 
 const placeholder_1 = __webpack_require__(5198);
 
+const inline_1 = __webpack_require__(1160);
+
 exports.segment = (0, combinator_1.block)((0, combinator_1.validate)(['[$', '$'], (0, combinator_1.sequence)([(0, combinator_1.line)((0, combinator_1.close)(label_1.segment, /^(?=\s).*\n/)), (0, combinator_1.union)([codeblock_1.segment, mathblock_1.segment, table_1.segment, blockquote_1.segment, placeholder_1.segment, (0, combinator_1.some)(source_1.contentline)])])));
-exports.fig = (0, combinator_1.block)((0, combinator_1.rewrite)(exports.segment, (0, combinator_1.verify)((0, combinator_1.convert)(source => {
+exports.fig = (0, combinator_1.block)((0, combinator_1.rewrite)(exports.segment, (0, combinator_1.verify)((0, combinator_1.convert)((source, context) => {
   const fence = (/^[^\n]*\n!?>+\s/.test(source) && source.match(/^~{3,}(?=[^\S\n]*$)/mg) || []).reduce((max, fence) => fence > max ? fence : max, '~~') + '~';
-  return `${fence}figure ${source}\n\n${fence}`;
+  return parser({
+    source,
+    context
+  }) ? `${fence}figure ${source.replace(/^(.+\n.+\n)([\S\s]+?)\n?$/, '$1\n$2')}\n${fence}` : `${fence}figure ${source}\n\n${fence}`;
 }, (0, combinator_1.union)([figure_1.figure])), ([el]) => el.tagName === 'FIGURE')));
+const parser = (0, combinator_1.sequence)([(0, combinator_1.line)((0, combinator_1.close)(label_1.segment, /^(?=\s).*\n/)), (0, combinator_1.line)((0, combinator_1.union)([inline_1.media, inline_1.shortmedia])), (0, combinator_1.some)(source_1.contentline)]);
 
 /***/ }),
 
@@ -9887,7 +10130,7 @@ function unlink(h) {
 /***/ 3252:
 /***/ (function(module) {
 
-/*! typed-dom v0.0.309 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
+/*! typed-dom v0.0.310 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();
@@ -10319,7 +10562,7 @@ exports.defrag = defrag;
 /***/ 6120:
 /***/ (function(module) {
 
-/*! typed-dom v0.0.309 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
+/*! typed-dom v0.0.310 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/karma.conf.js

@@ -6,7 +6,7 @@ module.exports = function (config) {
       { pattern: 'https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.21/lodash.js', watched: false, served: false, included: true, integrity: 'sha512-2iwCHjuj+PmdCyvb88rMOch0UcKQxVHi/gsAml1fN3eg82IDaO/cdzzeXX4iF2VzIIes7pODE1/G0ts3QBwslA==' },
       { pattern: 'https://cdnjs.cloudflare.com/ajax/libs/benchmark/2.1.4/benchmark.js', watched: false, served: false, included: true, integrity: 'sha512-XnVGk21Ij51MbU8XezQpkwZ1/GA8b5qmoVGIOdJLBYycutjkaeemipzRJP7P6mEJl99OfnweA7M3e4WLfuG7Aw==' },
       { pattern: 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.js', watched: false, served: false, included: true, integrity: 'sha512-n/4gHW3atM3QqRcbCn6ewmpxcLAHGaDjpEBu4xZd47N0W2oQ+6q7oc3PXstrJYXcbNU1OHdQ1T7pAP+gi5Yu8g==' },
-      { pattern: 'https://cdnjs.cloudflare.com/ajax/libs/prism/1.28.0/prism.min.js', watched: false, served: false, included: true, integrity: 'https://cdnjs.cloudflare.com/ajax/libs/prism/1.22.0/prism.js' },
+      { pattern: 'https://cdnjs.cloudflare.com/ajax/libs/prism/1.28.0/prism.min.js', watched: false, served: false, included: true, integrity: 'sha512-RDQSW3KoqJMiX0L/UBgwBmH1EmRYp8LBOiLaA8rBHIy+7OGP/7Gxg8vbt8wG4ZYd29P0Fnoq6+LOytCqx3cyoQ==' },
       { pattern: 'https://cdnjs.cloudflare.com/ajax/libs/prism/1.28.0/plugins/autoloader/prism-autoloader.min.js', watched: false, served: false, included: true, integrity: 'sha512-fTl/qcO1VgvKtOMApX2PdZzkziyr2stM65GYPLGuYMnuMm1z2JLJG6XVU7C/mR+E7xBUqCivykuhlzfqxXBXbg==' },
       { pattern: 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/3.2.0/es5/tex-chtml.min.js', watched: false, served: false, included: true, integrity: 'sha512-93xLZnNMlYI6xaQPf/cSdXoBZ23DThX7VehiGJJXB76HTTalQKPC5CIHuFX8dlQ5yzt6baBQRJ4sDXhzpojRJA==' },
       { pattern: 'https://cdnjs.cloudflare.com/ajax/libs/dompurify/2.3.8/purify.js', watched: false, served: false, included: true, integrity: 'sha512-QaF+0tDlqVmwZaQSc0kImgYmw+Cd66TxA5D9X70I5V9BNSqk6yBTbyqw2VEUsVYV5OTbxw8HD9d45on1wvYv7g==' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.262.2",
+  "version": "0.263.0",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",
@@ -34,26 +34,26 @@
     "@types/mocha": "9.1.1",
     "@types/power-assert": "1.5.8",
     "@types/prismjs": "1.26.0",
-    "@typescript-eslint/parser": "^5.37.0",
+    "@typescript-eslint/parser": "^5.38.1",
     "babel-loader": "^8.2.5",
     "babel-plugin-unassert": "^3.2.0",
     "concurrently": "^7.4.0",
-    "eslint": "^8.23.1",
+    "eslint": "^8.24.0",
     "eslint-plugin-redos": "^4.4.1",
     "eslint-webpack-plugin": "^3.2.0",
     "glob": "^8.0.3",
-    "karma": "^6.4.0",
+    "karma": "^6.4.1",
     "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": "^16.1.3",
+    "npm-check-updates": "^16.3.2",
     "semver": "^7.3.7",
-    "spica": "0.0.626",
-    "ts-loader": "^9.3.1",
-    "typed-dom": "^0.0.309",
+    "spica": "0.0.640",
+    "ts-loader": "^9.4.1",
+    "typed-dom": "^0.0.310",
     "typescript": "4.8.3",
     "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0",

package/src/combinator/control/manipulation/convert.ts

@@ -1,11 +1,11 @@
-import { Parser, check } from '../../data/parser';
+import { Parser, Ctx, Context, check } from '../../data/parser';
 
-export function convert<P extends Parser<unknown>>(conv: (source: string) => string, parser: P): P;
-export function convert<T>(conv: (source: string) => string, parser: Parser<T>): Parser<T> {
+export function convert<P extends Parser<unknown>>(conv: (source: string, context: Context<P>) => string, parser: P): P;
+export function convert<T>(conv: (source: string, context: Ctx) => string, parser: Parser<T>): Parser<T> {
   assert(parser);
   return ({ source, context }) => {
     if (source === '') return;
-    const src = conv(source);
+    const src = conv(source, context);
     if (src === '') return [[], ''];
     context.offset ??= 0;
     context.offset += source.length - src.length;

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

@@ -10,7 +10,6 @@ describe('Unit: parser/block/extension/fig', () => {
       assert.deepStrictEqual(inspect(parser('\n!https://host\n')), undefined);
       assert.deepStrictEqual(inspect(parser('[$group-name]\nhttps://host')), undefined);
       assert.deepStrictEqual(inspect(parser('[$group-name]\nhttps://host\n')), undefined);
-      assert.deepStrictEqual(inspect(parser('[$group-name]\n!https://host\na')), undefined);
       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);
@@ -43,6 +42,8 @@ describe('Unit: parser/block/extension/fig', () => {
       assert.deepStrictEqual(inspect(parser('[$group-name]\n!> _a_')), [['<figure data-type="quote" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><blockquote><section><p><em>a</em></p><h2>References</h2><ol class="references"></ol></section></blockquote></div></figure>'], '']);
       assert.deepStrictEqual(inspect(parser('[$group-name]\n![]{https://host}')), [['<figure data-type="media" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><a href="https://host" target="_blank"><img class="media" data-src="https://host" alt=""></a></div></figure>'], '']);
       assert.deepStrictEqual(inspect(parser('[$group-name]\n![]{https://host}\n')), [['<figure data-type="media" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><a href="https://host" target="_blank"><img class="media" data-src="https://host" alt=""></a></div></figure>'], '']);
+      assert.deepStrictEqual(inspect(parser('[$group-name]\n!https://host\ncaption')), [['<figure data-type="media" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext">caption</span></figcaption><div><a href="https://host" target="_blank"><img class="media" data-src="https://host" alt=""></a></div></figure>'], '']);
+      assert.deepStrictEqual(inspect(parser('[$group-name]\n!https://host\ncaption\n')), [['<figure data-type="media" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext">caption</span></figcaption><div><a href="https://host" target="_blank"><img class="media" data-src="https://host" alt=""></a></div></figure>'], '']);
       assert.deepStrictEqual(inspect(parser('$group-name\n!https://host')), [['<figure data-type="media" data-label="group-name" data-group="group"><figcaption><span class="figindex"></span><span class="figtext"></span></figcaption><div><a href="https://host" target="_blank"><img class="media" data-src="https://host" alt=""></a></div></figure>'], '']);
     });
 

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

@@ -8,6 +8,7 @@ import { segment as seg_math } from '../mathblock';
 import { segment as seg_table } from './table';
 import { segment as seg_blockquote } from '../blockquote';
 import { segment as seg_placeholder } from './placeholder';
+import { media, shortmedia } from '../../inline';
 
 import FigParser = ExtensionParser.FigParser;
 
@@ -25,10 +26,21 @@ export const segment: FigParser.SegmentParser = block(validate(['[$', '$'],
   ])));
 
 export const fig: FigParser = block(rewrite(segment, verify(convert(
-  source => {
+  (source, context) => {
     const fence = (/^[^\n]*\n!?>+\s/.test(source) && source.match(/^~{3,}(?=[^\S\n]*$)/mg) || [])
       .reduce((max, fence) => fence > max ? fence : max, '~~') + '~';
-    return `${fence}figure ${source}\n\n${fence}`;
+    return parser({ source, context })
+      ? `${fence}figure ${source.replace(/^(.+\n.+\n)([\S\s]+?)\n?$/, '$1\n$2')}\n${fence}`
+      : `${fence}figure ${source}\n\n${fence}`;
   },
   union([figure])),
   ([el]) => el.tagName === 'FIGURE')));
+
+const parser = sequence([
+  line(close(seg_label, /^(?=\s).*\n/)),
+  line(union([
+    media,
+    shortmedia,
+  ])),
+  some(contentline),
+]);