Download and catch dependencies in Aedifex.

1 files changed, 13 insertions, 14 deletions

diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux
index 102728e1e..794ed7e12 100644
--- a/stdlib/source/program/aedifex/pom.lux
+++ b/stdlib/source/program/aedifex/pom.lux
@@ -8,17 +8,16 @@
      ["_" xml (#+ XML)]]
     [collection
      ["." list ("#@." monoid functor)]]]]
-  [//
-   ["/" project]])
+  ["." // #_
+   ["/" project]
+   ["#." artifact (#+ Artifact)]
+   ["#." dependency (#+ Repository Dependency)]])
 
 ## https://maven.apache.org/pom.html
 
 (def: #export file
   "pom.xml")
 
-(def: #export extension
-  ".pom")
-
 (def: version
   XML
   (#_.Node ["" "modelVersion"] _.attrs
@@ -31,10 +30,10 @@
            (list (#_.Text value))))
 
 (def: (artifact value)
-  (-> /.Artifact (List XML))
-  (list (..property "groupId" (get@ #/.group value))
-        (..property "artifactId" (get@ #/.name value))
-        (..property "version" (get@ #/.version value))))
+  (-> Artifact (List XML))
+  (list (..property "groupId" (get@ #//artifact.group value))
+        (..property "artifactId" (get@ #//artifact.name value))
+        (..property "version" (get@ #//artifact.version value))))
 
 (def: distribution
   (-> /.Distribution XML)
@@ -50,17 +49,17 @@
       (#_.Node ["" "license"] _.attrs)))
 
 (def: repository
-  (-> /.Repository XML)
+  (-> Repository XML)
   (|>> (..property "url")
        list
        (#_.Node ["" "repository"] _.attrs)))
 
-(def: (dependency [artifact type])
-  (-> /.Dependency XML)
+(def: (dependency value)
+  (-> Dependency XML)
   (#_.Node ["" "dependency"]
            _.attrs
-           (list@compose (..artifact artifact)
-                         (list (..property "type" type)))))
+           (list@compose (..artifact (get@ #//dependency.artifact value))
+                         (list (..property "type" (get@ #//dependency.type value))))))
 
 (def: scm
   (-> /.SCM XML)