aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source/program/aedifex
diff options
context:
space:
mode:
Diffstat (limited to 'stdlib/source/program/aedifex')
-rw-r--r--stdlib/source/program/aedifex/command/build.lux3
-rw-r--r--stdlib/source/program/aedifex/command/deploy.lux5
-rw-r--r--stdlib/source/program/aedifex/command/test.lux3
-rw-r--r--stdlib/source/program/aedifex/dependency/resolution.lux14
-rw-r--r--stdlib/source/program/aedifex/hash.lux7
-rw-r--r--stdlib/source/program/aedifex/metadata/artifact.lux5
-rw-r--r--stdlib/source/program/aedifex/metadata/snapshot.lux5
-rw-r--r--stdlib/source/program/aedifex/parser.lux3
-rw-r--r--stdlib/source/program/aedifex/pom.lux3
-rw-r--r--stdlib/source/program/aedifex/profile.lux3
-rw-r--r--stdlib/source/program/aedifex/repository.lux133
-rw-r--r--stdlib/source/program/aedifex/repository/remote.lux138
12 files changed, 173 insertions, 149 deletions
diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux
index cb4465edd..a05d7ad85 100644
--- a/stdlib/source/program/aedifex/command/build.lux
+++ b/stdlib/source/program/aedifex/command/build.lux
@@ -18,7 +18,8 @@
[collection
["." list ("#\." functor)]
["." dictionary]
- ["." set]]
+ ["." set]]]
+ [math
[number
["i" int]]]
[world
diff --git a/stdlib/source/program/aedifex/command/deploy.lux b/stdlib/source/program/aedifex/command/deploy.lux
index 1f84567f0..b00f964d7 100644
--- a/stdlib/source/program/aedifex/command/deploy.lux
+++ b/stdlib/source/program/aedifex/command/deploy.lux
@@ -37,7 +37,8 @@
["#." pom]
["#." hash]
["#." repository (#+ Repository)
- [identity (#+ Identity)]]
+ [identity (#+ Identity)]
+ ["#/." remote]]
["#." metadata
["#/." artifact]
["#/." snapshot]]
@@ -93,7 +94,7 @@
(def: #export (do! console repository fs artifact profile)
(-> (Console Promise) (Repository Promise) (file.System Promise) Artifact (Command Any))
(let [deploy! (: (-> Extension Binary (Action Any))
- (|>> (///repository.uri artifact)
+ (|>> (///repository/remote.uri artifact)
(\ repository upload)))
fully_deploy! (: (-> Extension Binary (Action Any))
(function (_ extension payload)
diff --git a/stdlib/source/program/aedifex/command/test.lux b/stdlib/source/program/aedifex/command/test.lux
index 2727fc461..dff9b14ee 100644
--- a/stdlib/source/program/aedifex/command/test.lux
+++ b/stdlib/source/program/aedifex/command/test.lux
@@ -9,7 +9,8 @@
["!" capability]]]
[data
[text
- ["%" format (#+ format)]]
+ ["%" format (#+ format)]]]
+ [math
[number
["i" int]]]
[world
diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux
index e9d457ac9..1b40a3004 100644
--- a/stdlib/source/program/aedifex/dependency/resolution.lux
+++ b/stdlib/source/program/aedifex/dependency/resolution.lux
@@ -19,14 +19,15 @@
[text
["%" format (#+ format)]
["." encoding]]
- [number
- ["." i64]
- ["n" nat]]
[format
["." xml (#+ Tag XML)]]
[collection
["." dictionary (#+ Dictionary)]
["." set]]]
+ [math
+ [number
+ ["n" nat]
+ ["." i64]]]
[world
[net (#+ URL)
["." uri]]]]
@@ -39,7 +40,8 @@
["#." package (#+ Package)]
["#." artifact (#+ Artifact)
["#/." extension (#+ Extension)]]
- ["#." repository (#+ Address Repository)
+ ["#." repository (#+ Repository)
+ ["#/." remote (#+ Address)]
["#/." origin (#+ Origin)]]]])
(template [<name>]
@@ -60,7 +62,7 @@
(Exception [Artifact Extension Text])
(Promise (Try (Hash h)))))
(do (try.with promise.monad)
- [actual (\ repository download (///repository.uri artifact extension))]
+ [actual (\ repository download (///repository/remote.uri artifact extension))]
(\ promise.monad wrap
(do try.monad
[output (\ encoding.utf8 decode actual)
@@ -72,7 +74,7 @@
(def: (hashed repository artifact extension)
(-> (Repository Promise) Artifact Extension (Promise (Try [Binary Status])))
(do (try.with promise.monad)
- [data (\ repository download (///repository.uri artifact extension))
+ [data (\ repository download (///repository/remote.uri artifact extension))
sha-1 (..verified_hash data
repository artifact (format extension ///artifact/extension.sha-1)
///hash.sha-1 ///hash.sha-1_codec ..sha-1_does_not_match)
diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux
index 2c0c6df25..336d9bc96 100644
--- a/stdlib/source/program/aedifex/hash.lux
+++ b/stdlib/source/program/aedifex/hash.lux
@@ -12,10 +12,11 @@
["." binary (#+ Binary)]
["." text
["%" format (#+ Format format)]
- ["." encoding]]
+ ["." encoding]]]
+ [math
[number
- ["." i64]
- ["n" nat]]]
+ ["n" nat]
+ ["." i64]]]
[type
abstract]])
diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux
index cf9a34b58..5762bf49d 100644
--- a/stdlib/source/program/aedifex/metadata/artifact.lux
+++ b/stdlib/source/program/aedifex/metadata/artifact.lux
@@ -11,12 +11,13 @@
["." product]
["." text
["%" format (#+ format)]]
- [number
- ["n" nat]]
[format
["." xml (#+ XML)]]
[collection
["." list ("#\." functor)]]]
+ [math
+ [number
+ ["n" nat]]]
["." time (#+ Time)
["." instant (#+ Instant)]
["." date (#+ Date)]
diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux
index ea6ce4719..38af9a729 100644
--- a/stdlib/source/program/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/program/aedifex/metadata/snapshot.lux
@@ -12,12 +12,13 @@
["." product]
["." text
["%" format (#+ format)]]
- [number
- ["n" nat]]
[format
["." xml (#+ XML)]]
[collection
["." list ("#\." functor)]]]
+ [math
+ [number
+ ["n" nat]]]
["." time (#+ Time)
["." instant (#+ Instant)]
["." date (#+ Date)]
diff --git a/stdlib/source/program/aedifex/parser.lux b/stdlib/source/program/aedifex/parser.lux
index 8f95cc6a4..4a21b341a 100644
--- a/stdlib/source/program/aedifex/parser.lux
+++ b/stdlib/source/program/aedifex/parser.lux
@@ -21,7 +21,8 @@
["/" profile]
["#." project (#+ Project)]
["#." dependency]
- ["#." repository]
+ ["#." repository #_
+ ["#" remote]]
["#." artifact (#+ Artifact)
["#/." type]]])
diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux
index d1787d07c..f085e2808 100644
--- a/stdlib/source/program/aedifex/pom.lux
+++ b/stdlib/source/program/aedifex/pom.lux
@@ -19,8 +19,9 @@
["." dictionary]]]]
["." // #_
["/" profile]
- ["#." repository (#+ Address)]
["#." dependency (#+ Dependency)]
+ [repository
+ [remote (#+ Address)]]
["#." artifact (#+ Artifact)
["#/." type]]])
diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux
index adf1b049e..fa49e41cd 100644
--- a/stdlib/source/program/aedifex/profile.lux
+++ b/stdlib/source/program/aedifex/profile.lux
@@ -24,7 +24,8 @@
[//
["." artifact (#+ Artifact)]
["." dependency]
- ["." repository]])
+ ["." repository #_
+ ["#" remote (#+ Address)]]])
(type: #export Distribution
#Repo
diff --git a/stdlib/source/program/aedifex/repository.lux b/stdlib/source/program/aedifex/repository.lux
index 582144ad4..230888cef 100644
--- a/stdlib/source/program/aedifex/repository.lux
+++ b/stdlib/source/program/aedifex/repository.lux
@@ -1,38 +1,18 @@
(.module:
[lux #*
- ["." host (#+ import:)]
[abstract
[monad (#+ do)]]
[control
- ["." io (#+ IO)]
+ [io (#+ IO)]
["." try (#+ Try)]
- ["." exception (#+ exception:)]
[concurrency
["." promise (#+ Promise)]
["." stm]]]
[data
- ["." binary (#+ Binary)]
- ["." text
- ["%" format (#+ format)]]
- [number
- ["n" nat]]]
- [tool
- [compiler
- ["." version]
- ["." language #_
- ["#/." lux #_
- ["#" version]]]]]
+ [binary (#+ Binary)]]
[world
- [net (#+ URL)
- ["." uri (#+ URI)]]]]
- ["." / #_
- ["#." identity (#+ Identity)]
- ["/#" // #_
- ["#." artifact (#+ Artifact)
- ["#/." extension (#+ Extension)]]]])
-
-(type: #export Address
- URL)
+ [net
+ [uri (#+ URI)]]]])
(signature: #export (Repository !)
(: (-> URI (! (Try Binary)))
@@ -86,108 +66,3 @@
(#try.Failure error)
(wrap (#try.Failure error))))))
)))
-
-(import: java/lang/String)
-
-(import: java/lang/AutoCloseable
- ["#::."
- (close [] #io #try void)])
-
-(import: java/io/InputStream)
-
-(import: java/io/OutputStream
- ["#::."
- (flush [] #io #try void)
- (write [[byte]] #io #try void)])
-
-(import: java/net/URLConnection
- ["#::."
- (setDoOutput [boolean] #io #try void)
- (setRequestProperty [java/lang/String java/lang/String] #io #try void)
- (getInputStream [] #io #try java/io/InputStream)
- (getOutputStream [] #io #try java/io/OutputStream)])
-
-(import: java/net/HttpURLConnection
- ["#::."
- (setRequestMethod [java/lang/String] #io #try void)
- (getResponseCode [] #io #try int)])
-
-(import: java/net/URL
- ["#::."
- (new [java/lang/String])
- (openConnection [] #io #try java/net/URLConnection)])
-
-(import: java/io/BufferedInputStream
- ["#::."
- (new [java/io/InputStream])
- (read [[byte] int int] #io #try int)])
-
-(exception: #export (no_credentials {address Address})
- (exception.report
- ["Address" (%.text address)]))
-
-(exception: #export (deployment_failure {code Int})
- (exception.report
- ["Code" (%.int code)]))
-
-(def: #export (uri artifact extension)
- (-> Artifact Extension URI)
- (format (//artifact.uri artifact) extension))
-
-(def: buffer_size
- (n.* 512 1,024))
-
-(def: user_agent
- (format "LuxAedifex/" (version.format language/lux.version)))
-
-(structure: #export (remote identity address)
- (All [s] (-> (Maybe Identity) Address (Repository IO)))
-
- (def: (download uri)
- (do {! (try.with io.monad)}
- [connection (|> (format address uri)
- java/net/URL::new
- java/net/URL::openConnection)
- #let [connection (:coerce java/net/HttpURLConnection connection)]
- _ (java/net/HttpURLConnection::setRequestMethod "GET" connection)
- _ (java/net/URLConnection::setRequestProperty "User-Agent" ..user_agent connection)
- input (|> connection
- java/net/URLConnection::getInputStream
- (\ ! map (|>> java/io/BufferedInputStream::new)))
- #let [buffer (binary.create ..buffer_size)]]
- (loop [output (\ binary.monoid identity)]
- (do !
- [bytes_read (java/io/BufferedInputStream::read buffer +0 (.int ..buffer_size) input)]
- (case bytes_read
- -1 (do !
- [_ (java/lang/AutoCloseable::close input)]
- (wrap output))
- _ (if (n.= ..buffer_size bytes_read)
- (recur (\ binary.monoid compose output buffer))
- (do !
- [chunk (\ io.monad wrap (binary.slice 0 (.nat bytes_read) buffer))]
- (recur (\ binary.monoid compose output chunk)))))))))
-
- (def: (upload uri content)
- (case identity
- #.None
- (\ io.monad wrap (exception.throw ..no_credentials [address]))
-
- (#.Some [user password])
- (do (try.with io.monad)
- [connection (|> (format address uri)
- java/net/URL::new
- java/net/URL::openConnection)
- #let [connection (:coerce java/net/HttpURLConnection connection)]
- _ (java/net/HttpURLConnection::setRequestMethod "PUT" connection)
- _ (java/net/URLConnection::setDoOutput true connection)
- _ (java/net/URLConnection::setRequestProperty "Authorization" (/identity.basic_auth user password) connection)
- stream (java/net/URLConnection::getOutputStream connection)
- _ (java/io/OutputStream::write content stream)
- _ (java/io/OutputStream::flush stream)
- _ (java/lang/AutoCloseable::close stream)
- code (java/net/HttpURLConnection::getResponseCode connection)]
- (case code
- +201 (wrap [])
- _ (\ io.monad wrap (exception.throw ..deployment_failure [code]))))))
- )
diff --git a/stdlib/source/program/aedifex/repository/remote.lux b/stdlib/source/program/aedifex/repository/remote.lux
new file mode 100644
index 000000000..4979e5429
--- /dev/null
+++ b/stdlib/source/program/aedifex/repository/remote.lux
@@ -0,0 +1,138 @@
+(.module:
+ [lux #*
+ [host (#+ import:)]
+ [abstract
+ [monad (#+ do)]]
+ [control
+ ["." io (#+ IO)]
+ ["." try]
+ ["." exception (#+ exception:)]]
+ [data
+ ["." binary]
+ ["." text
+ ["%" format (#+ format)]]]
+ [math
+ [number
+ ["n" nat]]]
+ [tool
+ [compiler
+ ["." version]
+ ["." language #_
+ ["#/." lux #_
+ ["#" version]]]]]
+ [world
+ [net (#+ URL)
+ [uri (#+ URI)]]]]
+ ["." //
+ ["#." identity (#+ Identity)]
+ ["/#" // #_
+ ["#." artifact (#+ Artifact)
+ [extension (#+ Extension)]]]])
+
+(type: #export Address
+ URL)
+
+(import: java/lang/String)
+
+(import: java/lang/AutoCloseable
+ ["#::."
+ (close [] #io #try void)])
+
+(import: java/io/InputStream)
+
+(import: java/io/OutputStream
+ ["#::."
+ (flush [] #io #try void)
+ (write [[byte]] #io #try void)])
+
+(import: java/net/URLConnection
+ ["#::."
+ (setDoOutput [boolean] #io #try void)
+ (setRequestProperty [java/lang/String java/lang/String] #io #try void)
+ (getInputStream [] #io #try java/io/InputStream)
+ (getOutputStream [] #io #try java/io/OutputStream)])
+
+(import: java/net/HttpURLConnection
+ ["#::."
+ (setRequestMethod [java/lang/String] #io #try void)
+ (getResponseCode [] #io #try int)])
+
+(import: java/net/URL
+ ["#::."
+ (new [java/lang/String])
+ (openConnection [] #io #try java/net/URLConnection)])
+
+(import: java/io/BufferedInputStream
+ ["#::."
+ (new [java/io/InputStream])
+ (read [[byte] int int] #io #try int)])
+
+(exception: #export (no_credentials {address Address})
+ (exception.report
+ ["Address" (%.text address)]))
+
+(exception: #export (deployment_failure {code Int})
+ (exception.report
+ ["Code" (%.int code)]))
+
+(def: #export (uri artifact extension)
+ (-> Artifact Extension URI)
+ (format (///artifact.uri artifact) extension))
+
+(def: buffer_size
+ (n.* 512 1,024))
+
+(def: user_agent
+ (format "LuxAedifex/" (version.format language/lux.version)))
+
+(structure: #export (repository identity address)
+ (All [s] (-> (Maybe Identity) Address (//.Repository IO)))
+
+ (def: (download uri)
+ (do {! (try.with io.monad)}
+ [connection (|> (format address uri)
+ java/net/URL::new
+ java/net/URL::openConnection)
+ #let [connection (:coerce java/net/HttpURLConnection connection)]
+ _ (java/net/HttpURLConnection::setRequestMethod "GET" connection)
+ _ (java/net/URLConnection::setRequestProperty "User-Agent" ..user_agent connection)
+ input (|> connection
+ java/net/URLConnection::getInputStream
+ (\ ! map (|>> java/io/BufferedInputStream::new)))
+ #let [buffer (binary.create ..buffer_size)]]
+ (loop [output (\ binary.monoid identity)]
+ (do !
+ [bytes_read (java/io/BufferedInputStream::read buffer +0 (.int ..buffer_size) input)]
+ (case bytes_read
+ -1 (do !
+ [_ (java/lang/AutoCloseable::close input)]
+ (wrap output))
+ _ (if (n.= ..buffer_size bytes_read)
+ (recur (\ binary.monoid compose output buffer))
+ (do !
+ [chunk (\ io.monad wrap (binary.slice 0 (.nat bytes_read) buffer))]
+ (recur (\ binary.monoid compose output chunk)))))))))
+
+ (def: (upload uri content)
+ (case identity
+ #.None
+ (\ io.monad wrap (exception.throw ..no_credentials [address]))
+
+ (#.Some [user password])
+ (do (try.with io.monad)
+ [connection (|> (format address uri)
+ java/net/URL::new
+ java/net/URL::openConnection)
+ #let [connection (:coerce java/net/HttpURLConnection connection)]
+ _ (java/net/HttpURLConnection::setRequestMethod "PUT" connection)
+ _ (java/net/URLConnection::setDoOutput true connection)
+ _ (java/net/URLConnection::setRequestProperty "Authorization" (//identity.basic_auth user password) connection)
+ stream (java/net/URLConnection::getOutputStream connection)
+ _ (java/io/OutputStream::write content stream)
+ _ (java/io/OutputStream::flush stream)
+ _ (java/lang/AutoCloseable::close stream)
+ code (java/net/HttpURLConnection::getResponseCode connection)]
+ (case code
+ +201 (wrap [])
+ _ (\ io.monad wrap (exception.throw ..deployment_failure [code]))))))
+ )
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 13:57:33 +0000