GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-02-04 07:13:25 +08:00
Code Issues Projects Releases Wiki Activity

fix: Error handling

Browse Source
This commit is contained in:
Sidharth Vinod 2022-10-19 20:30:07 +05:30
parent d17aa6ecdd
commit 56a8068a7f
No known key found for this signature in database
GPG Key ID: FB5CCD378D3907CD
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
packages/mermaid/src/mermaid.ts
View File

@ -65,6 +65,31 @@ const init = async function (
} }
}; };
// eslint-disable-next-line @typescript-eslint/ban-types
const handleError = (error: unknown, errors: DetailedError[], parseError?: Function) => {
log.warn(error);
if (isDetailedError(error)) {
// handle case where error string and hash were
// wrapped in object like`const error = { str, hash };`
if (parseError) {
parseError(error.str, error.hash);
}
errors.push({ ...error, message: error.str, error });
} else {
// assume it is just error string and pass it on
if (parseError) {
parseError(error);
}
if (error instanceof Error) {
errors.push({
str: error.message,
message: error.message,
hash: error.name,
error,
});
}
}
};
const initThrowsErrors = function ( const initThrowsErrors = function (
config?: MermaidConfig, config?: MermaidConfig,
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
@ -144,17 +169,7 @@ const initThrowsErrors = function (
element element
); );
} catch (error) { } catch (error) {
log.warn('Catching Error (bootstrap)', error); handleError(error, errors, mermaid.parseError);
const mermaidError: DetailedError = {
error,
str: error.str,
hash: error.hash,
message: error.str,
};
if (typeof mermaid.parseError === 'function') {
mermaid.parseError(mermaidError);
}
errors.push(mermaidError);
} }
} }
if (errors.length > 0) { if (errors.length > 0) {
@ -285,17 +300,7 @@ const initThrowsErrorsAsync = async function (
element element
); );
} catch (error) { } catch (error) {
log.warn('Catching Error (bootstrap)', error); handleError(error, errors, mermaid.parseError);
const mermaidError: DetailedError = {
error,
str: error.str,
hash: error.hash,
message: error.str,
};
if (typeof mermaid.parseError === 'function') {
mermaid.parseError(mermaidError);
}
errors.push(mermaidError);
} }
} }
if (errors.length > 0) { if (errors.length > 0) {

2
packages/mermaid/src/utils.ts
View File

@ -825,7 +825,7 @@ export const sanitizeCss = (str) => {
export interface DetailedError { export interface DetailedError {
str: string; str: string;
hash: any; hash: any;
error?: Error; error?: any;
message?: string; message?: string;
} }