securemark 0.260.3 → 0.260.4

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.260.4
+
+- Refactoring.
+
 ## 0.260.3
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.260.3 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.260.4 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"));
@@ -3209,14 +3209,14 @@ class Memo {
   }
 
   get(position, syntax, state) {
-    //console.log('get', position + this.offset, syntax, state, this.memory[position + this.offset - 1]?.[`${syntax}:${state}`]);;
+    //console.log('get', position, syntax, state, this.memory[position - 1]?.[`${syntax}:${state}`]);;
     const cache = this.memory[position - 1]?.[`${syntax}:${state}`];
     return cache?.length === 2 ? [cache[0].slice(), cache[1]] : cache;
   }
 
   set(position, syntax, state, nodes, offset) {
     const record = this.memory[position - 1] ??= {};
-    record[`${syntax}:${state}`] = nodes ? [nodes.slice(), offset] : []; //console.log('set', position + this.offset, syntax, state, record[`${syntax}:${state}`]);
+    record[`${syntax}:${state}`] = nodes ? [nodes.slice(), offset] : []; //console.log('set', position, syntax, state, record[`${syntax}:${state}`]);
   }
 
   clear(position) {
@@ -3224,7 +3224,7 @@ class Memo {
 
     for (let i = position, len = memory.length; i < len; ++i) {
       memory.pop();
-    } //console.log('clear', position + this.offset + 1);
+    } //console.log('clear', position + 1);
 
   }
 
@@ -6707,8 +6707,8 @@ const array_1 = __webpack_require__(8112); // Don't use the symbols already used
 // All syntax surrounded by square brackets shouldn't contain line breaks.
 
 
-exports.placeholder = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['[:', '[^'], (0, combinator_1.surround)((0, source_1.str)(/^\[[:^]/), (0, combinator_1.syntax)(0
-/* Syntax.none */
+exports.placeholder = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(['[:', '[^'], (0, combinator_1.surround)((0, source_1.str)(/^\[[:^]/), (0, combinator_1.syntax)(512
+/* Syntax.placeholder */
 , 2, 1, 0
 /* State.none */
 , (0, visibility_1.startTight)((0, combinator_1.some)((0, combinator_1.union)([inline_1.inline]), ']', [[/^\\?\n/, 9], [']', 2]]))), (0, source_1.str)(']'), false, ([as, bs], rest) => [[(0, dom_1.html)('span', {
@@ -6958,7 +6958,7 @@ function parse(content, params, rest, context) {
   content = (0, dom_1.defrag)(content);
 
   for (let source = (0, util_1.stringify)(content); source;) {
-    if (/^[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*:\/\/[^/?#]/i.test(source)) return;
+    if (/^[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*:(?:\/{0,2}[^/?#\s]+|\/\/(?=[/]))/i.test(source)) return;
     const result = autolink({
       source,
       context
@@ -7044,12 +7044,12 @@ exports.resolve = resolve;
 
 function decode(uri) {
   if (!uri.includes('%')) return uri;
-  const origin = uri.match(/^[a-z](?:[-.](?=\w)|[0-9a-z])*:\/\/[^/?#]*/i)?.[0] ?? '';
+  const origin = uri.match(/^[a-z](?:[-.](?=\w)|[0-9a-z])*:(?:\/{0,2}[^/?#\s]+|\/\/(?=[/]))/i)?.[0] ?? '';
 
   try {
     let path = (0, global_1.decodeURI)(uri.slice(origin.length));
 
-    if (!origin && /^[a-z](?:[-.](?=\w)|[0-9a-z])*:\/\/[^/?#]/i.test(path)) {
+    if (!origin && /^[a-z](?:[-.](?=\w)|[0-9a-z])*:(?:\/{0,2}[^/?#\s]+|\/\/(?=[/]))/i.test(path)) {
       path = uri.slice(origin.length);
     }
 

package/package.json

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

package/src/combinator/data/parser/context/memo.ts

@@ -8,7 +8,7 @@ export class Memo {
     syntax: number,
     state: number,
   ): readonly [any[], number] | readonly [] | undefined {
-    //console.log('get', position + this.offset, syntax, state, this.memory[position + this.offset - 1]?.[`${syntax}:${state}`]);;
+    //console.log('get', position, syntax, state, this.memory[position - 1]?.[`${syntax}:${state}`]);;
     const cache = this.memory[position - 1]?.[`${syntax}:${state}`];
     return cache?.length === 2
       ? [cache[0].slice(), cache[1]]
@@ -26,13 +26,13 @@ export class Memo {
     record[`${syntax}:${state}`] = nodes
       ? [nodes.slice(), offset]
       : [];
-    //console.log('set', position + this.offset, syntax, state, record[`${syntax}:${state}`]);
+    //console.log('set', position, syntax, state, record[`${syntax}:${state}`]);
   }
   public clear(position: number): void {
     const memory = this.memory;
     for (let i = position, len = memory.length; i < len; ++i) {
       memory.pop();
     }
-    //console.log('clear', position + this.offset + 1);
+    //console.log('clear', position + 1);
   }
 }

package/src/parser/inline/extension/placeholder.ts

@@ -13,7 +13,7 @@ import { unshift } from 'spica/array';
 
 export const placeholder: ExtensionParser.PlaceholderParser = lazy(() => validate(['[:', '[^'], surround(
   str(/^\[[:^]/),
-  syntax(Syntax.none, 2, 1, State.none,
+  syntax(Syntax.placeholder, 2, 1, State.none,
   startTight(some(union([inline]), ']', [[/^\\?\n/, 9], [']', 2]]))),
   str(']'), false,
   ([as, bs], rest) => [[

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

@@ -29,6 +29,8 @@ describe('Unit: parser/inline/link', () => {
       assert.deepStrictEqual(inspect(parser('{http://a%C3%A1}')), [['<a class="url" href="http://a%C3%A1" target="_blank">http://a%C3%A1</a>'], '']);
       assert.deepStrictEqual(inspect(parser('[http://á]{http://evil}')), undefined);
       assert.deepStrictEqual(inspect(parser('[xxx://á]{http://evil}')), undefined);
+      assert.deepStrictEqual(inspect(parser('[mailto:á]{http://evil}')), undefined);
+      assert.deepStrictEqual(inspect(parser('[file:///]{http://evil}')), undefined);
       assert.deepStrictEqual(inspect(parser('[.http://á]{http://evil}')), undefined);
       assert.deepStrictEqual(inspect(parser('[0987654321]{tel:1234567890}')), undefined);
       assert.deepStrictEqual(inspect(parser('[1234567890-]{tel:1234567890}')), undefined);

package/src/parser/inline/link.ts

@@ -88,7 +88,7 @@ function parse(
   if (content.length !== 0 && trimNode(content).length === 0) return;
   content = defrag(content);
   for (let source = stringify(content); source;) {
-    if (/^[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*:\/\/[^/?#]/i.test(source)) return;
+    if (/^[a-z][0-9a-z]*(?:[-.][0-9a-z]+)*:(?:\/{0,2}[^/?#\s]+|\/\/(?=[/]))/i.test(source)) return;
     const result = autolink({ source, context });
     if (typeof eval(result, [])[0] === 'object') return;
     source = exec(result, '');
@@ -202,10 +202,10 @@ export function resolve(uri: string, host: URL | Location, source: URL | Locatio
 
 function decode(uri: string): string {
   if (!uri.includes('%')) return uri;
-  const origin = uri.match(/^[a-z](?:[-.](?=\w)|[0-9a-z])*:\/\/[^/?#]*/i)?.[0] ?? '';
+  const origin = uri.match(/^[a-z](?:[-.](?=\w)|[0-9a-z])*:(?:\/{0,2}[^/?#\s]+|\/\/(?=[/]))/i)?.[0] ?? '';
   try {
     let path = decodeURI(uri.slice(origin.length));
-    if (!origin && /^[a-z](?:[-.](?=\w)|[0-9a-z])*:\/\/[^/?#]/i.test(path)) {
+    if (!origin && /^[a-z](?:[-.](?=\w)|[0-9a-z])*:(?:\/{0,2}[^/?#\s]+|\/\/(?=[/]))/i.test(path)) {
       path = uri.slice(origin.length);
     }
     uri = origin + path;