cwl-svg - npm Package Compare versions

Comparing version 2.1.1 to 2.1.2

compiled/src/plugins/arrange/arrange.js

@@ -52,11 +52,13 @@ "use strict";
     SVGArrangePlugin.prototype.afterRender = function () {
+        var model = this.workflow.model;
+        var drawables = [].concat(model.steps || [], model.inputs || [], model.outputs || []);
         try {
-            for (var _a = __values(this.workflow.model.steps), _b = _a.next(); !_b.done; _b = _a.next()) {
-                var step = _b.value;
-                if (step.isVisible) {
-                    var missingCoordinate = isNaN(parseInt(step.customProps["sbg:x"]));
+            for (var drawables_1 = __values(drawables), drawables_1_1 = drawables_1.next(); !drawables_1_1.done; drawables_1_1 = drawables_1.next()) {
+                var node = drawables_1_1.value;
+                if (node.isVisible) {
+                    var missingCoordinate = isNaN(parseInt(node.customProps["sbg:x"]));
                     if (missingCoordinate) {
                         this.arrange();
+                        return;
                     }
-                    return;
                 }
@@ -68,7 +70,7 @@ }
             try {
-                if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                if (drawables_1_1 && !drawables_1_1.done && (_a = drawables_1.return)) _a.call(drawables_1);
             }
             finally { if (e_1) throw e_1.error; }
         }
-        var e_1, _c;
+        var e_1, _a;
     };
@@ -75,0 +77,0 @@ SVGArrangePlugin.prototype.arrange = function () {

package.json

@@ -12,3 +12,3 @@ {
   "description": "A library for generating an interactive SVG visualization of CWL workflows",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "scripts": {
@@ -15,0 +15,0 @@ "build": "rm -rf compiled && npx tsc",

src/plugins/arrange/arrange.ts

@@ -1,5 +0,6 @@
-import {GraphNode}              from '../../graph/graph-node';
-import {Workflow}               from '../../graph/workflow';
-import {SVGUtils}               from '../../utils/svg-utils';
-import {GraphChange, SVGPlugin} from '../plugin';
+import {GraphNode}                                                  from '../../graph/graph-node';
+import {Workflow}                                                   from '../../graph/workflow';
+import {SVGUtils}                                                   from '../../utils/svg-utils';
+import {GraphChange, SVGPlugin}                                     from '../plugin';
+import {StepModel, WorkflowStepInputModel, WorkflowStepOutputModel} from "cwlts/models";
 
@@ -34,12 +35,19 @@ export class SVGArrangePlugin implements SVGPlugin {
 
-        for (let step of this.workflow.model.steps) {
-            if (step.isVisible) {
+        const model     = this.workflow.model;
+        const drawables = [].concat(
+            model.steps || [],
+            model.inputs || [],
+            model.outputs || []
+        ) as Array<WorkflowStepInputModel | WorkflowStepOutputModel | StepModel>;
 
-                const missingCoordinate = isNaN(parseInt(step.customProps["sbg:x"]));
+        for (let node of drawables) {
 
+            if (node.isVisible) {
+
+                const missingCoordinate = isNaN(parseInt(node.customProps["sbg:x"]));
+
                 if (missingCoordinate) {
                     this.arrange();
+                    return;
                 }
-
-                return;
             }
@@ -46,0 +54,0 @@ }

No alert changes

Improved metrics

Total package byte prevSize

9086588

increased by0.01%

Lines of code

19822

increased by0.05%

No dependency changes