@graphql-tools/delegate 9.0.7 → 9.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/cjs/resolveExternalValue.js +5 -22
  2. package/esm/resolveExternalValue.js +5 -22
  3. package/package.json +1 -1
package/cjs/resolveExternalValue.js CHANGED
@@ -19,7 +19,10 @@ function resolveExternalValue(result, unpathedErrors, subschema, context, info,
19
19
  return resolveExternalObject(type, result, unpathedErrors, subschema, context, info, skipTypeMerging);
20
20
  }
21
21
  else if ((0, graphql_1.isListType)(type)) {
22
- return resolveExternalList(type, result, unpathedErrors, subschema, context, info, skipTypeMerging);
22
+ if (Array.isArray(result)) {
23
+ return resolveExternalList(type, result, unpathedErrors, subschema, context, info, skipTypeMerging);
24
+ }
25
+ return resolveExternalValue(result, unpathedErrors, subschema, context, info, type.ofType, skipTypeMerging);
23
26
  }
24
27
  }
25
28
  exports.resolveExternalValue = resolveExternalValue;
@@ -52,27 +55,7 @@ function resolveExternalObject(type, object, unpathedErrors, subschema, context,
52
55
  return (0, mergeFields_js_1.mergeFields)(mergedTypeInfo, object, subschema, context, info);
53
56
  }
54
57
  function resolveExternalList(type, list, unpathedErrors, subschema, context, info, skipTypeMerging) {
55
- return list.map(listMember => resolveExternalListMember((0, graphql_1.getNullableType)(type.ofType), listMember, unpathedErrors, subschema, context, info, skipTypeMerging));
56
- }
57
- function resolveExternalListMember(type, listMember, unpathedErrors, subschema, context, info, skipTypeMerging) {
58
- if (listMember instanceof Error) {
59
- return listMember;
60
- }
61
- if (listMember == null) {
62
- return reportUnpathedErrorsViaNull(unpathedErrors);
63
- }
64
- if ('parseValue' in type) {
65
- return type.parseValue(listMember);
66
- }
67
- else if ((0, graphql_1.isCompositeType)(type)) {
68
- return resolveExternalObject(type, listMember, unpathedErrors, subschema, context, info, skipTypeMerging);
69
- }
70
- else if ((0, graphql_1.isListType)(type)) {
71
- if (Array.isArray(listMember)) {
72
- return resolveExternalList(type, listMember, unpathedErrors, subschema, context, info, skipTypeMerging);
73
- }
74
- return resolveExternalListMember(type.ofType, listMember, unpathedErrors, subschema, context, info, skipTypeMerging);
75
- }
58
+ return list.map(listMember => resolveExternalValue(listMember, unpathedErrors, subschema, context, info, type.ofType, skipTypeMerging));
76
59
  }
77
60
  const reportedErrors = new WeakMap();
78
61
  function reportUnpathedErrorsViaNull(unpathedErrors) {
package/esm/resolveExternalValue.js CHANGED
@@ -16,7 +16,10 @@ export function resolveExternalValue(result, unpathedErrors, subschema, context,
16
16
  return resolveExternalObject(type, result, unpathedErrors, subschema, context, info, skipTypeMerging);
17
17
  }
18
18
  else if (isListType(type)) {
19
- return resolveExternalList(type, result, unpathedErrors, subschema, context, info, skipTypeMerging);
19
+ if (Array.isArray(result)) {
20
+ return resolveExternalList(type, result, unpathedErrors, subschema, context, info, skipTypeMerging);
21
+ }
22
+ return resolveExternalValue(result, unpathedErrors, subschema, context, info, type.ofType, skipTypeMerging);
20
23
  }
21
24
  }
22
25
  function resolveExternalObject(type, object, unpathedErrors, subschema, context, info, skipTypeMerging) {
@@ -48,27 +51,7 @@ function resolveExternalObject(type, object, unpathedErrors, subschema, context,
48
51
  return mergeFields(mergedTypeInfo, object, subschema, context, info);
49
52
  }
50
53
  function resolveExternalList(type, list, unpathedErrors, subschema, context, info, skipTypeMerging) {
51
- return list.map(listMember => resolveExternalListMember(getNullableType(type.ofType), listMember, unpathedErrors, subschema, context, info, skipTypeMerging));
52
- }
53
- function resolveExternalListMember(type, listMember, unpathedErrors, subschema, context, info, skipTypeMerging) {
54
- if (listMember instanceof Error) {
55
- return listMember;
56
- }
57
- if (listMember == null) {
58
- return reportUnpathedErrorsViaNull(unpathedErrors);
59
- }
60
- if ('parseValue' in type) {
61
- return type.parseValue(listMember);
62
- }
63
- else if (isCompositeType(type)) {
64
- return resolveExternalObject(type, listMember, unpathedErrors, subschema, context, info, skipTypeMerging);
65
- }
66
- else if (isListType(type)) {
67
- if (Array.isArray(listMember)) {
68
- return resolveExternalList(type, listMember, unpathedErrors, subschema, context, info, skipTypeMerging);
69
- }
70
- return resolveExternalListMember(type.ofType, listMember, unpathedErrors, subschema, context, info, skipTypeMerging);
71
- }
54
+ return list.map(listMember => resolveExternalValue(listMember, unpathedErrors, subschema, context, info, type.ofType, skipTypeMerging));
72
55
  }
73
56
  const reportedErrors = new WeakMap();
74
57
  function reportUnpathedErrorsViaNull(unpathedErrors) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@graphql-tools/delegate",
3
- "version": "9.0.7",
3
+ "version": "9.0.8",
4
4
  "description": "A set of utils for faster development of GraphQL tools",
5
5
  "sideEffects": false,
6
6
  "peerDependencies": {