jssm 5.82.0 → 5.82.1

package/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-1037 merges; 148 releases; Changlogging the last 10 commits; Full changelog at [CHANGELOG.long.md](CHANGELOG.long.md)
+1038 merges; 148 releases; Changlogging the last 10 commits; Full changelog at [CHANGELOG.long.md](CHANGELOG.long.md)
 
 
 
@@ -18,6 +18,21 @@ Published tags:
 
 
 
+ 
+
+ 
+
+## [Untagged] - 8/19/2022 11:04:20 PM
+
+Commit [88d7309bfd2217fe9aeae3be681ae1f520542365](https://github.com/StoneCypher/jssm/commit/88d7309bfd2217fe9aeae3be681ae1f520542365)
+
+Author: `John Haugeland <stonecypher@gmail.com>`
+
+  * Multiple themes, fixes StoneCypher/fsl#128
+
+
+
+
 &nbsp;
 
 &nbsp;
@@ -155,19 +170,4 @@ Author: `John Haugeland <stonecypher@gmail.com>`
 Merges [6cb2816, b59b5b5]
 
   * Merge pull request #527 from StoneCypher/AddInlineStylesToResolver
-  * Adds inline styles to resolver, fixes StoneCypher/fsl#1160
-
-
-
-
-&nbsp;
-
-&nbsp;
-
-## [Untagged] - 8/7/2022 11:52:57 PM
-
-Commit [b59b5b530de566d82b6fa707d66f9b5ceb2037e8](https://github.com/StoneCypher/jssm/commit/b59b5b530de566d82b6fa707d66f9b5ceb2037e8)
-
-Author: `John Haugeland <stonecypher@gmail.com>`
-
   * Adds inline styles to resolver, fixes StoneCypher/fsl#1160

package/README.md

@@ -18,7 +18,7 @@ Please edit the file it's derived from, instead: `./src/md/readme_base.md`
 
 
 
-* Generated for version 5.82.0 at 8/19/2022, 11:01:13 PM
+* Generated for version 5.82.1 at 8/20/2022, 11:14:58 AM
 
 -->
 # jssm
@@ -29,7 +29,7 @@ share online.  Easy to embed.
 
 Readable, useful state machines as one-liner strings.
 
-***4,837 tests*** run 5,728 times.  4,828 specs with 100.0% coverage, 9 fuzz tests with 5.4% coverage.  With 2,511 lines, that's about 1.9 tests per line, or 2.3 generated tests per line.
+***4,840 tests*** run 5,731 times.  4,831 specs with 100.0% coverage, 9 fuzz tests with 5.4% coverage.  With 2,612 lines, that's about 1.9 tests per line, or 2.2 generated tests per line.
 
 ***Meet your new state machine library.***
 

package/dist/es6/jssm.d.ts

@@ -1,6 +1,6 @@
 declare type StateType = string;
 import { JssmGenericState, JssmGenericConfig, JssmStateConfig, JssmTransition, JssmTransitionList, // JssmTransitionRule,
-JssmMachineInternalState, JssmParseTree, JssmStateDeclaration, JssmStateStyleKeyList, JssmArrow, JssmArrowDirection, JssmArrowKind, JssmLayout, JssmHistory, JssmSerialization, FslDirection, FslTheme, HookDescription, HookHandler, HookContext, HookResult, HookComplexResult } from './jssm_types';
+JssmMachineInternalState, JssmParseTree, JssmStateDeclaration, JssmStateStyleKeyList, JssmArrow, JssmArrowDirection, JssmArrowKind, JssmLayout, JssmHistory, JssmSerialization, FslDirection, FslDirections, FslTheme, HookDescription, HookHandler, HookContext, HookResult, HookComplexResult } from './jssm_types';
 import { seq, unique, find_repeated, weighted_rand_select, weighted_sample_select, histograph, weighted_histo_key } from './jssm_util';
 import * as constants from './jssm_constants';
 declare const shapes: string[], gviz_shapes: string[], named_colors: string[];
@@ -625,7 +625,9 @@ declare class Machine<mDT> {
     list_edges(): Array<JssmTransition<mDT>>;
     list_named_transitions(): Map<StateType, number>;
     list_actions(): Array<StateType>;
-    themes(): FslTheme[];
+    all_themes(): FslTheme[];
+    get themes(): FslTheme[];
+    set themes(to: FslTheme | FslTheme[]);
     flow(): FslDirection;
     get_transition_by_state_names(from: StateType, to: StateType): number;
     lookup_transition_for(from: StateType, to: StateType): JssmTransition<mDT>;
@@ -1209,4 +1211,4 @@ declare function is_hook_complex_result<mDT>(hr: unknown): hr is HookComplexResu
 declare function is_hook_rejection<mDT>(hr: HookResult<mDT>): boolean;
 declare function abstract_hook_step<mDT>(maybe_hook: HookHandler<mDT> | undefined, hook_args: HookContext<mDT>): HookComplexResult<mDT>;
 declare function deserialize<mDT>(machine_string: string, ser: JssmSerialization<mDT>): Machine<mDT>;
-export { version, transfer_state_properties, Machine, deserialize, make, wrap_parse as parse, compile, sm, from, arrow_direction, arrow_left_kind, arrow_right_kind, seq, unique, find_repeated, weighted_rand_select, histograph, weighted_sample_select, weighted_histo_key, constants, shapes, gviz_shapes, named_colors, is_hook_rejection, is_hook_complex_result, abstract_hook_step, state_style_condense };
+export { version, transfer_state_properties, Machine, deserialize, make, wrap_parse as parse, compile, sm, from, arrow_direction, arrow_left_kind, arrow_right_kind, seq, unique, find_repeated, weighted_rand_select, histograph, weighted_sample_select, weighted_histo_key, constants, shapes, gviz_shapes, named_colors, is_hook_rejection, is_hook_complex_result, abstract_hook_step, state_style_condense, FslDirections };

package/dist/es6/jssm.js

@@ -1,14 +1,17 @@
 // whargarbl lots of these return arrays could/should be sets
 import { reduce as reduce_to_639 } from 'reduce-to-639-1';
 import { circular_buffer } from 'circular_buffer_js';
+import { FslDirections } from './jssm_types';
 import { base_theme } from './themes/jssm_base_stylesheet';
 import { default_theme } from './themes/jssm_theme_default';
 import { modern_theme } from './themes/jssm_theme_modern';
 import { ocean_theme } from './themes/jssm_theme_ocean';
+import { plain_theme } from './themes/jssm_theme_plain';
 const theme_mapping = new Map();
 theme_mapping.set('default', default_theme);
 theme_mapping.set('modern', modern_theme);
 theme_mapping.set('ocean', ocean_theme);
+theme_mapping.set('plain', plain_theme);
 import { seq, unique, find_repeated, weighted_rand_select, weighted_sample_select, histograph, weighted_histo_key, array_box_if_string, name_bind_prop_and_state, hook_name, named_hook_name } from './jssm_util';
 import * as constants from './jssm_constants';
 const { shapes, gviz_shapes, named_colors } = constants;
@@ -1387,9 +1390,20 @@ class Machine {
     list_actions() {
         return Array.from(this._actions.keys());
     }
-    themes() {
+    all_themes() {
+        return [...theme_mapping.keys()]; // constructor sets this to "default" otherwise
+    }
+    get themes() {
         return this._themes; // constructor sets this to "default" otherwise
     }
+    set themes(to) {
+        if (typeof to === 'string') {
+            this._themes = [to];
+        }
+        else {
+            this._themes = to;
+        }
+    }
     flow() {
         return this._flow;
     }
@@ -2713,4 +2727,6 @@ function deserialize(machine_string, ser) {
 }
 export { version, transfer_state_properties, Machine, deserialize, make, wrap_parse as parse, compile, sm, from, arrow_direction, arrow_left_kind, arrow_right_kind, 
 // WHARGARBL TODO these should be exported to a utility library
-seq, unique, find_repeated, weighted_rand_select, histograph, weighted_sample_select, weighted_histo_key, constants, shapes, gviz_shapes, named_colors, is_hook_rejection, is_hook_complex_result, abstract_hook_step, state_style_condense };
+seq, unique, find_repeated, weighted_rand_select, histograph, weighted_sample_select, weighted_histo_key, constants, shapes, gviz_shapes, named_colors, is_hook_rejection, is_hook_complex_result, abstract_hook_step, state_style_condense, FslDirections
+//  FslThemes
+ };

package/dist/es6/jssm_types.d.ts

@@ -24,8 +24,10 @@ declare type JssmArrowKind = 'none' | 'legal' | 'main' | 'forced';
 declare type JssmLayout = 'dot' | 'circo' | 'twopi' | 'fdp';
 declare type JssmCorner = 'regular' | 'rounded' | 'lined';
 declare type JssmLineStyle = 'solid' | 'dashed' | 'dotted';
-declare type FslDirection = 'up' | 'right' | 'down' | 'left';
-declare type FslTheme = 'default' | 'ocean' | 'modern' | 'none';
+declare const FslDirections: readonly ["up", "right", "down", "left"];
+declare type FslDirection = typeof FslDirections[number];
+declare const FslThemes: readonly ["default", "ocean", "modern", "plain"];
+declare type FslTheme = typeof FslThemes[number];
 declare type JssmSerialization<DataType> = {
     jssm_version: string;
     timestamp: number;
@@ -351,4 +353,4 @@ declare type JssmErrorExtendedInfo = {
     requested_state?: StateType | undefined;
 };
 declare type JssmHistory<mDT> = circular_buffer<[StateType, mDT]>;
-export { JssmColor, JssmShape, JssmTransition, JssmTransitions, JssmTransitionList, JssmTransitionRule, JssmArrow, JssmArrowKind, JssmArrowDirection, JssmGenericConfig, JssmGenericState, JssmGenericMachine, JssmParseTree, JssmCompileSe, JssmCompileSeStart, JssmCompileRule, JssmPermitted, JssmPermittedOpt, JssmResult, JssmStateDeclaration, JssmStateDeclarationRule, JssmStateConfig, JssmStateStyleKey, JssmStateStyleKeyList, JssmBaseTheme, JssmTheme, JssmLayout, JssmHistory, JssmSerialization, JssmPropertyDefinition, JssmParseFunctionType, JssmMachineInternalState, JssmErrorExtendedInfo, FslDirection, FslTheme, HookDescription, HookHandler, HookContext, HookResult, HookComplexResult };
+export { JssmColor, JssmShape, JssmTransition, JssmTransitions, JssmTransitionList, JssmTransitionRule, JssmArrow, JssmArrowKind, JssmArrowDirection, JssmGenericConfig, JssmGenericState, JssmGenericMachine, JssmParseTree, JssmCompileSe, JssmCompileSeStart, JssmCompileRule, JssmPermitted, JssmPermittedOpt, JssmResult, JssmStateDeclaration, JssmStateDeclarationRule, JssmStateConfig, JssmStateStyleKey, JssmStateStyleKeyList, JssmBaseTheme, JssmTheme, JssmLayout, JssmHistory, JssmSerialization, JssmPropertyDefinition, JssmParseFunctionType, JssmMachineInternalState, JssmErrorExtendedInfo, FslDirections, FslDirection, FslThemes, FslTheme, HookDescription, HookHandler, HookContext, HookResult, HookComplexResult };

package/dist/es6/jssm_types.js

@@ -1 +1,3 @@
-export {};
+const FslDirections = ['up', 'right', 'down', 'left'];
+const FslThemes = ['default', 'ocean', 'modern', 'plain'];
+export { FslDirections, FslThemes };

package/dist/es6/themes/jssm_theme_plain.d.ts

@@ -0,0 +1,11 @@
+import { JssmStateConfig, JssmBaseTheme } from '../jssm_types';
+declare const base_state_style: JssmStateConfig;
+declare const base_active_state_style: JssmStateConfig;
+declare const base_terminal_state_style: JssmStateConfig;
+declare const base_active_terminal_state_style: JssmStateConfig;
+declare const base_start_state_style: JssmStateConfig;
+declare const base_active_start_state_style: JssmStateConfig;
+declare const base_end_state_style: JssmStateConfig;
+declare const base_active_end_state_style: JssmStateConfig;
+declare const plain_theme: JssmBaseTheme;
+export { base_state_style, base_active_state_style, base_terminal_state_style, base_active_terminal_state_style, base_start_state_style, base_active_start_state_style, base_end_state_style, base_active_end_state_style, plain_theme, plain_theme as theme };

package/dist/es6/themes/jssm_theme_plain.js

@@ -0,0 +1,69 @@
+const base_state_style = {
+    textColor: 'black',
+    backgroundColor: 'transparent',
+    shape: 'plaintext'
+};
+const base_active_state_style = {
+    textColor: 'black',
+    backgroundColor: 'transparent',
+    shape: 'plaintext'
+};
+const base_hooked_state_style = {
+    textColor: 'black',
+    backgroundColor: 'transparent',
+    shape: 'plaintext'
+};
+const base_terminal_state_style = {
+    textColor: 'black',
+    backgroundColor: 'transparent',
+    shape: 'plaintext'
+};
+const base_active_terminal_state_style = {
+    textColor: 'black',
+    backgroundColor: 'transparent',
+    shape: 'plaintext'
+};
+const base_start_state_style = {
+    textColor: 'black',
+    backgroundColor: 'transparent',
+    shape: 'plaintext'
+};
+const base_active_start_state_style = {
+    textColor: 'black',
+    backgroundColor: 'transparent',
+    shape: 'plaintext'
+};
+const base_active_hooked_state_style = {
+    textColor: 'black',
+    backgroundColor: 'transparent',
+    shape: 'plaintext'
+};
+const base_end_state_style = {
+    textColor: 'black',
+    backgroundColor: 'transparent',
+    shape: 'plaintext'
+};
+const base_active_end_state_style = {
+    textColor: 'black',
+    backgroundColor: 'transparent',
+    shape: 'plaintext'
+};
+const plain_theme = {
+    state: base_state_style,
+    start: base_start_state_style,
+    end: base_end_state_style,
+    terminal: base_terminal_state_style,
+    hooked: base_hooked_state_style,
+    active: base_active_state_style,
+    active_start: base_active_start_state_style,
+    active_end: base_active_end_state_style,
+    active_terminal: base_active_terminal_state_style,
+    active_hooked: base_active_hooked_state_style,
+    legal: undefined,
+    main: undefined,
+    forced: undefined,
+    action: undefined,
+    graph: undefined,
+    title: undefined // TODO FIXME
+};
+export { base_state_style, base_active_state_style, base_terminal_state_style, base_active_terminal_state_style, base_start_state_style, base_active_start_state_style, base_end_state_style, base_active_end_state_style, plain_theme, plain_theme as theme };

package/dist/es6/version.js

@@ -1,2 +1,2 @@
-const version = "5.82.0";
+const version = "5.82.1";
 export { version };