@dra2020/baseclient 1.0.81 → 1.0.84

package/dist/fsm/fsm.d.ts

@@ -3,6 +3,7 @@ export declare const FSM_STARTING: number;
 export declare const FSM_PENDING: number;
 export declare const FSM_DONE: number;
 export declare const FSM_ERROR: number;
+export declare const FSM_CANCEL: number;
 export declare const FSM_RELEASED: number;
 export declare const FSM_CUSTOM1: number;
 export declare const FSM_CUSTOM2: number;
@@ -44,6 +45,7 @@ export declare class Fsm {
     get ready(): boolean;
     get iserror(): boolean;
     get isDependentError(): boolean;
+    cancel(): void;
     setDependentError(): void;
     clearDependentError(): void;
     get ticked(): boolean;

package/dist/ot-js/otsession.d.ts

@@ -94,6 +94,7 @@ export interface SessionProps {
     };
     groups: any;
     xid?: string;
+    colors?: string;
 }
 export declare type LabelUpdate = {
     [name: string]: boolean | null;
@@ -112,6 +113,7 @@ export interface SessionUpdateProps {
     accessUpdate?: AccessMap;
     restore?: string;
     revision?: Revision;
+    colors?: string;
 }
 export interface SessionsIndex {
     [key: string]: SessionProps;

package/lib/fsm/fsm.ts

@@ -1,11 +1,12 @@
 // Shared libraries
 import * as Util from '../util/all';
 
-// States
+// States (note these are no longer bit flags - most uses create custom values incrementally from CUSTOM1)
 export const FSM_STARTING: number = 0;
 export const FSM_PENDING: number  = 1<<0;
 export const FSM_DONE: number     = 1<<1;
 export const FSM_ERROR: number    = 1<<2;
+export const FSM_CANCEL: number   = 5;
 export const FSM_RELEASED: number = 1<<3;
 export const FSM_CUSTOM1: number  = 1<<4;
 export const FSM_CUSTOM2: number  = 1<<5;
@@ -22,7 +23,7 @@ let doLater: any = global && global.setImmediate ? setImmediate : (cb: any) => {
 
 function FsmDone(s: number): boolean
 {
-  return (s === FSM_DONE || s === FSM_ERROR || s === FSM_RELEASED);
+  return (s === FSM_DONE || s === FSM_ERROR || s === FSM_RELEASED || s === FSM_CANCEL);
 }
 
 function FsmStateToString(state: number): string
@@ -151,7 +152,7 @@ export class Fsm
 
   get iserror(): boolean
     {
-      return (this.state === FSM_ERROR);
+      return (this.state === FSM_ERROR || this.state === FSM_CANCEL);
     }
 
   get isDependentError(): boolean
@@ -159,6 +160,12 @@ export class Fsm
       return this.dependentError;
     }
 
+  cancel(): void
+    {
+      // Override if you need to do more than marking complete
+      this.setState(FSM_CANCEL);
+    }
+
   setDependentError(): void
     {
       this.dependentError = true;

package/lib/ot-js/otsession.ts

@@ -120,6 +120,7 @@ export interface SessionProps
   xprops?: { [prop: string]: string };
   groups: any;  // DT.GroupsMapIndex
   xid?: string; // external ID
+  colors?: string; // cached district colors (specific to OT for redistricting)
 }
 
 // True to add, False to remove
@@ -140,6 +141,7 @@ export interface SessionUpdateProps
   accessUpdate?: AccessMap;
   restore?: string; // Revision ID
   revision?: Revision;  // If ID is empty, snap a new revision, otherwise label it.
+  colors?: string; // cached district colors (specific to OT for redistricting)
 }
 
 export interface SessionsIndex

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/baseclient",
-  "version": "1.0.81",
+  "version": "1.0.84",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
   "types": "./dist/all/all.d.ts",