@avantstay/graphql-ts-client 11.0.0-beta.1 → 11.0.0

package/dist/endpoint.js

@@ -603,7 +603,8 @@ function jsonToGraphQLQuery(param) {
     var alias = jsonQuery.__alias;
     var newJsonQuery = cloneDeep((0, import_omit.default)(jsonQuery, [
         "__alias",
-        "__headers"
+        "__headers",
+        "__url"
     ]));
     extractVariables({
         jsonQuery: _defineProperty({}, queryName, newJsonQuery),
@@ -723,11 +724,13 @@ var getApiEndpointCreator = function(apiConfig) {
     return function(kind, queryName) {
         var rawEndpoint = function() {
             var _ref = _asyncToGenerator(function(failureMode, jsonQuery) {
-                var _jsonQuery___alias, alias, _jsonQuery___retry, shouldRetry, _jsonQuery___headers, requestHeaders, _jsonToGraphQLQuery, query, variables, start, logOptions, responseListenerData, _ref, data, errors, warnings, headers, status, response, error;
+                var clientConfig, _jsonQuery___alias, alias, _jsonQuery___url, url, _jsonQuery___retry, shouldRetry, _jsonQuery___headers, requestHeaders, _jsonToGraphQLQuery, query, variables, start, logOptions, responseListenerData, _ref, data, errors, warnings, headers, status, response, error;
                 return __generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
+                            clientConfig = apiConfig.getClient();
                             alias = (_jsonQuery___alias = jsonQuery === null || jsonQuery === void 0 ? void 0 : jsonQuery.__alias) !== null && _jsonQuery___alias !== void 0 ? _jsonQuery___alias : queryName;
+                            url = (_jsonQuery___url = jsonQuery === null || jsonQuery === void 0 ? void 0 : jsonQuery.__url) !== null && _jsonQuery___url !== void 0 ? _jsonQuery___url : clientConfig.url;
                             shouldRetry = (_jsonQuery___retry = jsonQuery === null || jsonQuery === void 0 ? void 0 : jsonQuery.__retry) !== null && _jsonQuery___retry !== void 0 ? _jsonQuery___retry : true;
                             requestHeaders = (_jsonQuery___headers = jsonQuery === null || jsonQuery === void 0 ? void 0 : jsonQuery.__headers) !== null && _jsonQuery___headers !== void 0 ? _jsonQuery___headers : {};
                             _jsonToGraphQLQuery = jsonToGraphQLQuery({
@@ -764,7 +767,9 @@ var getApiEndpointCreator = function(apiConfig) {
                                     shouldRetry: shouldRetry,
                                     failureMode: failureMode,
                                     queryName: alias,
-                                    client: apiConfig.getClient(),
+                                    client: _objectSpreadProps(_objectSpread({}, clientConfig), {
+                                        url: url
+                                    }),
                                     requestHeaders: requestHeaders,
                                     query: query,
                                     variables: variables,

package/dist/index.js

@@ -477,7 +477,7 @@ var import_case = __toESM(require("case"));
 var esbuild = __toESM(require("esbuild"));
 var fs = __toESM(require("fs"));
 var import_graphql = require("graphql");
-var import_lodash = require("lodash");
+var import_kebabCase = __toESM(require("lodash/kebabCase"));
 var import_orderBy = __toESM(require("lodash/orderBy"));
 var import_set = __toESM(require("lodash/set"));
 var import_md5 = __toESM(require("md5"));
@@ -487,7 +487,7 @@ var prettier = __toESM(require("prettier"));
 // package.json
 var package_default = {
     name: "@avantstay/graphql-ts-client",
-    version: "11.0.0-beta.1",
+    version: "11.0.0",
     description: "GraphQL Typescript Client Generator",
     author: "Wellington Guimaraes",
     license: "MIT",
@@ -639,7 +639,7 @@ function gqlFieldToTypescript(field, param) {
                 selection: false
             });
         });
-        fieldTypeDefinition = "{ __headers?: {[key: string]: string}; __retry?: boolean; __alias?: string; __args".concat(fieldsOnArgs.every(function(arg) {
+        fieldTypeDefinition = "{ __headers?: {[key: string]: string}; __retry?: boolean; __alias?: string; __url?: string; __args".concat(fieldsOnArgs.every(function(arg) {
             return arg.isOptional;
         }) ? "?" : "", ": { ").concat(fieldsOnArgs.map(function(arg) {
             return arg.code;
@@ -679,7 +679,7 @@ function gqlEndpointToCode(kind, endpoint, codeOutputType) {
         selection: true
     });
     var argsType = endpoint.args && endpoint.args.length ? getArgsType(endpoint) : null;
-    var inputType = "{\n    __headers?: {[key: string]: string};\n    __retry?: boolean;\n    __alias?: string;\n    ".concat(argsType ? "__args".concat(argsType.optional ? "?" : "", ": ").concat(argsType.alias) : "", "\n  }").concat(selectionType ? " & ".concat(selectionType) : "");
+    var inputType = "{\n    __headers?: {[key: string]: string};\n    __retry?: boolean;\n    __alias?: string;\n    __url?: string;\n    ".concat(argsType ? "__args".concat(argsType.optional ? "?" : "", ": ").concat(argsType.alias) : "", "\n  }").concat(selectionType ? " & ".concat(selectionType) : "");
     var outputType = gqlTypeToTypescript(endpoint.type, {
         required: true
     });
@@ -866,7 +866,7 @@ function _fetchIntrospection() {
             switch(_state.label){
                 case 0:
                     endpoint = param.endpoint, headers = param.headers;
-                    introspectionCacheFileName = "gql-ts-client__introspection__".concat((0, import_lodash.kebabCase)(endpoint), ".json");
+                    introspectionCacheFileName = "gql-ts-client__introspection__".concat((0, import_kebabCase.default)(endpoint), ".json");
                     introspectionCacheFilePath = import_path.default.resolve(tempDir, introspectionCacheFileName);
                     loadedFromCache = false;
                     return [
@@ -877,7 +877,7 @@ function _fetchIntrospection() {
                             headers: _objectSpread({
                                 "Content-Type": "application/json"
                             }, headers)
-                        }).catch(function() {
+                        }).catch(function(e) {
                             var errorMessage = "The GraphQL introspection request failed (".concat(endpoint, ")");
                             if (fs.existsSync(introspectionCacheFilePath)) {
                                 var cachedSchema = JSON.parse(fs.readFileSync(introspectionCacheFilePath, {
@@ -889,6 +889,7 @@ function _fetchIntrospection() {
                                     data: cachedSchema
                                 };
                             } else {
+                                console.error(e);
                                 return Promise.reject(errorMessage);
                             }
                         })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avantstay/graphql-ts-client",
-  "version": "11.0.0-beta.1",
+  "version": "11.0.0",
   "description": "GraphQL Typescript Client Generator",
   "author": "Wellington Guimaraes",
   "license": "MIT",

package/src/__snapshots__/generateTypescriptClient.test.ts.snap

@@ -29,7 +29,7 @@ __export(exports, {
   client: () => client,
   default: () => stdin_default
 });
-var import_endpoint = __toModule(require("../dist/endpoint"));
+var import_endpoint = __toModule(require("./endpoint"));
 const formatGraphQL = (query) => query;
 const typesTree = {};
 let verbose = false;
@@ -79,7 +79,7 @@ var stdin_default = client;
 ",
   "typings": "// noinspection TypeScriptUnresolvedVariable, ES6UnusedImports, JSUnusedLocalSymbols, TypeScriptCheckImport
 import { DeepRequired } from "ts-essentials"
-import { Maybe, IResponseListener, Endpoint } from "../dist"
+import { Maybe, IResponseListener, Endpoint } from "."
 
 // Scalars
 export type IDate = string | Date
@@ -119,6 +119,7 @@ export declare const client: {
         __headers?: { [key: string]: string }
         __retry?: boolean
         __alias?: string
+        __url?: string
       },
       string,
       AllEnums

package/src/__testClient.d.ts

@@ -34,21 +34,21 @@ export interface FailingQueryArgs {
  * @deprecated Avoid directly using this interface. Instead, create a type alias based on the query/mutation return type.
  */
 
-export interface Image {
-  url?: string
-  alt?: string
+export interface Book {
+  title?: string
+  author?: string
+  type?: BookType
+  dateCreated?: ISODate
+  sequence?: BookSequence
 }
 
 /**
  * @deprecated Avoid directly using this interface. Instead, create a type alias based on the query/mutation return type.
  */
 
-export interface Book {
-  title?: string
-  author?: string
-  type?: BookType
-  dateCreated?: ISODate
-  images?: Image[]
+export interface BookSequence {
+  previousBook?: Book
+  nextBook?: Book
 }
 
 /**
@@ -83,17 +83,17 @@ export interface Query {
 
 // Selection Types
 
-export interface ImageSelection {
-  url?: boolean
-  alt?: boolean
-}
-
 export interface BookSelection {
   title?: boolean
   author?: boolean
   type?: boolean
   dateCreated?: boolean
-  images?: ImageSelection
+  sequence?: BookSequenceSelection
+}
+
+export interface BookSequenceSelection {
+  previousBook?: BookSelection
+  nextBook?: BookSelection
 }
 
 export interface BookSearchParamsAllOptionalSelection {
@@ -124,7 +124,7 @@ export declare const myApiClient: {
         __retry?: boolean
         __alias?: string
       } & BookSelection,
-      Book[],
+      DeepRequired<Book[]>,
       AllEnums
     >
     booksWithOptionalParams: Endpoint<
@@ -134,7 +134,7 @@ export declare const myApiClient: {
         __alias?: string
         __args?: BooksWithOptionalParamsArgs
       } & BookSelection,
-      Book[],
+      DeepRequired<Book[]>,
       AllEnums
     >
     booksWithRequiredParams: Endpoint<
@@ -144,7 +144,7 @@ export declare const myApiClient: {
         __alias?: string
         __args: BooksWithRequiredParamsArgs
       } & BookSelection,
-      Book[],
+      DeepRequired<Book[]>,
       AllEnums
     >
     failingQuery: Endpoint<

package/src/__testClient.js

@@ -67,7 +67,23 @@ const typesTree = {
     }
   },
   Book: {
-    images: {}
+    get sequence() {
+      return {
+        __fields: typesTree.BookSequence
+      };
+    }
+  },
+  BookSequence: {
+    get previousBook() {
+      return {
+        __fields: typesTree.Book
+      };
+    },
+    get nextBook() {
+      return {
+        __fields: typesTree.Book
+      };
+    }
   }
 };
 let verbose = false;

package/src/endpoint.ts

@@ -32,7 +32,10 @@ export const getApiEndpointCreator =
       headers: any
       status: any
     }> => {
+      const clientConfig = apiConfig.getClient()
+
       const alias = (jsonQuery as any)?.__alias ?? queryName
+      const url = (jsonQuery as any)?.__url ?? clientConfig.url
       const shouldRetry = (jsonQuery as any)?.__retry ?? true
       const requestHeaders = (jsonQuery as any)?.__headers ?? {}
       const { query, variables } = jsonToGraphQLQuery({ kind, queryName, jsonQuery, typesTree: apiConfig.typesTree })
@@ -58,7 +61,7 @@ export const getApiEndpointCreator =
           shouldRetry,
           failureMode,
           queryName: alias,
-          client: apiConfig.getClient(),
+          client: {...clientConfig, url },
           requestHeaders,
           query,
           variables,

package/src/generateTypescriptClient.ts

@@ -17,7 +17,7 @@ import {
   IntrospectionType,
   Source,
 } from 'graphql'
-import { kebabCase } from 'lodash'
+import kebabCase from 'lodash/kebabCase'
 import orderBy from 'lodash/orderBy'
 import set from 'lodash/set'
 import md5 from 'md5'
@@ -108,7 +108,7 @@ function gqlFieldToTypescript(
       })
     )
 
-    fieldTypeDefinition = `{ __headers?: {[key: string]: string}; __retry?: boolean; __alias?: string; __args${
+    fieldTypeDefinition = `{ __headers?: {[key: string]: string}; __retry?: boolean; __alias?: string; __url?: string; __args${
       fieldsOnArgs.every(arg => arg.isOptional) ? '?' : ''
     }: { ${fieldsOnArgs.map(arg => arg.code).join(', ')} }}${fieldTypeDefinition ? ` & ${fieldTypeDefinition}` : ''}`
   }
@@ -148,6 +148,7 @@ function gqlEndpointToCode(kind: 'mutation' | 'query', endpoint: IntrospectionFi
     __headers?: {[key: string]: string};
     __retry?: boolean;
     __alias?: string;
+    __url?: string;
     ${argsType ? `__args${argsType.optional ? '?' : ''}: ${argsType.alias}` : ''}
   }${selectionType ? ` & ${selectionType}` : ''}`
 
@@ -499,7 +500,7 @@ async function fetchIntrospection({ endpoint, headers }: FetchIntrospectionOptio
         },
       }
     )
-    .catch(() => {
+    .catch((e) => {
       const errorMessage = `The GraphQL introspection request failed (${endpoint})`
       if (fs.existsSync(introspectionCacheFilePath)) {
         const cachedSchema = JSON.parse(fs.readFileSync(introspectionCacheFilePath, { encoding: 'utf8' }))
@@ -507,6 +508,7 @@ async function fetchIntrospection({ endpoint, headers }: FetchIntrospectionOptio
         console.warn(`Successfully restored from local cache.`)
         return { data: cachedSchema }
       } else {
+        console.error(e)
         return Promise.reject(errorMessage)
       }
     })

package/src/jsonToGraphQLQuery.ts

@@ -23,7 +23,7 @@ export function jsonToGraphQLQuery({
 }) {
   const variablesData = {} as ExtractedVariables
   const alias = jsonQuery.__alias
-  const newJsonQuery = cloneDeep(omit(jsonQuery, ['__alias', '__headers']))
+  const newJsonQuery = cloneDeep(omit(jsonQuery, ['__alias', '__headers', '__url']))
 
   extractVariables({
     jsonQuery: { [queryName]: newJsonQuery },