securemark 0.255.0 → 0.255.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.255.1
+
+- Refactoring.
+
 ## 0.255.0
 
 - Change html parser not to use backtracking.

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! securemark v0.255.0 https://github.com/falsandtru/securemark | (c) 2017, falsandtru | UNLICENSED License */
+/*! securemark v0.255.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"));
@@ -2127,14 +2127,12 @@ function guard(f, parser) {
 exports.guard = guard;
 
 function reset(base, parser) {
-  if (isEmpty(base)) return parser;
   return (source, context) => parser(source, inherit((0, alias_1.ObjectCreate)(context), base));
 }
 
 exports.reset = reset;
 
 function context(base, parser) {
-  if (isEmpty(base)) return parser;
   const override = (0, memoize_1.memoize)(context => inherit((0, alias_1.ObjectCreate)(context), base), new global_1.WeakMap());
   return (source, context) => parser(source, override(context));
 }
@@ -2166,12 +2164,6 @@ const inherit = (0, assign_1.template)((prop, target, source) => {
   }
 });
 
-function isEmpty(context) {
-  for (const _ in context) return false;
-
-  return true;
-}
-
 /***/ }),
 
 /***/ 7957:
@@ -3550,12 +3542,13 @@ function parse(source, opts = {}, context) {
   const url = (0, header_2.headers)(source).find(field => field.toLowerCase().startsWith('url:'))?.slice(4).trim() ?? '';
   source = !context ? (0, normalize_1.normalize)(source) : source;
   context = {
-    url: url ? new url_1.ReadonlyURL(url) : context?.url,
     host: opts.host ?? context?.host ?? new url_1.ReadonlyURL(global_1.location.pathname, global_1.location.origin),
+    url: url ? new url_1.ReadonlyURL(url) : context?.url,
+    id: opts.id ?? context?.id,
     caches: context?.caches,
-    footnotes: global_1.undefined,
-    test: global_1.undefined,
-    ...opts
+    ...(context?.resources && {
+      resources: context.resources
+    })
   };
   if (context.host?.origin === 'null') throw new Error(`Invalid host: ${context.host.href}`);
   const node = (0, dom_1.frag)();
@@ -3888,7 +3881,7 @@ const parse_1 = __webpack_require__(5013);
 
 const dom_1 = __webpack_require__(3252);
 
-exports.aside = (0, combinator_1.creator)(100, (0, combinator_1.block)((0, combinator_1.validate)('~~~', (0, combinator_1.fmap)((0, combinator_1.fence)(/^(~{3,})aside(?!\S)([^\n]*)(?:$|\n)/, 300), // Bug: Type mismatch between outer and inner.
+exports.aside = (0, combinator_1.block)((0, combinator_1.validate)('~~~', (0, combinator_1.fmap)((0, combinator_1.fence)(/^(~{3,})aside(?!\S)([^\n]*)(?:$|\n)/, 300), // Bug: Type mismatch between outer and inner.
 ([body, overflow, closer, opener, delim, param], _, context) => {
   if (!closer || overflow || param.trimStart()) return [(0, dom_1.html)('pre', {
     class: 'invalid',
@@ -3920,7 +3913,7 @@ exports.aside = (0, combinator_1.creator)(100, (0, combinator_1.block)((0, combi
     id: (0, indexee_1.identity)((0, indexee_1.text)(heading)),
     class: 'aside'
   }, [document, references])];
-}))));
+})));
 
 /***/ }),
 
@@ -3946,7 +3939,7 @@ const mathblock_1 = __webpack_require__(3754);
 const dom_1 = __webpack_require__(3252);
 
 const opener = /^(~{3,})(?:example\/(\S+))?(?!\S)([^\n]*)(?:$|\n)/;
-exports.example = (0, combinator_1.creator)(100, (0, combinator_1.block)((0, combinator_1.validate)('~~~', (0, combinator_1.fmap)((0, combinator_1.fence)(opener, 300), // Bug: Type mismatch between outer and inner.
+exports.example = (0, combinator_1.block)((0, combinator_1.validate)('~~~', (0, combinator_1.fmap)((0, combinator_1.fence)(opener, 300), // Bug: Type mismatch between outer and inner.
 ([body, overflow, closer, opener, delim, type = 'markdown', param], _, context) => {
   if (!closer || overflow || param.trimStart()) return [(0, dom_1.html)('pre', {
     class: 'invalid',
@@ -3993,7 +3986,7 @@ exports.example = (0, combinator_1.creator)(100, (0, combinator_1.block)((0, com
         'data-invalid-message': 'Invalid example type'
       }, `${opener}${body}${closer}`)];
   }
-}))));
+})));
 
 /***/ }),
 

package/package.json

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

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

@@ -17,7 +17,6 @@ export function reset<P extends Parser<unknown>>(context: Context<P>, parser: P)
 export function reset<T>(base: Ctx, parser: Parser<T>): Parser<T> {
   assert(Object.getPrototypeOf(base) === Object.prototype);
   assert(Object.freeze(base));
-  if (isEmpty(base)) return parser;
   return (source, context) =>
     parser(source, inherit(ObjectCreate(context), base));
 }
@@ -26,7 +25,6 @@ export function context<P extends Parser<unknown>>(context: Context<P>, parser:
 export function context<T>(base: Ctx, parser: Parser<T>): Parser<T> {
   assert(Object.getPrototypeOf(base) === Object.prototype);
   assert(Object.freeze(base));
-  if (isEmpty(base)) return parser;
   const override = memoize<Ctx, Ctx>(context => inherit(ObjectCreate(context), base), new WeakMap());
   return (source, context) =>
     parser(source, override(context));
@@ -40,6 +38,7 @@ const inherit = template((prop, target, source) => {
   switch (prop) {
     case 'resources':
       assert(typeof source[prop] === 'object');
+      assert(target[prop] || !(prop in target));
       if (prop in target && !hasOwnProperty(target, prop)) return;
       return target[prop] = ObjectCreate(source[prop]);
   }
@@ -58,8 +57,3 @@ const inherit = template((prop, target, source) => {
       return target[prop] = source[prop];
   }
 });
-
-function isEmpty(context: Ctx): boolean {
-  for (const _ in context) return false;
-  return true;
-}

package/src/parser/api/parse.ts

@@ -1,4 +1,4 @@
-import { undefined, location } from 'spica/global';
+import { location } from 'spica/global';
 import { ParserOptions } from '../../..';
 import { MarkdownParser } from '../../../markdown';
 import { eval } from '../../combinator/data/parser';
@@ -22,12 +22,13 @@ export function parse(source: string, opts: Options = {}, context?: MarkdownPars
   source = !context ? normalize(source) : source;
   assert(!context?.delimiters);
   context = {
-    url: url ? new ReadonlyURL(url as ':') : context?.url,
     host: opts.host ?? context?.host ?? new ReadonlyURL(location.pathname, location.origin),
+    url: url ? new ReadonlyURL(url as ':') : context?.url,
+    id: opts.id ?? context?.id,
     caches: context?.caches,
-    footnotes: undefined,
-    test: undefined,
-    ...opts,
+    ...context?.resources && {
+      resources: context.resources,
+    },
   };
   if (context.host?.origin === 'null') throw new Error(`Invalid host: ${context.host.href}`);
   const node = frag();

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

@@ -1,10 +1,10 @@
 import { ExtensionParser } from '../../block';
-import { block, validate, fence, creator, fmap } from '../../../combinator';
+import { block, validate, fence, fmap } from '../../../combinator';
 import { identity, text } from '../../inline/extension/indexee';
 import { parse } from '../../api/parse';
 import { html } from 'typed-dom/dom';
 
-export const aside: ExtensionParser.AsideParser = creator(100, block(validate('~~~', fmap(
+export const aside: ExtensionParser.AsideParser = block(validate('~~~', fmap(
   fence(/^(~{3,})aside(?!\S)([^\n]*)(?:$|\n)/, 300),
   // Bug: Type mismatch between outer and inner.
   ([body, overflow, closer, opener, delim, param]: string[], _, context) => {
@@ -43,4 +43,4 @@ export const aside: ExtensionParser.AsideParser = creator(100, block(validate('~
         references,
       ]),
     ];
-  }))));
+  })));

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

@@ -1,13 +1,13 @@
 import { ExtensionParser } from '../../block';
 import { eval } from '../../../combinator/data/parser';
-import { block, validate, fence, creator, fmap } from '../../../combinator';
+import { block, validate, fence, fmap } from '../../../combinator';
 import { parse } from '../../api/parse';
 import { mathblock } from '../mathblock';
 import { html } from 'typed-dom/dom';
 
 const opener = /^(~{3,})(?:example\/(\S+))?(?!\S)([^\n]*)(?:$|\n)/;
 
-export const example: ExtensionParser.ExampleParser = creator(100, block(validate('~~~', fmap(
+export const example: ExtensionParser.ExampleParser = block(validate('~~~', fmap(
   fence(opener, 300),
   // Bug: Type mismatch between outer and inner.
   ([body, overflow, closer, opener, delim, type = 'markdown', param]: string[], _, context) => {
@@ -58,4 +58,4 @@ export const example: ExtensionParser.ExampleParser = creator(100, block(validat
           }, `${opener}${body}${closer}`),
         ];
     }
-  }))));
+  })));