extract type description spec.

alumbra · Dec 2, 2016 · 81c7e82 · 81c7e82
1 parent 6c0d41e
commit 81c7e82
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/src/alumbra/spec/analyzed_schema.clj b/src/alumbra/spec/analyzed_schema.clj
@@ -1,7 +1,7 @@
 (ns alumbra.spec.analyzed-schema
   (:require [clojure.spec :as s]
             [clojure.spec.gen :as gen]
-            [alumbra.spec common]))
+            [alumbra.spec type-description common]))
 
 ;; ## Names
 
@@ -90,23 +90,7 @@
   ;; value is nested.
   (s/keys :req-un [:alumbra/type-name
                    :alumbra/non-null?
-                   ::type-description]))
-
-(s/def ::type-description
-  (s/with-gen
-    (s/or :unnested ::unnested
-          :nested   ::nested)
-    #(gen/frequency
-       [[9 (s/gen ::unnested)]
-        [1 (gen/bind (gen/return nil) (fn [_] (s/gen ::nested)))]])))
-
-(s/def ::nested
-  (s/keys :req-un [:alumbra/non-null?
-                   ::type-description]))
-
-(s/def ::unnested
-  (s/keys :req-un [:alumbra/non-null?
-                   :alumbra/type-name]))
+                   :alumbra/type-description]))
 
 ;; ### Interfaces
 

diff --git a/src/alumbra/spec/type_description.clj b/src/alumbra/spec/type_description.clj
@@ -0,0 +1,20 @@
+(ns alumbra.spec.type-description
+  (:require [clojure.spec :as s]
+            [clojure.spec.gen :as gen]
+            [alumbra.spec common]))
+
+(s/def :alumbra/type-description
+  (s/with-gen
+    (s/or :unnested ::unnested
+          :nested   ::nested)
+    #(gen/frequency
+       [[9 (s/gen ::unnested)]
+        [1 (gen/bind (gen/return nil) (fn [_] (s/gen ::nested)))]])))
+
+(s/def ::nested
+  (s/keys :req-un [:alumbra/non-null?
+                   :alumbra/type-description]))
+
+(s/def ::unnested
+  (s/keys :req-un [:alumbra/non-null?
+                   :alumbra/type-name]))
diff --git a/src/alumbra/spec/validation_errors.clj b/src/alumbra/spec/validation_errors.clj
@@ -1,6 +1,6 @@
 (ns alumbra.spec.validation-errors
   (:require [clojure.spec :as s]
-            [alumbra.spec common]))
+            [alumbra.spec common type-description]))
 
 ;; ## Error Container