chore: properly working generated types within tests (#6288)

packages/payload/src/bin/generateTypes.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-floating-promises */
 import fs from 'fs'
 import { compile } from 'json-schema-to-typescript'
 
@@ -7,7 +6,7 @@ import type { SanitizedConfig } from '../config/types.js'
 import { configToJSONSchema } from '../utilities/configToJSONSchema.js'
 import Logger from '../utilities/logger.js'
 
-export function generateTypes(config: SanitizedConfig): void {
+export async function generateTypes(config: SanitizedConfig): Promise<void> {
   const logger = Logger()
   const outputFile = process.env.PAYLOAD_TS_OUTPUT_PATH || config.typescript.outputFile
 
@@ -16,8 +15,9 @@ export function generateTypes(config: SanitizedConfig): void {
   const jsonSchema = configToJSONSchema(config, config.db.defaultIDType)
 
   const declare = `declare module 'payload' {\n  export interface GeneratedTypes extends Config {}\n}`
+  const declareWithTSIgnoreError = `declare module 'payload' {\n // @ts-ignore \n export interface GeneratedTypes extends Config {}\n}`
 
-  compile(jsonSchema, 'Config', {
+  let compiled = await compile(jsonSchema, 'Config', {
     bannerComment:
       '/* tslint:disable */\n/* eslint-disable */\n/**\n* This file was automatically generated by Payload.\n* DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,\n* and re-run `payload generate:types` to regenerate this file.\n*/',
     style: {
@@ -27,11 +27,15 @@ export function generateTypes(config: SanitizedConfig): void {
     // If a field defines an interfaceName, it should be included in the generated types
     // even if it's not used by another type. Reason: the user might want to use it in their own code.
     unreachableDefinitions: true,
-  }).then((compiled) => {
+  })
-    if (config.typescript.declare !== false) {
+
+  if (config.typescript.declare !== false) {
+    if (config.typescript.declare?.ignoreTSError) {
+      compiled += `\n\n${declareWithTSIgnoreError}`
+    } else {
       compiled += `\n\n${declare}`
     }
-    fs.writeFileSync(outputFile, compiled)
+  }
-    logger.info(`Types written to ${outputFile}`)
+  fs.writeFileSync(outputFile, compiled)
-  })
+  logger.info(`Types written to ${outputFile}`)
 }

packages/payload/src/config/schema.ts

@@ -178,7 +178,7 @@ export default joi.object({
   sharp: joi.any(),
   telemetry: joi.boolean(),
   typescript: joi.object({
-    declare: joi.boolean(),
+    declare: joi.alternatives().try(joi.boolean(), joi.object({ ignoreTSError: joi.boolean() })),
     outputFile: joi.string(),
   }),
   upload: joi.object(),

packages/payload/src/config/types.ts

@@ -629,7 +629,18 @@ export type Config = {
   /** Control how typescript interfaces are generated from your collections. */
   typescript?: {
     /** Disable declare block in generated types file */
-    declare?: false
+    declare?:
+      | {
+          /**
+           * @internal internal use only to allow for multiple declarations within a monorepo and suppress the "Duplicate identifier GeneratedTypes" error
+           *
+           * Adds a @ts-ignore flag above the GeneratedTypes interface declaration
+           *
+           * @default false
+           */
+          ignoreTSError?: boolean
+        }
+      | false
     /** Filename to write the generated types to */
     outputFile?: string
   }

test/_community/payload-types.ts

@@ -1,4 +1,5 @@
 /* tslint:disable */
+/* eslint-disable */
 /**
  * This file was automatically generated by Payload.
  * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
@@ -7,44 +8,124 @@
 
 export interface Config {
   collections: {
-    posts: Post
+    posts: Post;
-    media: Media
+    users: User;
-    users: User
+    'payload-preferences': PayloadPreference;
-  }
+    'payload-migrations': PayloadMigration;
+  };
   globals: {
-    menu: Menu
+    menu: Menu;
-  }
+  };
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "posts".
+ */
 export interface Post {
-  id: string
+  id: string;
-  text?: string
+  text?: string | null;
-  associatedMedia?: string | Media
+  richText?: {
-  updatedAt: string
+    root: {
-  createdAt: string
+      type: string;
-}
+      children: {
-export interface Media {
+        type: string;
-  id: string
+        version: number;
-  updatedAt: string
+        [k: string]: unknown;
-  createdAt: string
+      }[];
-  url?: string
+      direction: ('ltr' | 'rtl') | null;
-  filename?: string
+      format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | '';
-  mimeType?: string
+      indent: number;
-  filesize?: number
+      version: number;
-  width?: number
+    };
-  height?: number
+    [k: string]: unknown;
+  } | null;
+  richText2?: {
+    root: {
+      type: string;
+      children: {
+        type: string;
+        version: number;
+        [k: string]: unknown;
+      }[];
+      direction: ('ltr' | 'rtl') | null;
+      format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | '';
+      indent: number;
+      version: number;
+    };
+    [k: string]: unknown;
+  } | null;
+  updatedAt: string;
+  createdAt: string;
+  _status?: ('draft' | 'published') | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email?: string
+  email: string;
-  resetPasswordToken?: string
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string
+  resetPasswordExpiration?: string | null;
-  loginAttempts?: number
+  salt?: string | null;
-  lockUntil?: string
+  hash?: string | null;
-  password?: string
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "menu".
+ */
 export interface Menu {
-  id: string
+  id: string;
-  globalText?: string
+  globalText?: string | null;
+  updatedAt?: string | null;
+  createdAt?: string | null;
 }
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/_community/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/access-control/payload-types.ts

@@ -8,154 +8,292 @@
 
 export interface Config {
   collections: {
-    users: User
+    users: User;
-    posts: Post
+    'non-admin-user': NonAdminUser;
-    unrestricted: Unrestricted
+    posts: Post;
-    restricted: Restricted
+    unrestricted: Unrestricted;
-    'read-only-collection': ReadOnlyCollection
+    restricted: Restricted;
-    'user-restricted': UserRestricted
+    'read-only-collection': ReadOnlyCollection;
-    'restricted-versions': RestrictedVersion
+    'user-restricted': UserRestricted;
-    'sibling-data': SiblingDatum
+    'restricted-versions': RestrictedVersion;
-    'rely-on-request-headers': RelyOnRequestHeader
+    'sibling-data': SiblingDatum;
-    'doc-level-access': DocLevelAccess
+    'rely-on-request-headers': RelyOnRequestHeader;
-    'hidden-fields': HiddenField
+    'doc-level-access': DocLevelAccess;
-    'hidden-access': HiddenAccess
+    'hidden-fields': HiddenField;
-    'payload-preferences': PayloadPreference
+    'hidden-access': HiddenAccess;
-    'payload-migrations': PayloadMigration
+    'hidden-access-count': HiddenAccessCount;
-  }
+    'payload-preferences': PayloadPreference;
-  globals: {}
+    'payload-migrations': PayloadMigration;
+  };
+  globals: {
+    settings: Setting;
+    test: Test;
+    'read-only-global': ReadOnlyGlobal;
+  };
+  locale: null;
+  user:
+    | (User & {
+        collection: 'users';
+      })
+    | (NonAdminUser & {
+        collection: 'non-admin-user';
+      });
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
-  id: string
+  id: string;
-  roles?: ('admin' | 'user')[] | null
+  roles?: ('admin' | 'user')[] | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email: string
+  email: string;
-  resetPasswordToken?: string | null
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string | null
+  resetPasswordExpiration?: string | null;
-  salt?: string | null
+  salt?: string | null;
-  hash?: string | null
+  hash?: string | null;
-  loginAttempts?: number | null
+  loginAttempts?: number | null;
-  lockUntil?: string | null
+  lockUntil?: string | null;
-  password: string | null
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "non-admin-user".
+ */
+export interface NonAdminUser {
+  id: string;
+  updatedAt: string;
+  createdAt: string;
+  email: string;
+  resetPasswordToken?: string | null;
+  resetPasswordExpiration?: string | null;
+  salt?: string | null;
+  hash?: string | null;
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "posts".
+ */
 export interface Post {
-  id: string
+  id: string;
-  restrictedField?: string | null
+  restrictedField?: string | null;
   group?: {
-    restrictedGroupText?: string | null
+    restrictedGroupText?: string | null;
-  }
+  };
-  restrictedRowText?: string | null
+  restrictedRowText?: string | null;
-  restrictedCollapsibleText?: string | null
+  restrictedCollapsibleText?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "unrestricted".
+ */
 export interface Unrestricted {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  userRestrictedDocs?: (string | UserRestricted)[] | null
+  userRestrictedDocs?: (string | UserRestricted)[] | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "user-restricted".
+ */
 export interface UserRestricted {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "restricted".
+ */
 export interface Restricted {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "read-only-collection".
+ */
 export interface ReadOnlyCollection {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "restricted-versions".
+ */
 export interface RestrictedVersion {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  hidden?: boolean | null
+  hidden?: boolean | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "sibling-data".
+ */
 export interface SiblingDatum {
-  id: string
+  id: string;
   array?:
     | {
-        allowPublicReadability?: boolean | null
+        allowPublicReadability?: boolean | null;
-        text?: string | null
+        text?: string | null;
-        id?: string | null
+        id?: string | null;
       }[]
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "rely-on-request-headers".
+ */
 export interface RelyOnRequestHeader {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "doc-level-access".
+ */
 export interface DocLevelAccess {
-  id: string
+  id: string;
-  approvedForRemoval?: boolean | null
+  approvedForRemoval?: boolean | null;
-  approvedTitle?: string | null
+  approvedTitle?: string | null;
-  lockTitle?: boolean | null
+  lockTitle?: boolean | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "hidden-fields".
+ */
 export interface HiddenField {
-  id: string
+  id: string;
-  title?: string | null
+  title?: string | null;
   partiallyHiddenGroup?: {
-    name?: string | null
+    name?: string | null;
-    value?: string | null
+    value?: string | null;
-  }
+  };
   partiallyHiddenArray?:
     | {
-        name?: string | null
+        name?: string | null;
-        value?: string | null
+        value?: string | null;
-        id?: string | null
+        id?: string | null;
       }[]
-    | null
+    | null;
-  hidden?: boolean | null
+  hidden?: boolean | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "hidden-access".
+ */
 export interface HiddenAccess {
-  id: string
+  id: string;
-  title: string
+  title: string;
-  hidden?: boolean | null
+  hidden?: boolean | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "hidden-access-count".
+ */
+export interface HiddenAccessCount {
+  id: string;
+  title: string;
+  hidden?: boolean | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
 export interface PayloadPreference {
-  id: string
+  id: string;
-  user: {
+  user:
-    relationTo: 'users'
+    | {
-    value: string | User
+        relationTo: 'users';
-  }
+        value: string | User;
-  key?: string | null
+      }
+    | {
+        relationTo: 'non-admin-user';
+        value: string | NonAdminUser;
+      };
+  key?: string | null;
   value?:
     | {
-        [k: string]: unknown
+        [k: string]: unknown;
       }
     | unknown[]
     | string
     | number
     | boolean
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
 export interface PayloadMigration {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  batch?: number | null
+  batch?: number | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "settings".
+ */
+export interface Setting {
+  id: string;
+  test?: boolean | null;
+  updatedAt?: string | null;
+  createdAt?: string | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "test".
+ */
+export interface Test {
+  id: string;
+  updatedAt?: string | null;
+  createdAt?: string | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "read-only-global".
+ */
+export interface ReadOnlyGlobal {
+  id: string;
+  name?: string | null;
+  updatedAt?: string | null;
+  createdAt?: string | null;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/access-control/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/admin/payload-types.ts

@@ -8,187 +8,336 @@
 
 export interface Config {
   collections: {
-    posts: Post
+    uploads: Upload;
-    users: User
+    posts: Post;
-    'hidden-collection': HiddenCollection
+    users: User;
-    'collection-no-api-view': CollectionNoApiView
+    'hidden-collection': HiddenCollection;
-    'custom-views-one': CustomViewsOne
+    'collection-no-api-view': CollectionNoApiView;
-    'custom-views-two': CustomViewsTwo
+    'custom-views-one': CustomViewsOne;
-    'group-one-collection-ones': GroupOneCollectionOne
+    'custom-views-two': CustomViewsTwo;
-    'group-one-collection-twos': GroupOneCollectionTwo
+    'group-one-collection-ones': GroupOneCollectionOne;
-    'group-two-collection-ones': GroupTwoCollectionOne
+    'group-one-collection-twos': GroupOneCollectionTwo;
-    'group-two-collection-twos': GroupTwoCollectionTwo
+    'group-two-collection-ones': GroupTwoCollectionOne;
-    geo: Geo
+    'group-two-collection-twos': GroupTwoCollectionTwo;
-    'payload-preferences': PayloadPreference
+    geo: Geo;
-    'payload-migrations': PayloadMigration
+    customIdTab: CustomIdTab;
-  }
+    customIdRow: CustomIdRow;
+    'disable-duplicate': DisableDuplicate;
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
   globals: {
-    'hidden-global': HiddenGlobal
+    'hidden-global': HiddenGlobal;
-    'global-no-api-view': GlobalNoApiView
+    'global-no-api-view': GlobalNoApiView;
-    global: Global
+    global: Global;
-    'custom-global-views-one': CustomGlobalViewsOne
+    'custom-global-views-one': CustomGlobalViewsOne;
-    'custom-global-views-two': CustomGlobalViewsTwo
+    'custom-global-views-two': CustomGlobalViewsTwo;
-    'group-globals-one': GroupGlobalsOne
+    'group-globals-one': GroupGlobalsOne;
-    'group-globals-two': GroupGlobalsTwo
+    'group-globals-two': GroupGlobalsTwo;
-  }
+  };
+  locale: 'es' | 'en';
+  user: User & {
+    collection: 'users';
+  };
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "uploads".
+ */
+export interface Upload {
+  id: string;
+  title?: string | null;
+  updatedAt: string;
+  createdAt: string;
+  url?: string | null;
+  thumbnailURL?: string | null;
+  filename?: string | null;
+  mimeType?: string | null;
+  filesize?: number | null;
+  width?: number | null;
+  height?: number | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "posts".
+ */
 export interface Post {
-  id: string
+  id: string;
-  title?: string | null
+  title?: string | null;
-  description?: string | null
+  description?: string | null;
-  number?: number | null
+  number?: number | null;
   richText?:
     | {
-        [k: string]: unknown
+        [k: string]: unknown;
       }[]
-    | null
+    | null;
   group?: {
-    title?: string | null
+    title?: string | null;
-  }
+  };
-  relationship?: (string | null) | Post
+  relationship?: (string | null) | Post;
-  sidebarField?: string | null
+  customCell?: string | null;
-  updatedAt: string
+  sidebarField?: string | null;
-  createdAt: string
+  descriptionAsString?: string | null;
-  _status?: ('draft' | 'published') | null
+  descriptionAsFunction?: string | null;
+  descriptionAsComponent?: string | null;
+  updatedAt: string;
+  createdAt: string;
+  _status?: ('draft' | 'published') | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
-  id: string
+  id: string;
-  textField?: string | null
+  textField?: string | null;
-  sidebarField?: string | null
+  sidebarField?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email: string
+  email: string;
-  resetPasswordToken?: string | null
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string | null
+  resetPasswordExpiration?: string | null;
-  salt?: string | null
+  salt?: string | null;
-  hash?: string | null
+  hash?: string | null;
-  loginAttempts?: number | null
+  loginAttempts?: number | null;
-  lockUntil?: string | null
+  lockUntil?: string | null;
-  password: string | null
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "hidden-collection".
+ */
 export interface HiddenCollection {
-  id: string
+  id: string;
-  title?: string | null
+  title?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "collection-no-api-view".
+ */
 export interface CollectionNoApiView {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "custom-views-one".
+ */
 export interface CustomViewsOne {
-  id: string
+  id: string;
-  title?: string | null
+  title?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "custom-views-two".
+ */
 export interface CustomViewsTwo {
-  id: string
+  id: string;
-  title?: string | null
+  title?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "group-one-collection-ones".
+ */
 export interface GroupOneCollectionOne {
-  id: string
+  id: string;
-  title?: string | null
+  title?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "group-one-collection-twos".
+ */
 export interface GroupOneCollectionTwo {
-  id: string
+  id: string;
-  title?: string | null
+  title?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "group-two-collection-ones".
+ */
 export interface GroupTwoCollectionOne {
-  id: string
+  id: string;
-  title?: string | null
+  title?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "group-two-collection-twos".
+ */
 export interface GroupTwoCollectionTwo {
-  id: string
+  id: string;
-  title?: string | null
+  title?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "geo".
+ */
 export interface Geo {
-  id: string
+  id: string;
   /**
    * @minItems 2
    * @maxItems 2
    */
-  point?: [number, number] | null
+  point?: [number, number] | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "customIdTab".
+ */
+export interface CustomIdTab {
+  id: string | null;
+  title?: string | null;
+  description?: string | null;
+  number?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "customIdRow".
+ */
+export interface CustomIdRow {
+  id: string | null;
+  title?: string | null;
+  description?: string | null;
+  number?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "disable-duplicate".
+ */
+export interface DisableDuplicate {
+  id: string;
+  title?: string | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
 export interface PayloadPreference {
-  id: string
+  id: string;
   user: {
-    relationTo: 'users'
+    relationTo: 'users';
-    value: string | User
+    value: string | User;
-  }
+  };
-  key?: string | null
+  key?: string | null;
   value?:
     | {
-        [k: string]: unknown
+        [k: string]: unknown;
       }
     | unknown[]
     | string
     | number
     | boolean
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
 export interface PayloadMigration {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  batch?: number | null
+  batch?: number | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "hidden-global".
+ */
 export interface HiddenGlobal {
-  id: string
+  id: string;
-  title?: string | null
+  title?: string | null;
-  updatedAt?: string | null
+  updatedAt?: string | null;
-  createdAt?: string | null
+  createdAt?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "global-no-api-view".
+ */
 export interface GlobalNoApiView {
-  id: string
+  id: string;
-  updatedAt?: string | null
+  updatedAt?: string | null;
-  createdAt?: string | null
+  createdAt?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "global".
+ */
 export interface Global {
-  id: string
+  id: string;
-  title?: string | null
+  title?: string | null;
-  sidebarField?: string | null
+  sidebarField?: string | null;
-  _status?: ('draft' | 'published') | null
+  _status?: ('draft' | 'published') | null;
-  updatedAt?: string | null
+  updatedAt?: string | null;
-  createdAt?: string | null
+  createdAt?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "custom-global-views-one".
+ */
 export interface CustomGlobalViewsOne {
-  id: string
+  id: string;
-  title?: string | null
+  title?: string | null;
-  updatedAt?: string | null
+  updatedAt?: string | null;
-  createdAt?: string | null
+  createdAt?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "custom-global-views-two".
+ */
 export interface CustomGlobalViewsTwo {
-  id: string
+  id: string;
-  title?: string | null
+  title?: string | null;
-  updatedAt?: string | null
+  updatedAt?: string | null;
-  createdAt?: string | null
+  createdAt?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "group-globals-one".
+ */
 export interface GroupGlobalsOne {
-  id: string
+  id: string;
-  title?: string | null
+  title?: string | null;
-  updatedAt?: string | null
+  updatedAt?: string | null;
-  createdAt?: string | null
+  createdAt?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "group-globals-two".
+ */
 export interface GroupGlobalsTwo {
-  id: string
+  id: string;
-  title?: string | null
+  title?: string | null;
-  updatedAt?: string | null
+  updatedAt?: string | null;
-  createdAt?: string | null
+  createdAt?: string | null;
 }
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/admin/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/array-update/payload-types.ts

@@ -1,36 +1,101 @@
 /* tslint:disable */
+/* eslint-disable */
 /**
  * This file was automatically generated by Payload.
  * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
  * and re-run `payload generate:types` to regenerate this file.
  */
 
-export interface Config {}
+export interface Config {
+  collections: {
+    arrays: Array;
+    users: User;
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
+  globals: {};
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "arrays".
  */
 export interface Array {
-  id: string
+  id: string;
-  array: {
+  arrayOfFields?:
-    required: string
+    | {
-    optional?: string
+        required: string;
-    id?: string
+        optional?: string | null;
-  }[]
+        innerArrayOfFields?:
-  createdAt: string
+          | {
-  updatedAt: string
+              required: string;
+              optional?: string | null;
+              id?: string | null;
+            }[]
+          | null;
+        id?: string | null;
+      }[]
+    | null;
+  updatedAt: string;
+  createdAt: string;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "users".
  */
 export interface User {
-  id: string
+  id: string;
-  email?: string
+  updatedAt: string;
-  resetPasswordToken?: string
+  createdAt: string;
-  resetPasswordExpiration?: string
+  email: string;
-  loginAttempts?: number
+  resetPasswordToken?: string | null;
-  lockUntil?: string
+  resetPasswordExpiration?: string | null;
-  createdAt: string
+  salt?: string | null;
-  updatedAt: string
+  hash?: string | null;
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/array-update/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/auth/payload-types.ts

@@ -7,148 +7,155 @@
  */
 
 export interface Config {
+  collections: {
+    users: User;
+    'api-keys': ApiKey;
+    'public-users': PublicUser;
+    relationsCollection: RelationsCollection;
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
+  globals: {};
+  locale: null;
   user:
     | (User & {
-        collection: 'users'
+        collection: 'users';
       })
     | (ApiKey & {
-        collection: 'api-keys'
+        collection: 'api-keys';
       })
     | (PublicUser & {
-        collection: 'public-users'
+        collection: 'public-users';
-      })
+      });
-  collections: {
-    users: User
-    'api-keys': ApiKey
-    'public-users': PublicUser
-    relationsCollection: RelationsCollection
-    'payload-preferences': PayloadPreference
-    'payload-migrations': PayloadMigration
-  }
-  globals: {}
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "users".
  */
 export interface User {
-  id: string
+  id: string;
-  adminOnlyField?: string | null
+  adminOnlyField?: string | null;
-  roles: ('admin' | 'editor' | 'moderator' | 'user' | 'viewer')[]
+  roles: ('admin' | 'editor' | 'moderator' | 'user' | 'viewer')[];
-  namedSaveToJWT?: string | null
+  namedSaveToJWT?: string | null;
   group?: {
-    liftedSaveToJWT?: string | null
+    liftedSaveToJWT?: string | null;
-  }
+  };
   groupSaveToJWT?: {
-    saveToJWTString?: string | null
+    saveToJWTString?: string | null;
-    saveToJWTFalse?: string | null
+    saveToJWTFalse?: string | null;
-  }
+  };
   saveToJWTTab: {
-    test?: string | null
+    test?: string | null;
-  }
+  };
   tabSaveToJWTString: {
-    includedByDefault?: string | null
+    includedByDefault?: string | null;
-  }
+  };
-  tabLiftedSaveToJWT?: string | null
+  tabLiftedSaveToJWT?: string | null;
-  unnamedTabSaveToJWTString?: string | null
+  unnamedTabSaveToJWTString?: string | null;
-  unnamedTabSaveToJWTFalse?: string | null
+  unnamedTabSaveToJWTFalse?: string | null;
-  custom?: string | null
+  custom?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  enableAPIKey?: boolean | null
+  enableAPIKey?: boolean | null;
-  apiKey?: string | null
+  apiKey?: string | null;
-  apiKeyIndex?: string | null
+  apiKeyIndex?: string | null;
-  email: string
+  email: string;
-  resetPasswordToken?: string | null
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string | null
+  resetPasswordExpiration?: string | null;
-  salt?: string | null
+  salt?: string | null;
-  hash?: string | null
+  hash?: string | null;
-  loginAttempts?: number | null
+  loginAttempts?: number | null;
-  lockUntil?: string | null
+  lockUntil?: string | null;
-  password?: string | null
+  password?: string | null;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "api-keys".
  */
 export interface ApiKey {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  enableAPIKey?: boolean | null
+  enableAPIKey?: boolean | null;
-  apiKey?: string | null
+  apiKey?: string | null;
-  apiKeyIndex?: string | null
+  apiKeyIndex?: string | null;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "public-users".
  */
 export interface PublicUser {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email: string
+  email: string;
-  resetPasswordToken?: string | null
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string | null
+  resetPasswordExpiration?: string | null;
-  salt?: string | null
+  salt?: string | null;
-  hash?: string | null
+  hash?: string | null;
-  _verified?: boolean | null
+  _verified?: boolean | null;
-  _verificationToken?: string | null
+  _verificationToken?: string | null;
-  loginAttempts?: number | null
+  loginAttempts?: number | null;
-  lockUntil?: string | null
+  lockUntil?: string | null;
-  password?: string | null
+  password?: string | null;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "relationsCollection".
  */
 export interface RelationsCollection {
-  id: string
+  id: string;
-  rel?: (string | null) | User
+  rel?: (string | null) | User;
-  text?: string | null
+  text?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "payload-preferences".
  */
 export interface PayloadPreference {
-  id: string
+  id: string;
   user:
     | {
-        relationTo: 'users'
+        relationTo: 'users';
-        value: string | User
+        value: string | User;
       }
     | {
-        relationTo: 'api-keys'
+        relationTo: 'api-keys';
-        value: string | ApiKey
+        value: string | ApiKey;
       }
     | {
-        relationTo: 'public-users'
+        relationTo: 'public-users';
-        value: string | PublicUser
+        value: string | PublicUser;
-      }
+      };
-  key?: string | null
+  key?: string | null;
   value?:
     | {
-        [k: string]: unknown
+        [k: string]: unknown;
       }
     | unknown[]
     | string
     | number
     | boolean
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "payload-migrations".
  */
 export interface PayloadMigration {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  batch?: number | null
+  batch?: number | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/auth/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/buildConfigWithDefaults.ts

@@ -161,7 +161,9 @@ export async function buildConfigWithDefaults(
     sharp,
     telemetry: false,
     typescript: {
-      declare: false,
+      declare: {
+        ignoreTSError: true,
+      },
     },
     ...testConfig,
     i18n: {

test/collections-graphql/payload-types.ts

@@ -8,227 +8,234 @@
 
 export interface Config {
   collections: {
-    users: User
+    users: User;
-    point: Point
+    point: Point;
-    posts: Post
+    posts: Post;
-    'custom-ids': CustomId
+    'custom-ids': CustomId;
-    relation: Relation
+    relation: Relation;
-    dummy: Dummy
+    dummy: Dummy;
-    'error-on-hooks': ErrorOnHook
+    'error-on-hooks': ErrorOnHook;
-    'payload-api-test-ones': PayloadApiTestOne
+    'payload-api-test-ones': PayloadApiTestOne;
-    'payload-api-test-twos': PayloadApiTestTwo
+    'payload-api-test-twos': PayloadApiTestTwo;
-    'content-type': ContentType
+    'content-type': ContentType;
-    'cyclical-relationship': CyclicalRelationship
+    'cyclical-relationship': CyclicalRelationship;
-    'payload-preferences': PayloadPreference
+    'payload-preferences': PayloadPreference;
-    'payload-migrations': PayloadMigration
+    'payload-migrations': PayloadMigration;
-  }
+  };
-  globals: {}
+  globals: {};
-  locale: 'en' | 'es'
+  locale: 'en' | 'es';
   user: User & {
-    collection: 'users'
+    collection: 'users';
-  }
+  };
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "users".
  */
 export interface User {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email: string
+  email: string;
-  resetPasswordToken?: string | null
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string | null
+  resetPasswordExpiration?: string | null;
-  salt?: string | null
+  salt?: string | null;
-  hash?: string | null
+  hash?: string | null;
-  loginAttempts?: number | null
+  loginAttempts?: number | null;
-  lockUntil?: string | null
+  lockUntil?: string | null;
-  password?: string | null
+  password?: string | null;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "point".
  */
 export interface Point {
-  id: string
+  id: string;
   /**
    * @minItems 2
    * @maxItems 2
    */
-  point?: [number, number] | null
+  point?: [number, number] | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "posts".
  */
 export interface Post {
-  id: string
+  id: string;
-  title?: string | null
+  title?: string | null;
-  description?: string | null
+  description?: string | null;
-  number?: number | null
+  number?: number | null;
-  min?: number | null
+  min?: number | null;
-  relationField?: (string | null) | Relation
+  relationField?: (string | null) | Relation;
-  relationToCustomID?: (number | null) | CustomId
+  relationToCustomID?: (number | null) | CustomId;
-  relationHasManyField?: (string | Relation)[] | null
+  relationHasManyField?: (string | Relation)[] | null;
   relationMultiRelationTo?:
     | ({
-        relationTo: 'relation'
+        relationTo: 'relation';
-        value: string | Relation
+        value: string | Relation;
       } | null)
     | ({
-        relationTo: 'dummy'
+        relationTo: 'dummy';
-        value: string | Dummy
+        value: string | Dummy;
-      } | null)
+      } | null);
   relationMultiRelationToHasMany?:
     | (
         | {
-            relationTo: 'relation'
+            relationTo: 'relation';
-            value: string | Relation
+            value: string | Relation;
           }
         | {
-            relationTo: 'dummy'
+            relationTo: 'dummy';
-            value: string | Dummy
+            value: string | Dummy;
           }
       )[]
-    | null
+    | null;
   A1?: {
-    A2?: string | null
+    A2?: string | null;
-  }
+  };
   B1?: {
-    B2?: string | null
+    B2?: string | null;
-  }
+  };
   C1?: {
-    C2Text?: string | null
+    C2Text?: string | null;
     C2?: {
-      C3?: string | null
+      C3?: string | null;
-    }
+    };
-  }
+  };
   D1: {
     D2?: {
       D3?: {
-        D4?: string | null
+        D4?: string | null;
-      }
+      };
-    }
+    };
-  }
+  };
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "relation".
  */
 export interface Relation {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "custom-ids".
  */
 export interface CustomId {
-  id: number
+  id: number;
-  title?: string | null
+  title?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "dummy".
  */
 export interface Dummy {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "error-on-hooks".
  */
 export interface ErrorOnHook {
-  id: string
+  id: string;
-  title?: string | null
+  title?: string | null;
-  errorBeforeChange?: boolean | null
+  errorBeforeChange?: boolean | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "payload-api-test-ones".
  */
 export interface PayloadApiTestOne {
-  id: string
+  id: string;
-  payloadAPI?: string | null
+  payloadAPI?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "payload-api-test-twos".
  */
 export interface PayloadApiTestTwo {
-  id: string
+  id: string;
-  payloadAPI?: string | null
+  payloadAPI?: string | null;
-  relation?: (string | null) | PayloadApiTestOne
+  relation?: (string | null) | PayloadApiTestOne;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "content-type".
  */
 export interface ContentType {
-  id: string
+  id: string;
-  contentType?: string | null
+  contentType?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "cyclical-relationship".
  */
 export interface CyclicalRelationship {
-  id: string
+  id: string;
-  title?: string | null
+  title?: string | null;
-  relationToSelf?: (string | null) | CyclicalRelationship
+  relationToSelf?: (string | null) | CyclicalRelationship;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
+  _status?: ('draft' | 'published') | null;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "payload-preferences".
  */
 export interface PayloadPreference {
-  id: string
+  id: string;
   user: {
-    relationTo: 'users'
+    relationTo: 'users';
-    value: string | User
+    value: string | User;
-  }
+  };
-  key?: string | null
+  key?: string | null;
   value?:
     | {
-        [k: string]: unknown
+        [k: string]: unknown;
       }
     | unknown[]
     | string
     | number
     | boolean
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "payload-migrations".
  */
 export interface PayloadMigration {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  batch?: number | null
+  batch?: number | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/collections-graphql/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/collections-rest/payload-types.ts

@@ -1,4 +1,5 @@
 /* tslint:disable */
+/* eslint-disable */
 /**
  * This file was automatically generated by Payload.
  * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
@@ -7,117 +8,188 @@
 
 export interface Config {
   collections: {
-    posts: Post
+    posts: Post;
-    point: Point
+    point: Point;
-    relation: Relation
+    relation: Relation;
-    dummy: Dummy
+    dummy: Dummy;
-    'custom-id': CustomId
+    'custom-id': CustomId;
-    'custom-id-number': CustomIdNumber
+    'custom-id-number': CustomIdNumber;
-    'error-on-hooks': ErrorOnHook
+    'error-on-hooks': ErrorOnHook;
-    users: User
+    users: User;
-  }
+    'payload-preferences': PayloadPreference;
-  globals: {}
+    'payload-migrations': PayloadMigration;
+  };
+  globals: {};
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "posts".
+ */
 export interface Post {
-  id: string
+  id: string;
-  title?: string
+  title?: string | null;
-  description?: string
+  description?: string | null;
-  number?: number
+  number?: number | null;
-  fakeLocalization?: string
+  fakeLocalization?: string | null;
-  relationField?: string | Relation
+  relationField?: (string | null) | Relation;
-  relationHasManyField?: string[] | Relation[]
+  relationHasManyField?: (string | Relation)[] | null;
   relationMultiRelationTo?:
-    | {
+    | ({
-        value: string | Relation
+        relationTo: 'relation';
-        relationTo: 'relation'
+        value: string | Relation;
-      }
+      } | null)
-    | {
+    | ({
-        value: string | Dummy
+        relationTo: 'dummy';
-        relationTo: 'dummy'
+        value: string | Dummy;
-      }
+      } | null);
   relationMultiRelationToHasMany?:
     | (
         | {
-            value: string
+            relationTo: 'relation';
-            relationTo: 'relation'
+            value: string | Relation;
           }
         | {
-            value: string
+            relationTo: 'dummy';
-            relationTo: 'dummy'
+            value: string | Dummy;
           }
       )[]
-    | (
+    | null;
-        | {
+  restrictedField?: string | null;
-            value: Relation
-            relationTo: 'relation'
-          }
-        | {
-            value: Dummy
-            relationTo: 'dummy'
-          }
-      )[]
-  restrictedField?: string
   D1: {
     D2?: {
       D3?: {
-        D4?: string
+        D4?: string | null;
-      }
+      };
-    }
+    };
-  }
+  };
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relation".
+ */
 export interface Relation {
-  id: string
+  id: string;
-  name?: string
+  name?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "dummy".
+ */
 export interface Dummy {
-  id: string
+  id: string;
-  title?: string
+  title?: string | null;
-  name?: string
+  name?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "point".
+ */
 export interface Point {
-  id: string
+  id: string;
   /**
    * @minItems 2
    * @maxItems 2
    */
-  point?: [number, number]
+  point?: [number, number] | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "custom-id".
+ */
 export interface CustomId {
-  id: string
+  id: string;
-  name?: string
+  name?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "custom-id-number".
+ */
 export interface CustomIdNumber {
-  id: number
+  id: number;
-  name?: string
+  name?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "error-on-hooks".
+ */
 export interface ErrorOnHook {
-  id: string
+  id: string;
-  text?: string
+  text?: string | null;
-  errorBeforeChange?: boolean
+  errorBeforeChange?: boolean | null;
-  errorAfterDelete?: boolean
+  errorAfterDelete?: boolean | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email?: string
+  email: string;
-  resetPasswordToken?: string
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string
+  resetPasswordExpiration?: string | null;
-  loginAttempts?: number
+  salt?: string | null;
-  lockUntil?: string
+  hash?: string | null;
-  password?: string
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/collections-rest/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/config/payload-types.ts

@@ -8,72 +8,102 @@
 
 export interface Config {
   collections: {
-    pages: Page
+    pages: Page;
-    users: User
+    users: User;
-    'payload-preferences': PayloadPreference
+    'payload-preferences': PayloadPreference;
-    'payload-migrations': PayloadMigration
+    'payload-migrations': PayloadMigration;
-  }
+  };
   globals: {
-    'my-global': MyGlobal
+    'my-global': MyGlobal;
-  }
+  };
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "pages".
+ */
 export interface Page {
-  id: string
+  id: string;
-  title?: string | null
+  title?: string | null;
   myBlocks?:
     | {
-        blockOneField?: string | null
+        blockOneField?: string | null;
-        blockTwoField?: string | null
+        blockTwoField?: string | null;
-        id?: string | null
+        id?: string | null;
-        blockName?: string | null
+        blockName?: string | null;
-        blockType: 'blockOne'
+        blockType: 'blockOne';
       }[]
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email: string
+  email: string;
-  resetPasswordToken?: string | null
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string | null
+  resetPasswordExpiration?: string | null;
-  salt?: string | null
+  salt?: string | null;
-  hash?: string | null
+  hash?: string | null;
-  loginAttempts?: number | null
+  loginAttempts?: number | null;
-  lockUntil?: string | null
+  lockUntil?: string | null;
-  password: string | null
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
 export interface PayloadPreference {
-  id: string
+  id: string;
   user: {
-    relationTo: 'users'
+    relationTo: 'users';
-    value: string | User
+    value: string | User;
-  }
+  };
-  key?: string | null
+  key?: string | null;
   value?:
     | {
-        [k: string]: unknown
+        [k: string]: unknown;
       }
     | unknown[]
     | string
     | number
     | boolean
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
 export interface PayloadMigration {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  batch?: number | null
+  batch?: number | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "my-global".
+ */
 export interface MyGlobal {
-  id: string
+  id: string;
-  title?: string | null
+  title?: string | null;
-  updatedAt?: string | null
+  updatedAt?: string | null;
-  createdAt?: string | null
+  createdAt?: string | null;
 }
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/config/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/create-payload-app/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/custom-graphql/payload-types.ts

@@ -8,48 +8,70 @@
 
 export interface Config {
   collections: {
-    users: User
+    users: User;
-    'payload-preferences': PayloadPreference
+    'payload-preferences': PayloadPreference;
-    'payload-migrations': PayloadMigration
+    'payload-migrations': PayloadMigration;
-  }
+  };
-  globals: {}
+  globals: {};
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email: string
+  email: string;
-  resetPasswordToken?: string | null
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string | null
+  resetPasswordExpiration?: string | null;
-  salt?: string | null
+  salt?: string | null;
-  hash?: string | null
+  hash?: string | null;
-  loginAttempts?: number | null
+  loginAttempts?: number | null;
-  lockUntil?: string | null
+  lockUntil?: string | null;
-  password: string | null
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
 export interface PayloadPreference {
-  id: string
+  id: string;
   user: {
-    relationTo: 'users'
+    relationTo: 'users';
-    value: string | User
+    value: string | User;
-  }
+  };
-  key?: string | null
+  key?: string | null;
   value?:
     | {
-        [k: string]: unknown
+        [k: string]: unknown;
       }
     | unknown[]
     | string
     | number
     | boolean
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
 export interface PayloadMigration {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  batch?: number | null
+  batch?: number | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/custom-graphql/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/database/payload-types.ts

@@ -8,79 +8,179 @@
 
 export interface Config {
   collections: {
-    posts: Post
+    posts: Post;
-    'relation-a': RelationA
+    'relation-a': RelationA;
-    'relation-b': RelationB
+    'relation-b': RelationB;
-    users: User
+    'custom-schema': CustomSchema;
-    'payload-preferences': PayloadPreference
+    users: User;
-    'payload-migrations': PayloadMigration
+    'payload-preferences': PayloadPreference;
-  }
+    'payload-migrations': PayloadMigration;
-  globals: {}
+  };
+  globals: {
+    global: Global;
+  };
+  locale: 'en' | 'es';
+  user: User & {
+    collection: 'users';
+  };
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "posts".
+ */
 export interface Post {
-  id: string
+  id: string;
-  title: string
+  title: string;
-  updatedAt: string
+  throwAfterChange?: boolean | null;
-  createdAt: string
+  updatedAt: string;
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relation-a".
+ */
 export interface RelationA {
-  id: string
+  id: string;
-  relationship?: (string | null) | RelationB
+  title?: string | null;
-  richText?:
+  relationship?: (string | null) | RelationB;
-    | {
+  richText?: {
-        [k: string]: unknown
+    root: {
-      }[]
+      type: string;
-    | null
+      children: {
-  updatedAt: string
+        type: string;
-  createdAt: string
+        version: number;
+        [k: string]: unknown;
+      }[];
+      direction: ('ltr' | 'rtl') | null;
+      format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | '';
+      indent: number;
+      version: number;
+    };
+    [k: string]: unknown;
+  } | null;
+  updatedAt: string;
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relation-b".
+ */
 export interface RelationB {
-  id: string
+  id: string;
-  relationship?: (string | null) | RelationA
+  title?: string | null;
-  richText?:
+  relationship?: (string | null) | RelationA;
+  richText?: {
+    root: {
+      type: string;
+      children: {
+        type: string;
+        version: number;
+        [k: string]: unknown;
+      }[];
+      direction: ('ltr' | 'rtl') | null;
+      format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | '';
+      indent: number;
+      version: number;
+    };
+    [k: string]: unknown;
+  } | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "custom-schema".
+ */
+export interface CustomSchema {
+  id: string;
+  text?: string | null;
+  localizedText?: string | null;
+  relationship?: (string | RelationA)[] | null;
+  select?: ('a' | 'b' | 'c')[] | null;
+  radio?: ('a' | 'b' | 'c') | null;
+  array?:
     | {
-        [k: string]: unknown
+        text?: string | null;
+        localizedText?: string | null;
+        id?: string | null;
       }[]
-    | null
+    | null;
-  updatedAt: string
+  blocks?:
-  createdAt: string
+    | {
+        text?: string | null;
+        localizedText?: string | null;
+        id?: string | null;
+        blockName?: string | null;
+        blockType: 'block';
+      }[]
+    | null;
+  updatedAt: string;
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email: string
+  email: string;
-  resetPasswordToken?: string | null
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string | null
+  resetPasswordExpiration?: string | null;
-  salt?: string | null
+  salt?: string | null;
-  hash?: string | null
+  hash?: string | null;
-  loginAttempts?: number | null
+  loginAttempts?: number | null;
-  lockUntil?: string | null
+  lockUntil?: string | null;
-  password: string | null
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
 export interface PayloadPreference {
-  id: string
+  id: string;
   user: {
-    relationTo: 'users'
+    relationTo: 'users';
-    value: string | User
+    value: string | User;
-  }
+  };
-  key?: string | null
+  key?: string | null;
   value?:
     | {
-        [k: string]: unknown
+        [k: string]: unknown;
       }
     | unknown[]
     | string
     | number
     | boolean
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
 export interface PayloadMigration {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  batch?: number | null
+  batch?: number | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "global".
+ */
+export interface Global {
+  id: string;
+  text?: string | null;
+  updatedAt?: string | null;
+  createdAt?: string | null;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/database/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/dataloader/payload-types.ts

@@ -1,33 +1,121 @@
 /* tslint:disable */
+/* eslint-disable */
 /**
  * This file was automatically generated by Payload.
  * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
  * and re-run `payload generate:types` to regenerate this file.
  */
 
-export interface Config {}
+export interface Config {
+  collections: {
+    posts: Post;
+    'relation-a': RelationA;
+    'relation-b': RelationB;
+    users: User;
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
+  globals: {};
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "posts".
  */
 export interface Post {
-  id: string
+  id: string;
-  title: string
+  title: string;
-  owner?: string | User
+  owner?: (string | null) | User;
-  createdAt: string
+  updatedAt: string;
-  updatedAt: string
+  createdAt: string;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "users".
  */
 export interface User {
-  id: string
+  id: string;
-  email?: string
+  updatedAt: string;
-  resetPasswordToken?: string
+  createdAt: string;
-  resetPasswordExpiration?: string
+  email: string;
-  loginAttempts?: number
+  resetPasswordToken?: string | null;
-  lockUntil?: string
+  resetPasswordExpiration?: string | null;
-  createdAt: string
+  salt?: string | null;
-  updatedAt: string
+  hash?: string | null;
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relation-a".
+ */
+export interface RelationA {
+  id: string;
+  relationship?: (string | null) | RelationB;
+  richText?:
+    | {
+        [k: string]: unknown;
+      }[]
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relation-b".
+ */
+export interface RelationB {
+  id: string;
+  relationship?: (string | null) | RelationA;
+  richText?:
+    | {
+        [k: string]: unknown;
+      }[]
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/dataloader/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/email-nodemailer/payload-types.ts

@@ -1,4 +1,5 @@
 /* tslint:disable */
+/* eslint-disable */
 /**
  * This file was automatically generated by Payload.
  * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
@@ -7,44 +8,70 @@
 
 export interface Config {
   collections: {
-    posts: Post
+    users: User;
-    media: Media
+    'payload-preferences': PayloadPreference;
-    users: User
+    'payload-migrations': PayloadMigration;
-  }
+  };
-  globals: {
+  globals: {};
-    menu: Menu
+  locale: null;
-  }
+  user: User & {
-}
+    collection: 'users';
-export interface Post {
+  };
-  id: string
-  text?: string
-  associatedMedia?: string | Media
-  updatedAt: string
-  createdAt: string
-}
-export interface Media {
-  id: string
-  updatedAt: string
-  createdAt: string
-  url?: string
-  filename?: string
-  mimeType?: string
-  filesize?: number
-  width?: number
-  height?: number
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email?: string
+  email: string;
-  resetPasswordToken?: string
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string
+  resetPasswordExpiration?: string | null;
-  loginAttempts?: number
+  salt?: string | null;
-  lockUntil?: string
+  hash?: string | null;
-  password?: string
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
 }
-export interface Menu {
+/**
-  id: string
+ * This interface was referenced by `Config`'s JSON-Schema
-  globalText?: string
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/email-nodemailer/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/email-resend/payload-types.ts

@@ -1,4 +1,5 @@
 /* tslint:disable */
+/* eslint-disable */
 /**
  * This file was automatically generated by Payload.
  * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
@@ -7,44 +8,70 @@
 
 export interface Config {
   collections: {
-    posts: Post
+    users: User;
-    media: Media
+    'payload-preferences': PayloadPreference;
-    users: User
+    'payload-migrations': PayloadMigration;
-  }
+  };
-  globals: {
+  globals: {};
-    menu: Menu
+  locale: null;
-  }
+  user: User & {
-}
+    collection: 'users';
-export interface Post {
+  };
-  id: string
-  text?: string
-  associatedMedia?: string | Media
-  updatedAt: string
-  createdAt: string
-}
-export interface Media {
-  id: string
-  updatedAt: string
-  createdAt: string
-  url?: string
-  filename?: string
-  mimeType?: string
-  filesize?: number
-  width?: number
-  height?: number
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email?: string
+  email: string;
-  resetPasswordToken?: string
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string
+  resetPasswordExpiration?: string | null;
-  loginAttempts?: number
+  salt?: string | null;
-  lockUntil?: string
+  hash?: string | null;
-  password?: string
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
 }
-export interface Menu {
+/**
-  id: string
+ * This interface was referenced by `Config`'s JSON-Schema
-  globalText?: string
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/email-resend/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/email/payload-types.ts

@@ -1,4 +1,5 @@
 /* tslint:disable */
+/* eslint-disable */
 /**
  * This file was automatically generated by Payload.
  * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
@@ -7,44 +8,138 @@
 
 export interface Config {
   collections: {
-    posts: Post
+    posts: Post;
-    media: Media
+    media: Media;
-    users: User
+    users: User;
-  }
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
   globals: {
-    menu: Menu
+    menu: Menu;
-  }
+  };
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "posts".
+ */
 export interface Post {
-  id: string
+  id: string;
-  text?: string
+  text?: string | null;
-  associatedMedia?: string | Media
+  associatedMedia?: string | Media | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
+  _status?: ('draft' | 'published') | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "media".
+ */
 export interface Media {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  url?: string
+  url?: string | null;
-  filename?: string
+  thumbnailURL?: string | null;
-  mimeType?: string
+  filename?: string | null;
-  filesize?: number
+  mimeType?: string | null;
-  width?: number
+  filesize?: number | null;
-  height?: number
+  width?: number | null;
+  height?: number | null;
+  sizes?: {
+    thumbnail?: {
+      url?: string | null;
+      width?: number | null;
+      height?: number | null;
+      mimeType?: string | null;
+      filesize?: number | null;
+      filename?: string | null;
+    };
+    medium?: {
+      url?: string | null;
+      width?: number | null;
+      height?: number | null;
+      mimeType?: string | null;
+      filesize?: number | null;
+      filename?: string | null;
+    };
+    large?: {
+      url?: string | null;
+      width?: number | null;
+      height?: number | null;
+      mimeType?: string | null;
+      filesize?: number | null;
+      filename?: string | null;
+    };
+  };
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email?: string
+  email: string;
-  resetPasswordToken?: string
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string
+  resetPasswordExpiration?: string | null;
-  loginAttempts?: number
+  salt?: string | null;
-  lockUntil?: string
+  hash?: string | null;
-  password?: string
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "menu".
+ */
 export interface Menu {
-  id: string
+  id: string;
-  globalText?: string
+  globalText?: string | null;
+  updatedAt?: string | null;
+  createdAt?: string | null;
 }
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/email/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/endpoints/payload-types.ts

@@ -1,39 +1,121 @@
 /* tslint:disable */
+/* eslint-disable */
 /**
  * This file was automatically generated by Payload.
  * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
  * and re-run `payload generate:types` to regenerate this file.
  */
 
-export interface Config {}
+export interface Config {
-/**
+  collections: {
- * This interface was referenced by `Config`'s JSON-Schema
+    endpoints: Endpoint;
- * via the `definition` "global-endpoints".
+    'no-endpoints': NoEndpoint;
- */
+    users: User;
-export interface GlobalEndpoint {
+    'payload-preferences': PayloadPreference;
-  id: string
+    'payload-migrations': PayloadMigration;
+  };
+  globals: {
+    'global-endpoints': GlobalEndpoint;
+    'global-no-endpoints': GlobalNoEndpoint;
+  };
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "endpoints".
  */
 export interface Endpoint {
-  id: string
+  id: string;
-  title?: string
+  title?: string | null;
-  createdAt: string
+  updatedAt: string;
-  updatedAt: string
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "no-endpoints".
+ */
+export interface NoEndpoint {
+  id: string;
+  name?: string | null;
+  updatedAt: string;
+  createdAt: string;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "users".
  */
 export interface User {
-  id: string
+  id: string;
-  email?: string
+  updatedAt: string;
-  resetPasswordToken?: string
+  createdAt: string;
-  resetPasswordExpiration?: string
+  email: string;
-  loginAttempts?: number
+  resetPasswordToken?: string | null;
-  lockUntil?: string
+  resetPasswordExpiration?: string | null;
-  createdAt: string
+  salt?: string | null;
-  updatedAt: string
+  hash?: string | null;
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "global-endpoints".
+ */
+export interface GlobalEndpoint {
+  id: string;
+  updatedAt?: string | null;
+  createdAt?: string | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "global-no-endpoints".
+ */
+export interface GlobalNoEndpoint {
+  id: string;
+  name?: string | null;
+  updatedAt?: string | null;
+  createdAt?: string | null;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/endpoints/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/field-error-states/payload-types.ts

@@ -8,214 +8,291 @@
 
 export interface Config {
   collections: {
-    'error-fields': ErrorField
+    'error-fields': ErrorField;
-    uploads: Upload
+    uploads: Upload;
-    users: User
+    users: User;
-    'payload-preferences': PayloadPreference
+    'payload-preferences': PayloadPreference;
-    'payload-migrations': PayloadMigration
+    'payload-migrations': PayloadMigration;
-  }
+  };
-  globals: {}
+  globals: {};
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "error-fields".
+ */
 export interface ErrorField {
-  id: string
+  id: string;
   parentArray?:
     | {
         childArray: {
-          childArrayText: string
+          childArrayText: string;
-          id?: string | null
+          id?: string | null;
-        }[]
+        }[];
-        id?: string | null
+        id?: string | null;
       }[]
-    | null
+    | null;
   home: {
-    tabText: string
+    tabText: string;
-    text: string
+    text: string;
     array?:
       | {
-          requiredArrayText: string
+          requiredArrayText: string;
-          arrayText?: string | null
+          arrayText?: string | null;
           group: {
-            text: string
+            text: string;
-            number: number
+            number: number;
-            date: string
+            date: string;
-            checkbox: boolean
+            checkbox: boolean;
-          }
+          };
-          code: string
+          code: string;
           json:
             | {
-                [k: string]: unknown
+                [k: string]: unknown;
               }
             | unknown[]
             | string
             | number
             | boolean
-            | null
+            | null;
-          email: string
+          email: string;
           /**
            * @minItems 2
            * @maxItems 2
            */
-          point: [number, number]
+          point: [number, number];
-          radio: 'mint' | 'dark_gray'
+          radio: 'mint' | 'dark_gray';
-          relationship: string | User
+          relationship: string | User;
           richtext: {
-            [k: string]: unknown
+            root: {
-          }[]
+              type: string;
-          select: 'mint' | 'dark_gray'
+              children: {
-          upload: string | Upload
+                type: string;
-          text: string
+                version: number;
-          textarea: string
+                [k: string]: unknown;
-          id?: string | null
+              }[];
+              direction: ('ltr' | 'rtl') | null;
+              format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | '';
+              indent: number;
+              version: number;
+            };
+            [k: string]: unknown;
+          };
+          select: 'mint' | 'dark_gray';
+          upload: string | Upload;
+          text: string;
+          textarea: string;
+          id?: string | null;
         }[]
-      | null
+      | null;
-  }
+  };
-  tabText: string
+  tabText: string;
-  text: string
+  text: string;
   array?:
     | {
-        requiredArrayText: string
+        requiredArrayText: string;
-        arrayText?: string | null
+        arrayText?: string | null;
         group: {
-          text: string
+          text: string;
-          number: number
+          number: number;
-          date: string
+          date: string;
-          checkbox: boolean
+          checkbox: boolean;
-        }
+        };
-        code: string
+        code: string;
         json:
           | {
-              [k: string]: unknown
+              [k: string]: unknown;
             }
           | unknown[]
           | string
           | number
           | boolean
-          | null
+          | null;
-        email: string
+        email: string;
         /**
          * @minItems 2
          * @maxItems 2
          */
-        point: [number, number]
+        point: [number, number];
-        radio: 'mint' | 'dark_gray'
+        radio: 'mint' | 'dark_gray';
-        relationship: string | User
+        relationship: string | User;
         richtext: {
-          [k: string]: unknown
+          root: {
-        }[]
+            type: string;
-        select: 'mint' | 'dark_gray'
+            children: {
-        upload: string | Upload
+              type: string;
-        text: string
+              version: number;
-        textarea: string
+              [k: string]: unknown;
-        id?: string | null
+            }[];
+            direction: ('ltr' | 'rtl') | null;
+            format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | '';
+            indent: number;
+            version: number;
+          };
+          [k: string]: unknown;
+        };
+        select: 'mint' | 'dark_gray';
+        upload: string | Upload;
+        text: string;
+        textarea: string;
+        id?: string | null;
       }[]
-    | null
+    | null;
   layout?:
     | {
-        tabText: string
+        tabText: string;
-        text: string
+        text: string;
         array?:
           | {
-              requiredArrayText: string
+              requiredArrayText: string;
-              arrayText?: string | null
+              arrayText?: string | null;
               group: {
-                text: string
+                text: string;
-                number: number
+                number: number;
-                date: string
+                date: string;
-                checkbox: boolean
+                checkbox: boolean;
-              }
+              };
-              code: string
+              code: string;
               json:
                 | {
-                    [k: string]: unknown
+                    [k: string]: unknown;
                   }
                 | unknown[]
                 | string
                 | number
                 | boolean
-                | null
+                | null;
-              email: string
+              email: string;
               /**
                * @minItems 2
                * @maxItems 2
                */
-              point: [number, number]
+              point: [number, number];
-              radio: 'mint' | 'dark_gray'
+              radio: 'mint' | 'dark_gray';
-              relationship: string | User
+              relationship: string | User;
               richtext: {
-                [k: string]: unknown
+                root: {
-              }[]
+                  type: string;
-              select: 'mint' | 'dark_gray'
+                  children: {
-              upload: string | Upload
+                    type: string;
-              text: string
+                    version: number;
-              textarea: string
+                    [k: string]: unknown;
-              id?: string | null
+                  }[];
+                  direction: ('ltr' | 'rtl') | null;
+                  format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | '';
+                  indent: number;
+                  version: number;
+                };
+                [k: string]: unknown;
+              };
+              select: 'mint' | 'dark_gray';
+              upload: string | Upload;
+              text: string;
+              textarea: string;
+              id?: string | null;
             }[]
-          | null
+          | null;
-        id?: string | null
+        id?: string | null;
-        blockName?: string | null
+        blockName?: string | null;
-        blockType: 'block1'
+        blockType: 'block1';
       }[]
-    | null
+    | null;
   group: {
-    text: string
+    text: string;
-  }
+  };
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email: string
+  email: string;
-  resetPasswordToken?: string | null
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string | null
+  resetPasswordExpiration?: string | null;
-  salt?: string | null
+  salt?: string | null;
-  hash?: string | null
+  hash?: string | null;
-  loginAttempts?: number | null
+  loginAttempts?: number | null;
-  lockUntil?: string | null
+  lockUntil?: string | null;
-  password: string | null
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "uploads".
+ */
 export interface Upload {
-  id: string
+  id: string;
-  text?: string | null
+  text?: string | null;
-  media?: string | Upload | null
+  media?: string | Upload | null;
-  richText?:
+  richText?: {
-    | {
+    root: {
-        [k: string]: unknown
+      type: string;
-      }[]
+      children: {
-    | null
+        type: string;
-  updatedAt: string
+        version: number;
-  createdAt: string
+        [k: string]: unknown;
-  url?: string | null
+      }[];
-  filename?: string | null
+      direction: ('ltr' | 'rtl') | null;
-  mimeType?: string | null
+      format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | '';
-  filesize?: number | null
+      indent: number;
-  width?: number | null
+      version: number;
-  height?: number | null
+    };
+    [k: string]: unknown;
+  } | null;
+  updatedAt: string;
+  createdAt: string;
+  url?: string | null;
+  thumbnailURL?: string | null;
+  filename?: string | null;
+  mimeType?: string | null;
+  filesize?: number | null;
+  width?: number | null;
+  height?: number | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
 export interface PayloadPreference {
-  id: string
+  id: string;
   user: {
-    relationTo: 'users'
+    relationTo: 'users';
-    value: string | User
+    value: string | User;
-  }
+  };
-  key?: string | null
+  key?: string | null;
   value?:
     | {
-        [k: string]: unknown
+        [k: string]: unknown;
       }
     | unknown[]
     | string
     | number
     | boolean
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
 export interface PayloadMigration {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  batch?: number | null
+  batch?: number | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/field-error-states/tsconfig.json

@@ -1,8 +1,3 @@
 {
   "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "paths": {
-      "payload/generated-types": ["./payload-types.ts"]
-    }
-  }
 }

test/field-perf/payload-types.ts

@@ -0,0 +1,118 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * This file was automatically generated by Payload.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {
+  collections: {
+    'blocks-collection': BlocksCollection;
+    users: User;
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
+  globals: {};
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "blocks-collection".
+ */
+export interface BlocksCollection {
+  id: string;
+  layout?:
+    | {
+        richText?: {
+          root: {
+            type: string;
+            children: {
+              type: string;
+              version: number;
+              [k: string]: unknown;
+            }[];
+            direction: ('ltr' | 'rtl') | null;
+            format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | '';
+            indent: number;
+            version: number;
+          };
+          [k: string]: unknown;
+        } | null;
+        field1?: string | null;
+        field2?: string | null;
+        field3?: string | null;
+        field4?: string | null;
+        field5?: string | null;
+        field6?: string | null;
+        field7?: string | null;
+        field8?: string | null;
+        field9?: string | null;
+        id?: string | null;
+        blockName?: string | null;
+        blockType: 'content';
+      }[]
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  updatedAt: string;
+  createdAt: string;
+  email: string;
+  resetPasswordToken?: string | null;
+  resetPasswordExpiration?: string | null;
+  salt?: string | null;
+  hash?: string | null;
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/fields-relationship/payload-types.ts

@@ -8,160 +8,244 @@
 
 export interface Config {
   collections: {
-    'fields-relationship': FieldsRelationship
+    'fields-relationship': FieldsRelationship;
-    'relation-one': RelationOne
+    'relation-filter-false': RelationFilterFalse;
-    'relation-two': RelationTwo
+    'relation-filter-true': RelationFilterTrue;
-    'relation-restricted': RelationRestricted
+    'relation-one': RelationOne;
-    'relation-with-title': RelationWithTitle
+    'relation-two': RelationTwo;
-    'relation-updated-externally': RelationUpdatedExternally
+    'relation-restricted': RelationRestricted;
-    'collection-1': Collection1
+    'relation-with-title': RelationWithTitle;
-    'collection-2': Collection2
+    'relation-updated-externally': RelationUpdatedExternally;
-    users: User
+    'collection-1': Collection1;
-    'payload-preferences': PayloadPreference
+    'collection-2': Collection2;
-    'payload-migrations': PayloadMigration
+    users: User;
-  }
+    'payload-preferences': PayloadPreference;
-  globals: {}
+    'payload-migrations': PayloadMigration;
+  };
+  globals: {};
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "fields-relationship".
+ */
 export interface FieldsRelationship {
-  id: string
+  id: string;
-  relationship?: (string | null) | RelationOne
+  relationship?: (string | null) | RelationOne;
-  relationshipHasMany?: (string | RelationOne)[] | null
+  relationshipHasMany?: (string | RelationOne)[] | null;
   relationshipMultiple?:
     | ({
-        relationTo: 'relation-one'
+        relationTo: 'relation-one';
-        value: string | RelationOne
+        value: string | RelationOne;
       } | null)
     | ({
-        relationTo: 'relation-two'
+        relationTo: 'relation-two';
-        value: string | RelationTwo
+        value: string | RelationTwo;
-      } | null)
+      } | null);
   relationshipHasManyMultiple?:
     | (
         | {
-            relationTo: 'relation-one'
+            relationTo: 'relation-one';
-            value: string | RelationOne
+            value: string | RelationOne;
           }
         | {
-            relationTo: 'relation-two'
+            relationTo: 'relation-two';
-            value: string | RelationTwo
+            value: string | RelationTwo;
           }
       )[]
-    | null
+    | null;
-  relationshipRestricted?: (string | null) | RelationRestricted
+  relationshipRestricted?: (string | null) | RelationRestricted;
-  relationshipWithTitle?: (string | null) | RelationWithTitle
+  relationshipWithTitle?: (string | null) | RelationWithTitle;
-  relationshipFiltered?: (string | null) | RelationOne
+  relationshipFiltered?: (string | null) | RelationOne;
-  relationshipFilteredAsync?: (string | null) | RelationOne
+  relationshipFilteredAsync?: (string | null) | RelationOne;
   relationshipManyFiltered?:
     | (
         | {
-            relationTo: 'relation-with-title'
+            relationTo: 'relation-with-title';
-            value: string | RelationWithTitle
+            value: string | RelationWithTitle;
           }
         | {
-            relationTo: 'relation-one'
+            relationTo: 'relation-filter-false';
-            value: string | RelationOne
+            value: string | RelationFilterFalse;
+          }
+        | {
+            relationTo: 'relation-filter-true';
+            value: string | RelationFilterTrue;
+          }
+        | {
+            relationTo: 'relation-one';
+            value: string | RelationOne;
           }
       )[]
-    | null
+    | null;
-  filter?: string | null
+  filter?: string | null;
-  relationshipReadOnly?: (string | null) | RelationOne
+  relationshipReadOnly?: (string | null) | RelationOne;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relation-one".
+ */
 export interface RelationOne {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relation-two".
+ */
 export interface RelationTwo {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relation-restricted".
+ */
 export interface RelationRestricted {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relation-with-title".
+ */
 export interface RelationWithTitle {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
   meta?: {
-    title?: string | null
+    title?: string | null;
-  }
+  };
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relation-filter-false".
+ */
+export interface RelationFilterFalse {
+  id: string;
+  name?: string | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relation-filter-true".
+ */
+export interface RelationFilterTrue {
+  id: string;
+  name?: string | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relation-updated-externally".
+ */
 export interface RelationUpdatedExternally {
-  id: string
+  id: string;
-  relationPrePopulate?: (string | null) | Collection1
+  relationPrePopulate?: (string | null) | Collection1;
-  relationHasMany?: (string | Collection1)[] | null
+  relationHasMany?: (string | Collection1)[] | null;
   relationToManyHasMany?:
     | (
         | {
-            relationTo: 'collection-1'
+            relationTo: 'collection-1';
-            value: string | Collection1
+            value: string | Collection1;
           }
         | {
-            relationTo: 'collection-2'
+            relationTo: 'collection-2';
-            value: string | Collection2
+            value: string | Collection2;
           }
       )[]
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "collection-1".
+ */
 export interface Collection1 {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "collection-2".
+ */
 export interface Collection2 {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email: string
+  email: string;
-  resetPasswordToken?: string | null
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string | null
+  resetPasswordExpiration?: string | null;
-  salt?: string | null
+  salt?: string | null;
-  hash?: string | null
+  hash?: string | null;
-  loginAttempts?: number | null
+  loginAttempts?: number | null;
-  lockUntil?: string | null
+  lockUntil?: string | null;
-  password: string | null
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
 export interface PayloadPreference {
-  id: string
+  id: string;
   user: {
-    relationTo: 'users'
+    relationTo: 'users';
-    value: string | User
+    value: string | User;
-  }
+  };
-  key?: string | null
+  key?: string | null;
   value?:
     | {
-        [k: string]: unknown
+        [k: string]: unknown;
       }
     | unknown[]
     | string
     | number
     | boolean
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
 export interface PayloadMigration {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  batch?: number | null
+  batch?: number | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/fields-relationship/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/fields/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/generateTypes.ts

@@ -1,4 +1,5 @@
 import fs from 'fs'
+import { spawn } from 'node:child_process'
 import path from 'path'
 import { generateTypes } from 'payload/node'
 
@@ -14,36 +15,59 @@ import { load } from './loader/load.js'
 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
 
-let testDir
+let testDir: string
-if (testConfigDir) {
-  testDir = path.resolve(dirname, testConfigDir)
 
-  console.log('Generating types for config:', path.resolve(testDir, 'config.ts'))
+async function run() {
+  if (testConfigDir) {
+    testDir = path.resolve(dirname, testConfigDir)
 
-  const config: SanitizedConfig = (await load(
+    const pathWithConfig = path.resolve(testDir, 'config.ts')
-    path.resolve(testDir, 'config.ts'),
+    console.log('Generating types for config:', pathWithConfig)
-  )) as unknown as SanitizedConfig
 
-  setTestEnvPaths(testDir)
+    const config: SanitizedConfig = (await load(pathWithConfig)) as unknown as SanitizedConfig
-  generateTypes(config)
-} else {
-  // Generate types for entire directory
-  testDir = dirname
 
-  console.log(
+    setTestEnvPaths(testDir)
-    'No testConfigDir passed. Generating types for config:',
+    await generateTypes(config)
-    path.resolve(testDir, 'config.ts'),
+  } else {
-  )
+    // Search through every folder in dirname, and if it has a config.ts file, generate types for it
+    const foundDirs: string[] = []
 
-  const config: SanitizedConfig = (await load(
+    fs.readdirSync(dirname, { withFileTypes: true })
-    path.resolve(testDir, 'config.ts'),
+      .filter((f) => f.isDirectory())
-  )) as unknown as SanitizedConfig
+      .forEach((dir) => {
+        const suiteDir = path.resolve(dirname, dir.name)
+        const configFound = fs.existsSync(path.resolve(suiteDir, 'config.ts'))
+        if (configFound) {
+          foundDirs.push(dir.name)
+        }
+      })
 
-  fs.readdirSync(dirname, { withFileTypes: true })
+    let i = 0
-    .filter((f) => f.isDirectory())
+    for (const suiteDir of foundDirs) {
-    .forEach((dir) => {
+      i++
-      const suiteDir = path.resolve(testDir, dir.name)
+      const pathWithConfig = path.resolve(suiteDir, 'config.ts')
-      const configFound = setTestEnvPaths(suiteDir)
+      console.log(`Generating types for config ${i} / ${foundDirs.length}:`, pathWithConfig)
-      if (configFound) generateTypes(config)
+
-    })
+      // start a new node process which runs test/generateTypes with pathWithConfig as argument. Can't run it in this process, as there could otherwise be
+      // breakage between tests, as node can cache things in between runs.
+      // Make sure to wait until the process is done before starting the next one.
+      const child = spawn('tsx', ['test/generateTypes.ts', suiteDir])
+
+      child.stdout.setEncoding('utf8')
+      child.stdout.on('data', function (data) {
+        console.log(suiteDir + ' stdout: ' + data)
+      })
+
+      child.stderr.setEncoding('utf8')
+      child.stderr.on('data', function (data) {
+        console.log(suiteDir + ' stderr: ' + data)
+      })
+
+      child.on('close', function (code) {
+        console.log(suiteDir + ' closing code: ' + code)
+      })
+    }
+  }
 }
+
+void run()

test/globals/payload-types.ts

@@ -1,41 +1,150 @@
 /* tslint:disable */
+/* eslint-disable */
 /**
  * This file was automatically generated by Payload.
  * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
  * and re-run `payload generate:types` to regenerate this file.
  */
 
-export interface Config {}
+export interface Config {
-/**
+  collections: {
- * This interface was referenced by `Config`'s JSON-Schema
+    users: User;
- * via the `definition` "global".
+    'payload-preferences': PayloadPreference;
- */
+    'payload-migrations': PayloadMigration;
-export interface Global {
+  };
-  id: string
+  globals: {
-  title?: string
+    global: Global;
-}
+    array: Array;
-/**
+    'default-value': DefaultValue;
- * This interface was referenced by `Config`'s JSON-Schema
+    'access-control': AccessControl;
- * via the `definition` "array".
+    'without-graphql': WithoutGraphql;
- */
+  };
-export interface Array {
+  locale: 'en' | 'es';
-  id: string
+  user: User & {
-  array: {
+    collection: 'users';
-    text?: string
+  };
-    id?: string
-  }[]
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "users".
  */
 export interface User {
-  id: string
+  id: string;
-  email?: string
+  updatedAt: string;
-  resetPasswordToken?: string
+  createdAt: string;
-  resetPasswordExpiration?: string
+  email: string;
-  loginAttempts?: number
+  resetPasswordToken?: string | null;
-  lockUntil?: string
+  resetPasswordExpiration?: string | null;
-  createdAt: string
+  salt?: string | null;
-  updatedAt: string
+  hash?: string | null;
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "global".
+ */
+export interface Global {
+  id: string;
+  json?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  title?: string | null;
+  updatedAt?: string | null;
+  createdAt?: string | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "array".
+ */
+export interface Array {
+  id: string;
+  array?:
+    | {
+        text?: string | null;
+        id?: string | null;
+      }[]
+    | null;
+  updatedAt?: string | null;
+  createdAt?: string | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "default-value".
+ */
+export interface DefaultValue {
+  id: string;
+  text?: string | null;
+  group?: {
+    text?: string | null;
+  };
+  updatedAt?: string | null;
+  createdAt?: string | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "access-control".
+ */
+export interface AccessControl {
+  id: string;
+  title: string;
+  enabled?: boolean | null;
+  updatedAt?: string | null;
+  createdAt?: string | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "without-graphql".
+ */
+export interface WithoutGraphql {
+  id: string;
+  updatedAt?: string | null;
+  createdAt?: string | null;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/globals/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/graphql-schema-gen/payload-types.ts

@@ -1,68 +1,158 @@
 /* tslint:disable */
+/* eslint-disable */
 /**
- * This file was automatically generated by Payload CMS.
+ * This file was automatically generated by Payload.
  * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
  * and re-run `payload generate:types` to regenerate this file.
  */
 
-export type SharedMetaArray = {
+/**
-  title?: string
+ * This interface was referenced by `Config`'s JSON-Schema
-  description?: string
+ * via the `definition` "SharedMetaArray".
-  id?: string
+ */
-}[]
+export type SharedMetaArray =
+  | {
+      title?: string | null;
+      description?: string | null;
+      id?: string | null;
+    }[]
+  | null;
 
 export interface Config {
   collections: {
-    collection1: Collection1
+    collection1: Collection1;
-    collection2: Collection2
+    collection2: Collection2;
-    users: User
+    'no-graphql': NoGraphql;
-  }
+    users: User;
-  globals: {}
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
+  globals: {};
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "collection1".
+ */
 export interface Collection1 {
-  id: string
+  id: string;
-  testing: string
+  testing: string;
-  title: string
+  title: string;
-  meta?: SharedMetaArray
+  meta?: SharedMetaArray;
-  blocks: (SharedMetaBlock | AnotherSharedBlock)[]
+  blocks: (SharedMetaBlock | AnotherSharedBlock)[];
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "SharedMetaBlock".
+ */
 export interface SharedMetaBlock {
-  b1title: string
+  b1title: string;
-  b1description?: string
+  b1description?: string | null;
-  id?: string
+  id?: string | null;
-  blockName?: string
+  blockName?: string | null;
-  blockType: 'block1'
+  blockType: 'block1';
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "AnotherSharedBlock".
+ */
 export interface AnotherSharedBlock {
-  b2title: string
+  b2title: string;
-  b2description?: string
+  b2description?: string | null;
-  id?: string
+  id?: string | null;
-  blockName?: string
+  blockName?: string | null;
-  blockType: 'block2'
+  blockType: 'block2';
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "collection2".
+ */
 export interface Collection2 {
-  id: string
+  id: string;
-  meta?: SharedMeta
+  metaArray?: SharedMetaArray;
+  metaGroup?: SharedMeta;
   nestedGroup?: {
-    meta?: SharedMeta
+    meta?: SharedMeta;
-  }
+  };
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "SharedMeta".
+ */
 export interface SharedMeta {
-  title?: string
+  title?: string | null;
-  description?: string
+  description?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "no-graphql".
+ */
+export interface NoGraphql {
+  id: string;
+  name?: string | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email?: string
+  email: string;
-  resetPasswordToken?: string
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string
+  resetPasswordExpiration?: string | null;
-  loginAttempts?: number
+  salt?: string | null;
-  lockUntil?: string
+  hash?: string | null;
-  password?: string
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+
+
+declare module 'payload' {
+  export interface GeneratedTypes extends Config {}
+}

test/graphql-schema-gen/tsconfig.json

@@ -1,9 +1,3 @@
 {
   "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "esModuleInterop": true,
-    "paths": {
-      "payload/generated-types": ["./payload-types.ts"]
-    }
-  }
 }

test/hooks/payload-types.ts

@@ -1,4 +1,5 @@
 /* tslint:disable */
+/* eslint-disable */
 /**
  * This file was automatically generated by Payload.
  * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
@@ -7,90 +8,213 @@
 
 export interface Config {
   collections: {
-    afterOperation: AfterOperation
+    afterOperation: AfterOperation;
-    transforms: Transform
+    'context-hooks': ContextHook;
-    hooks: Hook
+    transforms: Transform;
-    'nested-after-read-hooks': NestedAfterReadHook
+    hooks: Hook;
-    'chaining-hooks': ChainingHook
+    'nested-after-read-hooks': NestedAfterReadHook;
-    relations: Relation
+    'chaining-hooks': ChainingHook;
-    'hooks-users': HooksUser
+    relations: Relation;
-  }
+    'hooks-users': HooksUser;
-  globals: {}
+    'data-hooks': DataHook;
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
+  globals: {
+    'data-hooks-global': DataHooksGlobal;
+  };
+  locale: null;
+  user: HooksUser & {
+    collection: 'hooks-users';
+  };
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "afterOperation".
+ */
 export interface AfterOperation {
-  id: string
+  id: string;
-  title: string
+  title: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "context-hooks".
+ */
+export interface ContextHook {
+  id: string;
+  value?: string | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "transforms".
+ */
 export interface Transform {
-  id: string
+  id: string;
   /**
    * @minItems 2
    * @maxItems 2
    */
-  transform?: [number, number]
+  transform?: [number, number] | null;
   /**
    * @minItems 2
    * @maxItems 2
    */
-  localizedTransform?: [number, number]
+  localizedTransform?: [number, number] | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "hooks".
+ */
 export interface Hook {
-  id: string
+  id: string;
-  fieldBeforeValidate?: boolean
+  fieldBeforeValidate?: boolean | null;
-  fieldBeforeChange?: boolean
+  fieldBeforeChange?: boolean | null;
-  fieldAfterChange?: boolean
+  fieldAfterChange?: boolean | null;
-  fieldAfterRead?: boolean
+  fieldAfterRead?: boolean | null;
-  collectionBeforeValidate?: boolean
+  collectionBeforeValidate?: boolean | null;
-  collectionBeforeChange?: boolean
+  collectionBeforeChange?: boolean | null;
-  collectionAfterChange?: boolean
+  collectionAfterChange?: boolean | null;
-  collectionBeforeRead?: boolean
+  collectionBeforeRead?: boolean | null;
-  collectionAfterRead?: boolean
+  collectionAfterRead?: boolean | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "nested-after-read-hooks".
+ */
 export interface NestedAfterReadHook {
-  id: string
+  id: string;
-  text?: string
+  text?: string | null;
   group?: {
-    array?: {
+    array?:
-      input?: string
+      | {
-      afterRead?: string
+          input?: string | null;
-      shouldPopulate?: string | Relation
+          afterRead?: string | null;
-      id?: string
+          shouldPopulate?: (string | null) | Relation;
-    }[]
+          id?: string | null;
+        }[]
+      | null;
     subGroup?: {
-      afterRead?: string
+      afterRead?: string | null;
-      shouldPopulate?: string | Relation
+      shouldPopulate?: (string | null) | Relation;
-    }
+    };
-  }
+  };
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relations".
+ */
 export interface Relation {
-  id: string
+  id: string;
-  title: string
+  title: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "chaining-hooks".
+ */
 export interface ChainingHook {
-  id: string
+  id: string;
-  text?: string
+  text?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "hooks-users".
+ */
 export interface HooksUser {
-  id: string
+  id: string;
-  roles: ('admin' | 'user')[]
+  roles: ('admin' | 'user')[];
-  updatedAt: string
+  afterLoginHook?: boolean | null;
-  createdAt: string
+  updatedAt: string;
-  email?: string
+  createdAt: string;
-  resetPasswordToken?: string
+  email: string;
-  resetPasswordExpiration?: string
+  resetPasswordToken?: string | null;
-  loginAttempts?: number
+  resetPasswordExpiration?: string | null;
-  lockUntil?: string
+  salt?: string | null;
-  password?: string
+  hash?: string | null;
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "data-hooks".
+ */
+export interface DataHook {
+  id: string;
+  field_collectionAndField?: string | null;
+  collection_beforeOperation_collection?: string | null;
+  collection_beforeChange_collection?: string | null;
+  collection_afterChange_collection?: string | null;
+  collection_beforeRead_collection?: string | null;
+  collection_afterRead_collection?: string | null;
+  collection_afterOperation_collection?: string | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'hooks-users';
+    value: string | HooksUser;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "data-hooks-global".
+ */
+export interface DataHooksGlobal {
+  id: string;
+  field_globalAndField?: string | null;
+  global_beforeChange_global?: string | null;
+  global_afterChange_global?: string | null;
+  global_beforeRead_global?: string | null;
+  global_afterRead_global?: string | null;
+  updatedAt?: string | null;
+  createdAt?: string | null;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/hooks/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/live-preview/payload-types.ts

@@ -417,7 +417,6 @@ export interface Category {
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "ssr".
- */
 export interface Ssr {
   id: string;
   slug: string;
@@ -640,3 +639,9 @@ export interface Footer {
   updatedAt?: string | null;
   createdAt?: string | null;
 }
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/localization-rtl/config.ts

@@ -1,4 +1,3 @@
-import en from '../../packages/payload/src/translations/en.json'
 import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
 import { ar } from './ar.js'
@@ -8,13 +7,13 @@ import deepMerge from './deepMerge.js'
 
 export default buildConfigWithDefaults({
   collections: [Users, Posts],
-  i18n: {
+  /*i18n: {
     fallbackLng: 'en', // default
     debug: false, // default
     resources: {
       ar: deepMerge(en, ar),
     },
-  },
+  },*/
   localization: {
     locales: [
       {

test/localization-rtl/payload-types.ts

@@ -0,0 +1,104 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * This file was automatically generated by Payload.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {
+  collections: {
+    users: User;
+    posts: Post;
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
+  globals: {};
+  locale: 'en' | 'ar';
+  user: User & {
+    collection: 'users';
+  };
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  updatedAt: string;
+  createdAt: string;
+  email: string;
+  resetPasswordToken?: string | null;
+  resetPasswordExpiration?: string | null;
+  salt?: string | null;
+  hash?: string | null;
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "posts".
+ */
+export interface Post {
+  id: string;
+  title?: string | null;
+  description?: string | null;
+  content?: {
+    root: {
+      type: string;
+      children: {
+        type: string;
+        version: number;
+        [k: string]: unknown;
+      }[];
+      direction: ('ltr' | 'rtl') | null;
+      format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | '';
+      indent: number;
+      version: number;
+    };
+    [k: string]: unknown;
+  } | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/localization-rtl/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/localization/payload-types.ts

@@ -8,175 +8,291 @@
 
 export interface Config {
   collections: {
-    users: User
+    users: User;
-    'localized-posts': LocalizedPost
+    'localized-posts': LocalizedPost;
-    'array-fields': ArrayField
+    'array-fields': ArrayField;
-    'localized-required': LocalizedRequired
+    'localized-required': LocalizedRequired;
-    'with-localized-relationship': WithLocalizedRelationship
+    'with-localized-relationship': WithLocalizedRelationship;
-    'relationship-localized': RelationshipLocalized
+    'relationship-localized': RelationshipLocalized;
-    dummy: Dummy
+    dummy: Dummy;
-    'payload-preferences': PayloadPreference
+    nested: Nested;
-    'payload-migrations': PayloadMigration
+    'localized-sort': LocalizedSort;
-  }
+    'blocks-same-name': BlocksSameName;
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
   globals: {
-    'global-array': GlobalArray
+    'global-array': GlobalArray;
-  }
+  };
+  locale: 'en' | 'es' | 'pt' | 'ar';
+  user: User & {
+    collection: 'users';
+  };
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
-  id: string
+  id: string;
-  relation?: (string | null) | LocalizedPost
+  relation?: (string | null) | LocalizedPost;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email: string
+  email: string;
-  resetPasswordToken?: string | null
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string | null
+  resetPasswordExpiration?: string | null;
-  salt?: string | null
+  salt?: string | null;
-  hash?: string | null
+  hash?: string | null;
-  loginAttempts?: number | null
+  loginAttempts?: number | null;
-  lockUntil?: string | null
+  lockUntil?: string | null;
-  password: string | null
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "localized-posts".
+ */
 export interface LocalizedPost {
-  id: string
+  id: string;
-  title?: string | null
+  title?: string | null;
-  description?: string | null
+  description?: string | null;
-  localizedCheckbox?: boolean | null
+  localizedCheckbox?: boolean | null;
-  updatedAt: string
+  children?: (string | LocalizedPost)[] | null;
-  createdAt: string
+  group?: {
+    children?: string | null;
+  };
+  updatedAt: string;
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "array-fields".
+ */
 export interface ArrayField {
-  id: string
+  id: string;
   items?:
     | {
-        text: string
+        text: string;
-        id?: string | null
+        id?: string | null;
       }[]
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "localized-required".
+ */
 export interface LocalizedRequired {
-  id: string
+  id: string;
-  title: string
+  title: string;
   layout: (
     | {
-        text?: string | null
+        text?: string | null;
-        id?: string | null
+        id?: string | null;
-        blockName?: string | null
+        blockName?: string | null;
-        blockType: 'text'
+        blockType: 'text';
       }
     | {
-        number?: number | null
+        number?: number | null;
-        id?: string | null
+        id?: string | null;
-        blockName?: string | null
+        blockName?: string | null;
-        blockType: 'number'
+        blockType: 'number';
       }
-  )[]
+  )[];
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "with-localized-relationship".
+ */
 export interface WithLocalizedRelationship {
-  id: string
+  id: string;
-  localizedRelationship?: (string | null) | LocalizedPost
+  localizedRelationship?: (string | null) | LocalizedPost;
-  localizedRelationHasManyField?: (string | LocalizedPost)[] | null
+  localizedRelationHasManyField?: (string | LocalizedPost)[] | null;
   localizedRelationMultiRelationTo?:
     | ({
-        relationTo: 'localized-posts'
+        relationTo: 'localized-posts';
-        value: string | LocalizedPost
+        value: string | LocalizedPost;
       } | null)
     | ({
-        relationTo: 'dummy'
+        relationTo: 'dummy';
-        value: string | Dummy
+        value: string | Dummy;
-      } | null)
+      } | null);
   localizedRelationMultiRelationToHasMany?:
     | (
         | {
-            relationTo: 'localized-posts'
+            relationTo: 'localized-posts';
-            value: string | LocalizedPost
+            value: string | LocalizedPost;
           }
         | {
-            relationTo: 'dummy'
+            relationTo: 'dummy';
-            value: string | Dummy
+            value: string | Dummy;
           }
       )[]
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "dummy".
+ */
 export interface Dummy {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relationship-localized".
+ */
 export interface RelationshipLocalized {
-  id: string
+  id: string;
-  relationship?: (string | null) | LocalizedPost
+  relationship?: (string | null) | LocalizedPost;
-  relationshipHasMany?: (string | LocalizedPost)[] | null
+  relationshipHasMany?: (string | LocalizedPost)[] | null;
   relationMultiRelationTo?:
     | ({
-        relationTo: 'localized-posts'
+        relationTo: 'localized-posts';
-        value: string | LocalizedPost
+        value: string | LocalizedPost;
       } | null)
     | ({
-        relationTo: 'dummy'
+        relationTo: 'dummy';
-        value: string | Dummy
+        value: string | Dummy;
-      } | null)
+      } | null);
   relationMultiRelationToHasMany?:
     | (
         | {
-            relationTo: 'localized-posts'
+            relationTo: 'localized-posts';
-            value: string | LocalizedPost
+            value: string | LocalizedPost;
           }
         | {
-            relationTo: 'dummy'
+            relationTo: 'dummy';
-            value: string | Dummy
+            value: string | Dummy;
           }
       )[]
-    | null
+    | null;
   arrayField?:
     | {
-        nestedRelation?: (string | null) | LocalizedPost
+        nestedRelation?: (string | null) | LocalizedPost;
-        id?: string | null
+        id?: string | null;
       }[]
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "nested".
+ */
+export interface Nested {
+  id: string;
+  blocks?:
+    | {
+        array?:
+          | {
+              text?: string | null;
+              textNotLocalized?: string | null;
+              id?: string | null;
+            }[]
+          | null;
+        id?: string | null;
+        blockName?: string | null;
+        blockType: 'block';
+      }[]
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "localized-sort".
+ */
+export interface LocalizedSort {
+  id: string;
+  title?: string | null;
+  date?: string | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "blocks-same-name".
+ */
+export interface BlocksSameName {
+  id: string;
+  blocks?:
+    | (
+        | {
+            title?: string | null;
+            id?: string | null;
+            blockName?: string | null;
+            blockType: 'block_first';
+          }
+        | {
+            title?: string | null;
+            id?: string | null;
+            blockName?: string | null;
+            blockType: 'block_second';
+          }
+      )[]
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
 export interface PayloadPreference {
-  id: string
+  id: string;
   user: {
-    relationTo: 'users'
+    relationTo: 'users';
-    value: string | User
+    value: string | User;
-  }
+  };
-  key?: string | null
+  key?: string | null;
   value?:
     | {
-        [k: string]: unknown
+        [k: string]: unknown;
       }
     | unknown[]
     | string
     | number
     | boolean
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
 export interface PayloadMigration {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  batch?: number | null
+  batch?: number | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "global-array".
+ */
 export interface GlobalArray {
-  id: string
+  id: string;
   array?:
     | {
-        text?: string | null
+        text?: string | null;
-        id?: string | null
+        id?: string | null;
       }[]
-    | null
+    | null;
-  updatedAt?: string | null
+  updatedAt?: string | null;
-  createdAt?: string | null
+  createdAt?: string | null;
 }
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/localization/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/migrations-cli/payload-types.ts

@@ -1,48 +1,77 @@
 /* tslint:disable */
+/* eslint-disable */
 /**
- * This file was automatically generated by Payload CMS.
+ * This file was automatically generated by Payload.
  * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
  * and re-run `payload generate:types` to regenerate this file.
  */
 
 export interface Config {
   collections: {
-    users: User
+    users: User;
-    'payload-preferences': PayloadPreference
+    'payload-preferences': PayloadPreference;
-  }
+    'payload-migrations': PayloadMigration;
-  globals: {}
+  };
+  globals: {};
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
-  id: string
+  id: string;
-  custom?: string
+  updatedAt: string;
-  checkbox?: boolean
+  createdAt: string;
-  updatedAt: string
+  email: string;
-  createdAt: string
+  resetPasswordToken?: string | null;
-  email: string
+  resetPasswordExpiration?: string | null;
-  resetPasswordToken?: string
+  salt?: string | null;
-  resetPasswordExpiration?: string
+  hash?: string | null;
-  salt?: string
+  loginAttempts?: number | null;
-  hash?: string
+  lockUntil?: string | null;
-  loginAttempts?: number
+  password?: string | null;
-  lockUntil?: string
-  password?: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
 export interface PayloadPreference {
-  id: string
+  id: string;
   user: {
-    value: string | User
+    relationTo: 'users';
-    relationTo: 'users'
+    value: string | User;
-  }
+  };
-  key?: string
+  key?: string | null;
   value?:
     | {
-        [k: string]: unknown
+        [k: string]: unknown;
       }
     | unknown[]
     | string
     | number
     | boolean
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/migrations-cli/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/nested-fields/payload-types.ts

@@ -0,0 +1,164 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * This file was automatically generated by Payload.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {
+  collections: {
+    'nested-fields': NestedField;
+    users: User;
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
+  globals: {};
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "nested-fields".
+ */
+export interface NestedField {
+  id: string;
+  array?:
+    | {
+        group?: {
+          namedTab: {
+            blocks?:
+              | {
+                  text?: string | null;
+                  blockArray?:
+                    | {
+                        arrayText?: string | null;
+                        id?: string | null;
+                      }[]
+                    | null;
+                  id?: string | null;
+                  blockName?: string | null;
+                  blockType: 'blockWithFields';
+                }[]
+              | null;
+          };
+        };
+        id?: string | null;
+      }[]
+    | null;
+  tab1: {
+    layout?:
+      | (
+          | {
+              items?:
+                | {
+                    title: string;
+                    id?: string | null;
+                  }[]
+                | null;
+              id?: string | null;
+              blockName?: string | null;
+              blockType: 'block-1';
+            }
+          | {
+              items?:
+                | {
+                    title2: string;
+                    id?: string | null;
+                  }[]
+                | null;
+              id?: string | null;
+              blockName?: string | null;
+              blockType: 'block-2';
+            }
+        )[]
+      | null;
+  };
+  blocksWithSimilarConfigs?:
+    | (
+        | {
+            items?:
+              | {
+                  title: string;
+                  id?: string | null;
+                }[]
+              | null;
+            id?: string | null;
+            blockName?: string | null;
+            blockType: 'block-1';
+          }
+        | {
+            items?:
+              | {
+                  title2: string;
+                  id?: string | null;
+                }[]
+              | null;
+            id?: string | null;
+            blockName?: string | null;
+            blockType: 'block-2';
+          }
+      )[]
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  updatedAt: string;
+  createdAt: string;
+  email: string;
+  resetPasswordToken?: string | null;
+  resetPasswordExpiration?: string | null;
+  salt?: string | null;
+  hash?: string | null;
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/nested-fields/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/plugin-cloud-storage/payload-types.ts

@@ -0,0 +1,131 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * This file was automatically generated by Payload.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {
+  collections: {
+    media: Media;
+    'media-with-prefix': MediaWithPrefix;
+    users: User;
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
+  globals: {};
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "media".
+ */
+export interface Media {
+  id: string;
+  alt?: string | null;
+  updatedAt: string;
+  createdAt: string;
+  url?: string | null;
+  thumbnailURL?: string | null;
+  filename?: string | null;
+  mimeType?: string | null;
+  filesize?: number | null;
+  width?: number | null;
+  height?: number | null;
+  sizes?: {
+    square?: {
+      url?: string | null;
+      width?: number | null;
+      height?: number | null;
+      mimeType?: string | null;
+      filesize?: number | null;
+      filename?: string | null;
+    };
+    sixteenByNineMedium?: {
+      url?: string | null;
+      width?: number | null;
+      height?: number | null;
+      mimeType?: string | null;
+      filesize?: number | null;
+      filename?: string | null;
+    };
+  };
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "media-with-prefix".
+ */
+export interface MediaWithPrefix {
+  id: string;
+  prefix?: string | null;
+  updatedAt: string;
+  createdAt: string;
+  url?: string | null;
+  thumbnailURL?: string | null;
+  filename?: string | null;
+  mimeType?: string | null;
+  filesize?: number | null;
+  width?: number | null;
+  height?: number | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  updatedAt: string;
+  createdAt: string;
+  email: string;
+  resetPasswordToken?: string | null;
+  resetPasswordExpiration?: string | null;
+  salt?: string | null;
+  hash?: string | null;
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/plugin-cloud-storage/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/plugin-cloud/payload-types.ts

@@ -0,0 +1,113 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * This file was automatically generated by Payload.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {
+  collections: {
+    media: Media;
+    users: User;
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
+  globals: {};
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "media".
+ */
+export interface Media {
+  id: string;
+  alt?: string | null;
+  updatedAt: string;
+  createdAt: string;
+  url?: string | null;
+  thumbnailURL?: string | null;
+  filename?: string | null;
+  mimeType?: string | null;
+  filesize?: number | null;
+  width?: number | null;
+  height?: number | null;
+  sizes?: {
+    square?: {
+      url?: string | null;
+      width?: number | null;
+      height?: number | null;
+      mimeType?: string | null;
+      filesize?: number | null;
+      filename?: string | null;
+    };
+    sixteenByNineMedium?: {
+      url?: string | null;
+      width?: number | null;
+      height?: number | null;
+      mimeType?: string | null;
+      filesize?: number | null;
+      filename?: string | null;
+    };
+  };
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  updatedAt: string;
+  createdAt: string;
+  email: string;
+  resetPasswordToken?: string | null;
+  resetPasswordExpiration?: string | null;
+  salt?: string | null;
+  hash?: string | null;
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/plugin-cloud/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/plugin-form-builder/payload-types.ts

@@ -8,246 +8,280 @@
 
 export interface Config {
   collections: {
-    pages: Page
+    pages: Page;
-    users: User
+    users: User;
-    forms: Form
+    forms: Form;
-    'form-submissions': FormSubmission
+    'form-submissions': FormSubmission;
-    'payload-preferences': PayloadPreference
+    'payload-preferences': PayloadPreference;
-    'payload-migrations': PayloadMigration
+    'payload-migrations': PayloadMigration;
-  }
+  };
-  globals: {}
+  globals: {};
+  locale: 'en' | 'es' | 'de';
+  user: User & {
+    collection: 'users';
+  };
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "pages".
+ */
 export interface Page {
-  id: string
+  id: string;
-  title: string
+  title: string;
-  slug: string
+  slug: string;
-  form?: (string | null) | Form
+  form?: (string | null) | Form;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "forms".
+ */
 export interface Form {
-  id: string
+  id: string;
-  title: string
+  title: string;
   fields?:
     | (
         | {
-            name: string
+            name: string;
-            label?: string | null
+            label?: string | null;
-            width?: number | null
+            width?: number | null;
-            required?: boolean | null
+            required?: boolean | null;
-            defaultValue?: boolean | null
+            defaultValue?: boolean | null;
-            id?: string | null
+            id?: string | null;
-            blockName?: string | null
+            blockName?: string | null;
-            blockType: 'checkbox'
+            blockType: 'checkbox';
           }
         | {
-            name: string
+            name: string;
-            label?: string | null
+            label?: string | null;
-            width?: number | null
+            width?: number | null;
-            required?: boolean | null
+            required?: boolean | null;
-            id?: string | null
+            id?: string | null;
-            blockName?: string | null
+            blockName?: string | null;
-            blockType: 'country'
+            blockType: 'country';
           }
         | {
-            name: string
+            name: string;
-            label?: string | null
+            label?: string | null;
-            width?: number | null
+            width?: number | null;
-            required?: boolean | null
+            required?: boolean | null;
-            id?: string | null
+            id?: string | null;
-            blockName?: string | null
+            blockName?: string | null;
-            blockType: 'email'
+            blockType: 'email';
           }
         | {
             message?:
               | {
-                  [k: string]: unknown
+                  [k: string]: unknown;
                 }[]
-              | null
+              | null;
-            id?: string | null
+            id?: string | null;
-            blockName?: string | null
+            blockName?: string | null;
-            blockType: 'message'
+            blockType: 'message';
           }
         | {
-            name: string
+            name: string;
-            label?: string | null
+            label?: string | null;
-            width?: number | null
+            width?: number | null;
-            defaultValue?: number | null
+            defaultValue?: number | null;
-            required?: boolean | null
+            required?: boolean | null;
-            id?: string | null
+            id?: string | null;
-            blockName?: string | null
+            blockName?: string | null;
-            blockType: 'number'
+            blockType: 'number';
           }
         | {
-            name: string
+            name: string;
-            label?: string | null
+            label?: string | null;
-            width?: number | null
+            width?: number | null;
-            basePrice?: number | null
+            basePrice?: number | null;
             priceConditions?:
               | {
-                  fieldToUse?: string | null
+                  fieldToUse?: string | null;
-                  condition?: ('hasValue' | 'equals' | 'notEquals') | null
+                  condition?: ('hasValue' | 'equals' | 'notEquals') | null;
-                  valueForCondition?: string | null
+                  valueForCondition?: string | null;
-                  operator?: ('add' | 'subtract' | 'multiply' | 'divide') | null
+                  operator?: ('add' | 'subtract' | 'multiply' | 'divide') | null;
-                  valueType?: ('static' | 'valueOfField') | null
+                  valueType?: ('static' | 'valueOfField') | null;
-                  valueForOperator?: string | null
+                  valueForOperator?: string | null;
-                  id?: string | null
+                  id?: string | null;
                 }[]
-              | null
+              | null;
-            required?: boolean | null
+            required?: boolean | null;
-            id?: string | null
+            id?: string | null;
-            blockName?: string | null
+            blockName?: string | null;
-            blockType: 'payment'
+            blockType: 'payment';
           }
         | {
-            name: string
+            name: string;
-            label?: string | null
+            label?: string | null;
-            width?: number | null
+            width?: number | null;
-            defaultValue?: string | null
+            defaultValue?: string | null;
             options?:
               | {
-                  label: string
+                  label: string;
-                  value: string
+                  value: string;
-                  id?: string | null
+                  id?: string | null;
                 }[]
-              | null
+              | null;
-            required?: boolean | null
+            required?: boolean | null;
-            id?: string | null
+            id?: string | null;
-            blockName?: string | null
+            blockName?: string | null;
-            blockType: 'select'
+            blockType: 'select';
           }
         | {
-            name: string
+            name: string;
-            label?: string | null
+            label?: string | null;
-            width?: number | null
+            width?: number | null;
-            required?: boolean | null
+            required?: boolean | null;
-            id?: string | null
+            id?: string | null;
-            blockName?: string | null
+            blockName?: string | null;
-            blockType: 'state'
+            blockType: 'state';
           }
         | {
-            name: string
+            name: string;
-            label?: string | null
+            label?: string | null;
-            width?: number | null
+            width?: number | null;
-            defaultValue?: string | null
+            defaultValue?: string | null;
-            required?: boolean | null
+            required?: boolean | null;
-            id?: string | null
+            id?: string | null;
-            blockName?: string | null
+            blockName?: string | null;
-            blockType: 'text'
+            blockType: 'text';
           }
         | {
-            name: string
+            name: string;
-            label?: string | null
+            label?: string | null;
-            width?: number | null
+            width?: number | null;
-            defaultValue?: string | null
+            defaultValue?: string | null;
-            required?: boolean | null
+            required?: boolean | null;
-            id?: string | null
+            id?: string | null;
-            blockName?: string | null
+            blockName?: string | null;
-            blockType: 'textarea'
+            blockType: 'textarea';
           }
         | {
-            value?: string | null
+            value?: string | null;
-            id?: string | null
+            id?: string | null;
-            blockName?: string | null
+            blockName?: string | null;
-            blockType: 'color'
+            blockType: 'color';
           }
       )[]
-    | null
+    | null;
-  submitButtonLabel?: string | null
+  submitButtonLabel?: string | null;
-  confirmationType?: ('message' | 'redirect') | null
+  confirmationType?: ('message' | 'redirect') | null;
   confirmationMessage?:
     | {
-        [k: string]: unknown
+        [k: string]: unknown;
       }[]
-    | null
+    | null;
   redirect?: {
-    type?: ('reference' | 'custom') | null
+    type?: ('reference' | 'custom') | null;
     reference?: {
-      relationTo: 'pages'
+      relationTo: 'pages';
-      value: string | Page
+      value: string | Page;
-    } | null
+    } | null;
-    url?: string | null
+    url?: string | null;
-  }
+  };
   emails?:
     | {
-        emailTo?: string | null
+        emailTo?: string | null;
-        cc?: string | null
+        cc?: string | null;
-        bcc?: string | null
+        bcc?: string | null;
-        replyTo?: string | null
+        replyTo?: string | null;
-        emailFrom?: string | null
+        emailFrom?: string | null;
-        subject: string
+        subject: string;
         message?:
           | {
-              [k: string]: unknown
+              [k: string]: unknown;
             }[]
-          | null
+          | null;
-        id?: string | null
+        id?: string | null;
       }[]
-    | null
+    | null;
-  custom?: string | null
+  custom?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email: string
+  email: string;
-  resetPasswordToken?: string | null
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string | null
+  resetPasswordExpiration?: string | null;
-  salt?: string | null
+  salt?: string | null;
-  hash?: string | null
+  hash?: string | null;
-  loginAttempts?: number | null
+  loginAttempts?: number | null;
-  lockUntil?: string | null
+  lockUntil?: string | null;
-  password: string | null
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "form-submissions".
+ */
 export interface FormSubmission {
-  id: string
+  id: string;
-  form: string | Form
+  form: string | Form;
   submissionData?:
     | {
-        field: string
+        field: string;
-        value: string
+        value: string;
-        id?: string | null
+        id?: string | null;
       }[]
-    | null
+    | null;
   payment?: {
-    field?: string | null
+    field?: string | null;
-    status?: string | null
+    status?: string | null;
-    amount?: number | null
+    amount?: number | null;
-    paymentProcessor?: string | null
+    paymentProcessor?: string | null;
     creditCard?: {
-      token?: string | null
+      token?: string | null;
-      brand?: string | null
+      brand?: string | null;
-      number?: string | null
+      number?: string | null;
-    }
+    };
-  }
+  };
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
 export interface PayloadPreference {
-  id: string
+  id: string;
   user: {
-    relationTo: 'users'
+    relationTo: 'users';
-    value: string | User
+    value: string | User;
-  }
+  };
-  key?: string | null
+  key?: string | null;
   value?:
     | {
-        [k: string]: unknown
+        [k: string]: unknown;
       }
     | unknown[]
     | string
     | number
     | boolean
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
 export interface PayloadMigration {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  batch?: number | null
+  batch?: number | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/plugin-form-builder/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/plugin-nested-docs/payload-types.ts

@@ -8,108 +8,114 @@
 
 export interface Config {
   collections: {
-    pages: Page
+    pages: Page;
-    categories: Category
+    categories: Category;
-    users: User
+    users: User;
-    'payload-preferences': PayloadPreference
+    'payload-preferences': PayloadPreference;
-    'payload-migrations': PayloadMigration
+    'payload-migrations': PayloadMigration;
-  }
+  };
-  globals: {}
+  globals: {};
-  locale: 'en' | 'es' | 'de'
+  locale: 'en' | 'es' | 'de';
   user: User & {
-    collection: 'users'
+    collection: 'users';
-  }
+  };
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "pages".
  */
 export interface Page {
-  id: string
+  id: string;
-  title: string
+  title: string;
-  slug: string
+  slug: string;
-  fullTitle?: string | null
+  fullTitle?: string | null;
-  parent?: (string | null) | Page
+  parent?: (string | null) | Page;
   breadcrumbs?:
     | {
-        doc?: (string | null) | Page
+        doc?: (string | null) | Page;
-        url?: string | null
+        url?: string | null;
-        label?: string | null
+        label?: string | null;
-        id?: string | null
+        id?: string | null;
       }[]
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  _status?: ('draft' | 'published') | null
+  _status?: ('draft' | 'published') | null;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "categories".
  */
 export interface Category {
-  id: string
+  id: string;
-  name: string
+  name: string;
   categorization?:
     | {
-        doc?: (string | null) | Category
+        doc?: (string | null) | Category;
-        url?: string | null
+        url?: string | null;
-        label?: string | null
+        label?: string | null;
-        test?: string | null
+        test?: string | null;
-        id?: string | null
+        id?: string | null;
       }[]
-    | null
+    | null;
-  owner?: (string | null) | Category
+  owner?: (string | null) | Category;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "users".
  */
 export interface User {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email: string
+  email: string;
-  resetPasswordToken?: string | null
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string | null
+  resetPasswordExpiration?: string | null;
-  salt?: string | null
+  salt?: string | null;
-  hash?: string | null
+  hash?: string | null;
-  loginAttempts?: number | null
+  loginAttempts?: number | null;
-  lockUntil?: string | null
+  lockUntil?: string | null;
-  password?: string | null
+  password?: string | null;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "payload-preferences".
  */
 export interface PayloadPreference {
-  id: string
+  id: string;
   user: {
-    relationTo: 'users'
+    relationTo: 'users';
-    value: string | User
+    value: string | User;
-  }
+  };
-  key?: string | null
+  key?: string | null;
   value?:
     | {
-        [k: string]: unknown
+        [k: string]: unknown;
       }
     | unknown[]
     | string
     | number
     | boolean
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "payload-migrations".
  */
 export interface PayloadMigration {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  batch?: number | null
+  batch?: number | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/plugin-nested-docs/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/plugin-redirects/payload-types.ts

@@ -8,72 +8,102 @@
 
 export interface Config {
   collections: {
-    users: User
+    users: User;
-    pages: Page
+    pages: Page;
-    redirects: Redirect
+    redirects: Redirect;
-    'payload-preferences': PayloadPreference
+    'payload-preferences': PayloadPreference;
-    'payload-migrations': PayloadMigration
+    'payload-migrations': PayloadMigration;
-  }
+  };
-  globals: {}
+  globals: {};
+  locale: 'en' | 'es' | 'de';
+  user: User & {
+    collection: 'users';
+  };
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email: string
+  email: string;
-  resetPasswordToken?: string | null
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string | null
+  resetPasswordExpiration?: string | null;
-  salt?: string | null
+  salt?: string | null;
-  hash?: string | null
+  hash?: string | null;
-  loginAttempts?: number | null
+  loginAttempts?: number | null;
-  lockUntil?: string | null
+  lockUntil?: string | null;
-  password: string | null
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "pages".
+ */
 export interface Page {
-  id: string
+  id: string;
-  title: string
+  title: string;
-  excerpt?: string | null
+  excerpt?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  _status?: ('draft' | 'published') | null
+  _status?: ('draft' | 'published') | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "redirects".
+ */
 export interface Redirect {
-  id: string
+  id: string;
-  from: string
+  from: string;
   to?: {
-    type?: ('reference' | 'custom') | null
+    type?: ('reference' | 'custom') | null;
     reference?: {
-      relationTo: 'pages'
+      relationTo: 'pages';
-      value: string | Page
+      value: string | Page;
-    } | null
+    } | null;
-    url?: string | null
+    url?: string | null;
-  }
+  };
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
 export interface PayloadPreference {
-  id: string
+  id: string;
   user: {
-    relationTo: 'users'
+    relationTo: 'users';
-    value: string | User
+    value: string | User;
-  }
+  };
-  key?: string | null
+  key?: string | null;
   value?:
     | {
-        [k: string]: unknown
+        [k: string]: unknown;
       }
     | unknown[]
     | string
     | number
     | boolean
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
 export interface PayloadMigration {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  batch?: number | null
+  batch?: number | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/plugin-redirects/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/plugin-search/payload-types.ts

@@ -0,0 +1,125 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * This file was automatically generated by Payload.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {
+  collections: {
+    users: User;
+    pages: Page;
+    posts: Post;
+    search: Search;
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
+  globals: {};
+  locale: 'en' | 'es' | 'de';
+  user: User & {
+    collection: 'users';
+  };
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  updatedAt: string;
+  createdAt: string;
+  email: string;
+  resetPasswordToken?: string | null;
+  resetPasswordExpiration?: string | null;
+  salt?: string | null;
+  hash?: string | null;
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "pages".
+ */
+export interface Page {
+  id: string;
+  title: string;
+  excerpt?: string | null;
+  updatedAt: string;
+  createdAt: string;
+  _status?: ('draft' | 'published') | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "posts".
+ */
+export interface Post {
+  id: string;
+  title: string;
+  excerpt?: string | null;
+  updatedAt: string;
+  createdAt: string;
+  _status?: ('draft' | 'published') | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "search".
+ */
+export interface Search {
+  id: string;
+  title?: string | null;
+  priority?: number | null;
+  doc:
+    | {
+        relationTo: 'pages';
+        value: string | Page;
+      }
+    | {
+        relationTo: 'posts';
+        value: string | Post;
+      };
+  excerpt?: string | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/plugin-search/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/plugin-sentry/payload-types.ts

@@ -8,55 +8,81 @@
 
 export interface Config {
   collections: {
-    posts: Post
+    posts: Post;
-    users: User
+    users: User;
-    'payload-preferences': PayloadPreference
+    'payload-preferences': PayloadPreference;
-    'payload-migrations': PayloadMigration
+    'payload-migrations': PayloadMigration;
-  }
+  };
-  globals: {}
+  globals: {};
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "posts".
+ */
 export interface Post {
-  id: string
+  id: string;
-  text?: string | null
+  text?: string | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email: string
+  email: string;
-  resetPasswordToken?: string | null
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string | null
+  resetPasswordExpiration?: string | null;
-  salt?: string | null
+  salt?: string | null;
-  hash?: string | null
+  hash?: string | null;
-  loginAttempts?: number | null
+  loginAttempts?: number | null;
-  lockUntil?: string | null
+  lockUntil?: string | null;
-  password: string | null
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
 export interface PayloadPreference {
-  id: string
+  id: string;
   user: {
-    relationTo: 'users'
+    relationTo: 'users';
-    value: string | User
+    value: string | User;
-  }
+  };
-  key?: string | null
+  key?: string | null;
   value?:
     | {
-        [k: string]: unknown
+        [k: string]: unknown;
       }
     | unknown[]
     | string
     | number
     | boolean
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
 export interface PayloadMigration {
-  id: string
+  id: string;
-  name?: string | null
+  name?: string | null;
-  batch?: number | null
+  batch?: number | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/plugin-sentry/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/plugin-seo/payload-types.ts

@@ -8,80 +8,123 @@
 
 export interface Config {
   collections: {
-    users: User
+    users: User;
-    pages: Page
+    pages: Page;
-    media: Media
+    media: Media;
-    'payload-preferences': PayloadPreference
+    'payload-preferences': PayloadPreference;
-    'payload-migrations': PayloadMigration
+    'payload-migrations': PayloadMigration;
-  }
+  };
-  globals: {}
+  globals: {};
+  locale: 'en' | 'es' | 'de';
+  user: User & {
+    collection: 'users';
+  };
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email: string
+  email: string;
-  resetPasswordToken?: string
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string
+  resetPasswordExpiration?: string | null;
-  salt?: string
+  salt?: string | null;
-  hash?: string
+  hash?: string | null;
-  loginAttempts?: number
+  loginAttempts?: number | null;
-  lockUntil?: string
+  lockUntil?: string | null;
-  password: string
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "pages".
+ */
 export interface Page {
-  id: string
+  id: string;
-  title: string
+  title: string;
-  excerpt?: string
+  excerpt?: string | null;
-  slug: string
+  slug: string;
-  meta?: {
+  meta: {
-    title?: string
+    title: string;
-    description?: string
+    description?: string | null;
-    image?: string | Media
+    image?: string | Media | null;
-    ogTitle?: string
+    ogTitle?: string | null;
-  }
+  };
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  _status?: 'draft' | 'published'
+  _status?: ('draft' | 'published') | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "media".
+ */
 export interface Media {
-  id: string
+  id: string;
-  media?: string | Media
+  media?: string | Media | null;
   richText?: {
-    [k: string]: unknown
+    root: {
-  }[]
+      type: string;
-  updatedAt: string
+      children: {
-  createdAt: string
+        type: string;
-  url?: string
+        version: number;
-  filename?: string
+        [k: string]: unknown;
-  mimeType?: string
+      }[];
-  filesize?: number
+      direction: ('ltr' | 'rtl') | null;
-  width?: number
+      format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | '';
-  height?: number
+      indent: number;
+      version: number;
+    };
+    [k: string]: unknown;
+  } | null;
+  updatedAt: string;
+  createdAt: string;
+  url?: string | null;
+  thumbnailURL?: string | null;
+  filename?: string | null;
+  mimeType?: string | null;
+  filesize?: number | null;
+  width?: number | null;
+  height?: number | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
 export interface PayloadPreference {
-  id: string
+  id: string;
   user: {
-    relationTo: 'users'
+    relationTo: 'users';
-    value: string | User
+    value: string | User;
-  }
+  };
-  key?: string
+  key?: string | null;
   value?:
     | {
-        [k: string]: unknown
+        [k: string]: unknown;
       }
     | unknown[]
     | string
     | number
     | boolean
-    | null
+    | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
 export interface PayloadMigration {
-  id: string
+  id: string;
-  name?: string
+  name?: string | null;
-  batch?: number
+  batch?: number | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/plugin-seo/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/plugin-stripe/payload-types.ts

@@ -0,0 +1,139 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * This file was automatically generated by Payload.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {
+  collections: {
+    users: User;
+    products: Product;
+    customers: Customer;
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
+  globals: {};
+  locale: 'en' | 'es' | 'de';
+  user:
+    | (User & {
+        collection: 'users';
+      })
+    | (Customer & {
+        collection: 'customers';
+      });
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  name?: string | null;
+  updatedAt: string;
+  createdAt: string;
+  email: string;
+  resetPasswordToken?: string | null;
+  resetPasswordExpiration?: string | null;
+  salt?: string | null;
+  hash?: string | null;
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "products".
+ */
+export interface Product {
+  id: string;
+  name?: string | null;
+  price?: {
+    stripePriceID?: string | null;
+    stripeJSON?: string | null;
+  };
+  stripeID?: string | null;
+  skipSync?: boolean | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "customers".
+ */
+export interface Customer {
+  id: string;
+  name?: string | null;
+  subscriptions?:
+    | {
+        stripeSubscriptionID?: string | null;
+        stripeProductID?: string | null;
+        product?: (string | null) | Product;
+        status?:
+          | ('active' | 'canceled' | 'incomplete' | 'incomplete_expired' | 'past_due' | 'trialing' | 'unpaid')
+          | null;
+        id?: string | null;
+      }[]
+    | null;
+  stripeID?: string | null;
+  skipSync?: boolean | null;
+  updatedAt: string;
+  createdAt: string;
+  enableAPIKey?: boolean | null;
+  apiKey?: string | null;
+  apiKeyIndex?: string | null;
+  email: string;
+  resetPasswordToken?: string | null;
+  resetPasswordExpiration?: string | null;
+  salt?: string | null;
+  hash?: string | null;
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user:
+    | {
+        relationTo: 'users';
+        value: string | User;
+      }
+    | {
+        relationTo: 'customers';
+        value: string | Customer;
+      };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/plugin-stripe/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/plugins/payload-types.ts

@@ -0,0 +1,88 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * This file was automatically generated by Payload.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {
+  collections: {
+    users: User;
+    pages: Page;
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
+  globals: {};
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  updatedAt: string;
+  createdAt: string;
+  email: string;
+  resetPasswordToken?: string | null;
+  resetPasswordExpiration?: string | null;
+  salt?: string | null;
+  hash?: string | null;
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "pages".
+ */
+export interface Page {
+  id: string;
+  title?: string | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/plugins/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/relationships/payload-types.ts

@@ -1,4 +1,5 @@
 /* tslint:disable */
+/* eslint-disable */
 /**
  * This file was automatically generated by Payload.
  * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
@@ -7,104 +8,235 @@
 
 export interface Config {
   collections: {
-    posts: Post
+    posts: Post;
-    postsLocalized: PostsLocalized
+    postsLocalized: PostsLocalized;
-    relation: Relation
+    relation: Relation;
-    'strict-access': StrictAccess
+    'strict-access': StrictAccess;
-    'chained-relation': ChainedRelation
+    chained: Chained;
-    'custom-id-relation': CustomIdRelation
+    'custom-id': CustomId;
-    'custom-id-number-relation': CustomIdNumberRelation
+    'custom-id-number': CustomIdNumber;
-    screenings: Screening
+    screenings: Screening;
-    movies: Movie
+    movies: Movie;
-    directors: Director
+    directors: Director;
-    users: User
+    movieReviews: MovieReview;
-  }
+    'polymorphic-relationships': PolymorphicRelationship;
-  globals: {}
+    tree: Tree;
+    users: User;
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
+  globals: {};
+  locale: 'en' | 'de';
+  user: User & {
+    collection: 'users';
+  };
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "posts".
+ */
 export interface Post {
-  id: string
+  id: string;
-  title?: string
+  title?: string | null;
-  description?: string
+  description?: string | null;
-  number?: number
+  number?: number | null;
-  relationField?: string | Relation
+  relationField?: (string | null) | Relation;
-  defaultAccessRelation?: string | StrictAccess
+  defaultAccessRelation?: (string | null) | StrictAccess;
-  chainedRelation?: string | ChainedRelation
+  chainedRelation?: (string | null) | Chained;
-  maxDepthRelation?: string | Relation
+  maxDepthRelation?: (string | null) | Relation;
-  customIdRelation?: string | CustomIdRelation
+  customIdRelation?: (string | null) | CustomId;
-  customIdNumberRelation?: number | CustomIdNumberRelation
+  customIdNumberRelation?: (number | null) | CustomIdNumber;
-  filteredRelation?: string | Relation
+  filteredRelation?: (string | null) | Relation;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-}
-export interface PostsLocalized {
-  id: string
-  title?: string | null
-  relationField?: (string | null) | Relation
-  updatedAt: string
-  createdAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "relation".
+ */
 export interface Relation {
-  id: string
+  id: string;
-  name?: string
+  name?: string | null;
-  disableRelation: boolean
+  disableRelation: boolean;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "strict-access".
+ */
 export interface StrictAccess {
-  id: string
+  id: string;
-  name?: string
+  name?: string | null;
-  disableRelation: boolean
+  disableRelation: boolean;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
-export interface ChainedRelation {
+/**
-  id: string
+ * This interface was referenced by `Config`'s JSON-Schema
-  name?: string
+ * via the `definition` "chained".
-  relation?: string | ChainedRelation
+ */
-  updatedAt: string
+export interface Chained {
-  createdAt: string
+  id: string;
+  name?: string | null;
+  relation?: (string | null) | Chained;
+  updatedAt: string;
+  createdAt: string;
 }
-export interface CustomIdRelation {
+/**
-  id: string
+ * This interface was referenced by `Config`'s JSON-Schema
-  name?: string
+ * via the `definition` "custom-id".
-  updatedAt: string
+ */
-  createdAt: string
+export interface CustomId {
+  id: string;
+  name?: string | null;
+  updatedAt: string;
+  createdAt: string;
 }
-export interface CustomIdNumberRelation {
+/**
-  id: number
+ * This interface was referenced by `Config`'s JSON-Schema
-  name?: string
+ * via the `definition` "custom-id-number".
-  updatedAt: string
+ */
-  createdAt: string
+export interface CustomIdNumber {
+  id: number;
+  name?: string | null;
+  updatedAt: string;
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "postsLocalized".
+ */
+export interface PostsLocalized {
+  id: string;
+  title?: string | null;
+  relationField?: (string | null) | Relation;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "screenings".
+ */
 export interface Screening {
-  id: string
+  id: string;
-  name?: string
+  name?: string | null;
-  movie?: string | Movie
+  movie?: (string | null) | Movie;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "movies".
+ */
 export interface Movie {
-  id: string
+  id: string;
-  name?: string
+  name?: string | null;
-  director?: string | Director
+  director?: (string | null) | Director;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "directors".
+ */
 export interface Director {
-  id: string
+  id: string;
-  name?: string
+  name?: string | null;
-  movies?: Array<string | Movie>
+  movies?: (string | Movie)[] | null;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "movieReviews".
+ */
+export interface MovieReview {
+  id: string;
+  movieReviewer: string | User;
+  likes?: (string | User)[] | null;
+  visibility: 'followers' | 'public';
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
-  id: string
+  id: string;
-  updatedAt: string
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  email?: string
+  email: string;
-  resetPasswordToken?: string
+  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string
+  resetPasswordExpiration?: string | null;
-  loginAttempts?: number
+  salt?: string | null;
-  lockUntil?: string
+  hash?: string | null;
-  password?: string
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "polymorphic-relationships".
+ */
+export interface PolymorphicRelationship {
+  id: string;
+  polymorphic?: {
+    relationTo: 'movies';
+    value: string | Movie;
+  } | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "tree".
+ */
+export interface Tree {
+  id: string;
+  text?: string | null;
+  parent?: (string | null) | Tree;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/relationships/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/storage-azure/payload-types.ts

@@ -0,0 +1,131 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * This file was automatically generated by Payload.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {
+  collections: {
+    media: Media;
+    'media-with-prefix': MediaWithPrefix;
+    users: User;
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
+  globals: {};
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "media".
+ */
+export interface Media {
+  id: string;
+  alt?: string | null;
+  updatedAt: string;
+  createdAt: string;
+  url?: string | null;
+  thumbnailURL?: string | null;
+  filename?: string | null;
+  mimeType?: string | null;
+  filesize?: number | null;
+  width?: number | null;
+  height?: number | null;
+  sizes?: {
+    square?: {
+      url?: string | null;
+      width?: number | null;
+      height?: number | null;
+      mimeType?: string | null;
+      filesize?: number | null;
+      filename?: string | null;
+    };
+    sixteenByNineMedium?: {
+      url?: string | null;
+      width?: number | null;
+      height?: number | null;
+      mimeType?: string | null;
+      filesize?: number | null;
+      filename?: string | null;
+    };
+  };
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "media-with-prefix".
+ */
+export interface MediaWithPrefix {
+  id: string;
+  prefix?: string | null;
+  updatedAt: string;
+  createdAt: string;
+  url?: string | null;
+  thumbnailURL?: string | null;
+  filename?: string | null;
+  mimeType?: string | null;
+  filesize?: number | null;
+  width?: number | null;
+  height?: number | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  updatedAt: string;
+  createdAt: string;
+  email: string;
+  resetPasswordToken?: string | null;
+  resetPasswordExpiration?: string | null;
+  salt?: string | null;
+  hash?: string | null;
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/storage-azure/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/storage-gcs/payload-types.ts

@@ -0,0 +1,131 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * This file was automatically generated by Payload.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {
+  collections: {
+    media: Media;
+    'media-with-prefix': MediaWithPrefix;
+    users: User;
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
+  globals: {};
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "media".
+ */
+export interface Media {
+  id: string;
+  alt?: string | null;
+  updatedAt: string;
+  createdAt: string;
+  url?: string | null;
+  thumbnailURL?: string | null;
+  filename?: string | null;
+  mimeType?: string | null;
+  filesize?: number | null;
+  width?: number | null;
+  height?: number | null;
+  sizes?: {
+    square?: {
+      url?: string | null;
+      width?: number | null;
+      height?: number | null;
+      mimeType?: string | null;
+      filesize?: number | null;
+      filename?: string | null;
+    };
+    sixteenByNineMedium?: {
+      url?: string | null;
+      width?: number | null;
+      height?: number | null;
+      mimeType?: string | null;
+      filesize?: number | null;
+      filename?: string | null;
+    };
+  };
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "media-with-prefix".
+ */
+export interface MediaWithPrefix {
+  id: string;
+  prefix?: string | null;
+  updatedAt: string;
+  createdAt: string;
+  url?: string | null;
+  thumbnailURL?: string | null;
+  filename?: string | null;
+  mimeType?: string | null;
+  filesize?: number | null;
+  width?: number | null;
+  height?: number | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  updatedAt: string;
+  createdAt: string;
+  email: string;
+  resetPasswordToken?: string | null;
+  resetPasswordExpiration?: string | null;
+  salt?: string | null;
+  hash?: string | null;
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/storage-gcs/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/storage-s3/payload-types.ts

@@ -0,0 +1,131 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * This file was automatically generated by Payload.
+ * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
+ * and re-run `payload generate:types` to regenerate this file.
+ */
+
+export interface Config {
+  collections: {
+    media: Media;
+    'media-with-prefix': MediaWithPrefix;
+    users: User;
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
+  globals: {};
+  locale: null;
+  user: User & {
+    collection: 'users';
+  };
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "media".
+ */
+export interface Media {
+  id: string;
+  alt?: string | null;
+  updatedAt: string;
+  createdAt: string;
+  url?: string | null;
+  thumbnailURL?: string | null;
+  filename?: string | null;
+  mimeType?: string | null;
+  filesize?: number | null;
+  width?: number | null;
+  height?: number | null;
+  sizes?: {
+    square?: {
+      url?: string | null;
+      width?: number | null;
+      height?: number | null;
+      mimeType?: string | null;
+      filesize?: number | null;
+      filename?: string | null;
+    };
+    sixteenByNineMedium?: {
+      url?: string | null;
+      width?: number | null;
+      height?: number | null;
+      mimeType?: string | null;
+      filesize?: number | null;
+      filename?: string | null;
+    };
+  };
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "media-with-prefix".
+ */
+export interface MediaWithPrefix {
+  id: string;
+  prefix?: string | null;
+  updatedAt: string;
+  createdAt: string;
+  url?: string | null;
+  thumbnailURL?: string | null;
+  filename?: string | null;
+  mimeType?: string | null;
+  filesize?: number | null;
+  width?: number | null;
+  height?: number | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
+export interface User {
+  id: string;
+  updatedAt: string;
+  createdAt: string;
+  email: string;
+  resetPasswordToken?: string | null;
+  resetPasswordExpiration?: string | null;
+  salt?: string | null;
+  hash?: string | null;
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/storage-s3/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/storage-uploadthing/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/storage-vercel-blob/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/uploads/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}

test/versions/payload-types.ts

@@ -1,4 +1,5 @@
 /* tslint:disable */
+/* eslint-disable */
 /**
  * This file was automatically generated by Payload.
  * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
@@ -7,59 +8,193 @@
 
 export interface Config {
   collections: {
-    'autosave-posts': AutosavePost
+    'disable-publish': DisablePublish;
-    'draft-posts': DraftPost
+    posts: Post;
-    'version-posts': VersionPost
+    'autosave-posts': AutosavePost;
-    users: User
+    'draft-posts': DraftPost;
-  }
+    'version-posts': VersionPost;
+    'custom-ids': CustomId;
+    users: User;
+    'payload-preferences': PayloadPreference;
+    'payload-migrations': PayloadMigration;
+  };
   globals: {
-    'autosave-global': AutosaveGlobal
+    'autosave-global': AutosaveGlobal;
-    'draft-global': DraftGlobal
+    'draft-global': DraftGlobal;
-  }
+    'disable-publish-global': DisablePublishGlobal;
+  };
+  locale: 'en' | 'es';
+  user: User & {
+    collection: 'users';
+  };
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "disable-publish".
+ */
+export interface DisablePublish {
+  id: string;
+  title: string;
+  updatedAt: string;
+  createdAt: string;
+  _status?: ('draft' | 'published') | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "posts".
+ */
+export interface Post {
+  id: string;
+  relationToAutosaves?: (string | null) | AutosavePost;
+  relationToVersions?: (string | null) | VersionPost;
+  relationToDrafts?: (string | null) | DraftPost;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "autosave-posts".
+ */
 export interface AutosavePost {
-  id: string
+  id: string;
-  title: string
+  title: string;
-  description: string
+  description: string;
-  _status?: 'draft' | 'published'
+  updatedAt: string;
-  createdAt: string
+  createdAt: string;
-  updatedAt: string
+  _status?: ('draft' | 'published') | null;
-}
-export interface DraftPost {
-  id: string
-  title: string
-  description: string
-  radio?: 'test'
-  select?: ('test1' | 'test2')[]
-  _status?: 'draft' | 'published'
-  createdAt: string
-  updatedAt: string
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "version-posts".
+ */
 export interface VersionPost {
-  id: string
+  id: string;
-  title: string
+  title: string;
-  description: string
+  description: string;
-  createdAt: string
+  updatedAt: string;
-  updatedAt: string
+  createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "draft-posts".
+ */
+export interface DraftPost {
+  id: string;
+  title: string;
+  description: string;
+  radio?: 'test' | null;
+  select?: ('test1' | 'test2')[] | null;
+  blocksField?:
+    | {
+        text?: string | null;
+        localized?: string | null;
+        id?: string | null;
+        blockName?: string | null;
+        blockType: 'block';
+      }[]
+    | null;
+  relation?: (string | null) | DraftPost;
+  updatedAt: string;
+  createdAt: string;
+  _status?: ('draft' | 'published') | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "custom-ids".
+ */
+export interface CustomId {
+  id: string;
+  title?: string | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "users".
+ */
 export interface User {
-  id: string
+  id: string;
-  email?: string
+  updatedAt: string;
-  resetPasswordToken?: string
+  createdAt: string;
-  resetPasswordExpiration?: string
+  email: string;
-  loginAttempts?: number
+  resetPasswordToken?: string | null;
-  lockUntil?: string
+  resetPasswordExpiration?: string | null;
-  createdAt: string
+  salt?: string | null;
-  updatedAt: string
+  hash?: string | null;
-  password?: string
+  loginAttempts?: number | null;
+  lockUntil?: string | null;
+  password?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-preferences".
+ */
+export interface PayloadPreference {
+  id: string;
+  user: {
+    relationTo: 'users';
+    value: string | User;
+  };
+  key?: string | null;
+  value?:
+    | {
+        [k: string]: unknown;
+      }
+    | unknown[]
+    | string
+    | number
+    | boolean
+    | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "payload-migrations".
+ */
+export interface PayloadMigration {
+  id: string;
+  name?: string | null;
+  batch?: number | null;
+  updatedAt: string;
+  createdAt: string;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "autosave-global".
+ */
 export interface AutosaveGlobal {
-  id: string
+  id: string;
-  title: string
+  title: string;
-  _status?: 'draft' | 'published'
+  _status?: ('draft' | 'published') | null;
+  updatedAt?: string | null;
+  createdAt?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "draft-global".
+ */
 export interface DraftGlobal {
-  id: string
+  id: string;
-  title: string
+  title: string;
-  _status?: 'draft' | 'published'
+  _status?: ('draft' | 'published') | null;
+  updatedAt?: string | null;
+  createdAt?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "disable-publish-global".
+ */
+export interface DisablePublishGlobal {
+  id: string;
+  title?: string | null;
+  _status?: ('draft' | 'published') | null;
+  updatedAt?: string | null;
+  createdAt?: string | null;
+}
+
+
+declare module 'payload' {
+ // @ts-ignore 
+ export interface GeneratedTypes extends Config {}
+}

test/versions/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json",
+}