feat: node compatibility (#33)

* test: enable node testing

* fix: issue 19

* test: pretty formatted test expectations

* refactor: clean up namespace imports

---------

Co-authored-by: Timo Kramer <fw-git@timokramer.de>

.circleci/config.yml

@@ -3,41 +3,24 @@ version: 2.1
 orbs:
   tools: replikativ/clj-tools@0
 
-jobs:
-  build:
-    executor: tools/clojurecli
-    steps:
-      - attach_workspace:
-          at: /home/circleci
-      - run:
-          name: Clean
-          command: clojure -T:build clean
-      - run:
-          name: Build
-          command: clojure -T:build jar
-          no_output_timeout: 5m
-      - persist_to_workspace:
-          root: /home/circleci/
-          paths:
-            - .m2
-            - .npm
-            - replikativ
-
 workflows:
   build_test_and_deploy:
     jobs:
       - tools/setup:
           context: dockerhub-deploy
-          setup_cljs: false
       - tools/unittest:
           context: dockerhub-deploy
           requires:
             - tools/setup
+      - tools/cljstest:
+         context: docker-deploy
+         requires:
+           - tools/build
       - tools/format:
           context: dockerhub-deploy
           requires:
             - tools/setup
-      - build:
+      - tools/build:
           context: dockerhub-deploy
           requires:
             - tools/setup
@@ -51,7 +34,7 @@ workflows:
           requires:
             - tools/unittest
             - tools/format
-            - build
+            - tools/build
       - tools/release:
           context:
             - dockerhub-deploy

.clj-kondo/config.edn

@@ -0,0 +1,2 @@
+{:lint-as {datalog.parser.type/deftrecord clojure.core/defrecord
+           datalog.parser.impl.util/forv clojure.core/for}}

.gitignore

@@ -12,6 +12,12 @@ pom.xml.asc
 .hg/
 *.iml
 /.idea
-.clj-kondo/
+.cache
 .cpcache/
 .lsp/
+.cljs_node_repl/
+node_modules/
+out/
+package-lock.json
+package.json
+

bin/run-cljstests

@@ -0,0 +1,9 @@
+set -o errexit
+set -o pipefail
+
+echo "Running tests for node"
+[ -d "node_modules/ws" ] || npm install ws
+clojure -M:test unit-node
+
+#echo "Running tests for browser"
+#clojure -M:test unit-browser

bin/run-unittests

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-clojure -M:test "$@"
+clojure -M:test --focus unit "$@"

deps.edn

@@ -3,7 +3,9 @@
                  :extra-deps {com.clojure-goes-fast/clj-async-profiler {:mvn/version "0.4.1"}
                               criterium/criterium {:mvn/version "0.4.5"}}}
            :test {:main-opts ["-m" "kaocha.runner"]
-                  :extra-deps {lambdaisland/kaocha {:mvn/version "1.71.1119"}}
+                  :extra-deps {org.clojure/clojurescript {:mvn/version "1.11.60"}
+                               lambdaisland/kaocha {:mvn/version "1.71.1119"}
+                               lambdaisland/kaocha-cljs {:mvn/version "1.4.130"}}
                   :extra-paths ["perf" "test"]}
            :build {:deps {io.github.seancorfield/build-clj {:git/tag "v0.8.2"
                                                             :git/sha "0ffdb4c"}

perf/datalog/parser_perf.clj

@@ -1,7 +1,6 @@
 (ns datalog.parser-perf
   (:require [clojure.test :refer [deftest]]
             [datalog.parser :as parser]
-            [datalog.parser.test.util]
             [criterium.core :as cc]
             [clj-async-profiler.core :as prof]))
 

src/datalog/parser/impl.cljc

@@ -1,17 +1,15 @@
-(ns datalog.parser.impl
+(ns datalog.parser.impl 
   (:require [clojure.set               :as set]
-            [datalog.parser.type       :as t]
-            [datalog.parser.util                :refer [postwalk]]
+            [datalog.parser.type       :as t #?@(:cljs [:refer [Not And Or Aggregate SrcVar RulesVar RuleExpr
+                                                                RuleVars Variable ReturnMaps MappingKey]])]
             [datalog.parser.impl.proto :as p]
             [datalog.parser.impl.util :as util
-              #?(:cljs :refer-macros :clj :refer) [raise forv]]
-            #?(:cljs [datalog.parser.type :refer
-                      [Not And Or Aggregate SrcVar RulesVar RuleExpr
-                       RuleVars Variable ReturnMaps MappingKey]]))
+             #?(:cljs :refer-macros :clj :refer) [raise forv]])
   (:refer-clojure :rename  {distinct? core-distinct?})
   #?(:clj
      (:import [datalog.parser.type
-               Not And Or Aggregate SrcVar RulesVar RuleExpr RuleVars Variable ReturnMaps MappingKey])))
+               Not And Or Aggregate SrcVar RulesVar RuleExpr 
+               RuleVars Variable ReturnMaps MappingKey])))
 
 #?(:clj (set! *warn-on-reflection* true))
 
@@ -431,18 +429,18 @@
   "Parse pagination limit"
   [limit]
   (when limit
-    (if (= (type (first limit)) java.lang.Long)
+    (if (integer? (first limit))
       (first limit)
-      (raise "Cannot parse :limit, expected java.lang.Long"
+      (raise "Cannot parse :limit, expected integer"
              {:error :parser/limit, :limit limit}))))
 
 (defn parse-offset
   "Parse pagination offset"
   [offset]
   (when offset
-    (if (= (type (first offset)) java.lang.Long)
+    (if (integer? (first offset))
       (first offset)
-      (raise "Cannot parse :offset, expected java.lang.Long"
+      (raise "Cannot parse :offset, expected integer"
              {:error :parser/offset, :offset offset}))))
 
 (defn parse-return-maps
@@ -515,7 +513,7 @@
           (recur (update parsed key (fnil conj []) q) key qs))
         parsed))))
 
-(defn assert-valid [q form {:keys [find] :as mform}]
+(defn assert-valid [q form {:keys [find] :as _mform}]
   (let [find-vars    (t/collect-vars #{} (:qfind  q))
         with-vars    (set                (:qwith  q))
         in-vars      (t/collect-vars #{} (:qin    q))
@@ -560,7 +558,7 @@
 
   (let [rule-exprs (collect-type RuleExpr (:qwhere q))
         rules-vars (collect-type RulesVar (:qin    q))]
-    (when (and (not (empty? rule-exprs))
+    (when (and (seq rule-exprs)
                (empty? rules-vars))
       (raise "Missing rules var '%' in :in"
              {:error :parser/query, :form form}))))

src/datalog/parser/impl/proto.cljc

@@ -16,10 +16,15 @@
 (defprotocol IFindElements
   (find-elements [this]))
 
-(extend-type #?(:clj Object :cljs object)
-  Traversable
-  (-traversable? [_] false))
-
 (extend-type nil
   Traversable
   (-traversable? [_] false))
+
+#?(:clj (extend-protocol Traversable
+          Object (-traversable? [_] false))
+
+   :cljs (extend-protocol Traversable
+           boolean (-traversable? [_] false)
+           number  (-traversable? [_] false)
+           object  (-traversable? [_] false)
+           string  (-traversable? [_] false)))

src/datalog/parser/impl/util.cljc

@@ -1,6 +1,5 @@
 (ns ^:no-doc datalog.parser.impl.util
   (:require [datalog.parser.impl.proto :as proto]
-            [datalog.parser.util       :as util]
             [clojure.string            :as str])
   (:refer-clojure :exclude [seqable?]))
 
@@ -27,8 +26,9 @@
 (defn- reverse-attr? [v]
   (str/starts-with? v "_"))
 
-(defn #?@(:clj  [^Boolean reverse-ref?]
-          :cljs [^boolean reverse-ref?]) [attr]
+(defn reverse-ref?
+  #?@(:clj  [^Boolean [attr]] 
+      :cljs [^boolean [attr]]) 
   (-> attr decompose-ref second reverse-attr?))
 
 (defn- invert-name [s]
@@ -44,22 +44,13 @@
 (defn prefixed-symbol? [sym prefix]
   (and (symbol? sym) (= (first (name sym)) prefix)))
 
-(defn- #?@(:clj  [^Boolean seqable?]
-           :cljs [^boolean seqable?])
-  [x]
+(defn- seqable?
+  #?@(:clj  [^Boolean [x]]
+      :cljs [^boolean [x]])
   (and (not (string? x))
        #?(:cljs (or (cljs.core/seqable? x)
                     (array? x))
-          :clj  (clojure.core/seqable? x)
-          ;; was
-          #_(or (seq? x)
-                    (instance? clojure.lang.Seqable x)
-                    (nil? x)
-                    (instance? Iterable x)
-                    (-> x .getClass .isArray)
-                    (instance? java.util.Map x)))))
-
-
+          :clj  (clojure.core/seqable? x))))
 
 (defn collect
   ([pred form] (collect pred form []))

src/datalog/parser/pull.cljc

@@ -55,7 +55,7 @@
 
 (defrecord PullPattern [specs]
   IPullSpecComponent
-  (-as-spec [this]
+  (-as-spec [_this]
     (let [init (PullSpec. false (transient {}))
           spec (reduce aggregate-specs init specs)]
       [:subpattern (update spec :attrs persistent!)])))

test/datalog/parser/impl_test.cljc

@@ -2,9 +2,8 @@
   (:require #?(:cljs [cljs.test :refer-macros [is are deftest testing]]
                :clj  [clojure.test :refer     [is are deftest testing]])
             [datalog.parser.impl :as dp]
-            [datalog.parser.type :as t]
-            [datalog.parser.test.util])
-  (:import [clojure.lang ExceptionInfo]))
+            [datalog.parser.type :as t])
+  #?(:clj (:import [clojure.lang ExceptionInfo])))
 
 (deftest bindings
   (are [form res] (= (dp/parse-binding form) res)

test/datalog/parser/pull_test.cljc

@@ -1,7 +1,7 @@
 (ns datalog.parser.pull-test
   (:require [datalog.parser.pull :as dpp]
-            #?(:cljs [cljs.test    :as t :refer-macros [is are deftest testing]]
-               :clj  [clojure.test :as t :refer        [is are deftest testing]])))
+            #?(:cljs [cljs.test    :as t :refer-macros [is deftest testing]]
+               :clj  [clojure.test :as t :refer        [is deftest testing]])))
 
 #?(:cljs
    (def Throwable js/Error))