securemark 0.245.0 → 0.247.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.247.1
+
+- Fix math parser.
+
+## 0.247.0
+
+- Refine math parser.
+
+## 0.246.0
+
+- Extend table syntax to add grid type.
+
 ## 0.245.0
 
 - Use webpack.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.245.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.247.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"));
@@ -8,7 +8,7 @@
 		exports["securemark"] = factory(require("DOMPurify"), require("Prism"));
 	else
 		root["securemark"] = factory(root["DOMPurify"], root["Prism"]);
-})(globalThis, (__WEBPACK_EXTERNAL_MODULE__6231__, __WEBPACK_EXTERNAL_MODULE__9450__) => {
+})(this, (__WEBPACK_EXTERNAL_MODULE__6231__, __WEBPACK_EXTERNAL_MODULE__9450__) => {
 return /******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
@@ -4307,11 +4307,11 @@ const dom_1 = __webpack_require__(3252);
 
 const array_1 = __webpack_require__(8112);
 
-const opener = /^(~{3,})table(?!\S)([^\n]*)(?:$|\n)/;
+const opener = /^(~{3,})table(?:\/(\S+))?(?!\S)([^\n]*)(?:$|\n)/;
 exports.segment = (0, combinator_1.block)((0, combinator_1.validate)('~~~', (0, combinator_1.clear)((0, combinator_1.fence)(opener, 10000))));
 exports.segment_ = (0, combinator_1.block)((0, combinator_1.validate)('~~~', (0, combinator_1.clear)((0, combinator_1.fence)(opener, 10000, false))), false);
 exports.table = (0, combinator_1.block)((0, combinator_1.validate)('~~~', (0, combinator_1.fmap)((0, combinator_1.fence)(opener, 10000), // Bug: Type mismatch between outer and inner.
-([body, overflow, closer, opener, delim, param], _, context) => {
+([body, overflow, closer, opener, delim, type, param], _, context) => {
   if (!closer || overflow || param.trimStart()) return [(0, dom_1.html)('pre', {
     class: 'invalid',
     translate: 'no',
@@ -4319,7 +4319,23 @@ exports.table = (0, combinator_1.block)((0, combinator_1.validate)('~~~', (0, co
     'data-invalid-type': !closer || overflow ? 'fence' : 'argument',
     'data-invalid-message': !closer ? `Missing the closing delimiter "${delim}"` : overflow ? `Invalid trailing line after the closing delimiter "${delim}"` : 'Invalid argument'
   }, `${opener}${body}${overflow || closer}`)];
-  return (0, parser_1.eval)(parser(body, context)) ?? [(0, dom_1.html)('table')];
+
+  switch (type) {
+    case 'grid':
+    case global_1.undefined:
+      return ((0, parser_1.eval)(parser(body, context)) ?? [(0, dom_1.html)('table')]).map(el => (0, dom_1.define)(el, {
+        'data-type': type
+      }));
+
+    default:
+      return [(0, dom_1.html)('pre', {
+        class: 'invalid',
+        translate: 'no',
+        'data-invalid-syntax': 'table',
+        'data-invalid-type': 'argument',
+        'data-invalid-message': 'Invalid table type'
+      }, `${opener}${body}${closer}`)];
+  }
 })));
 const parser = (0, combinator_1.lazy)(() => (0, combinator_1.block)((0, locale_1.localize)((0, combinator_1.fmap)((0, combinator_1.some)((0, combinator_1.union)([row])), rows => [(0, dom_1.html)('table', format(rows))]))));
 const row = (0, combinator_1.lazy)(() => (0, combinator_1.dup)((0, combinator_1.fmap)((0, combinator_1.subsequence)([(0, combinator_1.dup)((0, combinator_1.union)([align])), (0, combinator_1.some)((0, combinator_1.union)([head, data, (0, combinator_1.some)(dataline, alignment), source_1.emptyline]))]), ns => !(0, alias_1.isArray)(ns[0]) ? (0, array_1.unshift)([[[]]], ns) : ns)));
@@ -5240,6 +5256,8 @@ const template_1 = __webpack_require__(4695);
 
 const comment_1 = __webpack_require__(8657);
 
+const math_1 = __webpack_require__(8946);
+
 const extension_1 = __webpack_require__(8053);
 
 const ruby_1 = __webpack_require__(6705);
@@ -5262,8 +5280,6 @@ const strong_1 = __webpack_require__(8072);
 
 const code_1 = __webpack_require__(5771);
 
-const math_1 = __webpack_require__(8946);
-
 const media_1 = __webpack_require__(1303);
 
 const htmlentity_1 = __webpack_require__(1562);
@@ -5276,7 +5292,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, extension_1.extension, ruby_1.ruby, link_1.link, media_1.media, html_1.html, insertion_1.insertion, deletion_1.deletion, mark_1.mark, emstrong_1.emstrong, strong_1.strong, emphasis_1.emphasis, code_1.code, math_1.math, htmlentity_1.htmlentity, shortmedia_1.shortmedia, autolink_1.autolink, bracket_1.bracket, source_1.text]);
+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, emstrong_1.emstrong, 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);
 
@@ -6528,18 +6544,13 @@ const source_1 = __webpack_require__(6743);
 
 const dom_1 = __webpack_require__(3252);
 
-const disallowedCommand = /\\(?:begin|tiny|huge|large)(?![0-9a-z])/i;
-exports.math = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.validate)('$', (0, combinator_1.rewrite)((0, combinator_1.union)([(0, combinator_1.surround)('$', // Latex's reserved characters: # $ % ^ & _ { } ~ \
-// $[0-9]+                    : Dollar
-// $[A-z]*-                   : Label
-// $[A-z]*(?!-)               : Math
-// $[\^_[({|]                 : Math
-// $[#$%&]                    : Invalid first character in Latex syntax
-(0, source_1.str)(/^(?![\s{}#$%&]|\d+(?:[,.]\d+)*[^-+*/=<>^_~\\$]|-[\da-z]|[a-z]+-)(?:\\\$|\x20(?!\$)|[\x21-\x23\x25-\x7E])+/i), /^\$(?![0-9a-z])/i), (0, combinator_1.surround)('$', bracket, '$')]), (source, {
+const syntax = /^(?:[ "([](?!\$)|\\{(?!\$)|\\[\\}$]?|^`|`(?!`)|[!#%&')\x2A-\x5A\]^_\x61-\x7A|~])+/;
+const forbiddenCommand = /\\(?:begin|tiny|huge|large)(?![a-z])/i;
+exports.math = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.validate)('$', (0, combinator_1.rewrite)((0, combinator_1.union)([(0, combinator_1.surround)('$', bracket, '$'), (0, combinator_1.surround)(/^\$(?!\s)/, (0, combinator_1.some)((0, combinator_1.union)([bracket, quote, (0, source_1.str)(syntax)])), /^\$(?![0-9A-Za-z])/)]), (source, {
   caches: {
     math: cache
   } = {}
-}) => [[cache?.get(source)?.cloneNode(true) || (0, dom_1.html)('span', !disallowedCommand.test(source) ? {
+}) => [[cache?.get(source)?.cloneNode(true) || (0, dom_1.html)('span', !forbiddenCommand.test(source) ? {
   class: 'math',
   translate: 'no',
   'data-src': source
@@ -6548,9 +6559,10 @@ exports.math = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combin
   translate: 'no',
   'data-invalid-syntax': 'math',
   'data-invalid-type': 'content',
-  'data-invalid-message': `"${source.match(disallowedCommand)[0]}" command is disallowed`
+  'data-invalid-message': `"${source.match(forbiddenCommand)[0]}" command is forbidden`
 }, source)], '']))));
-const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.surround)('{', (0, combinator_1.some)((0, combinator_1.union)([bracket, (0, combinator_1.some)(source_1.escsource, /^(?:[{}]|\\?\n)/)])), '}', true)));
+const bracket = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.surround)('{', (0, combinator_1.some)((0, combinator_1.union)([bracket, (0, combinator_1.some)(source_1.escsource, /^(?:[{}$]|\\?\n)/)])), '}', true)));
+const quote = (0, combinator_1.lazy)(() => (0, combinator_1.creator)((0, combinator_1.surround)('``', (0, combinator_1.some)((0, combinator_1.union)([quote, bracket, (0, combinator_1.focus)(/^(?:\\[\\{}$]|`(?!`)|[^`{}"$\n])*/, (0, source_1.str)(syntax))])), /^"?/, true)));
 
 /***/ }),
 
@@ -8718,14 +8730,14 @@ function fix(h) {
 /***/ }),
 
 /***/ 3252:
-/***/ ((module) => {
+/***/ (function(module) {
 
-/*! typed-dom v0.0.292 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
+/*! typed-dom v0.0.295 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(true)
 		module.exports = factory();
 	else {}
-})(globalThis, () => {
+})(this, () => {
 return /******/ (() => { // webpackBootstrap
 /******/ 	"use strict";
 /******/ 	var __webpack_modules__ = ({
@@ -8804,11 +8816,11 @@ exports.equal = equal;
 /***/ }),
 
 /***/ 128:
-/***/ ((module, __unused_webpack_exports, __nested_webpack_require_4961__) => {
+/***/ ((module, __unused_webpack_exports, __nested_webpack_require_4955__) => {
 
 
 
-__nested_webpack_require_4961__(921);
+__nested_webpack_require_4955__(921);
 
 const global = void 0 || typeof globalThis !== 'undefined' && globalThis // @ts-ignore
 || typeof self !== 'undefined' && self || Function('return this')();
@@ -8829,7 +8841,7 @@ var global = (/* unused pure expression or super */ null && (0));
 /***/ }),
 
 /***/ 808:
-/***/ ((__unused_webpack_module, exports, __nested_webpack_require_5448__) => {
+/***/ ((__unused_webpack_module, exports, __nested_webpack_require_5442__) => {
 
 
 
@@ -8838,11 +8850,11 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.reduce = exports.memoize = void 0;
 
-const global_1 = __nested_webpack_require_5448__(128);
+const global_1 = __nested_webpack_require_5442__(128);
 
-const alias_1 = __nested_webpack_require_5448__(406);
+const alias_1 = __nested_webpack_require_5442__(406);
 
-const compare_1 = __nested_webpack_require_5448__(529);
+const compare_1 = __nested_webpack_require_5442__(529);
 
 function memoize(f, identify = (...as) => as[0], memory) {
   if (typeof identify === 'object') return memoize(f, void 0, identify);
@@ -8900,7 +8912,7 @@ exports.reduce = reduce;
 /***/ }),
 
 /***/ 521:
-/***/ ((__unused_webpack_module, exports, __nested_webpack_require_6838__) => {
+/***/ ((__unused_webpack_module, exports, __nested_webpack_require_6832__) => {
 
 
 
@@ -8909,11 +8921,11 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.defrag = exports.prepend = exports.append = exports.isChildren = exports.define = exports.element = exports.text = exports.svg = exports.html = exports.frag = exports.shadow = void 0;
 
-const global_1 = __nested_webpack_require_6838__(128);
+const global_1 = __nested_webpack_require_6832__(128);
 
-const alias_1 = __nested_webpack_require_6838__(406);
+const alias_1 = __nested_webpack_require_6832__(406);
 
-const memoize_1 = __nested_webpack_require_6838__(808);
+const memoize_1 = __nested_webpack_require_6832__(808);
 
 var caches;
 
@@ -9018,7 +9030,7 @@ function defineAttrs(el, attrs) {
                 configurable: true,
                 enumerable: false,
                 writable: true,
-                value: prop in el ? ev => ev.returnValue : ''
+                value: prop in el && !(0, alias_1.hasOwnProperty)(el, prop) ? ev => ev.returnValue : ''
               });
           }
         }
@@ -9045,7 +9057,7 @@ function defineAttrs(el, attrs) {
                 configurable: true,
                 enumerable: false,
                 writable: true,
-                value: prop in el ? ev => ev.returnValue : ''
+                value: prop in el && !(0, alias_1.hasOwnProperty)(el, prop) ? ev => ev.returnValue : ''
               });
           }
         }
@@ -9149,7 +9161,7 @@ exports.defrag = defrag;
 /******/ 	var __webpack_module_cache__ = {};
 /******/ 	
 /******/ 	// The require function
-/******/ 	function __nested_webpack_require_13838__(moduleId) {
+/******/ 	function __nested_webpack_require_13916__(moduleId) {
 /******/ 		// Check if module is in cache
 /******/ 		var cachedModule = __webpack_module_cache__[moduleId];
 /******/ 		if (cachedModule !== undefined) {
@@ -9163,7 +9175,7 @@ exports.defrag = defrag;
 /******/ 		};
 /******/ 	
 /******/ 		// Execute the module function
-/******/ 		__webpack_modules__[moduleId](module, module.exports, __nested_webpack_require_13838__);
+/******/ 		__webpack_modules__[moduleId](module, module.exports, __nested_webpack_require_13916__);
 /******/ 	
 /******/ 		// Return the exports of the module
 /******/ 		return module.exports;
@@ -9174,7 +9186,7 @@ exports.defrag = defrag;
 /******/ 	// startup
 /******/ 	// Load entry module and return exports
 /******/ 	// This entry module is referenced by other modules so it can't be inlined
-/******/ 	var __webpack_exports__ = __nested_webpack_require_13838__(521);
+/******/ 	var __webpack_exports__ = __nested_webpack_require_13916__(521);
 /******/ 	
 /******/ 	return __webpack_exports__;
 /******/ })()
@@ -9184,14 +9196,14 @@ exports.defrag = defrag;
 /***/ }),
 
 /***/ 6120:
-/***/ ((module) => {
+/***/ (function(module) {
 
-/*! typed-dom v0.0.292 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
+/*! typed-dom v0.0.295 https://github.com/falsandtru/typed-dom | (c) 2016, falsandtru | (Apache-2.0 AND MPL-2.0) License */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(true)
 		module.exports = factory();
 	else {}
-})(globalThis, () => {
+})(this, () => {
 return /******/ (() => { // webpackBootstrap
 /******/ 	"use strict";
 var __webpack_exports__ = {};

package/karma.conf.js

@@ -1,9 +1,8 @@
 module.exports = function (config) {
   config.set({
     browsers: ['Chrome', 'Firefox'],
-    frameworks: ['mocha'],
+    frameworks: ['mocha', 'power-assert'],
     files: [
-      { pattern: 'https://cdn.jsdelivr.net/npm/power-assert@1.6.1/build/power-assert.js', watched: false, served: false, included: true, integrity: 'sha256-MuDC5CQFh3oWtiG0YE000HlkK08xAilD2v0ndZR+Kds=' },
       { pattern: 'https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.21/lodash.js', watched: false, served: false, included: true, integrity: 'sha512-2iwCHjuj+PmdCyvb88rMOch0UcKQxVHi/gsAml1fN3eg82IDaO/cdzzeXX4iF2VzIIes7pODE1/G0ts3QBwslA==' },
       { pattern: 'https://cdnjs.cloudflare.com/ajax/libs/benchmark/2.1.4/benchmark.js', watched: false, served: false, included: true, integrity: 'sha512-XnVGk21Ij51MbU8XezQpkwZ1/GA8b5qmoVGIOdJLBYycutjkaeemipzRJP7P6mEJl99OfnweA7M3e4WLfuG7Aw==' },
       { pattern: 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.js', watched: false, served: false, included: true, integrity: 'sha512-n/4gHW3atM3QqRcbCn6ewmpxcLAHGaDjpEBu4xZd47N0W2oQ+6q7oc3PXstrJYXcbNU1OHdQ1T7pAP+gi5Yu8g==' },

package/markdown.d.ts

@@ -652,6 +652,7 @@ export namespace MarkdownParser {
       InlineParser.ReferenceParser,
       InlineParser.TemplateParser,
       InlineParser.CommentParser,
+      InlineParser.MathParser,
       InlineParser.ExtensionParser,
       InlineParser.RubyParser,
       InlineParser.LinkParser,
@@ -664,7 +665,6 @@ export namespace MarkdownParser {
       InlineParser.StrongParser,
       InlineParser.EmphasisParser,
       InlineParser.CodeParser,
-      InlineParser.MathParser,
       InlineParser.HTMLEntityParser,
       InlineParser.ShortmediaParser,
       InlineParser.AutolinkParser,
@@ -748,6 +748,36 @@ export namespace MarkdownParser {
         InlineParser,
       ]> {
     }
+    export interface MathParser extends
+      // $expr$
+      // ${expr}$
+      Inline<'math'>,
+      Parser<HTMLElement, Context, [
+        MathParser.BracketParser,
+        Parser<string, Context, [
+          MathParser.BracketParser,
+          MathParser.QuoteParser,
+          SourceParser.StrParser,
+        ]>,
+      ]> {
+    }
+    export namespace MathParser {
+      export interface BracketParser extends
+        Inline<'math/bracket'>,
+        Parser<HTMLElement, Context, [
+          BracketParser,
+          SourceParser.EscapableSourceParser,
+        ]> {
+      }
+      export interface QuoteParser extends
+        Inline<'math/quote'>,
+        Parser<HTMLElement, Context, [
+          QuoteParser,
+          BracketParser,
+          SourceParser.StrParser,
+        ]> {
+      }
+    }
     export interface ExtensionParser extends
       // [#abc]
       Inline<'extension'>,
@@ -1039,24 +1069,6 @@ export namespace MarkdownParser {
         SourceParser.StrParser,
       ]> {
     }
-    export interface MathParser extends
-      // $expr$
-      // ${expr}$
-      Inline<'math'>,
-      Parser<HTMLElement, Context, [
-        SourceParser.StrParser,
-        MathParser.BracketParser,
-      ]> {
-    }
-    export namespace MathParser {
-      export interface BracketParser extends
-        Inline<'math/bracket'>,
-        Parser<HTMLElement, Context, [
-          BracketParser,
-          SourceParser.EscapableSourceParser,
-        ]> {
-      }
-    }
     export interface HTMLEntityParser extends
       // &copy;
       Inline<'htmlentity'>,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.245.0",
+  "version": "0.247.1",
   "description": "Secure markdown renderer working on browsers for user input data.",
   "private": false,
   "homepage": "https://github.com/falsandtru/securemark",
@@ -38,7 +38,7 @@
     "babel-loader": "^8.2.5",
     "babel-plugin-unassert": "^3.2.0",
     "concurrently": "^7.2.0",
-    "eslint": "^8.15.0",
+    "eslint": "^8.16.0",
     "eslint-plugin-redos": "^4.4.0",
     "eslint-webpack-plugin": "^3.1.1",
     "glob": "^8.0.3",
@@ -47,12 +47,13 @@
     "karma-coverage": "^2.2.0",
     "karma-firefox-launcher": "^2.1.2",
     "karma-mocha": "^2.0.1",
+    "karma-power-assert": "^1.0.0",
     "mocha": "^10.0.0",
-    "npm-check-updates": "^13.0.1",
+    "npm-check-updates": "^13.0.3",
     "semver": "^7.3.7",
-    "spica": "0.0.550",
+    "spica": "0.0.551",
     "ts-loader": "^9.3.0",
-    "typed-dom": "^0.0.292",
+    "typed-dom": "^0.0.295",
     "typescript": "4.6.4",
     "webpack": "^5.72.1",
     "webpack-cli": "^4.9.2",

package/src/parser/block/extension/table.test.ts

@@ -654,6 +654,15 @@ describe('Unit: parser/block/extension/table', () => {
         ]).outerHTML], '']);
     });
 
+    it('type', () => {
+      assert.deepStrictEqual(
+        inspect(parser('~~~table/invalid\n~~~')),
+        [['<pre class="invalid" translate="no">~~~table/invalid\n~~~</pre>'], '']);
+      assert.deepStrictEqual(
+        inspect(parser('~~~table/grid\n~~~')),
+        [[html('table', { 'data-type': 'grid' }).outerHTML], '']);
+    });
+
   });
 
 });

package/src/parser/block/extension/table.ts

@@ -7,7 +7,7 @@ import { inline } from '../../inline';
 import { str, anyline, emptyline, contentline } from '../../source';
 import { localize } from '../../locale';
 import { visualize } from '../../util';
-import { html, defrag } from 'typed-dom/dom';
+import { html, define, defrag } from 'typed-dom/dom';
 import { unshift, splice } from 'spica/array';
 
 import TableParser = ExtensionParser.TableParser;
@@ -15,7 +15,7 @@ import RowParser = TableParser.RowParser;
 import AlignParser = TableParser.AlignParser;
 import CellParser = TableParser.CellParser;
 
-const opener = /^(~{3,})table(?!\S)([^\n]*)(?:$|\n)/;
+const opener = /^(~{3,})table(?:\/(\S+))?(?!\S)([^\n]*)(?:$|\n)/;
 
 export const segment: TableParser.SegmentParser = block(validate('~~~',
   clear(fence(opener, 10000))));
@@ -26,7 +26,7 @@ export const segment_: TableParser.SegmentParser = block(validate('~~~',
 export const table: TableParser = block(validate('~~~', fmap(
   fence(opener, 10000),
   // Bug: Type mismatch between outer and inner.
-  ([body, overflow, closer, opener, delim, param]: string[], _, context) => {
+  ([body, overflow, closer, opener, delim, type, param]: string[], _, context) => {
     if (!closer || overflow || param.trimStart()) return [html('pre', {
       class: 'invalid',
       translate: 'no',
@@ -37,7 +37,20 @@ export const table: TableParser = block(validate('~~~', fmap(
         overflow ?  `Invalid trailing line after the closing delimiter "${delim}"` :
         'Invalid argument',
     }, `${opener}${body}${overflow || closer}`)];
-    return eval(parser(body, context)) ?? [html('table')];
+    switch (type) {
+      case 'grid':
+      case undefined:
+        return (eval(parser(body, context)) ?? [html('table')])
+          .map(el => define(el, { 'data-type': type }));
+      default:
+        return [html('pre', {
+          class: 'invalid',
+          translate: 'no',
+          'data-invalid-syntax': 'table',
+          'data-invalid-type': 'argument',
+          'data-invalid-message': 'Invalid table type',
+        }, `${opener}${body}${closer}`)];
+    }
   })));
 
 const parser: TableParser = lazy(() => block(localize(fmap(

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

@@ -52,7 +52,7 @@ describe('Unit: parser/block/reply/quote', () => {
       assert.deepStrictEqual(inspect(parser('> > a\n> > b\n> > c')), [['<span class="quote">&gt; &gt; a<br>&gt; &gt; b<br>&gt; &gt; c</span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('> > > a\n> > > b')), [['<span class="quote">&gt; &gt; &gt; a<br>&gt; &gt; &gt; b</span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('> #a')), [['<span class="quote">&gt; <a href="/hashtags/a" class="hashtag">#a</a></span>', '<br>'], '']);
-      assert.deepStrictEqual(inspect(parser('> $a-b$')), [['<span class="quote">&gt; $a-b$</span>', '<br>'], '']);
+      assert.deepStrictEqual(inspect(parser('> $-a, $-b')), [['<span class="quote">&gt; $-a, $-b</span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('> $a=b$')), [['<span class="quote">&gt; <span class="math" translate="no" data-src="$a=b$">$a=b$</span></span>', '<br>'], '']);
       assert.deepStrictEqual(inspect(parser('> ${a}$')), [['<span class="quote">&gt; <span class="math" translate="no" data-src="${a}$">${a}$</span></span>', '<br>'], '']);
     });

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

@@ -12,21 +12,24 @@ describe('Unit: parser/inline/math', () => {
       assert.deepStrictEqual(inspect(parser('$$')), undefined);
       assert.deepStrictEqual(inspect(parser('$$$')), undefined);
       assert.deepStrictEqual(inspect(parser('$0 $')), undefined);
-      assert.deepStrictEqual(inspect(parser('$0.$')), undefined);
-      assert.deepStrictEqual(inspect(parser('$1,000.99.$')), undefined);
-      assert.deepStrictEqual(inspect(parser('$0(a)$')), undefined);
-      assert.deepStrictEqual(inspect(parser('$0[a]$')), undefined);
-      assert.deepStrictEqual(inspect(parser('$0{a}$')), undefined);
-      assert.deepStrictEqual(inspect(parser('$0 -$')), undefined);
-      assert.deepStrictEqual(inspect(parser('$0 - $')), undefined);
-      assert.deepStrictEqual(inspect(parser('$0 + $')), undefined);
-      assert.deepStrictEqual(inspect(parser('$-0$')), undefined);
-      assert.deepStrictEqual(inspect(parser('$-0$-1')), undefined);
-      assert.deepStrictEqual(inspect(parser('$-a$')), undefined);
-      assert.deepStrictEqual(inspect(parser('$-a$-b')), undefined);
+      assert.deepStrictEqual(inspect(parser('$-0, $-1')), undefined);
+      assert.deepStrictEqual(inspect(parser('$-0 and $-1')), undefined);
+      assert.deepStrictEqual(inspect(parser('$-0と$-1')), undefined);
+      assert.deepStrictEqual(inspect(parser('$-a $-b')), undefined);
+      assert.deepStrictEqual(inspect(parser('$-a\\ $-b')), undefined);
       assert.deepStrictEqual(inspect(parser('$a $')), undefined);
-      assert.deepStrictEqual(inspect(parser('$a-b$')), undefined);
-      assert.deepStrictEqual(inspect(parser('$a-b$c-d')), undefined);
+      assert.deepStrictEqual(inspect(parser('$-a"$-b"')), undefined);
+      assert.deepStrictEqual(inspect(parser('$-a\\"$-b\\"')), undefined);
+      assert.deepStrictEqual(inspect(parser('$a"$')), undefined);
+      assert.deepStrictEqual(inspect(parser('$-a($-b)')), undefined);
+      assert.deepStrictEqual(inspect(parser('$-a\\($-b\\)')), undefined);
+      assert.deepStrictEqual(inspect(parser('$a($')), undefined);
+      assert.deepStrictEqual(inspect(parser('$-a[$-b]')), undefined);
+      assert.deepStrictEqual(inspect(parser('$-a\\[$-b\\]')), undefined);
+      assert.deepStrictEqual(inspect(parser('$a[$')), undefined);
+      assert.deepStrictEqual(inspect(parser('$-a{$-b}')), undefined);
+      assert.deepStrictEqual(inspect(parser('$-a\\{$-b\\}')), undefined);
+      assert.deepStrictEqual(inspect(parser('$a{$')), undefined);
       assert.deepStrictEqual(inspect(parser('$a$b')), undefined);
       assert.deepStrictEqual(inspect(parser('$a$b$')), undefined);
       assert.deepStrictEqual(inspect(parser('$ $')), undefined);
@@ -35,35 +38,46 @@ describe('Unit: parser/inline/math', () => {
       assert.deepStrictEqual(inspect(parser('$\n$')), undefined);
       assert.deepStrictEqual(inspect(parser('$a\\$\nb$')), undefined);
       assert.deepStrictEqual(inspect(parser('$a\\$\\\nb$')), undefined);
+      assert.deepStrictEqual(inspect(parser('$`"$')), undefined);
+      assert.deepStrictEqual(inspect(parser('$``a"$0')), undefined);
+      assert.deepStrictEqual(inspect(parser('$``a""$')), undefined);
+      assert.deepStrictEqual(inspect(parser('$```a""$')), undefined);
+      assert.deepStrictEqual(inspect(parser('$``\n"$')), undefined);
+      assert.deepStrictEqual(inspect(parser('$``a\\$\nb"$')), undefined);
+      assert.deepStrictEqual(inspect(parser('$``a\\$\\\nb"$')), undefined);
+      assert.deepStrictEqual(inspect(parser('$"$')), undefined);
+      assert.deepStrictEqual(inspect(parser('$}$')), undefined);
       assert.deepStrictEqual(inspect(parser('${')), undefined);
       assert.deepStrictEqual(inspect(parser('${a')), undefined);
       assert.deepStrictEqual(inspect(parser('${$')), undefined);
       assert.deepStrictEqual(inspect(parser('${}')), undefined);
       assert.deepStrictEqual(inspect(parser('${a} $')), undefined);
-      assert.deepStrictEqual(inspect(parser('${a}b$')), undefined);
-      assert.deepStrictEqual(inspect(parser('${a}{b}$')), undefined);
       assert.deepStrictEqual(inspect(parser('${a{b}$')), undefined);
       assert.deepStrictEqual(inspect(parser('${a}b}$')), undefined);
+      assert.deepStrictEqual(inspect(parser('${$}$')), undefined);
       assert.deepStrictEqual(inspect(parser('${\\}$')), undefined);
       assert.deepStrictEqual(inspect(parser('${\n}$')), undefined);
       assert.deepStrictEqual(inspect(parser('${a\\$\nb}$')), undefined);
       assert.deepStrictEqual(inspect(parser('${a\\$\\\nb}$')), undefined);
+      assert.deepStrictEqual(inspect(parser('$\\begin{}$')), [['<span class="invalid" translate="no">$\\begin{}$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$\\huge0$')), [['<span class="invalid" translate="no">$\\huge0$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$\\Begin{}$')), [['<span class="invalid" translate="no">$\\Begin{}$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('${\\begin}$')), [['<span class="invalid" translate="no">${\\begin}$</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('${\\Huge}$')), [['<span class="invalid" translate="no">${\\Huge}$</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('${a}b$')), undefined);
       assert.deepStrictEqual(inspect(parser(' ${a}$')), undefined);
     });
 
     it('basic', () => {
       assert.deepStrictEqual(inspect(parser('$0$')), [['<span class="math" translate="no" data-src="$0$">$0$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$0$$')), [['<span class="math" translate="no" data-src="$0$">$0$</span>'], '$']);
+      assert.deepStrictEqual(inspect(parser('$00$')), [['<span class="math" translate="no" data-src="$00$">$00$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$-0$')), [['<span class="math" translate="no" data-src="$-0$">$-0$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$0-1$')), [['<span class="math" translate="no" data-src="$0-1$">$0-1$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$0+1$')), [['<span class="math" translate="no" data-src="$0+1$">$0+1$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$0*1$')), [['<span class="math" translate="no" data-src="$0*1$">$0*1$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$0/1$')), [['<span class="math" translate="no" data-src="$0/1$">$0/1$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$a$')), [['<span class="math" translate="no" data-src="$a$">$a$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$a$$')), [['<span class="math" translate="no" data-src="$a$">$a$</span>'], '$']);
-      assert.deepStrictEqual(inspect(parser('$a -b$')), [['<span class="math" translate="no" data-src="$a -b$">$a -b$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$a-b$')), [['<span class="math" translate="no" data-src="$a-b$">$a-b$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$a+b$')), [['<span class="math" translate="no" data-src="$a+b$">$a+b$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$a*b$')), [['<span class="math" translate="no" data-src="$a*b$">$a*b$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$a/b$')), [['<span class="math" translate="no" data-src="$a/b$">$a/b$</span>'], '']);
@@ -71,6 +85,7 @@ describe('Unit: parser/inline/math', () => {
       assert.deepStrictEqual(inspect(parser(`$a''$`)), [[`<span class="math" translate="no" data-src="$a''$">$a''$</span>`], '']);
       assert.deepStrictEqual(inspect(parser('$a$[A](a)')), [['<span class="math" translate="no" data-src="$a$">$a$</span>'], '[A](a)']);
       assert.deepStrictEqual(inspect(parser('$A$')), [['<span class="math" translate="no" data-src="$A$">$A$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$-a$')), [['<span class="math" translate="no" data-src="$-a$">$-a$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$\\$$')), [['<span class="math" translate="no" data-src="$\\$$">$\\$$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$\\Pi$')), [['<span class="math" translate="no" data-src="$\\Pi$">$\\Pi$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$\\ 0$')), [['<span class="math" translate="no" data-src="$\\ 0$">$\\ 0$</span>'], '']);
@@ -86,6 +101,18 @@ describe('Unit: parser/inline/math', () => {
       assert.deepStrictEqual(inspect(parser('$f(x)$')), [['<span class="math" translate="no" data-src="$f(x)$">$f(x)$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$f: x \\to y$')), [['<span class="math" translate="no" data-src="$f: x \\to y$">$f: x \\to y$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('$k$-space')), [['<span class="math" translate="no" data-src="$k$">$k$</span>'], '-space']);
+      assert.deepStrictEqual(inspect(parser('$`$')), [['<span class="math" translate="no" data-src="$`$">$`$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$`"a$')), [['<span class="math" translate="no" data-src="$`&quot;a$">$`"a$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$``$')), [['<span class="math" translate="no" data-src="$``$">$``$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$``"$')), [['<span class="math" translate="no" data-src="$``&quot;$">$``"$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$``""a$')), [['<span class="math" translate="no" data-src="$``&quot;&quot;a$">$``""a$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$``a"$')), [['<span class="math" translate="no" data-src="$``a&quot;$">$``a"$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$``$"$')), [['<span class="math" translate="no" data-src="$``$">$``$</span>'], '"$']);
+      assert.deepStrictEqual(inspect(parser('$``\\"$')), [['<span class="math" translate="no" data-src="$``\\&quot;$">$``\\"$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$``a``b"c"$')), [['<span class="math" translate="no" data-src="$``a``b&quot;c&quot;$">$``a``b"c"$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$```"$')), [['<span class="math" translate="no" data-src="$```&quot;$">$```"$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$````""$')), [['<span class="math" translate="no" data-src="$````&quot;&quot;$">$````""$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('$a{b}$')), [['<span class="math" translate="no" data-src="$a{b}$">$a{b}$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('${}$')), [['<span class="math" translate="no" data-src="${}$">${}$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('${ }$')), [['<span class="math" translate="no" data-src="${ }$">${ }$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('${a}$')), [['<span class="math" translate="no" data-src="${a}$">${a}$</span>'], '']);
@@ -97,10 +124,14 @@ describe('Unit: parser/inline/math', () => {
       assert.deepStrictEqual(inspect(parser('${a }$')), [['<span class="math" translate="no" data-src="${a }$">${a }$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('${ a}$')), [['<span class="math" translate="no" data-src="${ a}$">${ a}$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('${ a }$')), [['<span class="math" translate="no" data-src="${ a }$">${ a }$</span>'], '']);
-      assert.deepStrictEqual(inspect(parser('${$}$')), [['<span class="math" translate="no" data-src="${$}$">${$}$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('${``a"}$')), [['<span class="math" translate="no" data-src="${``a&quot;}$">${``a"}$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('${\\a}$')), [['<span class="math" translate="no" data-src="${\\a}$">${\\a}$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('${\\$}$')), [['<span class="math" translate="no" data-src="${\\$}$">${\\$}$</span>'], '']);
       assert.deepStrictEqual(inspect(parser('${\\\\}$')), [['<span class="math" translate="no" data-src="${\\\\}$">${\\\\}$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('${a}b$')), [['<span class="math" translate="no" data-src="${a}b$">${a}b$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('${a}b{c}$')), [['<span class="math" translate="no" data-src="${a}b{c}$">${a}b{c}$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('${a}{b}$')), [['<span class="math" translate="no" data-src="${a}{b}$">${a}{b}$</span>'], '']);
+      assert.deepStrictEqual(inspect(parser('${あ}$')), [['<span class="math" translate="no" data-src="${あ}$">${あ}$</span>'], '']);
     });
 
     it('nest', () => {

package/src/parser/inline/math.ts

@@ -1,35 +1,34 @@
 import { MathParser } from '../inline';
-import { union, some, validate, rewrite, creator, surround, lazy } from '../../combinator';
+import { union, some, validate, focus, rewrite, creator, surround, lazy } from '../../combinator';
 import { escsource, str } from '../source';
 import { html } from 'typed-dom/dom';
 
-const disallowedCommand = /\\(?:begin|tiny|huge|large)(?![0-9a-z])/i;
+const syntax = /^(?:[ "([](?!\$)|\\{(?!\$)|\\[\\}$]?|^`|`(?!`)|[!#%&')\x2A-\x5A\]^_\x61-\x7A|~])+/;
+const forbiddenCommand = /\\(?:begin|tiny|huge|large)(?![a-z])/i;
 
 export const math: MathParser = lazy(() => creator(validate('$', rewrite(
   union([
-    surround(
-      '$',
-      // Latex's reserved characters: # $ % ^ & _ { } ~ \
-      // $[0-9]+                    : Dollar
-      // $[A-z]*-                   : Label
-      // $[A-z]*(?!-)               : Math
-      // $[\^_[({|]                 : Math
-      // $[#$%&]                    : Invalid first character in Latex syntax
-      str(/^(?![\s{}#$%&]|\d+(?:[,.]\d+)*[^-+*/=<>^_~\\$]|-[\da-z]|[a-z]+-)(?:\\\$|\x20(?!\$)|[\x21-\x23\x25-\x7E])+/i),
-      /^\$(?![0-9a-z])/i),
     surround('$', bracket, '$'),
+    surround(
+      /^\$(?!\s)/,
+      some(union([
+        bracket,
+        quote,
+        str(syntax),
+      ])),
+      /^\$(?![0-9A-Za-z])/),
   ]),
   (source, { caches: { math: cache } = {} }) => [[
     cache?.get(source)?.cloneNode(true) ||
     html('span',
-      !disallowedCommand.test(source)
+      !forbiddenCommand.test(source)
         ? { class: 'math', translate: 'no', 'data-src': source }
         : {
             class: 'invalid',
             translate: 'no',
             'data-invalid-syntax': 'math',
             'data-invalid-type': 'content',
-            'data-invalid-message': `"${source.match(disallowedCommand)![0]}" command is disallowed`,
+            'data-invalid-message': `"${source.match(forbiddenCommand)![0]}" command is forbidden`,
           },
       source)
   ], '']))));
@@ -38,7 +37,17 @@ const bracket: MathParser.BracketParser = lazy(() => creator(surround(
   '{',
   some(union([
     bracket,
-    some(escsource, /^(?:[{}]|\\?\n)/),
+    some(escsource, /^(?:[{}$]|\\?\n)/),
   ])),
   '}',
   true)));
+
+const quote: MathParser.QuoteParser = lazy(() => creator(surround(
+  '``',
+  some(union([
+    quote,
+    bracket,
+    focus(/^(?:\\[\\{}$]|`(?!`)|[^`{}"$\n])*/, str(syntax)),
+  ])),
+  /^"?/,
+  true)));

package/src/parser/inline.test.ts

@@ -112,7 +112,8 @@ describe('Unit: parser/inline', () => {
       assert.deepStrictEqual(inspect(parser('[$1]')), [['[', '$', '1', ']'], '']);
       assert.deepStrictEqual(inspect(parser('[$1-2]')), [['[', '$', '1', '-', '2', ']'], '']);
       assert.deepStrictEqual(inspect(parser('[$-1][$-2]')), [['<a class="label" data-label="$-1">$-1</a>', '<a class="label" data-label="$-2">$-2</a>'], '']);
-      assert.deepStrictEqual(inspect(parser('$-1$-2')), [['<a class="label" data-label="$-1">$-1</a>', '<a class="label" data-label="$-2">$-2</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('$-1, $-2')), [['<a class="label" data-label="$-1">$-1</a>', ',', ' ', '<a class="label" data-label="$-2">$-2</a>'], '']);
+      assert.deepStrictEqual(inspect(parser('$-1 and $-2')), [['<a class="label" data-label="$-1">$-1</a>', ' ', 'and', ' ', '<a class="label" data-label="$-2">$-2</a>'], '']);
       assert.deepStrictEqual(inspect(parser('$$-1')), [['$', '<a class="label" data-label="$-1">$-1</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[[#a]]')), [['<sup class="reference"><a href="/hashtags/a" class="hashtag">#a</a></sup>'], '']);
       assert.deepStrictEqual(inspect(parser('[[$-1]]')), [['<sup class="reference"><a class="label" data-label="$-1">$-1</a></sup>'], '']);

package/src/parser/inline.ts

@@ -5,6 +5,7 @@ import { annotation } from './inline/annotation';
 import { reference } from './inline/reference';
 import { template } from './inline/template';
 import { comment } from './inline/comment';
+import { math } from './inline/math';
 import { extension } from './inline/extension';
 import { ruby } from './inline/ruby';
 import { link } from './inline/link';
@@ -16,7 +17,6 @@ import { emstrong } from './inline/emstrong';
 import { emphasis } from './inline/emphasis';
 import { strong } from './inline/strong';
 import { code } from './inline/code';
-import { math } from './inline/math';
 import { media } from './inline/media';
 import { htmlentity } from './inline/htmlentity';
 import { shortmedia } from './inline/shortmedia';
@@ -30,6 +30,7 @@ export import AnnotationParser = InlineParser.AnnotationParser;
 export import ReferenceParser = InlineParser.ReferenceParser;
 export import TemplateParser = InlineParser.TemplateParser;
 export import CommentParser = InlineParser.CommentParser;
+export import MathParser = InlineParser.MathParser;
 export import ExtensionParser = InlineParser.ExtensionParser;
 export import RubyParser = InlineParser.RubyParser;
 export import LinkParser = InlineParser.LinkParser;
@@ -41,7 +42,6 @@ export import EmStrongParser = InlineParser.EmStrongParser;
 export import EmphasisParser = InlineParser.EmphasisParser;
 export import StrongParser = InlineParser.StrongParser;
 export import CodeParser = InlineParser.CodeParser;
-export import MathParser = InlineParser.MathParser;
 export import MediaParser = InlineParser.MediaParser;
 export import HTMLEntityParser = InlineParser.HTMLEntityParser;
 export import UnsafeHTMLEntityParser = InlineParser.UnsafeHTMLEntityParser;
@@ -55,6 +55,7 @@ export const inline: InlineParser = union([
   reference,
   template,
   comment,
+  math,
   extension,
   ruby,
   link,
@@ -67,7 +68,6 @@ export const inline: InlineParser = union([
   strong,
   emphasis,
   code,
-  math,
   htmlentity,
   shortmedia,
   autolink,

package/webpack.config.js

@@ -6,7 +6,7 @@ const { mergeWithRules } = require('webpack-merge');
 const ESLintPlugin = require('eslint-webpack-plugin');
 const pkg = require('./package.json');
 
-shell('rm -rf dist coverage');
+shell('rm -rf coverage');
 
 module.exports = env => {
   const merge = mergeWithRules({
@@ -39,7 +39,7 @@ module.exports = env => {
       path: path.resolve(__dirname, 'dist'),
       library: pkg.name,
       libraryTarget: 'umd',
-      globalObject: 'globalThis',
+      globalObject: 'this',
       clean: true,
     },
     module: {