jssm 5.73.0 → 5.75.0

package/jest-stoch.config.js

@@ -15,13 +15,19 @@ module.exports = {
 
   coverageThreshold : {
     global : {
-      branches   : 1,
-      functions  : 1,
-      lines      : 1,
-      statements : 1,
+      branches   : 0,
+      functions  : 0,
+      lines      : 0,
+      statements : 0,
     },
   },
 
-  collectCoverageFrom: ["src/ts/**/{!(jssm-dot),}.{js,ts}"]
+  collectCoverageFrom: ["src/ts/**/{!(jssm-dot),}.{js,ts}"],
+
+  reporters: [
+    ['default',             {}],
+    ['jest-json-reporter2', { outputDir: './coverage/stoch', outputFile: 'metrics.json',          fullOutput: false }],
+//  ['jest-json-reporter2', { outputDir: './coverage/stoch', outputFile: 'extended-metrics.json', fullOutput: true  }],
+  ]
 
 };

package/jssm.d.ts

@@ -234,6 +234,23 @@ declare class Machine<mDT> {
     _main_transition_hook: HookHandler<mDT> | undefined;
     _forced_transition_hook: HookHandler<mDT> | undefined;
     _any_transition_hook: HookHandler<mDT> | undefined;
+    _has_post_hooks: boolean;
+    _has_post_basic_hooks: boolean;
+    _has_post_named_hooks: boolean;
+    _has_post_entry_hooks: boolean;
+    _has_post_exit_hooks: boolean;
+    _has_post_global_action_hooks: boolean;
+    _has_post_transition_hooks: boolean;
+    _post_hooks: Map<string, HookHandler<mDT>>;
+    _post_named_hooks: Map<string, HookHandler<mDT>>;
+    _post_entry_hooks: Map<string, HookHandler<mDT>>;
+    _post_exit_hooks: Map<string, HookHandler<mDT>>;
+    _post_global_action_hooks: Map<string, HookHandler<mDT>>;
+    _post_any_action_hook: HookHandler<mDT> | undefined;
+    _post_standard_transition_hook: HookHandler<mDT> | undefined;
+    _post_main_transition_hook: HookHandler<mDT> | undefined;
+    _post_forced_transition_hook: HookHandler<mDT> | undefined;
+    _post_any_transition_hook: HookHandler<mDT> | undefined;
     _history: circular_buffer<[StateType, mDT]>;
     _history_length: number;
     constructor({ start_states, complete, transitions, machine_author, machine_comment, machine_contributor, machine_definition, machine_language, machine_license, machine_name, machine_version, state_declaration, fsl_version, dot_preamble, arrange_declaration, arrange_start_declaration, arrange_end_declaration, theme, flow, graph_layout, instance_name, history, data }: JssmGenericConfig<mDT>);
@@ -552,6 +569,16 @@ declare class Machine<mDT> {
     hook_any_transition(handler: HookHandler<mDT>): Machine<mDT>;
     hook_entry(to: string, handler: HookHandler<mDT>): Machine<mDT>;
     hook_exit(from: string, handler: HookHandler<mDT>): Machine<mDT>;
+    post_hook(from: string, to: string, handler: HookHandler<mDT>): Machine<mDT>;
+    post_hook_action(from: string, to: string, action: string, handler: HookHandler<mDT>): Machine<mDT>;
+    post_hook_global_action(action: string, handler: HookHandler<mDT>): Machine<mDT>;
+    post_hook_any_action(handler: HookHandler<mDT>): Machine<mDT>;
+    post_hook_standard_transition(handler: HookHandler<mDT>): Machine<mDT>;
+    post_hook_main_transition(handler: HookHandler<mDT>): Machine<mDT>;
+    post_hook_forced_transition(handler: HookHandler<mDT>): Machine<mDT>;
+    post_hook_any_transition(handler: HookHandler<mDT>): Machine<mDT>;
+    post_hook_entry(to: string, handler: HookHandler<mDT>): Machine<mDT>;
+    post_hook_exit(from: string, handler: HookHandler<mDT>): Machine<mDT>;
     edges_between(from: string, to: string): JssmTransition<mDT>[];
     transition_impl(newStateOrAction: StateType, newData: mDT | undefined, wasForced: boolean, wasAction: boolean): boolean;
     /*********

package/jssm_types.d.ts

@@ -198,7 +198,55 @@ declare type ExitHook<mDT> = {
     from: string;
     handler: HookHandler<mDT>;
 };
-declare type HookDescription<mDT> = BasicHookDescription<mDT> | HookDescriptionWithAction<mDT> | GlobalActionHook<mDT> | AnyActionHook<mDT> | StandardTransitionHook<mDT> | MainTransitionHook<mDT> | ForcedTransitionHook<mDT> | AnyTransitionHook<mDT> | EntryHook<mDT> | ExitHook<mDT>;
+declare type PostBasicHookDescription<mDT> = {
+    kind: 'post hook';
+    from: string;
+    to: string;
+    handler: PostHookHandler<mDT>;
+};
+declare type PostHookDescriptionWithAction<mDT> = {
+    kind: 'post named';
+    from: string;
+    to: string;
+    action: string;
+    handler: PostHookHandler<mDT>;
+};
+declare type PostStandardTransitionHook<mDT> = {
+    kind: 'post standard transition';
+    handler: PostHookHandler<mDT>;
+};
+declare type PostMainTransitionHook<mDT> = {
+    kind: 'post main transition';
+    handler: PostHookHandler<mDT>;
+};
+declare type PostForcedTransitionHook<mDT> = {
+    kind: 'post forced transition';
+    handler: PostHookHandler<mDT>;
+};
+declare type PostAnyTransitionHook<mDT> = {
+    kind: 'post any transition';
+    handler: PostHookHandler<mDT>;
+};
+declare type PostGlobalActionHook<mDT> = {
+    kind: 'post global action';
+    action: string;
+    handler: PostHookHandler<mDT>;
+};
+declare type PostAnyActionHook<mDT> = {
+    kind: 'post any action';
+    handler: PostHookHandler<mDT>;
+};
+declare type PostEntryHook<mDT> = {
+    kind: 'post entry';
+    to: string;
+    handler: PostHookHandler<mDT>;
+};
+declare type PostExitHook<mDT> = {
+    kind: 'post exit';
+    from: string;
+    handler: PostHookHandler<mDT>;
+};
+declare type HookDescription<mDT> = BasicHookDescription<mDT> | HookDescriptionWithAction<mDT> | GlobalActionHook<mDT> | AnyActionHook<mDT> | StandardTransitionHook<mDT> | MainTransitionHook<mDT> | ForcedTransitionHook<mDT> | AnyTransitionHook<mDT> | EntryHook<mDT> | ExitHook<mDT> | PostBasicHookDescription<mDT> | PostHookDescriptionWithAction<mDT> | PostGlobalActionHook<mDT> | PostAnyActionHook<mDT> | PostStandardTransitionHook<mDT> | PostMainTransitionHook<mDT> | PostForcedTransitionHook<mDT> | PostAnyTransitionHook<mDT> | PostEntryHook<mDT> | PostExitHook<mDT>;
 declare type HookComplexResult<mDT> = {
     pass: boolean;
     state?: StateType;
@@ -209,6 +257,7 @@ declare type HookContext<mDT> = {
     data: mDT;
 };
 declare type HookHandler<mDT> = (hook_context: HookContext<mDT>) => HookResult<mDT>;
+declare type PostHookHandler<mDT> = (hook_context: HookContext<mDT>) => void;
 declare type JssmErrorExtendedInfo = {
     requested_state?: StateType | undefined;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jssm",
-  "version": "5.73.0",
+  "version": "5.75.0",
   "engines": {
     "node": ">=10.0.0"
   },
@@ -28,15 +28,9 @@
   "browser": "dist/jssm.es5.iife.js",
   "types": "./jssm.d.ts",
   "scripts": {
-    "jest-spec": "jest -c jest-spec.config.js --color --verbose",
-    "jest-stoch": "jest -c jest-stoch.config.js --color --verbose",
-    "jest": "npm run jest-spec",
-    "jjest": "npm run jest-spec && npm run jest-stoch",
+    "jest": "jest -c jest-stoch.config.js --color --verbose && jest -c jest-spec.config.js --color --verbose",
     "test": "npm run make && npm run jest",
-    "rmgenerated": "rm -f src/ts/jssm-dot.ts && rm -f src/ts/version.ts && rm -f *.d.ts",
-    "removedir": "rm -rf dist && rm -rf docs",
-    "createdir": "mkdir dist && mkdir docs",
-    "clean": "npm run removedir && npm run rmgenerated && npm run createdir",
+    "clean": "rm -rf dist && rm -rf docs && cd coverage && rm -rf cloc && cd .. && rm -f src/ts/jssm-dot.ts && rm -f src/ts/version.ts && rm -f *.d.ts && mkdir dist && mkdir docs && cd coverage && mkdir cloc && cd ..",
     "peg": "rm -f src/ts/jssm-dot.js && pegjs src/ts/jssm-dot.peg && node src/buildjs/fixparser.js && rm src/ts/jssm-dot.js",
     "make_cjs": "rollup -c",
     "make_iife": "rollup -c rollup.config.iife.js",
@@ -47,7 +41,7 @@
     "audit": "text_audit -r -t major MAJOR wasteful WASTEFUL any mixed fixme FIXME checkme CHECKME testme TESTME stochable STOCHABLE todo TODO comeback COMEBACK whargarbl WHARGARBL -g ./src/ts/**/*.{js,ts}",
     "vet": "npm run eslint && npm run audit",
     "benny": "node ./src/buildjs/benchmark.js",
-    "build": "npm run vet && npm run test && npm run site && npm run changelog && npm run docs && npm run readme",
+    "build": "npm run vet && npm run test && npm run site && npm run changelog && npm run docs && npm run cloc && npm run readme",
     "clean_bench": "npm run test && npm run benny",
     "qbuild": "npm run test",
     "ci_build": "npm run vet && npm run test",
@@ -56,7 +50,8 @@
     "min_cjs": "mv dist/jssm.es5.cjs.js dist/jssm.es5.cjs.nonmin.js && terser dist/jssm.es5.cjs.nonmin.js > dist/jssm.es5.cjs.js",
     "site": "cp src/site/* docs/ && cp -r src/assets docs/assets/",
     "docs": "typedoc src/ts/jssm.ts --options typedoc-options.js",
-    "readme": "rm ./README.md && node ./src/buildjs/make_readme.js",
+    "cloc": "cloc --quiet ./src/** --exclude-list-file=./.clocignore --3 --json --out=./coverage/cloc/report_wt.json && cloc --quiet ./src/** --exclude-list-file=./.clocignore --exclude-dir=tests --3 --json --out=./coverage/cloc/report_nt.json && node ./src/buildjs/cloc_report.js",
+    "readme": "rm -f ./README.md && node ./src/buildjs/make_readme.js",
     "changelog": "rm -f CHANGELOG.md && rm -f ./src/doc_md/CHANGELOG.md && better_git_changelog -b && cp CHANGELOG.* ./src/doc_md/"
   },
   "repository": {
@@ -110,7 +105,7 @@
     "@typescript-eslint/eslint-plugin": "^4.13.0",
     "@typescript-eslint/parser": "^4.13.0",
     "benny": "^3.7.1",
-    "circular_buffer_js": "^1.10.0",
+    "cloc": "^2.9.0",
     "coveralls": "^3.0.11",
     "eslint": "^7.32.0",
     "eslint-plugin-fp": "^2.3.0",
@@ -129,10 +124,12 @@
     "text_audit": "^0.9.3",
     "ts-jest": "^27.0.7",
     "typedoc": "^0.22.15",
-    "typescript": "^4.6.4"
+    "typescript": "^4.6.4",
+    "xml2js": "^0.4.23"
   },
   "dependencies": {
     "better_git_changelog": "^1.6.1",
+    "circular_buffer_js": "^1.10.0",
     "reduce-to-639-1": "^1.0.4"
   }
 }