state-machine-cat 12.0.20 → 12.0.22

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2024 Sander Verweij
+Copyright (c) 2016-2025 Sander Verweij
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/cli/actions.mjs

@@ -5,7 +5,7 @@ const LICENSE = `
 
 The MIT License (MIT)
 
-Copyright (c) 2016-2024 Sander Verweij
+Copyright (c) 2016-2025 Sander Verweij
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/dist/counter.mjs

@@ -1,9 +1,9 @@
 export class Counter {
-	_lHWM = 0;
+	#lHWM = 0;
 	constructor(pStart = 0) {
-		this._lHWM = pStart;
+		this.#lHWM = pStart;
 	}
 	next() {
-		return ++this._lHWM;
+		return ++this.#lHWM;
 	}
 }

package/dist/parse/scxml/index.mjs

@@ -1,4 +1,4 @@
-import fastxml from "fast-xml-parser";
+import { XMLParser } from "fast-xml-parser";
 import he from "he";
 import traverse from "neotraverse";
 import { Counter } from "../../counter.mjs";
@@ -160,7 +160,7 @@ export function parse(pSCXMLString) {
 	const lTrimmedSCXMLString = pSCXMLString.trim();
 	const lAttributeNamePrefix = "@_";
 	let lXMLAsJSON = {};
-	const lXMLParser = new fastxml.XMLParser({
+	const lXMLParser = new XMLParser({
 		attributeNamePrefix: lAttributeNamePrefix,
 		ignoreAttributes: false,
 		parseTagValue: true,

package/dist/render/dot/index.mjs

@@ -16,7 +16,6 @@ import {
 	normalizeState,
 	stateNote,
 } from "./utl.mjs";
-let gRenderedTransitions = new Set();
 function initial(pState, pIndent) {
 	const lActiveAttribute = pState.active ? " penwidth=3.0" : "";
 	return `${pIndent}  "${pState.name}" [shape=circle style=filled class="${pState.class}" color="${pState.color}" fillcolor="${pState.color}" fixedsize=true height=0.15 label=""${lActiveAttribute}]${pState.noteText}`;
@@ -61,7 +60,13 @@ ${pIndent}    </table>`;
 	return `${pIndent}  "${pState.name}" [margin=0 class="${pState.class}" label= <${lLabelTag}
 ${pIndent}  >${pState.colorAttribute}${pState.fontColorAttribute}${lActiveAttribute}]${pState.noteText}`;
 }
-function compositeRegular(pState, pIndent, pOptions, pModel) {
+function compositeRegular(
+	pState,
+	pIndent,
+	pOptions,
+	pModel,
+	pRenderedTransitions,
+) {
 	const lPenWidth = pState.isParallelArea
 		? "1.0"
 		: pState.active
@@ -85,12 +90,18 @@ ${pIndent}    class="${pState.class}" label= <
 ${lLabelTag}
 ${pIndent}    > style=${lStyle} penwidth=${lPenWidth}${pState.colorAttribute}${pState.fontColorAttribute}
 ${pIndent}    "${pState.name}" [shape=point style=invis margin=0 width=0 height=0 fixedsize=true]
-${states(pState?.statemachine?.states ?? [], `${pIndent}    `, pOptions, pModel)}
+${states(pState?.statemachine?.states ?? [], `${pIndent}    `, pOptions, pModel, pRenderedTransitions)}
 ${pIndent}  }${pState.noteText}`;
 }
-function regular(pState, pIndent, pOptions, pModel) {
+function regular(pState, pIndent, pOptions, pModel, pRenderedTransitions) {
 	if (pState.statemachine) {
-		return compositeRegular(pState, pIndent, pOptions, pModel);
+		return compositeRegular(
+			pState,
+			pIndent,
+			pOptions,
+			pModel,
+			pRenderedTransitions,
+		);
 	}
 	return atomicRegular(pState, pIndent);
 }
@@ -163,14 +174,14 @@ const STATE_TYPE2FUNCTION = new Map([
 	["terminate", terminate],
 	["final", final],
 ]);
-function state(pState, pIndent, pOptions, pModel) {
+function state(pState, pIndent, pOptions, pModel, pRenderedTransitions) {
 	const lState = normalizeState(pState, pOptions, pIndent);
 	const lCandidateTransitions = pModel.findTransitionsToSiblings(
 		pState.name,
-		gRenderedTransitions,
+		pRenderedTransitions,
 	);
 	lCandidateTransitions.forEach((pTransition) => {
-		gRenderedTransitions.add(pTransition.id);
+		pRenderedTransitions.add(pTransition.id);
 	});
 	const lTransitions = transitions(
 		lCandidateTransitions,
@@ -184,14 +195,17 @@ function state(pState, pIndent, pOptions, pModel) {
 			pIndent,
 			pOptions,
 			pModel,
+			pRenderedTransitions,
 		) +
 		lTransitions +
 		"\n"
 	);
 }
-function states(pStates, pIndent, pOptions, pModel) {
+function states(pStates, pIndent, pOptions, pModel, pRenderedTransitions) {
 	return pStates
-		.map((pState) => state(pState, pIndent, pOptions, pModel))
+		.map((pState) =>
+			state(pState, pIndent, pOptions, pModel, pRenderedTransitions),
+		)
 		.join("");
 }
 function transition(pTransition, pIndent, pOptions, pModel) {
@@ -256,17 +270,22 @@ export default function renderDot(pStateMachine, pOptions = {}, pIndent = "") {
 	const lNodeAttributes = buildNodeAttributes(pOptions.dotNodeAttrs || []);
 	const lEdgeAttributes = buildEdgeAttributes(pOptions.dotEdgeAttrs || []);
 	const lModel = new StateMachineModel(pStateMachine);
-	gRenderedTransitions = new Set();
-	const lStates = states(pStateMachine.states, pIndent, pOptions, lModel);
+	const lRenderedTransitions = new Set();
+	const lStates = states(
+		pStateMachine.states,
+		pIndent,
+		pOptions,
+		lModel,
+		lRenderedTransitions,
+	);
 	const lRemainingTransitions = transitions(
 		lModel.flattenedTransitions.filter(
-			(pTransition) => !gRenderedTransitions.has(pTransition.id),
+			(pTransition) => !lRenderedTransitions.has(pTransition.id),
 		),
 		pIndent,
 		pOptions,
 		lModel,
 	);
-	gRenderedTransitions = new Set();
 	return `digraph "state transitions" {
   ${lGraphAttributes}
   node [${lNodeAttributes}]

package/dist/state-machine-model.mjs

@@ -32,26 +32,26 @@ function flattenTransitions(pStateMachine) {
 	return lTransitions;
 }
 export default class StateMachineModel {
-	_flattenedTransitions;
-	_flattenedStates;
+	#flattenedTransitions;
+	#flattenedStates;
 	constructor(pStateMachine) {
-		this._flattenedStates = new Map();
-		flattenStatesToMap(pStateMachine.states ?? [], this._flattenedStates);
-		this._flattenedTransitions = flattenTransitions(pStateMachine);
+		this.#flattenedStates = new Map();
+		flattenStatesToMap(pStateMachine.states ?? [], this.#flattenedStates);
+		this.#flattenedTransitions = flattenTransitions(pStateMachine);
 	}
 	get flattenedTransitions() {
-		return this._flattenedTransitions;
+		return this.#flattenedTransitions;
 	}
 	findStateByName(pName) {
-		return this._flattenedStates.get(pName);
+		return this.#flattenedStates.get(pName);
 	}
 	findStatesByTypes(pTypes) {
-		return Array.from(this._flattenedStates.values()).filter((pState) =>
+		return Array.from(this.#flattenedStates.values()).filter((pState) =>
 			pTypes.includes(pState.type),
 		);
 	}
 	findExternalSelfTransitions(pStateName) {
-		return this._flattenedTransitions.filter(
+		return this.#flattenedTransitions.filter(
 			(pTransition) =>
 				pTransition.from === pStateName &&
 				pTransition.to === pStateName &&
@@ -59,25 +59,25 @@ export default class StateMachineModel {
 		);
 	}
 	findTransitionsByFrom(pFromStateName) {
-		return this._flattenedTransitions.filter(
+		return this.#flattenedTransitions.filter(
 			(pTransition) => pTransition.from === pFromStateName,
 		);
 	}
 	findTransitionsByTo(pToStateName) {
-		return this._flattenedTransitions.filter(
+		return this.#flattenedTransitions.filter(
 			(pTransition) => pTransition.to === pToStateName,
 		);
 	}
 	getMaximumTransitionId() {
-		return Math.max(...this._flattenedTransitions.map(({ id }) => id));
+		return Math.max(...this.#flattenedTransitions.map(({ id }) => id));
 	}
 	findTransitionsToSiblings(pStateName, pExcludeIds) {
-		return this._flattenedTransitions.filter(
+		return this.#flattenedTransitions.filter(
 			(pTransition) =>
 				!pExcludeIds.has(pTransition.id) &&
 				pTransition.from === pStateName &&
-				this._flattenedStates.get(pTransition.to)?.parent ===
-					this._flattenedStates.get(pStateName)?.parent,
+				this.#flattenedStates.get(pTransition.to)?.parent ===
+					this.#flattenedStates.get(pStateName)?.parent,
 		);
 	}
 }

package/dist/version.mjs

@@ -1 +1 @@
-export const version = "12.0.20";
+export const version = "12.0.22";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "state-machine-cat",
-	"version": "12.0.20",
+	"version": "12.0.22",
 	"description": "write beautiful state charts",
 	"main": "./dist/index.mjs",
 	"module": "./dist/index.mjs",
@@ -42,7 +42,7 @@
 	"dependencies": {
 		"@hpcc-js/wasm-graphviz": "1.7.0",
 		"ajv": "8.17.1",
-		"fast-xml-parser": "4.5.1",
+		"fast-xml-parser": "5.2.0",
 		"he": "1.2.0",
 		"neotraverse": "0.6.18"
 	},