@graphql-yoga/plugin-defer-stream 2.0.3 → 2.0.4-alpha-20230810153432-d9f7d423

package/cjs/index.js

@@ -29,7 +29,7 @@ function useDeferStream() {
         onValidate: ({ params, addValidationRule, }) => {
             // Just to make TS happy because rules are always defined by useEngine.
             params.rules ||= [];
-            params.rules = params.rules.filter((rule) => rule.name !== 'OverlappingFieldsCanBeMergedRule');
+            params.rules = params.rules.filter(rule => rule.name !== 'OverlappingFieldsCanBeMergedRule');
             addValidationRule(overlapping_fields_can_be_merged_js_1.OverlappingFieldsCanBeMergedRule);
             addValidationRule(defer_stream_directive_label_js_1.DeferStreamDirectiveLabelRule);
             addValidationRule(defer_stream_directive_on_root_field_js_1.DeferStreamDirectiveOnRootFieldRule);

package/cjs/validations/defer-stream-directive-label.js

@@ -14,7 +14,7 @@ function DeferStreamDirectiveLabelRule(context) {
         Directive(node) {
             if (node.name.value === utils_1.GraphQLDeferDirective.name ||
                 node.name.value === utils_1.GraphQLStreamDirective.name) {
-                const labelArgument = node.arguments?.find((arg) => arg.name.value === 'label');
+                const labelArgument = node.arguments?.find(arg => arg.name.value === 'label');
                 const labelValue = labelArgument?.value;
                 if (!labelValue) {
                     return;
@@ -23,7 +23,9 @@ function DeferStreamDirectiveLabelRule(context) {
                     context.reportError((0, utils_1.createGraphQLError)(`Directive "${node.name.value}"'s label argument must be a static string.`, { nodes: node }));
                 }
                 else if (knownLabels[labelValue.value]) {
-                    context.reportError((0, utils_1.createGraphQLError)('Defer/Stream directive label argument must be unique.', { nodes: [knownLabels[labelValue.value], node] }));
+                    context.reportError((0, utils_1.createGraphQLError)('Defer/Stream directive label argument must be unique.', {
+                        nodes: [knownLabels[labelValue.value], node],
+                    }));
                 }
                 else {
                     knownLabels[labelValue.value] = node;

package/cjs/validations/overlapping-fields-can-be-merged.js

@@ -79,7 +79,7 @@ function sortValueNode(valueNode) {
 }
 function sortFields(fields) {
     return fields
-        .map((fieldNode) => ({
+        .map(fieldNode => ({
         ...fieldNode,
         value: sortValueNode(fieldNode.value),
     }))
@@ -88,8 +88,7 @@ function sortFields(fields) {
 function reasonMessage(reason) {
     if (Array.isArray(reason)) {
         return reason
-            .map(([responseName, subReason]) => `subfields "${responseName}" conflict because ` +
-            reasonMessage(subReason))
+            .map(([responseName, subReason]) => `subfields "${responseName}" conflict because ` + reasonMessage(subReason))
             .join(' and ');
     }
     return reason;
@@ -352,19 +351,13 @@ function findConflict(context, cachedFieldsAndFragmentNames, comparedFragmentPai
     // in the current state of the schema, then perhaps in some future version,
     // thus may not safely diverge.
     const areMutuallyExclusive = parentFieldsAreMutuallyExclusive ||
-        (parentType1 !== parentType2 &&
-            (0, graphql_1.isObjectType)(parentType1) &&
-            (0, graphql_1.isObjectType)(parentType2));
+        (parentType1 !== parentType2 && (0, graphql_1.isObjectType)(parentType1) && (0, graphql_1.isObjectType)(parentType2));
     if (!areMutuallyExclusive) {
         // Two aliases must refer to the same field.
         const name1 = node1.name.value;
         const name2 = node2.name.value;
         if (name1 !== name2) {
-            return [
-                [responseName, `"${name1}" and "${name2}" are different fields`],
-                [node1],
-                [node2],
-            ];
+            return [[responseName, `"${name1}" and "${name2}" are different fields`], [node1], [node2]];
         }
         // Two field calls must have the same arguments.
         if (stringifyArguments(node1) !== stringifyArguments(node2)) {
@@ -375,21 +368,14 @@ function findConflict(context, cachedFieldsAndFragmentNames, comparedFragmentPai
     const directives1 = /* c8 ignore next */ node1.directives ?? [];
     const directives2 = /* c8 ignore next */ node2.directives ?? [];
     if (!sameStreams(directives1, directives2)) {
-        return [
-            [responseName, 'they have differing stream directives'],
-            [node1],
-            [node2],
-        ];
+        return [[responseName, 'they have differing stream directives'], [node1], [node2]];
     }
     // The return type for each field.
     const type1 = def1?.type;
     const type2 = def2?.type;
     if (type1 && type2 && doTypesConflict(type1, type2)) {
         return [
-            [
-                responseName,
-                `they return conflicting types "${(0, utils_1.inspect)(type1)}" and "${(0, utils_1.inspect)(type2)}"`,
-            ],
+            [responseName, `they return conflicting types "${(0, utils_1.inspect)(type1)}" and "${(0, utils_1.inspect)(type2)}"`],
             [node1],
             [node2],
         ];
@@ -410,7 +396,7 @@ function stringifyArguments(fieldNode) {
     const args = /* c8 ignore next */ fieldNode.arguments ?? [];
     const inputObjectWithArgs = {
         kind: graphql_1.Kind.OBJECT,
-        fields: args.map((argNode) => ({
+        fields: args.map(argNode => ({
             kind: graphql_1.Kind.OBJECT_FIELD,
             name: argNode.name,
             value: argNode.value,
@@ -419,7 +405,7 @@ function stringifyArguments(fieldNode) {
     return (0, graphql_1.print)(sortValueNode(inputObjectWithArgs));
 }
 function getStreamDirective(directives) {
-    return directives.find((directive) => directive.name.value === 'stream');
+    return directives.find(directive => directive.name.value === 'stream');
 }
 function sameStreams(directives1, directives2) {
     const stream1 = getStreamDirective(directives1);
@@ -440,17 +426,13 @@ function sameStreams(directives1, directives2) {
 // later recursively. However List and Non-Null types must match.
 function doTypesConflict(type1, type2) {
     if ((0, graphql_1.isListType)(type1)) {
-        return (0, graphql_1.isListType)(type2)
-            ? doTypesConflict(type1.ofType, type2.ofType)
-            : true;
+        return (0, graphql_1.isListType)(type2) ? doTypesConflict(type1.ofType, type2.ofType) : true;
     }
     if ((0, graphql_1.isListType)(type2)) {
         return true;
     }
     if ((0, graphql_1.isNonNullType)(type1)) {
-        return (0, graphql_1.isNonNullType)(type2)
-            ? doTypesConflict(type1.ofType, type2.ofType)
-            : true;
+        return (0, graphql_1.isNonNullType)(type2) ? doTypesConflict(type1.ofType, type2.ofType) : true;
     }
     if ((0, graphql_1.isNonNullType)(type2)) {
         return true;

package/esm/index.js

@@ -1,5 +1,5 @@
 import { GraphQLSchema } from 'graphql';
-import { GraphQLDeferDirective, GraphQLStreamDirective, } from '@graphql-tools/utils';
+import { GraphQLDeferDirective, GraphQLStreamDirective } from '@graphql-tools/utils';
 import { DeferStreamDirectiveLabelRule } from './validations/defer-stream-directive-label.js';
 import { DeferStreamDirectiveOnRootFieldRule } from './validations/defer-stream-directive-on-root-field.js';
 import { OverlappingFieldsCanBeMergedRule } from './validations/overlapping-fields-can-be-merged.js';
@@ -26,7 +26,7 @@ export function useDeferStream() {
         onValidate: ({ params, addValidationRule, }) => {
             // Just to make TS happy because rules are always defined by useEngine.
             params.rules ||= [];
-            params.rules = params.rules.filter((rule) => rule.name !== 'OverlappingFieldsCanBeMergedRule');
+            params.rules = params.rules.filter(rule => rule.name !== 'OverlappingFieldsCanBeMergedRule');
             addValidationRule(OverlappingFieldsCanBeMergedRule);
             addValidationRule(DeferStreamDirectiveLabelRule);
             addValidationRule(DeferStreamDirectiveOnRootFieldRule);

package/esm/validations/defer-stream-directive-label.js

@@ -11,7 +11,7 @@ export function DeferStreamDirectiveLabelRule(context) {
         Directive(node) {
             if (node.name.value === GraphQLDeferDirective.name ||
                 node.name.value === GraphQLStreamDirective.name) {
-                const labelArgument = node.arguments?.find((arg) => arg.name.value === 'label');
+                const labelArgument = node.arguments?.find(arg => arg.name.value === 'label');
                 const labelValue = labelArgument?.value;
                 if (!labelValue) {
                     return;
@@ -20,7 +20,9 @@ export function DeferStreamDirectiveLabelRule(context) {
                     context.reportError(createGraphQLError(`Directive "${node.name.value}"'s label argument must be a static string.`, { nodes: node }));
                 }
                 else if (knownLabels[labelValue.value]) {
-                    context.reportError(createGraphQLError('Defer/Stream directive label argument must be unique.', { nodes: [knownLabels[labelValue.value], node] }));
+                    context.reportError(createGraphQLError('Defer/Stream directive label argument must be unique.', {
+                        nodes: [knownLabels[labelValue.value], node],
+                    }));
                 }
                 else {
                     knownLabels[labelValue.value] = node;

package/esm/validations/overlapping-fields-can-be-merged.js

@@ -75,7 +75,7 @@ function sortValueNode(valueNode) {
 }
 function sortFields(fields) {
     return fields
-        .map((fieldNode) => ({
+        .map(fieldNode => ({
         ...fieldNode,
         value: sortValueNode(fieldNode.value),
     }))
@@ -84,8 +84,7 @@ function sortFields(fields) {
 function reasonMessage(reason) {
     if (Array.isArray(reason)) {
         return reason
-            .map(([responseName, subReason]) => `subfields "${responseName}" conflict because ` +
-            reasonMessage(subReason))
+            .map(([responseName, subReason]) => `subfields "${responseName}" conflict because ` + reasonMessage(subReason))
             .join(' and ');
     }
     return reason;
@@ -347,19 +346,13 @@ function findConflict(context, cachedFieldsAndFragmentNames, comparedFragmentPai
     // in the current state of the schema, then perhaps in some future version,
     // thus may not safely diverge.
     const areMutuallyExclusive = parentFieldsAreMutuallyExclusive ||
-        (parentType1 !== parentType2 &&
-            isObjectType(parentType1) &&
-            isObjectType(parentType2));
+        (parentType1 !== parentType2 && isObjectType(parentType1) && isObjectType(parentType2));
     if (!areMutuallyExclusive) {
         // Two aliases must refer to the same field.
         const name1 = node1.name.value;
         const name2 = node2.name.value;
         if (name1 !== name2) {
-            return [
-                [responseName, `"${name1}" and "${name2}" are different fields`],
-                [node1],
-                [node2],
-            ];
+            return [[responseName, `"${name1}" and "${name2}" are different fields`], [node1], [node2]];
         }
         // Two field calls must have the same arguments.
         if (stringifyArguments(node1) !== stringifyArguments(node2)) {
@@ -370,21 +363,14 @@ function findConflict(context, cachedFieldsAndFragmentNames, comparedFragmentPai
     const directives1 = /* c8 ignore next */ node1.directives ?? [];
     const directives2 = /* c8 ignore next */ node2.directives ?? [];
     if (!sameStreams(directives1, directives2)) {
-        return [
-            [responseName, 'they have differing stream directives'],
-            [node1],
-            [node2],
-        ];
+        return [[responseName, 'they have differing stream directives'], [node1], [node2]];
     }
     // The return type for each field.
     const type1 = def1?.type;
     const type2 = def2?.type;
     if (type1 && type2 && doTypesConflict(type1, type2)) {
         return [
-            [
-                responseName,
-                `they return conflicting types "${inspect(type1)}" and "${inspect(type2)}"`,
-            ],
+            [responseName, `they return conflicting types "${inspect(type1)}" and "${inspect(type2)}"`],
             [node1],
             [node2],
         ];
@@ -405,7 +391,7 @@ function stringifyArguments(fieldNode) {
     const args = /* c8 ignore next */ fieldNode.arguments ?? [];
     const inputObjectWithArgs = {
         kind: Kind.OBJECT,
-        fields: args.map((argNode) => ({
+        fields: args.map(argNode => ({
             kind: Kind.OBJECT_FIELD,
             name: argNode.name,
             value: argNode.value,
@@ -414,7 +400,7 @@ function stringifyArguments(fieldNode) {
     return print(sortValueNode(inputObjectWithArgs));
 }
 function getStreamDirective(directives) {
-    return directives.find((directive) => directive.name.value === 'stream');
+    return directives.find(directive => directive.name.value === 'stream');
 }
 function sameStreams(directives1, directives2) {
     const stream1 = getStreamDirective(directives1);
@@ -435,17 +421,13 @@ function sameStreams(directives1, directives2) {
 // later recursively. However List and Non-Null types must match.
 function doTypesConflict(type1, type2) {
     if (isListType(type1)) {
-        return isListType(type2)
-            ? doTypesConflict(type1.ofType, type2.ofType)
-            : true;
+        return isListType(type2) ? doTypesConflict(type1.ofType, type2.ofType) : true;
     }
     if (isListType(type2)) {
         return true;
     }
     if (isNonNullType(type1)) {
-        return isNonNullType(type2)
-            ? doTypesConflict(type1.ofType, type2.ofType)
-            : true;
+        return isNonNullType(type2) ? doTypesConflict(type1.ofType, type2.ofType) : true;
     }
     if (isNonNullType(type2)) {
         return true;

package/esm/validations/stream-directive-on-list-field.js

@@ -1,5 +1,5 @@
-import { isListType, isWrappingType, } from 'graphql';
-import { createGraphQLError, GraphQLStreamDirective, } from '@graphql-tools/utils';
+import { isListType, isWrappingType } from 'graphql';
+import { createGraphQLError, GraphQLStreamDirective } from '@graphql-tools/utils';
 /**
  * Stream directive on list field
  *

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@graphql-yoga/plugin-defer-stream",
-  "version": "2.0.3",
+  "version": "2.0.4-alpha-20230810153432-d9f7d423",
   "description": "Defer/Stream plugin for GraphQL Yoga.",
   "peerDependencies": {
     "graphql": "^15.2.0 || ^16.0.0",
-    "graphql-yoga": "^4.0.3"
+    "graphql-yoga": "4.0.4-alpha-20230810153432-d9f7d423"
   },
   "dependencies": {
     "@graphql-tools/utils": "^10.0.0"