Remove bb specific code for array-map data structure (#805)

Since the latest bb we don't need this custom code anymore.

Author: borkdude

bb.edn

@@ -1,7 +1,7 @@
 {:min-bb-version "1.12.206"
  :paths ["bb"]
- :deps {io.github.nextjournal/dejavu {:git/sha "7276cd9cec1bad001d595b52cee9e83a60d43bf0"}
-        io.github.nextjournal/cas-client {:git/sha "114d3d88d38a2068ec844b0e6c808eaaa6aa64ef"}}
+ :deps {io.github.nextjournal/cas-client {:git/sha "114d3d88d38a2068ec844b0e6c808eaaa6aa64ef"}
+        io.github.nextjournal/clerk {:local/root "."}}
  :tasks
  {:requires
   ([tasks :as t]

src/nextjournal/clerk/always_array_map.clj

@@ -1,7 +1,6 @@
 (ns nextjournal.clerk.always-array-map
   "A persistent data structure that is based on array-map, but doesn't turn into a hash-map by using assoc etc.
-   Prints like a normal Clojure map in the order of insertion."
-  (:require [nextjournal.clerk.utils :as utils]))
+   Prints like a normal Clojure map in the order of insertion.")
 
 (set! *warn-on-reflection* true)
 
@@ -10,100 +9,72 @@
 
 (declare ->AlwaysArrayMap)
 
-(utils/if-bb
- (defn ->AlwaysArrayMap [m]
-   (proxy [clojure.lang.APersistentMap clojure.lang.IMeta clojure.lang.IObj]
-       []
-     (valAt
-       ([k]
-        (get m k))
-       ([k default-value]
-        (get m k default-value)))
-     (iterator []
-       (.iterator ^java.lang.Iterable m))
-
-     (containsKey [k] (contains? m k))
-     (entryAt [k] (when (contains? m k)
-                    (get this k)))
-     (equiv [other] (= m other))
-     (empty [] (empty m))
-     (count [] (count m))
-     (assoc [k v] (if (< (count m) 8)
-                    (->AlwaysArrayMap (assoc m k v))
-                    (->AlwaysArrayMap (assoc-after m k v))))
-     (without [k] (->AlwaysArrayMap (dissoc m k)))
-     (seq [] (seq m))
-                                        ; a lot of map users expect meta to work
-     (meta [] (meta m))
-     (withMeta [meta] (->AlwaysArrayMap (with-meta m meta)))))
-
- (deftype AlwaysArrayMap [^clojure.lang.PersistentArrayMap the-map]
-   clojure.lang.ILookup
-   (valAt [_ k]
-     (get the-map k))
-
-   clojure.lang.Seqable
-   (seq [_]
-     (seq the-map))
-
-   clojure.lang.IPersistentMap
-   (assoc [_ k v]
-     (if (< (count the-map) 8)
-       (->AlwaysArrayMap (assoc the-map k v))
-       (->AlwaysArrayMap (assoc-after the-map k v))))
-
-   (assocEx [_ _k _v]
-     (throw (ex-info "Not implemented" {})))
-
-   (without [_ k]
-     (->AlwaysArrayMap (dissoc the-map k)))
-
-   clojure.lang.Associative
-   (containsKey [_ k]
-     (contains? the-map k))
-
-   clojure.lang.IPersistentCollection
-   (equiv [_ other]
-     (= the-map other))
-   (count [_]
-     (count the-map))
-
-   java.lang.Iterable
-   (iterator [_]
-     (.iterator the-map))
-
-   clojure.lang.IMeta
-   (meta [_]
-     (meta the-map))
-
-   clojure.lang.IObj
-   (withMeta [_ meta]
-     (->AlwaysArrayMap (with-meta the-map meta)))
-
-   Object
-   (toString [_]
-     "<always-array-map>")))
+(deftype AlwaysArrayMap [^clojure.lang.PersistentArrayMap the-map]
+  clojure.lang.ILookup
+  (valAt [_ k]
+    (get the-map k))
+
+  clojure.lang.Seqable
+  (seq [_]
+    (seq the-map))
+
+  clojure.lang.IPersistentMap
+  (assoc [_ k v]
+    (if (< (count the-map) 8)
+      (->AlwaysArrayMap (assoc the-map k v))
+      (->AlwaysArrayMap (assoc-after the-map k v))))
+
+  (assocEx [_ _k _v]
+    (throw (ex-info "Not implemented" {})))
+
+  (without [_ k]
+    (->AlwaysArrayMap (dissoc the-map k)))
+
+  clojure.lang.Associative
+  (containsKey [_ k]
+    (contains? the-map k))
+
+  clojure.lang.IPersistentCollection
+  (equiv [_ other]
+    (= the-map other))
+  (count [_]
+    (count the-map))
+
+  java.lang.Iterable
+  (iterator [_]
+    (.iterator the-map))
+
+  clojure.lang.IMeta
+  (meta [_]
+    (meta the-map))
+
+  clojure.lang.IObj
+  (withMeta [_ meta]
+    (->AlwaysArrayMap (with-meta the-map meta)))
+
+  Object
+  (toString [_]
+    "<always-array-map>"))
 
 (defn assoc-before [aam k v]
   (->AlwaysArrayMap (apply array-map (list* k v (interleave (keys aam) (vals aam))))))
 
 (defn always-array-map [& kvs]
   (->AlwaysArrayMap (apply array-map kvs)))
 
-(utils/when-not-bb
- (defmethod print-method AlwaysArrayMap
-   [v ^java.io.Writer writer]
-   (.write writer "{")
-   (let [write-kv! (fn [k v]
-                     (.write writer (pr-str k))
-                     (.write writer " ")
-                     (.write writer (pr-str v)))]
-     (doseq [[k v] (butlast v)]
-       (write-kv! k v)
-       (.write writer ", "))
-     (let [[k v] (last v)]
-       (write-kv! k v)))
-   (.write writer "}")))
+(defmethod print-method AlwaysArrayMap
+  [v ^java.io.Writer writer]
+  (.write writer "{")
+  (let [write-kv! (fn [k v]
+                    (.write writer (pr-str k))
+                    (.write writer " ")
+                    (.write writer (pr-str v)))]
+    (doseq [[k v] (butlast v)]
+      (write-kv! k v)
+      (.write writer ", "))
+    (let [[k v] (last v)]
+      (write-kv! k v)))
+  (.write writer "}"))
 
 (comment
   (pr-str (always-array-map 1 2))

src/nextjournal/clerk/viewer.cljc

@@ -5,7 +5,7 @@
             [clojure.pprint :as pprint]
             [clojure.set :as set]
             [clojure.string :as str]
-            [flatland.ordered.map :as omap :refer [ordered-map]]
+            [flatland.ordered.map :as omap]
             #?@(:clj [[babashka.fs :as fs]
                       [clojure.repl :refer [demunge]]
                       [clojure.tools.reader :as tools.reader]
@@ -733,15 +733,15 @@
 #_(update-viewers default-viewers {:page-size #(dissoc % :page-size)})
 
 (defn ^:private ->ordered-map-by-name [viewers]
-  (into (ordered-map)
+  (into (omap/ordered-map)
         (map (juxt :name identity))
         viewers))
 
 (defn ^:private merge-prepending [m1 m2]
   (into (apply dissoc m2 (keys m1))
         (into m1 m2)))
 
-#_(merge-prepending (ordered-map :bar 1 :baz 2) (ordered-map {:baz 3 :a 1}))
+#_(merge-prepending (omap/ordered-map :bar 1 :baz 2) (ordered-map {:baz 3 :a 1}))
 
 (defn ^:private merge-viewers [viewers added-viewers]
   (when-let [unnamed-viewers (not-empty (filter (complement :name) (concat viewers added-viewers)))]