jssm 5.152.0 → 5.153.0

package/dist/cdn/viz.js

@@ -913,7 +913,19 @@ function peg$parse(input, options) {
             node.loc = location();
         }
         return node;
-    }, peg$c1573 = peg$otherExpectation("arrange declaration"), peg$currPos = 0, peg$savedPos = 0, peg$posDetailsCache = [{ line: 1, column: 1 }], peg$maxFailPos = 0, peg$maxFailExpected = [], peg$silentFails = 0, peg$result;
+    }, peg$c1573 = peg$otherExpectation("oarrange declaration"), peg$c1574 = "oarrange", peg$c1575 = peg$literalExpectation("oarrange", false), peg$c1576 = function (value) {
+        const node = { key: 'oarrange_declaration', value };
+        if (options.locations) {
+            node.loc = location();
+        }
+        return node;
+    }, peg$c1577 = peg$otherExpectation("farrange declaration"), peg$c1578 = "farrange", peg$c1579 = peg$literalExpectation("farrange", false), peg$c1580 = function (value) {
+        const node = { key: 'farrange_declaration', value };
+        if (options.locations) {
+            node.loc = location();
+        }
+        return node;
+    }, peg$c1581 = peg$otherExpectation("arrange declaration"), peg$currPos = 0, peg$savedPos = 0, peg$posDetailsCache = [{ line: 1, column: 1 }], peg$maxFailPos = 0, peg$maxFailExpected = [], peg$silentFails = 0, peg$result;
     if ("startRule" in options) {
         if (!(options.startRule in peg$startRuleFunctions)) {
             throw new Error("Can't start parsing from rule \"" + options.startRule + "\".");
@@ -20481,6 +20493,176 @@ function peg$parse(input, options) {
         }
         return s0;
     }
+    function peg$parseOArrangeDeclaration() {
+        var s0, s1, s2, s3, s4, s5, s6;
+        peg$silentFails++;
+        s0 = peg$currPos;
+        if (input.substr(peg$currPos, 8) === peg$c1574) {
+            s1 = peg$c1574;
+            peg$currPos += 8;
+        }
+        else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0 && peg$currPos >= peg$maxFailPos) {
+                peg$fail(peg$c1575);
+            }
+        }
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parseWS();
+            if (s2 === peg$FAILED) {
+                s2 = null;
+            }
+            if (s2 !== peg$FAILED) {
+                s3 = peg$parseLabelOrLabelList();
+                if (s3 !== peg$FAILED) {
+                    s4 = peg$parseWS();
+                    if (s4 === peg$FAILED) {
+                        s4 = null;
+                    }
+                    if (s4 !== peg$FAILED) {
+                        if (input.charCodeAt(peg$currPos) === 59) {
+                            s5 = peg$c1213;
+                            peg$currPos++;
+                        }
+                        else {
+                            s5 = peg$FAILED;
+                            if (peg$silentFails === 0 && peg$currPos >= peg$maxFailPos) {
+                                peg$fail(peg$c1214);
+                            }
+                        }
+                        if (s5 !== peg$FAILED) {
+                            s6 = peg$parseWS();
+                            if (s6 === peg$FAILED) {
+                                s6 = null;
+                            }
+                            if (s6 !== peg$FAILED) {
+                                peg$savedPos = s0;
+                                s1 = peg$c1576(s3);
+                                s0 = s1;
+                            }
+                            else {
+                                peg$currPos = s0;
+                                s0 = peg$FAILED;
+                            }
+                        }
+                        else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                    }
+                    else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                }
+                else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            }
+            else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        peg$silentFails--;
+        if (s0 === peg$FAILED) {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0 && peg$currPos >= peg$maxFailPos) {
+                peg$fail(peg$c1573);
+            }
+        }
+        return s0;
+    }
+    function peg$parseFArrangeDeclaration() {
+        var s0, s1, s2, s3, s4, s5, s6;
+        peg$silentFails++;
+        s0 = peg$currPos;
+        if (input.substr(peg$currPos, 8) === peg$c1578) {
+            s1 = peg$c1578;
+            peg$currPos += 8;
+        }
+        else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0 && peg$currPos >= peg$maxFailPos) {
+                peg$fail(peg$c1579);
+            }
+        }
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parseWS();
+            if (s2 === peg$FAILED) {
+                s2 = null;
+            }
+            if (s2 !== peg$FAILED) {
+                s3 = peg$parseLabelOrLabelList();
+                if (s3 !== peg$FAILED) {
+                    s4 = peg$parseWS();
+                    if (s4 === peg$FAILED) {
+                        s4 = null;
+                    }
+                    if (s4 !== peg$FAILED) {
+                        if (input.charCodeAt(peg$currPos) === 59) {
+                            s5 = peg$c1213;
+                            peg$currPos++;
+                        }
+                        else {
+                            s5 = peg$FAILED;
+                            if (peg$silentFails === 0 && peg$currPos >= peg$maxFailPos) {
+                                peg$fail(peg$c1214);
+                            }
+                        }
+                        if (s5 !== peg$FAILED) {
+                            s6 = peg$parseWS();
+                            if (s6 === peg$FAILED) {
+                                s6 = null;
+                            }
+                            if (s6 !== peg$FAILED) {
+                                peg$savedPos = s0;
+                                s1 = peg$c1580(s3);
+                                s0 = s1;
+                            }
+                            else {
+                                peg$currPos = s0;
+                                s0 = peg$FAILED;
+                            }
+                        }
+                        else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                    }
+                    else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                }
+                else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            }
+            else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        }
+        else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        peg$silentFails--;
+        if (s0 === peg$FAILED) {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0 && peg$currPos >= peg$maxFailPos) {
+                peg$fail(peg$c1577);
+            }
+        }
+        return s0;
+    }
     function peg$parseArrangeDeclaration() {
         var s0;
         peg$silentFails++;
@@ -20488,13 +20670,19 @@ function peg$parse(input, options) {
         if (s0 === peg$FAILED) {
             s0 = peg$parseArrangeEndDeclaration();
             if (s0 === peg$FAILED) {
-                s0 = peg$parseRegularArrangeDeclaration();
+                s0 = peg$parseOArrangeDeclaration();
+                if (s0 === peg$FAILED) {
+                    s0 = peg$parseFArrangeDeclaration();
+                    if (s0 === peg$FAILED) {
+                        s0 = peg$parseRegularArrangeDeclaration();
+                    }
+                }
             }
         }
         peg$silentFails--;
         if (s0 === peg$FAILED) {
             if (peg$silentFails === 0 && peg$currPos >= peg$maxFailPos) {
-                peg$fail(peg$c1573);
+                peg$fail(peg$c1581);
             }
         }
         return s0;
@@ -22395,7 +22583,8 @@ function compile_rule_handler(rule) {
         return { agg_as: 'state_declaration', val: { state: rule.name, declarations: rule.value } };
     }
     if (['arrange_declaration', 'arrange_start_declaration',
-        'arrange_end_declaration'].includes(rule.key)) {
+        'arrange_end_declaration', 'oarrange_declaration',
+        'farrange_declaration'].includes(rule.key)) {
         return { agg_as: rule.key, val: [rule.value] };
     }
     // things that can only exist once and are just a value under their own name
@@ -22601,6 +22790,8 @@ function compile(tree) {
         arrange_declaration: [],
         arrange_start_declaration: [],
         arrange_end_declaration: [],
+        oarrange_declaration: [],
+        farrange_declaration: [],
         machine_version: [],
         default_state_config: [],
         default_active_state_config: [],
@@ -22726,6 +22917,7 @@ function compile(tree) {
         }
     });
     ['arrange_declaration', 'arrange_start_declaration', 'arrange_end_declaration',
+        'oarrange_declaration', 'farrange_declaration',
         'machine_author', 'machine_contributor', 'machine_reference', 'theme',
         'state_declaration', 'property_definition', 'default_state_config',
         'default_start_state_config', 'default_end_state_config',
@@ -23396,7 +23588,7 @@ var constants = /*#__PURE__*/Object.freeze({
  *  Useful for runtime diagnostics and for embedding in serialized machine
  *  snapshots so that deserializers can detect version-skew.
  */
-const version = "5.152.0";
+const version = "5.153.0";
 
 // whargarbl lots of these return arrays could/should be sets
 const { state_name_chars, state_name_first_chars, action_label_chars } = constants;
@@ -23713,7 +23905,7 @@ function find_connected_components(states, edges) {
 }
 class Machine {
     // whargarbl this badly needs to be broken up, monolith master
-    constructor({ start_states, end_states = [], failed_outputs = [], initial_state, start_states_no_enforce, complete = [], transitions, machine_author, machine_comment, machine_contributor, machine_definition, machine_language, machine_license, machine_name, machine_version, npm_name, default_size, state_declaration, property_definition, state_property, fsl_version, dot_preamble = undefined, arrange_declaration = [], arrange_start_declaration = [], arrange_end_declaration = [], theme = ['default'], flow = 'down', graph_layout = 'dot', instance_name, history, boundary_depth_limit, data, default_state_config, default_active_state_config, default_hooked_state_config, default_terminal_state_config, default_start_state_config, default_end_state_config, default_transition_config, default_graph_config, group_registry, group_metadata, group_hooks, state_hooks, allows_override, config_allows_override, allow_islands, editor_config, rng_seed, time_source, timeout_source, clear_timeout_source }) {
+    constructor({ start_states, end_states = [], failed_outputs = [], initial_state, start_states_no_enforce, complete = [], transitions, machine_author, machine_comment, machine_contributor, machine_definition, machine_language, machine_license, machine_name, machine_version, npm_name, default_size, state_declaration, property_definition, state_property, fsl_version, dot_preamble = undefined, arrange_declaration = [], arrange_start_declaration = [], arrange_end_declaration = [], oarrange_declaration = [], farrange_declaration = [], theme = ['default'], flow = 'down', graph_layout = 'dot', instance_name, history, boundary_depth_limit, data, default_state_config, default_active_state_config, default_hooked_state_config, default_terminal_state_config, default_start_state_config, default_end_state_config, default_transition_config, default_graph_config, group_registry, group_metadata, group_hooks, state_hooks, allows_override, config_allows_override, allow_islands, editor_config, rng_seed, time_source, timeout_source, clear_timeout_source }) {
         this._time_source = time_source !== null && time_source !== void 0 ? time_source : (() => new Date().getTime());
         this._create_started = this._time_source();
         this._instance_name = instance_name;
@@ -23750,6 +23942,8 @@ class Machine {
         this._arrange_declaration = arrange_declaration;
         this._arrange_start_declaration = arrange_start_declaration;
         this._arrange_end_declaration = arrange_end_declaration;
+        this._oarrange_declaration = oarrange_declaration;
+        this._farrange_declaration = farrange_declaration;
         this._dot_preamble = dot_preamble;
         this._themes = theme;
         this._flow = flow;
@@ -24162,11 +24356,11 @@ class Machine {
         }
         this._created = this._time_source();
         this.auto_set_state_timeout();
-        this._arrange_declaration.forEach((arrange_pair) => arrange_pair.forEach((possibleState) => {
+        [this._arrange_declaration, this._oarrange_declaration, this._farrange_declaration].forEach((declaration) => declaration.forEach((arrange_pair) => arrange_pair.forEach((possibleState) => {
             if (!(this._states.has(possibleState))) {
                 throw new JssmError(this, `Cannot arrange state that does not exist "${possibleState}"`);
             }
-        }));
+        })));
     }
     /********
      *
@@ -24371,13 +24565,13 @@ class Machine {
      *  `;
      *
      *  traffic_light.state();  // Off
-     *  traffic_light.props();  // { can_go: true,  hesitate: true,  stop_first: true;  }
+     *  traffic_light.props();  // { can_go: true,  hesitate: true,  stop_first: true  }
      *
      *  traffic_light.go('Red');
-     *  traffic_light.props();  // { can_go: false, hesitate: true,  stop_first: true;  }
+     *  traffic_light.props();  // { can_go: false, hesitate: true,  stop_first: true  }
      *
      *  traffic_light.go('Green');
-     *  traffic_light.props();  // { can_go: true,  hesitate: false, stop_first: false; }
+     *  traffic_light.props();  // { can_go: true,  hesitate: false, stop_first: false }
      *  ```
      *
      *  @returns An object mapping every known property name to its current value
@@ -29164,6 +29358,11 @@ function colored_label(tr, which, color) {
 function states_to_edges_string(u_jssm, l_states, state_index, state_kinds) {
     const strike = new Set();
     const kind_of = (s) => { var _a; return (_a = state_kinds.get(s)) !== null && _a !== void 0 ? _a : 'base'; };
+    // `farrange` forces its members' left-to-right order by relaxing the rank
+    // constraint of every real edge incident to a member, so the invisible
+    // ordering chain (emitted in arranges_for) wins over the members' own edges.
+    const farrange_members = new Set((u_jssm._farrange_declaration || []).flat().map(String));
+    const cf = (s, ex) => (farrange_members.has(String(s)) || farrange_members.has(String(ex))) ? 'constraint=false;' : '';
     // Render one solo directed edge `s -> ex` for transition `tr`.
     const solo_edge = (s, ex, tr) => {
         const ex_kind = kind_of(ex);
@@ -29173,7 +29372,7 @@ function states_to_edges_string(u_jssm, l_states, state_index, state_kinds) {
         const maybeLabel = label ? `taillabel="${doublequote(label)}";` : '';
         const arrowHead = arrow_for(tr);
         const edgeInline = `${maybeLabel}arrowhead=${arrowHead};color="${line_color(ex_kind, tr.kind, '_solo')}"`;
-        return `${node_of(s, state_index)}->${node_of(ex, state_index)} [${labelInline}${edgeInline}];`;
+        return `${node_of(s, state_index)}->${node_of(ex, state_index)} [${cf(s, ex)}${labelInline}${edgeInline}];`;
     };
     return l_states.map((s) => u_jssm.list_exits(s).map((ex) => {
         if (strike.has(`${s}|${ex}`)) {
@@ -29207,7 +29406,7 @@ function states_to_edges_string(u_jssm, l_states, state_index, state_kinds) {
             const arrowTail = arrow_for(pair_tr);
             const edgeInline = `${maybeLabel}${maybeRLabel}arrowhead=${arrowHead};arrowtail=${arrowTail};dir=both;color="${line_color(ex_kind, edge_tr.kind, '_1')}:${line_color(s_kind, pair_tr.kind, '_2')}"`;
             strike.add(`${ex}|${s}`);
-            return `${node_of(s, state_index)}->${node_of(ex, state_index)} [${labelInline}${edgeInline}];`;
+            return `${node_of(s, state_index)}->${node_of(ex, state_index)} [${cf(s, ex)}${labelInline}${edgeInline}];`;
         }
         // one directed line per forward edge — parallel action edges (#325) and
         // self-loops (#531) draw each transition separately.  The reverse edges,
@@ -29216,8 +29415,15 @@ function states_to_edges_string(u_jssm, l_states, state_index, state_kinds) {
     }).join(' ')).join(' ');
 }
 /**
- *  Render `arrange`, `arrange_start`, and `arrange_end` declarations to
- *  rank-grouped subgraphs (`rank=same`/`rank=min`/`rank=max`).
+ *  Render `arrange`, `arrange_start`, `arrange_end`, `oarrange`, and `farrange`
+ *  declarations to rank-grouped subgraphs (`rank=same`/`rank=min`/`rank=max`).
+ *
+ *  `arrange*` emit only a rank group. `oarrange`/`farrange` additionally emit an
+ *  invisible left-to-right ordering chain (`a->b->c [style=invis]`) so the listed
+ *  states keep their written order on the rank. `oarrange` is best-effort (it
+ *  yields to hard rank constraints, never reshaping the graph); `farrange`'s
+ *  ordering is forced by also relaxing its members' real edges via
+ *  `constraint=false`, emitted in {@link states_to_edges_string}.
  *
  *  @internal
  */
@@ -29225,9 +29431,16 @@ function arranges_for(u_jssm, state_index) {
     const group = (decls, rank) => decls
         ? decls.map(d => `{rank=${rank}; ${d.map(di => node_of(di, state_index)).join('; ')};};`).join('\n')
         : '';
+    // For each group, an invisible chain pinning left-to-right order: one
+    // `prev->cur [style=invis]` edge per adjacent pair (empty for <2 members).
+    const order_chain = (decls) => decls
+        ? decls.map(d => d.slice(1).map((di, i) => `${node_of(d[i], state_index)}->${node_of(di, state_index)} [style=invis];`).join(' ')).join('\n')
+        : '';
     return group(u_jssm._arrange_declaration, 'same')
         + group(u_jssm._arrange_start_declaration, 'min')
-        + group(u_jssm._arrange_end_declaration, 'max');
+        + group(u_jssm._arrange_end_declaration, 'max')
+        + group(u_jssm._oarrange_declaration, 'same') + order_chain(u_jssm._oarrange_declaration)
+        + group(u_jssm._farrange_declaration, 'same') + order_chain(u_jssm._farrange_declaration);
 }
 /**
  *  Slugify a group name into the body of a Graphviz `cluster_…` subgraph

package/dist/cli/fsl-export-system-prompt.cjs

@@ -108,7 +108,7 @@ function parseFslArgs(argv, spec) {
   return { positional, flags, helpText };
 }
 
-const getVersion = () => "5.152.0";
+const getVersion = () => "5.153.0";
 const SPEC = {
   flags: {
     help: { short: "h", boolean: true },