Return multiple format output as an object

mdaines · Sep 24, 2024 · de27efd · de27efd
1 parent 33d039a
commit de27efd
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/packages/viz/src/viz.mjs b/packages/viz/src/viz.mjs
@@ -22,18 +22,18 @@ class Viz {
   }
 
   render(input, options = {}) {
-    let formats;
+    let format;
 
     if (options.format === void 0) {
-      formats = ["dot"];
+      format = "dot";
     } else {
-      formats = [options.format];
+      format = options.format;
     }
 
-    let result = this.wrapper.renderInput(input, formats, { engine: "dot", ...options });
+    let result = this.wrapper.renderInput(input, [format], { engine: "dot", ...options });
 
     if (result.status === "success") {
-      result.output = result.output[0];
+      result.output = result.output[format];
     }
 
     return result;

diff --git a/packages/viz/src/wrapper.mjs b/packages/viz/src/wrapper.mjs
@@ -76,7 +76,7 @@ class Wrapper {
         };
       }
 
-      let output = [];
+      let output = {};
 
       for (let format of formats) {
         resultPointer = this.module.ccall("viz_render", "number", ["number", "number", "string"], [contextPointer, graphPointer, format]);
@@ -88,7 +88,7 @@ class Wrapper {
             errors: this.#parseErrorMessages()
           };
         } else {
-          output.push(this.module.UTF8ToString(resultPointer));
+          output[format] = this.module.UTF8ToString(resultPointer);
 
           this.module.ccall("free", "number", ["number"], [resultPointer]);
           resultPointer = 0;

diff --git a/packages/viz/test/render-formats.test.mjs b/packages/viz/test/render-formats.test.mjs
@@ -14,10 +14,10 @@ describe("Viz", function() {
 
       assert.deepStrictEqual(result, {
         status: "success",
-        output: [
-          "graph a {\n\tgraph [bb=\"0,0,0,0\"];\n\tnode [label=\"\\N\"];\n}\n",
-          "<map id=\"a\" name=\"a\">\n</map>\n"
-        ],
+        output: {
+          dot: "graph a {\n\tgraph [bb=\"0,0,0,0\"];\n\tnode [label=\"\\N\"];\n}\n",
+          cmapx: "<map id=\"a\" name=\"a\">\n</map>\n"
+        },
         errors: []
       });
     });
@@ -27,10 +27,9 @@ describe("Viz", function() {
 
       assert.deepStrictEqual(result, {
         status: "success",
-        output: [
-          "graph a {\n\tgraph [bb=\"0,0,0,0\"];\n\tnode [label=\"\\N\"];\n}\n",
-          "graph a {\n\tgraph [bb=\"0,0,0,0\"];\n\tnode [label=\"\\N\"];\n}\n"
-        ],
+        output: {
+          dot: "graph a {\n\tgraph [bb=\"0,0,0,0\"];\n\tnode [label=\"\\N\"];\n}\n"
+        },
         errors: []
       });
     });
@@ -40,7 +39,7 @@ describe("Viz", function() {
 
       assert.deepStrictEqual(result, {
         status: "success",
-        output: [],
+        output: {},
         errors: []
       });
     });
@@ -50,10 +49,10 @@ describe("Viz", function() {
 
       assert.deepStrictEqual(result, {
         status: "success",
-        output: [
-          "graph a {\n\tgraph [bb=\"0,0,0,0\"];\n\tnode [label=\"\\N\"];\n}\n",
-          "<map id=\"a\" name=\"a\">\n</map>\n"
-        ],
+        output: {
+          dot: "graph a {\n\tgraph [bb=\"0,0,0,0\"];\n\tnode [label=\"\\N\"];\n}\n",
+          cmapx: "<map id=\"a\" name=\"a\">\n</map>\n"
+        },
         errors: []
       });
     });