From 1b9793733d599acdd3cd47b2b10340d3a194817e Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Wed, 3 May 2023 14:05:32 +0200
Subject: [PATCH] wip

---
 bb.edn                      |  3 ++-
 build/src/scittle/build.clj | 10 ++++++----
 deps.edn                    |  3 +--
 plugins/datascript/deps.edn |  3 +++
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/bb.edn b/bb.edn
index 9f3560b..f355484 100644
--- a/bb.edn
+++ b/bb.edn
@@ -4,7 +4,8 @@
         io.github.babashka/http-server
         {:git/sha "b38c1f16ad2c618adae2c3b102a5520c261a7dd3"}
         io.github.scittle/build
-        {:local/root "build"}}
+        {:local/root "build"}
+        io.github.babashka/scittle.datascript {:local/root "plugins/datascript"}}
 
  :tasks
  {:requires ([scittle.build :as build]
diff --git a/build/src/scittle/build.clj b/build/src/scittle/build.clj
index a3d0712..a643b1f 100644
--- a/build/src/scittle/build.clj
+++ b/build/src/scittle/build.clj
@@ -11,7 +11,7 @@
   []
   (filter fs/exists?
           (map (fn [d]
-                 (fs/file d "scittle_features.edn"))
+                 (fs/file d "scittle_plugin.edn"))
                (classpath/split-classpath (classpath/get-classpath)))))
 
 (defn- read-configs
@@ -21,8 +21,9 @@
 
 (defn- build-cmd [cmd scittle-dir]
   (let [files (feature-files)
+        _ (prn :files files)
         feature-configs (read-configs files)
-        ;; Each ./src/scittle_features.edn has a ./deps.edn
+        ;; Each ./src/scittle_plugin.edn has a ./deps.edn
         feature-dirs (map (comp fs/parent fs/parent) files)
         cmd' (if (seq files)
                (format "-Sdeps '%s' %s"
@@ -35,6 +36,7 @@
                                {'scittle/deps {:local/root scittle-dir}})}
                        cmd)
                cmd)]
+    (prn :cmd' cmd')
     (when (seq feature-configs)
       (println "Building features:" (str/join ", " (map :name feature-configs)) "..."))
     (if (seq feature-configs)
@@ -54,8 +56,8 @@
                        fs/parent))]
     (when building-outside-scittle?
       (fs/copy (fs/file scittle-dir "shadow-cljs.edn") "shadow-cljs.edn"))
-    (apply clojure {:extra-env {"SCI_ELIDE_VARS" "true"}}
-           (build-cmd cmd (str scittle-dir)) args)
+    (let [cmd (build-cmd cmd (str scittle-dir))]
+      (apply clojure {:extra-env {"SCI_ELIDE_VARS" "true"}} cmd args))
     (when building-outside-scittle?
       (fs/delete "shadow-cljs.edn"))))
 
diff --git a/deps.edn b/deps.edn
index 45092d5..ec562ba 100644
--- a/deps.edn
+++ b/deps.edn
@@ -1,5 +1,4 @@
 {:paths ["src" "resources"]
-
  :deps
  {org.clojure/clojure {:mvn/version "1.11.1"}
   thheller/shadow-cljs {:mvn/version "2.20.15"}
@@ -20,7 +19,7 @@
   io.github.babashka/sci.configs
   #_{:local/root "/Users/borkdude/dev/sci.configs"}
   {:git/url "https://github.com/babashka/sci.configs"
-   :git/sha "bf8d209e4aeabb92cb1be04e3d8f789583d5f449"}}
+   :git/sha "33bd51e53700b224b4cb5bda59eb21b62f962745"}}
  :aliases
  {:dev
   {:extra-paths ["dev"]
diff --git a/plugins/datascript/deps.edn b/plugins/datascript/deps.edn
index e69de29..1454ae1 100644
--- a/plugins/datascript/deps.edn
+++ b/plugins/datascript/deps.edn
@@ -0,0 +1,3 @@
+{:deps
+ {datascript/datascript {:mvn/version "1.3.12"}
+  io.github.babashka/sci.configs {:git/sha "33bd51e53700b224b4cb5bda59eb21b62f962745"}}}