Merge remote-tracking branch 'tonsky/master'

Author: tiensonqin

.github/workflows/build_test.yml

@@ -15,16 +15,15 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Choose Java 11
         run: |
           echo "JAVA_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV
           echo "$JAVA_HOME_11_X64/bin" >> $GITHUB_PATH
-      - name: Set up Clojure
-        uses: DeLaGuardo/setup-clojure@12.1
+      - name: Setup Clojure
+        uses: DeLaGuardo/setup-clojure@12.5
         with:
-          cli: 1.11.1.1413
-
+          cli: latest
       - run: ./script/test_clj.sh
       - run: clojure -M:shadow-cljs:test compile test && node target/datascript.js
       # - run: ./script/test_js.sh

.gitignore

@@ -29,3 +29,4 @@ web/target-cljs
 .rebl
 .shadow-cljs
 demos/node_storage/target
+.clj-kondo

CHANGELOG.md

@@ -1,3 +1,50 @@
+# 1.7.1 - Jun 20, 2024
+
+- Regression: :db.fn/call returning entity without :db/id #474 #475 via @DerGuteMoritz
+
+# 1.7.0 - Jun 19, 2024
+
+- Stable sorting of sequences of various types #470
+- Correctly restore `:max-tx` from storage
+- Fixed tempid/upsert resolution when multiple tempids are added first #472
+- Allow upsert by implicit tuple when only tuple components are specified #473
+- Allow lookup-refs inside tuples used for lookup-refs #452
+
+# 1.6.5 - May 3, 2024
+
+- Regression: fixed some OR queries broken in 1.6.4 #468 #469
+
+# 1.6.4
+
+- Implement “constant substitution” optimization for queries #462
+- Fixed :max-eid for dangling entities during reader-based serialization #463
+- Fixed tempid in unique refs #464
+- Pass through BigInteger/BigDeciman to freeze-fn in serializable #465 #466
+
+# 1.6.3
+
+- Fix regression in 1.6.2 #460 via @galdre
+
+# 1.6.2
+
+- Query: shortcircuit clause resolution when result is guaranteed to be empty #459 via @galdre
+
+# 1.6.1
+
+- Fixed JS version bug caused by Conn rewrite
+
+# 1.6.0
+
+- [ BREAKING ] Implement Conn as a single atom with extend-clj
+  - Only breaking if you relied on getting listneres from Conn meta
+  - Before: `@(:listeners (meta conn))`
+  - After: `(:listeners @(:atom conn))`
+- prevent explosion of redundant tuples during rule solving #457, thx @RutledgePaulV
+
+# 1.5.4
+
+- Fixed: `:xform` is not called on ref attributes #455
+
 # 1.5.3
 
 - Added: `d/reset-schema!`, `d/with-schema`

README.md

@@ -18,7 +18,12 @@ The intention with DataScript is to be a basic building block in client-side app
 ## Latest version [![Build Status](https://travis-ci.org/tonsky/datascript.svg?branch=master)](https://travis-ci.org/tonsky/datascript)
 
 ```clj
-[datascript "1.5.3"]
+;; lein
+[datascript "1.7.1"]
+```
+```clj
+;; deps.edn
+datascript/datascript {:mvn/version "1.7.1"}
 ```
 
 Important! If you are using shadow-cljs, add
@@ -79,6 +84,7 @@ Projects using DataScript:
 - [LightMesh](http://lightmesh.com/), datacenter management
 - [PartsBox](https://partsbox.io/), electronic parts management
 - [I am Fy](https://www.iamfy.co/), accessories e-shop
+- [Under Whose Command?](https://myanmar.securityforcemonitor.org/), an interactive report by Security Force Monitor
 - [Pinfigurator](https://kevinlynagh.com/pinfigurator/), a microcontroller search tool
 - [Precursor](http://precursorapp.com/), collaborative prototyping tool
 - [Acha-acha](http://tonsky.me/blog/acha-acha/), GitHub achievements
@@ -177,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.5.3/datascript-1.5.3.min.js"></script>
+<script src="https://github.com/tonsky/datascript/releases/download/1.7.1/datascript-1.7.1.min.js"></script>
 ```
 
 or as a CommonJS module ([npm page](https://www.npmjs.org/package/datascript)):
@@ -259,11 +265,7 @@ Interface differences:
 * Custom aggregate functions are called via aggregate keyword: `:find (aggregate ?myfn ?e) :in $ ?myfn`
 * Additional `:db.fn/retractAttribute` shortcut
 * Transactions are not annotated by default with `:db/txInstant`
-
-Expected soon:
-
-* Better error reporting
-* Proper documentation
+* When “transaction function” is called, the db that this function receive is a “partial db” relative to it's position in transaction.
 
 ## Differences from Datomic
 
@@ -272,13 +274,10 @@ Expected soon:
 * Simplified schema, not queryable
 * Attributes do not have to be declared in advance. Put them to schema only when you need special behaviour from them
 * Any type can be used for values
-* No `:db/ident` attributes, keywords are _literally_ attribute values, no integer id behind them
+* No `:db/ident` for attributes, keywords are _literally_ attribute values, no integer id behind them
 * No schema migrations
-* No cache segments management, no laziness. Entire DB must reside in memory
-* No facilities to persist, transfer over the wire or sync DB with the server
-* No pluggable storage options, no full-text search, no partitions
+* No full-text search, no partitions
 * No external dependencies
-* Free
 
 Aimed at interactive, long-living browser applications, DataScript DBs operate in constant space. If you do not add new entities, just update existing ones, or clean up database from time to time, memory consumption will be limited. This is unlike Datomic which keeps history of all changes, thus grows monotonically. DataScript does not track history by default, but you can do it via your own code if needed.
 
@@ -319,6 +318,6 @@ Benchmark:
 
 ## License
 
-Copyright © 2014–2021 Nikita Prokopov
+Copyright © 2014–2024 Nikita Prokopov
 
 Licensed under Eclipse Public License (see [LICENSE](LICENSE)).

bench/datascript/bench/datascript.cljc

@@ -110,6 +110,19 @@
                   [?e :sex :male]]
       @*db100k)))
 
+(defn bench-q5-shortcircuit []
+  (bench/bench
+    (d/q '[:find ?e ?n ?l ?a ?s ?al
+           :in $ ?n ?a
+           :where [?e :name ?n]
+                  [?e :age ?a]
+                  [?e :last-name ?l]
+                  [?e :sex ?s]
+                  [?e :alias ?al]]
+      @*db100k
+      "Anastasia"
+      35)))
+
 (defn bench-qpred1 []
   (bench/bench
     (d/q '[:find ?e ?s
@@ -226,6 +239,7 @@
    "q2"                 bench-q2
    "q3"                 bench-q3
    "q4"                 bench-q4
+   "q5-shortcircuit"    bench-q5-shortcircuit
    "qpred1"             bench-qpred1
    "qpred2"             bench-qpred2
    "pull-one-entities"  bench-pull-one-entities
@@ -277,6 +291,7 @@
   (bench-q2)
   (bench-q3)
   (bench-q4)
+  (bench-q5-shortcircuit)
   (bench-qpred1)
   (bench-qpred2)
   (bench-pull-one-entities)
@@ -298,4 +313,4 @@
   (bench-rules-long-30x3)
   (bench-rules-long-30x5)
   (bench-freeze)
-  (bench-thaw))
+  (bench-thaw))

deps.edn

@@ -1,32 +1,47 @@
-{:deps {org.clojars.tiensonqin/persistent-sorted-set {:mvn/version "0.0.6"}}
+{:deps
+ {org.clojars.tiensonqin/persistent-sorted-set {:mvn/version "0.0.6"}
+  io.github.tonsky/extend-clj {:mvn/version "0.1.0"}}
 
- :aliases {:1.9 {:override-deps {org.clojure/clojure {:mvn/version "1.9.0"}}}
+ :aliases
+ {:cljs
+  {:extra-paths ["test"]
+   :extra-deps
+   {org.clojure/clojurescript {:mvn/version "1.11.132"}}}
 
-           :1.10 {:override-deps {org.clojure/clojure {:mvn/version "1.10.2"}}}
+  :1.9
+  {:override-deps
+   {org.clojure/clojure {:mvn/version "1.9.0"}}}
 
-           :1.11.1 {:override-deps {org.clojure/clojure {:mvn/version "1.11.1"}}}
+  :1.10
+  {:override-deps
+   {org.clojure/clojure {:mvn/version "1.10.2"}}}
 
-           :dev {:extra-paths ["dev"]
-                 :extra-deps {org.clojure/tools.namespace {:mvn/version "1.3.0"}}}
-           :shadow-cljs
-           {:extra-deps {thheller/shadow-cljs {:mvn/version "2.19.0"}}
-            :main-opts ["-m" "shadow.cljs.devtools.cli"]}
+  :1.11.1
+  {:override-deps
+   {org.clojure/clojure {:mvn/version "1.11.1"}}}
 
-           :test {:extra-paths ["test"]
-                  :extra-deps {org.clojure/clojurescript  {:mvn/version "1.11.51"}
-                               metosin/jsonista           {:mvn/version "0.3.3"}
-                               cheshire/cheshire          {:mvn/version "5.10.0"}
-                               com.cognitect/transit-clj  {:mvn/version "1.0.324"}
-                               com.cognitect/transit-cljs {:mvn/version "0.8.269"}}}
+  :dev
+  {:extra-paths ["dev" "test"]
+   :jvm-opts    ["-ea" "-Ddatascript.debug" "-Dclojure.main.report=stderr"]
+   :extra-deps
+   {io.github.tonsky/duti      {:git/sha "fc833a87a8687b67e66281e216eeee1ad6048168"}
+    metosin/jsonista           {:mvn/version "0.3.3"}
+    cheshire/cheshire          {:mvn/version "5.10.0"}
+    com.cognitect/transit-clj  {:mvn/version "1.0.324"}
+    com.cognitect/transit-cljs {:mvn/version "0.8.269"}}}
 
-           :bench {:extra-paths ["bench"]
-                   :jvm-opts ["-server"
-                              "-XX:+UnlockDiagnosticVMOptions"
-                              "-Djdk.attach.allowAttachSelf"
-                              "-XX:+DebugNonSafepoints"]
-                   :extra-deps {metosin/jsonista    {:mvn/version "0.3.3"}
-                                criterium/criterium {:mvn/version "0.4.6"}
-                                com.clojure-goes-fast/clj-async-profiler {:mvn/version "1.0.0"}}}
+  :bench
+  {:extra-paths ["bench"]
+   :jvm-opts ["-server"
+              "-XX:+UnlockDiagnosticVMOptions"
+              "-Djdk.attach.allowAttachSelf"
+              "-XX:+DebugNonSafepoints"]
+   :extra-deps
+   {metosin/jsonista    {:mvn/version "0.3.3"}
+    criterium/criterium {:mvn/version "0.4.6"}
+    com.clojure-goes-fast/clj-async-profiler {:mvn/version "1.0.0"}}}
 
-           :datomic {:extra-paths ["bench_datomic" "test_datomic"]
-                     :extra-deps {com.datomic/peer {:mvn/version "1.0.6735"}}}}}
+  :datomic
+  {:extra-paths ["bench_datomic" "test_datomic"]
+   :extra-deps
+   {com.datomic/peer {:mvn/version "1.0.6735"}}}}}

dev/data_readers.clj

@@ -1,31 +1,17 @@
 (ns user
   (:require
-    [clojure.tools.namespace.repl :as ns]))
+    [duti.core :as duti]))
 
-(ns/set-refresh-dirs "src" "bench" "test" #_"bench_datomic" #_"test_datomic")
+(duti/set-dirs "src" "bench" "test" #_"bench_datomic" #_"test_datomic")
 
-(defn reload []
-  (set! *warn-on-reflection* true)
-  (let [res (ns/refresh)]
-    (if (instance? Throwable res)
-      (do
-        (.printStackTrace ^Throwable res)
-        (throw res))
-      res)))
+(def reload
+  duti/reload)
 
-(def lock
-  (Object.))
+(def -main
+  duti/-main)
 
-(defn position []
-  (let [trace (->> (Thread/currentThread)
-                (.getStackTrace)
-                (seq))
-        el    ^StackTraceElement (nth trace 4)]
-    (str "[" (clojure.lang.Compiler/demunge (.getClassName el)) " " (.getFileName el) ":" (.getLineNumber el) "]")))
+(defn test-all []
+  (duti/test #"datascript\.test\.(?!cljs).*"))
 
-(defn p [form]
-  `(let [t# (System/currentTimeMillis)
-         res# ~form]
-     (locking lock
-       (println (str "#p" (position) " " '~form " => (" (- (System/currentTimeMillis) t#) " ms) " res#)))
-     res#))
+(defn -test-main [_]
+  (duti/test-exit #"datascript\.test\.(?!cljs).*"))