@graphql-codegen/c-sharp-operations 3.0.0 → 3.1.0

package/cjs/visitor.js

@@ -22,11 +22,13 @@ class CSharpOperationsVisitor extends visitor_plugin_common_1.ClientSideBaseVisi
             subscriptionSuffix: rawConfig.subscriptionSuffix || defaultSuffix,
             scalars: (0, visitor_plugin_common_1.buildScalarsFromConfig)(schema, rawConfig, c_sharp_common_1.C_SHARP_SCALARS),
             typesafeOperation: rawConfig.typesafeOperation || false,
+            memberNamingFunction: (0, c_sharp_common_1.getMemberNamingFunction)(rawConfig),
         }, documents);
         this._operationsToInclude = [];
         this.overruleConfigSettings();
         (0, auto_bind_1.default)(this);
         this._schemaAST = (0, plugin_helpers_1.getCachedDocumentNodeFromSchema)(schema);
+        this._fragmentList = fragments;
     }
     // Some settings aren't supported with C#, overruled here
     overruleConfigSettings() {
@@ -71,7 +73,11 @@ class CSharpOperationsVisitor extends visitor_plugin_common_1.ClientSideBaseVisi
         return name;
     }
     _gql(node) {
-        const fragments = this._transformFragments(node);
+        const includeNestedFragments = this.config.documentMode === visitor_plugin_common_1.DocumentMode.documentNode ||
+            this.config.documentMode === visitor_plugin_common_1.DocumentMode.string ||
+            (this.config.dedupeFragments && node.kind === 'OperationDefinition');
+        const fragmentNames = this._extractFragments(node, includeNestedFragments);
+        const fragments = this._transformFragments(fragmentNames);
         const doc = this._prepareDocument([(0, graphql_1.print)(node), this._includeFragments(fragments, node.kind)].join('\n'));
         return doc.replace(/"/g, '""');
     }
@@ -87,7 +93,7 @@ class CSharpOperationsVisitor extends visitor_plugin_common_1.ClientSideBaseVisi
         const name = variable.variable.name.value;
         const baseType = !(0, graphql_1.isScalarType)(schemaType)
             ? innerType.name.value
-            : this.scalars[schemaType.name] || 'object';
+            : this.scalars[schemaType.name].input || 'object';
         const listType = (0, c_sharp_common_1.getListTypeField)(typeNode);
         const required = (0, c_sharp_common_1.getListInnerTypeNode)(typeNode).kind === graphql_1.Kind.NON_NULL_TYPE;
         return {
@@ -125,9 +131,9 @@ class CSharpOperationsVisitor extends visitor_plugin_common_1.ClientSideBaseVisi
                 const baseType = this.scalars[schemaType.name];
                 result = new c_sharp_common_1.CSharpFieldType({
                     baseType: {
-                        type: baseType,
+                        type: baseType.output,
                         required,
-                        valueType: (0, c_sharp_common_1.isValueType)(baseType),
+                        valueType: (0, c_sharp_common_1.isValueType)(baseType.output),
                     },
                     listType,
                 });
@@ -204,9 +210,10 @@ class CSharpOperationsVisitor extends visitor_plugin_common_1.ClientSideBaseVisi
                 const responseType = this.resolveFieldType(fieldSchema.type);
                 if (!node.selectionSet) {
                     const responseTypeName = (0, c_sharp_common_1.wrapFieldType)(responseType, responseType.listType, 'System.Collections.Generic.List');
+                    const propertyName = (0, c_sharp_common_1.convertSafeName)(this._parsedConfig.memberNamingFunction(node.name.value));
                     return (0, visitor_plugin_common_1.indentMultiline)([
                         `[JsonProperty("${node.name.value}")]`,
-                        `public ${responseTypeName} ${(0, c_sharp_common_1.convertSafeName)(node.name.value)} { get; set; }`,
+                        `public ${responseTypeName} ${propertyName} { get; set; }`,
                     ].join('\n') + '\n');
                 }
                 const selectionBaseTypeName = `${responseType.baseType.type}Selection`;
@@ -228,14 +235,15 @@ class CSharpOperationsVisitor extends visitor_plugin_common_1.ClientSideBaseVisi
                         return this._getResponseFieldRecursive(s, innerClassSchema);
                     })
                         .join('\n')).string;
+                const propertyName = (0, c_sharp_common_1.convertSafeName)(this._parsedConfig.memberNamingFunction(node.name.value));
                 return (0, visitor_plugin_common_1.indentMultiline)([
                     innerClassDefinition,
                     `[JsonProperty("${node.name.value}")]`,
-                    `public ${selectionTypeName} ${(0, c_sharp_common_1.convertSafeName)(node.name.value)} { get; set; }`,
+                    `public ${selectionTypeName} ${propertyName} { get; set; }`,
                 ].join('\n') + '\n');
             }
             case graphql_1.Kind.FRAGMENT_SPREAD: {
-                const fragmentSchema = this._fragments.find(f => f.name === node.name.value);
+                const fragmentSchema = this._fragmentList.find(f => f.name === node.name.value);
                 if (!fragmentSchema) {
                     throw new Error(`Fragment schema not found; ${node.name.value}`);
                 }
@@ -270,9 +278,10 @@ class CSharpOperationsVisitor extends visitor_plugin_common_1.ClientSideBaseVisi
             ((_b = node.variableDefinitions) === null || _b === void 0 ? void 0 : _b.map(v => {
                 const inputType = this.resolveFieldType(v.type);
                 const inputTypeName = (0, c_sharp_common_1.wrapFieldType)(inputType, inputType.listType, 'System.Collections.Generic.List');
+                const propertyName = (0, c_sharp_common_1.convertSafeName)(this._parsedConfig.memberNamingFunction(v.variable.name.value));
                 return (0, visitor_plugin_common_1.indentMultiline)([
                     `[JsonProperty("${v.variable.name.value}")]`,
-                    `public ${inputTypeName} ${(0, c_sharp_common_1.convertSafeName)(v.variable.name.value)} { get; set; }`,
+                    `public ${inputTypeName} ${propertyName} { get; set; }`,
                 ].join('\n') + '\n');
             }).join('\n'))).string;
     }
@@ -407,9 +416,10 @@ ${this._getOperationMethod(node)}
                 }
                 const inputType = this.resolveFieldType(f.type);
                 const inputTypeName = (0, c_sharp_common_1.wrapFieldType)(inputType, inputType.listType, 'System.Collections.Generic.List');
+                const propertyName = (0, c_sharp_common_1.convertSafeName)(this._parsedConfig.memberNamingFunction(f.name.value));
                 return (0, visitor_plugin_common_1.indentMultiline)([
                     `[JsonProperty("${f.name.value}")]`,
-                    `public ${inputTypeName} ${(0, c_sharp_common_1.convertSafeName)(f.name.value)} { get; set; }`,
+                    `public ${inputTypeName} ${propertyName} { get; set; }`,
                 ].join('\n') + '\n');
             }).filter(f => !!f).join('\n'))).string;
         return (0, visitor_plugin_common_1.indentMultiline)(inputClass, 2);
@@ -423,7 +433,7 @@ ${this._getOperationMethod(node)}
             .access('public')
             .asKind('enum')
             .withName((0, c_sharp_common_1.convertSafeName)(this.convertName(node.name)))
-            .withBlock((0, visitor_plugin_common_1.indentMultiline)((_a = node.values) === null || _a === void 0 ? void 0 : _a.map(v => v.name.value).join(',\n'))).string;
+            .withBlock((0, visitor_plugin_common_1.indentMultiline)((_a = node.values) === null || _a === void 0 ? void 0 : _a.map(v => this._parsedConfig.memberNamingFunction(v.name.value)).join(',\n'))).string;
         return (0, visitor_plugin_common_1.indentMultiline)(enumDefinition, 2);
     }
 }

package/esm/visitor.js

@@ -1,6 +1,6 @@
 import autoBind from 'auto-bind';
 import { isEnumType, isInputObjectType, isScalarType, Kind, print, visit, } from 'graphql';
-import { C_SHARP_SCALARS, convertSafeName, CSharpDeclarationBlock, CSharpFieldType, getListInnerTypeNode, getListTypeDepth, getListTypeField, isValueType, wrapFieldType, } from '@graphql-codegen/c-sharp-common';
+import { C_SHARP_SCALARS, convertSafeName, CSharpDeclarationBlock, CSharpFieldType, getListInnerTypeNode, getListTypeDepth, getListTypeField, getMemberNamingFunction, isValueType, wrapFieldType, } from '@graphql-codegen/c-sharp-common';
 import { getCachedDocumentNodeFromSchema } from '@graphql-codegen/plugin-helpers';
 import { buildScalarsFromConfig, ClientSideBaseVisitor, DocumentMode, getBaseTypeNode, indent, indentMultiline, } from '@graphql-codegen/visitor-plugin-common';
 const defaultSuffix = 'GQL';
@@ -18,11 +18,13 @@ export class CSharpOperationsVisitor extends ClientSideBaseVisitor {
             subscriptionSuffix: rawConfig.subscriptionSuffix || defaultSuffix,
             scalars: buildScalarsFromConfig(schema, rawConfig, C_SHARP_SCALARS),
             typesafeOperation: rawConfig.typesafeOperation || false,
+            memberNamingFunction: getMemberNamingFunction(rawConfig),
         }, documents);
         this._operationsToInclude = [];
         this.overruleConfigSettings();
         autoBind(this);
         this._schemaAST = getCachedDocumentNodeFromSchema(schema);
+        this._fragmentList = fragments;
     }
     // Some settings aren't supported with C#, overruled here
     overruleConfigSettings() {
@@ -67,7 +69,11 @@ export class CSharpOperationsVisitor extends ClientSideBaseVisitor {
         return name;
     }
     _gql(node) {
-        const fragments = this._transformFragments(node);
+        const includeNestedFragments = this.config.documentMode === DocumentMode.documentNode ||
+            this.config.documentMode === DocumentMode.string ||
+            (this.config.dedupeFragments && node.kind === 'OperationDefinition');
+        const fragmentNames = this._extractFragments(node, includeNestedFragments);
+        const fragments = this._transformFragments(fragmentNames);
         const doc = this._prepareDocument([print(node), this._includeFragments(fragments, node.kind)].join('\n'));
         return doc.replace(/"/g, '""');
     }
@@ -83,7 +89,7 @@ export class CSharpOperationsVisitor extends ClientSideBaseVisitor {
         const name = variable.variable.name.value;
         const baseType = !isScalarType(schemaType)
             ? innerType.name.value
-            : this.scalars[schemaType.name] || 'object';
+            : this.scalars[schemaType.name].input || 'object';
         const listType = getListTypeField(typeNode);
         const required = getListInnerTypeNode(typeNode).kind === Kind.NON_NULL_TYPE;
         return {
@@ -121,9 +127,9 @@ export class CSharpOperationsVisitor extends ClientSideBaseVisitor {
                 const baseType = this.scalars[schemaType.name];
                 result = new CSharpFieldType({
                     baseType: {
-                        type: baseType,
+                        type: baseType.output,
                         required,
-                        valueType: isValueType(baseType),
+                        valueType: isValueType(baseType.output),
                     },
                     listType,
                 });
@@ -200,9 +206,10 @@ export class CSharpOperationsVisitor extends ClientSideBaseVisitor {
                 const responseType = this.resolveFieldType(fieldSchema.type);
                 if (!node.selectionSet) {
                     const responseTypeName = wrapFieldType(responseType, responseType.listType, 'System.Collections.Generic.List');
+                    const propertyName = convertSafeName(this._parsedConfig.memberNamingFunction(node.name.value));
                     return indentMultiline([
                         `[JsonProperty("${node.name.value}")]`,
-                        `public ${responseTypeName} ${convertSafeName(node.name.value)} { get; set; }`,
+                        `public ${responseTypeName} ${propertyName} { get; set; }`,
                     ].join('\n') + '\n');
                 }
                 const selectionBaseTypeName = `${responseType.baseType.type}Selection`;
@@ -224,14 +231,15 @@ export class CSharpOperationsVisitor extends ClientSideBaseVisitor {
                         return this._getResponseFieldRecursive(s, innerClassSchema);
                     })
                         .join('\n')).string;
+                const propertyName = convertSafeName(this._parsedConfig.memberNamingFunction(node.name.value));
                 return indentMultiline([
                     innerClassDefinition,
                     `[JsonProperty("${node.name.value}")]`,
-                    `public ${selectionTypeName} ${convertSafeName(node.name.value)} { get; set; }`,
+                    `public ${selectionTypeName} ${propertyName} { get; set; }`,
                 ].join('\n') + '\n');
             }
             case Kind.FRAGMENT_SPREAD: {
-                const fragmentSchema = this._fragments.find(f => f.name === node.name.value);
+                const fragmentSchema = this._fragmentList.find(f => f.name === node.name.value);
                 if (!fragmentSchema) {
                     throw new Error(`Fragment schema not found; ${node.name.value}`);
                 }
@@ -266,9 +274,10 @@ export class CSharpOperationsVisitor extends ClientSideBaseVisitor {
             ((_b = node.variableDefinitions) === null || _b === void 0 ? void 0 : _b.map(v => {
                 const inputType = this.resolveFieldType(v.type);
                 const inputTypeName = wrapFieldType(inputType, inputType.listType, 'System.Collections.Generic.List');
+                const propertyName = convertSafeName(this._parsedConfig.memberNamingFunction(v.variable.name.value));
                 return indentMultiline([
                     `[JsonProperty("${v.variable.name.value}")]`,
-                    `public ${inputTypeName} ${convertSafeName(v.variable.name.value)} { get; set; }`,
+                    `public ${inputTypeName} ${propertyName} { get; set; }`,
                 ].join('\n') + '\n');
             }).join('\n'))).string;
     }
@@ -403,9 +412,10 @@ ${this._getOperationMethod(node)}
                 }
                 const inputType = this.resolveFieldType(f.type);
                 const inputTypeName = wrapFieldType(inputType, inputType.listType, 'System.Collections.Generic.List');
+                const propertyName = convertSafeName(this._parsedConfig.memberNamingFunction(f.name.value));
                 return indentMultiline([
                     `[JsonProperty("${f.name.value}")]`,
-                    `public ${inputTypeName} ${convertSafeName(f.name.value)} { get; set; }`,
+                    `public ${inputTypeName} ${propertyName} { get; set; }`,
                 ].join('\n') + '\n');
             }).filter(f => !!f).join('\n'))).string;
         return indentMultiline(inputClass, 2);
@@ -419,7 +429,7 @@ ${this._getOperationMethod(node)}
             .access('public')
             .asKind('enum')
             .withName(convertSafeName(this.convertName(node.name)))
-            .withBlock(indentMultiline((_a = node.values) === null || _a === void 0 ? void 0 : _a.map(v => v.name.value).join(',\n'))).string;
+            .withBlock(indentMultiline((_a = node.values) === null || _a === void 0 ? void 0 : _a.map(v => this._parsedConfig.memberNamingFunction(v.name.value)).join(',\n'))).string;
         return indentMultiline(enumDefinition, 2);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/c-sharp-operations",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "GraphQL Code Generator plugin for generating CSharp code based on GraphQL operations",
   "sideEffects": false,
   "peerDependencies": {
@@ -8,9 +8,9 @@
     "graphql-tag": "2.12.6"
   },
   "dependencies": {
-    "@graphql-codegen/c-sharp-common": "1.0.0",
-    "@graphql-codegen/plugin-helpers": "^3.0.0",
-    "@graphql-codegen/visitor-plugin-common": "^2.12.1",
+    "@graphql-codegen/c-sharp-common": "1.1.0",
+    "@graphql-codegen/plugin-helpers": "5.0.4",
+    "@graphql-codegen/visitor-plugin-common": "^5.3.1",
     "auto-bind": "~4.0.0",
     "change-case-all": "1.0.15",
     "tslib": "~2.6.0"

package/typings/config.d.cts

@@ -1,8 +1,9 @@
+import { MemberNameConventionConfig } from '@graphql-codegen/c-sharp-common';
 import { RawClientSideBasePluginConfig } from '@graphql-codegen/visitor-plugin-common';
 /**
  * @description This plugin generates C# `class` based on your GraphQL operations.
  */
-export interface CSharpOperationsRawPluginConfig extends RawClientSideBasePluginConfig {
+export interface CSharpOperationsRawPluginConfig extends RawClientSideBasePluginConfig, MemberNameConventionConfig {
     /**
      * @default GraphQLCodeGen
      * @description Allow you to customize the namespace name.

package/typings/config.d.ts

@@ -1,8 +1,9 @@
+import { MemberNameConventionConfig } from '@graphql-codegen/c-sharp-common';
 import { RawClientSideBasePluginConfig } from '@graphql-codegen/visitor-plugin-common';
 /**
  * @description This plugin generates C# `class` based on your GraphQL operations.
  */
-export interface CSharpOperationsRawPluginConfig extends RawClientSideBasePluginConfig {
+export interface CSharpOperationsRawPluginConfig extends RawClientSideBasePluginConfig, MemberNameConventionConfig {
     /**
      * @default GraphQLCodeGen
      * @description Allow you to customize the namespace name.

package/typings/visitor.d.cts

@@ -1,5 +1,5 @@
 import { EnumTypeDefinitionNode, GraphQLSchema, InputObjectTypeDefinitionNode, OperationDefinitionNode, TypeNode } from 'graphql';
-import { CSharpFieldType } from '@graphql-codegen/c-sharp-common';
+import { CSharpFieldType, MemberNamingFn } from '@graphql-codegen/c-sharp-common';
 import { Types } from '@graphql-codegen/plugin-helpers';
 import { ClientSideBasePluginConfig, ClientSideBaseVisitor, LoadedFragment } from '@graphql-codegen/visitor-plugin-common';
 import { CSharpOperationsRawPluginConfig } from './config.cjs';
@@ -10,10 +10,12 @@ export interface CSharpOperationsPluginConfig extends ClientSideBasePluginConfig
     mutationSuffix: string;
     subscriptionSuffix: string;
     typesafeOperation: boolean;
+    memberNamingFunction: MemberNamingFn;
 }
 export declare class CSharpOperationsVisitor extends ClientSideBaseVisitor<CSharpOperationsRawPluginConfig, CSharpOperationsPluginConfig> {
     private _operationsToInclude;
     private _schemaAST;
+    private readonly _fragmentList;
     constructor(schema: GraphQLSchema, fragments: LoadedFragment[], rawConfig: CSharpOperationsRawPluginConfig, documents?: Types.DocumentFile[]);
     private overruleConfigSettings;
     private _operationHasDirective;

package/typings/visitor.d.ts

@@ -1,5 +1,5 @@
 import { EnumTypeDefinitionNode, GraphQLSchema, InputObjectTypeDefinitionNode, OperationDefinitionNode, TypeNode } from 'graphql';
-import { CSharpFieldType } from '@graphql-codegen/c-sharp-common';
+import { CSharpFieldType, MemberNamingFn } from '@graphql-codegen/c-sharp-common';
 import { Types } from '@graphql-codegen/plugin-helpers';
 import { ClientSideBasePluginConfig, ClientSideBaseVisitor, LoadedFragment } from '@graphql-codegen/visitor-plugin-common';
 import { CSharpOperationsRawPluginConfig } from './config.js';
@@ -10,10 +10,12 @@ export interface CSharpOperationsPluginConfig extends ClientSideBasePluginConfig
     mutationSuffix: string;
     subscriptionSuffix: string;
     typesafeOperation: boolean;
+    memberNamingFunction: MemberNamingFn;
 }
 export declare class CSharpOperationsVisitor extends ClientSideBaseVisitor<CSharpOperationsRawPluginConfig, CSharpOperationsPluginConfig> {
     private _operationsToInclude;
     private _schemaAST;
+    private readonly _fragmentList;
     constructor(schema: GraphQLSchema, fragments: LoadedFragment[], rawConfig: CSharpOperationsRawPluginConfig, documents?: Types.DocumentFile[]);
     private overruleConfigSettings;
     private _operationHasDirective;