expound

feature-spec-alpha/babashka/impl/spec.clj

@@ -2,11 +2,10 @@
   {:no-doc true}
   (:require [babashka.impl.clojure.spec.alpha :as s :refer [sns]]
             [babashka.impl.clojure.spec.gen.alpha :as gen]
-            [babashka.impl.clojure.spec.test.alpha :as test]
+            [babashka.impl.clojure.spec.test.alpha :as test :refer [tns]]
             [clojure.core :as c]
             [sci.core :as sci :refer [copy-var]]))
 
-(def tns (sci/create-ns 'clojure.spec.test.alpha nil))
 (def gns (sci/create-ns 'clojure.spec.gen.alpha nil))
 
 (defn- ns-qualify
@@ -92,13 +91,20 @@
    'assert* (copy-var s/assert* sns)
    'explain-printer (copy-var s/explain-printer sns)
    ;; PRIVATE, but exposed for expound
-   'maybe-spec (copy-var s/maybe-spec sns)})
+   'maybe-spec (copy-var s/maybe-spec sns)
+   'spec-name (copy-var s/spec-name sns)
+   'explain-data* (copy-var s/explain-data* sns)
+   '->sym (copy-var s/->sym sns)
+   'explain-str (copy-var s/explain-str sns)})
 
 #_:clj-kondo/ignore
 (def test-namespace
   {'instrument (copy-var test/instrument tns)
    'unstrument (copy-var test/unstrument tns)
-   'with-instrument-disabled (copy-var test/with-instrument-disabled tns)})
+   '*instrument-enabled* test/instrument-enabled-var
+   'with-instrument-disabled (copy-var test/with-instrument-disabled tns)
+   'stacktrace-relevant-to-instrument (copy-var test/stacktrace-relevant-to-instrument tns)
+   'spec-checking-fn (copy-var test/spec-checking-fn tns)})
 
 #_:clj-kondo/ignore
 (def gen-namespace

src/babashka/impl/clojure/spec/alpha.clj

@@ -95,7 +95,7 @@
     (instance? clojure.lang.IObj spec)
     (with-meta spec (assoc (meta spec) :clojure.spec.alpha/name name))))
 
-(defn- spec-name [spec]
+(defn spec-name [spec]
   (cond
     (ident? spec) spec
 
@@ -234,6 +234,7 @@
 (defn explain-printer
   "Default printer for explain-data. nil indicates a successful validation."
   [ed]
+  (binding [*out* sci/out]
     (if ed
       (let [problems (->> (:clojure.spec.alpha/problems ed)
                           (sort-by #(- (count (:in %))))
@@ -254,7 +255,7 @@
               (print "\n\t" (pr-str k) " ")
               (pr v)))
           (newline)))
-    (println "Success!")))
+      (println "Success!"))))
 
 (def sns (sci/create-ns 'clojure.spec.alpha nil))
 
@@ -274,7 +275,7 @@
 (defn explain-str
   "Given a spec and a value that fails to conform, returns an explanation as a string."
   [spec x]
-  (with-out-str (explain spec x)))
+  (sci/with-out-str (explain spec x)))
 
 (declare valid?)
 
@@ -304,7 +305,7 @@
   ([spec] (gen spec nil))
   ([spec overrides] (gensub spec overrides [] {:clojure.spec.alpha/recursion-limit *recursion-limit*} spec)))
 
-(defn- ->sym
+(defn ->sym
   "Returns a symbol from a symbol or var"
   [x]
   (if (var? x)

src/babashka/impl/clojure/spec/test/alpha.clj

@@ -12,7 +12,8 @@
    [babashka.impl.clojure.spec.alpha :as s]
    [babashka.impl.clojure.spec.gen.alpha :as gen]
    [babashka.impl.pprint :as pp]
-   [clojure.string :as str]))
+   [clojure.string :as str]
+   [sci.core :as sci]))
 
 (in-ns 'clojure.spec.test.check)
 (in-ns 'babashka.impl.clojure.spec.test.alpha)
@@ -43,7 +44,7 @@
 
 (defn enumerate-namespace
   "Given a symbol naming an ns, or a collection of such symbols,
-returns the set of all symbols naming vars in those nses."
+  returns the set of all symbols naming vars in those nses."
   [ns-sym-or-syms]
   (into
    #{}
@@ -56,7 +57,11 @@ returns the set of all symbols naming vars in those nses."
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; instrument ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(def ^:private ^:dynamic *instrument-enabled*
+(def tns (sci/create-ns 'clojure.spec.test.alpha))
+
+(def instrument-enabled-var (sci/new-dynamic-var '*instrument-enabled* true {:ns tns} ))
+
+#_(def ^:private ^:dynamic *instrument-enabled*
     "if false, instrumented fns call straight through"
     true)
 
@@ -68,13 +73,13 @@ returns the set of all symbols naming vars in those nses."
 (defmacro with-instrument-disabled
   "Disables instrument's checking of calls, within a scope."
   [& body]
-  `(binding [*instrument-enabled* nil]
+  `(binding [clojure.spec.test.alpha/*instrument-enabled* nil]
      ~@body))
 
 (defn- interpret-stack-trace-element
   "Given the vector-of-syms form of a stacktrace element produced
-by e.g. Throwable->map, returns a map form that adds some keys
+  by e.g. Throwable->map, returns a map form that adds some keys
-guessing the original Clojure names. Returns a map with
+  guessing the original Clojure names. Returns a map with
 
   :class         class name symbol from stack trace
   :method        method symbol from stack trace
@@ -83,7 +88,7 @@ guessing the original Clojure names. Returns a map with
   :var-scope     optional Clojure var symbol scoping fn def
   :local-fn      optional local Clojure symbol scoping fn def
 
-For non-Clojure fns, :scope and :local-fn will be absent."
+  For non-Clojure fns, :scope and :local-fn will be absent."
   [[cls method file line]]
   (let [clojure? (contains? '#{invoke invokeStatic} method)
         demunge #(clojure.lang.Compiler/demunge %)
@@ -100,11 +105,11 @@ For non-Clojure fns, :scope and :local-fn will be absent."
            (when local
              {:local-fn (symbol (degensym local))}))))
 
-(defn- stacktrace-relevant-to-instrument
+(defn stacktrace-relevant-to-instrument
   "Takes a coll of stack trace elements (as returned by
-StackTraceElement->vec) and returns a coll of maps as per
+  StackTraceElement->vec) and returns a coll of maps as per
-interpret-stack-trace-element that are relevant to a
+  interpret-stack-trace-element that are relevant to a
-failure in instrument."
+  failure in instrument."
   [elems]
   (let [plumbing? (fn [{:keys [var-scope]}]
                     (contains? '#{clojure.spec.test.alpha/spec-checking-fn} var-scope))]
@@ -114,7 +119,7 @@ failure in instrument."
                     (drop-while plumbing?))
               elems)))
 
-(defn- spec-checking-fn
+(defn spec-checking-fn
   [v f fn-spec]
   (let [fn-spec (@#'s/maybe-spec fn-spec)
         conform! (fn [v role spec data args]
@@ -135,10 +140,10 @@ failure in instrument."
                        conformed)))]
     (fn
       [& args]
-     (if *instrument-enabled*
+      (if @instrument-enabled-var
-       (with-instrument-disabled
+        (sci/binding [@instrument-enabled-var false]
           (when (:args fn-spec) (conform! v :args (:args fn-spec) args args))
-         (binding [*instrument-enabled* true]
+          (sci/binding [@instrument-enabled-var true]
             (.applyTo ^clojure.lang.IFn f args)))
         (.applyTo ^clojure.lang.IFn f args)))))
 
@@ -467,5 +472,3 @@ key with a count for each different :type of result."
           (update (result-type result) (fnil inc 0))))
     {:total 0}
     check-results)))
-
-