securemark 0.232.0 → 0.232.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.232.1
+
+- Refactoring.
+
 ## 0.232.0
 
 - Refine paragraph syntax to separate mention syntax.

package/dist/securemark.js

@@ -1,4 +1,4 @@
-/*! securemark v0.232.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
+/*! securemark v0.232.1 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
 require = function () {
     function r(e, n, t) {
         function o(i, f) {
@@ -5807,16 +5807,16 @@ require = function () {
             const util_1 = _dereq_('../util');
             const typed_dom_1 = _dereq_('typed-dom');
             const array_1 = _dereq_('spica/array');
-            exports.reply = (0, combinator_1.block)((0, combinator_1.validate)('>', (0, locale_1.localize)((0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.inits)([
+            exports.reply = (0, combinator_1.block)((0, combinator_1.validate)('>', (0, locale_1.localize)((0, combinator_1.fmap)((0, combinator_1.inits)([
                 (0, combinator_1.some)((0, combinator_1.inits)([
                     cite_1.cite,
                     quote_1.quote
                 ])),
-                (0, combinator_1.subsequence)([
+                (0, combinator_1.some)((0, combinator_1.subsequence)([
                     (0, combinator_1.some)(quote_1.quote),
                     (0, combinator_1.fmap)((0, combinator_1.rewrite)((0, combinator_1.some)(source_1.anyline, quote_1.syntax), (0, combinator_1.trim)((0, util_1.visualize)((0, combinator_1.some)(inline_1.inline)))), ns => (0, array_1.push)(ns, [(0, typed_dom_1.html)('br')]))
-                ])
-            ])), ns => [(0, typed_dom_1.html)('p', (0, typed_dom_1.defrag)((0, array_1.pop)(ns)[0]))]))));
+                ]))
+            ]), ns => [(0, typed_dom_1.html)('p', (0, typed_dom_1.defrag)((0, array_1.pop)(ns)[0]))]))));
         },
         {
             '../../combinator': 27,
@@ -5841,7 +5841,7 @@ require = function () {
             const typed_dom_1 = _dereq_('typed-dom');
             exports.cite = (0, combinator_1.creator)((0, combinator_1.line)((0, combinator_1.fmap)((0, combinator_1.validate)('>>', (0, combinator_1.reverse)((0, combinator_1.tails)([
                 (0, source_1.str)(/^>*(?=>>)/),
-                anchor_1.anchor
+                (0, combinator_1.validate)(new RegExp(`${ anchor_1.syntax.source }[^\S\n]*(?:$|\n)`), anchor_1.anchor)
             ]))), ([el, quotes = '']) => [
                 (0, typed_dom_1.html)('span', { class: 'cite' }, (0, typed_dom_1.defrag)([
                     quotes + '>',
@@ -5873,12 +5873,12 @@ require = function () {
                 (0, combinator_1.rewrite)((0, combinator_1.some)((0, combinator_1.validate)(new RegExp(exports.syntax.source.split('|')[0]), source_1.anyline)), qblock),
                 (0, combinator_1.rewrite)((0, combinator_1.validate)(new RegExp(exports.syntax.source.split('|').slice(1).join('|')), source_1.anyline), (0, combinator_1.line)((0, combinator_1.union)([(0, source_1.str)(/^.+/)])))
             ])), ns => [
-                (0, typed_dom_1.html)('span', ns.length > 1 || /^>+(?=[^\S\n])/.test(ns[0]) ? { class: 'quote' } : {
+                (0, typed_dom_1.html)('span', ns.length > 1 ? { class: 'quote' } : {
                     class: 'quote invalid',
                     'data-invalid-syntax': 'quote',
                     'data-invalid-type': 'syntax',
                     'data-invalid-description': `Missing the whitespace after "${ ns[0].split(/[^>]/, 1)[0] }".`
-                }, ns),
+                }, (0, typed_dom_1.defrag)(ns)),
                 (0, typed_dom_1.html)('br')
             ]), false)));
             const qblock = (source, context) => {
@@ -5908,8 +5908,9 @@ require = function () {
                         continue;
                     }
                 }
+                nodes.unshift('');
                 return [
-                    (0, typed_dom_1.defrag)(nodes),
+                    nodes,
                     ''
                 ];
             };
@@ -6332,12 +6333,13 @@ require = function () {
         function (_dereq_, module, exports) {
             'use strict';
             Object.defineProperty(exports, '__esModule', { value: true });
-            exports.anchor = void 0;
+            exports.anchor = exports.syntax = void 0;
             const combinator_1 = _dereq_('../../../combinator');
             const link_1 = _dereq_('../link');
             const source_1 = _dereq_('../../source');
             const typed_dom_1 = _dereq_('typed-dom');
-            exports.anchor = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('>>', (0, combinator_1.fmap)((0, combinator_1.rewrite)((0, source_1.str)(/^>>[0-9a-z]+(?:-[0-9a-z]+)*(?![0-9A-Za-z@#:])/), (0, combinator_1.context)({
+            exports.syntax = /^>>[0-9a-z]+(?:-[0-9a-z]+)*(?![0-9A-Za-z@#:])/;
+            exports.anchor = (0, combinator_1.lazy)(() => (0, combinator_1.validate)('>>', (0, combinator_1.fmap)((0, combinator_1.rewrite)((0, source_1.str)(exports.syntax), (0, combinator_1.context)({
                 syntax: {
                     inline: {
                         link: true,

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.232.0",
+  "version": "0.232.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -449,9 +449,9 @@
       },
       "dependencies": {
         "lru-cache": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.4.1.tgz",
-          "integrity": "sha512-NCD7/WRlFmADccuHjsRUYqdluYBr//n/O0fesCb/n52FoGcgKh8o4Dpm7YIbZwVcDs8rPBQbCZLmWWsp6m+xGQ==",
+          "version": "7.4.2",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.4.2.tgz",
+          "integrity": "sha512-Xs3+hFPDSKQmL05Gs6NhvAADol1u9TmLoNoE03ZjszX6a5iYIO3rPUM4jIjoBUJeTaWEBMozjjmV70gvdRfIdw==",
           "dev": true
         },
         "mkdirp": {
@@ -3024,9 +3024,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.4.77",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.77.tgz",
-      "integrity": "sha512-fiDxw8mO9Ph1Z0bjX2sFTPpi0J0QkOiwOJF+5Q0J0baNc/F9lLePAvDPlnoxvbUYYMizqrKPeotRRkJ9LtxAew==",
+      "version": "1.4.80",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.80.tgz",
+      "integrity": "sha512-COsbJCGVYCc/aAY4cd94x1Js3q0r406YKGbdL8LXHg0O9dEjuFEFU/vZneRxBxKo/f1lLHi0YyAR7sbFM+i8Bg==",
       "dev": true
     },
     "elliptic": {
@@ -3243,9 +3243,9 @@
       }
     },
     "es5-ext": {
-      "version": "0.10.56",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.56.tgz",
-      "integrity": "sha512-YUhqzoMnIjMW5y8FzaMxsCu0eWCwq32GrlwhOhbQmL5OiZReWFm/KvRiYuvqf3CaG/zZ36Kyb4KfVe674cafCQ==",
+      "version": "0.10.57",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.57.tgz",
+      "integrity": "sha512-L7cCNoPwTkAp7IBHxrKLsh7NKiVFkcdxlP9vbVw9QUvb7gF0Mz9bEBN0WY9xqdTjGF907EMT/iG013vnbqwu1Q==",
       "dev": true,
       "requires": {
         "es6-iterator": "^2.0.3",
@@ -6715,9 +6715,9 @@
       }
     },
     "karma-chrome-launcher": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.1.0.tgz",
-      "integrity": "sha512-3dPs/n7vgz1rxxtynpzZTvb9y/GIaW8xjAwcIGttLbycqoFtI7yo1NGnQi6oFTherRE+GIhCAHZC4vEqWGhNvg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.1.1.tgz",
+      "integrity": "sha512-hsIglcq1vtboGPAN+DGCISCFOxW+ZVnIqhDQcCMqqCp+4dmJ0Qpq5QAjkbA0X2L9Mi6OBkHi2Srrbmm7pUKkzQ==",
       "dev": true,
       "requires": {
         "which": "^1.2.1"
@@ -7090,9 +7090,9 @@
       }
     },
     "make-fetch-happen": {
-      "version": "10.0.4",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.0.4.tgz",
-      "integrity": "sha512-CiReW6usy3UXby5N46XjWfLPFPq1glugCszh18I0NYJCwr129ZAx9j3Dlv+cRsK0q3VjlVysEzhdtdw2+NhdYA==",
+      "version": "10.0.5",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.0.5.tgz",
+      "integrity": "sha512-0JQ0daMRDFEv14DelmcFlprdhSDNG7WEgInTjBeWYWZ78W0jfDqygZdPLhcrQ4s/G8skNhBrS4fiF6xA+YlFjQ==",
       "dev": true,
       "requires": {
         "agentkeepalive": "^4.2.1",
@@ -7101,10 +7101,10 @@
         "http-proxy-agent": "^5.0.0",
         "https-proxy-agent": "^5.0.0",
         "is-lambda": "^1.0.1",
-        "lru-cache": "^7.4.0",
+        "lru-cache": "^7.4.1",
         "minipass": "^3.1.6",
         "minipass-collect": "^1.0.2",
-        "minipass-fetch": "^2.0.1",
+        "minipass-fetch": "^2.0.2",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
         "negotiator": "^0.6.3",
@@ -7114,9 +7114,9 @@
       },
       "dependencies": {
         "lru-cache": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.4.1.tgz",
-          "integrity": "sha512-NCD7/WRlFmADccuHjsRUYqdluYBr//n/O0fesCb/n52FoGcgKh8o4Dpm7YIbZwVcDs8rPBQbCZLmWWsp6m+xGQ==",
+          "version": "7.4.2",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.4.2.tgz",
+          "integrity": "sha512-Xs3+hFPDSKQmL05Gs6NhvAADol1u9TmLoNoE03ZjszX6a5iYIO3rPUM4jIjoBUJeTaWEBMozjjmV70gvdRfIdw==",
           "dev": true
         }
       }
@@ -7448,9 +7448,9 @@
       }
     },
     "minipass-fetch": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.0.2.tgz",
-      "integrity": "sha512-M63u5yWX0yxY1C3DcLVY1xWai0pNM3qa1xCMXFgdejY5F/NTmyzNVHGcBxKerX51lssqxwWWTjpg/ZPuD39gOQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.0.3.tgz",
+      "integrity": "sha512-VA+eiiUtaIvpQJXISwE3OiMvQwAWrgKb97F0aXlCS1Ahikr8fEQq8m3Hf7Kv9KT3nokuHigJKsDMB6atU04olQ==",
       "dev": true,
       "requires": {
         "encoding": "^0.1.13",
@@ -9158,9 +9158,9 @@
       }
     },
     "read-package-json": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-4.1.1.tgz",
-      "integrity": "sha512-P82sbZJ3ldDrWCOSKxJT0r/CXMWR0OR3KRh55SgKo3p91GSIEEC32v3lSHAvO/UcH3/IoL7uqhOFBduAnwdldw==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-4.1.2.tgz",
+      "integrity": "sha512-Dqer4pqzamDE2O4M55xp1qZMuLPqi4ldk2ya648FOMHRjwMzFhuxVrG04wd0c38IsvkVdr3vgHI6z+QTPdAjrQ==",
       "dev": true,
       "requires": {
         "glob": "^7.1.1",

package/package.json

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

package/src/parser/block/reply/cite.ts

@@ -1,6 +1,6 @@
 import { ReplyParser } from '../../block';
 import { tails, line, validate, creator, reverse, fmap } from '../../../combinator';
-import { anchor } from '../../inline/autolink/anchor';
+import { anchor, syntax } from '../../inline/autolink/anchor';
 import { str } from '../../source';
 import { html, define, defrag } from 'typed-dom';
 
@@ -8,7 +8,7 @@ export const cite: ReplyParser.CiteParser = creator(line(fmap(validate(
   '>>',
   reverse(tails([
     str(/^>*(?=>>)/),
-    anchor,
+    validate(new RegExp(`${syntax.source}[^\S\n]*(?:$|\n)`), anchor),
   ]))),
   ([el, quotes = '']: [HTMLElement, string?]) => [
     html('span', { class: 'cite' }, defrag([

package/src/parser/block/reply/quote.ts

@@ -20,7 +20,7 @@ export const quote: ReplyParser.QuoteParser = lazy(() => creator(block(fmap(vali
   ])),
   (ns: [string, ...(string | HTMLElement)[]]) => [
     html('span',
-      ns.length > 1 || /^>+(?=[^\S\n])/.test(ns[0])
+      ns.length > 1
         ? { class: 'quote' }
         : {
             class: 'quote invalid',
@@ -28,7 +28,7 @@ export const quote: ReplyParser.QuoteParser = lazy(() => creator(block(fmap(vali
             'data-invalid-type': 'syntax',
             'data-invalid-description': `Missing the whitespace after "${ns[0].split(/[^>]/, 1)[0]}".`,
           },
-      ns),
+      defrag(ns)),
     html('br'),
   ]),
   false)));
@@ -64,9 +64,11 @@ const qblock: ReplyParser.QuoteParser.BlockParser = (source, context) => {
       continue;
     }
   }
+  nodes.unshift('');
+  assert(nodes.length > 1);
   assert(nodes.every(n => typeof n === 'string' || n instanceof HTMLElement));
   assert(quotes.length === 0);
-  return [defrag(nodes), ''];
+  return [nodes, ''];
 };
 
 const text: ReplyParser.QuoteParser.TextParser = union([

package/src/parser/block/reply.ts

@@ -10,18 +10,18 @@ import { html, defrag } from 'typed-dom';
 import { push, pop } from 'spica/array';
 
 export const reply: ReplyParser = block(validate('>', localize(fmap(
-  some(inits([
+  inits([
     some(inits([
       cite,
       quote,
     ])),
-    subsequence([
+    some(subsequence([
       some(quote),
       fmap(
         rewrite(
           some(anyline, delimiter),
           trim(visualize(some(inline)))),
         ns => push(ns, [html('br')])),
-    ]),
-  ])),
+    ])),
+  ]),
   ns => [html('p', defrag(pop(ns)[0]))]))));

package/src/parser/inline/autolink/anchor.ts

@@ -4,8 +4,10 @@ import { link } from '../link';
 import { str } from '../../source';
 import { define } from 'typed-dom';
 
+export const syntax = /^>>[0-9a-z]+(?:-[0-9a-z]+)*(?![0-9A-Za-z@#:])/;
+
 export const anchor: AutolinkParser.AnchorParser = lazy(() => validate('>>', fmap(rewrite(
-  str(/^>>[0-9a-z]+(?:-[0-9a-z]+)*(?![0-9A-Za-z@#:])/),
+  str(syntax),
   context({ syntax: { inline: {
     link: true,
     autolink: false,