@avantstay/graphql-ts-client 10.7.0 → 10.9.0

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 },
@@ -31,14 +31,17 @@ export function jsonToGraphQLQuery({
     parentType: kind === 'query' ? typesTree.Query : typesTree.Mutation,
   })
 
-  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 }
-    })
+  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>)
+      return variablesObj
+    },
+    {} as Record<string, Variable>
+  )
 
   const variablesQuery = Object.keys(variableItems).length
     ? `(${entries(variableItems)

package/src/types.ts

@@ -21,30 +21,34 @@ export type IResponseListener = (info: ResponseListenerInfo) => void | Promise<v
 
 type ArrayElement<ArrayType extends readonly unknown[]> = ArrayType extends readonly (infer ElementType)[] ? ElementType : never
 
-export type Projection<Selection, Base, E = never> = Base extends Array<any>
-  ? ArrayElement<Base> extends Date | string | number | boolean | null | undefined | E
-    ? ArrayElement<Base>[]
-    : Projection<Defined<Selection>, ArrayElement<Base>, E>[]
-  : Base extends Date | string | number | boolean | null | E
-  ? // Is primitive and extends undefined
-    Selection extends undefined
-    ? Base | undefined
-    : Base
-  : {
-      [k in keyof Selection & keyof Base]: Selection[k] extends boolean
-        ? Base[k]
-        : Base[k] extends Array<infer A>
-        ? Projection<Defined<Selection[k]>, A, E>[]
-        : Projection<Defined<Selection[k]>, Base[k], E>
-    }
+type Primitive = Date | string | number | boolean | null | undefined
+
+// Projection is the resulting type of Selection (type generated out of a query) applied to Base (generated graphql type)
+export type Projection<Selection, Base, E = never> =
+  Base extends Array<any>
+    ? ArrayElement<Base> extends Primitive | E
+      ? ArrayElement<Base>[]
+      : Projection<Defined<Selection>, ArrayElement<Base>, E>[]
+    : Base extends Primitive | E
+      ? // Is primitive and extends undefined
+        Selection extends undefined
+        ? Base | undefined
+        : Base
+      : {
+          [k in keyof Selection & keyof Base]: Selection[k] extends boolean
+            ? Base[k]
+            : Base[k] extends Array<infer A>
+              ? Projection<Defined<Selection[k]>, A, E>[]
+              : Projection<Defined<Selection[k]>, Base[k], E>
+        }
 
 export type Unpacked<T> = T extends (infer U)[]
   ? U
   : T extends (...args: any[]) => infer U
-  ? U
-  : T extends Promise<infer U>
-  ? U
-  : T
+    ? U
+    : T extends Promise<infer U>
+      ? U
+      : T
 
 export type Replacement<M extends [any, any], T> = M extends any ? ([T] extends [M[0]] ? M[1] : never) : never
 
@@ -56,8 +60,8 @@ export type DeepReplace<T, Ignore, M extends [any, any]> = {
         : T[P]
       : Replacement<M, T[P]>
     : T[P] extends object
-    ? DeepReplace<T[P], Ignore, M>
-    : T[P]
+      ? DeepReplace<T[P], Ignore, M>
+      : T[P]
 }
 
 export type RawEndpoint<I, O, E> = <S extends I>(
@@ -95,6 +99,12 @@ export type LogInfo = {
   duration: number
 }
 
+export type TypescriptClientOutput = {
+  js: string
+  mjs: string
+  typings: string
+}
+
 export class GraphQLClientError extends Error {
   responseData: ResponseData