@statewalker/fsm-charts 0.2.4 → 0.2.6

package/src/dagre/util.js

@@ -1,5 +1,5 @@
-import { _ } from '../lodash-es/index.ts';
-import { Graph } from '../graphlib/index.js';
+import { Graph } from "../graphlib/index.js";
+import { _ } from "../lodash-es/index.ts";
 
 export {
   addDummyNode,
@@ -38,10 +38,10 @@ function addDummyNode(g, type, attrs, name) {
  */
 function simplify(g) {
   var simplified = new Graph().setGraph(g.graph());
-  _.forEach(g.nodes(), function (v) {
+  _.forEach(g.nodes(), (v) => {
     simplified.setNode(v, g.node(v));
   });
-  _.forEach(g.edges(), function (e) {
+  _.forEach(g.edges(), (e) => {
     var simpleLabel = simplified.edge(e.v, e.w) || { weight: 0, minlen: 1 };
     var label = g.edge(e);
     simplified.setEdge(e.v, e.w, {
@@ -53,22 +53,24 @@ function simplify(g) {
 }
 
 function asNonCompoundGraph(g) {
-  var simplified = new Graph({ multigraph: g.isMultigraph() }).setGraph(g.graph());
-  _.forEach(g.nodes(), function (v) {
+  var simplified = new Graph({ multigraph: g.isMultigraph() }).setGraph(
+    g.graph(),
+  );
+  _.forEach(g.nodes(), (v) => {
     if (!g.children(v).length) {
       simplified.setNode(v, g.node(v));
     }
   });
-  _.forEach(g.edges(), function (e) {
+  _.forEach(g.edges(), (e) => {
     simplified.setEdge(e, g.edge(e));
   });
   return simplified;
 }
 
 function successorWeights(g) {
-  var weightMap = _.map(g.nodes(), function (v) {
+  var weightMap = _.map(g.nodes(), (v) => {
     var sucs = {};
-    _.forEach(g.outEdges(v), function (e) {
+    _.forEach(g.outEdges(v), (e) => {
       sucs[e.w] = (sucs[e.w] || 0) + g.edge(e).weight;
     });
     return sucs;
@@ -77,9 +79,9 @@ function successorWeights(g) {
 }
 
 function predecessorWeights(g) {
-  var weightMap = _.map(g.nodes(), function (v) {
+  var weightMap = _.map(g.nodes(), (v) => {
     var preds = {};
-    _.forEach(g.inEdges(v), function (e) {
+    _.forEach(g.inEdges(v), (e) => {
       preds[e.v] = (preds[e.v] || 0) + g.edge(e).weight;
     });
     return preds;
@@ -103,7 +105,9 @@ function intersectRect(rect, point) {
   var h = rect.height / 2;
 
   if (!dx && !dy) {
-    throw new Error('Not possible to find intersection inside of the rectangle');
+    throw new Error(
+      "Not possible to find intersection inside of the rectangle",
+    );
   }
 
   var sx, sy;
@@ -131,10 +135,8 @@ function intersectRect(rect, point) {
  * function will produce a matrix with the ids of each node.
  */
 function buildLayerMatrix(g) {
-  var layering = _.map(_.range(maxRank(g) + 1), function () {
-    return [];
-  });
-  _.forEach(g.nodes(), function (v) {
+  var layering = _.map(_.range(maxRank(g) + 1), () => []);
+  _.forEach(g.nodes(), (v) => {
     var node = g.node(v);
     var rank = node.rank;
     if (!_.isUndefined(rank)) {
@@ -149,14 +151,10 @@ function buildLayerMatrix(g) {
  * rank(v) >= 0 and at least one node w has rank(w) = 0.
  */
 function normalizeRanks(g) {
-  var min = _.min(
-    _.map(g.nodes(), function (v) {
-      return g.node(v).rank;
-    })
-  );
-  _.forEach(g.nodes(), function (v) {
+  var min = _.min(_.map(g.nodes(), (v) => g.node(v).rank));
+  _.forEach(g.nodes(), (v) => {
     var node = g.node(v);
-    if (_.has(node, 'rank')) {
+    if (_.has(node, "rank")) {
       node.rank -= min;
     }
   });
@@ -164,14 +162,10 @@ function normalizeRanks(g) {
 
 function removeEmptyRanks(g) {
   // Ranks may not start at 0, so we need to offset them
-  var offset = _.min(
-    _.map(g.nodes(), function (v) {
-      return g.node(v).rank;
-    })
-  );
+  var offset = _.min(_.map(g.nodes(), (v) => g.node(v).rank));
 
   var layers = [];
-  _.forEach(g.nodes(), function (v) {
+  _.forEach(g.nodes(), (v) => {
     var rank = g.node(v).rank - offset;
     if (!layers[rank]) {
       layers[rank] = [];
@@ -181,11 +175,11 @@ function removeEmptyRanks(g) {
 
   var delta = 0;
   var nodeRankFactor = g.graph().nodeRankFactor;
-  _.forEach(layers, function (vs, i) {
+  _.forEach(layers, (vs, i) => {
     if (_.isUndefined(vs) && i % nodeRankFactor !== 0) {
       --delta;
     } else if (delta) {
-      _.forEach(vs, function (v) {
+      _.forEach(vs, (v) => {
         g.node(v).rank += delta;
       });
     }
@@ -201,17 +195,17 @@ function addBorderNode(g, prefix, rank, order) {
     node.rank = rank;
     node.order = order;
   }
-  return addDummyNode(g, 'border', node, prefix);
+  return addDummyNode(g, "border", node, prefix);
 }
 
 function maxRank(g) {
   return _.max(
-    _.map(g.nodes(), function (v) {
+    _.map(g.nodes(), (v) => {
       var rank = g.node(v).rank;
       if (!_.isUndefined(rank)) {
         return rank;
       }
-    })
+    }),
   );
 }
 
@@ -222,7 +216,7 @@ function maxRank(g) {
  */
 function partition(collection, fn) {
   var result = { lhs: [], rhs: [] };
-  _.forEach(collection, function (value) {
+  _.forEach(collection, (value) => {
     if (fn(value)) {
       result.lhs.push(value);
     } else {
@@ -241,10 +235,10 @@ function time(name, fn) {
   try {
     return fn();
   } finally {
-    console.log(name + ' time: ' + (_.now() - start) + 'ms');
+    console.log(`${name} time: ${_.now() - start}ms`);
   }
 }
 
-function notime(name, fn) {
+function notime(_name, fn) {
   return fn();
 }

package/src/dom/buildSections.ts

@@ -12,14 +12,14 @@ export function buildSections(root: HTMLElement | Iterable<Node>): DomSection {
   let peek: DomSection = null!;
   const stack: DomSection[] = [];
   const aligner = newTreeBuilder<[HTMLElement?]>({
-    enter(level, header) {
+    enter(_level, header) {
       const section: DomSection = {
         header,
         content: [],
         children: [],
       };
       top = top || section;
-      peek && peek.children.push(section);
+      peek?.children.push(section);
       peek = section;
       stack.push(section);
     },
@@ -29,20 +29,20 @@ export function buildSections(root: HTMLElement | Iterable<Node>): DomSection {
     },
   });
   aligner(0);
-  let currentHeaderLevel = 0;
-  let currentLevel = 0;
+  // Track the actual header magnitudes of the open ancestor sections. A header of
+  // level L closes every open header at its level or deeper, then opens at the
+  // resulting depth. Deriving depth from the real magnitudes (not a ±1 delta) keeps
+  // nesting correct for any header sequence and never goes negative.
+  const headerLevels: number[] = [];
   for (const node of nodes) {
     if (isDomElement(node)) {
       if (/^H[1-6]$/i.test(node.tagName)) {
         const headerLevel = +node.tagName.replace(/^H/, "");
-        currentLevel =
-          headerLevel > currentHeaderLevel
-            ? currentLevel + 1
-            : headerLevel < currentHeaderLevel
-              ? currentLevel - 1
-              : currentLevel;
-        currentHeaderLevel = headerLevel;
-        aligner(currentLevel, node);
+        while (headerLevels.length > 0 && headerLevels[headerLevels.length - 1] >= headerLevel) {
+          headerLevels.pop();
+        }
+        headerLevels.push(headerLevel);
+        aligner(headerLevels.length, node);
       } else {
         peek.content.push(node);
       }
@@ -73,13 +73,11 @@ export function* vistSections(
   }
 }
 
-export function findSection(
-  section: DomSection,
-  accept: (section: DomSection) => boolean,
-) {
+export function findSection(section: DomSection, accept: (section: DomSection) => boolean) {
   for (const s of vistSections(section)) {
     if (accept(s) === true) return s;
   }
+  return undefined;
 }
 
 // --------------------------------------------
@@ -89,9 +87,7 @@ export function isDomElement(node: Node): node is HTMLElement {
   return node.nodeType === Node.ELEMENT_NODE;
 }
 
-export function* toDomNodesIterator(
-  root: Node | Iterable<Node>,
-): Iterable<Node> {
+export function* toDomNodesIterator(root: Node | Iterable<Node>): Iterable<Node> {
   yield* root instanceof Node ? visitDom(root) : root;
 }
 

package/src/dom/description-panels.ts

@@ -1,12 +1,10 @@
-import { type DomSection } from "./buildSections.js";
+import type { DomSection } from "./buildSections.js";
 import { getStatesDescriptions } from "./getStatesDescriptions.js";
 
 export function getStateDescriptionRenderer(options: {
   element: HTMLElement;
   rootStateKey: string;
-  splitHeader?: (
-    header?: HTMLElement,
-  ) => [stateKey: undefined | string, label: string];
+  splitHeader?: (header?: HTMLElement) => [stateKey: undefined | string, label: string];
 }) {
   const descriptionsIndex = getStatesDescriptions(options);
 
@@ -19,7 +17,7 @@ export function getStateDescriptionRenderer(options: {
 
     const elm = renderSections({
       section,
-      deep: (section) => false, // section.state !== options.rootStateKey, // ???
+      deep: (_section) => false, // section.state !== options.rootStateKey, // ???
       header: (section) => {
         if (section.state === stateKey) {
           return section.title || section.state;
@@ -28,14 +26,14 @@ export function getStateDescriptionRenderer(options: {
       },
     });
     const details = elm?.querySelector("details");
-    details && (details.open = true);
+    if (details) details.open = true;
     return elm;
   };
 }
 
 export function renderSections<T extends DomSection>({
   section,
-  deep = (s) => true,
+  deep = (_s) => true,
   header = (section) => section.header?.cloneNode(true) as Node,
 }: {
   section: T;

package/src/dom/getStatesDescriptions.ts

@@ -1,9 +1,9 @@
 import {
   buildSections,
+  type DomSection,
   findSection,
   visitSectionNodes,
   vistSections,
-  type DomSection,
 } from "./buildSections.js";
 
 export type StateDescriptionSection = DomSection & {
@@ -14,9 +14,7 @@ export function* visitStateDescriptions({
   element,
   rootStateKey,
   removeFromDom = true,
-  splitHeader = (
-    header?: HTMLElement,
-  ): [stateKey: undefined | string, label: string] => {
+  splitHeader = (header?: HTMLElement): [stateKey: undefined | string, label: string] => {
     if (!header) return [undefined, ""];
     const text = header.innerText.trim();
     let key: string | undefined;
@@ -32,9 +30,7 @@ export function* visitStateDescriptions({
   element: HTMLElement;
   rootStateKey: string;
   removeFromDom?: boolean; // If true - removes state description nodes from the DOM
-  splitHeader?: (
-    header?: HTMLElement,
-  ) => [stateKey: undefined | string, label: string];
+  splitHeader?: (header?: HTMLElement) => [stateKey: undefined | string, label: string];
 }): Generator<StateDescriptionSection> {
   const docSections = buildSections(element);
   const rootDescription = findSection(docSections, (section: DomSection) => {
@@ -68,9 +64,7 @@ export function getStatesDescriptions(options: {
   element: HTMLElement;
   rootStateKey: string;
   removeFromDom?: boolean; // If true - removes state description nodes from the DOM
-  splitHeader?: (
-    header?: HTMLElement,
-  ) => [stateKey: undefined | string, label: string];
+  splitHeader?: (header?: HTMLElement) => [stateKey: undefined | string, label: string];
 }): { [state: string]: StateDescriptionSection } {
   const index: { [state: string]: StateDescriptionSection } = {};
   for (const description of visitStateDescriptions(options)) {

package/src/full/index.ts

@@ -1 +1 @@
-export * from "./toFsmStateCharts.ts";
+export * from "./toFsmStateCharts.js";

package/src/full/toFsmStateCharts.ts

@@ -1,14 +1,14 @@
-import { newId } from "../utils/newId.ts";
-import { newRegistry } from "../utils/newRegistry.ts";
-import { RuntimeStatechartApi, StateChartIndex } from "../runtime/index.ts";
 import {
   buildStatechartCss,
   buildStatechartsPanel,
-  FsmStateConfig,
-  StateChart,
-  StateGraphEdge,
-} from "../index-html.ts";
-import { buildCharts, getGraphParamsProvider } from "../index-layout.ts";
+  type FsmStateConfig,
+  type StateChart,
+  type StateGraphEdge,
+} from "../index-html.js";
+import { buildCharts, getGraphParamsProvider } from "../index-layout.js";
+import { RuntimeStatechartApi, StateChartIndex } from "../runtime/index.js";
+import { newId } from "../utils/newId.js";
+import { newRegistry } from "../utils/newRegistry.js";
 
 export type FsmStateCharts = {
   api: RuntimeStatechartApi;
@@ -92,11 +92,11 @@ ${css}
         const stateId = node.id;
         if (i < nodes.length - 1 || selected) {
           const transitions = index.getTransitions(stateId);
-          transitions.forEach((t) => api.selectTransition(t.id));
+          for (const t of transitions) api.selectTransition(t.id);
         }
       }
       // api.focusStates(...nodeIds);
-    })
+    }),
   );
 
   if (onTransitionClick) {
@@ -104,7 +104,7 @@ ${css}
       api.onTransitionClick((transitionId) => {
         const transition = index.getEdgeById(transitionId);
         transition && onTransitionClick(transition);
-      })
+      }),
     );
   }
   return {

package/src/graphlib/alg/components.js

@@ -1,4 +1,4 @@
-import { _ } from '../../lodash-es/index.ts';
+import { _ } from "../../lodash-es/index.ts";
 
 export { components };
 
@@ -15,7 +15,7 @@ function components(g) {
     _.each(g.predecessors(v), dfs);
   }
 
-  _.each(g.nodes(), function (v) {
+  _.each(g.nodes(), (v) => {
     cmpt = [];
     dfs(v);
     if (cmpt.length) {

package/src/graphlib/alg/dfs.js

@@ -1,4 +1,4 @@
-import { _ } from '../../lodash-es/index.ts';
+import { _ } from "../../lodash-es/index.ts";
 
 export { dfs };
 
@@ -19,12 +19,12 @@ function dfs(g, vs, order) {
 
   var acc = [];
   var visited = {};
-  _.each(vs, function (v) {
+  _.each(vs, (v) => {
     if (!g.hasNode(v)) {
-      throw new Error('Graph does not have node: ' + v);
+      throw new Error(`Graph does not have node: ${v}`);
     }
 
-    doDfs(g, v, order === 'post', visited, navigation, acc);
+    doDfs(g, v, order === "post", visited, navigation, acc);
   });
   return acc;
 }
@@ -36,7 +36,7 @@ function doDfs(g, v, postorder, visited, navigation, acc) {
     if (!postorder) {
       acc.push(v);
     }
-    _.each(navigation(v), function (w) {
+    _.each(navigation(v), (w) => {
       doDfs(g, w, postorder, visited, navigation, acc);
     });
     if (postorder) {

package/src/graphlib/alg/dijkstra-all.js

@@ -1,14 +1,14 @@
-import { _ } from '../../lodash-es/index.ts';
-import { dijkstra } from './dijkstra.js';
+import { _ } from "../../lodash-es/index.ts";
+import { dijkstra } from "./dijkstra.js";
 
 export { dijkstraAll };
 
 function dijkstraAll(g, weightFunc, edgeFunc) {
   return _.transform(
     g.nodes(),
-    function (acc, v) {
+    (acc, v) => {
       acc[v] = dijkstra(g, v, weightFunc, edgeFunc);
     },
-    {}
+    {},
   );
 }

package/src/graphlib/alg/dijkstra.js

@@ -1,5 +1,5 @@
-import { _ } from '../../lodash-es/index.ts';
-import { PriorityQueue } from '../data/priority-queue.js';
+import { _ } from "../../lodash-es/index.ts";
+import { PriorityQueue } from "../data/priority-queue.js";
 
 export { dijkstra };
 
@@ -10,10 +10,7 @@ function dijkstra(g, source, weightFn, edgeFn) {
     g,
     String(source),
     weightFn || DEFAULT_WEIGHT_FUNC,
-    edgeFn ||
-      function (v) {
-        return g.outEdges(v);
-      }
+    edgeFn || ((v) => g.outEdges(v)),
   );
 }
 
@@ -22,7 +19,7 @@ function runDijkstra(g, source, weightFn, edgeFn) {
   var pq = new PriorityQueue();
   var v, vEntry;
 
-  var updateNeighbors = function (edge) {
+  var updateNeighbors = (edge) => {
     var w = edge.v !== v ? edge.v : edge.w;
     var wEntry = results[w];
     var weight = weightFn(edge);
@@ -30,11 +27,11 @@ function runDijkstra(g, source, weightFn, edgeFn) {
 
     if (weight < 0) {
       throw new Error(
-        'dijkstra does not allow negative edge weights. ' +
-          'Bad edge: ' +
+        "dijkstra does not allow negative edge weights. " +
+          "Bad edge: " +
           edge +
-          ' Weight: ' +
-          weight
+          " Weight: " +
+          weight,
       );
     }
 
@@ -45,7 +42,7 @@ function runDijkstra(g, source, weightFn, edgeFn) {
     }
   };
 
-  g.nodes().forEach(function (v) {
+  g.nodes().forEach((v) => {
     var distance = v === source ? 0 : Number.POSITIVE_INFINITY;
     results[v] = { distance: distance };
     pq.add(v, distance);

package/src/graphlib/alg/find-cycles.js

@@ -1,10 +1,12 @@
-import { _ } from '../../lodash-es/index.ts';
-import { tarjan } from './tarjan.js';
+import { _ } from "../../lodash-es/index.ts";
+import { tarjan } from "./tarjan.js";
 
 export { findCycles };
 
 function findCycles(g) {
-  return _.filter(tarjan(g), function (cmpt) {
-    return cmpt.length > 1 || (cmpt.length === 1 && g.hasEdge(cmpt[0], cmpt[0]));
-  });
+  return _.filter(
+    tarjan(g),
+    (cmpt) =>
+      cmpt.length > 1 || (cmpt.length === 1 && g.hasEdge(cmpt[0], cmpt[0])),
+  );
 }

package/src/graphlib/alg/floyd-warshall.js

@@ -1,4 +1,4 @@
-import { _ } from '../../lodash-es/index.ts';
+import { _ } from "../../lodash-es/index.ts";
 
 export { floydWarshall };
 
@@ -8,10 +8,7 @@ function floydWarshall(g, weightFn, edgeFn) {
   return runFloydWarshall(
     g,
     weightFn || DEFAULT_WEIGHT_FUNC,
-    edgeFn ||
-      function (v) {
-        return g.outEdges(v);
-      }
+    edgeFn || ((v) => g.outEdges(v)),
   );
 }
 
@@ -19,26 +16,26 @@ function runFloydWarshall(g, weightFn, edgeFn) {
   var results = {};
   var nodes = g.nodes();
 
-  nodes.forEach(function (v) {
+  nodes.forEach((v) => {
     results[v] = {};
     results[v][v] = { distance: 0 };
-    nodes.forEach(function (w) {
+    nodes.forEach((w) => {
       if (v !== w) {
         results[v][w] = { distance: Number.POSITIVE_INFINITY };
       }
     });
-    edgeFn(v).forEach(function (edge) {
+    edgeFn(v).forEach((edge) => {
       var w = edge.v === v ? edge.w : edge.v;
       var d = weightFn(edge);
       results[v][w] = { distance: d, predecessor: v };
     });
   });
 
-  nodes.forEach(function (k) {
+  nodes.forEach((k) => {
     var rowK = results[k];
-    nodes.forEach(function (i) {
+    nodes.forEach((i) => {
       var rowI = results[i];
-      nodes.forEach(function (j) {
+      nodes.forEach((j) => {
         var ik = rowI[k];
         var kj = rowK[j];
         var ij = rowI[j];

package/src/graphlib/alg/index.d.ts

@@ -1,14 +1,14 @@
-import { components } from './components.js';
-import { dijkstra } from './dijkstra.js';
-import { dijkstraAll } from './dijkstra-all.js';
-import { findCycles } from './find-cycles.js';
-import { floydWarshall } from './floyd-warshall.js';
-import { isAcyclic } from './is-acyclic.js';
-import { postorder } from './postorder.js';
-import { preorder } from './preorder.js';
-import { prim } from './prim.js';
-import { tarjan } from './tarjan.js';
-import { topsort } from './topsort.js';
+import { components } from "./components.js";
+import { dijkstra } from "./dijkstra.js";
+import { dijkstraAll } from "./dijkstra-all.js";
+import { findCycles } from "./find-cycles.js";
+import { floydWarshall } from "./floyd-warshall.js";
+import { isAcyclic } from "./is-acyclic.js";
+import { postorder } from "./postorder.js";
+import { preorder } from "./preorder.js";
+import { prim } from "./prim.js";
+import { tarjan } from "./tarjan.js";
+import { topsort } from "./topsort.js";
 export {
   components,
   dijkstra,

package/src/graphlib/alg/index.js

@@ -1,14 +1,14 @@
-import { components } from './components.js';
-import { dijkstra } from './dijkstra.js';
-import { dijkstraAll } from './dijkstra-all.js';
-import { findCycles } from './find-cycles.js';
-import { floydWarshall } from './floyd-warshall.js';
-import { isAcyclic } from './is-acyclic.js';
-import { postorder } from './postorder.js';
-import { preorder } from './preorder.js';
-import { prim } from './prim.js';
-import { tarjan } from './tarjan.js';
-import { topsort } from './topsort.js';
+import { components } from "./components.js";
+import { dijkstra } from "./dijkstra.js";
+import { dijkstraAll } from "./dijkstra-all.js";
+import { findCycles } from "./find-cycles.js";
+import { floydWarshall } from "./floyd-warshall.js";
+import { isAcyclic } from "./is-acyclic.js";
+import { postorder } from "./postorder.js";
+import { preorder } from "./preorder.js";
+import { prim } from "./prim.js";
+import { tarjan } from "./tarjan.js";
+import { topsort } from "./topsort.js";
 
 export {
   components,

package/src/graphlib/alg/is-acyclic.js

@@ -1,4 +1,4 @@
-import { topsort, CycleException } from './topsort.js';
+import { CycleException, topsort } from "./topsort.js";
 
 export { isAcyclic };
 

package/src/graphlib/alg/postorder.js

@@ -1,7 +1,7 @@
-import { dfs } from './dfs.js';
+import { dfs } from "./dfs.js";
 
 export { postorder };
 
 function postorder(g, vs) {
-  return dfs(g, vs, 'post');
+  return dfs(g, vs, "post");
 }

package/src/graphlib/alg/preorder.js

@@ -1,7 +1,7 @@
-import { dfs } from './dfs.js';
+import { dfs } from "./dfs.js";
 
 export { preorder };
 
 function preorder(g, vs) {
-  return dfs(g, vs, 'pre');
+  return dfs(g, vs, "pre");
 }

package/src/graphlib/alg/prim.d.ts

@@ -1,2 +1,2 @@
 export function prim(g: any, weightFunc: any): Graph;
-import { Graph } from '../graph.js';
+import { Graph } from "../graph.js";