securemark 0.258.4 → 0.258.5

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.258.5
+
+- Refactoring.
+
 ## 0.258.4
 
 - Refactoring.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.258.4 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.258.5 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"));
@@ -2856,42 +2856,28 @@ function apply(parser, source, context, changes, values) {
 }
 
 function syntax(syntax, precedence, cost, parser) {
-  return (source, context) => {
+  return creation(cost, (source, context) => {
     if (source === '') return;
     const memo = context.memo ??= new memo_1.Memo();
     context.memorable ??= ~0;
     const p = context.precedence;
     context.precedence = precedence;
-    const {
-      resources = {
-        clock: 1,
-        recursion: 1
-      }
-    } = context;
-    if (resources.clock <= 0) throw new Error('Too many creations');
-    if (resources.recursion <= 0) throw new Error('Too much recursion');
-    --resources.recursion;
     const position = source.length;
     const state = context.state ?? 0;
     const cache = syntax && memo.get(position, syntax, state);
     const result = cache ? cache.length === 0 ? global_1.undefined : [cache[0], source.slice(cache[1])] : parser(source, context);
-    ++resources.recursion;
 
-    if (result && !cache) {
-      resources.clock -= cost;
+    if (syntax && state & context.memorable) {
+      cache ?? memo.set(position, syntax, state, (0, parser_1.eval)(result), source.length - (0, parser_1.exec)(result, '').length);
     }
 
-    if (syntax) {
-      if (state & context.memorable) {
-        cache ?? memo.set(position, syntax, state, (0, parser_1.eval)(result), source.length - (0, parser_1.exec)(result, '').length);
-      } else if (result && memo.length >= position) {
-        memo.clear(position);
-      }
+    if (result && !state && memo.length >= position) {
+      memo.clear(position);
     }
 
     context.precedence = p;
     return result;
-  };
+  });
 }
 
 exports.syntax = syntax;
@@ -3108,7 +3094,7 @@ class Memo {
 
     for (let i = position + this.offset, len = memory.length; i < len; ++i) {
       memory.pop();
-    } //console.log('clear', position);
+    } //console.log('clear', position + 1);
 
   }
 
@@ -8014,7 +8000,9 @@ exports.delimiter = /[\s\x00-\x7F]|\S[#>]|[（）、。！？][^\S\n]*(?=\\\n)/;
 exports.nonWhitespace = /[\S\n]|$/;
 exports.nonAlphanumeric = /[^0-9A-Za-z]|\S[#>]|$/;
 const repeat = (0, str_1.str)(/^(.)\1*/);
-exports.text = (0, combinator_1.creation)((source, context) => {
+exports.text = (0, combinator_1.syntax)(0
+/* Syntax.none */
+, 1, 1, (source, context) => {
   if (source === '') return;
   const i = source.search(exports.delimiter);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "securemark",
-  "version": "0.258.4",
+  "version": "0.258.5",
   "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

@@ -34,6 +34,6 @@ export class Memo {
     for (let i = position + this.offset, len = memory.length; i < len; ++i) {
       memory.pop();
     }
-    //console.log('clear', position);
+    //console.log('clear', position + 1);
   }
 }

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

@@ -58,16 +58,12 @@ function apply<T>(parser: Parser<T>, source: string, context: Ctx, changes: [str
 
 export function syntax<P extends Parser<unknown>>(syntax: number, precedence: number, cost: number, parser: P): P;
 export function syntax<T>(syntax: number, precedence: number, cost: number, parser?: Parser<T>): Parser<T> {
-  return (source, context) => {
+  return creation(cost, (source, context) => {
     if (source === '') return;
     const memo = context.memo ??= new Memo();
     context.memorable ??= ~0;
     const p = context.precedence;
     context.precedence = precedence;
-    const { resources = { clock: 1, recursion: 1 } } = context;
-    if (resources.clock <= 0) throw new Error('Too many creations');
-    if (resources.recursion <= 0) throw new Error('Too much recursion');
-    --resources.recursion;
     const position = source.length;
     const state = context.state ?? 0;
     const cache = syntax && memo.get(position, syntax, state);
@@ -76,23 +72,17 @@ export function syntax<T>(syntax: number, precedence: number, cost: number, pars
         ? undefined
         : [cache[0], source.slice(cache[1])]
       : parser!(source, context);
-    ++resources.recursion;
-    if (result && !cache) {
-      resources.clock -= cost;
+    if (syntax && state & context.memorable!) {
+      cache ?? memo.set(position, syntax, state, eval(result), source.length - exec(result, '').length);
+      assert.deepStrictEqual(cache && cache, cache && memo.get(position, syntax, state));
     }
-    if (syntax) {
-      if (state & context.memorable!) {
-        cache ?? memo.set(position, syntax, state, eval(result), source.length - exec(result, '').length);
-        assert.deepStrictEqual(cache && cache, cache && memo.get(position, syntax, state));
-      }
-      else if (result && memo.length! >= position) {
-        assert(!(state & context.memorable!));
-        memo.clear(position);
-      }
+    if (result && !state && memo.length! >= position) {
+      assert(!(state & context.memorable!));
+      memo.clear(position);
     }
     context.precedence = p;
     return result;
-  };
+  });
 }
 
 export function creation<P extends Parser<unknown>>(parser: P): P;

package/src/parser/source/text.ts

@@ -1,7 +1,8 @@
 import { undefined } from 'spica/global';
 import { TextParser, TxtParser, LinebreakParser } from '../source';
-import { union, creation, focus } from '../../combinator';
+import { union, syntax, focus } from '../../combinator';
 import { str } from './str';
+import { Syntax } from '../context';
 import { html } from 'typed-dom/dom';
 
 export const delimiter = /[\s\x00-\x7F]|\S[#>]|[（）、。！？][^\S\n]*(?=\\\n)/;
@@ -9,7 +10,7 @@ export const nonWhitespace = /[\S\n]|$/;
 export const nonAlphanumeric = /[^0-9A-Za-z]|\S[#>]|$/;
 const repeat = str(/^(.)\1*/);
 
-export const text: TextParser = creation((source, context) => {
+export const text: TextParser = syntax(Syntax.none, 1, 1, (source, context) => {
   if (source === '') return;
   const i = source.search(delimiter);
   switch (i) {