@dra2020/baseclient 1.0.123 → 1.0.125

package/dist/colors/jscolormapsdata.d.ts

@@ -1,4 +1,4 @@
-export declare type DataTable = {
+export type DataTable = {
     [key: string]: {
         interpolate: boolean;
         colors: any[];

package/dist/context/context.d.ts

@@ -1,4 +1,4 @@
-export declare type ContextValues = {
+export type ContextValues = {
     [key: string]: any;
 };
 export interface IContext {

package/dist/fsm/fsm.d.ts

@@ -14,9 +14,7 @@ export declare const FSM_CUSTOM6: number;
 export declare const FSM_CUSTOM7: number;
 export declare const FSM_CUSTOM8: number;
 export declare const FSM_CUSTOM9: number;
-export declare type FsmIndex = {
-    [key: number]: Fsm;
-};
+export type FsmIndex = Set<Fsm>;
 export declare class FsmManager {
     theId: number;
     theEpoch: number;
@@ -54,7 +52,8 @@ export declare class Fsm {
     waitOn(fsm: Fsm | Fsm[]): Fsm;
     setState(state: number): void;
     end(state?: number): void;
-    preTick(): void;
+    waitOnCompleted(f: Fsm): void;
+    _completed(f: Fsm): void;
     tick(): void;
 }
 export declare class FsmOnDone extends Fsm {
@@ -69,7 +68,7 @@ export declare class FsmSleep extends Fsm {
     constructor(env: FsmEnvironment, delay: number);
     tick(): void;
 }
-export declare type SerializerIndex = {
+export type SerializerIndex = {
     [key: string]: Fsm;
 };
 export declare class FsmSerializer extends Fsm {
@@ -78,7 +77,7 @@ export declare class FsmSerializer extends Fsm {
     serialize(id: string, fsm?: Fsm): Fsm;
     tick(): void;
 }
-declare type FsmArrayMap = {
+type FsmArrayMap = {
     [key: string]: Fsm[];
 };
 export declare class FsmTracker {

package/dist/geo/geo.d.ts

@@ -1,16 +1,16 @@
 import * as geojson from 'geojson';
 import * as Poly from '../poly/all';
-export declare type GeoProperties = geojson.GeoJsonProperties;
-export declare type GeoFeature = geojson.Feature;
-export declare type GeoFeatureArray = GeoFeature[];
-export declare type GeoFeatureCollection = geojson.FeatureCollection;
-export declare type GeoCentroidMap = {
+export type GeoProperties = geojson.GeoJsonProperties;
+export type GeoFeature = geojson.Feature;
+export type GeoFeatureArray = GeoFeature[];
+export type GeoFeatureCollection = geojson.FeatureCollection;
+export type GeoCentroidMap = {
     [geoid: string]: {
         x: number;
         y: number;
     };
 };
-export declare type HideMap = {
+export type HideMap = {
     [id: string]: boolean;
 };
 export declare function dumpMetrics(): void;
@@ -33,14 +33,14 @@ export declare function geoTopoToCollectionNonNull(topo: Poly.Topo): GeoFeatureC
 export interface GeoFeatureMap {
     [id: string]: GeoFeature;
 }
-export declare type FeatureFunc = (f: GeoFeature) => void;
+export type FeatureFunc = (f: GeoFeature) => void;
 interface GeoEntry {
     tag: string;
     col?: GeoFeatureCollection;
     map?: GeoFeatureMap;
     topo?: Poly.Topo;
 }
-declare type GeoEntryMap = {
+type GeoEntryMap = {
     [tag: string]: GeoEntry;
 };
 export declare function geoEqual(m1: GeoMultiCollection, m2: GeoMultiCollection): boolean;

package/dist/geo/multiblockmapping.d.ts

@@ -1,7 +1,7 @@
-export declare type BlockMapping = {
+export type BlockMapping = {
     [blockid: string]: string;
 };
-export declare type ReverseBlockMapping = {
+export type ReverseBlockMapping = {
     [geoid: string]: string[];
 };
 interface Entry {

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

@@ -5,8 +5,8 @@ export declare const OpRetain: number;
 export declare const OpCursor: number;
 export declare const OpSet: number;
 export declare const OpTmpRetain: number;
-export declare type OTSingleArrayEdit = [number, number, any];
-export declare type OTEdits = OTSingleArrayEdit[];
+export type OTSingleArrayEdit = [number, number, any];
+export type OTEdits = OTSingleArrayEdit[];
 declare enum OTalignEdgesType {
     AlignForCompose = 0,
     AlignForTransform = 1

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

@@ -1,7 +1,7 @@
 import * as OT from "./ottypes";
 export declare const OpCounterAdd = 1;
 export declare const OpCounterDel = 2;
-export declare type CounterEdit = [number, string, any];
+export type CounterEdit = [number, string, any];
 export declare class OTCounterResource extends OT.OTResourceBase {
     constructor(rid: string);
     static factory(rid: string): OTCounterResource;

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

@@ -1,7 +1,7 @@
 import * as OT from './ottypes';
 export declare const OpMapSet = 1;
 export declare const OpMapDel = 2;
-export declare type MapEdit = [number, string, any];
+export type MapEdit = [number, string, any];
 export declare class OTMapResource extends OT.OTResourceBase {
     constructor(rid: string);
     static factory(rid: string): OTMapResource;

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

@@ -23,7 +23,7 @@ export declare const FilterOfficial: number;
 export declare const FilterCOI: number;
 export declare const FilterMyGroups: number;
 export declare const FilterCount: number;
-export declare type Filter = number;
+export type Filter = number;
 export declare const PermNone: number;
 export declare const PermRead: number;
 export declare const PermWrite: number;
@@ -32,10 +32,10 @@ export declare const PermAdmin: number;
 export declare const PermVersion: number;
 export declare const PermEdit: number;
 export declare const PermAll: number;
-export declare type Permission = number;
+export type Permission = number;
 export declare const ServerStateRunning: number;
 export declare const ServerStateMaintenance: number;
-export declare type ServerState = number;
+export type ServerState = number;
 export interface AccessSessionMap {
     [key: string]: string;
 }
@@ -52,7 +52,7 @@ export interface Revision {
     label?: string;
     editcache?: string;
 }
-export declare type RevisionList = Revision[];
+export type RevisionList = Revision[];
 export interface SessionUser {
     id: string;
     name: string;
@@ -101,7 +101,7 @@ export interface SessionProps {
     xid?: string;
     colors?: string;
 }
-export declare type LabelUpdate = {
+export type LabelUpdate = {
     [name: string]: boolean | null;
 };
 export interface SessionUpdateProps {

package/dist/poly/matrix.d.ts

@@ -1,8 +1,8 @@
-export declare type Matrix = number[][];
-export declare type Vector = number[];
-export declare type Range = number[];
-export declare type Index = number[][];
-export declare type applyCB = (v: Vector) => number;
+export type Matrix = number[][];
+export type Vector = number[];
+export type Range = number[];
+export type Index = number[][];
+export type applyCB = (v: Vector) => number;
 export declare const enum Dim {
     Rows = 0,
     Columns = 1

package/dist/poly/polypack.d.ts

@@ -4,8 +4,8 @@ export interface PolyPack {
     buffer: any;
 }
 export declare function polyPackSize(coords: any): number;
-declare type EachRingCB = (buffer: Float64Array, iPoly: number, iRing: number, iOffset: number, nPoints: number) => void;
-declare type EachPointCB = (buffer: Float64Array, iPoly: number, iRing: number, iOffset: number) => void;
+type EachRingCB = (buffer: Float64Array, iPoly: number, iRing: number, iOffset: number, nPoints: number) => void;
+type EachPointCB = (buffer: Float64Array, iPoly: number, iRing: number, iOffset: number) => void;
 export declare function polyPackEachRing(pack: PolyPack, cb: EachRingCB): void;
 export declare function polyPackEachPoint(pack: PolyPack, cb: EachPointCB): void;
 export declare function polyPackCountPoints(pack: PolyPack): number;
@@ -22,7 +22,7 @@ export declare function polyUnpack(prepack: any): any;
 export declare function featurePackSize(f: any): number;
 export declare function featurePack(f: any, prepack?: PolyPack): any;
 export declare function featureUnpack(f: any): any;
-export declare type SavePack = WeakMap<any, any>;
+export type SavePack = WeakMap<any, any>;
 export declare function featureUnpackTemporarily(f: any, save?: SavePack): SavePack;
 export declare function featureRepack(f: any, save: SavePack): any;
 export declare function featurePackString(f: any): string;

package/dist/poly/simplify.d.ts

@@ -1,2 +1,2 @@
-export declare type Point = [number, number];
+export type Point = [number, number];
 export declare function simplify(points: Point[], tolerance?: number, highestQuality?: boolean): Point[];

package/dist/poly/topo.d.ts

@@ -2,11 +2,11 @@ import * as FSM from '../fsm/all';
 import * as G from '../geo/all';
 import * as P from './poly';
 import * as Q from './quad';
-export declare type Topo = any;
+export type Topo = any;
 export declare function topoFromCollection(col: any): Topo;
 export declare function topoContiguity(topo: Topo): any;
 export declare function topoToFeature(topo: Topo, geoid: string): any;
-export declare type TopoSpliceEntry = {
+export type TopoSpliceEntry = {
     topology: Topo;
     filterout?: any;
 };

package/dist/util/bintrie.d.ts

@@ -15,10 +15,10 @@ interface Fragment {
     s: string;
     u8?: Uint8Array;
 }
-declare type FragmentTable = {
+type FragmentTable = {
     [frag: string]: Fragment;
 };
-declare type FragmentPair = {
+type FragmentPair = {
     f1: Fragment;
     f2: Fragment;
     offset?: number;
@@ -51,7 +51,7 @@ declare class ValueTableBuilder {
     toOffset(s: string): number;
     toBinary(): void;
 }
-export declare type StringMap = {
+export type StringMap = {
     [key: string]: string;
 };
 interface UnpackedNode {

package/dist/util/gradient.d.ts

@@ -8,7 +8,7 @@ export interface Stop {
     stop: number;
     rgb?: RGB;
 }
-export declare type GradientStops = Stop[];
+export type GradientStops = Stop[];
 export declare function execGradient(stops: GradientStops, value: number): string;
 export declare function parseGradient(sStops: string): GradientStops;
 export declare function asCSSGradient(stops: GradientStops): string;

package/dist/util/util.d.ts

@@ -1,4 +1,4 @@
-export declare type DateString = string;
+export type DateString = string;
 export declare function Now(): DateString;
 export declare class Elapsed {
     tStart: any;

package/lib/fsm/fsm.ts

@@ -51,7 +51,7 @@ function FsmStateToString(state: number): string
   }
 }
 
-export type FsmIndex = { [key: number]: Fsm };
+export type FsmIndex = Set<Fsm>;
 
 export class FsmManager
 {
@@ -66,14 +66,14 @@ export class FsmManager
     this.theId = 0;
     this.theEpoch = 0;
     this.bTickSet = false;
-    this.theTickList = {};
+    this.theTickList = new Set<Fsm>();
     this.theBusyLoopCount = 0;
     this.doTick = this.doTick.bind(this);
   }
 
   forceTick(fsm: Fsm): void
   {
-    this.theTickList[fsm.id] = fsm;
+    this.theTickList.add(fsm);
     if (! this.bTickSet)
     {
       this.bTickSet = true;
@@ -82,32 +82,26 @@ export class FsmManager
   }
 
   doTick(): void
-    {
-      this.bTickSet = false;
-      let nLoops: number = 0;
-
-      while (nLoops < 1 && !Util.isEmpty(this.theTickList))
-      {
-        nLoops++;
-        let thisTickList = this.theTickList;
-        this.theTickList = {};
-
-        for (let id in thisTickList) if (thisTickList.hasOwnProperty(id))
-        {
-          let f = thisTickList[id];
-          f.preTick();
-          f.tick();
-        }
-      }
+  {
+    this.bTickSet = false;
+    let nLoops = 0;
 
-      if (Util.isEmpty(this.theTickList))
-        this.theBusyLoopCount = 0;
-      else
-        this.theBusyLoopCount++;
+    while (nLoops < 1 && this.theTickList.size > 0)
+    {
+      nLoops++;
+      let thisTickList = this.theTickList;
+      this.theTickList = new Set<Fsm>();
 
-      this.theEpoch++;
+      thisTickList.forEach((f: Fsm) => f.tick());
     }
 
+    if (this.theTickList.size == 0)
+      this.theBusyLoopCount = 0;
+    else
+      this.theBusyLoopCount++;
+
+    this.theEpoch++;
+  }
 }
 
 export interface FsmEnvironment
@@ -132,143 +126,105 @@ export class Fsm
       this.state = FSM_STARTING;
       this.dependentError = false;
       this.epochDone = -1;
-      this._waitOn = null;
-      this._waitedOn = null;
+      this._waitOn = new Set<Fsm>();
+      this._waitedOn = new Set<Fsm>();
       this.manager.forceTick(this);
     }
 
   get env(): FsmEnvironment { return this._env; }
   get manager(): FsmManager { return this.env.fsmManager; }
 
-  get done(): boolean
-    {
-      return FsmDone(this.state);
-    }
+  get done(): boolean { return FsmDone(this.state) }
 
-  get ready(): boolean
-    {
-      return !this.done && this._waitOn == null;
-    }
+  get ready(): boolean { return !this.done && this.nWaitOn == 0 }
 
-  get iserror(): boolean
-    {
-      return (this.state === FSM_ERROR || this.state === FSM_CANCEL);
-    }
+  get iserror(): boolean { return this.state === FSM_ERROR || this.state === FSM_CANCEL }
 
-  get isDependentError(): boolean
-    {
-      return this.dependentError;
-    }
+  get isDependentError(): boolean { return this.dependentError }
 
-  cancel(): void
-    {
-      // Override if you need to do more than marking complete
-      this.setState(FSM_CANCEL);
-    }
+  // Override if you need to do more than marking complete
+  cancel(): void { this.setState(FSM_CANCEL) }
 
-  setDependentError(): void
-    {
-      this.dependentError = true;
-    }
+  setDependentError(): void { this.dependentError = true }
 
-  clearDependentError(): void
-    {
-      this.dependentError = false;
-    }
+  clearDependentError(): void { this.dependentError = false }
 
-  get ticked(): boolean
-    {
-      return this.done && this.manager.theEpoch > this.epochDone;
-    }
+  get ticked(): boolean { return this.done && this.manager.theEpoch > this.epochDone }
 
-  get nWaitOn(): number
-    {
-      return Util.countKeys(this._waitOn);
-    }
+  get nWaitOn(): number { return this._waitOn.size }
 
-  get nWaitedOn(): number
-    {
-      return Util.countKeys(this._waitedOn);
-    }
+  get nWaitedOn(): number { return this._waitedOn.size }
 
   waitOn(fsm: Fsm | Fsm[]): Fsm
+  {
+    if (fsm == null)
+      return this;
+    else if (Array.isArray(fsm))
     {
-      if (fsm == null)
-        return this;
-      else if (Array.isArray(fsm))
+      fsm.forEach((f: Fsm) => this.waitOn(f));
+    }
+    else
+    {
+      if (fsm.done)
       {
-        for (let i: number = 0; i < fsm.length; i++)
-          this.waitOn(fsm[i]);
+        // If dependency is already done, don't add to waitOn list but ensure that
+        // this Fsm gets ticked during next epoch. This is because the dependent tick
+        // only happens when the dependency state is changed.
+        this.manager.forceTick(this);
+        if (fsm.iserror)
+          this.setDependentError();
       }
       else
       {
-        if (fsm.done)
-        {
-          // If dependency is already done, don't add to waitOn list but ensure that
-          // this Fsm gets ticked during next epoch. This is because the dependent tick
-          // only happens when the dependency state is changed.
-          this.manager.forceTick(this);
-          if (fsm.iserror)
-            this.setDependentError();
-        }
-        else
-        {
-          if (this._waitOn == null) this._waitOn = {};
-          this._waitOn[fsm.id] = fsm;
-          if (fsm._waitedOn == null) fsm._waitedOn = {};
-          fsm._waitedOn[this.id] = this;
-        }
+        this._waitOn.add(fsm);
+        fsm._waitedOn.add(this);
       }
-      return this;
     }
+    return this;
+  }
 
   setState(state: number): void
+  {
+    this.state = state;
+    if (this.done)
     {
-      this.state = state;
-      if (this.done)
+      // Loop because completion might add more to wait list
+      while (this.nWaitedOn)
       {
-        while (this._waitedOn)
-        {
-          let on = this._waitedOn;
-          this._waitedOn = null;
-          for (let id in on) if (on.hasOwnProperty(id))
-          {
-            let f = on[id];
-            if (this.iserror) f.setDependentError();
-            this.manager.forceTick(f);
-          }
-        }
-
-        this.epochDone = this.manager.theEpoch;
+        let waitedOn = this._waitedOn;
+        this._waitedOn = new Set<Fsm>();
+        waitedOn.forEach((f: Fsm) => { f._completed(this); this.manager.forceTick(f) });
       }
-      this.manager.forceTick(this);
+
+      this.epochDone = this.manager.theEpoch;
     }
+    this.manager.forceTick(this);
+  }
 
   // Can override if need to do more here
   end(state: number = FSM_DONE): void
-    {
-      this.setState(state);
-    }
+  {
+    this.setState(state);
+  }
 
-  // Cleans up _waitOn
-  preTick(): void
+  // Override if subclass needs to respond to individual items completing rather than waiting
+  // in tick. Useful to avoid O(n^2) if waiting on lots of items and not wanting to do a linear
+  // scan for completed FSMs. Or to not require separate bookkeeping for list of dependents.
+  waitOnCompleted(f: Fsm): void { }
+
+  _completed(f: Fsm): void
+  {
+    if (f.iserror) this.setDependentError();
+    if (f.done && this._waitOn.has(f))
     {
-      if (this._waitOn == null) return;
-      let bMore: boolean = false;
-      for (let id in this._waitOn) if (this._waitOn.hasOwnProperty(id))
-      {
-        let fsm = this._waitOn[id];
-        if (fsm.done)
-          delete this._waitOn[id];
-        else
-          bMore = true;
-      }
-      if (!bMore) this._waitOn = null;
+      this._waitOn.delete(f);
+      this.waitOnCompleted(f);
     }
+  }
 
   tick(): void
-    {
-    }
+  {
+  }
 }
 
 // Launches callback provided when the associated Fsm (or Fsm array) completes.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/baseclient",
-  "version": "1.0.123",
+  "version": "1.0.125",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
   "types": "./dist/all/all.d.ts",
@@ -30,14 +30,14 @@
   "devDependencies": {
     "@types/diff-match-patch": "^1.0.32",
     "@types/geojson": "^7946.0.8",
-    "@types/node": "12.7.2",
-    "@types/object-hash": "^2.2.1",
-    "source-map-loader": "^3.0.0",
-    "ts-loader": "^9.2.6",
+    "@types/node": "20.11.30",
+    "@types/object-hash": "^3.0.6",
+    "source-map-loader": "^5.0.0",
+    "ts-loader": "^9.5.1",
     "tsify": "^5.0.4",
-    "typescript": "^4.5.2",
-    "webpack": "^5.65.0",
-    "webpack-cli": "^4.9.1"
+    "typescript": "^5.4.3",
+    "webpack": "^5.91.0",
+    "webpack-cli": "^5.1.4"
   },
   "dependencies": {
     "@dra2020/topojson-client": "^3.2.12",
@@ -45,7 +45,7 @@
     "@dra2020/topojson-simplify": "^3.0.102",
     "diff-match-patch": "^1.0.5",
     "geojson": "^0.5.0",
-    "object-hash": "^2.2.0",
+    "object-hash": "^3.0.0",
     "polygon-clipping": "^0.15.3",
     "tinyqueue": "^2.0.3"
   }