Merge branch 'main' into main

Author: huseyinbuyukdere

CHANGELOG.md

@@ -1,3 +1,15 @@
+# v4.2.0 (Thu Feb 06 2025)
+
+#### 🚀 Enhancement
+
+- Add support for oneOf directive [#180](https://github.com/ardeois/graphql-codegen-typescript-mock-data/pull/180) ([@thomasobrien99](https://github.com/thomasobrien99))
+
+#### Authors: 1
+
+- [@thomasobrien99](https://github.com/thomasobrien99)
+
+---
+
 # v4.1.0 (Fri Sep 20 2024)
 
 #### 🚀 Enhancement

package.json

@@ -1,6 +1,6 @@
 {
     "name": "graphql-codegen-typescript-mock-data",
-    "version": "4.1.0",
+    "version": "4.2.0",
     "description": "GraphQL Codegen plugin for building mock data",
     "main": "dist/commonjs/index.js",
     "module": "dist/esnext/index.js",
@@ -24,6 +24,7 @@
     "dependencies": {
         "@faker-js/faker": "^8.4.1",
         "@graphql-codegen/plugin-helpers": "^5.0.4",
+        "@graphql-tools/utils": "^10.7.2",
         "casual": "^1.6.2",
         "change-case-all": "^1.0.15",
         "indefinite": "^2.4.1",
@@ -39,6 +40,7 @@
         "@auto-it/conventional-commits": "^11.1.6",
         "@graphql-codegen/testing": "^3.0.3",
         "@graphql-codegen/typescript": "^4.0.7",
+        "@types/indefinite": "^2.3.4",
         "@types/jest": "^27.0.2",
         "@typescript-eslint/eslint-plugin": "^5.1.0",
         "@typescript-eslint/parser": "^5.1.0",
@@ -57,7 +59,7 @@
         "prettier": "^2.4.1",
         "prettier-config-landr": "^0.2.0",
         "ts-jest": "^27.0.7",
-        "typescript": "^4.4.4"
+        "typescript": "^5.7.3"
     },
     "sideEffects": false,
     "scripts": {

src/index.ts

@@ -1,17 +1,10 @@
-import {
-    parse,
-    printSchema,
-    TypeNode,
-    ASTKindToNode,
-    ListTypeNode,
-    NamedTypeNode,
-    ObjectTypeDefinitionNode,
-} from 'graphql';
+import { parse, TypeNode, ASTKindToNode, ListTypeNode, NamedTypeNode, ObjectTypeDefinitionNode } from 'graphql';
 import * as allFakerLocales from '@faker-js/faker';
 import casual from 'casual';
 import { oldVisit, PluginFunction, resolveExternalModuleAndFn } from '@graphql-codegen/plugin-helpers';
 import { sentenceCase } from 'sentence-case';
 import a from 'indefinite';
+import { printSchemaWithDirectives } from '@graphql-tools/utils';
 import { setupFunctionTokens, setupMockValueGenerator } from './mockValueGenerator';
 
 type NamingConvention = 'change-case-all#pascalCase' | 'keep' | string;
@@ -460,6 +453,7 @@ const getMockString = (
     typesPrefix = '',
     transformUnderscore: boolean,
     typeNamesMapping?: Record<string, string>,
+    hasOneOfDirective = false,
 ) => {
     const typeNameConverter = createNameConverter(typeNamesConvention, transformUnderscore);
     const NewTypeName = typeNamesMapping[typeName] || typeName;
@@ -468,6 +462,10 @@ const getMockString = (
     const typename = addTypename ? `\n        __typename: '${typeName}',` : '';
     const typenameReturnType = addTypename ? `{ __typename: '${typeName}' } & ` : '';
 
+    const overridesArgumentString = !hasOneOfDirective
+        ? `overrides?: Partial<${casedNameWithPrefix}>`
+        : `override?: ${casedNameWithPrefix}`;
+
     if (terminateCircularRelationships) {
         const relationshipsToOmitInit =
             terminateCircularRelationships === 'immediate' ? '_relationshipsToOmit' : 'new Set(_relationshipsToOmit)';
@@ -476,7 +474,7 @@ export const ${toMockName(
             typeName,
             casedName,
             prefix,
-        )} = (overrides?: Partial<${casedNameWithPrefix}>, _relationshipsToOmit: Set<string> = new Set()): ${typenameReturnType}${casedNameWithPrefix} => {
+        )} = (${overridesArgumentString}, _relationshipsToOmit: Set<string> = new Set()): ${typenameReturnType}${casedNameWithPrefix} => {
     const relationshipsToOmit: Set<string> = ${relationshipsToOmitInit};
     relationshipsToOmit.add('${casedName}');
     return {${typename}
@@ -489,7 +487,7 @@ export const ${toMockName(
             typeName,
             casedName,
             prefix,
-        )} = (overrides?: Partial<${casedNameWithPrefix}>): ${typenameReturnType}${casedNameWithPrefix} => {
+        )} = (${overridesArgumentString}): ${typenameReturnType}${casedNameWithPrefix} => {
     return {${typename}
 ${fields}
     };
@@ -624,7 +622,8 @@ type VisitorType = { [K in keyof ASTKindToNode]?: VisitFn<ASTKindToNode[keyof AS
 // https://astexplorer.net
 // Paste your graphql schema in it, and you'll be able to see what the `astNode` will look like
 export const plugin: PluginFunction<TypescriptMocksPluginConfig> = (schema, documents, config) => {
-    const printedSchema = printSchema(schema); // Returns a string representation of the schema
+    const printedSchema = printSchemaWithDirectives(schema); // Returns a string representation of the schema
+
     const astNode = parse(printedSchema); // Transforms the string into ASTNode
 
     if ('typenames' in config) {
@@ -692,6 +691,30 @@ export const plugin: PluginFunction<TypescriptMocksPluginConfig> = (schema, docu
             }
         },
     };
+
+    const sharedGenerateMockOpts = {
+        customScalars: config.scalars,
+        defaultNullableToNull,
+        dynamicValues,
+        enumsAsTypes,
+        enumsPrefix: config.enumsPrefix,
+        enumValuesConvention,
+        fieldGeneration: config.fieldGeneration,
+        generateLibrary,
+        generatorLocale,
+        listElementCount,
+        nonNull: false,
+        prefix: config.prefix,
+        terminateCircularRelationships: getTerminateCircularRelationshipsConfig(config),
+        transformUnderscore,
+        typeNamesConvention,
+        typeNamesMapping,
+        types,
+        typesPrefix: config.typesPrefix,
+        useImplementingTypes,
+        useTypeImports,
+    };
+
     const visitor: VisitorType = {
         FieldDefinition: (node) => {
             const fieldName = node.name.value;
@@ -702,27 +725,8 @@ export const plugin: PluginFunction<TypescriptMocksPluginConfig> = (schema, docu
                     const value = generateMockValue({
                         typeName,
                         fieldName,
-                        types,
-                        typeNamesConvention,
-                        enumValuesConvention,
-                        terminateCircularRelationships: getTerminateCircularRelationshipsConfig(config),
-                        prefix: config.prefix,
-                        typesPrefix: config.typesPrefix,
-                        enumsPrefix: config.enumsPrefix,
                         currentType: node.type,
-                        customScalars: config.scalars,
-                        transformUnderscore,
-                        listElementCount,
-                        dynamicValues,
-                        generateLibrary,
-                        generatorLocale,
-                        fieldGeneration: config.fieldGeneration,
-                        enumsAsTypes,
-                        useTypeImports,
-                        useImplementingTypes,
-                        defaultNullableToNull,
-                        nonNull: false,
-                        typeNamesMapping: config.typeNamesMapping,
+                        ...sharedGenerateMockOpts,
                     });
 
                     return `        ${fieldName}: overrides && overrides.hasOwnProperty('${fieldName}') ? overrides.${fieldName}! : ${value},`;
@@ -735,50 +739,49 @@ export const plugin: PluginFunction<TypescriptMocksPluginConfig> = (schema, docu
             return {
                 typeName: fieldName,
                 mockFn: () => {
-                    const mockFields = node.fields
-                        ? node.fields
-                              .map((field) => {
-                                  const value = generateMockValue({
-                                      typeName: fieldName,
-                                      fieldName: field.name.value,
-                                      types,
-                                      typeNamesConvention,
-                                      enumValuesConvention,
-                                      terminateCircularRelationships: getTerminateCircularRelationshipsConfig(config),
-                                      prefix: config.prefix,
-                                      typesPrefix: config.typesPrefix,
-                                      enumsPrefix: config.enumsPrefix,
-                                      currentType: field.type,
-                                      customScalars: config.scalars,
-                                      transformUnderscore,
-                                      listElementCount,
-                                      dynamicValues,
-                                      generateLibrary,
-                                      generatorLocale,
-                                      fieldGeneration: config.fieldGeneration,
-                                      enumsAsTypes,
-                                      useTypeImports,
-                                      useImplementingTypes,
-                                      defaultNullableToNull,
-                                      nonNull: false,
-                                      typeNamesMapping: config.typeNamesMapping,
-                                  });
-
-                                  return `        ${field.name.value}: overrides && overrides.hasOwnProperty('${field.name.value}') ? overrides.${field.name.value}! : ${value},`;
-                              })
-                              .join('\n')
-                        : '';
+                    let mockFieldsString = '';
+
+                    const { directives } = node;
+                    const hasOneOfDirective = directives.some((directive) => directive.name.value === 'oneOf');
+
+                    if (node.fields && node.fields.length > 0 && hasOneOfDirective) {
+                        const field = node.fields[0];
+                        const value = generateMockValue({
+                            typeName: fieldName,
+                            fieldName: field.name.value,
+                            currentType: field.type,
+                            ...sharedGenerateMockOpts,
+                        });
+
+                        mockFieldsString = `        ...(override ? override : {${field.name.value} : ${value}}),`;
+                    } else if (node.fields) {
+                        mockFieldsString = node.fields
+                            .map((field) => {
+                                const value = generateMockValue({
+                                    typeName: fieldName,
+                                    fieldName: field.name.value,
+                                    currentType: field.type,
+                                    ...sharedGenerateMockOpts,
+                                });
+
+                                const valueWithOverride = `overrides && overrides.hasOwnProperty('${field.name.value}') ? overrides.${field.name.value}! : ${value}`;
+
+                                return `        ${field.name.value}: ${valueWithOverride},`;
+                            })
+                            .join('\n');
+                    }
 
                     return getMockString(
                         fieldName,
-                        mockFields,
+                        mockFieldsString,
                         typeNamesConvention,
                         getTerminateCircularRelationshipsConfig(config),
                         false,
                         config.prefix,
                         config.typesPrefix,
                         transformUnderscore,
                         typeNamesMapping,
+                        hasOneOfDirective,
                     );
                 },
             };