Skip to content

Commit fd7a94e

Browse files
rafaeldelbonirafaeldelboni
authored
Merge pull request #17 from clj-codes/chore/bumps
bump: deps and libs
2 parents e0205c2 + 0d73b88 commit fd7a94e

File tree

7 files changed

+71
-48
lines changed

7 files changed

+71
-48
lines changed

‎.github/workflows/release.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Install clojure cli
3434
uses: DeLaGuardo/setup-clojure@master
3535
with:
36-
cli: 1.11.1.1435
36+
cli: 1.11.2.1446
3737

3838
- name: Cache Maven packages
3939
uses: actions/cache@v4
@@ -52,7 +52,7 @@ jobs:
5252
run: zip -r -j docs-db.zip target/docs-db/*
5353

5454
- name: Release to GiHub
55-
uses: softprops/action-gh-release@v1
55+
uses: softprops/action-gh-release@v2
5656
with:
5757
files: "*.zip"
5858
generate_release_notes: true

‎.github/workflows/tests.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Install clojure cli
3333
uses: DeLaGuardo/setup-clojure@master
3434
with:
35-
cli: 1.11.1.1435
35+
cli: 1.11.2.1446
3636

3737
- name: Cache Maven packages
3838
uses: actions/cache@v4
@@ -59,12 +59,12 @@ jobs:
5959
- name: Install clojure cli
6060
uses: DeLaGuardo/setup-clojure@master
6161
with:
62-
cli: 1.11.1.1435
62+
cli: 1.11.2.1446
6363

6464
- name: Setup clojure-lsp
65-
uses: clojure-lsp/setup-clojure-lsp@v1
65+
uses: clojure-lsp/setup-clojure-lsp@v1.0.2
6666
with:
67-
clojure-lsp-version: 2023.12.29-12.09.27
67+
clojure-lsp-version: 2024.03.13-13.11.00
6868

6969
- name: Execute lint checks
7070
run: |

‎deps.edn‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{:paths ["src" "resources"]
2-
:deps {org.clojure/clojure {:mvn/version "1.11.1"}
3-
org.clojure/tools.deps {:mvn/version "0.18.1398"}
4-
clj-kondo/clj-kondo {:mvn/version "2024.02.12"}
5-
datalevin/datalevin {:mvn/version "0.8.26"}
2+
:deps {org.clojure/clojure {:mvn/version "1.11.2"}
3+
org.clojure/tools.deps {:mvn/version "0.19.1417"}
4+
clj-kondo/clj-kondo {:mvn/version "2024.03.13"}
5+
datalevin/datalevin {:mvn/version "0.9.3"}
66
com.cognitect/transit-clj {:mvn/version "1.0.333"}
77
org.slf4j/slf4j-nop {:mvn/version "2.0.12"}}
88

@@ -13,7 +13,7 @@
1313
:jvm-opts ["--add-opens=java.base/java.nio=ALL-UNNAMED"
1414
"--add-opens=java.base/sun.nio.ch=ALL-UNNAMED"]}
1515

16-
:build {:deps {io.github.clojure/tools.build {:mvn/version "0.9.6"}}
16+
:build {:deps {io.github.clojure/tools.build {:mvn/version "0.10.0"}}
1717
:ns-default build
1818
:exec-args {:uber-file "target/extractor.jar"}}
1919

@@ -27,7 +27,7 @@
2727
:jvm-opts ["--add-opens=java.base/java.nio=ALL-UNNAMED"
2828
"--add-opens=java.base/sun.nio.ch=ALL-UNNAMED"]}
2929

30-
:nrepl {:extra-deps {cider/cider-nrepl {:mvn/version "0.45.0"}}
30+
:nrepl {:extra-deps {cider/cider-nrepl {:mvn/version "0.47.0"}}
3131
:main-opts ["-m" "nrepl.cmdline" "--middleware" "[cider.nrepl/cider-middleware]"]}
3232

3333
:test {:main-opts ["-m" "kaocha.runner"]

‎dev/playground.clj‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,19 @@
5454

5555
; fulltext search with generated database
5656
(let [conn (d/get-conn "target/docs-db"
57-
datalevin/db-schemas)
57+
datalevin/db-schemas
58+
{:search-domains {"project-name" {:query-analyzer datalevin/query-analyzer
59+
:analyzer datalevin/analyzer}
60+
"namespace-name" {:query-analyzer datalevin/query-analyzer
61+
:analyzer datalevin/analyzer}
62+
"definition-name" {:query-analyzer datalevin/query-analyzer
63+
:analyzer datalevin/analyzer}}})
5864

5965
db (d/db conn)
6066

6167
datoms (->> (d/fulltext-datoms db
62-
"."
63-
{:top 30
64-
:domains ["definition-name"
68+
"a"
69+
{:domains ["definition-name"
6570
"namespace-name"
6671
"project-name"]})
6772
(map first)
@@ -129,7 +134,22 @@
129134
(d/close conn)
130135
result)
131136

132-
; tests with fulltext search
137+
; count by project
138+
(let [conn (d/get-conn "target/docs-db" datalevin/db-schemas)
139+
db (d/db conn)
140+
result (doall (d/q '[:find ?pn ?ps (count ?d)
141+
:in $
142+
:where
143+
[?p :project/id]
144+
[?p :project/name ?pn]
145+
[?p :project/sha ?ps]
146+
[?n :namespace/project ?p]
147+
[?d :definition/namespace ?n]]
148+
db))]
149+
(d/close conn)
150+
result)
151+
152+
; tests with fulltext search
133153
(let [conn (d/get-conn "target/docs-db" datalevin/db-schemas)
134154
db (d/db conn)
135155
result (doall (d/q '[:find ?e ?name ?a ?v ?b ?d
@@ -138,7 +158,7 @@
138158
[(fulltext $ ?q) [[?e ?a ?v ?b ?d]]]
139159
[?e :definition/name ?name]]
140160
db
141-
"assoc"))]
161+
"astoc"))]
142162
(d/close conn)
143163
result)
144164

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>org.clojure</groupId>
3232
<artifactId>clojure</artifactId>
33-
<version>1.11.1</version>
33+
<version>1.11.2</version>
3434
</dependency>
3535
</dependencies>
3636
<build>

‎resources/config.edn‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
{:db {:dir "target/docs-db"}
22
:deps {org.clojure/clojure
33
{:git/url "https://github.com/clojure/clojure"
4-
:git/tag "clojure-1.11.1"
5-
:git/sha "ce55092f2b2f5481d25cff6205470c1335760ef6"
4+
:git/tag "clojure-1.11.2"
5+
:git/sha "218054f1f2ddfc69ef4f9d17f916de35e4a4effe"
66
:extras {:definitions ["clojure.core/special-forms.edn"]}}
77
org.clojure/core.logic
88
{:git/url "https://github.com/clojure/core.logic"
9-
:git/tag "v1.0.1"
10-
:git/sha "d854548a1eb0706150bd5f5d939c7bca162c07fb"}
9+
:git/tag "v1.1.0"
10+
:git/sha "a489bb3bca10f74edc0e6c3869a9108298ecc060"}
1111
org.clojure/core.async
1212
{:git/url "https://github.com/clojure/core.async"
13-
:git/tag "v1.6.673"
14-
:git/sha "96adc333bb02c8fc60bd51306950b3ad291b3460"}
13+
:git/tag "v1.6.681"
14+
:git/sha "d7f1f9d8fba7b002e539562fcb33de853df6840e"}
1515
org.clojure/core.cache
1616
{:git/url "https://github.com/clojure/core.cache"
17-
:git/tag "v1.0.225"
18-
:git/sha "b9b3192fd7beda68a06af7de4b6d4c2a54515094"}
17+
:git/tag "v1.1.234"
18+
:git/sha "dab8bc6f9ef7e5e67947ace0e68238fc2e1dba01"}
1919
org.clojure/core.memoize
2020
{:git/url "https://github.com/clojure/core.memoize"
21-
:git/tag "v1.0.257"
22-
:git/sha "30adac08491ab6dd23db452215dd0c38ea0a42f4"}
21+
:git/tag "v1.1.266"
22+
:git/sha "a67aebf4506f344211fc66da181437404e28d435"}
2323
org.clojure/data.csv
2424
{:git/url "https://github.com/clojure/data.csv"
25-
:git/tag "v1.0.1"
26-
:git/sha "80c94ef6592f07d62c489359e8535343689d8135"}
25+
:git/tag "v1.1.0"
26+
:git/sha "c323f899a06653af9d66a8e0212b65d0ac6f7b7f"}
2727
org.clojure/data.xml
2828
{:git/url "https://github.com/clojure/data.xml"
29-
:git/tag "v0.2.0-alpha8"
30-
:git/sha "4fbff240e0e4d57537b616fc4c2b7f28f6555e20"}
29+
:git/tag "v0.2.0-alpha9"
30+
:git/sha "f5f552c38e76d9d34c6bc2e5b733fec61ad2ac7d"}
3131
org.clojure/data.json
3232
{:git/url "https://github.com/clojure/data.json"
33-
:git/tag "v2.4.0"
34-
:git/sha "43c122e91c5c5e46dc58dc7e8fcbb64bb9f88a14"}}}
33+
:git/tag "v2.5.0"
34+
:git/sha "457b88e27d7695b38f8b3d9c737e2efb8f2b476d"}}}

‎src/codes/clj/docs/extractor/datalevin.clj‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,20 +86,23 @@
8686
(into (sequence (tokenizer-a s))
8787
(sequence (tokenizer-b s)))))
8888

89-
(defn bulk-transact! [datoms config]
90-
(let [query-analyzer (su/create-analyzer
91-
{:tokenizer (merge-tokenizers
92-
(inter-fn [s] [[s 0 0]])
93-
(su/create-regexp-tokenizer #"[\s:/\.;,!=?\"'()\[\]{}|<>&@#^*\\~`\-]+"))
94-
:token-filters [su/lower-case-token-filter]})
89+
(def query-analyzer
90+
(su/create-analyzer
91+
{:tokenizer (merge-tokenizers
92+
(inter-fn [s] [[s 0 0]])
93+
(su/create-regexp-tokenizer #"[\s:/\.;,!=?\"'()\[\]{}|<>&@#^*\\~`\-]+"))
94+
:token-filters [su/lower-case-token-filter]}))
95+
96+
(def analyzer
97+
(su/create-analyzer
98+
{:tokenizer (merge-tokenizers
99+
(inter-fn [s] [[s 0 0]])
100+
(su/create-regexp-tokenizer #"[\s:/\.;,!=?\"'()\[\]{}|<>&@#^*\\~`\-]+"))
101+
:token-filters [su/lower-case-token-filter
102+
su/prefix-token-filter]}))
95103

96-
analyzer (su/create-analyzer
97-
{:tokenizer (merge-tokenizers
98-
(inter-fn [s] [[s 0 0]])
99-
(su/create-regexp-tokenizer #"[\s:/\.;,!=?\"'()\[\]{}|<>&@#^*\\~`\-]+"))
100-
:token-filters [su/lower-case-token-filter
101-
su/prefix-token-filter]})
102-
conn (-> config :db :dir
104+
(defn bulk-transact! [datoms config]
105+
(let [conn (-> config :db :dir
103106
(d/get-conn db-schemas
104107
{:search-domains {"project-name" {:query-analyzer query-analyzer
105108
:analyzer analyzer}

0 commit comments

Comments
 (0)