state-machine-cat 12.0.18 → 12.0.19

package/README.md

@@ -518,7 +518,7 @@ eat   -> sleep [color="blue" width=3.5] : belly full;
 
 ... would yield this diagram:
 
-<img width="659" alt="colored states and transitions" src="https://raw.githubusercontent.com/sverweij/state-machine-cat/main/docs/pics/10colored_states_and_transitions.png">
+<img width="488" alt="colored states and transitions" src="https://raw.githubusercontent.com/sverweij/state-machine-cat/main/docs/pics/10colored_states_and_transitions.png">
 
 What does 'experimental' mean?
 

package/dist/cli/cli.mjs

@@ -1,12 +1,8 @@
-import { readFileSync } from "node:fs";
 import { parseArgs } from "node:util";
-import satisfies from "semver/functions/satisfies.js";
+import { version } from "../version.mjs";
 import { formatError, displayLicense, transform } from "./actions.mjs";
 import normalize from "./normalize.mjs";
 import validations from "./validations.mjs";
-const $package = JSON.parse(
-	readFileSync(new URL("../../package.json", import.meta.url), "utf8"),
-);
 const HELP_TEXT = `Usage: smcat [options] [infile]
 
 Write beautiful state charts - https://github.com/sverweij/state-machine-cat
@@ -130,31 +126,20 @@ function parseArguments(pArguments) {
 		);
 	return { values: camelizeObject(values), positionals };
 }
-function assertNodeVersion(pCurrentNodeVersion, pSupportedEngines) {
-	if (!satisfies(pCurrentNodeVersion, pSupportedEngines)) {
-		throw new Error(
-			`\nERROR: your node version (${pCurrentNodeVersion}) is not recent enough.\n` +
-				`       state-machine-cat is supported on node ${pSupportedEngines}\n\n`,
-		);
-	}
-}
 export default async function cli(pArguments = process.argv, pOptions) {
 	const lOptions = {
-		currentNodeVersion: process.versions.node,
-		supportedEngines: $package.engines.node,
 		outStream: process.stdout,
 		errorStream: process.stderr,
 		...pOptions,
 	};
 	try {
-		assertNodeVersion(lOptions.currentNodeVersion, lOptions.supportedEngines);
 		const { values, positionals } = parseArguments(pArguments.slice(2));
 		if (values.help) {
 			lOptions.outStream.write(HELP_TEXT, "utf8");
 			return;
 		}
 		if (values.version) {
-			lOptions.outStream.write(`${$package.version}\n`, "utf8");
+			lOptions.outStream.write(`${version}\n`, "utf8");
 			return;
 		}
 		if (values.license) {

package/dist/parse/scxml/index.mjs

@@ -1,6 +1,6 @@
 import fastxml from "fast-xml-parser";
 import he from "he";
-import traverse from "traverse";
+import traverse from "neotraverse";
 import utl from "../../transform/utl.mjs";
 import parserHelpers from "../parser-helpers.mjs";
 import { castArray } from "./utl.mjs";

package/dist/render/dot/index.mjs

@@ -16,6 +16,7 @@ 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}`;
@@ -164,13 +165,28 @@ const STATE_TYPE2FUNCTION = new Map([
 ]);
 function state(pState, pIndent, pOptions, pModel) {
 	const lState = normalizeState(pState, pOptions, pIndent);
+	const lCandidateTransitions = pModel.findTransitionsToSiblings(
+		pState.name,
+		gRenderedTransitions,
+	);
+	lCandidateTransitions.forEach((pTransition) => {
+		gRenderedTransitions.add(pTransition.id);
+	});
+	const lTransitions = transitions(
+		lCandidateTransitions,
+		pIndent,
+		pOptions,
+		pModel,
+	);
 	return (
 		(STATE_TYPE2FUNCTION.get(pState.type) ?? regular)(
 			lState,
 			pIndent,
 			pOptions,
 			pModel,
-		) + "\n"
+		) +
+		lTransitions +
+		"\n"
 	);
 }
 function states(pStates, pIndent, pOptions, pModel) {
@@ -233,19 +249,23 @@ 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 lTransitions = transitions(
-		lModel.flattenedTransitions,
+	const lRemainingTransitions = transitions(
+		lModel.flattenedTransitions.filter(
+			(pTransition) => !gRenderedTransitions.has(pTransition.id),
+		),
 		pIndent,
 		pOptions,
 		lModel,
 	);
+	gRenderedTransitions = new Set();
 	return `digraph "state transitions" {
   ${lGraphAttributes}
   node [${lNodeAttributes}]
   edge [${lEdgeAttributes}]
 
-${lStates}${lTransitions}
+${lStates}${lRemainingTransitions}
 }
 `;
 }

package/dist/render/dot/utl.mjs

@@ -42,7 +42,8 @@ export function isVertical(pDirection) {
 export function isCompositeSelf(pStateMachineModel, pTransition) {
 	return (
 		pTransition.from === pTransition.to &&
-		pStateMachineModel.findStateByName(pTransition.from).statemachine &&
+		(pStateMachineModel.findStateByName(pTransition.from)?.statemachine ??
+			false) &&
 		pTransition.type !== "internal"
 	);
 }
@@ -94,7 +95,7 @@ export function getTransitionPorts(pOptions, pModel, pTransition) {
 	if (isVertical(lDirection)) {
 		lTailPorts = ' tailport="e" headport="e"';
 		lHeadPorts = ' tailport="w"';
-	} else if (pModel.findStateByName(pTransition.from).hasParent) {
+	} else if (pModel.findStateByName(pTransition.from)?.parent ?? false) {
 		lTailPorts = ' tailport="n" headport="n"';
 		lHeadPorts = ' tailport="s"';
 	}

package/dist/state-machine-model.mjs

@@ -1,21 +1,18 @@
-function flattenStates(pStates, pHasParent = false) {
-	let lReturnValue = [];
+function flattenStatesToMap(pStates, pMap, pParent = "") {
 	pStates
 		.filter((pState) => Boolean(pState.statemachine))
 		.forEach((pState) => {
 			if (Object.hasOwn(pState.statemachine, "states")) {
-				lReturnValue = lReturnValue.concat(
-					flattenStates(pState.statemachine.states, true),
-				);
+				flattenStatesToMap(pState.statemachine.states, pMap, pState.name);
 			}
 		});
-	return lReturnValue.concat(
-		pStates.map((pState) => ({
+	pStates.forEach((pState) =>
+		pMap.set(pState.name, {
 			name: pState.name,
 			type: pState.type,
 			statemachine: Boolean(pState.statemachine),
-			hasParent: pHasParent,
-		})),
+			parent: pParent,
+		}),
 	);
 }
 function flattenTransitions(pStateMachine) {
@@ -38,17 +35,18 @@ export default class StateMachineModel {
 	_flattenedTransitions;
 	_flattenedStates;
 	constructor(pStateMachine) {
-		this._flattenedStates = flattenStates(pStateMachine.states || []);
+		this._flattenedStates = new Map();
+		flattenStatesToMap(pStateMachine.states ?? [], this._flattenedStates);
 		this._flattenedTransitions = flattenTransitions(pStateMachine);
 	}
 	get flattenedTransitions() {
 		return this._flattenedTransitions;
 	}
 	findStateByName(pName) {
-		return this._flattenedStates.find((pState) => pState.name === pName);
+		return this._flattenedStates.get(pName);
 	}
 	findStatesByTypes(pTypes) {
-		return this._flattenedStates.filter((pState) =>
+		return Array.from(this._flattenedStates.values()).filter((pState) =>
 			pTypes.includes(pState.type),
 		);
 	}
@@ -70,4 +68,13 @@ export default class StateMachineModel {
 			(pTransition) => pTransition.to === pToStateName,
 		);
 	}
+	findTransitionsToSiblings(pStateName, pExcludeIds) {
+		return this._flattenedTransitions.filter(
+			(pTransition) =>
+				!pExcludeIds.has(pTransition.id) &&
+				pTransition.from === pStateName &&
+				this._flattenedStates.get(pTransition.to)?.parent ===
+					this._flattenedStates.get(pStateName)?.parent,
+		);
+	}
 }

package/dist/version.mjs

@@ -1 +1 @@
-export const version = "12.0.18";
+export const version = "12.0.19";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "state-machine-cat",
-	"version": "12.0.18",
+	"version": "12.0.19",
 	"description": "write beautiful state charts",
 	"main": "./dist/index.mjs",
 	"module": "./dist/index.mjs",
@@ -44,8 +44,7 @@
 		"ajv": "8.17.1",
 		"fast-xml-parser": "4.5.1",
 		"he": "1.2.0",
-		"semver": "^7.6.2",
-		"traverse": "0.6.8"
+		"neotraverse": "0.6.18"
 	},
 	"engines": {
 		"node": "^18.17||>=20"