Merge branch 'esm-with-instanceof' of https://github.com/yaacovCR/graphql-js into esm-with-instanceof

Author: yaacovCR

integrationTests/dev-node-implicit/package.json

@@ -1,8 +1,6 @@
 {
-  "name": "graphql-js-test-dev-node",
-  "description": "Node.js development mode integration test",
-  "version": "1.0.0",
   "private": true,
+  "description": "graphql-js development condition should work with node",
   "type": "module",
   "scripts": {
     "test": "node --conditions=development test.js"

integrationTests/dev-node-implicit/test.js

@@ -1,4 +1,5 @@
-import assert from 'assert';
+import assert from 'node:assert';
+
 import { isObjectType } from 'graphql';
 
 class GraphQLObjectType {
@@ -9,10 +10,12 @@ class GraphQLObjectType {
 
 try {
   isObjectType(new GraphQLObjectType());
-  assert.fail('Expected isObjectType to throw an error in Node.js implicit development mode.');
+  assert.fail(
+    'Expected isObjectType to throw an error in Node.js implicit development mode.',
+  );
 } catch (error) {
   assert.ok(
     error.message.includes('multiple') || error.message.includes('GraphQL'),
-    `Expected error message to include 'multiple' or 'GraphQL', but got: "${error.message}"`
+    `Expected error message to include 'multiple' or 'GraphQL', but got: "${error.message}"`,
   );
 }

resources/build-npm.ts

@@ -88,16 +88,17 @@ async function buildPackage(outDir: string): Promise<void> {
     extension: '.js',
   });
 
-  const devHelper = path.join(outDir, 'dev/index.js');
-
   for (const prodFile of emittedTSFiles) {
     const { dir, base } = path.parse(prodFile);
 
     const match = base.match(/^([^.]*)\.?(.*)$/);
     assert(match);
     const [, name, ext] = match;
 
-    if (prodFile === devHelper || ext === 'js.map') {
+    if (ext === 'js.map') {
+      continue;
+    } else if (path.basename(dir) === 'dev') {
+      packageJSON.exports['./dev'] = './dev/index.js';
       continue;
     }
 
@@ -107,7 +108,8 @@ async function buildPackage(outDir: string): Promise<void> {
       `${dir}/${name}`,
     );
 
-    const lines = ext === 'd.ts' ? [] : [`import '${relativePathToProd}/dev';`];
+    const lines =
+      ext === 'd.ts' ? [] : [`import '${relativePathToProd}/dev/index.js';`];
     lines.push(
       `export * from '${relativePathToProd}/${relativePathAndName}.js';`,
     );
@@ -121,19 +123,19 @@ async function buildPackage(outDir: string): Promise<void> {
     if (base === 'index.js') {
       const dirname = path.dirname(relativePathAndName);
       packageJSON.exports[dirname === '.' ? dirname : `./${dirname}`] = {
-        development: `./dev/${relativePathAndName}.js`,
+        development: `./__dev__/${relativePathAndName}.js`,
         default: `./${relativePathAndName}.js`,
       };
     }
   }
 
   // Temporary workaround to allow "internal" imports, no grantees provided
   packageJSON.exports['./*.js'] = {
-    development: './dev/*.js',
+    development: './__dev__/*.js',
     default: './*.js',
   };
   packageJSON.exports['./*'] = {
-    development: './dev/*.js',
+    development: './__dev__/*.js',
     default: './*.js',
   };
 
@@ -168,7 +170,7 @@ function emitTSFiles(options: {
   tsHost.writeFile = (filepath, body) => writeGeneratedFile(filepath, body);
 
   const tsProgram = ts.createProgram(
-    ['src/index.ts', 'src/development.ts'],
+    ['src/index.ts', 'src/dev/index.ts'],
     tsOptions,
     tsHost,
   );

resources/utils.ts

@@ -235,10 +235,12 @@ interface PackageJSON {
   scripts?: { [name: string]: string };
   type?: string;
   exports: {
-    [path: string]: {
-      development: string;
-      default: string;
-    };
+    [path: string]:
+      | string
+      | {
+          development: string;
+          default: string;
+        };
   };
   types?: string;
   typesVersions: { [ranges: string]: { [path: string]: Array<string> } };

src/dev/index.ts

@@ -1,6 +1,5 @@
 import { inspect } from '../jsutils/inspect.js';
 import type { Constructor } from '../jsutils/instanceOf.js';
-import { symbolForGraphQLInstanceOfCheck } from '../jsutils/instanceOf.js';
 
 /**
  * An additional check to be included within instanceOf warning when
@@ -43,5 +42,5 @@ spurious results.`,
   }
 }
 
-(globalThis as any)[symbolForGraphQLInstanceOfCheck] =
+(globalThis as any)[Symbol.for('graphql.instanceOfCheck')] =
   developmentInstanceOfCheck;

src/jsutils/instanceOf.ts

@@ -1,7 +1,3 @@
-export const symbolForGraphQLInstanceOfCheck = Symbol.for(
-  'graphql.instanceOfCheck',
-);
-
 /**
  * "src/development.ts" includes an additional check for development mode
  * which throws on multiple versions of graphql-js.
@@ -12,7 +8,7 @@ export const symbolForGraphQLInstanceOfCheck = Symbol.for(
  * 2. if the "development" condition is set.
  */
 const check: (_value: unknown, _constructor: Constructor) => void =
-  (globalThis as any)[symbolForGraphQLInstanceOfCheck] ??
+  (globalThis as any)[Symbol.for('graphql.instanceOfCheck')] ??
   ((_value: unknown, _constructor: Constructor) => {
     /* no-op */
   });