ensure msbuild based c# generated code merge queries into single class/file

Author: tocsoft

Samples/ClientSample/Client/GitHub/addStar.gql

@@ -1,3 +1,4 @@
+#! class:Sample.Client.GitHub.GitHubClientOther
 mutation ($repositoyId : ID!){
   addStar(input :{clientMutationId : "123",  starrableId :$repositoyId }){
     starrable {

Samples/ClientSample/Client/GitHub/gqlsettings.json

@@ -1,5 +1,4 @@
 {
   "class": "Sample.Client.GitHub.GitHubClient",
-  "output": "generated.cs", // this is relative to this file
-  "schema": "schema.json"
+,k  "schema": "schema.json"
 }

Samples/ClientSample/Client/GitHubTypescript/generated.ts

@@ -35,7 +35,7 @@ export default class GitHubTsClient {
 
     constructor(public client: fetchClient, public url: string) { }
 
-	addStar(	repositoyId? :string) : Promise<AddStarResult>{
+	addStar(	repositoyId :string) : Promise<AddStarResult>{
         return this.client.fetch(this.url, {
             method : 'POST',
             body : JSON.stringify({
@@ -95,7 +95,7 @@ export default class GitHubTsClient {
             }
         })
     }	
-	search(	type? :SearchType, 	query? :string) : Promise<SearchResult>{
+	search(	type :SearchType, 	query :string) : Promise<SearchResult>{
         return this.client.fetch(this.url, {
             method : 'POST',
             body : JSON.stringify({
@@ -140,7 +140,7 @@ export default class GitHubTsClient {
             }
         })
     }	
-	usersRepositores(	login? :string, 	repoCount? :number) : Promise<UsersRepositoresResult>{
+	usersRepositores(	login :string, 	repoCount :number) : Promise<UsersRepositoresResult>{
         return this.client.fetch(this.url, {
             method : 'POST',
             body : JSON.stringify({
@@ -187,24 +187,24 @@ export default class GitHubTsClient {
     }	
 }
 
-export class StarrableResult {
-		viewerHasStarred? :boolean;
+export class AddStarResult {
+		addStar? :AddStarPayloadResult;
 
-    static fromJS(json:any):StarrableResult{
+    static fromJS(json:any):AddStarResult{
         if(json == null || json == undefined){
             return null;
         }
 
-        var result = new StarrableResult();
+        var result = new AddStarResult();
 
-	result.viewerHasStarred = json["viewerHasStarred"];
+result.addStar= AddStarPayloadResult.fromJS(json["addStar"]);
 
         return result;
     }
 }
 
 export class AddStarPayloadResult {
-		starrable? :StarrableResult;
+		starrable :StarrableResult;
 
     static fromJS(json:any):AddStarPayloadResult{
         if(json == null || json == undefined){
@@ -219,90 +219,92 @@ result.starrable= StarrableResult.fromJS(json["starrable"]);
     }
 }
 
-export class AddStarResult {
-		addStar :AddStarPayloadResult;
+export class StarrableResult {
+		viewerHasStarred :boolean;
 
-    static fromJS(json:any):AddStarResult{
+    static fromJS(json:any):StarrableResult{
         if(json == null || json == undefined){
             return null;
         }
 
-        var result = new AddStarResult();
+        var result = new StarrableResult();
 
-result.addStar= AddStarPayloadResult.fromJS(json["addStar"]);
+	result.viewerHasStarred = json["viewerHasStarred"];
 
         return result;
     }
 }
 
-export class UserResult {
-		login? :string;
-		bio :string;
+export class CurrentUserResult {
+		viewer :UserResult;
 
-    static fromJS(json:any):UserResult{
+    static fromJS(json:any):CurrentUserResult{
         if(json == null || json == undefined){
             return null;
         }
 
-        var result = new UserResult();
+        var result = new CurrentUserResult();
 
-	result.login = json["login"];
-	result.bio = json["bio"];
+result.viewer= UserResult.fromJS(json["viewer"]);
 
         return result;
     }
 }
 
-export class CurrentUserResult {
-		viewer? :UserResult;
+export class UserResult {
+		login :string;
+		bio? :string;
 
-    static fromJS(json:any):CurrentUserResult{
+    static fromJS(json:any):UserResult{
         if(json == null || json == undefined){
             return null;
         }
 
-        var result = new CurrentUserResult();
+        var result = new UserResult();
 
-result.viewer= UserResult.fromJS(json["viewer"]);
+	result.login = json["login"];
+	result.bio = json["bio"];
 
         return result;
     }
 }
 
-export class User1Result {
-		login? :string;
+export class SearchResult {
+		viewer :User1Result;
+		search :SearchResultItemConnectionResult;
 
-    static fromJS(json:any):User1Result{
+    static fromJS(json:any):SearchResult{
         if(json == null || json == undefined){
             return null;
         }
 
-        var result = new User1Result();
+        var result = new SearchResult();
 
-	result.login = json["login"];
+result.viewer= User1Result.fromJS(json["viewer"]);
+result.search= SearchResultItemConnectionResult.fromJS(json["search"]);
 
         return result;
     }
 }
 
-export class SearchResultItemResult {
-		__typename :string;
+export class User1Result {
+		login :string;
 
-    static fromJS(json:any):SearchResultItemResult{
+    static fromJS(json:any):User1Result{
         if(json == null || json == undefined){
             return null;
         }
 
-        var result = new SearchResultItemResult();
+        var result = new User1Result();
 
-	result.__typename = json["__typename"];
+	result.login = json["login"];
 
         return result;
     }
 }
 
 export class SearchResultItemConnectionResult {
-		nodes :Array<SearchResultItemResult>;
+		nodes? :Array<SearchResultItemResult>;
 
     static fromJS(json:any):SearchResultItemConnectionResult{
         if(json == null || json == undefined){
@@ -319,95 +321,93 @@ if(json["nodes"]){
     }
 }
 
-export class SearchResult {
-		viewer? :User1Result;
-		search? :SearchResultItemConnectionResult;
+export class SearchResultItemResult {
+		__typename :string;
 
-    static fromJS(json:any):SearchResult{
+    static fromJS(json:any):SearchResultItemResult{
         if(json == null || json == undefined){
             return null;
         }
 
-        var result = new SearchResult();
+        var result = new SearchResultItemResult();
 
-result.viewer= User1Result.fromJS(json["viewer"]);
-result.search= SearchResultItemConnectionResult.fromJS(json["search"]);
+	result.__typename = json["__typename"];
 
         return result;
     }
 }
 
-export class RepositoryResult {
-		id? :string;
-		name? :string;
-		updatedAt? :Date;
+export class UsersRepositoresResult {
+		user? :User2Result;
 
-    static fromJS(json:any):RepositoryResult{
+    static fromJS(json:any):UsersRepositoresResult{
         if(json == null || json == undefined){
             return null;
         }
 
-        var result = new RepositoryResult();
+        var result = new UsersRepositoresResult();
 
-	result.id = json["id"];
-	result.name = json["name"];
-result.updatedAt = json["updatedAt"] ? new Date(json["updatedAt"]) : null;
+result.user= User2Result.fromJS(json["user"]);
 
         return result;
     }
 }
 
-export class RepositoryConnectionResult {
-		nodes :Array<RepositoryResult>;
+export class User2Result {
+		login :string;
+		bio? :string;
+		first :RepositoryConnectionResult;
+		last :RepositoryConnectionResult;
 
-    static fromJS(json:any):RepositoryConnectionResult{
+    static fromJS(json:any):User2Result{
         if(json == null || json == undefined){
             return null;
         }
 
-        var result = new RepositoryConnectionResult();
+        var result = new User2Result();
 
-if(json["nodes"]){ 
-		result.nodes = json["nodes"].map(v=>RepositoryResult.fromJS(v) );	
-	}
+	result.login = json["login"];
+	result.bio = json["bio"];
+result.first= RepositoryConnectionResult.fromJS(json["first"]);
+result.last= RepositoryConnectionResult.fromJS(json["last"]);
 
         return result;
     }
 }
 
-export class User2Result {
-		login? :string;
-		bio :string;
-		first? :RepositoryConnectionResult;
-		last? :RepositoryConnectionResult;
+export class RepositoryConnectionResult {
+		nodes? :Array<RepositoryResult>;
 
-    static fromJS(json:any):User2Result{
+    static fromJS(json:any):RepositoryConnectionResult{
         if(json == null || json == undefined){
             return null;
         }
 
-        var result = new User2Result();
+        var result = new RepositoryConnectionResult();
 
-	result.login = json["login"];
-	result.bio = json["bio"];
-result.first= RepositoryConnectionResult.fromJS(json["first"]);
-result.last= RepositoryConnectionResult.fromJS(json["last"]);
+if(json["nodes"]){ 
+		result.nodes = json["nodes"].map(v=>RepositoryResult.fromJS(v) );	
+	}
 
         return result;
     }
 }
 
-export class UsersRepositoresResult {
-		user :User2Result;
+export class RepositoryResult {
+		id :string;
+		name :string;
+		updatedAt :Date;
 
-    static fromJS(json:any):UsersRepositoresResult{
+    static fromJS(json:any):RepositoryResult{
         if(json == null || json == undefined){
             return null;
         }
 
-        var result = new UsersRepositoresResult();
+        var result = new RepositoryResult();
 
-result.user= User2Result.fromJS(json["user"]);
+	result.id = json["id"];
+	result.name = json["name"];
+result.updatedAt = json["updatedAt"] ? new Date(json["updatedAt"]) : null;
 
         return result;
     }

Samples/ClientSample/Client/GitHubTypescript/gqlsettings.json

@@ -1,5 +1,6 @@
 {
   "class": "Sample.Client.GitHub.GitHubTS",
   "output": "generated.ts", // this is relative to this file
+  "format": "ts",
   "schema": "schema.json"
 }

Samples/ClientSample/Program.cs

@@ -21,8 +21,7 @@ static async Task Main(string[] args)
                     { "Authorization", $"Bearer {accesstoken}" }
                 }
             };
-
-            var c = new Test.IntrospectedClient(httpClient);
+            
             httpClient.DefaultRequestHeaders.Accept.Add(new System.Net.Http.Headers.MediaTypeWithQualityHeaderValue("application/json"));
             var client = new Client.GitHub.GitHubClient(httpClient);
             var result = await client.UsersRepositoresAsync("tocsoft", 10);