securemark 0.225.1 → 0.225.2

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.225.2
+
+- Refactoring.
+
 ## 0.225.1
 
 - Refactoring.

package/design.md

@@ -148,12 +148,6 @@
 ゆえに参照箇所に実体を記述する注釈構文および識別に文字列を使用する図表構文を採用し、その表示方法は任意とする。
 脚注構文は附番が手作業となり参照と実体の対応の管理が困難であるため不採用とし注釈構文により生成可能とする。
 
-### 羅列的知識への非依存
-
-構文はその使用のために羅列的知識を求めてはならない。
-
-ゆえに構文はHTMLエンティティの参照の有効性を検査しない。
-
 ### テンプレート対応
 
 ソーステキストは自身をテンプレートとして別のソーステキストを生成するための構文を使用できなければならない。

package/dist/securemark.js

@@ -1,4 +1,4 @@
-/*! securemark v0.225.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
+/*! securemark v0.225.2 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
 require = function () {
     function r(e, n, t) {
         function o(i, f) {
@@ -8051,11 +8051,6 @@ require = function () {
                 const acc = [''];
                 while (source !== '') {
                     switch (source[0]) {
-                    case ' ':
-                    case '\u3000':
-                        acc.push('');
-                        source = source.slice(1);
-                        continue;
                     case '&': {
                             const result = (0, htmlentity_1.htmlentity)(source, context);
                             acc[acc.length - 1] += (0, parser_1.eval)(result, [source[0]])[0];
@@ -8063,6 +8058,11 @@ require = function () {
                             continue;
                         }
                     default: {
+                            if (source[0].trimStart() === '') {
+                                acc.push('');
+                                source = source.slice(1);
+                                continue;
+                            }
                             const result = (0, source_1.text)(source, context);
                             acc[acc.length - 1] += (_a = (0, parser_1.eval)(result)[0]) !== null && _a !== void 0 ? _a : source.slice(0, source.length - (0, parser_1.exec)(result).length);
                             source = (0, parser_1.exec)(result);
@@ -8642,6 +8642,7 @@ require = function () {
             Object.defineProperty(exports, '__esModule', { value: true });
             exports.escsource = void 0;
             const combinator_1 = _dereq_('../../combinator');
+            const text_1 = _dereq_('./text');
             const separator = /[\s\x00-\x2F\x3A-\x40\x5B-\x60\x7B-\x7F]/;
             exports.escsource = (0, combinator_1.creator)(source => {
                 if (source === '')
@@ -8661,9 +8662,11 @@ require = function () {
                             source.slice(2)
                         ];
                     default:
+                        const b = source[0] !== '\n' && source[0].trimStart() === '';
+                        const i = b || (0, text_1.isAlphanumeric)(source[0]) ? source.search(b ? text_1.nonWhitespace : text_1.nonAlphanumeric) : 1;
                         return [
-                            [source.slice(0, 1)],
-                            source.slice(1)
+                            [source.slice(0, i)],
+                            source.slice(i)
                         ];
                     }
                 default:
@@ -8674,7 +8677,10 @@ require = function () {
                 }
             });
         },
-        { '../../combinator': 30 }
+        {
+            '../../combinator': 30,
+            './text': 135
+        }
     ],
     133: [
         function (_dereq_, module, exports) {
@@ -9020,16 +9026,20 @@ require = function () {
             function isEndTightNodes(nodes) {
                 if (nodes.length === 0)
                     return true;
-                return isVisible(nodes[nodes.length - 1], -1);
+                for (let i = nodes.length; i--;) {
+                    if (typeof nodes[i] === 'object' && nodes[i]['className'] === 'comment')
+                        continue;
+                    return isVisible(nodes[i], -1);
+                }
+                return false;
             }
             exports.isEndTightNodes = isEndTightNodes;
-            function isVisible(node, position) {
-                if (!node)
-                    return false;
+            function isVisible(node, strpos) {
                 switch (typeof node) {
                 case 'string':
-                    const char = position === global_1.undefined ? node : node[position >= 0 ? position : node.length + position];
+                    const char = node && strpos !== global_1.undefined ? node[strpos >= 0 ? strpos : node.length + strpos] : node;
                     switch (char) {
+                    case '':
                     case ' ':
                     case '\t':
                     case '\n':

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.225.1",
+  "version": "0.225.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

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

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

@@ -15,6 +15,7 @@ describe('Unit: parser/inline/emphasis', () => {
       assert.deepStrictEqual(inspect(parser('*a\\\n*')), [['*', 'a', '<span class="linebreak"> </span>'], '*']);
       assert.deepStrictEqual(inspect(parser('*a**b')), [['*', 'a', '**', 'b'], '']);
       assert.deepStrictEqual(inspect(parser('*a**b*')), [['*', 'a', '**', 'b', '*'], '']);
+      assert.deepStrictEqual(inspect(parser('*a [# b #]*')), [['*', 'a', ' ', '<sup class="comment" title="b"></sup>'], '*']);
       assert.deepStrictEqual(inspect(parser('* *')), undefined);
       assert.deepStrictEqual(inspect(parser('* a*')), undefined);
       assert.deepStrictEqual(inspect(parser('* a *')), undefined);
@@ -35,10 +36,12 @@ describe('Unit: parser/inline/emphasis', () => {
       assert.deepStrictEqual(inspect(parser('*a\nb*')), [['<em>a<br>b</em>'], '']);
       assert.deepStrictEqual(inspect(parser('*a\\\nb*')), [['<em>a<span class="linebreak"> </span>b</em>'], '']);
       assert.deepStrictEqual(inspect(parser('*a**')), [['<em>a</em>'], '*']);
-      assert.deepStrictEqual(inspect(parser('*a**b**c*')), [['<em>a<strong>b</strong>c</em>'], '']);
     });
 
     it('nest', () => {
+      assert.deepStrictEqual(inspect(parser('*a**b**c*')), [['<em>a<strong>b</strong>c</em>'], '']);
+      assert.deepStrictEqual(inspect(parser('*a**b**c*d')), [['<em>a<strong>b</strong>c</em>'], 'd']);
+      assert.deepStrictEqual(inspect(parser('*a[# b #]*')), [['<em>a<sup class="comment" title="b"></sup></em>'], '']);
       assert.deepStrictEqual(inspect(parser('*`a`*')), [['<em><code data-src="`a`">a</code></em>'], '']);
       assert.deepStrictEqual(inspect(parser('*<small>*')), [['<em>&lt;small&gt;</em>'], '']);
       assert.deepStrictEqual(inspect(parser('*(*a*)*')), [['<em><span class="paren">(<em>a</em>)</span></em>'], '']);

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

@@ -16,6 +16,7 @@ describe('Unit: parser/inline/mark', () => {
       assert.deepStrictEqual(inspect(parser('==a\n==')), [['==', 'a', '<br>'], '==']);
       assert.deepStrictEqual(inspect(parser('==a\\ ==')), [['==', 'a', ' '], '==']);
       assert.deepStrictEqual(inspect(parser('==a\\\n==')), [['==', 'a', '<span class="linebreak"> </span>'], '==']);
+      assert.deepStrictEqual(inspect(parser('==a [# b #]==')), [['==', 'a', ' ', '<sup class="comment" title="b"></sup>'], '==']);
       assert.deepStrictEqual(inspect(parser('== ==')), undefined);
       assert.deepStrictEqual(inspect(parser('== a==')), undefined);
       assert.deepStrictEqual(inspect(parser('== a ==')), undefined);
@@ -36,6 +37,7 @@ describe('Unit: parser/inline/mark', () => {
     });
 
     it('nest', () => {
+      assert.deepStrictEqual(inspect(parser('==a[# b #]==')), [['<mark>a<sup class="comment" title="b"></sup></mark>'], '']);
       assert.deepStrictEqual(inspect(parser('==*==a==*==')), [['<mark><em><mark>a</mark></em></mark>'], '']);
     });
 

package/src/parser/inline/ruby.ts

@@ -51,11 +51,6 @@ const text: RubyParser.TextParser = creator((source, context) => {
   while (source !== '') {
     assert(source[0] !== '\n');
     switch (source[0]) {
-      case ' ':
-      case '　':
-        acc.push('');
-        source = source.slice(1);
-        continue;
       case '&': {
         const result = htmlentity(source, context);
         acc[acc.length - 1] += eval(result, [source[0]])[0];
@@ -63,6 +58,11 @@ const text: RubyParser.TextParser = creator((source, context) => {
         continue;
       }
       default: {
+        if (source[0].trimStart() === '') {
+          acc.push('');
+          source = source.slice(1);
+          continue;
+        }
         const result = txt(source, context)!;
         assert(result);
         acc[acc.length - 1] += eval(result)[0] ?? source.slice(0, source.length - exec(result).length);

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

@@ -15,6 +15,7 @@ describe('Unit: parser/inline/strong', () => {
       assert.deepStrictEqual(inspect(parser('**a\\ **')), [['**', 'a', ' '], '**']);
       assert.deepStrictEqual(inspect(parser('**a\\\n**')), [['**', 'a', '<span class="linebreak"> </span>'], '**']);
       assert.deepStrictEqual(inspect(parser('**a*b**')), [['**', 'a', '<em>b</em>', '*'], '']);
+      assert.deepStrictEqual(inspect(parser('**a [# b #]**')), [['**', 'a', ' ', '<sup class="comment" title="b"></sup>'], '**']);
       assert.deepStrictEqual(inspect(parser('** **')), undefined);
       assert.deepStrictEqual(inspect(parser('** a**')), undefined);
       assert.deepStrictEqual(inspect(parser('** a **')), undefined);
@@ -33,12 +34,13 @@ describe('Unit: parser/inline/strong', () => {
       assert.deepStrictEqual(inspect(parser('**ab**')), [['<strong>ab</strong>'], '']);
       assert.deepStrictEqual(inspect(parser('**a\nb**')), [['<strong>a<br>b</strong>'], '']);
       assert.deepStrictEqual(inspect(parser('**a\\\nb**')), [['<strong>a<span class="linebreak"> </span>b</strong>'], '']);
-      assert.deepStrictEqual(inspect(parser('**a*b*c**')), [['<strong>a<em>b</em>c</strong>'], '']);
-      assert.deepStrictEqual(inspect(parser('**a*b*c**d')), [['<strong>a<em>b</em>c</strong>'], 'd']);
-      assert.deepStrictEqual(inspect(parser('**a *b***')), [['<strong>a <em>b</em></strong>'], '']);
     });
 
     it('nest', () => {
+      assert.deepStrictEqual(inspect(parser('**a*b*c**')), [['<strong>a<em>b</em>c</strong>'], '']);
+      assert.deepStrictEqual(inspect(parser('**a*b*c**d')), [['<strong>a<em>b</em>c</strong>'], 'd']);
+      assert.deepStrictEqual(inspect(parser('**a *b***')), [['<strong>a <em>b</em></strong>'], '']);
+      assert.deepStrictEqual(inspect(parser('**a[# b #]**')), [['<strong>a<sup class="comment" title="b"></sup></strong>'], '']);
       assert.deepStrictEqual(inspect(parser('**`a`**')), [['<strong><code data-src="`a`">a</code></strong>'], '']);
       assert.deepStrictEqual(inspect(parser('**<small>**')), [['<strong>&lt;small&gt;</strong>'], '']);
       assert.deepStrictEqual(inspect(parser('**(*a*)**')), [['<strong><span class="paren">(<em>a</em>)</span></strong>'], '']);

package/src/parser/source/escapable.ts

@@ -1,5 +1,6 @@
 import { EscapableSourceParser } from '../source';
 import { creator } from '../../combinator';
+import { nonWhitespace, nonAlphanumeric, isAlphanumeric } from './text';
 
 const separator = /[\s\x00-\x2F\x3A-\x40\x5B-\x60\x7B-\x7F]/;
 
@@ -15,7 +16,12 @@ export const escsource: EscapableSourceParser = creator(source => {
         case '\\':
           return [[source.slice(0, 2)], source.slice(2)];
         default:
-          return [[source.slice(0, 1)], source.slice(1)];
+          const b = source[0] !== '\n' && source[0].trimStart() === '';
+          const i = b || isAlphanumeric(source[0])
+            ? source.search(b ? nonWhitespace : nonAlphanumeric)
+            : 1;
+          assert(i > 0);
+          return [[source.slice(0, i)], source.slice(i)];
       }
     default:
       return [[source.slice(0, i)], source.slice(i)];

package/src/parser/util.ts

@@ -135,17 +135,20 @@ export function isStartTightNodes(nodes: readonly (HTMLElement | string)[]): boo
 }
 export function isEndTightNodes(nodes: readonly (HTMLElement | string)[]): boolean {
   if (nodes.length === 0) return true;
-  return isVisible(nodes[nodes.length - 1], -1);
+  for (let i = nodes.length; i--;) {
+    if (typeof nodes[i] === 'object' && nodes[i]['className'] === 'comment') continue;
+    return isVisible(nodes[i], -1);
+  }
+  return false;
 }
-function isVisible(node: HTMLElement | string, position?: number): boolean {
-  if (!node) return false;
+function isVisible(node: HTMLElement | string, strpos?: number): boolean {
   switch (typeof node) {
     case 'string':
-      const char = position === undefined
-        ? node
-        : node[position >= 0 ? position : node.length + position];
-      assert(char);
+      const char = node && strpos !== undefined
+        ? node[strpos >= 0 ? strpos : node.length + strpos]
+        : node;
       switch (char) {
+        case '':
         case ' ':
         case '\t':
         case '\n':