Skip to content

Commit 5db88cc

Browse files
joadanjoadan
committed
Update Templates
1 parent 46723df commit 5db88cc

7 files changed

Lines changed: 33 additions & 45 deletions

File tree

‎src/Linq2GraphQL.Generator/GraphQLSchema/RootSchema.cs‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,17 +136,6 @@ public class BaseField
136136

137137
public BaseType Type { get; set; }
138138

139-
140-
//private TypeInfo fieldInfo;
141-
//public TypeInfo FieldInfo
142-
//{
143-
// get
144-
// {
145-
// fieldInfo ??= GetFieldTypeInfo();
146-
// return fieldInfo;
147-
// }
148-
//}
149-
150139
private CoreType coreType;
151140
public CoreType CoreType
152141
{
@@ -202,7 +191,7 @@ public string GetArgString(bool addTypeAttribute)
202191
if (addTypeAttribute)
203192
{
204193
result +=
205-
$"[GraphArgument(\"{arg.CoreType.GraphQLTypeDefinition}\")] {arg.CoreType.CSharpTypeDefinition} {arg.Name.ToCamelCase()}";
194+
$"[GraphQLArgument(\"{arg.Name}\", \"{arg.CoreType.GraphQLTypeDefinition}\")] {arg.CoreType.CSharpTypeDefinition} {arg.Name.ToCamelCase()}";
206195
}
207196
else
208197
{

‎src/Linq2GraphQL.Generator/Templates/Class/ClassTemplate.cs‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public virtual string TransformText()
6969

7070
#line default
7171
#line hidden
72-
this.Write(" [GraphMethod(\"");
72+
this.Write(" [GraphQLMember(\"");
7373

7474
#line 19 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
7575
this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
@@ -219,119 +219,119 @@ public virtual string TransformText()
219219
#line default
220220
#line hidden
221221
this.Write(" = new();\r\n /// <summary>\r\n /// Do not use in Query, only to retrive result" +
222-
"\r\n /// </summary>\r\n [GraphShadowProperty]\r\n public ");
222+
"\r\n /// </summary>\r\n public ");
223223

224-
#line 47 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
224+
#line 46 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
225225
this.Write(this.ToStringHelper.ToStringWithCulture(GetFieldCSharpName(field)));
226226

227227
#line default
228228
#line hidden
229229
this.Write(" ");
230230

231-
#line 47 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
231+
#line 46 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
232232
this.Write(this.ToStringHelper.ToStringWithCulture(field.CSharpName));
233233

234234
#line default
235235
#line hidden
236236
this.Write(" => _");
237237

238-
#line 47 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
238+
#line 46 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
239239
this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
240240

241241
#line default
242242
#line hidden
243243
this.Write(".Value(() => GetFirstMethodValue<");
244244

245-
#line 47 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
245+
#line 46 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
246246
this.Write(this.ToStringHelper.ToStringWithCulture(GetFieldCSharpName(field)));
247247

248248
#line default
249249
#line hidden
250250
this.Write(">(\"");
251251

252-
#line 47 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
252+
#line 46 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
253253
this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
254254

255255
#line default
256256
#line hidden
257257
this.Write("\"));\r\n\r\n");
258258

259-
#line 49 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
259+
#line 48 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
260260
} else {
261261

262262
#line default
263263
#line hidden
264264

265-
#line 50 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
265+
#line 49 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
266266
if (field.HasDescription) {
267267

268268
#line default
269269
#line hidden
270270
this.Write(" /// <summary>\r\n /// ");
271271

272-
#line 52 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
272+
#line 51 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
273273
this.Write(this.ToStringHelper.ToStringWithCulture(field.Description));
274274

275275
#line default
276276
#line hidden
277277
this.Write("\r\n /// </summary>\r\n");
278278

279-
#line 54 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
279+
#line 53 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
280280
}
281281

282282
#line default
283283
#line hidden
284284
this.Write(" [JsonPropertyName(\"");
285285

286-
#line 55 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
286+
#line 54 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
287287
this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
288288

289289
#line default
290290
#line hidden
291291
this.Write("\")]\r\n [GraphQLMember(\"");
292292

293-
#line 56 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
293+
#line 55 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
294294
this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
295295

296296
#line default
297297
#line hidden
298298
this.Write("\")]\r\n public ");
299299

300-
#line 57 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
300+
#line 56 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
301301
this.Write(this.ToStringHelper.ToStringWithCulture(GetFieldCSharpName(field)));
302302

303303
#line default
304304
#line hidden
305305
this.Write(" ");
306306

307-
#line 57 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
307+
#line 56 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
308308
this.Write(this.ToStringHelper.ToStringWithCulture(field.CSharpName));
309309

310310
#line default
311311
#line hidden
312312
this.Write(" { get; set; }\r\n\r\n");
313313

314-
#line 59 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
314+
#line 58 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
315315
}
316316

317317
#line default
318318
#line hidden
319319

320-
#line 60 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
320+
#line 59 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
321321
}
322322

323323
#line default
324324
#line hidden
325325

326-
#line 61 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
326+
#line 60 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
327327
if (classType.HasInterfaces) {
328328

329329
#line default
330330
#line hidden
331331
this.Write(" [JsonPropertyName(\"__typename\")]\r\n public string __TypeName { get; set; }\r" +
332332
"\n");
333333

334-
#line 64 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
334+
#line 63 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\ClassTemplate.tt"
335335
}
336336

337337
#line default

‎src/Linq2GraphQL.Generator/Templates/Class/ClassTemplate.tt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace <#= namespaceName #>;
1616
public static class <#= classType.Name #>Extensions
1717
{
1818
<# foreach (var field in classType.AllFields.Where(e => e.IsMethod)) { #>
19-
[GraphMethod("<#= field.Name #>")]
19+
[GraphQLMember("<#= field.Name #>")]
2020
public static <#= GetFieldCSharpName(field) #> <#= field.CSharpName #>(this <#= classType.Name #> <#= classType.Name.ToCamelCase() #>, <#= field.GetArgString(true) #>)
2121
{
2222
return <#= classType.Name.ToCamelCase() #>.GetMethodValue<<#= GetFieldCSharpName(field) #>>("<#= field.Name #>", <#= field.GetArgNames() #>);
@@ -43,7 +43,6 @@ public partial class <#= classType.Name #> <#= classType.GetInterfacesString("Gr
4343
/// <summary>
4444
/// Do not use in Query, only to retrive result
4545
/// </summary>
46-
[GraphShadowProperty]
4746
public <#= GetFieldCSharpName(field) #> <#= field.CSharpName #> => _<#= field.Name #>.Value(() => GetFirstMethodValue<<#= GetFieldCSharpName(field) #>>("<#= field.Name #>"));
4847

4948
<# } else { #>

‎src/Linq2GraphQL.Generator/Templates/Class/InputClassTemplate.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public virtual string TransformText()
5858

5959
#line default
6060
#line hidden
61-
this.Write("\t[JsonPropertyName(\"");
61+
this.Write("\t[GraphQLMember(\"");
6262

6363
#line 18 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Class\InputClassTemplate.tt"
6464
this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));

‎src/Linq2GraphQL.Generator/Templates/Class/InputClassTemplate.tt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public partial class <#= classType.Name #> : GraphInputBase
1515
{
1616
var coreType = field.CoreType;
1717
#>
18-
[JsonPropertyName("<#= field.Name #>")]
18+
[GraphQLMember("<#= field.Name #>")]
1919
public <#= GetPropertyDefinition(field) #> <#= field.CSharpName #>
2020
{
2121
get => GetValue<<#= coreType.CSharpTypeDefinition #>>("<#= field.Name #>");

‎src/Linq2GraphQL.Generator/Templates/Interface/InterfaceTemplate.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public virtual string TransformText()
178178

179179
#line default
180180
#line hidden
181-
this.Write("\t[JsonPropertyName(\"");
181+
this.Write("\t[GraphQLMember(\"");
182182

183183
#line 52 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
184184
this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
@@ -208,8 +208,8 @@ public virtual string TransformText()
208208

209209
#line default
210210
#line hidden
211-
this.Write(" [JsonPropertyName(\"__typename\")]\r\n public string __TypeName { get; set; }\r" +
212-
"\n\r\n}\r\n\r\ninternal class ");
211+
this.Write(" [GraphQLMember(\"__typename\")]\r\n public string __TypeName { get; set; }\r\n\r\n" +
212+
"}\r\n\r\ninternal class ");
213213

214214
#line 62 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
215215
this.Write(this.ToStringHelper.ToStringWithCulture(GetInterfaceConcreteName()));
@@ -234,7 +234,7 @@ public virtual string TransformText()
234234

235235
#line default
236236
#line hidden
237-
this.Write("\t[JsonPropertyName(\"");
237+
this.Write("\t[GraphQLMember(\"");
238238

239239
#line 69 "C:\Code\Github\Linq2GraphQL.Client\src\Linq2GraphQL.Generator\Templates\Interface\InterfaceTemplate.tt"
240240
this.Write(this.ToStringHelper.ToStringWithCulture(field.Name));
@@ -264,8 +264,8 @@ public virtual string TransformText()
264264

265265
#line default
266266
#line hidden
267-
this.Write("\r\n [JsonPropertyName(\"__typename\")]\r\n public string __TypeName { get; set; " +
268-
"}\r\n\r\n}");
267+
this.Write("\r\n [GraphQLMember(\"__typename\")]\r\n public string __TypeName { get; set; }\r\n" +
268+
"\r\n}");
269269
return this.GenerationEnvironment.ToString();
270270
}
271271
}

‎src/Linq2GraphQL.Generator/Templates/Interface/InterfaceTemplate.tt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ public interface <#= classType.Name #> <#= classType.GetInterfacesString() #>
4949
{
5050
var coreType = field.CoreType;
5151
#>
52-
[JsonPropertyName("<#= field.Name #>")]
52+
[GraphQLMember("<#= field.Name #>")]
5353
public <#= coreType.CSharpTypeDefinition #> <#= field.CSharpName #> { get; set; }
5454
<#
5555
}
5656
#>
57-
[JsonPropertyName("__typename")]
57+
[GraphQLMember("__typename")]
5858
public string __TypeName { get; set; }
5959

6060
}
@@ -66,13 +66,13 @@ internal class <#= GetInterfaceConcreteName() #> : <#= classType.Name #>
6666
{
6767
var coreType = field.CoreType;
6868
#>
69-
[JsonPropertyName("<#= field.Name #>")]
69+
[GraphQLMember("<#= field.Name #>")]
7070
public <#= coreType.CSharpTypeDefinition #> <#= field.CSharpName #> { get; set; }
7171
<#
7272
}
7373
#>
7474

75-
[JsonPropertyName("__typename")]
75+
[GraphQLMember("__typename")]
7676
public string __TypeName { get; set; }
7777

7878
}

0 commit comments

Comments
 (0)