@graphql-mesh/utils 0.94.4 → 0.94.6-alpha-20230725135900-7f7961089

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/logger.js +6 -3
  2. package/cjs/resolve-additional-resolvers.js +12 -105
  3. package/esm/logger.js +6 -3
  4. package/esm/resolve-additional-resolvers.js +12 -105
  5. package/package.json +2 -2
package/cjs/logger.js CHANGED
@@ -61,9 +61,12 @@ class DefaultLogger {
61
61
  });
62
62
  }
63
63
  get isDebug() {
64
- return (cross_helpers_1.process.env.DEBUG === '1' ||
65
- globalThis.DEBUG === '1' ||
66
- this.name.includes(cross_helpers_1.process.env.DEBUG || globalThis.DEBUG));
64
+ if (cross_helpers_1.process.env.DEBUG) {
65
+ return (cross_helpers_1.process.env.DEBUG === '1' ||
66
+ globalThis.DEBUG === '1' ||
67
+ this.name.includes(cross_helpers_1.process.env.DEBUG || globalThis.DEBUG));
68
+ }
69
+ return false;
67
70
  }
68
71
  get prefix() {
69
72
  return this.name ? (0, exports.titleBold)(this.name) : ``;
package/cjs/resolve-additional-resolvers.js CHANGED
@@ -206,9 +206,7 @@ function resolveAdditionalResolversWithoutImport(additionalResolver, pubsub) {
206
206
  }
207
207
  const resolverData = { root, args, context, info, env: cross_helpers_1.process.env };
208
208
  const targetArgs = {};
209
- for (const argPath in additionalResolver.sourceArgs) {
210
- (0, dset_1.dset)(targetArgs, argPath, string_interpolation_1.stringInterpolator.parse(additionalResolver.sourceArgs[argPath].toString(), resolverData));
211
- }
209
+ deeplySetArgs(resolverData, { targetArgs }, 'targetArgs', additionalResolver.sourceArgs);
212
210
  const options = {
213
211
  ...baseOptions,
214
212
  root,
@@ -242,109 +240,18 @@ function resolveAdditionalResolvers(baseDir, additionalResolvers, importFn, pubs
242
240
  return resolvers;
243
241
  }
244
242
  else {
245
- const baseOptions = {};
246
- if (additionalResolver.result) {
247
- baseOptions.valuesFromResults = generateValuesFromResults(additionalResolver.result);
248
- }
249
- if ('pubsubTopic' in additionalResolver) {
250
- return {
251
- [additionalResolver.targetTypeName]: {
252
- [additionalResolver.targetFieldName]: {
253
- subscribe: (0, with_filter_js_1.withFilter)((root, args, context, info) => {
254
- const resolverData = { root, args, context, info, env: cross_helpers_1.process.env };
255
- const topic = string_interpolation_1.stringInterpolator.parse(additionalResolver.pubsubTopic, resolverData);
256
- return pubsub.asyncIterator(topic);
257
- }, (root, args, context, info) => {
258
- return additionalResolver.filterBy
259
- ? // eslint-disable-next-line no-new-func
260
- new Function(`return ${additionalResolver.filterBy}`)()
261
- : true;
262
- }),
263
- resolve: (payload) => {
264
- if (baseOptions.valuesFromResults) {
265
- return baseOptions.valuesFromResults(payload);
266
- }
267
- return payload;
268
- },
269
- },
270
- },
271
- };
272
- }
273
- else if ('keysArg' in additionalResolver) {
274
- return {
275
- [additionalResolver.targetTypeName]: {
276
- [additionalResolver.targetFieldName]: {
277
- selectionSet: additionalResolver.requiredSelectionSet || `{ ${additionalResolver.keyField} }`,
278
- resolve: async (root, args, context, info) => {
279
- if (!baseOptions.selectionSet) {
280
- baseOptions.selectionSet = generateSelectionSetFactory(info.schema, additionalResolver);
281
- }
282
- const resolverData = { root, args, context, info, env: cross_helpers_1.process.env };
283
- const targetArgs = {};
284
- for (const argPath in additionalResolver.additionalArgs || {}) {
285
- (0, dset_1.dset)(targetArgs, argPath, string_interpolation_1.stringInterpolator.parse(additionalResolver.additionalArgs[argPath], resolverData));
286
- }
287
- const options = {
288
- ...baseOptions,
289
- root,
290
- context,
291
- info,
292
- argsFromKeys: (keys) => {
293
- const args = {};
294
- (0, dset_1.dset)(args, additionalResolver.keysArg, keys);
295
- Object.assign(args, targetArgs);
296
- return args;
297
- },
298
- key: (0, lodash_get_1.default)(root, additionalResolver.keyField),
299
- };
300
- return context[additionalResolver.sourceName][additionalResolver.sourceTypeName][additionalResolver.sourceFieldName](options);
301
- },
302
- },
303
- },
304
- };
305
- }
306
- else if ('targetTypeName' in additionalResolver) {
307
- return {
308
- [additionalResolver.targetTypeName]: {
309
- [additionalResolver.targetFieldName]: {
310
- selectionSet: additionalResolver.requiredSelectionSet,
311
- resolve: (root, args, context, info) => {
312
- // Assert source exists
313
- if (!context[additionalResolver.sourceName]) {
314
- throw new Error(`No source found named "${additionalResolver.sourceName}"`);
315
- }
316
- if (!context[additionalResolver.sourceName][additionalResolver.sourceTypeName]) {
317
- throw new Error(`No root type found named "${additionalResolver.sourceTypeName}" exists in the source ${additionalResolver.sourceName}\n` +
318
- `It should be one of the following; ${Object.keys(context[additionalResolver.sourceName]).join(',')})}}`);
319
- }
320
- if (!context[additionalResolver.sourceName][additionalResolver.sourceTypeName][additionalResolver.sourceFieldName]) {
321
- throw new Error(`No field named "${additionalResolver.sourceFieldName}" exists in the type ${additionalResolver.sourceTypeName} from the source ${additionalResolver.sourceName}`);
322
- }
323
- if (!baseOptions.selectionSet) {
324
- baseOptions.selectionSet = generateSelectionSetFactory(info.schema, additionalResolver);
325
- }
326
- const resolverData = { root, args, context, info, env: cross_helpers_1.process.env };
327
- const targetArgs = {};
328
- for (const argPath in additionalResolver.sourceArgs) {
329
- (0, dset_1.dset)(targetArgs, argPath, string_interpolation_1.stringInterpolator.parse(additionalResolver.sourceArgs[argPath].toString(), resolverData));
330
- }
331
- const options = {
332
- ...baseOptions,
333
- root,
334
- args: targetArgs,
335
- context,
336
- info,
337
- };
338
- return context[additionalResolver.sourceName][additionalResolver.sourceTypeName][additionalResolver.sourceFieldName](options);
339
- },
340
- },
341
- },
342
- };
343
- }
344
- else {
345
- return additionalResolver;
346
- }
243
+ return resolveAdditionalResolversWithoutImport(additionalResolver, pubsub);
347
244
  }
348
245
  }));
349
246
  }
350
247
  exports.resolveAdditionalResolvers = resolveAdditionalResolvers;
248
+ function deeplySetArgs(resolverData, args, path, value) {
249
+ if (typeof value === 'string') {
250
+ (0, dset_1.dset)(args, path, string_interpolation_1.stringInterpolator.parse(value.toString(), resolverData));
251
+ }
252
+ else {
253
+ for (const key in value) {
254
+ deeplySetArgs(resolverData, args, `${path}.${key}`, value[key]);
255
+ }
256
+ }
257
+ }
package/esm/logger.js CHANGED
@@ -53,9 +53,12 @@ export class DefaultLogger {
53
53
  });
54
54
  }
55
55
  get isDebug() {
56
- return (process.env.DEBUG === '1' ||
57
- globalThis.DEBUG === '1' ||
58
- this.name.includes(process.env.DEBUG || globalThis.DEBUG));
56
+ if (process.env.DEBUG) {
57
+ return (process.env.DEBUG === '1' ||
58
+ globalThis.DEBUG === '1' ||
59
+ this.name.includes(process.env.DEBUG || globalThis.DEBUG));
60
+ }
61
+ return false;
59
62
  }
60
63
  get prefix() {
61
64
  return this.name ? titleBold(this.name) : ``;
package/esm/resolve-additional-resolvers.js CHANGED
@@ -202,9 +202,7 @@ export function resolveAdditionalResolversWithoutImport(additionalResolver, pubs
202
202
  }
203
203
  const resolverData = { root, args, context, info, env: process.env };
204
204
  const targetArgs = {};
205
- for (const argPath in additionalResolver.sourceArgs) {
206
- dset(targetArgs, argPath, stringInterpolator.parse(additionalResolver.sourceArgs[argPath].toString(), resolverData));
207
- }
205
+ deeplySetArgs(resolverData, { targetArgs }, 'targetArgs', additionalResolver.sourceArgs);
208
206
  const options = {
209
207
  ...baseOptions,
210
208
  root,
@@ -237,108 +235,17 @@ export function resolveAdditionalResolvers(baseDir, additionalResolvers, importF
237
235
  return resolvers;
238
236
  }
239
237
  else {
240
- const baseOptions = {};
241
- if (additionalResolver.result) {
242
- baseOptions.valuesFromResults = generateValuesFromResults(additionalResolver.result);
243
- }
244
- if ('pubsubTopic' in additionalResolver) {
245
- return {
246
- [additionalResolver.targetTypeName]: {
247
- [additionalResolver.targetFieldName]: {
248
- subscribe: withFilter((root, args, context, info) => {
249
- const resolverData = { root, args, context, info, env: process.env };
250
- const topic = stringInterpolator.parse(additionalResolver.pubsubTopic, resolverData);
251
- return pubsub.asyncIterator(topic);
252
- }, (root, args, context, info) => {
253
- return additionalResolver.filterBy
254
- ? // eslint-disable-next-line no-new-func
255
- new Function(`return ${additionalResolver.filterBy}`)()
256
- : true;
257
- }),
258
- resolve: (payload) => {
259
- if (baseOptions.valuesFromResults) {
260
- return baseOptions.valuesFromResults(payload);
261
- }
262
- return payload;
263
- },
264
- },
265
- },
266
- };
267
- }
268
- else if ('keysArg' in additionalResolver) {
269
- return {
270
- [additionalResolver.targetTypeName]: {
271
- [additionalResolver.targetFieldName]: {
272
- selectionSet: additionalResolver.requiredSelectionSet || `{ ${additionalResolver.keyField} }`,
273
- resolve: async (root, args, context, info) => {
274
- if (!baseOptions.selectionSet) {
275
- baseOptions.selectionSet = generateSelectionSetFactory(info.schema, additionalResolver);
276
- }
277
- const resolverData = { root, args, context, info, env: process.env };
278
- const targetArgs = {};
279
- for (const argPath in additionalResolver.additionalArgs || {}) {
280
- dset(targetArgs, argPath, stringInterpolator.parse(additionalResolver.additionalArgs[argPath], resolverData));
281
- }
282
- const options = {
283
- ...baseOptions,
284
- root,
285
- context,
286
- info,
287
- argsFromKeys: (keys) => {
288
- const args = {};
289
- dset(args, additionalResolver.keysArg, keys);
290
- Object.assign(args, targetArgs);
291
- return args;
292
- },
293
- key: lodashGet(root, additionalResolver.keyField),
294
- };
295
- return context[additionalResolver.sourceName][additionalResolver.sourceTypeName][additionalResolver.sourceFieldName](options);
296
- },
297
- },
298
- },
299
- };
300
- }
301
- else if ('targetTypeName' in additionalResolver) {
302
- return {
303
- [additionalResolver.targetTypeName]: {
304
- [additionalResolver.targetFieldName]: {
305
- selectionSet: additionalResolver.requiredSelectionSet,
306
- resolve: (root, args, context, info) => {
307
- // Assert source exists
308
- if (!context[additionalResolver.sourceName]) {
309
- throw new Error(`No source found named "${additionalResolver.sourceName}"`);
310
- }
311
- if (!context[additionalResolver.sourceName][additionalResolver.sourceTypeName]) {
312
- throw new Error(`No root type found named "${additionalResolver.sourceTypeName}" exists in the source ${additionalResolver.sourceName}\n` +
313
- `It should be one of the following; ${Object.keys(context[additionalResolver.sourceName]).join(',')})}}`);
314
- }
315
- if (!context[additionalResolver.sourceName][additionalResolver.sourceTypeName][additionalResolver.sourceFieldName]) {
316
- throw new Error(`No field named "${additionalResolver.sourceFieldName}" exists in the type ${additionalResolver.sourceTypeName} from the source ${additionalResolver.sourceName}`);
317
- }
318
- if (!baseOptions.selectionSet) {
319
- baseOptions.selectionSet = generateSelectionSetFactory(info.schema, additionalResolver);
320
- }
321
- const resolverData = { root, args, context, info, env: process.env };
322
- const targetArgs = {};
323
- for (const argPath in additionalResolver.sourceArgs) {
324
- dset(targetArgs, argPath, stringInterpolator.parse(additionalResolver.sourceArgs[argPath].toString(), resolverData));
325
- }
326
- const options = {
327
- ...baseOptions,
328
- root,
329
- args: targetArgs,
330
- context,
331
- info,
332
- };
333
- return context[additionalResolver.sourceName][additionalResolver.sourceTypeName][additionalResolver.sourceFieldName](options);
334
- },
335
- },
336
- },
337
- };
338
- }
339
- else {
340
- return additionalResolver;
341
- }
238
+ return resolveAdditionalResolversWithoutImport(additionalResolver, pubsub);
342
239
  }
343
240
  }));
344
241
  }
242
+ function deeplySetArgs(resolverData, args, path, value) {
243
+ if (typeof value === 'string') {
244
+ dset(args, path, stringInterpolator.parse(value.toString(), resolverData));
245
+ }
246
+ else {
247
+ for (const key in value) {
248
+ deeplySetArgs(resolverData, args, `${path}.${key}`, value[key]);
249
+ }
250
+ }
251
+ }
package/package.json CHANGED
@@ -1,10 +1,10 @@
1
1
  {
2
2
  "name": "@graphql-mesh/utils",
3
- "version": "0.94.4",
3
+ "version": "0.94.6-alpha-20230725135900-7f7961089",
4
4
  "sideEffects": false,
5
5
  "peerDependencies": {
6
6
  "@graphql-mesh/cross-helpers": "^0.4.0",
7
- "@graphql-mesh/types": "^0.94.4",
7
+ "@graphql-mesh/types": "0.94.6-alpha-20230725135900-7f7961089",
8
8
  "@graphql-tools/utils": "^9.2.1 || ^10.0.0",
9
9
  "graphql": "*",
10
10
  "tslib": "^2.4.0"