purescript has all in one modules

4 files changed, 30 insertions, 38 deletions

diff --git a/Generate.hs b/Generate.hs
index a701b22..71302cc 100644
--- a/Generate.hs
+++ b/Generate.hs
@@ -25,8 +25,6 @@ main = do
   irEncodeHs <- eitherParseFile "templates/encode.hs.ede"
   irDecodeHs <- eitherParseFile "templates/decode.hs.ede"
   irPs <- eitherParseFile "templates/data.purs.ede"
-  irEncodePs <- eitherParseFile "templates/encode.purs.ede"
-  irDecodePs <- eitherParseFile "templates/decode.purs.ede"
   let generate name def = do
         dt <- getCurrentTime
         let env = fromPairs
@@ -52,6 +50,4 @@ main = do
         either error (\x -> writeFile ("out/" ++ name ++ "Decode.hs") $ LText.unpack x) $ irDecodeHs >>= (\t -> eitherRenderWith mylib t env)
         -- Purescript
         either error (\x -> writeFile ("out/" ++ name ++ ".purs") $ LText.unpack x) $ irPs >>= (\t -> eitherRenderWith mylib t env)
-        either error (\x -> writeFile ("out/" ++ name ++ "Encode.purs") $ LText.unpack x) $ irEncodePs >>= (\t -> eitherRenderWith mylib t env)
-        either error (\x -> writeFile ("out/" ++ name ++ "Decode.purs") $ LText.unpack x) $ irDecodePs >>= (\t -> eitherRenderWith mylib t env)
   generate "IR" ir
diff --git a/templates/data.purs.ede b/templates/data.purs.ede
index a26f292..957fff4 100644
--- a/templates/data.purs.ede
+++ b/templates/data.purs.ede
@@ -10,6 +10,12 @@ import Data.Map (Map(..))
 import Data.List (List(..))
 import Linear
 
+import Data.Argonaut.Combinators ((~>), (:=), (.?))
+import Data.Argonaut.Core (jsonEmptyObject)
+import Data.Argonaut.Printer (printJson)
+import Data.Argonaut.Encode (EncodeJson, encodeJson)
+import Data.Argonaut.Decode (DecodeJson, decodeJson)
+
 {% for t in dataAndType %}
 {% case t.value | constType %}
 {% when "DataDef" %}
@@ -32,3 +38,27 @@ derive instance generic{{ t.value.dataName }} :: Generic {{ t.value.dataName }}
 instance show{{ t.value.dataName }} :: Show {{ t.value.dataName }} where show = gShow
 instance eq{{ t.value.dataName }}   :: Eq {{ t.value.dataName }}   where eq = gEq
 {% endif %}{% endlet %}{% endfor %}
+
+{# JSON Encode and Decode #}
+{% for t in definitions %}
+instance encodeJson{{ t.value.dataName }} :: EncodeJson {{ t.value.dataName }} where
+  encodeJson v = case v of{% for c in t.value.constructors %}{% if c.value.fields | hasFieldNames %}
+    {{ c.value.name }} r ->
+      "tag" := "{{ c.value.name }}" ~>{% for f in c.value.fields %}
+      "{{ f.value.fieldName }}" := r.{{ f.value.fieldName }} ~>{% endfor %}
+      jsonEmptyObject{% else %}
+    {{ c.value.name }}{% for f in c.value.fields %} arg{{ f.index0 }}{% endfor %} -> "tag" := "{{ c.value.name }}"{% for f in c.value.fields %} ~> "arg{{ f.index0 }}" := arg{{ f.index0 }}{% endfor %} ~> jsonEmptyObject{% endif %}{% endfor %}
+
+instance decodeJson{{ t.value.dataName }} :: DecodeJson {{ t.value.dataName }} where
+  decodeJson json = do
+    obj <- decodeJson json
+    tag <- obj .? "tag"
+    case tag of{% for c in t.value.constructors %}{% if c.value.fields | hasFieldNames %}
+      "{{ c.value.name }}" -> do{% for f in c.value.fields %}
+        {{ f.value.fieldName }} <- obj .? "{{ f.value.fieldName }}"{% endfor %}
+        pure $ {{ c.value.name }}{% for f in c.value.fields %}
+          {% if f.first %}{ {% else %}, {%endif%}{{ f.value.fieldName }}:{{ f.value.fieldName }}{% endfor %}
+          } {% else %}
+      "{{ c.value.name }}" -> {% for f in c.value.fields %}{% if f.first %}{{ c.value.name }} <$>{% else %} <*>{% endif %} obj .? "arg{{ f.index0 }}"{%else%}pure {{ c.value.name }}{% endfor %}{% endif %}{% endfor %}
+
+{% endfor %}
\ No newline at end of file
diff --git a/templates/decode.purs.ede b/templates/decode.purs.ede
deleted file mode 100644
index d5390a9..0000000
--- a/templates/decode.purs.ede
+++ /dev/null
@@ -1,19 +0,0 @@
--- generated file, do not modify!
--- {{ dateTime }}
-
-module {{ moduleName }}Decode where
-
-{% for t in definitions %}
-instance decodeJson{{ t.value.dataName }} :: DecodeJson {{ t.value.dataName }} where
-  decodeJson json = do
-    obj <- decodeJson json
-    tag <- obj .? "tag"
-    case tag of{% for c in t.value.constructors %}{% if c.value.fields | hasFieldNames %}
-      "{{ c.value.name }}" -> do{% for f in c.value.fields %}
-        {{ f.value.fieldName }} <- obj .? "{{ f.value.fieldName }}"{% endfor %}
-        pure $ {{ c.value.name }}{% for f in c.value.fields %}
-          {% if f.first %}{ {% else %}, {%endif%}{{ f.value.fieldName }}:{{ f.value.fieldName }}{% endfor %}
-          } {% else %}
-      "{{ c.value.name }}" -> {{ c.value.name }}{% for f in c.value.fields %} {% if f.first %}<$>{% else %}<*>{% endif %} obj .? "arg{{ f.index0 }}"{% endfor %}{% endif %}{% endfor %}
-
-{% endfor %}
\ No newline at end of file
diff --git a/templates/encode.purs.ede b/templates/encode.purs.ede
deleted file mode 100644
index e2cfcac..0000000
--- a/templates/encode.purs.ede
+++ /dev/null
@@ -1,15 +0,0 @@
--- generated file, do not modify!
--- {{ dateTime }}
-
-module {{ moduleName }}Encode where
-
-{% for t in definitions %}
-instance encodeJson{{ t.value.dataName }} :: EncodeJson {{ t.value.dataName }} where
-  encodeJson v = case v of{% for c in t.value.constructors %}{% if c.value.fields | hasFieldNames %}
-    {{ c.value.name }} r ->
-      "tag" := "{{ c.value.name }}" ~>{% for f in c.value.fields %}
-      "{{ f.value.fieldName }}" := r.{{ f.value.fieldName }} ~>{% endfor %}
-      jsonEmptyObject{% else %}
-    {{ c.value.name }}{% for f in c.value.fields %} arg{{ f.index0 }}{% endfor %} -> "tag" := "{{ c.value.name }}"{% for f in c.value.fields %} ~> "arg{{ f.index0 }}" := arg{{ f.index0 }}{% endfor %} ~> jsonEmptyObject{% endif %}{% endfor %}
-
-{% endfor %}
\ No newline at end of file