Fix support for include paths

build.boot

@@ -6,7 +6,7 @@
   :dependencies   '[[org.clojure/clojure "1.10.1" :scope "provided"]
                     [metosin/bat-test "0.4.3" :scope "test"]
 
-                    [io.bit3/jsass "5.10.0"]
+                    [io.bit3/jsass "5.10.3"]
                     [cheshire "5.9.0"]
 
                     [org.webjars/webjars-locator "0.37"]
@@ -18,7 +18,7 @@
                     [integrant "0.7.0" :scope "test"]
 
                     ;; Webjars-locator uses logging
-                    [org.slf4j/slf4j-nop "1.7.25" :scope "test"]
+                    [org.slf4j/slf4j-nop "1.7.29" :scope "test"]
 
                     ;; For testing the webjars asset locator implementation
                     [org.webjars.bower/bootstrap "4.3.1" :scope "test"]

deps.edn

@@ -1,6 +1,7 @@
-{:deps {io.bit3/jsass {:mvn/version "5.5.2"}
-        cheshire {:mvn/version "5.7.1"}
-        org.webjars/webjars-locator {:mvn/version "0.32-1"}
+{:deps {io.bit3/jsass {:mvn/version "5.10.3"}
+        cheshire {:mvn/version "5.9.0"}
+        org.webjars/webjars-locator {:mvn/version "0.37"}
         hawk {:mvn/version "0.2.11"}
-        org.clojure/tools.cli {:mvn/version "0.4.1"}
-        org.slf4j/slf4j-nop {:mvn/version "1.7.25"}}}
+        org.clojure/tools.cli {:mvn/version "0.4.2"}}
+
+ :aliases {:test {:extra-deps {org.slf4j/slf4j-nop {:mvn/version "1.7.29"}}}}}

src/sass4clj/api.clj

@@ -39,7 +39,7 @@
               (core/sass-compile-to-file
                 path
                 (.getPath (io/file target-path (string/replace relative-path #"\.(scss|sass)$" ".css")))
-                (dissoc options :target-path :source-paths))
+                (dissoc options :target-path))
               (catch Exception e
                 (if auto
                   (println (.getMessage e))
@@ -65,13 +65,12 @@
 (defn build [{:keys [source-paths auto] :as options}]
   (when-not (s/valid? ::options options)
     (s/explain-out (s/explain-data ::options options)))
-  (let [options (dissoc options :source-paths)]
-    (if auto
-      (watcher/start source-paths (fn [& _]
-                                    (let [main-files (find-main-files source-paths options)]
-                                      (compile-sass main-files options))))
-      (let [main-files (find-main-files source-paths options)]
-        (compile-sass main-files options)))))
+  (if auto
+    (watcher/start source-paths (fn [& _]
+                                  (let [main-files (find-main-files source-paths options)]
+                                    (compile-sass main-files options))))
+    (let [main-files (find-main-files source-paths options)]
+      (compile-sass main-files options))))
 
 (defn start [options]
   (build (assoc options :auto true)))

test/sass4clj/api_test.clj

@@ -0,0 +1,37 @@
+(ns sass4clj.api-test
+  (:require [clojure.test :refer [deftest is]]
+            [clojure.java.io :as io]
+            [sass4clj.api :as sass])
+  (:import (java.nio.file Files)
+           (java.nio.file.attribute FileAttribute)))
+
+(defn- temp-dir
+  [prefix]
+  (.toString (Files/createTempDirectory prefix (into-array FileAttribute []))))
+
+(def ^:private includer-scss
+  "body {
+  color: red;
+}
+
+@import 'includee';
+")
+
+(def ^:private includee-sass
+  "@charset 'utf-8'
+
+p
+  color: blue
+")
+
+(deftest include-paths
+  (let [input-dir (temp-dir "sass4clj-input")
+        include-dir (temp-dir "sass4clj-include")
+        output-dir (temp-dir "sass4clj-output")
+        options {:source-paths [input-dir include-dir]
+                 :target-path  output-dir}]
+    (spit (io/file input-dir "includer.scss") includer-scss)
+    (spit (io/file include-dir "includee.sass") includee-sass)
+    (sass/build options)
+    (is (= "body {\n  color: red; }\n\np {\n  color: blue; }\n"
+           (slurp (io/file output-dir "includer.css"))))))