Fix missing include behavior in cljs

Fix #57 Related to #54
juxt · Jun 2, 2019 · bf1de01 · bf1de01
1 parent 405ac47
commit bf1de01
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/src/aero/core.cljc b/src/aero/core.cljc
@@ -6,7 +6,9 @@
     #?@(:clj [[clojure.edn :as edn]]
         :cljs [[cljs.tools.reader.edn :as edn]
                [cljs.tools.reader :refer [default-data-readers *data-readers*]]
-               [cljs.tools.reader.reader-types :refer [source-logging-push-back-reader]]])
+               [cljs.tools.reader.reader-types
+                :refer [source-logging-push-back-reader]
+                :as tools.reader.reader-types]])
     #?@(:clj [[clojure.java.io :as io]]
         :cljs [[goog.string :as gstring]
                goog.string.format
@@ -121,9 +123,13 @@
          include)))
    :cljs
    (defn adaptive-resolver [source include]
-     (if (path/isAbsolute include)
-       include
-       (path/join source ".." include))))
+     (let [fl (if (path/isAbsolute include)
+                include
+                (path/join source ".." include))]
+       (if (fs/existsSync fl)
+         fl
+         (source-logging-push-back-reader
+           (pr-str {:aero/missing-include include}))))))
 
 
 (def default-opts
@@ -187,10 +193,18 @@
              (throw (ex-info (#?(:clj format :cljs gstring/format) "Config error on line %s" line) {:line line} e))))))
      :cljs
      (read-pr-into-tagged-literal
-       (source-logging-push-back-reader
-         (fs/readFileSync source "utf-8")
-         1
-         source))))
+       (cond
+         (tools.reader.reader-types/source-logging-reader? source)
+         source
+
+         (implements? tools.reader.reader-types/Reader source)
+         (source-logging-push-back-reader source)
+
+         :else
+         (source-logging-push-back-reader
+           (fs/readFileSync source "utf-8")
+           1
+           source)))))
 
 ;; Queue utilities
 (defn- queue

diff --git a/test/aero/core_test.cljc b/test/aero/core_test.cljc
@@ -157,6 +157,10 @@
                                            :valid-file   (io/resource "aero/valid.edn")}}))
        (is (:aero/missing-include (read-config source {:profile :file-does-not-exist}))))))
 
+(deftest missing-include-test
+  (let [source "test/aero/includes.edn"]
+    (is (:aero/missing-include (read-config source {:profile :file-does-not-exist})))))
+
 #?(:clj
    (deftest dangling-ref-test
      (is