Merge pull request #10 from logseq/feat/db

Update to database version

Author: logseq-cldwalker

.github/workflows/ci.yml

@@ -3,19 +3,21 @@ name: CI
 
 on:
   push:
+  pull_request:
+    branches: [main]
 
 jobs:
   test:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: '16'
+          node-version: '22'
       - name: Setup Babashka
         uses: turtlequeue/[email protected]
         with:

.gitignore

@@ -1,6 +1,5 @@
 .shadow-cljs
 node_modules
-lib
 shadow-cljs.edn
 /report.html
 /test/libraries

CHANGELOG.md

@@ -3,6 +3,13 @@
 * Unless a version is noted below, versions map to nbb version as described in
   https://github.com/logseq/nbb-logseq/blob/main/README.md#versioning.
 
+## Unreleased
+* Alpha version of nbb-logseq which supports the database version
+* 1.3.X nbb with more included libraries: cljs-bean.transit, rewrite-clj and ordered
+* Versioned as logseq/nbb-logseq#feat-db-*
+
+## 1.2.173
+
 ## 1.1.158
 * 1.1.158 nbb with 3 new cljs-time fns for compatibility with logseq's :inputs
 

README.md

@@ -34,6 +34,17 @@ $ nbb-logseq -e '(+ 1 2 3)'
 6
 ```
 
+## Database Version
+
+To use `nbb-logseq` with [the database version](https://github.com/logseq/logseq#-database-version), specify the version as `logseq/nbb-logseq#feat-db-v24`. This version is only available through github and has not been released to npm. An npm version will be released when the database version has a desktop release.
+
+Unlike file graphs, DB graphs can be written by scripts. This is powerful and opens up more use cases for scripting. To write your own script, you'll need a package.json and nbb.edn. Use [this example package.json](https://github.com/logseq/publish-spa/blob/feat/db/package.json) and [this example nbb.edn](https://github.com/logseq/publish-spa/blob/feat/db/nbb.edn). Some example database graph scripts:
+
+* https://github.com/logseq/logseq/tree/master/deps/db/script - Scripts to query, validate and create any graph
+* https://github.com/logseq/logseq/blob/master/deps/outliner/script/transact.cljs - Script to transact (modify) nodes queried from the commandline
+* https://github.com/logseq/logseq/tree/master/scripts/src/logseq/tasks/db_graph - More complex scripts to generate graphs with all property types or with schema.org's ontology. See [this readme](https://github.com/logseq/logseq/tree/master/scripts#nbb-scripts) for using these.
+* [Example querying a LLM and a schema.org based DB graph](examples/ollama-chat/)
+
 ## Dependency Management
 
 `nbb-logseq` can use libraries from both NPM and ClojureScript. For NPM

bb.edn

@@ -2,23 +2,30 @@
  :deps
  {nbb.build/nbb.build
   {:git/url "https://github.com/babashka/nbb"
-   :git/sha "35e4e94966d0ae45bb87569940b7c1fb05c19467"
+   :git/sha "9119dbe9b5f660cb77d29058b3b762978ee4b939"
    :deps/root "build"}
   #_{:local/root "../nbb/build"}
   nbb/nbb
   {:git/url "https://github.com/babashka/nbb"
-   :git/sha "35e4e94966d0ae45bb87569940b7c1fb05c19467"
-   :git/tag "v1.2.173"}
+   :git/sha "9119dbe9b5f660cb77d29058b3b762978ee4b939"}
   #_{:local/root "../nbb"}
+  org.babashka/sci
+  {:mvn/version "0.8.41"}
   datascript/deps
-  {:git/url "https://github.com/babashka/nbb-features"
-   :git/sha "912ca86f1744b80d58d2c5c613df3a77d9f8624e"
+  {:git/url "https://github.com/logseq/nbb-features"
+   :git/sha "c16679a2f7327830a88fb61688e69e86eea015a0"
    :deps/root "features/datascript"}
+  #_{:local/root "../nbb-features/features/datascript"}
   datascript-transit/deps
-  {:git/url "https://github.com/babashka/nbb-features"
-   :git/sha "912ca86f1744b80d58d2c5c613df3a77d9f8624e"
+  {:git/url "https://github.com/logseq/nbb-features"
+   :git/sha "c16679a2f7327830a88fb61688e69e86eea015a0"
    :deps/root "features/datascript-transit"}
-  cljs-time/deps {:local/root "features/cljs-time"}}
+  #_{:local/root "../nbb-features/features/datascript-transit"}
+  cljs-time/deps {:local/root "features/cljs-time"}
+  ;; nbb comes with cljs-bean but not cljs-bean.transit
+  cljs-bean-transit/deps {:local/root "features/cljs-bean-transit"}
+  rewrite-clj/deps {:local/root "features/rewrite-clj"}
+  ordered/deps {:local/root "features/ordered"}}
 
  :tasks
  {:requires ([babashka.fs :as fs]

examples/README.md

@@ -17,7 +17,7 @@ nbb-logseq query.cljs docs '[:find (pull ?b [*]) :where [?b :block/marker]]'
   {:timestamps [], :properties [], :start-pos 774, :end-pos 824},
   :block/format :markdown,
   :block/level 3,
-  :block/content "LATER [#A] research balalah is a top priority",
+  :block/title "LATER [#A] research balalah is a top priority",
   :db/id 6361,
   :block/path-refs [{:db/id 5} {:db/id 14} {:db/id 1969}],
   :block/parent {:db/id 6360},

examples/fly-io/README.md

@@ -45,7 +45,7 @@ bb '(->> *input* (map :block/properties))'
 To try this service locally on your Logseq graph:
 
 1. Install [babashka](https://github.com/babashka/babashka) >= 0.8.156.
-2. Install node.js >= 16.3.1.
+2. Install node.js >= 22.
 3. Run `npm install` to install npm dependencies.
 4. Clone your graph: `git clone YOUR-GRAPH resources/graph`
   * If you don't have a graph, try the Logseq docs

examples/fly-io/nbb.edn

@@ -1,7 +1,6 @@
 {:deps
  {logseq/graph-parser
   {:git/url "https://github.com/logseq/logseq"
-   :git/sha "82cf4d3c65acbf230a3170640fe271dd74095067"
-   :git/tag "0.9.8"
+   :git/sha "65640ed8857199d89268295863cd556f5d90ea0b"
    :deps/root "deps/graph-parser"}
-   #_{:local/root "../../../logseq/deps/graph-parser"}}}
+  #_{:local/root "../../../logseq/deps/graph-parser"}}}

examples/fly-io/package-lock.json

@@ -1,9 +1,9 @@
 {
   "name": "mysite",
   "dependencies": {
-    "@logseq/nbb-logseq": "^1.1.155",
+    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v24",
     "express": "^4.18.1",
-    "mldoc": "1.5.1"
+    "mldoc": "1.5.9"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",