mirror of
https://github.com/mermaid-js/mermaid.git
synced 2025-01-28 07:03:17 +08:00
revert from and to type to object
This commit is contained in:
parent
a14637b416
commit
12bd301401
@ -120,13 +120,13 @@ const activationCount = (part: string) => {
|
|||||||
for (i = 0; i < state.records.messages.length; i++) {
|
for (i = 0; i < state.records.messages.length; i++) {
|
||||||
if (
|
if (
|
||||||
state.records.messages[i].type === LINETYPE.ACTIVE_START &&
|
state.records.messages[i].type === LINETYPE.ACTIVE_START &&
|
||||||
state.records.messages[i].from === part
|
state.records.messages[i].from?.actor === part
|
||||||
) {
|
) {
|
||||||
count++;
|
count++;
|
||||||
}
|
}
|
||||||
if (
|
if (
|
||||||
state.records.messages[i].type === LINETYPE.ACTIVE_END &&
|
state.records.messages[i].type === LINETYPE.ACTIVE_END &&
|
||||||
state.records.messages[i].from === part
|
state.records.messages[i].from?.actor === part
|
||||||
) {
|
) {
|
||||||
count--;
|
count--;
|
||||||
}
|
}
|
||||||
@ -157,10 +157,12 @@ export const addSignal = function (
|
|||||||
activate: boolean = false
|
activate: boolean = false
|
||||||
) {
|
) {
|
||||||
if (messageType === LINETYPE.ACTIVE_END) {
|
if (messageType === LINETYPE.ACTIVE_END) {
|
||||||
const cnt = activationCount(idFrom || '');
|
const cnt = activationCount(idFrom?.actor || '');
|
||||||
if (cnt < 1) {
|
if (cnt < 1) {
|
||||||
// Bail out as there is an activation signal from an inactive participant
|
// Bail out as there is an activation signal from an inactive participant
|
||||||
const error = new Error('Trying to inactivate an inactive participant (' + idFrom + ')');
|
const error = new Error(
|
||||||
|
'Trying to inactivate an inactive participant (' + idFrom?.actor + ')'
|
||||||
|
);
|
||||||
|
|
||||||
// @ts-ignore: we are passing hash param to the error object, however we should define our own custom error class to make it type safe
|
// @ts-ignore: we are passing hash param to the error object, however we should define our own custom error class to make it type safe
|
||||||
error.hash = {
|
error.hash = {
|
||||||
|
@ -20,8 +20,8 @@ export interface Actor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export interface Message {
|
export interface Message {
|
||||||
from?: string;
|
from?: { actor: string };
|
||||||
to?: string;
|
to?: { actor: string };
|
||||||
message:
|
message:
|
||||||
| string
|
| string
|
||||||
| {
|
| {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user