feat: Add support for yInvert and nop

Signed-off-by: Gordon Smith <[email protected]>

Author: GordonSmith

README.md

@@ -163,6 +163,8 @@ _ext_ optional "extra params":
 }
 ```
 * _wasmFolder_: An optional `string` specifying the location of wasm file.
+* _yInvert_: An optional boolean flag to invert the y coordinate in generic output formats (dot, xdot, plain, plain-ext).  This is equivalent to specifying -y when invoking Graphviz from the command-line. 
+* _nop_: An optional number to specify "No layout" mode for the neato engine.  This is equivalent to specifying the -n option when invoking Graphviz from the command-line.
 
 For example passing a web hosted Image to GraphViz:
 ```JavaScript

cpp/graphviz/graphvizlib/main.cpp

@@ -1,6 +1,7 @@
 #include "main.hpp"
 
 #include <gvc.h>
+#include <globals.h>
 
 extern gvplugin_library_t gvplugin_core_LTX_library;
 extern gvplugin_library_t gvplugin_dot_layout_LTX_library;
@@ -59,6 +60,17 @@ const char *Main::lastError()
     return errorMessage;
 }
 
+void Main::setYInvert(int yInvert)
+{
+    Y_invert = yInvert;
+}
+
+void Main::setNop(int nop)
+{
+    if (nop != 0)
+        Nop = nop;
+}
+
 //  Patch for invalid osage function  ---
 //  https://gitlab.com/graphviz/graphviz/issues/1544
 #include "types.h"

cpp/graphviz/graphvizlib/main.hpp

@@ -4,4 +4,6 @@ class Main
     static const char *layout(const char *dot, const char *format, const char *engine);
     static const char *lastError();
     static void createFile(const char *path, const char *data);
+    static void setYInvert(int yInvert);
+    static void setNop(int nop);
 };

cpp/graphviz/graphvizlib/main.idl

@@ -2,5 +2,7 @@ interface Main {
   [Const] static DOMString layout([Const] DOMString dot, [Const] DOMString format, [Const] DOMString engine);
   [Const] static DOMString lastError();
   void createFile([Const] DOMString file, [Const] DOMString data);
+  void setYInvert(long yInvert);
+  void setNop(long nop);
 };
 

src/graphviz.ts

@@ -20,6 +20,8 @@ interface Ext {
     images?: Image[];
     files?: File[];
     wasmFolder?: string;
+    yInvert?: boolean;
+    nop?: number;
 }
 
 function imageToFile(image: Image): File {
@@ -49,6 +51,8 @@ export const graphviz = {
         if (!dotSource) return Promise.resolve("");
         return loadWasm(graphvizlib, ext?.wasmFolder).then(wasm => {
             createFiles(wasm, ext);
+            wasm.Main.prototype.setYInvert(ext?.yInvert ? 1 : 0);
+            wasm.Main.prototype.setNop(ext?.nop ? ext?.nop : 0);
             const retVal = wasm.Main.prototype.layout(dotSource, outputFormat, layoutEngine);
             if (!retVal) {
                 throw new Error(wasm.Main.prototype.lastError());
@@ -87,6 +91,8 @@ class GraphvizSync {
     layout(dotSource: string, outputFormat: Format = "svg", layoutEngine: Engine = "dot", ext?: Ext): string {
         if (!dotSource) return "";
         createFiles(this._wasm, ext);
+        this._wasm.Main.prototype.setYInvert(ext?.yInvert ? 1 : 0);
+        this._wasm.Main.prototype.setNop(ext?.nop ? ext?.nop : 0);
         const retVal = this._wasm.Main.prototype.layout(dotSource, outputFormat, layoutEngine);
         if (!retVal) {
             throw new Error(this._wasm.Main.prototype.lastError());

test/graphviz.spec.js

@@ -136,7 +136,7 @@ describe("graphvizSync", function () {
             graphviz = gv;
             expect(graphviz).to.exist;
         });
-    })
+    });
     it("circo", function () {
         const svg = graphviz.circo(dot, "svg");
         expect(svg).to.be.a("string");
@@ -209,3 +209,22 @@ describe("bad dot", function () {
         expect(success).to.be.false;
     });
 });
+
+describe("yInvert", function () {
+    let graphviz;
+    let plain1;
+    let plain2;
+    it("create", function () {
+        return hpccWasm.graphvizSync().then(gv => {
+            graphviz = gv;
+            expect(graphviz).to.exist;
+        });
+    });
+    it("compare", function () {
+        const plain1 = graphviz.dot(dot, "plain");
+        const plain2 = graphviz.dot(dot, "plain", { yInvert: false });
+        const plain3 = graphviz.dot(dot, "plain", { yInvert: true });
+        expect(plain1).to.equal(plain2);
+        expect(plain1).to.not.equal(plain3);
+    });
+});