completion: move to Completion module & factor out types

3 files changed, 22 insertions, 23 deletions

diff --git a/pkgs/profpatsch/dhallsh/Completion/Command/type.dhall b/pkgs/profpatsch/dhallsh/Completion/Command/type.dhall
new file mode 100644
index 00000000..a0fd4e98
--- /dev/null
+++ b/pkgs/profpatsch/dhallsh/Completion/Command/type.dhall
@@ -0,0 +1,10 @@
+  λ(a : Type)
+→ { name :
+      Text
+  , description :
+      Text
+  , options :
+      List ../Option/type.dhall
+  , subcommands :
+      List a
+  }
diff --git a/pkgs/profpatsch/dhallsh/Completion/Option/type.dhall b/pkgs/profpatsch/dhallsh/Completion/Option/type.dhall
new file mode 100644
index 00000000..44f62d2e
--- /dev/null
+++ b/pkgs/profpatsch/dhallsh/Completion/Option/type.dhall
@@ -0,0 +1,9 @@
+{ short :
+    Optional Text
+, long :
+    Text
+, description :
+    Text
+, argument :
+    Optional Text
+}
diff --git a/pkgs/profpatsch/dhallsh/completion.dhall b/pkgs/profpatsch/dhallsh/Completion/completion.dhall
index 9df63144..e5b849a7 100644
--- a/pkgs/profpatsch/dhallsh/completion.dhall
+++ b/pkgs/profpatsch/dhallsh/Completion/completion.dhall
@@ -1,28 +1,8 @@
-let Void =
-      https://raw.githubusercontent.com/sellout/dada/master/Void/Type sha256:a413d5091ac5fb02410f02bdbede12eacd89ae52a933a6d24bb68eadbff92613
+let Void = ../imports/Void.dhall
 
-let Option =
-      { short :
-          Optional Text
-      , long :
-          Text
-      , description :
-          Text
-      , argument :
-          Optional Text
-      }
+let Option = ./Option/type.dhall
 
-let Command =
-        λ(a : Type)
-      → { name :
-            Text
-        , description :
-            Text
-        , options :
-            List Option
-        , subcommands :
-            List a
-        }
+let Command = ./Command/type.dhall
 
 let opt =
         λ(long : Text)