securemark 0.226.2 → 0.226.3

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.226.3
+
+- Refactoring.
+
 ## 0.226.2
 
 - Refactoring.

package/dist/securemark.js

@@ -1,4 +1,4 @@
-/*! securemark v0.226.2 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
+/*! securemark v0.226.3 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED */
 require = function () {
     function r(e, n, t) {
         function o(i, f) {
@@ -4719,7 +4719,7 @@ require = function () {
             const parser_1 = _dereq_('../../combinator/data/parser');
             const UNICODE_REPLACEMENT_CHARACTER = '\uFFFD';
             function normalize(source) {
-                return format(sanitize(source));
+                return sanitize(format(source));
             }
             exports.normalize = normalize;
             function format(source) {
@@ -6402,8 +6402,8 @@ require = function () {
             exports.header = void 0;
             const combinator_1 = _dereq_('../combinator');
             const segment_1 = _dereq_('./segment');
-            const normalize_1 = _dereq_('./api/normalize');
             const source_1 = _dereq_('./source');
+            const normalize_1 = _dereq_('./api/normalize');
             const typed_dom_1 = _dereq_('typed-dom');
             exports.header = (0, combinator_1.validate)(/^---+[^\S\v\f\r\n]*\r?\n[^\S\n]*(?=\S)/, (0, combinator_1.inits)([
                 (0, combinator_1.rewrite)((source, context) => {
@@ -8214,11 +8214,9 @@ require = function () {
                     if (ns.length === 0)
                         return ns;
                     const el = ns.length === 1 && typeof ns[0] === 'object' ? ns[0] : (0, typed_dom_1.html)('div', ns);
-                    const es = el.getElementsByClassName('linebreak');
+                    const es = el.querySelectorAll('.linebreak:not(:empty)');
                     for (let i = 0, len = es.length; i < len; ++i) {
                         const sb = es[i];
-                        if (!sb.firstChild)
-                            continue;
                         if (!check(sb))
                             continue;
                         sb.firstChild.remove();
@@ -8234,28 +8232,28 @@ require = function () {
                 return (0, ja_1.japanese)(char);
             }
             function lastChar(node) {
+                var _a, _b;
                 while (node = node === null || node === void 0 ? void 0 : node.previousSibling) {
-                    if ('id' in node && !node.firstChild) {
-                        switch (node.tagName) {
-                        case 'BR':
+                    if (!('id' in node))
+                        return (_a = [...node.data.slice(-2)].pop()) !== null && _a !== void 0 ? _a : '';
+                    if (node.firstChild)
+                        return (_b = [...text(node).slice(-2)].pop()) !== null && _b !== void 0 ? _b : '';
+                    switch (node.tagName) {
+                    case 'BR':
+                        return '';
+                    case 'SPAN':
+                        switch (node.className) {
+                        case 'linebreak':
                             return '';
-                        case 'SPAN':
-                            if (node.className === 'linebreak')
-                                return '';
                         }
-                        continue;
                     }
-                    const str = text(node);
-                    return str && [...str.slice(-2)].pop();
                 }
                 return '';
             }
-            function text(node) {
-                if (!('id' in node))
-                    return node.data;
-                switch (node.tagName) {
+            function text(el) {
+                switch (el.tagName) {
                 case 'RUBY':
-                    for (let ns = node.childNodes, i = ns.length; i--;) {
+                    for (let ns = el.childNodes, i = ns.length; i--;) {
                         const child = ns[i];
                         if ('id' in child)
                             continue;
@@ -8263,7 +8261,7 @@ require = function () {
                     }
                     return '';
                 default:
-                    return node.textContent;
+                    return el.textContent;
                 }
             }
         },
@@ -8568,7 +8566,7 @@ require = function () {
             }
             exports.segment = segment;
             function validate(source, size) {
-                return source.length <= size / 2 || source.length <= size && new global_1.Blob([source]).size <= size;
+                return source.length <= size / 4 || source.length <= size && new global_1.Blob([source]).size <= size;
             }
             exports.validate = validate;
         },
@@ -8784,6 +8782,30 @@ require = function () {
                         ''
                     ];
                 case 0:
+                    switch (source[0]) {
+                    case '\\':
+                        switch (source[1]) {
+                        case '\u3001':
+                        case '\u3002':
+                        case '\uFF01':
+                        case '\uFF1F':
+                            return (0, exports.text)(source.slice(1), context);
+                        }
+                        break;
+                    case '\u3001':
+                    case '\u3002':
+                    case '\uFF01':
+                    case '\uFF1F':
+                        const i = source.slice(1).search(exports.nonWhitespace) + 1;
+                        if (i > 0 && source.slice(i, i + 2) === '\\\n')
+                            return [
+                                [
+                                    source[0],
+                                    (0, typed_dom_1.html)('span', { class: 'linebreak' })
+                                ],
+                                source.slice(i + 2)
+                            ];
+                    }
                     switch (source[0]) {
                     case '\x7F':
                         return [
@@ -8822,20 +8844,6 @@ require = function () {
                             [source[0]],
                             source.slice(1)
                         ];
-                    case '\u3001':
-                    case '\u3002':
-                    case '\uFF01':
-                    case '\uFF1F': {
-                            const i = source.slice(1).search(exports.nonWhitespace) + 1;
-                            if (i > 0 && source.slice(i, i + 2) === '\\\n')
-                                return [
-                                    [
-                                        source[0],
-                                        (0, typed_dom_1.html)('span', { class: 'linebreak' })
-                                    ],
-                                    source.slice(i + 2)
-                                ];
-                        }
                     default:
                         const b = source[0].trimStart() === '';
                         const i = b || isAlphanumeric(source[0]) ? source.search(b ? exports.nonWhitespace : exports.nonAlphanumeric) : 1;

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.226.2",
+  "version": "0.226.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -548,9 +548,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "17.0.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.4.tgz",
-      "integrity": "sha512-6xwbrW4JJiJLgF+zNypN5wr2ykM9/jHcL7rQ8fZe2vuftggjzZeRSM4OwRc6Xk8qWjwJ99qVHo/JgOGmomWRog==",
+      "version": "17.0.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.5.tgz",
+      "integrity": "sha512-w3mrvNXLeDYV1GKTZorGJQivK6XLCoGwpnyJFbJVK/aTBQUxOCaa/GlFAAN3OTDFcb7h5tiFG+YXCO2By+riZw==",
       "dev": true
     },
     "@types/power-assert": {
@@ -1790,9 +1790,9 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001292",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001292.tgz",
-      "integrity": "sha512-jnT4Tq0Q4ma+6nncYQVe7d73kmDmE9C3OGTx3MvW7lBM/eY1S1DZTMBON7dqV481RhNiS5OxD7k9JQvmDOTirw==",
+      "version": "1.0.30001294",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001294.tgz",
+      "integrity": "sha512-LiMlrs1nSKZ8qkNhpUf5KD0Al1KCBE3zaT7OLOwEkagXMEDij98SiOovn9wxVGQpklk9vVC/pUSqgYmkmKOS8g==",
       "dev": true
     },
     "chalk": {
@@ -2413,9 +2413,9 @@
       "dev": true
     },
     "date-fns": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.27.0.tgz",
-      "integrity": "sha512-sj+J0Mo2p2X1e306MHq282WS4/A8Pz/95GIFcsPNMPMZVI3EUrAdSv90al1k+p74WGLCruMXk23bfEDZa71X9Q==",
+      "version": "2.28.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.28.0.tgz",
+      "integrity": "sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw==",
       "dev": true
     },
     "date-format": {
@@ -2867,9 +2867,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.4.28",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.28.tgz",
-      "integrity": "sha512-Gzbf0wUtKfyPaqf0Plz+Ctinf9eQIzxEqBHwSvbGfeOm9GMNdLxyu1dNiCUfM+x6r4BE0xUJNh3Nmg9gfAtTmg==",
+      "version": "1.4.30",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.30.tgz",
+      "integrity": "sha512-609z9sIMxDHg+TcR/VB3MXwH+uwtrYyeAwWc/orhnr90ixs6WVGSrt85CDLGUdNnLqCA7liv426V20EecjvflQ==",
       "dev": true
     },
     "elliptic": {
@@ -5929,9 +5929,9 @@
       }
     },
     "istanbul-reports": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.2.tgz",
-      "integrity": "sha512-0gHxuT1NNC0aEIL1zbJ+MTgPbbHhU77eJPuU35WKA7TgXiSNlCAx4PENoMrH0Or6M2H80TaZcWKhM0IK6V8gRw==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.3.tgz",
+      "integrity": "sha512-x9LtDVtfm/t1GFiLl3NffC7hz+I1ragvgX1P/Lg1NlIagifZDKUkuuaAxH/qpwj2IuEfD8G2Bs/UKp+sZ/pKkg==",
       "dev": true,
       "requires": {
         "html-escaper": "^2.0.0",

package/package.json

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

package/src/parser/api/normalize.ts

@@ -5,7 +5,7 @@ const UNICODE_REPLACEMENT_CHARACTER = '\uFFFD';
 assert(UNICODE_REPLACEMENT_CHARACTER.trim());
 
 export function normalize(source: string): string {
-  return format(sanitize(source));
+  return sanitize(format(source));
 }
 
 function format(source: string): string {
@@ -57,7 +57,7 @@ const unreadableHTMLEntityNames = [
   'it',
   'InvisibleComma',
   'ic',
-];
+] as const;
 const unreadableEscapableCharacters = unreadableHTMLEntityNames
   .flatMap(name => eval(unsafehtmlentity(`&${name};`, {}), []));
 assert(unreadableEscapableCharacters.length === unreadableHTMLEntityNames.length);
@@ -98,10 +98,10 @@ const unreadableSpecialCharacters = [
   '\u2060',
   // ZERO WIDTH NON-BREAKING SPACE
   '\uFEFF',
-];
+] as const;
 assert(unreadableSpecialCharacters.every(c => sanitize(c) === UNICODE_REPLACEMENT_CHARACTER));
 
-// 特殊不可視文字はエディタおよびソースビューアの等幅および強調表示により可視化する
+// 特殊不可視文字はエディタおよびソースビューアでは等幅および強調表示により可視化する
 export function escape(source: string): string {
   return source
     .replace(unreadableEscapableCharacter, char =>

package/src/parser/header.ts

@@ -1,8 +1,8 @@
 import { MarkdownParser } from '../../markdown';
 import { union, inits, block, validate, focus, rewrite, guard, clear } from '../combinator';
 import { segment } from './segment';
-import { normalize } from './api/normalize';
 import { str } from './source';
+import { normalize } from './api/normalize';
 import { html, defrag } from 'typed-dom';
 
 export const header: MarkdownParser.HeaderParser = validate(

package/src/parser/locale.ts

@@ -10,13 +10,12 @@ export function localize(parser: Parser<HTMLElement | string>): Parser<HTMLEleme
     const el = ns.length === 1 && typeof ns[0] === 'object'
       ? ns[0]
       : html('div', ns);
-    const es = el.getElementsByClassName('linebreak');
+    const es = el.querySelectorAll('.linebreak:not(:empty)');
     for (let i = 0, len = es.length; i < len; ++i) {
       const sb = es[i];
-      if (!sb.firstChild) continue;
+      assert(sb.firstChild!.textContent === ' ');
       if (!check(sb)) continue;
-      assert(sb.firstChild.textContent === ' ');
-      sb.firstChild.remove();
+      sb.firstChild!.remove();
     }
     return ns;
   });
@@ -31,26 +30,25 @@ function check(el: Element): boolean {
 
 function lastChar(node: Element | Text | null): string {
   while (node = node?.previousSibling as typeof node) {
-    if ('id' in node && !node.firstChild) {
-      switch (node.tagName) {
-        case 'BR':
-          return '';
-        case 'SPAN':
-          if (node.className === 'linebreak') return '';
-      }
-      continue;
+    if (!('id' in node)) return [...node.data.slice(-2)].pop() ?? '';
+    if (node.firstChild) return [...text(node).slice(-2)].pop() ?? '';
+    switch (node.tagName) {
+      case 'BR':
+        return '';
+      case 'SPAN':
+        switch (node.className) {
+          case 'linebreak':
+            return '';
+        }
     }
-    const str = text(node);
-    return str && [...str.slice(-2)].pop()!;
   }
   return '';
 }
 
-function text(node: Text | Element): string {
-  if (!('id' in node)) return node.data;
-  switch (node.tagName) {
+function text(el: Element): string {
+  switch (el.tagName) {
     case 'RUBY':
-      for (let ns = node.childNodes, i = ns.length; i--;) {
+      for (let ns = el.childNodes, i = ns.length; i--;) {
         const child = ns[i] as Text | Element;
         if ('id' in child) continue;
         return child.data;
@@ -58,6 +56,6 @@ function text(node: Text | Element): string {
       assert(false);
       return '';
     default:
-      return node.textContent!;
+      return el.textContent!;
   }
 }

package/src/parser/segment.ts

@@ -43,6 +43,6 @@ export function* segment(source: string): Generator<string, undefined, undefined
 }
 
 export function validate(source: string, size: number): boolean {
-  return source.length <= size / 2
+  return source.length <= size / 4
       || source.length <= size && new Blob([source]).size <= size;
 }

package/src/parser/source/text.ts

@@ -16,6 +16,23 @@ export const text: TextParser = creator((source, context) => {
     case -1:
       return [[source], ''];
     case 0:
+      switch (source[0]) {
+        case '\\':
+          switch (source[1]) {
+            case '、':
+            case '。':
+            case '！':
+            case '？':
+              return text(source.slice(1), context);
+          }
+          break;
+        case '、':
+        case '。':
+        case '！':
+        case '？':
+          const i = source.slice(1).search(nonWhitespace) + 1;
+          if (i > 0 && source.slice(i, i + 2) === '\\\n') return [[source[0], html('span', { class: 'linebreak' })], source.slice(i + 2)];
+      }
       switch (source[0]) {
         case '\x7F':
           assert(source[1] === '\\');
@@ -39,15 +56,6 @@ export const text: TextParser = creator((source, context) => {
           return source[1] === source[0]
             ? repeat(source, context)
             : [[source[0]], source.slice(1)];
-        case '、':
-        case '。':
-        case '！':
-        // @ts-expect-error
-        case '？': {
-          const i = source.slice(1).search(nonWhitespace) + 1;
-          if (i > 0 && source.slice(i, i + 2) === '\\\n') return [[source[0], html('span', { class: 'linebreak' })], source.slice(i + 2)];
-          // fallthrough
-        }
         default:
           assert(source[0] !== '\n');
           const b = source[0].trimStart() === '';