feat(core): add transit and up version of datascript

Author: Andrey Melnikov

project.clj

@@ -1,4 +1,4 @@
-(defproject datascript-mori "0.15.4"
+(defproject datascript-mori "0.16.2"
   :description "Wrapper for datascript interplay mori"
   :url "https://github.com/typeetfunc/datascript-mori"
   :license {:name "Eclipse Public License"
@@ -8,7 +8,8 @@
 
   :dependencies [[org.clojure/clojure "1.7.0"]
                  [org.clojure/clojurescript "1.7.170"]
-                 [datascript "0.15.4"]]
+                 [datascript "0.16.1"]
+                 [datascript-transit "0.2.2"]]
 
   :plugins [[lein-cljsbuild "1.1.2" :exclusions [[org.clojure/clojure]]]
             [lein-git-deps "0.0.2-SNAPSHOT"]]
@@ -24,6 +25,7 @@
                 :compiler {
                            :output-to "release-js/datascript-mori.bare.js"
                            :main datascript-mori.core
+                           :externs ["release-js/datascript-core.extern.js"]
                            :optimizations :advanced
                            :pretty-print false
                            }

release-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datascript-mori",
-  "version": "0.16.1",
+  "version": "0.17.0",
   "description": "Wrapper for datascript interplay mori",
   "homepage": "https://github.com/typeetfunc/datascript-mori",
   "author": "Andrei Melnikov (https://github.com/typeetfunc)",

release-js/test/combineJsAndCljsApi.spec.js

@@ -49,4 +49,16 @@ describe('Use regular JS API for create connection and add data to DB', () => {
     assert(isSet(result), 'result is mori set')
     assert(equals(result, set([vector("Igor")])), 'result equals #{["Igor"]}')
   })
+
+  it('cas is just work', () => {
+    var conn = djs.create_conn();
+    djs.transact(conn, [
+      [':db/add', 1, 'weight', 200]
+    ]);
+    djs.transact(conn, [
+      [':db.fn/cas', 1, 'weight', 200, 300]
+    ]);
+    var e = djs.entity(djs.db(conn), 1);
+    assert(e.get('weight') === 300, 'CAS changed weight correctly');
+  });
 })

release-js/test/onlyCljsApiUsage.spec.js

@@ -3,7 +3,8 @@ import {assert} from 'chai'
 var d = datascript.core // use datascript_mori.datascript.core API
 var djs = datascript.js
 var {hashMap, vector, parse, toJs, equals, isMap, hasKey, isSet, set, getIn, get} = mori
-var {DB_VALUE_TYPE, DB_TYPE_REF, DB_ADD, DB_ID, TEMPIDS} = helpers
+var {DB_VALUE_TYPE, DB_TYPE_REF, DB_ADD, DB_ID, TEMPIDS, DB_FN_CAS, stringify_db, 
+parse_db} = helpers
 
 describe('add data to DB and query them', () => {
   // scheme must be a mori structure or use helpers.schema_to_clj({friend: {":db/valueType": ":db.type/ref"}})
@@ -112,3 +113,34 @@ describe('create conn and use transact API', () => {
   })
   d.unlisten_BANG_(conn, "main") //or djs.unlisten(conn, "main", callback) is fully equal definition
 });
+
+
+describe('CAS', () => {
+  it('cas is just work', () => {
+    var conn = d.create_conn();
+    d.transact_BANG_(conn, vector(
+      vector(DB_ADD, 1, 'weight', 200)
+    ));
+    d.transact_BANG_(conn, vector(
+      vector(DB_FN_CAS, 1, 'weight', 200, 300)
+    ));
+    var e = d.entity(d.db(conn), 1);
+    assert(get(e, 'weight') === 300, 'CAS changed weight correctly');
+  });
+});
+
+describe('serialization/deserialization', () => {
+  it('serialize', () => {
+    var db = d.empty_db();
+    var dbWithItem = d.db_with(db, vector(
+      vector(DB_ADD, 1, 'weight', 200)
+    ));
+    assert(stringify_db(dbWithItem) === '["~#datascript/DB",["^ ","~:schema",null,"~:datoms",["~#list",[["~#datascript/Datom",[1,"weight",200,536870913]]]]]]', 'stringify db works correctly');
+  });
+
+  it('deserialize', () => {
+    var db = parse_db('["~#datascript/DB",["^ ","~:schema",null,"~:datoms",["~#list",[["~#datascript/Datom",[1,"weight",200,536870913]]]]]]', 'stringify db works correctly');
+    var e = d.entity(db, 1);
+    assert(get(e, 'weight') === 200, 'deserialize works correctly');
+  })
+});

src/datascript_mori/core.cljs

@@ -7,6 +7,7 @@
     [mori :as m]
     [mori.extra :as me]
     [cljs.reader :as reader]
+    [datascript.transit :as dt]
     [datascript.lru :as dlru]))
 
 (def ^:export schema_to_clj      djs/schema->clj)
@@ -31,9 +32,11 @@
     (let [qp (reader/read-string q)]
       (vswap! query_cache assoc q qp)
       qp)))
-
+(def ^:export stringify_db dt/write-transit-str)
+(def ^:export parse_db dt/read-transit-str)
 (def ^:export DB_ID :db/id)
 (def ^:export DB_FN_CALL :db.fn/call)
+(def ^:export DB_FN_CAS :db.fn/cas)
 (def ^:export DB_BEFORE :db-before)
 (def ^:export DB_AFTER :db-after)
 (def ^:export TX_DATA :tx-data)