Skip to content

Commit 95c620f

Browse files
committed
fix: access to resources in uberjar
1 parent 9e8b5ae commit 95c620f

File tree

7 files changed

+22
-16
lines changed

7 files changed

+22
-16
lines changed

deps.edn

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{:paths ["src"]
1+
{:paths ["src" "resources"]
22
:deps {com.github.clj-easy/graal-build-time {:mvn/version "1.0.5"}
33
org.clj-commons/clj-http-lite {:mvn/version "1.0.13"}
44
org.clojure/clojure {:mvn/version "1.11.3"}

dev/user.clj

-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@
154154

155155
;; (re-)run server
156156
(do (require '[mock-server.main :as server])
157-
(mock-server)
158157
(def mock-server (server/run)))
159158

160159
;; stop server

src/aidbox_sdk/generator.clj

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
(ns aidbox-sdk.generator
22
(:require
3-
[aidbox-sdk.utils :as u]
43
[clojure.java.io :as io]))
54

6-
(defn prepare-sdk-files [target-language]
7-
(let [base-dir (io/file "resources" "sdk" (name target-language))]
8-
(->> base-dir
9-
u/list-files
10-
(map (fn [file]
11-
{:path (.toFile (u/get-relative-path base-dir file))
12-
:content (slurp file)})))))
5+
(defn prepare-sdk-files [target-language files]
6+
(for [file files]
7+
{:path file
8+
:content (slurp
9+
(io/resource
10+
(str "sdk/" (name target-language) "/" file)))}))
1311

1412
;;
1513
;; main

src/aidbox_sdk/generator/dotnet.clj

+2-1
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,8 @@
334334
constrained-ir-schemas))
335335

336336
(generate-sdk-files [_ ir-schemas]
337-
(let [common-sdk-files (generator/prepare-sdk-files :dotnet)
337+
(let [files-list ["Aidbox.csproj" "Api.cs" "Client.cs"]
338+
common-sdk-files (generator/prepare-sdk-files :dotnet files-list)
338339
utils (generate-utils-namespace ir-schemas)]
339340
(conj common-sdk-files {:path (io/file "Utils.cs") :content utils})))
340341

src/aidbox_sdk/generator/python.clj

+4-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,10 @@
272272
(map generate-class (:backbone-elements ir-schema)))])})
273273
constraint-ir-schemas))
274274

275-
(generate-sdk-files [_ _] (generator/prepare-sdk-files :python))
275+
(generate-sdk-files [_ _]
276+
(generator/prepare-sdk-files
277+
:python [".env.tpl" "pylintrc.toml" "setup.py" "aidbox/py.typed"
278+
"aidbox/__init__.py"]))
276279

277280
(generate-valuesets [_ vs-schemas]))
278281

src/aidbox_sdk/generator/typescript.clj

+5-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,11 @@
232232
(map generate-class (:backbone-elements ir-schema)))]})})
233233
ir-schemas))
234234

235-
(generate-sdk-files [_ _] (generator/prepare-sdk-files :typescript))
235+
(generate-sdk-files [_ _]
236+
(generator/prepare-sdk-files
237+
:typescript
238+
["index.ts" "eslint.config.mjs" "http-client.ts" "package.json"
239+
"package-lock.json" "tsconfig.json" "types/index.ts"]))
236240

237241
(generate-valuesets [_ vs-schemas]
238242
(->> vs-schemas

src/aidbox_sdk/schema.clj

+4-3
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,9 @@
142142

143143
(defn retrieve-valuesets [fhir-versions]
144144
(let [fhir-version->value-set-file
145-
{"hl7.fhir.r4.core" "resources/r4-value-sets.edn"
146-
"hl7.fhir.r4b.core" "resources/r4b-value-sets.edn"
147-
"hl7.fhir.r5.core" "resources/r5-value-sets.edn"}]
145+
{"hl7.fhir.r4.core" (io/resource "r4-value-sets.edn")
146+
"hl7.fhir.r4b.core" (io/resource "r4b-value-sets.edn")
147+
"hl7.fhir.r5.core" (io/resource "r5-value-sets.edn")}]
148148
(reduce (fn [acc fhir-version]
149149
(let [valueset (walk/keywordize-keys
150150
(edn/read-string
@@ -153,3 +153,4 @@
153153
(assoc acc fhir-version valueset)))
154154
{}
155155
fhir-versions)))
156+

0 commit comments

Comments
 (0)