graphql 15.5.0 → 15.5.1

package/jsutils/instanceOf.js

@@ -5,10 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-/**
- * A replacement for instanceof which includes an error warning when multi-realm
- * constructors are detected.
- */
+var _inspect = _interopRequireDefault(require("./inspect.js"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 // See: https://expressjs.com/en/advanced/best-practice-performance.html#set-node_env-to-production
 // See: https://webpack.js.org/guides/production/
 var _default = process.env.NODE_ENV === 'production' ? // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2317')
@@ -21,12 +23,16 @@ function instanceOf(value, constructor) {
     return true;
   }
 
-  if (value) {
-    var valueClass = value.constructor;
-    var className = constructor.name;
+  if (_typeof(value) === 'object' && value !== null) {
+    var _value$constructor;
+
+    var className = constructor.prototype[Symbol.toStringTag];
+    var valueClassName = // We still need to support constructor's name to detect conflicts with older versions of this library.
+    Symbol.toStringTag in value ? value[Symbol.toStringTag] : (_value$constructor = value.constructor) === null || _value$constructor === void 0 ? void 0 : _value$constructor.name;
 
-    if (className && valueClass && valueClass.name === className) {
-      throw new Error("Cannot use ".concat(className, " \"").concat(value, "\" from another module or realm.\n\nEnsure that there is only one instance of \"graphql\" in the node_modules\ndirectory. If different versions of \"graphql\" are the dependencies of other\nrelied on modules, use \"resolutions\" to ensure only one version is installed.\n\nhttps://yarnpkg.com/en/docs/selective-version-resolutions\n\nDuplicate \"graphql\" modules cannot be used at the same time since different\nversions may have different capabilities and behavior. The data from one\nversion used in the function from another could produce confusing and\nspurious results."));
+    if (className === valueClassName) {
+      var stringifiedValue = (0, _inspect.default)(value);
+      throw new Error("Cannot use ".concat(className, " \"").concat(stringifiedValue, "\" from another module or realm.\n\nEnsure that there is only one instance of \"graphql\" in the node_modules\ndirectory. If different versions of \"graphql\" are the dependencies of other\nrelied on modules, use \"resolutions\" to ensure only one version is installed.\n\nhttps://yarnpkg.com/en/docs/selective-version-resolutions\n\nDuplicate \"graphql\" modules cannot be used at the same time since different\nversions may have different capabilities and behavior. The data from one\nversion used in the function from another could produce confusing and\nspurious results."));
     }
   }
 

package/jsutils/instanceOf.js.flow

@@ -1,4 +1,6 @@
 // @flow strict
+import inspect from './inspect';
+
 /**
  * A replacement for instanceof which includes an error warning when multi-realm
  * constructors are detected.
@@ -21,12 +23,17 @@ export default process.env.NODE_ENV === 'production'
       if (value instanceof constructor) {
         return true;
       }
-      if (value) {
-        const valueClass = value.constructor;
-        const className = constructor.name;
-        if (className && valueClass && valueClass.name === className) {
+      if (typeof value === 'object' && value !== null) {
+        const className = constructor.prototype[Symbol.toStringTag];
+        const valueClassName =
+          // We still need to support constructor's name to detect conflicts with older versions of this library.
+          Symbol.toStringTag in value
+            ? value[Symbol.toStringTag]
+            : value.constructor?.name;
+        if (className === valueClassName) {
+          const stringifiedValue = inspect(value);
           throw new Error(
-            `Cannot use ${className} "${value}" from another module or realm.
+            `Cannot use ${className} "${stringifiedValue}" from another module or realm.
 
 Ensure that there is only one instance of "graphql" in the node_modules
 directory. If different versions of "graphql" are the dependencies of other

package/jsutils/instanceOf.mjs

@@ -1,7 +1,11 @@
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+import inspect from "./inspect.mjs";
 /**
  * A replacement for instanceof which includes an error warning when multi-realm
  * constructors are detected.
  */
+
 // See: https://expressjs.com/en/advanced/best-practice-performance.html#set-node_env-to-production
 // See: https://webpack.js.org/guides/production/
 export default process.env.NODE_ENV === 'production' ? // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2317')
@@ -14,12 +18,16 @@ function instanceOf(value, constructor) {
     return true;
   }
 
-  if (value) {
-    var valueClass = value.constructor;
-    var className = constructor.name;
+  if (_typeof(value) === 'object' && value !== null) {
+    var _value$constructor;
+
+    var className = constructor.prototype[Symbol.toStringTag];
+    var valueClassName = // We still need to support constructor's name to detect conflicts with older versions of this library.
+    Symbol.toStringTag in value ? value[Symbol.toStringTag] : (_value$constructor = value.constructor) === null || _value$constructor === void 0 ? void 0 : _value$constructor.name;
 
-    if (className && valueClass && valueClass.name === className) {
-      throw new Error("Cannot use ".concat(className, " \"").concat(value, "\" from another module or realm.\n\nEnsure that there is only one instance of \"graphql\" in the node_modules\ndirectory. If different versions of \"graphql\" are the dependencies of other\nrelied on modules, use \"resolutions\" to ensure only one version is installed.\n\nhttps://yarnpkg.com/en/docs/selective-version-resolutions\n\nDuplicate \"graphql\" modules cannot be used at the same time since different\nversions may have different capabilities and behavior. The data from one\nversion used in the function from another could produce confusing and\nspurious results."));
+    if (className === valueClassName) {
+      var stringifiedValue = inspect(value);
+      throw new Error("Cannot use ".concat(className, " \"").concat(stringifiedValue, "\" from another module or realm.\n\nEnsure that there is only one instance of \"graphql\" in the node_modules\ndirectory. If different versions of \"graphql\" are the dependencies of other\nrelied on modules, use \"resolutions\" to ensure only one version is installed.\n\nhttps://yarnpkg.com/en/docs/selective-version-resolutions\n\nDuplicate \"graphql\" modules cannot be used at the same time since different\nversions may have different capabilities and behavior. The data from one\nversion used in the function from another could produce confusing and\nspurious results."));
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql",
-  "version": "15.5.0",
+  "version": "15.5.1",
   "description": "A Query Language and Runtime which can target any service.",
   "license": "MIT",
   "main": "index",
@@ -22,4 +22,4 @@
   "engines": {
     "node": ">= 10.x"
   }
-}
+}

package/version.js

@@ -13,7 +13,7 @@ exports.versionInfo = exports.version = void 0;
 /**
  * A string containing the version of the GraphQL.js library
  */
-var version = '15.5.0';
+var version = '15.5.1';
 /**
  * An object containing the components of the GraphQL.js version string
  */
@@ -22,7 +22,7 @@ exports.version = version;
 var versionInfo = Object.freeze({
   major: 15,
   minor: 5,
-  patch: 0,
+  patch: 1,
   preReleaseTag: null
 });
 exports.versionInfo = versionInfo;

package/version.js.flow

@@ -7,7 +7,7 @@
 /**
  * A string containing the version of the GraphQL.js library
  */
-export const version = '15.5.0';
+export const version = '15.5.1';
 
 /**
  * An object containing the components of the GraphQL.js version string
@@ -15,6 +15,6 @@ export const version = '15.5.0';
 export const versionInfo = Object.freeze({
   major: 15,
   minor: 5,
-  patch: 0,
+  patch: 1,
   preReleaseTag: null,
 });

package/version.mjs

@@ -6,7 +6,7 @@
 /**
  * A string containing the version of the GraphQL.js library
  */
-export var version = '15.5.0';
+export var version = '15.5.1';
 /**
  * An object containing the components of the GraphQL.js version string
  */
@@ -14,6 +14,6 @@ export var version = '15.5.0';
 export var versionInfo = Object.freeze({
   major: 15,
   minor: 5,
-  patch: 0,
+  patch: 1,
   preReleaseTag: null
 });