AddArguments<TArguments>(TArguments arguments) supports inner object (#28)

Co-authored-by: Carlos H. Carniatto <[email protected]>
Co-authored-by: Charles de Vandière <[email protected]>

Author: charlesdevandiere

.config/dotnet-tools.json

@@ -9,7 +9,7 @@
       ]
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "4.8.1",
+      "version": "5.1.3",
       "commands": [
         "reportgenerator"
       ]

.vscode/launch.json

@@ -6,7 +6,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "build",
-      "program": "${workspaceFolder}/sample/Pokedex/bin/Debug/netcoreapp3.1/Pokedex.dll",
+      "program": "${workspaceFolder}/sample/Pokedex/bin/Debug/net6.0/Pokedex.dll",
       "args": [
         "pikachu"
       ],

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Charles de Vandière
+Copyright (c) 2022 Charles de Vandière
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -11,7 +11,7 @@ A tool to build GraphQL query from a C# model.
 
 See complete documentation [here](https://charlesdevandiere.github.io/graphql-query-builder-dotnet/)
 
-See sample [here](sample/Pokedex)
+See sample [here](https://github.com/charlesdevandiere/graphql-query-builder-dotnet/tree/master/sample/Pokedex)
 
 ## Install
 

azure-pipelines.yml

@@ -6,7 +6,7 @@ variables:
   buildConfiguration: Release
 
 trigger:
-  batch: true
+  batch: 'true'
   branches:
     include:
       - master
@@ -16,42 +16,39 @@ trigger:
       - README.md
 
 steps:
-  - checkout: self
-    clean: true
-    persistCredentials: true
-
   - task: UseGitVersion@5
     displayName: GitVersion
     inputs:
       versionSpec: '5.x'
 
   - script: dotnet tool restore
-    displayName: 'dotnet tool restore'
+    displayName: 'Restore tools'
+
+  - script: dotnet build -c $(buildConfiguration)
+    displayName: 'Build'
 
-  - script: dotnet test -c $(buildConfiguration) --logger xunit -p:CollectCoverage=true -p:CoverletOutputFormat=cobertura -p:Exclude="[*]Shared.Models.*"
-    displayName: 'dotnet test'
+  - script: dotnet test --no-build -c $(buildConfiguration) --logger xunit -p:CollectCoverage=true -p:CoverletOutputFormat=cobertura -p:Exclude="[*]Shared.Models.*"
+    displayName: 'Test'
 
-  - script: dotnet pack ./src/GraphQL.Query.Builder/GraphQL.Query.Builder.csproj -c $(buildConfiguration) -o $(Build.ArtifactStagingDirectory)/out -p:Version=$(GitVersion.SemVer) --include-symbols
-    displayName: 'dotnet pack'
+  - script: dotnet pack ./src/GraphQL.Query.Builder/GraphQL.Query.Builder.csproj --no-build -c $(buildConfiguration) -o $(Build.ArtifactStagingDirectory)/out -p:Version=$(GitVersion.SemVer)
+    displayName: 'Pack'
 
   - task: PublishTestResults@2
-    displayName: 'publish test results'
+    displayName: 'Publish test results'
     inputs:
       testRunner: xUnit
       testResultsFiles: '**/TestResults.xml'
 
   - script: dotnet tool run reportgenerator -reports:**/coverage.cobertura.xml -targetdir:tests/coverage -reportTypes:Cobertura
-    displayName: 'generate code coverage report'
+    displayName: 'Generate code coverage report'
 
   - task: PublishCodeCoverageResults@1
-    displayName: 'publish code coverage'
+    displayName: 'Publish code coverage'
     inputs:
       codeCoverageTool: cobertura
       summaryFileLocation: '**/Cobertura.xml'
 
-  - task: PublishBuildArtifacts@1
-    displayName: 'publish artifact'
+  - publish: $(Build.ArtifactStagingDirectory)/out
     condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
-    inputs:
-      PathtoPublish: $(Build.ArtifactStagingDirectory)/out
-      ArtifactName: out
+    artifact: out
+    displayName: Publish artifact

src/GraphQL.Query.Builder/GraphQL.Query.Builder.csproj

@@ -3,16 +3,42 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Version>0.0.0</Version>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+
     <Authors>Charles de Vandière</Authors>
+    <Copyright>© 2022 Charles de Vandière</Copyright>
+    <Product>GraphQL.Query.Builder</Product>
+    <Title>GraphQL.Query.Builder</Title>
     <Description>A tool to build GraphQL query from a C# model.</Description>
+    <Summary>A tool to build GraphQL query from a C# model.</Summary>
+    <PackageIcon>logo.png</PackageIcon>
+    <PackageIconUrl>https://raw.githubusercontent.com/charlesdevandiere/graphql-query-builder-dotnet/master/logo.png</PackageIconUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://charlesdevandiere.github.io/graphql-query-builder-dotnet</PackageProjectUrl>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageTags>graphql</PackageTags>
+    <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/charlesdevandiere/graphql-query-builder-dotnet</RepositoryUrl>
-    <PackageIconUrl>https://raw.githubusercontent.com/charlesdevandiere/graphql-query-builder-dotnet/master/logo.png</PackageIconUrl>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="..\..\logo.png" Pack="true" PackagePath="/"/>
+    <None Include="..\..\LICENSE" Pack="true" PackagePath="LICENSE" />
+    <None Include="..\..\README.md" Pack="true" PackagePath="/" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Dawn.Guard" Version="1.12.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
   </ItemGroup>
 </Project>

src/GraphQL.Query.Builder/PropertyNameFormatter.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Reflection;
+using Dawn;
+using Newtonsoft.Json;
+
+namespace GraphQL.Query.Builder
+{
+    /// <summary>The query formatter class.</summary>
+    internal static class PropertyNameFormatter
+    {
+        /// <summary>Tries to get property name from JSON property attribute or from optional formater.</summary>
+        /// <param name="property">The property.</param>
+        /// <param name="formatter">The formatter.</param>
+        /// <returns>The property name.</returns>
+        internal static string GetPropertyName(PropertyInfo property, Func<string, string> formatter = null)
+        {
+            Guard.Argument(property, nameof(property)).NotNull();
+
+            Attribute jsonAttribute = property.GetCustomAttribute(typeof(JsonPropertyAttribute));
+
+            if (jsonAttribute != null)
+            {
+                if (!string.IsNullOrEmpty((jsonAttribute as JsonPropertyAttribute).PropertyName))
+                {
+                    return (jsonAttribute as JsonPropertyAttribute).PropertyName;
+                }
+            }
+
+            if (formatter != null)
+            {
+                return formatter.Invoke(property.Name);
+            }
+
+            return property.Name;
+        }
+    }
+}

src/GraphQL.Query.Builder/QueryOf{T}.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using Dawn;
-using Newtonsoft.Json;
 
 [assembly: InternalsVisibleTo("GraphQL.Query.Builder.UnitTests")]
 namespace GraphQL.Query.Builder
@@ -71,7 +71,7 @@ public IQuery<TSource> AddField<TProperty>(Expression<Func<TSource, TProperty>>
             Guard.Argument(selector, nameof(selector)).NotNull();
 
             PropertyInfo property = GetPropertyInfo(selector);
-            string name = GetPropertyName(property);
+            string name = PropertyNameFormatter.GetPropertyName(property, this.options?.Formatter);
 
             this.SelectList.Add(name);
 
@@ -104,7 +104,7 @@ public IQuery<TSource> AddField<TSubSource>(
             Guard.Argument(build, nameof(build)).NotNull();
 
             PropertyInfo property = GetPropertyInfo(selector);
-            string name = GetPropertyName(property);
+            string name = PropertyNameFormatter.GetPropertyName(property, this.options?.Formatter);
 
             return AddField(name, build);
         }
@@ -123,7 +123,7 @@ public IQuery<TSource> AddField<TSubSource>(
             Guard.Argument(build, nameof(build)).NotNull();
 
             PropertyInfo property = GetPropertyInfo(selector);
-            string name = GetPropertyName(property);
+            string name = PropertyNameFormatter.GetPropertyName(property, this.options?.Formatter);
 
             return AddField(name, build);
         }
@@ -185,10 +185,16 @@ public IQuery<TSource> AddArguments<TArguments>(TArguments arguments) where TArg
         {
             Guard.Argument(arguments, nameof(arguments)).NotNull();
 
-            PropertyInfo[] properties = typeof(TArguments).GetProperties();
+            IEnumerable<PropertyInfo> properties = arguments
+                .GetType()
+                .GetProperties()
+                .Where(property => property.GetValue(arguments) != null)
+                .OrderBy(property => property.Name);
             foreach (PropertyInfo property in properties)
             {
-                this.Arguments.Add(this.GetPropertyName(property), property.GetValue(arguments));
+                this.Arguments.Add(
+                    PropertyNameFormatter.GetPropertyName(property, this.options?.Formatter),
+                    property.GetValue(arguments));
             }
 
             return this;
@@ -238,30 +244,5 @@ private static PropertyInfo GetPropertyInfo<TProperty>(Expression<Func<TSource,
 
             return propertyInfo;
         }
-
-        /// <summary>Tries to get property name from JSON property attribute or from optional formater.</summary>
-        /// <param name="property">The property.</param>
-        /// <returns>The property name.</returns>
-        private string GetPropertyName(PropertyInfo property)
-        {
-            Guard.Argument(property, nameof(property)).NotNull();
-
-            Attribute attribute = property.GetCustomAttribute(typeof(JsonPropertyAttribute));
-
-            if (attribute != null)
-            {
-                if (!string.IsNullOrEmpty((attribute as JsonPropertyAttribute).PropertyName))
-                {
-                    return (attribute as JsonPropertyAttribute).PropertyName;
-                }
-            }
-
-            if (this.options?.Formatter != null)
-            {
-                return this.options.Formatter.Invoke(property.Name);
-            }
-
-            return property.Name;
-        }
     }
 }