@team-supercharge/oasg 18.0.1 → 18.1.0

package/targets/dotnet-webapi-system-text-json/templates/model.mustache

@@ -0,0 +1,206 @@
+{{>partial_header}}
+using System;
+using System.Linq;
+using System.Text;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Runtime.Serialization;
+{{#useNewtonsoft}}
+using Newtonsoft.Json;
+{{/useNewtonsoft}}
+{{^useNewtonsoft}}
+using System.Text.Json;
+using System.Text.Json.Serialization;
+{{/useNewtonsoft}}
+{{#models}}
+{{#model}}
+{{#discriminator}}
+using JsonSubTypes;
+{{#useSwashbuckle}}
+using Swashbuckle.AspNetCore.Annotations;
+{{/useSwashbuckle}}
+{{/discriminator}}
+{{/model}}
+{{/models}}
+using {{packageName}}.Converters;
+
+{{#models}}
+{{#model}}
+namespace {{modelPackage}}
+{ {{#isEnum}}{{>enumClass}}{{/isEnum}}{{^isEnum}}
+    /// <summary>
+    /// {{description}}
+    /// </summary>
+    [DataContract]
+    {{#discriminator}}
+    {{#useNewtonsoft}}
+    {{#mappedModels.size}}
+    [JsonConverter(typeof(JsonSubtypes), "{{{discriminatorName}}}")]
+    {{/mappedModels.size}}
+    {{/useNewtonsoft}}
+    {{#useSwashbuckle}}
+    [SwaggerDiscriminator("{{{discriminatorName}}}")]
+    {{/useSwashbuckle}}
+    {{#mappedModels}}
+    [JsonSubtypes.KnownSubType(typeof({{{modelName}}}), "{{^vendorExtensions.x-discriminator-value}}{{{mappingName}}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{.}}}{{/vendorExtensions.x-discriminator-value}}")]
+    {{#useSwashbuckle}}
+    [SwaggerSubType(typeof({{{modelName}}}), DiscriminatorValue =  "{{^vendorExtensions.x-discriminator-value}}{{{mappingName}}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{.}}}{{/vendorExtensions.x-discriminator-value}}")]
+    {{/useSwashbuckle}}
+    {{/mappedModels}}
+    {{/discriminator}}
+    public {{#modelClassModifier}}{{.}} {{/modelClassModifier}}class {{classname}} {{#parent}}: {{{.}}}{{^pocoModels}}, {{/pocoModels}}{{/parent}}{{^pocoModels}}{{^parent}}: {{/parent}}IEquatable<{{classname}}>{{/pocoModels}}
+    {
+        {{#vars}}
+        {{#items.isEnum}}
+        {{#items}}
+        {{^complexType}}
+{{>enumClass}}
+        {{/complexType}}
+        {{/items}}
+        {{/items.isEnum}}
+        {{#isEnum}}
+        {{^complexType}}
+{{>enumClass}}
+        {{/complexType}}
+        {{/isEnum}}
+        /// <summary>
+        /// {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
+        /// </summary>{{#description}}
+        /// <value>{{.}}</value>{{/description}}{{#example}}
+        /* <example>{{.}}</example> */{{/example}}{{#required}}
+        [Required]{{/required}}{{#pattern}}
+        [RegularExpression("{{{.}}}")]{{/pattern}}{{#minLength}}{{#maxLength}}
+        [StringLength({{maxLength}}, MinimumLength={{minLength}})]{{/maxLength}}{{/minLength}}{{#minLength}}{{^maxLength}}
+        [MinLength({{minLength}})]{{/maxLength}}{{/minLength}}{{^minLength}}{{#maxLength}}
+        [MaxLength({{.}})]{{/maxLength}}{{/minLength}}{{#minimum}}{{#maximum}}
+        [Range({{minimum}}, {{maximum}})]{{/maximum}}{{/minimum}}
+        [DataMember(Name="{{baseName}}", EmitDefaultValue={{#isNullable}}true{{/isNullable}}{{^isNullable}}{{#vendorExtensions.x-is-value-type}}true{{/vendorExtensions.x-is-value-type}}{{^vendorExtensions.x-is-value-type}}false{{/vendorExtensions.x-is-value-type}}{{/isNullable}})]
+        {{#isEnum}}
+        public {{{datatypeWithEnum}}}{{#isNullable}}{{^required}}?{{/required}}{{/isNullable}} {{name}} { get; set; }{{#defaultValue}} = {{{.}}};{{/defaultValue}}
+        {{/isEnum}}
+        {{^isEnum}}
+        public {{{dataType}}}{{#nullableReferenceTypes}}{{^isContainer}}{{^required}}{{^isNullable}}?{{/isNullable}}{{/required}}{{/isContainer}}{{/nullableReferenceTypes}} {{name}} { get; set; }{{#defaultValue}} = {{{.}}};{{/defaultValue}}
+        {{/isEnum}}
+        {{^-last}}
+
+        {{/-last}}
+        {{/vars}}
+
+        {{^pocoModels}}
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class {{classname}} {\n");
+            {{#vars}}
+            sb.Append("  {{name}}: ").Append({{name}}).Append("\n");
+            {{/vars}}
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public {{#parent}}{{^isMap}}{{^isArray}}new {{/isArray}}{{/isMap}}{{/parent}}string ToJson()
+        {
+            {{#useNewtonsoft}}
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+            {{/useNewtonsoft}}
+            {{^useNewtonsoft}}
+            return JsonSerializer.Serialize(this, {{classname}}SerializationContext.Default.{{classname}});
+            {{/useNewtonsoft}}
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="obj">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object obj)
+        {
+            if (obj is null) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            return obj.GetType() == GetType() && Equals(({{classname}})obj);
+        }
+
+        /// <summary>
+        /// Returns true if {{classname}} instances are equal
+        /// </summary>
+        /// <param name="other">Instance of {{classname}} to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals({{classname}} other)
+        {
+            if (other is null) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return {{#vars}}{{^isContainer}}
+                (
+                    {{name}} == other.{{name}} ||
+                    {{^vendorExtensions.x-is-value-type}}{{name}} != null &&{{/vendorExtensions.x-is-value-type}}
+                    {{name}}.Equals(other.{{name}})
+                ){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}}
+                (
+                    {{name}} == other.{{name}} ||
+                    {{^vendorExtensions.x-is-value-type}}{{name}} != null &&
+                    other.{{name}} != null &&
+                    {{/vendorExtensions.x-is-value-type}}{{name}}.SequenceEqual(other.{{name}})
+                ){{^-last}} && {{/-last}}{{/isContainer}}{{/vars}}{{^vars}}false{{/vars}};
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                var hashCode = 41;
+                // Suitable nullity checks etc, of course :)
+                {{#vars}}
+                    {{^vendorExtensions.x-is-value-type}}if ({{name}} != null){{/vendorExtensions.x-is-value-type}}
+                    hashCode = hashCode * 59 + {{name}}.GetHashCode();
+                {{/vars}}
+                return hashCode;
+            }
+        }
+
+        #region Operators
+        #pragma warning disable 1591
+
+        public static bool operator ==({{classname}} left, {{classname}} right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=({{classname}} left, {{classname}} right)
+        {
+            return !Equals(left, right);
+        }
+
+        #pragma warning restore 1591
+        #endregion Operators
+        {{/pocoModels}}
+    }
+{{^useNewtonsoft}}
+
+    /// <summary>
+    /// System.Text.Json source-generation context for <see cref="{{classname}}" />.
+    /// Used by ToJson() so (de)serialization is trim- and AOT-safe.
+    /// </summary>
+    [JsonSourceGenerationOptions(WriteIndented = true)]
+    [JsonSerializable(typeof({{classname}}))]
+    internal partial class {{classname}}SerializationContext : JsonSerializerContext
+    {
+    }
+{{/useNewtonsoft}}
+{{/isEnum}}
+{{/model}}
+{{/models}}
+}

package/targets/dotnet-webapi-system-text-json/templates/paramType.mustache

@@ -0,0 +1 @@
+{{#isQueryParam}}{{#isArray}}string[]{{/isArray}}{{^isArray}}{{{dataType}}}{{/isArray}}{{/isQueryParam}}{{^isQueryParam}}{{{dataType}}}{{/isQueryParam}}

package/targets/dotnet-webapi-system-text-json/templates/serviceCollectionExtensions.mustache

@@ -0,0 +1,66 @@
+// <auto-generated/>
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Http.Json;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace {{packageName}}
+{
+    /// <summary>
+    /// Registers the System.Text.Json options required by this generated package.
+    /// Call <c>builder.Services.Add{{packageName}}JsonOptions()</c> in Program.cs.
+    /// </summary>
+    public static class {{packageName}}ServiceCollectionExtensions
+    {
+        public static IServiceCollection Add{{packageName}}JsonOptions(this IServiceCollection services)
+        {
+            services.Configure<JsonOptions>(opts =>
+                opts.SerializerOptions.Converters.Add(new EnumMemberJsonConverterFactory()));
+            return services;
+        }
+    }
+
+    /// <summary>
+    /// Converts enums using their <see cref="EnumMemberAttribute" /> wire values (falling back to
+    /// the member name), so JSON like <c>"available"</c> round-trips to <c>StatusEnum.Available</c>.
+    /// </summary>
+    internal sealed class EnumMemberJsonConverterFactory : JsonConverterFactory
+    {
+        public override bool CanConvert(Type typeToConvert) => typeToConvert.IsEnum;
+
+        public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options) =>
+            (JsonConverter?)Activator.CreateInstance(
+                typeof(EnumMemberJsonConverter<>).MakeGenericType(typeToConvert));
+    }
+
+    internal sealed class EnumMemberJsonConverter<T> : JsonConverter<T> where T : struct, Enum
+    {
+        private static readonly Dictionary<string, T> _read;
+        private static readonly Dictionary<T, string> _write;
+
+        static EnumMemberJsonConverter()
+        {
+            _read = new Dictionary<string, T>(StringComparer.OrdinalIgnoreCase);
+            _write = new Dictionary<T, string>();
+            foreach (var field in typeof(T).GetFields(BindingFlags.Public | BindingFlags.Static))
+            {
+                var wireValue = field.GetCustomAttribute<EnumMemberAttribute>()?.Value ?? field.Name;
+                var enumValue = (T)field.GetValue(null)!;
+                _read[wireValue] = enumValue;
+                _write[enumValue] = wireValue;
+            }
+        }
+
+        public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
+            _read.TryGetValue(reader.GetString() ?? string.Empty, out var value)
+                ? value
+                : throw new JsonException($"Unknown value '{reader.GetString()}' for {typeof(T).Name}");
+
+        public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options) =>
+            writer.WriteStringValue(_write.TryGetValue(value, out var s) ? s : value.ToString());
+    }
+}

package/targets/react/templates/hook.mustache

@@ -41,7 +41,8 @@ import {
 {{#operation}}
 
 export type {{classname}}{{#lambda.titlecase}}{{nickname}}{{/lambda.titlecase}}Params =
-  {{#allParams.0}}{{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request{{/allParams.0}}{{^allParams.0}}void{{/allParams.0}} & { [HEADERS]?: Record<string, string> };
+  {{#allParams.0}}{{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request & { [HEADERS]?: Record<string, string> };{{/allParams.0}}
+  {{^allParams.0}}void | { [HEADERS]?: Record<string, string> };{{/allParams.0}}
 
 /**
   * `{{httpMethod}} {{path}}`
@@ -71,7 +72,13 @@ export function use{{#lambda.titlecase}}{{nickname}}{{/lambda.titlecase}}Mutatio
 
   return useMutation<{{{returnType}}}{{^returnType}}void{{/returnType}}, TError, {{classname}}{{#lambda.titlecase}}{{nickname}}{{/lambda.titlecase}}Params, TContext>({
     {{#allParams.0}}
-    mutationFn: ({ [HEADERS]: headers, ...params }) => api.{{nickname}}(params, { headers: { ...optionsHeaders, ...headers } }),
+    mutationFn: ({ [HEADERS]: headers, ...params }) => api.{{nickname}}(
+      params,
+      async ({ init }) => ({
+        ...init,
+        headers: { ...init.headers, ...optionsHeaders, ...headers }
+      })
+    ),
     {{/allParams.0}}
     {{^allParams.0}}
     mutationFn: () => api.{{nickname}}(),
@@ -175,12 +182,20 @@ export function use{{#lambda.titlecase}}{{nickname}}{{/lambda.titlecase}}Query(
   return useQuery({
     {{#allParams.0}}
     queryKey: {{#lambda.camelcase}}{{nickname}}{{/lambda.camelcase}}QueryKey.withParams(params, headers),
-    queryFn: ({ signal }) => api.{{nickname}}(params, { signal, headers }),
+    queryFn: ({ signal }) => api.{{nickname}}(params, async ({ init }) => ({
+      ...init,
+      signal,
+      headers: { ...init.headers, ...headers }
+    })),
     enabled: typeof params !== 'undefined' && enabled,
     {{/allParams.0}}
     {{^allParams.0}}
     queryKey: {{#lambda.camelcase}}{{nickname}}{{/lambda.camelcase}}QueryKey.all(headers),
-    queryFn: ({ signal }) => api.{{nickname}}({ signal, headers }),
+    queryFn: ({ signal }) => api.{{nickname}}(async ({ init }) => ({
+      ...init,
+      signal,
+      headers: { ...init.headers, ...headers }
+    })),
     enabled,
     {{/allParams.0}}
     ...options,
@@ -217,11 +232,19 @@ export function use{{#lambda.titlecase}}{{nickname}}{{/lambda.titlecase}}Suspens
   return useSuspenseQuery({
     {{#allParams.0}}
     queryKey: {{#lambda.camelcase}}{{nickname}}{{/lambda.camelcase}}QueryKey.withParams(params, headers),
-    queryFn: ({ signal }) => api.{{nickname}}(params, { signal, headers }),
+    queryFn: ({ signal }) => api.{{nickname}}(params, async ({ init }) => ({
+      ...init,
+      signal,
+      headers: { ...init.headers, ...headers }
+    })),
     {{/allParams.0}}
     {{^allParams.0}}
     queryKey: {{#lambda.camelcase}}{{nickname}}{{/lambda.camelcase}}QueryKey.all(headers),
-    queryFn: ({ signal }) => api.{{nickname}}({ signal, headers }),
+    queryFn: ({ signal }) => api.{{nickname}}(async ({ init }) => ({
+      ...init,
+      signal,
+      headers: { ...init.headers, ...headers }
+    })),
     {{/allParams.0}}
     ...options,
   });