@graphql-tools/utils 10.0.8 → 10.0.9-rc-20231121170354-0e80c00a

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 (5) hide show
  1. package/cjs/extractExtensionsFromSchema.js +44 -11
  2. package/cjs/mergeDeep.js +19 -0
  3. package/esm/extractExtensionsFromSchema.js +44 -11
  4. package/esm/mergeDeep.js +19 -0
  5. package/package.json +1 -1
package/cjs/extractExtensionsFromSchema.js CHANGED
@@ -3,61 +3,94 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.extractExtensionsFromSchema = void 0;
4
4
  const Interfaces_js_1 = require("./Interfaces.js");
5
5
  const mapSchema_js_1 = require("./mapSchema.js");
6
+ function handleDirectiveExtensions(extensions = {}) {
7
+ const finalExtensions = {
8
+ ...extensions,
9
+ };
10
+ const directives = finalExtensions.directives;
11
+ if (directives != null) {
12
+ for (const directiveName in directives) {
13
+ const directiveObj = directives[directiveName];
14
+ if (!Array.isArray(directiveObj)) {
15
+ directives[directiveName] = [directiveObj];
16
+ }
17
+ }
18
+ }
19
+ return finalExtensions;
20
+ }
6
21
  function extractExtensionsFromSchema(schema) {
7
22
  const result = {
8
- schemaExtensions: schema.extensions || {},
23
+ schemaExtensions: handleDirectiveExtensions(schema.extensions),
9
24
  types: {},
10
25
  };
11
26
  (0, mapSchema_js_1.mapSchema)(schema, {
12
27
  [Interfaces_js_1.MapperKind.OBJECT_TYPE]: type => {
13
- result.types[type.name] = { fields: {}, type: 'object', extensions: type.extensions || {} };
28
+ result.types[type.name] = {
29
+ fields: {},
30
+ type: 'object',
31
+ extensions: handleDirectiveExtensions(type.extensions),
32
+ };
14
33
  return type;
15
34
  },
16
35
  [Interfaces_js_1.MapperKind.INTERFACE_TYPE]: type => {
17
36
  result.types[type.name] = {
18
37
  fields: {},
19
38
  type: 'interface',
20
- extensions: type.extensions || {},
39
+ extensions: handleDirectiveExtensions(type.extensions),
21
40
  };
22
41
  return type;
23
42
  },
24
43
  [Interfaces_js_1.MapperKind.FIELD]: (field, fieldName, typeName) => {
25
44
  result.types[typeName].fields[fieldName] = {
26
45
  arguments: {},
27
- extensions: field.extensions || {},
46
+ extensions: handleDirectiveExtensions(field.extensions),
28
47
  };
29
48
  const args = field.args;
30
49
  if (args != null) {
31
50
  for (const argName in args) {
32
51
  result.types[typeName].fields[fieldName].arguments[argName] =
33
- args[argName].extensions || {};
52
+ handleDirectiveExtensions(args[argName].extensions);
34
53
  }
35
54
  }
36
55
  return field;
37
56
  },
38
57
  [Interfaces_js_1.MapperKind.ENUM_TYPE]: type => {
39
- result.types[type.name] = { values: {}, type: 'enum', extensions: type.extensions || {} };
58
+ result.types[type.name] = {
59
+ values: {},
60
+ type: 'enum',
61
+ extensions: handleDirectiveExtensions(type.extensions),
62
+ };
40
63
  return type;
41
64
  },
42
65
  [Interfaces_js_1.MapperKind.ENUM_VALUE]: (value, typeName, _schema, valueName) => {
43
- result.types[typeName].values[valueName] = value.extensions || {};
66
+ result.types[typeName].values[valueName] = handleDirectiveExtensions(value.extensions);
44
67
  return value;
45
68
  },
46
69
  [Interfaces_js_1.MapperKind.SCALAR_TYPE]: type => {
47
- result.types[type.name] = { type: 'scalar', extensions: type.extensions || {} };
70
+ result.types[type.name] = {
71
+ type: 'scalar',
72
+ extensions: handleDirectiveExtensions(type.extensions),
73
+ };
48
74
  return type;
49
75
  },
50
76
  [Interfaces_js_1.MapperKind.UNION_TYPE]: type => {
51
- result.types[type.name] = { type: 'union', extensions: type.extensions || {} };
77
+ result.types[type.name] = {
78
+ type: 'union',
79
+ extensions: handleDirectiveExtensions(type.extensions),
80
+ };
52
81
  return type;
53
82
  },
54
83
  [Interfaces_js_1.MapperKind.INPUT_OBJECT_TYPE]: type => {
55
- result.types[type.name] = { fields: {}, type: 'input', extensions: type.extensions || {} };
84
+ result.types[type.name] = {
85
+ fields: {},
86
+ type: 'input',
87
+ extensions: handleDirectiveExtensions(type.extensions),
88
+ };
56
89
  return type;
57
90
  },
58
91
  [Interfaces_js_1.MapperKind.INPUT_OBJECT_FIELD]: (field, fieldName, typeName) => {
59
92
  result.types[typeName].fields[fieldName] = {
60
- extensions: field.extensions || {},
93
+ extensions: handleDirectiveExtensions(field.extensions),
61
94
  };
62
95
  return field;
63
96
  },
package/cjs/mergeDeep.js CHANGED
@@ -31,11 +31,30 @@ function mergeDeep(sources, respectPrototype = false) {
31
31
  output[key] = mergeDeep([output[key], source[key]], respectPrototype);
32
32
  }
33
33
  }
34
+ else if (Array.isArray(output[key])) {
35
+ if (Array.isArray(source[key])) {
36
+ output[key].push(...source[key]);
37
+ }
38
+ else {
39
+ output[key].push(source[key]);
40
+ }
41
+ }
34
42
  else {
35
43
  Object.assign(output, { [key]: source[key] });
36
44
  }
37
45
  }
38
46
  }
47
+ else if (Array.isArray(target)) {
48
+ if (Array.isArray(source)) {
49
+ target.push(...source);
50
+ }
51
+ else {
52
+ target.push(source);
53
+ }
54
+ }
55
+ else if (Array.isArray(source)) {
56
+ return [target, ...source];
57
+ }
39
58
  }
40
59
  return output;
41
60
  }
package/esm/extractExtensionsFromSchema.js CHANGED
@@ -1,60 +1,93 @@
1
1
  import { MapperKind } from './Interfaces.js';
2
2
  import { mapSchema } from './mapSchema.js';
3
+ function handleDirectiveExtensions(extensions = {}) {
4
+ const finalExtensions = {
5
+ ...extensions,
6
+ };
7
+ const directives = finalExtensions.directives;
8
+ if (directives != null) {
9
+ for (const directiveName in directives) {
10
+ const directiveObj = directives[directiveName];
11
+ if (!Array.isArray(directiveObj)) {
12
+ directives[directiveName] = [directiveObj];
13
+ }
14
+ }
15
+ }
16
+ return finalExtensions;
17
+ }
3
18
  export function extractExtensionsFromSchema(schema) {
4
19
  const result = {
5
- schemaExtensions: schema.extensions || {},
20
+ schemaExtensions: handleDirectiveExtensions(schema.extensions),
6
21
  types: {},
7
22
  };
8
23
  mapSchema(schema, {
9
24
  [MapperKind.OBJECT_TYPE]: type => {
10
- result.types[type.name] = { fields: {}, type: 'object', extensions: type.extensions || {} };
25
+ result.types[type.name] = {
26
+ fields: {},
27
+ type: 'object',
28
+ extensions: handleDirectiveExtensions(type.extensions),
29
+ };
11
30
  return type;
12
31
  },
13
32
  [MapperKind.INTERFACE_TYPE]: type => {
14
33
  result.types[type.name] = {
15
34
  fields: {},
16
35
  type: 'interface',
17
- extensions: type.extensions || {},
36
+ extensions: handleDirectiveExtensions(type.extensions),
18
37
  };
19
38
  return type;
20
39
  },
21
40
  [MapperKind.FIELD]: (field, fieldName, typeName) => {
22
41
  result.types[typeName].fields[fieldName] = {
23
42
  arguments: {},
24
- extensions: field.extensions || {},
43
+ extensions: handleDirectiveExtensions(field.extensions),
25
44
  };
26
45
  const args = field.args;
27
46
  if (args != null) {
28
47
  for (const argName in args) {
29
48
  result.types[typeName].fields[fieldName].arguments[argName] =
30
- args[argName].extensions || {};
49
+ handleDirectiveExtensions(args[argName].extensions);
31
50
  }
32
51
  }
33
52
  return field;
34
53
  },
35
54
  [MapperKind.ENUM_TYPE]: type => {
36
- result.types[type.name] = { values: {}, type: 'enum', extensions: type.extensions || {} };
55
+ result.types[type.name] = {
56
+ values: {},
57
+ type: 'enum',
58
+ extensions: handleDirectiveExtensions(type.extensions),
59
+ };
37
60
  return type;
38
61
  },
39
62
  [MapperKind.ENUM_VALUE]: (value, typeName, _schema, valueName) => {
40
- result.types[typeName].values[valueName] = value.extensions || {};
63
+ result.types[typeName].values[valueName] = handleDirectiveExtensions(value.extensions);
41
64
  return value;
42
65
  },
43
66
  [MapperKind.SCALAR_TYPE]: type => {
44
- result.types[type.name] = { type: 'scalar', extensions: type.extensions || {} };
67
+ result.types[type.name] = {
68
+ type: 'scalar',
69
+ extensions: handleDirectiveExtensions(type.extensions),
70
+ };
45
71
  return type;
46
72
  },
47
73
  [MapperKind.UNION_TYPE]: type => {
48
- result.types[type.name] = { type: 'union', extensions: type.extensions || {} };
74
+ result.types[type.name] = {
75
+ type: 'union',
76
+ extensions: handleDirectiveExtensions(type.extensions),
77
+ };
49
78
  return type;
50
79
  },
51
80
  [MapperKind.INPUT_OBJECT_TYPE]: type => {
52
- result.types[type.name] = { fields: {}, type: 'input', extensions: type.extensions || {} };
81
+ result.types[type.name] = {
82
+ fields: {},
83
+ type: 'input',
84
+ extensions: handleDirectiveExtensions(type.extensions),
85
+ };
53
86
  return type;
54
87
  },
55
88
  [MapperKind.INPUT_OBJECT_FIELD]: (field, fieldName, typeName) => {
56
89
  result.types[typeName].fields[fieldName] = {
57
- extensions: field.extensions || {},
90
+ extensions: handleDirectiveExtensions(field.extensions),
58
91
  };
59
92
  return field;
60
93
  },
package/esm/mergeDeep.js CHANGED
@@ -28,11 +28,30 @@ export function mergeDeep(sources, respectPrototype = false) {
28
28
  output[key] = mergeDeep([output[key], source[key]], respectPrototype);
29
29
  }
30
30
  }
31
+ else if (Array.isArray(output[key])) {
32
+ if (Array.isArray(source[key])) {
33
+ output[key].push(...source[key]);
34
+ }
35
+ else {
36
+ output[key].push(source[key]);
37
+ }
38
+ }
31
39
  else {
32
40
  Object.assign(output, { [key]: source[key] });
33
41
  }
34
42
  }
35
43
  }
44
+ else if (Array.isArray(target)) {
45
+ if (Array.isArray(source)) {
46
+ target.push(...source);
47
+ }
48
+ else {
49
+ target.push(source);
50
+ }
51
+ }
52
+ else if (Array.isArray(source)) {
53
+ return [target, ...source];
54
+ }
36
55
  }
37
56
  return output;
38
57
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@graphql-tools/utils",
3
- "version": "10.0.8",
3
+ "version": "10.0.9-rc-20231121170354-0e80c00a",
4
4
  "description": "Common package containing utils and types for GraphQL tools",
5
5
  "sideEffects": false,
6
6
  "peerDependencies": {