list automatic ids in tempid report

Fix #246

Author: filipesilva

src/datascript/db.cljc

@@ -870,10 +870,13 @@
   [x]
   (or (and (number? x) (neg? x)) (string? x)))
 
+(defn- new-eid? [db eid]
+  (and (> eid (:max-eid db))
+       (< eid tx0))) ;; tx0 is max eid
+
 (defn- advance-max-eid [db eid]
   (cond-> db
-    (and (> eid (:max-eid db))
-         (< eid tx0)) ;; do not trigger advance if transaction id was referenced
+    (new-eid? db eid)
       (assoc :max-eid eid)))
 
 (defn- allocate-eid
@@ -885,6 +888,9 @@
         (assoc-in [:tempids e] eid)
       (tempid? e)
         (assoc-in [:tempids e] eid)
+      (and (not (tempid? e)) 
+           (new-eid? (:db-after report) eid))
+        (assoc-in [:tempids eid] eid)
       true
         (update-in [:db-after] advance-max-eid eid))))
 

test/datascript/test/transact.cljc

@@ -277,7 +277,7 @@
             :where [?e :name ?n]
                    [?e :friend ?fe]
                    [?fe :name ?fn]]]
-    (is (= (:tempids tx) { -1 2, -2 3, "B" 4, -3 5, :db/current-tx (+ d/tx0 1) }))
+    (is (= (:tempids tx) { 1 1, -1 2, -2 3, "B" 4, -3 5, :db/current-tx (+ d/tx0 1) }))
     (is (= (d/q q @conn "Sergey") #{["Ivan"] ["Petr"]}))
     (is (= (d/q q @conn "Boris") #{["Oleg"]}))
     (is (= (d/q q @conn "Oleg") #{["Boris"]}))))
@@ -298,7 +298,7 @@
                 [(+ d/tx0 1) :prop2 "prop2"]
                 [2 :name "Y"]
                 [2 :created-at (+ d/tx0 1)]}))
-        (is (= (:tempids tx1) (assoc {-1 2, :db/current-tx (+ d/tx0 1)}
+        (is (= (:tempids tx1) (assoc {1 1, -1 2, :db/current-tx (+ d/tx0 1)}
                                      tx-tempid (+ d/tx0 1))))
         (let [tx2   (d/transact! conn [[:db/add tx-tempid :prop3 "prop3"]])
               tx-id (get-in tx2 [:tempids tx-tempid])]

test/datascript/test/upsert.cljc

@@ -113,7 +113,7 @@
         (is (= (touched tx 3)
                {:name "Igor" :age 36}))
         (is (= (tempids tx)
-               {}))))
+               {3 3}))))
 
     (testing "upsert over intermediate db, tempids"
       (let [tx (d/with db [{:db/id -1 :name "Igor" :age 35}