diff --git a/head/schema-cjson/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.c b/head/schema-cjson/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.c new file mode 100644 index 0000000..604d711 --- /dev/null +++ b/head/schema-cjson/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.c @@ -0,0 +1,128 @@ +/** + * TopLevel.c + * This file has been autogenerated using quicktype https://github.com/quicktype/quicktype - DO NOT EDIT + */ + +#include "TopLevel.h" + +struct Committer * cJSON_ParseCommitter(const char * s) { + struct Committer * x = NULL; + if (NULL != s) { + cJSON * j = cJSON_Parse(s); + if (NULL != j) { + x = cJSON_GetCommitterValue(j); + cJSON_Delete(j); + } + } + return x; +} + +struct Committer * cJSON_GetCommitterValue(const cJSON * j) { + struct Committer * x = NULL; + if (NULL != j) { + if (NULL != (x = cJSON_malloc(sizeof(struct Committer)))) { + memset(x, 0, sizeof(struct Committer)); + if (cJSON_HasObjectItem(j, "date")) { + x->date = strdup(cJSON_GetStringValue(cJSON_GetObjectItemCaseSensitive(j, "date"))); + } + else { + if (NULL != (x->date = cJSON_malloc(sizeof(char)))) { + x->date[0] = '\0'; + } + } + } + } + return x; +} + +cJSON * cJSON_CreateCommitter(const struct Committer * x) { + cJSON * j = NULL; + if (NULL != x) { + if (NULL != (j = cJSON_CreateObject())) { + if (NULL != x->date) { + cJSON_AddStringToObject(j, "date", x->date); + } + else { + cJSON_AddStringToObject(j, "date", ""); + } + } + } + return j; +} + +char * cJSON_PrintCommitter(const struct Committer * x) { + char * s = NULL; + if (NULL != x) { + cJSON * j = cJSON_CreateCommitter(x); + if (NULL != j) { + s = cJSON_Print(j); + cJSON_Delete(j); + } + } + return s; +} + +void cJSON_DeleteCommitter(struct Committer * x) { + if (NULL != x) { + if (NULL != x->date) { + cJSON_free(x->date); + } + cJSON_free(x); + } +} + +struct TopLevel * cJSON_ParseTopLevel(const char * s) { + struct TopLevel * x = NULL; + if (NULL != s) { + cJSON * j = cJSON_Parse(s); + if (NULL != j) { + x = cJSON_GetTopLevelValue(j); + cJSON_Delete(j); + } + } + return x; +} + +struct TopLevel * cJSON_GetTopLevelValue(const cJSON * j) { + struct TopLevel * x = NULL; + if (NULL != j) { + if (NULL != (x = cJSON_malloc(sizeof(struct TopLevel)))) { + memset(x, 0, sizeof(struct TopLevel)); + if (cJSON_HasObjectItem(j, "committer")) { + x->committer = cJSON_GetCommitterValue(cJSON_GetObjectItemCaseSensitive(j, "committer")); + } + } + } + return x; +} + +cJSON * cJSON_CreateTopLevel(const struct TopLevel * x) { + cJSON * j = NULL; + if (NULL != x) { + if (NULL != (j = cJSON_CreateObject())) { + cJSON_AddItemToObject(j, "committer", cJSON_CreateCommitter(x->committer)); + } + } + return j; +} + +char * cJSON_PrintTopLevel(const struct TopLevel * x) { + char * s = NULL; + if (NULL != x) { + cJSON * j = cJSON_CreateTopLevel(x); + if (NULL != j) { + s = cJSON_Print(j); + cJSON_Delete(j); + } + } + return s; +} + +void cJSON_DeleteTopLevel(struct TopLevel * x) { + if (NULL != x) { + if (NULL != x->committer) { + cJSON_DeleteCommitter(x->committer); + } + cJSON_free(x); + } +} diff --git a/head/schema-cjson/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.h b/head/schema-cjson/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.h new file mode 100644 index 0000000..ae805c3 --- /dev/null +++ b/head/schema-cjson/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.h @@ -0,0 +1,61 @@ +/** + * TopLevel.h + * This file has been autogenerated using quicktype https://github.com/quicktype/quicktype - DO NOT EDIT + * This file depends of https://github.com/DaveGamble/cJSON, https://github.com/joelguittet/c-list and https://github.com/joelguittet/c-hashtable + * To parse json data from json string use the following: struct * data = cJSON_Parse(); + * To get json data from cJSON object use the following: struct * data = cJSON_GetValue(); + * To get cJSON object from json data use the following: cJSON * cjson = cJSON_Create(); + * To print json string from json data use the following: char * string = cJSON_Print(); + * To delete json data use the following: cJSON_Delete(); + */ + +#ifndef __TOPLEVEL_H__ +#define __TOPLEVEL_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include +#include +#include +#include +#include +#include + +#ifndef cJSON_Bool +#define cJSON_Bool (cJSON_True | cJSON_False) +#endif +#ifndef cJSON_Map +#define cJSON_Map (1 << 16) +#endif +#ifndef cJSON_Enum +#define cJSON_Enum (1 << 17) +#endif + +struct Committer { + char * date; +}; + +struct TopLevel { + struct Committer * committer; +}; + +struct Committer * cJSON_ParseCommitter(const char * s); +struct Committer * cJSON_GetCommitterValue(const cJSON * j); +cJSON * cJSON_CreateCommitter(const struct Committer * x); +char * cJSON_PrintCommitter(const struct Committer * x); +void cJSON_DeleteCommitter(struct Committer * x); + +struct TopLevel * cJSON_ParseTopLevel(const char * s); +struct TopLevel * cJSON_GetTopLevelValue(const cJSON * j); +cJSON * cJSON_CreateTopLevel(const struct TopLevel * x); +char * cJSON_PrintTopLevel(const struct TopLevel * x); +void cJSON_DeleteTopLevel(struct TopLevel * x); + +#ifdef __cplusplus +} +#endif + +#endif /* __TOPLEVEL_H__ */ diff --git a/head/schema-cplusplus/test/inputs/schema/transformed-string-intersection.schema/default/quicktype.hpp b/head/schema-cplusplus/test/inputs/schema/transformed-string-intersection.schema/default/quicktype.hpp new file mode 100644 index 0000000..a65163d --- /dev/null +++ b/head/schema-cplusplus/test/inputs/schema/transformed-string-intersection.schema/default/quicktype.hpp @@ -0,0 +1,87 @@ +// 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 +#include +#include + +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(); + } + return json(); + } + + inline json get_untyped(const json & j, std::string property) { + return get_untyped(j, property.data()); + } + #endif + + class Committer { + public: + Committer() = default; + virtual ~Committer() = default; + + private: + std::string date; + + public: + const std::string & get_date() const { return date; } + std::string & get_mutable_date() { return date; } + void set_date(const std::string & value) { this->date = value; } + }; + + class TopLevel { + public: + TopLevel() = default; + virtual ~TopLevel() = default; + + private: + Committer committer; + + public: + const Committer & get_committer() const { return committer; } + Committer & get_mutable_committer() { return committer; } + void set_committer(const Committer & value) { this->committer = value; } + }; +} + +namespace quicktype { + void from_json(const json & j, Committer & x); + void to_json(json & j, const Committer & x); + + void from_json(const json & j, TopLevel & x); + void to_json(json & j, const TopLevel & x); + + inline void from_json(const json & j, Committer& x) { + x.set_date(j.at("date").get()); + } + + inline void to_json(json & j, const Committer & x) { + j = json::object(); + j["date"] = x.get_date(); + } + + inline void from_json(const json & j, TopLevel& x) { + x.set_committer(j.at("committer").get()); + } + + inline void to_json(json & j, const TopLevel & x) { + j = json::object(); + j["committer"] = x.get_committer(); + } +} diff --git a/head/schema-csharp/test/inputs/schema/transformed-string-intersection.schema/default/QuickType.cs b/head/schema-csharp/test/inputs/schema/transformed-string-intersection.schema/default/QuickType.cs new file mode 100644 index 0000000..e0b9bc9 --- /dev/null +++ b/head/schema-csharp/test/inputs/schema/transformed-string-intersection.schema/default/QuickType.cs @@ -0,0 +1,67 @@ +// +// +// 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 + { + [JsonProperty("committer", Required = Required.Always)] + public Committer Committer { get; set; } + } + + public partial class Committer + { + [JsonProperty("date", Required = Required.Always)] + public DateTimeOffset Date { get; set; } + } + + public partial class TopLevel + { + public static TopLevel FromJson(string json) => JsonConvert.DeserializeObject(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/head/schema-csharp-SystemTextJson/test/inputs/schema/transformed-string-intersection.schema/default/QuickType.cs b/head/schema-csharp-SystemTextJson/test/inputs/schema/transformed-string-intersection.schema/default/QuickType.cs new file mode 100644 index 0000000..998533c --- /dev/null +++ b/head/schema-csharp-SystemTextJson/test/inputs/schema/transformed-string-intersection.schema/default/QuickType.cs @@ -0,0 +1,173 @@ +// +// +// 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 + { + [JsonRequired] + [JsonPropertyName("committer")] + public Committer Committer { get; set; } + } + + public partial class Committer + { + [JsonRequired] + [JsonPropertyName("date")] + public DateTimeOffset Date { get; set; } + } + + public partial class TopLevel + { + public static TopLevel FromJson(string json) => JsonSerializer.Deserialize(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 + { + 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 + { + 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 + { + 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/head/schema-csharp-records/test/inputs/schema/transformed-string-intersection.schema/default/QuickType.cs b/head/schema-csharp-records/test/inputs/schema/transformed-string-intersection.schema/default/QuickType.cs new file mode 100644 index 0000000..410a274 --- /dev/null +++ b/head/schema-csharp-records/test/inputs/schema/transformed-string-intersection.schema/default/QuickType.cs @@ -0,0 +1,67 @@ +// +// +// 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 + { + [JsonProperty("committer", Required = Required.Always)] + public Committer Committer { get; set; } + } + + public partial record Committer + { + [JsonProperty("date", Required = Required.Always)] + public DateTimeOffset Date { get; set; } + } + + public partial record TopLevel + { + public static TopLevel FromJson(string json) => JsonConvert.DeserializeObject(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/head/schema-dart/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.dart b/head/schema-dart/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.dart new file mode 100644 index 0000000..351c0cf --- /dev/null +++ b/head/schema-dart/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.dart @@ -0,0 +1,41 @@ +// 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 { + final Committer committer; + + TopLevel({ + required this.committer, + }); + + factory TopLevel.fromJson(Map json) => TopLevel( + committer: Committer.fromJson(json["committer"]), + ); + + Map toJson() => { + "committer": committer.toJson(), + }; +} + +class Committer { + final DateTime date; + + Committer({ + required this.date, + }); + + factory Committer.fromJson(Map json) => Committer( + date: DateTime.parse(json["date"]), + ); + + Map toJson() => { + "date": date.toIso8601String(), + }; +} diff --git a/head/schema-elixir/test/inputs/schema/transformed-string-intersection.schema/default/QuickType.ex b/head/schema-elixir/test/inputs/schema/transformed-string-intersection.schema/default/QuickType.ex new file mode 100644 index 0000000..7be7e27 --- /dev/null +++ b/head/schema-elixir/test/inputs/schema/transformed-string-intersection.schema/default/QuickType.ex @@ -0,0 +1,72 @@ +# This file was autogenerated using quicktype https://github.com/quicktype/quicktype +# +# Add Jason to your mix.exs +# +# Decode a JSON string: TopLevel.from_json(data) +# Encode into a JSON string: TopLevel.to_json(struct) + +defmodule Committer do + @enforce_keys [:date] + defstruct [:date] + + @type t :: %__MODULE__{ + date: String.t() + } + + def from_map(m) do + %Committer{ + date: m["date"], + } + end + + def from_json(json) do + json + |> Jason.decode!() + |> from_map() + end + + def to_map(struct) do + %{ + "date" => struct.date, + } + end + + def to_json(struct) do + struct + |> to_map() + |> Jason.encode!() + end +end + +defmodule TopLevel do + @enforce_keys [:committer] + defstruct [:committer] + + @type t :: %__MODULE__{ + committer: Committer.t() + } + + def from_map(m) do + %TopLevel{ + committer: Committer.from_map(m["committer"]), + } + end + + def from_json(json) do + json + |> Jason.decode!() + |> from_map() + end + + def to_map(struct) do + %{ + "committer" => Committer.to_map(struct.committer), + } + end + + def to_json(struct) do + struct + |> to_map() + |> Jason.encode!() + end +end diff --git a/head/schema-elm/test/inputs/schema/transformed-string-intersection.schema/default/QuickType.elm b/head/schema-elm/test/inputs/schema/transformed-string-intersection.schema/default/QuickType.elm new file mode 100644 index 0000000..5921d78 --- /dev/null +++ b/head/schema-elm/test/inputs/schema/transformed-string-intersection.schema/default/QuickType.elm @@ -0,0 +1,67 @@ +-- 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 + , Committer + ) + +import Json.Decode as Jdec +import Json.Decode.Pipeline as Jpipe +import Json.Encode as Jenc +import Dict exposing (Dict) + +type alias QuickType = + { committer : Committer + } + +type alias Committer = + { date : String + } + +-- decoders and encoders + +quickTypeToString : QuickType -> String +quickTypeToString r = Jenc.encode 0 (encodeQuickType r) + +quickType : Jdec.Decoder QuickType +quickType = + Jdec.succeed QuickType + |> Jpipe.required "committer" committer + +encodeQuickType : QuickType -> Jenc.Value +encodeQuickType x = + Jenc.object + [ ("committer", encodeCommitter x.committer) + ] + +committer : Jdec.Decoder Committer +committer = + Jdec.succeed Committer + |> Jpipe.required "date" Jdec.string + +encodeCommitter : Committer -> Jenc.Value +encodeCommitter x = + Jenc.object + [ ("date", Jenc.string x.date) + ] + +--- 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/transformed-string-intersection.schema/default/TopLevel.js b/head/schema-flow/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.js new file mode 100644 index 0000000..06553f8 --- /dev/null +++ b/head/schema-flow/test/inputs/schema/transformed-string-intersection.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 = { + committer: Committer; + [property: string]: mixed; +}; + +export type Committer = { + date: Date; + [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(val: any, typ: any): T { + return transform(val, typ, jsonToJSProps); +} + +function uncast(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: "committer", js: "committer", typ: r("Committer") }, + ], "any"), + "Committer": o([ + { json: "date", js: "date", typ: Date }, + ], "any"), +}; + +module.exports = { + "topLevelToJson": topLevelToJson, + "toTopLevel": toTopLevel, +}; diff --git a/head/schema-golang/test/inputs/schema/transformed-string-intersection.schema/default/quicktype.go b/head/schema-golang/test/inputs/schema/transformed-string-intersection.schema/default/quicktype.go new file mode 100644 index 0000000..4bba38e --- /dev/null +++ b/head/schema-golang/test/inputs/schema/transformed-string-intersection.schema/default/quicktype.go @@ -0,0 +1,29 @@ +// 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 "time" + +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 { + Committer Committer `json:"committer"` +} + +type Committer struct { + Date time.Time `json:"date"` +} diff --git a/head/schema-haskell/test/inputs/schema/transformed-string-intersection.schema/default/QuickType.hs b/head/schema-haskell/test/inputs/schema/transformed-string-intersection.schema/default/QuickType.hs new file mode 100644 index 0000000..07c550a --- /dev/null +++ b/head/schema-haskell/test/inputs/schema/transformed-string-intersection.schema/default/QuickType.hs @@ -0,0 +1,45 @@ +{-# LANGUAGE StrictData #-} +{-# LANGUAGE OverloadedStrings #-} + +module QuickType + ( QuickType (..) + , Committer (..) + , decodeTopLevel + ) where + +import Data.Aeson +import Data.Aeson.Types (emptyObject) +import Data.ByteString.Lazy (ByteString) +import Data.HashMap.Strict (HashMap) +import Data.Text (Text) + +data QuickType = QuickType + { committerQuickType :: Committer + } deriving (Show) + +data Committer = Committer + { dateCommitter :: Text + } deriving (Show) + +decodeTopLevel :: ByteString -> Maybe QuickType +decodeTopLevel = decode + +instance ToJSON QuickType where + toJSON (QuickType committerQuickType) = + object + [ "committer" .= committerQuickType + ] + +instance FromJSON QuickType where + parseJSON (Object v) = QuickType + <$> v .: "committer" + +instance ToJSON Committer where + toJSON (Committer dateCommitter) = + object + [ "date" .= dateCommitter + ] + +instance FromJSON Committer where + parseJSON (Object v) = Committer + <$> v .: "date" diff --git a/head/schema-java/test/inputs/schema/transformed-string-intersection.schema/default/src/main/java/io/quicktype/Committer.java b/head/schema-java/test/inputs/schema/transformed-string-intersection.schema/default/src/main/java/io/quicktype/Committer.java new file mode 100644 index 0000000..dfee489 --- /dev/null +++ b/head/schema-java/test/inputs/schema/transformed-string-intersection.schema/default/src/main/java/io/quicktype/Committer.java @@ -0,0 +1,13 @@ +package io.quicktype; + +import com.fasterxml.jackson.annotation.*; +import java.time.OffsetDateTime; + +public class Committer { + private OffsetDateTime date; + + @JsonProperty("date") + public OffsetDateTime getDate() { return date; } + @JsonProperty("date") + public void setDate(OffsetDateTime value) { this.date = value; } +} diff --git a/head/schema-java/test/inputs/schema/transformed-string-intersection.schema/default/src/main/java/io/quicktype/Converter.java b/head/schema-java/test/inputs/schema/transformed-string-intersection.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/transformed-string-intersection.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() { + @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/transformed-string-intersection.schema/default/src/main/java/io/quicktype/TopLevel.java b/head/schema-java/test/inputs/schema/transformed-string-intersection.schema/default/src/main/java/io/quicktype/TopLevel.java new file mode 100644 index 0000000..5192413 --- /dev/null +++ b/head/schema-java/test/inputs/schema/transformed-string-intersection.schema/default/src/main/java/io/quicktype/TopLevel.java @@ -0,0 +1,12 @@ +package io.quicktype; + +import com.fasterxml.jackson.annotation.*; + +public class TopLevel { + private Committer committer; + + @JsonProperty("committer") + public Committer getCommitter() { return committer; } + @JsonProperty("committer") + public void setCommitter(Committer value) { this.committer = value; } +} diff --git a/head/schema-java-datetime-legacy/test/inputs/schema/transformed-string-intersection.schema/default/src/main/java/io/quicktype/Committer.java b/head/schema-java-datetime-legacy/test/inputs/schema/transformed-string-intersection.schema/default/src/main/java/io/quicktype/Committer.java new file mode 100644 index 0000000..c011cbf --- /dev/null +++ b/head/schema-java-datetime-legacy/test/inputs/schema/transformed-string-intersection.schema/default/src/main/java/io/quicktype/Committer.java @@ -0,0 +1,15 @@ +package io.quicktype; + +import com.fasterxml.jackson.annotation.*; +import java.util.Date; + +public class Committer { + private Date date; + + @JsonProperty("date") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssX", timezone = "UTC") + public Date getDate() { return date; } + @JsonProperty("date") + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ssX", timezone = "UTC") + public void setDate(Date value) { this.date = value; } +} diff --git a/head/schema-java-datetime-legacy/test/inputs/schema/transformed-string-intersection.schema/default/src/main/java/io/quicktype/Converter.java b/head/schema-java-datetime-legacy/test/inputs/schema/transformed-string-intersection.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/transformed-string-intersection.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() { + @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() { + @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() { + @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/transformed-string-intersection.schema/default/src/main/java/io/quicktype/TopLevel.java b/head/schema-java-datetime-legacy/test/inputs/schema/transformed-string-intersection.schema/default/src/main/java/io/quicktype/TopLevel.java new file mode 100644 index 0000000..5192413 --- /dev/null +++ b/head/schema-java-datetime-legacy/test/inputs/schema/transformed-string-intersection.schema/default/src/main/java/io/quicktype/TopLevel.java @@ -0,0 +1,12 @@ +package io.quicktype; + +import com.fasterxml.jackson.annotation.*; + +public class TopLevel { + private Committer committer; + + @JsonProperty("committer") + public Committer getCommitter() { return committer; } + @JsonProperty("committer") + public void setCommitter(Committer value) { this.committer = value; } +} diff --git a/head/schema-java-lombok/test/inputs/schema/transformed-string-intersection.schema/default/src/main/java/io/quicktype/Committer.java b/head/schema-java-lombok/test/inputs/schema/transformed-string-intersection.schema/default/src/main/java/io/quicktype/Committer.java new file mode 100644 index 0000000..dfee489 --- /dev/null +++ b/head/schema-java-lombok/test/inputs/schema/transformed-string-intersection.schema/default/src/main/java/io/quicktype/Committer.java @@ -0,0 +1,13 @@ +package io.quicktype; + +import com.fasterxml.jackson.annotation.*; +import java.time.OffsetDateTime; + +public class Committer { + private OffsetDateTime date; + + @JsonProperty("date") + public OffsetDateTime getDate() { return date; } + @JsonProperty("date") + public void setDate(OffsetDateTime value) { this.date = value; } +} diff --git a/head/schema-java-lombok/test/inputs/schema/transformed-string-intersection.schema/default/src/main/java/io/quicktype/Converter.java b/head/schema-java-lombok/test/inputs/schema/transformed-string-intersection.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/transformed-string-intersection.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() { + @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/transformed-string-intersection.schema/default/src/main/java/io/quicktype/TopLevel.java b/head/schema-java-lombok/test/inputs/schema/transformed-string-intersection.schema/default/src/main/java/io/quicktype/TopLevel.java new file mode 100644 index 0000000..5192413 --- /dev/null +++ b/head/schema-java-lombok/test/inputs/schema/transformed-string-intersection.schema/default/src/main/java/io/quicktype/TopLevel.java @@ -0,0 +1,12 @@ +package io.quicktype; + +import com.fasterxml.jackson.annotation.*; + +public class TopLevel { + private Committer committer; + + @JsonProperty("committer") + public Committer getCommitter() { return committer; } + @JsonProperty("committer") + public void setCommitter(Committer value) { this.committer = value; } +} diff --git a/head/schema-javascript/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.js b/head/schema-javascript/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.js new file mode 100644 index 0000000..1888cd3 --- /dev/null +++ b/head/schema-javascript/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.js @@ -0,0 +1,185 @@ +// 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: "committer", js: "committer", typ: r("Committer") }, + ], "any"), + "Committer": o([ + { json: "date", js: "date", typ: Date }, + ], "any"), +}; + +module.exports = { + "topLevelToJson": topLevelToJson, + "toTopLevel": toTopLevel, +}; diff --git a/head/schema-kotlin/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.kt b/head/schema-kotlin/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.kt new file mode 100644 index 0000000..59ac519 --- /dev/null +++ b/head/schema-kotlin/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.kt @@ -0,0 +1,34 @@ +// To parse the JSON, install Klaxon and do: +// +// val topLevel = TopLevel.fromJson(jsonString) + +package quicktype + +import java.time.OffsetDateTime + +import com.beust.klaxon.* + +private fun Klaxon.convert(k: kotlin.reflect.KClass<*>, fromJson: (JsonValue) -> T, toJson: (T) -> String, isUnion: Boolean = false) = + this.converter(object: Converter { + @Suppress("UNCHECKED_CAST") + override fun toJson(value: Any) = toJson(value as T) + override fun fromJson(jv: JsonValue) = fromJson(jv) as Any + override fun canConvert(cls: Class<*>) = cls == k.java || (isUnion && cls.superclass == k.java) + }) + +private val klaxon = Klaxon() + .convert(OffsetDateTime::class, { OffsetDateTime.parse(it.string!!) }, { "\"${java.time.format.DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(it)}\"" }) + +data class TopLevel ( + val committer: Committer +) { + public fun toJson() = klaxon.toJsonString(this) + + companion object { + public fun fromJson(json: String) = klaxon.parse(json) + } +} + +data class Committer ( + val date: OffsetDateTime +) diff --git a/head/schema-kotlin-jackson/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.kt b/head/schema-kotlin-jackson/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.kt new file mode 100644 index 0000000..edf44c2 --- /dev/null +++ b/head/schema-kotlin-jackson/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.kt @@ -0,0 +1,49 @@ +// To parse the JSON, install jackson-module-kotlin and do: +// +// val topLevel = TopLevel.fromJson(jsonString) + +package quicktype + +import java.time.OffsetDateTime + +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.* + + +@Suppress("UNCHECKED_CAST") +private fun ObjectMapper.convert(k: kotlin.reflect.KClass<*>, fromJson: (JsonNode) -> T, toJson: (T) -> String, isUnion: Boolean = false) = registerModule(SimpleModule().apply { + addSerializer(k.java as Class, object : StdSerializer(k.java as Class) { + override fun serialize(value: T, gen: JsonGenerator, provider: SerializerProvider) = gen.writeRawValue(toJson(value)) + }) + addDeserializer(k.java as Class, object : StdDeserializer(k.java as Class) { + override fun deserialize(p: JsonParser, ctxt: DeserializationContext) = fromJson(p.readValueAsTree()) + }) +}) + +val mapper = jacksonObjectMapper().apply { + propertyNamingStrategy = PropertyNamingStrategy.LOWER_CAMEL_CASE + setSerializationInclusion(JsonInclude.Include.NON_NULL) + convert(OffsetDateTime::class, { OffsetDateTime.parse(it.asText()) }, { "\"${java.time.format.DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(it)}\"" }) +} + +data class TopLevel ( + @get:JsonProperty(required=true)@field:JsonProperty(required=true) + val committer: Committer +) { + fun toJson() = mapper.writeValueAsString(this) + + companion object { + fun fromJson(json: String) = mapper.readValue(json) + } +} + +data class Committer ( + @get:JsonProperty(required=true)@field:JsonProperty(required=true) + val date: OffsetDateTime +) diff --git a/head/schema-kotlinx/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.kt b/head/schema-kotlinx/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.kt new file mode 100644 index 0000000..104342f --- /dev/null +++ b/head/schema-kotlinx/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.kt @@ -0,0 +1,33 @@ +// To parse the JSON, install kotlin's serialization plugin and do: +// +// val json = Json { allowStructuredMapKeys = true } +// val topLevel = json.parse(TopLevel.serializer(), jsonString) + +@file:UseSerializers(OffsetDateTimeSerializer::class) + +package quicktype + +import java.time.OffsetDateTime + +import kotlinx.serialization.* +import kotlinx.serialization.json.* +import kotlinx.serialization.descriptors.* +import kotlinx.serialization.encoding.* + +@Serializable +data class TopLevel ( + val committer: Committer +) + +@Serializable +data class Committer ( + val date: OffsetDateTime +) + +object OffsetDateTimeSerializer : KSerializer { + override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("OffsetDateTime", PrimitiveKind.STRING) + override fun deserialize(decoder: Decoder): OffsetDateTime = OffsetDateTime.parse(decoder.decodeString()) + override fun serialize(encoder: Encoder, value: OffsetDateTime) { + encoder.encodeString(java.time.format.DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(value)) + } +} diff --git a/head/schema-php/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.php b/head/schema-php/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.php new file mode 100644 index 0000000..79bc8b9 --- /dev/null +++ b/head/schema-php/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.php @@ -0,0 +1,206 @@ +committer = $committer; + } + + /** + * @param stdClass $value + * @throws Exception + * @return Committer + */ + public static function fromCommitter(stdClass $value): Committer { + return Committer::from($value); /*class*/ + } + + /** + * @throws Exception + * @return stdClass + */ + public function toCommitter(): stdClass { + if (TopLevel::validateCommitter($this->committer)) { + return $this->committer->to(); /*class*/ + } + throw new Exception('never get to this TopLevel::committer'); + } + + /** + * @param Committer + * @return bool + * @throws Exception + */ + public static function validateCommitter(Committer $value): bool { + $value->validate(); + return true; + } + + /** + * @throws Exception + * @return Committer + */ + public function getCommitter(): Committer { + if (TopLevel::validateCommitter($this->committer)) { + return $this->committer; + } + throw new Exception('never get to getCommitter TopLevel::committer'); + } + + /** + * @return Committer + */ + public static function sampleCommitter(): Committer { + return Committer::sample(); /*31:committer*/ + } + + /** + * @throws Exception + * @return bool + */ + public function validate(): bool { + return TopLevel::validateCommitter($this->committer); + } + + /** + * @return stdClass + * @throws Exception + */ + public function to(): stdClass { + $out = new stdClass(); + $out->{'committer'} = $this->toCommitter(); + return $out; + } + + /** + * @param stdClass $obj + * @return TopLevel + * @throws Exception + */ + public static function from(stdClass $obj): TopLevel { + return new TopLevel( + TopLevel::fromCommitter($obj->{'committer'}) + ); + } + + /** + * @return TopLevel + */ + public static function sample(): TopLevel { + return new TopLevel( + TopLevel::sampleCommitter() + ); + } +} + +// This is an autogenerated file:Committer + +class Committer { + private DateTime $date; // json:date Required + + /** + * @param DateTime $date + */ + public function __construct(DateTime $date) { + $this->date = $date; + } + + /** + * @param string $value + * @throws Exception + * @return DateTime + */ + public static function fromDate(string $value): DateTime { + $tmp = DateTime::createFromFormat(DateTimeInterface::ISO8601, $value); + if (!is_a($tmp, 'DateTime')) { + throw new Exception('Attribute Error:Committer::'); + } + return $tmp; + } + + /** + * @throws Exception + * @return string + */ + public function toDate(): string { + if (Committer::validateDate($this->date)) { + return $this->date->format(DateTimeInterface::ISO8601); + } + throw new Exception('never get to this Committer::date'); + } + + /** + * @param DateTime + * @return bool + * @throws Exception + */ + public static function validateDate(DateTime $value): bool { + if (!is_a($value, 'DateTime')) { + throw new Exception('Attribute Error:Committer::date'); + } + return true; + } + + /** + * @throws Exception + * @return DateTime + */ + public function getDate(): DateTime { + if (Committer::validateDate($this->date)) { + return $this->date; + } + throw new Exception('never get to getDate Committer::date'); + } + + /** + * @return DateTime + */ + public static function sampleDate(): DateTime { + return DateTime::createFromFormat(DateTimeInterface::ISO8601, '2020-12-10T12:10:10+00:00'); + } + + /** + * @throws Exception + * @return bool + */ + public function validate(): bool { + return Committer::validateDate($this->date); + } + + /** + * @return stdClass + * @throws Exception + */ + public function to(): stdClass { + $out = new stdClass(); + $out->{'date'} = $this->toDate(); + return $out; + } + + /** + * @param stdClass $obj + * @return Committer + * @throws Exception + */ + public static function from(stdClass $obj): Committer { + return new Committer( + Committer::fromDate($obj->{'date'}) + ); + } + + /** + * @return Committer + */ + public static function sample(): Committer { + return new Committer( + Committer::sampleDate() + ); + } +} diff --git a/head/schema-pike/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.pmod b/head/schema-pike/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.pmod new file mode 100644 index 0000000..c837ad1 --- /dev/null +++ b/head/schema-pike/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.pmod @@ -0,0 +1,53 @@ +// 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 `_from_JSON`. +// It will return an instance of . +// 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 { + Committer committer; // json: "committer" + + string encode_json() { + mapping(string:mixed) json = ([ + "committer" : committer, + ]); + + return Standards.JSON.encode(json); + } +} + +TopLevel TopLevel_from_JSON(mixed json) { + TopLevel retval = TopLevel(); + + retval.committer = json["committer"]; + + return retval; +} + +class Committer { + string date; // json: "date" + + string encode_json() { + mapping(string:mixed) json = ([ + "date" : date, + ]); + + return Standards.JSON.encode(json); + } +} + +Committer Committer_from_JSON(mixed json) { + Committer retval = Committer(); + + retval.date = json["date"]; + + return retval; +} diff --git a/head/schema-python/test/inputs/schema/transformed-string-intersection.schema/default/quicktype.py b/head/schema-python/test/inputs/schema/transformed-string-intersection.schema/default/quicktype.py new file mode 100644 index 0000000..7220213 --- /dev/null +++ b/head/schema-python/test/inputs/schema/transformed-string-intersection.schema/default/quicktype.py @@ -0,0 +1,56 @@ +import datetime +from dataclasses import dataclass +from typing import Any, TypeVar, Type, cast +import dateutil.parser + + +T = TypeVar("T") + + +def from_datetime(x: Any) -> datetime.datetime: + return dateutil.parser.parse(x) + + +def to_class(c: Type[T], x: Any) -> dict: + assert isinstance(x, c) + return cast(Any, x).to_dict() + + +@dataclass +class Committer: + date: datetime.datetime + + @staticmethod + def from_dict(obj: Any) -> 'Committer': + assert isinstance(obj, dict) + date = from_datetime(obj.get("date")) + return Committer(date) + + def to_dict(self) -> dict: + result: dict = {} + result["date"] = self.date.isoformat() + return result + + +@dataclass +class TopLevel: + committer: Committer + + @staticmethod + def from_dict(obj: Any) -> 'TopLevel': + assert isinstance(obj, dict) + committer = Committer.from_dict(obj.get("committer")) + return TopLevel(committer) + + def to_dict(self) -> dict: + result: dict = {} + result["committer"] = to_class(Committer, self.committer) + 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/head/schema-ruby/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.rb b/head/schema-ruby/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.rb new file mode 100644 index 0000000..64882f3 --- /dev/null +++ b/head/schema-ruby/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.rb @@ -0,0 +1,70 @@ +# 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.committer.date +# +# 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 Committer < Dry::Struct + attribute :date, Types::String + + def self.from_dynamic!(d) + d = Types::Hash[d] + new( + date: d.fetch("date"), + ) + end + + def self.from_json!(json) + from_dynamic!(JSON.parse(json)) + end + + def to_dynamic + { + "date" => date, + } + end + + def to_json(options = nil) + JSON.generate(to_dynamic, options) + end +end + +class TopLevel < Dry::Struct + attribute :committer, Committer + + def self.from_dynamic!(d) + d = Types::Hash[d] + new( + committer: Committer.from_dynamic!(d.fetch("committer")), + ) + end + + def self.from_json!(json) + from_dynamic!(JSON.parse(json)) + end + + def to_dynamic + { + "committer" => committer.to_dynamic, + } + end + + def to_json(options = nil) + JSON.generate(to_dynamic, options) + end +end diff --git a/head/schema-rust/test/inputs/schema/transformed-string-intersection.schema/default/module_under_test.rs b/head/schema-rust/test/inputs/schema/transformed-string-intersection.schema/default/module_under_test.rs new file mode 100644 index 0000000..f5be4e1 --- /dev/null +++ b/head/schema-rust/test/inputs/schema/transformed-string-intersection.schema/default/module_under_test.rs @@ -0,0 +1,24 @@ +// 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 { + pub committer: Committer, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +pub struct Committer { + pub date: String, +} diff --git a/head/schema-scala3/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.scala b/head/schema-scala3/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.scala new file mode 100644 index 0000000..9f812bc --- /dev/null +++ b/head/schema-scala3/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.scala @@ -0,0 +1,16 @@ +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 ( + val committer : Committer +) derives Encoder.AsObject, Decoder + +case class Committer ( + val date : String +) derives Encoder.AsObject, Decoder diff --git a/head/schema-scala3-upickle/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.scala b/head/schema-scala3-upickle/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.scala new file mode 100644 index 0000000..e2d0356 --- /dev/null +++ b/head/schema-scala3-upickle/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.scala @@ -0,0 +1,74 @@ +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 ( + val committer : Committer +) derives OptionPickler.ReadWriter + +case class Committer ( + val date : String +) derives OptionPickler.ReadWriter diff --git a/head/schema-schema/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.schema b/head/schema-schema/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.schema new file mode 100644 index 0000000..6ec1cc6 --- /dev/null +++ b/head/schema-schema/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.schema @@ -0,0 +1,33 @@ +{ + "$schema": "http://json-schema.org/draft-06/schema#", + "$ref": "#/definitions/TopLevel", + "definitions": { + "TopLevel": { + "type": "object", + "additionalProperties": {}, + "properties": { + "committer": { + "$ref": "#/definitions/Committer" + } + }, + "required": [ + "committer" + ], + "title": "TopLevel" + }, + "Committer": { + "type": "object", + "additionalProperties": {}, + "properties": { + "date": { + "type": "string", + "format": "date-time" + } + }, + "required": [ + "date" + ], + "title": "Committer" + } + } +} diff --git a/head/schema-swift/test/inputs/schema/transformed-string-intersection.schema/default/quicktype.swift b/head/schema-swift/test/inputs/schema/transformed-string-intersection.schema/default/quicktype.swift new file mode 100644 index 0000000..a38f22a --- /dev/null +++ b/head/schema-swift/test/inputs/schema/transformed-string-intersection.schema/default/quicktype.swift @@ -0,0 +1,130 @@ +// This file was generated from JSON Schema using quicktype, do not modify it directly. +// To parse the JSON, add this file to your project and do: +// +// let topLevel = try TopLevel(json) + +import Foundation + +// MARK: - TopLevel +struct TopLevel: Codable { + let committer: Committer + + enum CodingKeys: String, CodingKey { + case committer = "committer" + } +} + +// MARK: TopLevel convenience initializers and mutators + +extension TopLevel { + init(data: Data) throws { + self = try newJSONDecoder().decode(TopLevel.self, from: data) + } + + init(_ json: String, using encoding: String.Encoding = .utf8) throws { + guard let data = json.data(using: encoding) else { + throw NSError(domain: "JSONDecoding", code: 0, userInfo: nil) + } + try self.init(data: data) + } + + init(fromURL url: URL) throws { + try self.init(data: try Data(contentsOf: url)) + } + + func with( + committer: Committer? = nil + ) -> TopLevel { + return TopLevel( + committer: committer ?? self.committer + ) + } + + func jsonData() throws -> Data { + return try newJSONEncoder().encode(self) + } + + func jsonString(encoding: String.Encoding = .utf8) throws -> String? { + return String(data: try self.jsonData(), encoding: encoding) + } +} + +// MARK: - Committer +struct Committer: Codable { + let date: Date + + enum CodingKeys: String, CodingKey { + case date = "date" + } +} + +// MARK: Committer convenience initializers and mutators + +extension Committer { + init(data: Data) throws { + self = try newJSONDecoder().decode(Committer.self, from: data) + } + + init(_ json: String, using encoding: String.Encoding = .utf8) throws { + guard let data = json.data(using: encoding) else { + throw NSError(domain: "JSONDecoding", code: 0, userInfo: nil) + } + try self.init(data: data) + } + + init(fromURL url: URL) throws { + try self.init(data: try Data(contentsOf: url)) + } + + func with( + date: Date? = nil + ) -> Committer { + return Committer( + date: date ?? self.date + ) + } + + func jsonData() throws -> Data { + return try newJSONEncoder().encode(self) + } + + func jsonString(encoding: String.Encoding = .utf8) throws -> String? { + return String(data: try self.jsonData(), encoding: encoding) + } +} + +// MARK: - Helper functions for creating encoders and decoders + +func newJSONDecoder() -> JSONDecoder { + let decoder = JSONDecoder() + decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in + let container = try decoder.singleValueContainer() + let dateStr = try container.decode(String.self) + + let formatter = DateFormatter() + formatter.calendar = Calendar(identifier: .iso8601) + formatter.locale = Locale(identifier: "en_US_POSIX") + formatter.timeZone = TimeZone(secondsFromGMT: 0) + formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXXX" + if let date = formatter.date(from: dateStr) { + return date + } + formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssXXXXX" + if let date = formatter.date(from: dateStr) { + return date + } + throw DecodingError.typeMismatch(Date.self, DecodingError.Context(codingPath: decoder.codingPath, debugDescription: "Could not decode date")) + }) + return decoder +} + +func newJSONEncoder() -> JSONEncoder { + let encoder = JSONEncoder() + let formatter = DateFormatter() + formatter.calendar = Calendar(identifier: .iso8601) + formatter.locale = Locale(identifier: "en_US_POSIX") + formatter.timeZone = TimeZone(secondsFromGMT: 0) + formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssXXXXX" + encoder.dateEncodingStrategy = .formatted(formatter) + return encoder +} diff --git a/head/schema-typescript/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.ts b/head/schema-typescript/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.ts new file mode 100644 index 0000000..524704f --- /dev/null +++ b/head/schema-typescript/test/inputs/schema/transformed-string-intersection.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 { + committer: Committer; + [property: string]: unknown; +} + +export interface Committer { + date: Date; + [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(val: any, typ: any): T { + return transform(val, typ, jsonToJSProps); +} + +function uncast(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: "committer", js: "committer", typ: r("Committer") }, + ], "any"), + "Committer": o([ + { json: "date", js: "date", typ: Date }, + ], "any"), +}; diff --git a/head/schema-typescript-zod/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.ts b/head/schema-typescript-zod/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.ts new file mode 100644 index 0000000..d02f3d4 --- /dev/null +++ b/head/schema-typescript-zod/test/inputs/schema/transformed-string-intersection.schema/default/TopLevel.ts @@ -0,0 +1,12 @@ +import * as z from "zod"; + + +export const CommitterSchema = z.object({ + "date": z.coerce.date(), +}); +export type Committer = z.infer; + +export const TopLevelSchema = z.object({ + "committer": CommitterSchema, +}); +export type TopLevel = z.infer;