jqtree 1.6.3 → 1.7.1

package/.github/workflows/ci.yml

@@ -12,17 +12,17 @@ jobs:
             - name: Setup node
               uses: actions/setup-node@v3
               with:
-                  node-version: "16"
+                  node-version: 16
             - name: Install pnpm
               run: npm install -g pnpm
             - name: Get pnpm store directory
               id: pnpm-cache
               run: |
-                echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
+                echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
             - uses: actions/cache@v3
               name: Setup pnpm cache
               with:
-                path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
+                path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
                 key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
                 restore-keys: |
                   ${{ runner.os }}-pnpm-store-
@@ -38,21 +38,21 @@ jobs:
                   pnpm install
             - name: Build
               run: |
-                  pnpm production
+                  pnpm run production
             - name: Lint
               run: |
-                  pnpm lint
+                  pnpm run lint
             - name: Check types
               run: |
-                  pnpm tsc
+                  pnpm run tsc
             - name: Clean coverage
-              run: pnpm clean-coverage
+              run: rm -rf .nyc_output && npx jest --clearCache
             - name: Run jest tests
-              run: pnpm jest
+              run: pnpm run jest
             - name: Playwright install
               run: npx playwright install chromium
             - name: Run playwright tests
-              run: pnpm playwright
+              run: pnpm run playwright
             - name: Screenshots artifact
               if: always()
               uses: actions/upload-artifact@v3
@@ -60,20 +60,14 @@ jobs:
                 name: screenshots
                 path: src/playwright/playwright.test.ts-snapshots/
             - name: Merge coverage
-              run: |
-                  pnpm merge-coverage
-                  pnpm print-coverage
+              run: cp jest-coverage/coverage-final.json .nyc_output/coverage_jsdom.json
             - name: Coverage artifact
               uses: actions/upload-artifact@v3
               with:
                 name: coverage
                 path: .nyc_output
-            - name: Coveralls
-              run: |
-                  pnpm coveralls
-              env:
-                  COVERALLS_REPO_TOKEN: ${{ secrets.github_token }}
-                  COVERALLS_SERVICE_NAME: github
-                  COVERALLS_GIT_COMMIT: ${{ github.sha }}
-                  COVERALLS_GIT_BRANCH: ${{ github.ref }}
-                  COVERALLS_SERVICE_JOB_ID: ${{ github.run_id }}
+            - name: Codecov
+              uses: codecov/codecov-action@v3
+              with:
+                directory: .nyc_output
+                verbose: true

package/.github/workflows/codeql-analysis.yml

@@ -2,9 +2,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [master]
+    branches: [dev]
   pull_request:
-    branches: [master]
+    branches: [dev]
 
 jobs:
     analyze:

package/README.md

@@ -1,4 +1,4 @@
-![Build](https://github.com/mbraak/jqTree/workflows/Continuous%20integration/badge.svg) [![Coverage Status](https://img.shields.io/coveralls/mbraak/jqTree.svg)](https://coveralls.io/r/mbraak/jqTree)
+![Build](https://github.com/mbraak/jqTree/workflows/Continuous%20integration/badge.svg) [![codecov](https://codecov.io/gh/mbraak/jqTree/branch/dev/graph/badge.svg?token=DKzjY5YUlq)](https://codecov.io/gh/mbraak/jqTree)
 
 [![NPM version](https://img.shields.io/npm/v/jqtree.svg)](https://www.npmjs.com/package/jqtree)
 

package/bower.json

@@ -1,11 +1,18 @@
 {
     "name": "jqTree",
-    "version": "1.6.3",
-    "main": ["jqtree.css", "jqtree-circle.png", "tree.jquery.js"],
+    "version": "1.7.1",
+    "main": [
+        "jqtree.css",
+        "jqtree-circle.png",
+        "tree.jquery.js"
+    ],
     "dependencies": {
         "jquery": ">=1.9"
     },
     "license": "Apache-2.0",
     "ignore": [],
-    "keywords": ["jquery-plugin", "tree"]
+    "keywords": [
+        "jquery-plugin",
+        "tree"
+    ]
 }

package/config/production

@@ -1,4 +1,4 @@
-rollup -c config/rollup.config.js &&
-DEBUG_BUILD=true rollup -c config/rollup.config.js &&
+rollup -c config/rollup.config.mjs &&
+DEBUG_BUILD=true rollup -c config/rollup.config.mjs &&
 babel src --config-file ./config/babel.config.json --out-dir lib --extensions .ts &&
 postcss --config ./config -o jqtree.css css/jqtree.postcss

package/config/{rollup.config.js → rollup.config.mjs}

@@ -1,11 +1,10 @@
 import fs from "fs";
-import path from "path";
 import jsonfile from "jsonfile";
 import template from "lodash.template";
 import { babel } from "@rollup/plugin-babel";
 import resolve from "@rollup/plugin-node-resolve";
 import serve from "rollup-plugin-serve";
-import { terser } from "rollup-plugin-terser";
+import terser from "@rollup/plugin-terser";
 
 const getBanner = () => {
     const headerTemplate = fs.readFileSync("./src/header.txt", "utf8");
@@ -32,7 +31,7 @@ const babelConfigFile = includeCoverage
 
 const babelPlugin = babel({
     babelHelpers: "bundled",
-    configFile: path.resolve(__dirname, babelConfigFile),
+    configFile: `./config/${babelConfigFile}`,
     extensions: [".ts"],
 });
 
@@ -49,11 +48,7 @@ if (!debugBuild) {
 
 if (devServer) {
     const servePlugin = serve({
-        contentBase: [
-            path.join(__dirname, "../devserver"),
-            path.join(__dirname, "../docs/static"),
-            path.join(__dirname, ".."),
-        ],
+        contentBase: ["./devserver", "./docs/static", "./"],
         port: 8080,
     });
     plugins.push(servePlugin);

package/docs/Gemfile.lock

@@ -1,43 +1,42 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.5)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.11.1)
     colorator (1.1.0)
-    commonmarker (0.23.4)
-    concurrent-ruby (1.1.10)
+    commonmarker (0.23.9)
+    concurrent-ruby (1.2.2)
     dnsruby (1.61.9)
       simpleidn (~> 0.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    ethon (0.15.0)
+    ethon (0.16.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
     execjs (2.8.1)
-    faraday (2.3.0)
-      faraday-net_http (~> 2.0)
+    faraday (2.7.4)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (2.0.3)
+    faraday-net_http (3.0.2)
     ffi (1.15.5)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
-    github-pages (226)
+    github-pages (228)
       github-pages-health-check (= 1.17.9)
-      jekyll (= 3.9.2)
+      jekyll (= 3.9.3)
       jekyll-avatar (= 0.7.0)
       jekyll-coffeescript (= 1.1.1)
-      jekyll-commonmark-ghpages (= 0.2.0)
+      jekyll-commonmark-ghpages (= 0.4.0)
       jekyll-default-layout (= 0.1.4)
       jekyll-feed (= 0.15.1)
       jekyll-gist (= 1.5.0)
@@ -71,10 +70,10 @@ GEM
       jemoji (= 0.12.0)
       kramdown (= 2.3.2)
       kramdown-parser-gfm (= 1.1.0)
-      liquid (= 4.0.3)
+      liquid (= 4.0.4)
       mercenary (~> 0.3)
       minima (= 2.5.1)
-      nokogiri (>= 1.13.4, < 2.0)
+      nokogiri (>= 1.13.6, < 2.0)
       rouge (= 3.26.0)
       terminal-table (~> 1.4)
     github-pages-health-check (1.17.9)
@@ -83,17 +82,17 @@ GEM
       octokit (~> 4.0)
       public_suffix (>= 3.0, < 5.0)
       typhoeus (~> 1.3)
-    html-pipeline (2.14.1)
+    html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
-    i18n (0.9.5)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.2)
+    jekyll (3.9.3)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 2.0)
       kramdown (>= 1.17, < 3)
@@ -109,11 +108,11 @@ GEM
       coffee-script-source (~> 1.11.1)
     jekyll-commonmark (1.4.0)
       commonmarker (~> 0.22)
-    jekyll-commonmark-ghpages (0.2.0)
-      commonmarker (~> 0.23.4)
+    jekyll-commonmark-ghpages (0.4.0)
+      commonmarker (~> 0.23.7)
       jekyll (~> 3.9.0)
       jekyll-commonmark (~> 1.4.0)
-      rouge (>= 2.0, < 4.0)
+      rouge (>= 2.0, < 5.0)
     jekyll-default-layout (0.1.4)
       jekyll (~> 3.0)
     jekyll-feed (0.15.1)
@@ -201,28 +200,28 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.7.1)
+    liquid (4.0.4)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    mini_portile2 (2.8.0)
+    mini_portile2 (2.8.1)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.15.0)
-    nokogiri (1.13.6)
+    minitest (5.18.0)
+    nokogiri (1.14.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    octokit (4.25.0)
+    octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.7)
-    racc (1.6.0)
-    rb-fsevent (0.11.1)
+    racc (1.6.2)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
@@ -242,16 +241,14 @@ GEM
       unf (~> 0.1.4)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    thread_safe (0.3.6)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.10)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
     unicode-display_width (1.8.0)
-    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby

package/docs/_config.yml

@@ -18,7 +18,7 @@ defaults:
       values:
         layout: "example"
 
-jqtree_version: 1.6.3
+jqtree_version: 1.7.1
 
 # Build settings
 markdown: kramdown

package/docs/_entries/10_changelog.md

@@ -3,6 +3,19 @@ title: Changelog
 name: changelog
 ---
 
+#### 1.7.1 (august 6 2023)
+
+-   Issue #724: improve accessibility
+
+#### 1.7.0 (december 23 2022)
+
+Small breaking change: this release changes the definition of getPreviousNode and getNextNode.
+
+-   Issue #704: dispatch the tree.load_data after initializing the tree
+-   Issue #706: change the functions for getting the next and previous nodes.
+    -   Rename getPreviousNode to getPreviousVisibleNode and getNextNode to getNextVisibleNode.
+    -   Add new getPreviousNode and getNextNode functions that ignores if a node is visible.
+
 #### 1.6.3 (august 7 2022)
 
 -   Issue # 692: openFolderDelay is false disables opening folders during drag and drop

package/docs/_entries/93_getnextnode.md

@@ -3,7 +3,10 @@ title: getNextNode
 name: node-functions-getnextnode
 ---
 
-Get the next node in the tree. Does the same as using the *down* key.
+Get the next node in the tree.
+
+-   If the node has children, return the first child.
+-   If the node is the last child, return the next sibling of the parent.
 
 Returns a node or null.
 

package/docs/_entries/{95_getpreviousnode.md → 95_getnextvisiblenode.md}

@@ -3,7 +3,7 @@ title: getPreviousNode
 name: node-functions-getpreviousnode
 ---
 
-Get the previous node in the tree. Does the same as using the *up* key.
+Return the previous node in the tree.
 
 Returns a node or null.
 

package/docs/_entries/98_getpreviousvisiblenode.md

@@ -0,0 +1,14 @@
+---
+title: getPreviousVisibleNode
+name: node-functions-getpreviousvisiblenode
+---
+
+-   Get the previous visible node in the tree. Does the same as using the _up_ key.
+-   If the previous node is an open parent: return the last child of the node.
+-   If the previous node is a closed parent: skip the child nodes of the previous parent, return the previous parent node.
+
+Returns a node or null.
+
+{% highlight js %}
+var node = node.getPreviousVisibleNode();
+{% endhighlight %}

package/docs/package.json

@@ -10,13 +10,13 @@
     "copy_static": "cp ../tree.jquery.js . && cp ../jqtree.css ."
   },
   "devDependencies": {
-    "@tailwindcss/typography": "^0.5.2",
-    "autoprefixer": "^10.4.7",
-    "postcss": "^8.4.14",
-    "postcss-cli": "^9.1.0",
-    "postcss-import": "^14.1.0",
+    "@tailwindcss/typography": "^0.5.9",
+    "autoprefixer": "^10.4.14",
+    "postcss": "^8.4.27",
+    "postcss-cli": "^10.1.0",
+    "postcss-import": "^15.1.0",
     "postcss-load-config": "^4.0.1",
-    "postcss-nested": "^5.0.6",
-    "tailwindcss": "^3.1.2"
+    "postcss-nested": "^6.0.1",
+    "tailwindcss": "^3.3.3"
   }
 }