@hyper-fetch/graphql 7.5.3 → 8.0.0

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 (47) hide show
  1. package/{.eslintrc.json → .eslintrc copy.json } +1 -1
  2. package/.eslintrc.cjs +12 -0
  3. package/__tests__/e2e/e2e.graphql-server.ts +135 -0
  4. package/__tests__/e2e/e2e.graphql.spec.ts +486 -0
  5. package/__tests__/features/adapter/adapter.browser.spec.ts +110 -20
  6. package/__tests__/features/adapter/adapter.server.spec.ts +20 -27
  7. package/__tests__/features/adapter/adapter.utils.spec.ts +36 -3
  8. package/__tests__/request-module.d.ts +12 -0
  9. package/__tests__/shared/callbacks.shared.ts +3 -1
  10. package/__tests__/shared/progress.shared.ts +2 -1
  11. package/__tests__/tsconfig.json +13 -3
  12. package/__tests__/vitest.setup.ts +10 -0
  13. package/dist/adapter/adapter.constants.d.ts +4 -0
  14. package/dist/adapter/adapter.constants.d.ts.map +1 -0
  15. package/dist/adapter/adapter.d.ts +3 -0
  16. package/dist/adapter/adapter.d.ts.map +1 -0
  17. package/dist/adapter/adapter.types.d.ts +24 -0
  18. package/dist/adapter/adapter.types.d.ts.map +1 -0
  19. package/dist/adapter/adapter.utils.d.ts +9 -0
  20. package/dist/adapter/adapter.utils.d.ts.map +1 -0
  21. package/dist/adapter/http-adapter.fetch.d.ts +3 -0
  22. package/dist/adapter/http-adapter.fetch.d.ts.map +1 -0
  23. package/dist/adapter/index.d.ts +6 -0
  24. package/dist/adapter/index.d.ts.map +1 -0
  25. package/dist/index.d.ts +2 -34
  26. package/dist/index.d.ts.map +1 -0
  27. package/dist/index.mjs +183 -0
  28. package/dist/index.mjs.map +1 -0
  29. package/package.json +10 -25
  30. package/src/adapter/adapter.constants.ts +1 -1
  31. package/src/adapter/adapter.ts +3 -8
  32. package/src/adapter/adapter.types.ts +7 -3
  33. package/src/adapter/adapter.utils.ts +8 -3
  34. package/src/adapter/http-adapter.fetch.ts +186 -0
  35. package/src/adapter/index.ts +1 -0
  36. package/tsconfig.base.json +2 -6
  37. package/tsconfig.json +2 -6
  38. package/vite.config.ts +45 -0
  39. package/__tests__/global.d.ts +0 -1
  40. package/__tests__/jest.setup.ts +0 -1
  41. package/dist/browser/index.js +0 -191
  42. package/dist/browser/index.js.map +0 -7
  43. package/dist/index.js +0 -330
  44. package/dist/index.js.map +0 -7
  45. package/jest.config.ts +0 -6
  46. package/src/adapter/http-adapter.browser.ts +0 -148
  47. package/src/adapter/http-adapter.server.ts +0 -148
package/dist/index.mjs ADDED
@@ -0,0 +1,183 @@
1
+ import { Adapter, HttpMethods, Time, getErrorMessage, parseResponse, stringifyKey, stringifyQueryParams } from "@hyper-fetch/core";
2
+ import { parse, print } from "graphql";
3
+ //#region src/adapter/http-adapter.fetch.ts
4
+ var getGqlAdapter = () => new Adapter({
5
+ name: "graphql",
6
+ defaultMethod: GraphqlMethod.POST,
7
+ defaultExtra: gqlExtra,
8
+ systemErrorStatus: 0,
9
+ systemErrorExtra: gqlExtra
10
+ }).onInitialize(({ client }) => {
11
+ client.setCacheKeyMapper((request) => {
12
+ return `${request.method}_${gqlEndpointNameMapper(request.endpoint)}-${stringifyKey(request.params)}-${stringifyKey(request.queryParams)}`;
13
+ });
14
+ client.setQueryKeyMapper((request) => {
15
+ return `${request.method}_${gqlEndpointNameMapper(request.endpoint)}-${stringifyKey(request.params)}-${stringifyKey(request.queryParams)}`;
16
+ });
17
+ client.setAbortKeyMapper((request) => {
18
+ return `${request.method}_${gqlEndpointNameMapper(request.endpoint)}-${request.cancelable}`;
19
+ });
20
+ }).setInternalErrorMapping((error) => [error]).setDevtoolsEndpointGetter(gqlEndpointNameMapper).setEndpointMapper(gqlEndpointMapper).setFetcher(async ({ request, adapterOptions, headers, onError, onResponseEnd, onTimeoutError, onRequestEnd, createAbortListener, getAbortController, onResponseProgress, onResponseStart, onBeforeRequest, onRequestStart, onRequestProgress, onSuccess }) => {
21
+ const { fullUrl, payload } = getRequestValues(request);
22
+ const controller = getAbortController();
23
+ const { timeout: timeoutMs = defaultTimeout, ...restOptions } = adapterOptions || {};
24
+ let timedOut = false;
25
+ let timeoutId;
26
+ const unmountListener = createAbortListener({
27
+ status: 0,
28
+ extra: gqlExtra
29
+ });
30
+ if (timeoutMs > 0 && controller) timeoutId = setTimeout(() => {
31
+ timedOut = true;
32
+ unmountListener();
33
+ controller.abort();
34
+ }, timeoutMs);
35
+ onBeforeRequest();
36
+ onRequestStart();
37
+ try {
38
+ const init = {
39
+ method: request.method,
40
+ headers,
41
+ signal: controller?.signal,
42
+ ...restOptions
43
+ };
44
+ if (payload) {
45
+ init.body = payload;
46
+ if (typeof payload === "string") {
47
+ const total = new Blob([payload]).size;
48
+ onRequestProgress({
49
+ total,
50
+ loaded: total
51
+ });
52
+ }
53
+ }
54
+ onRequestEnd();
55
+ const response = await fetch(fullUrl, init);
56
+ if (timeoutId) clearTimeout(timeoutId);
57
+ onResponseStart();
58
+ const responseHeaders = {};
59
+ response.headers.forEach((value, key) => {
60
+ responseHeaders[key] = value;
61
+ });
62
+ let body;
63
+ if (response.body && typeof response.body.getReader === "function") {
64
+ const reader = response.body.getReader();
65
+ const contentLength = parseInt(response.headers.get("content-length") || "0", 10);
66
+ let receivedLength = 0;
67
+ const chunks = [];
68
+ while (true) {
69
+ const { done, value } = await reader.read();
70
+ if (done) break;
71
+ chunks.push(value);
72
+ receivedLength += value.length;
73
+ onResponseProgress({
74
+ total: contentLength || receivedLength,
75
+ loaded: receivedLength
76
+ });
77
+ }
78
+ const allChunks = new Uint8Array(receivedLength);
79
+ let position = 0;
80
+ for (const chunk of chunks) {
81
+ allChunks.set(chunk, position);
82
+ position += chunk.length;
83
+ }
84
+ body = new TextDecoder().decode(allChunks);
85
+ } else body = await response.text();
86
+ onResponseEnd();
87
+ unmountListener();
88
+ const { status } = response;
89
+ const parsed = parseResponse(body);
90
+ const data = parsed?.data ?? null;
91
+ const errors = parsed?.errors || null;
92
+ const extensions = parsed?.extensions || {};
93
+ if (errors || status > 399 || status === 0) onError({
94
+ error: errors || [getErrorMessage()],
95
+ status,
96
+ extra: {
97
+ headers: responseHeaders,
98
+ extensions
99
+ }
100
+ });
101
+ else onSuccess({
102
+ data,
103
+ error: errors,
104
+ status,
105
+ extra: {
106
+ headers: responseHeaders,
107
+ extensions
108
+ }
109
+ });
110
+ } catch (err) {
111
+ if (timeoutId) clearTimeout(timeoutId);
112
+ unmountListener();
113
+ if (controller?.signal?.aborted) {
114
+ if (timedOut) onTimeoutError({
115
+ status: 0,
116
+ extra: gqlExtra
117
+ });
118
+ return;
119
+ }
120
+ onError({
121
+ error: err,
122
+ status: 0,
123
+ extra: gqlExtra
124
+ });
125
+ }
126
+ });
127
+ //#endregion
128
+ //#region src/adapter/adapter.ts
129
+ var GraphqlAdapter = () => {
130
+ return getGqlAdapter();
131
+ };
132
+ //#endregion
133
+ //#region src/adapter/adapter.types.ts
134
+ var GraphqlMethod = /* @__PURE__ */ function(GraphqlMethod) {
135
+ GraphqlMethod["POST"] = "POST";
136
+ GraphqlMethod["GET"] = "GET";
137
+ return GraphqlMethod;
138
+ }({});
139
+ //#endregion
140
+ //#region src/adapter/adapter.utils.ts
141
+ var getRequestValues = (request) => {
142
+ const isPostRequest = request.method === HttpMethods.POST;
143
+ const query = request.endpoint;
144
+ const variables = request.payload;
145
+ return {
146
+ fullUrl: isPostRequest ? request.client.url : request.client.url + stringifyQueryParams({
147
+ query,
148
+ variables
149
+ }),
150
+ payload: isPostRequest ? JSON.stringify({
151
+ query,
152
+ variables
153
+ }) : null
154
+ };
155
+ };
156
+ var gqlEndpointMapper = (endpoint) => {
157
+ if (typeof endpoint === "string") return endpoint;
158
+ return print(endpoint);
159
+ };
160
+ var gqlEndpointNameMapper = (endpoint) => {
161
+ try {
162
+ const operationDefinition = parse(endpoint).definitions.find((def) => def.kind === "OperationDefinition");
163
+ if (operationDefinition) {
164
+ if (operationDefinition.name?.value) return operationDefinition.name.value;
165
+ const selection = operationDefinition.selectionSet.selections[0];
166
+ if (selection?.kind === "Field") return selection.name.value;
167
+ if (selection?.kind === "InlineFragment" && selection.typeCondition) return selection.typeCondition.name.value;
168
+ }
169
+ } catch (error) {}
170
+ const [name] = endpoint.replace(/(query|mutation|subscription)/, "").replace(/[{}().,:]/g, " ").trim().split(" ");
171
+ return name || "graphql-request";
172
+ };
173
+ //#endregion
174
+ //#region src/adapter/adapter.constants.ts
175
+ var defaultTimeout = Time.SEC * 5;
176
+ var gqlExtra = {
177
+ headers: {},
178
+ extensions: {}
179
+ };
180
+ //#endregion
181
+ export { GraphqlAdapter, GraphqlMethod, defaultTimeout, getGqlAdapter, getRequestValues, gqlEndpointMapper, gqlEndpointNameMapper, gqlExtra };
182
+
183
+ //# sourceMappingURL=index.mjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.mjs","names":[],"sources":["../src/adapter/http-adapter.fetch.ts","../src/adapter/adapter.ts","../src/adapter/adapter.types.ts","../src/adapter/adapter.utils.ts","../src/adapter/adapter.constants.ts"],"sourcesContent":["import type { QueryParamsType } from \"@hyper-fetch/core\";\nimport { parseResponse, getErrorMessage, Adapter, stringifyKey } from \"@hyper-fetch/core\";\n\nimport type {\n GraphqlAdapterType,\n GraphQlExtraType,\n GraphQlEndpointType,\n FetchGraphqlAdapterOptionsType,\n} from \"adapter\";\nimport {\n gqlExtra,\n defaultTimeout,\n getRequestValues,\n GraphqlMethod,\n gqlEndpointMapper,\n gqlEndpointNameMapper,\n} from \"adapter\";\n\nexport const getGqlAdapter = (): GraphqlAdapterType =>\n new Adapter<\n FetchGraphqlAdapterOptionsType,\n GraphqlMethod,\n number,\n GraphQlExtraType,\n QueryParamsType | string,\n undefined,\n GraphQlEndpointType\n >({\n name: \"graphql\",\n defaultMethod: GraphqlMethod.POST,\n defaultExtra: gqlExtra,\n systemErrorStatus: 0,\n systemErrorExtra: gqlExtra,\n })\n .onInitialize(({ client }) => {\n client.setCacheKeyMapper((request) => {\n return `${request.method}_${gqlEndpointNameMapper(request.endpoint)}-${stringifyKey(request.params)}-${stringifyKey(request.queryParams)}`;\n });\n client.setQueryKeyMapper((request) => {\n return `${request.method}_${gqlEndpointNameMapper(request.endpoint)}-${stringifyKey(request.params)}-${stringifyKey(request.queryParams)}`;\n });\n client.setAbortKeyMapper((request) => {\n return `${request.method}_${gqlEndpointNameMapper(request.endpoint)}-${request.cancelable}`;\n });\n })\n .setInternalErrorMapping((error) => [error])\n .setDevtoolsEndpointGetter(gqlEndpointNameMapper)\n .setEndpointMapper(gqlEndpointMapper)\n .setFetcher(\n async ({\n request,\n adapterOptions,\n headers,\n onError,\n onResponseEnd,\n onTimeoutError,\n onRequestEnd,\n createAbortListener,\n getAbortController,\n onResponseProgress,\n onResponseStart,\n onBeforeRequest,\n onRequestStart,\n onRequestProgress,\n onSuccess,\n }) => {\n const { fullUrl, payload } = getRequestValues(request);\n\n const controller = getAbortController();\n const { timeout: timeoutMs = defaultTimeout, ...restOptions } = adapterOptions || {};\n\n let timedOut = false;\n let timeoutId: ReturnType<typeof setTimeout> | undefined;\n\n const unmountListener = createAbortListener({\n status: 0,\n extra: gqlExtra,\n });\n\n if (timeoutMs > 0 && controller) {\n timeoutId = setTimeout(() => {\n timedOut = true;\n unmountListener();\n controller.abort();\n }, timeoutMs);\n }\n\n onBeforeRequest();\n onRequestStart();\n\n try {\n const init: RequestInit = {\n method: request.method,\n headers: headers as Record<string, string>,\n signal: controller?.signal,\n ...restOptions,\n };\n\n if (payload) {\n init.body = payload;\n\n if (typeof payload === \"string\") {\n const total = new Blob([payload]).size;\n onRequestProgress({ total, loaded: total } as ProgressEvent);\n }\n }\n\n onRequestEnd();\n\n const response = await fetch(fullUrl, init);\n\n if (timeoutId) clearTimeout(timeoutId);\n\n onResponseStart();\n\n const responseHeaders: Record<string, string> = {};\n response.headers.forEach((value, key) => {\n responseHeaders[key] = value;\n });\n\n let body: string;\n\n if (response.body && typeof response.body.getReader === \"function\") {\n const reader = response.body.getReader();\n const contentLength = parseInt(response.headers.get(\"content-length\") || \"0\", 10);\n let receivedLength = 0;\n const chunks: Uint8Array[] = [];\n\n // eslint-disable-next-line no-constant-condition\n while (true) {\n // eslint-disable-next-line no-await-in-loop\n const { done, value } = await reader.read();\n if (done) break;\n chunks.push(value);\n receivedLength += value.length;\n onResponseProgress({ total: contentLength || receivedLength, loaded: receivedLength } as ProgressEvent);\n }\n\n const allChunks = new Uint8Array(receivedLength);\n let position = 0;\n // eslint-disable-next-line no-restricted-syntax\n for (const chunk of chunks) {\n allChunks.set(chunk, position);\n position += chunk.length;\n }\n body = new TextDecoder().decode(allChunks);\n } else {\n body = await response.text();\n }\n\n onResponseEnd();\n unmountListener();\n\n const { status } = response;\n const parsed = parseResponse(body);\n const data = parsed?.data ?? null;\n const errors = parsed?.errors || null;\n const extensions = parsed?.extensions || {};\n const failure = errors || status > 399 || status === 0;\n\n if (failure) {\n const error = errors || [getErrorMessage()];\n onError({ error, status, extra: { headers: responseHeaders, extensions } });\n } else {\n onSuccess({\n data,\n error: errors,\n status,\n extra: { headers: responseHeaders, extensions },\n });\n }\n } catch (err: any) {\n if (timeoutId) clearTimeout(timeoutId);\n unmountListener();\n\n if (controller?.signal?.aborted) {\n if (timedOut) {\n onTimeoutError({ status: 0, extra: gqlExtra });\n }\n return;\n }\n\n onError({ error: err, status: 0, extra: gqlExtra });\n }\n },\n );\n","import { getGqlAdapter } from \"./http-adapter.fetch\";\nimport type { GraphqlAdapterType } from \"./adapter.types\";\n\nexport const GraphqlAdapter = (): GraphqlAdapterType => {\n return getGqlAdapter();\n};\n","import type { Adapter, EmptyTypes, QueryParamsType } from \"@hyper-fetch/core\";\nimport type { DocumentNode } from \"graphql/language/ast\";\n\nexport enum GraphqlMethod {\n POST = \"POST\",\n GET = \"GET\",\n}\n\nexport type GraphQlExtraType = { headers: HeadersInit; extensions: Record<string, any> };\n\nexport type GraphQlEndpointType = string | DocumentNode;\n\nexport type FetchGraphqlAdapterOptionsType = Omit<RequestInit, \"method\" | \"headers\" | \"body\" | \"signal\"> & {\n timeout?: number;\n};\n\nexport type GraphqlAdapterType = Adapter<\n FetchGraphqlAdapterOptionsType,\n GraphqlMethod,\n number,\n GraphQlExtraType,\n QueryParamsType | string,\n undefined,\n GraphQlEndpointType,\n (endpoint: GraphQlEndpointType) => string\n>;\n\n// Extract\n\ntype GqlParamType = boolean | string | number | Record<string, any> | EmptyTypes;\n\nexport type ExtractGqlRouteParams<T extends string> = string extends T\n ? EmptyTypes\n : T extends `${string}query ${infer Parameters} {${infer QueryRest}`\n ? Parameters extends `${string}$${infer Param},${infer Rest}`\n ? GqlParameter<Param, Rest> &\n // eslint-disable-next-line @typescript-eslint/ban-types\n (ExtractGqlRouteParams<QueryRest> extends EmptyTypes ? {} : ExtractGqlRouteParams<QueryRest>)\n : Parameters extends `${string}$${infer Param})${infer Rest}`\n ? GqlParameter<Param, Rest> &\n // eslint-disable-next-line @typescript-eslint/ban-types\n (ExtractGqlRouteParams<QueryRest> extends EmptyTypes ? {} : ExtractGqlRouteParams<QueryRest>)\n : EmptyTypes\n : T extends `${string}$${infer Parameters},${infer Rest}`\n ? GqlParameter<Parameters, Rest>\n : T extends `${string}$${infer Parameters})${infer Rest}`\n ? GqlParameter<Parameters, Rest>\n : EmptyTypes;\n\nexport type GqlParameter<T extends string, Rest extends string> = T extends `${infer Param}:${string}!`\n ? { [k in Param]: GqlParamType } & (ExtractGqlRouteParams<Rest> extends EmptyTypes\n ? // eslint-disable-next-line @typescript-eslint/ban-types\n {}\n : ExtractGqlRouteParams<Rest>)\n : T extends `${infer Param}:${string}`\n ? { [k in Param]?: GqlParamType } & (ExtractGqlRouteParams<Rest> extends EmptyTypes\n ? // eslint-disable-next-line @typescript-eslint/ban-types\n {}\n : ExtractGqlRouteParams<Rest>)\n : EmptyTypes;\n","import type { RequestInstance } from \"@hyper-fetch/core\";\nimport { HttpMethods, stringifyQueryParams } from \"@hyper-fetch/core\";\nimport type { OperationDefinitionNode } from \"graphql\";\nimport { print, parse } from \"graphql\";\n\nimport type { GraphQlEndpointType } from \"adapter\";\n\nexport const getRequestValues = <R extends RequestInstance>(request: R) => {\n const isPostRequest = request.method === HttpMethods.POST;\n\n const query = request.endpoint;\n const variables = request.payload;\n\n const fullUrl = isPostRequest ? request.client.url : request.client.url + stringifyQueryParams({ query, variables });\n\n const payload = isPostRequest\n ? JSON.stringify({\n query,\n variables,\n })\n : null;\n\n return { fullUrl, payload };\n};\n\nexport const gqlEndpointMapper = <E extends GraphQlEndpointType>(endpoint: E): string => {\n if (typeof endpoint === \"string\") {\n return endpoint;\n }\n return print(endpoint);\n};\n\nexport const gqlEndpointNameMapper = (endpoint: string): string => {\n try {\n const ast = parse(endpoint);\n const operationDefinition = ast.definitions.find(\n (def): def is OperationDefinitionNode => def.kind === \"OperationDefinition\",\n );\n\n if (operationDefinition) {\n if (operationDefinition.name?.value) {\n return operationDefinition.name.value;\n }\n\n const selection = operationDefinition.selectionSet.selections[0];\n if (selection?.kind === \"Field\") {\n return selection.name.value;\n }\n if (selection?.kind === \"InlineFragment\" && selection.typeCondition) {\n return selection.typeCondition.name.value;\n }\n }\n } catch (error) {\n // We can ignore this error and just return some fallback\n }\n\n // Fallback for invalid gql queries or something else\n const clearedQuery = endpoint\n .replace(/(query|mutation|subscription)/, \"\")\n .replace(/[{}().,:]/g, \" \")\n .trim();\n const [name] = clearedQuery.split(\" \");\n\n return name || \"graphql-request\";\n};\n","import { Time } from \"@hyper-fetch/core\";\n\nimport type { GraphQlExtraType } from \"./adapter.types\";\n\nexport const defaultTimeout = Time.SEC * 5;\n\nexport const gqlExtra: GraphQlExtraType = {\n headers: {},\n extensions: {},\n};\n"],"mappings":"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"}
package/package.json CHANGED
@@ -1,44 +1,29 @@
1
1
  {
2
2
  "name": "@hyper-fetch/graphql",
3
- "version": "7.5.3",
3
+ "version": "8.0.0",
4
4
  "description": "Simple graphql adapter",
5
5
  "author": "Maciej Pyrc <maciekpyrc@gmail.com>, Kacper Skawina <kacper.skawina@gmail.com>",
6
6
  "homepage": "https://hyperfetch.bettertyped.com/",
7
7
  "license": "Apache-2.0",
8
- "main": "dist/index.js",
9
- "module": "dist/index.js",
10
- "client": "dist/browser/index.js",
11
- "browser": "dist/browser/index.js",
12
- "server": "dist/server/index.js",
13
- "node": "dist/server/index.js",
8
+ "main": "dist/index.mjs",
9
+ "module": "dist/index.mjs",
14
10
  "types": "dist/index.d.ts",
15
11
  "source": "src/index.ts",
16
12
  "exports": {
17
13
  ".": {
18
- "types": {
19
- "import": "./dist/index.d.ts"
20
- },
21
- "browser": {
22
- "require": "./dist/browser/index.js",
23
- "import": "./dist/browser/index.js"
24
- },
25
- "default": {
26
- "require": "./dist/index.js",
27
- "import": "./dist/index.js"
28
- }
14
+ "types": "./dist/index.d.ts",
15
+ "require": "./dist/index.mjs",
16
+ "import": "./dist/index.mjs"
29
17
  },
30
18
  "./package.json": "./package.json"
31
19
  },
32
20
  "scripts": {
33
- "clean": "npx rimraf dist",
34
- "test": "jest --watchAll --maxWorkers=3 --forceExit",
35
- "test:pipeline": "jest --watchAll=false --maxWorkers=1 --no-cache --forceExit",
21
+ "test": "vitest run",
36
22
  "start": "yarn build && npx run-when-changed --watch 'src/**/*.ts' --exec 'yarn build'",
37
- "build": "yarn clean && node ../../scripts/build.js",
38
- "postbuild": "yarn rollup -c ../../rollup.config.js",
23
+ "build": "vite build",
39
24
  "lint": "eslint . --ext .js,.jsx,.tsx,.ts --fix",
40
25
  "format": "prettier --write .",
41
- "typescheck": "tsc --noEmit --emitDeclarationOnly false",
26
+ "typecheck": "tsc --noEmit --emitDeclarationOnly false && tsc --noEmit -p __tests__/tsconfig.json",
42
27
  "tests": "yarn lint-staged",
43
28
  "release": "yarn semantic-release --extends ../../release.config.js -t 'hyper-fetch-graphql-v${version}'"
44
29
  },
@@ -67,7 +52,7 @@
67
52
  },
68
53
  "lint-staged": {
69
54
  "*.{js,jsx,ts,tsx}": [
70
- "yarn jest --passWithNoTests"
55
+ "vitest related --run --passWithNoTests"
71
56
  ]
72
57
  },
73
58
  "keywords": [
@@ -1,6 +1,6 @@
1
1
  import { Time } from "@hyper-fetch/core";
2
2
 
3
- import { GraphQlExtraType } from "./adapter.types";
3
+ import type { GraphQlExtraType } from "./adapter.types";
4
4
 
5
5
  export const defaultTimeout = Time.SEC * 5;
6
6
 
@@ -1,11 +1,6 @@
1
- import * as browser from "@browser-adapter";
2
- import * as server from "@server-adapter";
3
-
4
- import { GraphqlAdapterType } from "./adapter.types";
1
+ import { getGqlAdapter } from "./http-adapter.fetch";
2
+ import type { GraphqlAdapterType } from "./adapter.types";
5
3
 
6
4
  export const GraphqlAdapter = (): GraphqlAdapterType => {
7
- if (typeof XMLHttpRequest !== "undefined") {
8
- return browser.getGqlAdapter();
9
- }
10
- return server.getGqlAdapter();
5
+ return getGqlAdapter();
11
6
  };
@@ -1,5 +1,5 @@
1
- import { Adapter, EmptyTypes, QueryParamsType } from "@hyper-fetch/core";
2
- import { DocumentNode } from "graphql/language/ast";
1
+ import type { Adapter, EmptyTypes, QueryParamsType } from "@hyper-fetch/core";
2
+ import type { DocumentNode } from "graphql/language/ast";
3
3
 
4
4
  export enum GraphqlMethod {
5
5
  POST = "POST",
@@ -10,8 +10,12 @@ export type GraphQlExtraType = { headers: HeadersInit; extensions: Record<string
10
10
 
11
11
  export type GraphQlEndpointType = string | DocumentNode;
12
12
 
13
+ export type FetchGraphqlAdapterOptionsType = Omit<RequestInit, "method" | "headers" | "body" | "signal"> & {
14
+ timeout?: number;
15
+ };
16
+
13
17
  export type GraphqlAdapterType = Adapter<
14
- Partial<XMLHttpRequest>,
18
+ FetchGraphqlAdapterOptionsType,
15
19
  GraphqlMethod,
16
20
  number,
17
21
  GraphQlExtraType,
@@ -1,7 +1,9 @@
1
- import { RequestInstance, HttpMethods, stringifyQueryParams } from "@hyper-fetch/core";
2
- import { print, parse, OperationDefinitionNode } from "graphql";
1
+ import type { RequestInstance } from "@hyper-fetch/core";
2
+ import { HttpMethods, stringifyQueryParams } from "@hyper-fetch/core";
3
+ import type { OperationDefinitionNode } from "graphql";
4
+ import { print, parse } from "graphql";
3
5
 
4
- import { GraphQlEndpointType } from "adapter";
6
+ import type { GraphQlEndpointType } from "adapter";
5
7
 
6
8
  export const getRequestValues = <R extends RequestInstance>(request: R) => {
7
9
  const isPostRequest = request.method === HttpMethods.POST;
@@ -44,6 +46,9 @@ export const gqlEndpointNameMapper = (endpoint: string): string => {
44
46
  if (selection?.kind === "Field") {
45
47
  return selection.name.value;
46
48
  }
49
+ if (selection?.kind === "InlineFragment" && selection.typeCondition) {
50
+ return selection.typeCondition.name.value;
51
+ }
47
52
  }
48
53
  } catch (error) {
49
54
  // We can ignore this error and just return some fallback
@@ -0,0 +1,186 @@
1
+ import type { QueryParamsType } from "@hyper-fetch/core";
2
+ import { parseResponse, getErrorMessage, Adapter, stringifyKey } from "@hyper-fetch/core";
3
+
4
+ import type {
5
+ GraphqlAdapterType,
6
+ GraphQlExtraType,
7
+ GraphQlEndpointType,
8
+ FetchGraphqlAdapterOptionsType,
9
+ } from "adapter";
10
+ import {
11
+ gqlExtra,
12
+ defaultTimeout,
13
+ getRequestValues,
14
+ GraphqlMethod,
15
+ gqlEndpointMapper,
16
+ gqlEndpointNameMapper,
17
+ } from "adapter";
18
+
19
+ export const getGqlAdapter = (): GraphqlAdapterType =>
20
+ new Adapter<
21
+ FetchGraphqlAdapterOptionsType,
22
+ GraphqlMethod,
23
+ number,
24
+ GraphQlExtraType,
25
+ QueryParamsType | string,
26
+ undefined,
27
+ GraphQlEndpointType
28
+ >({
29
+ name: "graphql",
30
+ defaultMethod: GraphqlMethod.POST,
31
+ defaultExtra: gqlExtra,
32
+ systemErrorStatus: 0,
33
+ systemErrorExtra: gqlExtra,
34
+ })
35
+ .onInitialize(({ client }) => {
36
+ client.setCacheKeyMapper((request) => {
37
+ return `${request.method}_${gqlEndpointNameMapper(request.endpoint)}-${stringifyKey(request.params)}-${stringifyKey(request.queryParams)}`;
38
+ });
39
+ client.setQueryKeyMapper((request) => {
40
+ return `${request.method}_${gqlEndpointNameMapper(request.endpoint)}-${stringifyKey(request.params)}-${stringifyKey(request.queryParams)}`;
41
+ });
42
+ client.setAbortKeyMapper((request) => {
43
+ return `${request.method}_${gqlEndpointNameMapper(request.endpoint)}-${request.cancelable}`;
44
+ });
45
+ })
46
+ .setInternalErrorMapping((error) => [error])
47
+ .setDevtoolsEndpointGetter(gqlEndpointNameMapper)
48
+ .setEndpointMapper(gqlEndpointMapper)
49
+ .setFetcher(
50
+ async ({
51
+ request,
52
+ adapterOptions,
53
+ headers,
54
+ onError,
55
+ onResponseEnd,
56
+ onTimeoutError,
57
+ onRequestEnd,
58
+ createAbortListener,
59
+ getAbortController,
60
+ onResponseProgress,
61
+ onResponseStart,
62
+ onBeforeRequest,
63
+ onRequestStart,
64
+ onRequestProgress,
65
+ onSuccess,
66
+ }) => {
67
+ const { fullUrl, payload } = getRequestValues(request);
68
+
69
+ const controller = getAbortController();
70
+ const { timeout: timeoutMs = defaultTimeout, ...restOptions } = adapterOptions || {};
71
+
72
+ let timedOut = false;
73
+ let timeoutId: ReturnType<typeof setTimeout> | undefined;
74
+
75
+ const unmountListener = createAbortListener({
76
+ status: 0,
77
+ extra: gqlExtra,
78
+ });
79
+
80
+ if (timeoutMs > 0 && controller) {
81
+ timeoutId = setTimeout(() => {
82
+ timedOut = true;
83
+ unmountListener();
84
+ controller.abort();
85
+ }, timeoutMs);
86
+ }
87
+
88
+ onBeforeRequest();
89
+ onRequestStart();
90
+
91
+ try {
92
+ const init: RequestInit = {
93
+ method: request.method,
94
+ headers: headers as Record<string, string>,
95
+ signal: controller?.signal,
96
+ ...restOptions,
97
+ };
98
+
99
+ if (payload) {
100
+ init.body = payload;
101
+
102
+ if (typeof payload === "string") {
103
+ const total = new Blob([payload]).size;
104
+ onRequestProgress({ total, loaded: total } as ProgressEvent);
105
+ }
106
+ }
107
+
108
+ onRequestEnd();
109
+
110
+ const response = await fetch(fullUrl, init);
111
+
112
+ if (timeoutId) clearTimeout(timeoutId);
113
+
114
+ onResponseStart();
115
+
116
+ const responseHeaders: Record<string, string> = {};
117
+ response.headers.forEach((value, key) => {
118
+ responseHeaders[key] = value;
119
+ });
120
+
121
+ let body: string;
122
+
123
+ if (response.body && typeof response.body.getReader === "function") {
124
+ const reader = response.body.getReader();
125
+ const contentLength = parseInt(response.headers.get("content-length") || "0", 10);
126
+ let receivedLength = 0;
127
+ const chunks: Uint8Array[] = [];
128
+
129
+ // eslint-disable-next-line no-constant-condition
130
+ while (true) {
131
+ // eslint-disable-next-line no-await-in-loop
132
+ const { done, value } = await reader.read();
133
+ if (done) break;
134
+ chunks.push(value);
135
+ receivedLength += value.length;
136
+ onResponseProgress({ total: contentLength || receivedLength, loaded: receivedLength } as ProgressEvent);
137
+ }
138
+
139
+ const allChunks = new Uint8Array(receivedLength);
140
+ let position = 0;
141
+ // eslint-disable-next-line no-restricted-syntax
142
+ for (const chunk of chunks) {
143
+ allChunks.set(chunk, position);
144
+ position += chunk.length;
145
+ }
146
+ body = new TextDecoder().decode(allChunks);
147
+ } else {
148
+ body = await response.text();
149
+ }
150
+
151
+ onResponseEnd();
152
+ unmountListener();
153
+
154
+ const { status } = response;
155
+ const parsed = parseResponse(body);
156
+ const data = parsed?.data ?? null;
157
+ const errors = parsed?.errors || null;
158
+ const extensions = parsed?.extensions || {};
159
+ const failure = errors || status > 399 || status === 0;
160
+
161
+ if (failure) {
162
+ const error = errors || [getErrorMessage()];
163
+ onError({ error, status, extra: { headers: responseHeaders, extensions } });
164
+ } else {
165
+ onSuccess({
166
+ data,
167
+ error: errors,
168
+ status,
169
+ extra: { headers: responseHeaders, extensions },
170
+ });
171
+ }
172
+ } catch (err: any) {
173
+ if (timeoutId) clearTimeout(timeoutId);
174
+ unmountListener();
175
+
176
+ if (controller?.signal?.aborted) {
177
+ if (timedOut) {
178
+ onTimeoutError({ status: 0, extra: gqlExtra });
179
+ }
180
+ return;
181
+ }
182
+
183
+ onError({ error: err, status: 0, extra: gqlExtra });
184
+ }
185
+ },
186
+ );
@@ -2,3 +2,4 @@ export * from "./adapter";
2
2
  export * from "./adapter.types";
3
3
  export * from "./adapter.utils";
4
4
  export * from "./adapter.constants";
5
+ export * from "./http-adapter.fetch";
@@ -2,11 +2,7 @@
2
2
  "extends": "../../tsconfig.json",
3
3
  "compilerOptions": {
4
4
  "rootDir": "./src",
5
- "baseUrl": "./src",
6
- "paths": {
7
- "@browser-adapter": ["./adapter/http-adapter.browser.ts"],
8
- "@server-adapter": ["./adapter/http-adapter.browser.ts"]
9
- }
5
+ "baseUrl": "./src"
10
6
  },
11
- "exclude": ["dist", "jest.config.ts"]
7
+ "exclude": ["dist", "vite.config.ts"]
12
8
  }
package/tsconfig.json CHANGED
@@ -2,11 +2,7 @@
2
2
  "extends": "../../tsconfig.json",
3
3
  "compilerOptions": {
4
4
  "rootDir": ".",
5
- "baseUrl": "./src",
6
- "paths": {
7
- "@browser-adapter": ["./adapter/http-adapter.browser.ts"],
8
- "@server-adapter": ["./adapter/http-adapter.server.ts"]
9
- }
5
+ "baseUrl": "./src"
10
6
  },
11
- "exclude": ["node_modules", "dist", "jest.config.ts", "__tests__"]
7
+ "exclude": ["node_modules", "dist", "vite.config.ts", "__tests__"]
12
8
  }
package/vite.config.ts ADDED
@@ -0,0 +1,45 @@
1
+ /// <reference types="vitest/config" />
2
+ import { defineConfig } from "vite";
3
+ import dts from "vite-plugin-dts";
4
+ import tsconfigPaths from "vite-tsconfig-paths";
5
+ import path from "path";
6
+ import { getDtsCompilerOptionsForPackage } from "../../scripts/vite-dts-internal-paths";
7
+ import { getRollupExternalsFromPackageJson } from "../../scripts/vite-lib-externals-from-package";
8
+
9
+ export default defineConfig({
10
+ build: {
11
+ lib: {
12
+ entry: "src/index.ts",
13
+ formats: ["es"],
14
+ fileName: "index",
15
+ },
16
+ sourcemap: true,
17
+ minify: false,
18
+ rollupOptions: {
19
+ external: [...getRollupExternalsFromPackageJson(__dirname), "graphql", "graphql-tag"],
20
+ },
21
+ },
22
+ plugins: [
23
+ dts({
24
+ entryRoot: "src",
25
+ compilerOptions: getDtsCompilerOptionsForPackage(__dirname),
26
+ }),
27
+ tsconfigPaths(),
28
+ ],
29
+ test: {
30
+ globals: true,
31
+ environment: "node",
32
+ setupFiles: ["./__tests__/vitest.setup.ts"],
33
+ include: ["__tests__/**/*.spec.{ts,tsx}", "src/**/*.spec.{ts,tsx}"],
34
+ coverage: {
35
+ provider: "v8",
36
+ include: ["src/**/*.{ts,tsx}"],
37
+ exclude: ["**/*.spec.*", "**/types.*", "**/constants.*", "**/index.ts"],
38
+ },
39
+ alias: {
40
+ "@hyper-fetch/core": path.resolve(__dirname, "../core/src/index.ts"),
41
+ "@hyper-fetch/sockets": path.resolve(__dirname, "../sockets/src/index.ts"),
42
+ "@hyper-fetch/testing": path.resolve(__dirname, "../testing/src/index.ts"),
43
+ },
44
+ },
45
+ });
@@ -1 +0,0 @@
1
- import "jest-extended";
@@ -1 +0,0 @@
1
- import "jest-extended";