aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source/program/aedifex/dependency
diff options
context:
space:
mode:
authorEduardo Julian2020-12-23 06:33:44 -0400
committerEduardo Julian2020-12-23 06:33:44 -0400
commitd29e091e98dabb8dfcf816899ada480ecbf7e357 (patch)
treea9d34c7fbb700cdb0c1f1226d377150614ce9914 /stdlib/source/program/aedifex/dependency
parentcad959345afb8bf0bd1e5eefe6c63f136833b3ce (diff)
Refactored "export" common syntax.
Diffstat (limited to '')
-rw-r--r--stdlib/source/program/aedifex/dependency/resolution.lux49
1 files changed, 27 insertions, 22 deletions
diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux
index 2131495b9..f49d1da56 100644
--- a/stdlib/source/program/aedifex/dependency/resolution.lux
+++ b/stdlib/source/program/aedifex/dependency/resolution.lux
@@ -31,65 +31,70 @@
[net (#+ URL)
["." uri]]]]
["." // (#+ Dependency)
+ ["#." status (#+ Status)]
["/#" // #_
["/" profile]
["#." repository (#+ Address Repository)]
- ["#." hash]
+ ["#." hash (#+ Hash SHA-1 MD5)]
["#." pom]
["#." package (#+ Package)]
["#." artifact (#+ Artifact)
["#/." extension (#+ Extension)]]]])
(template [<name>]
- [(exception: #export (<name> {dependency Dependency} {hash Text})
+ [(exception: #export (<name> {artifact Artifact} {extension Extension} {hash Text})
(exception.report
- ["Artifact" (///artifact.format (get@ #//.artifact dependency))]
- ["Type" (%.text (get@ #//.type dependency))]
+ ["Artifact" (///artifact.format artifact)]
+ ["Extension" (%.text extension)]
["Hash" (%.text hash)]))]
[sha-1-does-not-match]
[md5-does-not-match]
)
-(def: (verified-hash dependency library repository artifact extension hash codec exception)
+(def: (verified-hash library repository artifact extension hash codec exception)
(All [h]
- (-> Dependency Binary (Repository Promise) Artifact Extension
- (-> Binary (///hash.Hash h)) (Codec Text (///hash.Hash h))
- (Exception [Dependency Text])
- (Promise (Try (///hash.Hash h)))))
+ (-> Binary (Repository Promise) Artifact Extension
+ (-> Binary (Hash h)) (Codec Text (Hash h))
+ (Exception [Artifact Extension Text])
+ (Promise (Try (Hash h)))))
(do (try.with promise.monad)
[actual (\ repository download (///repository.uri artifact extension))]
(\ promise.monad wrap
(do try.monad
[output (\ encoding.utf8 decode actual)
actual (\ codec decode output)
- _ (exception.assert exception [dependency output]
+ _ (exception.assert exception [artifact extension output]
(\ ///hash.equivalence = (hash library) actual))]
(wrap actual)))))
+(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))
+ 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)
+ md5 (..verified-hash data
+ repository artifact (format extension ///artifact/extension.md5)
+ ///hash.md5 ///hash.md5-codec ..md5-does-not-match)]
+ (wrap [data (#//status.Verified sha-1 md5)])))
+
(def: #export (one repository dependency)
(-> (Repository Promise) Dependency (Promise (Try Package)))
(let [[artifact type] dependency
extension (///artifact/extension.extension type)]
(do (try.with promise.monad)
- [library (\ repository download (///repository.uri artifact extension))
- sha-1 (..verified-hash dependency library
- repository artifact ///artifact/extension.sha-1
- ///hash.sha-1 ///hash.sha-1-codec ..sha-1-does-not-match)
- md5 (..verified-hash dependency library
- repository artifact ///artifact/extension.md5
- ///hash.md5 ///hash.md5-codec ..md5-does-not-match)
- pom (\ repository download (///repository.uri artifact ///artifact/extension.pom))]
+ [[pom pom-status] (..hashed repository artifact ///artifact/extension.pom)
+ library-&-status (..hashed repository artifact extension)]
(\ promise.monad wrap
(do try.monad
[pom (\ encoding.utf8 decode pom)
pom (\ xml.codec decode pom)
profile (<xml>.run ///pom.parser pom)]
(wrap {#///package.origin #///package.Remote
- #///package.library library
- #///package.pom pom
- #///package.sha-1 sha-1
- #///package.md5 md5}))))))
+ #///package.library library-&-status
+ #///package.pom [pom pom-status]}))))))
(type: #export Resolution
(Dictionary Dependency Package))