fix: with merge headers (#1091)

graffle-js · Sep 15, 2024 · 6ed584d · 6ed584d
1 parent 1aa55ca
commit 6ed584d
Show file tree

Hide file tree

Showing 70 changed files with 213 additions and 212 deletions.
diff --git a/examples/10_transport-http/transport-http_headers_raw__headers.ts b/examples/10_transport-http/transport-http_headers_raw__headers.ts
@@ -11,7 +11,6 @@ const graffle = Graffle
     schema: publicGraphQLSchemaEndpoints.Atlas,
     transport: {
       headers: {
-        // todo: authorization header not showing up in final output!
         authorization: `Bearer MY_TOKEN`,
         'x-something-to-unset': `true`,
       },

diff --git a/...__outputs__/10_transport-http/transport-http_extension_headers__dynamicHeaders.output.txt b/...__outputs__/10_transport-http/transport-http_extension_headers__dynamicHeaders.output.txt
@@ -4,7 +4,7 @@
   headers: Headers {
     accept: 'application/graphql-response+json; charset=utf-8, application/json; charset=utf-8',
     'content-type': 'application/json',
-    'x-sent-at-time': '1726357184256'
+    'x-sent-at-time': '1726370577818'
   },
   signal: undefined,
   method: 'post',

diff --git a/examples/__outputs__/10_transport-http/transport-http_headers_raw__headers.output.txt b/examples/__outputs__/10_transport-http/transport-http_headers_raw__headers.output.txt
@@ -2,5 +2,6 @@
 Headers {
   accept: 'application/graphql-response+json; charset=utf-8, application/json; charset=utf-8',
   'content-type': 'application/json',
+  authorization: 'Bearer MY_TOKEN',
   'x-from-raw': 'true'
 }
diff --git a/examples/__outputs__/20_output/output_envelope.output.txt b/examples/__outputs__/20_output/output_envelope.output.txt
@@ -19,7 +19,7 @@
     headers: Headers {
       connection: 'keep-alive',
       'content-length': '119',
-      'x-served-by': 'cache-yul1970031-YUL',
+      'x-served-by': 'cache-yul1970040-YUL',
       'accept-ranges': 'bytes',
       date: 'Sun, 08 Sep 2024 18:13:26 GMT',
       'content-type': 'application/graphql-response+json; charset=utf-8',
@@ -32,13 +32,13 @@
       'alt-svc': 'h3=":443"; ma=86400',
       'access-control-allow-origin': '*',
       'x-powered-by': 'Stellate',
-      age: '537979',
+      age: '551373',
       'cache-control': 'public, s-maxage=2628000, stale-while-revalidate=2628000',
       'x-cache': 'HIT',
-      'x-cache-hits': '70',
+      'x-cache-hits': '59',
       'gcdn-cache': 'HIT',
-      'stellate-rate-limit-budget-remaining': '35',
-      'stellate-rate-limit-rules': '"IP limit";type="RequestCount";budget=50;limited=?0;remaining=35;refill=18',
+      'stellate-rate-limit-budget-remaining': '44',
+      'stellate-rate-limit-rules': '"IP limit";type="RequestCount";budget=50;limited=?0;remaining=44;refill=38',
       'stellate-rate-limit-decision': 'pass',
       'stellate-rate-limit-budget-required': '5',
       'content-encoding': 'br'

diff --git a/examples/__outputs__/60_extension/extension_opentelemetry__opentelemetry.output.txt b/examples/__outputs__/60_extension/extension_opentelemetry__opentelemetry.output.txt
@@ -9,14 +9,14 @@
     }
   },
   instrumentationScope: { name: 'graffle', version: undefined, schemaUrl: undefined },
-  traceId: '739682d434b4322a234dc2c868b9acfe',
-  parentId: '4b88214552131b9f',
+  traceId: '5f3cc79a0d7f600e6443b66ca5fd7599',
+  parentId: 'c7121550554a028f',
   traceState: undefined,
   name: 'encode',
-  id: '84efcd9e0032a5d8',
+  id: 'bf19a2fd444136bd',
   kind: 0,
-  timestamp: 1726357184994000,
-  duration: 761,
+  timestamp: 1726370578428000,
+  duration: 542.708,
   attributes: {},
   status: { code: 0 },
   events: [],
@@ -33,14 +33,14 @@
     }
   },
   instrumentationScope: { name: 'graffle', version: undefined, schemaUrl: undefined },
-  traceId: '739682d434b4322a234dc2c868b9acfe',
-  parentId: '4b88214552131b9f',
+  traceId: '5f3cc79a0d7f600e6443b66ca5fd7599',
+  parentId: 'c7121550554a028f',
   traceState: undefined,
   name: 'pack',
-  id: 'bc8ec0700844cd69',
+  id: '7f76dd08ed8139ad',
   kind: 0,
-  timestamp: 1726357184997000,
-  duration: 1012.708,
+  timestamp: 1726370578434000,
+  duration: 1102.792,
   attributes: {},
   status: { code: 0 },
   events: [],
@@ -57,14 +57,14 @@
     }
   },
   instrumentationScope: { name: 'graffle', version: undefined, schemaUrl: undefined },
-  traceId: '739682d434b4322a234dc2c868b9acfe',
-  parentId: '4b88214552131b9f',
+  traceId: '5f3cc79a0d7f600e6443b66ca5fd7599',
+  parentId: 'c7121550554a028f',
   traceState: undefined,
   name: 'exchange',
-  id: '64c50da0cd515f43',
+  id: 'febb48d8497c0eb4',
   kind: 0,
-  timestamp: 1726357184999000,
-  duration: 164325.125,
+  timestamp: 1726370578436000,
+  duration: 175379.417,
   attributes: {},
   status: { code: 0 },
   events: [],
@@ -81,14 +81,14 @@
     }
   },
   instrumentationScope: { name: 'graffle', version: undefined, schemaUrl: undefined },
-  traceId: '739682d434b4322a234dc2c868b9acfe',
-  parentId: '4b88214552131b9f',
+  traceId: '5f3cc79a0d7f600e6443b66ca5fd7599',
+  parentId: 'c7121550554a028f',
   traceState: undefined,
   name: 'unpack',
-  id: '8b36d845f0b08d6d',
+  id: '858aa86480423499',
   kind: 0,
-  timestamp: 1726357185163000,
-  duration: 2875.167,
+  timestamp: 1726370578611000,
+  duration: 2229.292,
   attributes: {},
   status: { code: 0 },
   events: [],
@@ -105,14 +105,14 @@
     }
   },
   instrumentationScope: { name: 'graffle', version: undefined, schemaUrl: undefined },
-  traceId: '739682d434b4322a234dc2c868b9acfe',
-  parentId: '4b88214552131b9f',
+  traceId: '5f3cc79a0d7f600e6443b66ca5fd7599',
+  parentId: 'c7121550554a028f',
   traceState: undefined,
   name: 'decode',
-  id: 'aa2dbba36d46bc6f',
+  id: '903b572b71e9d6c3',
   kind: 0,
-  timestamp: 1726357185166000,
-  duration: 161.875,
+  timestamp: 1726370578614000,
+  duration: 121.791,
   attributes: {},
   status: { code: 0 },
   events: [],
@@ -129,14 +129,14 @@
     }
   },
   instrumentationScope: { name: 'graffle', version: undefined, schemaUrl: undefined },
-  traceId: '739682d434b4322a234dc2c868b9acfe',
+  traceId: '5f3cc79a0d7f600e6443b66ca5fd7599',
   parentId: undefined,
   traceState: undefined,
   name: 'request',
-  id: '4b88214552131b9f',
+  id: 'c7121550554a028f',
   kind: 0,
-  timestamp: 1726357184994000,
-  duration: 173145.083,
+  timestamp: 1726370578427000,
+  duration: 187055.167,
   attributes: {},
   status: { code: 0 },
   events: [],

diff --git a/package.json b/package.json
@@ -128,12 +128,12 @@
     "@types/body-parser": "^1.19.5",
     "@types/express": "^4.17.21",
     "@types/json-bigint": "^1.0.4",
-    "@types/node": "^22.5.4",
+    "@types/node": "^22.5.5",
     "@typescript-eslint/eslint-plugin": "^8.5.0",
     "@typescript-eslint/parser": "^8.5.0",
     "doctoc": "^2.2.1",
     "dripip": "^0.10.0",
-    "es-toolkit": "^1.18.0",
+    "es-toolkit": "^1.19.0",
     "eslint": "^9.10.0",
     "eslint-config-prisma": "^0.6.0",
     "eslint-plugin-deprecation": "^3.0.0",