diff --git a/base/schema-cjson/test/inputs/schema/list.schema/default/TopLevel.h b/head/schema-cjson/test/inputs/schema/list.schema/default/TopLevel.h
index a55e160..4ad351e 100644
--- a/base/schema-cjson/test/inputs/schema/list.schema/default/TopLevel.h
+++ b/head/schema-cjson/test/inputs/schema/list.schema/default/TopLevel.h
@@ -38,6 +38,9 @@ extern "C" {
  * A recursive class type
  */
 struct TopLevel {
+    /**
+     * A recursive class type
+     */
     struct TopLevel * next;
 };
 
diff --git a/base/schema-cjson/test/inputs/schema/ref-remote.schema/default/TopLevel.h b/head/schema-cjson/test/inputs/schema/ref-remote.schema/default/TopLevel.h
index a55e160..4ad351e 100644
--- a/base/schema-cjson/test/inputs/schema/ref-remote.schema/default/TopLevel.h
+++ b/head/schema-cjson/test/inputs/schema/ref-remote.schema/default/TopLevel.h
@@ -38,6 +38,9 @@ extern "C" {
  * A recursive class type
  */
 struct TopLevel {
+    /**
+     * A recursive class type
+     */
     struct TopLevel * next;
 };
 
diff --git a/base/schema-cjson/test/inputs/schema/simple-ref.schema/default/TopLevel.h b/head/schema-cjson/test/inputs/schema/simple-ref.schema/default/TopLevel.h
index a55e160..4ad351e 100644
--- a/base/schema-cjson/test/inputs/schema/simple-ref.schema/default/TopLevel.h
+++ b/head/schema-cjson/test/inputs/schema/simple-ref.schema/default/TopLevel.h
@@ -38,6 +38,9 @@ extern "C" {
  * A recursive class type
  */
 struct TopLevel {
+    /**
+     * A recursive class type
+     */
     struct TopLevel * next;
 };
 
diff --git a/head/schema-cplusplus/test/inputs/schema/description-ref.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/description-ref.schema/default/quicktype.hpp
new file mode 100644
index 0000000..642b64b
--- /dev/null
+++ b/head/schema-cplusplus/test/inputs/schema/description-ref.schema/default/quicktype.hpp
@@ -0,0 +1,74 @@
+//  To parse this JSON data, first install
+//
+//      json.hpp  https://github.com/nlohmann/json
+//
+//  Then include this file, and then do
+//
+//     TopLevel data = nlohmann::json::parse(jsonString);
+
+#pragma once
+
+#include "json.hpp"
+
+#include <optional>
+#include <stdexcept>
+#include <regex>
+
+namespace quicktype {
+    using nlohmann::json;
+
+    #ifndef NLOHMANN_UNTYPED_quicktype_HELPER
+    #define NLOHMANN_UNTYPED_quicktype_HELPER
+    inline json get_untyped(const json & j, const char * property) {
+        if (j.find(property) != j.end()) {
+            return j.at(property).get<json>();
+        }
+        return json();
+    }
+
+    inline json get_untyped(const json & j, std::string property) {
+        return get_untyped(j, property.data());
+    }
+    #endif
+
+    class TopLevel {
+        public:
+        TopLevel() = default;
+        virtual ~TopLevel() = default;
+
+        private:
+        std::string name;
+        std::string surname;
+
+        public:
+        /**
+         * name description
+         */
+        const std::string & get_name() const { return name; }
+        std::string & get_mutable_name() { return name; }
+        void set_name(const std::string & value) { this->name = value; }
+
+        /**
+         * surname description
+         */
+        const std::string & get_surname() const { return surname; }
+        std::string & get_mutable_surname() { return surname; }
+        void set_surname(const std::string & value) { this->surname = value; }
+    };
+}
+
+namespace quicktype {
+    void from_json(const json & j, TopLevel & x);
+    void to_json(json & j, const TopLevel & x);
+
+    inline void from_json(const json & j, TopLevel& x) {
+        x.set_name(j.at("name").get<std::string>());
+        x.set_surname(j.at("surname").get<std::string>());
+    }
+
+    inline void to_json(json & j, const TopLevel & x) {
+        j = json::object();
+        j["name"] = x.get_name();
+        j["surname"] = x.get_surname();
+    }
+}
diff --git a/base/schema-cplusplus/test/inputs/schema/list.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/list.schema/default/quicktype.hpp
index 789e1f7..e6659e2 100644
--- a/base/schema-cplusplus/test/inputs/schema/list.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/list.schema/default/quicktype.hpp
@@ -100,6 +100,9 @@ namespace quicktype {
         std::shared_ptr<TopLevel> next;
 
         public:
+        /**
+         * A recursive class type
+         */
         const std::shared_ptr<TopLevel> & get_next() const { return next; }
         std::shared_ptr<TopLevel> & get_mutable_next() { return next; }
         void set_next(const std::shared_ptr<TopLevel> & value) { this->next = value; }
diff --git a/base/schema-cplusplus/test/inputs/schema/ref-remote.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/ref-remote.schema/default/quicktype.hpp
index 789e1f7..e6659e2 100644
--- a/base/schema-cplusplus/test/inputs/schema/ref-remote.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/ref-remote.schema/default/quicktype.hpp
@@ -100,6 +100,9 @@ namespace quicktype {
         std::shared_ptr<TopLevel> next;
 
         public:
+        /**
+         * A recursive class type
+         */
         const std::shared_ptr<TopLevel> & get_next() const { return next; }
         std::shared_ptr<TopLevel> & get_mutable_next() { return next; }
         void set_next(const std::shared_ptr<TopLevel> & value) { this->next = value; }
diff --git a/base/schema-cplusplus/test/inputs/schema/simple-ref.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/simple-ref.schema/default/quicktype.hpp
index 789e1f7..e6659e2 100644
--- a/base/schema-cplusplus/test/inputs/schema/simple-ref.schema/default/quicktype.hpp
+++ b/head/schema-cplusplus/test/inputs/schema/simple-ref.schema/default/quicktype.hpp
@@ -100,6 +100,9 @@ namespace quicktype {
         std::shared_ptr<TopLevel> next;
 
         public:
+        /**
+         * A recursive class type
+         */
         const std::shared_ptr<TopLevel> & get_next() const { return next; }
         std::shared_ptr<TopLevel> & get_mutable_next() { return next; }
         void set_next(const std::shared_ptr<TopLevel> & value) { this->next = value; }
diff --git a/head/schema-csharp/test/inputs/schema/description-ref.schema/default/QuickType.cs b/head/schema-csharp/test/inputs/schema/description-ref.schema/default/QuickType.cs
new file mode 100644
index 0000000..ac10f4e
--- /dev/null
+++ b/head/schema-csharp/test/inputs/schema/description-ref.schema/default/QuickType.cs
@@ -0,0 +1,70 @@
+// <auto-generated />
+//
+// To parse this JSON data, add NuGet 'Newtonsoft.Json' then do:
+//
+//    using QuickType;
+//
+//    var topLevel = TopLevel.FromJson(jsonString);
+#nullable enable
+#pragma warning disable CS8618
+#pragma warning disable CS8601
+#pragma warning disable CS8602
+#pragma warning disable CS8603
+#pragma warning disable CS8604
+#pragma warning disable CS8625
+#pragma warning disable CS8765
+
+namespace QuickType
+{
+    using System;
+    using System.Collections.Generic;
+
+    using System.Globalization;
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Converters;
+
+    public partial class TopLevel
+    {
+        /// <summary>
+        /// name description
+        /// </summary>
+        [JsonProperty("name", Required = Required.Always)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// surname description
+        /// </summary>
+        [JsonProperty("surname", Required = Required.Always)]
+        public string Surname { get; set; }
+    }
+
+    public partial class TopLevel
+    {
+        public static TopLevel FromJson(string json) => JsonConvert.DeserializeObject<TopLevel>(json, QuickType.Converter.Settings);
+    }
+
+    public static partial class Serialize
+    {
+        public static string ToJson(this TopLevel self) => JsonConvert.SerializeObject(self, QuickType.Converter.Settings);
+    }
+
+    internal static partial class Converter
+    {
+        public static readonly JsonSerializerSettings Settings = new JsonSerializerSettings
+        {
+            MetadataPropertyHandling = MetadataPropertyHandling.Ignore,
+            DateParseHandling = DateParseHandling.None,
+            Converters =
+            {
+                new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }
+            },
+        };
+    }
+}
+#pragma warning restore CS8618
+#pragma warning restore CS8601
+#pragma warning restore CS8602
+#pragma warning restore CS8603
+#pragma warning restore CS8604
+#pragma warning restore CS8625
+#pragma warning restore CS8765
diff --git a/base/schema-csharp/test/inputs/schema/list.schema/default/QuickType.cs b/head/schema-csharp/test/inputs/schema/list.schema/default/QuickType.cs
index 9954593..377dfc1 100644
--- a/base/schema-csharp/test/inputs/schema/list.schema/default/QuickType.cs
+++ b/head/schema-csharp/test/inputs/schema/list.schema/default/QuickType.cs
@@ -28,6 +28,9 @@ namespace QuickType
     /// </summary>
     public partial class TopLevel
     {
+        /// <summary>
+        /// A recursive class type
+        /// </summary>
         [JsonProperty("next", Required = Required.DisallowNull, NullValueHandling = NullValueHandling.Ignore)]
         public TopLevel? Next { get; set; }
     }
diff --git a/base/schema-csharp/test/inputs/schema/ref-remote.schema/default/QuickType.cs b/head/schema-csharp/test/inputs/schema/ref-remote.schema/default/QuickType.cs
index 9954593..377dfc1 100644
--- a/base/schema-csharp/test/inputs/schema/ref-remote.schema/default/QuickType.cs
+++ b/head/schema-csharp/test/inputs/schema/ref-remote.schema/default/QuickType.cs
@@ -28,6 +28,9 @@ namespace QuickType
     /// </summary>
     public partial class TopLevel
     {
+        /// <summary>
+        /// A recursive class type
+        /// </summary>
         [JsonProperty("next", Required = Required.DisallowNull, NullValueHandling = NullValueHandling.Ignore)]
         public TopLevel? Next { get; set; }
     }
diff --git a/base/schema-csharp/test/inputs/schema/simple-ref.schema/default/QuickType.cs b/head/schema-csharp/test/inputs/schema/simple-ref.schema/default/QuickType.cs
index 9954593..377dfc1 100644
--- a/base/schema-csharp/test/inputs/schema/simple-ref.schema/default/QuickType.cs
+++ b/head/schema-csharp/test/inputs/schema/simple-ref.schema/default/QuickType.cs
@@ -28,6 +28,9 @@ namespace QuickType
     /// </summary>
     public partial class TopLevel
     {
+        /// <summary>
+        /// A recursive class type
+        /// </summary>
         [JsonProperty("next", Required = Required.DisallowNull, NullValueHandling = NullValueHandling.Ignore)]
         public TopLevel? Next { get; set; }
     }
diff --git a/head/schema-csharp-SystemTextJson/test/inputs/schema/description-ref.schema/default/QuickType.cs b/head/schema-csharp-SystemTextJson/test/inputs/schema/description-ref.schema/default/QuickType.cs
new file mode 100644
index 0000000..6342fdb
--- /dev/null
+++ b/head/schema-csharp-SystemTextJson/test/inputs/schema/description-ref.schema/default/QuickType.cs
@@ -0,0 +1,176 @@
+// <auto-generated />
+//
+// To parse this JSON data, add NuGet 'System.Text.Json' then do:
+//
+//    using QuickType;
+//
+//    var topLevel = TopLevel.FromJson(jsonString);
+#nullable enable
+#pragma warning disable CS8618
+#pragma warning disable CS8601
+#pragma warning disable CS8602
+#pragma warning disable CS8603
+
+namespace QuickType
+{
+    using System;
+    using System.Collections.Generic;
+
+    using System.Text.Json;
+    using System.Text.Json.Serialization;
+    using System.Globalization;
+
+    public partial class TopLevel
+    {
+        /// <summary>
+        /// name description
+        /// </summary>
+        [JsonRequired]
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// surname description
+        /// </summary>
+        [JsonRequired]
+        [JsonPropertyName("surname")]
+        public string Surname { get; set; }
+    }
+
+    public partial class TopLevel
+    {
+        public static TopLevel FromJson(string json) => JsonSerializer.Deserialize<TopLevel>(json, QuickType.Converter.Settings);
+    }
+
+    public static partial class Serialize
+    {
+        public static string ToJson(this TopLevel self) => JsonSerializer.Serialize(self, QuickType.Converter.Settings);
+    }
+
+    internal static partial class Converter
+    {
+        public static readonly JsonSerializerOptions Settings = new(JsonSerializerDefaults.General)
+        {
+            Converters =
+            {
+                new DateOnlyConverter(),
+                new TimeOnlyConverter(),
+                IsoDateTimeOffsetConverter.Singleton
+            },
+        };
+    }
+    
+    public class DateOnlyConverter : JsonConverter<DateOnly>
+    {
+        private readonly string serializationFormat;
+        public DateOnlyConverter() : this(null) { }
+
+        public DateOnlyConverter(string? serializationFormat)
+        {
+                this.serializationFormat = serializationFormat ?? "yyyy-MM-dd";
+        }
+
+        public override DateOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+                var value = reader.GetString();
+                return DateOnly.Parse(value!);
+        }
+
+        public override void Write(Utf8JsonWriter writer, DateOnly value, JsonSerializerOptions options)
+                => writer.WriteStringValue(value.ToString(serializationFormat));
+    }
+
+    public class TimeOnlyConverter : JsonConverter<TimeOnly>
+    {
+        private readonly string serializationFormat;
+
+        public TimeOnlyConverter() : this(null) { }
+
+        public TimeOnlyConverter(string? serializationFormat)
+        {
+                this.serializationFormat = serializationFormat ?? "HH:mm:ss.fff";
+        }
+
+        public override TimeOnly Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+                var value = reader.GetString();
+                return TimeOnly.Parse(value!);
+        }
+
+        public override void Write(Utf8JsonWriter writer, TimeOnly value, JsonSerializerOptions options)
+                => writer.WriteStringValue(value.ToString(serializationFormat));
+    }
+
+    internal class IsoDateTimeOffsetConverter : JsonConverter<DateTimeOffset>
+    {
+        public override bool CanConvert(Type t) => t == typeof(DateTimeOffset);
+
+        private const string DefaultDateTimeFormat = "yyyy'-'MM'-'dd'T'HH':'mm':'ss.FFFFFFFK";
+
+        private DateTimeStyles _dateTimeStyles = DateTimeStyles.RoundtripKind;
+        private string? _dateTimeFormat;
+        private CultureInfo? _culture;
+
+        public DateTimeStyles DateTimeStyles
+        {
+                get => _dateTimeStyles;
+                set => _dateTimeStyles = value;
+        }
+
+        public string? DateTimeFormat
+        {
+                get => _dateTimeFormat ?? string.Empty;
+                set => _dateTimeFormat = (string.IsNullOrEmpty(value)) ? null : value;
+        }
+
+        public CultureInfo Culture
+        {
+                get => _culture ?? CultureInfo.CurrentCulture;
+                set => _culture = value;
+        }
+
+        public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSerializerOptions options)
+        {
+                string text;
+
+
+                if ((_dateTimeStyles & DateTimeStyles.AdjustToUniversal) == DateTimeStyles.AdjustToUniversal
+                        || (_dateTimeStyles & DateTimeStyles.AssumeUniversal) == DateTimeStyles.AssumeUniversal)
+                {
+                        value = value.ToUniversalTime();
+                }
+
+                text = value.ToString(_dateTimeFormat ?? DefaultDateTimeFormat, Culture);
+
+                writer.WriteStringValue(text);
+        }
+
+        public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+                string? dateText = reader.GetString();
+
+                if (string.IsNullOrEmpty(dateText) == false)
+                {
+                        if (!string.IsNullOrEmpty(_dateTimeFormat))
+                        {
+                                return DateTimeOffset.ParseExact(dateText, _dateTimeFormat, Culture, _dateTimeStyles);
+                        }
+                        else
+                        {
+                                return DateTimeOffset.Parse(dateText, Culture, _dateTimeStyles);
+                        }
+                }
+                else
+                {
+                        return default(DateTimeOffset);
+                }
+        }
+
+
+        public static readonly IsoDateTimeOffsetConverter Singleton = new IsoDateTimeOffsetConverter();
+    }
+}
+#pragma warning restore CS8618
+#pragma warning restore CS8601
+#pragma warning restore CS8602
+#pragma warning restore CS8603
diff --git a/base/schema-csharp-SystemTextJson/test/inputs/schema/list.schema/default/QuickType.cs b/head/schema-csharp-SystemTextJson/test/inputs/schema/list.schema/default/QuickType.cs
index 0831177..a48c4c0 100644
--- a/base/schema-csharp-SystemTextJson/test/inputs/schema/list.schema/default/QuickType.cs
+++ b/head/schema-csharp-SystemTextJson/test/inputs/schema/list.schema/default/QuickType.cs
@@ -25,6 +25,9 @@ namespace QuickType
     /// </summary>
     public partial class TopLevel
     {
+        /// <summary>
+        /// A recursive class type
+        /// </summary>
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
         [JsonPropertyName("next")]
         public TopLevel? Next { get; set; }
diff --git a/base/schema-csharp-SystemTextJson/test/inputs/schema/ref-remote.schema/default/QuickType.cs b/head/schema-csharp-SystemTextJson/test/inputs/schema/ref-remote.schema/default/QuickType.cs
index 0831177..a48c4c0 100644
--- a/base/schema-csharp-SystemTextJson/test/inputs/schema/ref-remote.schema/default/QuickType.cs
+++ b/head/schema-csharp-SystemTextJson/test/inputs/schema/ref-remote.schema/default/QuickType.cs
@@ -25,6 +25,9 @@ namespace QuickType
     /// </summary>
     public partial class TopLevel
     {
+        /// <summary>
+        /// A recursive class type
+        /// </summary>
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
         [JsonPropertyName("next")]
         public TopLevel? Next { get; set; }
diff --git a/base/schema-csharp-SystemTextJson/test/inputs/schema/simple-ref.schema/default/QuickType.cs b/head/schema-csharp-SystemTextJson/test/inputs/schema/simple-ref.schema/default/QuickType.cs
index 0831177..a48c4c0 100644
--- a/base/schema-csharp-SystemTextJson/test/inputs/schema/simple-ref.schema/default/QuickType.cs
+++ b/head/schema-csharp-SystemTextJson/test/inputs/schema/simple-ref.schema/default/QuickType.cs
@@ -25,6 +25,9 @@ namespace QuickType
     /// </summary>
     public partial class TopLevel
     {
+        /// <summary>
+        /// A recursive class type
+        /// </summary>
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
         [JsonPropertyName("next")]
         public TopLevel? Next { get; set; }
diff --git a/head/schema-csharp-records/test/inputs/schema/description-ref.schema/default/QuickType.cs b/head/schema-csharp-records/test/inputs/schema/description-ref.schema/default/QuickType.cs
new file mode 100644
index 0000000..d6ecdec
--- /dev/null
+++ b/head/schema-csharp-records/test/inputs/schema/description-ref.schema/default/QuickType.cs
@@ -0,0 +1,70 @@
+// <auto-generated />
+//
+// To parse this JSON data, add NuGet 'Newtonsoft.Json' then do:
+//
+//    using QuickType;
+//
+//    var topLevel = TopLevel.FromJson(jsonString);
+#nullable enable
+#pragma warning disable CS8618
+#pragma warning disable CS8601
+#pragma warning disable CS8602
+#pragma warning disable CS8603
+#pragma warning disable CS8604
+#pragma warning disable CS8625
+#pragma warning disable CS8765
+
+namespace QuickType
+{
+    using System;
+    using System.Collections.Generic;
+
+    using System.Globalization;
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Converters;
+
+    public partial record TopLevel
+    {
+        /// <summary>
+        /// name description
+        /// </summary>
+        [JsonProperty("name", Required = Required.Always)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// surname description
+        /// </summary>
+        [JsonProperty("surname", Required = Required.Always)]
+        public string Surname { get; set; }
+    }
+
+    public partial record TopLevel
+    {
+        public static TopLevel FromJson(string json) => JsonConvert.DeserializeObject<TopLevel>(json, QuickType.Converter.Settings);
+    }
+
+    public static partial class Serialize
+    {
+        public static string ToJson(this TopLevel self) => JsonConvert.SerializeObject(self, QuickType.Converter.Settings);
+    }
+
+    internal static partial class Converter
+    {
+        public static readonly JsonSerializerSettings Settings = new JsonSerializerSettings
+        {
+            MetadataPropertyHandling = MetadataPropertyHandling.Ignore,
+            DateParseHandling = DateParseHandling.None,
+            Converters =
+            {
+                new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }
+            },
+        };
+    }
+}
+#pragma warning restore CS8618
+#pragma warning restore CS8601
+#pragma warning restore CS8602
+#pragma warning restore CS8603
+#pragma warning restore CS8604
+#pragma warning restore CS8625
+#pragma warning restore CS8765
diff --git a/base/schema-csharp-records/test/inputs/schema/list.schema/default/QuickType.cs b/head/schema-csharp-records/test/inputs/schema/list.schema/default/QuickType.cs
index d2421e5..c826720 100644
--- a/base/schema-csharp-records/test/inputs/schema/list.schema/default/QuickType.cs
+++ b/head/schema-csharp-records/test/inputs/schema/list.schema/default/QuickType.cs
@@ -28,6 +28,9 @@ namespace QuickType
     /// </summary>
     public partial record TopLevel
     {
+        /// <summary>
+        /// A recursive class type
+        /// </summary>
         [JsonProperty("next", Required = Required.DisallowNull, NullValueHandling = NullValueHandling.Ignore)]
         public TopLevel? Next { get; set; }
     }
diff --git a/base/schema-csharp-records/test/inputs/schema/ref-remote.schema/default/QuickType.cs b/head/schema-csharp-records/test/inputs/schema/ref-remote.schema/default/QuickType.cs
index d2421e5..c826720 100644
--- a/base/schema-csharp-records/test/inputs/schema/ref-remote.schema/default/QuickType.cs
+++ b/head/schema-csharp-records/test/inputs/schema/ref-remote.schema/default/QuickType.cs
@@ -28,6 +28,9 @@ namespace QuickType
     /// </summary>
     public partial record TopLevel
     {
+        /// <summary>
+        /// A recursive class type
+        /// </summary>
         [JsonProperty("next", Required = Required.DisallowNull, NullValueHandling = NullValueHandling.Ignore)]
         public TopLevel? Next { get; set; }
     }
diff --git a/base/schema-csharp-records/test/inputs/schema/simple-ref.schema/default/QuickType.cs b/head/schema-csharp-records/test/inputs/schema/simple-ref.schema/default/QuickType.cs
index d2421e5..c826720 100644
--- a/base/schema-csharp-records/test/inputs/schema/simple-ref.schema/default/QuickType.cs
+++ b/head/schema-csharp-records/test/inputs/schema/simple-ref.schema/default/QuickType.cs
@@ -28,6 +28,9 @@ namespace QuickType
     /// </summary>
     public partial record TopLevel
     {
+        /// <summary>
+        /// A recursive class type
+        /// </summary>
         [JsonProperty("next", Required = Required.DisallowNull, NullValueHandling = NullValueHandling.Ignore)]
         public TopLevel? Next { get; set; }
     }
diff --git a/head/schema-dart/test/inputs/schema/description-ref.schema/default/TopLevel.dart b/head/schema-dart/test/inputs/schema/description-ref.schema/default/TopLevel.dart
new file mode 100644
index 0000000..8e86caa
--- /dev/null
+++ b/head/schema-dart/test/inputs/schema/description-ref.schema/default/TopLevel.dart
@@ -0,0 +1,33 @@
+// To parse this JSON data, do
+//
+//     final topLevel = topLevelFromJson(jsonString);
+
+import 'dart:convert';
+
+TopLevel topLevelFromJson(String str) => TopLevel.fromJson(json.decode(str));
+
+String topLevelToJson(TopLevel data) => json.encode(data.toJson());
+
+class TopLevel {
+    
+    ///name description
+    final String name;
+    
+    ///surname description
+    final String surname;
+
+    TopLevel({
+        required this.name,
+        required this.surname,
+    });
+
+    factory TopLevel.fromJson(Map<String, dynamic> json) => TopLevel(
+        name: json["name"],
+        surname: json["surname"],
+    );
+
+    Map<String, dynamic> toJson() => {
+        "name": name,
+        "surname": surname,
+    };
+}
diff --git a/base/schema-elixir/test/inputs/schema/list.schema/default/QuickType.ex b/head/schema-elixir/test/inputs/schema/list.schema/default/QuickType.ex
index 2137e15..eade9f3 100644
--- a/base/schema-elixir/test/inputs/schema/list.schema/default/QuickType.ex
+++ b/head/schema-elixir/test/inputs/schema/list.schema/default/QuickType.ex
@@ -8,6 +8,7 @@
 defmodule TopLevel do
   @moduledoc """
   A recursive class type
+  - `:next` - A recursive class type
   """
 
   defstruct [:next]
diff --git a/base/schema-elixir/test/inputs/schema/ref-remote.schema/default/QuickType.ex b/head/schema-elixir/test/inputs/schema/ref-remote.schema/default/QuickType.ex
index 2137e15..eade9f3 100644
--- a/base/schema-elixir/test/inputs/schema/ref-remote.schema/default/QuickType.ex
+++ b/head/schema-elixir/test/inputs/schema/ref-remote.schema/default/QuickType.ex
@@ -8,6 +8,7 @@
 defmodule TopLevel do
   @moduledoc """
   A recursive class type
+  - `:next` - A recursive class type
   """
 
   defstruct [:next]
diff --git a/base/schema-elixir/test/inputs/schema/simple-ref.schema/default/QuickType.ex b/head/schema-elixir/test/inputs/schema/simple-ref.schema/default/QuickType.ex
index 2137e15..eade9f3 100644
--- a/base/schema-elixir/test/inputs/schema/simple-ref.schema/default/QuickType.ex
+++ b/head/schema-elixir/test/inputs/schema/simple-ref.schema/default/QuickType.ex
@@ -8,6 +8,7 @@
 defmodule TopLevel do
   @moduledoc """
   A recursive class type
+  - `:next` - A recursive class type
   """
 
   defstruct [:next]
diff --git a/head/schema-elm/test/inputs/schema/description-ref.schema/default/QuickType.elm b/head/schema-elm/test/inputs/schema/description-ref.schema/default/QuickType.elm
new file mode 100644
index 0000000..12db028
--- /dev/null
+++ b/head/schema-elm/test/inputs/schema/description-ref.schema/default/QuickType.elm
@@ -0,0 +1,60 @@
+-- To decode the JSON data, add this file to your project, run
+--
+--     elm install NoRedInk/elm-json-decode-pipeline
+--
+-- add these imports
+--
+--     import Json.Decode exposing (decodeString)
+--     import QuickType exposing (quickType)
+--
+-- and you're off to the races with
+--
+--     decodeString quickType myJsonString
+
+module QuickType exposing
+    ( QuickType
+    , quickTypeToString
+    , quickType
+    )
+
+import Json.Decode as Jdec
+import Json.Decode.Pipeline as Jpipe
+import Json.Encode as Jenc
+import Dict exposing (Dict)
+
+{-| name:
+name description
+
+surname:
+surname description
+-}
+type alias QuickType =
+    { name : String
+    , surname : String
+    }
+
+-- decoders and encoders
+
+quickTypeToString : QuickType -> String
+quickTypeToString r = Jenc.encode 0 (encodeQuickType r)
+
+quickType : Jdec.Decoder QuickType
+quickType =
+    Jdec.succeed QuickType
+        |> Jpipe.required "name" Jdec.string
+        |> Jpipe.required "surname" Jdec.string
+
+encodeQuickType : QuickType -> Jenc.Value
+encodeQuickType x =
+    Jenc.object
+        [ ("name", Jenc.string x.name)
+        , ("surname", Jenc.string x.surname)
+        ]
+
+--- encoder helpers
+
+makeNullableEncoder : (a -> Jenc.Value) -> Maybe a -> Jenc.Value
+makeNullableEncoder f m =
+    case m of
+    Just x -> f x
+    Nothing -> Jenc.null
diff --git a/head/schema-flow/test/inputs/schema/description-ref.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/description-ref.schema/default/TopLevel.js
new file mode 100644
index 0000000..1b41a8f
--- /dev/null
+++ b/head/schema-flow/test/inputs/schema/description-ref.schema/default/TopLevel.js
@@ -0,0 +1,197 @@
+// @flow
+
+// To parse this data:
+//
+//   const Convert = require("./TopLevel");
+//
+//   const topLevel = Convert.toTopLevel(json);
+//
+// These functions will throw an error if the JSON doesn't
+// match the expected interface, even if the JSON is valid.
+
+export type TopLevel = {
+    /**
+     * name description
+     */
+    name: string;
+    /**
+     * surname description
+     */
+    surname: string;
+    [property: string]: mixed;
+};
+
+// Converts JSON strings to/from your types
+// and asserts the results of JSON.parse at runtime
+function toTopLevel(json: string): TopLevel {
+    return cast(JSON.parse(json), r("TopLevel"));
+}
+
+function topLevelToJson(value: TopLevel): string {
+    return JSON.stringify(uncast(value, r("TopLevel")), null, 2);
+}
+
+function invalidValue(typ: any, val: any, key: any, parent: any = '') {
+    const prettyTyp = prettyTypeName(typ);
+    const parentText = parent ? ` on ${parent}` : '';
+    const keyText = key ? ` for key "${key}"` : '';
+    throw Error(`Invalid value${keyText}${parentText}. Expected ${prettyTyp} but got ${JSON.stringify(val)}`);
+}
+
+function prettyTypeName(typ: any): string {
+    if (Array.isArray(typ)) {
+        if (typ.length === 2 && typ[0] === undefined) {
+            return `an optional ${prettyTypeName(typ[1])}`;
+        } else {
+            return `one of [${typ.map(a => { return prettyTypeName(a); }).join(", ")}]`;
+        }
+    } else if (typeof typ === "object" && typ.literal !== undefined) {
+        return typ.literal;
+    } else {
+        return typeof typ;
+    }
+}
+
+function jsonToJSProps(typ: any): any {
+    if (typ.jsonToJS === undefined) {
+        const map: any = {};
+        typ.props.forEach((p: any) => map[p.json] = { key: p.js, typ: p.typ });
+        typ.jsonToJS = map;
+    }
+    return typ.jsonToJS;
+}
+
+function jsToJSONProps(typ: any): any {
+    if (typ.jsToJSON === undefined) {
+        const map: any = {};
+        typ.props.forEach((p: any) => map[p.js] = { key: p.json, typ: p.typ });
+        typ.jsToJSON = map;
+    }
+    return typ.jsToJSON;
+}
+
+function transform(val: any, typ: any, getProps: any, key: any = '', parent: any = ''): any {
+    function transformPrimitive(typ: string, val: any): any {
+        if (typeof typ === typeof val) return val;
+        return invalidValue(typ, val, key, parent);
+    }
+
+    function transformUnion(typs: any[], val: any): any {
+        // val must validate against one typ in typs
+        const l = typs.length;
+        for (let i = 0; i < l; i++) {
+            const typ = typs[i];
+            try {
+                return transform(val, typ, getProps);
+            } catch (_) {}
+        }
+        return invalidValue(typs, val, key, parent);
+    }
+
+    function transformEnum(cases: string[], val: any): any {
+        if (cases.indexOf(val) !== -1) return val;
+        return invalidValue(cases.map(a => { return l(a); }), val, key, parent);
+    }
+
+    function transformArray(typ: any, val: any): any {
+        // val must be an array with no invalid elements
+        if (!Array.isArray(val)) return invalidValue(l("array"), val, key, parent);
+        return val.map(el => transform(el, typ, getProps));
+    }
+
+    function transformDate(val: any): any {
+        if (val === null) {
+            return null;
+        }
+        const d = new Date(val);
+        if (isNaN(d.valueOf())) {
+            return invalidValue(l("Date"), val, key, parent);
+        }
+        return d;
+    }
+
+    function transformObject(props: { [k: string]: any }, additional: any, val: any): any {
+        if (val === null || typeof val !== "object" || Array.isArray(val)) {
+            return invalidValue(l(ref || "object"), val, key, parent);
+        }
+        const result: any = {};
+        Object.getOwnPropertyNames(props).forEach(key => {
+            const prop = props[key];
+            const v = Object.prototype.hasOwnProperty.call(val, key) ? val[key] : undefined;
+            result[prop.key] = transform(v, prop.typ, getProps, key, ref);
+        });
+        Object.getOwnPropertyNames(val).forEach(key => {
+            if (!Object.prototype.hasOwnProperty.call(props, key)) {
+                result[key] = transform(val[key], additional, getProps, key, ref);
+            }
+        });
+        return result;
+    }
+
+    if (typ === "any") return val;
+    if (typ === null) {
+        if (val === null) return val;
+        return invalidValue(typ, val, key, parent);
+    }
+    if (typ === false) return invalidValue(typ, val, key, parent);
+    let ref: any = undefined;
+    while (typeof typ === "object" && typ.ref !== undefined) {
+        ref = typ.ref;
+        typ = typeMap[typ.ref];
+    }
+    if (Array.isArray(typ)) return transformEnum(typ, val);
+    if (typeof typ === "object") {
+        return typ.hasOwnProperty("unionMembers") ? transformUnion(typ.unionMembers, val)
+            : typ.hasOwnProperty("arrayItems")    ? transformArray(typ.arrayItems, val)
+            : typ.hasOwnProperty("props")         ? transformObject(getProps(typ), typ.additional, val)
+            : invalidValue(typ, val, key, parent);
+    }
+    // Numbers can be parsed by Date but shouldn't be.
+    if (typ === Date && typeof val !== "number") return transformDate(val);
+    return transformPrimitive(typ, val);
+}
+
+function cast<T>(val: any, typ: any): T {
+    return transform(val, typ, jsonToJSProps);
+}
+
+function uncast<T>(val: T, typ: any): any {
+    return transform(val, typ, jsToJSONProps);
+}
+
+function l(typ: any) {
+    return { literal: typ };
+}
+
+function a(typ: any) {
+    return { arrayItems: typ };
+}
+
+function u(...typs: any[]) {
+    return { unionMembers: typs };
+}
+
+function o(props: any[], additional: any) {
+    return { props, additional };
+}
+
+function m(additional: any) {
+    const props: any[] = [];
+    return { props, additional };
+}
+
+function r(name: string) {
+    return { ref: name };
+}
+
+const typeMap: any = {
+    "TopLevel": o([
+        { json: "name", js: "name", typ: "" },
+        { json: "surname", js: "surname", typ: "" },
+    ], "any"),
+};
+
+module.exports = {
+    "topLevelToJson": topLevelToJson,
+    "toTopLevel": toTopLevel,
+};
diff --git a/base/schema-flow/test/inputs/schema/list.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/list.schema/default/TopLevel.js
index f719af5..b8e98ea 100644
--- a/base/schema-flow/test/inputs/schema/list.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/list.schema/default/TopLevel.js
@@ -13,6 +13,9 @@
  * A recursive class type
  */
 export type TopLevel = {
+    /**
+     * A recursive class type
+     */
     next?: TopLevel;
     [property: string]: mixed;
 };
diff --git a/base/schema-flow/test/inputs/schema/ref-remote.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/ref-remote.schema/default/TopLevel.js
index f719af5..b8e98ea 100644
--- a/base/schema-flow/test/inputs/schema/ref-remote.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/ref-remote.schema/default/TopLevel.js
@@ -13,6 +13,9 @@
  * A recursive class type
  */
 export type TopLevel = {
+    /**
+     * A recursive class type
+     */
     next?: TopLevel;
     [property: string]: mixed;
 };
diff --git a/base/schema-flow/test/inputs/schema/simple-ref.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/simple-ref.schema/default/TopLevel.js
index f719af5..b8e98ea 100644
--- a/base/schema-flow/test/inputs/schema/simple-ref.schema/default/TopLevel.js
+++ b/head/schema-flow/test/inputs/schema/simple-ref.schema/default/TopLevel.js
@@ -13,6 +13,9 @@
  * A recursive class type
  */
 export type TopLevel = {
+    /**
+     * A recursive class type
+     */
     next?: TopLevel;
     [property: string]: mixed;
 };
diff --git a/head/schema-golang/test/inputs/schema/description-ref.schema/default/quicktype.go b/head/schema-golang/test/inputs/schema/description-ref.schema/default/quicktype.go
new file mode 100644
index 0000000..a4f0653
--- /dev/null
+++ b/head/schema-golang/test/inputs/schema/description-ref.schema/default/quicktype.go
@@ -0,0 +1,26 @@
+// Code generated from JSON Schema using quicktype. DO NOT EDIT.
+// To parse and unparse this JSON data, add this code to your project and do:
+//
+//    topLevel, err := UnmarshalTopLevel(bytes)
+//    bytes, err = topLevel.Marshal()
+
+package main
+
+import "encoding/json"
+
+func UnmarshalTopLevel(data []byte) (TopLevel, error) {
+	var r TopLevel
+	err := json.Unmarshal(data, &r)
+	return r, err
+}
+
+func (r *TopLevel) Marshal() ([]byte, error) {
+	return json.Marshal(r)
+}
+
+type TopLevel struct {
+	// name description          
+	Name                  string `json:"name"`
+	// surname description       
+	Surname               string `json:"surname"`
+}
diff --git a/base/schema-golang/test/inputs/schema/list.schema/default/quicktype.go b/head/schema-golang/test/inputs/schema/list.schema/default/quicktype.go
index 5298ac2..d1b364a 100644
--- a/base/schema-golang/test/inputs/schema/list.schema/default/quicktype.go
+++ b/head/schema-golang/test/inputs/schema/list.schema/default/quicktype.go
@@ -20,5 +20,6 @@ func (r *TopLevel) Marshal() ([]byte, error) {
 
 // A recursive class type
 type TopLevel struct {
-	Next *TopLevel `json:"next,omitempty"`
+	// A recursive class type          
+	Next                     *TopLevel `json:"next,omitempty"`
 }
diff --git a/base/schema-golang/test/inputs/schema/ref-remote.schema/default/quicktype.go b/head/schema-golang/test/inputs/schema/ref-remote.schema/default/quicktype.go
index 5298ac2..d1b364a 100644
--- a/base/schema-golang/test/inputs/schema/ref-remote.schema/default/quicktype.go
+++ b/head/schema-golang/test/inputs/schema/ref-remote.schema/default/quicktype.go
@@ -20,5 +20,6 @@ func (r *TopLevel) Marshal() ([]byte, error) {
 
 // A recursive class type
 type TopLevel struct {
-	Next *TopLevel `json:"next,omitempty"`
+	// A recursive class type          
+	Next                     *TopLevel `json:"next,omitempty"`
 }
diff --git a/base/schema-golang/test/inputs/schema/simple-ref.schema/default/quicktype.go b/head/schema-golang/test/inputs/schema/simple-ref.schema/default/quicktype.go
index 5298ac2..d1b364a 100644
--- a/base/schema-golang/test/inputs/schema/simple-ref.schema/default/quicktype.go
+++ b/head/schema-golang/test/inputs/schema/simple-ref.schema/default/quicktype.go
@@ -20,5 +20,6 @@ func (r *TopLevel) Marshal() ([]byte, error) {
 
 // A recursive class type
 type TopLevel struct {
-	Next *TopLevel `json:"next,omitempty"`
+	// A recursive class type          
+	Next                     *TopLevel `json:"next,omitempty"`
 }
diff --git a/base/schema-haskell/test/inputs/schema/list.schema/default/QuickType.hs b/head/schema-haskell/test/inputs/schema/list.schema/default/QuickType.hs
index 1d0b087..d9d2122 100644
--- a/base/schema-haskell/test/inputs/schema/list.schema/default/QuickType.hs
+++ b/head/schema-haskell/test/inputs/schema/list.schema/default/QuickType.hs
@@ -12,8 +12,11 @@ import Data.ByteString.Lazy (ByteString)
 import Data.HashMap.Strict (HashMap)
 import Data.Text (Text)
 
-{-| A recursive class type -}
+{-| A recursive class type
 
+next:
+A recursive class type
+-}
 data QuickType = QuickType
     { nextQuickType :: Maybe QuickType
     } deriving (Show)
diff --git a/base/schema-haskell/test/inputs/schema/ref-remote.schema/default/QuickType.hs b/head/schema-haskell/test/inputs/schema/ref-remote.schema/default/QuickType.hs
index 1d0b087..d9d2122 100644
--- a/base/schema-haskell/test/inputs/schema/ref-remote.schema/default/QuickType.hs
+++ b/head/schema-haskell/test/inputs/schema/ref-remote.schema/default/QuickType.hs
@@ -12,8 +12,11 @@ import Data.ByteString.Lazy (ByteString)
 import Data.HashMap.Strict (HashMap)
 import Data.Text (Text)
 
-{-| A recursive class type -}
+{-| A recursive class type
 
+next:
+A recursive class type
+-}
 data QuickType = QuickType
     { nextQuickType :: Maybe QuickType
     } deriving (Show)
diff --git a/base/schema-haskell/test/inputs/schema/simple-ref.schema/default/QuickType.hs b/head/schema-haskell/test/inputs/schema/simple-ref.schema/default/QuickType.hs
index 1d0b087..d9d2122 100644
--- a/base/schema-haskell/test/inputs/schema/simple-ref.schema/default/QuickType.hs
+++ b/head/schema-haskell/test/inputs/schema/simple-ref.schema/default/QuickType.hs
@@ -12,8 +12,11 @@ import Data.ByteString.Lazy (ByteString)
 import Data.HashMap.Strict (HashMap)
 import Data.Text (Text)
 
-{-| A recursive class type -}
+{-| A recursive class type
 
+next:
+A recursive class type
+-}
 data QuickType = QuickType
     { nextQuickType :: Maybe QuickType
     } deriving (Show)
diff --git a/head/schema-java/test/inputs/schema/description-ref.schema/default/src/main/java/io/quicktype/Converter.java b/head/schema-java/test/inputs/schema/description-ref.schema/default/src/main/java/io/quicktype/Converter.java
new file mode 100644
index 0000000..a8eb236
--- /dev/null
+++ b/head/schema-java/test/inputs/schema/description-ref.schema/default/src/main/java/io/quicktype/Converter.java
@@ -0,0 +1,101 @@
+// To use this code, add the following Maven dependency to your project:
+//
+//
+//     com.fasterxml.jackson.core     : jackson-databind          : 2.9.0
+//     com.fasterxml.jackson.datatype : jackson-datatype-jsr310   : 2.9.0
+//
+// Import this package:
+//
+//     import io.quicktype.Converter;
+//
+// Then you can deserialize a JSON string with
+//
+//     TopLevel data = Converter.fromJsonString(jsonString);
+
+package io.quicktype;
+
+import java.io.IOException;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import java.util.*;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.temporal.ChronoField;
+
+public class Converter {
+    // Date-time helpers
+
+    private static final DateTimeFormatter DATE_TIME_FORMATTER = new DateTimeFormatterBuilder()
+            .appendOptional(DateTimeFormatter.ISO_DATE_TIME)
+            .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+            .appendOptional(DateTimeFormatter.ISO_INSTANT)
+            .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX"))
+            .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX"))
+            .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
+            .toFormatter()
+            .withZone(ZoneOffset.UTC);
+
+    public static OffsetDateTime parseDateTimeString(String str) {
+        return ZonedDateTime.from(Converter.DATE_TIME_FORMATTER.parse(str)).toOffsetDateTime();
+    }
+
+    private static final DateTimeFormatter TIME_FORMATTER = new DateTimeFormatterBuilder()
+            .appendOptional(DateTimeFormatter.ISO_TIME)
+            .appendOptional(DateTimeFormatter.ISO_OFFSET_TIME)
+            .parseDefaulting(ChronoField.YEAR, 2020)
+            .parseDefaulting(ChronoField.MONTH_OF_YEAR, 1)
+            .parseDefaulting(ChronoField.DAY_OF_MONTH, 1)
+            .toFormatter()
+            .withZone(ZoneOffset.UTC);
+
+    public static OffsetTime parseTimeString(String str) {
+        return ZonedDateTime.from(Converter.TIME_FORMATTER.parse(str)).toOffsetDateTime().toOffsetTime();
+    }
+    // Serialize/deserialize helpers
+
+    public static TopLevel fromJsonString(String json) throws IOException {
+        return getObjectReader().readValue(json);
+    }
+
+    public static String toJsonString(TopLevel obj) throws JsonProcessingException {
+        return getObjectWriter().writeValueAsString(obj);
+    }
+
+    private static ObjectReader reader;
+    private static ObjectWriter writer;
+
+    private static void instantiateMapper() {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.findAndRegisterModules();
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+        SimpleModule module = new SimpleModule();
+        module.addDeserializer(OffsetDateTime.class, new JsonDeserializer<OffsetDateTime>() {
+            @Override
+            public OffsetDateTime deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+                String value = jsonParser.getText();
+                return Converter.parseDateTimeString(value);
+            }
+        });
+        mapper.registerModule(module);
+        reader = mapper.readerFor(TopLevel.class);
+        writer = mapper.writerFor(TopLevel.class);
+    }
+
+    private static ObjectReader getObjectReader() {
+        if (reader == null) instantiateMapper();
+        return reader;
+    }
+
+    private static ObjectWriter getObjectWriter() {
+        if (writer == null) instantiateMapper();
+        return writer;
+    }
+}
diff --git a/head/schema-java/test/inputs/schema/description-ref.schema/default/src/main/java/io/quicktype/TopLevel.java b/head/schema-java/test/inputs/schema/description-ref.schema/default/src/main/java/io/quicktype/TopLevel.java
new file mode 100644
index 0000000..14f8670
--- /dev/null
+++ b/head/schema-java/test/inputs/schema/description-ref.schema/default/src/main/java/io/quicktype/TopLevel.java
@@ -0,0 +1,24 @@
+package io.quicktype;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class TopLevel {
+    private String name;
+    private String surname;
+
+    /**
+     * name description
+     */
+    @JsonProperty("name")
+    public String getName() { return name; }
+    @JsonProperty("name")
+    public void setName(String value) { this.name = value; }
+
+    /**
+     * surname description
+     */
+    @JsonProperty("surname")
+    public String getSurname() { return surname; }
+    @JsonProperty("surname")
+    public void setSurname(String value) { this.surname = value; }
+}
diff --git a/base/schema-java/test/inputs/schema/list.schema/default/src/main/java/io/quicktype/TopLevel.java b/head/schema-java/test/inputs/schema/list.schema/default/src/main/java/io/quicktype/TopLevel.java
index 02273f5..a39226e 100644
--- a/base/schema-java/test/inputs/schema/list.schema/default/src/main/java/io/quicktype/TopLevel.java
+++ b/head/schema-java/test/inputs/schema/list.schema/default/src/main/java/io/quicktype/TopLevel.java
@@ -8,6 +8,9 @@ import com.fasterxml.jackson.annotation.*;
 public class TopLevel {
     private TopLevel next;
 
+    /**
+     * A recursive class type
+     */
     @JsonProperty("next")
     public TopLevel getNext() { return next; }
     @JsonProperty("next")
diff --git a/base/schema-java/test/inputs/schema/ref-remote.schema/default/src/main/java/io/quicktype/TopLevel.java b/head/schema-java/test/inputs/schema/ref-remote.schema/default/src/main/java/io/quicktype/TopLevel.java
index 02273f5..a39226e 100644
--- a/base/schema-java/test/inputs/schema/ref-remote.schema/default/src/main/java/io/quicktype/TopLevel.java
+++ b/head/schema-java/test/inputs/schema/ref-remote.schema/default/src/main/java/io/quicktype/TopLevel.java
@@ -8,6 +8,9 @@ import com.fasterxml.jackson.annotation.*;
 public class TopLevel {
     private TopLevel next;
 
+    /**
+     * A recursive class type
+     */
     @JsonProperty("next")
     public TopLevel getNext() { return next; }
     @JsonProperty("next")
diff --git a/base/schema-java/test/inputs/schema/simple-ref.schema/default/src/main/java/io/quicktype/TopLevel.java b/head/schema-java/test/inputs/schema/simple-ref.schema/default/src/main/java/io/quicktype/TopLevel.java
index 02273f5..a39226e 100644
--- a/base/schema-java/test/inputs/schema/simple-ref.schema/default/src/main/java/io/quicktype/TopLevel.java
+++ b/head/schema-java/test/inputs/schema/simple-ref.schema/default/src/main/java/io/quicktype/TopLevel.java
@@ -8,6 +8,9 @@ import com.fasterxml.jackson.annotation.*;
 public class TopLevel {
     private TopLevel next;
 
+    /**
+     * A recursive class type
+     */
     @JsonProperty("next")
     public TopLevel getNext() { return next; }
     @JsonProperty("next")
diff --git a/head/schema-java-datetime-legacy/test/inputs/schema/description-ref.schema/default/src/main/java/io/quicktype/Converter.java b/head/schema-java-datetime-legacy/test/inputs/schema/description-ref.schema/default/src/main/java/io/quicktype/Converter.java
new file mode 100644
index 0000000..7d4811b
--- /dev/null
+++ b/head/schema-java-datetime-legacy/test/inputs/schema/description-ref.schema/default/src/main/java/io/quicktype/Converter.java
@@ -0,0 +1,121 @@
+// To use this code, add the following Maven dependency to your project:
+//
+//
+//     com.fasterxml.jackson.core     : jackson-databind          : 2.9.0
+//
+//
+// Import this package:
+//
+//     import io.quicktype.Converter;
+//
+// Then you can deserialize a JSON string with
+//
+//     TopLevel data = Converter.fromJsonString(jsonString);
+
+package io.quicktype;
+
+import java.io.IOException;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import java.util.*;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+
+public class Converter {
+    // Date-time helpers
+
+    private static final String[] DATE_TIME_FORMATS = {
+            "yyyy-MM-dd'T'HH:mm:ss.SX",
+            "yyyy-MM-dd'T'HH:mm:ss.S",
+            "yyyy-MM-dd'T'HH:mm:ssX",
+            "yyyy-MM-dd'T'HH:mm:ss",
+            "yyyy-MM-dd HH:mm:ss.SX",
+            "yyyy-MM-dd HH:mm:ss.S",
+            "yyyy-MM-dd HH:mm:ssX",
+            "yyyy-MM-dd HH:mm:ss",
+            "HH:mm:ss.SZ",
+            "HH:mm:ss.S",
+            "HH:mm:ssZ",
+            "HH:mm:ss",
+            "yyyy-MM-dd",
+    };
+
+    public static Date parseAllDateTimeString(String str) {
+        for (String format : DATE_TIME_FORMATS) {
+            try {
+                return new SimpleDateFormat(format).parse(str);
+            } catch (Exception ex) {
+                // Ignored
+            }
+        }
+        return null;
+    }
+
+    public static String serializeDateTime(Date datetime) {
+        return new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ssZ").format(datetime);
+    }
+
+    public static String serializeDate(Date datetime) {
+        return new SimpleDateFormat("yyyy-MM-dd").format(datetime);
+    }
+
+    public static String serializeTime(Date datetime) {
+        return new SimpleDateFormat("hh:mm:ssZ").format(datetime);
+    }
+    // Serialize/deserialize helpers
+
+    public static TopLevel fromJsonString(String json) throws IOException {
+        return getObjectReader().readValue(json);
+    }
+
+    public static String toJsonString(TopLevel obj) throws JsonProcessingException {
+        return getObjectWriter().writeValueAsString(obj);
+    }
+
+    private static ObjectReader reader;
+    private static ObjectWriter writer;
+
+    private static void instantiateMapper() {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.findAndRegisterModules();
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+        SimpleModule module = new SimpleModule();
+        module.addDeserializer(Date.class, new JsonDeserializer<Date>() {
+            @Override
+            public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+                String value = jsonParser.getText();
+                return Converter.parseAllDateTimeString(value);
+            }
+        });
+        module.addDeserializer(Date.class, new JsonDeserializer<Date>() {
+            @Override
+            public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+                String value = jsonParser.getText();
+                return Converter.parseAllDateTimeString(value);
+            }
+        });
+        module.addDeserializer(Date.class, new JsonDeserializer<Date>() {
+            @Override
+            public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+                String value = jsonParser.getText();
+                return Converter.parseAllDateTimeString(value);
+            }
+        });
+        mapper.registerModule(module);
+        reader = mapper.readerFor(TopLevel.class);
+        writer = mapper.writerFor(TopLevel.class);
+    }
+
+    private static ObjectReader getObjectReader() {
+        if (reader == null) instantiateMapper();
+        return reader;
+    }
+
+    private static ObjectWriter getObjectWriter() {
+        if (writer == null) instantiateMapper();
+        return writer;
+    }
+}
diff --git a/head/schema-java-datetime-legacy/test/inputs/schema/description-ref.schema/default/src/main/java/io/quicktype/TopLevel.java b/head/schema-java-datetime-legacy/test/inputs/schema/description-ref.schema/default/src/main/java/io/quicktype/TopLevel.java
new file mode 100644
index 0000000..14f8670
--- /dev/null
+++ b/head/schema-java-datetime-legacy/test/inputs/schema/description-ref.schema/default/src/main/java/io/quicktype/TopLevel.java
@@ -0,0 +1,24 @@
+package io.quicktype;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class TopLevel {
+    private String name;
+    private String surname;
+
+    /**
+     * name description
+     */
+    @JsonProperty("name")
+    public String getName() { return name; }
+    @JsonProperty("name")
+    public void setName(String value) { this.name = value; }
+
+    /**
+     * surname description
+     */
+    @JsonProperty("surname")
+    public String getSurname() { return surname; }
+    @JsonProperty("surname")
+    public void setSurname(String value) { this.surname = value; }
+}
diff --git a/base/schema-java-datetime-legacy/test/inputs/schema/list.schema/default/src/main/java/io/quicktype/TopLevel.java b/head/schema-java-datetime-legacy/test/inputs/schema/list.schema/default/src/main/java/io/quicktype/TopLevel.java
index 02273f5..a39226e 100644
--- a/base/schema-java-datetime-legacy/test/inputs/schema/list.schema/default/src/main/java/io/quicktype/TopLevel.java
+++ b/head/schema-java-datetime-legacy/test/inputs/schema/list.schema/default/src/main/java/io/quicktype/TopLevel.java
@@ -8,6 +8,9 @@ import com.fasterxml.jackson.annotation.*;
 public class TopLevel {
     private TopLevel next;
 
+    /**
+     * A recursive class type
+     */
     @JsonProperty("next")
     public TopLevel getNext() { return next; }
     @JsonProperty("next")
diff --git a/base/schema-java-datetime-legacy/test/inputs/schema/ref-remote.schema/default/src/main/java/io/quicktype/TopLevel.java b/head/schema-java-datetime-legacy/test/inputs/schema/ref-remote.schema/default/src/main/java/io/quicktype/TopLevel.java
index 02273f5..a39226e 100644
--- a/base/schema-java-datetime-legacy/test/inputs/schema/ref-remote.schema/default/src/main/java/io/quicktype/TopLevel.java
+++ b/head/schema-java-datetime-legacy/test/inputs/schema/ref-remote.schema/default/src/main/java/io/quicktype/TopLevel.java
@@ -8,6 +8,9 @@ import com.fasterxml.jackson.annotation.*;
 public class TopLevel {
     private TopLevel next;
 
+    /**
+     * A recursive class type
+     */
     @JsonProperty("next")
     public TopLevel getNext() { return next; }
     @JsonProperty("next")
diff --git a/base/schema-java-datetime-legacy/test/inputs/schema/simple-ref.schema/default/src/main/java/io/quicktype/TopLevel.java b/head/schema-java-datetime-legacy/test/inputs/schema/simple-ref.schema/default/src/main/java/io/quicktype/TopLevel.java
index 02273f5..a39226e 100644
--- a/base/schema-java-datetime-legacy/test/inputs/schema/simple-ref.schema/default/src/main/java/io/quicktype/TopLevel.java
+++ b/head/schema-java-datetime-legacy/test/inputs/schema/simple-ref.schema/default/src/main/java/io/quicktype/TopLevel.java
@@ -8,6 +8,9 @@ import com.fasterxml.jackson.annotation.*;
 public class TopLevel {
     private TopLevel next;
 
+    /**
+     * A recursive class type
+     */
     @JsonProperty("next")
     public TopLevel getNext() { return next; }
     @JsonProperty("next")
diff --git a/head/schema-java-lombok/test/inputs/schema/description-ref.schema/default/src/main/java/io/quicktype/Converter.java b/head/schema-java-lombok/test/inputs/schema/description-ref.schema/default/src/main/java/io/quicktype/Converter.java
new file mode 100644
index 0000000..a8eb236
--- /dev/null
+++ b/head/schema-java-lombok/test/inputs/schema/description-ref.schema/default/src/main/java/io/quicktype/Converter.java
@@ -0,0 +1,101 @@
+// To use this code, add the following Maven dependency to your project:
+//
+//
+//     com.fasterxml.jackson.core     : jackson-databind          : 2.9.0
+//     com.fasterxml.jackson.datatype : jackson-datatype-jsr310   : 2.9.0
+//
+// Import this package:
+//
+//     import io.quicktype.Converter;
+//
+// Then you can deserialize a JSON string with
+//
+//     TopLevel data = Converter.fromJsonString(jsonString);
+
+package io.quicktype;
+
+import java.io.IOException;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import java.util.*;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.temporal.ChronoField;
+
+public class Converter {
+    // Date-time helpers
+
+    private static final DateTimeFormatter DATE_TIME_FORMATTER = new DateTimeFormatterBuilder()
+            .appendOptional(DateTimeFormatter.ISO_DATE_TIME)
+            .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+            .appendOptional(DateTimeFormatter.ISO_INSTANT)
+            .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX"))
+            .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX"))
+            .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
+            .toFormatter()
+            .withZone(ZoneOffset.UTC);
+
+    public static OffsetDateTime parseDateTimeString(String str) {
+        return ZonedDateTime.from(Converter.DATE_TIME_FORMATTER.parse(str)).toOffsetDateTime();
+    }
+
+    private static final DateTimeFormatter TIME_FORMATTER = new DateTimeFormatterBuilder()
+            .appendOptional(DateTimeFormatter.ISO_TIME)
+            .appendOptional(DateTimeFormatter.ISO_OFFSET_TIME)
+            .parseDefaulting(ChronoField.YEAR, 2020)
+            .parseDefaulting(ChronoField.MONTH_OF_YEAR, 1)
+            .parseDefaulting(ChronoField.DAY_OF_MONTH, 1)
+            .toFormatter()
+            .withZone(ZoneOffset.UTC);
+
+    public static OffsetTime parseTimeString(String str) {
+        return ZonedDateTime.from(Converter.TIME_FORMATTER.parse(str)).toOffsetDateTime().toOffsetTime();
+    }
+    // Serialize/deserialize helpers
+
+    public static TopLevel fromJsonString(String json) throws IOException {
+        return getObjectReader().readValue(json);
+    }
+
+    public static String toJsonString(TopLevel obj) throws JsonProcessingException {
+        return getObjectWriter().writeValueAsString(obj);
+    }
+
+    private static ObjectReader reader;
+    private static ObjectWriter writer;
+
+    private static void instantiateMapper() {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.findAndRegisterModules();
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+        SimpleModule module = new SimpleModule();
+        module.addDeserializer(OffsetDateTime.class, new JsonDeserializer<OffsetDateTime>() {
+            @Override
+            public OffsetDateTime deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
+                String value = jsonParser.getText();
+                return Converter.parseDateTimeString(value);
+            }
+        });
+        mapper.registerModule(module);
+        reader = mapper.readerFor(TopLevel.class);
+        writer = mapper.writerFor(TopLevel.class);
+    }
+
+    private static ObjectReader getObjectReader() {
+        if (reader == null) instantiateMapper();
+        return reader;
+    }
+
+    private static ObjectWriter getObjectWriter() {
+        if (writer == null) instantiateMapper();
+        return writer;
+    }
+}
diff --git a/head/schema-java-lombok/test/inputs/schema/description-ref.schema/default/src/main/java/io/quicktype/TopLevel.java b/head/schema-java-lombok/test/inputs/schema/description-ref.schema/default/src/main/java/io/quicktype/TopLevel.java
new file mode 100644
index 0000000..14f8670
--- /dev/null
+++ b/head/schema-java-lombok/test/inputs/schema/description-ref.schema/default/src/main/java/io/quicktype/TopLevel.java
@@ -0,0 +1,24 @@
+package io.quicktype;
+
+import com.fasterxml.jackson.annotation.*;
+
+public class TopLevel {
+    private String name;
+    private String surname;
+
+    /**
+     * name description
+     */
+    @JsonProperty("name")
+    public String getName() { return name; }
+    @JsonProperty("name")
+    public void setName(String value) { this.name = value; }
+
+    /**
+     * surname description
+     */
+    @JsonProperty("surname")
+    public String getSurname() { return surname; }
+    @JsonProperty("surname")
+    public void setSurname(String value) { this.surname = value; }
+}
diff --git a/base/schema-java-lombok/test/inputs/schema/list.schema/default/src/main/java/io/quicktype/TopLevel.java b/head/schema-java-lombok/test/inputs/schema/list.schema/default/src/main/java/io/quicktype/TopLevel.java
index 02273f5..a39226e 100644
--- a/base/schema-java-lombok/test/inputs/schema/list.schema/default/src/main/java/io/quicktype/TopLevel.java
+++ b/head/schema-java-lombok/test/inputs/schema/list.schema/default/src/main/java/io/quicktype/TopLevel.java
@@ -8,6 +8,9 @@ import com.fasterxml.jackson.annotation.*;
 public class TopLevel {
     private TopLevel next;
 
+    /**
+     * A recursive class type
+     */
     @JsonProperty("next")
     public TopLevel getNext() { return next; }
     @JsonProperty("next")
diff --git a/base/schema-java-lombok/test/inputs/schema/ref-remote.schema/default/src/main/java/io/quicktype/TopLevel.java b/head/schema-java-lombok/test/inputs/schema/ref-remote.schema/default/src/main/java/io/quicktype/TopLevel.java
index 02273f5..a39226e 100644
--- a/base/schema-java-lombok/test/inputs/schema/ref-remote.schema/default/src/main/java/io/quicktype/TopLevel.java
+++ b/head/schema-java-lombok/test/inputs/schema/ref-remote.schema/default/src/main/java/io/quicktype/TopLevel.java
@@ -8,6 +8,9 @@ import com.fasterxml.jackson.annotation.*;
 public class TopLevel {
     private TopLevel next;
 
+    /**
+     * A recursive class type
+     */
     @JsonProperty("next")
     public TopLevel getNext() { return next; }
     @JsonProperty("next")
diff --git a/base/schema-java-lombok/test/inputs/schema/simple-ref.schema/default/src/main/java/io/quicktype/TopLevel.java b/head/schema-java-lombok/test/inputs/schema/simple-ref.schema/default/src/main/java/io/quicktype/TopLevel.java
index 02273f5..a39226e 100644
--- a/base/schema-java-lombok/test/inputs/schema/simple-ref.schema/default/src/main/java/io/quicktype/TopLevel.java
+++ b/head/schema-java-lombok/test/inputs/schema/simple-ref.schema/default/src/main/java/io/quicktype/TopLevel.java
@@ -8,6 +8,9 @@ import com.fasterxml.jackson.annotation.*;
 public class TopLevel {
     private TopLevel next;
 
+    /**
+     * A recursive class type
+     */
     @JsonProperty("next")
     public TopLevel getNext() { return next; }
     @JsonProperty("next")
diff --git a/head/schema-javascript/test/inputs/schema/description-ref.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/description-ref.schema/default/TopLevel.js
new file mode 100644
index 0000000..0d4d8b8
--- /dev/null
+++ b/head/schema-javascript/test/inputs/schema/description-ref.schema/default/TopLevel.js
@@ -0,0 +1,183 @@
+// To parse this data:
+//
+//   const Convert = require("./TopLevel");
+//
+//   const topLevel = Convert.toTopLevel(json);
+//
+// These functions will throw an error if the JSON doesn't
+// match the expected interface, even if the JSON is valid.
+
+// Converts JSON strings to/from your types
+// and asserts the results of JSON.parse at runtime
+function toTopLevel(json) {
+    return cast(JSON.parse(json), r("TopLevel"));
+}
+
+function topLevelToJson(value) {
+    return JSON.stringify(uncast(value, r("TopLevel")), null, 2);
+}
+
+function invalidValue(typ, val, key, parent = '') {
+    const prettyTyp = prettyTypeName(typ);
+    const parentText = parent ? ` on ${parent}` : '';
+    const keyText = key ? ` for key "${key}"` : '';
+    throw Error(`Invalid value${keyText}${parentText}. Expected ${prettyTyp} but got ${JSON.stringify(val)}`);
+}
+
+function prettyTypeName(typ) {
+    if (Array.isArray(typ)) {
+        if (typ.length === 2 && typ[0] === undefined) {
+            return `an optional ${prettyTypeName(typ[1])}`;
+        } else {
+            return `one of [${typ.map(a => { return prettyTypeName(a); }).join(", ")}]`;
+        }
+    } else if (typeof typ === "object" && typ.literal !== undefined) {
+        return typ.literal;
+    } else {
+        return typeof typ;
+    }
+}
+
+function jsonToJSProps(typ) {
+    if (typ.jsonToJS === undefined) {
+        const map = {};
+        typ.props.forEach((p) => map[p.json] = { key: p.js, typ: p.typ });
+        typ.jsonToJS = map;
+    }
+    return typ.jsonToJS;
+}
+
+function jsToJSONProps(typ) {
+    if (typ.jsToJSON === undefined) {
+        const map = {};
+        typ.props.forEach((p) => map[p.js] = { key: p.json, typ: p.typ });
+        typ.jsToJSON = map;
+    }
+    return typ.jsToJSON;
+}
+
+function transform(val, typ, getProps, key = '', parent = '') {
+    function transformPrimitive(typ, val) {
+        if (typeof typ === typeof val) return val;
+        return invalidValue(typ, val, key, parent);
+    }
+
+    function transformUnion(typs, val) {
+        // val must validate against one typ in typs
+        const l = typs.length;
+        for (let i = 0; i < l; i++) {
+            const typ = typs[i];
+            try {
+                return transform(val, typ, getProps);
+            } catch (_) {}
+        }
+        return invalidValue(typs, val, key, parent);
+    }
+
+    function transformEnum(cases, val) {
+        if (cases.indexOf(val) !== -1) return val;
+        return invalidValue(cases.map(a => { return l(a); }), val, key, parent);
+    }
+
+    function transformArray(typ, val) {
+        // val must be an array with no invalid elements
+        if (!Array.isArray(val)) return invalidValue(l("array"), val, key, parent);
+        return val.map(el => transform(el, typ, getProps));
+    }
+
+    function transformDate(val) {
+        if (val === null) {
+            return null;
+        }
+        const d = new Date(val);
+        if (isNaN(d.valueOf())) {
+            return invalidValue(l("Date"), val, key, parent);
+        }
+        return d;
+    }
+
+    function transformObject(props, additional, val) {
+        if (val === null || typeof val !== "object" || Array.isArray(val)) {
+            return invalidValue(l(ref || "object"), val, key, parent);
+        }
+        const result = {};
+        Object.getOwnPropertyNames(props).forEach(key => {
+            const prop = props[key];
+            const v = Object.prototype.hasOwnProperty.call(val, key) ? val[key] : undefined;
+            result[prop.key] = transform(v, prop.typ, getProps, key, ref);
+        });
+        Object.getOwnPropertyNames(val).forEach(key => {
+            if (!Object.prototype.hasOwnProperty.call(props, key)) {
+                result[key] = transform(val[key], additional, getProps, key, ref);
+            }
+        });
+        return result;
+    }
+
+    if (typ === "any") return val;
+    if (typ === null) {
+        if (val === null) return val;
+        return invalidValue(typ, val, key, parent);
+    }
+    if (typ === false) return invalidValue(typ, val, key, parent);
+    let ref = undefined;
+    while (typeof typ === "object" && typ.ref !== undefined) {
+        ref = typ.ref;
+        typ = typeMap[typ.ref];
+    }
+    if (Array.isArray(typ)) return transformEnum(typ, val);
+    if (typeof typ === "object") {
+        return typ.hasOwnProperty("unionMembers") ? transformUnion(typ.unionMembers, val)
+            : typ.hasOwnProperty("arrayItems")    ? transformArray(typ.arrayItems, val)
+            : typ.hasOwnProperty("props")         ? transformObject(getProps(typ), typ.additional, val)
+            : invalidValue(typ, val, key, parent);
+    }
+    // Numbers can be parsed by Date but shouldn't be.
+    if (typ === Date && typeof val !== "number") return transformDate(val);
+    return transformPrimitive(typ, val);
+}
+
+function cast(val, typ) {
+    return transform(val, typ, jsonToJSProps);
+}
+
+function uncast(val, typ) {
+    return transform(val, typ, jsToJSONProps);
+}
+
+function l(typ) {
+    return { literal: typ };
+}
+
+function a(typ) {
+    return { arrayItems: typ };
+}
+
+function u(...typs) {
+    return { unionMembers: typs };
+}
+
+function o(props, additional) {
+    return { props, additional };
+}
+
+function m(additional) {
+    const props = [];
+    return { props, additional };
+}
+
+function r(name) {
+    return { ref: name };
+}
+
+const typeMap = {
+    "TopLevel": o([
+        { json: "name", js: "name", typ: "" },
+        { json: "surname", js: "surname", typ: "" },
+    ], "any"),
+};
+
+module.exports = {
+    "topLevelToJson": topLevelToJson,
+    "toTopLevel": toTopLevel,
+};
diff --git a/head/schema-kotlin/test/inputs/schema/description-ref.schema/default/TopLevel.kt b/head/schema-kotlin/test/inputs/schema/description-ref.schema/default/TopLevel.kt
new file mode 100644
index 0000000..5428c67
--- /dev/null
+++ b/head/schema-kotlin/test/inputs/schema/description-ref.schema/default/TopLevel.kt
@@ -0,0 +1,27 @@
+// To parse the JSON, install Klaxon and do:
+//
+//   val topLevel = TopLevel.fromJson(jsonString)
+
+package quicktype
+
+import com.beust.klaxon.*
+
+private val klaxon = Klaxon()
+
+data class TopLevel (
+    /**
+     * name description
+     */
+    val name: String,
+
+    /**
+     * surname description
+     */
+    val surname: String
+) {
+    public fun toJson() = klaxon.toJsonString(this)
+
+    companion object {
+        public fun fromJson(json: String) = klaxon.parse<TopLevel>(json)
+    }
+}
diff --git a/base/schema-kotlin/test/inputs/schema/list.schema/default/TopLevel.kt b/head/schema-kotlin/test/inputs/schema/list.schema/default/TopLevel.kt
index 45b9b95..f561374 100644
--- a/base/schema-kotlin/test/inputs/schema/list.schema/default/TopLevel.kt
+++ b/head/schema-kotlin/test/inputs/schema/list.schema/default/TopLevel.kt
@@ -12,6 +12,9 @@ private val klaxon = Klaxon()
  * A recursive class type
  */
 data class TopLevel (
+    /**
+     * A recursive class type
+     */
     val next: TopLevel? = null
 ) {
     public fun toJson() = klaxon.toJsonString(this)
diff --git a/base/schema-kotlin/test/inputs/schema/ref-remote.schema/default/TopLevel.kt b/head/schema-kotlin/test/inputs/schema/ref-remote.schema/default/TopLevel.kt
index 45b9b95..f561374 100644
--- a/base/schema-kotlin/test/inputs/schema/ref-remote.schema/default/TopLevel.kt
+++ b/head/schema-kotlin/test/inputs/schema/ref-remote.schema/default/TopLevel.kt
@@ -12,6 +12,9 @@ private val klaxon = Klaxon()
  * A recursive class type
  */
 data class TopLevel (
+    /**
+     * A recursive class type
+     */
     val next: TopLevel? = null
 ) {
     public fun toJson() = klaxon.toJsonString(this)
diff --git a/base/schema-kotlin/test/inputs/schema/simple-ref.schema/default/TopLevel.kt b/head/schema-kotlin/test/inputs/schema/simple-ref.schema/default/TopLevel.kt
index 45b9b95..f561374 100644
--- a/base/schema-kotlin/test/inputs/schema/simple-ref.schema/default/TopLevel.kt
+++ b/head/schema-kotlin/test/inputs/schema/simple-ref.schema/default/TopLevel.kt
@@ -12,6 +12,9 @@ private val klaxon = Klaxon()
  * A recursive class type
  */
 data class TopLevel (
+    /**
+     * A recursive class type
+     */
     val next: TopLevel? = null
 ) {
     public fun toJson() = klaxon.toJsonString(this)
diff --git a/head/schema-kotlin-jackson/test/inputs/schema/description-ref.schema/default/TopLevel.kt b/head/schema-kotlin-jackson/test/inputs/schema/description-ref.schema/default/TopLevel.kt
new file mode 100644
index 0000000..b06a11e
--- /dev/null
+++ b/head/schema-kotlin-jackson/test/inputs/schema/description-ref.schema/default/TopLevel.kt
@@ -0,0 +1,39 @@
+// To parse the JSON, install jackson-module-kotlin and do:
+//
+//   val topLevel = TopLevel.fromJson(jsonString)
+
+package quicktype
+
+import com.fasterxml.jackson.annotation.*
+import com.fasterxml.jackson.core.*
+import com.fasterxml.jackson.databind.*
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer
+import com.fasterxml.jackson.databind.module.SimpleModule
+import com.fasterxml.jackson.databind.node.*
+import com.fasterxml.jackson.databind.ser.std.StdSerializer
+import com.fasterxml.jackson.module.kotlin.*
+
+val mapper = jacksonObjectMapper().apply {
+    propertyNamingStrategy = PropertyNamingStrategy.LOWER_CAMEL_CASE
+    setSerializationInclusion(JsonInclude.Include.NON_NULL)
+}
+
+data class TopLevel (
+    /**
+     * name description
+     */
+    @get:JsonProperty(required=true)@field:JsonProperty(required=true)
+    val name: String,
+
+    /**
+     * surname description
+     */
+    @get:JsonProperty(required=true)@field:JsonProperty(required=true)
+    val surname: String
+) {
+    fun toJson() = mapper.writeValueAsString(this)
+
+    companion object {
+        fun fromJson(json: String) = mapper.readValue<TopLevel>(json)
+    }
+}
diff --git a/base/schema-kotlin-jackson/test/inputs/schema/list.schema/default/TopLevel.kt b/head/schema-kotlin-jackson/test/inputs/schema/list.schema/default/TopLevel.kt
index 3e5ecf4..97c14aa 100644
--- a/base/schema-kotlin-jackson/test/inputs/schema/list.schema/default/TopLevel.kt
+++ b/head/schema-kotlin-jackson/test/inputs/schema/list.schema/default/TopLevel.kt
@@ -22,6 +22,9 @@ val mapper = jacksonObjectMapper().apply {
  * A recursive class type
  */
 data class TopLevel (
+    /**
+     * A recursive class type
+     */
     val next: TopLevel? = null
 ) {
     fun toJson() = mapper.writeValueAsString(this)
diff --git a/base/schema-kotlin-jackson/test/inputs/schema/ref-remote.schema/default/TopLevel.kt b/head/schema-kotlin-jackson/test/inputs/schema/ref-remote.schema/default/TopLevel.kt
index 3e5ecf4..97c14aa 100644
--- a/base/schema-kotlin-jackson/test/inputs/schema/ref-remote.schema/default/TopLevel.kt
+++ b/head/schema-kotlin-jackson/test/inputs/schema/ref-remote.schema/default/TopLevel.kt
@@ -22,6 +22,9 @@ val mapper = jacksonObjectMapper().apply {
  * A recursive class type
  */
 data class TopLevel (
+    /**
+     * A recursive class type
+     */
     val next: TopLevel? = null
 ) {
     fun toJson() = mapper.writeValueAsString(this)
diff --git a/base/schema-kotlin-jackson/test/inputs/schema/simple-ref.schema/default/TopLevel.kt b/head/schema-kotlin-jackson/test/inputs/schema/simple-ref.schema/default/TopLevel.kt
index 3e5ecf4..97c14aa 100644
--- a/base/schema-kotlin-jackson/test/inputs/schema/simple-ref.schema/default/TopLevel.kt
+++ b/head/schema-kotlin-jackson/test/inputs/schema/simple-ref.schema/default/TopLevel.kt
@@ -22,6 +22,9 @@ val mapper = jacksonObjectMapper().apply {
  * A recursive class type
  */
 data class TopLevel (
+    /**
+     * A recursive class type
+     */
     val next: TopLevel? = null
 ) {
     fun toJson() = mapper.writeValueAsString(this)
diff --git a/head/schema-kotlinx/test/inputs/schema/description-ref.schema/default/TopLevel.kt b/head/schema-kotlinx/test/inputs/schema/description-ref.schema/default/TopLevel.kt
new file mode 100644
index 0000000..eb726e4
--- /dev/null
+++ b/head/schema-kotlinx/test/inputs/schema/description-ref.schema/default/TopLevel.kt
@@ -0,0 +1,24 @@
+// To parse the JSON, install kotlin's serialization plugin and do:
+//
+// val json     = Json { allowStructuredMapKeys = true }
+// val topLevel = json.parse(TopLevel.serializer(), jsonString)
+
+package quicktype
+
+import kotlinx.serialization.*
+import kotlinx.serialization.json.*
+import kotlinx.serialization.descriptors.*
+import kotlinx.serialization.encoding.*
+
+@Serializable
+data class TopLevel (
+    /**
+     * name description
+     */
+    val name: String,
+
+    /**
+     * surname description
+     */
+    val surname: String
+)
diff --git a/base/schema-kotlinx/test/inputs/schema/list.schema/default/TopLevel.kt b/head/schema-kotlinx/test/inputs/schema/list.schema/default/TopLevel.kt
index e8ff828..8a0bd48 100644
--- a/base/schema-kotlinx/test/inputs/schema/list.schema/default/TopLevel.kt
+++ b/head/schema-kotlinx/test/inputs/schema/list.schema/default/TopLevel.kt
@@ -15,5 +15,8 @@ import kotlinx.serialization.encoding.*
  */
 @Serializable
 data class TopLevel (
+    /**
+     * A recursive class type
+     */
     val next: TopLevel? = null
 )
diff --git a/base/schema-kotlinx/test/inputs/schema/ref-remote.schema/default/TopLevel.kt b/head/schema-kotlinx/test/inputs/schema/ref-remote.schema/default/TopLevel.kt
index e8ff828..8a0bd48 100644
--- a/base/schema-kotlinx/test/inputs/schema/ref-remote.schema/default/TopLevel.kt
+++ b/head/schema-kotlinx/test/inputs/schema/ref-remote.schema/default/TopLevel.kt
@@ -15,5 +15,8 @@ import kotlinx.serialization.encoding.*
  */
 @Serializable
 data class TopLevel (
+    /**
+     * A recursive class type
+     */
     val next: TopLevel? = null
 )
diff --git a/base/schema-kotlinx/test/inputs/schema/simple-ref.schema/default/TopLevel.kt b/head/schema-kotlinx/test/inputs/schema/simple-ref.schema/default/TopLevel.kt
index e8ff828..8a0bd48 100644
--- a/base/schema-kotlinx/test/inputs/schema/simple-ref.schema/default/TopLevel.kt
+++ b/head/schema-kotlinx/test/inputs/schema/simple-ref.schema/default/TopLevel.kt
@@ -15,5 +15,8 @@ import kotlinx.serialization.encoding.*
  */
 @Serializable
 data class TopLevel (
+    /**
+     * A recursive class type
+     */
     val next: TopLevel? = null
 )
diff --git a/head/schema-php/test/inputs/schema/description-ref.schema/default/TopLevel.php b/head/schema-php/test/inputs/schema/description-ref.schema/default/TopLevel.php
new file mode 100644
index 0000000..827a1bd
--- /dev/null
+++ b/head/schema-php/test/inputs/schema/description-ref.schema/default/TopLevel.php
@@ -0,0 +1,174 @@
+<?php
+declare(strict_types=1);
+
+// This is an autogenerated file:TopLevel
+
+class TopLevel {
+    private string $name; // json:name Required
+    private string $surname; // json:surname Required
+
+    /**
+     * @param string $name
+     * @param string $surname
+     */
+    public function __construct(string $name, string $surname) {
+        $this->name = $name;
+        $this->surname = $surname;
+    }
+
+    /**
+     * name description
+     *
+     * @param string $value
+     * @throws Exception
+     * @return string
+     */
+    public static function fromName(string $value): string {
+        return $value; /*string*/
+    }
+
+    /**
+     * name description
+     *
+     * @throws Exception
+     * @return string
+     */
+    public function toName(): string {
+        if (TopLevel::validateName($this->name))  {
+            return $this->name; /*string*/
+        }
+        throw new Exception('never get to this TopLevel::name');
+    }
+
+    /**
+     * name description
+     *
+     * @param string
+     * @return bool
+     * @throws Exception
+     */
+    public static function validateName(string $value): bool {
+        return true;
+    }
+
+    /**
+     * name description
+     *
+     * @throws Exception
+     * @return string
+     */
+    public function getName(): string {
+        if (TopLevel::validateName($this->name))  {
+            return $this->name;
+        }
+        throw new Exception('never get to getName TopLevel::name');
+    }
+
+    /**
+     * name description
+     *
+     * @return string
+     */
+    public static function sampleName(): string {
+        return 'TopLevel::name::31'; /*31:name*/
+    }
+
+    /**
+     * surname description
+     *
+     * @param string $value
+     * @throws Exception
+     * @return string
+     */
+    public static function fromSurname(string $value): string {
+        return $value; /*string*/
+    }
+
+    /**
+     * surname description
+     *
+     * @throws Exception
+     * @return string
+     */
+    public function toSurname(): string {
+        if (TopLevel::validateSurname($this->surname))  {
+            return $this->surname; /*string*/
+        }
+        throw new Exception('never get to this TopLevel::surname');
+    }
+
+    /**
+     * surname description
+     *
+     * @param string
+     * @return bool
+     * @throws Exception
+     */
+    public static function validateSurname(string $value): bool {
+        return true;
+    }
+
+    /**
+     * surname description
+     *
+     * @throws Exception
+     * @return string
+     */
+    public function getSurname(): string {
+        if (TopLevel::validateSurname($this->surname))  {
+            return $this->surname;
+        }
+        throw new Exception('never get to getSurname TopLevel::surname');
+    }
+
+    /**
+     * surname description
+     *
+     * @return string
+     */
+    public static function sampleSurname(): string {
+        return 'TopLevel::surname::32'; /*32:surname*/
+    }
+
+    /**
+     * @throws Exception
+     * @return bool
+     */
+    public function validate(): bool {
+        return TopLevel::validateName($this->name)
+        || TopLevel::validateSurname($this->surname);
+    }
+
+    /**
+     * @return stdClass
+     * @throws Exception
+     */
+    public function to(): stdClass  {
+        $out = new stdClass();
+        $out->{'name'} = $this->toName();
+        $out->{'surname'} = $this->toSurname();
+        return $out;
+    }
+
+    /**
+     * @param stdClass $obj
+     * @return TopLevel
+     * @throws Exception
+     */
+    public static function from(stdClass $obj): TopLevel {
+        return new TopLevel(
+         TopLevel::fromName($obj->{'name'})
+        ,TopLevel::fromSurname($obj->{'surname'})
+        );
+    }
+
+    /**
+     * @return TopLevel
+     */
+    public static function sample(): TopLevel {
+        return new TopLevel(
+         TopLevel::sampleName()
+        ,TopLevel::sampleSurname()
+        );
+    }
+}
diff --git a/base/schema-php/test/inputs/schema/list.schema/default/TopLevel.php b/head/schema-php/test/inputs/schema/list.schema/default/TopLevel.php
index 83e200f..456d782 100644
--- a/base/schema-php/test/inputs/schema/list.schema/default/TopLevel.php
+++ b/head/schema-php/test/inputs/schema/list.schema/default/TopLevel.php
@@ -14,6 +14,8 @@ class TopLevel {
     }
 
     /**
+     * A recursive class type
+     *
      * @param ?stdClass $value
      * @throws Exception
      * @return ?TopLevel
@@ -27,6 +29,8 @@ class TopLevel {
     }
 
     /**
+     * A recursive class type
+     *
      * @throws Exception
      * @return ?stdClass
      */
@@ -42,6 +46,8 @@ class TopLevel {
     }
 
     /**
+     * A recursive class type
+     *
      * @param TopLevel|null
      * @return bool
      * @throws Exception
@@ -54,6 +60,8 @@ class TopLevel {
     }
 
     /**
+     * A recursive class type
+     *
      * @throws Exception
      * @return ?TopLevel
      */
@@ -65,6 +73,8 @@ class TopLevel {
     }
 
     /**
+     * A recursive class type
+     *
      * @return ?TopLevel
      */
     public static function sampleNext(): ?TopLevel {
diff --git a/base/schema-php/test/inputs/schema/ref-remote.schema/default/TopLevel.php b/head/schema-php/test/inputs/schema/ref-remote.schema/default/TopLevel.php
index 83e200f..456d782 100644
--- a/base/schema-php/test/inputs/schema/ref-remote.schema/default/TopLevel.php
+++ b/head/schema-php/test/inputs/schema/ref-remote.schema/default/TopLevel.php
@@ -14,6 +14,8 @@ class TopLevel {
     }
 
     /**
+     * A recursive class type
+     *
      * @param ?stdClass $value
      * @throws Exception
      * @return ?TopLevel
@@ -27,6 +29,8 @@ class TopLevel {
     }
 
     /**
+     * A recursive class type
+     *
      * @throws Exception
      * @return ?stdClass
      */
@@ -42,6 +46,8 @@ class TopLevel {
     }
 
     /**
+     * A recursive class type
+     *
      * @param TopLevel|null
      * @return bool
      * @throws Exception
@@ -54,6 +60,8 @@ class TopLevel {
     }
 
     /**
+     * A recursive class type
+     *
      * @throws Exception
      * @return ?TopLevel
      */
@@ -65,6 +73,8 @@ class TopLevel {
     }
 
     /**
+     * A recursive class type
+     *
      * @return ?TopLevel
      */
     public static function sampleNext(): ?TopLevel {
diff --git a/base/schema-php/test/inputs/schema/simple-ref.schema/default/TopLevel.php b/head/schema-php/test/inputs/schema/simple-ref.schema/default/TopLevel.php
index 83e200f..456d782 100644
--- a/base/schema-php/test/inputs/schema/simple-ref.schema/default/TopLevel.php
+++ b/head/schema-php/test/inputs/schema/simple-ref.schema/default/TopLevel.php
@@ -14,6 +14,8 @@ class TopLevel {
     }
 
     /**
+     * A recursive class type
+     *
      * @param ?stdClass $value
      * @throws Exception
      * @return ?TopLevel
@@ -27,6 +29,8 @@ class TopLevel {
     }
 
     /**
+     * A recursive class type
+     *
      * @throws Exception
      * @return ?stdClass
      */
@@ -42,6 +46,8 @@ class TopLevel {
     }
 
     /**
+     * A recursive class type
+     *
      * @param TopLevel|null
      * @return bool
      * @throws Exception
@@ -54,6 +60,8 @@ class TopLevel {
     }
 
     /**
+     * A recursive class type
+     *
      * @throws Exception
      * @return ?TopLevel
      */
@@ -65,6 +73,8 @@ class TopLevel {
     }
 
     /**
+     * A recursive class type
+     *
      * @return ?TopLevel
      */
     public static function sampleNext(): ?TopLevel {
diff --git a/head/schema-pike/test/inputs/schema/description-ref.schema/default/TopLevel.pmod b/head/schema-pike/test/inputs/schema/description-ref.schema/default/TopLevel.pmod
new file mode 100644
index 0000000..9846839
--- /dev/null
+++ b/head/schema-pike/test/inputs/schema/description-ref.schema/default/TopLevel.pmod
@@ -0,0 +1,36 @@
+// This source has been automatically generated by quicktype.
+// ( https://github.com/quicktype/quicktype )
+//
+// To use this code, simply import it into your project as a Pike module.
+// To JSON-encode your object, you can pass it to `Standards.JSON.encode`
+// or call `encode_json` on it.
+//
+// To decode a JSON string, first pass it to `Standards.JSON.decode`,
+// and then pass the result to `<YourClass>_from_JSON`.
+// It will return an instance of <YourClass>.
+// Bear in mind that these functions have unexpected behavior,
+// and will likely throw an error, if the JSON string does not
+// match the expected interface, even if the JSON itself is valid.
+
+class TopLevel {
+    string name;    // json: "name"
+    string surname; // json: "surname"
+
+    string encode_json() {
+        mapping(string:mixed) json = ([
+            "name" : name,
+            "surname" : surname,
+        ]);
+
+        return Standards.JSON.encode(json);
+    }
+}
+
+TopLevel TopLevel_from_JSON(mixed json) {
+    TopLevel retval = TopLevel();
+
+    retval.name = json["name"];
+    retval.surname = json["surname"];
+
+    return retval;
+}
diff --git a/head/schema-python/test/inputs/schema/description-ref.schema/default/quicktype.py b/head/schema-python/test/inputs/schema/description-ref.schema/default/quicktype.py
new file mode 100644
index 0000000..cb23bee
--- /dev/null
+++ b/head/schema-python/test/inputs/schema/description-ref.schema/default/quicktype.py
@@ -0,0 +1,45 @@
+from dataclasses import dataclass
+from typing import Any, TypeVar, Type, cast
+
+
+T = TypeVar("T")
+
+
+def from_str(x: Any) -> str:
+    assert isinstance(x, str)
+    return x
+
+
+def to_class(c: Type[T], x: Any) -> dict:
+    assert isinstance(x, c)
+    return cast(Any, x).to_dict()
+
+
+@dataclass
+class TopLevel:
+    name: str
+    """name description"""
+
+    surname: str
+    """surname description"""
+
+    @staticmethod
+    def from_dict(obj: Any) -> 'TopLevel':
+        assert isinstance(obj, dict)
+        name = from_str(obj.get("name"))
+        surname = from_str(obj.get("surname"))
+        return TopLevel(name, surname)
+
+    def to_dict(self) -> dict:
+        result: dict = {}
+        result["name"] = from_str(self.name)
+        result["surname"] = from_str(self.surname)
+        return result
+
+
+def top_level_from_dict(s: Any) -> TopLevel:
+    return TopLevel.from_dict(s)
+
+
+def top_level_to_dict(x: TopLevel) -> Any:
+    return to_class(TopLevel, x)
diff --git a/base/schema-python/test/inputs/schema/list.schema/default/quicktype.py b/head/schema-python/test/inputs/schema/list.schema/default/quicktype.py
index 457d930..5982671 100644
--- a/base/schema-python/test/inputs/schema/list.schema/default/quicktype.py
+++ b/head/schema-python/test/inputs/schema/list.schema/default/quicktype.py
@@ -29,6 +29,7 @@ class TopLevel:
     """A recursive class type"""
 
     next: 'TopLevel | None' = None
+    """A recursive class type"""
 
     @staticmethod
     def from_dict(obj: Any) -> 'TopLevel':
diff --git a/base/schema-python/test/inputs/schema/ref-remote.schema/default/quicktype.py b/head/schema-python/test/inputs/schema/ref-remote.schema/default/quicktype.py
index 457d930..5982671 100644
--- a/base/schema-python/test/inputs/schema/ref-remote.schema/default/quicktype.py
+++ b/head/schema-python/test/inputs/schema/ref-remote.schema/default/quicktype.py
@@ -29,6 +29,7 @@ class TopLevel:
     """A recursive class type"""
 
     next: 'TopLevel | None' = None
+    """A recursive class type"""
 
     @staticmethod
     def from_dict(obj: Any) -> 'TopLevel':
diff --git a/base/schema-python/test/inputs/schema/simple-ref.schema/default/quicktype.py b/head/schema-python/test/inputs/schema/simple-ref.schema/default/quicktype.py
index 457d930..5982671 100644
--- a/base/schema-python/test/inputs/schema/simple-ref.schema/default/quicktype.py
+++ b/head/schema-python/test/inputs/schema/simple-ref.schema/default/quicktype.py
@@ -29,6 +29,7 @@ class TopLevel:
     """A recursive class type"""
 
     next: 'TopLevel | None' = None
+    """A recursive class type"""
 
     @staticmethod
     def from_dict(obj: Any) -> 'TopLevel':
diff --git a/head/schema-ruby/test/inputs/schema/description-ref.schema/default/TopLevel.rb b/head/schema-ruby/test/inputs/schema/description-ref.schema/default/TopLevel.rb
new file mode 100644
index 0000000..25c0e30
--- /dev/null
+++ b/head/schema-ruby/test/inputs/schema/description-ref.schema/default/TopLevel.rb
@@ -0,0 +1,52 @@
+# This code may look unusually verbose for Ruby (and it is), but
+# it performs some subtle and complex validation of JSON data.
+#
+# To parse this JSON, add 'dry-struct' and 'dry-types' gems, then do:
+#
+#   top_level = TopLevel.from_json! "{…}"
+#   puts top_level.top_level_name
+#
+# If from_json! succeeds, the value returned matches the schema.
+
+require 'json'
+require 'dry-types'
+require 'dry-struct'
+
+module Types
+  include Dry.Types(default: :nominal)
+
+  Hash   = Strict::Hash
+  String = Strict::String
+end
+
+class TopLevel < Dry::Struct
+
+  # name description
+  attribute :top_level_name, Types::String
+
+  # surname description
+  attribute :surname, Types::String
+
+  def self.from_dynamic!(d)
+    d = Types::Hash[d]
+    new(
+      top_level_name: d.fetch("name"),
+      surname:        d.fetch("surname"),
+    )
+  end
+
+  def self.from_json!(json)
+    from_dynamic!(JSON.parse(json))
+  end
+
+  def to_dynamic
+    {
+      "name"    => top_level_name,
+      "surname" => surname,
+    }
+  end
+
+  def to_json(options = nil)
+    JSON.generate(to_dynamic, options)
+  end
+end
diff --git a/base/schema-ruby/test/inputs/schema/list.schema/default/TopLevel.rb b/head/schema-ruby/test/inputs/schema/list.schema/default/TopLevel.rb
index 2b5e2e4..f26294c 100644
--- a/base/schema-ruby/test/inputs/schema/list.schema/default/TopLevel.rb
+++ b/head/schema-ruby/test/inputs/schema/list.schema/default/TopLevel.rb
@@ -20,6 +20,8 @@ end
 
 # A recursive class type
 class TopLevel < Dry::Struct
+
+  # A recursive class type
   attribute :top_level_next, TopLevel.optional
 
   def self.from_dynamic!(d)
diff --git a/base/schema-ruby/test/inputs/schema/ref-remote.schema/default/TopLevel.rb b/head/schema-ruby/test/inputs/schema/ref-remote.schema/default/TopLevel.rb
index 2b5e2e4..f26294c 100644
--- a/base/schema-ruby/test/inputs/schema/ref-remote.schema/default/TopLevel.rb
+++ b/head/schema-ruby/test/inputs/schema/ref-remote.schema/default/TopLevel.rb
@@ -20,6 +20,8 @@ end
 
 # A recursive class type
 class TopLevel < Dry::Struct
+
+  # A recursive class type
   attribute :top_level_next, TopLevel.optional
 
   def self.from_dynamic!(d)
diff --git a/base/schema-ruby/test/inputs/schema/simple-ref.schema/default/TopLevel.rb b/head/schema-ruby/test/inputs/schema/simple-ref.schema/default/TopLevel.rb
index 2b5e2e4..f26294c 100644
--- a/base/schema-ruby/test/inputs/schema/simple-ref.schema/default/TopLevel.rb
+++ b/head/schema-ruby/test/inputs/schema/simple-ref.schema/default/TopLevel.rb
@@ -20,6 +20,8 @@ end
 
 # A recursive class type
 class TopLevel < Dry::Struct
+
+  # A recursive class type
   attribute :top_level_next, TopLevel.optional
 
   def self.from_dynamic!(d)
diff --git a/head/schema-rust/test/inputs/schema/description-ref.schema/default/module_under_test.rs b/head/schema-rust/test/inputs/schema/description-ref.schema/default/module_under_test.rs
new file mode 100644
index 0000000..9645f77
--- /dev/null
+++ b/head/schema-rust/test/inputs/schema/description-ref.schema/default/module_under_test.rs
@@ -0,0 +1,23 @@
+// Example code that deserializes and serializes the model.
+// extern crate serde;
+// #[macro_use]
+// extern crate serde_derive;
+// extern crate serde_json;
+//
+// use generated_module::TopLevel;
+//
+// fn main() {
+//     let json = r#"{"answer": 42}"#;
+//     let model: TopLevel = serde_json::from_str(&json).unwrap();
+// }
+
+use serde::{Serialize, Deserialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct TopLevel {
+    /// name description
+    pub name: String,
+
+    /// surname description
+    pub surname: String,
+}
diff --git a/base/schema-rust/test/inputs/schema/list.schema/default/module_under_test.rs b/head/schema-rust/test/inputs/schema/list.schema/default/module_under_test.rs
index d33731c..0ec929c 100644
--- a/base/schema-rust/test/inputs/schema/list.schema/default/module_under_test.rs
+++ b/head/schema-rust/test/inputs/schema/list.schema/default/module_under_test.rs
@@ -16,5 +16,6 @@ use serde::{Serialize, Deserialize};
 /// A recursive class type
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct TopLevel {
+    /// A recursive class type
     pub next: Option<Box<TopLevel>>,
 }
diff --git a/base/schema-rust/test/inputs/schema/ref-remote.schema/default/module_under_test.rs b/head/schema-rust/test/inputs/schema/ref-remote.schema/default/module_under_test.rs
index d33731c..0ec929c 100644
--- a/base/schema-rust/test/inputs/schema/ref-remote.schema/default/module_under_test.rs
+++ b/head/schema-rust/test/inputs/schema/ref-remote.schema/default/module_under_test.rs
@@ -16,5 +16,6 @@ use serde::{Serialize, Deserialize};
 /// A recursive class type
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct TopLevel {
+    /// A recursive class type
     pub next: Option<Box<TopLevel>>,
 }
diff --git a/base/schema-rust/test/inputs/schema/simple-ref.schema/default/module_under_test.rs b/head/schema-rust/test/inputs/schema/simple-ref.schema/default/module_under_test.rs
index d33731c..0ec929c 100644
--- a/base/schema-rust/test/inputs/schema/simple-ref.schema/default/module_under_test.rs
+++ b/head/schema-rust/test/inputs/schema/simple-ref.schema/default/module_under_test.rs
@@ -16,5 +16,6 @@ use serde::{Serialize, Deserialize};
 /// A recursive class type
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct TopLevel {
+    /// A recursive class type
     pub next: Option<Box<TopLevel>>,
 }
diff --git a/head/schema-scala3/test/inputs/schema/description-ref.schema/default/TopLevel.scala b/head/schema-scala3/test/inputs/schema/description-ref.schema/default/TopLevel.scala
new file mode 100644
index 0000000..2e94775
--- /dev/null
+++ b/head/schema-scala3/test/inputs/schema/description-ref.schema/default/TopLevel.scala
@@ -0,0 +1,20 @@
+package quicktype
+
+import io.circe.syntax._
+import io.circe._
+import cats.syntax.functor._
+
+// If a union has a null in, then we'll need this too... 
+type NullValue = None.type
+
+case class TopLevel (
+    /**
+     * name description
+     */
+    val name : String,
+
+    /**
+     * surname description
+     */
+    val surname : String
+) derives Encoder.AsObject, Decoder
diff --git a/base/schema-scala3/test/inputs/schema/list.schema/default/TopLevel.scala b/head/schema-scala3/test/inputs/schema/list.schema/default/TopLevel.scala
index e5ea07f..cdb14d5 100644
--- a/base/schema-scala3/test/inputs/schema/list.schema/default/TopLevel.scala
+++ b/head/schema-scala3/test/inputs/schema/list.schema/default/TopLevel.scala
@@ -11,5 +11,8 @@ type NullValue = None.type
  * A recursive class type
  */
 case class TopLevel (
+    /**
+     * A recursive class type
+     */
     val next : Option[TopLevel] = None
 ) derives Encoder.AsObject, Decoder
diff --git a/base/schema-scala3/test/inputs/schema/ref-remote.schema/default/TopLevel.scala b/head/schema-scala3/test/inputs/schema/ref-remote.schema/default/TopLevel.scala
index e5ea07f..cdb14d5 100644
--- a/base/schema-scala3/test/inputs/schema/ref-remote.schema/default/TopLevel.scala
+++ b/head/schema-scala3/test/inputs/schema/ref-remote.schema/default/TopLevel.scala
@@ -11,5 +11,8 @@ type NullValue = None.type
  * A recursive class type
  */
 case class TopLevel (
+    /**
+     * A recursive class type
+     */
     val next : Option[TopLevel] = None
 ) derives Encoder.AsObject, Decoder
diff --git a/base/schema-scala3/test/inputs/schema/simple-ref.schema/default/TopLevel.scala b/head/schema-scala3/test/inputs/schema/simple-ref.schema/default/TopLevel.scala
index e5ea07f..cdb14d5 100644
--- a/base/schema-scala3/test/inputs/schema/simple-ref.schema/default/TopLevel.scala
+++ b/head/schema-scala3/test/inputs/schema/simple-ref.schema/default/TopLevel.scala
@@ -11,5 +11,8 @@ type NullValue = None.type
  * A recursive class type
  */
 case class TopLevel (
+    /**
+     * A recursive class type
+     */
     val next : Option[TopLevel] = None
 ) derives Encoder.AsObject, Decoder
diff --git a/head/schema-scala3-upickle/test/inputs/schema/description-ref.schema/default/TopLevel.scala b/head/schema-scala3-upickle/test/inputs/schema/description-ref.schema/default/TopLevel.scala
new file mode 100644
index 0000000..5c3e5cd
--- /dev/null
+++ b/head/schema-scala3-upickle/test/inputs/schema/description-ref.schema/default/TopLevel.scala
@@ -0,0 +1,78 @@
+package quicktype
+
+// Custom pickler so that missing keys and JSON nulls both read as None,
+// and None is left out when writing (upickle's default for Option is a
+// JSON array).
+object OptionPickler extends upickle.AttributeTagged:
+    import upickle.default.Writer
+    import upickle.default.Reader
+    override implicit def OptionWriter[T: Writer]: Writer[Option[T]] =
+        implicitly[Writer[T]].comap[Option[T]] {
+            case None => null.asInstanceOf[T]
+            case Some(x) => x
+        }
+
+    override implicit def OptionReader[T: Reader]: Reader[Option[T]] = {
+        new Reader.Delegate[Any, Option[T]](implicitly[Reader[T]].map(Some(_))){
+        override def visitNull(index: Int) = None
+        }
+    }
+end OptionPickler
+
+// If a union has a null in, then we'll need this too...
+type NullValue = None.type
+given OptionPickler.ReadWriter[NullValue] = OptionPickler.readwriter[ujson.Value].bimap[NullValue](
+    _ => ujson.Null,
+    json => if json.isNull then None else throw new upickle.core.Abort("not null")
+)
+
+object JsonExt:
+    val valueReader = OptionPickler.readwriter[ujson.Value]
+
+    // upickle's built-in primitive readers are lenient -- the numeric and
+    // boolean readers accept strings, and the string reader accepts
+    // numbers and booleans -- so untagged unions need strict readers to
+    // pick the right member.
+    val strictString: OptionPickler.Reader[String] = valueReader.map {
+        case ujson.Str(s) => s
+        case json => throw new upickle.core.Abort("expected string, got " + json)
+    }
+    val strictLong: OptionPickler.Reader[Long] = valueReader.map {
+        case ujson.Num(n) if n.isWhole => n.toLong
+        case json => throw new upickle.core.Abort("expected integer, got " + json)
+    }
+    val strictDouble: OptionPickler.Reader[Double] = valueReader.map {
+        case ujson.Num(n) => n
+        case json => throw new upickle.core.Abort("expected number, got " + json)
+    }
+    val strictBoolean: OptionPickler.Reader[Boolean] = valueReader.map {
+        case ujson.Bool(b) => b
+        case json => throw new upickle.core.Abort("expected boolean, got " + json)
+    }
+
+    def badMerge[T](r1: => OptionPickler.Reader[?], rest: OptionPickler.Reader[?]*): OptionPickler.Reader[T] = valueReader.map { json =>
+        var t: T | Null = null
+        val stack       = Vector.newBuilder[Throwable]
+        (r1 +: rest).foreach { reader =>
+            if t == null then
+            try
+                t = OptionPickler.read[T](json, trace = true)(using reader.asInstanceOf[OptionPickler.Reader[T]])
+            catch
+                case exc => stack += exc
+        }
+        if t != null then t.nn else throw new Exception(json.toString(), stack.result().headOption.getOrElse(null))
+    }
+end JsonExt
+
+
+case class TopLevel (
+    /**
+     * name description
+     */
+    val name : String,
+
+    /**
+     * surname description
+     */
+    val surname : String
+) derives OptionPickler.ReadWriter
diff --git a/base/schema-scala3-upickle/test/inputs/schema/list.schema/default/TopLevel.scala b/head/schema-scala3-upickle/test/inputs/schema/list.schema/default/TopLevel.scala
index a0054a1..d60e8cf 100644
--- a/base/schema-scala3-upickle/test/inputs/schema/list.schema/default/TopLevel.scala
+++ b/head/schema-scala3-upickle/test/inputs/schema/list.schema/default/TopLevel.scala
@@ -69,5 +69,8 @@ end JsonExt
  * A recursive class type
  */
 case class TopLevel (
+    /**
+     * A recursive class type
+     */
     val next : Option[TopLevel] = None
 ) derives OptionPickler.ReadWriter
diff --git a/base/schema-scala3-upickle/test/inputs/schema/ref-remote.schema/default/TopLevel.scala b/head/schema-scala3-upickle/test/inputs/schema/ref-remote.schema/default/TopLevel.scala
index a0054a1..d60e8cf 100644
--- a/base/schema-scala3-upickle/test/inputs/schema/ref-remote.schema/default/TopLevel.scala
+++ b/head/schema-scala3-upickle/test/inputs/schema/ref-remote.schema/default/TopLevel.scala
@@ -69,5 +69,8 @@ end JsonExt
  * A recursive class type
  */
 case class TopLevel (
+    /**
+     * A recursive class type
+     */
     val next : Option[TopLevel] = None
 ) derives OptionPickler.ReadWriter
diff --git a/base/schema-scala3-upickle/test/inputs/schema/simple-ref.schema/default/TopLevel.scala b/head/schema-scala3-upickle/test/inputs/schema/simple-ref.schema/default/TopLevel.scala
index a0054a1..d60e8cf 100644
--- a/base/schema-scala3-upickle/test/inputs/schema/simple-ref.schema/default/TopLevel.scala
+++ b/head/schema-scala3-upickle/test/inputs/schema/simple-ref.schema/default/TopLevel.scala
@@ -69,5 +69,8 @@ end JsonExt
  * A recursive class type
  */
 case class TopLevel (
+    /**
+     * A recursive class type
+     */
     val next : Option[TopLevel] = None
 ) derives OptionPickler.ReadWriter
diff --git a/head/schema-schema/test/inputs/schema/description-ref.schema/default/TopLevel.schema b/head/schema-schema/test/inputs/schema/description-ref.schema/default/TopLevel.schema
new file mode 100644
index 0000000..e4edf6f
--- /dev/null
+++ b/head/schema-schema/test/inputs/schema/description-ref.schema/default/TopLevel.schema
@@ -0,0 +1,25 @@
+{
+    "$schema": "http://json-schema.org/draft-06/schema#",
+    "$ref": "#/definitions/TopLevel",
+    "definitions": {
+        "TopLevel": {
+            "type": "object",
+            "additionalProperties": {},
+            "properties": {
+                "name": {
+                    "type": "string",
+                    "description": "name description"
+                },
+                "surname": {
+                    "type": "string",
+                    "description": "surname description"
+                }
+            },
+            "required": [
+                "name",
+                "surname"
+            ],
+            "title": "TopLevel"
+        }
+    }
+}
diff --git a/base/schema-schema/test/inputs/schema/list.schema/default/TopLevel.schema b/head/schema-schema/test/inputs/schema/list.schema/default/TopLevel.schema
index 77ea4d1..7a4d2de 100644
--- a/base/schema-schema/test/inputs/schema/list.schema/default/TopLevel.schema
+++ b/head/schema-schema/test/inputs/schema/list.schema/default/TopLevel.schema
@@ -7,7 +7,8 @@
             "additionalProperties": {},
             "properties": {
                 "next": {
-                    "$ref": "#/definitions/TopLevel"
+                    "$ref": "#/definitions/TopLevel",
+                    "description": "A recursive class type"
                 }
             },
             "required": [],
diff --git a/base/schema-schema/test/inputs/schema/ref-remote.schema/default/TopLevel.schema b/head/schema-schema/test/inputs/schema/ref-remote.schema/default/TopLevel.schema
index 77ea4d1..7a4d2de 100644
--- a/base/schema-schema/test/inputs/schema/ref-remote.schema/default/TopLevel.schema
+++ b/head/schema-schema/test/inputs/schema/ref-remote.schema/default/TopLevel.schema
@@ -7,7 +7,8 @@
             "additionalProperties": {},
             "properties": {
                 "next": {
-                    "$ref": "#/definitions/TopLevel"
+                    "$ref": "#/definitions/TopLevel",
+                    "description": "A recursive class type"
                 }
             },
             "required": [],
diff --git a/base/schema-schema/test/inputs/schema/simple-ref.schema/default/TopLevel.schema b/head/schema-schema/test/inputs/schema/simple-ref.schema/default/TopLevel.schema
index 77ea4d1..7a4d2de 100644
--- a/base/schema-schema/test/inputs/schema/simple-ref.schema/default/TopLevel.schema
+++ b/head/schema-schema/test/inputs/schema/simple-ref.schema/default/TopLevel.schema
@@ -7,7 +7,8 @@
             "additionalProperties": {},
             "properties": {
                 "next": {
-                    "$ref": "#/definitions/TopLevel"
+                    "$ref": "#/definitions/TopLevel",
+                    "description": "A recursive class type"
                 }
             },
             "required": [],
diff --git a/base/schema-schema/test/inputs/schema/vega-lite.schema/default/TopLevel.schema b/head/schema-schema/test/inputs/schema/vega-lite.schema/default/TopLevel.schema
index acaeea5..4ea8de9 100644
--- a/base/schema-schema/test/inputs/schema/vega-lite.schema/default/TopLevel.schema
+++ b/head/schema-schema/test/inputs/schema/vega-lite.schema/default/TopLevel.schema
@@ -270,7 +270,7 @@
                     "additionalProperties": {
                         "$ref": "#/definitions/VGMarkConfig"
                     },
-                    "description": "An object hash that defines key-value mappings to determine default properties for marks with a given [style](mark.html#mark-def).  The keys represent styles names; the value are valid [mark configuration objects](mark.html#config).  "
+                    "description": "An object hash that defines key-value mappings to determine default properties for marks\nwith a given [style](mark.html#mark-def).  The keys represent styles names; the value are\nvalid [mark configuration objects](mark.html#config)."
                 },
                 "text": {
                     "$ref": "#/definitions/TextConfig",
@@ -2871,7 +2871,7 @@
                             "type": "null"
                         }
                     ],
-                    "description": "The sort order. One of `\"ascending\"` (default) or `\"descending\"`.\nSort order for a facet field.\nThis can be `\"ascending\"`, `\"descending\"`."
+                    "description": "The sort order. One of `\"ascending\"` (default) or `\"descending\"`."
                 }
             },
             "required": [
@@ -2908,7 +2908,7 @@
                             "type": "null"
                         }
                     ],
-                    "description": "The sort order. One of `\"ascending\"` (default) or `\"descending\"`.\nSort order for a facet field.\nThis can be `\"ascending\"`, `\"descending\"`."
+                    "description": "Sort order for a facet field.\nThis can be `\"ascending\"`, `\"descending\"`."
                 },
                 "timeUnit": {
                     "$ref": "#/definitions/TimeUnit",
@@ -3087,7 +3087,7 @@
                             "type": "null"
                         }
                     ],
-                    "description": "The sort order. One of `\"ascending\"` (default) or `\"descending\"`.\nSort order for a facet field.\nThis can be `\"ascending\"`, `\"descending\"`."
+                    "description": "The sort order. One of `\"ascending\"` (default) or `\"descending\"`."
                 },
                 "timeUnit": {
                     "$ref": "#/definitions/TimeUnit",
@@ -3231,7 +3231,7 @@
                             "type": "null"
                         }
                     ],
-                    "description": "Type of stacking offset if the field should be stacked.\n`stack` is only applicable for `x` and `y` channels with continuous domains.\nFor example, `stack` of `y` can be used to customize stacking for a vertical bar chart.\n\n`stack` can be one of the following values:\n\n- `\"zero\"`: stacking with baseline offset at zero value of the scale (for creating typical stacked [bar](stack.html#bar) and [area](stack.html#area) chart).\n- `\"normalize\"` - stacking with normalized domain (for creating [normalized stacked bar and area charts](stack.html#normalized). <br/>\n- `\"center\"` - stacking with center baseline (for [streamgraph](stack.html#streamgraph)).\n- `null` - No-stacking. This will produce layered [bar](stack.html#layered-bar-chart) and area chart.\n\n__Default value:__ `zero` for plots with all of the following conditions are true:\n\n1. The mark is `bar` or `area`;\n2. The stacked measure channel (x or y) has a linear scale;\n3. At least one of non-position channels mapped to an unaggregated field that is different from x and y.  Otherwise, `null` by default."
+                    "description": "Type of stacking offset if the field should be stacked.\n`stack` is only applicable for `x` and `y` channels with continuous domains.\nFor example, `stack` of `y` can be used to customize stacking for a vertical bar chart.\n\n`stack` can be one of the following values:\n\n- `\"zero\"`: stacking with baseline offset at zero value of the scale (for creating\ntypical stacked [bar](stack.html#bar) and [area](stack.html#area) chart).\n- `\"normalize\"` - stacking with normalized domain (for creating [normalized stacked bar\nand area charts](stack.html#normalized). <br/>\n- `\"center\"` - stacking with center baseline (for [streamgraph](stack.html#streamgraph)).\n- `null` - No-stacking. This will produce layered [bar](stack.html#layered-bar-chart) and\narea chart.\n\n__Default value:__ `zero` for plots with all of the following conditions are true:\n\n1. The mark is `bar` or `area`;\n2. The stacked measure channel (x or y) has a linear scale;\n3. At least one of non-position channels mapped to an unaggregated field that is\ndifferent from x and y.  Otherwise, `null` by default."
                 },
                 "timeUnit": {
                     "$ref": "#/definitions/TimeUnit",
diff --git a/base/schema-swift/test/inputs/schema/list.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/list.schema/default/quicktype.swift
index c9432ab..f2bed9d 100644
--- a/base/schema-swift/test/inputs/schema/list.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/list.schema/default/quicktype.swift
@@ -8,6 +8,7 @@ import Foundation
 /// A recursive class type
 // MARK: - TopLevel
 class TopLevel: Codable {
+    /// A recursive class type
     let next: TopLevel?
 
     enum CodingKeys: String, CodingKey {
diff --git a/base/schema-swift/test/inputs/schema/ref-remote.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/ref-remote.schema/default/quicktype.swift
index c9432ab..f2bed9d 100644
--- a/base/schema-swift/test/inputs/schema/ref-remote.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/ref-remote.schema/default/quicktype.swift
@@ -8,6 +8,7 @@ import Foundation
 /// A recursive class type
 // MARK: - TopLevel
 class TopLevel: Codable {
+    /// A recursive class type
     let next: TopLevel?
 
     enum CodingKeys: String, CodingKey {
diff --git a/base/schema-swift/test/inputs/schema/simple-ref.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/simple-ref.schema/default/quicktype.swift
index c9432ab..f2bed9d 100644
--- a/base/schema-swift/test/inputs/schema/simple-ref.schema/default/quicktype.swift
+++ b/head/schema-swift/test/inputs/schema/simple-ref.schema/default/quicktype.swift
@@ -8,6 +8,7 @@ import Foundation
 /// A recursive class type
 // MARK: - TopLevel
 class TopLevel: Codable {
+    /// A recursive class type
     let next: TopLevel?
 
     enum CodingKeys: String, CodingKey {
diff --git a/head/schema-typescript/test/inputs/schema/description-ref.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/description-ref.schema/default/TopLevel.ts
new file mode 100644
index 0000000..47e1a07
--- /dev/null
+++ b/head/schema-typescript/test/inputs/schema/description-ref.schema/default/TopLevel.ts
@@ -0,0 +1,192 @@
+// To parse this data:
+//
+//   import { Convert, TopLevel } from "./TopLevel";
+//
+//   const topLevel = Convert.toTopLevel(json);
+//
+// These functions will throw an error if the JSON doesn't
+// match the expected interface, even if the JSON is valid.
+
+export interface TopLevel {
+    /**
+     * name description
+     */
+    name: string;
+    /**
+     * surname description
+     */
+    surname: string;
+    [property: string]: unknown;
+}
+
+// Converts JSON strings to/from your types
+// and asserts the results of JSON.parse at runtime
+export class Convert {
+    public static toTopLevel(json: string): TopLevel {
+        return cast(JSON.parse(json), r("TopLevel"));
+    }
+
+    public static topLevelToJson(value: TopLevel): string {
+        return JSON.stringify(uncast(value, r("TopLevel")), null, 2);
+    }
+}
+
+function invalidValue(typ: any, val: any, key: any, parent: any = ''): never {
+    const prettyTyp = prettyTypeName(typ);
+    const parentText = parent ? ` on ${parent}` : '';
+    const keyText = key ? ` for key "${key}"` : '';
+    throw Error(`Invalid value${keyText}${parentText}. Expected ${prettyTyp} but got ${JSON.stringify(val)}`);
+}
+
+function prettyTypeName(typ: any): string {
+    if (Array.isArray(typ)) {
+        if (typ.length === 2 && typ[0] === undefined) {
+            return `an optional ${prettyTypeName(typ[1])}`;
+        } else {
+            return `one of [${typ.map(a => { return prettyTypeName(a); }).join(", ")}]`;
+        }
+    } else if (typeof typ === "object" && typ.literal !== undefined) {
+        return typ.literal;
+    } else {
+        return typeof typ;
+    }
+}
+
+function jsonToJSProps(typ: any): any {
+    if (typ.jsonToJS === undefined) {
+        const map: any = {};
+        typ.props.forEach((p: any) => map[p.json] = { key: p.js, typ: p.typ });
+        typ.jsonToJS = map;
+    }
+    return typ.jsonToJS;
+}
+
+function jsToJSONProps(typ: any): any {
+    if (typ.jsToJSON === undefined) {
+        const map: any = {};
+        typ.props.forEach((p: any) => map[p.js] = { key: p.json, typ: p.typ });
+        typ.jsToJSON = map;
+    }
+    return typ.jsToJSON;
+}
+
+function transform(val: any, typ: any, getProps: any, key: any = '', parent: any = ''): any {
+    function transformPrimitive(typ: string, val: any): any {
+        if (typeof typ === typeof val) return val;
+        return invalidValue(typ, val, key, parent);
+    }
+
+    function transformUnion(typs: any[], val: any): any {
+        // val must validate against one typ in typs
+        const l = typs.length;
+        for (let i = 0; i < l; i++) {
+            const typ = typs[i];
+            try {
+                return transform(val, typ, getProps);
+            } catch (_) {}
+        }
+        return invalidValue(typs, val, key, parent);
+    }
+
+    function transformEnum(cases: string[], val: any): any {
+        if (cases.indexOf(val) !== -1) return val;
+        return invalidValue(cases.map(a => { return l(a); }), val, key, parent);
+    }
+
+    function transformArray(typ: any, val: any): any {
+        // val must be an array with no invalid elements
+        if (!Array.isArray(val)) return invalidValue(l("array"), val, key, parent);
+        return val.map(el => transform(el, typ, getProps));
+    }
+
+    function transformDate(val: any): any {
+        if (val === null) {
+            return null;
+        }
+        const d = new Date(val);
+        if (isNaN(d.valueOf())) {
+            return invalidValue(l("Date"), val, key, parent);
+        }
+        return d;
+    }
+
+    function transformObject(props: { [k: string]: any }, additional: any, val: any): any {
+        if (val === null || typeof val !== "object" || Array.isArray(val)) {
+            return invalidValue(l(ref || "object"), val, key, parent);
+        }
+        const result: any = {};
+        Object.getOwnPropertyNames(props).forEach(key => {
+            const prop = props[key];
+            const v = Object.prototype.hasOwnProperty.call(val, key) ? val[key] : undefined;
+            result[prop.key] = transform(v, prop.typ, getProps, key, ref);
+        });
+        Object.getOwnPropertyNames(val).forEach(key => {
+            if (!Object.prototype.hasOwnProperty.call(props, key)) {
+                result[key] = transform(val[key], additional, getProps, key, ref);
+            }
+        });
+        return result;
+    }
+
+    if (typ === "any") return val;
+    if (typ === null) {
+        if (val === null) return val;
+        return invalidValue(typ, val, key, parent);
+    }
+    if (typ === false) return invalidValue(typ, val, key, parent);
+    let ref: any = undefined;
+    while (typeof typ === "object" && typ.ref !== undefined) {
+        ref = typ.ref;
+        typ = typeMap[typ.ref];
+    }
+    if (Array.isArray(typ)) return transformEnum(typ, val);
+    if (typeof typ === "object") {
+        return typ.hasOwnProperty("unionMembers") ? transformUnion(typ.unionMembers, val)
+            : typ.hasOwnProperty("arrayItems")    ? transformArray(typ.arrayItems, val)
+            : typ.hasOwnProperty("props")         ? transformObject(getProps(typ), typ.additional, val)
+            : invalidValue(typ, val, key, parent);
+    }
+    // Numbers can be parsed by Date but shouldn't be.
+    if (typ === Date && typeof val !== "number") return transformDate(val);
+    return transformPrimitive(typ, val);
+}
+
+function cast<T>(val: any, typ: any): T {
+    return transform(val, typ, jsonToJSProps);
+}
+
+function uncast<T>(val: T, typ: any): any {
+    return transform(val, typ, jsToJSONProps);
+}
+
+function l(typ: any) {
+    return { literal: typ };
+}
+
+function a(typ: any) {
+    return { arrayItems: typ };
+}
+
+function u(...typs: any[]) {
+    return { unionMembers: typs };
+}
+
+function o(props: any[], additional: any) {
+    return { props, additional };
+}
+
+function m(additional: any) {
+    const props: any[] = [];
+    return { props, additional };
+}
+
+function r(name: string) {
+    return { ref: name };
+}
+
+const typeMap: any = {
+    "TopLevel": o([
+        { json: "name", js: "name", typ: "" },
+        { json: "surname", js: "surname", typ: "" },
+    ], "any"),
+};
diff --git a/base/schema-typescript/test/inputs/schema/list.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/list.schema/default/TopLevel.ts
index 05c7e06..9c20f28 100644
--- a/base/schema-typescript/test/inputs/schema/list.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/list.schema/default/TopLevel.ts
@@ -11,6 +11,9 @@
  * A recursive class type
  */
 export interface TopLevel {
+    /**
+     * A recursive class type
+     */
     next?: TopLevel;
     [property: string]: unknown;
 }
diff --git a/base/schema-typescript/test/inputs/schema/ref-remote.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/ref-remote.schema/default/TopLevel.ts
index 05c7e06..9c20f28 100644
--- a/base/schema-typescript/test/inputs/schema/ref-remote.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/ref-remote.schema/default/TopLevel.ts
@@ -11,6 +11,9 @@
  * A recursive class type
  */
 export interface TopLevel {
+    /**
+     * A recursive class type
+     */
     next?: TopLevel;
     [property: string]: unknown;
 }
diff --git a/base/schema-typescript/test/inputs/schema/simple-ref.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/simple-ref.schema/default/TopLevel.ts
index 05c7e06..9c20f28 100644
--- a/base/schema-typescript/test/inputs/schema/simple-ref.schema/default/TopLevel.ts
+++ b/head/schema-typescript/test/inputs/schema/simple-ref.schema/default/TopLevel.ts
@@ -11,6 +11,9 @@
  * A recursive class type
  */
 export interface TopLevel {
+    /**
+     * A recursive class type
+     */
     next?: TopLevel;
     [property: string]: unknown;
 }