@avantstay/graphql-ts-client 10.6.0 → 10.7.0

package/dist/endpoint.js

@@ -610,12 +610,22 @@ function jsonToGraphQLQuery(param) {
         variables: variablesData,
         parentType: kind === "query" ? typesTree.Query : typesTree.Mutation
     });
-    var variablesQuery = Object.keys(variablesData).length ? "(".concat(entries(variablesData).map(function(param) {
+    var variableItems = Object.values(variablesData).reduce(function(variablesObj, variables2) {
+        variables2.forEach(function(variable, index) {
+            var name = variable.update(variables2.length > 1 ? index : void 0);
+            variablesObj[name] = {
+                type: variable.type,
+                value: variable.value
+            };
+        });
+        return variablesObj;
+    }, {});
+    var variablesQuery = Object.keys(variableItems).length ? "(".concat(entries(variableItems).map(function(param) {
         var _param = _slicedToArray(param, 2), queryName2 = _param[0], type = _param[1].type;
         return "$".concat(queryName2, ": ").concat(type);
     }).join(", "), ")") : "";
     var query = "".concat(kind, " ").concat(alias || queryName).concat(variablesQuery, " { ").concat(alias ? "".concat(alias, ":") : "").concat(queryName).concat(toGraphql(newJsonQuery), " }");
-    var variables = fromEntries(entries(variablesData).map(function(param) {
+    var variables = fromEntries(entries(variableItems).map(function(param) {
         var _param = _slicedToArray(param, 2), k = _param[0], v = _param[1];
         return [
             k,
@@ -633,14 +643,22 @@ function extractVariables(param) {
     if (jsonQuery.__args) {
         Object.keys(jsonQuery.__args).forEach(function(k) {
             if (typeof jsonQuery.__args[k] === "string" && jsonQuery.__args[k].startsWith(VAR_PREFIX)) return;
-            var variableName = "".concat(k, "_").concat(Math.random().toString(36).substr(2, 4));
-            if (jsonQuery.__args[k] !== void 0) {
-                variables[variableName] = {
-                    type: parentType.__args[k],
-                    value: jsonQuery.__args[k]
-                };
-                jsonQuery.__args[k] = "".concat(VAR_PREFIX, "$").concat(variableName);
+            if (jsonQuery.__args[k] === void 0) return;
+            var variableName = k;
+            if (!variables[variableName]) {
+                variables[variableName] = [];
             }
+            variables[variableName].push({
+                name: variableName,
+                type: parentType.__args[k],
+                value: jsonQuery.__args[k],
+                update: function(index) {
+                    var name = "".concat(variableName).concat(index !== void 0 ? "_".concat(index) : "");
+                    jsonQuery.__args[k] = "".concat(VAR_PREFIX, "$").concat(name);
+                    return name;
+                }
+            });
+            jsonQuery.__args[k] = VAR_PREFIX;
         });
     }
     Object.keys(jsonQuery).filter(function(k) {

package/dist/index.js

@@ -487,7 +487,7 @@ var prettier = __toESM(require("prettier"));
 // package.json
 var package_default = {
     name: "@avantstay/graphql-ts-client",
-    version: "10.6.0",
+    version: "10.7.0",
     description: "GraphQL Typescript Client Generator",
     author: "Wellington Guimaraes",
     license: "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avantstay/graphql-ts-client",
-  "version": "10.6.0",
+  "version": "10.7.0",
   "description": "GraphQL Typescript Client Generator",
   "author": "Wellington Guimaraes",
   "license": "MIT",
@@ -8,8 +8,8 @@
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "tsup src/index.ts src/endpoint.ts --dts",
-    "test": "cross-env GQL_CLIENT_DIST_PATH='.' jest --watch"
-
+    "test": "cross-env GQL_CLIENT_DIST_PATH='.' jest --watch",
+    "prepublishOnly": "yarn build"
   },
   "files": [
     "dist",

package/src/jsonToGraphQLQuery.test.ts

@@ -38,8 +38,14 @@ describe('jsonToGraphQLQuery', () => {
       __args: {
         foo: 'Bar',
       },
-
       something: true,
+      another: {
+        __args: {
+          foo: 'Lorem ipsum',
+          bar: 'Dolor sit amet',
+        },
+        zeta: true,
+      },
     }
 
     const response = jsonToGraphQLQuery({
@@ -53,14 +59,24 @@ describe('jsonToGraphQLQuery', () => {
               __args: {
                 foo: 'UUID!',
               },
+              something: 'Boolean!',
+              another: {
+                __args: {
+                  foo: 'String!',
+                  bar: 'String!',
+                },
+                zeta: 'Int!',
+              },
             }
           },
         },
       },
     })
 
-    Object.keys(response.variables).forEach(varName => {
-      expect(response.query.split(varName).length - 1).toBeGreaterThanOrEqual(2) //every variable name should be present at least 2 times
+    expect(response.variables).toEqual({
+      foo_0: 'Bar',
+      foo_1: 'Lorem ipsum',
+      bar: 'Dolor sit amet',
     })
   })
 })

package/src/jsonToGraphQLQuery.ts

@@ -7,6 +7,9 @@ const fromEntries: (arr: [string, any][]) => { [key: string]: any } = require('l
 const entries: (obj: { [key: string]: any }) => [string, any][] = require('lodash/toPairs')
 const cloneDeep = require('lodash/cloneDeep')
 
+type ExtractedVariables = Record<string, (Variable & { name: string; update: (index?: number) => string })[]>
+type Variable = { type: any; value: any }
+
 export function jsonToGraphQLQuery({
   kind,
   queryName,
@@ -18,7 +21,7 @@ export function jsonToGraphQLQuery({
   jsonQuery: any
   typesTree: any
 }) {
-  const variablesData = {} as any
+  const variablesData = {} as ExtractedVariables
   const alias = jsonQuery.__alias
   const newJsonQuery = cloneDeep(omit(jsonQuery, ['__alias', '__headers']))
 
@@ -28,8 +31,17 @@ export function jsonToGraphQLQuery({
     parentType: kind === 'query' ? typesTree.Query : typesTree.Mutation,
   })
 
-  const variablesQuery = Object.keys(variablesData).length
-    ? `(${entries(variablesData)
+  const variableItems = Object.values(variablesData).reduce((variablesObj, variables) => {
+    variables.forEach((variable, index) => {
+      const name = variable.update(variables.length > 1 ? index : undefined)
+      variablesObj[name] = { type: variable.type, value: variable.value }
+    })
+
+    return variablesObj
+  }, {} as Record<string, Variable>)
+
+  const variablesQuery = Object.keys(variableItems).length
+    ? `(${entries(variableItems)
         .map(([queryName, { type }]: any) => `$${queryName}: ${type}`)
         .join(', ')})`
     : ''
@@ -37,7 +49,7 @@ export function jsonToGraphQLQuery({
   const query = `${kind} ${alias || queryName}${variablesQuery} { ${alias ? `${alias}:` : ''}${queryName}${toGraphql(
     newJsonQuery
   )} }`
-  const variables = fromEntries(entries(variablesData).map(([k, v]: any) => [k, v.value]))
+  const variables = fromEntries(entries(variableItems).map(([k, v]: any) => [k, v.value]))
 
   return {
     query,
@@ -45,22 +57,41 @@ export function jsonToGraphQLQuery({
   }
 }
 
-function extractVariables({ jsonQuery, variables, parentType }: { jsonQuery: any; variables: any; parentType: any }) {
+function extractVariables({
+  jsonQuery,
+  variables,
+  parentType,
+}: {
+  jsonQuery: any
+  variables: ExtractedVariables
+  parentType: any
+}) {
   if (!parentType) return
 
   if (jsonQuery.__args) {
     Object.keys(jsonQuery.__args).forEach(k => {
       if (typeof jsonQuery.__args[k] === 'string' && jsonQuery.__args[k].startsWith(VAR_PREFIX)) return
+      if (jsonQuery.__args[k] === undefined) return
 
-      const variableName = `${k}_${Math.random().toString(36).substr(2, 4)}`
+      const variableName = k
 
-      if (jsonQuery.__args[k] !== undefined) {
-        variables[variableName] = {
-          type: parentType.__args[k],
-          value: jsonQuery.__args[k],
-        }
-        jsonQuery.__args[k] = `${VAR_PREFIX}$${variableName}`
+      if (!variables[variableName]) {
+        variables[variableName] = []
       }
+
+      variables[variableName].push({
+        name: variableName,
+        type: parentType.__args[k],
+        value: jsonQuery.__args[k],
+        update: (index?: number) => {
+          const name = `${variableName}${index !== undefined ? `_${index}` : ''}`
+          jsonQuery.__args[k] = `${VAR_PREFIX}$${name}`
+
+          return name
+        },
+      })
+
+      jsonQuery.__args[k] = VAR_PREFIX
     })
   }
 

package/src/__testClient.d.ts

@@ -1,148 +0,0 @@
-// noinspection TypeScriptUnresolvedVariable, ES6UnusedImports, JSUnusedLocalSymbols, TypeScriptCheckImport
-import { DeepRequired } from "ts-essentials"
-import { Maybe, IResponseListener, Endpoint } from "../dist"
-
-// Scalars
-export type IDate = string | Date
-export declare type ISODate = IDate
-
-// Enums
-
-export declare enum BookType {
-  dolor = "DOLOR",
-  ipsum = "IPSUM",
-  sit = "SIT",
-}
-
-type AllEnums = BookType
-
-// Args
-export interface BooksWithoutParamsArgs {}
-export interface BooksWithOptionalParamsArgs {
-  params?: BookSearchParamsAllOptional
-}
-export interface BooksWithRequiredParamsArgs {
-  params: BookSearchParamsSomeRequired
-}
-export interface FailingQueryArgs {
-  id: string
-}
-
-// Input/Output Types
-
-/**
- * @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
-}
-
-/**
- * @deprecated Avoid directly using this interface. Instead, create a type alias based on the query/mutation return type.
- */
-
-export interface BookSearchParamsAllOptional {
-  title?: string
-  author?: string
-  createdAfter?: ISODate
-}
-
-/**
- * @deprecated Avoid directly using this interface. Instead, create a type alias based on the query/mutation return type.
- */
-
-export interface BookSearchParamsSomeRequired {
-  title: string
-  author?: string
-}
-
-/**
- * @deprecated Avoid directly using this interface. Instead, create a type alias based on the query/mutation return type.
- */
-
-export interface Query {
-  booksWithoutParams?: Book[]
-  booksWithOptionalParams?: Book[]
-  booksWithRequiredParams?: Book[]
-  failingQuery?: string
-}
-
-// Selection Types
-
-export interface BookSelection {
-  title?: boolean
-  author?: boolean
-  type?: boolean
-  dateCreated?: boolean
-}
-
-export interface BookSearchParamsAllOptionalSelection {
-  title?: boolean
-  author?: boolean
-  createdAfter?: boolean
-}
-
-export interface BookSearchParamsSomeRequiredSelection {
-  title?: boolean
-  author?: boolean
-}
-
-export declare const myApiClient: {
-  addResponseListener: (listener: IResponseListener) => void
-  setHeader: (key: string, value: string) => void
-  setHeaders: (newHeaders: { [k: string]: string }) => void
-  setUrl: (url: string) => void
-  setRetryConfig: (options: {
-    max: number
-    waitBeforeRetry?: number
-    before?: IResponseListener
-  }) => void
-  queries: {
-    booksWithoutParams: Endpoint<
-      {
-        __headers?: { [key: string]: string }
-        __retry?: boolean
-        __alias?: string
-      } & BookSelection,
-      DeepRequired<Book[]>,
-      AllEnums
-    >
-    booksWithOptionalParams: Endpoint<
-      {
-        __headers?: { [key: string]: string }
-        __retry?: boolean
-        __alias?: string
-        __args?: BooksWithOptionalParamsArgs
-      } & BookSelection,
-      DeepRequired<Book[]>,
-      AllEnums
-    >
-    booksWithRequiredParams: Endpoint<
-      {
-        __headers?: { [key: string]: string }
-        __retry?: boolean
-        __alias?: string
-        __args: BooksWithRequiredParamsArgs
-      } & BookSelection,
-      DeepRequired<Book[]>,
-      AllEnums
-    >
-    failingQuery: Endpoint<
-      {
-        __headers?: { [key: string]: string }
-        __retry?: boolean
-        __alias?: string
-        __args: FailingQueryArgs
-      },
-      string,
-      AllEnums
-    >
-  }
-  mutations: {}
-}
-
-export default myApiClient

package/src/__testClient.js

@@ -1,110 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __export = (target, all) => {
-  __markAsModule(target);
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __reExport = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, { get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable });
-  }
-  return target;
-};
-var __toModule = (module2) => {
-  return __reExport(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? { get: () => module2.default, enumerable: true } : { value: module2, enumerable: true })), module2);
-};
-__export(exports, {
-  BookType: () => BookType,
-  default: () => stdin_default,
-  myApiClient: () => myApiClient
-});
-var import_endpoint = __toModule(require("../dist/endpoint"));
-var import_standalone = __toModule(require("prettier/standalone"));
-var import_parser_graphql = __toModule(require("prettier/parser-graphql"));
-const formatGraphQL = (query) => (0, import_standalone.format)(query, { parser: "graphql", plugins: [import_parser_graphql.default] });
-const BookType = {
-  dolor: "DOLOR",
-  ipsum: "IPSUM",
-  sit: "SIT"
-};
-const typesTree = {
-  Query: {
-    get booksWithOptionalParams() {
-      return {
-        __args: {
-          params: "BookSearchParamsAllOptional!"
-        }
-      };
-    },
-    get booksWithRequiredParams() {
-      return {
-        __args: {
-          params: "BookSearchParamsSomeRequired!"
-        }
-      };
-    },
-    get failingQuery() {
-      return {
-        __args: {
-          id: "String!"
-        }
-      };
-    },
-    booksWithoutParams: {}
-  }
-};
-let verbose = false;
-let headers = {};
-let url = "http://localhost:4123/graphql";
-let retryConfig = {
-  max: 0,
-  before: void 0,
-  waitBeforeRetry: 0
-};
-let responseListeners = [];
-let errorsParser = void 0;
-let apiEndpoint = (0, import_endpoint.getApiEndpointCreator)({
-  getClient: () => ({ url, headers, retryConfig }),
-  responseListeners,
-  maxAge: 3e4,
-  verbose,
-  typesTree,
-  formatGraphQL,
-  errorsParser
-});
-const myApiClient = {
-  addResponseListener: (listener) => responseListeners.push(listener),
-  setHeader: (key, value) => {
-    headers[key] = value;
-  },
-  setHeaders: (newHeaders) => {
-    headers = newHeaders;
-  },
-  setRetryConfig: (options) => {
-    if (!Number.isInteger(options.max) || options.max < 0) {
-      throw new Error("retryOptions.max should be a non-negative integer");
-    }
-    retryConfig = {
-      max: options.max,
-      waitBeforeRetry: options.waitBeforeRetry,
-      before: options.before
-    };
-  },
-  setUrl: (_url) => url = _url,
-  queries: {
-    booksWithoutParams: apiEndpoint("query", "booksWithoutParams"),
-    booksWithOptionalParams: apiEndpoint("query", "booksWithOptionalParams"),
-    booksWithRequiredParams: apiEndpoint("query", "booksWithRequiredParams"),
-    failingQuery: apiEndpoint("query", "failingQuery")
-  },
-  mutations: {}
-};
-var stdin_default = myApiClient;