Compare commits
2 commits
master
...
lean-execu
| Author | SHA1 | Date | |
|---|---|---|---|
|
bde18388d7 | ||
|
|
3f26eb1826 |
33 changed files with 862 additions and 6690 deletions
37
.github/workflows/ci.yml
vendored
37
.github/workflows/ci.yml
vendored
|
|
@ -1,37 +0,0 @@
|
|||
name: CI
|
||||
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
fetch_depth: 0
|
||||
|
||||
- name: Setup Babashka
|
||||
uses: turtlequeue/setup-babashka@v1.3.0
|
||||
with:
|
||||
babashka-version: 0.7.8
|
||||
|
||||
- name: Prepare java
|
||||
uses: actions/setup-java@v2
|
||||
with:
|
||||
distribution: 'zulu'
|
||||
java-version: '8'
|
||||
|
||||
- name: Install clojure tools
|
||||
uses: DeLaGuardo/setup-clojure@4.0
|
||||
with:
|
||||
lein: 2.9.1
|
||||
|
||||
- name: Run clj tests
|
||||
run: bb test:clj
|
||||
|
||||
- name: Run cljs tests
|
||||
run: bb test:cljs
|
||||
|
||||
- name: Run babashka tests
|
||||
run: bb test:bb
|
||||
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -9,7 +9,3 @@ pom.xml.asc
|
|||
.lein-repl-history
|
||||
.lein-plugins/
|
||||
.lein-failures
|
||||
.cljs_node_repl
|
||||
out/
|
||||
.cpcache
|
||||
.cache
|
||||
|
|
|
|||
312
CHANGES.md
312
CHANGES.md
|
|
@ -1,312 +0,0 @@
|
|||
## 1.1.4
|
||||
|
||||
* Add arglist metadata to navs (thanks @phronmophobic)
|
||||
* Improve before-index performance by 150x on lists and 5x on vectors (thanks @jeff303)
|
||||
* Bug fix: BEFORE-ELEM, AFTER-ELEM, FIRST, LAST, BEGINNING, and END on subvecs now produce vector type in cljs
|
||||
* Add compatibility with [babashka](https://babashka.org/)
|
||||
|
||||
## 1.1.3 - 2019-10-13
|
||||
|
||||
* Better AOT behavior: path functions for inline caching and protpath extensions no longer write eval'd class files. You can force path functions to not override `*compile-files*` by binding `com.rpl.specter.impl/*path-compile-files*` to `true`.
|
||||
* Bug fix: fix throw-illegal in cljs
|
||||
|
||||
## 1.1.2 - 2018-11-01
|
||||
|
||||
* Eliminate reflection warning
|
||||
* Bug fix: Fix inline compiler symbol handling so class references can be used as constants within paths
|
||||
* Bug fix: Fix handling of subvector paths in cljs
|
||||
|
||||
## 1.1.1 - 2018-04-23
|
||||
|
||||
* ClojureScript 1.10 introduced a change causing the `walker` navigator to fail to walk records. `ALL` has been updated to operate over `MapEntry` in ClojureScript, fixing the issue.
|
||||
* Change ns form to comply with cljs.core.specs.alpha (thanks @gnl)
|
||||
* Remove usage of pprint in cljs so advanced optimization doesn't include it
|
||||
|
||||
## 1.1.0 - 2018-01-02
|
||||
|
||||
* Add `vtransform` variant of `transform` that takes in collected values as a vector in the first argument rather than spliced into argument list.
|
||||
* Add `vterminal` that takes in collected vals as vector in first argument rather than spliced into argument list.
|
||||
* Add `compact` navigator. After each step of navigation of its subpath, `compact` removes the collection if it's empty.
|
||||
* Change `terminal` to be a no-op on select codepath
|
||||
* Bug fix: `subselect`/`filterer` removes first matched element instead of setting to nil when transformed to empty sequence
|
||||
|
||||
## 1.0.5 - 2017-11-16
|
||||
|
||||
* Add `regex-nav` navigator for regexes, which navigates to every match in a string and supports replacement with a new substring (thanks @mwfogleman)
|
||||
* Regexes implicitly convert to `regex-nav` in paths
|
||||
* Strings, numbers, booleans, characters, and symbols implicitly convert to `keypath` in paths
|
||||
|
||||
## 1.0.4 - 2017-10-17
|
||||
|
||||
* Add `indexed-vals` navigator, a variant of `INDEXED-VALS` that allows for a customized start index.
|
||||
* Bug fix: Fix `INDEXED-VALS` invalidly overwriting elements in some transforms involving multiple index changes
|
||||
|
||||
## 1.0.3 - 2017-08-14
|
||||
|
||||
* Added `before-index` navigator for inserting a single element into a sequence.
|
||||
* Added `index-nav` navigator for moving an element in a sequence to a new index, shifting other elements in the process.
|
||||
* Added `INDEXED-VALS` navigator for navigating to every element of a sequence as [index elem] pair. Transform on index portion works the same as `index-nav`.
|
||||
* Workaround for ClojureScript regression that causes warnings for record fields named "var" or other reserved names
|
||||
|
||||
## 1.0.2 - 2017-06-12
|
||||
|
||||
* Added `pred=`, `pred<`, `pred>`, `pred<=`, `pred>=` for filtering using common comparisons
|
||||
* Add `map-key` navigator
|
||||
* Add `set-elem` navigator
|
||||
* Add `ALL-WITH-META` navigator
|
||||
* `walker` and `codewalker` can now be used with `NONE` to remove elements
|
||||
* Improve `walker` performance by 70% by replacing clojure.walk implementation with custom recursive path
|
||||
* Extend `ALL` to work on records (navigate to key/value pairs)
|
||||
* Add ability to declare a function for end index of `srange-dynamic` that takes in the result of the start index fn. Use `end-fn` macro to declare this function (takes in 2 args of [collection, start-index]). Functions defined with normal mechanisms (e.g. `fn`) will still only take in the collection as an argument.
|
||||
* Workaround for ClojureScript bug that emits warnings for vars named the same as a private var in cljs.core (in this case `NONE`, added as private var to cljs.core with 1.9.562)
|
||||
* For ALL transforms on maps, interpret transformed key/value pair of size < 2 as removal
|
||||
* Bug fix: Fix incorrect inline compilation when a dynamic function invocation is nested in a data structure within a parameter to a navigator builder
|
||||
|
||||
## 1.0.1 - 2017-04-17
|
||||
|
||||
* `subselect`/`filterer` can remove entries in source by transforming to a smaller sequence
|
||||
* Add `satisfies-protpath?`
|
||||
* Inline cache vars are marked private so as not to interfere with tooling
|
||||
* Improve performance of `ALL` transform on lists by 20%
|
||||
* Bug fix: Using `pred` no longer inserts unnecessary `coerce-nav` call at callsite
|
||||
* Bug fix: Dynamic navs in argument position to another nav now properly expanded and compiled
|
||||
* Bug fix: Dynamic parameters nested inside data structures as arguments are now compiled correctly by inline compiler
|
||||
|
||||
## 1.0.0 - 2017-03-01
|
||||
|
||||
* Transform to `com.rpl.specter/NONE` to remove elements from data structures. Works with `keypath` (for both sequences and maps), `must`, `nthpath`, `ALL`, `MAP-VALS`, `FIRST`, and `LAST`
|
||||
* Add `nthpath` navigator
|
||||
* Add `with-fresh-collected` higher order navigator
|
||||
* Added `traverse-all` which returns a transducer that traverses over all elements matching the given path.
|
||||
* `select-first` and `select-any` now avoid traversal beyond the first value matched by the path (like when using `ALL`), so they are faster now for those use cases.
|
||||
* Add `MAP-KEYS` navigator that's more efficient than `[ALL FIRST]`
|
||||
* Add `NAME` and `NAMESPACE` navigators
|
||||
* Extend `srange`, `BEGINNING`, `END` to work on strings. Navigates to a substring.
|
||||
* Extend `FIRST` and `LAST` to work on strings. Navigates to a character.
|
||||
* Add `BEFORE-ELEM` and `AFTER-ELEM` for prepending or appending a single element to a sequence
|
||||
* Add `NONE-ELEM` to efficiently add a single element to a set
|
||||
* Improved `ALL` performance for PersistentHashSet
|
||||
* Dynamic navs automatically compile sequence returns if completely static
|
||||
* Eliminate reflection warnings for clj (thanks @mpenet)
|
||||
* Bug fix: Collected vals now properly passed to subpaths for `if-path`, `selected?`, and `not-selected?`
|
||||
* Bug fix: `LAST`, `FIRST`, `BEGINNING`, and `END` properly transform subvector types to a vector type
|
||||
|
||||
## 0.13.2 - 2016-12-21
|
||||
|
||||
* Bug fix: Fix race condition relating to retrieving path from cache and AOT compilation
|
||||
* Bug fix: LAST no longer converts lists to vectors
|
||||
* Bug fix: Workaround issue with aot + uberjar
|
||||
|
||||
## 0.13.1 - 2016-11-07
|
||||
|
||||
* Remove any? in com.rpl.specter.impl to avoid conflict with Clojure 1.9
|
||||
* Enhanced dynamic navigators to continue expanding if any other dynamic navs are returned
|
||||
* Added `eachnav` to turn any 1-argument navigator into a navigator that accepts any number of arguments, navigating by each argument in order
|
||||
* `keypath` and `must` enhanced to take in multiple arguments for concisely specifying multiple steps
|
||||
* Added `traversed`
|
||||
* Bug fix: Fix regression from 0.13.0 where [ALL FIRST] on a PersistentArrayMap that created duplicate keys would create an invalid PersistentArrayMap
|
||||
* Bug fix: Fix problems with multi-path and if-path in latest versions of ClojureScript
|
||||
* Bug fix: Inline compiler no longer flattens and changes the type of sequential params
|
||||
|
||||
## 0.13.0 - 2016-09-06
|
||||
|
||||
* BREAKING CHANGE: `com.rpl.specter.macros` namespace removed and all macros moved into core `com.rpl.specter` namespace
|
||||
* BREAKING CHANGE: Core protocol `Navigator` changed to `RichNavigator` and functions now have an extra argument.
|
||||
* BREAKING CHANGE: All navigators must be defined with `defnav` and its variations from `com.rpl.specter`. The core protocols may no longer be extended. Existing types can be turned into navigators with the new `IndirectNav` protocol.
|
||||
* BREAKING CHANGE: Removed `fixed-pathed-nav` and `variable-pathed-nav` and replaced with much more generic `late-bound-nav`. `late-bound-nav` can have normal values be late-bound parameterized (not just paths). Use `late-path` function to indicate which parameters are paths. If all bindings given to `late-bound-nav` are static, the navigator will be resolved and cached immediately. See `transformed` and `selected?` for examples.
|
||||
* BREAKING CHANGE: Paths can no longer be compiled without their parameters. Instead, use the `path` macro to handle the parameterization.
|
||||
* BREAKING CHANGE: Parameterized protocol paths now work differently since paths cannot be specified without their parameters. Instead, use the parameter names from the declaration in the extension to specify where the parameters should go. For example:
|
||||
```clojure
|
||||
(defprotocolpath MyProtPath [a])
|
||||
(extend-protocolpath MyProtPath
|
||||
clojure.lang.PersistentArrayMap
|
||||
(must a))
|
||||
```
|
||||
* BREAKING CHANGE: Removed `defpathedfn` and replaced with much more generic `defdynamicnav`. `defdynamicnav` works similar to a macro and takes as input the parameters seen during inline caching. Use `dynamic-param?` to distinguish which parameters are statically specified and which are dynamic. `defdynamicnav` is typically used in conjunction with `late-bound-nav` – see implementation of `selected?` for an example.
|
||||
* Inline caching now works with locals, dynamic vars, and special forms used in the nav position. When resolved at runtime, those values will be coerced to a navigator if a vector or implicit nav (e.g. keyword). Can hint with ^:direct-nav metadata to remove this coercion if know for sure those values will be implementations of `RichNavigator` interface.
|
||||
* Redesigned internals so navigators use interface dispatch rather than storing transform/selection functions as separate fields.
|
||||
* Added `local-declarepath` to assist in making local recursive or mutually recursive paths. Use with `providepath`.
|
||||
* Added `recursive-path` to assist in making recursive paths, both parameterized and unparameterized. Example:
|
||||
```clojure
|
||||
(let [tree-walker (recursive-path [] p (if-path vector? [ALL p] STAY))]
|
||||
(select tree-walker [1 [2 [3 4] 5] [[6]]]))
|
||||
```
|
||||
* Significantly improved performance of paths that use dynamic parameters.
|
||||
* Inline factoring now parameterizes navigators immediately when all parameters are constants (rather than factoring it to use late-bound parameterization). This creates leaner, faster code.
|
||||
* Added `IndirectNav` protocol for turning a value type into a navigator.
|
||||
* Removed `must-cache-paths!`. No longer relevant since all paths can now be compiled and cached.
|
||||
* Added `with-inline-debug` macro that prints information about the code being analyzed and produced by the inline compiler / cacher.
|
||||
* Switched codebase from cljx to cljc
|
||||
* Improved performance of ALL and MAP-VALS on PersistentArrayMap by about 2x
|
||||
* `defnav` now generates helper functions for every method. For example, `keypath` now has helpers `keypath-select*` and `keypath-transform*`. These functions take parameters `[key structure next-fn]`
|
||||
* Bug fix: ALL and MAP-VALS transforms on PersistentArrayMap above the threshold now output PersistentArrayMap instead of PersistentHashMap
|
||||
|
||||
|
||||
## 0.12.0 - 2016-08-05
|
||||
|
||||
* BREAKING CHANGE: Changed semantics of `Navigator` protocol `select*` in order to enable very large performance improvements to `select`, `select-one`, `select-first`, and `select-one!`. Custom navigators will need to be updated to conform to the new required semantics. Codebases that do not use custom navigators do not require any changes. See the docstring on the protocol for the details.
|
||||
* Added `select-any` operation which selects a single element navigated to by the path. Which element returned is undefined. If no elements are navigated to, returns `com.rpl.specter/NONE`. This is the fastest selection operation.
|
||||
* Added `selected-any?` operation that returns true if any element is navigated to.
|
||||
* Added `traverse` operation which returns a reducible object of all the elements navigated to by the path. Very efficient.
|
||||
* Added `multi-transform` operation which can be used to perform multiple transformations in a single traversal. Much more efficient than doing the
|
||||
transformations with `transform` one after another when the transformations share a lot of navigation. `multi-transform` is used in conjunction with `terminal` and `terminal-val` – see the docstring for details.
|
||||
* Huge performance improvements to `select`, `select-one`, `select-first`, and `select-one!`
|
||||
* Huge performance improvement to `multi-path`
|
||||
* Added META navigator (thanks @aengelberg)
|
||||
* Added DISPENSE navigator to drop all collected values for subsequent navigation
|
||||
* Added `collected?` macro to create a filter function which operates on the collected values.
|
||||
* Error now thrown if a pathedfn (like filterer) is used without being parameterized
|
||||
* Performance improvement for ALL and MAP-VALS on small maps for Clojure by leveraging IMapIterable interface
|
||||
* Added low-level `richnav` macro for creating navigators with full flexibility
|
||||
* Bug fix: multi-path and if-path now work properly with value collection
|
||||
* Bug fix: END, BEGINNING, FIRST, LAST, and MAP-VALS now work properly on nil
|
||||
* Bug fix: ALL and MAP-VALS now maintain the comparator of sorted maps
|
||||
* Bug fix: Using value collection along with `setval` no longer throws exception
|
||||
* Bug fix: Fix error when trying to use Specter along with AOT compilation
|
||||
|
||||
## 0.11.2 - 2016-06-09
|
||||
|
||||
* Renamed com.rpl.specter.transient namespace to com.rpl.specter.transients to eliminate ClojureScript compiler warning about reserved keyword
|
||||
* Eliminated compiler warnings for ClojureScript version
|
||||
|
||||
## 0.11.1 - 2016-06-08
|
||||
|
||||
* More efficient inline caching for Clojure version, benchmarks show inline caching within 5% of manually precompiled code for all cases
|
||||
* Added navigators for transients in com.rpl.specter.transient namespace (thanks @aengelberg)
|
||||
* Huge performance improvement for ALL transform on maps and vectors
|
||||
* Significant performance improvements for FIRST/LAST for vectors
|
||||
* Huge performance improvements for `if-path`, `cond-path`, `selected?`, and `not-selected?`, especially for condition path containing only static functions
|
||||
* Huge performance improvement for `END` on vectors
|
||||
* Added specialized MAP-VALS navigator that is twice as fast as using [ALL LAST]
|
||||
* Dropped support for Clojurescript below v1.7.10
|
||||
* Added :notpath metadata to signify pathedfn arguments that should be treated as regular arguments during inline factoring. If one of these arguments is not a static var reference or non-collection value, the path will not factor.
|
||||
* Bug fix: `transformed` transform-fn no longer factors into `pred` when an anonymous function during inline factoring
|
||||
* Bug fix: Fixed nil->val to not replace the val on `false`
|
||||
* Bug fix: Eliminate reflection when using primitive parameters in an inline cached path
|
||||
|
||||
## 0.11.0 - 2016-05-31
|
||||
|
||||
* New `path` macro does intelligent inline caching of the provided path. The path is factored into a static portion and into params which may change on each usage of the path (e.g. local parameters). The static part is factored and compiled on the first run-through, and then re-used for all subsequent invocations. As an example, `[ALL (keypath k)]` is factored into `[ALL keypath]`, which is compiled and cached, and `[k]`, which is provided on each execution. If it is not possible to precompile the path (e.g. [ALL some-local-variable]), nothing is cached and the path will be compiled on each run-through.
|
||||
* BREAKING CHANGE: all `select/transform/setval/replace-in` functions changed to macros and moved to com.rpl.specter.macros namespace. The new macros now automatically wrap the provided path in `path` to enable inline caching. Expect up to a 100x performance improvement without using explicit precompilation, and to be within 2% to 15% of the performance of explicitly precompiled usage.
|
||||
* Added `select*/transform*/setval*/replace-in*/etc.` functions that have the same functionality as the old `select/transform/setval/replace-in` functions.
|
||||
* Added `must-cache-paths!` function to throw an error if it is not possible to factor a path into a static portion and dynamic parameters.
|
||||
* BREAKING CHANGE: `defpath` renamed to `defnav`
|
||||
* BREAKING CHANGE: `path` renamed to `nav`
|
||||
* BREAKING CHANGE: `fixed-pathed-path` and `variable-pathed-path` renamed to `fixed-pathed-nav` and `variabled-pathed-nav`
|
||||
* Added `must` navigator to navigate to a key if and only if it exists in the structure
|
||||
* Added `continuous-subseqs` navigator
|
||||
* Added `ATOM` navigator (thanks @rakeshp)
|
||||
* Added "navigator constructors" that can be defined via `defnavconstructor`. These allow defining a flexible function to parameterize a defnav, and the function integrates with inline caching for high performance.
|
||||
|
||||
|
||||
## 0.10.0 - 2016-04-26
|
||||
|
||||
* Make codebase bootstrap cljs compatible
|
||||
* Remove usage of reducers in cljs version in favor of transducers (thanks @StephenRudolph)
|
||||
* ALL now maintains type of queues (thanks @StephenRudolph)
|
||||
* Added `parser` path (thanks @thomasathorne)
|
||||
* Added `submap` path (thanks @bfabry)
|
||||
* Added `subselect` path (thanks @aengelberg)
|
||||
* Fix filterer to maintain the type of the input sequence in transforms
|
||||
* Integrated zipper navigation into com.rpl.specter.zipper namespace
|
||||
|
||||
## 0.9.3 - 2016-04-15
|
||||
|
||||
* Change clojure/clojurescript to provided dependencies
|
||||
* ALL on maps auto-coerces MapEntry to vector, enabling smoother transformation of map keys
|
||||
* declarepath can now be parameterized
|
||||
* Added params-reset which calls its path with the params index walked back by the number of params needed by its path. This enables recursive parameterized paths
|
||||
* Added convenience syntax for defprotocolpath with no params, e.g. (defprotocolpath foo)
|
||||
* Rename VOID to STOP
|
||||
|
||||
## 0.9.2 - 2016-01-26
|
||||
|
||||
* Added VOID selector which navigates nowhere
|
||||
* Better syntax checking for defpath
|
||||
* Fixed bug in protocol paths (#48)
|
||||
* Protocol paths now error when extension has invalid number of needed parameters
|
||||
* Fix replace-in to work with value collection
|
||||
* Added STAY selector
|
||||
* Added stay-then-continue and continue-then-stay selectors which enable pre-order/post-order traversals
|
||||
* Added declarepath and providepath, which enable arbitrary recursive or mutually recursive paths
|
||||
* Renamed paramspath to path
|
||||
|
||||
## 0.9.1 - 2016-01-05
|
||||
|
||||
* Fixed reflection in protocol path code
|
||||
* Optimized late-bound parameterization for JVM implementation by directly creating the object array rather than use object-array
|
||||
* Incorrectly specified function names in defpath will now throw error
|
||||
|
||||
## 0.9.0 - 2015-12-12
|
||||
|
||||
* Fixed bug where comp-paths wouldn't work on lazy seqs in cljs
|
||||
* Renamed defparamspath and defparamscollector to defpath and defcollector
|
||||
* For Clojure version only, implemented protocol paths (see #38)
|
||||
|
||||
## 0.8.0 - 2015-10-10
|
||||
|
||||
* Now compatible with Clojure 1.6.0 and 1.5.1 by switching build to cljx (thanks @MerelyAPseudonym)
|
||||
* Added subset selector (like srange but for sets)
|
||||
* Added nil->val, NIL->SET, NIL->LIST, and NIL->VECTOR selectors to make it easier to manipulate maps (e.g. (setval [:akey NIL->VECTOR END] [:a :b] amap) to append that vector into that value for the map, even if nothing was at that value at the start)
|
||||
|
||||
## 0.7.1 - 2015-09-24
|
||||
|
||||
* view can now be late-bound parameterized
|
||||
* Added a late-bound parameterized version of using a function as a selector called "pred"
|
||||
* Added paramsfn helper macro for defining filter functions that take late-bound parameters
|
||||
* walker and codewalker can now be late-bound parameterized
|
||||
|
||||
## 0.7.0 - 2015-09-11
|
||||
|
||||
* Added late-bound parameterization feature: allows selectors that require params to be precompiled without the parameters, and the parameters are supplied later in bulk. This effectively enables Specter to be used in any situation with very high performance.
|
||||
* Converted Specter built-in selectors to use late-bound parameterization when appropriate
|
||||
* ALL, FIRST, and LAST are now precompiled
|
||||
|
||||
## 0.6.2 - 2015-07-03
|
||||
|
||||
* Added not-selected? selector
|
||||
* Added transformed selector
|
||||
* Sped up CLJS implementation for comp-paths by replacing obj-extends? call with satisfies?
|
||||
* Fixed CLJS implementation to extend core types appropriately
|
||||
* Used not-native hint to enable direct method invocation to speed up CLJS implementation
|
||||
|
||||
|
||||
## 0.6.1 - 2015-07-01
|
||||
|
||||
* Huge speedup to ClojureScript implementation by optimizing field access
|
||||
|
||||
## 0.6.0 - 2015-07-01
|
||||
|
||||
* Added ClojureScript compatibility
|
||||
|
||||
## 0.5.7 - 2015-06-30
|
||||
|
||||
* Fix bug in select-one! which wouldn't allow nil result
|
||||
|
||||
## 0.5.6 - 2015-06-29
|
||||
|
||||
* Add multi-path implementation
|
||||
* change FIRST/LAST to select nothing on an empty sequence
|
||||
* Allow sets to be used directly as selectors (acts as filter)
|
||||
|
||||
## 0.5.5 - 2015-06-22
|
||||
|
||||
* Change filterer to accept a selector (that acts like selected? to determine whether or not to select value)
|
||||
|
||||
## 0.5.4 - 2015-06-19
|
||||
|
||||
* Change cond-path and if-path to take in a selector for conditionals (same idea as selected?)
|
||||
|
||||
## 0.5.3 - 2015-06-18
|
||||
|
||||
* Added cond-path and if-path selectors for choosing paths depending on value of structure at that location
|
||||
|
||||
## 0.5.2 - 2015-06-01
|
||||
|
||||
* Fix error for selectors with one element defined using comp-paths, e.g. [:a (comp-paths :b)]
|
||||
|
||||
## 0.5.1 - 2015-05-31
|
||||
|
||||
* Added putval for adding external values to collected values list
|
||||
* nil is now interpreted as identity selector
|
||||
* empty selector is now interpreted as identity selector instead of producing error
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
# Contributing
|
||||
|
||||
We welcome external contributions to this project. For ideas for new functionality, we recommend first opening an issue so we can discuss whether it makes sense for the project.
|
||||
|
||||
## Contribution process
|
||||
|
||||
1. Open a pull request. If possible, please include thorough tests of the new code.
|
||||
2. If you have not already signed a contributor agreement, we will request that you sign one. We use Adobe Sign for this so it's very quick and easy. Note that we cannot look at your pull request until a contributor agreement is signed.
|
||||
3. We will then review your pull request and possibly ask for changes.
|
||||
25
DEVELOPER.md
25
DEVELOPER.md
|
|
@ -1,25 +0,0 @@
|
|||
# Running Clojure tests
|
||||
|
||||
```
|
||||
lein do clean, test
|
||||
```
|
||||
|
||||
# Running ClojureScript tests
|
||||
|
||||
```
|
||||
lein javac
|
||||
lein doo node test-build once
|
||||
```
|
||||
|
||||
# Running benchmarks
|
||||
## All benchmarks
|
||||
```
|
||||
scripts/run-benchmarks
|
||||
```
|
||||
## Individual benchmark(s)
|
||||
Specify the benchmark names as command line args. They will likely each need quoted because they contain spaces.
|
||||
Order is ignored.
|
||||
```
|
||||
scripts/run-benchmarks "prepend to a vector" "filter a sequence"
|
||||
```
|
||||
|
||||
351
README.md
351
README.md
|
|
@ -1,76 +1,9 @@
|
|||
# Specter
|
||||
Deep introspection and transformation of nested data
|
||||
|
||||
Specter rejects Clojure's restrictive approach to immutable data structure manipulation, instead exposing an elegant API to allow any sort of manipulation imaginable. Specter especially excels at querying and transforming nested and recursive data, important use cases that are very complex to handle with vanilla Clojure.
|
||||
|
||||
Specter has an extremely simple core, just a single abstraction called "navigator". Queries and transforms are done by composing navigators into a "path" precisely targeting what you want to retrieve or change. Navigators can be composed with any other navigators, allowing sophisticated manipulations to be expressed very concisely.
|
||||
|
||||
In addition, Specter has performance rivaling hand-optimized code (see [this benchmark](https://gist.github.com/nathanmarz/b7c612b417647db80b9eaab618ff8d83)). Clojure's only comparable built-in operations are `get-in` and `update-in`, and the Specter equivalents are 30% and 85% faster respectively (while being just as concise). Under the hood, Specter uses [advanced dynamic techniques](https://github.com/redplanetlabs/specter/wiki/Specter's-inline-caching-implementation) to strip away the overhead of composition.
|
||||
|
||||
There are some key differences between the Clojure approach to data manipulation and the Specter approach. Unlike Clojure, Specter always uses the most efficient method possible to implement an operation for a datatype (e.g. `last` vs. `LAST`). Clojure intentionally leaves out many operations, such as prepending to a vector or inserting into the middle of a sequence. Specter has navigators that cover these use cases (`BEFORE-ELEM` and `before-index`) and many more. Finally, Specter transforms always target precise parts of a data structure, leaving everything else the same. For instance, `ALL` targets every value within a sequence, and the resulting transform is always the same type as the input (e.g. a vector stays a vector, a sorted map stays a sorted map).
|
||||
|
||||
Consider these examples:
|
||||
|
||||
**Example 1: Increment every even number nested within map of vector of maps**
|
||||
|
||||
```clojure
|
||||
(def data {:a [{:aa 1 :bb 2}
|
||||
{:cc 3}]
|
||||
:b [{:dd 4}]})
|
||||
|
||||
;; Manual Clojure
|
||||
(defn map-vals [m afn]
|
||||
(->> m (map (fn [[k v]] [k (afn v)])) (into (empty m))))
|
||||
|
||||
(map-vals data
|
||||
(fn [v]
|
||||
(mapv
|
||||
(fn [m]
|
||||
(map-vals
|
||||
m
|
||||
(fn [v] (if (even? v) (inc v) v))))
|
||||
v)))
|
||||
|
||||
;; Specter
|
||||
(transform [MAP-VALS ALL MAP-VALS even?] inc data)
|
||||
```
|
||||
|
||||
**Example 2: Append a sequence of elements to a nested vector**
|
||||
|
||||
```clojure
|
||||
(def data {:a [1 2 3]})
|
||||
|
||||
;; Manual Clojure
|
||||
(update data :a (fn [v] (into (if v v []) [4 5])))
|
||||
|
||||
;; Specter
|
||||
(setval [:a END] [4 5] data)
|
||||
```
|
||||
|
||||
**Example 3: Increment the last odd number in a sequence**
|
||||
|
||||
```clojure
|
||||
(def data [1 2 3 4 5 6 7 8])
|
||||
|
||||
;; Manual Clojure
|
||||
(let [idx (reduce-kv (fn [res i v] (if (odd? v) i res)) nil data)]
|
||||
(if idx (update data idx inc) data))
|
||||
|
||||
;; Specter
|
||||
(transform [(filterer odd?) LAST] inc data)
|
||||
```
|
||||
|
||||
**Example 4: Map a function over a sequence without changing the type or order of the sequence**
|
||||
|
||||
```clojure
|
||||
;; Manual Clojure
|
||||
(map inc data) ;; doesn't work, becomes a lazy sequence
|
||||
(into (empty data) (map inc data)) ;; doesn't work, reverses the order of lists
|
||||
|
||||
;; Specter
|
||||
(transform ALL inc data) ;; works for all Clojure datatypes with near-optimal efficiency
|
||||
```
|
||||
|
||||
# About
|
||||
|
||||
Specter is a library for concisely querying and updating nested data structures. One way to think of it is "get-in" and "assoc-in" on steroids, though Specter works on any data structure, not just maps. It is similar to the concept of a "lens" in functional programming, though it has some important extensions.
|
||||
|
||||
# Latest Version
|
||||
|
||||
|
|
@ -78,111 +11,70 @@ The latest release version of Specter is hosted on [Clojars](https://clojars.org
|
|||
|
||||
[](https://clojars.org/com.rpl/specter)
|
||||
|
||||
# Learn Specter
|
||||
# How to use
|
||||
|
||||
- Introductory blog post: [Clojure's missing piece](http://nathanmarz.com/blog/clojures-missing-piece.html)
|
||||
- Presentation about Specter: [Specter: Powerful and Simple Data Structure Manipulation](https://www.youtube.com/watch?v=VTCy_DkAJGk)
|
||||
- Note that this presentation was given before Specter's inline compilation/caching system was developed. You no longer need to do anything special to get near-optimal performance.
|
||||
- Screencast on Specter: [Understanding Specter](https://www.youtube.com/watch?v=rh5J4vacG98)
|
||||
- List of navigators with examples: [This wiki page](https://github.com/redplanetlabs/specter/wiki/List-of-Navigators) provides a more comprehensive overview than the API docs about the behavior of specific navigators and includes many examples.
|
||||
- Core operations and defining new navigators: [This wiki page](https://github.com/redplanetlabs/specter/wiki/List-of-Macros) provides a more comprehensive overview than the API docs of the core select/transform/etc. operations and the operations for defining new navigators.
|
||||
- [This wiki page](https://github.com/redplanetlabs/specter/wiki/Using-Specter-Recursively) explains how to do precise and efficient recursive navigation with Specter.
|
||||
- [This wiki page](https://github.com/redplanetlabs/specter/wiki/Using-Specter-With-Zippers) provides a comprehensive overview of how to use Specter's zipper navigators. Zippers are a much slower navigation method but can perform certain tasks that are not possible with Specter's regular navigators. Note that zippers are rarely needed.
|
||||
- [Cheat Sheet](https://github.com/redplanetlabs/specter/wiki/Cheat-Sheet)
|
||||
- [API docs](http://redplanetlabs.github.io/specter/)
|
||||
- Performance guide: [This post](https://github.com/redplanetlabs/specter/wiki/Specter's-inline-caching-implementation) provides an overview of how Specter achieves its performance.
|
||||
|
||||
Specter's API is contained in these files:
|
||||
|
||||
- [specter.cljc](https://github.com/redplanetlabs/specter/blob/master/src/clj/com/rpl/specter.cljc): This contains the built-in navigators and the definition of the core operations.
|
||||
- [transients.cljc](https://github.com/redplanetlabs/specter/blob/master/src/clj/com/rpl/specter/transients.cljc): This contains navigators for transient collections.
|
||||
- [zipper.cljc](https://github.com/redplanetlabs/specter/blob/master/src/clj/com/rpl/specter/zipper.cljc): This integrates zipper-based navigation into Specter.
|
||||
|
||||
# Questions?
|
||||
|
||||
You can ask questions about Specter by [opening an issue](https://github.com/redplanetlabs/specter/issues?utf8=%E2%9C%93&q=is%3Aissue+label%3Aquestion+) on Github.
|
||||
|
||||
You can also find help in the #specter channel on [Clojurians](http://clojurians.net/).
|
||||
|
||||
# Examples
|
||||
|
||||
Increment all the values in maps of maps:
|
||||
The usage of Specter will be explained via example. Suppose you have a sequence of maps, and you want to extract all the even values for :a keys. Here's how you do it:
|
||||
```clojure
|
||||
user> (use 'com.rpl.specter)
|
||||
user> (transform [MAP-VALS MAP-VALS]
|
||||
inc
|
||||
{:a {:aa 1} :b {:ba -1 :bb 2}})
|
||||
{:a {:aa 2}, :b {:ba 0, :bb 3}}
|
||||
nil
|
||||
user> (select [ALL :a even?]
|
||||
[{:a 1} {:a 2} {:a 4} {:a 3}])
|
||||
[2 4]
|
||||
```
|
||||
|
||||
Increment all the even values for :a keys in a sequence of maps:
|
||||
`select` extracts a sequence of results from a data structure. It takes in a "selector", which is a sequence of steps on how to navigate into that data structure. In this case, `ALL` looks at every element in the sequence, `:a` looks at the :a key for each element currently navigated to, and `even?` filters out any elements that aren't an even value.
|
||||
|
||||
Another function called `update` is used to perform a transformation on a data structure. In addition to a selector, it takes in an "update function" which specifies what to do with each element navigated to. For example, here's how to increment all the even values for :a keys in a sequence of maps:
|
||||
|
||||
```clojure
|
||||
user> (transform [ALL :a even?]
|
||||
user> (update [ALL :a even?]
|
||||
inc
|
||||
[{:a 1} {:a 2} {:a 4} {:a 3}])
|
||||
[{:a 1} {:a 3} {:a 5} {:a 3}]
|
||||
```
|
||||
|
||||
Retrieve every number divisible by 3 out of a sequence of sequences:
|
||||
```clojure
|
||||
user> (select [ALL ALL #(= 0 (mod % 3))]
|
||||
[[1 2 3 4] [] [5 3 2 18] [2 4 6] [12]])
|
||||
[3 3 18 6 12]
|
||||
```
|
||||
|
||||
Increment the last odd number in a sequence:
|
||||
Specter comes with all sorts of built-in ways of navigating data structures. For example, here's how to increment the last odd number in a sequence:
|
||||
|
||||
```clojure
|
||||
user> (transform [(filterer odd?) LAST]
|
||||
user> (update [(filterer odd?) LAST]
|
||||
inc
|
||||
[2 1 3 6 9 4 8])
|
||||
[2 1 3 6 10 4 8]
|
||||
```
|
||||
|
||||
Remove nils from a nested sequence:
|
||||
`filterer` navigates you to a view of the sequence currently being looked at. `LAST` navigates you to the last element of whatever sequence you're looking at. But of course during updates, the updates are performed on the original data structure.
|
||||
|
||||
`srange` is a selector for looking at or replacing a subsequence of a sequence. For example, here's how to increment all the odd numbers between indexes 1 (inclusive) and 4 (exclusive):
|
||||
|
||||
```clojure
|
||||
user> (setval [:a ALL nil?] NONE {:a [1 2 nil 3 nil]})
|
||||
{:a [1 2 3]}
|
||||
```
|
||||
|
||||
Remove key/value pair from nested map:
|
||||
|
||||
```clojure
|
||||
user> (setval [:a :b :c] NONE {:a {:b {:c 1}}})
|
||||
{:a {:b {}}}
|
||||
```
|
||||
|
||||
Remove key/value pair from nested map, removing maps that become empty along the way:
|
||||
|
||||
```clojure
|
||||
user> (setval [:a (compact :b :c)] NONE {:a {:b {:c 1}}})
|
||||
{}
|
||||
```
|
||||
|
||||
Increment all the odd numbers between indices 1 (inclusive) and 4 (exclusive):
|
||||
|
||||
```clojure
|
||||
user> (transform [(srange 1 4) ALL odd?] inc [0 1 2 3 4 5 6 7])
|
||||
user> (update [(srange 1 4) ALL odd?] inc [0 1 2 3 4 5 6 7])
|
||||
[0 2 2 4 4 5 6 7]
|
||||
```
|
||||
|
||||
Replace the subsequence from indices 2 to 4 with [:a :b :c :d :e]:
|
||||
`srange` can also be used to replace that subsequence entirely with a new sequence. For example, here's how to replace the subsequence from index 2 to 4 with [-1 -1 -1]:
|
||||
|
||||
```clojure
|
||||
user> (setval (srange 2 4) [:a :b :c :d :e] [0 1 2 3 4 5 6 7 8 9])
|
||||
[0 1 :a :b :c :d :e 4 5 6 7 8 9]
|
||||
user> (update (srange 2 4) (fn [_] [-1 -1 -1]) [0 1 2 3 4 5 6 7 8 9])
|
||||
[0 1 -1 -1 -1 4 5 6 7 8 9]
|
||||
```
|
||||
|
||||
Concatenate the sequence [:a :b] to every nested sequence of a sequence:
|
||||
The above can be written more concisely using the `setval` function, which is a wrapper around `update`:
|
||||
|
||||
```clojure
|
||||
user> (setval (srange 2 4) [-1 -1 -1] [0 1 2 3 4 5 6 7 8 9])
|
||||
[0 1 -1 -1 -1 4 5 6 7 8 9]
|
||||
```
|
||||
|
||||
Here's how to concatenate the sequence [:a :b] to every nested sequence of a sequence:
|
||||
|
||||
```clojure
|
||||
user> (setval [ALL END] [:a :b] [[1] '(1 2) [:c]])
|
||||
[[1 :a :b] (1 2 :a :b) [:c :a :b]]
|
||||
```
|
||||
|
||||
Get all the numbers out of a data structure, no matter how they're nested:
|
||||
`END` is a wrapper around `srange-dynamic`, which takes in functions that return the start index and end index given the structure.
|
||||
|
||||
`walker` is another useful selector that walks the data structure until a predicate is matched. Here's how to get all the numbers out of a map:
|
||||
|
||||
```clojure
|
||||
user> (select (walker number?)
|
||||
|
|
@ -190,154 +82,71 @@ user> (select (walker number?)
|
|||
[2 1 2 1 2 6 7 4]
|
||||
```
|
||||
|
||||
Navigate with string keys:
|
||||
When doing more involved transformations, you often find you lose context when navigating deep within a data structure and need information "up" the data structure to perform the transformation. Specter solves this problem by allowing you to collect values during navigation to use in the update function. Here's an example which transforms a sequence of maps by adding the value of the :b key to the value of the :a key, but only if the :a key is even:
|
||||
|
||||
```clojure
|
||||
user> (select ["a" "b"]
|
||||
{"a" {"b" 10}})
|
||||
[10]
|
||||
user> (update [ALL (collect-one :b) :a even?]
|
||||
+
|
||||
[{:a 1 :b 3} {:a 2 :b -10} {:a 4 :b 10} {:a 3}])
|
||||
[{:b 3, :a 1} {:b -10, :a -8} {:b 10, :a 14} {:a 3}]
|
||||
```
|
||||
|
||||
Reverse the positions of all even numbers between indices 4 and 11:
|
||||
The update function receives as arguments all the collected values followed by the navigated to value. So in this case `+` receives the value of the :b key followed by the value of the :a key, and the update is performed to :a's value.
|
||||
|
||||
The three built-in ways for collecting values are `VAL`, `collect`, and `collect-one`. `VAL` just adds whatever element it's currently on to the value list, while `collect` and `collect-one` take in a selector to navigate to the desired value. `collect` works just like `select` by finding a sequence of values, while `collect-one` expects to only navigate to a single value.
|
||||
|
||||
To make your own selector, implement the `StructurePath` protocol which looks like:
|
||||
|
||||
```clojure
|
||||
user> (transform [(srange 4 11) (filterer even?)]
|
||||
reverse
|
||||
[0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15])
|
||||
[0 1 2 3 10 5 8 7 6 9 4 11 12 13 14 15]
|
||||
(defprotocol StructurePath
|
||||
(select* [this structure next-fn])
|
||||
(update* [this structure next-fn])
|
||||
)
|
||||
```
|
||||
|
||||
Looking at the implementations of the built-in selectors should provide you with the guidance you need to make your own selectors.
|
||||
|
||||
Finally, you can make `select` and `update` work much faster by precompiling your selectors using the `comp-paths` function. There's about a 5x speed difference between the following two invocations of update:
|
||||
|
||||
```clojure
|
||||
(def precompiled (comp-paths ALL :a even?))
|
||||
|
||||
(update [ALL :a even?] structure)
|
||||
(update precompiled structure)
|
||||
```
|
||||
|
||||
Some more examples:
|
||||
|
||||
Decrement every value in a map:
|
||||
```clojure
|
||||
user> (update [ALL LAST]
|
||||
dec
|
||||
{:a 1 :b 3})
|
||||
{:b 2 :a 0}
|
||||
```
|
||||
|
||||
Get every number divisible by 3 out of a sequence of sequences:
|
||||
```clojure
|
||||
user> (select [ALL ALL #(= 0 (mod % 3))]
|
||||
[[1 2 3 4] [] [5 3 2 18] [2 4 6] [12]])
|
||||
[3 3 18 6 12]
|
||||
```
|
||||
|
||||
Append [:c :d] to every subsequence that has at least two even numbers:
|
||||
```clojure
|
||||
user> (setval [ALL
|
||||
(selected? (filterer even?) (view count) (pred>= 2))
|
||||
(selected? (filterer even?) (view count) #(>= % 2))
|
||||
END]
|
||||
[:c :d]
|
||||
[[1 2 3 4 5 6] [7 0 -1] [8 8] []])
|
||||
[[1 2 3 4 5 6 :c :d] [7 0 -1] [8 8 :c :d] []]
|
||||
```
|
||||
|
||||
When doing more involved transformations, you often find you lose context when navigating deep within a data structure and need information "up" the data structure to perform the transformation. Specter solves this problem by allowing you to collect values during navigation to use in the transform function. Here's an example which transforms a sequence of maps by adding the value of the :b key to the value of the :a key, but only if the :a key is even:
|
||||
|
||||
```clojure
|
||||
user> (transform [ALL (collect-one :b) :a even?]
|
||||
+
|
||||
[{:a 1 :b 3} {:a 2 :b -10} {:a 4 :b 10} {:a 3}])
|
||||
[{:b 3, :a 1} {:b -10, :a -8} {:b 10, :a 14} {:a 3}]
|
||||
```
|
||||
|
||||
The transform function receives as arguments all the collected values followed by the navigated to value. So in this case `+` receives the value of the :b key followed by the value of the :a key, and the transform is performed to :a's value.
|
||||
|
||||
The four built-in ways for collecting values are `VAL`, `collect`, `collect-one`, and `putval`. `VAL` just adds whatever element it's currently on to the value list, while `collect` and `collect-one` take in a selector to navigate to the desired value. `collect` works just like `select` by finding a sequence of values, while `collect-one` expects to only navigate to a single value. Finally, `putval` adds an external value into the collected values list.
|
||||
|
||||
|
||||
Increment the value for :a key by 10:
|
||||
```clojure
|
||||
user> (transform [:a (putval 10)]
|
||||
+
|
||||
{:a 1 :b 3})
|
||||
{:b 3 :a 11}
|
||||
```
|
||||
|
||||
|
||||
For every map in a sequence, increment every number in :c's value if :a is even or increment :d if :a is odd:
|
||||
|
||||
```clojure
|
||||
user> (transform [ALL (if-path [:a even?] [:c ALL] :d)]
|
||||
inc
|
||||
[{:a 2 :c [1 2] :d 4} {:a 4 :c [0 10 -1]} {:a -1 :c [1 1 1] :d 1}])
|
||||
[{:c [2 3], :d 4, :a 2} {:c [1 11 0], :a 4} {:c [1 1 1], :d 2, :a -1}]
|
||||
```
|
||||
|
||||
"Protocol paths" can be used to navigate on polymorphic data. For example, if you have two ways of storing "account" information:
|
||||
|
||||
```clojure
|
||||
(defrecord Account [funds])
|
||||
(defrecord User [account])
|
||||
(defrecord Family [accounts-list])
|
||||
```
|
||||
|
||||
You can make an "AccountPath" that dynamically chooses its path based on the type of element it is currently navigated to:
|
||||
|
||||
|
||||
```clojure
|
||||
(defprotocolpath AccountPath [])
|
||||
(extend-protocolpath AccountPath
|
||||
User :account
|
||||
Family [:accounts-list ALL])
|
||||
```
|
||||
|
||||
Then, here is how to select all the funds out of a list of `User` and `Family`:
|
||||
|
||||
```clojure
|
||||
user> (select [ALL AccountPath :funds]
|
||||
[(->User (->Account 50))
|
||||
(->User (->Account 51))
|
||||
(->Family [(->Account 1)
|
||||
(->Account 2)])
|
||||
])
|
||||
[50 51 1 2]
|
||||
```
|
||||
|
||||
The next examples demonstrate recursive navigation. Here's one way to double all the even numbers in a tree:
|
||||
|
||||
```clojure
|
||||
(defprotocolpath TreeWalker [])
|
||||
|
||||
(extend-protocolpath TreeWalker
|
||||
Object nil
|
||||
clojure.lang.PersistentVector [ALL TreeWalker])
|
||||
|
||||
(transform [TreeWalker number? even?] #(* 2 %) [:a 1 [2 [[[3]]] :e] [4 5 [6 7]]])
|
||||
;; => [:a 1 [4 [[[3]]] :e] [8 5 [12 7]]]
|
||||
```
|
||||
|
||||
Here's how to reverse the positions of all even numbers in a tree (with order based on a depth first search). This example uses conditional navigation instead of protocol paths to do the walk:
|
||||
|
||||
```clojure
|
||||
(def TreeValues
|
||||
(recursive-path [] p
|
||||
(if-path vector?
|
||||
[ALL p]
|
||||
STAY
|
||||
)))
|
||||
|
||||
|
||||
(transform (subselect TreeValues even?)
|
||||
reverse
|
||||
[1 2 [3 [[4]] 5] [6 [7 8] 9 [[10]]]]
|
||||
)
|
||||
;; => [1 10 [3 [[8]] 5] [6 [7 4] 9 [[2]]]]
|
||||
```
|
||||
|
||||
# ClojureScript
|
||||
|
||||
Specter supports ClojureScript! However, some of the differences between Clojure and ClojureScript affect how you use Specter in ClojureScript, in particular with the namespace declarations. In Clojure, you might `(use 'com.rpl.specter)` or say `(:require [com.rpl.specter :refer :all])` in your namespace declaration. But in ClojureScript, these options [aren't allowed](https://groups.google.com/d/msg/clojurescript/SzYK08Oduxo/MxLUjg50gQwJ). Instead, consider using one of these options:
|
||||
|
||||
```clojure
|
||||
(:require [com.rpl.specter :as s])
|
||||
(:require [com.rpl.specter :as s :refer-macros [select transform]]) ;; add in the Specter macros that you need
|
||||
```
|
||||
|
||||
# Future work
|
||||
- Integrate Specter with other kinds of data structures, such as graphs. Desired navigations include: reduction in topological order, navigate to outgoing/incoming nodes, to a subgraph (with metadata indicating how to attach external edges on transformation), to node attributes, to node values, to specific nodes.
|
||||
|
||||
# clj-kondo
|
||||
|
||||
When using Specter in a project with [clj-kondo](https://github.com/clj-kondo/clj-kondo), a lot of the vars will be considered unresolved because internally Specter defines them with macros. The following configuration snippet will resolve these issues if you include it in your `.clj-kondo/config.edn` file.
|
||||
|
||||
```clojure
|
||||
{:lint-as {com.rpl.specter/defcollector clojure.core/defn
|
||||
com.rpl.specter/defdynamicnav clojure.core/defn
|
||||
com.rpl.specter/defmacroalias clojure.core/def
|
||||
com.rpl.specter/defnav clojure.core/defn
|
||||
com.rpl.specter/defrichnav clojure.core/defn}}
|
||||
```
|
||||
|
||||
# Babashka
|
||||
|
||||
This library is compatible with [babashka](https://babashka.org/) as of specter 1.1.4 and babashka 0.7.8.
|
||||
- Make it possible to parallelize selects/updates
|
||||
- Any connection to transducers?
|
||||
- Add Clojurescript compatibility
|
||||
|
||||
# License
|
||||
|
||||
Copyright 2015-2020 Red Planet Labs, Inc. Specter is licensed under Apache License v2.0.
|
||||
Copyright 2015 Red Planet Labs, Inc. Specter is licensed under Apache License v2.0.
|
||||
|
|
|
|||
1
VERSION
1
VERSION
|
|
@ -1 +0,0 @@
|
|||
1.1.5-SNAPSHOT
|
||||
19
bb.edn
19
bb.edn
|
|
@ -1,19 +0,0 @@
|
|||
{:paths ["src/clj"]
|
||||
:tasks
|
||||
{test:clj {:doc "Run clj tests with leiningen"
|
||||
:task (shell "lein test")}
|
||||
|
||||
test:cljs {:doc "Run cljs tests with leiningen"
|
||||
:task (shell "lein doo node test-build once")}
|
||||
|
||||
test:bb {:doc "Run bb tests"
|
||||
:extra-paths ["test"]
|
||||
:extra-deps {org.clojure/test.check {:mvn/version "0.9.0"}
|
||||
io.github.cognitect-labs/test-runner
|
||||
{:git/tag "v0.5.0" :git/sha "b3fd0d2"}
|
||||
org.clojure/tools.namespace {:git/url "https://github.com/babashka/tools.namespace"
|
||||
:git/sha "3625153ee66dfcec2ba600851b5b2cbdab8fae6c"}}
|
||||
:requires ([cognitect.test-runner :as tr])
|
||||
:task (apply tr/-main
|
||||
"-d" "test"
|
||||
*command-line-args*)}}}
|
||||
46
project.clj
46
project.clj
|
|
@ -1,43 +1,9 @@
|
|||
(def VERSION (.trim (slurp "VERSION")))
|
||||
|
||||
(defproject com.rpl/specter VERSION
|
||||
(defproject com.rpl/specter "0.1.0"
|
||||
:dependencies [[org.clojure/clojure "1.6.0"]
|
||||
]
|
||||
: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"]
|
||||
|
||||
:source-paths ["src/clj"]
|
||||
:java-source-paths ["src/java"]
|
||||
:test-paths ["test", "target/test-classes"]
|
||||
:auto-clean false
|
||||
:dependencies [[riddley "0.1.12"]]
|
||||
:plugins [[lein-codox "0.10.7"]
|
||||
[lein-doo "0.1.7"]]
|
||||
:codox {:source-paths ["target/classes" "src/clj"]
|
||||
:namespaces [com.rpl.specter
|
||||
com.rpl.specter.zipper
|
||||
com.rpl.specter.protocols
|
||||
com.rpl.specter.transients]
|
||||
:source-uri
|
||||
{#"target/classes" "https://github.com/nathanmarz/specter/tree/{version}/src/clj/{classpath}x#L{line}"
|
||||
#".*" "https://github.com/nathanmarz/specter/tree/{version}/src/clj/{classpath}#L{line}"}}
|
||||
|
||||
|
||||
:cljsbuild {:builds [{:id "test-build"
|
||||
:source-paths ["src/clj" "target/classes" "test"]
|
||||
:compiler {:output-to "out/testable.js"
|
||||
:main 'com.rpl.specter.cljs-test-runner
|
||||
:target :nodejs
|
||||
:optimizations :none}}]}
|
||||
|
||||
:test-paths ["test/clj"]
|
||||
:profiles {:dev {:dependencies
|
||||
[[org.clojure/test.check "0.9.0"]
|
||||
[org.clojure/clojure "1.9.0"]
|
||||
[org.clojure/clojurescript "1.10.439"]]}
|
||||
:bench {:dependencies [[org.clojure/clojure "1.9.0"]
|
||||
[criterium "0.4.4"]]}
|
||||
:test {:dependencies [[org.clojure/clojure "1.7.0"]]}}
|
||||
|
||||
:deploy-repositories
|
||||
[["clojars" {:url "https://repo.clojars.org"
|
||||
:sign-releases false}]]
|
||||
|
||||
:aliases {"deploy" ["do" "clean," "deploy" "clojars"]})
|
||||
[[org.clojure/test.check "0.5.9"]]}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,357 +0,0 @@
|
|||
(ns com.rpl.specter.benchmarks
|
||||
(:use [com.rpl.specter]
|
||||
[com.rpl.specter.transients])
|
||||
(:require [clojure.walk :as walk]
|
||||
[com.rpl.specter.impl :as i]
|
||||
[criterium.core :as bench]))
|
||||
|
||||
(defn pretty-float3 [anum]
|
||||
(format "%.3g" anum))
|
||||
|
||||
(defn mean [a-fn]
|
||||
(-> a-fn (bench/benchmark* {}) :mean first (* 1000000)))
|
||||
|
||||
(defn compare-benchmark [afn-map]
|
||||
(let [results (transform MAP-VALS mean afn-map)
|
||||
[[_ best-time] & _ :as sorted] (sort-by last results)]
|
||||
(println "\nMean(us)\tvs best\t\tCode")
|
||||
(doseq [[k t] sorted]
|
||||
(println (pretty-float3 t) "\t\t" (pretty-float3 (/ t best-time 1.0)) "\t\t" k))))
|
||||
|
||||
(defmacro run-benchmark [name & exprs]
|
||||
(let [only-benchmarks (set (filter some? *command-line-args*))
|
||||
all-benchmarks? (empty? only-benchmarks)]
|
||||
(if (or all-benchmarks? (contains? only-benchmarks name))
|
||||
(let [afn-map (->> exprs shuffle (map (fn [e] [`(quote ~e) `(fn [] ~e)])) (into {}))]
|
||||
`(do
|
||||
(println "Benchmark:" ~name)
|
||||
(compare-benchmark ~afn-map)
|
||||
(println "\n********************************\n"))))))
|
||||
|
||||
(defn specter-dynamic-nested-get [data a b c]
|
||||
(select-any (keypath a b c) data))
|
||||
|
||||
|
||||
(defn get-k [k] (fn [m next] (next (get m k))))
|
||||
|
||||
(def get-a-b-c
|
||||
(reduce
|
||||
(fn [curr afn]
|
||||
(fn [structure]
|
||||
(afn structure curr)))
|
||||
[identity (get-k :c) (get-k :b) (get-k :a)]))
|
||||
|
||||
(let [data {:a {:b {:c 1}}}
|
||||
p (comp-paths :a :b :c)]
|
||||
(run-benchmark "get value in nested map"
|
||||
(select-any [:a :b :c] data)
|
||||
(select-any (keypath :a :b :c) data)
|
||||
(select-one [:a :b :c] data)
|
||||
(select-first [:a :b :c] data)
|
||||
(select-one! [:a :b :c] data)
|
||||
(compiled-select-any p data)
|
||||
(specter-dynamic-nested-get data :a :b :c)
|
||||
(get-in data [:a :b :c])
|
||||
(get-a-b-c data)
|
||||
(-> data :a :b :c identity)
|
||||
(-> data (get :a) (get :b) (get :c))
|
||||
(-> data :a :b :c)
|
||||
(select-any [(keypath :a) (keypath :b) (keypath :c)] data)))
|
||||
|
||||
|
||||
(let [data {:a {:b {:c 1}}}]
|
||||
(run-benchmark "set value in nested map"
|
||||
(assoc-in data [:a :b :c] 1)
|
||||
(setval [:a :b :c] 1 data)))
|
||||
|
||||
|
||||
;; because below 1.7 there is no update function
|
||||
(defn- my-update [m k afn]
|
||||
(assoc m k (afn (get m k))))
|
||||
|
||||
(defn manual-transform [m afn]
|
||||
(my-update m :a
|
||||
(fn [m2]
|
||||
(my-update m2 :b
|
||||
(fn [m3]
|
||||
(my-update m3 :c afn))))))
|
||||
|
||||
(let [data {:a {:b {:c 1}}}]
|
||||
(run-benchmark "update value in nested map"
|
||||
(update-in data [:a :b :c] inc)
|
||||
(transform [:a :b :c] inc data)
|
||||
(manual-transform data inc)))
|
||||
|
||||
|
||||
(defn map-vals-map-iterable [^clojure.lang.IMapIterable m afn]
|
||||
(let [k-it (.keyIterator m)
|
||||
v-it (.valIterator m)]
|
||||
(loop [ret {}]
|
||||
(if (.hasNext k-it)
|
||||
(let [k (.next k-it)
|
||||
v (.next v-it)]
|
||||
(recur (assoc ret k (afn v))))
|
||||
|
||||
ret))))
|
||||
|
||||
|
||||
(defn map-vals-map-iterable-transient [^clojure.lang.IMapIterable m afn]
|
||||
(persistent!
|
||||
(let [k-it (.keyIterator m)
|
||||
v-it (.valIterator m)]
|
||||
(loop [ret (transient {})]
|
||||
(if (.hasNext k-it)
|
||||
(let [k (.next k-it)
|
||||
v (.next v-it)]
|
||||
(recur (assoc! ret k (afn v))))
|
||||
|
||||
ret)))))
|
||||
|
||||
|
||||
(let [data '(1 2 3 4 5)]
|
||||
(run-benchmark "transform values of a list"
|
||||
(transform ALL inc data)
|
||||
(doall (sequence (map inc) data))
|
||||
(reverse (into '() (map inc) data))
|
||||
))
|
||||
|
||||
(let [data {:a 1 :b 2 :c 3 :d 4}]
|
||||
(run-benchmark "transform values of a small map"
|
||||
(into {} (for [[k v] data] [k (inc v)]))
|
||||
(reduce-kv (fn [m k v] (assoc m k (inc v))) {} data)
|
||||
(persistent! (reduce-kv (fn [m k v] (assoc! m k (inc v))) (transient {}) data))
|
||||
(reduce-kv (fn [m k v] (assoc m k (inc v))) (empty data) data)
|
||||
(transform [ALL LAST] inc data)
|
||||
(transform MAP-VALS inc data)
|
||||
(zipmap (keys data) (map inc (vals data)))
|
||||
(into {} (map (fn [e] [(key e) (inc (val e))]) data))
|
||||
(into {} (map (fn [e] [(key e) (inc (val e))])) data)
|
||||
(map-vals-map-iterable data inc)
|
||||
(map-vals-map-iterable-transient data inc)
|
||||
))
|
||||
|
||||
|
||||
(let [data (->> (for [i (range 1000)] [i i]) (into {}))]
|
||||
(run-benchmark "transform values of large map"
|
||||
(into {} (for [[k v] data] [k (inc v)]))
|
||||
(reduce-kv (fn [m k v] (assoc m k (inc v))) {} data)
|
||||
(persistent! (reduce-kv (fn [m k v] (assoc! m k (inc v))) (transient {}) data))
|
||||
(persistent! (reduce-kv (fn [m k v] (assoc! m k (inc v))) (transient clojure.lang.PersistentHashMap/EMPTY) data))
|
||||
(reduce-kv (fn [m k v] (assoc m k (inc v))) (empty data) data)
|
||||
(transform [ALL LAST] inc data)
|
||||
(transform MAP-VALS inc data)
|
||||
(zipmap (keys data) (map inc (vals data)))
|
||||
(into {} (map (fn [e] [(key e) (inc (val e))]) data))
|
||||
(into {} (map (fn [e] [(key e) (inc (val e))])) data)
|
||||
(map-vals-map-iterable data inc)
|
||||
(map-vals-map-iterable-transient data inc)))
|
||||
|
||||
|
||||
(let [data [1 2 3 4 5 6 7 8 9 10]]
|
||||
(run-benchmark "first value of a size 10 vector"
|
||||
(first data)
|
||||
(select-any ALL data)
|
||||
(select-any FIRST data)
|
||||
(select-first ALL data)
|
||||
))
|
||||
|
||||
(let [data [1 2 3 4 5]]
|
||||
(run-benchmark "map a function over a vector"
|
||||
(vec (map inc data))
|
||||
(mapv inc data)
|
||||
(transform ALL inc data)
|
||||
(into [] (map inc) data)))
|
||||
|
||||
|
||||
(let [data [1 2 3 4 5 6 7 8 9 10]]
|
||||
(run-benchmark "filter a sequence"
|
||||
(doall (filter even? data))
|
||||
(filterv even? data)
|
||||
(select [ALL even?] data)
|
||||
(select-any (filterer even?) data)
|
||||
(into [] (filter even?) data)))
|
||||
|
||||
|
||||
(let [data [{:a 2 :b 2} {:a 1} {:a 4} {:a 6}]
|
||||
xf (comp (map :a) (filter even?))]
|
||||
(run-benchmark "even :a values from sequence of maps"
|
||||
(select [ALL :a even?] data)
|
||||
(->> data (mapv :a) (filter even?) doall)
|
||||
(into [] (comp (map :a) (filter even?)) data)
|
||||
(into [] xf data)))
|
||||
|
||||
|
||||
(let [v (vec (range 1000))]
|
||||
(run-benchmark "Append to a large vector"
|
||||
(setval END [1] v)
|
||||
(setval AFTER-ELEM 1 v)
|
||||
(reduce conj v [1])
|
||||
(conj v 1)))
|
||||
|
||||
(let [data [1 2 3 4 5 6 7 8 9 10]]
|
||||
(run-benchmark "prepend to a vector"
|
||||
(vec (cons 0 data))
|
||||
(setval BEFORE-ELEM 0 data)
|
||||
(into [0] data)
|
||||
))
|
||||
|
||||
(declarepath TreeValues)
|
||||
|
||||
(providepath TreeValues
|
||||
(if-path vector?
|
||||
[ALL TreeValues]
|
||||
STAY))
|
||||
|
||||
(defprotocolpath TreeValuesProt)
|
||||
|
||||
(extend-protocolpath TreeValuesProt
|
||||
clojure.lang.PersistentVector [ALL TreeValuesProt]
|
||||
Object STAY)
|
||||
|
||||
|
||||
(defn tree-value-transform [afn atree]
|
||||
(if (vector? atree)
|
||||
(mapv #(tree-value-transform afn %) atree)
|
||||
(afn atree)))
|
||||
|
||||
|
||||
(let [data [1 2 [[3]] [4 6 [7 [8]] 10]]]
|
||||
(run-benchmark "update every value in a tree (represented with vectors)"
|
||||
(walk/postwalk (fn [e] (if (and (number? e) (even? e)) (inc e) e)) data)
|
||||
(transform [(walker number?) even?] inc data)
|
||||
(transform [TreeValues even?] inc data)
|
||||
(transform [TreeValuesProt even?] inc data)
|
||||
(tree-value-transform (fn [e] (if (even? e) (inc e) e)) data)))
|
||||
|
||||
|
||||
(let [toappend (range 1000)]
|
||||
(run-benchmark "transient comparison: building up vectors"
|
||||
(reduce (fn [v i] (conj v i)) [] toappend)
|
||||
(reduce (fn [v i] (conj! v i)) (transient []) toappend)
|
||||
(setval END toappend [])
|
||||
(setval END! toappend (transient []))))
|
||||
|
||||
(let [toappend (range 1000)]
|
||||
(run-benchmark "transient comparison: building up vectors one at a time"
|
||||
(reduce (fn [v i] (conj v i)) [] toappend)
|
||||
(reduce (fn [v i] (conj! v i)) (transient []) toappend)
|
||||
(reduce (fn [v i] (setval END [i] v)) [] toappend)
|
||||
(reduce (fn [v i] (setval END! [i] v)) (transient []) toappend)))
|
||||
|
||||
|
||||
(let [data (vec (range 1000))
|
||||
tdata (transient data)
|
||||
tdata2 (transient data)]
|
||||
(run-benchmark "transient comparison: assoc'ing in vectors"
|
||||
(assoc data 600 0)
|
||||
(assoc! tdata 600 0)
|
||||
(setval (keypath 600) 0 data)
|
||||
(setval (keypath! 600) 0 tdata2)))
|
||||
|
||||
(let [data (into {} (for [k (range 1000)]
|
||||
[k (rand)]))
|
||||
tdata (transient data)
|
||||
tdata2 (transient data)]
|
||||
(run-benchmark "transient comparison: assoc'ing in maps"
|
||||
(assoc data 600 0)
|
||||
(assoc! tdata 600 0)
|
||||
(setval (keypath 600) 0 data)
|
||||
(setval (keypath! 600) 0 tdata2)))
|
||||
|
||||
(defn modify-submap
|
||||
[m]
|
||||
(assoc m 0 1 458 89))
|
||||
|
||||
(let [data (into {} (for [k (range 1000)]
|
||||
[k (rand)]))
|
||||
tdata (transient data)]
|
||||
(run-benchmark "transient comparison: submap"
|
||||
(transform (submap [600 700]) modify-submap data)
|
||||
(transform (submap! [600 700]) modify-submap tdata)))
|
||||
|
||||
(let [data {:x 1}
|
||||
meta-map {:my :metadata}]
|
||||
(run-benchmark "set metadata"
|
||||
(with-meta data meta-map)
|
||||
(setval META meta-map data)))
|
||||
|
||||
(let [data (with-meta {:x 1} {:my :metadata})]
|
||||
(run-benchmark "get metadata"
|
||||
(meta data)
|
||||
(select-any META data)))
|
||||
|
||||
(let [data (with-meta {:x 1} {:my :metadata})]
|
||||
(run-benchmark "vary metadata"
|
||||
(vary-meta data assoc :y 2)
|
||||
(setval [META :y] 2 data)))
|
||||
|
||||
(let [data (range 1000)]
|
||||
(run-benchmark "Traverse into a set"
|
||||
(set data)
|
||||
(set (select ALL data))
|
||||
(into #{} (traverse ALL data))
|
||||
(persistent!
|
||||
(reduce conj! (transient #{}) (traverse ALL data)))
|
||||
(reduce conj #{} (traverse ALL data))))
|
||||
|
||||
|
||||
(defn mult-10 [v] (* 10 v))
|
||||
|
||||
(let [data [1 2 3 4 5 6 7 8 9]]
|
||||
(run-benchmark "multi-transform vs. consecutive transforms, one shared nav"
|
||||
(->> data (transform [ALL even?] mult-10) (transform [ALL odd?] dec))
|
||||
(multi-transform [ALL (multi-path [even? (terminal mult-10)] [odd? (terminal dec)])] data)))
|
||||
|
||||
|
||||
(let [data [[1 2 3 4 :a] [5] [6 7 :b 8 9] [10 11 12 13]]]
|
||||
(run-benchmark "multi-transform vs. consecutive transforms, three shared navs"
|
||||
(->> data (transform [ALL ALL number? even?] mult-10) (transform [ALL ALL number? odd?] dec))
|
||||
(multi-transform [ALL ALL number? (multi-path [even? (terminal mult-10)] [odd? (terminal dec)])] data)))
|
||||
|
||||
(let [data {:a 1 :b 2 :c 3 :d 4}]
|
||||
(run-benchmark "namespace qualify keys of a small map"
|
||||
(into {}
|
||||
(map (fn [[k v]] [(keyword (str *ns*) (name k)) v]))
|
||||
data)
|
||||
(reduce-kv (fn [m k v] (assoc m (keyword (str *ns*) (name k)) v)) {} data)
|
||||
(setval [MAP-KEYS NAMESPACE] (str *ns*) data)
|
||||
))
|
||||
|
||||
|
||||
(let [data (->> (for [i (range 1000)] [(keyword (str i)) i]) (into {}))]
|
||||
(run-benchmark "namespace qualify keys of a large map"
|
||||
(into {}
|
||||
(map (fn [[k v]] [(keyword (str *ns*) (name k)) v]))
|
||||
data)
|
||||
(reduce-kv (fn [m k v] (assoc m (keyword (str *ns*) (name k)) v)) {} data)
|
||||
(setval [MAP-KEYS NAMESPACE] (str *ns*) data)
|
||||
))
|
||||
|
||||
(defnav walker-old [afn]
|
||||
(select* [this structure next-fn]
|
||||
(i/walk-select afn next-fn structure))
|
||||
(transform* [this structure next-fn]
|
||||
(i/walk-until afn next-fn structure)))
|
||||
|
||||
(let [data {:a [1 2 {:c '(3 4) :d {:e [1 2 3] 7 8 9 10}}]}]
|
||||
(run-benchmark "walker vs. clojure.walk version"
|
||||
(transform (walker number?) inc data)
|
||||
(transform (walker-old number?) inc data)
|
||||
))
|
||||
|
||||
(let [size 1000
|
||||
middle-idx (/ size 2)
|
||||
v -1
|
||||
rng (range size)
|
||||
data-vec (vec rng)
|
||||
data-lst (apply list rng)]
|
||||
(run-benchmark "before-index vs. srange in middle (vector)"
|
||||
(setval (before-index middle-idx) v data-vec)
|
||||
(setval (srange middle-idx middle-idx) [v] data-vec))
|
||||
(run-benchmark "before-index vs. srange in middle (list)"
|
||||
(setval (before-index middle-idx) v data-lst)
|
||||
(setval (srange middle-idx middle-idx) [v] data-lst))
|
||||
(run-benchmark "before-index at 0 vs. srange vs. cons (list)"
|
||||
(setval (before-index 0) v data-lst)
|
||||
(setval (srange 0 0) [v] data-lst)
|
||||
(cons v data-lst)))
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
rlwrap java -cp `lein classpath` clojure.main scripts/repl.clj
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
(require
|
||||
'[cljs.repl :as repl]
|
||||
'[cljs.repl.node :as node])
|
||||
|
||||
(repl/repl (node/repl-env))
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
lein javac
|
||||
lein version
|
||||
echo
|
||||
lein show-profiles bench
|
||||
echo
|
||||
java -server -XX:MaxInlineSize=100 -cp "$(lein with-profile bench classpath)" clojure.main scripts/benchmarks.clj "$@"
|
||||
145
src/clj/com/rpl/specter.clj
Normal file
145
src/clj/com/rpl/specter.clj
Normal file
|
|
@ -0,0 +1,145 @@
|
|||
(ns com.rpl.specter
|
||||
(:use [com.rpl.specter impl protocols])
|
||||
)
|
||||
|
||||
;;TODO: can make usage of vals much more efficient by determining during composition how many vals
|
||||
;;there are going to be. this should make it much easier to allocate space for vals without doing concats
|
||||
;;all over the place. The apply to the vals + structure can also be avoided since the number of vals is known
|
||||
;;beforehand
|
||||
(defn comp-paths [& paths]
|
||||
(comp-paths* (vec paths)))
|
||||
|
||||
;; Selector functions
|
||||
|
||||
(defn select
|
||||
"Navigates to and returns a sequence of all the elements specified by the selector."
|
||||
[selector structure]
|
||||
(let [sp (comp-paths* selector)]
|
||||
(exec-select selector structure)
|
||||
))
|
||||
|
||||
(defn select-one
|
||||
"Like select, but returns either one element or nil. Throws exception if multiple elements found"
|
||||
[selector structure]
|
||||
(let [res (select selector structure)]
|
||||
(when (> (count res) 1)
|
||||
(throw-illegal "More than one element found for params: " selector structure))
|
||||
(first res)
|
||||
))
|
||||
|
||||
(defn select-one!
|
||||
"Returns exactly one element, throws exception if zero or multiple elements found"
|
||||
[selector structure]
|
||||
(let [res (select-one selector structure)]
|
||||
(when (nil? res) (throw-illegal "No elements found for params: " selector structure))
|
||||
res
|
||||
))
|
||||
|
||||
(defn select-first
|
||||
"Returns first element found. Not any more efficient than select, just a convenience"
|
||||
[selector structure]
|
||||
(first (select selector structure)))
|
||||
|
||||
;; Update functions
|
||||
|
||||
(defn update
|
||||
"Navigates to each value specified by the selector and replaces it by the result of running
|
||||
the update-fn on it"
|
||||
[selector update-fn structure]
|
||||
(let [selector (comp-paths* selector)]
|
||||
(exec-update selector update-fn structure)
|
||||
))
|
||||
|
||||
(defn setval
|
||||
"Navigates to each value specified by the selector and replaces it by val"
|
||||
[selector val structure]
|
||||
(update selector (fn [_] val) structure))
|
||||
|
||||
(defn replace-in [selector update-fn structure & {:keys [merge-fn] :or {merge-fn concat}}]
|
||||
"Similar to update, except returns a pair of [updated-structure sequence-of-user-ret].
|
||||
The update-fn in this case is expected to return [ret user-ret]. ret is
|
||||
what's used to update the data structure, while user-ret will be added to the user-ret sequence
|
||||
in the final return. replace-in is useful for situations where you need to know the specific values
|
||||
of what was updated in the data structure."
|
||||
(let [state (mutable-cell nil)]
|
||||
[(update selector
|
||||
(fn [e]
|
||||
(let [res (update-fn e)]
|
||||
(if res
|
||||
(let [[ret user-ret] res]
|
||||
(->> user-ret
|
||||
(merge-fn (get-cell state))
|
||||
(set-cell! state))
|
||||
ret)
|
||||
e
|
||||
)))
|
||||
structure)
|
||||
(get-cell state)]
|
||||
))
|
||||
|
||||
;; Built-in pathing and context operations
|
||||
|
||||
(def ALL (->AllStructurePath))
|
||||
|
||||
(def VAL (->ValCollect))
|
||||
|
||||
(def LAST (->LastStructurePath))
|
||||
|
||||
(def FIRST (->FirstStructurePath))
|
||||
|
||||
(defn srange-dynamic [start-fn end-fn] (->SRangePath start-fn end-fn))
|
||||
|
||||
(defn srange [start end] (srange-dynamic (fn [_] start) (fn [_] end)))
|
||||
|
||||
(def START (srange 0 0))
|
||||
|
||||
(def END (srange-dynamic count count))
|
||||
|
||||
(defn walker [afn] (->WalkerStructurePath afn))
|
||||
|
||||
(defn codewalker [afn] (->CodeWalkerStructurePath afn))
|
||||
|
||||
(defn filterer [afn] (->FilterStructurePath afn))
|
||||
|
||||
(defn keypath [akey] (->KeyPath akey))
|
||||
|
||||
(defn view [afn] (->ViewPath afn))
|
||||
|
||||
(defmacro viewfn [& args]
|
||||
`(view (fn ~@args)))
|
||||
|
||||
(defn selected?
|
||||
"Filters the current value based on whether a selector finds anything.
|
||||
e.g. (selected? :vals ALL even?) keeps the current element only if an
|
||||
even number exists for the :vals key"
|
||||
[& selectors]
|
||||
(let [s (comp-paths selectors)]
|
||||
(fn [structure]
|
||||
(->> structure
|
||||
(select s)
|
||||
empty?
|
||||
not))))
|
||||
|
||||
(extend-type clojure.lang.Keyword
|
||||
StructurePath
|
||||
(select* [kw structure next-fn]
|
||||
(key-select kw structure next-fn))
|
||||
(update* [kw structure next-fn]
|
||||
(key-update kw structure next-fn)
|
||||
))
|
||||
|
||||
(extend-type clojure.lang.AFn
|
||||
StructurePath
|
||||
(select* [afn structure next-fn]
|
||||
(if (afn structure)
|
||||
(next-fn structure)))
|
||||
(update* [afn structure next-fn]
|
||||
(if (afn structure)
|
||||
(next-fn structure)
|
||||
structure)))
|
||||
|
||||
(defn collect [& selector]
|
||||
(->SelectCollector select (comp-paths* selector)))
|
||||
|
||||
(defn collect-one [& selector]
|
||||
(->SelectCollector select-one (comp-paths* selector)))
|
||||
File diff suppressed because it is too large
Load diff
347
src/clj/com/rpl/specter/impl.clj
Normal file
347
src/clj/com/rpl/specter/impl.clj
Normal file
|
|
@ -0,0 +1,347 @@
|
|||
(ns com.rpl.specter.impl
|
||||
(:use [com.rpl.specter protocols])
|
||||
(:require [clojure.walk :as walk]
|
||||
[clojure.core.reducers :as r])
|
||||
)
|
||||
|
||||
(defn benchmark [iters afn]
|
||||
(time
|
||||
(dotimes [_ iters]
|
||||
(afn))))
|
||||
|
||||
(defprotocol CoercePath
|
||||
(coerce-path [this]))
|
||||
|
||||
(extend-protocol CoercePath
|
||||
com.rpl.specter.protocols.Collector
|
||||
(coerce-path [collector]
|
||||
(reify StructureValsPath
|
||||
(select-full* [this vals structure next-fn]
|
||||
(next-fn (conj vals (collect-val collector structure)) structure))
|
||||
(update-full* [this vals structure next-fn]
|
||||
(next-fn (conj vals (collect-val collector structure)) structure))))
|
||||
|
||||
;; need to say Object instead of StructurePath so that things like Keyword are properly coerced
|
||||
Object
|
||||
(coerce-path [spath]
|
||||
spath))
|
||||
|
||||
(defprotocol CoerceStructureValsPath
|
||||
(coerce-structure-vals-path [this]))
|
||||
|
||||
(extend-protocol CoerceStructureValsPath
|
||||
com.rpl.specter.protocols.StructureValsPath
|
||||
(coerce-structure-vals-path [this] this)
|
||||
|
||||
com.rpl.specter.protocols.Collector
|
||||
(coerce-structure-vals-path [this] (coerce-path this))
|
||||
|
||||
|
||||
;; need to say Object instead of StructurePath so that things like Keyword are properly coerced
|
||||
Object
|
||||
(coerce-structure-vals-path [spath]
|
||||
(reify StructureValsPath
|
||||
(select-full* [this vals structure next-fn]
|
||||
(select* spath structure (fn [structure] (next-fn vals structure))))
|
||||
(update-full* [this vals structure next-fn]
|
||||
(update* spath structure (fn [structure] (next-fn vals structure)))
|
||||
))))
|
||||
|
||||
(defn- combine-same-types [[f & _ :as all]]
|
||||
(cond (extends? StructureValsPath (class f))
|
||||
all
|
||||
|
||||
(extends? Collector (class f))
|
||||
[(reify StructureValsPath
|
||||
(select-full* [this vals structure next-fn]
|
||||
(next-fn (reduce conj vals (for [c all] (collect-val c structure))) structure))
|
||||
(update-full* [this vals structure next-fn]
|
||||
(next-fn (reduce conj vals (for [c all] (collect-val c structure))) structure))
|
||||
)]
|
||||
|
||||
:else
|
||||
[(reduce (fn [curr sp]
|
||||
(reify StructurePath
|
||||
(select* [this structure next-fn]
|
||||
(select* sp structure
|
||||
(fn [structure-next]
|
||||
(select* curr structure-next next-fn))))
|
||||
(update* [this structure next-fn]
|
||||
(update* sp structure
|
||||
(fn [structure-next]
|
||||
(update* curr structure-next next-fn))))
|
||||
))
|
||||
(reverse all))]))
|
||||
|
||||
(defprotocol PathComposer
|
||||
(comp-paths* [paths]))
|
||||
|
||||
(extend-protocol PathComposer
|
||||
Object
|
||||
(comp-paths* [sp]
|
||||
(coerce-path sp))
|
||||
java.util.List
|
||||
(comp-paths* [structure-paths]
|
||||
(let [combined (->> structure-paths
|
||||
flatten
|
||||
(partition-by (fn [e]
|
||||
(cond (extends? StructureValsPath (class e)) :svalspath
|
||||
(extends? Collector (class e)) :collector
|
||||
:else :spath)))
|
||||
(mapcat combine-same-types))]
|
||||
(if (= 1 (count combined))
|
||||
(first combined)
|
||||
(reduce (fn [sp-curr sp]
|
||||
(reify StructureValsPath
|
||||
(select-full* [this vals structure next-fn]
|
||||
(select-full* sp vals structure
|
||||
(fn [vals-next structure-next]
|
||||
(select-full* sp-curr vals-next structure-next next-fn)))
|
||||
)
|
||||
(update-full* [this vals structure next-fn]
|
||||
(update-full* sp vals structure
|
||||
(fn [vals-next structure-next]
|
||||
(update-full* sp-curr vals-next structure-next next-fn))))
|
||||
))
|
||||
(->> structure-paths (map coerce-structure-vals-path) reverse))
|
||||
))))
|
||||
|
||||
(defprotocol Executor
|
||||
(exec-select [selector structure])
|
||||
(exec-update [selector update-fn structure]))
|
||||
|
||||
(extend-protocol Executor
|
||||
com.rpl.specter.protocols.StructureValsPath
|
||||
(exec-select [selector structure]
|
||||
(select-full* selector
|
||||
[]
|
||||
structure
|
||||
(fn [vals structure]
|
||||
(if-not (empty? vals) [(conj vals structure)] [structure]))))
|
||||
(exec-update [selector update-fn structure]
|
||||
(update-full* selector
|
||||
[]
|
||||
structure
|
||||
(fn [vals structure]
|
||||
(if (empty? vals)
|
||||
(update-fn structure)
|
||||
(apply update-fn (conj vals structure))))))
|
||||
|
||||
Object
|
||||
(exec-select [selector structure]
|
||||
(select* selector structure (fn [e] [e])))
|
||||
(exec-update [selector update-fn structure]
|
||||
(update* selector structure update-fn)
|
||||
))
|
||||
|
||||
;; cell implementation idea taken from prismatic schema library
|
||||
(definterface PMutableCell
|
||||
(get_cell ^Object [])
|
||||
(set_cell [^Object x]))
|
||||
|
||||
(deftype MutableCell [^:volatile-mutable ^Object q]
|
||||
PMutableCell
|
||||
(get_cell [this] q)
|
||||
(set_cell [this x] (set! q x)))
|
||||
|
||||
(defn mutable-cell ^PMutableCell
|
||||
([] (mutable-cell nil))
|
||||
([init] (MutableCell. init)))
|
||||
|
||||
(defn set-cell! [^PMutableCell cell val]
|
||||
(.set_cell cell val))
|
||||
|
||||
(defn get-cell [^PMutableCell cell]
|
||||
(.get_cell cell))
|
||||
|
||||
(defmacro throw* [etype & args]
|
||||
`(throw (new ~etype (pr-str ~@args))))
|
||||
|
||||
(defmacro throw-illegal [& args]
|
||||
`(throw* IllegalArgumentException ~@args))
|
||||
|
||||
(defn update-cell! [cell afn]
|
||||
(let [ret (afn (get-cell cell))]
|
||||
(set-cell! cell ret)
|
||||
ret))
|
||||
|
||||
(defn- append [coll elem]
|
||||
(-> coll vec (conj elem)))
|
||||
|
||||
(defprotocol SetExtremes
|
||||
(set-first [s val])
|
||||
(set-last [s val]))
|
||||
|
||||
(defn- set-first-list [l v]
|
||||
(cons v (rest l)))
|
||||
|
||||
(defn- set-last-list [l v]
|
||||
(append (butlast l) v))
|
||||
|
||||
(extend-protocol SetExtremes
|
||||
clojure.lang.PersistentVector
|
||||
(set-first [v val]
|
||||
(assoc v 0 val))
|
||||
(set-last [v val]
|
||||
(assoc v (-> v count dec) val))
|
||||
Object
|
||||
(set-first [l val]
|
||||
(set-first-list l val))
|
||||
(set-last [l val]
|
||||
(set-last-list l val)
|
||||
))
|
||||
|
||||
(defn- walk-until [pred on-match-fn structure]
|
||||
(if (pred structure)
|
||||
(on-match-fn structure)
|
||||
(walk/walk (partial walk-until pred on-match-fn) identity structure)
|
||||
))
|
||||
|
||||
(defn- fn-invocation? [f]
|
||||
(or (instance? clojure.lang.Cons f)
|
||||
(instance? clojure.lang.LazySeq f)
|
||||
(list? f)))
|
||||
|
||||
(defn- codewalk-until [pred on-match-fn structure]
|
||||
(if (pred structure)
|
||||
(on-match-fn structure)
|
||||
(let [ret (walk/walk (partial codewalk-until pred on-match-fn) identity structure)]
|
||||
(if (and (fn-invocation? structure) (fn-invocation? ret))
|
||||
(with-meta ret (meta structure))
|
||||
ret
|
||||
))))
|
||||
|
||||
(defn- conj-all! [cell elems]
|
||||
(set-cell! cell (concat (get-cell cell) elems)))
|
||||
|
||||
;; returns vector of all results
|
||||
(defn- walk-select [pred continue-fn structure]
|
||||
(let [ret (mutable-cell [])
|
||||
walker (fn this [structure]
|
||||
(if (pred structure)
|
||||
(conj-all! ret (continue-fn structure))
|
||||
(walk/walk this identity structure))
|
||||
)]
|
||||
(walker structure)
|
||||
(get-cell ret)
|
||||
))
|
||||
|
||||
(defn- filter+ancestry [afn aseq]
|
||||
(let [aseq (vec aseq)]
|
||||
(reduce (fn [[s m :as orig] i]
|
||||
(let [e (get aseq i)
|
||||
pos (count s)]
|
||||
(if (afn e)
|
||||
[(conj s e) (assoc m pos i)]
|
||||
orig
|
||||
)))
|
||||
[[] {}]
|
||||
(range (count aseq))
|
||||
)))
|
||||
|
||||
(defn key-select [akey structure next-fn]
|
||||
(next-fn (get structure akey)))
|
||||
|
||||
(defn key-update [akey structure next-fn]
|
||||
(assoc structure akey (next-fn (get structure akey))
|
||||
))
|
||||
|
||||
(deftype AllStructurePath []
|
||||
StructurePath
|
||||
(select* [this structure next-fn]
|
||||
(into [] (r/mapcat next-fn structure)))
|
||||
(update* [this structure next-fn]
|
||||
(let [empty-structure (empty structure)]
|
||||
(if (list? empty-structure)
|
||||
;; this is done to maintain order, otherwise lists get reversed
|
||||
(doall (map next-fn structure))
|
||||
(->> structure (r/map next-fn) (into empty-structure))
|
||||
))))
|
||||
|
||||
(deftype ValCollect []
|
||||
Collector
|
||||
(collect-val [this structure]
|
||||
structure))
|
||||
|
||||
(deftype LastStructurePath []
|
||||
StructurePath
|
||||
(select* [this structure next-fn]
|
||||
(next-fn (last structure)))
|
||||
(update* [this structure next-fn]
|
||||
(set-last structure (next-fn (last structure)))))
|
||||
|
||||
(deftype FirstStructurePath []
|
||||
StructurePath
|
||||
(select* [this structure next-fn]
|
||||
(next-fn (first structure)))
|
||||
(update* [this structure next-fn]
|
||||
(set-first structure (next-fn (first structure)))))
|
||||
|
||||
(deftype WalkerStructurePath [afn]
|
||||
StructurePath
|
||||
(select* [this structure next-fn]
|
||||
(walk-select afn next-fn structure))
|
||||
(update* [this structure next-fn]
|
||||
(walk-until afn next-fn structure)))
|
||||
|
||||
(deftype CodeWalkerStructurePath [afn]
|
||||
StructurePath
|
||||
(select* [this structure next-fn]
|
||||
(walk-select afn next-fn structure))
|
||||
(update* [this structure next-fn]
|
||||
(codewalk-until afn next-fn structure)))
|
||||
|
||||
(deftype FilterStructurePath [afn]
|
||||
StructurePath
|
||||
(select* [this structure next-fn]
|
||||
(->> structure (filter afn) doall next-fn))
|
||||
(update* [this structure next-fn]
|
||||
(let [[filtered ancestry] (filter+ancestry afn structure)
|
||||
;; the vec is necessary so that we can get by index later
|
||||
;; (can't get by index for cons'd lists)
|
||||
next (vec (next-fn filtered))]
|
||||
(reduce (fn [curr [newi oldi]]
|
||||
(assoc curr oldi (get next newi)))
|
||||
(vec structure)
|
||||
ancestry))))
|
||||
|
||||
(deftype KeyPath [akey]
|
||||
StructurePath
|
||||
(select* [this structure next-fn]
|
||||
(key-select akey structure next-fn))
|
||||
(update* [this structure next-fn]
|
||||
(key-update akey structure next-fn)
|
||||
))
|
||||
|
||||
(deftype SelectCollector [sel-fn selector]
|
||||
Collector
|
||||
(collect-val [this structure]
|
||||
(sel-fn selector structure)))
|
||||
|
||||
(deftype SRangePath [start-fn end-fn]
|
||||
StructurePath
|
||||
(select* [this structure next-fn]
|
||||
(let [start (start-fn structure)
|
||||
end (end-fn structure)]
|
||||
(next-fn (-> structure vec (subvec start end)))
|
||||
))
|
||||
(update* [this structure next-fn]
|
||||
(let [start (start-fn structure)
|
||||
end (end-fn structure)
|
||||
structurev (vec structure)
|
||||
newpart (next-fn (-> structurev (subvec start end)))
|
||||
res (concat (subvec structurev 0 start)
|
||||
newpart
|
||||
(subvec structurev end (count structure)))]
|
||||
(if (vector? structure)
|
||||
(vec res)
|
||||
res
|
||||
))))
|
||||
|
||||
(deftype ViewPath [view-fn]
|
||||
StructurePath
|
||||
(select* [this structure next-fn]
|
||||
(-> structure view-fn next-fn))
|
||||
(update* [this structure next-fn]
|
||||
(-> structure view-fn next-fn)
|
||||
))
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,54 +0,0 @@
|
|||
(ns com.rpl.specter.macros
|
||||
(:use [com.rpl.specter.protocols :only [RichNavigator]])
|
||||
(:require [com.rpl.specter.impl :as i]))
|
||||
|
||||
|
||||
(defn- determine-params-impls [impls]
|
||||
(let [grouped (->> impls (map (fn [[n & body]] [n body])) (into {}))]
|
||||
(if-not (= #{'select* 'transform*} (-> grouped keys set))
|
||||
(throw (ex-info "defnav must implement select* and transform*"
|
||||
{:methods (keys grouped)})))
|
||||
grouped))
|
||||
|
||||
|
||||
(defmacro richnav [params & impls]
|
||||
(if (empty? params)
|
||||
`(reify RichNavigator ~@impls)
|
||||
`(i/direct-nav-obj
|
||||
(fn ~params
|
||||
(reify RichNavigator
|
||||
~@impls)))))
|
||||
|
||||
|
||||
(defmacro nav [params & impls]
|
||||
(let [{[[_ s-structure-sym s-next-fn-sym] & s-body] 'select*
|
||||
[[_ t-structure-sym t-next-fn-sym] & t-body] 'transform*} (determine-params-impls impls)]
|
||||
`(richnav ~params
|
||||
(~'select* [this# vals# ~s-structure-sym next-fn#]
|
||||
(let [~s-next-fn-sym (fn [s#] (next-fn# vals# s#))]
|
||||
~@s-body))
|
||||
(~'transform* [this# vals# ~t-structure-sym next-fn#]
|
||||
(let [~t-next-fn-sym (fn [s#] (next-fn# vals# s#))]
|
||||
~@t-body)))))
|
||||
|
||||
(defn- helper-name [name method-name]
|
||||
(with-meta (symbol (str name "-" method-name)) {:no-doc true}))
|
||||
|
||||
(defmacro defnav [name params & impls]
|
||||
;; remove the "this" param for the helper
|
||||
(let [helpers (for [[mname [_ & mparams] & mbody] impls]
|
||||
`(defn ~(helper-name name mname) [~@params ~@mparams] ~@mbody))
|
||||
decls (for [[mname & _] impls]
|
||||
`(declare ~(helper-name name mname)))
|
||||
name-with-meta (vary-meta name
|
||||
assoc :arglists (list 'quote (list params)))]
|
||||
`(do
|
||||
~@decls
|
||||
~@helpers
|
||||
(def ~name-with-meta (nav ~params ~@impls)))))
|
||||
|
||||
(defmacro defrichnav [name params & impls]
|
||||
(let [name-with-meta (vary-meta name
|
||||
assoc :arglists (list 'quote (list params)))]
|
||||
`(def ~name-with-meta
|
||||
(richnav ~params ~@impls))))
|
||||
|
|
@ -1,786 +0,0 @@
|
|||
(ns com.rpl.specter.navs
|
||||
#?(:cljs (:require-macros
|
||||
[com.rpl.specter
|
||||
:refer
|
||||
[defnav defrichnav]]
|
||||
[com.rpl.specter.util-macros :refer
|
||||
[doseqres]]))
|
||||
#?(:clj (:use [com.rpl.specter.macros :only [defnav defrichnav]]
|
||||
[com.rpl.specter.util-macros :only [doseqres]]))
|
||||
(:require [com.rpl.specter.impl :as i]
|
||||
#?@(:bb []
|
||||
:clj [[clojure.core.reducers :as r]])))
|
||||
|
||||
|
||||
(defn not-selected?*
|
||||
[compiled-path vals structure]
|
||||
(->> structure
|
||||
(i/compiled-select-any* compiled-path vals)
|
||||
(identical? i/NONE)))
|
||||
|
||||
(defn selected?*
|
||||
[compiled-path vals structure]
|
||||
(not (not-selected?* compiled-path vals structure)))
|
||||
|
||||
|
||||
(defn all-select [structure next-fn]
|
||||
(doseqres i/NONE [e structure]
|
||||
(next-fn e)))
|
||||
|
||||
#?(
|
||||
:clj
|
||||
(defn queue? [coll]
|
||||
(instance? clojure.lang.PersistentQueue coll))
|
||||
|
||||
:cljs
|
||||
(defn queue? [coll]
|
||||
(= (type coll) (type #queue []))))
|
||||
|
||||
|
||||
(defprotocol AllTransformProtocol
|
||||
(all-transform [structure next-fn]))
|
||||
|
||||
(defn void-transformed-kv-pair? [newkv]
|
||||
(or (identical? newkv i/NONE) (< (count newkv) 2)))
|
||||
|
||||
(defn- non-transient-map-all-transform [structure next-fn empty-map]
|
||||
(reduce-kv
|
||||
(fn [m k v]
|
||||
(let [newkv (next-fn [k v])]
|
||||
(if (void-transformed-kv-pair? newkv)
|
||||
m
|
||||
(assoc m (nth newkv 0) (nth newkv 1)))))
|
||||
|
||||
empty-map
|
||||
structure))
|
||||
|
||||
(defn not-NONE? [v]
|
||||
(-> v (identical? i/NONE) not))
|
||||
|
||||
|
||||
(defn- all-transform-list [structure next-fn]
|
||||
(doall (sequence (comp (map next-fn) (filter not-NONE?)) structure)))
|
||||
|
||||
(defn- all-transform-record [structure next-fn]
|
||||
(reduce
|
||||
(fn [res kv] (conj res (next-fn kv)))
|
||||
structure
|
||||
structure
|
||||
))
|
||||
|
||||
(extend-protocol AllTransformProtocol
|
||||
nil
|
||||
(all-transform [structure next-fn]
|
||||
nil)
|
||||
|
||||
|
||||
#?(:clj clojure.lang.MapEntry)
|
||||
#?(:clj
|
||||
(all-transform [structure next-fn]
|
||||
(let [newk (next-fn (key structure))
|
||||
newv (next-fn (val structure))]
|
||||
(clojure.lang.MapEntry. newk newv))))
|
||||
|
||||
|
||||
#?(:cljs cljs.core/MapEntry)
|
||||
#?(:cljs
|
||||
(all-transform [structure next-fn]
|
||||
(let [newk (next-fn (key structure))
|
||||
newv (next-fn (val structure))]
|
||||
(cljs.core/->MapEntry newk newv nil))))
|
||||
|
||||
#?(:clj clojure.lang.IPersistentVector :cljs cljs.core/PersistentVector)
|
||||
(all-transform [structure next-fn]
|
||||
(into []
|
||||
(comp (map next-fn)
|
||||
(filter not-NONE?))
|
||||
structure))
|
||||
|
||||
#?(:clj String :cljs string)
|
||||
(all-transform [structure next-fn]
|
||||
(apply str (into []
|
||||
(comp (map next-fn)
|
||||
(filter not-NONE?))
|
||||
structure)))
|
||||
|
||||
#?(:clj clojure.lang.PersistentHashSet :cljs cljs.core/PersistentHashSet)
|
||||
(all-transform [structure next-fn]
|
||||
(into #{}
|
||||
(comp (map next-fn)
|
||||
(filter not-NONE?))
|
||||
structure))
|
||||
|
||||
#?(:clj clojure.lang.PersistentArrayMap)
|
||||
#?(:bb
|
||||
(all-transform [structure next-fn]
|
||||
(non-transient-map-all-transform structure next-fn {}))
|
||||
:clj
|
||||
(all-transform [structure next-fn]
|
||||
(let [k-it (.keyIterator structure)
|
||||
v-it (.valIterator structure)
|
||||
none-cell (i/mutable-cell 0)
|
||||
len (.count structure)
|
||||
array (i/fast-object-array (* 2 len))]
|
||||
(loop [i 0
|
||||
j 0]
|
||||
(if (.hasNext k-it)
|
||||
(let [k (.next k-it)
|
||||
v (.next v-it)
|
||||
newkv (next-fn [k v])]
|
||||
(if (void-transformed-kv-pair? newkv)
|
||||
(do
|
||||
(i/update-cell! none-cell inc)
|
||||
(recur (+ i 2) j))
|
||||
(do
|
||||
(aset array j (nth newkv 0))
|
||||
(aset array (inc j) (nth newkv 1))
|
||||
(recur (+ i 2) (+ j 2)))))))
|
||||
(let [none-count (i/get-cell none-cell)
|
||||
array (if (not= 0 none-count)
|
||||
(java.util.Arrays/copyOf array (int (* 2 (- len none-count))))
|
||||
array
|
||||
)]
|
||||
(clojure.lang.PersistentArrayMap/createAsIfByAssoc array)))))
|
||||
|
||||
|
||||
#?(:cljs cljs.core/PersistentArrayMap)
|
||||
#?(:cljs
|
||||
(all-transform [structure next-fn]
|
||||
(non-transient-map-all-transform structure next-fn {})))
|
||||
|
||||
|
||||
#?(:clj clojure.lang.PersistentTreeMap :cljs cljs.core/PersistentTreeMap)
|
||||
(all-transform [structure next-fn]
|
||||
(non-transient-map-all-transform structure next-fn (empty structure)))
|
||||
|
||||
#?(:clj clojure.lang.IRecord)
|
||||
#?(:clj
|
||||
(all-transform [structure next-fn]
|
||||
(all-transform-record structure next-fn)))
|
||||
|
||||
#?(:clj clojure.lang.PersistentHashMap :cljs cljs.core/PersistentHashMap)
|
||||
(all-transform [structure next-fn]
|
||||
(persistent!
|
||||
(reduce-kv
|
||||
(fn [m k v]
|
||||
(let [newkv (next-fn [k v])]
|
||||
(if (void-transformed-kv-pair? newkv)
|
||||
m
|
||||
(assoc! m (nth newkv 0) (nth newkv 1)))))
|
||||
|
||||
(transient
|
||||
#?(:clj clojure.lang.PersistentHashMap/EMPTY :cljs cljs.core.PersistentHashMap.EMPTY))
|
||||
|
||||
structure)))
|
||||
|
||||
|
||||
|
||||
#?(:clj Object)
|
||||
#?(:clj
|
||||
(all-transform [structure next-fn]
|
||||
(let [empty-structure (empty structure)]
|
||||
(cond (and (list? empty-structure) (not (queue? empty-structure)))
|
||||
(all-transform-list structure next-fn)
|
||||
|
||||
(map? structure)
|
||||
;; reduce-kv is much faster than doing r/map through call to (into ...)
|
||||
(reduce-kv
|
||||
(fn [m k v]
|
||||
(let [newkv (next-fn [k v])]
|
||||
(if (void-transformed-kv-pair? newkv)
|
||||
m
|
||||
(assoc m (nth newkv 0) (nth newkv 1)))))
|
||||
|
||||
empty-structure
|
||||
structure)
|
||||
|
||||
|
||||
:else
|
||||
#?(:bb (into empty-structure
|
||||
(comp (map next-fn) (filter not-NONE?))
|
||||
structure)
|
||||
:clj (->> structure
|
||||
(r/map next-fn)
|
||||
(r/filter not-NONE?)
|
||||
(into empty-structure)))))))
|
||||
|
||||
|
||||
#?(:cljs default)
|
||||
#?(:cljs
|
||||
(all-transform [structure next-fn]
|
||||
(if (record? structure)
|
||||
;; this case is solely for cljs since extending to IRecord doesn't work for cljs
|
||||
(all-transform-record structure next-fn)
|
||||
(let [empty-structure (empty structure)]
|
||||
(cond
|
||||
(and (list? empty-structure) (not (queue? empty-structure)))
|
||||
(all-transform-list structure next-fn)
|
||||
|
||||
(map? structure)
|
||||
(reduce-kv
|
||||
(fn [m k v]
|
||||
(let [newkv (next-fn [k v])]
|
||||
(if (void-transformed-kv-pair? newkv)
|
||||
m
|
||||
(assoc m (nth newkv 0) (nth newkv 1)))))
|
||||
empty-structure
|
||||
structure)
|
||||
|
||||
:else
|
||||
(into empty-structure
|
||||
(comp (map next-fn) (filter not-NONE?))
|
||||
structure)))))))
|
||||
|
||||
|
||||
|
||||
(defprotocol MapTransformProtocol
|
||||
(map-vals-transform [structure next-fn])
|
||||
(map-keys-transform [structure next-fn])
|
||||
)
|
||||
|
||||
|
||||
|
||||
(defn map-vals-non-transient-transform [structure empty-map next-fn]
|
||||
(reduce-kv
|
||||
(fn [m k v]
|
||||
(let [newv (next-fn v)]
|
||||
(if (identical? newv i/NONE)
|
||||
m
|
||||
(assoc m k newv))))
|
||||
empty-map
|
||||
structure))
|
||||
|
||||
(defn map-keys-non-transient-transform [structure empty-map next-fn]
|
||||
(reduce-kv
|
||||
(fn [m k v]
|
||||
(let [newk (next-fn k)]
|
||||
(if (identical? newk i/NONE)
|
||||
m
|
||||
(assoc m newk v))))
|
||||
empty-map
|
||||
structure))
|
||||
|
||||
(extend-protocol MapTransformProtocol
|
||||
nil
|
||||
(map-vals-transform [structure next-fn]
|
||||
nil)
|
||||
(map-keys-transform [structure next-fn]
|
||||
nil)
|
||||
|
||||
|
||||
#?(:clj clojure.lang.PersistentArrayMap)
|
||||
#?(:bb
|
||||
(map-vals-transform [structure next-fn]
|
||||
(map-vals-non-transient-transform structure {} next-fn))
|
||||
:clj
|
||||
(map-vals-transform [structure next-fn]
|
||||
(let [k-it (.keyIterator structure)
|
||||
v-it (.valIterator structure)
|
||||
none-cell (i/mutable-cell 0)
|
||||
len (.count structure)
|
||||
array (i/fast-object-array (* 2 len))]
|
||||
(loop [i 0
|
||||
j 0]
|
||||
(if (.hasNext k-it)
|
||||
(let [k (.next k-it)
|
||||
v (.next v-it)
|
||||
newv (next-fn v)]
|
||||
(if (identical? newv i/NONE)
|
||||
(do
|
||||
(i/update-cell! none-cell inc)
|
||||
(recur (+ i 2) j))
|
||||
(do
|
||||
(aset array j k)
|
||||
(aset array (inc j) newv)
|
||||
(recur (+ i 2) (+ j 2)))))))
|
||||
(let [none-count (i/get-cell none-cell)
|
||||
array (if (not= 0 none-count)
|
||||
(java.util.Arrays/copyOf array (int (* 2 (- len none-count))))
|
||||
array
|
||||
)]
|
||||
(clojure.lang.PersistentArrayMap. array)))))
|
||||
#?(:bb
|
||||
(map-keys-transform [structure next-fn]
|
||||
(map-keys-non-transient-transform structure {} next-fn))
|
||||
:clj
|
||||
(map-keys-transform [structure next-fn]
|
||||
(let [k-it (.keyIterator structure)
|
||||
v-it (.valIterator structure)
|
||||
none-cell (i/mutable-cell 0)
|
||||
len (.count structure)
|
||||
array (i/fast-object-array (* 2 len))]
|
||||
(loop [i 0
|
||||
j 0]
|
||||
(if (.hasNext k-it)
|
||||
(let [k (.next k-it)
|
||||
v (.next v-it)
|
||||
newk (next-fn k)]
|
||||
(if (identical? newk i/NONE)
|
||||
(do
|
||||
(i/update-cell! none-cell inc)
|
||||
(recur (+ i 2) j))
|
||||
(do
|
||||
(aset array j newk)
|
||||
(aset array (inc j) v)
|
||||
(recur (+ i 2) (+ j 2)))))))
|
||||
(let [none-count (i/get-cell none-cell)
|
||||
array (if (not= 0 none-count)
|
||||
(java.util.Arrays/copyOf array (int (* 2 (- len none-count))))
|
||||
array
|
||||
)]
|
||||
(clojure.lang.PersistentArrayMap/createAsIfByAssoc array)))))
|
||||
|
||||
#?(:cljs cljs.core/PersistentArrayMap)
|
||||
#?(:cljs
|
||||
(map-vals-transform [structure next-fn]
|
||||
(map-vals-non-transient-transform structure {} next-fn)))
|
||||
#?(:cljs
|
||||
(map-keys-transform [structure next-fn]
|
||||
(map-keys-non-transient-transform structure {} next-fn)))
|
||||
|
||||
|
||||
#?(:clj clojure.lang.PersistentTreeMap :cljs cljs.core/PersistentTreeMap)
|
||||
(map-vals-transform [structure next-fn]
|
||||
(map-vals-non-transient-transform structure (empty structure) next-fn))
|
||||
(map-keys-transform [structure next-fn]
|
||||
(map-keys-non-transient-transform structure (empty structure) next-fn))
|
||||
|
||||
|
||||
#?(:clj clojure.lang.PersistentHashMap :cljs cljs.core/PersistentHashMap)
|
||||
(map-vals-transform [structure next-fn]
|
||||
(persistent!
|
||||
(reduce-kv
|
||||
(fn [m k v]
|
||||
(let [newv (next-fn v)]
|
||||
(if (identical? newv i/NONE)
|
||||
m
|
||||
(assoc! m k newv))))
|
||||
(transient
|
||||
#?(:clj clojure.lang.PersistentHashMap/EMPTY :cljs cljs.core.PersistentHashMap.EMPTY))
|
||||
|
||||
structure)))
|
||||
(map-keys-transform [structure next-fn]
|
||||
(persistent!
|
||||
(reduce-kv
|
||||
(fn [m k v]
|
||||
(let [newk (next-fn k)]
|
||||
(if (identical? newk i/NONE)
|
||||
m
|
||||
(assoc! m newk v))))
|
||||
(transient
|
||||
#?(:clj clojure.lang.PersistentHashMap/EMPTY :cljs cljs.core.PersistentHashMap.EMPTY))
|
||||
|
||||
structure)))
|
||||
|
||||
#?(:clj Object :cljs default)
|
||||
(map-vals-transform [structure next-fn]
|
||||
(reduce-kv
|
||||
(fn [m k v]
|
||||
(let [newv (next-fn v)]
|
||||
(if (identical? newv i/NONE)
|
||||
m
|
||||
(assoc m k newv))))
|
||||
(empty structure)
|
||||
structure))
|
||||
(map-keys-transform [structure next-fn]
|
||||
(reduce-kv
|
||||
(fn [m k v]
|
||||
(let [newk (next-fn k)]
|
||||
(if (identical? newk i/NONE)
|
||||
m
|
||||
(assoc m newk v))))
|
||||
(empty structure)
|
||||
structure)))
|
||||
|
||||
(defn srange-select [structure start end next-fn]
|
||||
(next-fn
|
||||
(if (string? structure)
|
||||
(subs structure start end)
|
||||
(-> structure vec (subvec start end))
|
||||
)))
|
||||
|
||||
(def srange-transform i/srange-transform*)
|
||||
|
||||
|
||||
(defn extract-basic-filter-fn [path]
|
||||
(cond (fn? path)
|
||||
path
|
||||
|
||||
(and (coll? path)
|
||||
(every? fn? path))
|
||||
(reduce
|
||||
(fn [combined afn]
|
||||
(fn [structure]
|
||||
(and (combined structure) (afn structure))))
|
||||
|
||||
path)))
|
||||
|
||||
|
||||
|
||||
|
||||
(defn if-select [vals structure next-fn then-tester then-nav else-nav]
|
||||
(i/exec-select*
|
||||
(if (then-tester structure) then-nav else-nav)
|
||||
vals
|
||||
structure
|
||||
next-fn))
|
||||
|
||||
|
||||
|
||||
(defn if-transform [vals structure next-fn then-tester then-nav else-nav]
|
||||
(i/exec-transform*
|
||||
(if (then-tester structure) then-nav else-nav)
|
||||
vals
|
||||
structure
|
||||
next-fn))
|
||||
|
||||
|
||||
|
||||
|
||||
(defprotocol AddExtremes
|
||||
(append-all [structure elements])
|
||||
(prepend-all [structure elements])
|
||||
(append-one [structure elem])
|
||||
(prepend-one [structure elem])
|
||||
)
|
||||
|
||||
(extend-protocol AddExtremes
|
||||
nil
|
||||
(append-all [_ elements]
|
||||
elements)
|
||||
(prepend-all [_ elements]
|
||||
elements)
|
||||
(append-one [_ elem]
|
||||
(list elem))
|
||||
(prepend-one [_ elem]
|
||||
(list elem))
|
||||
|
||||
#?(:clj clojure.lang.IPersistentVector :cljs cljs.core/PersistentVector)
|
||||
(append-all [structure elements]
|
||||
(reduce conj structure elements))
|
||||
(prepend-all [structure elements]
|
||||
(let [ret (transient [])]
|
||||
(as-> ret <>
|
||||
(reduce conj! <> elements)
|
||||
(reduce conj! <> structure)
|
||||
(persistent! <>))))
|
||||
(append-one [structure elem]
|
||||
(conj structure elem))
|
||||
(prepend-one [structure elem]
|
||||
(into [elem] structure))
|
||||
|
||||
#?(:cljs cljs.core/Subvec)
|
||||
#?(:cljs
|
||||
(append-all [structure elements]
|
||||
(reduce conj structure elements)))
|
||||
#?(:cljs
|
||||
(prepend-all [structure elements]
|
||||
(let [ret (transient [])]
|
||||
(as-> ret <>
|
||||
(reduce conj! <> elements)
|
||||
(reduce conj! <> structure)
|
||||
(persistent! <>)))))
|
||||
#?(:cljs
|
||||
(append-one [structure elem]
|
||||
(conj structure elem)))
|
||||
#?(:cljs
|
||||
(prepend-one [structure elem]
|
||||
(into [elem] structure)))
|
||||
|
||||
|
||||
#?(:clj Object :cljs default)
|
||||
(append-all [structure elements]
|
||||
(concat structure elements))
|
||||
(prepend-all [structure elements]
|
||||
(concat elements structure))
|
||||
(append-one [structure elem]
|
||||
(concat structure [elem]))
|
||||
(prepend-one [structure elem]
|
||||
(cons elem structure))
|
||||
)
|
||||
|
||||
|
||||
|
||||
(defprotocol UpdateExtremes
|
||||
(update-first [s afn])
|
||||
(update-last [s afn]))
|
||||
|
||||
(defprotocol GetExtremes
|
||||
(get-first [s])
|
||||
(get-last [s]))
|
||||
|
||||
(defprotocol FastEmpty
|
||||
(fast-empty? [s]))
|
||||
|
||||
(defprotocol InsertBeforeIndex
|
||||
(insert-before-idx [aseq idx val]))
|
||||
|
||||
(defnav PosNavigator [getter updater]
|
||||
(select* [this structure next-fn]
|
||||
(if-not (fast-empty? structure)
|
||||
(next-fn (getter structure))
|
||||
i/NONE))
|
||||
(transform* [this structure next-fn]
|
||||
(if (fast-empty? structure)
|
||||
structure
|
||||
(updater structure next-fn))))
|
||||
|
||||
#?(:bb
|
||||
(defn vec-count [v]
|
||||
(count v))
|
||||
|
||||
:clj
|
||||
(defn vec-count [^clojure.lang.IPersistentVector v]
|
||||
(.length v))
|
||||
|
||||
:cljs
|
||||
(defn vec-count [v]
|
||||
(count v)))
|
||||
|
||||
(defn- update-first-list [l afn]
|
||||
(let [newf (afn (first l))
|
||||
restl (rest l)]
|
||||
(if (identical? i/NONE newf)
|
||||
restl
|
||||
(cons newf restl))))
|
||||
|
||||
(defn- update-last-list [l afn]
|
||||
(let [lastl (afn (last l))
|
||||
bl (butlast l)]
|
||||
(if (identical? i/NONE lastl)
|
||||
(if (nil? bl) '() bl)
|
||||
(concat bl [lastl]))))
|
||||
|
||||
(defn- update-first-vector [v afn]
|
||||
(let [val (nth v 0)
|
||||
newv (afn val)]
|
||||
(if (identical? i/NONE newv)
|
||||
(subvec v 1)
|
||||
(assoc v 0 newv)
|
||||
)))
|
||||
|
||||
(defn- update-last-vector [v afn]
|
||||
;; type-hinting vec-count to ^int caused weird errors with case
|
||||
(let [c (int (vec-count v))]
|
||||
(case c
|
||||
1 (let [[e] v
|
||||
newe (afn e)]
|
||||
(if (identical? i/NONE newe)
|
||||
[]
|
||||
[newe]))
|
||||
2 (let [[e1 e2] v
|
||||
newe (afn e2)]
|
||||
(if (identical? i/NONE newe)
|
||||
[e1]
|
||||
[e1 newe]))
|
||||
(let [i (dec c)
|
||||
newe (afn (nth v i))]
|
||||
(if (identical? i/NONE newe)
|
||||
(pop v)
|
||||
(assoc v i newe))))))
|
||||
|
||||
|
||||
#?(:bb
|
||||
(defn transient-vec-count [v]
|
||||
(count v))
|
||||
|
||||
:clj
|
||||
(defn transient-vec-count [^clojure.lang.ITransientVector v]
|
||||
(.count v))
|
||||
|
||||
:cljs
|
||||
(defn transient-vec-count [v]
|
||||
(count v)))
|
||||
|
||||
|
||||
(extend-protocol UpdateExtremes
|
||||
#?(:clj clojure.lang.IPersistentVector :cljs cljs.core/PersistentVector)
|
||||
(update-first [v afn]
|
||||
(update-first-vector v afn))
|
||||
|
||||
(update-last [v afn]
|
||||
(update-last-vector v afn))
|
||||
|
||||
#?(:cljs cljs.core/Subvec)
|
||||
#?(:cljs
|
||||
(update-first [v afn]
|
||||
(update-first-vector v afn)))
|
||||
#?(:cljs
|
||||
(update-last [v afn]
|
||||
(update-last-vector v afn)))
|
||||
|
||||
#?(:clj String :cljs string)
|
||||
(update-first [s afn]
|
||||
(let [rests (subs s 1 (count s))
|
||||
newb (afn (nth s 0))]
|
||||
(if (identical? i/NONE newb)
|
||||
rests
|
||||
(str newb rests))))
|
||||
|
||||
(update-last [s afn]
|
||||
(let [last-idx (-> s count dec)
|
||||
newl (afn (nth s last-idx))
|
||||
begins (subs s 0 last-idx)]
|
||||
(if (identical? i/NONE newl)
|
||||
begins
|
||||
(str begins newl)
|
||||
)))
|
||||
|
||||
#?(:cljs cljs.core/MapEntry)
|
||||
#?(:cljs
|
||||
(update-first [e afn]
|
||||
(cljs.core/->MapEntry (-> e key afn) (val e) nil)))
|
||||
#?(:cljs
|
||||
(update-last [e afn]
|
||||
(cljs.core/->MapEntry (key e) (-> e val afn) nil)))
|
||||
|
||||
#?(:clj Object :cljs default)
|
||||
(update-first [l val]
|
||||
(update-first-list l val))
|
||||
(update-last [l val]
|
||||
(update-last-list l val)))
|
||||
|
||||
|
||||
(extend-protocol GetExtremes
|
||||
#?(:clj clojure.lang.IPersistentVector :cljs cljs.core/PersistentVector)
|
||||
(get-first [v]
|
||||
(nth v 0))
|
||||
(get-last [v]
|
||||
(peek v))
|
||||
|
||||
#?(:clj Object :cljs default)
|
||||
(get-first [s]
|
||||
(first s))
|
||||
(get-last [s]
|
||||
(last s))
|
||||
|
||||
#?(:cljs cljs.core/MapEntry)
|
||||
#?(:cljs
|
||||
(get-first [e]
|
||||
(key e)))
|
||||
#?(:cljs
|
||||
(get-last [e]
|
||||
(val e)))
|
||||
|
||||
#?(:clj String :cljs string)
|
||||
(get-first [s]
|
||||
(nth s 0))
|
||||
(get-last [s]
|
||||
(nth s (-> s count dec))
|
||||
))
|
||||
|
||||
|
||||
|
||||
(extend-protocol FastEmpty
|
||||
nil
|
||||
(fast-empty? [_] true)
|
||||
|
||||
#?(:clj clojure.lang.IPersistentVector :cljs cljs.core/PersistentVector)
|
||||
(fast-empty? [v]
|
||||
(= 0 (vec-count v)))
|
||||
#?(:clj clojure.lang.ITransientVector :cljs cljs.core/TransientVector)
|
||||
(fast-empty? [v]
|
||||
(= 0 (transient-vec-count v)))
|
||||
#?(:clj Object :cljs default)
|
||||
(fast-empty? [s]
|
||||
(empty? s)))
|
||||
|
||||
|
||||
(defn- do-keypath-transform [vals structure key next-fn]
|
||||
(let [newv (next-fn vals (get structure key))]
|
||||
(if (identical? newv i/NONE)
|
||||
(if (sequential? structure)
|
||||
(i/srange-transform* structure key (inc key) (fn [_] []))
|
||||
(dissoc structure key))
|
||||
(assoc structure key newv))))
|
||||
|
||||
(defrichnav
|
||||
^{:doc "Navigates to the specified key, navigating to nil if it does not exist.
|
||||
Setting the value to NONE will remove it from the collection."}
|
||||
keypath*
|
||||
[key]
|
||||
(select* [this vals structure next-fn]
|
||||
(next-fn vals (get structure key)))
|
||||
(transform* [this vals structure next-fn]
|
||||
(do-keypath-transform vals structure key next-fn)
|
||||
))
|
||||
|
||||
|
||||
(defrichnav
|
||||
^{:doc "Navigates to the key only if it exists in the map. Setting the value to NONE
|
||||
will remove it from the collection."}
|
||||
must*
|
||||
[k]
|
||||
(select* [this vals structure next-fn]
|
||||
(if (contains? structure k)
|
||||
(next-fn vals (get structure k))
|
||||
i/NONE))
|
||||
(transform* [this vals structure next-fn]
|
||||
(if (contains? structure k)
|
||||
(do-keypath-transform vals structure k next-fn)
|
||||
structure)))
|
||||
|
||||
(defrichnav nthpath*
|
||||
^{:doc "Navigates to the given position in the sequence. Setting the value to NONE
|
||||
will remove it from the sequence. Works for all sequence types."}
|
||||
[i]
|
||||
(select* [this vals structure next-fn]
|
||||
(next-fn vals (nth structure i)))
|
||||
(transform* [this vals structure next-fn]
|
||||
(if (vector? structure)
|
||||
(let [newv (next-fn vals (nth structure i))]
|
||||
(if (identical? newv i/NONE)
|
||||
(i/srange-transform* structure i (inc i) (fn [_] []))
|
||||
(assoc structure i newv)))
|
||||
(i/srange-transform* ; can make this much more efficient with alternate impl
|
||||
structure
|
||||
i
|
||||
(inc i)
|
||||
(fn [[e]]
|
||||
(let [v (next-fn vals e)]
|
||||
(if (identical? v i/NONE)
|
||||
[]
|
||||
[v])
|
||||
))))))
|
||||
|
||||
(defrecord SrangeEndFunction [end-fn])
|
||||
|
||||
;; done this way to maintain backwards compatibility
|
||||
(defn invoke-end-fn [end-fn structure start]
|
||||
(if (instance? SrangeEndFunction end-fn)
|
||||
((:end-fn end-fn) structure start)
|
||||
(end-fn structure)
|
||||
))
|
||||
|
||||
(defn- insert-before-index-list [lst idx val]
|
||||
;; an implementation that is most efficient for list style structures
|
||||
(let [[front back] (split-at idx lst)]
|
||||
(concat front (cons val back))))
|
||||
|
||||
(extend-protocol InsertBeforeIndex
|
||||
nil
|
||||
(insert-before-idx [_ idx val]
|
||||
(if (= 0 idx)
|
||||
(list val)
|
||||
(throw (ex-info "For a nil structure, can only insert before index 0"
|
||||
{:insertion-index idx}))))
|
||||
|
||||
#?(:clj java.lang.String :cljs string)
|
||||
(insert-before-idx [aseq idx val]
|
||||
(apply str (insert-before-index-list aseq idx val)))
|
||||
|
||||
#?(:clj clojure.lang.LazySeq :cljs cljs.core/LazySeq)
|
||||
(insert-before-idx [aseq idx val]
|
||||
(insert-before-index-list aseq idx val))
|
||||
|
||||
#?(:clj clojure.lang.IPersistentVector :cljs cljs.core/PersistentVector)
|
||||
(insert-before-idx [aseq idx val]
|
||||
(let [front (subvec aseq 0 idx)
|
||||
back (subvec aseq idx)]
|
||||
(into (conj front val) back)))
|
||||
|
||||
#?(:clj clojure.lang.IPersistentList :cljs cljs.core/List)
|
||||
(insert-before-idx [aseq idx val]
|
||||
(cond (= idx 0)
|
||||
(cons val aseq)
|
||||
:else (insert-before-index-list aseq idx val))))
|
||||
23
src/clj/com/rpl/specter/protocols.clj
Normal file
23
src/clj/com/rpl/specter/protocols.clj
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
(ns com.rpl.specter.protocols)
|
||||
|
||||
|
||||
;;TODO: might be able to speed it up more by having these return a function rather than
|
||||
;;rely on protocol methods (can then compose functions together directly)
|
||||
;;so protocol would just be used during composition - what about execution?
|
||||
;;could have a select-fast function that takes in a selector FUNCTION explicitly
|
||||
(defprotocol StructureValsPath
|
||||
(select-full* [this vals structure next-fn])
|
||||
(update-full* [this vals structure next-fn]))
|
||||
|
||||
(defprotocol StructurePath
|
||||
(select* [this structure next-fn])
|
||||
(update* [this structure next-fn]))
|
||||
|
||||
(defprotocol Collector
|
||||
(collect-val [this structure]))
|
||||
|
||||
;;TODO: Collectors in sequence become a StructureValsPath that does all collection at once
|
||||
;;StructurePath in sequence become a single StructurePath
|
||||
;;any StructureValsPath composed with anything becomes a StructureValsPath
|
||||
;;TODO: update update/select to be able to execute a StructurePath directly without coercing it
|
||||
;; - this will avoid MANY layers of indirection and overhead
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
(ns com.rpl.specter.protocols)
|
||||
|
||||
(defprotocol RichNavigator
|
||||
"Do not use this protocol directly. All navigators must be created using macros
|
||||
in com.rpl.specter namespace."
|
||||
(select* [this vals structure next-fn]
|
||||
"An implementation of `select*` must call `next-fn` on each
|
||||
subvalue of `structure`. The result of `select*` is specified
|
||||
as follows:
|
||||
|
||||
1. `NONE` if `next-fn` never called
|
||||
2. `NONE` if all calls to `next-fn` return `NONE`
|
||||
3. Otherwise, any non-`NONE` return value from calling `next-fn`
|
||||
")
|
||||
(transform* [this vals structure next-fn]
|
||||
"An implementation of `transform*` must use `next-fn` to transform
|
||||
any subvalues of `structure` and then merge those transformed values
|
||||
back into `structure`. Everything else in `structure` must be unchanged."))
|
||||
|
||||
|
||||
(defprotocol Collector
|
||||
"Do not use this protocol directly. All navigators must be created using
|
||||
macros in com.rpl.specter namespace."
|
||||
(collect-val [this structure]))
|
||||
|
||||
(defprotocol ImplicitNav
|
||||
(implicit-nav [obj]))
|
||||
|
|
@ -1,100 +0,0 @@
|
|||
(ns com.rpl.specter.transients
|
||||
#?(:cljs
|
||||
(:require-macros [com.rpl.specter
|
||||
:refer
|
||||
[defnav]]))
|
||||
(:use #?(:clj
|
||||
[com.rpl.specter :only
|
||||
[defnav]]))
|
||||
(:require [com.rpl.specter.navs :as n]
|
||||
[com.rpl.specter :refer [subselect selected?]]))
|
||||
|
||||
(defnav
|
||||
^{:doc "Navigates to the specified key of a transient collection,
|
||||
navigating to nil if it doesn't exist."}
|
||||
keypath!
|
||||
[key]
|
||||
(select* [this structure next-fn]
|
||||
(next-fn (get structure key)))
|
||||
(transform* [this structure next-fn]
|
||||
(assoc! structure key (next-fn (get structure key)))))
|
||||
|
||||
|
||||
|
||||
(defnav
|
||||
^{:doc "Navigates to an empty (persistent) vector at the end of a transient vector."}
|
||||
END!
|
||||
[]
|
||||
(select* [this structure next-fn]
|
||||
(next-fn []))
|
||||
(transform* [this structure next-fn]
|
||||
(let [res (next-fn [])]
|
||||
(reduce conj! structure res))))
|
||||
|
||||
(defn- t-get-first
|
||||
[tv]
|
||||
(nth tv 0))
|
||||
|
||||
(defn- t-get-last
|
||||
[tv]
|
||||
(nth tv (dec (n/transient-vec-count tv))))
|
||||
|
||||
(defn- t-update-first
|
||||
[tv next-fn]
|
||||
(assoc! tv 0 (next-fn (nth tv 0))))
|
||||
|
||||
(defn- t-update-last
|
||||
[tv next-fn]
|
||||
(let [i (dec (n/transient-vec-count tv))]
|
||||
(assoc! tv i (next-fn (nth tv i)))))
|
||||
|
||||
|
||||
(def FIRST!
|
||||
"Navigates to the first element of a transient vector."
|
||||
(n/PosNavigator t-get-first t-update-first))
|
||||
|
||||
(def LAST!
|
||||
"Navigates to the last element of a transient vector."
|
||||
(n/PosNavigator t-get-last t-update-last))
|
||||
|
||||
#?(
|
||||
:clj
|
||||
(defn- select-keys-from-transient-map
|
||||
"Selects keys from transient map, because built-in select-keys uses
|
||||
`find` which is unsupported."
|
||||
[m m-keys]
|
||||
(loop [result {}
|
||||
m-keys m-keys]
|
||||
(if-not (seq m-keys)
|
||||
result
|
||||
(let [k (first m-keys)
|
||||
;; support Clojure 1.6 where contains? is broken on transients
|
||||
item (get m k ::not-found)]
|
||||
(recur (if-not (identical? item ::not-found)
|
||||
(assoc result k item)
|
||||
result)
|
||||
(rest m-keys))))))
|
||||
|
||||
:cljs
|
||||
(defn- select-keys-from-transient-map
|
||||
"Uses select-keys on a transient map."
|
||||
[m m-keys]
|
||||
(select-keys m m-keys)))
|
||||
|
||||
|
||||
(defnav
|
||||
^{:doc "Navigates to the specified persistent submap of a transient map."}
|
||||
submap!
|
||||
[m-keys]
|
||||
(select* [this structure next-fn]
|
||||
(next-fn (select-keys-from-transient-map structure m-keys)))
|
||||
(transform* [this structure next-fn]
|
||||
(let [selected (select-keys-from-transient-map structure m-keys)
|
||||
res (next-fn selected)]
|
||||
(as-> structure %
|
||||
(reduce (fn [m k]
|
||||
(dissoc! m k))
|
||||
% m-keys)
|
||||
(reduce-kv (fn [m k v]
|
||||
(assoc! m k v))
|
||||
% res)))))
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
(ns com.rpl.specter.util-macros)
|
||||
|
||||
(defmacro doseqres [backup-res [n aseq] & body]
|
||||
`(reduce
|
||||
(fn [curr# ~n]
|
||||
(let [ret# (do ~@body)]
|
||||
(if (identical? ret# ~backup-res)
|
||||
curr#
|
||||
(if (reduced? ret#) (reduced ret#) ret#))))
|
||||
|
||||
~backup-res
|
||||
~aseq))
|
||||
|
||||
(defn- gensyms [amt]
|
||||
(vec (repeatedly amt gensym)))
|
||||
|
||||
(defmacro mk-comp-navs []
|
||||
(let [impls (for [i (range 3 20)]
|
||||
(let [[fsym & rsyms :as syms] (gensyms i)]
|
||||
`([~@syms] (~'comp-navs ~fsym (~'comp-navs ~@rsyms)))))
|
||||
last-syms (gensyms 19)]
|
||||
`(defn ~'comp-navs
|
||||
([] ~'com.rpl.specter.impl/STAY*)
|
||||
([nav1#] nav1#)
|
||||
([nav1# nav2#] (~'com.rpl.specter.impl/combine-two-navs nav1# nav2#))
|
||||
~@impls
|
||||
([~@last-syms ~'& rest#]
|
||||
(~'comp-navs
|
||||
(~'comp-navs ~@last-syms)
|
||||
(reduce ~'comp-navs rest#))))))
|
||||
|
||||
|
||||
|
||||
;;TODO: move these definitions somewhere else
|
||||
(defn late-fn-record-name [i]
|
||||
(symbol (str "LateFn" i)))
|
||||
|
||||
(defn late-fn-record-constructor-name [i]
|
||||
(symbol (str "->LateFn" i)))
|
||||
|
||||
(defn- mk-late-fn-record [i]
|
||||
(let [fields (concat ['fn] (for [j (range i)] (symbol (str "arg" j))))
|
||||
dparams (gensym "dynamic-params")
|
||||
resolvers (for [f fields]
|
||||
`(~'late-resolve ~f ~dparams))]
|
||||
`(defrecord ~(late-fn-record-name i) [~@fields]
|
||||
~'LateResolve
|
||||
(~'late-resolve [this# ~dparams]
|
||||
(~@resolvers)))))
|
||||
|
||||
|
||||
(defmacro mk-late-fn-records []
|
||||
(let [impls (for [i (range 20)] (mk-late-fn-record i))]
|
||||
`(do ~@impls)))
|
||||
|
||||
(defmacro mk-late-fn []
|
||||
(let [f (gensym "afn")
|
||||
args (gensym "args")
|
||||
cases (for [i (range 19)]
|
||||
[i
|
||||
(let [gets (for [j (range i)] `(nth ~args ~j))]
|
||||
`(~(late-fn-record-constructor-name i)
|
||||
~f
|
||||
~@gets))])]
|
||||
`(defn ~'late-fn [~f ~args]
|
||||
(case (count ~args)
|
||||
~@(apply concat cases)
|
||||
(throw (ex-info "Cannot have late function with more than 18 args" {}))))))
|
||||
|
|
@ -1,138 +0,0 @@
|
|||
(ns com.rpl.specter.zipper
|
||||
#?(:cljs (:require-macros
|
||||
[com.rpl.specter
|
||||
:refer [defnav nav declarepath providepath recursive-path]]))
|
||||
#?(:clj
|
||||
(:use
|
||||
[com.rpl.specter :only [defnav nav declarepath providepath
|
||||
recursive-path]]))
|
||||
(:require [com.rpl.specter :as s]
|
||||
[clojure.zip :as zip]))
|
||||
|
||||
(defnav zipper [constructor]
|
||||
(select* [this structure next-fn]
|
||||
(next-fn (constructor structure)))
|
||||
(transform* [this structure next-fn]
|
||||
(zip/root (next-fn (constructor structure)))))
|
||||
|
||||
|
||||
(def VECTOR-ZIP (zipper zip/vector-zip))
|
||||
(def SEQ-ZIP (zipper zip/seq-zip))
|
||||
(def XML-ZIP (zipper zip/xml-zip))
|
||||
|
||||
|
||||
(def ^{:doc "Navigate to the next element in the structure.
|
||||
If no next element, works like STOP."}
|
||||
NEXT
|
||||
(s/comp-paths
|
||||
(s/view zip/next)
|
||||
(s/if-path zip/end?
|
||||
s/STOP
|
||||
s/STAY)))
|
||||
|
||||
|
||||
(defn- mk-zip-nav [znav]
|
||||
(nav []
|
||||
(select* [this structure next-fn]
|
||||
(let [ret (znav structure)]
|
||||
(if ret (next-fn ret))))
|
||||
|
||||
(transform* [this structure next-fn]
|
||||
(let [ret (znav structure)]
|
||||
(if ret (next-fn ret) structure)))))
|
||||
|
||||
|
||||
;; (multi-path RIGHT LEFT) will not navigate to the right and left
|
||||
;; of the currently navigated element because locations aren't stable
|
||||
;; like they are for maps/graphs. The path following RIGHT could
|
||||
;; insert lots of elements all over the sequence, and there's no
|
||||
;; way to determine how to get "back".
|
||||
(def ^{:doc "Navigate to the element to the right.
|
||||
If no element there, works like STOP."}
|
||||
RIGHT (mk-zip-nav zip/right))
|
||||
|
||||
(def ^{:doc "Navigate to the element to the left.
|
||||
If no element there, works like STOP."}
|
||||
LEFT (mk-zip-nav zip/left))
|
||||
|
||||
(def DOWN (mk-zip-nav zip/down))
|
||||
(def UP (mk-zip-nav zip/up))
|
||||
|
||||
(def ^{:doc "Navigate to the previous element.
|
||||
If this is the first element, works like STOP."}
|
||||
PREV (mk-zip-nav zip/prev))
|
||||
|
||||
(def RIGHTMOST (s/view zip/rightmost))
|
||||
(def LEFTMOST (s/view zip/leftmost))
|
||||
|
||||
(defn- inner-insert [structure next-fn inserter mover backer]
|
||||
(let [to-insert (next-fn [])
|
||||
inserts (reduce
|
||||
(fn [z e] (-> z (inserter e) mover))
|
||||
structure
|
||||
to-insert)]
|
||||
|
||||
(if backer
|
||||
(reduce (fn [z _] (backer z)) inserts to-insert)
|
||||
inserts)))
|
||||
|
||||
|
||||
(defnav ^{:doc "Navigate to the empty subsequence directly to the
|
||||
right of this element."}
|
||||
INNER-RIGHT []
|
||||
(select* [this structure next-fn]
|
||||
(next-fn []))
|
||||
(transform* [this structure next-fn]
|
||||
(inner-insert structure next-fn zip/insert-right zip/right zip/left)))
|
||||
|
||||
|
||||
(defnav ^{:doc "Navigate to the empty subsequence directly to the
|
||||
left of this element."}
|
||||
INNER-LEFT []
|
||||
(select* [this structure next-fn]
|
||||
(next-fn []))
|
||||
(transform* [this structure next-fn]
|
||||
(inner-insert structure next-fn zip/insert-left identity nil)))
|
||||
|
||||
|
||||
(defnav NODE []
|
||||
(select* [this structure next-fn]
|
||||
(next-fn (zip/node structure)))
|
||||
|
||||
(transform* [this structure next-fn]
|
||||
(zip/edit structure next-fn)))
|
||||
|
||||
|
||||
(defnav ^{:doc "Navigate to the subsequence containing only
|
||||
the node currently pointed to. This works just
|
||||
like srange and can be used to remove elements
|
||||
from the structure"}
|
||||
NODE-SEQ []
|
||||
(select* [this structure next-fn]
|
||||
(next-fn [(zip/node structure)]))
|
||||
|
||||
(transform* [this structure next-fn]
|
||||
(let [to-insert (next-fn [(zip/node structure)])
|
||||
inserted (reduce zip/insert-left structure to-insert)]
|
||||
(zip/remove inserted))))
|
||||
|
||||
|
||||
(def ^{:doc "Navigate the zipper to the first element
|
||||
in the structure matching predfn. A linear scan
|
||||
is done using NEXT to find the element."}
|
||||
find-first
|
||||
(recursive-path [predfn] p
|
||||
(s/if-path [NODE (s/pred predfn)]
|
||||
s/STAY
|
||||
[NEXT p])))
|
||||
|
||||
|
||||
|
||||
(declarepath ^{:doc "Navigate to every element reachable using calls
|
||||
to NEXT"}
|
||||
NEXT-WALK)
|
||||
|
||||
(providepath NEXT-WALK
|
||||
(s/stay-then-continue
|
||||
NEXT
|
||||
NEXT-WALK))
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
package com.rpl.specter;
|
||||
|
||||
public class MutableCell {
|
||||
private Object o;
|
||||
|
||||
public MutableCell(Object o) {
|
||||
this.o = o;
|
||||
}
|
||||
|
||||
public Object get() {
|
||||
return o;
|
||||
}
|
||||
|
||||
public void set(Object o) {
|
||||
this.o = o;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
package com.rpl.specter;
|
||||
|
||||
public class Util {
|
||||
public static Object[] makeObjectArray(int size) {
|
||||
return new Object[size];
|
||||
}
|
||||
}
|
||||
229
test/clj/com/rpl/specter/core_test.clj
Normal file
229
test/clj/com/rpl/specter/core_test.clj
Normal file
|
|
@ -0,0 +1,229 @@
|
|||
(ns com.rpl.specter.core-test
|
||||
(:use [clojure.test]
|
||||
[clojure.test.check.clojure-test]
|
||||
[com.rpl specter]
|
||||
[com.rpl.specter test-helpers])
|
||||
(:require [clojure.test.check
|
||||
[generators :as gen]
|
||||
[properties :as prop]]
|
||||
[clojure.test.check :as qc]))
|
||||
|
||||
;;TODO:
|
||||
;; test walk, codewalk
|
||||
;; test keypath
|
||||
;; test comp-structure-paths
|
||||
|
||||
(defn gen-map-with-keys [key-gen val-gen & keys]
|
||||
(gen/bind (gen/map key-gen val-gen)
|
||||
(fn [m]
|
||||
(gen/bind
|
||||
(apply gen/hash-map (mapcat (fn [k] [k val-gen]) keys))
|
||||
(fn [m2]
|
||||
(gen/return (merge m m2)))))))
|
||||
|
||||
(defspec select-all-keyword-filter
|
||||
(for-all+
|
||||
[kw gen/keyword
|
||||
v (gen/vector (max-size 5
|
||||
(gen-map-with-keys gen/keyword gen/int kw)))
|
||||
pred (gen/elements [odd? even?])]
|
||||
(= (select [ALL kw pred] v)
|
||||
(->> v (map kw) (filter pred))
|
||||
)))
|
||||
|
||||
(defspec select-pos-extreme-pred
|
||||
(for-all+
|
||||
[v (gen/vector gen/int)
|
||||
pred (gen/elements [odd? even?])
|
||||
pos (gen/elements [[FIRST first] [LAST last]])]
|
||||
(= (select-one [(filterer pred) (first pos)] v)
|
||||
(->> v (filter pred) ((last pos)))
|
||||
)))
|
||||
|
||||
(defspec select-all-on-map
|
||||
(for-all+
|
||||
[m (max-size 5 (gen/map gen/keyword gen/int))]
|
||||
(= (select [ALL LAST] m)
|
||||
(for [[k v] m] v))
|
||||
))
|
||||
|
||||
(deftest select-one-test
|
||||
(is (thrown? Exception (select-one [ALL even?] [1 2 3 4])))
|
||||
(is (= 1 (select-one [ALL odd?] [2 4 1 6])))
|
||||
)
|
||||
|
||||
(deftest select-first-test
|
||||
(is (= 7 (select-first [(filterer odd?) ALL #(> % 4)] [3 4 2 3 7 5 9 8])))
|
||||
(is (nil? (select-first [ALL even?] [1 3 5 9])))
|
||||
)
|
||||
|
||||
(defspec update-all-on-map
|
||||
(for-all+
|
||||
[m (max-size 5 (gen/map gen/keyword gen/int))]
|
||||
(= (update [ALL LAST] inc m)
|
||||
(into {} (for [[k v] m] [k (inc v)]))
|
||||
)))
|
||||
|
||||
(defspec update-all
|
||||
(for-all+
|
||||
[v (gen/vector gen/int)]
|
||||
(let [v2 (update [ALL] inc v)]
|
||||
(and (vector? v2) (= v2 (map inc v)))
|
||||
)))
|
||||
|
||||
(defspec update-all-list
|
||||
(for-all+
|
||||
[v (gen/list gen/int)]
|
||||
(let [v2 (update [ALL] inc v)]
|
||||
(and (seq? v2) (= v2 (map inc v)))
|
||||
)))
|
||||
|
||||
(defspec update-all-filter
|
||||
(for-all+
|
||||
[v (gen/vector gen/int)
|
||||
pred (gen/elements [odd? even?])
|
||||
action (gen/elements [inc dec])]
|
||||
(let [v2 (update [ALL pred] action v)]
|
||||
(= v2 (map (fn [v] (if (pred v) (action v) v)) v))
|
||||
)))
|
||||
|
||||
(defspec update-last
|
||||
(for-all+
|
||||
[v (gen/not-empty (gen/vector gen/int))
|
||||
pred (gen/elements [inc dec])]
|
||||
(let [v2 (update [LAST] pred v)]
|
||||
(= v2 (concat (butlast v) [(pred (last v))]))
|
||||
)))
|
||||
|
||||
(defspec update-first
|
||||
(for-all+
|
||||
[v (gen/not-empty (gen/vector gen/int))
|
||||
pred (gen/elements [inc dec])]
|
||||
(let [v2 (update [FIRST] pred v)]
|
||||
(= v2 (concat [(pred (first v))] (rest v) ))
|
||||
)))
|
||||
|
||||
(defspec update-filterer-all-equivalency
|
||||
(prop/for-all
|
||||
[v (gen/vector gen/int)]
|
||||
(let [v2 (update [(filterer odd?) ALL] inc v)
|
||||
v3 (update [ALL odd?] inc v)]
|
||||
(= v2 v3))
|
||||
))
|
||||
|
||||
(defspec update-with-context
|
||||
(for-all+
|
||||
[kw1 gen/keyword
|
||||
kw2 gen/keyword
|
||||
m (max-size 10 (gen-map-with-keys gen/keyword gen/int kw1 kw2))
|
||||
pred (gen/elements [odd? even?])]
|
||||
(= (update [(collect-one kw2) kw1 pred] + m)
|
||||
(if (pred (kw1 m))
|
||||
(assoc m kw1 (+ (kw1 m) (kw2 m)))
|
||||
m
|
||||
))))
|
||||
|
||||
(defn differing-elements [v1 v2]
|
||||
(->> (map vector v1 v2)
|
||||
(map-indexed (fn [i [e1 e2]]
|
||||
(if (not= e1 e2)
|
||||
i)))
|
||||
(filter identity)))
|
||||
|
||||
(defspec update-last-compound
|
||||
(for-all+
|
||||
[v (gen/such-that #(some odd? %) (gen/vector gen/int))]
|
||||
(let [v2 (update [(filterer odd?) LAST] inc v)
|
||||
differing-elems (differing-elements v v2)]
|
||||
(and (= (count v2) (count v))
|
||||
(= (count differing-elems) 1)
|
||||
(every? even? (drop (first differing-elems) v2))
|
||||
))))
|
||||
|
||||
;; max sizes prevent too much data from being generated and keeps test from taking forever
|
||||
(defspec update-keyword
|
||||
(for-all+
|
||||
[k1 (max-size 3 gen/keyword)
|
||||
k2 (max-size 3 gen/keyword)
|
||||
m1 (max-size 5
|
||||
(gen-map-with-keys
|
||||
gen/keyword
|
||||
(gen-map-with-keys gen/keyword gen/int k2)
|
||||
k1))
|
||||
pred (gen/elements [inc dec])]
|
||||
(let [m2 (update [k1 k2] pred m1)]
|
||||
(= (assoc-in m1 [k1 k2] nil) (assoc-in m2 [k1 k2] nil))
|
||||
(= (pred (get-in m1 [k1 k2])) (get-in m2 [k1 k2]))
|
||||
)))
|
||||
|
||||
(defspec replace-in-test
|
||||
(for-all+
|
||||
[v (gen/vector gen/int)]
|
||||
(let [res (->> v (map (fn [v] (if (even? v) (inc v) v))))
|
||||
user-ret (->> v
|
||||
(filter even?)
|
||||
(map (fn [v] [v v]))
|
||||
(apply concat))
|
||||
user-ret (if (empty? user-ret) nil user-ret)]
|
||||
(= (replace-in [ALL even?] (fn [v] [(inc v) [v v]]) v)
|
||||
[res user-ret]
|
||||
))))
|
||||
|
||||
(defspec replace-in-custom-merge
|
||||
(for-all+
|
||||
[v (gen/vector gen/int)]
|
||||
(let [res (->> v (map (fn [v] (if (even? v) (inc v) v))))
|
||||
last-even (->> v (filter even?) last)
|
||||
user-ret (if last-even {:a last-even})]
|
||||
(= (replace-in [ALL even?] (fn [v] [(inc v) v]) v :merge-fn (fn [curr new]
|
||||
(assoc curr :a new)))
|
||||
[res user-ret]
|
||||
))))
|
||||
|
||||
(defspec srange-extremes-test
|
||||
(for-all+
|
||||
[v (gen/vector gen/int)
|
||||
v2 (gen/vector gen/int)]
|
||||
(let [b (setval START v2 v)
|
||||
e (setval END v2 v)]
|
||||
(and (= b (concat v2 v))
|
||||
(= e (concat v v2)))
|
||||
)))
|
||||
|
||||
(defspec srange-test
|
||||
(for-all+
|
||||
[v (gen/vector gen/int)
|
||||
b (gen/elements (-> v count inc range))
|
||||
e (gen/elements (range b (-> v count inc)))
|
||||
]
|
||||
(let [sv (subvec v b e)
|
||||
predcount (fn [pred v] (->> v (filter pred) count))
|
||||
even-count (partial predcount even?)
|
||||
odd-count (partial predcount odd?)
|
||||
b (update (srange b e) (fn [r] (filter odd? r)) v)]
|
||||
(and (= (odd-count v) (odd-count b))
|
||||
(= (+ (even-count b) (even-count sv))
|
||||
(even-count v)))
|
||||
)))
|
||||
|
||||
(deftest structure-path-directly-test
|
||||
(is (= 3 (select-one :b {:a 1 :b 3})))
|
||||
(is (= 5 (select-one (comp-paths :a :b) {:a {:b 5}})))
|
||||
)
|
||||
|
||||
(defspec view-test
|
||||
(for-all+
|
||||
[i gen/int
|
||||
afn (gen/elements [inc dec])]
|
||||
(= (first (select (view afn) i))
|
||||
(first (select (viewfn [i] (afn i)) i))
|
||||
(afn i)
|
||||
(update (view afn) identity i)
|
||||
)))
|
||||
|
||||
(deftest selected?-test
|
||||
(is (= [[1 3 5] [2 :a] [7 11 4 2 :a] [10 1 :a] []]
|
||||
(setval [ALL (selected? ALL even?) END]
|
||||
[:a]
|
||||
[[1 3 5] [2] [7 11 4 2] [10 1] []]
|
||||
))))
|
||||
32
test/clj/com/rpl/specter/test_helpers.clj
Normal file
32
test/clj/com/rpl/specter/test_helpers.clj
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
(ns com.rpl.specter.test-helpers
|
||||
(:use [clojure.test]
|
||||
[clojure.test.check.clojure-test])
|
||||
(:require [clojure.test.check
|
||||
[generators :as gen]
|
||||
[properties :as prop]]
|
||||
[clojure.test.check :as qc]
|
||||
[clojure.pprint :as pp]))
|
||||
|
||||
;; it seems like gen/bind and gen/return are a monad (hence the names)
|
||||
(defmacro for-all+ [bindings & body]
|
||||
(let [parts (partition 2 bindings)
|
||||
vars (vec (map first parts))
|
||||
genned (reduce
|
||||
(fn [curr [v code]]
|
||||
`(gen/bind ~code (fn [~v] ~curr)))
|
||||
`(gen/return ~vars)
|
||||
(reverse parts))]
|
||||
`(prop/for-all [~vars ~genned]
|
||||
~@body )))
|
||||
|
||||
(defn max-size [n {gen :gen}]
|
||||
(gen/make-gen
|
||||
(fn [rnd _size]
|
||||
(gen rnd (if (< _size n) _size n)))))
|
||||
|
||||
|
||||
(defn gen-tuple+ [& inputs]
|
||||
(->> inputs
|
||||
(map #(if (gen/generator? %) % (gen/return %)))
|
||||
(apply gen/tuple)
|
||||
))
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
(ns com.rpl.specter.cljs-test-helpers)
|
||||
|
||||
;; it seems like gen/bind and gen/return are a monad (hence the names)
|
||||
(defmacro for-all+ [bindings & body]
|
||||
(let [parts (partition 2 bindings)
|
||||
vars (vec (map first parts))
|
||||
genned (reduce
|
||||
(fn [curr [v code]]
|
||||
`(clojure.test.check.generators/bind ~code (fn [~v] ~curr)))
|
||||
`(clojure.test.check.generators/return ~vars)
|
||||
(reverse parts))]
|
||||
`(clojure.test.check.properties/for-all [~vars ~genned]
|
||||
~@body)))
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
(ns com.rpl.specter.cljs-test-runner
|
||||
(:require [doo.runner :refer-macros [doo-tests]]
|
||||
[com.rpl.specter.core-test]
|
||||
[com.rpl.specter.zipper-test]))
|
||||
|
||||
(doo-tests 'com.rpl.specter.core-test
|
||||
'com.rpl.specter.zipper-test)
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,36 +0,0 @@
|
|||
(ns com.rpl.specter.test-helpers
|
||||
(:require [clojure.test.check
|
||||
[generators :as gen]
|
||||
[properties :as prop]]
|
||||
[clojure.test])
|
||||
|
||||
(:use [com.rpl.specter :only [select transform]]
|
||||
[com.rpl.specter :only [select* transform*]]))
|
||||
|
||||
|
||||
;; it seems like gen/bind and gen/return are a monad (hence the names)
|
||||
;; this is only for clj (cljs version in different file)
|
||||
(defmacro for-all+ [bindings & body]
|
||||
(let [parts (partition 2 bindings)
|
||||
vars (vec (map first parts))
|
||||
genned (reduce
|
||||
(fn [curr [v code]]
|
||||
`(gen/bind ~code (fn [~v] ~curr)))
|
||||
`(gen/return ~vars)
|
||||
(reverse parts))]
|
||||
`(prop/for-all [~vars ~genned]
|
||||
~@body)))
|
||||
|
||||
|
||||
(defmacro ic-test [params-decl apath transform-fn data params]
|
||||
(let [platform (if (contains? &env :locals) :cljs :clj)
|
||||
is-sym (if (= platform :clj) 'clojure.test/is 'cljs.test/is)]
|
||||
`(let [icfnsel# (fn [~@params-decl] (select ~apath ~data))
|
||||
icfntran# (fn [~@params-decl] (transform ~apath ~transform-fn ~data))
|
||||
regfnsel# (fn [~@params-decl] (select* ~apath ~data))
|
||||
regfntran# (fn [~@params-decl] (transform* ~apath ~transform-fn ~data))
|
||||
params# (if (empty? ~params) [[]] ~params)]
|
||||
(dotimes [_# 3]
|
||||
(doseq [ps# params#]
|
||||
(~is-sym (= (apply icfnsel# ps#) (apply regfnsel# ps#)))
|
||||
(~is-sym (= (apply icfntran# ps#) (apply regfntran# ps#))))))))
|
||||
|
|
@ -1,122 +0,0 @@
|
|||
(ns com.rpl.specter.zipper-test
|
||||
#?(:cljs (:require-macros
|
||||
[cljs.test :refer [is deftest]]
|
||||
[clojure.test.check.clojure-test :refer [defspec]]
|
||||
[com.rpl.specter.cljs-test-helpers :refer [for-all+]]
|
||||
[com.rpl.specter
|
||||
:refer [declarepath providepath select select-one select-one!
|
||||
select-first transform setval replace-in]]))
|
||||
|
||||
(:use
|
||||
#?(:clj [clojure.test :only [deftest is]])
|
||||
#?(:clj [clojure.test.check.clojure-test :only [defspec]])
|
||||
#?(:clj [com.rpl.specter.test-helpers :only [for-all+]])
|
||||
#?(:clj [com.rpl.specter
|
||||
:only [declarepath providepath select select-one select-one!
|
||||
select-first transform setval replace-in]]))
|
||||
|
||||
(:require #?(:clj [clojure.test.check.generators :as gen])
|
||||
#?(:clj [clojure.test.check.properties :as prop])
|
||||
#?(:cljs [clojure.test.check :as tc])
|
||||
#?(:cljs [clojure.test.check.generators :as gen])
|
||||
#?(:cljs [clojure.test.check.properties :as prop :include-macros true])
|
||||
[com.rpl.specter :as s]
|
||||
[com.rpl.specter.zipper :as z]))
|
||||
|
||||
(defspec zipper-end-equivalency-test
|
||||
(for-all+
|
||||
[v (gen/not-empty (gen/vector gen/int))
|
||||
i (gen/vector gen/int)]
|
||||
(= (setval s/END i v)
|
||||
(setval [z/VECTOR-ZIP z/DOWN z/RIGHTMOST z/INNER-RIGHT] i v))))
|
||||
|
||||
|
||||
(deftest zipper-multi-insert-test
|
||||
(is (= [1 2 :a :b 3 :a :b 4]
|
||||
(setval [z/VECTOR-ZIP
|
||||
z/DOWN
|
||||
z/RIGHT
|
||||
z/RIGHT
|
||||
(s/multi-path z/INNER-RIGHT z/INNER-LEFT)]
|
||||
|
||||
[:a :b]
|
||||
[1 2 3 4])
|
||||
|
||||
(setval [z/VECTOR-ZIP
|
||||
z/DOWN
|
||||
z/RIGHT
|
||||
z/RIGHT
|
||||
(s/multi-path z/INNER-LEFT z/INNER-RIGHT)]
|
||||
|
||||
[:a :b]
|
||||
[1 2 3 4]))))
|
||||
|
||||
|
||||
|
||||
|
||||
(deftest zipper-down-up-test
|
||||
(is (= [1 [2 3 5] 6]
|
||||
(transform [z/VECTOR-ZIP
|
||||
z/DOWN
|
||||
z/RIGHT
|
||||
z/DOWN
|
||||
z/RIGHT
|
||||
z/RIGHT
|
||||
(s/multi-path
|
||||
s/STAY
|
||||
[z/UP z/RIGHT])
|
||||
z/NODE]
|
||||
inc
|
||||
[1 [2 3 4] 5]))))
|
||||
|
||||
|
||||
|
||||
|
||||
(deftest next-terminate-test
|
||||
(is (= [2 [3 4 [5]] 6]
|
||||
(transform [z/VECTOR-ZIP z/NEXT-WALK z/NODE number?]
|
||||
inc
|
||||
[1 [2 3 [4]] 5])))
|
||||
(is (= [1 [3 [[]] 5]]
|
||||
(setval [z/VECTOR-ZIP
|
||||
z/NEXT-WALK
|
||||
(s/selected? z/NODE number? even?)
|
||||
z/NODE-SEQ]
|
||||
[]
|
||||
[1 2 [3 [[4]] 5] 6]))))
|
||||
|
||||
|
||||
|
||||
|
||||
(deftest zipper-nav-stop-test
|
||||
(is (= [1]
|
||||
(transform [z/VECTOR-ZIP z/UP z/NODE] inc [1])))
|
||||
(is (= [1]
|
||||
(transform [z/VECTOR-ZIP z/DOWN z/LEFT z/NODE] inc [1])))
|
||||
(is (= [1]
|
||||
(transform [z/VECTOR-ZIP z/DOWN z/RIGHT z/NODE] inc [1])))
|
||||
(is (= []
|
||||
(transform [z/VECTOR-ZIP z/DOWN z/NODE] inc []))))
|
||||
|
||||
|
||||
(deftest find-first-test
|
||||
(is (= [1 [3 [[4]] 5] 6]
|
||||
(setval [z/VECTOR-ZIP
|
||||
(z/find-first #(and (number? %) (even? %)))
|
||||
z/NODE-SEQ]
|
||||
|
||||
[]
|
||||
[1 2 [3 [[4]] 5] 6]))))
|
||||
|
||||
|
||||
|
||||
(deftest nodeseq-expand-test
|
||||
(is (= [2 [2] [[4 4 4]] 4 4 4 6]
|
||||
(transform [z/VECTOR-ZIP
|
||||
z/NEXT-WALK
|
||||
(s/selected? z/NODE number? odd?)
|
||||
(s/collect-one z/NODE)
|
||||
z/NODE-SEQ]
|
||||
(fn [v _]
|
||||
(repeat v (inc v)))
|
||||
[1 [2] [[3]] 3 6]))))
|
||||
Loading…
Reference in a new issue