chore(example): Update GQty clients in examples to use defaultRespons…

…eHandler
gqty-dev · Jan 31, 2025 · ecb06a8 · ecb06a8
1 parent b2c95fd
commit ecb06a8
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 58 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,7 @@
 {
+  "[javascript][typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
   "typescript.tsdk": "node_modules/typescript/lib",
   "prettier.proseWrap": "preserve"
 }
diff --git a/examples/gnt/gqty/index.ts b/examples/gnt/gqty/index.ts
@@ -3,11 +3,16 @@
  */
 
 import { createLogger } from '@gqty/logger';
-import { Cache, GQtyError, createClient, type QueryFetcher } from 'gqty';
 import {
+  Cache,
+  createClient,
+  defaultResponseHandler,
+  type QueryFetcher,
+} from 'gqty';
+import {
+  type GeneratedSchema,
   generatedSchema,
   scalarsEnumsHash,
-  type GeneratedSchema,
 } from './schema.generated';
 
 const queryFetcher: QueryFetcher = async function (
@@ -29,23 +34,7 @@ const queryFetcher: QueryFetcher = async function (
     ...fetchOptions,
   });
 
-  if (response.status >= 400) {
-    throw new GQtyError(
-      `GraphQL endpoint responded with HTTP status ${response.status}.`
-    );
-  }
-
-  const text = await response.text();
-
-  try {
-    return JSON.parse(text);
-  } catch {
-    throw new GQtyError(
-      `Malformed JSON response: ${
-        text.length > 50 ? text.slice(0, 50) + '...' : text
-      }`
-    );
-  }
+  return await defaultResponseHandler(response);
 };
 
 const cache = new Cache(

diff --git a/examples/react/src/graphql/gqty.ts b/examples/react/src/graphql/gqty.ts
@@ -6,13 +6,16 @@
 import { createSubscriptionsClient } from '@gqty/subscriptions';
 import extractFiles from 'extract-files/extractFiles.mjs';
 import isExtractableFile from 'extract-files/isExtractableFile.mjs';
-import { Cache, createClient, LegacyQueryFetcher as QueryFetcher } from 'gqty';
 import {
-  generatedSchema,
+  Cache,
+  createClient,
+  defaultResponseHandler,
+  LegacyQueryFetcher as QueryFetcher,
+} from 'gqty';
+import {
   GeneratedSchema,
+  generatedSchema,
   scalarsEnumsHash,
-  SchemaObjectTypes,
-  SchemaObjectTypesNames,
 } from './schema.generated';
 
 const queryFetcher: QueryFetcher = async function (query, variables) {
@@ -33,10 +36,13 @@ const queryFetcher: QueryFetcher = async function (query, variables) {
     formData.append(
       'map',
       JSON.stringify(
-        [...files.values()].reduce((prev, paths, i) => {
-          prev[i + 1] = paths;
-          return prev;
-        }, {} as Record<number, string[]>)
+        [...files.values()].reduce(
+          (prev, paths, i) => {
+            prev[i + 1] = paths;
+            return prev;
+          },
+          {} as Record<number, string[]>
+        )
       )
     );
 
@@ -51,7 +57,7 @@ const queryFetcher: QueryFetcher = async function (query, variables) {
       mode: 'cors',
     });
 
-    return await response.json();
+    return await defaultResponseHandler(response);
   } else {
     const response = await fetch(endpoint, {
       method: 'POST',
@@ -65,13 +71,14 @@ const queryFetcher: QueryFetcher = async function (query, variables) {
       mode: 'cors',
     });
 
-    return await response.json();
+    return await defaultResponseHandler(response);
   }
 };
 
 const subscriptionsClient =
-  typeof window !== 'undefined'
-    ? createSubscriptionsClient({
+  typeof window === 'undefined'
+    ? undefined
+    : createSubscriptionsClient({
         wsEndpoint: () => {
           // Modify if needed
           const url = new URL('/api/graphql', window.location.href);
@@ -80,20 +87,15 @@ const subscriptionsClient =
           console.log(42, url.href);
           return url.href;
         },
-      })
-    : undefined;
+      });
 
 export const cache = new Cache(undefined, {
   maxAge: 1000,
   staleWhileRevalidate: 60 * 5000,
   normalization: true,
 });
 
-export const client = createClient<
-  GeneratedSchema,
-  SchemaObjectTypesNames,
-  SchemaObjectTypes
->({
+export const client = createClient<GeneratedSchema>({
   cache,
   schema: generatedSchema,
   scalarsEnumsHash,
@@ -105,4 +107,4 @@ const { query, mutation, mutate, subscription, resolved, refetch, track } =
   client;
 
 export * from './schema.generated';
-export { query, mutation, mutate, subscription, resolved, refetch, track };
+export { mutate, mutation, query, refetch, resolved, subscription, track };
diff --git a/examples/solid/src/gqty/index.ts b/examples/solid/src/gqty/index.ts
@@ -3,11 +3,17 @@
  */
 
 import { createSolidClient } from '@gqty/solid';
-import { Cache, GQtyError, createClient, type QueryFetcher } from 'gqty';
 import {
+  Cache,
+  createClient,
+  defaultResponseHandler,
+  GQtyError,
+  type QueryFetcher,
+} from 'gqty';
+import {
+  type GeneratedSchema,
   generatedSchema,
   scalarsEnumsHash,
-  type GeneratedSchema,
 } from './schema.generated';
 
 const queryFetcher: QueryFetcher = async function (
@@ -35,17 +41,7 @@ const queryFetcher: QueryFetcher = async function (
     );
   }
 
-  const text = await response.text();
-
-  try {
-    return JSON.parse(text);
-  } catch {
-    throw new GQtyError(
-      `Malformed JSON response: ${
-        text.length > 50 ? text.slice(0, 50) + '...' : text
-      }`
-    );
-  }
+  return await defaultResponseHandler(response);
 };
 
 const cache = new Cache(

diff --git a/examples/vite-react/src/gqty/index.ts b/examples/vite-react/src/gqty/index.ts
@@ -4,7 +4,7 @@
 
 import { createReactClient } from '@gqty/react';
 import type { QueryFetcher } from 'gqty';
-import { Cache, createClient } from 'gqty';
+import { Cache, createClient, defaultResponseHandler } from 'gqty';
 import type { GeneratedSchema } from './schema.generated';
 import { generatedSchema, scalarsEnumsHash } from './schema.generated';
 
@@ -27,9 +27,7 @@ const queryFetcher: QueryFetcher = async function (
     ...fetchOptions,
   });
 
-  const json = await response.json();
-
-  return json;
+  return await defaultResponseHandler(response);
 };
 
 const cache = new Cache(

diff --git a/packages/cli/build.ts b/packages/cli/build.ts
@@ -10,7 +10,7 @@ fs.rmSync('dist', { force: true, recursive: true });
 // tsc --emitDeclarationOnly
 // Note: Creates the target directory, and serves as a pre-build typecheck.
 tsc
-  .createProgram(['src/index.ts'], {
+  .createProgram(['src/envelop.ts', 'src/index.ts'], {
     baseUrl: '.',
     declaration: true,
     emitDeclarationOnly: true,

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -25,6 +25,11 @@
       "types": "./dist/index.d.ts",
       "import": "./dist/index.mjs",
       "require": "./dist/index.js"
+    },
+    "./envelop": {
+      "types": "./dist/envelop.d.ts",
+      "import": "./dist/envelop.mjs",
+      "require": "./dist/envelop.js"
     }
   },
   "files": [

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml