Skip to content

Commit

Permalink
build(typescript): target ES3 (for max compatibility) and put dom & e…
Browse files Browse the repository at this point in the history
…s2016 libs in so we can still use modern constructs
  • Loading branch information
sverweij committed Aug 27, 2018
1 parent e1ff7af commit fd28fae
Show file tree
Hide file tree
Showing 45 changed files with 1,160 additions and 1,074 deletions.
3 changes: 2 additions & 1 deletion .dependency-cruiser.json
Expand Up @@ -140,6 +140,7 @@
"options": {
"moduleSystems": ["cjs", "es6"],
"doNotFollow": "node_modules",
"tsPreCompilationDeps": true
"tsPreCompilationDeps": true,
"prefix": "https://github.com/mscgenjs/mscgenjs-core/blob/develop"
}
}
4 changes: 2 additions & 2 deletions Makefile
Expand Up @@ -56,10 +56,10 @@ src/parse/%parser.js: src/parse/peg/%parser.pegjs
include config/jsdependencies.mk
include config/dependencies.mk

src/render/graphics/csstemplates.ts: src/render/graphics/styling \
src/render/graphics/csstemplates.json: src/render/graphics/styling \
utl/to-csstemplates-js.utility.js \
src/render/graphics/styling/base.css \
src/render/graphics/styling/csstemplates.tsTemplate \
src/render/graphics/styling/csstemplates.jsonTemplate \
src/render/graphics/styling/*.style/*.css \
src/render/graphics/styling/*.style/*.json
node utl/to-csstemplates-js.utility.js > $@
Expand Down
24 changes: 12 additions & 12 deletions dist/index-lazy.js
Expand Up @@ -2,9 +2,9 @@
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
const main_1 = __importDefault(require("./main"));
const lazy_resolver_1 = __importDefault(require("./main/lazy-resolver"));
exports.__esModule = true;
var main_1 = __importDefault(require("./main"));
var lazy_resolver_1 = __importDefault(require("./main/lazy-resolver"));
/**
* Exactly the same interface as @index.js - the only difference is that the
* functions only load dependencies at the moment they need them.
Expand All @@ -13,35 +13,35 @@ module.exports = {
/**
* See the function of the same name in @index.js.
*/
renderMsc(pScript, pOptions, pCallBack) {
main_1.default.renderMsc(pScript, pOptions || {}, pCallBack, lazy_resolver_1.default.getParser, lazy_resolver_1.default.getGraphicsRenderer);
renderMsc: function (pScript, pOptions, pCallBack) {
main_1["default"].renderMsc(pScript, pOptions || {}, pCallBack, lazy_resolver_1["default"].getParser, lazy_resolver_1["default"].getGraphicsRenderer);
},
/**
* See the function of the same name in @index.js.
*/
translateMsc(pScript, pOptions) {
return main_1.default.translateMsc(pScript, pOptions || {}, lazy_resolver_1.default.getParser, lazy_resolver_1.default.getTextRenderer);
translateMsc: function (pScript, pOptions) {
return main_1["default"].translateMsc(pScript, pOptions || {}, lazy_resolver_1["default"].getParser, lazy_resolver_1["default"].getTextRenderer);
},
/**
* See the variable of the same name in @index.js.
*/
version: main_1.default.version,
version: main_1["default"].version,
/**
* See the variable of the same name in @index.js.
*/
getAllowedValues: main_1.default.getAllowedValues,
getAllowedValues: main_1["default"].getAllowedValues,
/**
* See the function of the same name in @index.js
*/
getParser: lazy_resolver_1.default.getParser,
getParser: lazy_resolver_1["default"].getParser,
/**
* See the function of the same name in @index.js
*/
getGraphicsRenderer: lazy_resolver_1.default.getGraphicsRenderer,
getGraphicsRenderer: lazy_resolver_1["default"].getGraphicsRenderer,
/**
* See the function of the same name in @index.js
*/
getTextRenderer: lazy_resolver_1.default.getTextRenderer,
getTextRenderer: lazy_resolver_1["default"].getTextRenderer
};
/*
This file is part of mscgen_js.
Expand Down
24 changes: 12 additions & 12 deletions dist/index.js
Expand Up @@ -2,9 +2,9 @@
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
const index_1 = __importDefault(require("./main/index"));
const static_resolver_1 = __importDefault(require("./main/static-resolver"));
exports.__esModule = true;
var index_1 = __importDefault(require("./main/index"));
var static_resolver_1 = __importDefault(require("./main/static-resolver"));
module.exports = {
/**
* parses the given script and renders it in the DOM element with
Expand Down Expand Up @@ -35,8 +35,8 @@ module.exports = {
* includeSource: whether the generated svg should include the script
* in a desc element or not. Defaults to false
*/
renderMsc(pScript, pOptions, pCallBack) {
index_1.default.renderMsc(pScript, pOptions || {}, pCallBack, static_resolver_1.default.getParser, static_resolver_1.default.getGraphicsRenderer);
renderMsc: function (pScript, pOptions, pCallBack) {
index_1["default"].renderMsc(pScript, pOptions || {}, pCallBack, static_resolver_1["default"].getParser, static_resolver_1["default"].getGraphicsRenderer);
},
/**
* Translates the input script to an outputscript.
Expand All @@ -53,16 +53,16 @@ module.exports = {
* outputType : defaults to "json". Possible values:
* allowedValues.outputType
*/
translateMsc(pScript, pOptions) {
return index_1.default.translateMsc(pScript, pOptions || {}, static_resolver_1.default.getParser, static_resolver_1.default.getTextRenderer);
translateMsc: function (pScript, pOptions) {
return index_1["default"].translateMsc(pScript, pOptions || {}, static_resolver_1["default"].getParser, static_resolver_1["default"].getTextRenderer);
},
/**
* The current (semver compliant) version number string of
* mscgenjs
*
* @type {string}
*/
version: index_1.default.version,
version: index_1["default"].version,
/**
*
* An object with arrays of allowed values for parameters in the
Expand All @@ -76,7 +76,7 @@ module.exports = {
* pOptions.namedStyle
*
*/
getAllowedValues: index_1.default.getAllowedValues,
getAllowedValues: index_1["default"].getAllowedValues,
/**
* returns a parser module for the given language. The module exposes
* a parse(pString) function which returns an abstract syntax tree in
Expand All @@ -89,7 +89,7 @@ module.exports = {
* "json". Defaults to "mscgen"
* @return {object}
*/
getParser: static_resolver_1.default.getParser,
getParser: static_resolver_1["default"].getParser,
/**
* returns a renderer that renders the abstract syntax tree as a scalable
* vector graphics (in practice: @render/graphics/renderast)
Expand All @@ -98,7 +98,7 @@ module.exports = {
*
* @return {object}
*/
getGraphicsRenderer: static_resolver_1.default.getGraphicsRenderer,
getGraphicsRenderer: static_resolver_1["default"].getGraphicsRenderer,
/**
* returns a renderer to the given language. The module exposes a
* render(pAST) function which returns a rendition of the abstract
Expand All @@ -108,7 +108,7 @@ module.exports = {
*
* @return {object}
*/
getTextRenderer: static_resolver_1.default.getTextRenderer,
getTextRenderer: static_resolver_1["default"].getTextRenderer
};
/*
This file is part of mscgen_js.
Expand Down
2 changes: 1 addition & 1 deletion dist/index.min.js

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions dist/main/index.js
Expand Up @@ -2,9 +2,9 @@
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
const allowedvalues_1 = __importDefault(require("./allowedvalues"));
const normalizeoptions_1 = __importDefault(require("./normalizeoptions"));
exports.__esModule = true;
var allowedvalues_1 = __importDefault(require("./allowedvalues"));
var normalizeoptions_1 = __importDefault(require("./normalizeoptions"));
function isProbablyAnASTAlready(pScript, pInputType) {
return pInputType === "json" && typeof pScript === "object";
}
Expand All @@ -27,26 +27,26 @@ function runCallBack(pCallBack, pError, pResult) {
}
}
}
exports.default = {
renderMsc(pScript, pOptions, pCallBack, pGetParser, pGetGraphicsRenderer) {
const lOptions = normalizeoptions_1.default(pOptions, pScript);
exports["default"] = {
renderMsc: function (pScript, pOptions, pCallBack, pGetParser, pGetGraphicsRenderer) {
var lOptions = normalizeoptions_1["default"](pOptions, pScript);
try {
runCallBack(pCallBack, null, pGetGraphicsRenderer().render(getAST(pScript, lOptions.inputType, pGetParser), lOptions.window, lOptions.elementId, {
source: lOptions.source,
styleAdditions: lOptions.styleAdditions,
additionalTemplate: lOptions.additionalTemplate,
mirrorEntitiesOnBottom: lOptions.mirrorEntitiesOnBottom,
regularArcTextVerticalAlignment: lOptions.regularArcTextVerticalAlignment,
regularArcTextVerticalAlignment: lOptions.regularArcTextVerticalAlignment
}));
}
catch (pException) {
runCallBack(pCallBack, pException);
}
},
translateMsc(pScript, pOptions, pGetParser, pGetTextRenderer) {
const lOptions = Object.assign({
translateMsc: function (pScript, pOptions, pGetParser, pGetTextRenderer) {
var lOptions = Object.assign({
inputType: "mscgen",
outputType: "json",
outputType: "json"
}, pOptions || {});
if (lOptions.outputType === "ast") {
return pGetParser(lOptions.inputType).parse(pScript);
Expand All @@ -57,9 +57,9 @@ exports.default = {
return pGetTextRenderer(lOptions.outputType).render(getAST(pScript, lOptions.inputType, pGetParser));
},
version: "3.0.0-beta-0",
getAllowedValues() {
return allowedvalues_1.default;
},
getAllowedValues: function () {
return allowedvalues_1["default"];
}
};
/*
This file is part of mscgen_js.
Expand Down
24 changes: 12 additions & 12 deletions dist/main/lazy-resolver.js
Expand Up @@ -2,31 +2,31 @@
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
const lodash_memoize_1 = __importDefault(require("lodash.memoize"));
const DEFAULT_PARSER = "../parse/mscgenparser";
const DEFAULT_TEXT_RENDERER = "../render/text/ast2mscgen";
const gLang2Parser = Object.freeze({
exports.__esModule = true;
var lodash_memoize_1 = __importDefault(require("lodash.memoize"));
var DEFAULT_PARSER = "../parse/mscgenparser";
var DEFAULT_TEXT_RENDERER = "../render/text/ast2mscgen";
var gLang2Parser = Object.freeze({
mscgen: "../parse/mscgenparser",
xu: "../parse/xuparser",
msgenny: "../parse/msgennyparser",
msgenny: "../parse/msgennyparser"
});
const gLang2TextRenderer = Object.freeze({
var gLang2TextRenderer = Object.freeze({
mscgen: "../render/text/ast2mscgen",
msgenny: "../render/text/ast2msgenny",
xu: "../render/text/ast2xu",
dot: "../render/text/ast2dot",
doxygen: "../render/text/ast2doxygen",
doxygen: "../render/text/ast2doxygen"
});
exports.default = {
getParser: lodash_memoize_1.default((pLanguage) => {
exports["default"] = {
getParser: lodash_memoize_1["default"](function (pLanguage) {
if (["ast", "json"].indexOf(pLanguage) > -1) {
return JSON;
}
return require(gLang2Parser[pLanguage] || DEFAULT_PARSER);
}),
getGraphicsRenderer: lodash_memoize_1.default(() => require("../render/graphics/renderast").default),
getTextRenderer: lodash_memoize_1.default((pLanguage) => require(gLang2TextRenderer[pLanguage] || DEFAULT_TEXT_RENDERER).default),
getGraphicsRenderer: lodash_memoize_1["default"](function () { return require("../render/graphics/renderast")["default"]; }),
getTextRenderer: lodash_memoize_1["default"](function (pLanguage) { return require(gLang2TextRenderer[pLanguage] || DEFAULT_TEXT_RENDERER)["default"]; })
};
/*
This file is part of mscgen_js.
Expand Down
22 changes: 11 additions & 11 deletions dist/main/normalizeoptions.js
Expand Up @@ -2,29 +2,29 @@
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
const allowedvalues_1 = __importDefault(require("./allowedvalues"));
exports.__esModule = true;
var allowedvalues_1 = __importDefault(require("./allowedvalues"));
function normalizeValueFromValidValues(pValue, pValidValues, pDefault) {
let lRetval = pDefault;
if (pValidValues.some((pValidValue) => pValidValue.name === pValue)) {
var lRetval = pDefault;
if (pValidValues.some(function (pValidValue) { return pValidValue.name === pValue; })) {
lRetval = pValue;
}
return lRetval;
}
function normalizeVerticalAlignment(pVerticalAlignment) {
return normalizeValueFromValidValues(pVerticalAlignment, allowedvalues_1.default.regularArcTextVerticalAlignment, "middle");
return normalizeValueFromValidValues(pVerticalAlignment, allowedvalues_1["default"].regularArcTextVerticalAlignment, "middle");
}
function normalizeInputType(pInputType) {
return normalizeValueFromValidValues(pInputType, allowedvalues_1.default.inputType, "mscgen");
return normalizeValueFromValidValues(pInputType, allowedvalues_1["default"].inputType, "mscgen");
}
function normalizeAdditionalTemplate(pAdditionalTemplate) {
return normalizeValueFromValidValues(pAdditionalTemplate, allowedvalues_1.default.namedStyle, "basic");
return normalizeValueFromValidValues(pAdditionalTemplate, allowedvalues_1["default"].namedStyle, "basic");
}
function booleanize(pValue, pDefault) {
return typeof pValue === "boolean" ? pValue : pDefault;
}
exports.default = (pOptions, pScript) => {
const lIncludeSource = booleanize(pOptions.includeSource, true);
exports["default"] = (function (pOptions, pScript) {
var lIncludeSource = booleanize(pOptions.includeSource, true);
return {
inputType: normalizeInputType(pOptions.inputType),
elementId: pOptions.elementId || "__svg",
Expand All @@ -34,9 +34,9 @@ exports.default = (pOptions, pScript) => {
styleAdditions: pOptions.styleAdditions || null,
additionalTemplate: normalizeAdditionalTemplate(pOptions.additionalTemplate),
mirrorEntitiesOnBottom: booleanize(pOptions.mirrorEntitiesOnBottom, false),
regularArcTextVerticalAlignment: normalizeVerticalAlignment(pOptions.regularArcTextVerticalAlignment),
regularArcTextVerticalAlignment: normalizeVerticalAlignment(pOptions.regularArcTextVerticalAlignment)
};
};
});
/*
This file is part of mscgen_js.
Expand Down
52 changes: 26 additions & 26 deletions dist/main/static-resolver.js
Expand Up @@ -9,43 +9,43 @@ var __importStar = (this && this.__importStar) || function (mod) {
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
const mscgenparser = __importStar(require("../parse/mscgenparser"));
const msgennyparser = __importStar(require("../parse/msgennyparser"));
const xuparser = __importStar(require("../parse/xuparser"));
const renderast_1 = __importDefault(require("../render/graphics/renderast"));
const ast2dot_1 = __importDefault(require("../render/text/ast2dot"));
const ast2doxygen_1 = __importDefault(require("../render/text/ast2doxygen"));
const ast2mscgen_1 = __importDefault(require("../render/text/ast2mscgen"));
const ast2msgenny_1 = __importDefault(require("../render/text/ast2msgenny"));
const ast2xu_1 = __importDefault(require("../render/text/ast2xu"));
const DEFAULT_PARSER = mscgenparser;
const DEFAULT_TEXT_RENDERER = ast2mscgen_1.default;
const gLang2Parser = Object.freeze({
exports.__esModule = true;
var mscgenparser = __importStar(require("../parse/mscgenparser"));
var msgennyparser = __importStar(require("../parse/msgennyparser"));
var xuparser = __importStar(require("../parse/xuparser"));
var renderast_1 = __importDefault(require("../render/graphics/renderast"));
var ast2dot_1 = __importDefault(require("../render/text/ast2dot"));
var ast2doxygen_1 = __importDefault(require("../render/text/ast2doxygen"));
var ast2mscgen_1 = __importDefault(require("../render/text/ast2mscgen"));
var ast2msgenny_1 = __importDefault(require("../render/text/ast2msgenny"));
var ast2xu_1 = __importDefault(require("../render/text/ast2xu"));
var DEFAULT_PARSER = mscgenparser;
var DEFAULT_TEXT_RENDERER = ast2mscgen_1["default"];
var gLang2Parser = Object.freeze({
mscgen: mscgenparser,
xu: xuparser,
msgenny: msgennyparser,
msgenny: msgennyparser
});
const gLang2TextRenderer = Object.freeze({
mscgen: ast2mscgen_1.default,
msgenny: ast2msgenny_1.default,
xu: ast2xu_1.default,
dot: ast2dot_1.default,
doxygen: ast2doxygen_1.default,
var gLang2TextRenderer = Object.freeze({
mscgen: ast2mscgen_1["default"],
msgenny: ast2msgenny_1["default"],
xu: ast2xu_1["default"],
dot: ast2dot_1["default"],
doxygen: ast2doxygen_1["default"]
});
exports.default = {
getParser(pLanguage) {
exports["default"] = {
getParser: function (pLanguage) {
if (["ast", "json"].includes(pLanguage)) {
return JSON;
}
return gLang2Parser[pLanguage] || DEFAULT_PARSER;
},
getGraphicsRenderer() {
return renderast_1.default;
getGraphicsRenderer: function () {
return renderast_1["default"];
},
getTextRenderer(pLanguage) {
getTextRenderer: function (pLanguage) {
return gLang2TextRenderer[pLanguage] || DEFAULT_TEXT_RENDERER;
},
}
};
/*
This file is part of mscgen_js.
Expand Down

0 comments on commit fd28fae

Please sign in to comment.