state-machine-cat 14.0.3 → 14.0.5

package/dist/cli/normalize.mjs

@@ -1,42 +1,40 @@
 import path from "node:path";
 import { getAllowedValues } from "../options.mjs";
 import { parse as parseAttributes } from "./attributes-parser.mjs";
-const INPUT_EXTENSIONS = {
-	".smcat": "smcat",
-	".scxml": "scxml",
-	".xml": "scxml",
-	".json": "json",
-	".ast": "json",
-};
-const OUTPUT_EXTENSIONS = {
-	".ast": "json",
-	".dot": "dot",
-	".eps": "eps",
-	".json": "json",
-	".pdf": "pdf",
-	".png": "png",
-	".ps": "ps",
-	".ps2": "ps2",
-	".scjson": "scjson",
-	".scxml": "scxml",
-	".smcat": "smcat",
-	".svg": "svg",
-};
+const INPUT_EXTENSIONS = new Map([
+	[".smcat", "smcat"],
+	[".scxml", "scxml"],
+	[".xml", "scxml"],
+	[".json", "json"],
+	[".ast", "json"],
+]);
+const OUTPUT_EXTENSIONS = new Map([
+	[".ast", "json"],
+	[".dot", "dot"],
+	[".eps", "eps"],
+	[".json", "json"],
+	[".pdf", "pdf"],
+	[".png", "png"],
+	[".ps", "ps"],
+	[".ps2", "ps2"],
+	[".scjson", "scjson"],
+	[".scxml", "scxml"],
+	[".smcat", "smcat"],
+	[".svg", "svg"],
+]);
+const NON_OBVIOUS_OUTPUT_EXTENSIONS = new Map([
+	["oldeps", "eps"],
+	["oldps", "ps"],
+	["oldps2", "ps"],
+	["oldsvg", "svg"],
+	["ps2", "ps2"],
+]);
 function classifyExtension(pString, pExtensionMap, pDefault) {
-	return pExtensionMap[path.extname(pString)] || pDefault;
-}
-function outputType2Extension(pOutputType) {
-	const lExceptions = {
-		oldeps: "eps",
-		oldps: "ps",
-		oldps2: "ps",
-		oldsvg: "svg",
-		ps2: "ps",
-	};
-	return lExceptions[pOutputType] || pOutputType;
+	return pExtensionMap.get(path.extname(pString)) || pDefault;
 }
 function deriveOutputFromInput(pInputFrom, pOutputType) {
-	const lExtension = outputType2Extension(pOutputType);
+	const lExtension =
+		NON_OBVIOUS_OUTPUT_EXTENSIONS.get(pOutputType) || pOutputType;
 	if (!pInputFrom || "-" === pInputFrom) {
 		return "-";
 	}

package/dist/index.mjs

@@ -7,9 +7,7 @@ import getRenderFunction from "./render/index.mjs";
 import { version as _version } from "./version.mjs";
 let gDesugarModule = null;
 async function desugar(pStateMachine) {
-	if (!gDesugarModule) {
-		gDesugarModule = await import("./transform/desugar.mjs");
-	}
+	gDesugarModule ??= await import("./transform/desugar.mjs");
 	const lDesugarFunction = gDesugarModule.default;
 	return lDesugarFunction(pStateMachine);
 }

package/dist/parse/parser-helpers.mjs

@@ -1,7 +1,4 @@
 import StateMachineModel from "../state-machine-model.mjs";
-const TRIGGER_RE_AS_A_STRING =
-	"^(entry|activity|exit)\\s*/\\s*([^\\n$]*)(\\n|$)";
-const TRIGGER_RE = new RegExp(TRIGGER_RE_AS_A_STRING);
 function stateExists(pKnownStateNames, pName) {
 	return pKnownStateNames.includes(pName);
 }
@@ -131,23 +128,23 @@ export function uniq(pArray, pEqualFunction) {
 		return pBag.concat(pMarble);
 	}, []);
 }
+const TRANSITION_EXPRESSION_RE =
+	/(?<event>[^[/]{1,256})?(?<condition>\[[^\]]{1,256}\])?[^/]{0,100}(?<action>\/.{1,2048})?/;
 export function parseTransitionExpression(pString) {
-	const lTransitionExpressionRe = /([^[/]+)?(\[[^\]]+\])?[^/]*(\/.+)?/;
 	const lReturnValue = {};
-	const lMatchResult = lTransitionExpressionRe.exec(pString);
-	const lEventPos = 1;
-	const lConditionPos = 2;
-	const lActionPos = 3;
-	if (lMatchResult[lEventPos]) {
-		lReturnValue.event = lMatchResult[lEventPos].trim();
-	}
-	if (lMatchResult[lConditionPos]) {
-		lReturnValue.cond = lMatchResult[lConditionPos].slice(1, -1).trim();
-	}
-	if (lMatchResult[lActionPos]) {
-		lReturnValue.action = lMatchResult[lActionPos]
-			.slice(1, lMatchResult[lActionPos].length)
-			.trim();
+	const lMatch = TRANSITION_EXPRESSION_RE.exec(pString);
+	if (lMatch?.groups) {
+		if (lMatch.groups.event) {
+			lReturnValue.event = lMatch.groups.event.trim();
+		}
+		if (lMatch.groups.condition) {
+			lReturnValue.cond = lMatch.groups.condition.slice(1, -1).trim();
+		}
+		if (lMatch.groups.action) {
+			lReturnValue.action = lMatch.groups.action
+				.slice(1, lMatch.groups.action.length)
+				.trim();
+		}
 	}
 	return lReturnValue;
 }
@@ -159,20 +156,16 @@ export function setIf(pObject, pProperty, pValue, pCondition = Boolean) {
 export function setIfNotEmpty(pObject, pProperty, pValue) {
 	setIf(pObject, pProperty, pValue, (pX) => pX && pX.length > 0);
 }
+const TRIGGER_RE =
+	/^(?<triggerType>entry|activity|exit)\s{0,100}\/\s{0,100}(?<triggerBody>[^\n$]{0,2048})(?:\n|$)/;
 function extractAction(pActivityCandidate) {
+	const lReturnValue = { type: "activity", body: pActivityCandidate };
 	const lMatch = TRIGGER_RE.exec(pActivityCandidate);
-	const lTypePos = 1;
-	const lBodyPos = 2;
-	if (lMatch) {
-		return {
-			type: lMatch[lTypePos],
-			body: lMatch[lBodyPos],
-		};
+	if (lMatch?.groups) {
+		lReturnValue.type = lMatch.groups.triggerType;
+		lReturnValue.body = lMatch.groups.triggerBody;
 	}
-	return {
-		type: "activity",
-		body: pActivityCandidate,
-	};
+	return lReturnValue;
 }
 export function extractActions(pString) {
 	return pString

package/dist/parse/smcat/smcat-parser.mjs

@@ -454,7 +454,7 @@ function peg$parse(input, options) {
 		return parseInt(digits.join(""), 10);
 	}
 	function peg$f32(s) {
-		return s.join("").replace(/\\\"/g, '"');
+		return s.join("").replaceAll(/\\\"/g, '"');
 	}
 	function peg$f33(c) {
 		return c;

package/dist/render/dot/index.mjs

@@ -124,7 +124,7 @@ function choiceActions(pActions, pActive) {
 			}
 			return lReturnValue;
 		})
-		.join("\\n");
+		.join(String.raw`\n`);
 }
 function choice(pState, pIndent) {
 	const lActiveAttribute = pState.active ? "penwidth=3.0 " : "";

package/dist/render/dot/utl.mjs

@@ -1,39 +1,36 @@
 import he from "he";
 import { getOptionValue } from "../../options.mjs";
+const COLORABLE_STATE_TYPES = new Set([
+	"initial",
+	"fork",
+	"join",
+	"junction",
+	"forkjoin",
+	"terminate",
+	"final",
+]);
 function getStateColor(pState, pNodeAttributes) {
 	const lNodeColor = (pNodeAttributes || []).find(
 		(pAttribute) => pAttribute.name === "color",
 	)?.value;
-	if (
-		lNodeColor &&
-		!pState.color &&
-		[
-			"initial",
-			"fork",
-			"join",
-			"junction",
-			"forkjoin",
-			"terminate",
-			"final",
-		].includes(pState.type)
-	) {
+	if (lNodeColor && !pState.color && COLORABLE_STATE_TYPES.has(pState.type)) {
 		return lNodeColor;
 	}
 	return pState.color ?? "black";
 }
 export function escapeString(pString) {
 	return pString
-		.replace(/\\/g, "\\\\")
-		.replace(/\n\s*/g, "\\l")
-		.replace(/"/g, '\\"')
-		.concat("\\l");
+		.replaceAll("\\", String.raw`\\`)
+		.replaceAll(/\n\s*/g, String.raw`\l`)
+		.replaceAll('"', String.raw`\"`)
+		.concat(String.raw`\l`);
 }
 export function escapeLabelString(pString) {
 	return pString
-		.replace(/\\/g, "\\\\")
-		.replace(/\n\s*/g, "   \\l")
-		.replace(/"/g, '\\"')
-		.concat("   \\l");
+		.replaceAll("\\", String.raw`\\`)
+		.replaceAll(/\n\s*/g, String.raw`   \l`)
+		.replaceAll('"', String.raw`\"`)
+		.concat(String.raw`   \l`);
 }
 export function isVertical(pDirection) {
 	const lDirection = pDirection || "top-down";

package/dist/render/index.mjs

@@ -6,34 +6,24 @@ let gSCXMLModule = null;
 export default async function getRenderFunction(pOutputType) {
 	switch (pOutputType) {
 		case "smcat": {
-			if (!gSmCatModule) {
-				gSmCatModule = await import("./smcat.mjs");
-			}
+			gSmCatModule ??= await import("./smcat.mjs");
 			return gSmCatModule.default;
 		}
 		case "dot": {
-			if (!gDotModule) {
-				gDotModule = await import("./dot/index.mjs");
-			}
+			gDotModule ??= await import("./dot/index.mjs");
 			return gDotModule.default;
 		}
 		case "svg":
 		case "oldsvg": {
-			if (!gSVGModule) {
-				gSVGModule = await import("./vector/vector-with-wasm.mjs");
-			}
+			gSVGModule ??= await import("./vector/vector-with-wasm.mjs");
 			return gSVGModule.default;
 		}
 		case "scjson": {
-			if (!gSCJSONModule) {
-				gSCJSONModule = await import("./scjson/index.mjs");
-			}
+			gSCJSONModule ??= await import("./scjson/index.mjs");
 			return gSCJSONModule.default;
 		}
 		case "scxml": {
-			if (!gSCXMLModule) {
-				gSCXMLModule = await import("./scxml/index.mjs");
-			}
+			gSCXMLModule ??= await import("./scxml/index.mjs");
 			return gSCXMLModule.default;
 		}
 		default:

package/dist/render/scjson/index.mjs

@@ -1,17 +1,17 @@
 import StateMachineModel from "../../state-machine-model.mjs";
 import makeValidXMLName from "./make-valid-xml-name.mjs";
 import makeValidEventNames from "./make-valid-event-names.mjs";
-const STATE_TYPE2SCXML_STATE_KIND = {
-	regular: "state",
-	initial: "initial",
-	final: "final",
-	terminate: "final",
-	parallel: "parallel",
-	history: "history",
-	deephistory: "history",
-};
+const STATE_TYPE2SCXML_STATE_KIND = new Map([
+	["regular", "state"],
+	["initial", "initial"],
+	["final", "final"],
+	["terminate", "final"],
+	["parallel", "parallel"],
+	["history", "history"],
+	["deephistory", "history"],
+]);
 function stateType2SCXMLStateKind(pStateType) {
-	return STATE_TYPE2SCXML_STATE_KIND[pStateType] || "state";
+	return STATE_TYPE2SCXML_STATE_KIND.get(pStateType) || "state";
 }
 function transformTransition(pTransition) {
 	const lReturnValue = {

package/dist/render/scjson/make-valid-event-names.mjs

@@ -2,7 +2,7 @@ const EVENT_CHAR_FORBIDDEN_RE =
 	/[\u00B7\u0300-\u036F\u203F-\u2040\u0000-\u0029\u002B-\u002C\u002F\u003B-\u0040\u005B-\u0060\u007B-\u00BF\u00D7\u00F7\u0300-\u036F\u037E\u2000-\u200B\u200E-\u206F\u2190-\u2BFF\u2FF0-\u3000\uD800-\uF8FF\uFDD0-\uFDEF\uFFFE-\uFFFF]/g;
 const START_EVENT_CHAR_FORBIDDEN_EXTRA_RE = /[.]/g;
 function makeValidEventChar(pCandidateEventStringTail) {
-	return pCandidateEventStringTail.replace(EVENT_CHAR_FORBIDDEN_RE, "_");
+	return pCandidateEventStringTail.replaceAll(EVENT_CHAR_FORBIDDEN_RE, "_");
 }
 function makeValidEventStartChar(pCandidateEventStringStart) {
 	let lReturnValue = makeValidEventChar(pCandidateEventStringStart);
@@ -12,12 +12,12 @@ function makeValidEventStartChar(pCandidateEventStringStart) {
 	return lReturnValue;
 }
 function makeValidEventName(pCandidateEventName) {
-	pCandidateEventName = pCandidateEventName.replace(/\s+/g, " ").trim();
+	pCandidateEventName = pCandidateEventName.replaceAll(/\s+/g, " ").trim();
 	return makeValidEventStartChar(pCandidateEventName[0]).concat(
 		makeValidEventChar(pCandidateEventName.slice(1)),
 	);
 }
-export default (pCandidateEventNames) => {
+export default function makeValidEventNames(pCandidateEventNames) {
 	const lCandidateEventNames = pCandidateEventNames ?? "";
 	if (lCandidateEventNames.length === 0) {
 		return "empty";
@@ -27,4 +27,4 @@ export default (pCandidateEventNames) => {
 		.filter((pCandidateEventName) => pCandidateEventName.length > 0)
 		.map(makeValidEventName)
 		.join(" ");
-};
+}

package/dist/render/scjson/make-valid-xml-name.mjs

@@ -3,7 +3,7 @@ const NAME_CHAR_FORBIDDEN_RE =
 const START_NAME_CHAR_FORBIDDEN_EXTRA_RE =
 	/[-.0-9\u00B7\u0300-\u036F\u203F-\u2040]/g;
 function makeValidNameChars(pCandidateNameTail) {
-	return pCandidateNameTail.replace(NAME_CHAR_FORBIDDEN_RE, "_");
+	return pCandidateNameTail.replaceAll(NAME_CHAR_FORBIDDEN_RE, "_");
 }
 function makeValidNameStartChar(pCandidateChar) {
 	let lReturnValue = makeValidNameChars(pCandidateChar);
@@ -12,7 +12,7 @@ function makeValidNameStartChar(pCandidateChar) {
 	}
 	return lReturnValue;
 }
-export default (pCandidateName) => {
+export default function makeValidXMLName(pCandidateName) {
 	pCandidateName = pCandidateName || "";
 	if (pCandidateName.length === 0) {
 		return `__empty`;
@@ -20,4 +20,4 @@ export default (pCandidateName) => {
 	return makeValidNameStartChar(pCandidateName[0]).concat(
 		makeValidNameChars(pCandidateName.slice(1)),
 	);
-};
+}

package/dist/render/scxml/render-from-scjson.mjs

@@ -2,7 +2,7 @@ import he from "he";
 const INDENT_LENGTH = 4;
 function indentString(pString, pCount) {
 	const lRegex = /^(?!\s*$)/gm;
-	return pString.replace(lRegex, " ".repeat(pCount));
+	return pString.replaceAll(lRegex, " ".repeat(pCount));
 }
 function renderTransitionAttributes(pTransition) {
 	let lReturnValue = "";

package/dist/render/smcat.mjs

@@ -1,14 +1,14 @@
 const NAME_QUOTABLE = /[;,{[ ]/;
 const ACTIONS_QUOTABLE = /[;,{}]/;
 const LABEL_QUOTABLE = /[;{]/;
-const RENDERABLE_STATE_ATTRIBUTES = [
+const RENDERABLE_STATE_ATTRIBUTES = new Set([
 	"label",
 	"type",
 	"color",
 	"active",
 	"class",
-];
-const RENDERABLE_TRANSITION_ATTRIBUTES = ["type", "color", "class"];
+]);
+const RENDERABLE_TRANSITION_ATTRIBUTES = new Set(["type", "color", "class"]);
 function quoteIfNecessary(pRegExp, pString) {
 	return pRegExp.test(pString) ? `"${pString}"` : pString;
 }
@@ -35,7 +35,7 @@ function extendedAttribute(pKey, pValue) {
 }
 function extendedStateAttributes(pState) {
 	return Object.entries(pState)
-		.filter(([pKey]) => RENDERABLE_STATE_ATTRIBUTES.includes(pKey))
+		.filter(([pKey]) => RENDERABLE_STATE_ATTRIBUTES.has(pKey))
 		.filter(([pKey]) => pKey !== "type" || pState.typeExplicitlySet)
 		.map(([pKey, pValue]) => extendedAttribute(pKey, pValue))
 		.join(" ");
@@ -75,12 +75,12 @@ function states(pStates, pIndent = "") {
 }
 function transitionHasExtendedAttributes(pTransition) {
 	return Object.entries(pTransition).some(([pKey]) =>
-		RENDERABLE_TRANSITION_ATTRIBUTES.includes(pKey),
+		RENDERABLE_TRANSITION_ATTRIBUTES.has(pKey),
 	);
 }
 function extendedTransitionAttributes(pTransition) {
 	return Object.entries(pTransition)
-		.filter(([pKey]) => RENDERABLE_TRANSITION_ATTRIBUTES.includes(pKey))
+		.filter(([pKey]) => RENDERABLE_TRANSITION_ATTRIBUTES.has(pKey))
 		.map(([pKey, pValue]) => extendedAttribute(pKey, pValue))
 		.join(" ");
 }

package/dist/render/vector/vector-native-dot-with-fallback.mjs

@@ -2,7 +2,7 @@ import { Graphviz } from "@hpcc-js/wasm-graphviz";
 import { getOptionValue } from "../../options.mjs";
 import ast2dot from "../dot/index.mjs";
 import { isAvailable, convert } from "./dot-to-vector-native.mjs";
-const VIZ_JS_UNSUPPORTED_OUTPUT_FORMATS = ["pdf", "png"];
+const VIZ_JS_UNSUPPORTED_OUTPUT_FORMATS = new Set(["pdf", "png"]);
 const gGraphViz = await Graphviz.load();
 const renderVector = (pStateMachine, pOptions) => {
 	const lDotProgram = ast2dot(pStateMachine, pOptions);
@@ -13,7 +13,7 @@ const renderVector = (pStateMachine, pOptions) => {
 	if (isAvailable(pOptions)) {
 		return convert(lDotProgram, lDotOptions);
 	} else {
-		if (VIZ_JS_UNSUPPORTED_OUTPUT_FORMATS.includes(lDotOptions.format)) {
+		if (VIZ_JS_UNSUPPORTED_OUTPUT_FORMATS.has(lDotOptions.format)) {
 			throw new Error(
 				"GraphViz 'dot' executable not found. Falling back to wasm.\n\n" +
 					"The compiled-to-wasm version of GraphViz we use doesn't support the " +

package/dist/state-machine-model.mjs

@@ -40,6 +40,9 @@ export default class StateMachineModel {
 	get flattenedTransitions() {
 		return this.#flattenedTransitions;
 	}
+	get flattenedStates() {
+		return this.#flattenedStates;
+	}
 	findStateByName(pName) {
 		return this.#flattenedStates.get(pName);
 	}

package/dist/transform/desugar.mjs

@@ -116,10 +116,10 @@ function removeStatesCascading(pMachine, pStateNames) {
 		);
 	return lMachine;
 }
-export default (
+export default function desugar(
 	pMachine,
 	pDesugarableStates = ["fork", "junction", "choice"],
-) => {
+) {
 	const lModel = new StateMachineModel(pMachine);
 	const lPseudoStateNames = lModel
 		.findStatesByTypes(pDesugarableStates)
@@ -139,4 +139,4 @@ export default (
 		new Counter(lMaximumTransitionId),
 	);
 	return removeStatesCascading(lMachine, lPseudoStateNames);
-};
+}

package/dist/version.mjs

@@ -1 +1 @@
-export const version = "14.0.3";
+export const version = "14.0.5";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "state-machine-cat",
-	"version": "14.0.3",
+	"version": "14.0.5",
 	"description": "write beautiful state charts",
 	"type": "module",
 	"main": "./dist/index.mjs",
@@ -41,8 +41,8 @@
 		"state-machine-cat": "dist/cli/main.mjs"
 	},
 	"dependencies": {
-		"@hpcc-js/wasm-graphviz": "1.18.0",
-		"fast-xml-parser": "5.3.3",
+		"@hpcc-js/wasm-graphviz": "1.20.1",
+		"fast-xml-parser": "5.3.4",
 		"he": "1.2.0",
 		"neotraverse": "0.6.18"
 	},