Upgrade Lezer Parser to 1.0.0 and Codemirror bundle to 6.0.0 (#25)

In addition:

* Fix API changes around tree navigation
* Demo app evaluate forms in Clerk's SCI viewer context
* Add github test workflow + snapshot build of demo app on every commit
* Fix dependabot security alert: Bump elliptic from 6.5.3 to 6.5.4 (#26)
* Tests run against lezer-clojure grammar, not live one shipped in the repo

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Author: zampino

.github/workflows/clojure.yaml

@@ -0,0 +1,75 @@
+name: CI
+on: push
+jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    steps:
+      - name: 🔧 Install java
+        uses: actions/setup-java@v1
+        with:
+          java-version: '11.0.7'
+
+      - name: 🔧 Install clojure
+        uses: DeLaGuardo/setup-clojure@master
+        with:
+          cli: '1.10.3.943'
+
+      - name: 🛎 Checkout
+        uses: actions/checkout@v2
+
+      - name: 🧶 Yarn Install
+        run: yarn install
+
+      - name: 🧪 Run tests
+        run: yarn test
+
+  snapshot:
+    name: Static App / Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: 🛎 Checkout
+        uses: actions/checkout@v2
+
+      - name: 🔐 Google Auth
+        uses: google-github-actions/auth@v0
+        with:
+          credentials_json: ${{ secrets.GCLOUD_SERVICE_KEY }}
+
+      - name: 🔧 Setup Google Cloud SDK
+        uses: google-github-actions/[email protected]
+
+      - name: 🔧 Install java
+        uses: actions/setup-java@v1
+        with:
+          java-version: '11.0.7'
+
+      - name: 🔧 Install clojure
+        uses: DeLaGuardo/setup-clojure@master
+        with:
+          cli: '1.10.3.943'
+      - name: 🧶 Yarn Install
+        run: yarn install
+
+      - name: 🧶 Yarn Build
+        run: yarn build
+
+      - name: 📠 Copy static build to bucket under SHA
+        run: gsutil cp -r public gs://nextjournal-snapshots/clojure-mode/build/${{ github.sha }}
+
+      - name: 📠 Copy static build to GitHub Pages
+        if: ${{ github.ref == 'refs/heads/main' }}
+        uses: JamesIves/[email protected]
+        with:
+          branch: gh-pages     # The branch the action should deploy to.
+          folder: public       # The folder the action should deploy.
+
+      - name: ✅ Add success status to report with link to snapshot
+        uses: Sibz/github-status-action@v1
+        with:
+          authToken: ${{secrets.GITHUB_TOKEN}}
+          context: 'CI / Static App / URL'
+          description: 'Ready'
+          state: 'success'
+          sha: ${{github.event.pull_request.head.sha || github.sha}}
+          target_url: https://snapshots.nextjournal.com/clojure-mode/build/${{ github.sha }}

.github/workflows/main.yml

@@ -2,8 +2,10 @@
 .idea
 .calva
 .clj-kondo
+.cpcache
 .lsp
 public/js
 node_modules
 public/test
 *.iml
+out

.gitignore

@@ -1,26 +1,18 @@
 (ns nextjournal.clojure-mode.demo
-  (:require ["@codemirror/closebrackets" :refer [closeBrackets]]
-            ["@codemirror/fold" :as fold]
-            ["@codemirror/gutter" :refer [lineNumbers]]
-            ["@codemirror/highlight" :as highlight]
-            ["@codemirror/history" :refer [history historyKeymap]]
+  (:require ["@codemirror/language" :refer [foldGutter syntaxHighlighting defaultHighlightStyle]]
+            ["@codemirror/commands" :refer [history historyKeymap]]
             ["@codemirror/state" :refer [EditorState]]
             ["@codemirror/view" :as view :refer [EditorView]]
-            ["lezer" :as lezer]
-            ["lezer-generator" :as lg]
-            ["lezer-tree" :as lz-tree]
+            [nextjournal.clerk.sci-viewer :as sv]
+            [nextjournal.clerk.viewer :as clerk.viewer]
             [applied-science.js-interop :as j]
             [clojure.string :as str]
             [nextjournal.clojure-mode :as cm-clj]
             [nextjournal.clojure-mode.demo.sci :as sci]
-            [nextjournal.clojure-mode.extensions.close-brackets :as close-brackets]
-            [nextjournal.clojure-mode.extensions.formatting :as format]
-            [nextjournal.clojure-mode.extensions.selection-history :as sel-history]
             [nextjournal.clojure-mode.keymap :as keymap]
             [nextjournal.clojure-mode.live-grammar :as live-grammar]
-            [nextjournal.clojure-mode.node :as n]
-            [nextjournal.clojure-mode.selections :as sel]
             [nextjournal.clojure-mode.test-utils :as test-utils]
+            [react]
             [reagent.core :as r]
             [reagent.dom :as rdom]))
 
@@ -44,10 +36,9 @@
 
 (defonce extensions #js[theme
                         (history)
-                        highlight/defaultHighlightStyle
+                        (syntaxHighlighting defaultHighlightStyle)
                         (view/drawSelection)
-                                        ;(lineNumbers)
-                        (fold/foldGutter)
+                        (foldGutter)
                         (.. EditorState -allowMultipleSelections (of true))
                         (if false
                           ;; use live-reloading grammar
@@ -77,7 +68,11 @@
             :style {:max-height 410}}]
      (when eval?
        [:div.mt-3.mv-4.pl-6 {:style {:white-space "pre-wrap" :font-family "var(--code-font)"}}
-        (prn-str @last-result)])]
+        (when-some [{:keys [error result]} @last-result]
+          (cond
+            error [:div.red error]
+            (react/isValidElement result) result
+            'else (sv/inspect-paginated result)))])]
     (finally
       (j/call @!view :destroy))))
 

demo/src/nextjournal/clojure_mode/demo.cljs

@@ -1,17 +1,16 @@
 (ns nextjournal.clojure-mode.demo.sci
   (:require ["@codemirror/view" :as view]
             [applied-science.js-interop :as j]
-            [sci.core :as sci]
-            [nextjournal.clojure-mode.node :as n]
+            [clojure.string :as str]
+            [nextjournal.clerk.sci-viewer :as sv]
             [nextjournal.clojure-mode.extensions.eval-region :as eval-region]
-            [nextjournal.clojure-mode.util :as u]))
-
-(defonce context (sci/init {}))
+            [sci.core :as sci]))
 
 (defn eval-string [source]
-  (try (sci/eval-string* context source)
-       (catch js/Error e
-         (str e))))
+  (when-some [code (not-empty (str/trim source))]
+    (try {:result (sci/eval-string* @sv/!sci-ctx code)}
+         (catch js/Error e
+           {:error (str (.-message e))}))))
 
 (j/defn eval-at-cursor [on-result ^:js {:keys [state]}]
   (some->> (eval-region/cursor-node-string state)
@@ -26,7 +25,8 @@
   true)
 
 (j/defn eval-cell [on-result ^:js {:keys [state]}]
-  (-> (str "(do " (.-doc state) " )")
+  (-> (.-doc state)
+      (str)
       (eval-string)
       (on-result))
   true)

demo/src/nextjournal/clojure_mode/demo/sci.cljs

@@ -1,9 +1,16 @@
-{:deps {applied-science/js-interop {:mvn/version "0.2.5"}
+{:deps {applied-science/js-interop {:mvn/version "0.3.3"}
         org.clojure/clojure {:mvn/version "1.10.3"}
         org.clojure/clojurescript {:mvn/version "1.10.866"}}
  :aliases
  {:dev {:extra-paths ["test"]
         :extra-deps {thheller/shadow-cljs {:mvn/version "2.14.4"}}}
-  :demo {:extra-deps {borkdude/sci {:mvn/version "0.2.0"}
-                      reagent/reagent {:mvn/version "1.0.0"}}
-         :extra-paths ["demo/src"]}}}
+
+  :demo {:extra-paths ["demo/src"]
+         :jvm-opts ["-Dpolyglot.engine.WarnInterpreterOnly=false"]
+         :extra-deps {org.babashka/sci {:mvn/version "0.3.5"}
+                      reagent/reagent {:mvn/version "1.1.1"}
+                      io.github.nextjournal/clerk {:git/sha "601bef312884b9a0f0c5339299578698aa8eb5fe"}
+                      ;; clerk dev deps
+                      io.github.babashka/sci.configs {:git/sha "fcd367c6a6115c5c4e41f3a08ee5a8d5b3387a18"}
+                      io.github.nextjournal/viewers {:git/sha "15d03f0b0534fbdcfcc949e0fae2e1a1f4bee931"
+                                                     :exclusions [io.github.nextjournal/clojure-mode]}}}}}

deps.edn

@@ -1,33 +1,39 @@
 {
     "dependencies": {
-        "@codemirror/autocomplete": "^0.18.0",
-        "@codemirror/closebrackets": "^0.18.0",
-        "@codemirror/commands": "^0.18.0",
-        "@codemirror/comment": "^0.18.0",
-        "@codemirror/fold": "^0.18.0",
-        "@codemirror/gutter": "^0.18.0",
-        "@codemirror/highlight": "^0.18.3",
-        "@codemirror/history": "^0.18.0",
-        "@codemirror/language": "^0.18.0",
-        "@codemirror/lint": "^0.18.0",
-        "@codemirror/matchbrackets": "^0.18.0",
-        "@codemirror/rectangular-selection": "^0.18.0",
-        "@codemirror/search": "^0.18.0",
-        "@codemirror/state": "^0.18.0",
-        "@codemirror/view": "^0.18.0",
-        "lezer": "^0.13.1",
-        "lezer-clojure": "0.1.10",
-        "lezer-generator": "^0.13.0",
-        "lezer-tree": "^0.13.0",
+        "@codemirror/autocomplete": "^6.0.2",
+        "@codemirror/commands": "^6.0.0",
+        "@codemirror/language": "^6.1.0",
+        "@codemirror/lint": "^6.0.0",
+        "@codemirror/search": "^6.0.0",
+        "@codemirror/state": "^6.0.1",
+        "@codemirror/view": "^6.0.2",
+        "@lezer/common": "^1.0.0",
+        "@lezer/generator": "^1.0.0",
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0",
+        "d3-require": "^1.2.4",
+        "emoji-regex": "^10.0.0",
+        "framer-motion": "^6.2.8",
+        "katex": "^0.12.0",
+        "lezer-clojure": "1.0.0-rc.1",
+        "markdown-it": "12.3.2",
+        "markdown-it-block-image": "0.0.3",
+        "markdown-it-sidenote": "gerwitz/markdown-it-sidenote#0b4ffb98ae6d013072f79a832785225c05dd1f29",
+        "markdown-it-texmath": "0.9.1",
+        "markdown-it-toc-done-right": "4.2.0",
         "platform": "1.3.5",
         "react": "17.0.1",
         "react-dom": "17.0.1",
-        "shadow-cljs": "^2.14.4",
         "stacktrace-js": "^2.0.2",
         "w3c-keyname": "^2.2.4"
     },
     "scripts": {
         "watch": "shadow-cljs -A:demo watch demo test",
-        "build": "shadow-cljs -A:demo release demo"
+        "build": "shadow-cljs -A:demo release demo",
+        "test": "shadow-cljs -A:dev release ci-test && node out/node-tests.js",
+        "watch2": "git ls-files | entr yarn test"
+    },
+    "devDependencies": {
+        "shadow-cljs": "2.19.5"
     }
 }

package.json

@@ -14,5 +14,12 @@
                  ;; sometimes I get weird $jscomp.inherits errors, which can be fixed
                  ;; by temporarily uncommenting the following forms in each build.
                  #_#_:js-options
-                 {:resolve {"lezer-clojure" {:target :npm
-                                             :require "lezer-clojure/dist/index.cjs"}}}}}}
+                         {:resolve {"lezer-clojure" {:target :npm
+                                                     :require "lezer-clojure/dist/index.cjs"}}}}
+          :ci-test {:target :node-test
+                    :ns-regexp "-tests$"
+                    :output-dir "out"
+                    :output-to "out/node-tests.js"
+                    :compiler-options {:optimizations :simple}
+                    :closure-defines {nextjournal.clojure-mode.util/node-js? true}
+                    :js-options {:output-feature-set :es8}}}}

shadow-cljs.edn

@@ -1,16 +1,19 @@
-{:npm-deps {"@codemirror/autocomplete" "^0.18.0",
-            "@codemirror/closebrackets" "^0.18.0",
-            "@codemirror/commands" "^0.18.0",
-            "@codemirror/comment" "^0.18.0",
-            "@codemirror/fold" "^0.18.0",
-            "@codemirror/gutter" "^0.18.0",
-            "@codemirror/highlight" "^0.18.0",
-            "@codemirror/history" "^0.18.0",
-            "@codemirror/language" "^0.18.0",
-            "@codemirror/lint" "^0.18.0",
-            "@codemirror/matchbrackets" "^0.18.0",
-            "@codemirror/rectangular-selection" "^0.18.0",
-            "@codemirror/search" "^0.18.0",
-            "@codemirror/state" "^0.18.0",
-            "@codemirror/view" "^0.18.0",
-            "lezer-clojure" "0.1.10"}}
+{:npm-deps
+ {"@codemirror/autocomplete" "^6.0.2"
+  "@codemirror/commands" "^6.0.0"
+  "@codemirror/language" "^6.1.0"
+  "@codemirror/lint" "^6.0.0"
+  "@codemirror/search" "^6.0.0"
+  "@codemirror/state" "^6.0.1"
+  "@codemirror/view" "^6.0.2"
+  "@lezer/common" "^1.0.0"
+  "@lezer/generator" "^1.0.0"
+  "@lezer/highlight" "^1.0.0"
+  "@lezer/lr" "^1.0.0"
+  "lezer-clojure" "1.0.0-rc.1"
+  "platform" "1.3.5"
+  "react" "17.0.1"
+  "react-dom" "17.0.1"
+  "stacktrace-js" "^2.0.2"
+  "w3c-keyname" "^2.2.4"
+  }}