@hpcc-js/wasm-graphviz 1.26.0 → 1.27.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hpcc-js/wasm-graphviz",
-  "version": "1.26.0",
+  "version": "1.27.0",
   "description": "hpcc-js - WASM Graphviz",
   "type": "module",
   "exports": {
@@ -56,5 +56,5 @@
   },
   "homepage": "https://hpcc-systems.github.io/hpcc-js-wasm/",
   "license": "Apache-2.0",
-  "gitHead": "b173ceec45fa54ec60a1642655d4f785ade8165c"
+  "gitHead": "489d0efe182d908652e5dea34891a6c26b760780"
 }

package/src/graphviz.ts

@@ -184,10 +184,10 @@ export class Subgraph {
     /**
      * Create (or find) a node and add it to this subgraph.
      */
-    addNode(name: string): this;
+    addNode(name: string, attrs?: AttrValues<NodeAttrs>, htmlAttrs?: AttrValues<NodeAttrs>): this;
     addNode(init: NodeInit): this;
-    addNode(nameOrInit: string | NodeInit): this {
-        const init = typeof nameOrInit === "string" ? { name: nameOrInit } : nameOrInit;
+    addNode(nameOrInit: string | NodeInit, nodeAttrs?: AttrValues<NodeAttrs>, nodeHtmlAttrs?: AttrValues<NodeAttrs>): this {
+        const init = typeof nameOrInit === "string" ? { name: nameOrInit, attrs: nodeAttrs, htmlAttrs: nodeHtmlAttrs } : nameOrInit;
         const { name, attrs, htmlAttrs } = init;
 
         this._sg.addNode(name);
@@ -200,11 +200,14 @@ export class Subgraph {
      * Create an edge inside this subgraph.  Both endpoints are created
      * automatically if they do not already exist.
      */
-    addEdge(tail: string, head: string, key?: string): this;
+    addEdge(tail: string, head: string, attrs?: AttrValues<EdgeAttrs>, htmlAttrs?: AttrValues<EdgeAttrs>): this;
+    addEdge(tail: string, head: string, key: string, attrs?: AttrValues<EdgeAttrs>, htmlAttrs?: AttrValues<EdgeAttrs>): this;
     addEdge(init: EdgeInit): this;
-    addEdge(tailOrInit: string | EdgeInit, head?: string, key: string = ""): this {
+    addEdge(tailOrInit: string | EdgeInit, head?: string, keyOrAttrs: string | AttrValues<EdgeAttrs> = "", attrsOrHtmlAttrs?: AttrValues<EdgeAttrs>, maybeHtmlAttrs?: AttrValues<EdgeAttrs>): this {
         const init = typeof tailOrInit === "string"
-            ? { tail: tailOrInit, head: head!, key }
+            ? typeof keyOrAttrs === "string"
+                ? { tail: tailOrInit, head: head!, key: keyOrAttrs, attrs: attrsOrHtmlAttrs, htmlAttrs: maybeHtmlAttrs }
+                : { tail: tailOrInit, head: head!, attrs: keyOrAttrs, htmlAttrs: attrsOrHtmlAttrs }
             : tailOrInit;
         const { tail, head: resolvedHead, key: resolvedKey = "", attrs, htmlAttrs } = init;
 
@@ -217,10 +220,10 @@ export class Subgraph {
     /**
      * Create (or return an existing) named subgraph under this subgraph.
      */
-    addSubgraph(name: string): Subgraph;
+    addSubgraph(name: string, attrs?: AttrValues<ClusterAttrs>, htmlAttrs?: AttrValues<ClusterAttrs>): Subgraph;
     addSubgraph(init: SubgraphInit): Subgraph;
-    addSubgraph(nameOrInit: string | SubgraphInit): Subgraph {
-        const init = typeof nameOrInit === "string" ? { name: nameOrInit } : nameOrInit;
+    addSubgraph(nameOrInit: string | SubgraphInit, attrs?: AttrValues<ClusterAttrs>, htmlAttrs?: AttrValues<ClusterAttrs>): Subgraph {
+        const init = typeof nameOrInit === "string" ? { name: nameOrInit, attrs, htmlAttrs } : nameOrInit;
         // addSubgraph only returns null when the internal subgraph pointer is null,
         // which cannot happen while this Subgraph instance is alive.
         return new Subgraph(this._sg.addSubgraph(init.name)!).applyInit(init);
@@ -578,10 +581,10 @@ export class Graph {
      * Create a node.  If a node with this name already exists it is returned
      * unchanged.
      */
-    addNode(name: string): this;
+    addNode(name: string, attrs?: AttrValues<NodeAttrs>, htmlAttrs?: AttrValues<NodeAttrs>): this;
     addNode(init: NodeInit): this;
-    addNode(nameOrInit: string | NodeInit): this {
-        const init = typeof nameOrInit === "string" ? { name: nameOrInit } : nameOrInit;
+    addNode(nameOrInit: string | NodeInit, nodeAttrs?: AttrValues<NodeAttrs>, nodeHtmlAttrs?: AttrValues<NodeAttrs>): this {
+        const init = typeof nameOrInit === "string" ? { name: nameOrInit, attrs: nodeAttrs, htmlAttrs: nodeHtmlAttrs } : nameOrInit;
         const { name, attrs, htmlAttrs } = init;
 
         this._graph.addNode(name);
@@ -596,11 +599,14 @@ export class Graph {
      * parallel edges between the same pair of nodes; omit (or pass `""`) for
      * an anonymous edge.
      */
-    addEdge(tail: string, head: string, key?: string): this;
+    addEdge(tail: string, head: string, attrs?: AttrValues<EdgeAttrs>, htmlAttrs?: AttrValues<EdgeAttrs>): this;
+    addEdge(tail: string, head: string, key: string, attrs?: AttrValues<EdgeAttrs>, htmlAttrs?: AttrValues<EdgeAttrs>): this;
     addEdge(init: EdgeInit): this;
-    addEdge(tailOrInit: string | EdgeInit, head?: string, key: string = ""): this {
+    addEdge(tailOrInit: string | EdgeInit, head?: string, keyOrAttrs: string | AttrValues<EdgeAttrs> = "", attrsOrHtmlAttrs?: AttrValues<EdgeAttrs>, maybeHtmlAttrs?: AttrValues<EdgeAttrs>): this {
         const init = typeof tailOrInit === "string"
-            ? { tail: tailOrInit, head: head!, key }
+            ? typeof keyOrAttrs === "string"
+                ? { tail: tailOrInit, head: head!, key: keyOrAttrs, attrs: attrsOrHtmlAttrs, htmlAttrs: maybeHtmlAttrs }
+                : { tail: tailOrInit, head: head!, attrs: keyOrAttrs, htmlAttrs: attrsOrHtmlAttrs }
             : tailOrInit;
         const { tail, head: resolvedHead, key: resolvedKey = "", attrs, htmlAttrs } = init;
 
@@ -954,10 +960,10 @@ export class Graph {
      * cluster.setAttr("label", "My Cluster").addEdge("a", "b");
      * ```
      */
-    addSubgraph(name: string): Subgraph;
+    addSubgraph(name: string, attrs?: AttrValues<ClusterAttrs>, htmlAttrs?: AttrValues<ClusterAttrs>): Subgraph;
     addSubgraph(init: SubgraphInit): Subgraph;
-    addSubgraph(nameOrInit: string | SubgraphInit): Subgraph {
-        const init = typeof nameOrInit === "string" ? { name: nameOrInit } : nameOrInit;
+    addSubgraph(nameOrInit: string | SubgraphInit, attrs?: AttrValues<ClusterAttrs>, htmlAttrs?: AttrValues<ClusterAttrs>): Subgraph {
+        const init = typeof nameOrInit === "string" ? { name: nameOrInit, attrs, htmlAttrs } : nameOrInit;
         // addSubgraph only returns null when the internal graph pointer is null,
         // which cannot happen while this Graph instance is alive.
         return new Subgraph(this._graph.addSubgraph(init.name)!).applyInit(init);

package/types/graphviz.d.ts

@@ -110,18 +110,19 @@ export declare class Subgraph {
     /**
      * Create (or find) a node and add it to this subgraph.
      */
-    addNode(name: string): this;
+    addNode(name: string, attrs?: AttrValues<NodeAttrs>, htmlAttrs?: AttrValues<NodeAttrs>): this;
     addNode(init: NodeInit): this;
     /**
      * Create an edge inside this subgraph.  Both endpoints are created
      * automatically if they do not already exist.
      */
-    addEdge(tail: string, head: string, key?: string): this;
+    addEdge(tail: string, head: string, attrs?: AttrValues<EdgeAttrs>, htmlAttrs?: AttrValues<EdgeAttrs>): this;
+    addEdge(tail: string, head: string, key: string, attrs?: AttrValues<EdgeAttrs>, htmlAttrs?: AttrValues<EdgeAttrs>): this;
     addEdge(init: EdgeInit): this;
     /**
      * Create (or return an existing) named subgraph under this subgraph.
      */
-    addSubgraph(name: string): Subgraph;
+    addSubgraph(name: string, attrs?: AttrValues<ClusterAttrs>, htmlAttrs?: AttrValues<ClusterAttrs>): Subgraph;
     addSubgraph(init: SubgraphInit): Subgraph;
     applyInit(init: SubgraphInit): this;
     /**
@@ -305,7 +306,7 @@ export declare class Graph {
      * Create a node.  If a node with this name already exists it is returned
      * unchanged.
      */
-    addNode(name: string): this;
+    addNode(name: string, attrs?: AttrValues<NodeAttrs>, htmlAttrs?: AttrValues<NodeAttrs>): this;
     addNode(init: NodeInit): this;
     /**
      * Create an edge from `tail` to `head`.  Both nodes are created
@@ -313,7 +314,8 @@ export declare class Graph {
      * parallel edges between the same pair of nodes; omit (or pass `""`) for
      * an anonymous edge.
      */
-    addEdge(tail: string, head: string, key?: string): this;
+    addEdge(tail: string, head: string, attrs?: AttrValues<EdgeAttrs>, htmlAttrs?: AttrValues<EdgeAttrs>): this;
+    addEdge(tail: string, head: string, key: string, attrs?: AttrValues<EdgeAttrs>, htmlAttrs?: AttrValues<EdgeAttrs>): this;
     addEdge(init: EdgeInit): this;
     applyInit(init: GraphInit): this;
     /**
@@ -491,7 +493,7 @@ export declare class Graph {
      * cluster.setAttr("label", "My Cluster").addEdge("a", "b");
      * ```
      */
-    addSubgraph(name: string): Subgraph;
+    addSubgraph(name: string, attrs?: AttrValues<ClusterAttrs>, htmlAttrs?: AttrValues<ClusterAttrs>): Subgraph;
     addSubgraph(init: SubgraphInit): Subgraph;
     /**
      * Look up an existing subgraph by name without creating a new one.