fix: subscriptionField overload for builder api access

src/definitions/queryField.ts

@@ -19,6 +19,7 @@ export function queryField(...args: any[]) {
       if (typeof args[0] === 'function') {
         return args[0](t)
       }
+
       const [fieldName, config] = args as [string, QueryFieldConfig<any>]
       const finalConfig = typeof config === 'function' ? config() : config
       t.field(fieldName, finalConfig)

src/definitions/subscriptionField.ts

@@ -1,16 +1,31 @@
-import { extendType } from './extendType'
-import { SubscriptionTypeConfig } from './subscriptionType'
+import { extendType, NexusExtendTypeDef } from './extendType'
+import { SubscriptionBuilder, SubscriptionTypeConfig } from './subscriptionType'
+
+export type SubscriptionFieldConfig<FieldName extends string, Event> =
+  | SubscriptionTypeConfig<FieldName, Event>
+  | (() => SubscriptionTypeConfig<FieldName, Event>)
+
+export function subscriptionField(
+  fieldFn: (t: SubscriptionBuilder) => void
+): NexusExtendTypeDef<'Subscription'>
+
+export function subscriptionField<FieldName extends string, Event>(
+  fieldName: FieldName,
+  config: SubscriptionFieldConfig<FieldName, Event>
+): NexusExtendTypeDef<'Subscription'>
 
 /**
  * Add one field to the Subscription type
  */
-export function subscriptionField<FieldName extends string, Event>(
-  fieldName: FieldName,
-  config: SubscriptionTypeConfig<FieldName, Event> | (() => SubscriptionTypeConfig<FieldName, Event>)
-) {
+export function subscriptionField(...args: any[]) {
   return extendType({
     type: 'Subscription',
     definition(t) {
+      if (typeof args[0] === 'function') {
+        return args[0](t)
+      }
+
+      const [fieldName, config] = args as [string, SubscriptionFieldConfig<any, any>]
       const finalConfig = typeof config === 'function' ? config() : config
       t.field(fieldName, finalConfig as any)
     },

tests/__helpers/testApp.ts

@@ -11,11 +11,12 @@ type HookSettings = {
 }
 
 export async function generateTypegen(settings: HookSettings) {
-  const rootDir = settings.rootDir
+  const projectDir = settings.rootDir
 
-  const typegenModulePath = join(rootDir, '__typegen.ts')
-  const entrypointModulePath = join(rootDir, '__app.ts')
-  const importPath = relative(rootDir, join(__dirname, '..', '..', 'src')).replace(/\\/g, '/')
+  const typegenModulePath = join(projectDir, '__typegen.ts')
+  const sdlFilePath = join(projectDir, '__schema.graphql')
+  const entrypointModulePath = join(projectDir, '__app.ts')
+  const importPath = relative(projectDir, join(__dirname, '..', '..', 'src')).replace(/\\/g, '/')
 
   const entrypoint = require(entrypointModulePath)
   const { plugins, ...types } = entrypoint
@@ -24,7 +25,7 @@ export async function generateTypegen(settings: HookSettings) {
     types: types,
     outputs: {
       typegen: typegenModulePath,
-      schema: false,
+      schema: sdlFilePath,
     },
     shouldGenerateArtifacts: true,
     plugins: plugins || [],

tests/integrations/abstractTypes/allStrategiesOptionalWhenTypeNameEnabled/__schema.graphql

@@ -0,0 +1,16 @@
+### This file was generated by Nexus Schema
+### Do not make changes to this file directly
+
+type A {
+  name: String
+}
+
+type B {
+  age: Int
+}
+
+type Query {
+  union: Union
+}
+
+union Union = A | B

tests/integrations/abstractTypes/isTypeOfsImplemented/__schema.graphql

@@ -0,0 +1,16 @@
+### This file was generated by Nexus Schema
+### Do not make changes to this file directly
+
+type A {
+  name: String
+}
+
+type B {
+  age: Int
+}
+
+type Query {
+  union: Union
+}
+
+union Union = A | B

tests/integrations/abstractTypes/missingIsTypeOf/__schema.graphql

@@ -0,0 +1,16 @@
+### This file was generated by Nexus Schema
+### Do not make changes to this file directly
+
+type A {
+  name: String
+}
+
+type B {
+  age: Int
+}
+
+type Query {
+  union: Union
+}
+
+union Union = A | B

tests/integrations/abstractTypes/missingResolveType/__schema.graphql

@@ -0,0 +1,16 @@
+### This file was generated by Nexus Schema
+### Do not make changes to this file directly
+
+type A {
+  name: String
+}
+
+type B {
+  age: Int
+}
+
+type Query {
+  union: Union
+}
+
+union Union = A | B

tests/integrations/abstractTypes/missingResolveTypeOrIsTypeOf/__schema.graphql

@@ -0,0 +1,14 @@
+### This file was generated by Nexus Schema
+### Do not make changes to this file directly
+
+type A {
+  name: String
+}
+
+type Query {
+  ok: Boolean!
+}
+
+union U1 = A
+
+union U2 = A

tests/integrations/abstractTypes/missingTypenameDiscriminant/__schema.graphql

@@ -0,0 +1,16 @@
+### This file was generated by Nexus Schema
+### Do not make changes to this file directly
+
+type A {
+  name: String
+}
+
+type B {
+  age: Int
+}
+
+type Query {
+  union: Union
+}
+
+union Union = A | B

tests/integrations/abstractTypes/resolveTypeImplemented/__schema.graphql

@@ -0,0 +1,16 @@
+### This file was generated by Nexus Schema
+### Do not make changes to this file directly
+
+type A {
+  name: String
+}
+
+type B {
+  age: Int
+}
+
+type Query {
+  union: Union
+}
+
+union Union = A | B

tests/integrations/declarativeWrappingPlugin/__schema.graphql

@@ -0,0 +1,17 @@
+### This file was generated by Nexus Schema
+### Do not make changes to this file directly
+
+type DeclarativeWrappingOutput {
+  someList: [String]
+  someListOfLists(int: Int!): [[String!]!]
+  someNullField(input: InlineInputType): String
+  someRequiredField: String!
+}
+
+input InlineInputType {
+  abc: Int!
+}
+
+type Query {
+  someField: DeclarativeWrappingOutput!
+}

tests/integrations/kitchenSink/__app.ts

@@ -13,6 +13,7 @@ import {
   queryType,
   scalarType,
   stringArg,
+  subscriptionField,
   subscriptionType,
 } from '../../../src'
 import { mockStream } from '../../__helpers'
@@ -154,7 +155,7 @@ export const Mutation = mutationType({
 export const Subscription2 = extendType({
   type: 'Subscription',
   definition(t) {
-    t.boolean('someBooleanFromExtend', {
+    t.boolean('someBooleanFromExtendType', {
       subscribe() {
         return mockStream(10, true, (b) => b)
       },
@@ -165,6 +166,17 @@ export const Subscription2 = extendType({
   },
 })
 
+export const Subscription3 = subscriptionField((t) => {
+  t.boolean('someBooleanFromSubscriptionField', {
+    subscribe() {
+      return mockStream(10, true, (b) => b)
+    },
+    resolve: (event: boolean) => {
+      return event
+    },
+  })
+})
+
 export const Subscription = subscriptionType({
   definition(t) {
     // lists

tests/integrations/kitchenSink/__schema.graphql

@@ -0,0 +1,129 @@
+### This file was generated by Nexus Schema
+### Do not make changes to this file directly
+
+interface I {
+  hello: String
+}
+
+type Mutation {
+  createUser(firstName: String, lastName: String): User
+}
+
+"""
+No-Op scalar for testing purposes only
+"""
+scalar MyCustomScalar
+
+type OfI implements I {
+  hello: String
+}
+
+type OfI2 implements I {
+  hello: String
+}
+
+"""
+PageInfo cursor, as defined in https://facebook.github.io/relay/graphql/connections.htm#sec-undefined.PageInfo
+"""
+type PageInfo {
+  """
+  The cursor corresponding to the last nodes in edges. Null if the connection is empty.
+  """
+  endCursor: String
+
+  """
+  Used to indicate whether more edges exist following the set defined by the clients arguments.
+  """
+  hasNextPage: Boolean!
+
+  """
+  Used to indicate whether more edges exist prior to the set defined by the clients arguments.
+  """
+  hasPreviousPage: Boolean!
+
+  """
+  The cursor corresponding to the first nodes in edges. Null if the connection is empty.
+  """
+  startCursor: String
+}
+
+type Post {
+  body: String
+  title: String
+}
+
+type PostConnection {
+  """
+  https://facebook.github.io/relay/graphql/connections.htm#sec-Edge-Types
+  """
+  edges: [PostEdge]
+
+  """
+  https://facebook.github.io/relay/graphql/connections.htm#sec-undefined.PageInfo
+  """
+  pageInfo: PageInfo!
+}
+
+type PostEdge {
+  """
+  https://facebook.github.io/relay/graphql/connections.htm#sec-Cursor
+  """
+  cursor: String!
+  delta: Int
+
+  """
+  https://facebook.github.io/relay/graphql/connections.htm#sec-Node
+  """
+  node: Post
+}
+
+input PostSearchInput {
+  body: String
+  title: String
+}
+
+type Query {
+  customScalar: MyCustomScalar
+  foo: String
+  searchPosts(input: PostSearchInput): [Post]
+  user(id: ID): User
+}
+
+type Subscription {
+  someBoolean: Boolean
+  someBooleanFromExtendType: Boolean
+  someBooleanFromSubscriptionField: Boolean
+  someField: Int
+  someFields: [Int]
+  someFloat: Float
+  someID: ID
+  someInt: Int
+  someInts: [Int]
+  someString: String
+}
+
+type User {
+  firstName: String
+  lastName: String
+  posts(
+    """
+    Returns the elements in the list that come after the specified cursor
+    """
+    after: String
+
+    """
+    Returns the elements in the list that come before the specified cursor
+    """
+    before: String
+
+    """
+    Returns the first n elements from the list.
+    """
+    first: Int
+
+    """
+    Returns the last n elements from the list.
+    """
+    last: Int
+  ): PostConnection
+}

tests/integrations/kitchenSink/__typegen.ts

@@ -167,7 +167,8 @@ export interface NexusGenFieldTypes {
   Subscription: {
     // field return type
     someBoolean: boolean | null // Boolean
-    someBooleanFromExtend: boolean | null // Boolean
+    someBooleanFromExtendType: boolean | null // Boolean
+    someBooleanFromSubscriptionField: boolean | null // Boolean
     someField: number | null // Int
     someFields: Array<number | null> | null // [Int]
     someFloat: number | null // Float
@@ -234,7 +235,8 @@ export interface NexusGenFieldTypeNames {
   Subscription: {
     // field return type name
     someBoolean: 'Boolean'
-    someBooleanFromExtend: 'Boolean'
+    someBooleanFromExtendType: 'Boolean'
+    someBooleanFromSubscriptionField: 'Boolean'
     someField: 'Int'
     someFields: 'Int'
     someFloat: 'Float'