Add resolve-key to meta-init / meta-opts-init

kwrooijen · Jul 1, 2020 · 1d1b899 · 1d1b899
1 parent ba1fb74
commit 1d1b899
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -10,41 +10,41 @@ didn't think would fit in core.
 
 ### Core
 
-+ [integrant-tools.core/readers](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.core#readers)
-+ [integrant-tools.core/derive-unknown](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.core#derive-unknown)
-+ [integrant-tools.core/derive-hierarchy](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.core#derive-hierarchy)
-+ [integrant-tools.core/derive-composite](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.core#derive-composite)
-+ [integrant-tools.core/underive-all](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.core#underive-all)
-+ [integrant-tools.core/find-derived-keys](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.core#find-derived-keys)
-+ [integrant-tools.core/meta-init](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.core#meta-init)
-+ [integrant-tools.core/meta-opts-init](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.core#meta-opts-init)
-+ [integrant-tools.core/meta-opts-resume](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.core#meta-opts-resume)
-+ [integrant-tools.core/find-derived-key](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.core#find-derived-key)
-+ [integrant-tools.core/find-derived-values](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.core#find-derived-values)
-+ [integrant-tools.core/find-derived-value](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.core#find-derived-value)
-+ [integrant-tools.core/select-keys](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.core#select-keys)
++ [integrant-tools.core/readers](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.core#readers)
++ [integrant-tools.core/derive-unknown](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.core#derive-unknown)
++ [integrant-tools.core/derive-hierarchy](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.core#derive-hierarchy)
++ [integrant-tools.core/derive-composite](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.core#derive-composite)
++ [integrant-tools.core/underive-all](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.core#underive-all)
++ [integrant-tools.core/find-derived-keys](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.core#find-derived-keys)
++ [integrant-tools.core/meta-init](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.core#meta-init)
++ [integrant-tools.core/meta-opts-init](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.core#meta-opts-init)
++ [integrant-tools.core/meta-opts-resume](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.core#meta-opts-resume)
++ [integrant-tools.core/find-derived-key](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.core#find-derived-key)
++ [integrant-tools.core/find-derived-values](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.core#find-derived-values)
++ [integrant-tools.core/find-derived-value](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.core#find-derived-value)
++ [integrant-tools.core/select-keys](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.core#select-keys)
 
 ### EDN
 
-+ [integrant-tools.edn/meta-str](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.edn#meta-str)
-+ [integrant-tools.edn/lazy-read](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.edn#lazy-read)
++ [integrant-tools.edn/meta-str](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.edn#meta-str)
++ [integrant-tools.edn/lazy-read](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.edn#lazy-read)
 
 ### Keyword
 
-* [integrant-tools.keyword/ancestor?](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.keyword#ancestor?)
-* [integrant-tools.keyword/descendant?](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.keyword#descendant?)
-* [integrant-tools.keyword/parent?](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.keyword#parent?)
-* [integrant-tools.keyword/child?](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.keyword#child?)
-* [integrant-tools.keyword/child](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.keyword#child)
-* [integrant-tools.keyword/parent](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.keyword#parent)
-* [integrant-tools.keyword/ancestor](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.keyword#ancestor)
-* [integrant-tools.keyword/descendant](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.keyword#descendant)
-* [integrant-tools.keyword/children](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.keyword#children)
-* [integrant-tools.keyword/underive-ancestors](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.keyword#underive-ancestors)
-* [integrant-tools.keyword/underive-parents](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.keyword#underive-parents)
-* [integrant-tools.keyword/underive-descendants](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.keyword#underive-descendants)
-* [integrant-tools.keyword/underive-children](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.keyword#underive-children)
-* [integrant-tools.keyword/make-child](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.6/api/integrant-tools.keyword#make-child)
+* [integrant-tools.keyword/ancestor?](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.keyword#ancestor?)
+* [integrant-tools.keyword/descendant?](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.keyword#descendant?)
+* [integrant-tools.keyword/parent?](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.keyword#parent?)
+* [integrant-tools.keyword/child?](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.keyword#child?)
+* [integrant-tools.keyword/child](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.keyword#child)
+* [integrant-tools.keyword/parent](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.keyword#parent)
+* [integrant-tools.keyword/ancestor](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.keyword#ancestor)
+* [integrant-tools.keyword/descendant](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.keyword#descendant)
+* [integrant-tools.keyword/children](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.keyword#children)
+* [integrant-tools.keyword/underive-ancestors](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.keyword#underive-ancestors)
+* [integrant-tools.keyword/underive-parents](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.keyword#underive-parents)
+* [integrant-tools.keyword/underive-descendants](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.keyword#underive-descendants)
+* [integrant-tools.keyword/underive-children](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.keyword#underive-children)
+* [integrant-tools.keyword/make-child](https://cljdoc.org/d/kwrooijen/integrant-tools/0.3.7/api/integrant-tools.keyword#make-child)
 
 ## Author / License
 

diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject kwrooijen/integrant-tools "0.3.6"
+(defproject kwrooijen/integrant-tools "0.3.7"
   :description "A library with helper functions, reader tags, and init-keys for Integrant"
   :url "https://github.com/kwrooijen/integrant-tools"
   :license {:name "MIT"}

diff --git a/src/integrant_tools/core.cljc b/src/integrant_tools/core.cljc
@@ -162,7 +162,7 @@
    (meta-init config (keys config)))
   ([config keys]
    {:pre [(map? config)]}
-   (ig/build config keys meta-init-key #'ig/assert-pre-init-spec)))
+   (ig/build config keys meta-init-key #'ig/assert-pre-init-spec ig/resolve-key)))
 
 (defn meta-opts-init
   "Same as ig/init, but `opts` is merged into the resulting value's
@@ -172,7 +172,7 @@
    (meta-opts-init config (keys config)))
   ([config keys]
    {:pre [(map? config)]}
-   (ig/build config keys meta-opts-init-key #'ig/assert-pre-init-spec)))
+   (ig/build config keys meta-opts-init-key #'ig/assert-pre-init-spec ig/resolve-key)))
 
 (defn meta-opts-resume
   "Same as ig/resume, but `opts` is merged into the resulting value's