securemark 0.280.3 → 0.280.4

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.280.4
+
+- Refactoring.
+
 ## 0.280.3
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.280.3 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.280.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("Prism"), require("DOMPurify"));
@@ -2814,6 +2814,7 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.convert = void 0;
 const parser_1 = __webpack_require__(6728);
+const alias_1 = __webpack_require__(5406);
 function convert(conv, parser, empty = false) {
   return ({
     source,
@@ -2822,13 +2823,14 @@ function convert(conv, parser, empty = false) {
     if (source === '') return;
     const src = conv(source, context);
     if (src === '') return empty ? [[], ''] : undefined;
+    const offset = (0, alias_1.max)(source.length - src.length, 0);
     context.offset ??= 0;
-    context.offset += source.length - src.length;
+    context.offset += offset;
     const result = parser({
       source: src,
       context
     });
-    context.offset -= source.length - src.length;
+    context.offset -= offset;
     return result;
   };
 }
@@ -2953,13 +2955,14 @@ function indent(opener, parser, separation = false) {
   return (0, bind_1.bind)((0, block_1.block)((0, match_1.match)(opener, (0, memoize_1.memoize)(([indent]) => (0, some_1.some)((0, line_1.line)((0, surround_1.open)(indent, ({
     source
   }) => [[source], '']))), ([indent]) => indent.length * 2 + +(indent[0] === ' '), {})), separation), (lines, rest, context) => {
+    const offset = rest.length;
     context.offset ??= 0;
-    context.offset += rest.length;
+    context.offset += offset;
     const result = parser({
       source: trimBlockEnd(lines.join('')),
       context
     });
-    context.offset -= rest.length;
+    context.offset -= offset;
     return result && (0, parser_1.exec)(result) === '' ? [(0, parser_1.eval)(result), rest] : undefined;
   });
 }
@@ -3080,13 +3083,14 @@ function focus(scope, parser) {
     if (source === '') return;
     const src = match(source);
     if (src === '') return;
+    const offset = source.length - src.length;
     context.offset ??= 0;
-    context.offset += source.length - src.length;
+    context.offset += offset;
     const result = parser({
       source: src,
       context
     });
-    context.offset -= source.length - src.length;
+    context.offset -= offset;
     if (result === undefined) return;
     return (0, parser_1.exec)(result).length < src.length ? [(0, parser_1.eval)(result), (0, parser_1.exec)(result) + source.slice(src.length)] : undefined;
   };
@@ -3107,13 +3111,14 @@ function rewrite(scope, parser) {
     context.memo = memo;
     if (res1 === undefined || (0, parser_1.exec)(res1).length >= source.length) return;
     const src = source.slice(0, source.length - (0, parser_1.exec)(res1).length);
+    const offset = source.length - src.length;
     context.offset ??= 0;
-    context.offset += source.length - src.length;
+    context.offset += offset;
     const res2 = parser({
       source: src,
       context
     });
-    context.offset -= source.length - src.length;
+    context.offset -= offset;
     if (res2 === undefined) return;
     return (0, parser_1.exec)(res2).length < src.length ? [(0, parser_1.eval)(res2), (0, parser_1.exec)(res2) + (0, parser_1.exec)(res1)] : undefined;
   };
@@ -3645,10 +3650,10 @@ class Memo {
 
   resize(position) {
     const memory = this.memory;
-    for (let len = memory.length, i = position; i < len; ++i) {
+    for (let i = memory.length; i > position; --i) {
       this.count -= +memory.pop();
     }
-    //console.log('resize', position);
+    //console.log('resize', position + 1);
   }
 
   clear() {
@@ -5874,7 +5879,7 @@ exports.autolink = (0, combinator_1.lazy)(() => (0, combinator_1.validate)(/^(?:
 // Escape unmatched hashtag-like strings.
 (0, source_1.str)(new RegExp(/^#+(?:[^\p{C}\p{S}\p{P}\s]|emoji|['_])*/u.source.replace('emoji', hashtag_1.emoji), 'u')),
 // Escape invalid leading characters.
-(0, source_1.str)(/^[0-9\p{Sc}](?=>)/u), anchor_1.anchor])), ns => ns.length === 1 ? ns : [(0, util_1.stringify)(ns)])])))));
+(0, source_1.str)(/^[0-9a-z](?=>)/iu), anchor_1.anchor])), ns => ns.length === 1 ? ns : [(0, util_1.stringify)(ns)])])))));
 
 /***/ }),
 

package/package.json

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

package/src/combinator/control/manipulation/convert.ts

@@ -1,5 +1,8 @@
 import { Parser, Ctx, Context, check } from '../../data/parser';
+import { max } from 'spica/alias';
 
+// 設計上キャッシュが汚染されるが運用で回避可能
+// 変換の前または後のみキャッシュされるなら問題ない
 export function convert<P extends Parser<unknown>>(conv: (source: string, context: Context<P>) => string, parser: P, empty?: boolean): P;
 export function convert<T>(conv: (source: string, context: Ctx) => string, parser: Parser<T>, empty = false): Parser<T> {
   assert(parser);
@@ -7,11 +10,13 @@ export function convert<T>(conv: (source: string, context: Ctx) => string, parse
     if (source === '') return;
     const src = conv(source, context);
     if (src === '') return empty ? [[], ''] : undefined;
+    const offset = max(source.length - src.length, 0);
+    assert(offset >= 0);
     context.offset ??= 0;
-    context.offset += source.length - src.length;
+    context.offset += offset;
     const result = parser({ source: src, context });
     assert(check(src, result));
-    context.offset -= source.length - src.length;
+    context.offset -= offset;
     return result;
   };
 }

package/src/combinator/control/manipulation/indent.ts

@@ -20,10 +20,12 @@ export function indent<T>(opener: RegExp | Parser<T>, parser?: Parser<T> | boole
     ([indent]) => indent.length * 2 + +(indent[0] === ' '), {})), separation),
     (lines, rest, context) => {
       assert(parser = parser as Parser<T>);
+      const offset = rest.length;
+      assert(offset >= 0);
       context.offset ??= 0;
-      context.offset += rest.length;
+      context.offset += offset;
       const result = parser({ source: trimBlockEnd(lines.join('')), context });
-      context.offset -= rest.length;
+      context.offset -= offset;
       return result && exec(result) === ''
         ? [eval(result), rest]
         : undefined;

package/src/combinator/control/manipulation/scope.ts

@@ -12,11 +12,13 @@ export function focus<T>(scope: string | RegExp, parser: Parser<T>): Parser<T> {
     const src = match(source);
     assert(source.startsWith(src));
     if (src === '') return;
+    const offset = source.length - src.length;
+    assert(offset >= 0);
     context.offset ??= 0;
-    context.offset += source.length - src.length;
+    context.offset += offset;
     const result = parser({ source: src, context });
     assert(check(src, result));
-    context.offset -= source.length - src.length;
+    context.offset -= offset;
     if (result === undefined) return;
     assert(exec(result).length < src.length);
     return exec(result).length < src.length
@@ -41,11 +43,13 @@ export function rewrite<T>(scope: Parser<unknown>, parser: Parser<T>): Parser<T>
     const src = source.slice(0, source.length - exec(res1).length);
     assert(src !== '');
     assert(source.startsWith(src));
+    const offset = source.length - src.length;
+    assert(offset >= 0);
     context.offset ??= 0;
-    context.offset += source.length - src.length;
+    context.offset += offset;
     const res2 = parser({ source: src, context });
     assert(check(src, res2));
-    context.offset -= source.length - src.length;
+    context.offset -= offset;
     if (res2 === undefined) return;
     assert(exec(res2) === '');
     return exec(res2).length < src.length

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

@@ -38,10 +38,10 @@ export class Memo {
   }
   public resize(position: number): void {
     const memory = this.memory;
-    for (let len = memory.length, i = position; i < len; ++i) {
+    for (let i = memory.length; i > position; --i) {
       this.count -= +memory.pop()!;
     }
-    //console.log('resize', position);
+    //console.log('resize', position + 1);
   }
   public clear(): void {
     this.memory = [];

package/src/parser/inline/autolink.ts

@@ -33,7 +33,7 @@ export const autolink: AutolinkParser = lazy(() =>
       // Escape unmatched hashtag-like strings.
       str(new RegExp(/^#+(?:[^\p{C}\p{S}\p{P}\s]|emoji|['_])*/u.source.replace('emoji', emoji), 'u')),
       // Escape invalid leading characters.
-      str(/^[0-9\p{Sc}](?=>)/u),
+      str(/^[0-9a-z](?=>)/iu),
       anchor,
     ])),
     ns => ns.length === 1 ? ns : [stringify(ns)]),