fix deps db test and most lints

Also deleted duplicated gp-util.{page-ref,block-ref} files that were moved to common
and moved a related test to common dep
This commit is contained in:
Gabriel Horner
2024-01-11 14:33:23 -05:00
parent b514dbe4f7
commit cdddce0120
16 changed files with 39 additions and 123 deletions

View File

@@ -134,11 +134,10 @@
logseq.graph-parser.text text
logseq.graph-parser.block gp-block
logseq.graph-parser.mldoc gp-mldoc
logseq.graph-parser.util gp-util
logseq.common.util common-util
logseq.graph-parser.property gp-property
logseq.graph-parser.config gp-config
logseq.graph-parser.util.page-ref page-ref
logseq.graph-parser.util.block-ref block-ref
logseq.common.util.page-ref page-ref
logseq.common.util.block-ref block-ref
logseq.graph-parser.util.db db-util
logseq.graph-parser.date-time-util date-time-util
logseq.outliner.pipeline outliner-pipeline

View File

@@ -1,3 +1,7 @@
{:paths ["src"]
:api-namespaces [logseq.common.path]
:api-namespaces [logseq.common.path
logseq.common.util.page-ref
logseq.common.util.block-ref
logseq.common.util
logseq.common.config]
:report {:format :ignore}}

View File

@@ -1,6 +1,4 @@
;; API fn
logseq.common.config/remove-hidden-files
;; API fn
logseq.common.graph/get-files
;; API fn
logseq.common.graph/read-directories

View File

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

View File

@@ -9,5 +9,7 @@
logseq.db.sqlite.create-graph
logseq.db.frontend.malli-schema
;; Some fns are used by frontend but not worth moving over yet
logseq.db.frontend.schema]
logseq.db.frontend.schema
logseq.db.frontend.validate
logseq.db]
:report {:format :ignore}}

View File

@@ -1,6 +1,4 @@
;; API
logseq.db/start-conn
;; API
logseq.db.frontend.rules/query-dsl-rules
;; API
logseq.db.frontend.rules/db-query-dsl-rules
@@ -10,3 +8,5 @@ logseq.db.frontend.rules/extract-rules
logseq.db.frontend.property.type/type-or-closed-value?
;; Internal API
logseq.db.frontend.rules/rules
;; API
logseq.db.frontend.content/special-id-ref->page

View File

@@ -56,7 +56,7 @@
{:db/id 100002
:block/content "test"
:block/uuid block-uuid
:block/page 100001
:block/page {:db/id 100001}
:block/created-at created-at
:block/updated-at created-at}]
_ (d/transact! conn* blocks)

View File

@@ -1,7 +1,6 @@
{:paths ["src"]
:api-namespaces [logseq.graph-parser.property
;; carve doesn't detect nbb only usage
logseq.graph-parser.log
;; Used in tests
logseq.graph-parser.test.docs-graph-helper]
logseq.graph-parser.test.docs-graph-helper
logseq.graph-parser.schema.mldoc]
:report {:format :ignore}}

View File

@@ -5,31 +5,9 @@ logseq.graph-parser.mldoc/ast-export-markdown
;; API
logseq.graph-parser.mldoc/link?
;; API
logseq.graph-parser.util.block-ref/left-and-right-parens
;; API
logseq.graph-parser.util.block-ref/->block-ref
;; API
logseq.graph-parser.util.block-ref/block-ref?
;; API
logseq.graph-parser.util.block-ref/get-all-block-ref-ids
;; API
logseq.graph-parser.util.page-ref/left-and-right-brackets
;; API
logseq.graph-parser.util.page-ref/->page-ref
;; API
logseq.graph-parser.util.page-ref/get-page-name!
;; API
logseq.graph-parser.config/remove-asset-protocol
;; API
logseq.graph-parser.util/unquote-string
;; API
logseq.graph-parser.util.page-ref/page-ref-re
;; API
logseq.graph-parser/get-blocks-to-delete
;; API
logseq.graph-parser.util.db/resolve-input
;; TODO: use fast-remove-nils instead
logseq.graph-parser.util/remove-nils
;; API
logseq.graph-parser.text/get-file-basename
;; API
@@ -37,8 +15,12 @@ logseq.graph-parser.mldoc/mldoc-link?
;; public var
logseq.graph-parser.schema.mldoc/block-ast-coll-schema
;; API
logseq.graph-parser.config/img-formats
logseq.graph-parser/import-file-to-db-graph
;; API
logseq.graph-parser.config/text-formats
logseq.graph-parser.block/extract-plain
;; API
logseq.graph-parser/import-file-to-db-graph
logseq.graph-parser.block/extract-refs-from-text
;; API
logseq.graph-parser.text/get-page-name
;; API
logseq.graph-parser.whiteboard/shape->block

View File

@@ -10,11 +10,11 @@
logseq.graph-parser.text text
logseq.graph-parser.block gp-block
logseq.graph-parser.mldoc gp-mldoc
logseq.graph-parser.util gp-util
logseq.common.util common-util
logseq.graph-parser.property gp-property
logseq.graph-parser.config gp-config
logseq.common.config common-config
logseq.graph-parser.date-time-util date-time-util
logseq.graph-parser.util.page-ref page-ref
logseq.graph-parser.util.block-ref block-ref}}}
logseq.common.util.page-ref page-ref
logseq.common.util.block-ref block-ref}}}
:skip-comments true
:output {:progress true}}

View File

@@ -6,7 +6,6 @@
[logseq.common.graph :as common-graph]
[logseq.common.config :as common-config]
[logseq.graph-parser :as graph-parser]
[logseq.common.config :as common-config]
[logseq.common.util :as common-util]
[logseq.db :as ldb]))

View File

@@ -14,6 +14,7 @@
[clojure.string :as string]
[logseq.common.util :as common-util]
[logseq.common.config :as common-config]
#_:clj-kondo/ignore
[logseq.graph-parser.schema.mldoc :as mldoc-schema]
[logseq.db.sqlite.util :as sqlite-util]))
@@ -149,6 +150,7 @@
js/JSON.stringify)))
(defn ->edn
;; TODO: Re-enable schema
;; {:malli/schema [:=> [:cat :string :string] mldoc-schema/block-ast-with-pos-coll-schema]}
([content config]
(if (string? content)

View File

@@ -1,41 +0,0 @@
(ns logseq.common.util.block-ref
"Core vars and util fns for block-refs"
(:require [clojure.string :as string]))
(def left-parens "Opening characters for block-ref" "((")
(def right-parens "Closing characters for block-ref" "))")
(def left-and-right-parens "Opening and closing characters for block-ref"
(str left-parens right-parens))
(def block-ref-re #"\(\(([a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12})\)\)")
(defn get-all-block-ref-ids
[content]
(map second (re-seq block-ref-re content)))
(defn get-block-ref-id
"Extracts block id from block-ref using regex"
[s]
(second (re-matches block-ref-re s)))
(defn get-string-block-ref-id
"Extracts block id from block-ref by stripping parens e.g. ((123)) -> 123.
This is a less strict version of get-block-ref-id"
[s]
(subs s 2 (- (count s) 2)))
(defn block-ref?
"Determines if string is block ref using regex"
[s]
(boolean (get-block-ref-id s)))
(defn string-block-ref?
"Determines if string is block ref by checking parens. This is less strict version
of block-ref?"
[s]
(and (string/starts-with? s left-parens)
(string/ends-with? s right-parens)))
(defn ->block-ref
"Creates block ref string given id"
[block-id]
(str left-parens block-id right-parens))

View File

@@ -1,36 +0,0 @@
(ns logseq.common.util.page-ref
"Core vars and util fns for page-ref. Currently this only handles a logseq
page-ref e.g. [[page name]]"
(:require [clojure.string :as string]))
(def left-brackets "Opening characters for page-ref" "[[")
(def right-brackets "Closing characters for page-ref" "]]")
(def left-and-right-brackets "Opening and closing characters for page-ref"
(str left-brackets right-brackets))
;; common regular expressions
(def page-ref-re "Inner capture and doesn't match nested brackets" #"\[\[(.*?)\]\]")
(def page-ref-without-nested-re "Matches most inner nested brackets" #"\[\[([^\[\]]+)\]\]")
(def page-ref-any-re "Inner capture that matches anything between brackets" #"\[\[(.*)\]\]")
(defn page-ref?
"Determines if string is page-ref. Avoid using with format-specific page-refs e.g. org"
[s]
(and (string/starts-with? s left-brackets)
(string/ends-with? s right-brackets)))
(defn ->page-ref
"Create a page ref given a page name"
[page-name]
(str left-brackets page-name right-brackets))
(defn get-page-name
"Extracts page-name from page-ref string"
[s]
(second (re-matches page-ref-any-re s)))
(defn get-page-name!
"Extracts page-name from page-ref and fall back to arg. Useful for when user
input may (not) be a page-ref"
[s]
(or (get-page-name s) s))

View File

@@ -1,4 +1,6 @@
{:paths ["src"]
:api-namespaces [logseq.outliner.datascript-report
logseq.outliner.pipeline]
logseq.outliner.pipeline
logseq.outliner.core
logseq.outliner.tree]
:report {:format :ignore}}

View File

@@ -1,2 +1,8 @@
;; API fn
logseq.outliner.cli.pipeline/add-listener
;; private
logseq.outliner.core/*transaction-opts*
;; private
logseq.outliner.core/*transaction-args*
;; API fn
logseq.outliner.datascript/transact!