@graphql-codegen/testing 5.0.2 → 5.0.3-alpha-20260920112236-61210c9e19c41cd401b641c8894e4eebaa08e96e

package/cjs/typescript.js

@@ -6,6 +6,26 @@ const tslib_1 = require("tslib");
 const path_1 = require("path");
 const LZString = tslib_1.__importStar(require("lz-string")); // lz-string is a package which has CJS/ESM issues. So, we cannot do `import { something } from 'lz-string'`
 const typescript_1 = require("typescript");
+/**
+ * Resolve the `@types` directory that actually contains `@types/node`.
+ *
+ * This used to be derived from `require.resolve('typescript')` as
+ * `<ts>/lib/../../../@types`, which only lands on `node_modules/@types` in a flat
+ * (npm/yarn) layout. Under pnpm's default isolated layout `require.resolve` returns the
+ * realpath inside the virtual store, so it pointed at
+ * `node_modules/.pnpm/typescript@<version>/node_modules/@types` -- a directory that does
+ * not exist -- and no ambient typings were ever loaded.
+ *
+ * Locating the directory from `@types/node` itself keeps it correct under every layout.
+ */
+function resolveTypeRoots() {
+    // A `typeRoots` entry is a *container* directory, not a type package: TypeScript resolves
+    // every name in `types` as `<typeRoot>/<name>`, so `types: ['node']` looks for
+    // `<typeRoot>/node`. Hence two steps up from the manifest -- to the package, then to the
+    // `@types` directory holding it.
+    const nodeTypesPackageDir = (0, path_1.dirname)(require.resolve('@types/node/package.json')); // <..>/@types/node
+    return [(0, path_1.dirname)(nodeTypesPackageDir)]; // <..>/@types
+}
 function validateTs(pluginOutput, options = {
     noEmitOnError: true,
     noImplicitAny: true,
@@ -13,7 +33,7 @@ function validateTs(pluginOutput, options = {
     experimentalDecorators: true,
     emitDecoratorMetadata: true,
     target: typescript_1.ScriptTarget.ES5,
-    typeRoots: [(0, path_1.resolve)(require.resolve('typescript'), '../../../@types/')],
+    typeRoots: resolveTypeRoots(),
     jsx: typescript_1.JsxEmit.React,
     allowJs: true,
     skipLibCheck: true,
@@ -40,7 +60,7 @@ function validateTs(pluginOutput, options = {
     }
     if (typescript_1.version.startsWith('6.')) {
         options.ignoreDeprecations ||= '6.0';
-        // options.types ||= ['node']; FIXME(pnpm-update): causing errors about missing node. Maybe resolving at the wrong location?
+        options.types ||= ['node'];
     }
     const contents = typeof pluginOutput === 'string'
         ? pluginOutput
@@ -134,7 +154,7 @@ function compileTs(contents, options = {
     experimentalDecorators: true,
     emitDecoratorMetadata: true,
     target: typescript_1.ScriptTarget.ES5,
-    typeRoots: [(0, path_1.resolve)(require.resolve('typescript'), '../../../@types/')],
+    typeRoots: resolveTypeRoots(),
     jsx: typescript_1.JsxEmit.Preserve,
     allowJs: true,
     lib: [

package/esm/typescript.js

@@ -1,6 +1,26 @@
-import { dirname, join, resolve } from 'path';
+import { dirname, join } from 'path';
 import * as LZString from 'lz-string'; // lz-string is a package which has CJS/ESM issues. So, we cannot do `import { something } from 'lz-string'`
 import { createCompilerHost, createProgram, createSourceFile, flattenDiagnosticMessageText, JsxEmit, ModuleKind, ModuleResolutionKind, ScriptKind, ScriptTarget, version as tsVersion, } from 'typescript';
+/**
+ * Resolve the `@types` directory that actually contains `@types/node`.
+ *
+ * This used to be derived from `require.resolve('typescript')` as
+ * `<ts>/lib/../../../@types`, which only lands on `node_modules/@types` in a flat
+ * (npm/yarn) layout. Under pnpm's default isolated layout `require.resolve` returns the
+ * realpath inside the virtual store, so it pointed at
+ * `node_modules/.pnpm/typescript@<version>/node_modules/@types` -- a directory that does
+ * not exist -- and no ambient typings were ever loaded.
+ *
+ * Locating the directory from `@types/node` itself keeps it correct under every layout.
+ */
+function resolveTypeRoots() {
+    // A `typeRoots` entry is a *container* directory, not a type package: TypeScript resolves
+    // every name in `types` as `<typeRoot>/<name>`, so `types: ['node']` looks for
+    // `<typeRoot>/node`. Hence two steps up from the manifest -- to the package, then to the
+    // `@types` directory holding it.
+    const nodeTypesPackageDir = dirname(require.resolve('@types/node/package.json')); // <..>/@types/node
+    return [dirname(nodeTypesPackageDir)]; // <..>/@types
+}
 export function validateTs(pluginOutput, options = {
     noEmitOnError: true,
     noImplicitAny: true,
@@ -8,7 +28,7 @@ export function validateTs(pluginOutput, options = {
     experimentalDecorators: true,
     emitDecoratorMetadata: true,
     target: ScriptTarget.ES5,
-    typeRoots: [resolve(require.resolve('typescript'), '../../../@types/')],
+    typeRoots: resolveTypeRoots(),
     jsx: JsxEmit.React,
     allowJs: true,
     skipLibCheck: true,
@@ -35,7 +55,7 @@ export function validateTs(pluginOutput, options = {
     }
     if (tsVersion.startsWith('6.')) {
         options.ignoreDeprecations ||= '6.0';
-        // options.types ||= ['node']; FIXME(pnpm-update): causing errors about missing node. Maybe resolving at the wrong location?
+        options.types ||= ['node'];
     }
     const contents = typeof pluginOutput === 'string'
         ? pluginOutput
@@ -129,7 +149,7 @@ export function compileTs(contents, options = {
     experimentalDecorators: true,
     emitDecoratorMetadata: true,
     target: ScriptTarget.ES5,
-    typeRoots: [resolve(require.resolve('typescript'), '../../../@types/')],
+    typeRoots: resolveTypeRoots(),
     jsx: JsxEmit.Preserve,
     allowJs: true,
     lib: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/testing",
-  "version": "5.0.2",
+  "version": "5.0.3-alpha-20260920112236-61210c9e19c41cd401b641c8894e4eebaa08e96e",
   "description": "GraphQL Codegen Testing Utils",
   "peerDependencies": {
     "jest-diff": "^23.0.0 || ^24.0.0 || ^25.0.0 || ^26.0.0 || ^27.0.0 || ^28.0.0 || ^29.0.0 || ^30.0.0",