Merge GraphQL and Vitest updates (#1428)

* Move shared Zod helpers and remove unused test helpers

* chore(deps): update dependency graphql to v16.13.2

* chore(deps): update dependency vitest to v4

* test: align GraphQL resolution for Vitest 4

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Author: Code-Hex

package.json

@@ -101,7 +101,7 @@
     "ts-jest": "29.4.9",
     "typescript": "6.0.3",
     "valibot": "1.3.1",
-    "vitest": "^3.2.4",
+    "vitest": "^4.0.0",
     "yup": "1.7.1",
     "zod": "4.3.6"
   }

pnpm-lock.yaml

@@ -6,12 +6,15 @@ import { isNamedType } from './graphql.js';
 
 /**
  * Wraps a schema expression in a library-specific lazy reference when the type
- * is a complex (non-scalar, non-enum) named type — avoiding issues with
+ * is a complex (non-scalar, non-enum) named type, avoiding issues with
  * mutually-recursive input types.
  *
  * Each validation library has its own lazy syntax (z.lazy, v.lazy, etc.), so
  * callers supply the wrapper function.
  *
+ * @param visitor - Type lookup used to distinguish scalars/enums from complex types.
+ * @param type - GraphQL type node for the schema expression.
+ * @param schema - Generated schema expression to wrap when needed.
  * @param lazyWrapper - e.g. `(s) => \`z.lazy(() => ${s})\``
  */
 export function buildMaybeLazy(

src/lazy.ts

@@ -18,7 +18,6 @@ import {
   ObjectTypeDefinitionBuilder,
 } from '../graphql.js';
 import { BaseSchemaVisitor } from '../schema_visitor.js';
-import { buildZodOperationSchemas } from './operation.js';
 import {
   anySchema,
   buildObjectExpression,
@@ -31,7 +30,8 @@ import {
   schemaDepthVariable,
   unionLiterals,
   withDescription,
-} from './shared.js';
+} from '../zod_shared.js';
+import { buildZodOperationSchemas } from './operation.js';
 
 export class ZodSchemaVisitor extends BaseSchemaVisitor {
   constructor(schema: GraphQLSchema, config: ValidationSchemaPluginConfig) {

src/zod/index.ts

@@ -12,24 +12,24 @@ import type {
   TypeNode,
 } from 'graphql';
 
-import type { ValidationSchemaPluginConfig } from '../config.js';
-import type { Visitor } from '../visitor.js';
+import type { ValidationSchemaPluginConfig } from './config.js';
+import type { Visitor } from './visitor.js';
 import { resolveExternalModuleAndFn } from '@graphql-codegen/plugin-helpers';
 import { convertNameParts, indent } from '@graphql-codegen/visitor-plugin-common';
 import {
   isInputObjectType,
   Kind,
   valueFromASTUntyped,
 } from 'graphql';
-import { buildApi, formatDirectiveConfig } from '../directive.js';
+import { buildApi, formatDirectiveConfig } from './directive.js';
 import {
   escapeGraphQLCharacters,
   isListType,
   isNamedType,
   isNonNullType,
-} from '../graphql.js';
-import { buildMaybeLazy } from '../lazy.js';
-import { buildScalarSchema } from '../scalar.js';
+} from './graphql.js';
+import { buildMaybeLazy } from './lazy.js';
+import { buildScalarSchema } from './scalar.js';
 
 export const anySchema = `definedNonNullAnySchema`;
 

src/zod/shared.ts src/zod_shared.tssrc/zod/shared.ts renamed to src/zod_shared.ts

@@ -32,7 +32,7 @@ import {
   schemaDepthVariable,
   unionLiterals,
   withDescription,
-} from '../zod/shared.js';
+} from '../zod_shared.js';
 
 export class ZodV4SchemaVisitor extends BaseSchemaVisitor {
   constructor(schema: GraphQLSchema, config: ValidationSchemaPluginConfig) {

src/zodv4/index.ts

@@ -1,6 +1,14 @@
+import { createRequire } from 'node:module';
 import { defineConfig } from 'vitest/config';
 
+const require = createRequire(import.meta.url);
+
 export default defineConfig({
+  resolve: {
+    alias: {
+      graphql: require.resolve('graphql/index.js'),
+    },
+  },
   test: {
     globals: true,
     environment: 'node',
@@ -9,6 +17,7 @@ export default defineConfig({
     exclude: ['node_modules', 'dist', 'example', '.idea', '.git', '.cache', '.github'],
     server: {
       deps: {
+        external: ['graphql'],
         fallbackCJS: true,
       },
     },