securemark 0.283.7 → 0.284.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.284.0
+
+- Add italic syntax.
+
 ## 0.283.7
 
 - Refactoring.

package/README.md

@@ -47,7 +47,7 @@ Secure markdown renderer working on browsers for user input data.
 - Blockquote (>, !>)
 - Preformattedtext (```)
 - Pagebreak (===)
-- Inline markups (*, **, `, []{}, {}, ![]{}, !{}, \[](), ++, ~~, (()), ...)
+- Inline markups (*, **, ///, `, []{}, {}, ![]{}, !{}, \[](), ++, ~~, (()), ...)
 - Inline HTML tags (\<bdi>, \<bdo>)
 - Autolink (https://host, user@host, @user)
 - Shortmedia (!https://host/image.png, !https://youtu.be/...)
@@ -65,16 +65,16 @@ Secure markdown renderer working on browsers for user input data.
 
 ## Operator precedence
 
-|P| Operators              |
-|-|------------------------|
-|9| \n, \\\n               |
-|8| `                      |
-|6| (()), [[]], {{}}, ${}$ |
-|5| [% %]                  |
-|4| \<tag>\</tag>          |
-|3| $, "                   |
-|2| (), [], {}             |
-|1| *, **, ==, ++, ~~      |
+|P| Operators                    |
+|-|------------------------------|
+|9| \n, \\\n                     |
+|6| `                            |
+|5| ${}$                         |
+|4| [% %]                        |
+|3| \<tag>\</tag>                |
+|2| $, "                         |
+|1| (), [], {}, (()), [[]], {{}} |
+|0| *, **, ///, ==, ++, ~~       |
 
 ## Dependencies
 

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.283.7 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.284.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("Prism"), require("DOMPurify"));
@@ -2426,7 +2426,7 @@ exports.math = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('$', (0,
   'data-invalid-type': 'content',
   'data-invalid-message': `"${source.match(forbiddenCommand)[0]}" command is forbidden`
 }, source)], '']))));
-const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(0, 6 /* Recursion.terminal */, (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.some)((0, combinator_1.union)([bracket, (0, combinator_1.some)(source_1.escsource, /^(?:[{}$]|\\?\n)/)])), (0, source_1.str)('}'), true)));
+const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(0, 6 /* Recursion.terminal */, (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.some)((0, combinator_1.union)([bracket, (0, combinator_1.some)(source_1.escsource, /^[{}$\n]/)])), (0, source_1.str)('}'), true)));
 
 /***/ },
 
@@ -3917,6 +3917,28 @@ MultiHeap.min = Heap.min;
 
 /***/ },
 
+/***/ 3744
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.italic = void 0;
+const combinator_1 = __webpack_require__(3484);
+const inline_1 = __webpack_require__(7973);
+const source_1 = __webpack_require__(8745);
+const visibility_1 = __webpack_require__(6364);
+const array_1 = __webpack_require__(6876);
+const dom_1 = __webpack_require__(394);
+// 斜体は単語に使うとかえって見づらく読み飛ばしやすくなるため使わないべきであり
+// ある程度の長さのある文に使うのが望ましい。
+exports.italic = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(1, 4 /* Recursion.inline */, (0, combinator_1.surround)((0, source_1.str)('///', '/'), (0, combinator_1.precedence)(0, (0, visibility_1.startTight)((0, combinator_1.some)((0, combinator_1.union)([(0, combinator_1.some)(inline_1.inline, (0, visibility_1.blankWith)('///')), (0, combinator_1.open)((0, combinator_1.some)(inline_1.inline, '/'), exports.italic)])))), (0, source_1.str)('///'), false, ([, bs], rest) => [[(0, dom_1.html)('i', (0, dom_1.defrag)(bs))], rest], ([as, bs], rest) => [(0, array_1.unshift)(as, bs), rest])));
+
+/***/ },
+
 /***/ 3770
 (__unused_webpack_module, exports, __webpack_require__) {
 
@@ -4959,7 +4981,7 @@ const dom_1 = __webpack_require__(394);
 exports.template = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, (0, combinator_1.surround)('{{', (0, combinator_1.precedence)(1, (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), '}')), '}}', true, ([, ns = []], rest) => [[(0, dom_1.html)('span', {
   class: 'template'
 }, `{{${ns.join('')}}}`)], rest], undefined, 3 | 28 /* Backtrack.template */)));
-const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(0, 6 /* Recursion.terminal */, (0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), ')'), (0, source_1.str)(')'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest], 3 | 28 /* Backtrack.template */), (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), ']'), (0, source_1.str)(']'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest], 3 | 28 /* Backtrack.template */), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), '}'), (0, source_1.str)('}'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest], 3 | 28 /* Backtrack.template */), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.precedence)(2, (0, combinator_1.some)(source_1.escsource, /^"|^\\?\n/)), (0, source_1.str)('"'), true, undefined, undefined, 3 | 28 /* Backtrack.template */)])));
+const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creation)(0, 6 /* Recursion.terminal */, (0, combinator_1.union)([(0, combinator_1.surround)((0, source_1.str)('('), (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), ')'), (0, source_1.str)(')'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest], 3 | 28 /* Backtrack.template */), (0, combinator_1.surround)((0, source_1.str)('['), (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), ']'), (0, source_1.str)(']'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest], 3 | 28 /* Backtrack.template */), (0, combinator_1.surround)((0, source_1.str)('{'), (0, combinator_1.some)((0, combinator_1.union)([bracket, source_1.escsource]), '}'), (0, source_1.str)('}'), true, undefined, ([as, bs = []], rest) => [(0, array_1.unshift)(as, bs), rest], 3 | 28 /* Backtrack.template */), (0, combinator_1.surround)((0, source_1.str)('"'), (0, combinator_1.precedence)(2, (0, combinator_1.some)(source_1.escsource, /^["\n]/)), (0, source_1.str)('"'), true, undefined, undefined, 3 | 28 /* Backtrack.template */)])));
 
 /***/ },
 
@@ -5435,6 +5457,7 @@ exports.text = (0, combinator_1.creation)(1, 0 /* Recursion.ignore */, ({
         case '\n':
           return [[(0, dom_1.html)('br')], source.slice(1)];
         case '*':
+        case '/':
         case '+':
         case '~':
         case '=':
@@ -7674,6 +7697,7 @@ const mark_1 = __webpack_require__(5381);
 const emstrong_1 = __webpack_require__(365);
 const strong_1 = __webpack_require__(6591);
 const emphasis_1 = __webpack_require__(1354);
+const italic_1 = __webpack_require__(3744);
 const math_1 = __webpack_require__(2962);
 const code_1 = __webpack_require__(3481);
 const htmlentity_1 = __webpack_require__(470);
@@ -7708,6 +7732,8 @@ exports.inline = (0, combinator_1.lazy)(() => (0, combinator_1.union)([input =>
       return (0, deletion_1.deletion)(input);
     case '==':
       return (0, mark_1.mark)(input);
+    case '//':
+      return (0, italic_1.italic)(input);
   }
   switch (source[0]) {
     case '[':

package/markdown.d.ts

@@ -661,6 +661,7 @@ export namespace MarkdownParser {
       InlineParser.EmStrongParser,
       InlineParser.StrongParser,
       InlineParser.EmphasisParser,
+      InlineParser.ItalicParser,
       InlineParser.MathParser,
       InlineParser.CodeParser,
       InlineParser.HTMLEntityParser,
@@ -1066,6 +1067,14 @@ export namespace MarkdownParser {
         ]>,
       ]> {
     }
+    export interface ItalicParser extends
+      // ///abc///
+      Inline<'italic'>,
+      Parser<HTMLElement | string, Context, [
+        InlineParser,
+        ItalicParser,
+      ]> {
+    }
     export interface MathParser extends
       // $expr$
       // ${expr}$

package/package.json

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

package/src/parser/inline/autolink/url.test.ts

@@ -16,7 +16,7 @@ describe('Unit: parser/inline/autolink/url', () => {
       assert.deepStrictEqual(inspect(parser('Http://host')), [['Http'], '://host']);
       //assert.deepStrictEqual(inspect(parser('http://[::ffff:0:0%1]')), [['<a class="invalid">http://[::ffff:0:0%1]</a>'], '']);
       //assert.deepStrictEqual(inspect(parser('http://[::ffff:0:0/96]')), [['<a class="invalid">http://[::ffff:0:0/96]</a>'], '']);
-      assert.deepStrictEqual(inspect(parser(' http://a')), undefined);
+      assert.deepStrictEqual(inspect(parser(' http://host')), undefined);
     });
 
     it('basic', () => {

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

@@ -0,0 +1,53 @@
+import { italic } from './italic';
+import { some } from '../../combinator';
+import { inspect } from '../../debug.test';
+
+describe('Unit: parser/inline/italic', () => {
+  describe('italic', () => {
+    const parser = (source: string) => some(italic)({ source, context: {} });
+
+    it('invalid', () => {
+      assert.deepStrictEqual(inspect(parser('///')), undefined);
+      assert.deepStrictEqual(inspect(parser('///a')), [['///', 'a'], '']);
+      assert.deepStrictEqual(inspect(parser('///a ///')), [['///', 'a'], ' ///']);
+      assert.deepStrictEqual(inspect(parser('///a  ///')), [['///', 'a', ' '], ' ///']);
+      assert.deepStrictEqual(inspect(parser('///a\n///')), [['///', 'a'], '\n///']);
+      assert.deepStrictEqual(inspect(parser('///a\\ ///')), [['///', 'a'], '\\ ///']);
+      assert.deepStrictEqual(inspect(parser('///a\\\n///')), [['///', 'a'], '\\\n///']);
+      assert.deepStrictEqual(inspect(parser('///a/b')), [['///', 'a', '/', 'b'], '']);
+      assert.deepStrictEqual(inspect(parser('///a//b')), [['///', 'a', '//', 'b'], '']);
+      assert.deepStrictEqual(inspect(parser('///a*b///')), [['///', 'a', '*', 'b', '///'], '']);
+      assert.deepStrictEqual(inspect(parser('/// ///')), undefined);
+      assert.deepStrictEqual(inspect(parser('/// a///')), undefined);
+      assert.deepStrictEqual(inspect(parser('/// a ///')), undefined);
+      assert.deepStrictEqual(inspect(parser('///\n///')), undefined);
+      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////')), undefined);
+      assert.deepStrictEqual(inspect(parser('/////a/////')), undefined);
+      assert.deepStrictEqual(inspect(parser(' ///a///')), undefined);
+    });
+
+    it('basic', () => {
+      assert.deepStrictEqual(inspect(parser('///a///')), [['<i>a</i>'], '']);
+      assert.deepStrictEqual(inspect(parser('///ab///')), [['<i>ab</i>'], '']);
+      assert.deepStrictEqual(inspect(parser('///a////')), [['<i>a</i>'], '/']);
+      assert.deepStrictEqual(inspect(parser('///a\nb///')), [['<i>a<br>b</i>'], '']);
+      assert.deepStrictEqual(inspect(parser('///a\\\nb///')), [['<i>a<br>b</i>'], '']);
+    });
+
+    it('nest', () => {
+      assert.deepStrictEqual(inspect(parser('///a ///b//////')), [['<i>a <i>b</i></i>'], '']);
+      assert.deepStrictEqual(inspect(parser('///a\\ ///b//////')), [['<i>a <i>b</i></i>'], '']);
+      assert.deepStrictEqual(inspect(parser('///a&Tab;///b//////')), [['<i>a\t<i>b</i></i>'], '']);
+      assert.deepStrictEqual(inspect(parser('///a<wbr>///b//////')), [['<i>a<wbr><i>b</i></i>'], '']);
+      assert.deepStrictEqual(inspect(parser('///`a`///')), [['<i><code data-src="`a`">a</code></i>'], '']);
+      assert.deepStrictEqual(inspect(parser('///(///a///)///')), [['<i><span class="paren">(<i>a</i>)</span></i>'], '']);
+      assert.deepStrictEqual(inspect(parser('///{http://host/}///')), [['<i><a class="url" href="http://host/" target="_blank">http://host/</a></i>'], '']);
+    });
+
+  });
+
+});

package/src/parser/inline/italic.ts

@@ -0,0 +1,21 @@
+import { ItalicParser } from '../inline';
+import { Recursion } from '../context';
+import { union, some, creation, precedence, surround, open, lazy } from '../../combinator';
+import { inline } from '../inline';
+import { str } from '../source';
+import { startTight, blankWith } from '../visibility';
+import { unshift } from 'spica/array';
+import { html, defrag } from 'typed-dom/dom';
+
+// 斜体は単語に使うとかえって見づらく読み飛ばしやすくなるため使わないべきであり
+// ある程度の長さのある文に使うのが望ましい。
+export const italic: ItalicParser = lazy(() => creation(1, Recursion.inline, surround(
+  str('///', '/'),
+  precedence(0,
+  startTight(some(union([
+    some(inline, blankWith('///')),
+    open(some(inline, '/'), italic),
+  ])))),
+  str('///'), false,
+  ([, bs], rest) => [[html('i', defrag(bs))], rest],
+  ([as, bs], rest) => [unshift(as, bs), rest])));

package/src/parser/inline/math.ts

@@ -36,7 +36,7 @@ const bracket: MathParser.BracketParser = lazy(() => creation(0, Recursion.termi
   str('{'),
   some(union([
     bracket,
-    some(escsource, /^(?:[{}$]|\\?\n)/),
+    some(escsource, /^[{}$\n]/),
   ])),
   str('}'),
   true)));

package/src/parser/inline/template.ts

@@ -20,6 +20,6 @@ const bracket: TemplateParser.BracketParser = lazy(() => creation(0, Recursion.t
     undefined, ([as, bs = []], rest) => [unshift(as, bs), rest], 3 | Backtrack.template),
   surround(str('{'), some(union([bracket, escsource]), '}'), str('}'), true,
     undefined, ([as, bs = []], rest) => [unshift(as, bs), rest], 3 | Backtrack.template),
-  surround(str('"'), precedence(2, some(escsource, /^"|^\\?\n/)), str('"'), true,
+  surround(str('"'), precedence(2, some(escsource, /^["\n]/)), str('"'), true,
     undefined, undefined, 3 | Backtrack.template),
 ])));

package/src/parser/inline.test.ts

@@ -96,6 +96,7 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('***a****')), [['<em><strong>a</strong></em>', '*'], '']);
       assert.deepStrictEqual(inspect(parser('****a***')), [['****', 'a', '***'], '']);
       assert.deepStrictEqual(inspect(parser('****a****')), [['****', 'a', '****'], '']);
+      assert.deepStrictEqual(inspect(parser('//////a//////')), [['//////', 'a', '//////'], '']);
       assert.deepStrictEqual(inspect(parser('*(*a*)*')), [['<em><span class="paren">(<em>a</em>)</span></em>'], '']);
       assert.deepStrictEqual(inspect(parser('**(**a**)**')), [['<strong><span class="paren">(<strong>a</strong>)</span></strong>'], '']);
       assert.deepStrictEqual(inspect(parser('*++ ++*')), [['<em><ins> </ins></em>'], '']);
@@ -175,13 +176,13 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('"[% "*"* %]')), [['"', '<span class="remark"><input type="checkbox"><span>[% "*"* %]</span></span>'], '']);
       assert.deepStrictEqual(inspect(parser('"{{""}}')), [['"', '{', '{', '"', '"', '}', '}'], '']);
       assert.deepStrictEqual(inspect(parser('[#http://host/(<bdi>)]</bdi>')), [['<a class="index" href="#index::http://host/(&lt;bdi&gt;)">http://host/(&lt;bdi&gt;)</a>', '<', '/', 'bdi', '>'], '']);
-      assert.deepStrictEqual(inspect(parser('[#@a/http://host/(<bdi>)]</bdi>')), [[ '[', '#@a/http', ':', '/', '/', 'host', '/', '(', '<bdi>)]</bdi>' ], '']);
+      assert.deepStrictEqual(inspect(parser('[#@a/http://host/(<bdi>)]</bdi>')), [[ '[', '#@a/http', ':', '//', 'host', '/', '(', '<bdi>)]</bdi>' ], '']);
     });
 
     it('uri', () => {
       assert.deepStrictEqual(inspect(parser('\nhttp://host')), [['<br>', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('0http://host')), [['0http', ':', '/', '/', 'host'], '']);
-      assert.deepStrictEqual(inspect(parser('0aAhttp://host')), [['0aAhttp', ':', '/', '/', 'host'], '']);
+      assert.deepStrictEqual(inspect(parser('0http://host')), [['0http', ':', '//', 'host'], '']);
+      assert.deepStrictEqual(inspect(parser('0aAhttp://host')), [['0aAhttp', ':', '//', 'host'], '']);
       assert.deepStrictEqual(inspect(parser('?http://host')), [['?', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
       assert.deepStrictEqual(inspect(parser('0!http://host')), [['0', '!', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);
       assert.deepStrictEqual(inspect(parser('0?http://host')), [['0', '?', '<a class="url" href="http://host" target="_blank">http://host</a>'], '']);

package/src/parser/inline.ts

@@ -14,6 +14,7 @@ import { mark } from './inline/mark';
 import { emstrong } from './inline/emstrong';
 import { strong } from './inline/strong';
 import { emphasis } from './inline/emphasis';
+import { italic } from './inline/italic';
 import { math } from './inline/math';
 import { code } from './inline/code';
 import { htmlentity } from './inline/htmlentity';
@@ -36,6 +37,7 @@ export import MarkParser = InlineParser.MarkParser;
 export import EmStrongParser = InlineParser.EmStrongParser;
 export import StrongParser = InlineParser.StrongParser;
 export import EmphasisParser = InlineParser.EmphasisParser;
+export import ItalicParser = InlineParser.ItalicParser;
 export import MathParser = InlineParser.MathParser;
 export import CodeParser = InlineParser.CodeParser;
 export import MediaParser = InlineParser.MediaParser;
@@ -75,6 +77,8 @@ export const inline: InlineParser = lazy(() => union([
         return deletion(input);
       case '==':
         return mark(input);
+      case '//':
+        return italic(input);
     }
     switch (source[0]) {
       case '[':

package/src/parser/source/text.ts

@@ -34,6 +34,7 @@ export const text: TextParser = creation(1, Recursion.ignore, ({ source, context
         case '\n':
           return [[html('br')], source.slice(1)];
         case '*':
+        case '/':
         case '+':
         case '~':
         case '=':