re-namespace

Author: puredanger

README.md

@@ -1,4 +1,4 @@
-spec-alpha2
+alpha.spec
 ========================================
 
 spec is a Clojure library to describe the structure of data and functions. Specs can be used to validate data, conform (destructure) data, explain invalid data, generate examples that conform to the specs, and automatically use generative testing to test functions.
@@ -8,13 +8,13 @@ For more information:
 * Rationale - https://clojure.org/about/spec
 * Guide - https://clojure.org/guides/spec (for spec.alpha, note namespaces and other differences below)
 
-spec.alpha was released with Clojure 1.9 and can be found at https://github.com/clojure/spec.alpha. spec-alpha2 incorporates feedback from spec.alpha as well as work towards several new features. Please note that spec-alpha2 is not 100% API-compatible with spec.alpha (although it is similar).
+spec.alpha was released with Clojure 1.9 and can be found at https://github.com/clojure/spec.alpha. This library is an evolution from spec.alpha as well as work towards several new features. Please note that alpha.spec is not 100% API-compatible with spec.alpha (although it is similar).
 
 Namespaces to load:
 
-    (require '[clojure.spec-alpha2 :as s]
-             '[clojure.spec-alpha2.gen :as gen]
-             '[clojure.spec-alpha2.test :as test])
+    (require '[clojure.alpha.spec :as s]
+             '[clojure.alpha.spec :as gen]
+             'iclojure.alpha.spec.test :as test])
 
 Also see: [Differences from spec.alpha](https://github.com/clojure/spec-alpha2/wiki/Differences-from-spec.alpha)
 
@@ -24,12 +24,12 @@ Releases and Dependency Information
 
 Development release:
 
-During development, you can use the git dep to try spec-alpha2:
+During development, you can use the git dep to try alpha.spec:
 
-    clj -Sdeps '{:deps {org.clojure/clojure {:mvn/version "1.10.0"}
+    clj -Sdeps '{:deps {org.clojure/clojure {:mvn/version "1.10.1"}
                         org.clojure/test.check {:mvn/version "0.9.0"} 
-                        org.clojure/spec-alpha2 {:git/url "https://github.com/clojure/spec-alpha2.git" 
-                                                 :sha "<SHA>"}}}'
+                        org.clojure/alpha.spec {:git/url "https://github.com/clojure/spec-alpha2.git" 
+                                                :sha "<SHA>"}}}'
 
 Where the latest SHA can be found with:
 

pom.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>spec-alpha2</artifactId>
+  <artifactId>alpha.spec</artifactId>
   <version>0.2.177-SNAPSHOT</version>
-  <name>spec-alpha2</name>
+  <name>alpha.spec</name>
   <description>Specification of data and functions</description>
 
   <scm>
@@ -74,11 +74,11 @@
                 <argument>-classpath</argument>
                 <classpath />
                 <argument>clojure.lang.Compile</argument>
-                <argument>clojure.spec-alpha2.protocols</argument>
-                <argument>clojure.spec-alpha2</argument>
-                <argument>clojure.spec-alpha2.impl</argument>
-                <argument>clojure.spec-alpha2.gen</argument>
-                <argument>clojure.spec-alpha2.test</argument>
+                <argument>clojure.alpha.spec.protocols</argument>
+                <argument>clojure.alpha.spec</argument>
+                <argument>clojure.alpha.spec.impl</argument>
+                <argument>clojure.alpha.spec.gen</argument>
+                <argument>clojure.alpha.spec.test</argument>
               </arguments>
             </configuration>
           </execution>

src/main/clojure/clojure/spec_alpha2.clj renamed to src/main/clojure/clojure/alpha/spec.clj

@@ -13,13 +13,13 @@
 
   Rationale: https://clojure.org/about/spec
   Guide: https://clojure.org/guides/spec"}
-  clojure.spec-alpha2
+  clojure.alpha.spec
   (:refer-clojure :exclude [+ * and assert or cat def keys merge comp])
-  (:require [clojure.spec-alpha2.protocols :as protocols
+  (:require [clojure.alpha.spec.protocols :as protocols
              :refer [conform* unform* explain* gen* with-gen* describe*]]
             [clojure.walk :as walk]
-            [clojure.spec-alpha2.gen :as gen])
-  (:import [clojure.spec_alpha2.protocols Spec Schema]))
+            [clojure.alpha.spec.gen :as gen])
+  (:import [clojure.alpha.spec.protocols Spec Schema]))
 
 (alias 'c 'clojure.core)
 (alias 'sa 'clojure.spec.alpha)
@@ -235,7 +235,7 @@
     :else (throw (IllegalArgumentException. (str "Unknown schema op of type: " (class sform))))))
 
 (defn conform
-  "Given a spec and a value, returns :clojure.spec-alpha2/invalid
+  "Given a spec and a value, returns :clojure.alpha.spec/invalid
 	if value does not match spec, else the (possibly destructured) value."
   ([spec x]
     (conform spec x nil))
@@ -587,7 +587,7 @@
   input as per re but subjects the resulting value to the
   conjunction of the predicates, and any conforming they might perform."
   [re & preds]
-  `(resolve-spec '~(explicate (ns-name *ns*) `(clojure.spec-alpha2/& ~re ~@preds))))
+  `(resolve-spec '~(explicate (ns-name *ns*) `(clojure.alpha.spec/& ~re ~@preds))))
 
 (defmacro nest
   "takes a regex op and returns a non-regex op that describes a nested
@@ -597,7 +597,7 @@
 
 (defmacro conformer
   "takes a predicate function with the semantics of conform i.e. it should return either a
-  (possibly converted) value or :clojure.spec-alpha2/invalid, and returns a
+  (possibly converted) value or :clojure.alpha.spec/invalid, and returns a
   spec that uses it as a predicate/conformer. Optionally takes a
   second fn that does unform of result of first"
   ([f] `(resolve-spec '~(explicate (ns-name *ns*) `(conformer ~f))))
@@ -648,7 +648,7 @@
   by calling get-spec with the var or fully-qualified symbol.
 
   Once registered, function specs are included in doc, checked by
-  instrument, tested by the runner clojure.spec-alpha2.test/check, and (if
+  instrument, tested by the runner clojure.alpha.spec.test/check, and (if
   a macro) used to explain errors during macroexpansion.
 
   Note that :fn specs require the presence of :args and :ret specs to
@@ -665,7 +665,7 @@
                  :sym symbol?)
     :ret symbol?)"
   [fn-sym & specs]
-  `(clojure.spec-alpha2/def ~fn-sym (clojure.spec-alpha2/fspec ~@specs)))
+  `(clojure.alpha.spec/def ~fn-sym (clojure.alpha.spec/fspec ~@specs)))
 
 (defmacro keys
   "Creates and returns a map validating spec. :req and :opt are both
@@ -963,23 +963,23 @@ set. You can toggle check-asserts? with (check-asserts bool)."
          (list `resolve-spec (list `explicate (list `quote '~ns-name) (list `quote (cons '~op ~'sargs))))))))
 
 ;; Load the spec op implementations
-(load "/clojure/spec_alpha2/impl")
+(load "/clojure/alpha/spec/impl")
 
 ;; Derived ops
 
 (defop inst-in
   "Returns a spec that validates insts in the range from start
   (inclusive) to end (exclusive)."
   [start end]
-  :gen #(clojure.spec-alpha2.gen/fmap (fn [^long d] (java.util.Date. d))
-         (clojure.spec-alpha2.gen/large-integer* {:min (inst-ms start) :max (inst-ms end)}))
+  :gen #(clojure.alpha.spec.gen/fmap (fn [^long d] (java.util.Date. d))
+         (clojure.alpha.spec.gen/large-integer* {:min (inst-ms start) :max (inst-ms end)}))
   (and inst? #(inst-in-range? start end %)))
 
 (defop int-in
   "Returns a spec that validates fixed precision integers in the
   range from start (inclusive) to end (exclusive)."
   [start end]
-  :gen #(clojure.spec-alpha2.gen/large-integer* {:min start :max (dec end)})
+  :gen #(clojure.alpha.spec.gen/large-integer* {:min start :max (dec end)})
   (and int? #(int-in-range? start end %)))
 
 (defop double-in
@@ -990,7 +990,7 @@ set. You can toggle check-asserts? with (check-asserts bool)."
     :min       - minimum value (inclusive, default none)
     :max       - maximum value (inclusive, default none)"
   [& {:keys [infinite? NaN? min max :as m]}]
-  :gen #(clojure.spec-alpha2.gen/double* m)
+  :gen #(clojure.alpha.spec.gen/double* m)
   (and double?
        #(if-not infinite? (not (Double/isInfinite %)))
        #(if-not NaN? (not (Double/isNaN %)))
@@ -1020,7 +1020,7 @@ set. You can toggle check-asserts? with (check-asserts bool)."
          (let [primary# (:primary ~'mform)
                preds# (:preds ~'mform)
                a# (:args ~'mform)
-               comp-spec# (concat (list 'clojure.spec-alpha2/and- (cons '~(explicate ns-name spec-op) a#)) preds#)]
+               comp-spec# (concat (list 'clojure.alpha.spec/and- (cons '~(explicate ns-name spec-op) a#)) preds#)]
            (resolve-spec comp-spec#)))
        (defmacro ~op-name
          ~@(if doc [doc] [])

src/main/clojure/clojure/spec_alpha2/gen.clj renamed to src/main/clojure/clojure/alpha/spec/gen.clj

@@ -6,7 +6,7 @@
 ;   the terms of this license.
 ;   You must not remove this notice, or any other, from this software.
 
-(ns clojure.spec-alpha2.gen
+(ns clojure.alpha.spec.gen
     (:refer-clojure :exclude [boolean bytes cat hash-map list map not-empty set vector
                               char double int keyword symbol string uuid delay shuffle]))
 
@@ -196,8 +196,8 @@ gens, each of which should generate something sequential."
     (get @gen-builtins pred)))
 
 (comment
-  (require :reload 'clojure.spec-alpha2.gen)
-  (in-ns 'clojure.spec-alpha2.gen)
+  (require :reload 'clojure.alpha.spec.gen)
+  (in-ns 'clojure.alpha.spec.gen)
 
   ;; combinators, see call to lazy-combinators above for complete list
   (generate (one-of [(gen-for-pred integer?) (gen-for-pred string?)]))

src/main/clojure/clojure/spec_alpha2/impl.clj renamed to src/main/clojure/clojure/alpha/spec/impl.clj

@@ -7,14 +7,14 @@
 ;   You must not remove this notice, or any other, from this software.
 
 (ns ^{:skip-wiki true}
-  clojure.spec-alpha2.impl
+  clojure.alpha.spec.impl
   (:require
-    [clojure.spec-alpha2 :as s]
-    [clojure.spec-alpha2.protocols :as protocols
+    [clojure.alpha.spec :as s]
+    [clojure.alpha.spec.protocols :as protocols
      :refer [Spec conform* unform* explain* gen* with-gen* describe*
              Schema keyspecs*
              Select]]
-    [clojure.spec-alpha2.gen :as gen]
+    [clojure.alpha.spec.gen :as gen]
     [clojure.set :as set]
     [clojure.walk :as walk]))
 
@@ -193,13 +193,13 @@
   (assert (and (= (count keys) (count specs)) (every? keyword? keys)) "cat expects k1 p1 k2 p2..., where ks are keywords")
   (cat-impl keys (mapv s/resolve-spec specs) specs))
 
-(defmethod s/expand-spec 'clojure.spec-alpha2/&
+(defmethod s/expand-spec 'clojure.alpha.spec/&
   [[_ re & preds]]
-  {:clojure.spec/op 'clojure.spec-alpha2/&
+  {:clojure.spec/op 'clojure.alpha.spec/&
    :spec re
    :preds (vec preds)})
 
-(defmethod s/create-spec 'clojure.spec-alpha2/&
+(defmethod s/create-spec 'clojure.alpha.spec/&
   [{:keys [spec preds]}]
   (amp-impl (s/resolve-spec spec) spec (mapv s/resolve-spec preds) (mapv #'s/unfn preds)))
 
@@ -1441,7 +1441,7 @@
       (case op
         ::s/accept nil
         nil p
-        ::s/amp (list* 'clojure.spec-alpha2/& (resolve-form amp) (resolve-forms forms))
+        ::s/amp (list* 'clojure.alpha.spec/& (resolve-form amp) (resolve-forms forms))
         ::s/pcat (if rep+
                  (list `s/+ rep+)
                  (cons `s/cat (mapcat vector (or (seq ks) (repeat :_)) (resolve-forms forms))))

src/main/clojure/clojure/spec_alpha2/protocols.clj renamed to src/main/clojure/clojure/alpha/spec/protocols.clj

@@ -6,7 +6,7 @@
 ;   the terms of this license.
 ;   You must not remove this notice, or any other, from this software.
 
-(ns clojure.spec-alpha2.protocols)
+(ns clojure.alpha.spec.protocols)
 
 (defprotocol Spec
   :extend-via-metadata true

src/main/clojure/clojure/spec_alpha2/test.clj renamed to src/main/clojure/clojure/alpha/spec/test.clj

@@ -6,16 +6,16 @@
 ;   the terms of this license.
 ;   You must not remove this notice, or any other, from this software.
 
-(ns clojure.spec-alpha2.test
+(ns clojure.alpha.spec.test
   (:refer-clojure :exclude [test])
   (:require
    [clojure.pprint :as pp]
-   [clojure.spec-alpha2 :as s]
-   [clojure.spec-alpha2.gen :as gen]
+   [clojure.alpha.spec :as s]
+   [clojure.alpha.spec.gen :as gen]
    [clojure.string :as str]))
 
 (in-ns 'clojure.spec.test.check)
-(in-ns 'clojure.spec-alpha2.test)
+(in-ns 'clojure.alpha.spec.test)
 (alias 'stc 'clojure.spec.test.check)
 (alias 'sa 'clojure.spec.alpha)
 
@@ -104,7 +104,7 @@ interpret-stack-trace-element that are relevant to a
 failure in instrument."
   [elems]
   (let [plumbing? (fn [{:keys [var-scope]}]
-                    (contains? '#{clojure.spec-alpha2.test/spec-checking-fn} var-scope))]
+                    (contains? '#{clojure.alpha.spec.test/spec-checking-fn} var-scope))]
     (sequence (comp (map StackTraceElement->vec)
                     (map interpret-stack-trace-element)
                     (filter :var-scope)
@@ -113,7 +113,7 @@ failure in instrument."
 
 (defn- spec-checking-fn
   [v f fn-spec]
-  (let [fn-spec (@#'clojure.spec-alpha2.impl/maybe-spec fn-spec)
+  (let [fn-spec (@#'clojure.alpha.spec.impl/maybe-spec fn-spec)
         conform! (fn [v role spec data args]
                    (let [conformed (s/conform spec data)]
                      (if (= ::s/invalid conformed)