Fix uniqueness of Type Names generated by default.

Author: nodkz

src/definition.js

@@ -96,29 +96,6 @@ export type ExtendedResolveParams = ResolveParams & {
 
 // HELPERS OPTIONS
 
-export type filterHelperArgsOpts = {
-  filterTypeName?: string,
-  isRequired?: boolean,
-  onlyIndexed?: boolean,
-  requiredFields?: string | string[],
-  model?: MongooseModelT,
-};
-
-export type sortHelperArgsOpts = {
-  sortTypeName?: string,
-};
-
-export type inputHelperArgsOpts = {
-  inputTypeName?: string,
-  isRequired?: boolean,
-  removeFields?: string[],
-  requiredFields?: string[],
-};
-
-export type limitHelperArgsOpts = {
-  defaultValue?: number,
-};
-
 export type genResolverOpts = {
   filter?: filterHelperArgsOpts,
   sort?: sortHelperArgsOpts,
@@ -196,4 +173,27 @@ export type typeConverterResolversOpts = {
   count?: false | {
     filter?: filterHelperArgsOpts | false,
   },
-}
+};
+
+export type filterHelperArgsOpts = {
+  filterTypeName?: string,
+  isRequired?: boolean,
+  onlyIndexed?: boolean,
+  requiredFields?: string | string[],
+  model?: MongooseModelT,
+};
+
+export type sortHelperArgsOpts = {
+  sortTypeName?: string,
+};
+
+export type inputHelperArgsOpts = {
+  inputTypeName?: string,
+  isRequired?: boolean,
+  removeFields?: string[],
+  requiredFields?: string[],
+};
+
+export type limitHelperArgsOpts = {
+  defaultValue?: number,
+};

src/resolvers/findByIds.js

@@ -47,7 +47,7 @@ export default function findByIds(
         ...(opts && opts.limit),
       }),
       ...sortHelperArgs(model, {
-        sortTypeName: `Sort${gqType.name}Input`,
+        sortTypeName: `SortFindByIds${gqType.name}Input`,
         ...(opts && opts.sort),
       }),
     },

src/resolvers/findMany.js

@@ -40,7 +40,7 @@ export default function findMany(
     kind: 'query',
     args: {
       ...filterHelperArgs(gqType, {
-        filterTypeName: `Filter${gqType.name}Input`,
+        filterTypeName: `FilterFindMany${gqType.name}Input`,
         model,
         ...(opts && opts.filter),
       }),
@@ -49,7 +49,7 @@ export default function findMany(
         ...(opts && opts.limit),
       }),
       ...sortHelperArgs(model, {
-        sortTypeName: `Sort${gqType.name}Input`,
+        sortTypeName: `SortFindMany${gqType.name}Input`,
         ...(opts && opts.sort),
       }),
     },

src/resolvers/findOne.js

@@ -37,13 +37,13 @@ export default function findOne(
     kind: 'query',
     args: {
       ...filterHelperArgs(gqType, {
-        filterTypeName: `Filter${gqType.name}Input`,
+        filterTypeName: `FilterFindOne${gqType.name}Input`,
         model,
         ...(opts && opts.filter),
       }),
       ...skipHelperArgs(),
       ...sortHelperArgs(model, {
-        sortTypeName: `Sort${gqType.name}Input`,
+        sortTypeName: `SortFindOne${gqType.name}Input`,
         ...(opts && opts.sort),
       }),
     },

src/resolvers/removeMany.js

@@ -45,7 +45,7 @@ export default function removeMany(
     }),
     args: {
       ...filterHelperArgs(gqType, {
-        filterTypeName: `Filter${gqType.name}Input`,
+        filterTypeName: `FilterRemoveMany${gqType.name}Input`,
         isRequired: true,
         model,
         ...(opts && opts.filter),

src/resolvers/removeOne.js

@@ -54,12 +54,12 @@ export default function removeOne(
     }),
     args: {
       ...filterHelperArgs(gqType, {
-        filterTypeName: `Filter${gqType.name}Input`,
+        filterTypeName: `FilterRemoveOne${gqType.name}Input`,
         model,
         ...(opts && opts.filter),
       }),
       ...sortHelperArgs(model, {
-        sortTypeName: `Sort${gqType.name}Input`,
+        sortTypeName: `SortRemoveOne${gqType.name}Input`,
         ...(opts && opts.sort),
       }),
     },

src/resolvers/updateMany.js

@@ -55,12 +55,12 @@ export default function updateMany(
         ...(opts && opts.input),
       }),
       ...filterHelperArgs(gqType, {
-        filterTypeName: `Filter${gqType.name}Input`,
+        filterTypeName: `FilterUpdateMany${gqType.name}Input`,
         model,
         ...(opts && opts.filter),
       }),
       ...sortHelperArgs(model, {
-        sortTypeName: `Sort${gqType.name}Input`,
+        sortTypeName: `SortUpdateMany${gqType.name}Input`,
         ...(opts && opts.sort),
       }),
       ...skipHelperArgs(),

src/resolvers/updateOne.js

@@ -63,12 +63,12 @@ export default function updateOne(
         ...(opts && opts.input),
       }),
       ...filterHelperArgs(gqType, {
-        filterTypeName: `Filter${gqType.name}Input`,
+        filterTypeName: `FilterUpdateOne${gqType.name}Input`,
         model,
         ...(opts && opts.filter),
       }),
       ...sortHelperArgs(model, {
-        sortTypeName: `Sort${gqType.name}Input`,
+        sortTypeName: `SortUpdateOne${gqType.name}Input`,
         ...(opts && opts.sort),
       }),
       ...skipHelperArgs(),