formatting, update

lib/classes/Graph.ts

@@ -83,7 +83,7 @@ export class Graph extends Element {
       .replace (/^\s+$/gmu, '');
   }
 
-  public add_node (constructor: ((n: Node) => void) | string): string {
+  public add_node (constructor: string | ((n: Node) => void)): string {
     const node = new Node ('unnamed', this.full_name);
 
     if (typeof constructor === 'string') {
@@ -96,7 +96,7 @@ export class Graph extends Element {
     return node.full_name;
   }
 
-  public add_graph (constructor: ((g: Graph) => void) | string): string {
+  public add_graph (constructor: string | ((g: Graph) => void)): string {
     const graph = new Graph ('unnamed', this.full_name);
 
     graph.directional = this.directional;

lib/classes/GraphStream.ts

@@ -42,7 +42,7 @@ export class GraphStream extends Transform {
     return '  '.repeat (this._path.length);
   }
 
-  private finish_node ():void {
+  private finish_node (): void {
     if (
       [
         'ce',
@@ -168,7 +168,7 @@ export class GraphStream extends Transform {
     // this.write ({ type: 'en', args: [] });
   }
 
-  public create_graph (name: string, type: 'u'|'d'|'s' = 's'): void {
+  public create_graph (name: string, type: 'd' | 's' | 'u' = 's'): void {
     const instr_type = `c${type}g` as GraphStreamCommand;
     this.write ({ type: instr_type, args: [ validate_name (name) ] });
   }

test/spec/Stream.ts

@@ -43,7 +43,7 @@ const complex = `digraph foo {
 
 // eslint-disable-next-line max-lines-per-function
 describe ('stream', () => {
-  it ('stream graph', () => new Promise ((resolve) => {
+  it ('stream graph', () => new Promise<void> ((resolve) => {
     let output = '';
     const stream = (new GraphStream);
     stream.on ('data', (data) => {
@@ -60,7 +60,7 @@ describe ('stream', () => {
   }));
 
   // eslint-disable-next-line max-statements
-  it ('complex stream graph', () => new Promise ((resolve) => {
+  it ('complex stream graph', () => new Promise<void> ((resolve) => {
     let output = '';
     const stream = (new GraphStream);
     stream.on ('data', (data) => {
@@ -111,31 +111,31 @@ describe ('stream', () => {
      * ce       eg, cn, csg, ce, at   cug, cdg
      */
 
-    const cn = (g:GraphStream) => {
+    const cn = (g: GraphStream) => {
       g.create_node ('foo');
     };
-    const cug = (g:GraphStream) => {
+    const cug = (g: GraphStream) => {
       g.create_graph ('foo', 'u');
     };
-    const cdg = (g:GraphStream) => {
+    const cdg = (g: GraphStream) => {
       g.create_graph ('foo', 'd');
     };
-    const csg = (g:GraphStream) => {
+    const csg = (g: GraphStream) => {
       g.create_graph ('foo', 's');
     };
-    const eg = (g:GraphStream) => {
+    const eg = (g: GraphStream) => {
       g.end_graph ();
     };
-    const at = (g:GraphStream) => {
+    const at = (g: GraphStream) => {
       g.attributes ({ color: 'red' });
     };
-    const ce = (g:GraphStream) => {
+    const ce = (g: GraphStream) => {
       g.create_edge ('foo', 'bar');
     };
 
     const combinations = [
       {
-        primary: (g:GraphStream) => {
+        primary: (g: GraphStream) => {
           cug (g);
           cn (g);
         },
@@ -159,7 +159,7 @@ describe ('stream', () => {
         ]
       },
       {
-        primary:   (g:GraphStream) => {
+        primary:   (g: GraphStream) => {
           cug (g);
           csg (g);
         },
@@ -169,7 +169,7 @@ describe ('stream', () => {
         ]
       },
       {
-        primary:   (g:GraphStream) => {
+        primary:   (g: GraphStream) => {
           cug (g);
           csg (g);
           eg (g);
@@ -181,7 +181,7 @@ describe ('stream', () => {
         ]
       },
       {
-        primary:   (g:GraphStream) => {
+        primary:   (g: GraphStream) => {
           cug (g);
           at (g);
         },
@@ -192,7 +192,7 @@ describe ('stream', () => {
         ]
       },
       {
-        primary:   (g:GraphStream) => {
+        primary:   (g: GraphStream) => {
           cug (g);
           ce (g);
         },