bump version to 0.0.9 in package.json and package-lock.json; add type definitions for cytoscape-dagre, d3-interpolate, and plotly.js; update solver methods to accept null values

Author: riccardodebenedictis

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "ratio-gui",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -16,6 +16,9 @@
   },
   "devDependencies": {
     "@types/cytoscape": "^3.21.8",
+    "@types/cytoscape-dagre": "^2.3.3",
+    "@types/d3-interpolate": "^3.0.4",
+    "@types/plotly.js": "^2.35.1",
     "typescript": "~5.6.2"
   },
   "dependencies": {
@@ -28,4 +31,4 @@
     "plotly.js": "^3.0.0-rc.1",
     "tippy.js": "^6.3.7"
   }
-}
+}

package.json

@@ -83,7 +83,7 @@ export namespace solver {
       this.flaws.set(flaw.get_id(), flaw);
       for (const listener of this.solver_listeners) listener.flaw_cost_changed(flaw);
     }
-    current_flaw(flaw: graph.Flaw): void {
+    current_flaw(flaw: graph.Flaw | null): void {
       this.c_flaw = flaw;
       if (this.c_resolver)
         this.current_resolver(null);
@@ -93,7 +93,7 @@ export namespace solver {
       this.resolvers.set(resolver.get_id(), resolver);
       for (const listener of this.solver_listeners) listener.resolver_created(resolver);
     }
-    current_resolver(resolver: graph.Resolver): void {
+    current_resolver(resolver: graph.Resolver | null): void {
       this.c_resolver = resolver;
       for (const listener of this.solver_listeners) listener.current_resolver(resolver);
     }
@@ -113,10 +113,10 @@ export namespace solver {
 
     flaw_created(flaw: graph.Flaw): void;
     flaw_cost_changed(flaw: graph.Flaw): void;
-    current_flaw(flaw: graph.Flaw): void;
+    current_flaw(flaw: graph.Flaw | null): void;
 
     resolver_created(resolver: graph.Resolver): void;
-    current_resolver(resolver: graph.Resolver): void;
+    current_resolver(resolver: graph.Resolver | null): void;
   }
 
   export class SolverSet implements SolverSetListener {
@@ -297,7 +297,7 @@ export namespace solver {
         this.val = val;
       }
 
-      to_string(_, expressive = false): string {
+      to_string(_: Map<number, Value>, expressive = false): string {
         switch (this.val) {
           case LBool.True:
             return expressive ? 'true' : '⊤';
@@ -323,7 +323,7 @@ export namespace solver {
         this.ub = ub;
       }
 
-      to_string(_, expressive = false): string {
+      to_string(_: Map<number, Value>, expressive = false): string {
         if (expressive) {
           let res = `${this.val}`;
           if (this.lb || this.ub)
@@ -348,7 +348,7 @@ export namespace solver {
         this.ub = ub;
       }
 
-      to_string(_, expressive = false): string {
+      to_string(_: Map<number, Value>, expressive = false): string {
         if (expressive) {
           let res = `${this.val.to_string()}`;
           if (this.lb || this.ub)
@@ -373,7 +373,7 @@ export namespace solver {
         this.ub = ub;
       }
 
-      to_string(_, expressive = false): string {
+      to_string(_: Map<number, Value>, expressive = false): string {
         if (expressive) {
           let res = `${this.val.to_string()}`;
           if (this.lb || this.ub)
@@ -428,6 +428,7 @@ export namespace solver {
       constructor(id: number, type: string, name: string) {
         super();
         this.id = id;
+        this.type = type;
         this.name = name;
       }
 

src/solver.ts

@@ -19,9 +19,9 @@ export class SolverAnchor extends AnchorComponent<solver.Solver> implements solv
   state_changed(state: solver.SolverState): void { this.render(); }
   flaw_created(flaw: solver.graph.Flaw): void { }
   flaw_cost_changed(flaw: solver.graph.Flaw): void { }
-  current_flaw(flaw: solver.graph.Flaw): void { }
+  current_flaw(flaw: solver.graph.Flaw | null): void { }
   resolver_created(resolver: solver.graph.Resolver): void { }
-  current_resolver(resolver: solver.graph.Resolver): void { }
+  current_resolver(resolver: solver.graph.Resolver | null): void { }
 
   private render(): void {
     this.element.innerHTML = to_icon(this.payload.get_state()) + ' ' + this.payload.get_name();

src/solver_components.ts

@@ -90,7 +90,7 @@ export class SolverGraph extends Component<solver.Solver, HTMLDivElement> implem
     this.cy.layout(this.layout).run();
   }
 
-  current_flaw(flaw: solver.graph.Flaw): void {
+  current_flaw(flaw: solver.graph.Flaw | null): void {
     this.cy.layout(this.layout).run();
   }
 
@@ -99,7 +99,7 @@ export class SolverGraph extends Component<solver.Solver, HTMLDivElement> implem
     this.cy.layout(this.layout).run();
   }
 
-  current_resolver(resolver: solver.graph.Resolver): void {
+  current_resolver(resolver: solver.graph.Resolver | null): void {
     this.cy.layout(this.layout).run();
   }
 

src/solver_graph.ts

@@ -1,28 +1,27 @@
 import { Component } from "./app";
 import { solver } from "./solver";
-import Plotly from 'plotly.js';
+import Plotly, { Shape } from 'plotly.js';
 
 export class TimelinesChart extends Component<solver.Solver, HTMLDivElement> implements solver.SolverListener {
 
+  private current_time: Partial<Shape> = {
+    type: 'line',
+    x0: 0,
+    y0: 0,
+    x1: 0,
+    y1: 1,
+    xref: 'x',
+    yref: 'paper',
+    line: {
+      color: 'darkgrey',
+      width: 2
+    }
+  };
   private layout = {
     autosize: true,
     xaxis: { title: 'Time' },
     showlegend: false,
-    shapes: [
-      {
-        type: 'line',
-        x0: 0,
-        y0: 0,
-        x1: 0,
-        y1: 1,
-        xref: 'x',
-        yref: 'paper',
-        line: {
-          color: 'darkgrey',
-          width: 2
-        }
-      }
-    ]
+    shapes: [this.current_time],
   };
   private config = { responsive: true, displaylogo: false };
 
@@ -39,9 +38,9 @@ export class TimelinesChart extends Component<solver.Solver, HTMLDivElement> imp
   state_changed(state: solver.SolverState): void { }
   flaw_created(flaw: solver.graph.Flaw): void { }
   flaw_cost_changed(flaw: solver.graph.Flaw): void { }
-  current_flaw(flaw: solver.graph.Flaw): void { }
+  current_flaw(flaw: solver.graph.Flaw | null): void { }
   resolver_created(resolver: solver.graph.Resolver): void { }
-  current_resolver(resolver: solver.graph.Resolver): void { }
+  current_resolver(resolver: solver.graph.Resolver | null): void { }
 
   unmounting(): void { this.payload.remove_solver_listener(this); }
 }

src/solver_timelines.ts

@@ -1,10 +1,12 @@
 {
   "compilerOptions": {
-    "module": "commonjs",
-    "target": "es2019",
+    "module": "ESNext",
+    "target": "ES2015",
     "declaration": true,
     "outDir": "./dist",
-    "esModuleInterop": true
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "strict": true
   },
   "include": [
     "src/**/*"