@hpcc-js/wasm 1.13.0 → 1.14.0

package/README.md

@@ -35,13 +35,34 @@ npm install --global @hpcc-js/wasm
 Usage: dot-wasm [options] fileOrDot
 
 Options:
-      --version  Show version number                                   [boolean]
-  -K, --layout   Set layout engine (circo | dot | fdp | sfdp | neato | osage |
-                 patchwork | twopi). By default, dot is used.
-  -T, --format   Set output language to one of the supported formats (svg, dot,
-                 json, dot_json, xdot_json, plain, plain-ext). By default, svg
-                 is produced.
-  -h, --help     Show help                                             [boolean]
+      --version      Show version number                               [boolean]
+  -K, --layout       Set layout engine (circo | dot | fdp | sfdp | neato | osage
+                     | patchwork | twopi). By default, dot is used.
+  -T, --format       Set output language to one of the supported formats (svg,
+                     dot, json, dot_json, xdot_json, plain, plain-ext). By
+                     default, svg is produced.
+  -n, --neato-no-op  Sets no-op flag in neato.
+                     "-n 1" assumes neato nodes have already been positioned and
+                     all nodes have a pos attribute giving the positions. It
+                     then performs an optional adjustment to remove node-node
+                     overlap, depending on the value of the overlap attribute,
+                     computes the edge layouts, depending on the value of the
+                     splines attribute, and emits the graph in the appropriate
+                     format.
+                     "-n 2" Use node positions as specified, with no adjustment
+                     to remove node-node overlaps, and use any edge layouts
+                     already specified by the pos attribute. neato computes an
+                     edge layout for any edge that does not have a pos
+                     attribute. As usual, edge layout is guided by the splines
+                     attribute.
+  -y, --invert-y     By default, the coordinate system used in generic output
+                     formats, such as attributed dot, extended dot, plain and
+                     plain-ext, is the standard cartesian system with the origin
+                     in the lower left corner, and with increasing y coordinates
+                     as points move from bottom to top. If the -y flag is used,
+                     the coordinate system is inverted, so that increasing
+                     values of y correspond to movement from top to bottom.
+  -h, --help         Show help                                         [boolean]
 
 Examples:
   dot-wasm -K neato -T xdot ./input.dot  Execute NEATO layout and outputs XDOT

package/bin/cli.js

@@ -15,6 +15,12 @@ const yargs = require("yargs/yargs")(process.argv.slice(2))
     .alias("T", "format")
     .nargs("T", 1)
     .describe("T", "Set output language to one of the supported formats (svg, dot, json, dot_json, xdot_json, plain, plain-ext). By default, svg is produced.")
+    .alias("n", "neato-no-op")
+    .nargs("n", 1)
+    .describe("n", "Sets no-op flag in neato.\n\"-n 1\" assumes neato nodes have already been positioned and all nodes have a pos attribute giving the positions. It then performs an optional adjustment to remove node-node overlap, depending on the value of the overlap attribute, computes the edge layouts, depending on the value of the splines attribute, and emits the graph in the appropriate format.\n\"-n 2\" Use node positions as specified, with no adjustment to remove node-node overlaps, and use any edge layouts already specified by the pos attribute. neato computes an edge layout for any edge that does not have a pos attribute. As usual, edge layout is guided by the splines attribute.")
+    .alias("y", "invert-y")
+    .nargs("y", 0)
+    .describe("y", "By default, the coordinate system used in generic output formats, such as attributed dot, extended dot, plain and plain-ext, is the standard cartesian system with the origin in the lower left corner, and with increasing y coordinates as points move from bottom to top. If the -y flag is used, the coordinate system is inverted, so that increasing values of y correspond to movement from top to bottom.")
     .help("h")
     .alias("h", "help")
     .epilog("https://github.com/hpcc-systems/hpcc-js-wasm")
@@ -29,7 +35,21 @@ try {
     } else {
         dot = argv._[0];
     }
-    gvMod.graphviz.layout(dot, argv.format ?? "svg", argv.layout ?? "dot").then(response => {
+
+    if (argv.n && argv.layout.trim() !== "neato") {
+        throw new Error("-n option is only supported with -T neato");
+    }
+
+    const ext = {
+    };
+    if (argv.n) {
+        ext.nop = parseInt(argv.n);
+    }
+    if (argv.y) {
+        ext.yInvert = true;
+    }
+
+    gvMod.graphviz.layout(dot, argv.format?.trim() ?? "svg", argv.layout?.trim() ?? "dot", ext).then(response => {
         console.log(response);
     }).catch(e => {
         console.error(e.message);

package/dist/expat.es6.js

@@ -35,10 +35,10 @@ module.exports = cpp;
 
 var expatlib = expatlib$2.exports;
 
-var expatlib$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/_mergeNamespaces({
+var expatlib$1 = /*#__PURE__*/_mergeNamespaces({
   __proto__: null,
   'default': expatlib
-}, [expatlib$2.exports]));
+}, [expatlib$2.exports]);
 
 function getGlobal() {
     if (typeof self !== "undefined") {
@@ -52,12 +52,12 @@ function getGlobal() {
     }
     throw new Error("unable to locate global object");
 }
-var globalNS = getGlobal();
-var _wasmFolder = globalNS.__hpcc_wasmFolder || undefined;
+const globalNS = getGlobal();
+let _wasmFolder = globalNS.__hpcc_wasmFolder || undefined;
 function wasmFolder(_) {
     if (!arguments.length)
         return _wasmFolder;
-    var retVal = _wasmFolder;
+    const retVal = _wasmFolder;
     _wasmFolder = _;
     return retVal;
 }
@@ -74,13 +74,13 @@ function trimStart(str, charToRemove) {
     return str;
 }
 function loadWasm(_wasmLib, wf, wasmBinary) {
-    var wasmLib = _wasmLib.default || _wasmLib;
+    const wasmLib = _wasmLib.default || _wasmLib;
     //  Prevent double load ---
     if (!wasmLib.__hpcc_promise) {
         wasmLib.__hpcc_promise = wasmLib({
-            wasmBinary: wasmBinary,
-            locateFile: function (path, prefix) {
-                return "".concat(trimEnd(wf || wasmFolder() || prefix || ".", "/"), "/").concat(trimStart(path, "/"));
+            wasmBinary,
+            locateFile: (path, prefix) => {
+                return `${trimEnd(wf || wasmFolder() || prefix || ".", "/")}/${trimStart(path, "/")}`;
             }
         });
     }
@@ -88,66 +88,60 @@ function loadWasm(_wasmLib, wf, wasmBinary) {
 }
 
 // @ts-ignore
-var StackElement = /** @class */ (function () {
-    function StackElement(tag, attrs) {
+class StackElement {
+    constructor(tag, attrs) {
         this.tag = tag;
         this.attrs = attrs;
         this._content = "";
     }
-    Object.defineProperty(StackElement.prototype, "content", {
-        get: function () {
-            return this._content;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    StackElement.prototype.appendContent = function (content) {
+    get content() {
+        return this._content;
+    }
+    appendContent(content) {
         this._content += content;
-    };
-    return StackElement;
-}());
-var StackParser = /** @class */ (function () {
-    function StackParser() {
+    }
+}
+class StackParser {
+    constructor() {
         this._stack = [];
     }
-    StackParser.prototype.parse = function (xml, wasmFolder, wasmBinary) {
+    parse(xml, wasmFolder, wasmBinary) {
         return parse(xml, this, wasmFolder, wasmBinary);
-    };
-    StackParser.prototype.top = function () {
+    }
+    top() {
         return this._stack[this._stack.length - 1];
-    };
-    StackParser.prototype.startElement = function (tag, attrs) {
-        var retVal = new StackElement(tag, attrs);
+    }
+    startElement(tag, attrs) {
+        const retVal = new StackElement(tag, attrs);
         this._stack.push(retVal);
         return retVal;
-    };
-    StackParser.prototype.endElement = function (tag) {
+    }
+    endElement(tag) {
         return this._stack.pop();
-    };
-    StackParser.prototype.characterData = function (content) {
+    }
+    characterData(content) {
         this.top().appendContent(content);
-    };
-    return StackParser;
-}());
+    }
+}
 function parseAttrs(attrs) {
-    var retVal = {};
-    var keys = attrs;
-    var sep = "".concat(String.fromCharCode(1));
-    var sep2 = "".concat(sep).concat(sep);
-    keys.split(sep2).filter(function (key) { return !!key; }).forEach(function (key) {
-        var parts = key.split(sep);
+    const retVal = {};
+    const keys = attrs;
+    const sep = `${String.fromCharCode(1)}`;
+    const sep2 = `${sep}${sep}`;
+    keys.split(sep2).filter((key) => !!key).forEach((key) => {
+        const parts = key.split(sep);
         retVal[parts[0]] = parts[1];
     });
     return retVal;
 }
 function expatVersion(wasmFolder, wasmBinary) {
-    return loadWasm(expatlib$1, wasmFolder, wasmBinary).then(function (module) {
+    return loadWasm(expatlib$1, wasmFolder, wasmBinary).then(module => {
         return module.CExpat.prototype.version();
     });
 }
 function parse(xml, callback, wasmFolder, wasmBinary) {
-    return loadWasm(expatlib$1, wasmFolder, wasmBinary).then(function (module) {
-        var parser = new module.CExpatJS();
+    return loadWasm(expatlib$1, wasmFolder, wasmBinary).then(module => {
+        const parser = new module.CExpatJS();
         parser.startElement = function () {
             callback.startElement(this.tag(), parseAttrs(this.attrs()));
         };
@@ -158,7 +152,7 @@ function parse(xml, callback, wasmFolder, wasmBinary) {
             callback.characterData(this.content());
         };
         parser.create();
-        var retVal = parser.parse(xml);
+        const retVal = parser.parse(xml);
         parser.destroy();
         module.destroy(parser);
         return retVal;