fix(deps): update dependency parse-duration to v2 (#539)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: theguild-bot <[email protected]> Co-authored-by: Arda TANRIKULU <[email protected]>
graphql-hive · Jan 27, 2025 · df20361 · df20361
1 parent aab5441
commit df20361
Show file tree

Hide file tree

Showing 20 changed files with 36 additions and 35 deletions.
diff --git a/.changeset/@graphql-hive_gateway-539-dependencies.md b/.changeset/@graphql-hive_gateway-539-dependencies.md
@@ -0,0 +1,7 @@
+---
+'@graphql-hive/gateway': patch
+---
+
+dependencies updates: 
+
+- Updated dependency [`parse-duration@^2.0.0` ↗︎](https://www.npmjs.com/package/parse-duration/v/2.0.0) (from `^1.1.0`, in `dependencies`)
diff --git a/examples/extra-fields/example.tar.gz b/examples/extra-fields/example.tar.gz
diff --git a/examples/extra-fields/package-lock.json b/examples/extra-fields/package-lock.json
diff --git a/examples/hmac-auth-https/example.tar.gz b/examples/hmac-auth-https/example.tar.gz
diff --git a/examples/hmac-auth-https/package-lock.json b/examples/hmac-auth-https/package-lock.json
diff --git a/examples/interface-additional-resolvers/example.tar.gz b/examples/interface-additional-resolvers/example.tar.gz
diff --git a/examples/interface-additional-resolvers/package-lock.json b/examples/interface-additional-resolvers/package-lock.json
diff --git a/examples/subscriptions-with-transforms/example.tar.gz b/examples/subscriptions-with-transforms/example.tar.gz
diff --git a/examples/subscriptions-with-transforms/package-lock.json b/examples/subscriptions-with-transforms/package-lock.json
diff --git a/examples/type-merging-batching/example.tar.gz b/examples/type-merging-batching/example.tar.gz
diff --git a/examples/type-merging-batching/package-lock.json b/examples/type-merging-batching/package-lock.json
diff --git a/packages/gateway/package.json b/packages/gateway/package.json
@@ -85,7 +85,7 @@
     "dotenv": "^16.3.1",
     "graphql-ws": "^5.16.0",
     "graphql-yoga": "^5.10.11",
-    "parse-duration": "^1.1.0",
+    "parse-duration": "^2.0.0",
     "tslib": "^2.8.1",
     "ws": "^8.18.0"
   },

diff --git a/packages/gateway/src/cli.ts b/packages/gateway/src/cli.ts
@@ -201,7 +201,7 @@ export const defaultOptions = {
       ? '127.0.0.1'
       : '0.0.0.0',
   port: 4000,
-  polling: '10s',
+  pollingInterval: 10_000,
 };
 
 /** Root cli for the gateway. */
@@ -213,9 +213,10 @@ let cli = new Command()
   .addOption(
     new Option(
       '--fork <count>',
-      `count of workers to spawn. uses "${maxFork}" (available parallelism) workers when NODE_ENV is "production", otherwise "1" (the main) worker (default: ${JSON.stringify(defaultOptions.fork)}`,
+      `count of workers to spawn. uses "${maxFork}" (available parallelism) workers when NODE_ENV is "production", otherwise "1" (the main) worker`,
     )
       .env('FORK')
+      .default(defaultOptions.fork)
       .argParser((v) => {
         const count = parseInt(v);
         if (isNaN(count)) {
@@ -235,17 +236,16 @@ let cli = new Command()
       `path to the configuration file. defaults to the following files respectively in the current working directory: ${createDefaultConfigPaths('gateway').join(', ')}`,
     ).env('CONFIG_PATH'),
   )
-  .option(
-    '-h, --host <hostname>',
-    `host to use for serving (default: ${JSON.stringify(defaultOptions.host)}`,
-    defaultOptions.host,
+  .addOption(
+    new Option('-h, --host <hostname>', `host to use for serving`).default(
+      defaultOptions.host,
+      defaultOptions.host,
+    ),
   )
   .addOption(
-    new Option(
-      '-p, --port <number>',
-      `port to use for serving (default: ${JSON.stringify(defaultOptions.port)}`,
-    )
+    new Option('-p, --port <number>', `port to use for serving`)
       .env('PORT')
+      .default(defaultOptions.port)
       .argParser((v) => {
         const port = parseInt(v);
         if (isNaN(port)) {
@@ -256,13 +256,13 @@ let cli = new Command()
   )
   .addOption(
     new Option(
-      '--polling <duration>',
-      `schema polling interval in human readable duration (default: ${JSON.stringify(defaultOptions.polling)})`,
+      '--polling, --pollingInterval <duration>',
+      `schema polling interval in human readable duration`,
     )
-      .default(parseDuration(defaultOptions.polling))
+      .default(10_000, '10s')
       .env('POLLING')
       .argParser((v) => {
-        const interval = parseDuration(v);
+        const interval = parseDuration(v) as number;
         if (!interval) {
           throw new InvalidArgumentError('not a duration.');
         }

diff --git a/packages/gateway/src/commands/proxy.ts b/packages/gateway/src/commands/proxy.ts
@@ -35,7 +35,6 @@ export const addCommand: AddCommand = (ctx, cli) =>
         hiveCdnKey,
         hiveRegistryToken,
         maskedErrors,
-        polling,
         hivePersistedDocumentsEndpoint,
         hivePersistedDocumentsToken,
         ...opts
@@ -123,7 +122,6 @@ export const addCommand: AddCommand = (ctx, cli) =>
               },
             }
           : {}),
-        ...(polling ? { pollingInterval: polling } : {}),
         proxy,
         ...(schema ? { schema } : {}),
         logging: loadedConfig.logging ?? ctx.log,

diff --git a/packages/gateway/src/commands/subgraph.ts b/packages/gateway/src/commands/subgraph.ts
@@ -36,7 +36,6 @@ export const addCommand: AddCommand = (ctx, cli) =>
       const {
         maskedErrors,
         hiveRegistryToken,
-        polling,
         hivePersistedDocumentsEndpoint,
         hivePersistedDocumentsToken,
         ...opts
@@ -84,7 +83,6 @@ export const addCommand: AddCommand = (ctx, cli) =>
               },
             }
           : {}),
-        ...(polling ? { pollingInterval: polling } : {}),
         subgraph,
         logging: loadedConfig.logging ?? ctx.log,
         productName: ctx.productName,

diff --git a/packages/gateway/src/commands/supergraph.ts b/packages/gateway/src/commands/supergraph.ts
@@ -50,7 +50,6 @@ export const addCommand: AddCommand = (ctx, cli) =>
         hiveCdnKey,
         hiveRegistryToken,
         maskedErrors,
-        polling,
         apolloGraphRef,
         apolloKey,
         hivePersistedDocumentsEndpoint,
@@ -200,7 +199,6 @@ export const addCommand: AddCommand = (ctx, cli) =>
         ...loadedConfig,
         ...opts,
         ...registryConfig,
-        ...(polling ? { pollingInterval: polling } : {}),
         supergraph,
         logging: loadedConfig.logging ?? ctx.log,
         productName: ctx.productName,

diff --git a/packages/plugins/hmac-upstream-signature/package.json b/packages/plugins/hmac-upstream-signature/package.json
@@ -51,7 +51,7 @@
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@graphql-hive/gateway": "workspace:*",
+    "@graphql-hive/gateway-runtime": "workspace:*",
     "@types/json-stable-stringify": "^1.1.0",
     "graphql": "^16.9.0",
     "graphql-yoga": "^5.10.11",

diff --git a/packages/plugins/hmac-upstream-signature/src/index.ts b/packages/plugins/hmac-upstream-signature/src/index.ts
@@ -1,4 +1,4 @@
-import type { GatewayPlugin } from '@graphql-hive/gateway';
+import type { GatewayPlugin } from '@graphql-hive/gateway-runtime';
 import type { OnSubgraphExecutePayload } from '@graphql-mesh/fusion-runtime';
 import { serializeExecutionRequest } from '@graphql-tools/executor-common';
 import { mapMaybePromise } from '@graphql-tools/utils';

diff --git a/packages/runtime/tests/graphos.test.ts b/packages/runtime/tests/graphos.test.ts
@@ -3,7 +3,7 @@ import {
   DefaultLogger,
   type GatewayConfigContext,
   type GatewayGraphOSManagedFederationOptions,
-} from '@graphql-hive/gateway';
+} from '@graphql-hive/gateway-runtime';
 import { Response } from '@whatwg-node/fetch';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { createGraphOSFetcher } from '../src/fetchers/graphos';

diff --git a/yarn.lock b/yarn.lock
@@ -3299,7 +3299,7 @@ __metadata:
     graphql-middleware: "npm:^6.1.35"
     graphql-ws: "npm:^5.16.0"
     graphql-yoga: "npm:^5.10.11"
-    parse-duration: "npm:^1.1.0"
+    parse-duration: "npm:^2.0.0"
     pkgroll: "npm:2.6.1"
     postject: "npm:^1.0.0-alpha.6"
     rimraf: "npm:^6.0.1"
@@ -3507,7 +3507,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@graphql-mesh/hmac-upstream-signature@workspace:packages/plugins/hmac-upstream-signature"
   dependencies:
-    "@graphql-hive/gateway": "workspace:*"
+    "@graphql-hive/gateway-runtime": "workspace:*"
     "@graphql-mesh/cross-helpers": "npm:^0.4.9"
     "@graphql-mesh/types": "npm:^0.103.6"
     "@graphql-mesh/utils": "npm:^0.103.6"
@@ -14364,10 +14364,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"parse-duration@npm:^1.1.0":
-  version: 1.1.2
-  resolution: "parse-duration@npm:1.1.2"
-  checksum: 10c0/2e014150ecfa4a509028a6122b045bda5c1e0c367ca5eae854cdb91cf2a9ce763bb4ae551cecffda19330316976f699a71f6c125c26e6cacbc02fced812316ab
+"parse-duration@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "parse-duration@npm:2.0.1"
+  checksum: 10c0/8629786dbefd20603daddca03af9ac383cf5220e2728c616bb3a51aa60a64c8bfb2ef9603ccb4805642447c7f788334003a54226e39fedd9ca09acdf0321c8e8
   languageName: node
   linkType: hard