securemark 0.233.0 → 0.233.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.233.1
+
+- Refactoring.
+
 ## 0.233.0
 
 - Refine comment parser.

package/dist/securemark.js

@@ -1,4 +1,4 @@
-/*! securemark v0.233.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
+/*! securemark v0.233.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
 require = function () {
     function r(e, n, t) {
         function o(i, f) {
@@ -6907,8 +6907,9 @@ require = function () {
                 return (0, combinator_1.fmap)(parser, ([el], _, {id}) => [(0, typed_dom_1.define)(el, { id: id !== '' && identity(text(el)) || global_1.undefined })]);
             }
             exports.indexee = indexee;
-            function identity(index) {
-                return `index:${ index.trim().replace(/\s+/g, '_').slice(0, 101).replace(/^(.{97}).{4}$/, '$1...') }`;
+            function identity(text) {
+                text && (text = text.trim());
+                return text && `index:${ text.replace(/\s+/g, '_').slice(0, 101).replace(/^(.{97}).{4}$/, '$1...') }`;
             }
             exports.identity = identity;
             function text(source) {
@@ -8159,7 +8160,7 @@ require = function () {
                         } else {
                             (_b = ref.lastChild) === null || _b === void 0 ? void 0 : _b.remove();
                         }
-                        const title = global_1.undefined || titles.get(identifier) || +identifier[0] && ref.title || (0, indexee_1.text)(content).trim() || global_1.undefined;
+                        const title = global_1.undefined || titles.get(identifier) || +identifier[0] && ref.title || (0, indexee_1.text)(content).trim() || content.textContent.trim() || global_1.undefined;
                         title ? !titles.has(identifier) && titles.set(identifier, title) : buffer.set(identifier, ref);
                         const blank = !!abbr && !content.firstChild;
                         const refIndex = i + 1;

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.233.0",
+  "version": "0.233.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -3030,9 +3030,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.4.92",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.92.tgz",
-      "integrity": "sha512-YAVbvQIcDE/IJ/vzDMjD484/hsRbFPW2qXJPaYTfOhtligmfYEYOep+5QojpaEU9kq6bMvNeC2aG7arYvTHYsA==",
+      "version": "1.4.93",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.93.tgz",
+      "integrity": "sha512-ywq9Pc5Gwwpv7NG767CtoU8xF3aAUQJjH9//Wy3MBCg4w5JSLbJUq2L8IsCdzPMjvSgxuue9WcVaTOyyxCL0aQ==",
       "dev": true
     },
     "elliptic": {
@@ -6359,9 +6359,9 @@
       "dev": true
     },
     "isbinaryfile": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz",
-      "integrity": "sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.9.tgz",
+      "integrity": "sha512-GhwgwhMeEkMF/PmVpA+zRGCxoQvJ7PONqsKI+eq+ivgYolKe7AQdlqLFiSEBSTrO3YsQ2jvgwT2Gd6Z1TDcoaw==",
       "dev": true
     },
     "isexe": {
@@ -7092,18 +7092,18 @@
       }
     },
     "make-fetch-happen": {
-      "version": "10.0.6",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.0.6.tgz",
-      "integrity": "sha512-4Gfh6lV3TLXmj7qz79hBFuvVqjYSMW6v2+sxtdX4LFQU0rK3V/txRjE0DoZb7X0IF3t9f8NO3CxPSWlvdckhVA==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.1.0.tgz",
+      "integrity": "sha512-HeP4QlkadP/Op+hE+Une1070kcyN85FshQObku3/rmzRh4zDcKXA19d2L3AQR6UoaX3uZmhSOpTLH15b1vOFvQ==",
       "dev": true,
       "requires": {
         "agentkeepalive": "^4.2.1",
-        "cacache": "^16.0.0",
+        "cacache": "^16.0.2",
         "http-cache-semantics": "^4.1.0",
         "http-proxy-agent": "^5.0.0",
         "https-proxy-agent": "^5.0.0",
         "is-lambda": "^1.0.1",
-        "lru-cache": "^7.5.1",
+        "lru-cache": "^7.7.1",
         "minipass": "^3.1.6",
         "minipass-collect": "^1.0.2",
         "minipass-fetch": "^2.0.3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.233.0",
+  "version": "0.233.1",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",

package/src/parser/inline/annotation.test.ts

@@ -18,14 +18,14 @@ describe('Unit: parser/inline/annotation', () => {
       assert.deepStrictEqual(inspect(parser('((\na))')), undefined);
       assert.deepStrictEqual(inspect(parser('((\\ a))')), undefined);
       assert.deepStrictEqual(inspect(parser('((\\\na))')), undefined);
+      assert.deepStrictEqual(inspect(parser('((<wbr>a))')), undefined);
       assert.deepStrictEqual(inspect(parser('((a\n))')), undefined);
       assert.deepStrictEqual(inspect(parser('((a\\\n))')), undefined);
       assert.deepStrictEqual(inspect(parser('((a\nb))')), undefined);
       assert.deepStrictEqual(inspect(parser('((a\\\nb))')), undefined);
-      assert.deepStrictEqual(inspect(parser('((<wbr>a))')), undefined);
-      assert.deepStrictEqual(inspect(parser('((a)b))')), undefined);
       assert.deepStrictEqual(inspect(parser('((*a\nb*))')), undefined);
       assert.deepStrictEqual(inspect(parser('((\\))')), undefined);
+      assert.deepStrictEqual(inspect(parser('((a)b))')), undefined);
       assert.deepStrictEqual(inspect(parser('(((a))')), undefined);
       assert.deepStrictEqual(inspect(parser(' ((a))')), undefined);
     });

package/src/parser/inline/deletion.test.ts

@@ -17,7 +17,7 @@ describe('Unit: parser/inline/deletion', () => {
 
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('~~a~~')), [['<del>a</del>'], '']);
-      assert.deepStrictEqual(inspect(parser('~~ab~~')), [['<del>ab</del>'], '']);
+      assert.deepStrictEqual(inspect(parser('~~a~b~~')), [['<del>a~b</del>'], '']);
       assert.deepStrictEqual(inspect(parser('~~a ~~')), [['<del>a </del>'], '']);
       assert.deepStrictEqual(inspect(parser('~~ ~~')), [['<del> </del>'], '']);
       assert.deepStrictEqual(inspect(parser('~~ a~~')), [['<del> a</del>'], '']);

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

@@ -54,8 +54,8 @@ describe('Unit: parser/inline/extension/index', () => {
       assert.deepStrictEqual(inspect(parser('[#@a]')), [['<a class="index" href="#index:@a">@a</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#http://host]')), [['<a class="index" href="#index:http://host">http://host</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#!http://host]')), [['<a class="index" href="#index:!http://host">!http://host</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#[#  #]]')), [['<a class="index" href="#index:"><span class="comment">[#  #]</span></a>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#[# a #]]')), [['<a class="index" href="#index:"><span class="comment">[# a #]</span></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#[#  #]]')), [['<a class="index"><span class="comment">[#  #]</span></a>'], '']);
+      assert.deepStrictEqual(inspect(parser('[#[# a #]]')), [['<a class="index"><span class="comment">[# a #]</span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a((b))]')), [['<a class="index" href="#index:a((b))">a<span class="paren">((b))</span></a>'], '']);
       assert.deepStrictEqual(inspect(parser('[#a[[b]]]')), [['<a class="index" href="#index:a[[b]]">a[[b]]</a>'], '']);
     });

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

@@ -9,9 +9,10 @@ export function indexee(parser: Parser<HTMLElement, MarkdownParser.Context>): Pa
   return fmap(parser, ([el], _, { id }) => [define(el, { id: id !== '' && identity(text(el)) || undefined })]);
 }
 
-export function identity(index: string): string {
-  assert(!index.includes('\n'));
-  return `index:${index.trim().replace(/\s+/g, '_').slice(0, 101).replace(/^(.{97}).{4}$/, '$1...')}`;
+export function identity(text: string): string {
+  assert(!text.includes('\n'));
+  text &&= text.trim();
+  return text && `index:${text.replace(/\s+/g, '_').slice(0, 101).replace(/^(.{97}).{4}$/, '$1...')}`;
 }
 assert(identity('0'.repeat(100)).slice(6) === '0'.repeat(100));
 assert(identity('0'.repeat(101)).slice(6) === '0'.repeat(97) + '...');

package/src/parser/inline/insertion.test.ts

@@ -17,7 +17,7 @@ describe('Unit: parser/inline/insertion', () => {
 
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('++a++')), [['<ins>a</ins>'], '']);
-      assert.deepStrictEqual(inspect(parser('++ab++')), [['<ins>ab</ins>'], '']);
+      assert.deepStrictEqual(inspect(parser('++a+b++')), [['<ins>a+b</ins>'], '']);
       assert.deepStrictEqual(inspect(parser('++a ++')), [['<ins>a </ins>'], '']);
       assert.deepStrictEqual(inspect(parser('++ ++')), [['<ins> </ins>'], '']);
       assert.deepStrictEqual(inspect(parser('++ a++')), [['<ins> a</ins>'], '']);

package/src/parser/inline/mark.test.ts

@@ -27,7 +27,7 @@ describe('Unit: parser/inline/mark', () => {
 
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('==a==')), [['<mark>a</mark>'], '']);
-      assert.deepStrictEqual(inspect(parser('==ab==')), [['<mark>ab</mark>'], '']);
+      assert.deepStrictEqual(inspect(parser('==a=b==')), [['<mark>a=b</mark>'], '']);
       assert.deepStrictEqual(inspect(parser('==a\nb==')), [['<mark>a<br>b</mark>'], '']);
       assert.deepStrictEqual(inspect(parser('==a\\\nb==')), [['<mark>a<span class="linebreak"> </span>b</mark>'], '']);
       assert.deepStrictEqual(inspect(parser('==\\===')), [['<mark>=</mark>'], '']);

package/src/parser/inline/reference.test.ts

@@ -18,14 +18,14 @@ describe('Unit: parser/inline/reference', () => {
       assert.deepStrictEqual(inspect(parser('[[\na]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[\\ a]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[\\\na]]')), undefined);
+      assert.deepStrictEqual(inspect(parser('[[<wbr>a]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[a\n]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[a\\\n]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[a\nb]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[a\\\nb]]')), undefined);
-      assert.deepStrictEqual(inspect(parser('[[<wbr>a]]')), undefined);
-      assert.deepStrictEqual(inspect(parser('[[a]b]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[*a\nb*]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[\\]]')), undefined);
+      assert.deepStrictEqual(inspect(parser('[[a]b]]')), undefined);
       assert.deepStrictEqual(inspect(parser('[[[a]]')), undefined);
       assert.deepStrictEqual(inspect(parser(' [[a]]')), undefined);
     });

package/src/parser/inline/template.test.ts

@@ -11,8 +11,8 @@ describe('Unit: parser/inline/template', () => {
       assert.deepStrictEqual(inspect(parser('{')), undefined);
       assert.deepStrictEqual(inspect(parser('{}')), undefined);
       assert.deepStrictEqual(inspect(parser('{{')), undefined);
-      assert.deepStrictEqual(inspect(parser('{{a}b}}')), undefined);
       assert.deepStrictEqual(inspect(parser('{{\\}}')), undefined);
+      assert.deepStrictEqual(inspect(parser('{{a}b}')), undefined);
       assert.deepStrictEqual(inspect(parser('{{{a}}')), undefined);
       assert.deepStrictEqual(inspect(parser(' {{}}')), undefined);
     });

package/src/parser/processor/footnote.ts

@@ -22,8 +22,8 @@ function build(
   marker: (index: number, abbr: string | undefined) => string,
 ) {
   assert(syntax.match(/^[a-z]+$/));
-  // Referenceを含むAnnotationの重複排除は両構文が互いに処理済みである必要があるため
-  // 事後の補正処理が必要となり各1回の処理では不可能
+  // Referenceを含むAnnotationの重複排除は両構文が互いに処理済みであることを必要とするため
+  // 構文ごとに各1回の処理では不可能
   const identify = memoize<HTMLElement, string>(
     ref => `${+!ref.querySelector('.label')}:${ref.getAttribute('data-abbr') || '_' + ref.innerHTML}`,
     new WeakMap());
@@ -69,6 +69,7 @@ function build(
         || titles.get(identifier)
         || +identifier[0] && ref.title
         || text(content).trim()
+        || content.textContent!.trim()
         || undefined;
       title
         ? !titles.has(identifier) && titles.set(identifier, title)