Revert "Merge branch 'release_9.2.0_buggfixes'"
This reverts commit1a0309fb87
, reversing changes made to56a8068a7f
. This is because the PR https://github.com/mermaid-js/mermaid/pull/3702 worked fine on the `develop` and `release_9.2.0_buggfixes` branches, but had a bunch of git merge conflicts on the `release/9.2.0` branch.
This commit is contained in:
parent
1a0309fb87
commit
81924f72c8
|
@ -72,7 +72,7 @@ classDiagram
|
||||||
Student "1" --o "1" IdCard : carries
|
Student "1" --o "1" IdCard : carries
|
||||||
Student "1" --o "1" Bike : rides
|
Student "1" --o "1" Bike : rides
|
||||||
</pre>
|
</pre>
|
||||||
<pre id="diagram" class="mermaid">
|
<pre id="diagram" class="mermaid2">
|
||||||
mindmap
|
mindmap
|
||||||
root
|
root
|
||||||
child1((Circle))
|
child1((Circle))
|
||||||
|
|
|
@ -48,32 +48,11 @@ describe('when using mermaid and ', function () {
|
||||||
const node = document.createElement('div');
|
const node = document.createElement('div');
|
||||||
node.appendChild(document.createTextNode('graph TD;\na;'));
|
node.appendChild(document.createTextNode('graph TD;\na;'));
|
||||||
|
|
||||||
await mermaid.initThrowsErrors(undefined, node);
|
mermaid.initThrowsErrors(undefined, node);
|
||||||
// mermaidAPI.render function has been mocked, since it doesn't yet work
|
// mermaidAPI.render function has been mocked, since it doesn't yet work
|
||||||
// in Node.JS (only works in browser)
|
// in Node.JS (only works in browser)
|
||||||
expect(mermaidAPI.render).toHaveBeenCalled();
|
expect(mermaidAPI.render).toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
it('should throw error (but still render) if lazyLoadedDiagram fails', async () => {
|
|
||||||
const node = document.createElement('div');
|
|
||||||
node.appendChild(document.createTextNode('graph TD;\na;'));
|
|
||||||
|
|
||||||
mermaidAPI.setConfig({
|
|
||||||
lazyLoadedDiagrams: ['this-file-does-not-exist.mjs'],
|
|
||||||
});
|
|
||||||
await expect(mermaid.initThrowsErrors(undefined, node)).rejects.toThrowError(
|
|
||||||
// this error message is probably different on every platform
|
|
||||||
// this one is just for vite-note (node/jest/browser may be different)
|
|
||||||
'Failed to load this-file-does-not-exist.mjs'
|
|
||||||
);
|
|
||||||
|
|
||||||
// should still render, even if lazyLoadedDiagrams fails
|
|
||||||
expect(mermaidAPI.render).toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(() => {
|
|
||||||
// we modify mermaid config in some tests, so we need to make sure to reset them
|
|
||||||
mermaidAPI.reset();
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('checking validity of input ', function () {
|
describe('checking validity of input ', function () {
|
||||||
|
|
|
@ -47,7 +47,13 @@ const init = async function (
|
||||||
callback?: Function
|
callback?: Function
|
||||||
) {
|
) {
|
||||||
try {
|
try {
|
||||||
await initThrowsErrors(config, nodes, callback);
|
const conf = mermaidAPI.getConfig();
|
||||||
|
if (conf?.lazyLoadedDiagrams && conf.lazyLoadedDiagrams.length > 0) {
|
||||||
|
await registerLazyLoadedDiagrams(conf);
|
||||||
|
await initThrowsErrorsAsync(config, nodes, callback);
|
||||||
|
} else {
|
||||||
|
initThrowsErrors(config, nodes, callback);
|
||||||
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
log.warn('Syntax Error rendering');
|
log.warn('Syntax Error rendering');
|
||||||
if (isDetailedError(e)) {
|
if (isDetailedError(e)) {
|
||||||
|
@ -84,19 +90,7 @@ const handleError = (error: unknown, errors: DetailedError[], parseError?: Funct
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
/**
|
const initThrowsErrors = function (
|
||||||
* Equivalent to {@link init()}, except an error will be thrown on error.
|
|
||||||
*
|
|
||||||
* @param config - **Deprecated** Mermaid sequenceConfig.
|
|
||||||
* @param nodes - One of:
|
|
||||||
* - A DOM Node
|
|
||||||
* - An array of DOM nodes (as would come from a jQuery selector)
|
|
||||||
* - A W3C selector, a la `.mermaid` (default)
|
|
||||||
* @param callback - Function that is called with the id of each generated mermaid diagram.
|
|
||||||
*
|
|
||||||
* @returns Resolves on success, otherwise the {@link Promise} will be rejected with an Error.
|
|
||||||
*/
|
|
||||||
const initThrowsErrors = async function (
|
|
||||||
config?: MermaidConfig,
|
config?: MermaidConfig,
|
||||||
// eslint-disable-next-line no-undef
|
// eslint-disable-next-line no-undef
|
||||||
nodes?: string | HTMLElement | NodeListOf<HTMLElement>,
|
nodes?: string | HTMLElement | NodeListOf<HTMLElement>,
|
||||||
|
@ -110,24 +104,6 @@ const initThrowsErrors = async function (
|
||||||
mermaid.sequenceConfig = config;
|
mermaid.sequenceConfig = config;
|
||||||
}
|
}
|
||||||
|
|
||||||
const errors = [];
|
|
||||||
|
|
||||||
if (conf?.lazyLoadedDiagrams && conf.lazyLoadedDiagrams.length > 0) {
|
|
||||||
// Load all lazy loaded diagrams in parallel
|
|
||||||
const results = await Promise.allSettled(
|
|
||||||
conf.lazyLoadedDiagrams.map(async (diagram: string) => {
|
|
||||||
const { id, detector, loadDiagram } = await import(diagram);
|
|
||||||
addDetector(id, detector, loadDiagram);
|
|
||||||
})
|
|
||||||
);
|
|
||||||
for (const result of results) {
|
|
||||||
if (result.status == 'rejected') {
|
|
||||||
log.warn(`Failed to lazyLoadedDiagram due to `, result.reason);
|
|
||||||
errors.push(result.reason);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// if last argument is a function this is the callback function
|
// if last argument is a function this is the callback function
|
||||||
log.debug(`${!callback ? 'No ' : ''}Callback function found`);
|
log.debug(`${!callback ? 'No ' : ''}Callback function found`);
|
||||||
let nodesToProcess: ArrayLike<HTMLElement>;
|
let nodesToProcess: ArrayLike<HTMLElement>;
|
||||||
|
@ -153,6 +129,7 @@ const initThrowsErrors = async function (
|
||||||
const idGenerator = new utils.initIdGenerator(conf.deterministicIds, conf.deterministicIDSeed);
|
const idGenerator = new utils.initIdGenerator(conf.deterministicIds, conf.deterministicIDSeed);
|
||||||
|
|
||||||
let txt: string;
|
let txt: string;
|
||||||
|
const errors: DetailedError[] = [];
|
||||||
|
|
||||||
// element is the current div with mermaid class
|
// element is the current div with mermaid class
|
||||||
for (const element of Array.from(nodesToProcess)) {
|
for (const element of Array.from(nodesToProcess)) {
|
||||||
|
|
Loading…
Reference in New Issue