Use Promise helpers (#8431)

* Use Promise helpers

* chore(dependencies): updated changesets for modified dependencies

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.changeset/@graphql-mesh_apollo-link-8431-dependencies.md

@@ -0,0 +1,5 @@
+---
+"@graphql-mesh/apollo-link": patch
+---
+dependencies updates:
+  - Added dependency [`@whatwg-node/promise-helpers@^1.0.0` ↗︎](https://www.npmjs.com/package/@whatwg-node/promise-helpers/v/1.0.0) (to `dependencies`)

.changeset/@graphql-mesh_cache-cfw-kv-8431-dependencies.md

@@ -0,0 +1,5 @@
+---
+"@graphql-mesh/cache-cfw-kv": patch
+---
+dependencies updates:
+  - Added dependency [`@whatwg-node/promise-helpers@^1.0.0` ↗︎](https://www.npmjs.com/package/@whatwg-node/promise-helpers/v/1.0.0) (to `dependencies`)

.changeset/@graphql-mesh_cache-redis-8431-dependencies.md

@@ -0,0 +1,5 @@
+---
+"@graphql-mesh/cache-redis": patch
+---
+dependencies updates:
+  - Removed dependency [`@graphql-mesh/utils@^0.103.19` ↗︎](https://www.npmjs.com/package/@graphql-mesh/utils/v/0.103.19) (from `dependencies`)

.changeset/@graphql-mesh_cache-upstash-redis-8431-dependencies.md

@@ -0,0 +1,5 @@
+---
+"@graphql-mesh/cache-upstash-redis": patch
+---
+dependencies updates:
+  - Removed dependency [`@graphql-mesh/utils@^0.103.19` ↗︎](https://www.npmjs.com/package/@graphql-mesh/utils/v/0.103.19) (from `dependencies`)

.changeset/@graphql-mesh_cli-8431-dependencies.md

@@ -0,0 +1,5 @@
+---
+"@graphql-mesh/cli": patch
+---
+dependencies updates:
+  - Added dependency [`@whatwg-node/promise-helpers@^1.0.0` ↗︎](https://www.npmjs.com/package/@whatwg-node/promise-helpers/v/1.0.0) (to `dependencies`)

.changeset/@graphql-mesh_compose-cli-8431-dependencies.md

@@ -0,0 +1,5 @@
+---
+"@graphql-mesh/compose-cli": patch
+---
+dependencies updates:
+  - Added dependency [`@whatwg-node/promise-helpers@^1.0.0` ↗︎](https://www.npmjs.com/package/@whatwg-node/promise-helpers/v/1.0.0) (to `dependencies`)

.changeset/@graphql-mesh_plugin-deduplicate-request-8431-dependencies.md

@@ -0,0 +1,5 @@
+---
+"@graphql-mesh/plugin-deduplicate-request": patch
+---
+dependencies updates:
+  - Added dependency [`@whatwg-node/promise-helpers@^1.0.0` ↗︎](https://www.npmjs.com/package/@whatwg-node/promise-helpers/v/1.0.0) (to `dependencies`)

.changeset/@graphql-mesh_plugin-http-cache-8431-dependencies.md

@@ -0,0 +1,5 @@
+---
+"@graphql-mesh/plugin-http-cache": patch
+---
+dependencies updates:
+  - Added dependency [`@whatwg-node/promise-helpers@^1.0.0` ↗︎](https://www.npmjs.com/package/@whatwg-node/promise-helpers/v/1.0.0) (to `dependencies`)

.changeset/@graphql-mesh_plugin-newrelic-8431-dependencies.md

@@ -0,0 +1,5 @@
+---
+"@graphql-mesh/plugin-newrelic": patch
+---
+dependencies updates:
+  - Added dependency [`@whatwg-node/promise-helpers@^1.0.0` ↗︎](https://www.npmjs.com/package/@whatwg-node/promise-helpers/v/1.0.0) (to `dependencies`)

.changeset/@graphql-mesh_plugin-operation-headers-8431-dependencies.md

@@ -0,0 +1,5 @@
+---
+"@graphql-mesh/plugin-operation-headers": patch
+---
+dependencies updates:
+  - Added dependency [`@whatwg-node/promise-helpers@^1.0.0` ↗︎](https://www.npmjs.com/package/@whatwg-node/promise-helpers/v/1.0.0) (to `dependencies`)

.changeset/@graphql-mesh_plugin-rate-limit-8431-dependencies.md

@@ -0,0 +1,5 @@
+---
+"@graphql-mesh/plugin-rate-limit": patch
+---
+dependencies updates:
+  - Added dependency [`@whatwg-node/promise-helpers@^1.0.0` ↗︎](https://www.npmjs.com/package/@whatwg-node/promise-helpers/v/1.0.0) (to `dependencies`)

.changeset/@graphql-mesh_plugin-response-cache-8431-dependencies.md

@@ -0,0 +1,5 @@
+---
+"@graphql-mesh/plugin-response-cache": patch
+---
+dependencies updates:
+  - Added dependency [`@whatwg-node/promise-helpers@^1.0.0` ↗︎](https://www.npmjs.com/package/@whatwg-node/promise-helpers/v/1.0.0) (to `dependencies`)

.changeset/@graphql-mesh_runtime-8431-dependencies.md

@@ -0,0 +1,5 @@
+---
+"@graphql-mesh/runtime": patch
+---
+dependencies updates:
+  - Added dependency [`@whatwg-node/promise-helpers@^1.0.0` ↗︎](https://www.npmjs.com/package/@whatwg-node/promise-helpers/v/1.0.0) (to `dependencies`)

.changeset/@graphql-mesh_transport-grpc-8431-dependencies.md

@@ -0,0 +1,5 @@
+---
+"@graphql-mesh/transport-grpc": patch
+---
+dependencies updates:
+  - Added dependency [`@whatwg-node/promise-helpers@^1.0.0` ↗︎](https://www.npmjs.com/package/@whatwg-node/promise-helpers/v/1.0.0) (to `dependencies`)

.changeset/@graphql-mesh_transport-sqlite-8431-dependencies.md

@@ -0,0 +1,5 @@
+---
+"@graphql-mesh/transport-sqlite": patch
+---
+dependencies updates:
+  - Added dependency [`@whatwg-node/promise-helpers@^1.0.0` ↗︎](https://www.npmjs.com/package/@whatwg-node/promise-helpers/v/1.0.0) (to `dependencies`)

.changeset/@graphql-mesh_utils-8431-dependencies.md

@@ -0,0 +1,5 @@
+---
+"@graphql-mesh/utils": patch
+---
+dependencies updates:
+  - Added dependency [`@whatwg-node/promise-helpers@^1.0.0` ↗︎](https://www.npmjs.com/package/@whatwg-node/promise-helpers/v/1.0.0) (to `dependencies`)

.changeset/@omnigraph_odata-8431-dependencies.md

@@ -0,0 +1,5 @@
+---
+"@omnigraph/odata": patch
+---
+dependencies updates:
+  - Added dependency [`@whatwg-node/promise-helpers@^1.0.0` ↗︎](https://www.npmjs.com/package/@whatwg-node/promise-helpers/v/1.0.0) (to `dependencies`)

.changeset/@omnigraph_soap-8431-dependencies.md

@@ -0,0 +1,5 @@
+---
+"@omnigraph/soap": patch
+---
+dependencies updates:
+  - Added dependency [`@whatwg-node/promise-helpers@^1.0.0` ↗︎](https://www.npmjs.com/package/@whatwg-node/promise-helpers/v/1.0.0) (to `dependencies`)

packages/cache/cfw-kv/package.json

@@ -37,6 +37,7 @@
   "dependencies": {
     "@graphql-mesh/types": "^0.103.19",
     "@graphql-mesh/utils": "^0.103.19",
+    "@whatwg-node/promise-helpers": "^1.0.0",
     "tslib": "^2.4.0"
   },
   "devDependencies": {

packages/cache/cfw-kv/src/index.ts

@@ -1,6 +1,6 @@
 /// <reference types="@cloudflare/workers-types" />
 import type { KeyValueCache, Logger } from '@graphql-mesh/types';
-import { mapMaybePromise } from '@graphql-mesh/utils';
+import { handleMaybePromise } from '@whatwg-node/promise-helpers';
 
 export default class CFWorkerKVCache implements KeyValueCache {
   private kvNamespace?: KVNamespace;
@@ -21,13 +21,16 @@ export default class CFWorkerKVCache implements KeyValueCache {
   }
 
   getKeysByPrefix(prefix: string) {
-    return mapMaybePromise(this.kvNamespace?.list({ prefix }), result => {
-      if (!result) {
-        return [];
-      }
+    return handleMaybePromise(
+      () => this.kvNamespace?.list({ prefix }),
+      result => {
+        if (!result) {
+          return [];
+        }
 
-      return result.keys.map(keyEntry => keyEntry.name);
-    });
+        return result.keys.map(keyEntry => keyEntry.name);
+      },
+    );
   }
 
   set(key: string, value: any, options?: { ttl?: number }): Promise<void> {
@@ -37,14 +40,10 @@ export default class CFWorkerKVCache implements KeyValueCache {
   }
 
   delete(key: string) {
-    try {
-      return mapMaybePromise(
-        this.kvNamespace?.delete(key),
-        () => true,
-        () => false,
-      );
-    } catch (e) {
-      return false;
-    }
+    return handleMaybePromise(
+      () => this.kvNamespace?.delete(key),
+      () => true,
+      () => false,
+    );
   }
 }

packages/cache/localforage/src/index.ts

@@ -6,7 +6,6 @@ import type {
   MeshPubSub,
   YamlConfig,
 } from '@graphql-mesh/types';
-import { mapMaybePromise } from '@graphql-mesh/utils';
 
 export default class LocalforageCache<V = any> implements KeyValueCache<V> {
   private localforage: LocalForage;
@@ -26,21 +25,17 @@ export default class LocalforageCache<V = any> implements KeyValueCache<V> {
   }
 
   get(key: string) {
-    const getItem = () => {
-      return this.localforage.getItem<V>(key.toString());
-    };
-    return mapMaybePromise(this.localforage.getItem<number>(`${key}.expiresAt`), expiresAt => {
+    const getItem = () => this.localforage.getItem<V>(key.toString());
+    return this.localforage.getItem<number>(`${key}.expiresAt`).then(expiresAt => {
       if (expiresAt && Date.now() > expiresAt) {
-        return mapMaybePromise(this.localforage.removeItem(key), getItem);
+        return this.localforage.removeItem(key).then(() => getItem());
       }
       return getItem();
     });
   }
 
   getKeysByPrefix(prefix: string) {
-    return mapMaybePromise(this.localforage.keys(), keys =>
-      keys.filter(key => key.startsWith(prefix)),
-    );
+    return this.localforage.keys().then(keys => keys.filter(key => key.startsWith(prefix)));
   }
 
   set(key: string, value: V, options?: KeyValueCacheSetOptions) {
@@ -52,8 +47,7 @@ export default class LocalforageCache<V = any> implements KeyValueCache<V> {
   }
 
   delete(key: string) {
-    return mapMaybePromise(
-      this.localforage.removeItem(key),
+    return this.localforage.removeItem(key).then(
       () => true,
       () => false,
     );

packages/cache/redis/package.json

@@ -38,7 +38,6 @@
     "@graphql-mesh/cross-helpers": "^0.4.10",
     "@graphql-mesh/string-interpolation": "0.5.8",
     "@graphql-mesh/types": "^0.103.19",
-    "@graphql-mesh/utils": "^0.103.19",
     "@whatwg-node/disposablestack": "^0.0.5",
     "ioredis": "^5.3.2",
     "ioredis-mock": "^8.8.3",

packages/cache/redis/src/index.ts

@@ -9,7 +9,6 @@ import type {
   MeshPubSub,
   YamlConfig,
 } from '@graphql-mesh/types';
-import { mapMaybePromise } from '@graphql-mesh/utils';
 import { DisposableSymbols } from '@whatwg-node/disposablestack';
 
 function interpolateStrWithEnv(str: string): string {
@@ -109,37 +108,27 @@ export default class RedisCache<V = string> implements KeyValueCache<V>, Disposa
   }
 
   get(key: string): Promise<V | undefined> {
-    return mapMaybePromise(this.client.get(key), value => {
-      return value != null ? JSON.parse(value) : undefined;
-    });
+    return this.client.get(key).then(value => (value != null ? JSON.parse(value) : undefined));
   }
 
   getKeysByPrefix(prefix: string): Promise<string[]> {
     return scanPatterns(this.client, `${prefix}*`);
   }
 
   delete(key: string): PromiseLike<boolean> | boolean {
-    try {
-      return mapMaybePromise(
-        this.client.del(key),
-        value => value > 0,
-        () => false,
-      );
-    } catch (e) {
-      return false;
-    }
+    return this.client.del(key).then(
+      value => value > 0,
+      () => false,
+    );
   }
 }
 
 function scanPatterns(redis: Redis, pattern: string, cursor: string = '0', keys: string[] = []) {
-  return mapMaybePromise(
-    redis.scan(cursor, 'MATCH', pattern, 'COUNT', '10'),
-    ([nextCursor, nextKeys]) => {
-      keys.push(...nextKeys);
-      if (nextCursor === '0') {
-        return keys;
-      }
-      return scanPatterns(redis, pattern, nextCursor, keys);
-    },
-  );
+  return redis.scan(cursor, 'MATCH', pattern, 'COUNT', '10').then(([nextCursor, nextKeys]) => {
+    keys.push(...nextKeys);
+    if (nextCursor === '0') {
+      return keys;
+    }
+    return scanPatterns(redis, pattern, nextCursor, keys);
+  });
 }

packages/cache/upstash-redis/package.json

@@ -37,7 +37,6 @@
   "dependencies": {
     "@graphql-mesh/cross-helpers": "^0.4.9",
     "@graphql-mesh/types": "^0.103.19",
-    "@graphql-mesh/utils": "^0.103.19",
     "@upstash/redis": "^1.34.3",
     "@whatwg-node/disposablestack": "^0.0.5",
     "tslib": "^2.4.0"

packages/cache/upstash-redis/src/index.ts

@@ -1,6 +1,5 @@
 import { process } from '@graphql-mesh/cross-helpers';
 import type { KeyValueCache } from '@graphql-mesh/types';
-import { mapMaybePromise } from '@graphql-mesh/utils';
 import { Redis, type RedisConfigNodejs } from '@upstash/redis';
 import { DisposableSymbols } from '@whatwg-node/disposablestack';
 
@@ -33,7 +32,7 @@ export default class UpstashRedisCache implements KeyValueCache {
   }
 
   delete(key: string) {
-    return mapMaybePromise(this.redis.del(key), num => num > 0);
+    return this.redis.del(key).then(num => num > 0);
   }
 
   async getKeysByPrefix(prefix: string): Promise<string[]> {

packages/compose-cli/package.json

@@ -50,6 +50,7 @@
     "@graphql-tools/schema": "^10.0.5",
     "@graphql-tools/utils": "^10.8.0",
     "@whatwg-node/fetch": "^0.10.4",
+    "@whatwg-node/promise-helpers": "^1.0.0",
     "commander": "^13.0.0",
     "dotenv": "^16.3.1"
   },