@graphql-tools/schema - npm Package Compare versions

Comparing version 10.0.0-rc-20230519015308-f93ea91d to 10.0.0-rc-20230519104627-f6fea064

cjs/addResolversToSchema.js

@@ -89,3 +89,2 @@ "use strict";
 function addResolversToExistingSchema(schema, resolvers, defaultFieldResolver) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     const typeMap = schema.getTypeMap();
@@ -103,8 +102,8 @@ for (const typeName in resolvers) {
                         ...type.astNode,
-                        description: (_b = (_a = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.astNode) === null || _a === void 0 ? void 0 : _a.description) !== null && _b !== void 0 ? _b : type.astNode.description,
-                        directives: ((_c = type.astNode.directives) !== null && _c !== void 0 ? _c : []).concat((_e = (_d = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.astNode) === null || _d === void 0 ? void 0 : _d.directives) !== null && _e !== void 0 ? _e : []),
+                        description: resolverValue?.astNode?.description ?? type.astNode.description,
+                        directives: (type.astNode.directives ?? []).concat(resolverValue?.astNode?.directives ?? []),
                     };
                 }
                 else if (fieldName === 'extensionASTNodes' && type.extensionASTNodes != null) {
-                    type.extensionASTNodes = type.extensionASTNodes.concat((_f = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.extensionASTNodes) !== null && _f !== void 0 ? _f : []);
+                    type.extensionASTNodes = type.extensionASTNodes.concat(resolverValue?.extensionASTNodes ?? []);
                 }
@@ -131,8 +130,8 @@ else if (fieldName === 'extensions' &&
                         ...config.astNode,
-                        description: (_h = (_g = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.astNode) === null || _g === void 0 ? void 0 : _g.description) !== null && _h !== void 0 ? _h : config.astNode.description,
-                        directives: ((_j = config.astNode.directives) !== null && _j !== void 0 ? _j : []).concat((_l = (_k = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.astNode) === null || _k === void 0 ? void 0 : _k.directives) !== null && _l !== void 0 ? _l : []),
+                        description: resolverValue?.astNode?.description ?? config.astNode.description,
+                        directives: (config.astNode.directives ?? []).concat(resolverValue?.astNode?.directives ?? []),
                     };
                 }
                 else if (fieldName === 'extensionASTNodes' && config.extensionASTNodes != null) {
-                    config.extensionASTNodes = config.extensionASTNodes.concat((_m = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.extensionASTNodes) !== null && _m !== void 0 ? _m : []);
+                    config.extensionASTNodes = config.extensionASTNodes.concat(resolverValue?.extensionASTNodes ?? []);
                 }
@@ -197,3 +196,2 @@ else if (fieldName === 'extensions' &&
         [utils_1.MapperKind.SCALAR_TYPE]: type => {
-            var _a, _b, _c, _d, _e, _f;
             const config = type.toConfig();
@@ -209,8 +207,8 @@ const resolverValue = resolvers[type.name];
                             ...config.astNode,
-                            description: (_b = (_a = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.astNode) === null || _a === void 0 ? void 0 : _a.description) !== null && _b !== void 0 ? _b : config.astNode.description,
-                            directives: ((_c = config.astNode.directives) !== null && _c !== void 0 ? _c : []).concat((_e = (_d = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.astNode) === null || _d === void 0 ? void 0 : _d.directives) !== null && _e !== void 0 ? _e : []),
+                            description: resolverValue?.astNode?.description ?? config.astNode.description,
+                            directives: (config.astNode.directives ?? []).concat(resolverValue?.astNode?.directives ?? []),
                         };
                     }
                     else if (fieldName === 'extensionASTNodes' && config.extensionASTNodes != null) {
-                        config.extensionASTNodes = config.extensionASTNodes.concat((_f = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.extensionASTNodes) !== null && _f !== void 0 ? _f : []);
+                        config.extensionASTNodes = config.extensionASTNodes.concat(resolverValue?.extensionASTNodes ?? []);
                     }
@@ -230,3 +228,2 @@ else if (fieldName === 'extensions' &&
         [utils_1.MapperKind.ENUM_TYPE]: type => {
-            var _a, _b, _c, _d, _e, _f;
             const resolverValue = resolvers[type.name];
@@ -243,8 +240,8 @@ const config = type.toConfig();
                             ...config.astNode,
-                            description: (_b = (_a = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.astNode) === null || _a === void 0 ? void 0 : _a.description) !== null && _b !== void 0 ? _b : config.astNode.description,
-                            directives: ((_c = config.astNode.directives) !== null && _c !== void 0 ? _c : []).concat((_e = (_d = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.astNode) === null || _d === void 0 ? void 0 : _d.directives) !== null && _e !== void 0 ? _e : []),
+                            description: resolverValue?.astNode?.description ?? config.astNode.description,
+                            directives: (config.astNode.directives ?? []).concat(resolverValue?.astNode?.directives ?? []),
                         };
                     }
                     else if (fieldName === 'extensionASTNodes' && config.extensionASTNodes != null) {
-                        config.extensionASTNodes = config.extensionASTNodes.concat((_f = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.extensionASTNodes) !== null && _f !== void 0 ? _f : []);
+                        config.extensionASTNodes = config.extensionASTNodes.concat(resolverValue?.extensionASTNodes ?? []);
                     }
@@ -251,0 +248,0 @@ else if (fieldName === 'extensions' &&

cjs/makeExecutableSchema.js

@@ -64,3 +64,3 @@ "use strict";
     }
-    else if (otherOptions === null || otherOptions === void 0 ? void 0 : otherOptions.commentDescriptions) {
+    else if (otherOptions?.commentDescriptions) {
         const mergedTypeDefs = (0, merge_1.mergeTypeDefs)(typeDefs, {
@@ -67,0 +67,0 @@ ...otherOptions,

esm/addResolversToSchema.js

@@ -85,3 +85,2 @@ import { GraphQLEnumType, GraphQLScalarType, GraphQLUnionType, GraphQLInterfaceType, GraphQLObjectType, isSpecifiedScalarType, isScalarType, isEnumType, isUnionType, isInterfaceType, isObjectType, } from 'graphql';
 function addResolversToExistingSchema(schema, resolvers, defaultFieldResolver) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     const typeMap = schema.getTypeMap();
@@ -99,8 +98,8 @@ for (const typeName in resolvers) {
                         ...type.astNode,
-                        description: (_b = (_a = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.astNode) === null || _a === void 0 ? void 0 : _a.description) !== null && _b !== void 0 ? _b : type.astNode.description,
-                        directives: ((_c = type.astNode.directives) !== null && _c !== void 0 ? _c : []).concat((_e = (_d = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.astNode) === null || _d === void 0 ? void 0 : _d.directives) !== null && _e !== void 0 ? _e : []),
+                        description: resolverValue?.astNode?.description ?? type.astNode.description,
+                        directives: (type.astNode.directives ?? []).concat(resolverValue?.astNode?.directives ?? []),
                     };
                 }
                 else if (fieldName === 'extensionASTNodes' && type.extensionASTNodes != null) {
-                    type.extensionASTNodes = type.extensionASTNodes.concat((_f = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.extensionASTNodes) !== null && _f !== void 0 ? _f : []);
+                    type.extensionASTNodes = type.extensionASTNodes.concat(resolverValue?.extensionASTNodes ?? []);
                 }
@@ -127,8 +126,8 @@ else if (fieldName === 'extensions' &&
                         ...config.astNode,
-                        description: (_h = (_g = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.astNode) === null || _g === void 0 ? void 0 : _g.description) !== null && _h !== void 0 ? _h : config.astNode.description,
-                        directives: ((_j = config.astNode.directives) !== null && _j !== void 0 ? _j : []).concat((_l = (_k = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.astNode) === null || _k === void 0 ? void 0 : _k.directives) !== null && _l !== void 0 ? _l : []),
+                        description: resolverValue?.astNode?.description ?? config.astNode.description,
+                        directives: (config.astNode.directives ?? []).concat(resolverValue?.astNode?.directives ?? []),
                     };
                 }
                 else if (fieldName === 'extensionASTNodes' && config.extensionASTNodes != null) {
-                    config.extensionASTNodes = config.extensionASTNodes.concat((_m = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.extensionASTNodes) !== null && _m !== void 0 ? _m : []);
+                    config.extensionASTNodes = config.extensionASTNodes.concat(resolverValue?.extensionASTNodes ?? []);
                 }
@@ -193,3 +192,2 @@ else if (fieldName === 'extensions' &&
         [MapperKind.SCALAR_TYPE]: type => {
-            var _a, _b, _c, _d, _e, _f;
             const config = type.toConfig();
@@ -205,8 +203,8 @@ const resolverValue = resolvers[type.name];
                             ...config.astNode,
-                            description: (_b = (_a = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.astNode) === null || _a === void 0 ? void 0 : _a.description) !== null && _b !== void 0 ? _b : config.astNode.description,
-                            directives: ((_c = config.astNode.directives) !== null && _c !== void 0 ? _c : []).concat((_e = (_d = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.astNode) === null || _d === void 0 ? void 0 : _d.directives) !== null && _e !== void 0 ? _e : []),
+                            description: resolverValue?.astNode?.description ?? config.astNode.description,
+                            directives: (config.astNode.directives ?? []).concat(resolverValue?.astNode?.directives ?? []),
                         };
                     }
                     else if (fieldName === 'extensionASTNodes' && config.extensionASTNodes != null) {
-                        config.extensionASTNodes = config.extensionASTNodes.concat((_f = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.extensionASTNodes) !== null && _f !== void 0 ? _f : []);
+                        config.extensionASTNodes = config.extensionASTNodes.concat(resolverValue?.extensionASTNodes ?? []);
                     }
@@ -226,3 +224,2 @@ else if (fieldName === 'extensions' &&
         [MapperKind.ENUM_TYPE]: type => {
-            var _a, _b, _c, _d, _e, _f;
             const resolverValue = resolvers[type.name];
@@ -239,8 +236,8 @@ const config = type.toConfig();
                             ...config.astNode,
-                            description: (_b = (_a = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.astNode) === null || _a === void 0 ? void 0 : _a.description) !== null && _b !== void 0 ? _b : config.astNode.description,
-                            directives: ((_c = config.astNode.directives) !== null && _c !== void 0 ? _c : []).concat((_e = (_d = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.astNode) === null || _d === void 0 ? void 0 : _d.directives) !== null && _e !== void 0 ? _e : []),
+                            description: resolverValue?.astNode?.description ?? config.astNode.description,
+                            directives: (config.astNode.directives ?? []).concat(resolverValue?.astNode?.directives ?? []),
                         };
                     }
                     else if (fieldName === 'extensionASTNodes' && config.extensionASTNodes != null) {
-                        config.extensionASTNodes = config.extensionASTNodes.concat((_f = resolverValue === null || resolverValue === void 0 ? void 0 : resolverValue.extensionASTNodes) !== null && _f !== void 0 ? _f : []);
+                        config.extensionASTNodes = config.extensionASTNodes.concat(resolverValue?.extensionASTNodes ?? []);
                     }
@@ -247,0 +244,0 @@ else if (fieldName === 'extensions' &&

esm/makeExecutableSchema.js

@@ -61,3 +61,3 @@ import { buildASTSchema, buildSchema, isSchema } from 'graphql';
     }
-    else if (otherOptions === null || otherOptions === void 0 ? void 0 : otherOptions.commentDescriptions) {
+    else if (otherOptions?.commentDescriptions) {
         const mergedTypeDefs = mergeTypeDefs(typeDefs, {
@@ -64,0 +64,0 @@ ...otherOptions,

package.json

 {
   "name": "@graphql-tools/schema",
-  "version": "10.0.0-rc-20230519015308-f93ea91d",
+  "version": "10.0.0-rc-20230519104627-f6fea064",
   "description": "A set of utils for faster development of GraphQL tools",
@@ -10,4 +10,4 @@ "sideEffects": false,
   "dependencies": {
-    "@graphql-tools/merge": "9.0.0-rc-20230519015308-f93ea91d",
-    "@graphql-tools/utils": "10.0.0-rc-20230519015308-f93ea91d",
+    "@graphql-tools/merge": "9.0.0-rc-20230519104627-f6fea064",
+    "@graphql-tools/utils": "10.0.0-rc-20230519104627-f6fea064",
     "tslib": "^2.4.0",
@@ -14,0 +14,0 @@ "value-or-promise": "^1.0.12"

No alert changes

Worsened metrics

Total package byte prevSize

65955

decreased by-5.41%

Lines of code

1251

decreased by-0.48%

Dependency changes

• + Added@graphql-tools/merge@9.0.0-rc-20230519104627-f6fea064(transitive)

• + Added@graphql-tools/utils@10.0.0-rc-20230519104627-f6fea064(transitive)

• - Removed@graphql-tools/merge@9.0.0-rc-20230519015308-f93ea91d(transitive)

• - Removed@graphql-tools/utils@10.0.0-rc-20230519015308-f93ea91d(transitive)

• Updated@graphql-tools/merge@9.0.0-rc-20230519104627-f6fea064

• Updated@graphql-tools/utils@10.0.0-rc-20230519104627-f6fea064