@vladimirdev635/gql-client 0.0.97 → 0.0.99

package/executor.js

@@ -32,22 +32,23 @@ export class Executor {
                 clientContext: this.config.context,
                 requestContext,
                 operation,
-                variables
+                variables,
             });
         }
         let init = await this.config.serializer.serializeRequest({
             clientContext: this.config.context,
             requestContext,
             operation,
-            variables
+            variables,
         });
-        for (const middleware of this.config.middlewares.afterSerialization.sync) {
+        for (const middleware of this.config.middlewares.afterSerialization
+            .sync) {
             init = await middleware({
                 clientContext: this.config.context,
                 requestContext,
                 operation,
                 variables,
-                init
+                init,
             });
         }
         let response = await this.config.fetcher(init);
@@ -58,14 +59,14 @@ export class Executor {
                 operation,
                 variables,
                 init,
-                response
+                response,
             });
         }
         let result = await this.config.parser.parseBodySync({
             clientContext: this.config.context,
             requestContext,
             operation,
-            response
+            response,
         });
         for (const middleware of this.config.middlewares.afterParsing.sync) {
             result = await middleware({
@@ -75,7 +76,7 @@ export class Executor {
                 variables,
                 init,
                 response,
-                result
+                result,
             });
         }
         return { result, response };
@@ -95,28 +96,30 @@ export class Executor {
                 clientContext: this.config.context,
                 requestContext,
                 operation,
-                variables
+                variables,
             });
         }
         let init = await this.config.serializer.serializeRequest({
             clientContext: this.config.context,
             requestContext,
             operation,
-            variables
+            variables,
         });
-        for (const middleware of this.config.middlewares.afterSerialization.subscription) {
+        for (const middleware of this.config.middlewares.afterSerialization
+            .subscription) {
             init = await middleware({
                 clientContext: this.config.context,
                 requestContext,
                 operation,
                 variables,
                 init,
-                controller
+                controller,
             });
         }
         init.signal = controller.signal;
         let response = await this.config.fetcher(init);
-        for (const middleware of this.config.middlewares.beforeParsing.subscription) {
+        for (const middleware of this.config.middlewares.beforeParsing
+            .subscription) {
             response = await middleware({
                 clientContext: this.config.context,
                 requestContext,
@@ -124,7 +127,7 @@ export class Executor {
                 variables,
                 init,
                 response,
-                controller
+                controller,
             });
         }
         let result = await this.config.parser.parseBodySubscription({
@@ -132,9 +135,10 @@ export class Executor {
             requestContext,
             operation,
             response,
-            controller
+            controller,
         });
-        for (const middleware of this.config.middlewares.afterParsing.subscription) {
+        for (const middleware of this.config.middlewares.afterParsing
+            .subscription) {
             result = await middleware({
                 clientContext: this.config.context,
                 requestContext,
@@ -143,7 +147,7 @@ export class Executor {
                 init,
                 response,
                 result,
-                controller
+                controller,
             });
         }
         return { result, response };

package/package.json

@@ -1,37 +1,43 @@
 {
     "name": "@vladimirdev635/gql-client",
-    "version": "0.0.97",
-    "type": "module",
-    "main": "./index.js",
-    "types": "./index.d.ts",
-    "files": [
-        "./"
-    ],
+    "version": "0.0.99",
+    "description": "",
+    "keywords": [],
     "homepage": "https://github.com/Voldemat/graphql-plus-plus#readme",
+    "license": "ISC",
+    "author": "",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/Voldemat/graphql-plus-plus.git"
     },
+    "files": [
+        "./"
+    ],
+    "type": "module",
+    "main": "./index.js",
+    "types": "./index.d.ts",
     "scripts": {
-        "lint": "eslint .",
-        "lint:fix": "eslint --fix .",
-        "lint:ci": "npm run lint",
+        "fmt": "oxfmt .",
+        "fmt:check": "oxfmt --check .",
+        "lint": "oxlint .",
+        "lint:fix": "oxlint --fix .",
+        "lint:ci": "npm run fmt:check && npm run lint",
         "test": "vitest",
         "build": "tsc && cp package.json ./dist/"
     },
-    "keywords": [],
-    "author": "",
-    "license": "ISC",
-    "description": "",
     "devDependencies": {
-        "@eslint/compat": "^1.3.0",
         "@types/node": "^24.0.1",
-        "@typescript-eslint/eslint-plugin": "^8.34.0",
-        "eslint": "^9.28.0",
         "jiti": "^2.4.2",
+        "oxfmt": "^0.62.0",
+        "oxlint": "^1.77.0",
+        "typescript": "<7.0.0",
         "vitest": "^3.2.4"
     },
     "peerDependencies": {
         "zod": ">=3.25.76"
+    },
+    "allowScripts": {
+        "esbuild@0.25.5": true,
+        "fsevents@2.3.3": true
     }
 }

package/parsers/parseBodySubscription.js

@@ -1,8 +1,6 @@
 import assert from 'assert';
 export function buildParseBodySubscriptionFunc() {
-    return async (options
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    ) => {
+    return async (options) => {
         if (options.response.status !== 200) {
             throw new Error(await options.response.text());
         }
@@ -14,23 +12,19 @@ export function buildParseBodySubscriptionFunc() {
         const decoder = new TextDecoder();
         let shouldClose = false;
         let resolve;
-        const signal = new Promise(res => resolve = res);
+        const signal = new Promise((res) => (resolve = res));
         const close = () => {
             shouldClose = true;
             resolve({ done: true, value: undefined });
             options.controller.abort();
         };
-        const stream = async function* () {
+        const stream = (async function* () {
             while (!shouldClose) {
-                const readResult = await Promise.race([
-                    reader.read(),
-                    signal
-                ]);
+                const readResult = await Promise.race([reader.read(), signal]);
                 if (readResult.done)
                     return;
-                const lines = decoder.decode(readResult.value)
-                    .split('\n');
-                for (const line of lines.filter(c => c !== '')) {
+                const lines = decoder.decode(readResult.value).split('\n');
+                for (const line of lines.filter((c) => c !== '')) {
                     if (shouldClose)
                         break;
                     const [name, value] = line.split(/:(.*)/s, 2);
@@ -39,11 +33,11 @@ export function buildParseBodySubscriptionFunc() {
                     yield options.operation.resultSchema.parse(JSON.parse(value).data);
                 }
             }
-        }();
+        })();
         return {
             stream,
             close,
-            [Symbol.dispose]: close
+            [Symbol.dispose]: close,
         };
     };
 }

package/parsers/parser.js

@@ -6,15 +6,20 @@ const defaultParserOptions = {
 };
 export function createParser(parserOptions = defaultParserOptions) {
     return {
-        parseBodySync: async (options
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        ) => {
-            const json = await options.response.json();
+        parseBodySync: async (options) => {
+            const text = await options.response.text();
+            let json;
+            try {
+                json = JSON.parse(text);
+            }
+            catch (error) {
+                throw new Error(`Failed to parse response as json: ${error}, text: ${text}`);
+            }
             if (json.errors) {
                 await parserOptions.onErrors(options, json.errors);
             }
             return options.operation.resultSchema.parse(json.data);
         },
-        parseBodySubscription: buildParseBodySubscriptionFunc()
+        parseBodySubscription: buildParseBodySubscriptionFunc(),
     };
 }

package/serializers/json.js

@@ -13,13 +13,13 @@ export function createJSONSerializer() {
                 method: 'POST',
                 body: JSON.stringify({
                     query: operation.document,
-                    variables: operation.variablesSchema.parse(variables)
+                    variables: operation.variablesSchema.parse(variables),
                 }, (key, value) => {
                     assert(!(value instanceof File), 'jsonSerializer cannot encode File objects, ' +
                         `key: "${key}"`);
                     return value;
                 }),
-                ...requestContext.fetchOptions
+                ...requestContext.fetchOptions,
             };
         },
     };

package/serializers/multipart.js

@@ -8,8 +8,9 @@ function getFilesKeysAndPayload(variables, initialPath = '', shouldTreatAsObject
             newObject[key] = null;
             continue;
         }
-        if (typeof value === 'object' && value !== null && (shouldTreatAsObject === undefined ||
-            shouldTreatAsObject(value))) {
+        if (typeof value === 'object' &&
+            value !== null &&
+            (shouldTreatAsObject === undefined || shouldTreatAsObject(value))) {
             const [valueFilesKeys, valueObj] = getFilesKeysAndPayload(value, initialPath + key + '.', shouldTreatAsObject);
             filesKeys.push(...valueFilesKeys);
             newObject[key] = valueObj;
@@ -35,12 +36,13 @@ function buildFormData(operation, variables, shouldTreatAsObject) {
     assert(filesKeys.length !== 0, 'Dont use multipartSerializer for regular bodies');
     formData.append('operations', JSON.stringify({
         query: operation.document,
-        variables: finalVariables
+        variables: finalVariables,
     }));
-    const properties = filesKeys
-        .map((key, index) => [String(index), key]);
-    const finalMap = Object.fromEntries(properties
-        .map(([index, key]) => {
+    const properties = filesKeys.map((key, index) => [
+        String(index),
+        key,
+    ]);
+    const finalMap = Object.fromEntries(properties.map(([index, key]) => {
         return [index, ['variables.' + key]];
     }));
     formData.append('map', JSON.stringify(finalMap));
@@ -64,7 +66,7 @@ export function createMultipartSerializer() {
                 method: 'POST',
                 headers,
                 body: buildFormData(operation, operation.variablesSchema.parse(variables)),
-                ...requestContext.fetchOptions
+                ...requestContext.fetchOptions,
             };
         },
     };

package/serializers/tests/json.spec.js

@@ -16,13 +16,13 @@ describe('Json serializer', () => {
         };
         const variables = {
             name: 'test-name',
-            file: new File([], '')
+            file: new File([], ''),
         };
         expect(() => jsonSerializer.serializeRequest({
             operation,
             variables,
             clientContext: {},
-            requestContext: {}
+            requestContext: {},
         })).toThrowError('jsonSerializer cannot encode File objects, key: "file"');
     });
     it('Should json stringify variables', async () => {
@@ -42,7 +42,7 @@ describe('Json serializer', () => {
             clientContext: {},
             requestContext: {},
             operation,
-            variables
+            variables,
         });
         const headers = new Headers(init.headers);
         expect(headers.get('Content-Type')).toBe('application/json');
@@ -50,7 +50,7 @@ describe('Json serializer', () => {
             query: operation.document,
             variables: {
                 name: 'test-name',
-            }
+            },
         }));
     });
 });

package/serializers/tests/multipart.spec.js

@@ -10,18 +10,18 @@ describe('Multipart serializer', () => {
             name: '',
             type: 'QUERY',
             variablesSchema: z.object({
-                name: z.string()
+                name: z.string(),
             }),
             resultSchema: z.void(),
         };
         const variables = {
-            name: 'test-name'
+            name: 'test-name',
         };
         expect(() => multipartSerializer.serializeRequest({
             clientContext: {},
             requestContext: {},
             operation,
-            variables
+            variables,
         })).toThrowError('Dont use multipartSerializer for regular bodies');
     });
     it('Should build proper form data', async () => {
@@ -31,19 +31,19 @@ describe('Multipart serializer', () => {
             type: 'QUERY',
             variablesSchema: z.object({
                 name: z.string(),
-                file: z.file()
+                file: z.file(),
             }),
             resultSchema: z.void(),
         };
         const variables = {
             name: 'test-name',
-            file: new File([], 'check.txt')
+            file: new File([], 'check.txt'),
         };
         const init = await multipartSerializer.serializeRequest({
             clientContext: {},
             requestContext: {},
             operation,
-            variables
+            variables,
         });
         const headers = new Headers(init.headers);
         expect(headers.get('Content-Type')).toBe(null);
@@ -53,11 +53,11 @@ describe('Multipart serializer', () => {
             query: operation.document,
             variables: {
                 name: 'test-name',
-                file: null
-            }
+                file: null,
+            },
         }));
         expect(init.body.get('map')).toBe(JSON.stringify({
-            '0': ['variables.file']
+            '0': ['variables.file'],
         }));
         expect(init.body.get('0')).toStrictEqual(variables.file);
     });

package/types/index.d.ts

@@ -1,6 +1,6 @@
-export type { Operation, SyncOperation, SubscriptionOperation, RequestContext, OperationVariables, OperationResult } from './base.js';
+export type { Operation, SyncOperation, SubscriptionOperation, RequestContext, OperationVariables, OperationResult, } from './base.js';
 export * as middlewares from './middlewares/index.js';
-export type { ClientParser, ClientParserParseBodySyncOptions, ClientParserParseBodySubscriptionOptions, SubOpAsyncIterable } from './parser.js';
+export type { ClientParser, ClientParserParseBodySyncOptions, ClientParserParseBodySubscriptionOptions, SubOpAsyncIterable, } from './parser.js';
 export type { ClientSerializer } from './serializer.js';
 export type { ClientConfig } from './config.js';
 export type { OpResultBasedOnOp } from './utils.js';