jqtree 1.6.2 → 1.7.0

package/lib/test/node.test.js

@@ -1,15 +1,10 @@
 "use strict";
 
 var _givens = _interopRequireDefault(require("givens"));
-
 var _node = require("../node");
-
 var _exampleData = _interopRequireDefault(require("./support/exampleData"));
-
 require("jest-extended");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 var context = describe;
 describe("addAfter", function () {
   var given = (0, _givens["default"])();
@@ -378,8 +373,8 @@ describe("constructor", function () {
         id: 123,
         name: "n1",
         url: "/"
-      }); // todo: match object?
-
+      });
+      // todo: match object?
       expect(given.node).not.toHaveProperty("label");
       expect(given.node.children).toHaveLength(0);
       expect(given.node.parent).toBeNull();
@@ -520,50 +515,39 @@ describe("getNextNode", function () {
   given("tree", function () {
     return new _node.Node().loadFromData(_exampleData["default"]);
   });
-  given("nextNode", function () {
-    return given.fromNode.getNextNode(given.includeChildren);
-  });
-  context("with includeChildren is true", function () {
-    given("includeChildren", function () {
-      return true;
+  context("with a parent node", function () {
+    given("fromNode", function () {
+      return given.tree.getNodeByNameMustExist("node1");
     });
-    context("with a parent node", function () {
-      given("fromNode", function () {
-        return given.tree.getNodeByNameMustExist("node1");
-      });
-      context("when the parent node is closed", function () {
-        it("returns the next sibling", function () {
-          expect(given.nextNode).toMatchObject({
-            name: "node2"
-          });
-        });
-      });
-      context("when the parent node is open", function () {
-        beforeEach(function () {
-          given.fromNode.is_open = true;
-        });
-        it("returns the first child", function () {
-          expect(given.nextNode).toMatchObject({
-            name: "child1"
-          });
+    context("when the parent node is closed", function () {
+      it("returns the first child", function () {
+        expect(given.fromNode.getNextNode()).toMatchObject({
+          name: "child1"
         });
       });
     });
-    context("with the node is the last child", function () {
-      given("fromNode", function () {
-        return given.tree.getNodeByNameMustExist("child2");
+    context("when the parent node is open", function () {
+      beforeEach(function () {
+        given.fromNode.is_open = true;
       });
-      it("returns the next sibling of the parent", function () {
-        expect(given.nextNode).toMatchObject({
-          name: "node2"
+      it("returns the first child", function () {
+        expect(given.fromNode.getNextNode()).toMatchObject({
+          name: "child1"
         });
       });
     });
   });
-  context("with includeChildren is false", function () {
-    given("includeChildren", function () {
-      return false;
+  context("with the node is the last child", function () {
+    given("fromNode", function () {
+      return given.tree.getNodeByNameMustExist("child2");
+    });
+    it("returns the next sibling of the parent", function () {
+      expect(given.fromNode.getNextNode()).toMatchObject({
+        name: "node2"
+      });
     });
+  });
+  context("with includeChildren is false", function () {
     context("with an open parent node", function () {
       given("fromNode", function () {
         return given.tree.getNodeByNameMustExist("node1");
@@ -572,11 +556,57 @@ describe("getNextNode", function () {
         given.fromNode.is_open = true;
       });
       it("returns the next sibling", function () {
-        expect(given.nextNode).toMatchObject({
+        expect(given.fromNode.getNextNode(false)).toMatchObject({
+          name: "node2"
+        });
+      });
+    });
+  });
+});
+describe("getNextVisibleNode", function () {
+  var given = (0, _givens["default"])();
+  given("tree", function () {
+    return new _node.Node().loadFromData(_exampleData["default"]);
+  });
+  context("with a parent node", function () {
+    given("fromNode", function () {
+      return given.tree.getNodeByNameMustExist("node1");
+    });
+    context("when the parent node is closed", function () {
+      it("returns the next sibling", function () {
+        expect(given.fromNode.getNextVisibleNode()).toMatchObject({
           name: "node2"
         });
       });
     });
+    context("when the parent node is open", function () {
+      beforeEach(function () {
+        given.fromNode.is_open = true;
+      });
+      it("returns the first child", function () {
+        expect(given.fromNode.getNextVisibleNode()).toMatchObject({
+          name: "child1"
+        });
+      });
+    });
+  });
+  context("with the node is the last child", function () {
+    given("fromNode", function () {
+      return given.tree.getNodeByNameMustExist("child2");
+    });
+    it("returns the next sibling of the parent", function () {
+      expect(given.fromNode.getNextVisibleNode()).toMatchObject({
+        name: "node2"
+      });
+    });
+  });
+  context("with the tree node", function () {
+    given("fromNode", function () {
+      return given.tree;
+    });
+    it("returns null", function () {
+      expect(given.fromNode.getNextVisibleNode()).toBeNull();
+    });
   });
 });
 describe("getNextSibling", function () {
@@ -699,44 +729,71 @@ describe("getParent", function () {
 });
 describe("getPreviousNode", function () {
   var given = (0, _givens["default"])();
-  given("node2", function () {
-    return given.tree.getNodeByNameMustExist("node2");
+  given("tree", function () {
+    return new _node.Node().loadFromData(_exampleData["default"]);
+  });
+  it("returns null with a tree node", function () {
+    expect(given.tree.getPreviousNode()).toBeNull();
+  });
+  it("returns the last child of the previous sibling when the previous node is closed and has children", function () {
+    given.tree.getNodeByNameMustExist("node2").is_open = false;
+    var node2 = given.tree.getNodeByNameMustExist("node2");
+    expect(node2.getPreviousNode()).toMatchObject({
+      name: "child2"
+    });
+  });
+  it("returns the last child of the previous sibling when the previous node is open and has children", function () {
+    given.tree.getNodeByNameMustExist("node2").is_open = true;
+    var node2 = given.tree.getNodeByNameMustExist("node2");
+    expect(node2.getPreviousNode()).toMatchObject({
+      name: "child2"
+    });
+  });
+  it("returns the first child if a node is the second child", function () {
+    var child2 = given.tree.getNodeByNameMustExist("child2");
+    expect(child2.getPreviousNode()).toMatchObject({
+      name: "child1"
+    });
   });
-  given("node3", function () {
-    return given.tree.getNodeByNameMustExist("node3");
+  it("returns the parent with a node that is the first child", function () {
+    var node3 = given.tree.getNodeByNameMustExist("node3");
+    expect(node3.getPreviousNode()).toMatchObject({
+      name: "node2"
+    });
   });
+});
+describe("getPreviousVisibleNode", function () {
+  var given = (0, _givens["default"])();
   given("tree", function () {
     return new _node.Node().loadFromData(_exampleData["default"]);
   });
-  context("with a tree", function () {
-    it("returns null", function () {
-      expect(given.tree.getPreviousNode()).toBeNull();
+  it("returns null with a tree node", function () {
+    expect(given.tree.getPreviousVisibleNode()).toBeNull();
+  });
+  it("returns the previous sibling when the previous sibling is closed and has children", function () {
+    given.tree.getNodeByNameMustExist("node2").is_open = false;
+    var node2 = given.tree.getNodeByNameMustExist("node2");
+    expect(node2.getPreviousVisibleNode()).toMatchObject({
+      name: "node1"
     });
   });
-  context("when the previous sibling has children", function () {
-    context("when the previous node is closed", function () {
-      it("returns the previous sibling", function () {
-        expect(given.node2.getPreviousNode()).toMatchObject({
-          name: "node1"
-        });
-      });
+  it("returns the last child of the previous sibling when the previous sibling is open and has children", function () {
+    given.tree.getNodeByNameMustExist("node1").is_open = true;
+    var node2 = given.tree.getNodeByNameMustExist("node2");
+    expect(node2.getPreviousVisibleNode()).toMatchObject({
+      name: "child2"
     });
-    context("when the previous node is open", function () {
-      beforeEach(function () {
-        given.tree.getNodeByNameMustExist("node1").is_open = true;
-      });
-      it("returns the last child of the previous sibling", function () {
-        expect(given.node2.getPreviousNode()).toMatchObject({
-          name: "child2"
-        });
-      });
+  });
+  it("returns the first child if a node is the second child", function () {
+    var child2 = given.tree.getNodeByNameMustExist("child2");
+    expect(child2.getPreviousVisibleNode()).toMatchObject({
+      name: "child1"
     });
   });
-  context("with a node that is the first child", function () {
-    it("returns the parent", function () {
-      expect(given.node3.getPreviousNode()).toMatchObject({
-        name: "node2"
-      });
+  it("returns the parent when a node is the first child", function () {
+    var node3 = given.tree.getNodeByNameMustExist("node3");
+    expect(node3.getPreviousVisibleNode()).toMatchObject({
+      name: "node2"
     });
   });
 });
@@ -861,7 +918,6 @@ describe("iterate", function () {
       given.visited.push([node.name, level]);
       return true;
     };
-
     given("visitor", function () {
       return visitAllNodes;
     });
@@ -874,7 +930,6 @@ describe("iterate", function () {
       given.visited.push([node.name, level]);
       return false;
     };
-
     given("visitor", function () {
       return visitNodes;
     });

package/lib/test/nodeUtil.test.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _node = require("../node");
-
 var context = describe;
 describe("getPosition", function () {
   it("returns the position", function () {

package/lib/test/support/jqTreeMatchers.js

@@ -1,24 +1,20 @@
 "use strict";
 
 var _treeStructure = _interopRequireDefault(require("./treeStructure"));
-
 var _testUtil = require("./testUtil");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 var assertJqTreeFolder = function assertJqTreeFolder($el) {
   /* istanbul ignore if */
   if (!$el.hasClass("jqtree-folder")) {
     throw new Error("Node is not a folder");
   }
 };
-
 expect.extend({
   toBeClosed: function toBeClosed(el) {
     var $el = jQuery(el);
     assertJqTreeFolder($el);
-    /* istanbul ignore next */
 
+    /* istanbul ignore next */
     return {
       message: function message() {
         return "The node is open";
@@ -38,8 +34,8 @@ expect.extend({
   toBeOpen: function toBeOpen(el) {
     var $el = jQuery(el);
     assertJqTreeFolder($el);
-    /* istanbul ignore next */
 
+    /* istanbul ignore next */
     return {
       message: function message() {
         return "The node is closed";
@@ -49,8 +45,8 @@ expect.extend({
   },
   toBeSelected: function toBeSelected(el) {
     var $el = jQuery(el);
-    /* istanbul ignore next */
 
+    /* istanbul ignore next */
     return {
       message: function message() {
         return "The node is not selected";
@@ -60,11 +56,10 @@ expect.extend({
   },
   toHaveTreeStructure: function toHaveTreeStructure(el, expectedStructure) {
     var _this = this;
-
     var $el = jQuery(el);
     var receivedStructure = (0, _treeStructure["default"])($el);
-    /* istanbul ignore next */
 
+    /* istanbul ignore next */
     return {
       message: function message() {
         return _this.utils.printDiffOrStringify(expectedStructure, receivedStructure, "expected", "received", true);

package/lib/test/support/setupTests.js

@@ -1,11 +1,7 @@
 "use strict";
 
 var _jquery = _interopRequireDefault(require("jquery"));
-
 require("./jqTreeMatchers");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 window.$ = _jquery["default"]; // eslint-disable-line @typescript-eslint/no-unsafe-member-access
-
 window.jQuery = _jquery["default"]; // eslint-disable-line @typescript-eslint/no-unsafe-member-access

package/lib/test/support/testUtil.js

@@ -4,38 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.togglerLink = exports.titleSpan = exports.singleChild = void 0;
-
 var singleChild = function singleChild($el, selector) {
   var $result = $el.children(selector);
-  /* istanbul ignore if */
 
+  /* istanbul ignore if */
   if ($result.length === 0) {
     throw "No child found for selector '".concat(selector, "'");
   }
-  /* istanbul ignore if */
-
 
+  /* istanbul ignore if */
   if ($result.length > 1) {
     throw "Multiple elements found for selector '".concat(selector, "'");
   }
-
   return $result;
 };
-
 exports.singleChild = singleChild;
-
 var titleSpan = function titleSpan(liNode) {
   return singleChild(nodeElement(liNode), "span.jqtree-title");
 };
-
 exports.titleSpan = titleSpan;
-
 var togglerLink = function togglerLink(liNode) {
   return singleChild(nodeElement(liNode), "a.jqtree-toggler");
 };
-
 exports.togglerLink = togglerLink;
-
 var nodeElement = function nodeElement(liNode) {
   return singleChild(jQuery(liNode), "div.jqtree-element ");
 };

package/lib/test/support/treeStructure.js

@@ -4,15 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _testUtil = require("./testUtil");
-
 var getTreeNode = function getTreeNode($li) {
   var $div = (0, _testUtil.singleChild)($li, "div.jqtree-element");
   var $span = (0, _testUtil.singleChild)($div, "span.jqtree-title");
   var name = $span.html();
   var selected = $li.hasClass("jqtree-selected");
-
   if ($li.hasClass("jqtree-folder")) {
     var $ul = $li.children("ul.jqtree_common");
     return {
@@ -30,16 +27,13 @@ var getTreeNode = function getTreeNode($li) {
     };
   }
 };
-
 var getChildren = function getChildren($ul) {
   return $ul.children("li.jqtree_common").map(function (_, li) {
     return getTreeNode(jQuery(li));
   }).get();
 };
-
 var treeStructure = function treeStructure($el) {
   return getChildren((0, _testUtil.singleChild)($el, "ul.jqtree-tree"));
 };
-
 var _default = treeStructure;
 exports["default"] = _default;

package/lib/test/util.test.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _util = require("../util");
-
 describe("getBoolString", function () {
   it("returns true or false", function () {
     expect((0, _util.getBoolString)(true)).toBe("true");