enhance: update action to use latest logseq and nbb-logseq

logseq-cldwalker · logseq-cldwalker · commit 5e10f8c9ece3 · 2025-07-14T23:01:49.000-04:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,4 +10,4 @@ jobs:
 
       # TODO: Test a real graph
       - name: Run graph-validator tests
-        uses: logseq/graph-validator@main
+        uses: logseq/graph-validator@feat/db
diff --git a/nbb.edn b/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"}}}
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
   },
   "homepage": "https://github.com/logseq/graph-validator#readme",
   "dependencies": {
-    "@logseq/nbb-logseq": "^1.2.173",
-    "mldoc": "^1.5.0"
+    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v24",
+    "mldoc": "^1.5.9"
   }
 }
diff --git a/src/logseq/graph_validator.cljs b/src/logseq/graph_validator.cljs
@@ -81,7 +81,11 @@
              (exclude-tests exclude))
            (setup-graph dir)
            (apply t/run-tests (into ['logseq.graph-validator.default-validations]
-                                    (map symbol add-namespaces))))))))
+                                    (map symbol add-namespaces)))))
+        (p/catch
+         (fn [err]
+           (prn :unexpected-failure! err)
+           (js/process.exit 1))))))
 
 (defn -main [& args]
   (let [options (-> (cli/parse-opts args {:spec spec})
diff --git a/src/logseq/graph_validator/default_validations.cljs b/src/logseq/graph_validator/default_validations.cljs
@@ -1,16 +1,16 @@
 (ns logseq.graph-validator.default-validations
   "Default validations that are enabled on graph-validator"
-  (:require [clojure.test :as t :refer [deftest is]]
-            [logseq.graph-parser.util.block-ref :as block-ref]
-            [logseq.db.rules :as rules]
-            [clojure.walk :as walk]
+  (:require ["fs" :as fs]
+            ["path" :as path]
+            [clojure.edn :as edn]
             [clojure.set :as set]
             [clojure.string :as string]
+            [clojure.test :as t :refer [deftest is]]
+            [clojure.walk :as walk]
             [datascript.core :as d]
-            [logseq.graph-validator.state :as state]
-            [clojure.edn :as edn]
-            ["fs" :as fs]
-            ["path" :as path]))
+            [logseq.common.util.block-ref :as block-ref]
+            [logseq.db.file-based.rules :as file-rules]
+            [logseq.graph-validator.state :as state]))
 
 (defn- extract-subnodes-by-pred [pred node]
   (cond
@@ -46,7 +46,7 @@
                       :in $ %
                       :where (has-property ?b :id)]
                     @state/db-conn
-                    (vals rules/query-dsl-rules))
+                    [(:has-property file-rules/query-dsl-rules)])
                (map first)
                (map (comp :id :block/properties))
                set))))))
@@ -61,7 +61,7 @@
                       :in $ %
                       :where (has-property ?b :id)]
                     @state/db-conn
-                    (vals rules/query-dsl-rules))
+                    [(:has-property file-rules/query-dsl-rules)])
                (map first)
                (map (comp :id :block/properties))
                set))))))
@@ -181,7 +181,7 @@
               :where
               (has-page-property ?b :alias)]
             db
-            (vals rules/query-dsl-rules))
+            [(:has-page-property file-rules/query-dsl-rules)])
        (map first)
        (map (comp :alias :block/properties))
        (mapcat identity)
@@ -199,7 +199,7 @@
                                     used-page-refs*))
         aliases (get-all-aliases @state/db-conn)
         all-db-pages* (->> (d/q '[:find ?n
-                                  :where [?b :block/name ?n] [?b :block/file] [?b :block/journal? false]]
+                                  :where [?b :block/name ?n] [?b :block/file] (not [?b :block/type "journal"])]
                                 @state/db-conn)
                            (map first)
                            set)
diff --git a/src/logseq/graph_validator/validations/class.cljs b/src/logseq/graph_validator/validations/class.cljs
@@ -2,7 +2,7 @@
   "Validations related to managing classes"
   (:require [clojure.test :refer [deftest is]]
             [logseq.graph-validator.state :as state]
-            [logseq.db.rules :as rules]
+            [logseq.db.file-based.rules :as file-rules]
             [datascript.core :as d]))
 
 (defn- get-classes []
@@ -11,12 +11,12 @@
           :in $ %
           :where (page-property ?b :type "Class")]
         @state/db-conn
-        (vals rules/query-dsl-rules))
+        [(:page-property file-rules/query-dsl-rules)])
        (map first)
-       (map #(assoc (:block/properties %) :block/original-name (:block/original-name %)))))
+       (map #(assoc (:block/properties %) :block/title (:block/title %)))))
 
 (deftest classes-have-parents
-  (is (empty? (remove #(or (some? (:parent %)) (= "Thing" (:block/original-name %)))
+  (is (empty? (remove #(or (some? (:parent %)) (= "Thing" (:block/title %)))
                       (get-classes)))
       "All classes have parent property except Thing"))
 
@@ -25,5 +25,5 @@
       "All classes have urls"))
 
 (deftest classes-are-capitalized
-  (is (empty? (remove #(re-find #"^[A-Z]" (:block/original-name %)) (get-classes)))
+  (is (empty? (remove #(re-find #"^[A-Z]" (:block/title %)) (get-classes)))
       "All classes start with a capital letter"))
diff --git a/src/logseq/graph_validator/validations/property.cljs b/src/logseq/graph_validator/validations/property.cljs
@@ -28,9 +28,9 @@
             [clojure.string :as string]
             [logseq.graph-validator.state :as state]
             [logseq.graph-parser.property :as gp-property]
-            [logseq.graph-parser.util.page-ref :as page-ref]
-            [logseq.graph-parser.util :as gp-util]
-            [logseq.db.rules :as rules]
+            [logseq.common.util.page-ref :as page-ref]
+            [logseq.common.util :as common-util]
+            [logseq.db.file-based.rules :as file-rules]
             [datascript.core :as d]
             [clojure.edn :as edn]
             ["path" :as path]
@@ -100,7 +100,7 @@
   "Get all property entities from :properties"
   [db]
   (d/q
-   '[:find (pull ?b [:block/content :block/original-name :block/properties]) ?p
+   '[:find (pull ?b [:block/content :block/title :block/properties]) ?p
      :in $
      :where
      [?b :block/properties ?p]
@@ -134,10 +134,10 @@
   []
   (->> (d/q '[:find (pull ?b [*])
               :in $ %
-              :where [?b :block/original-name]
+              :where [?b :block/title]
               (has-page-property ?b :type)]
             @state/db-conn
-            (vals rules/query-dsl-rules))
+            [(:has-page-property file-rules/query-dsl-rules)])
        (map first)))
 
 ;; Macro fns
@@ -181,7 +181,7 @@
   {:Integer int?
    :String string?
    :Boolean boolean?
-   :Uri gp-util/url?
+   :Uri common-util/url?
    ;; TODO: Make this configurable
    :Date #(re-matches #"\d{2}-\d{2}-\d{4}" %)
    :Time #(re-matches #"\d\d?:\d\d" %)
@@ -217,7 +217,7 @@
   (let [all-things (get-all-page-things)
         children-maps (->> all-things
                            (filter #(= "Class" (first (get-in % [:block/properties :type]))))
-                           (map #(vector (:block/original-name %) (first (get-in % [:block/properties :parent]))))
+                           (map #(vector (:block/title %) (first (get-in % [:block/properties :parent]))))
                            (into {}))
         range-properties (->> all-things
                               (filter #(= "Property" (first (get-in % [:block/properties :type]))))
@@ -255,7 +255,7 @@
   (let [all-things (get-all-page-things)
         children-maps (->> all-things
                            (filter #(= "Class" (first (get-in % [:block/properties :type]))))
-                           (map #(vector (:block/original-name %) (first (get-in % [:block/properties :parent]))))
+                           (map #(vector (:block/title %) (first (get-in % [:block/properties :parent]))))
                            (into {}))
         range-properties (->> all-things
                               (filter #(= "Property" (first (get-in % [:block/properties :type]))))
@@ -270,7 +270,7 @@
         page-classes (->> all-things
                           (mapcat (fn [b]
                                     (map #(vector % (first (get-in b [:block/properties :type])))
-                                         (into [(:block/original-name b)]
+                                         (into [(:block/title b)]
                                                (get-in b [:block/properties :alias])))))
                           (into {}))]
     (doseq [[property ranges] range-properties]
@@ -299,14 +299,14 @@
                                           props)))
                            (reduce (fn [m [prop ent]]
                                      (assoc-in m
-                                               [prop (select-keys ent [:block/content :block/original-name])]
+                                               [prop (select-keys ent [:block/content :block/title])]
                                                ;; later: Support multiple types
                                                (first (:types ent))))
                                    {}))
         _ (println "Validating domains for" (count domain-properties) "properties")
         children-maps (->> all-things
                            (filter #(= "Class" (first (get-in % [:block/properties :type]))))
-                           (map #(vector (:block/original-name %) (first (get-in % [:block/properties :parent]))))
+                           (map #(vector (:block/title %) (first (get-in % [:block/properties :parent]))))
                            (into {}))]
     (doseq [[property domains] domain-properties]
       (validate-property-domains property domains (property-ents property) children-maps))))
@@ -317,7 +317,7 @@
           :in $ %
           :where (page-property ?b :type "Property")]
         @state/db-conn
-        (vals rules/query-dsl-rules))
+        [(:page-property file-rules/query-dsl-rules)])
        (map first)
        (map #(assoc (:block/properties %) :block/name (:block/name %)))))
 
diff --git a/yarn.lock b/yarn.lock
@@ -2,12 +2,11 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@^1.2.173":
-  version "1.2.173"
-  resolved "https://registry.yarnpkg.com/@logseq/nbb-logseq/-/nbb-logseq-1.2.173.tgz#27a52c350f06ac9c337d73687738f6ea8b2fc3f3"
-  integrity sha512-ABKPtVnSOiS4Zpk9+UTaGcs5H6EUmRADr9FJ0aEAVpa0WfAyvUbX/NgkQGMe1kKRv3EbIuLwaxfy+txr31OtAg==
+"@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.1.0"
-  resolved "https://registry.yarnpkg.com/import-meta-resolve/-/import-meta-resolve-2.1.0.tgz#c8952d331ed6e9bb6ad524a7549deb3d34af41ce"
-  integrity sha512-yG9pxkWJVTy4cmRsNWE3ztFdtFuYIV8G4N+cbCkO8b+qngkLyIUhxQFuZ0qJm67+0nUOxjMPT7nfksPKza1v2g==
+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==
 
-mldoc@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/mldoc/-/mldoc-1.5.0.tgz#c1250115ef320ec3eaf9717dd65730b041d78e7b"
-  integrity sha512-V1HSNCOkeWRukQPfOdUv12wMKeNSVNzz2AIvjsmi/C8fakimoOt5oJA+H+r1bNf+7j9PBtagEzbrTTRKoOmqpw==
+mldoc@^1.5.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"
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`},`
`18`	`18`	`"homepage": "https://github.com/logseq/graph-validator#readme",`
`19`	`19`	`"dependencies": {`
`20`		`- "@logseq/nbb-logseq": "^1.2.173",`
`21`		`- "mldoc": "^1.5.0"`
	`20`	`+ "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v24",`
	`21`	`+ "mldoc": "^1.5.9"`
`22`	`22`	`}`
`23`	`23`	`}`