@bbob/preset
Advanced tools
Comparing version 2.5.6 to 2.5.7
@@ -6,2 +6,13 @@ # Change Log | ||
## [2.5.7](https://github.com/JiLiZART/bbob/compare/v2.5.6...v2.5.7) (2020-07-05) | ||
### Bug Fixes | ||
* **html:** escape bad html ([#67](https://github.com/JiLiZART/bbob/issues/67)) ([87f38fe](https://github.com/JiLiZART/bbob/commit/87f38fe97ef7881be982b3d47c727cd280f1b057)) | ||
## [2.5.6](https://github.com/JiLiZART/bbob/compare/v2.5.5...v2.5.6) (2020-04-12) | ||
@@ -8,0 +19,0 @@ |
@@ -66,3 +66,3 @@ (function (global, factory) { | ||
exports.__esModule = true; | ||
exports.isEOL = exports.isStringNode = exports.isTagNode = exports.getUniqAttr = exports.getNodeLength = exports.appendToNode = exports.attrValue = exports.attrsToString = void 0; | ||
exports.isEOL = exports.isStringNode = exports.isTagNode = exports.getUniqAttr = exports.getNodeLength = exports.escapeHTML = exports.appendToNode = exports.attrValue = exports.attrsToString = void 0; | ||
@@ -122,4 +122,5 @@ | ||
var escapeQuote = function escapeQuote(value) { | ||
return value.replace(/"/g, '"'); | ||
var escapeHTML = function escapeHTML(value) { | ||
return value.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>').replace(/"/g, '"').replace(/'/g, ''') // eslint-disable-next-line no-script-url | ||
.replace('javascript:', 'javascript%3A'); | ||
}; | ||
@@ -134,2 +135,4 @@ /** | ||
exports.escapeHTML = escapeHTML; | ||
var attrValue = function attrValue(name, value) { | ||
@@ -145,6 +148,6 @@ var type = typeof value; | ||
string: function string() { | ||
return name + "=\"" + escapeQuote(value) + "\""; | ||
return name + "=\"" + escapeHTML(value) + "\""; | ||
}, | ||
object: function object() { | ||
return name + "=\"" + escapeQuote(JSON.stringify(value)) + "\""; | ||
return name + "=\"" + escapeHTML(JSON.stringify(value)) + "\""; | ||
} | ||
@@ -198,11 +201,12 @@ }; | ||
var es_5 = es.getNodeLength; | ||
var es_6 = es.appendToNode; | ||
var es_7 = es.attrValue; | ||
var es_8 = es.attrsToString; | ||
var es_6 = es.escapeHTML; | ||
var es_7 = es.appendToNode; | ||
var es_8 = es.attrValue; | ||
var es_9 = es.attrsToString; | ||
/* eslint-disable indent */ | ||
function process(tags, tree, core) { | ||
function process(tags, tree, core, options) { | ||
tree.walk(function (node) { | ||
return es_3(node) && tags[node.tag] ? tags[node.tag](node, core) : node; | ||
return es_3(node) && tags[node.tag] ? tags[node.tag](node, core, options) : node; | ||
}); | ||
@@ -223,5 +227,9 @@ } | ||
instance.options = Object.assign(instance.options || {}, opts); | ||
return function (tree, core) { | ||
return process(defTags, tree, core); | ||
var creator = function creator(tree, core) { | ||
return process(defTags, tree, core, instance.options); | ||
}; | ||
creator.options = instance.options; | ||
return creator; | ||
}; | ||
@@ -228,0 +236,0 @@ |
@@ -1,1 +0,1 @@ | ||
!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports):"function"==typeof define&&define.amd?define(["exports"],n):n((t=t||self).BbobPreset={})}(this,(function(t){"use strict";function n(t){return t&&t.__esModule&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t}function e(t,n){return t(n={exports:{}},n.exports),n.exports}var r=e((function(t,n){n.__esModule=!0,n.BACKSLASH=n.PLACEHOLDER_SPACE=n.PLACEHOLDER_SPACE_TAB=n.SLASH=n.CLOSE_BRAKET=n.OPEN_BRAKET=n.SPACE=n.QUOTEMARK=n.EQ=n.TAB=n.R=n.F=n.N=void 0;n.N="\n";n.TAB="\t";n.F="\f";n.R="\r";n.EQ="=";n.QUOTEMARK='"';n.SPACE=" ";n.OPEN_BRAKET="[";n.CLOSE_BRAKET="]";n.SLASH="/";n.BACKSLASH="\\";n.PLACEHOLDER_SPACE_TAB=" ";n.PLACEHOLDER_SPACE=" "}));n(r);var o=e((function(t,n){n.__esModule=!0,n.isEOL=n.isStringNode=n.isTagNode=n.getUniqAttr=n.getNodeLength=n.appendToNode=n.attrValue=n.attrsToString=void 0;var e=function(t){return"object"==typeof t&&!!t.tag};n.isTagNode=e;var o=function(t){return"string"==typeof t};n.isStringNode=o;n.isEOL=function(t){return t===r.N};n.getNodeLength=function t(n){return e(n)?n.content.reduce((function(n,e){return n+t(e)}),0):o(n)?n.length:0};n.appendToNode=function(t,n){t.content.push(n)};var u=function(t){return t.replace(/"/g,""")},i=function(t,n){var e=typeof n,r={boolean:function(){return n?""+t:""},number:function(){return t+'="'+n+'"'},string:function(){return t+'="'+u(n)+'"'},object:function(){return t+'="'+u(JSON.stringify(n))+'"'}};return r[e]?r[e]():""};n.attrValue=i;n.attrsToString=function(t){return void 0===t?"":Object.keys(t).reduce((function(n,e){return[].concat(n,[i(e,t[e])])}),[""]).join(" ")};n.getUniqAttr=function(t){return Object.keys(t).reduce((function(n,e){return t[e]===e?t[e]:null}),null)}}));n(o);var u=o.isTagNode;function i(t){var n=function n(e){return void 0===e&&(e={}),n.options=Object.assign(n.options||{},e),function(n,e){return function(t,n,e){n.walk((function(n){return u(n)&&t[n.tag]?t[n.tag](n,e):n}))}(t,n,e)}};return n.extend=function(e){return i(e(t,n.options))},n}t.createPreset=i,t.default=i,Object.defineProperty(t,"__esModule",{value:!0})})); | ||
!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e((t=t||self).BbobPreset={})}(this,(function(t){"use strict";function e(t){return t&&t.__esModule&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t}function n(t,e){return t(e={exports:{}},e.exports),e.exports}var r=n((function(t,e){e.__esModule=!0,e.BACKSLASH=e.PLACEHOLDER_SPACE=e.PLACEHOLDER_SPACE_TAB=e.SLASH=e.CLOSE_BRAKET=e.OPEN_BRAKET=e.SPACE=e.QUOTEMARK=e.EQ=e.TAB=e.R=e.F=e.N=void 0;e.N="\n";e.TAB="\t";e.F="\f";e.R="\r";e.EQ="=";e.QUOTEMARK='"';e.SPACE=" ";e.OPEN_BRAKET="[";e.CLOSE_BRAKET="]";e.SLASH="/";e.BACKSLASH="\\";e.PLACEHOLDER_SPACE_TAB=" ";e.PLACEHOLDER_SPACE=" "}));e(r);var o=n((function(t,e){e.__esModule=!0,e.isEOL=e.isStringNode=e.isTagNode=e.getUniqAttr=e.getNodeLength=e.escapeHTML=e.appendToNode=e.attrValue=e.attrsToString=void 0;var n=function(t){return"object"==typeof t&&!!t.tag};e.isTagNode=n;var o=function(t){return"string"==typeof t};e.isStringNode=o;e.isEOL=function(t){return t===r.N};e.getNodeLength=function t(e){return n(e)?e.content.reduce((function(e,n){return e+t(n)}),0):o(e)?e.length:0};e.appendToNode=function(t,e){t.content.push(e)};var u=function(t){return t.replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">").replace(/"/g,""").replace(/'/g,"'").replace("javascript:","javascript%3A")};e.escapeHTML=u;var i=function(t,e){var n=typeof e,r={boolean:function(){return e?""+t:""},number:function(){return t+'="'+e+'"'},string:function(){return t+'="'+u(e)+'"'},object:function(){return t+'="'+u(JSON.stringify(e))+'"'}};return r[n]?r[n]():""};e.attrValue=i;e.attrsToString=function(t){return void 0===t?"":Object.keys(t).reduce((function(e,n){return[].concat(e,[i(n,t[n])])}),[""]).join(" ")};e.getUniqAttr=function(t){return Object.keys(t).reduce((function(e,n){return t[n]===n?t[n]:null}),null)}}));e(o);var u=o.isTagNode;function i(t){var e=function e(n){void 0===n&&(n={}),e.options=Object.assign(e.options||{},n);var r=function(n,r){return function(t,e,n,r){e.walk((function(e){return u(e)&&t[e.tag]?t[e.tag](e,n,r):e}))}(t,n,r,e.options)};return r.options=e.options,r};return e.extend=function(n){return i(n(t,e.options))},e}t.createPreset=i,t.default=i,Object.defineProperty(t,"__esModule",{value:!0})})); |
@@ -10,4 +10,4 @@ "use strict"; | ||
/* eslint-disable indent */ | ||
function process(tags, tree, core) { | ||
tree.walk(node => (0, _pluginHelper.isTagNode)(node) && tags[node.tag] ? tags[node.tag](node, core) : node); | ||
function process(tags, tree, core, options) { | ||
tree.walk(node => (0, _pluginHelper.isTagNode)(node) && tags[node.tag] ? tags[node.tag](node, core, options) : node); | ||
} | ||
@@ -27,3 +27,7 @@ /** | ||
instance.options = Object.assign(instance.options || {}, opts); | ||
return (tree, core) => process(defTags, tree, core); | ||
var creator = (tree, core) => process(defTags, tree, core, instance.options); | ||
creator.options = instance.options; | ||
return creator; | ||
}; | ||
@@ -30,0 +34,0 @@ |
@@ -10,5 +10,5 @@ "use strict"; | ||
/* eslint-disable indent */ | ||
function process(tags, tree, core) { | ||
function process(tags, tree, core, options) { | ||
tree.walk(function (node) { | ||
return (0, _pluginHelper.isTagNode)(node) && tags[node.tag] ? tags[node.tag](node, core) : node; | ||
return (0, _pluginHelper.isTagNode)(node) && tags[node.tag] ? tags[node.tag](node, core, options) : node; | ||
}); | ||
@@ -29,5 +29,9 @@ } | ||
instance.options = Object.assign(instance.options || {}, opts); | ||
return function (tree, core) { | ||
return process(defTags, tree, core); | ||
var creator = function creator(tree, core) { | ||
return process(defTags, tree, core, instance.options); | ||
}; | ||
creator.options = instance.options; | ||
return creator; | ||
}; | ||
@@ -34,0 +38,0 @@ |
{ | ||
"name": "@bbob/preset", | ||
"version": "2.5.6", | ||
"version": "2.5.7", | ||
"description": "Base preset for creating extensible presets for @bbob/core", | ||
@@ -11,3 +11,3 @@ "keywords": [ | ||
"dependencies": { | ||
"@bbob/plugin-helper": "^2.5.6" | ||
"@bbob/plugin-helper": "^2.5.7" | ||
}, | ||
@@ -60,3 +60,3 @@ "main": "lib/index.js", | ||
], | ||
"gitHead": "5af63e4158f252f901b76ba54cfa7f1bbc246ec8" | ||
"gitHead": "fe6a16b6d9850bdfe3569649583c9957bf8ebe9c" | ||
} |
/* eslint-disable indent */ | ||
import { isTagNode } from '@bbob/plugin-helper'; | ||
function process(tags, tree, core) { | ||
function process(tags, tree, core, options) { | ||
tree.walk((node) => (isTagNode(node) && tags[node.tag] | ||
? tags[node.tag](node, core) | ||
? tags[node.tag](node, core, options) | ||
: node)); | ||
@@ -17,3 +17,8 @@ } | ||
instance.options = Object.assign(instance.options || {}, opts); | ||
return (tree, core) => process(defTags, tree, core); | ||
const creator = (tree, core) => process(defTags, tree, core, instance.options); | ||
creator.options = instance.options; | ||
return creator; | ||
}; | ||
@@ -20,0 +25,0 @@ |
17053
286
Updated@bbob/plugin-helper@^2.5.7