Merge branch 'ardeois:main' into change-case-for-enum-values

Author: sebvilhelm

CHANGELOG.md

@@ -1,3 +1,41 @@
+# v2.1.2 (Fri Feb 18 2022)
+
+#### 🐛 Bug Fix
+
+- fix: wrong type generated when terminateCircularRelationships is true [#70](https://github.com/ardeois/graphql-codegen-typescript-mock-data/pull/70) ([@BenStirrup](https://github.com/BenStirrup) [@ardeois](https://github.com/ardeois))
+
+#### Authors: 2
+
+- Benjamin Stirrup ([@BenStirrup](https://github.com/BenStirrup))
+- Corentin Ardeois ([@ardeois](https://github.com/ardeois))
+
+---
+
+# v2.1.1 (Fri Feb 18 2022)
+
+#### ⚠️ Pushed to `main`
+
+- feat: dependency update ([@ardeois](https://github.com/ardeois))
+
+#### Authors: 1
+
+- Corentin Ardeois ([@ardeois](https://github.com/ardeois))
+
+---
+
+# v2.1.0 (Fri Feb 18 2022)
+
+#### 🚀 Enhancement
+
+- fix: #69 [#71](https://github.com/ardeois/graphql-codegen-typescript-mock-data/pull/71) ([@bokuweb](https://github.com/bokuweb) [@ardeois](https://github.com/ardeois))
+
+#### Authors: 2
+
+- bokuweb ([@bokuweb](https://github.com/bokuweb))
+- Corentin Ardeois ([@ardeois](https://github.com/ardeois))
+
+---
+
 # v2.0.0 (Thu Nov 04 2021)
 
 #### 💥 Breaking Change

package.json

@@ -1,6 +1,6 @@
 {
     "name": "graphql-codegen-typescript-mock-data",
-    "version": "2.0.0",
+    "version": "2.1.2",
     "description": "GraphQL Codegen plugin for building mock data",
     "main": "dist/commonjs/index.js",
     "module": "dist/esnext/index.js",
@@ -22,31 +22,31 @@
         "fakes"
     ],
     "dependencies": {
-        "@graphql-codegen/plugin-helpers": "^1.17.9",
+        "@graphql-codegen/plugin-helpers": "^2.4.1",
         "casual": "^1.6.2",
         "indefinite": "^2.4.1",
         "pascal-case": "^3.1.1",
         "sentence-case": "^3.0.3",
         "upper-case": "^2.0.1"
     },
     "peerDependencies": {
-        "graphql": "^14.6.0 || ^15.0.0"
+        "graphql": "^14.6.0 || ^15.0.0 || ^16.0.0"
     },
     "devDependencies": {
-        "@auto-it/conventional-commits": "^10.32.1",
+        "@auto-it/conventional-commits": "^10.32.6",
         "@graphql-codegen/testing": "^1.17.7",
         "@types/faker": "^5.5.9",
         "@types/jest": "^27.0.2",
         "@typescript-eslint/eslint-plugin": "^5.1.0",
         "@typescript-eslint/parser": "^5.1.0",
-        "auto": "^10.32.1",
+        "auto": "^10.32.6",
         "eslint": "8.0.1",
         "eslint-config-landr": "0.7.0",
         "eslint-config-prettier": "^8.3.0",
         "eslint-plugin-import": "^2.25.2",
         "eslint-plugin-jest": "^25.2.2",
         "eslint-plugin-prettier": "^4.0.0",
-        "graphql": "^15.6.1",
+        "graphql": "^16.3.0",
         "husky": "^7.0.0",
         "jest": "^27.3.1",
         "lint-staged": "^11.2.3",

src/index.ts

@@ -1,6 +1,6 @@
-import { ASTKindToNode, NamedTypeNode, parse, printSchema, TypeNode, visit, VisitFn } from 'graphql';
+import { ASTKindToNode, NamedTypeNode, parse, printSchema, TypeNode } from 'graphql';
 import casual from 'casual';
-import { PluginFunction } from '@graphql-codegen/plugin-helpers';
+import { PluginFunction, oldVisit } from '@graphql-codegen/plugin-helpers';
 import { pascalCase } from 'pascal-case';
 import { upperCase } from 'upper-case';
 import { sentenceCase } from 'sentence-case';
@@ -181,7 +181,7 @@ const getNamedType = (opts: Options<NamedTypeNode>): string | number | boolean =
                 }
             }
             if (opts.terminateCircularRelationships) {
-                return `relationshipsToOmit.has('${name}') ? {} as ${name} : ${toMockName(
+                return `relationshipsToOmit.has('${casedName}') ? {} as ${casedName} : ${toMockName(
                     name,
                     casedName,
                     opts.prefix,
@@ -212,6 +212,8 @@ const generateMockValue = (opts: Options): string | number | boolean => {
             });
             return `[${value}]`;
         }
+        default:
+            throw new Error('unreached');
     }
 };
 
@@ -323,6 +325,23 @@ interface TypeItem {
     types?: readonly NamedTypeNode[];
 }
 
+type VisitFn<TAnyNode, TVisitedNode = TAnyNode> = (
+    /** The current node being visiting. */
+    node: TVisitedNode,
+    /** The index or key to this node from the parent node or Array. */
+    key: string | number | undefined,
+    /** The parent immediately above this node, which may be an Array. */
+    parent: TAnyNode | ReadonlyArray<TAnyNode> | undefined,
+    /** The key path to get to this node from the root node. */
+    path: ReadonlyArray<string | number>,
+    /**
+     * All nodes and Arrays visited before reaching parent of this node.
+     * These correspond to array indices in `path`.
+     * Note: ancestors includes arrays which contain the parent of visited node.
+     */
+    ancestors: ReadonlyArray<TAnyNode | ReadonlyArray<TAnyNode>>,
+) => any;
+
 type VisitorType = { [K in keyof ASTKindToNode]?: VisitFn<ASTKindToNode[keyof ASTKindToNode], ASTKindToNode[K]> };
 
 // This plugin was generated with the help of ast explorer.
@@ -480,7 +499,7 @@ export const plugin: PluginFunction<TypescriptMocksPluginConfig> = (schema, docu
         },
     };
 
-    const result = visit(astNode, { leave: visitor });
+    const result = oldVisit(astNode, { leave: visitor });
     const definitions = result.definitions.filter((definition: any) => !!definition);
     const typesFile = config.typesFile ? config.typesFile.replace(/\.[\w]+$/, '') : null;
 

tests/__snapshots__/typescript-mock-data.spec.ts.snap

@@ -1981,7 +1981,7 @@ export const aUser = (overrides?: Partial<User>, relationshipsToOmit: Set<string
         status: overrides && overrides.hasOwnProperty('status') ? overrides.status! : Status.Online,
         customStatus: overrides && overrides.hasOwnProperty('customStatus') ? overrides.customStatus! : AbcStatus.HasXyzStatus,
         scalarValue: overrides && overrides.hasOwnProperty('scalarValue') ? overrides.scalarValue! : 'neque',
-        camelCaseThing: overrides && overrides.hasOwnProperty('camelCaseThing') ? overrides.camelCaseThing! : relationshipsToOmit.has('camelCaseThing') ? {} as camelCaseThing : aCamelCaseThing({}, relationshipsToOmit),
+        camelCaseThing: overrides && overrides.hasOwnProperty('camelCaseThing') ? overrides.camelCaseThing! : relationshipsToOmit.has('CamelCaseThing') ? {} as CamelCaseThing : aCamelCaseThing({}, relationshipsToOmit),
         unionThing: overrides && overrides.hasOwnProperty('unionThing') ? overrides.unionThing! : relationshipsToOmit.has('Avatar') ? {} as Avatar : anAvatar({}, relationshipsToOmit),
         prefixedEnum: overrides && overrides.hasOwnProperty('prefixedEnum') ? overrides.prefixedEnum! : PrefixedEnum.PrefixedValue,
     };
@@ -2036,7 +2036,7 @@ export const aQuery = (overrides?: Partial<Query>, relationshipsToOmit: Set<stri
     relationshipsToOmit.add('Query');
     return {
         user: overrides && overrides.hasOwnProperty('user') ? overrides.user! : relationshipsToOmit.has('User') ? {} as User : aUser({}, relationshipsToOmit),
-        prefixed_query: overrides && overrides.hasOwnProperty('prefixed_query') ? overrides.prefixed_query! : relationshipsToOmit.has('Prefixed_Response') ? {} as Prefixed_Response : aPrefixedResponse({}, relationshipsToOmit),
+        prefixed_query: overrides && overrides.hasOwnProperty('prefixed_query') ? overrides.prefixed_query! : relationshipsToOmit.has('PrefixedResponse') ? {} as PrefixedResponse : aPrefixedResponse({}, relationshipsToOmit),
     };
 };
 "