Formatting: removed extra whitespace inside parens/braces/brackets

Author: tonsky

src/datascript/built_ins.cljc

@@ -78,8 +78,8 @@
        (greater-equal y (first more)))
      false)))
 
-(def query-fns {
-  '= =, '== ==, 'not= not=, '!= not=,
+(def query-fns
+  {'= =, '== ==, 'not= not=, '!= not=,
   '< less, '> greater, '<= less-equal, '>= greater-equal,
   '+ +, '- -, '* *, '/ /,
   'quot quot, 'rem rem, 'mod mod, 'inc inc, 'dec dec, 'max max, 'min min,
@@ -96,8 +96,7 @@
   '-differ? -differ?, 'get-else -get-else, 'get-some -get-some, 'missing? -missing?, 'ground identity,
   'clojure.string/blank? str/blank?, 'clojure.string/includes? str/includes?,
   'clojure.string/starts-with? str/starts-with?, 'clojure.string/ends-with? str/ends-with?
-  'tuple vector, 'untuple identity
-})
+  'tuple vector, 'untuple identity})
 
 ;; Aggregates
 

src/datascript/core.cljc

@@ -474,11 +474,11 @@
   
    Returns transaction report, a map:
 
-       { :db-before ...       ; db value before transaction
-         :db-after  ...       ; db value after transaction
-         :tx-data   [...]     ; plain datoms that were added/retracted from db-before
-         :tempids   {...}     ; map of tempid from tx-data => assigned entid in db-after
-         :tx-meta   tx-meta } ; the exact value you passed as `tx-meta`
+       {:db-before ...      ; db value before transaction
+        :db-after  ...      ; db value after transaction
+        :tx-data   [...]    ; plain datoms that were added/retracted from db-before
+        :tempids   {...}    ; map of tempid from tx-data => assigned entid in db-after
+        :tx-meta   tx-meta} ; the exact value you passed as `tx-meta`
 
   Note! `conn` will be updated in-place and is not returned from [[transact!]].
   

src/datascript/db.cljc

@@ -240,8 +240,7 @@
         clojure.lang.Associative
         (entryAt [d k] (some->> (val-at-datom d k nil) (clojure.lang.MapEntry k)))
         (containsKey [e k] (#{:e :a :v :tx :added} k))
-        (assoc [d k v] (assoc-datom d k v))]
-))
+        (assoc [d k v] (assoc-datom d k v))]))
 
 #?(:cljs (goog/exportSymbol "datascript.db.Datom" Datom))
 
@@ -1107,8 +1106,7 @@
        (.write w "]}"))
 
      (defmethod print-method DB [db w] (pr-db db w))
-     (defmethod print-method FilteredDB [db w] (pr-db db w))     
-))
+     (defmethod print-method FilteredDB [db w] (pr-db db w))))
 
 (defn db-from-reader [{:keys [schema datoms]}]
   (init-db (map (fn [[e a v tx]] (datom e a v tx)) datoms) schema {}))
@@ -1752,7 +1750,7 @@
             ;; trash => error
             :else
             (util/raise "Expected number, string or lookup ref for :db/id, got " old-eid
-              { :error :entity-id/syntax, :entity entity })))
+              {:error :entity-id/syntax, :entity entity})))
 
         (sequential? entity)
         (let [[op e a v] entity]
@@ -1776,7 +1774,7 @@
             (and (tempid? e)
               (not= op :db/add))
             (util/raise "Can't use tempid in '" entity "'. Tempids are allowed in :db/add only"
-              { :error :transact/syntax, :op entity })
+              {:error :transact/syntax, :op entity})
 
             (or (= op :db.fn/cas)
               (= op :db/cas))
@@ -1796,7 +1794,7 @@
                   (if (= v ov)
                     (recur (transact-add report [:db/add e a nv]) entities)
                     (util/raise ":db.fn/cas failed on datom [" e " " a " " v "], expected " ov
-                           {:error :transact/cas, :old (first datoms), :expected ov, :new nv })))))
+                           {:error :transact/cas, :old (first datoms), :expected ov, :new nv})))))
 
             (tx-id? e)
             (recur (allocate-eid report e (current-tx report)) (cons [op (current-tx report) a v] entities))

src/datascript/impl/entity.cljc

@@ -142,8 +142,7 @@
 
        clojure.lang.IFn
        (invoke [e k]      (lookup-entity e k))
-       (invoke [e k not-found] (lookup-entity e k not-found))
-       ]))
+       (invoke [e k not-found] (lookup-entity e k not-found))]))
 
 (defn entity? [x] (instance? Entity x))
 

src/datascript/js.cljs

@@ -56,11 +56,11 @@
     obj))
 
 (defn- tx-report->js [report]
-  #js { :db_before (:db-before report)
-        :db_after  (:db-after report)
-        :tx_data   (->> (:tx-data report) into-array)
-        :tempids   (tempids->js (:tempids report))
-        :tx_meta   (:tx-meta report) })
+  #js {:db_before (:db-before report)
+       :db_after  (:db-after report)
+       :tx_data   (->> (:tx-data report) into-array)
+       :tempids   (tempids->js (:tempids report))
+       :tx_meta   (:tx-meta report)})
 
 (defn js->Datom [d]
   (if (array? d)
@@ -132,13 +132,13 @@
     report))
 
 (defn ^:export reset_conn [conn db & [tx-meta]]
-  (let [report #js { :db_before @conn
-                     :db_after  db
-                     :tx_data   (into-array
-                                  (concat
-                                    (map #(assoc % :added false) (d/datoms @conn :eavt))
-                                    (d/datoms db :eavt)))
-                     :tx_meta   tx-meta }]
+  (let [report #js {:db_before @conn
+                    :db_after  db
+                    :tx_data   (into-array
+                                 (concat
+                                   (map #(assoc % :added false) (d/datoms @conn :eavt))
+                                   (d/datoms db :eavt)))
+                    :tx_meta   tx-meta}]
     (reset! conn db)
     (doseq [[_ callback] (:listeners @(:atom conn))]
       (callback report))

src/datascript/parser.cljc

@@ -484,8 +484,7 @@
             (util/raise "Cannot parse rule-expr arguments, expected [ (variable | constant | '_')+ ]"
                    {:error :parser/where, :form form})
           :else
-            (RuleExpr. source* name* args*)
-          )))))
+            (RuleExpr. source* name* args*))))))
 
 (defn- collect-vars-acc [acc form]
   (cond
@@ -619,7 +618,7 @@
       (parse-rule-expr form)
       (parse-pattern   form)
       (util/raise "Cannot parse clause, expected (data-pattern | pred-expr | fn-expr | rule-expr | not-clause | not-join-clause | or-clause | or-join-clause)"
-             {:error :parser/where, :form form} )))
+             {:error :parser/where, :form form})))
 
 (defn parse-clauses [clauses]
   (parse-seq parse-clause clauses))

src/datascript/pull_api.cljc

@@ -375,6 +375,5 @@
          #'datascript.test.pull-api/test-pull-recursion
          #'datascript.test.pull-api/test-dual-recursion
          #'datascript.test.pull-api/test-deep-recursion
-         #'datascript.test.pull-api/test-lookup-ref-pull
-         ])
+         #'datascript.test.pull-api/test-lookup-ref-pull])
       @clojure.test/*report-counters*)))

src/datascript/query.cljc

@@ -36,8 +36,8 @@
 ;; attrs:
 ;;    {?e 0, ?v 1} or {?e2 "a", ?age "v"}
 ;; tuples:
-;;    [ #js [1 "Ivan" 5 14] ... ]
-;; or [ (Datom. 2 "Oleg" 1 55) ... ]
+;;    [#js [1 "Ivan" 5 14] ...]
+;; or [(Datom. 2 "Oleg" 1 55) ...]
 (defrecord Relation [attrs tuples])
 
 
@@ -183,8 +183,7 @@
               (reduce (fn [acc t2]
                         (conj! acc (join-tuples t1 idxs1 t2 idxs2)))
                       acc (:tuples rel2)))
-            (transient []) (:tuples rel1)))
-        ))))
+            (transient []) (:tuples rel1)))))))
 
 ;;
 
@@ -373,7 +372,7 @@
                                                (conj! acc (join-tuples tuple1 keep-idxs1 tuple2 keep-idxs2)))
                                              acc tuples1)
                                      acc)))
-                               (transient []) )
+                               (transient []))
                        (persistent!))]
     (Relation. (zipmap (concat keep-attrs1 keep-attrs2) (range))
                new-tuples)))

src/datascript/query_v3.cljc

@@ -226,7 +226,7 @@
                :cljs (str (type rel))))
     (.write "{:symbols ")
     (.write (pr-str (-symbols rel)))
-    (.write ", :coll " )
+    (.write ", :coll ")
     (.write (pr-str (persistent! (-fold rel #(conj! %1 (seq %2)) (transient [])))))
     (.write "}")))
 
@@ -786,7 +786,7 @@
           (if (contains? sources sym)
             (da/aset target i (get sources sym))
             (throw (ex-info (str "Unbound source variable: " sym " in " form)
-                            { :error :query/where, :form form, :var sym })))
+                            { :error :query/where, :form form, :var sym})))
         (instance? Constant arg)
           (da/aset target i (:value arg))))))
 
@@ -937,11 +937,11 @@
 
 (defn q [q & inputs]
   (let [parsed-q (lru/-get query-cache q #(dp/parse-query q))
-        context  { :rels    []
-                    :consts  {}
-                    :sources {}
-                    :rules   {}
-                    :default-source-symbol '$ }
+        context  {:rels    []
+                  :consts  {}
+                  :sources {}
+                  :rules   {}
+                  :default-source-symbol '$}
         context  (resolve-ins context (:qin parsed-q) inputs)
         context  (resolve-clauses context (:qwhere parsed-q))
         syms     (concat (dp/find-vars (:qfind parsed-q))
@@ -952,7 +952,7 @@
 (comment
   (t/test-ns 'datascript.test.query-v3)
 
-  (let [query   '[ :find  ?lid ?status ?starttime ?endtime (min ?paid) (distinct ?studentinfo) ?lgid
+  (let [query   '[:find  ?lid ?status ?starttime ?endtime (min ?paid) (distinct ?studentinfo) ?lgid
                   :in    $ ?tid ?week ?list
                   :where [?lid :lesson/teacherid ?tid]
                           [?lid :lesson/week ?week]

src/datascript/util.cljc

@@ -136,7 +136,7 @@
             high     (.getMostSignificantBits uuid)
             low      (.getLeastSignificantBits uuid)
             new-high (bit-or (bit-and high 0x00000000FFFFFFFF)
-                       (bit-shift-left time 32)) ]
+                       (bit-shift-left time 32))]
         (UUID. new-high low))
       :cljs
       (uuid