marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-08-23 02:06:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: TS errors

Browse Source
This commit is contained in:
Sidharth Vinod
2022-10-19 19:03:29 +05:30
parent 1388e201e5
commit 4c311ea4b1
2 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ import { log } from './logger';
import utils from './utils'; import utils from './utils';
import { mermaidAPI } from './mermaidAPI'; import { mermaidAPI } from './mermaidAPI';
import { addDetector } from './diagram-api/detectType'; import { addDetector } from './diagram-api/detectType';
import { isDetailedError } from './utils'; import { isDetailedError, DetailedError } from './utils';
import { registerDiagram } from './diagram-api/diagramAPI'; import { registerDiagram } from './diagram-api/diagramAPI';
/** /**
@@ -103,7 +103,7 @@ const initThrowsErrors = 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 = []; 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)) {
@@ -144,8 +144,12 @@ const initThrowsErrors = function (
); );
} catch (error) { } catch (error) {
log.warn('Catching Error (bootstrap)', error); log.warn('Catching Error (bootstrap)', error);
// @ts-ignore: TODO Fix ts errors const mermaidError: DetailedError = {
const mermaidError = { error, str: error.str, hash: error.hash, message: error.str }; error,
str: error.str,
hash: error.hash,
message: error.str,
};
if (typeof mermaid.parseError === 'function') { if (typeof mermaid.parseError === 'function') {
mermaid.parseError(mermaidError); mermaid.parseError(mermaidError);
} }
@@ -240,7 +244,7 @@ const initThrowsErrorsAsync = 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 = []; 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)) {
@@ -281,8 +285,12 @@ const initThrowsErrorsAsync = async function (
); );
} catch (error) { } catch (error) {
log.warn('Catching Error (bootstrap)', error); log.warn('Catching Error (bootstrap)', error);
// @ts-ignore: TODO Fix ts errors const mermaidError: DetailedError = {
const mermaidError = { error, str: error.str, hash: error.hash, message: error.str }; error,
str: error.str,
hash: error.hash,
message: error.str,
};
if (typeof mermaid.parseError === 'function') { if (typeof mermaid.parseError === 'function') {
mermaid.parseError(mermaidError); mermaid.parseError(mermaidError);
} }
@@ -355,22 +363,21 @@ const parse = (txt: string) => {
return mermaidAPI.parse(txt, mermaid.parseError); return mermaidAPI.parse(txt, mermaid.parseError);
}; };
// @ts-ignore: TODO Fix ts errors const executionQueue: (() => Promise<unknown>)[] = [];
const executionQueue = [];
let executionQueueRunning = false; let executionQueueRunning = false;
const executeQueue = async () => { const executeQueue = async () => {
if (executionQueueRunning) { if (executionQueueRunning) {
return; return;
} }
executionQueueRunning = true; executionQueueRunning = true;
// @ts-ignore: TODO Fix ts errors
while (executionQueue.length > 0) { while (executionQueue.length > 0) {
// @ts-ignore: TODO Fix ts errors
const f = executionQueue.shift(); const f = executionQueue.shift();
try { if (f) {
await f(); try {
} catch (e) { await f();
log.error('Error executing queue', e); } catch (e) {
log.error('Error executing queue', e);
}
} }
} }
executionQueueRunning = false; executionQueueRunning = false;
@@ -497,10 +504,8 @@ const mermaid: {
mermaidAPI, mermaidAPI,
parse, parse,
parseAsync, parseAsync,
// parseAsync: mermaidAPI.parseAsync,
render: mermaidAPI.render, render: mermaidAPI.render,
renderAsync, renderAsync,
// renderAsync: mermaidAPI.renderAsync,
init, init,
initThrowsErrors, initThrowsErrors,
initialize, initialize,
@@ -508,8 +513,6 @@ const mermaid: {
parseError: undefined, parseError: undefined,
contentLoaded, contentLoaded,
setParseErrorHandler, setParseErrorHandler,
// test1,
// executeQueue,
}; };
export default mermaid; export default mermaid;

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

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