Merge remote-tracking branch 'tonsky/master'

Author: tiensonqin

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.7.3 - Jul 22, 2024
+
+- Fixed `find-datom` on empty DB #477 thx @RCmerci
+
+# 1.7.2 - Jul 4, 2024
+
+- Regression: transacting many ref value as a set of inline maps #476 
+
 # 1.7.1 - Jun 20, 2024
 
 - Regression: :db.fn/call returning entity without :db/id #474 #475 via @DerGuteMoritz

README.md

@@ -19,11 +19,11 @@ The intention with DataScript is to be a basic building block in client-side app
 
 ```clj
 ;; lein
-[datascript "1.7.1"]
+[datascript "1.7.3"]
 ```
 ```clj
 ;; deps.edn
-datascript/datascript {:mvn/version "1.7.1"}
+datascript/datascript {:mvn/version "1.7.3"}
 ```
 
 Important! If you are using shadow-cljs, add
@@ -183,7 +183,7 @@ For more examples, see [our acceptance test suite](test/datascript/test/).
 DataScript can be used from any JS engine without additional dependencies:
 
 ```html
-<script src="https://github.com/tonsky/datascript/releases/download/1.7.1/datascript-1.7.1.min.js"></script>
+<script src="https://github.com/tonsky/datascript/releases/download/1.7.3/datascript-1.7.3.min.js"></script>
 ```
 
 or as a CommonJS module ([npm page](https://www.npmjs.org/package/datascript)):

project.clj

@@ -1,4 +1,4 @@
-(def version "1.7.1")
+(def version "1.7.3")
 
 (defproject datascript (str version (System/getenv "DATASCRIPT_CLASSIFIER"))
   :description "An implementation of Datomic in-memory database and Datalog query engine in ClojureScript"

release-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datascript",
-  "version": "1.7.1",
+  "version": "1.7.3",
   "description": "Immutable in-memory triplestore with Datalog queries",
   "homepage": "https://github.com/tonsky/datascript",
   "author": "Nikita Prokopov (https://github.com/tonsky)",

release-js/wrapper.prefix

@@ -1,5 +1,5 @@
 /**
- * Datascript v1.7.1
+ * Datascript v1.7.3
  *
  * Copyright 2014-2021 Nikita Prokopov
  *

script/release.clj

@@ -37,8 +37,11 @@
 
 (defn update-version []
   (println "\n\n[ Updating version number ]\n")
-  (let [old-v (current-version)]
-    (update-file "CHANGELOG.md" #(str/replace % "# WIP" (str "# " new-v)))
+  (let [old-v (current-version)
+        today (.format
+                (java.time.format.DateTimeFormatter/ofPattern "MMM d, yyyy")
+                (java.time.LocalDate/now))]
+    (update-file "CHANGELOG.md" #(str/replace % "# WIP" (str "# " new-v " - " today)))
     (update-file "project.clj"  #(str/replace % old-v new-v))
     (update-file "README.md"    #(str/replace % old-v new-v))
     (update-file "release-js/package.json" #(str/replace % 
@@ -55,11 +58,11 @@
 (defn make-commit []
   (println "\n\n[ Making a commit ]\n")
   (sh "git" "add"
-      "CHANGELOG.md"
-      "project.clj"
-      "README.md"
-      "release-js/package.json"
-      "release-js/wrapper.prefix")
+    "CHANGELOG.md"
+    "project.clj"
+    "README.md"
+    "release-js/package.json"
+    "release-js/wrapper.prefix")
 
   (sh "git" "commit" "-m" commit-message)
   (sh "git" "tag" new-v)
@@ -71,9 +74,9 @@
 
 (defn- str->json [s]
   (-> s
-      (str/replace "\\" "\\\\")
-      (str/replace "\"" "\\\"")
-      (str/replace "\n" "\\n")))
+    (str/replace "\\" "\\\\")
+    (str/replace "\"" "\\\"")
+    (str/replace "\n" "\\n")))
 
 (defn- map->json [m]
   (str "{ "
@@ -86,27 +89,31 @@
 
 (defn github-release []
   (sh "cp" "release-js/datascript.js" (str "release-js/datascript-" new-v ".min.js"))
-  (let [changelog (->> (slurp "CHANGELOG.md")
-                       str/split-lines
-                       (drop-while #(not= (str "# " new-v) %))
-                       next
-                       (take-while #(not (re-matches #"# .+" %)))
-                       (remove str/blank?)
-                       (str/join "\n"))
-        request  { "tag_name" new-v
-                   "name"     new-v
+  (let [re        (as-> new-v %
+                    (str/replace % "." "\\.")
+                    (str "# " % " .*")
+                    (re-pattern %))
+        changelog (->> (slurp "CHANGELOG.md")
+                    str/split-lines
+                    (drop-while #(not (re-matches re %)))
+                    next
+                    (take-while #(not (re-matches #"# .+" %)))
+                    (remove str/blank?)
+                    (str/join "\n"))
+        request   {"tag_name"         new-v
+                   "name"             new-v
                    "target_commitish" "master"
-                   "body" changelog}
-        response (sh "curl" "-u" GITHUB_BASIC
-                     "-X" "POST"
-                     "--data" (map->json request)
-                     "https://api.github.com/repos/tonsky/datascript/releases")
-        [_ id]    (re-find #"\"id\": (\d+)" response)]
+                   "body"             changelog}
+        response  (sh "curl" "-u" GITHUB_BASIC
+                    "-X" "POST"
+                    "--data" (map->json request)
+                    "https://api.github.com/repos/tonsky/datascript/releases")
+        [_ id]     (re-find #"\"id\": (\d+)" response)]
     (sh "curl" "-u" GITHUB_BASIC
-               "-X" "POST"
-               "-H" "Content-Type: application/javascript"
-               "--data-binary" (str "@release-js/datascript-" new-v ".min.js")
-               (str "https://uploads.github.com/repos/tonsky/datascript/releases/" id "/assets?name=datascript-" new-v ".min.js"))))
+      "-X" "POST"
+      "-H" "Content-Type: application/javascript"
+      "--data-binary" (str "@release-js/datascript-" new-v ".min.js")
+      (str "https://uploads.github.com/repos/tonsky/datascript/releases/" id "/assets?name=datascript-" new-v ".min.js"))))
 
 (defn -main []
   (sh "lein" "clean")

src/datascript/db.cljc

@@ -1153,7 +1153,7 @@
         cmp     #?(:clj (.comparator ^clojure.lang.Sorted set) :cljs (.-comparator set))
         from    (components->pattern db index c0 c1 c2 c3 e0 tx0)
         to      (components->pattern db index c0 c1 c2 c3 emax txmax)
-        datom   (first (set/seek (seq set) from))]
+        datom   (some-> set seq (set/seek from) first)]
     (when (and (some? datom) (<= 0 (cmp to datom)))
       datom)))
 
@@ -1167,6 +1167,13 @@
 (defn+ ^boolean multival? [db attr]
   (is-attr? db attr :db.cardinality/many))
 
+(defn+ ^boolean multi-value? [db attr value]
+  (and
+    (is-attr? db attr :db.cardinality/many)
+    (or
+      (arrays/array? value)
+      (and (coll? value) (not (map? value))))))
+
 (defn+ ^boolean ref? [db attr]
   (is-attr? db attr :db.type/ref))
 
@@ -1307,8 +1314,7 @@
           (cond
             (not (or (keyword? a) (string? a)))
             (assoc entity a v)
-
-            (and (ref? db a) (multival? db a) (sequential? v))
+            (and (ref? db a) (multi-value? db a v))
             (assoc entity a (assoc-auto-tempids db v))
 
             (ref? db a)
@@ -1332,7 +1338,7 @@
         :let [[op e a v] entity]
         (= :db/add op)
         (ref? db a))
-      (if (and (multival? db a) (sequential? v))
+      (if (multi-value? db a v)
         [op e a (assoc-auto-tempids db v)]
         [op e a (first (assoc-auto-tempids db [v]))])
 
@@ -1552,11 +1558,7 @@
             (not (contains? idents a))
             [(assoc entity' a v) upserts]
 
-            (and
-              (multival? db a)
-              (or
-                (arrays/array? v)
-                (and (coll? v) (not (map? v)))))
+            (multi-value? db a v)
             (let [[insert upsert] (split a v)]
               [(cond-> entity'
                  (not (empty? insert)) (assoc a insert))

test/datascript/test/explode.cljc

@@ -36,21 +36,27 @@
 (deftest test-explode-ref
   (let [db0 (d/empty-db {:children {:db/valueType :db.type/ref
                                     :db/cardinality :db.cardinality/many}})]
-    (let [db (d/db-with db0 [{:db/id -1, :name "Ivan", :children [-2 -3]}
-                             {:db/id -2, :name "Petr"} 
-                             {:db/id -3, :name "Evgeny"}])]
-      (is (= (d/q '[:find ?n
-                    :where [_ :children ?e]
-                    [?e :name ?n]] db)
-            #{["Petr"] ["Evgeny"]})))
+    (doseq [children [[-2 -3]
+                      #{-2 -3}
+                      (list -2 -3)]]
+      (testing (str "ref + many + " children) 
+        (let [db (d/db-with db0 [{:db/id -1, :name "Ivan", :children children}
+                                 {:db/id -2, :name "Petr"} 
+                                 {:db/id -3, :name "Evgeny"}])]
+          (is (= #{["Petr"] ["Evgeny"]}
+                (d/q '[:find ?n
+                       :where
+                       [_ :children ?e]
+                       [?e :name ?n]] db))))))
 
     (let [db (d/db-with db0 [{:db/id -1, :name "Ivan"}
                              {:db/id -2, :name "Petr", :_children -1} 
                              {:db/id -3, :name "Evgeny", :_children -1}])]
-      (is (= (d/q '[:find ?n
-                    :where [_ :children ?e]
-                    [?e :name ?n]] db)
-            #{["Petr"] ["Evgeny"]})))
+      (is (= #{["Petr"] ["Evgeny"]}
+            (d/q '[:find ?n
+                   :where
+                   [_ :children ?e]
+                   [?e :name ?n]] db))))
 
     (is (thrown-msg? "Bad attribute :_parent: reverse attribute name requires {:db/valueType :db.type/ref} in schema"
           (d/db-with db0 [{:name "Sergey" :_parent 1}])))))
@@ -78,9 +84,9 @@
     (let [schema {:profile {:db/valueType :db.type/ref
                             :db/cardinality :db.cardinality/many}}
           db     (d/empty-db schema)]
-      (are [tx res] (= (d/q '[:find ?e ?a ?v
-                              :where [?e ?a ?v]]
-                         (d/db-with db tx)) res)
+      (are [tx res] (= res (d/q '[:find ?e ?a ?v
+                                  :where [?e ?a ?v]]
+                             (d/db-with db tx)))
         [{:db/id 5 :name "Ivan" :profile {:db/id 7 :email "@2"}}]
         #{[5 :name "Ivan"] [5 :profile 7] [7 :email "@2"]}
 
@@ -92,6 +98,13 @@
 
         [{:name "Ivan" :profile [{:email "@2"} {:email "@3"}]}]
         #{[1 :name "Ivan"] [1 :profile 2] [2 :email "@2"] [1 :profile 3] [3 :email "@3"]}
+        
+        ;; issue-467
+        [{:name "Ivan" :profile #{{:email "@2"} {:email "@3"}}}]
+        #{[1 :name "Ivan"] [1 :profile 2] [2 :email "@3"] [1 :profile 3] [3 :email "@2"]}
+        
+        [{:name "Ivan" :profile (list {:email "@2"} {:email "@3"})}]
+        #{[1 :name "Ivan"] [1 :profile 2] [2 :email "@2"] [1 :profile 3] [3 :email "@3"]}
 
         [{:email "@2" :_profile {:name "Ivan"}}]
         #{[1 :email "@2"] [2 :name "Ivan"] [2 :profile 1]}

test/datascript/test/index.cljc

@@ -102,7 +102,11 @@
     (is (= [2 :name "Ivan"] (dvec (d/find-datom db :eavt 2 :name))))
 
     (is (= nil (dvec (d/find-datom db :eavt 1 :name "Ivan"))))
-    (is (= nil (dvec (d/find-datom db :eavt 4))))))
+    (is (= nil (dvec (d/find-datom db :eavt 4))))
+    
+    ;; issue-477
+    (is (= nil (d/find-datom (d/empty-db) :eavt)))
+    (is (= nil (d/find-datom (d/empty-db {:age {:db/index true}}) :eavt)))))
 
 (deftest test-seek-datoms
   (let [dvec #(vector (:e %) (:a %) (:v %))

test/datascript/test/transact.cljc

@@ -18,7 +18,7 @@
     (is (= (d/q '[:find ?v
                   :where [1 :aka ?v]] db)
           #{["Devil"] ["Tupen"]}))
-
+    
     (testing "Retract"
       (let [db  (-> db
                   (d/db-with [[:db/retract 1 :name "Petr"]])
@@ -219,7 +219,21 @@
     (let [{:keys [db-after]} (d/transact! conn [[:db.fn/call inc-age "Petr"]])
           e (d/entity db-after 1)]
       (is (= (:age e) 32))
-      (is (:had-birthday e)))))
+      (is (:had-birthday e)))
+    
+    (let [{:keys [db-after]} (d/transact! conn
+                               [[:db.fn/call (fn [db]
+                                               [{:name "Oleg"}])]])
+          e (d/entity db-after 2)]
+      (is (= "Oleg" (:name e))))
+    
+    (let [{:keys [db-after
+                  tempids]} (d/transact! conn
+                              [[:db.fn/call (fn [db]
+                                              [{:db/id -1
+                                                :name "Vera"}])]])
+          e (d/entity db-after (tempids -1))]
+      (is (= "Vera" (:name e))))))
 
 (deftest test-db-ident-fn
   (let [conn    (d/create-conn {:name {:db/unique :db.unique/identity}})