Removed some log statements

This commit is contained in:
Knut Sveidqvist 2021-08-05 19:53:11 +02:00
parent b29979bfd9
commit b6648283c2
8 changed files with 197 additions and 49 deletions

111
dist/mermaid.core.js vendored
View File

@ -656,7 +656,7 @@ module.exports = function(module) {
/*! exports provided: name, version, description, main, keywords, scripts, repository, author, license, standard, dependencies, devDependencies, files, yarn-upgrade-all, sideEffects, husky, default */
/***/ (function(module) {
module.exports = JSON.parse("{\"name\":\"mermaid\",\"version\":\"8.11.3\",\"description\":\"Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.\",\"main\":\"dist/mermaid.core.js\",\"keywords\":[\"diagram\",\"markdown\",\"flowchart\",\"sequence diagram\",\"gantt\",\"class diagram\",\"git graph\"],\"scripts\":{\"build:development\":\"webpack --progress --colors\",\"build:production\":\"yarn build:development -p --config webpack.config.prod.babel.js\",\"build\":\"yarn build:development && yarn build:production\",\"postbuild\":\"documentation build src/mermaidAPI.js src/config.js src/defaultConfig.js --shallow -f md --markdown-toc false > docs/Setup.md\",\"build:watch\":\"yarn build --watch\",\"release\":\"yarn build\",\"lint\":\"eslint src\",\"e2e:depr\":\"yarn lint && jest e2e --config e2e/jest.config.js\",\"cypress\":\"percy exec -- cypress run\",\"e2e\":\"start-server-and-test dev http://localhost:9000/ cypress\",\"e2e-upd\":\"yarn lint && jest e2e -u --config e2e/jest.config.js\",\"dev\":\"webpack-dev-server --config webpack.config.e2e.js\",\"test\":\"yarn lint && jest src/.*\",\"test:watch\":\"jest --watch src\",\"prepublishOnly\":\"yarn build && yarn test\",\"prepare\":\"yarn build\"},\"repository\":{\"type\":\"git\",\"url\":\"https://github.com/knsv/mermaid\"},\"author\":\"Knut Sveidqvist\",\"license\":\"MIT\",\"standard\":{\"ignore\":[\"**/parser/*.js\",\"dist/**/*.js\",\"cypress/**/*.js\"],\"globals\":[\"page\"]},\"dependencies\":{\"@braintree/sanitize-url\":\"^3.1.0\",\"@percy/migrate\":\"^0.10.0\",\"d3\":\"^5.7.0\",\"dagre\":\"^0.8.5\",\"dagre-d3\":\"^0.6.4\",\"dompurify\":\"2.3.0\",\"graphlib\":\"^2.1.8\",\"khroma\":\"^1.4.1\",\"moment-mini\":\"^2.24.0\",\"stylis\":\"^4.0.10\"},\"devDependencies\":{\"@babel/core\":\"^7.14.6\",\"@babel/preset-env\":\"^7.14.7\",\"@babel/register\":\"^7.14.5\",\"@percy/cli\":\"^1.0.0-beta.58\",\"@percy/cypress\":\"^3.1.0\",\"babel-core\":\"7.0.0-bridge.0\",\"babel-eslint\":\"^10.1.0\",\"babel-jest\":\"^27.0.6\",\"babel-loader\":\"^8.2.2\",\"coveralls\":\"^3.0.2\",\"css-to-string-loader\":\"^0.1.3\",\"cypress\":\"7.6.0\",\"documentation\":\"13.2.0\",\"eslint\":\"^7.30.0\",\"eslint-config-prettier\":\"^8.3.0\",\"eslint-plugin-prettier\":\"^3.4.0\",\"husky\":\"^7.0.1\",\"identity-obj-proxy\":\"^3.0.0\",\"jest\":\"^27.0.6\",\"jison\":\"^0.4.18\",\"js-base64\":\"3.6.1\",\"moment\":\"^2.23.0\",\"prettier\":\"^2.3.2\",\"start-server-and-test\":\"^1.12.6\",\"terser-webpack-plugin\":\"^2.2.2\",\"webpack\":\"^4.41.2\",\"webpack-bundle-analyzer\":\"^4.4.2\",\"webpack-cli\":\"^3.1.2\",\"webpack-dev-server\":\"^3.4.1\",\"webpack-node-externals\":\"^1.7.2\"},\"files\":[\"dist\"],\"yarn-upgrade-all\":{\"ignore\":[\"babel-core\"]},\"sideEffects\":[\"**/*.css\",\"**/*.scss\"],\"husky\":{\"hooks\":{\"pre-push\":\"yarn test\"}}}");
module.exports = JSON.parse("{\"name\":\"mermaid\",\"version\":\"8.11.4\",\"description\":\"Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.\",\"main\":\"dist/mermaid.core.js\",\"keywords\":[\"diagram\",\"markdown\",\"flowchart\",\"sequence diagram\",\"gantt\",\"class diagram\",\"git graph\"],\"scripts\":{\"build:development\":\"webpack --progress --colors\",\"build:production\":\"yarn build:development -p --config webpack.config.prod.babel.js\",\"build\":\"yarn build:development && yarn build:production\",\"postbuild\":\"documentation build src/mermaidAPI.js src/config.js src/defaultConfig.js --shallow -f md --markdown-toc false > docs/Setup.md\",\"build:watch\":\"yarn build --watch\",\"release\":\"yarn build\",\"lint\":\"eslint src\",\"e2e:depr\":\"yarn lint && jest e2e --config e2e/jest.config.js\",\"cypress\":\"percy exec -- cypress run\",\"e2e\":\"start-server-and-test dev http://localhost:9000/ cypress\",\"e2e-upd\":\"yarn lint && jest e2e -u --config e2e/jest.config.js\",\"dev\":\"webpack-dev-server --config webpack.config.e2e.js\",\"test\":\"yarn lint && jest src/.*\",\"test:watch\":\"jest --watch src\",\"prepublishOnly\":\"yarn build && yarn test\",\"prepare\":\"yarn build\"},\"repository\":{\"type\":\"git\",\"url\":\"https://github.com/knsv/mermaid\"},\"author\":\"Knut Sveidqvist\",\"license\":\"MIT\",\"standard\":{\"ignore\":[\"**/parser/*.js\",\"dist/**/*.js\",\"cypress/**/*.js\"],\"globals\":[\"page\"]},\"dependencies\":{\"@braintree/sanitize-url\":\"^3.1.0\",\"@percy/migrate\":\"^0.10.0\",\"d3\":\"^5.7.0\",\"dagre\":\"^0.8.5\",\"dagre-d3\":\"^0.6.4\",\"dompurify\":\"2.3.0\",\"graphlib\":\"^2.1.8\",\"khroma\":\"^1.4.1\",\"moment-mini\":\"^2.24.0\",\"stylis\":\"^4.0.10\"},\"devDependencies\":{\"@babel/core\":\"^7.14.6\",\"@babel/preset-env\":\"^7.14.7\",\"@babel/register\":\"^7.14.5\",\"@percy/cli\":\"^1.0.0-beta.58\",\"@percy/cypress\":\"^3.1.0\",\"babel-core\":\"7.0.0-bridge.0\",\"babel-eslint\":\"^10.1.0\",\"babel-jest\":\"^27.0.6\",\"babel-loader\":\"^8.2.2\",\"coveralls\":\"^3.0.2\",\"css-to-string-loader\":\"^0.1.3\",\"cypress\":\"7.6.0\",\"documentation\":\"13.2.0\",\"eslint\":\"^7.30.0\",\"eslint-config-prettier\":\"^8.3.0\",\"eslint-plugin-prettier\":\"^3.4.0\",\"husky\":\"^7.0.1\",\"identity-obj-proxy\":\"^3.0.0\",\"jest\":\"^27.0.6\",\"jison\":\"^0.4.18\",\"js-base64\":\"3.6.1\",\"moment\":\"^2.23.0\",\"prettier\":\"^2.3.2\",\"start-server-and-test\":\"^1.12.6\",\"terser-webpack-plugin\":\"^2.2.2\",\"webpack\":\"^4.41.2\",\"webpack-bundle-analyzer\":\"^4.4.2\",\"webpack-cli\":\"^3.1.2\",\"webpack-dev-server\":\"^3.4.1\",\"webpack-node-externals\":\"^1.7.2\"},\"files\":[\"dist\"],\"yarn-upgrade-all\":{\"ignore\":[\"babel-core\"]},\"sideEffects\":[\"**/*.css\",\"**/*.scss\"],\"husky\":{\"hooks\":{\"pre-push\":\"yarn test\"}}}");
/***/ }),
@ -3841,12 +3841,27 @@ function insertPolygonShape(parent, w, h, points) {
/*!******************************!*\
!*** ./src/defaultConfig.js ***!
\******************************/
/*! exports provided: default */
/*! exports provided: configKeys, default */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "configKeys", function() { return configKeys; });
/* harmony import */ var _themes__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./themes */ "./src/themes/index.js");
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
/**
* **Configuration methods in Mermaid version 8.6.0 have been updated, to learn more[[click here](8.6.0_docs.md)].**
@ -4987,6 +5002,21 @@ var config = {
};
config.class.arrowMarkerAbsolute = config.arrowMarkerAbsolute;
config.git.arrowMarkerAbsolute = config.arrowMarkerAbsolute;
var keyify = function keyify(obj) {
var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
return Object.keys(obj).reduce(function (res, el) {
if (Array.isArray(obj[el])) {
return res;
} else if (_typeof(obj[el]) === 'object' && obj[el] !== null) {
return [].concat(_toConsumableArray(res), [prefix + el], _toConsumableArray(keyify(obj[el], '')));
}
return [].concat(_toConsumableArray(res), [prefix + el]);
}, []);
};
var configKeys = keyify(config, '');
/* harmony default export */ __webpack_exports__["default"] = (config);
/***/ }),
@ -25659,6 +25689,9 @@ var handleDirective = function handleDirective(p, directive, type) {
delete directive.args[prop];
}
});
console.log('sanitize in handleDirective', directive.args);
Object(_utils__WEBPACK_IMPORTED_MODULE_44__["directiveSanitizer"])(directive.args);
console.log('sanitize in handleDirective (done)', directive.args);
reinitialize(directive.args);
_config__WEBPACK_IMPORTED_MODULE_3__["addDirective"](directive.args);
break;
@ -27327,7 +27360,7 @@ var getThemeVariables = function getThemeVariables(userOverrides) {
/*!**********************!*\
!*** ./src/utils.js ***!
\**********************/
/*! exports provided: detectInit, detectDirective, detectType, isSubstringInArray, interpolateToCurve, formatUrl, runFunc, getStylesFromArray, generateId, random, assignWithDepth, getTextObj, drawSimpleText, wrapLabel, calculateTextHeight, calculateTextWidth, calculateTextDimensions, calculateSvgSizeAttrs, configureSvgSize, initIdGeneratior, entityDecode, default */
/*! exports provided: detectInit, detectDirective, detectType, isSubstringInArray, interpolateToCurve, formatUrl, runFunc, getStylesFromArray, generateId, random, assignWithDepth, getTextObj, drawSimpleText, wrapLabel, calculateTextHeight, calculateTextWidth, calculateTextDimensions, calculateSvgSizeAttrs, configureSvgSize, initIdGeneratior, entityDecode, directiveSanitizer, default */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@ -27353,12 +27386,14 @@ __webpack_require__.r(__webpack_exports__);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "configureSvgSize", function() { return configureSvgSize; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "initIdGeneratior", function() { return initIdGeneratior; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "entityDecode", function() { return entityDecode; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "directiveSanitizer", function() { return directiveSanitizer; });
/* harmony import */ var _braintree_sanitize_url__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @braintree/sanitize-url */ "@braintree/sanitize-url");
/* harmony import */ var _braintree_sanitize_url__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_braintree_sanitize_url__WEBPACK_IMPORTED_MODULE_0__);
/* harmony import */ var d3__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! d3 */ "d3");
/* harmony import */ var d3__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(d3__WEBPACK_IMPORTED_MODULE_1__);
/* harmony import */ var _diagrams_common_common__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./diagrams/common/common */ "./src/diagrams/common/common.js");
/* harmony import */ var _logger__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./logger */ "./src/logger.js");
/* harmony import */ var _defaultConfig__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./defaultConfig */ "./src/defaultConfig.js");
/* harmony import */ var _logger__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./logger */ "./src/logger.js");
var _this = undefined;
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@ -27386,6 +27421,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
// Effectively an enum of the supported curve types, accessible by name
var d3CurveTypes = {
@ -27443,15 +27479,10 @@ var detectInit = function detectInit(text, cnf) {
var args = inits.map(function (init) {
return init.args;
});
Object.keys(args).forEach(function (argKey) {
Object.keys(args[argKey]).forEach(function (key) {
if (key.indexOf('__') === 0) {
_logger__WEBPACK_IMPORTED_MODULE_3__["log"].debug('sanitize deleting prototype option', args[key]);
delete args[argKey][key];
}
});
});
console.log('sanitizer (args)', args);
directiveSanitizer(args);
results = assignWithDepth(results, _toConsumableArray(args));
console.log('sanitize results', results);
} else {
results = inits.args;
}
@ -27468,7 +27499,8 @@ var detectInit = function detectInit(text, cnf) {
delete results[prop];
}
});
}
} // Todo: refactor this, these results are never used
return results;
};
@ -27500,7 +27532,7 @@ var detectDirective = function detectDirective(text) {
try {
var commentWithoutDirectives = new RegExp("[%]{2}(?![{]".concat(directiveWithoutOpen.source, ")(?=[}][%]{2}).*\n"), 'ig');
text = text.trim().replace(commentWithoutDirectives, '').replace(/'/gm, '"');
_logger__WEBPACK_IMPORTED_MODULE_3__["log"].debug("Detecting diagram directive".concat(type !== null ? ' type:' + type : '', " based on the text:").concat(text));
_logger__WEBPACK_IMPORTED_MODULE_4__["log"].debug("Detecting diagram directive".concat(type !== null ? ' type:' + type : '', " based on the text:").concat(text));
var match,
result = [];
@ -27530,7 +27562,7 @@ var detectDirective = function detectDirective(text) {
return result.length === 1 ? result[0] : result;
} catch (error) {
_logger__WEBPACK_IMPORTED_MODULE_3__["log"].error("ERROR: ".concat(error.message, " - Unable to parse directive\n ").concat(type !== null ? ' type:' + type : '', " based on the text:").concat(text));
_logger__WEBPACK_IMPORTED_MODULE_4__["log"].error("ERROR: ".concat(error.message, " - Unable to parse directive\n ").concat(type !== null ? ' type:' + type : '', " based on the text:").concat(text));
return {
type: null,
args: null
@ -27744,7 +27776,7 @@ var calcCardinalityPosition = function calcCardinalityPosition(isRelationTypePre
var prevPoint;
var totalDistance = 0; // eslint-disable-line
_logger__WEBPACK_IMPORTED_MODULE_3__["log"].info('our points', points);
_logger__WEBPACK_IMPORTED_MODULE_4__["log"].info('our points', points);
if (points[0] !== initialPosition) {
points = points.reverse();
@ -27810,7 +27842,7 @@ var calcTerminalLabelPosition = function calcTerminalLabelPosition(terminalMarke
var prevPoint;
var totalDistance = 0; // eslint-disable-line
_logger__WEBPACK_IMPORTED_MODULE_3__["log"].info('our points', points);
_logger__WEBPACK_IMPORTED_MODULE_4__["log"].info('our points', points);
if (position !== 'start_left' && position !== 'start_right') {
points = points.reverse();
@ -28305,6 +28337,48 @@ var entityDecode = function entityDecode(html) {
decoder.innerHTML = html;
return unescape(decoder.textContent);
};
var directiveSanitizer = function directiveSanitizer(args) {
console.log('directiveSanitizer called with', args);
if (_typeof(args) === 'object') {
// check for array
if (args.length) {
args.forEach(function (arg) {
return directiveSanitizer(arg);
});
} else {
// This is an object
Object.keys(args).forEach(function (key) {
_logger__WEBPACK_IMPORTED_MODULE_4__["log"].debug('Checking key', key);
if (key.indexOf('__') === 0) {
_logger__WEBPACK_IMPORTED_MODULE_4__["log"].debug('sanitize deleting __ option', key);
delete args[key];
}
if (key.indexOf('proto') >= 0) {
_logger__WEBPACK_IMPORTED_MODULE_4__["log"].debug('sanitize deleting proto option', key);
delete args[key];
}
if (key.indexOf('constr') >= 0) {
_logger__WEBPACK_IMPORTED_MODULE_4__["log"].debug('sanitize deleting constr option', key);
delete args[key];
}
if (_defaultConfig__WEBPACK_IMPORTED_MODULE_3__["configKeys"].indexOf(key) < 0) {
_logger__WEBPACK_IMPORTED_MODULE_4__["log"].debug('sanitize deleting option', key);
delete args[key];
} else {
if (_typeof(args[key]) === 'object') {
_logger__WEBPACK_IMPORTED_MODULE_4__["log"].debug('sanitize deleting object', key);
directiveSanitizer(args[key]);
}
}
});
}
}
};
/* harmony default export */ __webpack_exports__["default"] = ({
assignWithDepth: assignWithDepth,
wrapLabel: wrapLabel,
@ -28328,7 +28402,8 @@ var entityDecode = function entityDecode(html) {
memoize: memoize,
runFunc: runFunc,
entityDecode: entityDecode,
initIdGeneratior: initIdGeneratior
initIdGeneratior: initIdGeneratior,
directiveSanitizer: directiveSanitizer
});
/***/ }),

File diff suppressed because one or more lines are too long

111
dist/mermaid.js vendored
View File

@ -49068,7 +49068,7 @@ module.exports = function(module) {
/*! exports provided: name, version, description, main, keywords, scripts, repository, author, license, standard, dependencies, devDependencies, files, yarn-upgrade-all, sideEffects, husky, default */
/***/ (function(module) {
module.exports = JSON.parse("{\"name\":\"mermaid\",\"version\":\"8.11.3\",\"description\":\"Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.\",\"main\":\"dist/mermaid.core.js\",\"keywords\":[\"diagram\",\"markdown\",\"flowchart\",\"sequence diagram\",\"gantt\",\"class diagram\",\"git graph\"],\"scripts\":{\"build:development\":\"webpack --progress --colors\",\"build:production\":\"yarn build:development -p --config webpack.config.prod.babel.js\",\"build\":\"yarn build:development && yarn build:production\",\"postbuild\":\"documentation build src/mermaidAPI.js src/config.js src/defaultConfig.js --shallow -f md --markdown-toc false > docs/Setup.md\",\"build:watch\":\"yarn build --watch\",\"release\":\"yarn build\",\"lint\":\"eslint src\",\"e2e:depr\":\"yarn lint && jest e2e --config e2e/jest.config.js\",\"cypress\":\"percy exec -- cypress run\",\"e2e\":\"start-server-and-test dev http://localhost:9000/ cypress\",\"e2e-upd\":\"yarn lint && jest e2e -u --config e2e/jest.config.js\",\"dev\":\"webpack-dev-server --config webpack.config.e2e.js\",\"test\":\"yarn lint && jest src/.*\",\"test:watch\":\"jest --watch src\",\"prepublishOnly\":\"yarn build && yarn test\",\"prepare\":\"yarn build\"},\"repository\":{\"type\":\"git\",\"url\":\"https://github.com/knsv/mermaid\"},\"author\":\"Knut Sveidqvist\",\"license\":\"MIT\",\"standard\":{\"ignore\":[\"**/parser/*.js\",\"dist/**/*.js\",\"cypress/**/*.js\"],\"globals\":[\"page\"]},\"dependencies\":{\"@braintree/sanitize-url\":\"^3.1.0\",\"@percy/migrate\":\"^0.10.0\",\"d3\":\"^5.7.0\",\"dagre\":\"^0.8.5\",\"dagre-d3\":\"^0.6.4\",\"dompurify\":\"2.3.0\",\"graphlib\":\"^2.1.8\",\"khroma\":\"^1.4.1\",\"moment-mini\":\"^2.24.0\",\"stylis\":\"^4.0.10\"},\"devDependencies\":{\"@babel/core\":\"^7.14.6\",\"@babel/preset-env\":\"^7.14.7\",\"@babel/register\":\"^7.14.5\",\"@percy/cli\":\"^1.0.0-beta.58\",\"@percy/cypress\":\"^3.1.0\",\"babel-core\":\"7.0.0-bridge.0\",\"babel-eslint\":\"^10.1.0\",\"babel-jest\":\"^27.0.6\",\"babel-loader\":\"^8.2.2\",\"coveralls\":\"^3.0.2\",\"css-to-string-loader\":\"^0.1.3\",\"cypress\":\"7.6.0\",\"documentation\":\"13.2.0\",\"eslint\":\"^7.30.0\",\"eslint-config-prettier\":\"^8.3.0\",\"eslint-plugin-prettier\":\"^3.4.0\",\"husky\":\"^7.0.1\",\"identity-obj-proxy\":\"^3.0.0\",\"jest\":\"^27.0.6\",\"jison\":\"^0.4.18\",\"js-base64\":\"3.6.1\",\"moment\":\"^2.23.0\",\"prettier\":\"^2.3.2\",\"start-server-and-test\":\"^1.12.6\",\"terser-webpack-plugin\":\"^2.2.2\",\"webpack\":\"^4.41.2\",\"webpack-bundle-analyzer\":\"^4.4.2\",\"webpack-cli\":\"^3.1.2\",\"webpack-dev-server\":\"^3.4.1\",\"webpack-node-externals\":\"^1.7.2\"},\"files\":[\"dist\"],\"yarn-upgrade-all\":{\"ignore\":[\"babel-core\"]},\"sideEffects\":[\"**/*.css\",\"**/*.scss\"],\"husky\":{\"hooks\":{\"pre-push\":\"yarn test\"}}}");
module.exports = JSON.parse("{\"name\":\"mermaid\",\"version\":\"8.11.4\",\"description\":\"Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.\",\"main\":\"dist/mermaid.core.js\",\"keywords\":[\"diagram\",\"markdown\",\"flowchart\",\"sequence diagram\",\"gantt\",\"class diagram\",\"git graph\"],\"scripts\":{\"build:development\":\"webpack --progress --colors\",\"build:production\":\"yarn build:development -p --config webpack.config.prod.babel.js\",\"build\":\"yarn build:development && yarn build:production\",\"postbuild\":\"documentation build src/mermaidAPI.js src/config.js src/defaultConfig.js --shallow -f md --markdown-toc false > docs/Setup.md\",\"build:watch\":\"yarn build --watch\",\"release\":\"yarn build\",\"lint\":\"eslint src\",\"e2e:depr\":\"yarn lint && jest e2e --config e2e/jest.config.js\",\"cypress\":\"percy exec -- cypress run\",\"e2e\":\"start-server-and-test dev http://localhost:9000/ cypress\",\"e2e-upd\":\"yarn lint && jest e2e -u --config e2e/jest.config.js\",\"dev\":\"webpack-dev-server --config webpack.config.e2e.js\",\"test\":\"yarn lint && jest src/.*\",\"test:watch\":\"jest --watch src\",\"prepublishOnly\":\"yarn build && yarn test\",\"prepare\":\"yarn build\"},\"repository\":{\"type\":\"git\",\"url\":\"https://github.com/knsv/mermaid\"},\"author\":\"Knut Sveidqvist\",\"license\":\"MIT\",\"standard\":{\"ignore\":[\"**/parser/*.js\",\"dist/**/*.js\",\"cypress/**/*.js\"],\"globals\":[\"page\"]},\"dependencies\":{\"@braintree/sanitize-url\":\"^3.1.0\",\"@percy/migrate\":\"^0.10.0\",\"d3\":\"^5.7.0\",\"dagre\":\"^0.8.5\",\"dagre-d3\":\"^0.6.4\",\"dompurify\":\"2.3.0\",\"graphlib\":\"^2.1.8\",\"khroma\":\"^1.4.1\",\"moment-mini\":\"^2.24.0\",\"stylis\":\"^4.0.10\"},\"devDependencies\":{\"@babel/core\":\"^7.14.6\",\"@babel/preset-env\":\"^7.14.7\",\"@babel/register\":\"^7.14.5\",\"@percy/cli\":\"^1.0.0-beta.58\",\"@percy/cypress\":\"^3.1.0\",\"babel-core\":\"7.0.0-bridge.0\",\"babel-eslint\":\"^10.1.0\",\"babel-jest\":\"^27.0.6\",\"babel-loader\":\"^8.2.2\",\"coveralls\":\"^3.0.2\",\"css-to-string-loader\":\"^0.1.3\",\"cypress\":\"7.6.0\",\"documentation\":\"13.2.0\",\"eslint\":\"^7.30.0\",\"eslint-config-prettier\":\"^8.3.0\",\"eslint-plugin-prettier\":\"^3.4.0\",\"husky\":\"^7.0.1\",\"identity-obj-proxy\":\"^3.0.0\",\"jest\":\"^27.0.6\",\"jison\":\"^0.4.18\",\"js-base64\":\"3.6.1\",\"moment\":\"^2.23.0\",\"prettier\":\"^2.3.2\",\"start-server-and-test\":\"^1.12.6\",\"terser-webpack-plugin\":\"^2.2.2\",\"webpack\":\"^4.41.2\",\"webpack-bundle-analyzer\":\"^4.4.2\",\"webpack-cli\":\"^3.1.2\",\"webpack-dev-server\":\"^3.4.1\",\"webpack-node-externals\":\"^1.7.2\"},\"files\":[\"dist\"],\"yarn-upgrade-all\":{\"ignore\":[\"babel-core\"]},\"sideEffects\":[\"**/*.css\",\"**/*.scss\"],\"husky\":{\"hooks\":{\"pre-push\":\"yarn test\"}}}");
/***/ }),
@ -52248,12 +52248,27 @@ function insertPolygonShape(parent, w, h, points) {
/*!******************************!*\
!*** ./src/defaultConfig.js ***!
\******************************/
/*! exports provided: default */
/*! exports provided: configKeys, default */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "configKeys", function() { return configKeys; });
/* harmony import */ var _themes__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./themes */ "./src/themes/index.js");
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
/**
* **Configuration methods in Mermaid version 8.6.0 have been updated, to learn more[[click here](8.6.0_docs.md)].**
@ -53394,6 +53409,21 @@ var config = {
};
config.class.arrowMarkerAbsolute = config.arrowMarkerAbsolute;
config.git.arrowMarkerAbsolute = config.arrowMarkerAbsolute;
var keyify = function keyify(obj) {
var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
return Object.keys(obj).reduce(function (res, el) {
if (Array.isArray(obj[el])) {
return res;
} else if (_typeof(obj[el]) === 'object' && obj[el] !== null) {
return [].concat(_toConsumableArray(res), [prefix + el], _toConsumableArray(keyify(obj[el], '')));
}
return [].concat(_toConsumableArray(res), [prefix + el]);
}, []);
};
var configKeys = keyify(config, '');
/* harmony default export */ __webpack_exports__["default"] = (config);
/***/ }),
@ -74044,6 +74074,9 @@ var handleDirective = function handleDirective(p, directive, type) {
delete directive.args[prop];
}
});
console.log('sanitize in handleDirective', directive.args);
Object(_utils__WEBPACK_IMPORTED_MODULE_44__["directiveSanitizer"])(directive.args);
console.log('sanitize in handleDirective (done)', directive.args);
reinitialize(directive.args);
_config__WEBPACK_IMPORTED_MODULE_3__["addDirective"](directive.args);
break;
@ -75712,7 +75745,7 @@ var getThemeVariables = function getThemeVariables(userOverrides) {
/*!**********************!*\
!*** ./src/utils.js ***!
\**********************/
/*! exports provided: detectInit, detectDirective, detectType, isSubstringInArray, interpolateToCurve, formatUrl, runFunc, getStylesFromArray, generateId, random, assignWithDepth, getTextObj, drawSimpleText, wrapLabel, calculateTextHeight, calculateTextWidth, calculateTextDimensions, calculateSvgSizeAttrs, configureSvgSize, initIdGeneratior, entityDecode, default */
/*! exports provided: detectInit, detectDirective, detectType, isSubstringInArray, interpolateToCurve, formatUrl, runFunc, getStylesFromArray, generateId, random, assignWithDepth, getTextObj, drawSimpleText, wrapLabel, calculateTextHeight, calculateTextWidth, calculateTextDimensions, calculateSvgSizeAttrs, configureSvgSize, initIdGeneratior, entityDecode, directiveSanitizer, default */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
@ -75738,11 +75771,13 @@ __webpack_require__.r(__webpack_exports__);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "configureSvgSize", function() { return configureSvgSize; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "initIdGeneratior", function() { return initIdGeneratior; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "entityDecode", function() { return entityDecode; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "directiveSanitizer", function() { return directiveSanitizer; });
/* harmony import */ var _braintree_sanitize_url__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @braintree/sanitize-url */ "./node_modules/@braintree/sanitize-url/index.js");
/* harmony import */ var _braintree_sanitize_url__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_braintree_sanitize_url__WEBPACK_IMPORTED_MODULE_0__);
/* harmony import */ var d3__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! d3 */ "./node_modules/d3/index.js");
/* harmony import */ var _diagrams_common_common__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./diagrams/common/common */ "./src/diagrams/common/common.js");
/* harmony import */ var _logger__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./logger */ "./src/logger.js");
/* harmony import */ var _defaultConfig__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./defaultConfig */ "./src/defaultConfig.js");
/* harmony import */ var _logger__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./logger */ "./src/logger.js");
var _this = undefined;
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@ -75770,6 +75805,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
// Effectively an enum of the supported curve types, accessible by name
var d3CurveTypes = {
@ -75827,15 +75863,10 @@ var detectInit = function detectInit(text, cnf) {
var args = inits.map(function (init) {
return init.args;
});
Object.keys(args).forEach(function (argKey) {
Object.keys(args[argKey]).forEach(function (key) {
if (key.indexOf('__') === 0) {
_logger__WEBPACK_IMPORTED_MODULE_3__["log"].debug('sanitize deleting prototype option', args[key]);
delete args[argKey][key];
}
});
});
console.log('sanitizer (args)', args);
directiveSanitizer(args);
results = assignWithDepth(results, _toConsumableArray(args));
console.log('sanitize results', results);
} else {
results = inits.args;
}
@ -75852,7 +75883,8 @@ var detectInit = function detectInit(text, cnf) {
delete results[prop];
}
});
}
} // Todo: refactor this, these results are never used
return results;
};
@ -75884,7 +75916,7 @@ var detectDirective = function detectDirective(text) {
try {
var commentWithoutDirectives = new RegExp("[%]{2}(?![{]".concat(directiveWithoutOpen.source, ")(?=[}][%]{2}).*\n"), 'ig');
text = text.trim().replace(commentWithoutDirectives, '').replace(/'/gm, '"');
_logger__WEBPACK_IMPORTED_MODULE_3__["log"].debug("Detecting diagram directive".concat(type !== null ? ' type:' + type : '', " based on the text:").concat(text));
_logger__WEBPACK_IMPORTED_MODULE_4__["log"].debug("Detecting diagram directive".concat(type !== null ? ' type:' + type : '', " based on the text:").concat(text));
var match,
result = [];
@ -75914,7 +75946,7 @@ var detectDirective = function detectDirective(text) {
return result.length === 1 ? result[0] : result;
} catch (error) {
_logger__WEBPACK_IMPORTED_MODULE_3__["log"].error("ERROR: ".concat(error.message, " - Unable to parse directive\n ").concat(type !== null ? ' type:' + type : '', " based on the text:").concat(text));
_logger__WEBPACK_IMPORTED_MODULE_4__["log"].error("ERROR: ".concat(error.message, " - Unable to parse directive\n ").concat(type !== null ? ' type:' + type : '', " based on the text:").concat(text));
return {
type: null,
args: null
@ -76128,7 +76160,7 @@ var calcCardinalityPosition = function calcCardinalityPosition(isRelationTypePre
var prevPoint;
var totalDistance = 0; // eslint-disable-line
_logger__WEBPACK_IMPORTED_MODULE_3__["log"].info('our points', points);
_logger__WEBPACK_IMPORTED_MODULE_4__["log"].info('our points', points);
if (points[0] !== initialPosition) {
points = points.reverse();
@ -76194,7 +76226,7 @@ var calcTerminalLabelPosition = function calcTerminalLabelPosition(terminalMarke
var prevPoint;
var totalDistance = 0; // eslint-disable-line
_logger__WEBPACK_IMPORTED_MODULE_3__["log"].info('our points', points);
_logger__WEBPACK_IMPORTED_MODULE_4__["log"].info('our points', points);
if (position !== 'start_left' && position !== 'start_right') {
points = points.reverse();
@ -76689,6 +76721,48 @@ var entityDecode = function entityDecode(html) {
decoder.innerHTML = html;
return unescape(decoder.textContent);
};
var directiveSanitizer = function directiveSanitizer(args) {
console.log('directiveSanitizer called with', args);
if (_typeof(args) === 'object') {
// check for array
if (args.length) {
args.forEach(function (arg) {
return directiveSanitizer(arg);
});
} else {
// This is an object
Object.keys(args).forEach(function (key) {
_logger__WEBPACK_IMPORTED_MODULE_4__["log"].debug('Checking key', key);
if (key.indexOf('__') === 0) {
_logger__WEBPACK_IMPORTED_MODULE_4__["log"].debug('sanitize deleting __ option', key);
delete args[key];
}
if (key.indexOf('proto') >= 0) {
_logger__WEBPACK_IMPORTED_MODULE_4__["log"].debug('sanitize deleting proto option', key);
delete args[key];
}
if (key.indexOf('constr') >= 0) {
_logger__WEBPACK_IMPORTED_MODULE_4__["log"].debug('sanitize deleting constr option', key);
delete args[key];
}
if (_defaultConfig__WEBPACK_IMPORTED_MODULE_3__["configKeys"].indexOf(key) < 0) {
_logger__WEBPACK_IMPORTED_MODULE_4__["log"].debug('sanitize deleting option', key);
delete args[key];
} else {
if (_typeof(args[key]) === 'object') {
_logger__WEBPACK_IMPORTED_MODULE_4__["log"].debug('sanitize deleting object', key);
directiveSanitizer(args[key]);
}
}
});
}
}
};
/* harmony default export */ __webpack_exports__["default"] = ({
assignWithDepth: assignWithDepth,
wrapLabel: wrapLabel,
@ -76712,7 +76786,8 @@ var entityDecode = function entityDecode(html) {
memoize: memoize,
runFunc: runFunc,
entityDecode: entityDecode,
initIdGeneratior: initIdGeneratior
initIdGeneratior: initIdGeneratior,
directiveSanitizer: directiveSanitizer
});
/***/ })

2
dist/mermaid.js.map vendored

File diff suppressed because one or more lines are too long

10
dist/mermaid.min.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -538,9 +538,9 @@ const handleDirective = function (p, directive, type) {
delete directive.args[prop];
}
});
console.log('sanitize in handleDirective', directive.args);
log.debug('sanitize in handleDirective', directive.args);
directiveSanitizer(directive.args);
console.log('sanitize in handleDirective (done)', directive.args);
log.debug('sanitize in handleDirective (done)', directive.args);
reinitialize(directive.args);
configApi.addDirective(directive.args);
break;

View File

@ -73,11 +73,9 @@ export const detectInit = function (text, cnf) {
if (Array.isArray(inits)) {
let args = inits.map((init) => init.args);
console.log('sanitizer (args)', args);
directiveSanitizer(args);
results = assignWithDepth(results, [...args]);
console.log('sanitize results', results);
} else {
results = inits.args;
}
@ -822,7 +820,7 @@ export const entityDecode = function (html) {
};
export const directiveSanitizer = (args) => {
console.log('directiveSanitizer called with', args);
log.debug('directiveSanitizer called with', args);
if (typeof args === 'object') {
// check for array
if (args.length) {