diff options
Diffstat (limited to '')
| -rw-r--r-- | stdlib/source/program/aedifex/dependency.lux | 38 | ||||
| -rw-r--r-- | stdlib/source/program/aedifex/dependency/deployment.lux | 50 | ||||
| -rw-r--r-- | stdlib/source/program/aedifex/dependency/resolution.lux | 18 |
3 files changed, 53 insertions, 53 deletions
diff --git a/stdlib/source/program/aedifex/dependency.lux b/stdlib/source/program/aedifex/dependency.lux index 3dd3d9c71..5bf2e4ef9 100644 --- a/stdlib/source/program/aedifex/dependency.lux +++ b/stdlib/source/program/aedifex/dependency.lux @@ -1,17 +1,17 @@ (.using - [library - [lux {"-" Type} - [abstract - [equivalence {"+" Equivalence}] - [order {"+" Order}] - [hash {"+" Hash}]] - [data - ["[0]" product] - ["[0]" text ("[1]#[0]" order) - ["%" format {"+" format}]]]]] - ["[0]" // "_" - ["[1]" artifact {"+" Artifact} ("[1]#[0]" order) - [type {"+" Type}]]]) + [library + [lux {"-" Type} + [abstract + [equivalence {"+" Equivalence}] + [order {"+" Order}] + [hash {"+" Hash}]] + [data + ["[0]" product] + ["[0]" text ("[1]#[0]" order) + ["%" format {"+" format}]]]]] + ["[0]" // "_" + ["[1]" artifact {"+" Artifact} ("[1]#[0]" order) + [type {"+" Type}]]]) (type: .public Dependency (Record @@ -36,10 +36,10 @@ ..equivalence) (def: (< reference subject) - (<| (or (//#< (value@ #artifact reference) - (value@ #artifact subject))) + (<| (or (//#< (the #artifact reference) + (the #artifact subject))) - (and (//#= (value@ #artifact reference) - (value@ #artifact subject))) - (text#< (value@ #type reference) - (value@ #type subject))))) + (and (//#= (the #artifact reference) + (the #artifact subject))) + (text#< (the #type reference) + (the #type subject))))) diff --git a/stdlib/source/program/aedifex/dependency/deployment.lux b/stdlib/source/program/aedifex/dependency/deployment.lux index 7098505d4..f55520ec1 100644 --- a/stdlib/source/program/aedifex/dependency/deployment.lux +++ b/stdlib/source/program/aedifex/dependency/deployment.lux @@ -91,39 +91,39 @@ (do try.monad [now (: (Try ///artifact/time.Time) (///artifact/time.of_instant now)) - .let [version_template (value@ ///artifact.#version artifact) + .let [version_template (the ///artifact.#version artifact) snapshot (|> snapshot - (revised@ [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] - (function (_ snapshot) - (case snapshot - {///artifact/snapshot.#Local} - {///artifact/snapshot.#Local} - - {///artifact/snapshot.#Remote [_ build]} - {///artifact/snapshot.#Remote [now (++ build)]}))) - (with@ [///metadata/snapshot.#versioning ///artifact/versioning.#last_updated] now)) - versioning_snapshot (value@ [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] snapshot)]] + (revised [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] + (function (_ snapshot) + (case snapshot + {///artifact/snapshot.#Local} + {///artifact/snapshot.#Local} + + {///artifact/snapshot.#Remote [_ build]} + {///artifact/snapshot.#Remote [now (++ build)]}))) + (has [///metadata/snapshot.#versioning ///artifact/versioning.#last_updated] now)) + versioning_snapshot (the [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] snapshot)]] (in (|> snapshot - (with@ [///metadata/snapshot.#versioning ///artifact/versioning.#versions] - (list [///artifact/snapshot/version.#extension type - ///artifact/snapshot/version.#value (///artifact/snapshot/version/value.format - [///artifact/snapshot/version/value.#version version_template - ///artifact/snapshot/version/value.#snapshot versioning_snapshot]) - ///artifact/snapshot/version.#updated now])) - ... (with@ [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] - ... (list#composite (..artifacts type (product.right (value@ ///package.#library package))) - ... (..artifacts ///artifact/type.pom (product.right (value@ ///package.#pom package))))) + (has [///metadata/snapshot.#versioning ///artifact/versioning.#versions] + (list [///artifact/snapshot/version.#extension type + ///artifact/snapshot/version.#value (///artifact/snapshot/version/value.format + [///artifact/snapshot/version/value.#version version_template + ///artifact/snapshot/version/value.#snapshot versioning_snapshot]) + ///artifact/snapshot/version.#updated now])) + ... (has [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] + ... (list#composite (..artifacts type (product.right (the ///package.#library package))) + ... (..artifacts ///artifact/type.pom (product.right (the ///package.#pom package))))) )))) (def: .public (one repository [artifact type] package) (-> (Repository Async) Dependency Package (Async (Try Artifact))) (do [! async.monad] [now (async.future instant.now) - .let [version_template (value@ ///artifact.#version artifact)]] + .let [version_template (the ///artifact.#version artifact)]] (do (try.with !) - [_ (with_status repository version_template [artifact type] (value@ ///package.#library package)) + [_ (with_status repository version_template [artifact type] (the ///package.#library package)) - _ (let [[pom pom_data status] (value@ ///package.#pom package)] + _ (let [[pom pom_data status] (the ///package.#pom package)] (with_status repository version_template [artifact ///artifact/type.pom] @@ -135,8 +135,8 @@ _ (///metadata/snapshot.write repository artifact snapshot) project (///metadata/artifact.read repository artifact) _ (|> project - (with@ ///metadata/artifact.#versions (list version_template)) - (with@ ///metadata/artifact.#last_updated now) + (has ///metadata/artifact.#versions (list version_template)) + (has ///metadata/artifact.#last_updated now) (///metadata/artifact.write repository artifact))] (in artifact)))) diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux index 627a3e6ef..1fcc77dd7 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -129,10 +129,10 @@ extension (///artifact/extension.extension type)] (do (try.with async.monad) [snapshot (///metadata/snapshot.read repository artifact) - .let [version_template (value@ [///metadata/snapshot.#artifact ///artifact.#version] snapshot) + .let [version_template (the [///metadata/snapshot.#artifact ///artifact.#version] snapshot) artifact_version (value.format [value.#version version_template - value.#snapshot (value@ [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] snapshot)]) - artifact (with@ ///artifact.#version artifact_version artifact)] + value.#snapshot (the [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] snapshot)]) + artifact (has ///artifact.#version artifact_version artifact)] [pom_data pom_status] (..hashed repository version_template artifact ///artifact/extension.pom) library_&_status (..hashed repository version_template artifact extension)] (# async.monad in @@ -157,8 +157,8 @@ (exception: .public (cannot_resolve [dependency Dependency]) (exception.report - ["Artifact" (%.text (///artifact.format (value@ //.#artifact dependency)))] - ["Type" (%.text (value@ //.#type dependency))])) + ["Artifact" (%.text (///artifact.format (the //.#artifact dependency)))] + ["Type" (%.text (the //.#type dependency))])) (template [<sigil> <name> <doing> <at>] [(def: (<name> console repository artifact) @@ -185,17 +185,17 @@ {.#Item repository alternatives} (do [! async.monad] - [_ (..announce_fetching console repository (value@ //.#artifact dependency)) + [_ (..announce_fetching console repository (the //.#artifact dependency)) outcome (..one repository dependency)] (case outcome {try.#Success package} (do ! - [_ (..announce_success console repository (value@ //.#artifact dependency))] + [_ (..announce_success console repository (the //.#artifact dependency))] (in outcome)) {try.#Failure error} (do ! - [_ (..announce_failure console repository (value@ //.#artifact dependency))] + [_ (..announce_failure console repository (the //.#artifact dependency))] (any console alternatives dependency)))))) (def: .public (all console repositories new_repository dependencies resolution) @@ -214,7 +214,7 @@ [successes failures resolution]) {.#Item head tail} - (case (value@ [//.#artifact ///artifact.#version] head) + (case (the [//.#artifact ///artifact.#version] head) ... Skip if there is no version "" (again repositories successes |