BREAKING - do not apply camelCase naming convention in buildOperation…

…NodeForField and remove camel-case dependency
ardatan · Jun 17, 2021 · e610927 · e610927
1 parent 9520001
commit e610927
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 23 deletions.
diff --git a/.changeset/polite-yaks-drive.md b/.changeset/polite-yaks-drive.md
@@ -0,0 +1,5 @@
+---
+'@graphql-tools/utils': major
+---
+
+BREAKING - do not apply camelCase naming convention in buildOperationNodeForField
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -36,7 +36,6 @@
   },
   "dependencies": {
     "@ardatan/aggregate-error": "0.0.6",
-    "camel-case": "4.1.2",
     "tslib": "~2.3.0"
   },
   "publishConfig": {

diff --git a/packages/utils/src/build-operation-for-field.ts b/packages/utils/src/build-operation-for-field.ts
@@ -27,7 +27,6 @@ import {
   isEnumType,
   Kind,
 } from 'graphql';
-import { camelCase } from 'camel-case';
 
 let operationVariables: VariableDefinitionNode[] = [];
 let fieldTypeMap = new Map();
@@ -44,10 +43,6 @@ function resetFieldMap() {
   fieldTypeMap = new Map();
 }
 
-function buildOperationName(name: string) {
-  return camelCase(name);
-}
-
 export type Skip = string[];
 export type Force = string[];
 export type Ignore = string[];
@@ -131,7 +126,7 @@ function buildOperationAndCollectVariables({
   };
   const type = typeMap[kind];
   const field = type.getFields()[fieldName];
-  const operationName = buildOperationName(`${fieldName}_${kind}`);
+  const operationName = `${fieldName}_${kind}`;
 
   if (field.args) {
     field.args.forEach(arg => {
@@ -396,7 +391,7 @@ function resolveVariable(arg: GraphQLArgument, name?: string): VariableDefinitio
 }
 
 function getArgumentName(name: string, path: string[]): string {
-  return camelCase([...path, name].join('_'));
+  return [...path, name].join('_');
 }
 
 function resolveField({

diff --git a/packages/utils/tests/build-operation-node-for-field.spec.ts b/packages/utils/tests/build-operation-node-for-field.spec.ts
@@ -84,7 +84,7 @@ test('should work with Query', async () => {
 
   expect(clean(document)).toEqual(
     clean(/* GraphQL */ `
-      query meQuery {
+      query me_query {
         me {
           id
           name
@@ -131,7 +131,7 @@ test('should work with Query and variables', async () => {
 
   expect(clean(document)).toEqual(
     clean(/* GraphQL */ `
-      query userQuery($id: ID!) {
+      query user_query($id: ID!) {
         user(id: $id) {
           id
           name
@@ -178,7 +178,7 @@ test('should work with Query and complicated variable', async () => {
 
   expect(clean(document)).toEqual(
     clean(/* GraphQL */ `
-      query menuByIngredientsQuery($ingredients: [String!]!) {
+      query menuByIngredients_query($ingredients: [String!]!) {
         menuByIngredients(ingredients: $ingredients) {
           ... on Pizza {
             dough
@@ -211,7 +211,7 @@ test('should work with Union', async () => {
 
   expect(clean(document)).toEqual(
     clean(/* GraphQL */ `
-      query menuQuery {
+      query menu_query {
         menu {
           ... on Pizza {
             dough
@@ -244,7 +244,7 @@ test('should work with mutation', async () => {
 
   expect(clean(document)).toEqual(
     clean(/* GraphQL */ `
-      mutation addSaladMutation($ingredients: [String!]!) {
+      mutation addSalad_mutation($ingredients: [String!]!) {
         addSalad(ingredients: $ingredients) {
           ... on CaeserSalad {
             ingredients
@@ -271,7 +271,7 @@ test('should work with mutation and unions', async () => {
 
   expect(clean(document)).toEqual(
     clean(/* GraphQL */ `
-      mutation addRandomFoodMutation {
+      mutation addRandomFood_mutation {
         addRandomFood {
           ... on Pizza {
             dough
@@ -304,9 +304,9 @@ test('should work with Query and nested variables', async () => {
 
   expect(clean(document)).toEqual(
     clean(/* GraphQL */ `
-      query feedQuery($feedCommentsFilter: String!) {
+      query feed_query($feed_comments_filter: String!) {
         feed {
-          comments(filter: $feedCommentsFilter)
+          comments(filter: $feed_comments_filter)
         }
       }
     `)
@@ -324,7 +324,7 @@ test('should be able to ignore using models when requested', async () => {
 
   expect(clean(document)).toEqual(
     clean(/* GraphQL */ `
-      query userQuery($id: ID!) {
+      query user_query($id: ID!) {
         user(id: $id) {
           id
           name
@@ -373,7 +373,7 @@ test('should work with Subscription', async () => {
 
   expect(clean(document)).toEqual(
     clean(/* GraphQL */ `
-      subscription onFoodSubscription {
+      subscription onFood_subscription {
         onFood {
           ... on Pizza {
             dough
@@ -423,7 +423,7 @@ test('should work with circular ref (default depth limit === 1)', async () => {
 
   expect(clean(document)).toEqual(
     clean(/* GraphQL */ `
-      query aQuery {
+      query a_query {
         a {
           b {
             c {
@@ -465,7 +465,7 @@ test('should work with circular ref (custom depth limit)', async () => {
 
   expect(clean(document)).toEqual(
     clean(/* GraphQL */ `
-      query aQuery {
+      query a_query {
         a {
           b {
             c {
@@ -510,7 +510,7 @@ test('arguments', async () => {
 
   expect(clean(document)).toEqual(
     clean(/* GraphQL */ `
-      query usersQuery($pageInfo: PageInfoInput!) {
+      query users_query($pageInfo: PageInfoInput!) {
         users(pageInfo: $pageInfo) {
           id
           name
@@ -538,7 +538,7 @@ test('selectedFields', async () => {
 
   expect(clean(document)).toEqual(
     clean(/* GraphQL */ `
-      query userQuery($id: ID!) {
+      query user_query($id: ID!) {
         user(id: $id) {
           favoriteFood {
             ... on Pizza {

diff --git a/yarn.lock b/yarn.lock
@@ -4095,7 +4095,7 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camel-case@4.1.2, camel-case@^4.1.1:
+camel-case@^4.1.1:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a"
   integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==