Fixes: Printer bugs and updates json_schema version

- Fixes: various minor bugs related to printing Elm code.
- Adds: json_schema version 0.3 dependency.
- Closes #95.

Author: dragonwasrobot

.tool-versions

@@ -1,2 +1,2 @@
-erlang 21.3
-elixir 1.8.1
+erlang 22.0
+elixir 1.9.0

.travis.yml

@@ -1,9 +1,9 @@
 language: elixir
 
 elixir:
-  - '1.8.1'
+  - '1.9.0'
 otp_release:
-  - '21.3'
+  - '22.0'
 
 cache:
   directories:
@@ -18,7 +18,7 @@ install:
 
 script:
   - mix test
-#  - mix dialyzer --halt-exit-status
+  - mix dialyzer
 
 # Leave only the .plt files in build
 before_cache:

examples/example-output-elm-code/src/Data/Circle.elm

@@ -1,19 +1,7 @@
-module Data.Circle exposing
-    ( Circle
-    , circleDecoder
-    , encodeCircle
-    )
+module Data.Circle exposing (..)
 
 -- Schema for a circle shape
 
-import Data.Definitions as Definitions
-import Data.Utils
-    exposing
-        ( encodeNestedOptional
-        , encodeNestedRequired
-        , encodeOptional
-        , encodeRequired
-        )
 import Json.Decode as Decode
     exposing
         ( Decoder
@@ -40,6 +28,14 @@ import Json.Encode as Encode
         , list
         , object
         )
+import Data.Definitions as Definitions
+import Data.Utils
+    exposing
+        ( encodeNestedOptional
+        , encodeNestedRequired
+        , encodeOptional
+        , encodeRequired
+        )
 
 
 type alias Circle =

examples/example-output-elm-code/src/Data/Definitions.elm

@@ -1,21 +1,7 @@
-module Data.Definitions exposing
-    ( Color(..)
-    , Point
-    , colorDecoder
-    , encodeColor
-    , encodePoint
-    , pointDecoder
-    )
+module Data.Definitions exposing (..)
 
 -- Schema for common types
 
-import Data.Utils
-    exposing
-        ( encodeNestedOptional
-        , encodeNestedRequired
-        , encodeOptional
-        , encodeRequired
-        )
 import Json.Decode as Decode
     exposing
         ( Decoder
@@ -42,6 +28,13 @@ import Json.Encode as Encode
         , list
         , object
         )
+import Data.Utils
+    exposing
+        ( encodeNestedOptional
+        , encodeNestedRequired
+        , encodeOptional
+        , encodeRequired
+        )
 
 
 type Color

examples/example-output-elm-code/src/Data/Utils.elm

@@ -1,9 +1,10 @@
-module Data.Utils exposing
-    ( encodeNestedOptional
-    , encodeNestedRequired
-    , encodeOptional
-    , encodeRequired
-    )
+module Data.Utils
+    exposing
+        ( encodeNestedOptional
+        , encodeNestedRequired
+        , encodeOptional
+        , encodeRequired
+        )
 
 -- Util functions for decoding and encoding JSON objects.
 

examples/example-output-elm-code/tests/Data/CircleTests.elm

@@ -1,16 +1,13 @@
-module Data.CircleTests exposing
-    ( circleFuzzer
-    , encodeDecodeCircleTest
-    )
+module Data.CircleTests exposing (..)
 
 -- Tests: Schema for a circle shape
 
-import Data.Circle exposing (..)
-import Data.DefinitionsTests as Definitions
 import Expect exposing (Expectation)
 import Fuzz exposing (Fuzzer)
-import Json.Decode as Decode
 import Test exposing (..)
+import Json.Decode as Decode
+import Data.Circle exposing (..)
+import Data.DefinitionsTests as Definitions
 
 
 circleFuzzer : Fuzzer Circle

examples/example-output-elm-code/tests/Data/DefinitionsTests.elm

@@ -1,17 +1,12 @@
-module Data.DefinitionsTests exposing
-    ( colorFuzzer
-    , encodeDecodeColorTest
-    , encodeDecodePointTest
-    , pointFuzzer
-    )
+module Data.DefinitionsTests exposing (..)
 
 -- Tests: Schema for common types
 
-import Data.Definitions exposing (..)
 import Expect exposing (Expectation)
 import Fuzz exposing (Fuzzer)
-import Json.Decode as Decode
 import Test exposing (..)
+import Json.Decode as Decode
+import Data.Definitions exposing (..)
 
 
 colorFuzzer : Fuzzer Color

lib/js2e.ex

@@ -26,7 +26,8 @@ defmodule JS2E do
 
   @spec main([String.t()]) :: :ok
   def main(args) do
-    {options, paths, errors} = OptionParser.parse(args, switches: [module_name: :string])
+    {options, paths, errors} =
+      OptionParser.parse(args, switches: [module_name: :string])
 
     if Enum.empty?(paths) == true do
       IO.puts(@moduledoc)
@@ -41,7 +42,9 @@ defmodule JS2E do
     files = resolve_all_paths(paths)
 
     if Enum.empty?(files) == true do
-      print_error("Error: Could not find any " <> "JSON files in path: #{inspect(paths)}")
+      print_error(
+        "Error: Could not find any JSON files in path: #{inspect(paths)}"
+      )
 
       exit(:no_files)
     end
@@ -122,9 +125,11 @@ defmodule JS2E do
     else
       Logger.info("Converting to Elm code!")
 
-      printer_result = Printer.print_schemas(parser_result.schema_dict, module_name)
+      printer_result =
+        Printer.print_schemas(parser_result.schema_dict, module_name)
 
-      tests_printer_result = Printer.print_schemas_tests(parser_result.schema_dict, module_name)
+      tests_printer_result =
+        Printer.print_schemas_tests(parser_result.schema_dict, module_name)
 
       cond do
         length(printer_result.errors) > 0 ->
@@ -163,7 +168,7 @@ defmodule JS2E do
                 String.replace(module_name, ".", "/")
               )
 
-            Logger.debug(fn -> "Writing file '#{normalized_file_path}'" end)
+            Logger.debug("Writing file '#{normalized_file_path}'")
             {:ok, file} = File.open(normalized_file_path, [:write])
             IO.binwrite(file, file_content)
             File.close(file)
@@ -210,7 +215,8 @@ defmodule JS2E do
               "-",
               max(
                 0,
-                74 - String.length(pretty_warning_type) - String.length(file_path)
+                74 - String.length(pretty_warning_type) -
+                  String.length(file_path)
               )
             )
 
@@ -305,7 +311,8 @@ defmodule JS2E do
   end
 
   defp warning_header do
-    header = String.duplicate("^", 35) <> " WARNINGS " <> String.duplicate("^", 35)
+    header =
+      String.duplicate("^", 35) <> " WARNINGS " <> String.duplicate("^", 35)
 
     IO.puts(IO.ANSI.format([:yellow, header]))
   end

lib/printer/all_of_printer.ex

@@ -56,7 +56,9 @@ defmodule JS2E.Printer.AllOfPrinter do
 
     {type_fields, errors} =
       types
-      |> Enum.map(&create_type_field(&1, path, schema_def, schema_dict, module_name))
+      |> Enum.map(
+        &create_type_field(&1, path, schema_def, schema_dict, module_name)
+      )
       |> CommonOperations.split_ok_and_errors()
 
     type_name
@@ -83,7 +85,7 @@ defmodule JS2E.Printer.AllOfPrinter do
     field_type_result =
       type_path
       |> Resolver.resolve_type(parent, schema_def, schema_dict)
-      |> ElmTypes.create_type_name(schema_def, module_name)
+      |> ElmTypes.create_type_name(parent, schema_def, schema_dict, module_name)
 
     case field_type_result do
       {:ok, field_type} ->
@@ -121,7 +123,9 @@ defmodule JS2E.Printer.AllOfPrinter do
       ) do
     {decoder_clauses, errors} =
       type_paths
-      |> Enum.map(&create_decoder_property(&1, path, schema_def, schema_dict, module_name))
+      |> Enum.map(
+        &create_decoder_property(&1, path, schema_def, schema_dict, module_name)
+      )
       |> CommonOperations.split_ok_and_errors()
 
     normalized_name = Naming.normalize_identifier(name, :downcase)
@@ -191,7 +195,8 @@ defmodule JS2E.Printer.AllOfPrinter do
     {:ok, %{property_name: property_name, decoder_name: decoder_name}}
   end
 
-  @spec create_decoder_enum_clause(String.t(), String.t(), String.t()) :: {:ok, map}
+  @spec create_decoder_enum_clause(String.t(), String.t(), String.t()) ::
+          {:ok, map}
   defp create_decoder_enum_clause(
          property_name,
          property_type_decoder,
@@ -329,7 +334,8 @@ defmodule JS2E.Printer.AllOfPrinter do
          _schema_dict,
          _module_name
        ) do
-    error_msg = "allOf printer expected ObjectType but found #{type_def.__struct__}"
+    error_msg =
+      "allOf printer expected ObjectType but found #{type_def.__struct__}"
 
     ErrorUtil.unexpected_type(type_def.path, error_msg)
   end

lib/printer/any_of_printer.ex

@@ -55,7 +55,9 @@ defmodule JS2E.Printer.AnyOfPrinter do
 
     {type_fields, errors} =
       types
-      |> Enum.map(&create_type_field(&1, path, schema_def, schema_dict, module_name))
+      |> Enum.map(
+        &create_type_field(&1, path, schema_def, schema_dict, module_name)
+      )
       |> CommonOperations.split_ok_and_errors()
 
     type_name
@@ -82,7 +84,7 @@ defmodule JS2E.Printer.AnyOfPrinter do
     field_type_result =
       type_path
       |> Resolver.resolve_type(parent, schema_def, schema_dict)
-      |> ElmTypes.create_type_name(schema_def, module_name)
+      |> ElmTypes.create_type_name(parent, schema_def, schema_dict, module_name)
 
     case field_type_result do
       {:ok, field_type} ->
@@ -120,7 +122,9 @@ defmodule JS2E.Printer.AnyOfPrinter do
       ) do
     {decoder_clauses, errors} =
       type_paths
-      |> Enum.map(&create_decoder_property(&1, path, schema_def, schema_dict, module_name))
+      |> Enum.map(
+        &create_decoder_property(&1, path, schema_def, schema_dict, module_name)
+      )
       |> CommonOperations.split_ok_and_errors()
 
     normalized_name = Naming.normalize_identifier(name, :downcase)
@@ -190,7 +194,8 @@ defmodule JS2E.Printer.AnyOfPrinter do
     {:ok, %{property_name: property_name, decoder_name: decoder_name}}
   end
 
-  @spec create_decoder_enum_clause(String.t(), String.t(), String.t()) :: {:ok, map}
+  @spec create_decoder_enum_clause(String.t(), String.t(), String.t()) ::
+          {:ok, map}
   defp create_decoder_enum_clause(
          property_name,
          property_type_decoder,
@@ -323,7 +328,8 @@ defmodule JS2E.Printer.AnyOfPrinter do
          _schema_dict,
          _module_name
        ) do
-    error_msg = "anyOf printer expected ObjectType but found #{type_def.__struct__}"
+    error_msg =
+      "anyOf printer expected ObjectType but found #{type_def.__struct__}"
 
     ErrorUtil.unexpected_type(type_def.path, error_msg)
   end

lib/printer/array_printer.ex

@@ -104,7 +104,8 @@ defmodule JS2E.Printer.ArrayPrinter do
         ElmDecoders.determine_primitive_type_decoder(items_type.type)
 
       _ ->
-        items_type_name = Naming.normalize_identifier(items_type.name, :downcase)
+        items_type_name =
+          Naming.normalize_identifier(items_type.name, :downcase)
 
         if items_type_name == "hash" do
           {:ok, "rootDecoder"}
@@ -141,7 +142,7 @@ defmodule JS2E.Printer.ArrayPrinter do
            Resolver.resolve_type(items_path, path, schema_def, schema_dict),
          {:ok, items_type_name} <- determine_type_name(items_type),
          {:ok, items_encoder_name} <- determine_encoder_name(items_type) do
-      "encode#{Naming.normalize_identifier(items_type_name, :upcase)}s"
+      "encode#{Naming.normalize_identifier(name, :upcase)}"
       |> encoder_template(name, items_type_name, items_encoder_name)
       |> PrinterResult.new()
     else
@@ -205,8 +206,7 @@ defmodule JS2E.Printer.ArrayPrinter do
       argument_name = Naming.normalize_identifier(name, :downcase)
       fuzzer_name = "#{name}Fuzzer"
       decoder_name = "#{Naming.normalize_identifier(name, :downcase)}Decoder"
-
-      encoder_name = "encode#{Naming.normalize_identifier(items_type_name, :upcase)}s"
+      encoder_name = "encode#{Naming.normalize_identifier(name, :upcase)}"
 
       array_name
       |> fuzzer_template(
@@ -235,7 +235,8 @@ defmodule JS2E.Printer.ArrayPrinter do
         ElmFuzzers.determine_primitive_fuzzer_name(items_type.type)
 
       _ ->
-        items_type_name = Naming.normalize_identifier(items_type.name, :downcase)
+        items_type_name =
+          Naming.normalize_identifier(items_type.name, :downcase)
 
         if items_type_name == "hash" do
           {:ok, "rootFuzzer"}