fix deps

deps/graph-parser/nbb.edn

@@ -1,8 +1,10 @@
 {:paths ["src"]
  :deps
- {logseq/db
-  {:local/root "../db"}
-  logseq/common
+ {logseq/common
   {:local/root "../common"}
+
+  logseq/db
+  {:local/root "../db"}
+
   io.github.nextjournal/nbb-test-runner
   {:git/sha "60ed57aa04bca8d604f5ba6b28848bd887109347"}}}

deps/graph-parser/src/logseq/graph_parser/property.cljs

@@ -166,9 +166,9 @@
     (let [org? (= format :org)
           kv-format (if org? ":%s: %s" (str "%s" colons " %s"))
           full-format (if org? ":PROPERTIES:\n%s\n:END:" "%s\n")
-          properties-content (->> (map (fn [[k v]] (common-util/format kv-format (name k) v)) properties)
+          properties-content (->> (map (fn [[k v]] (gstring/format kv-format (name k) v)) properties)
                                   (string/join "\n"))]
-      (common-util/format full-format properties-content))))
+      (gstring/format full-format properties-content))))
 
 (defn simplified-property?
   [line]

deps/graph-parser/test/logseq/graph_parser/util/file_name_test.cljs

@@ -7,37 +7,37 @@
 
 ;; Stuffs should be parsable (don't crash) when users dump some random files
 (deftest page-name-parsing-tests
-  (is (string? (#'gp-util/tri-lb-title-parsing  "___-_-_-_---___----")))
-  (is (string? (#'gp-util/tri-lb-title-parsing  "_____///____---___----")))
-  (is (string? (#'gp-util/tri-lb-title-parsing  "/_/////---/_----")))
-  (is (string? (#'gp-util/tri-lb-title-parsing  "/\\#*%lasdf\\//__--dsll_____----....-._0x2B")))
-  (is (string? (#'gp-util/tri-lb-title-parsing  "/\\#*%l;;&&;&\\//__--dsll_____----....-._0x2B")))
-  (is (string? (#'gp-util/tri-lb-title-parsing  multiplatform-reserved-chars)))
-  (is (string? (#'gp-util/tri-lb-title-parsing  "dsa&l dsalfjk jkl"))))
+  (is (string? (#'common-util/tri-lb-title-parsing  "___-_-_-_---___----")))
+  (is (string? (#'common-util/tri-lb-title-parsing  "_____///____---___----")))
+  (is (string? (#'common-util/tri-lb-title-parsing  "/_/////---/_----")))
+  (is (string? (#'common-util/tri-lb-title-parsing  "/\\#*%lasdf\\//__--dsll_____----....-._0x2B")))
+  (is (string? (#'common-util/tri-lb-title-parsing  "/\\#*%l;;&&;&\\//__--dsll_____----....-._0x2B")))
+  (is (string? (#'common-util/tri-lb-title-parsing  multiplatform-reserved-chars)))
+  (is (string? (#'common-util/tri-lb-title-parsing  "dsa&l dsalfjk jkl"))))
 
 (deftest uri-decoding-tests
-  (is (= (gp-util/safe-url-decode "%*-sd%%%saf%=lks") "%*-sd%%%saf%=lks")) ;; Contains %, but invalid
-  (is (= (gp-util/safe-url-decode "%2FDownloads%2FCNN%3AIs%5CAll%3AYou%20Need.pdf") "/Downloads/CNN:Is\\All:You Need.pdf"))
-  (is (= (gp-util/safe-url-decode "asldkflksdaf啦放假啦睡觉啦啊啥的都撒娇浪费；dla") "asldkflksdaf啦放假啦睡觉啦啊啥的都撒娇浪费；dla")))
+  (is (= (common-util/safe-url-decode "%*-sd%%%saf%=lks") "%*-sd%%%saf%=lks")) ;; Contains %, but invalid
+  (is (= (common-util/safe-url-decode "%2FDownloads%2FCNN%3AIs%5CAll%3AYou%20Need.pdf") "/Downloads/CNN:Is\\All:You Need.pdf"))
+  (is (= (common-util/safe-url-decode "asldkflksdaf啦放假啦睡觉啦啊啥的都撒娇浪费；dla") "asldkflksdaf啦放假啦睡觉啦啊啥的都撒娇浪费；dla")))
 
 (deftest page-name-sanitization-backward-tests
-  (is (= "abc.def.ghi.jkl" (#'gp-util/tri-lb-title-parsing "abc.def.ghi.jkl")))
-  (is (= "abc/def/ghi/jkl" (#'gp-util/tri-lb-title-parsing "abc%2Fdef%2Fghi%2Fjkl")))
-  (is (= "abc%/def/ghi/jkl" (#'gp-util/tri-lb-title-parsing "abc%25%2Fdef%2Fghi%2Fjkl")))
-  (is (= "abc%2——ef/ghi/jkl" (#'gp-util/tri-lb-title-parsing "abc%2——ef%2Fghi%2Fjkl")))
-  (is (= "abc&2Fghi/jkl" (#'gp-util/tri-lb-title-parsing "abc&2Fghi%2Fjkl")))
-  (is (= "abc<2Fghi/jkl" (#'gp-util/tri-lb-title-parsing "abc<2Fghi%2Fjkl")))
-  (is (= "abc%2Fghi/jkl" (#'gp-util/tri-lb-title-parsing "abc%2Fghi%2Fjkl")))
-  (is (= "abc;&;2Fghi/jkl" (#'gp-util/tri-lb-title-parsing "abc;&;2Fghi%2Fjkl")))
+  (is (= "abc.def.ghi.jkl" (#'common-util/tri-lb-title-parsing "abc.def.ghi.jkl")))
+  (is (= "abc/def/ghi/jkl" (#'common-util/tri-lb-title-parsing "abc%2Fdef%2Fghi%2Fjkl")))
+  (is (= "abc%/def/ghi/jkl" (#'common-util/tri-lb-title-parsing "abc%25%2Fdef%2Fghi%2Fjkl")))
+  (is (= "abc%2——ef/ghi/jkl" (#'common-util/tri-lb-title-parsing "abc%2——ef%2Fghi%2Fjkl")))
+  (is (= "abc&2Fghi/jkl" (#'common-util/tri-lb-title-parsing "abc&2Fghi%2Fjkl")))
+  (is (= "abc<2Fghi/jkl" (#'common-util/tri-lb-title-parsing "abc<2Fghi%2Fjkl")))
+  (is (= "abc%2Fghi/jkl" (#'common-util/tri-lb-title-parsing "abc%2Fghi%2Fjkl")))
+  (is (= "abc;&;2Fghi/jkl" (#'common-util/tri-lb-title-parsing "abc;&;2Fghi%2Fjkl")))
   ;; happens when importing some compatible files on *nix / macOS
-  (is (= multiplatform-reserved-chars (#'gp-util/tri-lb-title-parsing multiplatform-reserved-chars))))
+  (is (= multiplatform-reserved-chars (#'common-util/tri-lb-title-parsing multiplatform-reserved-chars))))
 
 (deftest path-utils-tests
-  (is (= "asldk lakls " (gp-util/path->file-body "/data/app/asldk lakls .lsad")))
-  (is (= "asldk lakls " (gp-util/path->file-body "asldk lakls .lsad")))
-  (is (= "asldk lakls" (gp-util/path->file-body "asldk lakls")))
-  (is (= "asldk lakls" (gp-util/path->file-body "/data/app/asldk lakls")))
-  (is (= "asldk lakls" (gp-util/path->file-body "file://data/app/asldk lakls.as")))
-  (is (= "中文asldk lakls" (gp-util/path->file-body "file://中文data/app/中文asldk lakls.as")))
-  (is (= "lsad" (gp-util/path->file-ext "asldk lakls .lsad")))
-  (is (= "lsad" (gp-util/path->file-ext "中文asldk lakls .lsad"))))
+  (is (= "asldk lakls " (common-util/path->file-body "/data/app/asldk lakls .lsad")))
+  (is (= "asldk lakls " (common-util/path->file-body "asldk lakls .lsad")))
+  (is (= "asldk lakls" (common-util/path->file-body "asldk lakls")))
+  (is (= "asldk lakls" (common-util/path->file-body "/data/app/asldk lakls")))
+  (is (= "asldk lakls" (common-util/path->file-body "file://data/app/asldk lakls.as")))
+  (is (= "中文asldk lakls" (common-util/path->file-body "file://中文data/app/中文asldk lakls.as")))
+  (is (= "lsad" (common-util/path->file-ext "asldk lakls .lsad")))
+  (is (= "lsad" (common-util/path->file-ext "中文asldk lakls .lsad"))))

deps/graph-parser/test/logseq/graph_parser/util/page_ref_test.cljs

@@ -1,4 +1,4 @@
-(ns logseq.common.util.page-ref-test
+(ns logseq.graph-parser.util.page-ref-test
   (:require [logseq.common.util.page-ref :as page-ref]
             [cljs.test :refer [are deftest]]))