luciano/specter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

switch from cljx to cljc

Browse source
This commit is contained in:
Nathan Marz 2016-08-06 10:40:45 -04:00
parent fb6cd38b1d
commit 74f38d93a9
11 changed files with 269 additions and 267 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
project.clj
View file

@ -3,11 +3,10 @@
(defproject com.rpl/specter VERSION (defproject com.rpl/specter VERSION
:jvm-opts ["-XX:-OmitStackTraceInFastThrow" ; this prevents JVM from doing optimizations which can remove stack traces from NPE and other exceptions :jvm-opts ["-XX:-OmitStackTraceInFastThrow" ; this prevents JVM from doing optimizations which can remove stack traces from NPE and other exceptions
;"-agentpath:/Applications/YourKit_Java_Profiler_2015_build_15056.app/Contents/Resources/bin/mac/libyjpagent.jnilib" ;"-agentpath:/Applications/YourKit_Java_Profiler_2015_build_15056.app/Contents/Resources/bin/mac/libyjpagent.jnilib"
] ]
:source-paths ["src/clj"] :source-paths ["src/clj"]
:java-source-paths ["src/java"] :java-source-paths ["src/java"]
:test-paths ["test", "target/test-classes"] :test-paths ["test", "target/test-classes"]
:jar-exclusions [#"\.cljx"]
:auto-clean false :auto-clean false
:dependencies [[riddley "0.1.12"]] :dependencies [[riddley "0.1.12"]]
:plugins [[lein-codox "0.9.5"]] :plugins [[lein-codox "0.9.5"]]
@ -26,25 +25,8 @@
[[org.clojure/test.check "0.7.0"] [[org.clojure/test.check "0.7.0"]
[org.clojure/clojure "1.7.0"] [org.clojure/clojure "1.7.0"]
[org.clojure/clojurescript "1.7.10"]] [org.clojure/clojurescript "1.7.10"]]
:plugins
[[com.keminglabs/cljx "0.6.0"]]
:cljx {:builds [{:source-paths ["src/clj"]
:output-path "target/classes"
:rules :clj}
{:source-paths ["src/clj"]
:output-path "target/classes"
:rules :cljs}
{:source-paths ["test"]
:output-path "target/test-classes"
:rules :clj}
{:source-paths ["test"]
:output-path "target/test-classes"
:rules :cljs}]}
} }
:test {:dependencies [[org.clojure/clojure "1.7.0"]]} :test {:dependencies [[org.clojure/clojure "1.7.0"]]}
} }
:aliases {"cleantest" ["do" "clean," :aliases {"deploy" ["do" "clean," "deploy" "clojars"]}
"cljx" "once,"
"test"]
"deploy" ["do" "clean," "cljx" "once," "deploy" "clojars"]}
) )

28
src/clj/com/rpl/specter.cljx → src/clj/com/rpl/specter.cljc
View file

@ -1,5 +1,5 @@
(ns com.rpl.specter (ns com.rpl.specter
#+cljs (:require-macros #?(:cljs (:require-macros
[com.rpl.specter.macros [com.rpl.specter.macros
:refer :refer
[fixed-pathed-collector [fixed-pathed-collector
@ -12,17 +12,17 @@
]] ]]
[com.rpl.specter.util-macros :refer [com.rpl.specter.util-macros :refer
[doseqres]] [doseqres]]
) ))
(:use [com.rpl.specter.protocols :only [ImplicitNav]] (:use [com.rpl.specter.protocols :only [ImplicitNav]]
#+clj [com.rpl.specter.macros :only #?(:clj [com.rpl.specter.macros :only
[fixed-pathed-collector [fixed-pathed-collector
fixed-pathed-nav fixed-pathed-nav
defcollector defcollector
defnav defnav
defpathedfn defpathedfn
richnav richnav
defnavconstructor]] defnavconstructor]])
#+clj [com.rpl.specter.util-macros :only [doseqres]] #?(:clj [com.rpl.specter.util-macros :only [doseqres]])
) )
(:require [com.rpl.specter.impl :as i] (:require [com.rpl.specter.impl :as i]
[com.rpl.specter.navs :as n] [com.rpl.specter.navs :as n]
@ -525,16 +525,16 @@
ImplicitNav ImplicitNav
(implicit-nav [this] STAY)) (implicit-nav [this] STAY))
(extend-type #+clj clojure.lang.Keyword #+cljs cljs.core/Keyword (extend-type #?(:clj clojure.lang.Keyword :cljs cljs.core/Keyword)
ImplicitNav ImplicitNav
(implicit-nav [this] (keypath this)) (implicit-nav [this] (keypath this))
) )
(extend-type #+clj clojure.lang.AFn #+cljs function (extend-type #?(:clj clojure.lang.AFn :cljs function)
ImplicitNav ImplicitNav
(implicit-nav [this] (pred this))) (implicit-nav [this] (pred this)))
(extend-type #+clj clojure.lang.PersistentHashSet #+cljs cljs.core/PersistentHashSet (extend-type #?(:clj clojure.lang.PersistentHashSet :cljs cljs.core/PersistentHashSet)
ImplicitNav ImplicitNav
(implicit-nav [this] (pred this))) (implicit-nav [this] (pred this)))

0
src/clj/com/rpl/specter/defnavhelpers.cljx → src/clj/com/rpl/specter/defnavhelpers.cljc
View file

202
src/clj/com/rpl/specter/impl.cljx → src/clj/com/rpl/specter/impl.cljc
View file

@ -1,21 +1,18 @@
(ns com.rpl.specter.impl (ns com.rpl.specter.impl
#+cljs (:require-macros #?(:cljs (:require-macros
[com.rpl.specter.prot-opt-invoke
:refer [mk-optimized-invocation]]
[com.rpl.specter.defhelpers :refer [define-ParamsNeededPath]] [com.rpl.specter.defhelpers :refer [define-ParamsNeededPath]]
[com.rpl.specter.util-macros :refer [doseqres]] [com.rpl.specter.util-macros :refer [doseqres]]
) ))
(:use [com.rpl.specter.protocols :only (:use [com.rpl.specter.protocols :only
[select* transform* collect-val Navigator]] [select* transform* collect-val Navigator]]
#+clj [com.rpl.specter.util-macros :only [doseqres]] #?(:clj [com.rpl.specter.util-macros :only [doseqres]])
) )
(:require [com.rpl.specter.protocols :as p] (:require [com.rpl.specter.protocols :as p]
[clojure.string :as s] [clojure.string :as s]
#+clj [com.rpl.specter.defhelpers :as dh] #?(:clj [com.rpl.specter.defhelpers :as dh])
#+clj [riddley.walk :as riddley] #?(:clj [riddley.walk :as riddley])
) )
#+clj #?(:clj (:import [com.rpl.specter Util MutableCell]))
(:import [com.rpl.specter Util MutableCell])
) )
(def NONE ::NONE) (def NONE ::NONE)
@ -51,45 +48,53 @@
([a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 & r] v) ([a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 & r] v)
)) ))
#+clj #?(:clj
(defmacro throw* [etype & args] (defmacro throw* [etype & args]
`(throw (new ~etype (smart-str ~@args)))) `(throw (new ~etype (smart-str ~@args)))))
#+clj #?(
:clj
(defmacro throw-illegal [& args] (defmacro throw-illegal [& args]
`(throw* IllegalArgumentException ~@args)) `(throw* IllegalArgumentException ~@args))
#+cljs :cljs
(defn throw-illegal [& args] (defn throw-illegal [& args]
(throw (js/Error. (apply str args)))) (throw (js/Error. (apply str args))))
)
;; need to get the expansion function like this so that ;; need to get the expansion function like this so that
;; this code compiles in a clojure environment where cljs.analyzer ;; this code compiles in a clojure environment where cljs.analyzer
;; namespace does not exist ;; namespace does not exist
#+clj #?(
:clj
(defn cljs-analyzer-macroexpand-1 [] (defn cljs-analyzer-macroexpand-1 []
(eval 'cljs.analyzer/macroexpand-1)) (eval 'cljs.analyzer/macroexpand-1))
;; this version is for bootstrap cljs ;; this version is for bootstrap cljs
#+cljs :cljs
(defn cljs-analyzer-macroexpand-1 [] (defn cljs-analyzer-macroexpand-1 []
^:cljs.analyzer/no-resolve cljs.analyzer/macroexpand-1) ^:cljs.analyzer/no-resolve cljs.analyzer/macroexpand-1)
)
#+clj #?(
:clj
(defn clj-macroexpand-all [form] (defn clj-macroexpand-all [form]
(riddley/macroexpand-all form)) (riddley/macroexpand-all form))
#+cljs :cljs
(defn clj-macroexpand-all [form] (defn clj-macroexpand-all [form]
(throw-illegal "not implemented")) (throw-illegal "not implemented"))
)
#+clj #?(
:clj
(defn intern* [ns name val] (intern ns name val)) (defn intern* [ns name val] (intern ns name val))
#+cljs :cljs
(defn intern* [ns name val] (defn intern* [ns name val]
(throw-illegal "intern not supported in ClojureScript")) (throw-illegal "intern not supported in ClojureScript"))
)
(defn benchmark [iters afn] (defn benchmark [iters afn]
(time (time
@ -105,45 +110,53 @@
(rich-transform* [this params params-idx vals structure next-fn]) (rich-transform* [this params params-idx vals structure next-fn])
) )
#+clj #?(
:clj
(defmacro exec-rich-select* [this & args] (defmacro exec-rich-select* [this & args]
(let [hinted (with-meta this {:tag 'com.rpl.specter.impl.RichNavigator})] (let [hinted (with-meta this {:tag 'com.rpl.specter.impl.RichNavigator})]
`(.rich-select* ~hinted ~@args) `(.rich-select* ~hinted ~@args)
)) ))
#+cljs :cljs
(defn exec-rich-select* [this params params-idx vals structure next-fn] (defn exec-rich-select* [this params params-idx vals structure next-fn]
(rich-select* ^not-native this params params-idx vals structure next-fn)) (rich-select* ^not-native this params params-idx vals structure next-fn))
)
#+clj #?(
:clj
(defmacro exec-rich-transform* [this & args] (defmacro exec-rich-transform* [this & args]
(let [hinted (with-meta this {:tag 'com.rpl.specter.impl.RichNavigator})] (let [hinted (with-meta this {:tag 'com.rpl.specter.impl.RichNavigator})]
`(.rich-transform* ~hinted ~@args) `(.rich-transform* ~hinted ~@args)
)) ))
#+cljs :cljs
(defn exec-rich-transform* [this params params-idx vals structure next-fn] (defn exec-rich-transform* [this params params-idx vals structure next-fn]
(rich-transform* ^not-native this params params-idx vals structure next-fn)) (rich-transform* ^not-native this params params-idx vals structure next-fn))
)
#+clj #?(
:clj
(defmacro exec-select* [this & args] (defmacro exec-select* [this & args]
(let [hinted (with-meta this {:tag 'com.rpl.specter.protocols.Navigator})] (let [hinted (with-meta this {:tag 'com.rpl.specter.protocols.Navigator})]
`(.select* ~hinted ~@args) `(.select* ~hinted ~@args)
)) ))
#+cljs :cljs
(defn exec-select* [this structure next-fn] (defn exec-select* [this structure next-fn]
(p/select* ^not-native this structure next-fn)) (p/select* ^not-native this structure next-fn))
)
#+clj #?(
:clj
(defmacro exec-transform* [this & args] (defmacro exec-transform* [this & args]
(let [hinted (with-meta this {:tag 'com.rpl.specter.protocols.Navigator})] (let [hinted (with-meta this {:tag 'com.rpl.specter.protocols.Navigator})]
`(.transform* ~hinted ~@args) `(.transform* ~hinted ~@args)
)) ))
#+cljs :cljs
(defn exec-transform* [this structure next-fn] (defn exec-transform* [this structure next-fn]
(p/transform* ^not-native this structure next-fn)) (p/transform* ^not-native this structure next-fn))
)
(def RichPathExecutor (def RichPathExecutor
(->ExecutorFunctions (->ExecutorFunctions
@ -194,16 +207,18 @@
(declare bind-params*) (declare bind-params*)
#+clj #?(
:clj
(defmacro fast-object-array [i] (defmacro fast-object-array [i]
`(com.rpl.specter.Util/makeObjectArray ~i)) `(com.rpl.specter.Util/makeObjectArray ~i))
#+cljs :cljs
(defn fast-object-array [i] (defn fast-object-array [i]
(object-array i)) (object-array i))
)
#?(
#+clj :clj
(dh/define-ParamsNeededPath (dh/define-ParamsNeededPath
true true
clojure.lang.IFn clojure.lang.IFn
@ -212,7 +227,7 @@
(let [a (object-array args)] (let [a (object-array args)]
(com.rpl.specter.impl/bind-params* this a 0)))) (com.rpl.specter.impl/bind-params* this a 0))))
#+cljs :cljs
(define-ParamsNeededPath (define-ParamsNeededPath
false false
cljs.core/IFn cljs.core/IFn
@ -227,6 +242,7 @@
rest))] rest))]
(com.rpl.specter.impl/bind-params* this a 0)) (com.rpl.specter.impl/bind-params* this a 0))
)) ))
)
(defn params-needed-path? [o] (defn params-needed-path? [o]
(instance? ParamsNeededPath o)) (instance? ParamsNeededPath o))
@ -288,24 +304,24 @@
(coerce-path [this] (coerce-path [this]
this) this)
#+clj java.util.List #+cljs cljs.core/PersistentVector #?(:clj java.util.List :cljs cljs.core/PersistentVector)
(coerce-path [this] (coerce-path [this]
(do-comp-paths this)) (do-comp-paths this))
#+cljs cljs.core/IndexedSeq #?(:cljs cljs.core/IndexedSeq)
#+cljs (coerce-path [this] #?(:cljs (coerce-path [this]
(coerce-path (vec this))) (coerce-path (vec this))))
#+cljs cljs.core/EmptyList #?(:cljs cljs.core/EmptyList)
#+cljs (coerce-path [this] #?(:cljs (coerce-path [this]
(coerce-path (vec this))) (coerce-path (vec this))))
#+cljs cljs.core/List #?(:cljs cljs.core/List)
#+cljs (coerce-path [this] #?(:cljs (coerce-path [this]
(coerce-path (vec this))) (coerce-path (vec this))))
#+cljs cljs.core/LazySeq #?(:cljs cljs.core/LazySeq)
#+cljs (coerce-path [this] #?(:cljs (coerce-path [this]
(coerce-path (vec this))) (coerce-path (vec this))))
#+clj Object #+cljs default #?(:clj Object :cljs default)
(coerce-path [this] (coerce-path [this]
(coerce-object this))) (coerce-object this)))
@ -388,10 +404,10 @@
nil nil
(do-comp-paths [o] (do-comp-paths [o]
(coerce-path o)) (coerce-path o))
#+clj Object #+cljs default #?(:clj Object :cljs default)
(do-comp-paths [o] (do-comp-paths [o]
(coerce-path o)) (coerce-path o))
#+clj java.util.List #+cljs cljs.core/PersistentVector #?(:clj java.util.List :cljs cljs.core/PersistentVector)
(do-comp-paths [navigators] (do-comp-paths [navigators]
(if (empty? navigators) (if (empty? navigators)
(coerce-path nil) (coerce-path nil)
@ -430,42 +446,50 @@
;; cell implementation idea taken from prismatic schema library ;; cell implementation idea taken from prismatic schema library
#+cljs #?(:cljs
(defprotocol PMutableCell (defprotocol PMutableCell
(set_cell [cell x])) (set_cell [cell x]))
)
#+cljs #?(:cljs
(deftype MutableCell [^:volatile-mutable q] (deftype MutableCell [^:volatile-mutable q]
PMutableCell PMutableCell
(set_cell [this x] (set! q x))) (set_cell [this x] (set! q x)))
)
#+cljs #?(
(defn mutable-cell :clj
([] (mutable-cell nil))
([init] (MutableCell. init)))
#+cljs
(defn set-cell! [cell val]
(set_cell cell val))
#+cljs
(defn get-cell [cell]
#+clj (get_cell cell) #+cljs (.-q cell)
)
#+clj
(defn mutable-cell (defn mutable-cell
([] (mutable-cell nil)) ([] (mutable-cell nil))
([v] (MutableCell. v))) ([v] (MutableCell. v)))
#+clj :cljs
(defn mutable-cell
([] (mutable-cell nil))
([init] (MutableCell. init)))
)
#?(
:clj
(defn set-cell! [^MutableCell c v]
(.set c v))
:cljs
(defn set-cell! [cell val]
(set_cell cell val))
)
#?(
:clj
(defn get-cell [^MutableCell c] (defn get-cell [^MutableCell c]
(.get c)) (.get c))
#+clj
(defn set-cell! [^MutableCell c v] :cljs
(.set c v)) (defn get-cell [cell]
(.-q cell))
)
(defn update-cell! [cell afn] (defn update-cell! [cell afn]
@ -488,7 +512,8 @@
;; amazingly doing this as a macro shows a big effect in the ;; amazingly doing this as a macro shows a big effect in the
;; benchmark for getting a value out of a nested map ;; benchmark for getting a value out of a nested map
#+clj #?(
:clj
(defmacro compiled-traverse* [path result-fn structure] (defmacro compiled-traverse* [path result-fn structure]
`(let [nav# (compiled-nav-field ~path) `(let [nav# (compiled-nav-field ~path)
ex# (compiled-executors-field ~path)] ex# (compiled-executors-field ~path)]
@ -498,7 +523,7 @@
~structure) ~structure)
)) ))
#+cljs :cljs
(defn compiled-traverse* [path result-fn structure] (defn compiled-traverse* [path result-fn structure]
(let [nav (compiled-nav-field path) (let [nav (compiled-nav-field path)
ex (compiled-executors-field path)] ex (compiled-executors-field path)]
@ -507,13 +532,14 @@
result-fn result-fn
structure) structure)
)) ))
)
(defn do-compiled-traverse [apath structure] (defn do-compiled-traverse [apath structure]
(reify #+clj clojure.lang.IReduce #+cljs cljs.core/IReduce (reify #?(:clj clojure.lang.IReduce :cljs cljs.core/IReduce)
(#+clj reduce #+cljs -reduce (#?(:clj reduce :cljs -reduce)
[this afn] [this afn]
(#+clj .reduce #+cljs -reduce this afn (afn))) (#?(:clj .reduce :cljs -reduce) this afn (afn)))
(#+clj reduce #+cljs -reduce (#?(:clj reduce :cljs -reduce)
[this afn start] [this afn start]
(let [cell (mutable-cell start)] (let [cell (mutable-cell start)]
(compiled-traverse* (compiled-traverse*
@ -616,9 +642,9 @@
)))) ))))
(defn fn-invocation? [f] (defn fn-invocation? [f]
(or #+clj (instance? clojure.lang.Cons f) (or #?(:clj (instance? clojure.lang.Cons f))
#+clj (instance? clojure.lang.LazySeq f) #?(:clj (instance? clojure.lang.LazySeq f))
#+cljs (instance? cljs.core.LazySeq f) #?(:cljs (instance? cljs.core.LazySeq f))
(list? f))) (list? f)))
(defrecord LayeredNav [underlying]) (defrecord LayeredNav [underlying])
@ -702,13 +728,13 @@
(or (satisfies? p/ImplicitNav v) (or (satisfies? p/ImplicitNav v)
(instance? CompiledPath v))) (instance? CompiledPath v)))
#+cljs #?(:cljs
(defn handle-params [precompiled params-maker possible-params] (defn handle-params [precompiled params-maker possible-params]
(let [params (fast-object-array (count params-maker))] (let [params (fast-object-array (count params-maker))]
(dotimes [i (count params-maker)] (dotimes [i (count params-maker)]
(aset params i ((get possible-params (get params-maker i))))) (aset params i ((get possible-params (get params-maker i)))))
(bind-params* precompiled params 0) (bind-params* precompiled params 0)
)) )))
(defn filter-select [afn structure next-fn] (defn filter-select [afn structure next-fn]
(if (afn structure) (if (afn structure)
@ -980,11 +1006,12 @@
;; This is needed when aset is used on primitive values in mk-params-maker ;; This is needed when aset is used on primitive values in mk-params-maker
;; to avoid reflection ;; to avoid reflection
#+clj #?(:clj
(defn aset-object [^objects a i ^Object v] (defn aset-object [^objects a i ^Object v]
(aset a i v)) (aset a i v)))
#+clj #?(
:clj
(defn mk-params-maker [ns-str params-code possible-params-code used-locals] (defn mk-params-maker [ns-str params-code possible-params-code used-locals]
(let [ns (find-ns (symbol ns-str)) (let [ns (find-ns (symbol ns-str))
array-sym (gensym "array")] array-sym (gensym "array")]
@ -1000,13 +1027,14 @@
~array-sym ~array-sym
)))))) ))))))
#+cljs :cljs
(defn mk-params-maker [ns-str params-code possible-params-code used-locals] (defn mk-params-maker [ns-str params-code possible-params-code used-locals]
(let [indexed (->> possible-params-code (let [indexed (->> possible-params-code
(map-indexed (comp vec reverse vector)) (map-indexed (comp vec reverse vector))
(into {}))] (into {}))]
;;TODO: may be more efficient as an array ;;TODO: may be more efficient as an array
(mapv (fn [c] (get indexed c)) params-code))) (mapv (fn [c] (get indexed c)) params-code)))
)
;; possible-params-code is for cljs impl that can't use eval ;; possible-params-code is for cljs impl that can't use eval
(defn magic-precompilation [prepared-path ns-str used-locals possible-params-code] (defn magic-precompilation [prepared-path ns-str used-locals possible-params-code]
@ -1060,7 +1088,7 @@
(defn compiled-multi-transform* [path structure] (defn compiled-multi-transform* [path structure]
(compiled-transform* path multi-transform-error-fn structure)) (compiled-transform* path multi-transform-error-fn structure))
#+clj #?(:clj
(defn extend-protocolpath* [protpath protpath-prot extensions] (defn extend-protocolpath* [protpath protpath-prot extensions]
(let [extensions (partition 2 extensions) (let [extensions (partition 2 extensions)
m (-> protpath-prot :sigs keys first) m (-> protpath-prot :sigs keys first)
@ -1074,7 +1102,7 @@
(throw-illegal "Invalid number of params in extended protocol path, expected " (throw-illegal "Invalid number of params in extended protocol path, expected "
expected-params " but got " needed-params)) expected-params " but got " needed-params))
(extend atype protpath-prot {m (fn [_] rich-nav)}) (extend atype protpath-prot {m (fn [_] rich-nav)})
)))) )))))
(defn parameterize-path [apath params params-idx] (defn parameterize-path [apath params params-idx]
(if (instance? CompiledPath apath) (if (instance? CompiledPath apath)

116
src/clj/com/rpl/specter/navs.cljx → src/clj/com/rpl/specter/navs.cljc
View file

@ -1,5 +1,5 @@
(ns com.rpl.specter.navs (ns com.rpl.specter.navs
#+cljs (:require-macros #?(:cljs (:require-macros
[com.rpl.specter.macros [com.rpl.specter.macros
:refer :refer
[fixed-pathed-collector [fixed-pathed-collector
@ -12,12 +12,12 @@
]] ]]
[com.rpl.specter.util-macros :refer [com.rpl.specter.util-macros :refer
[doseqres]] [doseqres]]
) ))
(:use #+clj [com.rpl.specter macros] (:use #?(:clj [com.rpl.specter macros])
#+clj [com.rpl.specter.util-macros :only [doseqres]]) #?(:clj [com.rpl.specter.util-macros :only [doseqres]]))
(:require [com.rpl.specter.impl :as i] (:require [com.rpl.specter.impl :as i]
[clojure.walk :as walk] [clojure.walk :as walk]
#+clj [clojure.core.reducers :as r] #?(:clj [clojure.core.reducers :as r])
[com.rpl.specter.defnavhelpers] ; so that for cljs it's loaded as macros expand to this [com.rpl.specter.defnavhelpers] ; so that for cljs it's loaded as macros expand to this
) )
) )
@ -61,14 +61,16 @@
(doseqres i/NONE [e structure] (doseqres i/NONE [e structure]
(next-fn e))) (next-fn e)))
#+cljs #?(
(defn queue? [coll] :clj
(= (type coll) (type #queue [])))
#+clj
(defn queue? [coll] (defn queue? [coll]
(instance? clojure.lang.PersistentQueue coll)) (instance? clojure.lang.PersistentQueue coll))
:cljs
(defn queue? [coll]
(= (type coll) (type #queue [])))
)
(defprotocol AllTransformProtocol (defprotocol AllTransformProtocol
(all-transform [structure next-fn])) (all-transform [structure next-fn]))
@ -89,21 +91,20 @@
) )
;; in cljs they're PersistentVector so don't need a special case ;; in cljs they're PersistentVector so don't need a special case
#+clj clojure.lang.MapEntry #?(:clj clojure.lang.MapEntry)
#+clj #?(:clj
(all-transform [structure next-fn] (all-transform [structure next-fn]
(let [newk (next-fn (key structure)) (let [newk (next-fn (key structure))
newv (next-fn (val structure))] newv (next-fn (val structure))]
(clojure.lang.MapEntry. newk newv) (clojure.lang.MapEntry. newk newv)
)) )))
#+clj clojure.lang.PersistentVector #+cljs cljs.core/PersistentVector #?(:clj clojure.lang.PersistentVector :cljs cljs.core/PersistentVector)
(all-transform [structure next-fn] (all-transform [structure next-fn]
(mapv next-fn structure)) (mapv next-fn structure))
#+clj #?(:clj clojure.lang.PersistentArrayMap)
clojure.lang.PersistentArrayMap #?(:clj
#+clj
(all-transform [structure next-fn] (all-transform [structure next-fn]
(let [k-it (.keyIterator structure) (let [k-it (.keyIterator structure)
v-it (.valIterator structure)] v-it (.valIterator structure)]
@ -114,21 +115,20 @@
[newk newv] (next-fn [k v])] [newk newv] (next-fn [k v])]
(recur (assoc ret newk newv))) (recur (assoc ret newk newv)))
ret ret
)))) )))))
#+cljs #?(:cljs cljs.core/PersistentArrayMap)
cljs.core/PersistentArrayMap #?(:cljs
#+cljs
(all-transform [structure next-fn] (all-transform [structure next-fn]
(non-transient-map-all-transform structure next-fn {}) (non-transient-map-all-transform structure next-fn {})
) ))
#+clj clojure.lang.PersistentTreeMap #+cljs cljs.core/PersistentTreeMap #?(:clj clojure.lang.PersistentTreeMap :cljs cljs.core/PersistentTreeMap)
(all-transform [structure next-fn] (all-transform [structure next-fn]
(non-transient-map-all-transform structure next-fn (empty structure)) (non-transient-map-all-transform structure next-fn (empty structure))
) )
#+clj clojure.lang.PersistentHashMap #+cljs cljs.core/PersistentHashMap #?(:clj clojure.lang.PersistentHashMap :cljs cljs.core/PersistentHashMap)
(all-transform [structure next-fn] (all-transform [structure next-fn]
(persistent! (persistent!
(reduce-kv (reduce-kv
@ -137,15 +137,14 @@
(assoc! m newk newv) (assoc! m newk newv)
)) ))
(transient (transient
#+clj clojure.lang.PersistentHashMap/EMPTY #+cljs cljs.core.PersistentHashMap.EMPTY #?(:clj clojure.lang.PersistentHashMap/EMPTY :cljs cljs.core.PersistentHashMap.EMPTY)
) )
structure structure
))) )))
#+clj #?(:clj Object)
Object #?(:clj
#+clj
(all-transform [structure next-fn] (all-transform [structure next-fn]
(let [empty-structure (empty structure)] (let [empty-structure (empty structure)]
(cond (and (list? empty-structure) (not (queue? empty-structure))) (cond (and (list? empty-structure) (not (queue? empty-structure)))
@ -165,18 +164,17 @@
:else :else
(->> structure (r/map next-fn) (into empty-structure)) (->> structure (r/map next-fn) (into empty-structure))
))) ))))
#+cljs #?(:cljs default)
default #?(:cljs
#+cljs
(all-transform [structure next-fn] (all-transform [structure next-fn]
(let [empty-structure (empty structure)] (let [empty-structure (empty structure)]
(if (and (list? empty-structure) (not (queue? empty-structure))) (if (and (list? empty-structure) (not (queue? empty-structure)))
;; this is done to maintain order, otherwise lists get reversed ;; this is done to maintain order, otherwise lists get reversed
(doall (map next-fn structure)) (doall (map next-fn structure))
(into empty-structure (map #(next-fn %)) structure) (into empty-structure (map #(next-fn %)) structure)
))) ))))
) )
(defprotocol MapValsTransformProtocol (defprotocol MapValsTransformProtocol
@ -195,9 +193,8 @@
nil nil
) )
#+clj #?(:clj clojure.lang.PersistentArrayMap)
clojure.lang.PersistentArrayMap #?(:clj
#+clj
(map-vals-transform [structure next-fn] (map-vals-transform [structure next-fn]
(let [k-it (.keyIterator structure) (let [k-it (.keyIterator structure)
v-it (.valIterator structure)] v-it (.valIterator structure)]
@ -207,33 +204,32 @@
v (.next v-it)] v (.next v-it)]
(recur (assoc ret k (next-fn v)))) (recur (assoc ret k (next-fn v))))
ret ret
)))) )))))
#+cljs #?(:cljs cljs.core/PersistentArrayMap)
cljs.core/PersistentArrayMap #?(:cljs
#+cljs
(map-vals-transform [structure next-fn] (map-vals-transform [structure next-fn]
(map-vals-non-transient-transform structure {} next-fn) (map-vals-non-transient-transform structure {} next-fn)
) ))
#+clj clojure.lang.PersistentTreeMap #+cljs cljs.core/PersistentTreeMap #?(:clj clojure.lang.PersistentTreeMap :cljs cljs.core/PersistentTreeMap)
(map-vals-transform [structure next-fn] (map-vals-transform [structure next-fn]
(map-vals-non-transient-transform structure (empty structure) next-fn) (map-vals-non-transient-transform structure (empty structure) next-fn)
) )
#+clj clojure.lang.PersistentHashMap #+cljs cljs.core/PersistentHashMap #?(:clj clojure.lang.PersistentHashMap :cljs cljs.core/PersistentHashMap)
(map-vals-transform [structure next-fn] (map-vals-transform [structure next-fn]
(persistent! (persistent!
(reduce-kv (reduce-kv
(fn [m k v] (fn [m k v]
(assoc! m k (next-fn v))) (assoc! m k (next-fn v)))
(transient (transient
#+clj clojure.lang.PersistentHashMap/EMPTY #+cljs cljs.core.PersistentHashMap.EMPTY #?(:clj clojure.lang.PersistentHashMap/EMPTY :cljs cljs.core.PersistentHashMap.EMPTY)
) )
structure structure
))) )))
#+clj Object #+cljs default #?(:clj Object :cljs default)
(map-vals-transform [structure next-fn] (map-vals-transform [structure next-fn]
(reduce-kv (reduce-kv
(fn [m k v] (fn [m k v]
@ -334,7 +330,7 @@
(prepend-all [_ elements] (prepend-all [_ elements]
elements) elements)
#+clj clojure.lang.PersistentVector #+cljs cljs.core/PersistentVector #?(:clj clojure.lang.PersistentVector :cljs cljs.core/PersistentVector)
(append-all [structure elements] (append-all [structure elements]
(reduce conj structure elements)) (reduce conj structure elements))
(prepend-all [structure elements] (prepend-all [structure elements]
@ -345,7 +341,7 @@
(persistent! <>) (persistent! <>)
))) )))
#+clj Object #+cljs default #?(:clj Object :cljs default)
(append-all [structure elements] (append-all [structure elements]
(concat structure elements)) (concat structure elements))
(prepend-all [structure elements] (prepend-all [structure elements]
@ -380,24 +376,28 @@
(defn- update-last-list [l afn] (defn- update-last-list [l afn]
(append (butlast l) (afn (last l)))) (append (butlast l) (afn (last l))))
#+clj #?(
:clj
(defn vec-count [^clojure.lang.IPersistentVector v] (defn vec-count [^clojure.lang.IPersistentVector v]
(.length v)) (.length v))
#+cljs :cljs
(defn vec-count [v] (defn vec-count [v]
(count v)) (count v))
)
#+clj #?(
:clj
(defn transient-vec-count [^clojure.lang.ITransientVector v] (defn transient-vec-count [^clojure.lang.ITransientVector v]
(.count v)) (.count v))
#+cljs :cljs
(defn transient-vec-count [v] (defn transient-vec-count [v]
(count v)) (count v))
)
(extend-protocol UpdateExtremes (extend-protocol UpdateExtremes
#+clj clojure.lang.PersistentVector #+cljs cljs.core/PersistentVector #?(:clj clojure.lang.PersistentVector :cljs cljs.core/PersistentVector)
(update-first [v afn] (update-first [v afn]
(let [val (nth v 0)] (let [val (nth v 0)]
(assoc v 0 (afn val)) (assoc v 0 (afn val))
@ -411,7 +411,7 @@
(let [i (dec c)] (let [i (dec c)]
(assoc v i (afn (nth v i))) (assoc v i (afn (nth v i)))
)))) ))))
#+clj Object #+cljs default #?(:clj Object :cljs default)
(update-first [l val] (update-first [l val]
(update-first-list l val)) (update-first-list l val))
(update-last [l val] (update-last [l val]
@ -419,12 +419,12 @@
)) ))
(extend-protocol GetExtremes (extend-protocol GetExtremes
#+clj clojure.lang.IPersistentVector #+cljs cljs.core/PersistentVector #?(:clj clojure.lang.IPersistentVector :cljs cljs.core/PersistentVector)
(get-first [v] (get-first [v]
(nth v 0)) (nth v 0))
(get-last [v] (get-last [v]
(peek v)) (peek v))
#+clj Object #+cljs default #?(:clj Object :cljs default)
(get-first [s] (get-first [s]
(first s)) (first s))
(get-last [s] (get-last [s]
@ -436,13 +436,13 @@
nil nil
(fast-empty? [_] true) (fast-empty? [_] true)
#+clj clojure.lang.IPersistentVector #+cljs cljs.core/PersistentVector #?(:clj clojure.lang.IPersistentVector :cljs cljs.core/PersistentVector)
(fast-empty? [v] (fast-empty? [v]
(= 0 (vec-count v))) (= 0 (vec-count v)))
#+clj clojure.lang.ITransientVector #+cljs cljs.core/TransientVector #?(:clj clojure.lang.ITransientVector :cljs cljs.core/TransientVector)
(fast-empty? [v] (fast-empty? [v]
(= 0 (transient-vec-count v))) (= 0 (transient-vec-count v)))
#+clj Object #+cljs default #?(:clj Object :cljs default)
(fast-empty? [s] (fast-empty? [s]
(empty? s)) (empty? s))
) )

11
src/clj/com/rpl/specter/prot_opt_invoke.clj
View file

@ -1,11 +0,0 @@
(ns com.rpl.specter.prot-opt-invoke)
(defmacro mk-optimized-invocation [protocol obj method num-args]
(let [args (take num-args (repeatedly gensym))
o (-> (gensym) (with-meta {:tag 'not-native}))]
`(if (~'implements? ~protocol ~obj)
(fn [~o ~@args]
(~method ~o ~@args)
)
~method
)))

0
src/clj/com/rpl/specter/protocols.cljx → src/clj/com/rpl/specter/protocols.cljc
View file

14
src/clj/com/rpl/specter/transients.cljx → src/clj/com/rpl/specter/transients.cljc
View file

@ -1,13 +1,13 @@
(ns com.rpl.specter.transients (ns com.rpl.specter.transients
#+cljs #?(:cljs
(:require-macros [com.rpl.specter.macros (:require-macros [com.rpl.specter.macros
:refer :refer
[defnav [defnav
defpathedfn]]) defpathedfn]]))
(:use #+clj (:use #?(:clj
[com.rpl.specter.macros :only [com.rpl.specter.macros :only
[defnav [defnav
defpathedfn]]) defpathedfn]]))
(:require [com.rpl.specter.navs :as n] (:require [com.rpl.specter.navs :as n]
[com.rpl.specter :refer [subselect selected?]])) [com.rpl.specter :refer [subselect selected?]]))
@ -59,7 +59,8 @@
"Navigates to the last element of a transient vector." "Navigates to the last element of a transient vector."
(n/PosNavigator t-get-last t-update-last)) (n/PosNavigator t-get-last t-update-last))
#+clj #?(
:clj
(defn- select-keys-from-transient-map (defn- select-keys-from-transient-map
"Selects keys from transient map, because built-in select-keys uses "Selects keys from transient map, because built-in select-keys uses
`find` which is unsupported." `find` which is unsupported."
@ -76,11 +77,12 @@
result) result)
(rest m-keys)))))) (rest m-keys))))))
#+cljs :cljs
(defn- select-keys-from-transient-map (defn- select-keys-from-transient-map
"Uses select-keys on a transient map." "Uses select-keys on a transient map."
[m m-keys] [m m-keys]
(select-keys m m-keys)) (select-keys m m-keys))
)
(defnav (defnav
^{:doc "Navigates to the specified persistent submap of a transient map."} ^{:doc "Navigates to the specified persistent submap of a transient map."}

14
src/clj/com/rpl/specter/zipper.cljx → src/clj/com/rpl/specter/zipper.cljc
View file

@ -1,10 +1,10 @@
(ns com.rpl.specter.zipper (ns com.rpl.specter.zipper
#+cljs (:require-macros #?(:cljs (:require-macros
[com.rpl.specter.macros [com.rpl.specter.macros
:refer [defnav nav declarepath providepath]]) :refer [defnav nav declarepath providepath]]))
#+clj #?(:clj
(:use (:use
[com.rpl.specter.macros :only [defnav nav declarepath providepath]]) [com.rpl.specter.macros :only [defnav nav declarepath providepath]]))
(:require [com.rpl.specter :as s] (:require [com.rpl.specter :as s]
[clojure.zip :as zip])) [clojure.zip :as zip]))
@ -43,9 +43,9 @@
;; (multi-path RIGHT LEFT) will not navigate to the right and left ;; (multi-path RIGHT LEFT) will not navigate to the right and left
;; of the currently navigated element because locations aren't stable ;; of the currently navigated element because locations aren't stable
;; like they are for maps/graphs. The path following RIGHT could ;; like they are for maps/graphs. The path following RIGHT could
;; insert lots of elements all over the sequence, and there's no ;; insert lots of elements all over the sequence, and there's no
;; way to determine how to get "back". ;; way to determine how to get "back".
(def ^{:doc "Navigate to the element to the right. (def ^{:doc "Navigate to the element to the right.
If no element there, works like STOP."} If no element there, works like STOP."}
RIGHT (mk-zip-nav zip/right)) RIGHT (mk-zip-nav zip/right))
@ -103,7 +103,7 @@
)) ))
(defnav ^{:doc "Navigate to the subsequence containing only (defnav ^{:doc "Navigate to the subsequence containing only
the node currently pointed to. This works just the node currently pointed to. This works just
like srange and can be used to remove elements like srange and can be used to remove elements
from the structure"} from the structure"}
NODE-SEQ [] NODE-SEQ []

103
test/com/rpl/specter/core_test.cljx → test/com/rpl/specter/core_test.cljc
View file

@ -1,5 +1,5 @@
(ns com.rpl.specter.core-test (ns com.rpl.specter.core-test
#+cljs (:require-macros #?(:cljs (:require-macros
[cljs.test :refer [is deftest]] [cljs.test :refer [is deftest]]
[cljs.test.check.cljs-test :refer [defspec]] [cljs.test.check.cljs-test :refer [defspec]]
[com.rpl.specter.cljs-test-helpers :refer [for-all+]] [com.rpl.specter.cljs-test-helpers :refer [for-all+]]
@ -9,25 +9,25 @@
nav declarepath providepath select select-one select-one! nav declarepath providepath select select-one select-one!
select-first transform setval replace-in defnavconstructor select-first transform setval replace-in defnavconstructor
select-any selected-any? collected? traverse select-any selected-any? collected? traverse
multi-transform]]) multi-transform]]))
(:use (:use
#+clj [clojure.test :only [deftest is]] #?(:clj [clojure.test :only [deftest is]])
#+clj [clojure.test.check.clojure-test :only [defspec]] #?(:clj [clojure.test.check.clojure-test :only [defspec]])
#+clj [com.rpl.specter.test-helpers :only [for-all+ ic-test]] #?(:clj [com.rpl.specter.test-helpers :only [for-all+ ic-test]])
#+clj [com.rpl.specter.macros #?(:clj [com.rpl.specter.macros
:only [paramsfn defprotocolpath defnav extend-protocolpath :only [paramsfn defprotocolpath defnav extend-protocolpath
nav declarepath providepath select select-one select-one! nav declarepath providepath select select-one select-one!
select-first transform setval replace-in defnavconstructor select-first transform setval replace-in defnavconstructor
select-any selected-any? collected? traverse select-any selected-any? collected? traverse
multi-transform]] multi-transform]])
) )
(:require #+clj [clojure.test.check.generators :as gen] (:require #?(:clj [clojure.test.check.generators :as gen])
#+clj [clojure.test.check.properties :as prop] #?(:clj [clojure.test.check.properties :as prop])
#+cljs [cljs.test.check :as tc] #?(:cljs [cljs.test.check :as tc])
#+cljs [cljs.test.check.generators :as gen] #?(:cljs [cljs.test.check.generators :as gen])
#+cljs [cljs.test.check.properties :as prop :include-macros true] #?(:cljs [cljs.test.check.properties :as prop :include-macros true])
[com.rpl.specter :as s] [com.rpl.specter :as s]
[com.rpl.specter.transients :as t] [com.rpl.specter.transients :as t]
[clojure.set :as set])) [clojure.set :as set]))
@ -76,7 +76,7 @@
)) ))
(deftest select-one-test (deftest select-one-test
(is (thrown? #+clj Exception #+cljs js/Error (select-one [s/ALL even?] [1 2 3 4]))) (is (thrown? #?(:clj Exception :cljs js/Error) (select-one [s/ALL even?] [1 2 3 4])))
(is (= 1 (select-one [s/ALL odd?] [2 4 1 6]))) (is (= 1 (select-one [s/ALL odd?] [2 4 1 6])))
) )
@ -247,7 +247,7 @@
(deftest atom-test (deftest atom-test
(let [v (transform s/ATOM inc (atom 1))] (let [v (transform s/ATOM inc (atom 1))]
(is (instance? #+clj clojure.lang.Atom #+cljs cljs.core/Atom v)) (is (instance? #?(:clj clojure.lang.Atom :cljs cljs.core/Atom) v))
(is (= 2 (select-one s/ATOM v) @v)))) (is (= 2 (select-one s/ATOM v) @v))))
(defspec view-test (defspec view-test
@ -453,7 +453,7 @@
(deftest nil-select-one-test (deftest nil-select-one-test
(is (= nil (select-one! s/ALL [nil]))) (is (= nil (select-one! s/ALL [nil])))
(is (thrown? #+clj Exception #+cljs js/Error (select-one! s/ALL []))) (is (thrown? #?(:clj Exception :cljs js/Error) (select-one! s/ALL [])))
) )
@ -756,7 +756,7 @@
[:q [:abc 3] [:ccc [:abc] [:abc "a" [:abc [:abc [:d]]]]]] [:q [:abc 3] [:ccc [:abc] [:abc "a" [:abc [:abc [:d]]]]]]
)))) ))))
#+clj #?(:clj
(deftest large-params-test (deftest large-params-test
(let [path (apply s/comp-paths (repeat 25 s/keypath)) (let [path (apply s/comp-paths (repeat 25 s/keypath))
m (reduce m (reduce
@ -765,20 +765,20 @@
:a :a
(reverse (range 25)))] (reverse (range 25)))]
(is (= :a (select-one (apply path (range 25)) m))) (is (= :a (select-one (apply path (range 25)) m)))
)) )))
;;TODO: there's a bug in clojurescript that won't allow ;;TODO: there's a bug in clojurescript that won't allow
;; non function implementations of IFn to have more than 20 arguments ;; non function implementations of IFn to have more than 20 arguments
#+clj #?(:clj
(do (do
(defprotocolpath AccountPath []) (defprotocolpath AccountPath [])
(defrecord Account [funds]) (defrecord Account [funds])
(defrecord User [account]) (defrecord User [account])
(defrecord Family [accounts]) (defrecord Family [accounts])
(extend-protocolpath AccountPath User :account Family [:accounts s/ALL]) (extend-protocolpath AccountPath User :account Family [:accounts s/ALL])
) ))
#+clj #?(:clj
(deftest protocolpath-basic-test (deftest protocolpath-basic-test
(let [data [(->User (->Account 30)) (let [data [(->User (->Account 30))
(->User (->Account 50)) (->User (->Account 50))
@ -791,9 +791,9 @@
(transform [s/ALL AccountPath :funds] (transform [s/ALL AccountPath :funds]
inc inc
data))) data)))
)) )))
#+clj #?(:clj
(do (do
(defprotocolpath LabeledAccountPath [label]) (defprotocolpath LabeledAccountPath [label])
(defrecord LabeledUser [account]) (defrecord LabeledUser [account])
@ -801,9 +801,9 @@
(extend-protocolpath LabeledAccountPath (extend-protocolpath LabeledAccountPath
LabeledUser [:account s/keypath] LabeledUser [:account s/keypath]
LabeledFamily [:accounts s/keypath s/ALL]) LabeledFamily [:accounts s/keypath s/ALL])
) ))
#+clj #?(:clj
(deftest protocolpath-params-test (deftest protocolpath-params-test
(let [data [(->LabeledUser {:a (->Account 30)}) (let [data [(->LabeledUser {:a (->Account 30)})
(->LabeledUser {:a (->Account 50)}) (->LabeledUser {:a (->Account 50)})
@ -816,10 +816,10 @@
(transform [s/ALL (LabeledAccountPath :a) :funds] (transform [s/ALL (LabeledAccountPath :a) :funds]
inc inc
data))) data)))
)) )))
#+clj #?(:clj
(do (do
(defprotocolpath CustomWalker []) (defprotocolpath CustomWalker [])
(extend-protocolpath CustomWalker (extend-protocolpath CustomWalker
@ -827,32 +827,33 @@
clojure.lang.PersistentHashMap [(s/keypath :a) CustomWalker] clojure.lang.PersistentHashMap [(s/keypath :a) CustomWalker]
clojure.lang.PersistentArrayMap [(s/keypath :a) CustomWalker] clojure.lang.PersistentArrayMap [(s/keypath :a) CustomWalker]
clojure.lang.PersistentVector [s/ALL CustomWalker] clojure.lang.PersistentVector [s/ALL CustomWalker]
) )))
) #?(:clj
#+clj
(deftest mixed-rich-regular-protocolpath (deftest mixed-rich-regular-protocolpath
(is (= [1 2 3 11 21 22 25] (is (= [1 2 3 11 21 22 25]
(select [CustomWalker number?] [{:a [1 2 :c [3]]} [[[[[[11]]] 21 [22 :c 25]]]]]))) (select [CustomWalker number?] [{:a [1 2 :c [3]]} [[[[[[11]]] 21 [22 :c 25]]]]])))
(is (= [2 3 [[[4]] :b 0] {:a 4 :b 10}] (is (= [2 3 [[[4]] :b 0] {:a 4 :b 10}]
(transform [CustomWalker number?] inc [1 2 [[[3]] :b -1] {:a 3 :b 10}]))) (transform [CustomWalker number?] inc [1 2 [[[3]] :b -1] {:a 3 :b 10}])))
) ))
#+cljs
(defn make-queue [coll]
(reduce
#(conj %1 %2)
#queue []
coll))
#+clj #?(
:clj
(defn make-queue [coll] (defn make-queue [coll]
(reduce (reduce
#(conj %1 %2) #(conj %1 %2)
clojure.lang.PersistentQueue/EMPTY clojure.lang.PersistentQueue/EMPTY
coll)) coll))
:cljs
(defn make-queue [coll]
(reduce
#(conj %1 %2)
#queue []
coll))
)
(defspec transform-idempotency 50 (defspec transform-idempotency 50
(for-all+ (for-all+
[v1 (gen/vector gen/int) [v1 (gen/vector gen/int)
@ -964,26 +965,26 @@
) )
(s/must-cache-paths!) (s/must-cache-paths!)
(is (thrown? #+clj Exception #+cljs js/Error (is (thrown? #?(:clj Exception :cljs js/Error)
(select (if true :a :b) nil) (select (if true :a :b) nil)
)) ))
(is (thrown? #+clj Exception #+cljs js/Error (is (thrown? #?(:clj Exception :cljs js/Error)
(select (*APATH* :a) nil) (select (*APATH* :a) nil)
)) ))
(is (thrown? #+clj Exception #+cljs js/Error (is (thrown? #?(:clj Exception :cljs js/Error)
(select [:a (identity even?)] {:a 2}) (select [:a (identity even?)] {:a 2})
)) ))
;; this tests a bug that existed before ^:staticparam annotation ;; this tests a bug that existed before ^:staticparam annotation
;; for pathedfns ;; for pathedfns
(is (thrown? #+clj Exception #+cljs js/Error (is (thrown? #?(:clj Exception :cljs js/Error)
(select [(s/putval 10) (s/transformed s/STAY #(inc %))] 10) (select [(s/putval 10) (s/transformed s/STAY #(inc %))] 10)
)) ))
(let [p :a] (let [p :a]
(is (thrown? #+clj Exception #+cljs js/Error (is (thrown? #?(:clj Exception :cljs js/Error)
(select [p even?] {:a 2}) (select [p even?] {:a 2})
))) )))
(let [p :a] (let [p :a]
(is (thrown? #+clj Exception #+cljs js/Error (is (thrown? #?(:clj Exception :cljs js/Error)
(select [s/ALL (s/selected? p even?)] [{:a 2}]) (select [s/ALL (s/selected? p even?)] [{:a 2}])
))) )))
(s/must-cache-paths! false) (s/must-cache-paths! false)
@ -1036,13 +1037,13 @@
(is (= false (select-one! (s/nil->val true) false))) (is (= false (select-one! (s/nil->val true) false)))
) )
#+clj #?(:clj
(deftest all-map-entry (deftest all-map-entry
(let [e (transform s/ALL inc (first {1 3}))] (let [e (transform s/ALL inc (first {1 3}))]
(is (instance? clojure.lang.MapEntry e)) (is (instance? clojure.lang.MapEntry e))
(is (= 2 (key e))) (is (= 2 (key e)))
(is (= 4 (val e))) (is (= 4 (val e)))
)) )))
(deftest select-on-empty-vector (deftest select-on-empty-vector
(is (= s/NONE (select-any s/ALL []))) (is (= s/NONE (select-any s/ALL [])))
@ -1320,7 +1321,7 @@
)))) ))))
(deftest multi-transform-overrun-error (deftest multi-transform-overrun-error
(is (thrown? #+clj Exception #+cljs js/Error (multi-transform s/STAY 3))) (is (thrown? #?(:clj Exception :cljs js/Error) (multi-transform s/STAY 3)))
) )
(deftest terminal-val-test (deftest terminal-val-test

26
test/com/rpl/specter/zipper_test.cljx → test/com/rpl/specter/zipper_test.cljc
View file

@ -1,25 +1,25 @@
(ns com.rpl.specter.zipper-test (ns com.rpl.specter.zipper-test
#+cljs (:require-macros #?(:cljs (:require-macros
[cljs.test :refer [is deftest]] [cljs.test :refer [is deftest]]
[cljs.test.check.cljs-test :refer [defspec]] [cljs.test.check.cljs-test :refer [defspec]]
[com.rpl.specter.cljs-test-helpers :refer [for-all+]] [com.rpl.specter.cljs-test-helpers :refer [for-all+]]
[com.rpl.specter.macros [com.rpl.specter.macros
:refer [declarepath providepath select select-one select-one! :refer [declarepath providepath select select-one select-one!
select-first transform setval replace-in]] select-first transform setval replace-in]]
) ))
(:use (:use
#+clj [clojure.test :only [deftest is]] #?(:clj [clojure.test :only [deftest is]])
#+clj [clojure.test.check.clojure-test :only [defspec]] #?(:clj [clojure.test.check.clojure-test :only [defspec]])
#+clj [com.rpl.specter.test-helpers :only [for-all+]] #?(:clj [com.rpl.specter.test-helpers :only [for-all+]])
#+clj [com.rpl.specter.macros #?(:clj [com.rpl.specter.macros
:only [declarepath providepath select select-one select-one! :only [declarepath providepath select select-one select-one!
select-first transform setval replace-in]] select-first transform setval replace-in]])
) )
(:require #+clj [clojure.test.check.generators :as gen] (:require #?(:clj [clojure.test.check.generators :as gen])
#+clj [clojure.test.check.properties :as prop] #?(:clj [clojure.test.check.properties :as prop])
#+cljs [cljs.test.check :as tc] #?(:cljs [cljs.test.check :as tc])
#+cljs [cljs.test.check.generators :as gen] #?(:cljs [cljs.test.check.generators :as gen])
#+cljs [cljs.test.check.properties :as prop :include-macros true] #?(:cljs [cljs.test.check.properties :as prop :include-macros true])
[com.rpl.specter :as s] [com.rpl.specter :as s]
[com.rpl.specter.zipper :as z])) [com.rpl.specter.zipper :as z]))