securemark 0.261.0 → 0.261.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.261.1
+
+- Refactoring.
+
 ## 0.261.0
 
 - Change emphasis syntax and strong syntax.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.261.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.261.1 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"));
@@ -5886,8 +5886,6 @@ exports.shortmedia = exports.media = exports.indexer = exports.indexee = exports
 
 const combinator_1 = __webpack_require__(2087);
 
-const escape_1 = __webpack_require__(2778);
-
 const annotation_1 = __webpack_require__(2736);
 
 const reference_1 = __webpack_require__(3555);
@@ -5930,7 +5928,7 @@ const bracket_1 = __webpack_require__(5196);
 
 const source_1 = __webpack_require__(6743);
 
-exports.inline = (0, combinator_1.union)([escape_1.escape, annotation_1.annotation, reference_1.reference, template_1.template, comment_1.comment, math_1.math, extension_1.extension, ruby_1.ruby, link_1.link, media_1.media, html_1.html, insertion_1.insertion, deletion_1.deletion, mark_1.mark, strong_1.strong, emphasis_1.emphasis, code_1.code, htmlentity_1.htmlentity, shortmedia_1.shortmedia, autolink_1.autolink, bracket_1.bracket, source_1.text]);
+exports.inline = (0, combinator_1.union)([annotation_1.annotation, reference_1.reference, template_1.template, comment_1.comment, math_1.math, extension_1.extension, ruby_1.ruby, link_1.link, media_1.media, html_1.html, insertion_1.insertion, deletion_1.deletion, mark_1.mark, strong_1.strong, emphasis_1.emphasis, code_1.code, htmlentity_1.htmlentity, shortmedia_1.shortmedia, autolink_1.autolink, bracket_1.bracket, source_1.text]);
 
 var indexee_1 = __webpack_require__(1269);
 
@@ -6410,7 +6408,7 @@ const dom_1 = __webpack_require__(3252);
 
 const array_1 = __webpack_require__(8112);
 
-exports.deletion = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('~~'), (0, combinator_1.syntax)(0
+exports.deletion = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('~~', '~'), (0, combinator_1.syntax)(0
 /* Syntax.none */
 , 1, 1, 0
 /* State.none */
@@ -6441,50 +6439,11 @@ const dom_1 = __webpack_require__(3252);
 
 const array_1 = __webpack_require__(8112);
 
-exports.emphasis = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('_'), (0, combinator_1.syntax)(0
+exports.emphasis = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('_', '_'), (0, combinator_1.syntax)(0
 /* Syntax.none */
 , 1, 1, 0
 /* State.none */
-, (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.emphasis)])), '_')), (0, source_1.str)('_'), false, ([, bs], rest) => [[(0, dom_1.html)('em', (0, dom_1.defrag)(bs))], rest], ([as, bs], rest) => [(0, array_1.unshift)(as, bs), rest]));
-
-/***/ }),
-
-/***/ 2778:
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports.escape = void 0;
-
-const global_1 = __webpack_require__(4128);
-
-const combinator_1 = __webpack_require__(2087);
-
-const source_1 = __webpack_require__(6743);
-
-const repeat = (0, source_1.str)(/^(.)\1*/);
-exports.escape = (0, combinator_1.union)([({
-  source,
-  context
-}) => {
-  switch (source[0]) {
-    case '+':
-    case '~':
-    case '=':
-      if (!source[2]) return;
-      return source[2] === source[0] && source[1] === source[0] ? repeat({
-        source,
-        context
-      }) : global_1.undefined;
-
-    default:
-      return;
-  }
-}]);
+, (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.emphasis)])))), (0, source_1.str)('_'), false, ([, bs], rest) => [[(0, dom_1.html)('em', (0, dom_1.defrag)(bs))], rest], ([as, bs], rest) => [(0, array_1.unshift)(as, bs), rest]));
 
 /***/ }),
 
@@ -6916,7 +6875,7 @@ const dom_1 = __webpack_require__(3252);
 
 const array_1 = __webpack_require__(8112);
 
-exports.insertion = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('++'), (0, combinator_1.syntax)(0
+exports.insertion = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('++', '+'), (0, combinator_1.syntax)(0
 /* Syntax.none */
 , 1, 1, 0
 /* State.none */
@@ -7122,7 +7081,7 @@ const dom_1 = __webpack_require__(3252);
 
 const array_1 = __webpack_require__(8112);
 
-exports.mark = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('=='), (0, combinator_1.syntax)(0
+exports.mark = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('==', '='), (0, combinator_1.syntax)(0
 /* Syntax.none */
 , 1, 1, 0
 /* State.none */
@@ -7510,11 +7469,11 @@ const dom_1 = __webpack_require__(3252);
 
 const array_1 = __webpack_require__(8112);
 
-exports.strong = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('*'), (0, combinator_1.syntax)(0
+exports.strong = (0, combinator_1.lazy)(() => (0, combinator_1.surround)((0, source_1.str)('*', '*'), (0, combinator_1.syntax)(0
 /* Syntax.none */
 , 1, 1, 0
 /* State.none */
-, (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.strong)])), '*')), (0, source_1.str)('*'), false, ([, bs], rest) => [[(0, dom_1.html)('strong', (0, dom_1.defrag)(bs))], rest], ([as, bs], rest) => [(0, array_1.unshift)(as, bs), rest]));
+, (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.strong)])))), (0, source_1.str)('*'), false, ([, bs], rest) => [[(0, dom_1.html)('strong', (0, dom_1.defrag)(bs))], rest], ([as, bs], rest) => [(0, array_1.unshift)(as, bs), rest]));
 
 /***/ }),
 
@@ -7640,7 +7599,7 @@ Object.defineProperty(exports, "__esModule", ({
 exports.japanese = void 0;
 
 function japanese(char) {
-  return /^[\p{Ideo}\p{Script_Extensions=Hiragana}\p{Script_Extensions=Katakana}～！？]/u.test(char);
+  return /^[\p{Ideo}\p{scx=Hiragana}\p{scx=Katakana}～！？]/u.test(char);
 }
 
 exports.japanese = japanese;
@@ -8264,17 +8223,19 @@ const global_1 = __webpack_require__(4128);
 
 const combinator_1 = __webpack_require__(2087);
 
-function str(pattern) {
+function str(pattern, not) {
   return typeof pattern === 'string' ? (0, combinator_1.creation)(1, false, ({
     source
   }) => {
     if (source === '') return;
+    if (not && source.slice(pattern.length, pattern.length + not.length) === not) return;
     return source.slice(0, pattern.length) === pattern ? [[pattern], source.slice(pattern.length)] : global_1.undefined;
   }) : (0, combinator_1.creation)(1, false, ({
     source
   }) => {
     if (source === '') return;
     const m = source.match(pattern);
+    if (m && not && source.slice(m[0].length, m[0].length + not.length) === not) return;
     return m && m[0].length > 0 ? [[m[0]], source.slice(m[0].length)] : global_1.undefined;
   });
 }
@@ -8319,10 +8280,10 @@ const str_1 = __webpack_require__(2790);
 
 const dom_1 = __webpack_require__(3252);
 
-exports.delimiter = /[\s\x00-\x7F]|\S[#>]|[\p{Ideo}\p{Script_Extensions=Hiragana}\p{Script_Extensions=Katakana}～！？][^\S\n]*(?=\\\n)/u;
+exports.delimiter = /[\s\x00-\x7F]|\S[#>]|[\p{Ideo}\p{scx=Hiragana}\p{scx=Katakana}～！？][^\S\n]*(?=\\\n)/u;
 exports.nonWhitespace = /[\S\n]|$/;
 exports.nonAlphanumeric = /[^0-9A-Za-z]|\S[#>]|$/;
-const nssb = /^[\p{Ideo}\p{Script_Extensions=Hiragana}\p{Script_Extensions=Katakana}～！？][^\S\n]*(?=\\\n)/u;
+const nssb = /^[\p{Ideo}\p{scx=Hiragana}\p{scx=Katakana}～！？][^\S\n]*(?=\\\n)/u;
 const repeat = (0, str_1.str)(/^(.)\1*/);
 exports.text = (0, combinator_1.creation)(1, false, ({
   source,

package/markdown.d.ts

@@ -621,7 +621,6 @@ export namespace MarkdownParser {
   export interface InlineParser extends
     Markdown<'inline'>,
     Parser<HTMLElement | string, Context, [
-      InlineParser.EscapeParser,
       InlineParser.AnnotationParser,
       InlineParser.ReferenceParser,
       InlineParser.TemplateParser,
@@ -647,16 +646,6 @@ export namespace MarkdownParser {
   }
   export namespace InlineParser {
     interface Inline<T extends string> extends Markdown<`inline/${T}`> { }
-    export interface EscapeParser extends
-      // ****
-      // +++
-      // ~~~
-      // ===
-      Inline<'escape'>,
-      Parser<string, Context, [
-        SourceParser.StrParser,
-      ]> {
-    }
     export interface AnnotationParser extends
       // ((abc))
       Inline<'annotation'>,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.261.0",
+  "version": "0.261.1",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",
@@ -34,11 +34,11 @@
     "@types/mocha": "9.1.1",
     "@types/power-assert": "1.5.8",
     "@types/prismjs": "1.26.0",
-    "@typescript-eslint/parser": "^5.33.0",
+    "@typescript-eslint/parser": "^5.33.1",
     "babel-loader": "^8.2.5",
     "babel-plugin-unassert": "^3.2.0",
     "concurrently": "^7.3.0",
-    "eslint": "^8.21.0",
+    "eslint": "^8.22.0",
     "eslint-plugin-redos": "^4.4.1",
     "eslint-webpack-plugin": "^3.2.0",
     "glob": "^8.0.3",

package/src/parser/inline/deletion.ts

@@ -8,7 +8,7 @@ import { html, defrag } from 'typed-dom/dom';
 import { unshift } from 'spica/array';
 
 export const deletion: DeletionParser = lazy(() => surround(
-  str('~~'),
+  str('~~', '~'),
   syntax(Syntax.none, 1, 1, State.none,
   some(union([
     some(inline, blankWith('\n', '~~')),

package/src/parser/inline/emphasis.ts

@@ -8,12 +8,12 @@ import { html, defrag } from 'typed-dom/dom';
 import { unshift } from 'spica/array';
 
 export const emphasis: EmphasisParser = lazy(() => surround(
-  str('_'),
+  str('_', '_'),
   syntax(Syntax.none, 1, 1, State.none,
   startTight(some(union([
     some(inline, blankWith('_')),
     open(some(inline, '_'), emphasis),
-  ])), '_')),
+  ])))),
   str('_'), false,
   ([, bs], rest) => [[html('em', defrag(bs))], rest],
   ([as, bs], rest) => [unshift(as, bs), rest]));

package/src/parser/inline/insertion.ts

@@ -8,7 +8,7 @@ import { html, defrag } from 'typed-dom/dom';
 import { unshift } from 'spica/array';
 
 export const insertion: InsertionParser = lazy(() => surround(
-  str('++'),
+  str('++', '+'),
   syntax(Syntax.none, 1, 1, State.none,
   some(union([
     some(inline, blankWith('\n', '++')),

package/src/parser/inline/mark.ts

@@ -8,7 +8,7 @@ import { html, defrag } from 'typed-dom/dom';
 import { unshift } from 'spica/array';
 
 export const mark: MarkParser = lazy(() => surround(
-  str('=='),
+  str('==', '='),
   syntax(Syntax.none, 1, 1, State.none,
   startTight(some(union([
     some(inline, blankWith('==')),

package/src/parser/inline/strong.ts

@@ -8,12 +8,12 @@ import { html, defrag } from 'typed-dom/dom';
 import { unshift } from 'spica/array';
 
 export const strong: StrongParser = lazy(() => surround(
-  str('*'),
+  str('*', '*'),
   syntax(Syntax.none, 1, 1, State.none,
   startTight(some(union([
     some(inline, blankWith('*')),
     open(some(inline, '*'), strong),
-  ])), '*')),
+  ])))),
   str('*'), false,
   ([, bs], rest) => [[html('strong', defrag(bs))], rest],
   ([as, bs], rest) => [unshift(as, bs), rest]));

package/src/parser/inline.ts

@@ -1,6 +1,5 @@
 import { MarkdownParser } from '../../markdown';
 import { union } from '../combinator';
-import { escape } from './inline/escape';
 import { annotation } from './inline/annotation';
 import { reference } from './inline/reference';
 import { template } from './inline/template';
@@ -24,7 +23,6 @@ import { bracket } from './inline/bracket';
 import { text } from './source';
 
 export import InlineParser = MarkdownParser.InlineParser;
-export import EscapeParser = InlineParser.EscapeParser;
 export import AnnotationParser = InlineParser.AnnotationParser;
 export import ReferenceParser = InlineParser.ReferenceParser;
 export import TemplateParser = InlineParser.TemplateParser;
@@ -48,7 +46,6 @@ export import AutolinkParser = InlineParser.AutolinkParser;
 export import BracketParser = InlineParser.BracketParser;
 
 export const inline: InlineParser = union([
-  escape,
   annotation,
   reference,
   template,

package/src/parser/locale/ja.ts

@@ -1,3 +1,3 @@
 export function japanese(char: string): boolean {
-  return /^[\p{Ideo}\p{Script_Extensions=Hiragana}\p{Script_Extensions=Katakana}～！？]/u.test(char);
+  return /^[\p{Ideo}\p{scx=Hiragana}\p{scx=Katakana}～！？]/u.test(char);
 }

package/src/parser/source/str.ts

@@ -3,12 +3,13 @@ import { StrParser } from '../source';
 import { Parser, Context } from '../../combinator/data/parser';
 import { creation } from '../../combinator';
 
-export function str(pattern: string | RegExp): StrParser;
-export function str(pattern: string | RegExp): Parser<string, Context<StrParser>, []> {
+export function str(pattern: string | RegExp, not?: string): StrParser;
+export function str(pattern: string | RegExp, not?: string): Parser<string, Context<StrParser>, []> {
   assert(pattern);
   return typeof pattern === 'string'
     ? creation(1, false, ({ source }) => {
         if (source === '') return;
+        if (not && source.slice(pattern.length, pattern.length + not.length) === not) return;
         return source.slice(0, pattern.length) === pattern
           ? [[pattern], source.slice(pattern.length)]
           : undefined;
@@ -16,6 +17,7 @@ export function str(pattern: string | RegExp): Parser<string, Context<StrParser>
     : creation(1, false, ({ source }) => {
         if (source === '') return;
         const m = source.match(pattern);
+        if (m && not && source.slice(m[0].length, m[0].length + not.length) === not) return;
         return m && m[0].length > 0
           ? [[m[0]], source.slice(m[0].length)]
           : undefined;

package/src/parser/source/text.ts

@@ -4,10 +4,10 @@ import { union, creation, focus } from '../../combinator';
 import { str } from './str';
 import { html } from 'typed-dom/dom';
 
-export const delimiter = /[\s\x00-\x7F]|\S[#>]|[\p{Ideo}\p{Script_Extensions=Hiragana}\p{Script_Extensions=Katakana}～！？][^\S\n]*(?=\\\n)/u;
+export const delimiter = /[\s\x00-\x7F]|\S[#>]|[\p{Ideo}\p{scx=Hiragana}\p{scx=Katakana}～！？][^\S\n]*(?=\\\n)/u;
 export const nonWhitespace = /[\S\n]|$/;
 export const nonAlphanumeric = /[^0-9A-Za-z]|\S[#>]|$/;
-const nssb = /^[\p{Ideo}\p{Script_Extensions=Hiragana}\p{Script_Extensions=Katakana}～！？][^\S\n]*(?=\\\n)/u;
+const nssb = /^[\p{Ideo}\p{scx=Hiragana}\p{scx=Katakana}～！？][^\S\n]*(?=\\\n)/u;
 const repeat = str(/^(.)\1*/);
 
 export const text: TextParser = creation(1, false, ({ source, context }) => {

package/src/parser/inline/escape.ts

@@ -1,21 +0,0 @@
-import { undefined } from 'spica/global';
-import { EscapeParser } from '../inline';
-import { union } from '../../combinator';
-import { str } from '../source';
-
-const repeat = str(/^(.)\1*/);
-
-export const escape: EscapeParser = union([({ source, context }) => {
-  switch (source[0]) {
-    case '+':
-    case '~':
-    case '=':
-      if (!source[2]) return;
-      return source[2] === source[0]
-          && source[1] === source[0]
-        ? repeat({ source, context })
-        : undefined;
-    default:
-      return;
-  }
-}]);