From 2d1e75105372ab707d941f445f1ec89f34ef41d9 Mon Sep 17 00:00:00 2001
From: kloimhardt <kloimhardt@kloimhardts-MacBook-Air.local>
Date: Tue, 8 Jun 2021 20:14:16 +0200
Subject: [PATCH] remove daiquiri, use reagent/as-element

---
 deps.edn                 |  2 +-
 externs/main.txt         |  1 -
 shadow-cljs.edn          |  4 +++-
 src/scittle/cljs.cljs    | 13 +++++++++++++
 src/scittle/core.cljs    |  3 ++-
 src/scittle/qlkit.cljs   | 15 ++-------------
 src/scittle/reagent.cljs |  2 +-
 7 files changed, 22 insertions(+), 18 deletions(-)
 delete mode 100644 externs/main.txt
 create mode 100644 src/scittle/cljs.cljs

diff --git a/deps.edn b/deps.edn
index 0deba6e..73c180c 100644
--- a/deps.edn
+++ b/deps.edn
@@ -12,7 +12,7 @@
   cljs-ajax/cljs-ajax {:mvn/version "0.8.3"}
   qlkit/qlkit {:git/url "https://github.com/kloimhardt/qlkit"
                :sha "fc925a96af4d5460470414ea9bab83ff0548fe62"}
-  rum/rum {:mvn/version "0.12.6"}}
+  }
 
  :aliases
  {:dev
diff --git a/externs/main.txt b/externs/main.txt
deleted file mode 100644
index 768bb9e..0000000
--- a/externs/main.txt
+++ /dev/null
@@ -1 +0,0 @@
-setState
diff --git a/shadow-cljs.edn b/shadow-cljs.edn
index cb9f22a..5c235b1 100644
--- a/shadow-cljs.edn
+++ b/shadow-cljs.edn
@@ -21,7 +21,9 @@
     :scittle.ajax {:entries [scittle.ajax]
                    :depends-on #{:scittle}}
     :scittle.qlkit {:entries [scittle.qlkit]
-                    :depends-on #{:scittle}}}
+                    :depends-on #{:scittle}}
+    :scittle.cljs {:entries [scittle.cljs]
+                   :depends-on #{:scittle}}}
    :build-hooks [(shadow.cljs.build-report/hook)]
    :output-dir "resources/public/js"
    :devtools   {:repl-pprint true}
diff --git a/src/scittle/cljs.cljs b/src/scittle/cljs.cljs
new file mode 100644
index 0000000..3f113a8
--- /dev/null
+++ b/src/scittle/cljs.cljs
@@ -0,0 +1,13 @@
+(ns scittle.cljs
+  (:require [cljs.reader :refer [read-string]]
+            [sci.core :as sci]
+            [scittle.core :as scittle]))
+
+(def rns (sci/create-ns 'cljs.reader nil))
+
+(def cljs-reader-namespace
+  {'read-string (sci/copy-var read-string rns)})
+
+(scittle/register-plugin!
+ ::ajax
+ {:namespaces {'cljs.reader cljs-reader-namespace}})
diff --git a/src/scittle/core.cljs b/src/scittle/core.cljs
index bc51c59..a6cde42 100644
--- a/src/scittle/core.cljs
+++ b/src/scittle/core.cljs
@@ -23,7 +23,8 @@
    {'println     println
     'prn         prn
     'system-time system-time
-    'time        (sci/copy-var time cljns)}
+    'time        (sci/copy-var time cljns)
+    'random-uuid random-uuid}
    'goog.object {'set gobject/set
                  'get gobject/get}})
 
diff --git a/src/scittle/qlkit.cljs b/src/scittle/qlkit.cljs
index 24bad7c..48cbcdd 100644
--- a/src/scittle/qlkit.cljs
+++ b/src/scittle/qlkit.cljs
@@ -1,7 +1,5 @@
 (ns scittle.qlkit
   (:require [qlkit.core :as ql]
-            [daiquiri.interpreter :as di]
-            [cljs.reader :refer [read-string]]
             [sci.core :as sci]
             [scittle.core :as scittle]))
 
@@ -20,17 +18,8 @@
    'parse-children (sci/copy-var ql/parse-children qns)
    'parse-children-remote (sci/copy-var ql/parse-children-remote qns)
    'parse-children-sync (sci/copy-var ql/parse-children-sync qns)
-   'mount (sci/copy-var ql/mount qns)
-
-   'random-uuid (sci/copy-var random-uuid qns)
-   'read-string (sci/copy-var read-string qns)})
-
-(def dins (sci/create-ns 'daiquiri.interpreter nil))
-
-(def daiquiri-interpreter-ns
-  {'interpret (sci/copy-var di/interpret dins)})
+   'mount (sci/copy-var ql/mount qns)})
 
 (scittle/register-plugin!
   ::qlkit
-  {:namespaces {'qlkit.core qlkit-namespace
-                'daiquiri.interpreter daiquiri-interpreter-ns}})
+  {:namespaces {'qlkit.core qlkit-namespace}})
diff --git a/src/scittle/reagent.cljs b/src/scittle/reagent.cljs
index aa589ef..4cf687c 100644
--- a/src/scittle/reagent.cljs
+++ b/src/scittle/reagent.cljs
@@ -8,7 +8,7 @@
 
 (def reagent-namespace
   {'atom (sci/copy-var r/atom rns)
-   'cursor (sci/copy-var r/cursor rns)})
+   'as-element (sci/copy-var r/as-element rns)})
 
 (def rdns (sci/create-ns 'reagent.dom nil))