Merge pull request #528 from StoneCypher/SpinUpThemes

Spin up themes
StoneCypher · Aug 20, 2022 · 5278df4 · 5278df4
2 parents 72d6ef7 + 88d7309
commit 5278df4
Show file tree

Hide file tree

Showing 45 changed files with 6,735 additions and 5,138 deletions.
diff --git a/CHANGELOG.long.md b/CHANGELOG.long.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-1033 merges; 148 releases
+1037 merges; 148 releases
 
 
 
@@ -18,6 +18,66 @@ Published tags:
 
 
 
+&nbsp;
+
+&nbsp;
+
+## [Untagged] - 8/19/2022 8:44:55 PM
+
+Commit [2cf5a3f8121a68db58bba992e85b95a8b0e6315e](https://github.com/StoneCypher/jssm/commit/2cf5a3f8121a68db58bba992e85b95a8b0e6315e)
+
+Author: `John Haugeland <stonecypher@gmail.com>`
+
+  * coverage pass prior to multitheme
+
+
+
+
+&nbsp;
+
+&nbsp;
+
+## [Untagged] - 8/18/2022 10:12:07 PM
+
+Commit [2f81a2682202a239acc8acbefe0360e3481c8ca9](https://github.com/StoneCypher/jssm/commit/2f81a2682202a239acc8acbefe0360e3481c8ca9)
+
+Author: `John Haugeland <stonecypher@gmail.com>`
+
+  * draft themes in place
+
+
+
+
+&nbsp;
+
+&nbsp;
+
+## [Untagged] - 8/17/2022 10:02:39 PM
+
+Commit [9209392cd7e025b365da88aa29649c63b241074d](https://github.com/StoneCypher/jssm/commit/9209392cd7e025b365da88aa29649c63b241074d)
+
+Author: `John Haugeland <stonecypher@gmail.com>`
+
+  * mostly done, just have to surface the themes then do testing
+
+
+
+
+&nbsp;
+
+&nbsp;
+
+## [Untagged] - 8/14/2022 4:22:34 PM
+
+Commit [72d6ef77839234d9763ba3c5e667f0eb5ef43951](https://github.com/StoneCypher/jssm/commit/72d6ef77839234d9763ba3c5e667f0eb5ef43951)
+
+Author: `John Haugeland <stonecypher@gmail.com>`
+
+  * Clarify composite style type before we start work on themes
+
+
+
+
 &nbsp;
 
 &nbsp;

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-1033 merges; 148 releases; Changlogging the last 10 commits; Full changelog at [CHANGELOG.long.md](CHANGELOG.long.md)
+1037 merges; 148 releases; Changlogging the last 10 commits; Full changelog at [CHANGELOG.long.md](CHANGELOG.long.md)
 
 
 
@@ -22,13 +22,13 @@ Published tags:
 
 &nbsp;
 
-## [Untagged] - 8/11/2022 9:01:49 PM
+## [Untagged] - 8/19/2022 8:44:55 PM
 
-Commit [df1dd4c1d190b6571cf43637183b831229793eba](https://github.com/StoneCypher/jssm/commit/df1dd4c1d190b6571cf43637183b831229793eba)
+Commit [2cf5a3f8121a68db58bba992e85b95a8b0e6315e](https://github.com/StoneCypher/jssm/commit/2cf5a3f8121a68db58bba992e85b95a8b0e6315e)
 
 Author: `John Haugeland <stonecypher@gmail.com>`
 
-  * Small type changes preparing for theme
+  * coverage pass prior to multitheme
 
 
 
@@ -37,13 +37,13 @@ Author: `John Haugeland <stonecypher@gmail.com>`
 
 &nbsp;
 
-## [Untagged] - 8/10/2022 11:32:42 PM
+## [Untagged] - 8/18/2022 10:12:07 PM
 
-Commit [5162f2299530514aecba1bf78fbfe77910e3a417](https://github.com/StoneCypher/jssm/commit/5162f2299530514aecba1bf78fbfe77910e3a417)
+Commit [2f81a2682202a239acc8acbefe0360e3481c8ca9](https://github.com/StoneCypher/jssm/commit/2f81a2682202a239acc8acbefe0360e3481c8ca9)
 
 Author: `John Haugeland <stonecypher@gmail.com>`
 
-  * Engine and parser support for label substitution (no viz yet,) fixes StoneCypher/fsl#117; fixes StoneCypher/fsl#263
+  * draft themes in place
 
 
 
@@ -52,15 +52,13 @@ Author: `John Haugeland <stonecypher@gmail.com>`
 
 &nbsp;
 
-## [Untagged] - 8/10/2022 10:25:03 PM
+## [Untagged] - 8/17/2022 10:02:39 PM
 
-Commit [bab9f160ae1dab672a2800c175c21fed2e74f48e](https://github.com/StoneCypher/jssm/commit/bab9f160ae1dab672a2800c175c21fed2e74f48e)
+Commit [9209392cd7e025b365da88aa29649c63b241074d](https://github.com/StoneCypher/jssm/commit/9209392cd7e025b365da88aa29649c63b241074d)
 
 Author: `John Haugeland <stonecypher@gmail.com>`
 
-Merges [59e95d8, c3939c3]
-
-  * Merge branch 'main' of github.com:StoneCypher/jssm
+  * mostly done, just have to surface the themes then do testing
 
 
 
@@ -69,13 +67,13 @@ Merges [59e95d8, c3939c3]
 
 &nbsp;
 
-## [Untagged] - 8/10/2022 10:24:55 PM
+## [Untagged] - 8/14/2022 4:22:34 PM
 
-Commit [59e95d8d4c06a63fb51b0c886d23612a4835ccfc](https://github.com/StoneCypher/jssm/commit/59e95d8d4c06a63fb51b0c886d23612a4835ccfc)
+Commit [72d6ef77839234d9763ba3c5e667f0eb5ef43951](https://github.com/StoneCypher/jssm/commit/72d6ef77839234d9763ba3c5e667f0eb5ef43951)
 
 Author: `John Haugeland <stonecypher@gmail.com>`
 
-  * tests for property overriding from inline and for border lines
+  * Clarify composite style type before we start work on themes
 
 
 
@@ -84,18 +82,13 @@ Author: `John Haugeland <stonecypher@gmail.com>`
 
 &nbsp;
 
-<a name="5__80__1" />
-
-## [5.80.1] - 8/7/2022 11:57:01 PM
+## [Untagged] - 8/11/2022 9:01:49 PM
 
-Commit [c3939c3486d8ae2338385de375d753ef5a38673d](https://github.com/StoneCypher/jssm/commit/c3939c3486d8ae2338385de375d753ef5a38673d)
+Commit [df1dd4c1d190b6571cf43637183b831229793eba](https://github.com/StoneCypher/jssm/commit/df1dd4c1d190b6571cf43637183b831229793eba)
 
 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
+  * Small type changes preparing for theme
 
 
 
@@ -104,13 +97,13 @@ Merges [6cb2816, b59b5b5]
 
 &nbsp;
 
-## [Untagged] - 8/7/2022 11:52:57 PM
+## [Untagged] - 8/10/2022 11:32:42 PM
 
-Commit [b59b5b530de566d82b6fa707d66f9b5ceb2037e8](https://github.com/StoneCypher/jssm/commit/b59b5b530de566d82b6fa707d66f9b5ceb2037e8)
+Commit [5162f2299530514aecba1bf78fbfe77910e3a417](https://github.com/StoneCypher/jssm/commit/5162f2299530514aecba1bf78fbfe77910e3a417)
 
 Author: `John Haugeland <stonecypher@gmail.com>`
 
-  * Adds inline styles to resolver, fixes StoneCypher/fsl#1160
+  * Engine and parser support for label substitution (no viz yet,) fixes StoneCypher/fsl#117; fixes StoneCypher/fsl#263
 
 
 
@@ -119,18 +112,15 @@ Author: `John Haugeland <stonecypher@gmail.com>`
 
 &nbsp;
 
-<a name="5__80__0" />
-
-## [5.80.0] - 8/4/2022 9:37:11 PM
+## [Untagged] - 8/10/2022 10:25:03 PM
 
-Commit [6cb281616eaa3d70bc0ff4e14410c5caa07f70f2](https://github.com/StoneCypher/jssm/commit/6cb281616eaa3d70bc0ff4e14410c5caa07f70f2)
+Commit [bab9f160ae1dab672a2800c175c21fed2e74f48e](https://github.com/StoneCypher/jssm/commit/bab9f160ae1dab672a2800c175c21fed2e74f48e)
 
 Author: `John Haugeland <stonecypher@gmail.com>`
 
-Merges [4d79b09, ed398d3]
+Merges [59e95d8, c3939c3]
 
-  * Merge pull request #526 from StoneCypher/SupportForStartAndEndStateStyling
-  * Support for start and end state styling
+  * Merge branch 'main' of github.com:StoneCypher/jssm
 
 
 
@@ -139,13 +129,13 @@ Merges [4d79b09, ed398d3]
 
 &nbsp;
 
-## [Untagged] - 8/4/2022 9:29:52 PM
+## [Untagged] - 8/10/2022 10:24:55 PM
 
-Commit [ed398d3627e63b7b64d009acb42779b814e2f6da](https://github.com/StoneCypher/jssm/commit/ed398d3627e63b7b64d009acb42779b814e2f6da)
+Commit [59e95d8d4c06a63fb51b0c886d23612a4835ccfc](https://github.com/StoneCypher/jssm/commit/59e95d8d4c06a63fb51b0c886d23612a4835ccfc)
 
 Author: `John Haugeland <stonecypher@gmail.com>`
 
-  * tests
+  * tests for property overriding from inline and for border lines
 
 
 
@@ -154,13 +144,18 @@ Author: `John Haugeland <stonecypher@gmail.com>`
 
 &nbsp;
 
-## [Untagged] - 8/4/2022 9:15:50 PM
+<a name="5__80__1" />
+
+## [5.80.1] - 8/7/2022 11:57:01 PM
 
-Commit [63304cd9d1dd4ea5801edb6437f361023e3d6c32](https://github.com/StoneCypher/jssm/commit/63304cd9d1dd4ea5801edb6437f361023e3d6c32)
+Commit [c3939c3486d8ae2338385de375d753ef5a38673d](https://github.com/StoneCypher/jssm/commit/c3939c3486d8ae2338385de375d753ef5a38673d)
 
 Author: `John Haugeland <stonecypher@gmail.com>`
 
-  * Styling now works for start, end, and terminal state types too.  Fixes StoneCypher/fsl#1143, fixes StoneCypher/fsl#1141, fixes StoneCypher/fsl#1156, fixes StoneCypher/fsl#1157, fixes StoneCypher/fsl#242
+Merges [6cb2816, b59b5b5]
+
+  * Merge pull request #527 from StoneCypher/AddInlineStylesToResolver
+  * Adds inline styles to resolver, fixes StoneCypher/fsl#1160
 
 
 
@@ -169,10 +164,10 @@ Author: `John Haugeland <stonecypher@gmail.com>`
 
 &nbsp;
 
-## [Untagged] - 8/4/2022 1:50:52 AM
+## [Untagged] - 8/7/2022 11:52:57 PM
 
-Commit [89948de7b9857909a6132c95cd6019be08e82d18](https://github.com/StoneCypher/jssm/commit/89948de7b9857909a6132c95cd6019be08e82d18)
+Commit [b59b5b530de566d82b6fa707d66f9b5ceb2037e8](https://github.com/StoneCypher/jssm/commit/b59b5b530de566d82b6fa707d66f9b5ceb2037e8)
 
 Author: `John Haugeland <stonecypher@gmail.com>`
 
-  * Semi-working implementation of style condensation, fixes StoneCypher/fsl#1141; added base stylesheet, fixes StoneCypher/fsl#1142
+  * Adds inline styles to resolver, fixes StoneCypher/fsl#1160
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Please edit the file it's derived from, instead: `./src/md/readme_base.md`
 
 
 
-* Generated for version 5.81.2 at 8/14/2022, 4:21:54 PM
+* Generated for version 5.82.0 at 8/19/2022, 11:01:13 PM
 
 -->
 # jssm
@@ -29,7 +29,7 @@ share online.  Easy to embed.
 
 Readable, useful state machines as one-liner strings.
 
-***4,832 tests*** run 5,723 times.  4,823 specs with 100.0% coverage, 9 fuzz tests with 5.4% coverage.  With 2,272 lines, that's about 2.1 tests per line, or 2.5 generated tests per line.
+***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.
 
 ***Meet your new state machine library.***
 

diff --git a/dist/es6/jssm-dot.js b/dist/es6/jssm-dot.js
diff --git a/dist/es6/jssm.d.ts b/dist/es6/jssm.d.ts
@@ -218,7 +218,7 @@ declare class Machine<mDT> {
     _arrange_declaration: Array<Array<StateType>>;
     _arrange_start_declaration: Array<Array<StateType>>;
     _arrange_end_declaration: Array<Array<StateType>>;
-    _theme: FslTheme;
+    _themes: FslTheme[];
     _flow: FslDirection;
     _has_hooks: boolean;
     _has_basic_hooks: boolean;
@@ -625,7 +625,7 @@ declare class Machine<mDT> {
     list_edges(): Array<JssmTransition<mDT>>;
     list_named_transitions(): Map<StateType, number>;
     list_actions(): Array<StateType>;
-    theme(): FslTheme;
+    themes(): FslTheme[];
     flow(): FslDirection;
     get_transition_by_state_names(from: StateType, to: StateType): number;
     lookup_transition_for(from: StateType, to: StateType): JssmTransition<mDT>;
@@ -1070,7 +1070,7 @@ declare class Machine<mDT> {
      *  ```
      *
      *  @typeparam mDT The type of the machine data member; usually omitted
-  b   *
+     *
      *  @param actionName The action to engage
      *
      *  @param newData The data change to insert during the action