@graphql-tools/github-loader 7.3.6-alpha-d9e3cbee.0 → 7.3.6

package/cjs/index.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const utils_1 = require("@graphql-tools/utils");
 const graphql_tag_pluck_1 = require("@graphql-tools/graphql-tag-pluck");
 const graphql_1 = require("graphql");
-const sync_fetch_1 = tslib_1.__importDefault(require("sync-fetch"));
+const sync_fetch_1 = tslib_1.__importDefault(require("@ardatan/sync-fetch"));
 const fetch_1 = require("@whatwg-node/fetch");
 // github:owner/name#ref:path/to/file
 function extractData(pointer) {
@@ -44,7 +44,8 @@ class GithubLoader {
         const fetch = options.customFetch || fetch_1.fetch;
         const request = await fetch('https://api.github.com/graphql', this.prepareRequest({ owner, ref, path, name, options }));
         const response = await request.json();
-        return this.handleResponse({ pointer, path, options, response });
+        const status = request.status;
+        return this.handleResponse({ pointer, path, options, response, status });
     }
     loadSync(pointer, options) {
         if (!this.canLoadSync(pointer)) {
@@ -54,13 +55,17 @@ class GithubLoader {
         const fetch = options.customFetch || sync_fetch_1.default;
         const request = fetch('https://api.github.com/graphql', this.prepareRequest({ owner, ref, path, name, options }));
         const response = request.json();
-        return this.handleResponse({ pointer, path, options, response });
+        const status = request.status;
+        return this.handleResponse({ pointer, path, options, response, status });
     }
-    handleResponse({ pointer, path, options, response }) {
+    handleResponse({ pointer, path, options, response, status, }) {
         let errorMessage = null;
         if (response.errors && response.errors.length > 0) {
             errorMessage = response.errors.map((item) => item.message).join(', ');
         }
+        else if (status === 401) {
+            errorMessage = response.message;
+        }
         else if (!response.data) {
             errorMessage = response;
         }

package/esm/index.js

@@ -1,7 +1,7 @@
 import { parseGraphQLSDL, parseGraphQLJSON } from '@graphql-tools/utils';
 import { gqlPluckFromCodeStringSync } from '@graphql-tools/graphql-tag-pluck';
 import { parse } from 'graphql';
-import syncFetch from 'sync-fetch';
+import syncFetch from '@ardatan/sync-fetch';
 import { fetch as asyncFetch } from '@whatwg-node/fetch';
 // github:owner/name#ref:path/to/file
 function extractData(pointer) {
@@ -40,7 +40,8 @@ export class GithubLoader {
         const fetch = options.customFetch || asyncFetch;
         const request = await fetch('https://api.github.com/graphql', this.prepareRequest({ owner, ref, path, name, options }));
         const response = await request.json();
-        return this.handleResponse({ pointer, path, options, response });
+        const status = request.status;
+        return this.handleResponse({ pointer, path, options, response, status });
     }
     loadSync(pointer, options) {
         if (!this.canLoadSync(pointer)) {
@@ -50,13 +51,17 @@ export class GithubLoader {
         const fetch = options.customFetch || syncFetch;
         const request = fetch('https://api.github.com/graphql', this.prepareRequest({ owner, ref, path, name, options }));
         const response = request.json();
-        return this.handleResponse({ pointer, path, options, response });
+        const status = request.status;
+        return this.handleResponse({ pointer, path, options, response, status });
     }
-    handleResponse({ pointer, path, options, response }) {
+    handleResponse({ pointer, path, options, response, status, }) {
         let errorMessage = null;
         if (response.errors && response.errors.length > 0) {
             errorMessage = response.errors.map((item) => item.message).join(', ');
         }
+        else if (status === 401) {
+            errorMessage = response.message;
+        }
         else if (!response.data) {
             errorMessage = response;
         }

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@graphql-tools/github-loader",
-  "version": "7.3.6-alpha-d9e3cbee.0",
+  "version": "7.3.6",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
+    "@ardatan/sync-fetch": "0.0.1",
     "@graphql-tools/utils": "8.9.0",
     "@graphql-tools/graphql-tag-pluck": "7.3.1",
     "@whatwg-node/fetch": "^0.2.4",
-    "sync-fetch": "0.4.1",
     "tslib": "^2.4.0"
   },
   "repository": {

package/typings/index.d.ts

@@ -1,6 +1,6 @@
 import { Loader, BaseLoaderOptions, Source } from '@graphql-tools/utils';
 import { GraphQLTagPluckOptions } from '@graphql-tools/graphql-tag-pluck';
-import syncFetch from 'sync-fetch';
+import syncFetch from '@ardatan/sync-fetch';
 import { fetch as asyncFetch } from '@whatwg-node/fetch';
 /**
  * Additional options for loading from GitHub
@@ -31,11 +31,12 @@ export declare class GithubLoader implements Loader<GithubLoaderOptions> {
     canLoadSync(pointer: string): boolean;
     load(pointer: string, options: GithubLoaderOptions): Promise<Source[]>;
     loadSync(pointer: string, options: GithubLoaderOptions): Source[];
-    handleResponse({ pointer, path, options, response }: {
+    handleResponse({ pointer, path, options, response, status, }: {
         pointer: string;
         path: string;
         options: any;
         response: any;
+        status: number;
     }): Source[] | {
         location: string | undefined;
         document: import("graphql").DocumentNode;