v0.9.140

project.clj

@@ -1,4 +1,4 @@
-(defproject tupelo "0.9.139"
+(defproject tupelo "0.9.140"
   :description "Tupelo:  Clojure With A Spoonful of Honey"
   :url "http://github.com/cloojure/tupelo"
   :license {:name "Eclipse Public License"

src/cljc/tupelo/core.cljc

@@ -358,8 +358,13 @@
   (let [unlazy-item (fn [item]
                       (cond
                         (sequential? item) (vec item)
-                        (map? item) (into (sorted-map) item) ; #todo => (sorted-map-generic)
+
+            #?@(:clj  [ (map? item) (into (sorted-map-generic) item)
+                        (set? item) (into (sorted-set-generic) item) ]
+                :cljs [ (map? item) (into (sorted-map) item) ; #todo => (sorted-map-generic)
                         (set? item) (into (sorted-set) item) ; #todo => (sorted-map-generic)
+                      ] )
+
             #?@(:clj [
                         (instance? java.io.InputStream item) (slurp item)  ; #todo need test
                         (instance? java.util.List item) (vec item)  ; #todo need test

src/cljc/tupelo/parse.cljc

@@ -23,6 +23,7 @@
 
 #?(:clj
    (do
+
      (defn edn-parsible
        "Traverses a data structure to ensure it can be serialized with `pr-str` and read via
        clojure.tools.reader.edn/read-string. All non-parsible content is replaced

src/cljc/tupelo/vec.cljc

@@ -17,9 +17,15 @@
             [tupelo.schema :as tsk]
             ))
   #?(:cljs (:require
+             [clojure.core :as cc]
              [clojure.set :as set]
              [schema.core :as s]
-             [tupelo.core :as t :refer [spy spyx spyxx spyx-pretty grab]] ; #todo :include-macros true
+             [tupelo.core :as t  :include-macros true
+                  :refer [spy spyx spyxx spyx-pretty grab glue map-entry indexed
+                          forv vals->map fetch-in let-spy xlast xfirst keep-if drop-if
+                          it-> cond-it-> xfirst xsecond xthird xlast
+                          ]
+              ] ; #todo :include-macros true
              [tupelo.data.index :as index]
              [tupelo.schema :as tsk]
              )))

test/cljc/tst/tupelo/parse.cljc

@@ -7,21 +7,18 @@
 (ns tst.tupelo.parse
   #?(:clj (:import [java.lang Math]))
   #?(:clj (:require
-            [clojure.string :as str]
-            [schema.core :as s]
+            [tupelo.test :as ttst :refer [define-fixture deftest dotest dotest-focus is isnt is= isnt= is-set= is-nonblank= testing throws?]]
+
             [tupelo.core :as t :refer [spy spyx spyxx]]
             [tupelo.parse :as tpar]
-            [tupelo.string :as ts]
-            [tupelo.test :as ttst :refer [define-fixture deftest dotest dotest-focus is isnt is= isnt= is-set= is-nonblank= testing throws?]]) )
+            ))
   #?(:cljs (:require
-             [clojure.string :as str]
-             [schema.core :as s]
+             [tupelo.test-cljs :refer [define-fixture deftest dotest is isnt is= isnt= is-set= is-nonblank= testing throws?]]
+
              [tupelo.core :as t :refer [spy spyx spyxx] :include-macros true]
              [tupelo.parse :as tpar]
-             [tupelo.string :as ts :include-macros true]
-             [tupelo.test-cljs :refer [define-fixture deftest dotest is isnt is= isnt= is-set= is-nonblank= testing throws?]]
-           ))
-)
+             ))
+  )
 
 #?(:cljs (enable-console-print!))
 

test/cljc/tst/tupelo/vec.cljc

@@ -8,25 +8,27 @@
   #?(:clj (:refer-clojure :exclude [load ->VecNode]))
   #?(:clj (:require
             [tupelo.test :refer [define-fixture deftest dotest dotest-focus is isnt is= isnt= is-set= is-nonblank= testing throws?]]
-            [tupelo.core :as t :refer [spy spyx spyxx spy-pretty spyx-pretty unlazy let-spy only forv glue
-                                       ]]
-            [tupelo.data :as td]
-            [tupelo.data.index :as tdi]
+            [tupelo.core :as t :refer [spy spyx spyxx spy-pretty spyx-pretty unlazy let-spy only forv glue ]]
+
+            [clojure.set :as set]
+            [schema.core :as s]
+            [tupelo.data.index :as index]
             [tupelo.lexical :as lex]
             [tupelo.vec :as tv]
-            [clojure.data.avl :as avl]
-            [schema.core :as s]
-            [clojure.walk :as walk]
-            [clojure.set :as set]
-            [tupelo.data.index :as index]))
+            ))
   #?(:cljs (:require
-             [tupelo.test-cljs :refer [define-fixture deftest dotest is isnt is= isnt= is-set= is-nonblank= testing throws?]
-              :include-macros true]
-             [tupelo.core :as t :refer [spy spyx spyxx] :include-macros true]
+             [tupelo.test-cljs :include-macros true
+                :refer [define-fixture deftest dotest is isnt is= isnt= is-set= is-nonblank= testing throws?] ]
+             [tupelo.core :as t :refer [spy spyx spyxx spyx-pretty grab glue map-entry indexed
+                                        forv vals->map fetch-in let-spy xlast xfirst keep-if drop-if
+                                        it-> cond-it-> xfirst xsecond xthird xlast ]]
+
+             [clojure.set :as set]
+             [schema.core :as s]
              [tupelo.data :as td]
+             [tupelo.data.index :as index]
              [tupelo.lexical :as lex]
-             [clojure.data.avl :as avl]
-             [schema.core :as s]
+             [tupelo.vec :as tv]
              ))
   )