@naturalcycles/js-lib 14.266.1 → 14.267.1

package/dist/http/fetcher.js

@@ -124,7 +124,10 @@ class Fetcher {
             variables: opt.variables,
         });
         // Checking the query length, and not allowing to use GET if above 1900
-        if (opt.method === 'GET' && opt.query.length < 1900) {
+        if (opt.method === 'GET' && opt.query.length > 1900) {
+            opt.method = 'POST';
+        }
+        if (opt.method === 'GET') {
             opt.searchParams = {
                 ...opt.searchParams,
                 ...payload,
@@ -142,6 +145,7 @@ class Fetcher {
             const err = res.body.errors[0];
             // todo: consider creating a new GraphQLError class for this
             throw new error_util_1.HttpRequestError(err.message, {
+                ...payload, // query and variables
                 errors: res.body.errors, // full errors payload returned
                 response: res.fetchResponse,
                 responseStatusCode: res.statusCode,
@@ -152,7 +156,11 @@ class Fetcher {
                 requestDuration: Date.now() - res.req.started,
             });
         }
-        return res.body.data;
+        const { data } = res.body;
+        if (opt.unwrapObject) {
+            return data[opt.unwrapObject];
+        }
+        return data;
     }
     // responseType=readableStream
     /**

package/dist/http/fetcher.model.d.ts

@@ -119,6 +119,18 @@ export interface FetcherRequest extends Omit<FetcherOptions, 'method' | 'headers
 export interface FetcherGraphQLOptions extends FetcherOptions {
     query: string;
     variables?: AnyObject;
+    /**
+     * When querying singular entities, it may be convenient to specify 1st level object to unwrap.
+     * Example:
+     * {
+     *   homePage: { ... }
+     * }
+     *
+     * unwrapObject: 'homePage'
+     *
+     * would return the contents of `{ ... }`
+     */
+    unwrapObject?: string;
 }
 export interface FetcherOptions {
     method?: HttpMethod;

package/dist-esm/http/fetcher.js

@@ -117,7 +117,10 @@ export class Fetcher {
             variables: opt.variables,
         });
         // Checking the query length, and not allowing to use GET if above 1900
-        if (opt.method === 'GET' && opt.query.length < 1900) {
+        if (opt.method === 'GET' && opt.query.length > 1900) {
+            opt.method = 'POST';
+        }
+        if (opt.method === 'GET') {
             opt.searchParams = {
                 ...opt.searchParams,
                 ...payload,
@@ -135,6 +138,7 @@ export class Fetcher {
             const err = res.body.errors[0];
             // todo: consider creating a new GraphQLError class for this
             throw new HttpRequestError(err.message, {
+                ...payload, // query and variables
                 errors: res.body.errors, // full errors payload returned
                 response: res.fetchResponse,
                 responseStatusCode: res.statusCode,
@@ -145,7 +149,11 @@ export class Fetcher {
                 requestDuration: Date.now() - res.req.started,
             });
         }
-        return res.body.data;
+        const { data } = res.body;
+        if (opt.unwrapObject) {
+            return data[opt.unwrapObject];
+        }
+        return data;
     }
     // responseType=readableStream
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.266.1",
+  "version": "14.267.1",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build-esm-cjs",

package/src/http/fetcher.model.ts

@@ -155,6 +155,18 @@ export interface FetcherRequest
 export interface FetcherGraphQLOptions extends FetcherOptions {
   query: string
   variables?: AnyObject
+  /**
+   * When querying singular entities, it may be convenient to specify 1st level object to unwrap.
+   * Example:
+   * {
+   *   homePage: { ... }
+   * }
+   *
+   * unwrapObject: 'homePage'
+   *
+   * would return the contents of `{ ... }`
+   */
+  unwrapObject?: string
 }
 
 export interface FetcherOptions {

package/src/http/fetcher.ts

@@ -194,7 +194,11 @@ export class Fetcher {
     })
 
     // Checking the query length, and not allowing to use GET if above 1900
-    if (opt.method === 'GET' && opt.query.length < 1900) {
+    if (opt.method === 'GET' && opt.query.length > 1900) {
+      opt.method = 'POST'
+    }
+
+    if (opt.method === 'GET') {
       opt.searchParams = {
         ...opt.searchParams,
         ...payload,
@@ -214,6 +218,7 @@ export class Fetcher {
 
       // todo: consider creating a new GraphQLError class for this
       throw new HttpRequestError(err.message, {
+        ...payload, // query and variables
         errors: res.body.errors, // full errors payload returned
         response: res.fetchResponse,
         responseStatusCode: res.statusCode,
@@ -225,7 +230,12 @@ export class Fetcher {
       })
     }
 
-    return res.body.data
+    const { data } = res.body
+    if (opt.unwrapObject) {
+      return (data as any)[opt.unwrapObject]
+    }
+
+    return data
   }
 
   // responseType=readableStream