Update to database version

.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.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",

examples/fly-io/server.cljs

@@ -7,7 +7,8 @@
    [clojure.edn :as edn]
    [goog.string :as gstring]
    [logseq.graph-parser.cli :as gp-cli]
-   [logseq.db.rules :as rules]
+   [logseq.db.file-based.rules :as file-rules]
+   [logseq.db.frontend.rules :as rules]
    [datascript.core :as d]))
 
 (def app (express))
@@ -41,8 +42,8 @@
                      query' (if add-rules? (into query [:in '$ '%]) query)
                      _ (println "Query:" (pr-str query'))
                      res (map first
-                              (apply d/q query' @@db-conn
-                                (if add-rules? [(vals rules/query-dsl-rules)] [])))]
+                              (d/q query' @@db-conn
+                                (if add-rules? (rules/extract-rules file-rules/query-dsl-rules)  [])))]
                  (with-out-str
                    (pprint/pprint res))))))
 

examples/from-js/.gitignore

@@ -0,0 +1 @@
+knowledge-garden

examples/from-js/README.md

@@ -7,7 +7,7 @@ examples](https://github.com/babashka/nbb#calling-nbb-from-javascript).
 
 ## Setup
 
-* Install node.js >= 16 and yarn.
+* Install node.js >= 22 and yarn.
 * Run `yarn install` to install npm dependencies.
 * Install [babashka](https://github.com/babashka/babashka)
 
@@ -25,18 +25,18 @@ Datalog query the Logseq app can, but from the commandline. Here's how to use
 this script:
 
 ```sh
-# First clone an example graph like the logseq docs
-$ git clone https://github.com/logseq/docs && cd docs
+# First clone an example graph like this user's graph
+$ git clone https://github.com/pengx17/knowledge-garden && cd knowledge-garden
 
 # Print all the page names in the graph
-$ node query.mjs . '[:find ?n :where [?b :block/name ?n]]'
+$ node ../query.mjs . '[:find ?n :where [?b :block/name ?n]]'
 Parsing 269 files...
 [
   "setting___enable journals",
 ...
 
 # Print all the tasks' contents
-$ node query.mjs . '[:find (pull ?b [:block/content]) :where (task ?b #{"TODO"})]'
+$ node ../query.mjs . '[:find (pull ?b [:block/title]) :where (task ?b #{"DONE"})]'
 Parsing 269 files...
 [
   {
@@ -86,8 +86,8 @@ $ yarn nbb-logseq -m graph-ast/-main -h
 
 Here's how to use this script:
 ```sh
-# First clone an example graph like the logseq docs
-$ git clone https://github.com/logseq/docs && cd docs
+# First clone an example graph like this user's graph
+$ git clone https://github.com/pengx17/knowledge-garden && cd knowledge-garden
 
 # Saves all ast data in the graph.
 $ logseq-graph-ast . -o asts.edn

examples/from-js/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/from-js/package.json

@@ -2,8 +2,8 @@
   "name": "@logseq/nbb-logseq-from-js",
   "version": "1.0.0",
   "dependencies": {
-    "@logseq/nbb-logseq": "^1.2.168",
-    "mldoc": "1.5.1"
+    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v24",
+    "mldoc": "1.5.9"
   },
   "bin": {
     "logseq-graph-ast": "graph_ast.mjs"

examples/from-js/query.mjs

@@ -12,14 +12,15 @@ if (args.length < 2) {
 const results = await loadString(`
   (ns query
     (:require [logseq.graph-parser.cli :as gp-cli]
-              [logseq.db.rules :as rules]
+              [logseq.db.file-based.rules :as file-rules]
+              [logseq.db.frontend.rules :as rules]
               [datascript.core :as d]
               [clojure.edn :as edn]))
 
   (defn- main [graph-dir query*]
     (let [{:keys [conn]} (gp-cli/parse-graph graph-dir {:verbose false})
           query (into query* [:in '$ '%]) ;; assumes no :in are in queries
-          results (map first (apply d/q query @conn [(vals rules/query-dsl-rules)]))]
+          results (map first (d/q query @conn (rules/extract-rules file-rules/query-dsl-rules)))]
       (clj->js results)))
 
   (main "${args[0]}" '${args[1]})

examples/from-js/yarn.lock

@@ -2,12 +2,11 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@^1.2.168":
-  version "1.2.168"
-  resolved "https://registry.yarnpkg.com/@logseq/nbb-logseq/-/nbb-logseq-1.2.168.tgz#e4120c4a7eb6c80737473292c1e20919b4453c91"
-  integrity sha512-lgZuAhck/74+9mT4vr6jVLkPcyRA/RO8ApBizq3d1L6LsPlPjdRp4nIaC2I1/p/AaIIB5vP89pMpqZfVsIHHQg==
+"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v24":
+  version "1.2.173-feat-db-v24"
+  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/3d5b78b0382c7253bf9874c1f38586dd338434f4"
   dependencies:
-    import-meta-resolve "^2.1.0"
+    import-meta-resolve "^4.1.0"
 
 ansi-regex@^2.0.0:
   version "2.1.1"
@@ -93,10 +92,10 @@ get-stream@^4.0.0:
   dependencies:
     pump "^3.0.0"
 
-import-meta-resolve@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/import-meta-resolve/-/import-meta-resolve-2.2.0.tgz#701aa29a044954bd135214049294745ac70dd607"
-  integrity sha512-CpPOtiCHxP9HdtDM5F45tNiAe66Cqlv3f5uHoJjt+KlaLrUh9/Wz9vepADZ78SlqEo62aDWZtj9ydMGXV+CPnw==
+import-meta-resolve@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz#f9db8bead9fafa61adb811db77a2bf22c5399706"
+  integrity sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==
 
 invert-kv@^2.0.0:
   version "2.0.0"
@@ -161,10 +160,10 @@ mimic-fn@^2.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-[email protected].1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/mldoc/-/mldoc-1.5.1.tgz#570ae860d621e167e9a586f5be2b1bb96faf8bb7"
-  integrity sha512-FlmspawzeYjIegvHlUxx2VoZx2ExHKS5h+f80yCFjhuW3yeqdvq4zFP19GJGVGbAWnyTL0DfUoROf84IMAL8Fw==
+[email protected].9:
+  version "1.5.9"
+  resolved "https://registry.yarnpkg.com/mldoc/-/mldoc-1.5.9.tgz#43d740351c64285f0f4988ac9497922d54ae66fc"
+  integrity sha512-87FQ7hseS87tsk+VdpIigpu8LH+GwmbbFgpxgFwvnbH5oOjmIrc47laH4Dyggzqiy8/vMjDHkl7vsId0eXhCDQ==
   dependencies:
     yargs "^12.0.2"
 

examples/linked-data/README.md

@@ -7,7 +7,7 @@ in to existing ones.
 
 ## Setup
 
-* Install node.js >= 16 and yarn.
+* Install node.js >= 22 and yarn.
 * Run `yarn install` to install npm dependencies.
 * Install [babashka](https://github.com/babashka/babashka)