tabshift/payloadcms
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

chore: esm-ify payload

Browse Source
This commit is contained in:
James
2024-03-06 14:30:23 -05:00
parent 137952af73
commit 9674f4e739
208 changed files with 1178 additions and 1224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/payload/src/admin/RichText.ts
View File

@@ -1,9 +1,9 @@
import type { JSONSchema4 } from 'json-schema' import type { JSONSchema4 } from 'json-schema'
import type { SanitizedConfig } from '../config/types' import type { SanitizedConfig } from '../config/types.d.ts'
import type { Field, RichTextField, Validate } from '../fields/config/types' import type { Field, RichTextField, Validate } from '../fields/config/types.d.ts'
import type { PayloadRequest, RequestContext } from '../types' import type { PayloadRequest, RequestContext } from '../types/index.d.ts'
import type { CellComponentProps } from './elements/Cell' import type { CellComponentProps } from './elements/Cell.d.ts'
export type RichTextFieldProps< export type RichTextFieldProps<
Value extends object, Value extends object,

4
packages/payload/src/admin/elements/Cell.ts
View File

@@ -1,4 +1,4 @@
import type { SanitizedCollectionConfig } from '../../collections/config/types' import type { SanitizedCollectionConfig } from '../../collections/config/types.d.ts'
import type { import type {
BlockField, BlockField,
DateField, DateField,
@@ -7,7 +7,7 @@ import type {
Labels, Labels,
RelationshipField, RelationshipField,
SelectField, SelectField,
} from '../../fields/config/types' } from '../../fields/config/types.d.ts'
export type CellProps = { export type CellProps = {
/** /**

6
packages/payload/src/admin/elements/Tab.ts
View File

@@ -1,8 +1,8 @@
import type { I18n } from '@payloadcms/translations' import type { I18n } from '@payloadcms/translations'
import type { SanitizedCollectionConfig } from '../../collections/config/types' import type { SanitizedCollectionConfig } from '../../collections/config/types.d.ts'
import type { SanitizedConfig } from '../../config/types' import type { SanitizedConfig } from '../../config/types.d.ts'
import type { SanitizedGlobalConfig } from '../../globals/config/types' import type { SanitizedGlobalConfig } from '../../globals/config/types.d.ts'
export type DocumentTabProps = { export type DocumentTabProps = {
apiURL?: string apiURL?: string

2
packages/payload/src/admin/forms/Form.ts
View File

@@ -1,4 +1,4 @@
import type { ClientValidate, Field } from '../../fields/config/types' import type { ClientValidate, Field } from '../../fields/config/types.d.ts'
export type Data = { export type Data = {
[key: string]: any [key: string]: any

2
packages/payload/src/admin/forms/RowLabel.ts
View File

@@ -1,4 +1,4 @@
import type { Data } from './Form' import type { Data } from './Form.d.ts'
export type RowLabelArgs = { export type RowLabelArgs = {
data: Data data: Data

38
packages/payload/src/admin/types.ts
View File

@@ -1,34 +1,34 @@
export type { RichTextAdapter, RichTextFieldProps } from './RichText' export type { RichTextAdapter, RichTextFieldProps } from './RichText.d.ts'
export type { CellComponentProps, CellProps } from './elements/Cell' export type { CellComponentProps, CellProps } from './elements/Cell.d.ts'
export type { ConditionalDateProps } from './elements/DatePicker' export type { ConditionalDateProps } from './elements/DatePicker.d.ts'
export type { DayPickerProps, SharedProps, TimePickerProps } from './elements/DatePicker' export type { DayPickerProps, SharedProps, TimePickerProps } from './elements/DatePicker.d.ts'
export type { DefaultPreviewButtonProps } from './elements/PreviewButton' export type { DefaultPreviewButtonProps } from './elements/PreviewButton.d.ts'
export type { CustomPreviewButtonProps } from './elements/PreviewButton' export type { CustomPreviewButtonProps } from './elements/PreviewButton.d.ts'
export type { DefaultPublishButtonProps } from './elements/PublishButton' export type { DefaultPublishButtonProps } from './elements/PublishButton.d.ts'
export type { CustomPublishButtonProps } from './elements/PublishButton' export type { CustomPublishButtonProps } from './elements/PublishButton.d.ts'
export type { DefaultSaveButtonProps } from './elements/SaveButton' export type { DefaultSaveButtonProps } from './elements/SaveButton.d.ts'
export type { CustomSaveButtonProps } from './elements/SaveButton' export type { CustomSaveButtonProps } from './elements/SaveButton.d.ts'
export type { DefaultSaveDraftButtonProps } from './elements/SaveDraftButton' export type { DefaultSaveDraftButtonProps } from './elements/SaveDraftButton.d.ts'
export type { CustomSaveDraftButtonProps } from './elements/SaveDraftButton' export type { CustomSaveDraftButtonProps } from './elements/SaveDraftButton.d.ts'
export type { export type {
DocumentTab, DocumentTab,
DocumentTabComponent, DocumentTabComponent,
DocumentTabCondition, DocumentTabCondition,
DocumentTabConfig, DocumentTabConfig,
DocumentTabProps, DocumentTabProps,
} from './elements/Tab' } from './elements/Tab.d.ts'
export type { ErrorProps } from './forms/Error' export type { ErrorProps } from './forms/Error.d.ts'
export type { export type {
Description, Description,
DescriptionComponent, DescriptionComponent,
DescriptionFunction, DescriptionFunction,
} from './forms/FieldDescription' } from './forms/FieldDescription.d.ts'
export type { Data, FormField, FormState, Row } from './forms/Form' export type { Data, FormField, FormState, Row } from './forms/Form.d.ts'
export type { LabelProps } from './forms/Label' export type { LabelProps } from './forms/Label.d.ts'
export type { RowLabel, RowLabelComponent } from './forms/RowLabel' export type { RowLabel, RowLabelComponent } from './forms/RowLabel.d.ts'
export type { export type {
AdminViewComponent, AdminViewComponent,
EditViewProps, EditViewProps,
InitPageResult, InitPageResult,
ServerSideEditViewProps, ServerSideEditViewProps,
} from './views/types' } from './views/types.d.ts'

8
packages/payload/src/admin/views/types.ts
View File

@@ -1,9 +1,9 @@
import type { Translations } from '@payloadcms/translations' import type { Translations } from '@payloadcms/translations'
import type { Permissions, User } from '../../auth' import type { Permissions, User } from '../../auth/index.js'
import type { SanitizedCollectionConfig } from '../../collections/config/types' import type { SanitizedCollectionConfig } from '../../collections/config/types.d.ts'
import type { SanitizedGlobalConfig } from '../../globals/config/types' import type { SanitizedGlobalConfig } from '../../globals/config/types.d.ts'
import type { PayloadRequest } from '../../types' import type { PayloadRequest } from '../../types/index.d.ts'
export type AdminViewConfig = { export type AdminViewConfig = {
Component: AdminViewComponent Component: AdminViewComponent

6
packages/payload/src/auth/baseFields/accountLock.ts
View File

@@ -1,15 +1,15 @@
import type { Field } from '../../fields/config/types' import type { Field } from '../../fields/config/types.d.ts'
export default [ export default [
{ {
name: 'loginAttempts', name: 'loginAttempts',
type: 'number',
defaultValue: 0, defaultValue: 0,
hidden: true, hidden: true,
type: 'number',
}, },
{ {
name: 'lockUntil', name: 'lockUntil',
hidden: true,
type: 'date', type: 'date',
hidden: true,
}, },
] as Field[] ] as Field[]

4
packages/payload/src/auth/baseFields/apiKey.ts
View File

@@ -1,8 +1,8 @@
import crypto from 'crypto' import crypto from 'crypto'
import type { Field, FieldHook } from '../../fields/config/types' import type { Field, FieldHook } from '../../fields/config/types.d.ts'
import { extractTranslations } from '../../translations/extractTranslations' import { extractTranslations } from '../../translations/extractTranslations.js'
const labels = extractTranslations(['authentication:enableAPIKey', 'authentication:apiKey']) const labels = extractTranslations(['authentication:enableAPIKey', 'authentication:apiKey'])

6
packages/payload/src/auth/baseFields/auth.ts
View File

@@ -1,7 +1,7 @@
import type { Field } from '../../fields/config/types' import type { Field } from '../../fields/config/types.d.ts'
import { email } from '../../fields/validations' import { email } from '../../fields/validations.js'
import { extractTranslations } from '../../translations/extractTranslations' import { extractTranslations } from '../../translations/extractTranslations.js'
const labels = extractTranslations(['general:email']) const labels = extractTranslations(['general:email'])

8
packages/payload/src/auth/baseFields/verification.ts
View File

@@ -1,6 +1,6 @@
import type { Field, FieldHook } from '../../fields/config/types' import type { Field, FieldHook } from '../../fields/config/types.d.ts'
import { extractTranslations } from '../../translations/extractTranslations' import { extractTranslations } from '../../translations/extractTranslations.js'
const labels = extractTranslations(['authentication:verified']) const labels = extractTranslations(['authentication:verified'])
@@ -22,6 +22,7 @@ const autoRemoveVerificationToken: FieldHook = ({ data, operation, originalDoc,
export default [ export default [
{ {
name: '_verified', name: '_verified',
type: 'checkbox',
access: { access: {
create: ({ req: { user } }) => Boolean(user), create: ({ req: { user } }) => Boolean(user),
read: ({ req: { user } }) => Boolean(user), read: ({ req: { user } }) => Boolean(user),
@@ -33,14 +34,13 @@ export default [
}, },
}, },
label: labels['authentication:verified'], label: labels['authentication:verified'],
type: 'checkbox',
}, },
{ {
name: '_verificationToken', name: '_verificationToken',
type: 'text',
hidden: true, hidden: true,
hooks: { hooks: {
beforeChange: [autoRemoveVerificationToken], beforeChange: [autoRemoveVerificationToken],
}, },
type: 'text',
}, },
] as Field[] ] as Field[]

12
packages/payload/src/auth/cookies.ts
View File

@@ -1,5 +1,5 @@
import type { Payload } from '..' import type { Payload } from '../index.d.ts'
import type { SanitizedCollectionConfig } from './../collections/config/types' import type { SanitizedCollectionConfig } from './../collections/config/types.d.ts'
type CookieOptions = { type CookieOptions = {
domain?: string domain?: string
expires?: Date expires?: Date
@@ -84,8 +84,8 @@ export const generatePayloadCookie = ({
typeof collectionConfig.auth.cookies.sameSite === 'string' typeof collectionConfig.auth.cookies.sameSite === 'string'
? collectionConfig.auth.cookies.sameSite ? collectionConfig.auth.cookies.sameSite
: collectionConfig.auth.cookies.sameSite : collectionConfig.auth.cookies.sameSite
? 'Strict' ? 'Strict'
: undefined : undefined
return generateCookie({ return generateCookie({
name: `${payload.config.cookiePrefix}-token`, name: `${payload.config.cookiePrefix}-token`,
@@ -107,8 +107,8 @@ export const generateExpiredPayloadCookie = ({
typeof collectionConfig.auth.cookies.sameSite === 'string' typeof collectionConfig.auth.cookies.sameSite === 'string'
? collectionConfig.auth.cookies.sameSite ? collectionConfig.auth.cookies.sameSite
: collectionConfig.auth.cookies.sameSite : collectionConfig.auth.cookies.sameSite
? 'Strict' ? 'Strict'
: undefined : undefined
const expires = new Date(Date.now() - 1000) const expires = new Date(Date.now() - 1000)

2
packages/payload/src/auth/defaultAccess.ts
View File

@@ -1,3 +1,3 @@
import type { PayloadRequest } from '../types' import type { PayloadRequest } from '../types/index.d.ts'
export default ({ req: { user } }: { req: PayloadRequest }): boolean => Boolean(user) export default ({ req: { user } }: { req: PayloadRequest }): boolean => Boolean(user)

6
packages/payload/src/auth/defaultUser.ts
View File

@@ -1,10 +1,11 @@
import type { CollectionConfig } from '../collections/config/types' import type { CollectionConfig } from '../collections/config/types.d.ts'
import { extractTranslations } from '../translations/extractTranslations' import { extractTranslations } from '../translations/extractTranslations.js'
const labels = extractTranslations(['general:user', 'general:users']) const labels = extractTranslations(['general:user', 'general:users'])
export const defaultUserCollection: CollectionConfig = { export const defaultUserCollection: CollectionConfig = {
slug: 'users',
admin: { admin: {
useAsTitle: 'email', useAsTitle: 'email',
}, },
@@ -16,5 +17,4 @@ export const defaultUserCollection: CollectionConfig = {
plural: labels['general:users'], plural: labels['general:users'],
singular: labels['general:user'], singular: labels['general:user'],
}, },
slug: 'users',
} }

6
packages/payload/src/auth/executeAccess.ts
View File

@@ -1,7 +1,7 @@
import type { Access, AccessResult } from '../config/types' import type { Access, AccessResult } from '../config/types.d.ts'
import type { PayloadRequest } from '../exports/types' import type { PayloadRequest } from '../exports/types.d.ts'
import { Forbidden } from '../errors' import { Forbidden } from '../errors/index.js'
type OperationArgs = { type OperationArgs = {
data?: any data?: any

4
packages/payload/src/auth/extractJWT.ts
View File

@@ -1,6 +1,6 @@
import type { AuthStrategyFunctionArgs } from '.' import type { AuthStrategyFunctionArgs } from './index.d.ts'
import { parseCookies } from '../utilities/parseCookies' import { parseCookies } from '../utilities/parseCookies.js'
export const extractJWT = ( export const extractJWT = (
args: Pick<AuthStrategyFunctionArgs, 'cookies' | 'headers' | 'payload'>, args: Pick<AuthStrategyFunctionArgs, 'cookies' | 'headers' | 'payload'>,

10
packages/payload/src/auth/getAccessResults.ts
View File

@@ -1,7 +1,7 @@
import type { AllOperations, PayloadRequest } from '../types' import type { AllOperations, PayloadRequest } from '../types/index.d.ts'
import type { Permissions } from './types' import type { Permissions } from './types.d.ts'
import { getEntityPolicies } from '../utilities/getEntityPolicies' import { getEntityPolicies } from '../utilities/getEntityPolicies.js'
type GetAccessResultsArgs = { type GetAccessResultsArgs = {
req: PayloadRequest req: PayloadRequest
@@ -44,10 +44,10 @@ export async function getAccessResults({ req }: GetAccessResultsArgs): Promise<P
} }
const collectionPolicy = await getEntityPolicies({ const collectionPolicy = await getEntityPolicies({
type: 'collection',
entity: collection, entity: collection,
operations: collectionOperations, operations: collectionOperations,
req, req,
type: 'collection',
}) })
results.collections = { results.collections = {
...results.collections, ...results.collections,
@@ -65,10 +65,10 @@ export async function getAccessResults({ req }: GetAccessResultsArgs): Promise<P
} }
const globalPolicy = await getEntityPolicies({ const globalPolicy = await getEntityPolicies({
type: 'global',
entity: global, entity: global,
operations: globalOperations, operations: globalOperations,
req, req,
type: 'global',
}) })
results.globals = { results.globals = {
...results.globals, ...results.globals,

2
packages/payload/src/auth/getAuthenticatedUser.ts
View File

@@ -1,4 +1,4 @@
import type { AuthStrategyFunctionArgs, User } from '.' import type { AuthStrategyFunctionArgs, User } from './index.d.ts'
export const getAuthenticatedUser = async ( export const getAuthenticatedUser = async (
args: AuthStrategyFunctionArgs, args: AuthStrategyFunctionArgs,

8
packages/payload/src/auth/getFieldsToSign.ts
View File

@@ -1,9 +1,9 @@
/* eslint-disable no-param-reassign */ /* eslint-disable no-param-reassign */
import type { User } from '.' import type { CollectionConfig } from '../collections/config/types.d.ts'
import type { CollectionConfig } from '../collections/config/types' import type { Field, TabAsField } from '../fields/config/types.d.ts'
import type { Field, TabAsField } from '../fields/config/types' import type { User } from './index.d.ts'
import { fieldAffectsData, tabHasName } from '../fields/config/types' import { fieldAffectsData, tabHasName } from '../fields/config/types.js'
type TraverseFieldsArgs = { type TraverseFieldsArgs = {
data: Record<string, unknown> data: Record<string, unknown>

6
packages/payload/src/auth/index.ts
View File

@@ -1,4 +1,4 @@
export * from './types' export * from './types.js'
export { extractJWT } from './extractJWT' export { extractJWT } from './extractJWT.js'
export * from './cookies' export * from './cookies.js'

14
packages/payload/src/auth/operations/access.ts
View File

@@ -1,11 +1,11 @@
import type { PayloadRequest } from '../../types' import type { PayloadRequest } from '../../types/index.d.ts'
import type { Permissions } from '../types' import type { Permissions } from '../types.d.ts'
import { commitTransaction } from '../../utilities/commitTransaction' import { commitTransaction } from '../../utilities/commitTransaction.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
import { adminInit as adminInitTelemetry } from '../../utilities/telemetry/events/adminInit' import { adminInit as adminInitTelemetry } from '../../utilities/telemetry/events/adminInit.js'
import { getAccessResults } from '../getAccessResults' import { getAccessResults } from '../getAccessResults.js'
type Arguments = { type Arguments = {
req: PayloadRequest req: PayloadRequest

14
packages/payload/src/auth/operations/forgotPassword.ts
View File

@@ -1,14 +1,14 @@
import crypto from 'crypto' import crypto from 'crypto'
import { URL } from 'url' import { URL } from 'url'
import type { Collection } from '../../collections/config/types' import type { Collection } from '../../collections/config/types.d.ts'
import type { PayloadRequest } from '../../types' import type { PayloadRequest } from '../../types/index.d.ts'
import { buildAfterOperation } from '../../collections/operations/utils' import { buildAfterOperation } from '../../collections/operations/utils.js'
import { APIError } from '../../errors' import { APIError } from '../../errors/index.js'
import { commitTransaction } from '../../utilities/commitTransaction' import { commitTransaction } from '../../utilities/commitTransaction.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
export type Arguments = { export type Arguments = {
collection: Collection collection: Collection

2
packages/payload/src/auth/operations/init.ts
View File

@@ -1,4 +1,4 @@
import type { PayloadRequest } from '../../types' import type { PayloadRequest } from '../../types/index.d.ts'
export const initOperation = async (args: { export const initOperation = async (args: {
collection: string collection: string

12
packages/payload/src/auth/operations/local/forgotPassword.ts
View File

@@ -1,10 +1,10 @@
import type { GeneratedTypes, Payload, RequestContext } from '../../..' import type { GeneratedTypes, Payload, RequestContext } from '../../../index.d.ts'
import type { PayloadRequest } from '../../../types' import type { PayloadRequest } from '../../../types/index.d.ts'
import type { Result } from '../forgotPassword' import type { Result } from '../forgotPassword.d.ts'
import { APIError } from '../../../errors' import { APIError } from '../../../errors/index.js'
import { createLocalReq } from '../../../utilities/createLocalReq' import { createLocalReq } from '../../../utilities/createLocalReq.js'
import { forgotPasswordOperation } from '../forgotPassword' import { forgotPasswordOperation } from '../forgotPassword.js'
export type Options<T extends keyof GeneratedTypes['collections']> = { export type Options<T extends keyof GeneratedTypes['collections']> = {
collection: T collection: T

10
packages/payload/src/auth/operations/local/index.ts
View File

@@ -1,8 +1,8 @@
import forgotPassword from './forgotPassword' import forgotPassword from './forgotPassword.js'
import login from './login' import login from './login.js'
import resetPassword from './resetPassword' import resetPassword from './resetPassword.js'
import unlock from './unlock' import unlock from './unlock.js'
import verifyEmail from './verifyEmail' import verifyEmail from './verifyEmail.js'
export default { export default {
forgotPassword, forgotPassword,

14
packages/payload/src/auth/operations/local/login.ts
View File

@@ -1,11 +1,11 @@
import type { Payload, RequestContext } from '../../..' import type { Payload, RequestContext } from '../../../index.d.ts'
import type { GeneratedTypes } from '../../../index' import type { GeneratedTypes } from '../../../index.d.ts'
import type { PayloadRequest } from '../../../types' import type { PayloadRequest } from '../../../types/index.d.ts'
import type { Result } from '../login' import type { Result } from '../login.d.ts'
import { APIError } from '../../../errors' import { APIError } from '../../../errors/index.js'
import { createLocalReq } from '../../../utilities/createLocalReq' import { createLocalReq } from '../../../utilities/createLocalReq.js'
import { loginOperation } from '../login' import { loginOperation } from '../login.js'
export type Options<TSlug extends keyof GeneratedTypes['collections']> = { export type Options<TSlug extends keyof GeneratedTypes['collections']> = {
collection: TSlug collection: TSlug

14
packages/payload/src/auth/operations/local/resetPassword.ts
View File

@@ -1,11 +1,11 @@
import type { Payload, RequestContext } from '../../..' import type { Payload, RequestContext } from '../../../index.d.ts'
import type { GeneratedTypes } from '../../../' import type { GeneratedTypes } from '../../../index.d.ts'
import type { PayloadRequest } from '../../../types' import type { PayloadRequest } from '../../../types/index.d.ts'
import type { Result } from '../resetPassword' import type { Result } from '../resetPassword.d.ts'
import { APIError } from '../../../errors' import { APIError } from '../../../errors/index.js'
import { createLocalReq } from '../../../utilities/createLocalReq' import { createLocalReq } from '../../../utilities/createLocalReq.js'
import { resetPasswordOperation } from '../resetPassword' import { resetPasswordOperation } from '../resetPassword.js'
export type Options<T extends keyof GeneratedTypes['collections']> = { export type Options<T extends keyof GeneratedTypes['collections']> = {
collection: T collection: T

12
packages/payload/src/auth/operations/local/unlock.ts
View File

@@ -1,10 +1,10 @@
import type { Payload, RequestContext } from '../../..' import type { Payload, RequestContext } from '../../../index.d.ts'
import type { GeneratedTypes } from '../../../' import type { GeneratedTypes } from '../../../index.d.ts'
import type { PayloadRequest } from '../../../types' import type { PayloadRequest } from '../../../types/index.d.ts'
import { APIError } from '../../../errors' import { APIError } from '../../../errors/index.js'
import { createLocalReq } from '../../../utilities/createLocalReq' import { createLocalReq } from '../../../utilities/createLocalReq.js'
import { unlockOperation } from '../unlock' import { unlockOperation } from '../unlock.js'
export type Options<T extends keyof GeneratedTypes['collections']> = { export type Options<T extends keyof GeneratedTypes['collections']> = {
collection: T collection: T

12
packages/payload/src/auth/operations/local/verifyEmail.ts
View File

@@ -1,10 +1,10 @@
import type { Payload, RequestContext } from '../../..' import type { Payload, RequestContext } from '../../../index.d.ts'
import type { GeneratedTypes } from '../../../' import type { GeneratedTypes } from '../../../index.d.ts'
import type { PayloadRequest } from '../../../types' import type { PayloadRequest } from '../../../types/index.d.ts'
import { APIError } from '../../../errors' import { APIError } from '../../../errors/index.js'
import { createLocalReq } from '../../../utilities/createLocalReq' import { createLocalReq } from '../../../utilities/createLocalReq.js'
import { verifyEmailOperation } from '../verifyEmail' import { verifyEmailOperation } from '../verifyEmail.js'
export type Options<T extends keyof GeneratedTypes['collections']> = { export type Options<T extends keyof GeneratedTypes['collections']> = {
collection: T collection: T

32
packages/payload/src/auth/operations/login.ts
View File

@@ -1,22 +1,22 @@
import jwt from 'jsonwebtoken' import jwt from 'jsonwebtoken'
import type { GeneratedTypes } from '../../' import type { Collection } from '../../collections/config/types.d.ts'
import type { Collection } from '../../collections/config/types' import type { GeneratedTypes } from '../../index.d.ts'
import type { PayloadRequest } from '../../types' import type { PayloadRequest } from '../../types/index.d.ts'
import type { User } from '../types' import type { User } from '../types.d.ts'
import { buildAfterOperation } from '../../collections/operations/utils' import { buildAfterOperation } from '../../collections/operations/utils.js'
import { AuthenticationError, LockedAuth } from '../../errors' import { AuthenticationError, LockedAuth } from '../../errors/index.js'
import { afterRead } from '../../fields/hooks/afterRead' import { afterRead } from '../../fields/hooks/afterRead/index.js'
import { commitTransaction } from '../../utilities/commitTransaction' import { commitTransaction } from '../../utilities/commitTransaction.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
import sanitizeInternalFields from '../../utilities/sanitizeInternalFields' import sanitizeInternalFields from '../../utilities/sanitizeInternalFields.js'
import { getFieldsToSign } from '../getFieldsToSign' import { getFieldsToSign } from '../getFieldsToSign.js'
import isLocked from '../isLocked' import isLocked from '../isLocked.js'
import { authenticateLocalStrategy } from '../strategies/local/authenticate' import { authenticateLocalStrategy } from '../strategies/local/authenticate.js'
import { incrementLoginAttempts } from '../strategies/local/incrementLoginAttempts' import { incrementLoginAttempts } from '../strategies/local/incrementLoginAttempts.js'
import { resetLoginAttempts } from '../strategies/local/resetLoginAttempts' import { resetLoginAttempts } from '../strategies/local/resetLoginAttempts.js'
export type Result = { export type Result = {
exp?: number exp?: number

6
packages/payload/src/auth/operations/logout.ts
View File

@@ -1,9 +1,9 @@
import httpStatus from 'http-status' import httpStatus from 'http-status'
import type { Collection } from '../../collections/config/types' import type { Collection } from '../../collections/config/types.d.ts'
import type { PayloadRequest } from '../../types' import type { PayloadRequest } from '../../types/index.d.ts'
import { APIError } from '../../errors' import { APIError } from '../../errors/index.js'
export type Arguments = { export type Arguments = {
collection: Collection collection: Collection

6
packages/payload/src/auth/operations/me.ts
View File

@@ -1,8 +1,8 @@
import jwt from 'jsonwebtoken' import jwt from 'jsonwebtoken'
import type { Collection } from '../../collections/config/types' import type { Collection } from '../../collections/config/types.d.ts'
import type { PayloadRequest } from '../../types' import type { PayloadRequest } from '../../types/index.d.ts'
import type { User } from '../types' import type { User } from '../types.d.ts'
export type Result = { export type Result = {
collection?: string collection?: string

18
packages/payload/src/auth/operations/refresh.ts
View File

@@ -1,16 +1,16 @@
import jwt from 'jsonwebtoken' import jwt from 'jsonwebtoken'
import url from 'url' import url from 'url'
import type { BeforeOperationHook, Collection } from '../../collections/config/types' import type { BeforeOperationHook, Collection } from '../../collections/config/types.d.ts'
import type { PayloadRequest } from '../../types' import type { PayloadRequest } from '../../types/index.d.ts'
import type { Document } from '../../types' import type { Document } from '../../types/index.d.ts'
import { buildAfterOperation } from '../../collections/operations/utils' import { buildAfterOperation } from '../../collections/operations/utils.js'
import { Forbidden } from '../../errors' import { Forbidden } from '../../errors/index.js'
import { getFieldsToSign } from '../getFieldsToSign' import { commitTransaction } from '../../utilities/commitTransaction.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { commitTransaction } from '../../utilities/commitTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { getFieldsToSign } from '../getFieldsToSign.js'
export type Result = { export type Result = {
exp: number exp: number

16
packages/payload/src/auth/operations/registerFirstUser.ts
View File

@@ -1,13 +1,13 @@
import type { MarkOptional } from 'ts-essentials' import type { MarkOptional } from 'ts-essentials'
import type { GeneratedTypes } from '../../' import type { Collection } from '../../collections/config/types.d.ts'
import type { Collection } from '../../collections/config/types' import type { GeneratedTypes } from '../../index.d.ts'
import type { PayloadRequest } from '../../types' import type { PayloadRequest } from '../../types/index.d.ts'
import { Forbidden } from '../../errors' import { Forbidden } from '../../errors/index.js'
import { commitTransaction } from '../../utilities/commitTransaction' import { commitTransaction } from '../../utilities/commitTransaction.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
export type Arguments<T extends { [field: number | string | symbol]: unknown }> = { export type Arguments<T extends { [field: number | string | symbol]: unknown }> = {
collection: Collection collection: Collection
@@ -31,8 +31,8 @@ export const registerFirstUserOperation = async <TSlug extends keyof GeneratedTy
collection: { collection: {
config, config,
config: { config: {
auth: { verify },
slug, slug,
auth: { verify },
}, },
}, },
data, data,

18
packages/payload/src/auth/operations/resetPassword.ts
View File

@@ -1,15 +1,15 @@
import jwt from 'jsonwebtoken' import jwt from 'jsonwebtoken'
import type { Collection } from '../../collections/config/types' import type { Collection } from '../../collections/config/types.d.ts'
import type { PayloadRequest } from '../../types' import type { PayloadRequest } from '../../types/index.d.ts'
import { APIError } from '../../errors' import { APIError } from '../../errors/index.js'
import { commitTransaction } from '../../utilities/commitTransaction' import { commitTransaction } from '../../utilities/commitTransaction.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
import { getFieldsToSign } from '../getFieldsToSign' import { getFieldsToSign } from '../getFieldsToSign.js'
import { authenticateLocalStrategy } from '../strategies/local/authenticate' import { authenticateLocalStrategy } from '../strategies/local/authenticate.js'
import { generatePasswordSaltHash } from '../strategies/local/generatePasswordSaltHash' import { generatePasswordSaltHash } from '../strategies/local/generatePasswordSaltHash.js'
export type Result = { export type Result = {
token?: string token?: string

16
packages/payload/src/auth/operations/unlock.ts
View File

@@ -1,12 +1,12 @@
import type { Collection } from '../../collections/config/types' import type { Collection } from '../../collections/config/types.d.ts'
import type { PayloadRequest } from '../../types' import type { PayloadRequest } from '../../types/index.d.ts'
import { APIError } from '../../errors' import { APIError } from '../../errors/index.js'
import { commitTransaction } from '../../utilities/commitTransaction' import { commitTransaction } from '../../utilities/commitTransaction.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
import executeAccess from '../executeAccess' import executeAccess from '../executeAccess.js'
import { resetLoginAttempts } from '../strategies/local/resetLoginAttempts' import { resetLoginAttempts } from '../strategies/local/resetLoginAttempts.js'
export type Args = { export type Args = {
collection: Collection collection: Collection

12
packages/payload/src/auth/operations/verifyEmail.ts
View File

@@ -1,12 +1,12 @@
import httpStatus from 'http-status' import httpStatus from 'http-status'
import type { Collection } from '../../collections/config/types' import type { Collection } from '../../collections/config/types.d.ts'
import type { PayloadRequest } from '../../types' import type { PayloadRequest } from '../../types/index.d.ts'
import { APIError } from '../../errors' import { APIError } from '../../errors/index.js'
import { commitTransaction } from '../../utilities/commitTransaction' import { commitTransaction } from '../../utilities/commitTransaction.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
export type Args = { export type Args = {
collection: Collection collection: Collection

10
packages/payload/src/auth/sendVerificationEmail.ts
View File

@@ -1,10 +1,10 @@
import { URL } from 'url' import { URL } from 'url'
import type { Payload } from '..' import type { Collection } from '../collections/config/types.d.ts'
import type { Collection } from '../collections/config/types' import type { EmailOptions, SanitizedConfig } from '../config/types.d.ts'
import type { EmailOptions, SanitizedConfig } from '../config/types' import type { Payload } from '../index.d.ts'
import type { PayloadRequest } from '../types' import type { PayloadRequest } from '../types/index.d.ts'
import type { User, VerifyConfig } from './types' import type { User, VerifyConfig } from './types.d.ts'
type Args = { type Args = {
collection: Collection collection: Collection

6
packages/payload/src/auth/strategies/apiKey.ts
View File

@@ -1,8 +1,8 @@
import crypto from 'crypto' import crypto from 'crypto'
import type { AuthStrategyFunction, User } from '..' import type { SanitizedCollectionConfig } from '../../collections/config/types.d.ts'
import type { SanitizedCollectionConfig } from '../../collections/config/types' import type { Where } from '../../exports/types.js'
import type { Where } from '../../exports/types' import type { AuthStrategyFunction, User } from '../index.d.ts'
export const APIKeyAuthentication = export const APIKeyAuthentication =
(collectionConfig: SanitizedCollectionConfig): AuthStrategyFunction => (collectionConfig: SanitizedCollectionConfig): AuthStrategyFunction =>

4
packages/payload/src/auth/strategies/jwt.ts
View File

@@ -1,8 +1,8 @@
import jwt from 'jsonwebtoken' import jwt from 'jsonwebtoken'
import type { AuthStrategyFunction, User } from '..' import type { AuthStrategyFunction, User } from '../index.d.ts'
import { extractJWT } from '../extractJWT' import { extractJWT } from '../extractJWT.js'
type JWTToken = { type JWTToken = {
collection: string collection: string

2
packages/payload/src/auth/strategies/local/authenticate.ts
View File

@@ -1,7 +1,7 @@
import crypto from 'crypto' import crypto from 'crypto'
import scmp from 'scmp' import scmp from 'scmp'
import type { TypeWithID } from '../../../collections/config/types' import type { TypeWithID } from '../../../collections/config/types.d.ts'
type Doc = TypeWithID & Record<string, unknown> type Doc = TypeWithID & Record<string, unknown>

2
packages/payload/src/auth/strategies/local/generatePasswordSaltHash.ts
View File

@@ -1,6 +1,6 @@
import crypto from 'crypto' import crypto from 'crypto'
import { ValidationError } from '../../../errors' import { ValidationError } from '../../../errors/index.js'
const defaultPasswordValidator = (password: string): string | true => { const defaultPasswordValidator = (password: string): string | true => {
if (!password) return 'No password was given' if (!password) return 'No password was given'

6
packages/payload/src/auth/strategies/local/incrementLoginAttempts.ts
View File

@@ -1,6 +1,6 @@
import type { Payload } from '../../..' import type { SanitizedCollectionConfig, TypeWithID } from '../../../collections/config/types.d.ts'
import type { SanitizedCollectionConfig, TypeWithID } from '../../../collections/config/types' import type { Payload } from '../../../index.d.ts'
import type { PayloadRequest } from '../../../types' import type { PayloadRequest } from '../../../types/index.d.ts'
type Args = { type Args = {
collection: SanitizedCollectionConfig collection: SanitizedCollectionConfig

10
packages/payload/src/auth/strategies/local/register.ts
View File

@@ -1,9 +1,9 @@
import type { Payload } from '../../..' import type { SanitizedCollectionConfig } from '../../../collections/config/types.d.ts'
import type { SanitizedCollectionConfig } from '../../../collections/config/types' import type { Payload } from '../../../index.d.ts'
import type { PayloadRequest } from '../../../types' import type { PayloadRequest } from '../../../types/index.d.ts'
import { ValidationError } from '../../../errors' import { ValidationError } from '../../../errors/index.js'
import { generatePasswordSaltHash } from './generatePasswordSaltHash' import { generatePasswordSaltHash } from './generatePasswordSaltHash.js'
type Args = { type Args = {
collection: SanitizedCollectionConfig collection: SanitizedCollectionConfig

6
packages/payload/src/auth/strategies/local/resetLoginAttempts.ts
View File

@@ -1,6 +1,6 @@
import type { Payload } from '../../..' import type { SanitizedCollectionConfig, TypeWithID } from '../../../collections/config/types.d.ts'
import type { SanitizedCollectionConfig, TypeWithID } from '../../../collections/config/types' import type { Payload } from '../../../index.d.ts'
import type { PayloadRequest } from '../../../types' import type { PayloadRequest } from '../../../types/index.d.ts'
type Args = { type Args = {
collection: SanitizedCollectionConfig collection: SanitizedCollectionConfig

4
packages/payload/src/auth/types.ts
View File

@@ -1,7 +1,7 @@
import type { DeepRequired } from 'ts-essentials' import type { DeepRequired } from 'ts-essentials'
import type { Payload } from '../' import type { Payload } from '../index.d.ts'
import type { PayloadRequest, Where } from '../types' import type { PayloadRequest, Where } from '../types/index.d.ts'
export type Permission = { export type Permission = {
permission: boolean permission: boolean

8
packages/payload/src/bin/generateTypes.ts
View File

@@ -2,11 +2,11 @@
import fs from 'fs' import fs from 'fs'
import { compile } from 'json-schema-to-typescript' import { compile } from 'json-schema-to-typescript'
import type { SanitizedConfig } from '../config/types' import type { SanitizedConfig } from '../config/types.d.ts'
import loadConfig from '../config/load' import loadConfig from '../config/load.js'
import { configToJSONSchema } from '../utilities/configToJSONSchema' import { configToJSONSchema } from '../utilities/configToJSONSchema.js'
import Logger from '../utilities/logger' import Logger from '../utilities/logger.js'
export function generateTypes(config: SanitizedConfig): void { export function generateTypes(config: SanitizedConfig): void {
const logger = Logger() const logger = Logger()

10
packages/payload/src/bin/index.ts
View File

@@ -1,11 +1,11 @@
import minimist from 'minimist' import minimist from 'minimist'
import type { BinScript } from '../config/types' import type { BinScript } from '../config/types.d.ts'
import loadConfig from '../config/load' import loadConfig from '../config/load.js'
import { generateTypes } from './generateTypes' import { generateTypes } from './generateTypes.js'
import { loadEnv } from './loadEnv' import { loadEnv } from './loadEnv.js'
import { migrate } from './migrate' import { migrate } from './migrate.js'
loadEnv() loadEnv()

6
packages/payload/src/bin/migrate.ts
View File

@@ -2,9 +2,9 @@ import type { ParsedArgs } from 'minimist'
import minimist from 'minimist' import minimist from 'minimist'
import payload from '..' import loadConfig from '../config/load.js'
import loadConfig from '../config/load' import payload from '../index.js'
import { prettySyncLoggerDestination } from '../utilities/logger' import { prettySyncLoggerDestination } from '../utilities/logger.js'
/** /**
* The default logger's options did not allow for forcing sync logging * The default logger's options did not allow for forcing sync logging

0
packages/payload/src/bundlers/mocks/db-mongodb.js
View File

1
packages/payload/src/bundlers/mocks/db-postgres.js
View File

@@ -1 +0,0 @@
export const postgresAdapter = () => ({})

3
packages/payload/src/bundlers/mocks/dotENV.js
View File

@@ -1,3 +0,0 @@
export default {
config: () => null,
}

1
packages/payload/src/bundlers/mocks/emptyModule.js
View File

@@ -1 +0,0 @@
export default () => {}

1
packages/payload/src/bundlers/mocks/fileMock.js
View File

@@ -1 +0,0 @@
export default 'file-stub'

9
packages/payload/src/bundlers/types.ts
View File

@@ -1,9 +0,0 @@
import type { PayloadHandler, SanitizedConfig } from 'payload/config'
import type { Payload } from '../types'
export interface PayloadBundler {
build: (payloadConfig: SanitizedConfig) => Promise<void> // used in `payload build`
dev: (payload: Payload) => Promise<PayloadHandler> // this would be a typical Express middleware handler
serve: (payload: Payload) => Promise<PayloadHandler> // serve built files in production
}

2
packages/payload/src/collections/config/build.ts
View File

@@ -1,4 +1,4 @@
import type { CollectionConfig } from './types' import type { CollectionConfig } from './types.d.ts'
const buildCollection = (collection: CollectionConfig): CollectionConfig => collection const buildCollection = (collection: CollectionConfig): CollectionConfig => collection

2
packages/payload/src/collections/config/defaults.ts
View File

@@ -1,4 +1,4 @@
import defaultAccess from '../../auth/defaultAccess' import defaultAccess from '../../auth/defaultAccess.js'
export const defaults = { export const defaults = {
access: { access: {

30
packages/payload/src/collections/config/sanitize.ts
View File

@@ -1,22 +1,22 @@
import merge from 'deepmerge' import merge from 'deepmerge'
import { isPlainObject } from 'is-plain-object' import { isPlainObject } from 'is-plain-object'
import type { Config } from '../../config/types' import type { Config } from '../../config/types.d.ts'
import type { CollectionConfig, SanitizedCollectionConfig } from './types' import type { CollectionConfig, SanitizedCollectionConfig } from './types.d.ts'
import baseAccountLockFields from '../../auth/baseFields/accountLock' import baseAccountLockFields from '../../auth/baseFields/accountLock.js'
import baseAPIKeyFields from '../../auth/baseFields/apiKey' import baseAPIKeyFields from '../../auth/baseFields/apiKey.js'
import baseAuthFields from '../../auth/baseFields/auth' import baseAuthFields from '../../auth/baseFields/auth.js'
import baseVerificationFields from '../../auth/baseFields/verification' import baseVerificationFields from '../../auth/baseFields/verification.js'
import TimestampsRequired from '../../errors/TimestampsRequired' import TimestampsRequired from '../../errors/TimestampsRequired.js'
import { sanitizeFields } from '../../fields/config/sanitize' import { sanitizeFields } from '../../fields/config/sanitize.js'
import { fieldAffectsData } from '../../fields/config/types' import { fieldAffectsData } from '../../fields/config/types.js'
import mergeBaseFields from '../../fields/mergeBaseFields' import mergeBaseFields from '../../fields/mergeBaseFields.js'
import { extractTranslations } from '../../translations/extractTranslations' import { extractTranslations } from '../../translations/extractTranslations.js'
import getBaseUploadFields from '../../uploads/getBaseFields' import getBaseUploadFields from '../../uploads/getBaseFields.js'
import { formatLabels } from '../../utilities/formatLabels' import { formatLabels } from '../../utilities/formatLabels.js'
import baseVersionFields from '../../versions/baseFields' import baseVersionFields from '../../versions/baseFields.js'
import { authDefaults, defaults } from './defaults' import { authDefaults, defaults } from './defaults.js'
const translations = extractTranslations(['general:createdAt', 'general:updatedAt']) const translations = extractTranslations(['general:createdAt', 'general:updatedAt'])

4
packages/payload/src/collections/config/schema.ts
View File

@@ -1,11 +1,11 @@
import joi from 'joi' import joi from 'joi'
import { endpointsSchema } from '../../config/schema' import { endpointsSchema } from '../../config/schema.js'
import { import {
componentSchema, componentSchema,
customViewSchema, customViewSchema,
livePreviewSchema, livePreviewSchema,
} from '../../config/shared/componentSchema' } from '../../config/shared/componentSchema.js'
const strategyBaseSchema = joi.object().keys({ const strategyBaseSchema = joi.object().keys({
logout: joi.boolean(), logout: joi.boolean(),

21
packages/payload/src/collections/config/types.ts
View File

@@ -1,14 +1,13 @@
import type { GraphQLInputObjectType, GraphQLNonNull, GraphQLObjectType } from 'graphql' import type { GraphQLInputObjectType, GraphQLNonNull, GraphQLObjectType } from 'graphql'
import type { DeepRequired } from 'ts-essentials' import type { DeepRequired } from 'ts-essentials'
import type { GeneratedTypes } from '../../'
import type { import type {
CustomPreviewButtonProps, CustomPreviewButtonProps,
CustomPublishButtonProps, CustomPublishButtonProps,
CustomSaveButtonProps, CustomSaveButtonProps,
CustomSaveDraftButtonProps, CustomSaveDraftButtonProps,
} from '../../admin/types' } from '../../admin/types.d.ts'
import type { Auth, IncomingAuthType, User } from '../../auth/types' import type { Auth, IncomingAuthType, User } from '../../auth/types.d.ts'
import type { import type {
Access, Access,
EditViewComponent, EditViewComponent,
@@ -17,12 +16,16 @@ import type {
EntityDescription, EntityDescription,
GeneratePreviewURL, GeneratePreviewURL,
LivePreviewConfig, LivePreviewConfig,
} from '../../config/types' } from '../../config/types.d.ts'
import type { Field } from '../../fields/config/types' import type { Field } from '../../fields/config/types.d.ts'
import type { PayloadRequest, RequestContext } from '../../types' import type { GeneratedTypes } from '../../index.d.ts'
import type { SanitizedUploadConfig, UploadConfig } from '../../uploads/types' import type { PayloadRequest, RequestContext } from '../../types/index.d.ts'
import type { IncomingCollectionVersions, SanitizedCollectionVersions } from '../../versions/types' import type { SanitizedUploadConfig, UploadConfig } from '../../uploads/types.d.ts'
import type { AfterOperationArg, AfterOperationMap } from '../operations/utils' import type {
IncomingCollectionVersions,
SanitizedCollectionVersions,
} from '../../versions/types.d.ts'
import type { AfterOperationArg, AfterOperationMap } from '../operations/utils.d.ts'
export type HookOperationType = export type HookOperationType =
| 'autosave' | 'autosave'

10
packages/payload/src/collections/dataloader.ts
View File

@@ -2,12 +2,12 @@ import type { BatchLoadFn } from 'dataloader'
import DataLoader from 'dataloader' import DataLoader from 'dataloader'
import type { PayloadRequest } from '../types' import type { PayloadRequest } from '../types/index.d.ts'
import type { TypeWithID } from './config/types' import type { TypeWithID } from './config/types.d.ts'
import { fieldAffectsData } from '../fields/config/types' import { fieldAffectsData } from '../fields/config/types.js'
import { getIDType } from '../utilities/getIDType' import { getIDType } from '../utilities/getIDType.js'
import { isValidID } from '../utilities/isValidID' import { isValidID } from '../utilities/isValidID.js'
// Payload uses `dataloader` to solve the classic GraphQL N+1 problem. // Payload uses `dataloader` to solve the classic GraphQL N+1 problem.

41
packages/payload/src/collections/operations/create.ts
View File

@@ -2,33 +2,32 @@ import type { MarkOptional } from 'ts-essentials'
import crypto from 'crypto' import crypto from 'crypto'
import type { GeneratedTypes } from '../../' import type { GeneratedTypes } from '../../index.d.ts'
import type { PayloadRequest } from '../../types' import type { Document, PayloadRequest } from '../../types/index.d.ts'
import type { Document } from '../../types'
import type { import type {
AfterChangeHook, AfterChangeHook,
BeforeOperationHook, BeforeOperationHook,
BeforeValidateHook, BeforeValidateHook,
Collection, Collection,
} from '../config/types' } from '../config/types.d.ts'
import executeAccess from '../../auth/executeAccess' import executeAccess from '../../auth/executeAccess.js'
import sendVerificationEmail from '../../auth/sendVerificationEmail' import sendVerificationEmail from '../../auth/sendVerificationEmail.js'
import { registerLocalStrategy } from '../../auth/strategies/local/register' import { registerLocalStrategy } from '../../auth/strategies/local/register.js'
import { afterChange } from '../../fields/hooks/afterChange' import { afterChange } from '../../fields/hooks/afterChange/index.js'
import { afterRead } from '../../fields/hooks/afterRead' import { afterRead } from '../../fields/hooks/afterRead/index.js'
import { beforeChange } from '../../fields/hooks/beforeChange' import { beforeChange } from '../../fields/hooks/beforeChange/index.js'
import { beforeValidate } from '../../fields/hooks/beforeValidate' import { beforeValidate } from '../../fields/hooks/beforeValidate/index.js'
import { generateFileData } from '../../uploads/generateFileData' import { generateFileData } from '../../uploads/generateFileData.js'
import { unlinkTempFiles } from '../../uploads/unlinkTempFiles' import { unlinkTempFiles } from '../../uploads/unlinkTempFiles.js'
import { uploadFiles } from '../../uploads/uploadFiles' import { uploadFiles } from '../../uploads/uploadFiles.js'
import { commitTransaction } from '../../utilities/commitTransaction' import { commitTransaction } from '../../utilities/commitTransaction.js'
import flattenFields from '../../utilities/flattenTopLevelFields' import flattenFields from '../../utilities/flattenTopLevelFields.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
import sanitizeInternalFields from '../../utilities/sanitizeInternalFields' import sanitizeInternalFields from '../../utilities/sanitizeInternalFields.js'
import { saveVersion } from '../../versions/saveVersion' import { saveVersion } from '../../versions/saveVersion.js'
import { buildAfterOperation } from './utils' import { buildAfterOperation } from './utils.js'
export type CreateUpdateType = { [field: number | string | symbol]: unknown } export type CreateUpdateType = { [field: number | string | symbol]: unknown }

33
packages/payload/src/collections/operations/delete.ts
View File

@@ -1,23 +1,22 @@
import httpStatus from 'http-status' import httpStatus from 'http-status'
import type { GeneratedTypes } from '../../' import type { AccessResult } from '../../config/types.d.ts'
import type { AccessResult } from '../../config/types' import type { GeneratedTypes } from '../../index.d.ts'
import type { PayloadRequest } from '../../types' import type { PayloadRequest, Where } from '../../types/index.d.ts'
import type { Where } from '../../types' import type { BeforeOperationHook, Collection } from '../config/types.d.ts'
import type { BeforeOperationHook, Collection } from '../config/types'
import executeAccess from '../../auth/executeAccess' import executeAccess from '../../auth/executeAccess.js'
import { combineQueries } from '../../database/combineQueries' import { combineQueries } from '../../database/combineQueries.js'
import { validateQueryPaths } from '../../database/queryValidation/validateQueryPaths' import { validateQueryPaths } from '../../database/queryValidation/validateQueryPaths.js'
import { APIError } from '../../errors' import { APIError } from '../../errors/index.js'
import { afterRead } from '../../fields/hooks/afterRead' import { afterRead } from '../../fields/hooks/afterRead/index.js'
import { deleteUserPreferences } from '../../preferences/deleteUserPreferences' import { deleteUserPreferences } from '../../preferences/deleteUserPreferences.js'
import { deleteAssociatedFiles } from '../../uploads/deleteAssociatedFiles' import { deleteAssociatedFiles } from '../../uploads/deleteAssociatedFiles.js'
import { commitTransaction } from '../../utilities/commitTransaction' import { commitTransaction } from '../../utilities/commitTransaction.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
import { deleteCollectionVersions } from '../../versions/deleteCollectionVersions' import { deleteCollectionVersions } from '../../versions/deleteCollectionVersions.js'
import { buildAfterOperation } from './utils' import { buildAfterOperation } from './utils.js'
export type Arguments = { export type Arguments = {
collection: Collection collection: Collection

31
packages/payload/src/collections/operations/deleteByID.ts
View File

@@ -1,20 +1,19 @@
import type { GeneratedTypes } from '../../' import type { GeneratedTypes } from '../../index.d.ts'
import type { PayloadRequest } from '../../types' import type { Document, PayloadRequest } from '../../types/index.d.ts'
import type { Document } from '../../types' import type { BeforeOperationHook, Collection } from '../config/types.d.ts'
import type { BeforeOperationHook, Collection } from '../config/types'
import executeAccess from '../../auth/executeAccess' import executeAccess from '../../auth/executeAccess.js'
import { hasWhereAccessResult } from '../../auth/types' import { hasWhereAccessResult } from '../../auth/types.js'
import { combineQueries } from '../../database/combineQueries' import { combineQueries } from '../../database/combineQueries.js'
import { Forbidden, NotFound } from '../../errors' import { Forbidden, NotFound } from '../../errors/index.js'
import { afterRead } from '../../fields/hooks/afterRead' import { afterRead } from '../../fields/hooks/afterRead/index.js'
import { deleteUserPreferences } from '../../preferences/deleteUserPreferences' import { deleteUserPreferences } from '../../preferences/deleteUserPreferences.js'
import { deleteAssociatedFiles } from '../../uploads/deleteAssociatedFiles' import { deleteAssociatedFiles } from '../../uploads/deleteAssociatedFiles.js'
import { commitTransaction } from '../../utilities/commitTransaction' import { commitTransaction } from '../../utilities/commitTransaction.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
import { deleteCollectionVersions } from '../../versions/deleteCollectionVersions' import { deleteCollectionVersions } from '../../versions/deleteCollectionVersions.js'
import { buildAfterOperation } from './utils' import { buildAfterOperation } from './utils.js'
export type Arguments = { export type Arguments = {
collection: Collection collection: Collection

17
packages/payload/src/collections/operations/docAccess.ts
View File

@@ -1,12 +1,11 @@
import type { CollectionPermission } from '../../auth' import type { CollectionPermission } from '../../auth/index.d.ts'
import type { PayloadRequest } from '../../types' import type { AllOperations, PayloadRequest } from '../../types/index.d.ts'
import type { AllOperations } from '../../types' import type { Collection } from '../config/types.d.ts'
import type { Collection } from '../config/types'
import { commitTransaction } from '../../utilities/commitTransaction' import { commitTransaction } from '../../utilities/commitTransaction.js'
import { getEntityPolicies } from '../../utilities/getEntityPolicies' import { getEntityPolicies } from '../../utilities/getEntityPolicies.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
const allOperations: AllOperations[] = ['create', 'read', 'update', 'delete'] const allOperations: AllOperations[] = ['create', 'read', 'update', 'delete']
@@ -42,10 +41,10 @@ export async function docAccessOperation(args: Arguments): Promise<CollectionPer
const result = await getEntityPolicies({ const result = await getEntityPolicies({
id, id,
type: 'collection',
entity: config, entity: config,
operations: collectionOperations, operations: collectionOperations,
req, req,
type: 'collection',
}) })
if (shouldCommit) await commitTransaction(req) if (shouldCommit) await commitTransaction(req)

31
packages/payload/src/collections/operations/find.ts
View File

@@ -1,20 +1,19 @@
import type { AccessResult } from '../../config/types' import type { AccessResult } from '../../config/types.d.ts'
import type { PaginatedDocs } from '../../database/types' import type { PaginatedDocs } from '../../database/types.d.ts'
import type { PayloadRequest } from '../../types' import type { PayloadRequest, Where } from '../../types/index.d.ts'
import type { Where } from '../../types' import type { Collection, TypeWithID } from '../config/types.d.ts'
import type { Collection, TypeWithID } from '../config/types'
import executeAccess from '../../auth/executeAccess' import executeAccess from '../../auth/executeAccess.js'
import { combineQueries } from '../../database/combineQueries' import { combineQueries } from '../../database/combineQueries.js'
import { validateQueryPaths } from '../../database/queryValidation/validateQueryPaths' import { validateQueryPaths } from '../../database/queryValidation/validateQueryPaths.js'
import { afterRead } from '../../fields/hooks/afterRead' import { afterRead } from '../../fields/hooks/afterRead/index.js'
import { commitTransaction } from '../../utilities/commitTransaction' import { commitTransaction } from '../../utilities/commitTransaction.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
import { buildVersionCollectionFields } from '../../versions/buildCollectionFields' import { buildVersionCollectionFields } from '../../versions/buildCollectionFields.js'
import { appendVersionToQueryKey } from '../../versions/drafts/appendVersionToQueryKey' import { appendVersionToQueryKey } from '../../versions/drafts/appendVersionToQueryKey.js'
import { getQueryDraftsSort } from '../../versions/drafts/getQueryDraftsSort' import { getQueryDraftsSort } from '../../versions/drafts/getQueryDraftsSort.js'
import { buildAfterOperation } from './utils' import { buildAfterOperation } from './utils.js'
export type Arguments = { export type Arguments = {
collection: Collection collection: Collection

24
packages/payload/src/collections/operations/findByID.ts
View File

@@ -1,17 +1,17 @@
/* eslint-disable no-underscore-dangle */ /* eslint-disable no-underscore-dangle */
import type { FindOneArgs } from '../../database/types' import type { FindOneArgs } from '../../database/types.d.ts'
import type { PayloadRequest } from '../../types' import type { PayloadRequest } from '../../types/index.d.ts'
import type { Collection, TypeWithID } from '../config/types' import type { Collection, TypeWithID } from '../config/types.d.ts'
import executeAccess from '../../auth/executeAccess' import executeAccess from '../../auth/executeAccess.js'
import { combineQueries } from '../../database/combineQueries' import { combineQueries } from '../../database/combineQueries.js'
import { NotFound } from '../../errors' import { NotFound } from '../../errors/index.js'
import { afterRead } from '../../fields/hooks/afterRead' import { afterRead } from '../../fields/hooks/afterRead/index.js'
import { commitTransaction } from '../../utilities/commitTransaction' import { commitTransaction } from '../../utilities/commitTransaction.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
import replaceWithDraftIfAvailable from '../../versions/drafts/replaceWithDraftIfAvailable' import replaceWithDraftIfAvailable from '../../versions/drafts/replaceWithDraftIfAvailable.js'
import { buildAfterOperation } from './utils' import { buildAfterOperation } from './utils.js'
export type Arguments = { export type Arguments = {
collection: Collection collection: Collection

20
packages/payload/src/collections/operations/findVersionByID.ts
View File

@@ -1,17 +1,17 @@
/* eslint-disable no-underscore-dangle */ /* eslint-disable no-underscore-dangle */
import httpStatus from 'http-status' import httpStatus from 'http-status'
import type { PayloadRequest } from '../../types' import type { PayloadRequest } from '../../types/index.d.ts'
import type { TypeWithVersion } from '../../versions/types' import type { TypeWithVersion } from '../../versions/types.d.ts'
import type { Collection, TypeWithID } from '../config/types' import type { Collection, TypeWithID } from '../config/types.d.ts'
import executeAccess from '../../auth/executeAccess' import executeAccess from '../../auth/executeAccess.js'
import { combineQueries } from '../../database/combineQueries' import { combineQueries } from '../../database/combineQueries.js'
import { APIError, Forbidden, NotFound } from '../../errors' import { APIError, Forbidden, NotFound } from '../../errors/index.js'
import { afterRead } from '../../fields/hooks/afterRead' import { afterRead } from '../../fields/hooks/afterRead/index.js'
import { commitTransaction } from '../../utilities/commitTransaction' import { commitTransaction } from '../../utilities/commitTransaction.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
export type Arguments = { export type Arguments = {
collection: Collection collection: Collection

27
packages/payload/src/collections/operations/findVersions.ts
View File

@@ -1,18 +1,17 @@
import type { PaginatedDocs } from '../../database/types' import type { PaginatedDocs } from '../../database/types.d.ts'
import type { PayloadRequest } from '../../types' import type { PayloadRequest, Where } from '../../types/index.d.ts'
import type { Where } from '../../types' import type { TypeWithVersion } from '../../versions/types.d.ts'
import type { TypeWithVersion } from '../../versions/types' import type { Collection } from '../config/types.d.ts'
import type { Collection } from '../config/types'
import executeAccess from '../../auth/executeAccess' import executeAccess from '../../auth/executeAccess.js'
import { combineQueries } from '../../database/combineQueries' import { combineQueries } from '../../database/combineQueries.js'
import { validateQueryPaths } from '../../database/queryValidation/validateQueryPaths' import { validateQueryPaths } from '../../database/queryValidation/validateQueryPaths.js'
import { afterRead } from '../../fields/hooks/afterRead' import { afterRead } from '../../fields/hooks/afterRead/index.js'
import { commitTransaction } from '../../utilities/commitTransaction' import { commitTransaction } from '../../utilities/commitTransaction.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
import sanitizeInternalFields from '../../utilities/sanitizeInternalFields' import sanitizeInternalFields from '../../utilities/sanitizeInternalFields.js'
import { buildVersionCollectionFields } from '../../versions/buildCollectionFields' import { buildVersionCollectionFields } from '../../versions/buildCollectionFields.js'
export type Arguments = { export type Arguments = {
collection: Collection collection: Collection

17
packages/payload/src/collections/operations/local/create.ts
View File

@@ -1,15 +1,14 @@
import type { MarkOptional } from 'ts-essentials' import type { MarkOptional } from 'ts-essentials'
import type { Payload } from '../../..' import type { GeneratedTypes } from '../../..//index.d.ts'
import type { GeneratedTypes } from '../../../' import type { Payload } from '../../../index.d.ts'
import type { PayloadRequest, RequestContext } from '../../../types' import type { Document, PayloadRequest, RequestContext } from '../../../types/index.d.ts'
import type { Document } from '../../../types' import type { File } from '../../../uploads/types.d.ts'
import type { File } from '../../../uploads/types'
import { APIError } from '../../../errors' import { APIError } from '../../../errors/index.js'
import getFileByPath from '../../../uploads/getFileByPath' import getFileByPath from '../../../uploads/getFileByPath.js'
import { createLocalReq } from '../../../utilities/createLocalReq' import { createLocalReq } from '../../../utilities/createLocalReq.js'
import { createOperation } from '../create' import { createOperation } from '../create.js'
export type Options<TSlug extends keyof GeneratedTypes['collections']> = { export type Options<TSlug extends keyof GeneratedTypes['collections']> = {
collection: TSlug collection: TSlug

18
packages/payload/src/collections/operations/local/delete.ts
View File

@@ -1,13 +1,13 @@
import type { Payload } from '../../..' import type { Payload } from '../../../index.d.ts'
import type { GeneratedTypes } from '../../../' import type { GeneratedTypes } from '../../../index.d.ts'
import type { PayloadRequest, RequestContext } from '../../../types' import type { PayloadRequest, RequestContext } from '../../../types/index.d.ts'
import type { Document, Where } from '../../../types' import type { Document, Where } from '../../../types/index.d.ts'
import type { BulkOperationResult } from '../../config/types' import type { BulkOperationResult } from '../../config/types.d.ts'
import { APIError } from '../../../errors' import { APIError } from '../../../errors/index.js'
import { createLocalReq } from '../../../utilities/createLocalReq' import { createLocalReq } from '../../../utilities/createLocalReq.js'
import { deleteOperation } from '../delete' import { deleteOperation } from '../delete.js'
import { deleteByIDOperation } from '../deleteByID' import { deleteByIDOperation } from '../deleteByID.js'
export type BaseOptions<T extends keyof GeneratedTypes['collections']> = { export type BaseOptions<T extends keyof GeneratedTypes['collections']> = {
collection: T collection: T

13
packages/payload/src/collections/operations/local/find.ts
View File

@@ -1,11 +1,10 @@
import type { GeneratedTypes, Payload } from '../../../' import type { PaginatedDocs } from '../../../database/types.d.ts'
import type { PaginatedDocs } from '../../../database/types' import type { GeneratedTypes, Payload } from '../../../index.d.ts'
import type { PayloadRequest, RequestContext } from '../../../types' import type { Document, PayloadRequest, RequestContext, Where } from '../../../types/index.d.ts'
import type { Document, Where } from '../../../types'
import { APIError } from '../../../errors' import { APIError } from '../../../errors/index.js'
import { createLocalReq } from '../../../utilities/createLocalReq' import { createLocalReq } from '../../../utilities/createLocalReq.js'
import { findOperation } from '../find' import { findOperation } from '../find.js'
export type Options<T extends keyof GeneratedTypes['collections']> = { export type Options<T extends keyof GeneratedTypes['collections']> = {
collection: T collection: T

12
packages/payload/src/collections/operations/local/findByID.ts
View File

@@ -1,11 +1,9 @@
import type { GeneratedTypes } from '../../../' import type { GeneratedTypes, Payload } from '../../../index.d.ts'
import type { Payload } from '../../../' import type { Document, PayloadRequest, RequestContext } from '../../../types/index.d.ts'
import type { PayloadRequest, RequestContext } from '../../../types'
import type { Document } from '../../../types'
import { APIError } from '../../../errors' import { APIError } from '../../../errors/index.js'
import { createLocalReq } from '../../../utilities/createLocalReq' import { createLocalReq } from '../../../utilities/createLocalReq.js'
import { findByIDOperation } from '../findByID' import { findByIDOperation } from '../findByID.js'
export type Options<T extends keyof GeneratedTypes['collections']> = { export type Options<T extends keyof GeneratedTypes['collections']> = {
collection: T collection: T

13
packages/payload/src/collections/operations/local/findVersionByID.ts
View File

@@ -1,11 +1,10 @@
import type { GeneratedTypes, Payload } from '../../../' import type { GeneratedTypes, Payload } from '../../../index.d.ts'
import type { PayloadRequest, RequestContext } from '../../../types' import type { Document, PayloadRequest, RequestContext } from '../../../types/index.d.ts'
import type { Document } from '../../../types' import type { TypeWithVersion } from '../../../versions/types.d.ts'
import type { TypeWithVersion } from '../../../versions/types'
import { APIError } from '../../../errors' import { APIError } from '../../../errors/index.js'
import { createLocalReq } from '../../../utilities/createLocalReq' import { createLocalReq } from '../../../utilities/createLocalReq.js'
import { findVersionByIDOperation } from '../findVersionByID' import { findVersionByIDOperation } from '../findVersionByID.js'
export type Options<T extends keyof GeneratedTypes['collections']> = { export type Options<T extends keyof GeneratedTypes['collections']> = {
collection: T collection: T

15
packages/payload/src/collections/operations/local/findVersions.ts
View File

@@ -1,12 +1,11 @@
import type { GeneratedTypes, Payload } from '../../../' import type { PaginatedDocs } from '../../../database/types.d.ts'
import type { PaginatedDocs } from '../../../database/types' import type { GeneratedTypes, Payload } from '../../../index.d.ts'
import type { PayloadRequest, RequestContext } from '../../../types' import type { Document, PayloadRequest, RequestContext, Where } from '../../../types/index.d.ts'
import type { Document, Where } from '../../../types' import type { TypeWithVersion } from '../../../versions/types.d.ts'
import type { TypeWithVersion } from '../../../versions/types'
import { APIError } from '../../../errors' import { APIError } from '../../../errors/index.js'
import { createLocalReq } from '../../../utilities/createLocalReq' import { createLocalReq } from '../../../utilities/createLocalReq.js'
import { findVersionsOperation } from '../findVersions' import { findVersionsOperation } from '../findVersions.js'
export type Options<T extends keyof GeneratedTypes['collections']> = { export type Options<T extends keyof GeneratedTypes['collections']> = {
collection: T collection: T

18
packages/payload/src/collections/operations/local/index.ts
View File

@@ -1,12 +1,12 @@
import auth from '../../../auth/operations/local' import auth from '../../../auth/operations/local/index.js'
import create from './create' import create from './create.js'
import deleteLocal from './delete' import deleteLocal from './delete.js'
import find from './find' import find from './find.js'
import findByID from './findByID' import findByID from './findByID.js'
import findVersionByID from './findVersionByID' import findVersionByID from './findVersionByID.js'
import findVersions from './findVersions' import findVersions from './findVersions.js'
import restoreVersion from './restoreVersion' import restoreVersion from './restoreVersion.js'
import update from './update' import update from './update.js'
export default { export default {
auth, auth,

11
packages/payload/src/collections/operations/local/restoreVersion.ts
View File

@@ -1,10 +1,9 @@
import type { GeneratedTypes, Payload } from '../../../' import type { GeneratedTypes, Payload } from '../../../index.d.ts'
import type { PayloadRequest, RequestContext } from '../../../types' import type { Document, PayloadRequest, RequestContext } from '../../../types/index.d.ts'
import type { Document } from '../../../types'
import { APIError } from '../../../errors' import { APIError } from '../../../errors/index.js'
import { createLocalReq } from '../../../utilities/createLocalReq' import { createLocalReq } from '../../../utilities/createLocalReq.js'
import { restoreVersionOperation } from '../restoreVersion' import { restoreVersionOperation } from '../restoreVersion.js'
export type Options<T extends keyof GeneratedTypes['collections']> = { export type Options<T extends keyof GeneratedTypes['collections']> = {
collection: T collection: T

19
packages/payload/src/collections/operations/local/update.ts
View File

@@ -1,16 +1,15 @@
import type { DeepPartial } from 'ts-essentials' import type { DeepPartial } from 'ts-essentials'
import type { GeneratedTypes, Payload } from '../../../' import type { GeneratedTypes, Payload } from '../../../index.d.ts'
import type { PayloadRequest, RequestContext } from '../../../types' import type { Document, PayloadRequest, RequestContext, Where } from '../../../types/index.d.ts'
import type { Document, Where } from '../../../types' import type { File } from '../../../uploads/types.d.ts'
import type { File } from '../../../uploads/types' import type { BulkOperationResult } from '../../config/types.d.ts'
import type { BulkOperationResult } from '../../config/types'
import { APIError } from '../../../errors' import { APIError } from '../../../errors/index.js'
import getFileByPath from '../../../uploads/getFileByPath' import getFileByPath from '../../../uploads/getFileByPath.js'
import { createLocalReq } from '../../../utilities/createLocalReq' import { createLocalReq } from '../../../utilities/createLocalReq.js'
import { updateOperation } from '../update' import { updateOperation } from '../update.js'
import { updateByIDOperation } from '../updateByID' import { updateByIDOperation } from '../updateByID.js'
export type BaseOptions<TSlug extends keyof GeneratedTypes['collections']> = { export type BaseOptions<TSlug extends keyof GeneratedTypes['collections']> = {
autosave?: boolean autosave?: boolean

26
packages/payload/src/collections/operations/restoreVersion.ts
View File

@@ -1,20 +1,20 @@
/* eslint-disable no-underscore-dangle */ /* eslint-disable no-underscore-dangle */
import httpStatus from 'http-status' import httpStatus from 'http-status'
import type { FindOneArgs } from '../../database/types' import type { FindOneArgs } from '../../database/types.d.ts'
import type { PayloadRequest } from '../../types' import type { PayloadRequest } from '../../types/index.d.ts'
import type { Collection, TypeWithID } from '../config/types' import type { Collection, TypeWithID } from '../config/types.d.ts'
import executeAccess from '../../auth/executeAccess' import executeAccess from '../../auth/executeAccess.js'
import { hasWhereAccessResult } from '../../auth/types' import { hasWhereAccessResult } from '../../auth/types.js'
import { combineQueries } from '../../database/combineQueries' import { combineQueries } from '../../database/combineQueries.js'
import { APIError, Forbidden, NotFound } from '../../errors' import { APIError, Forbidden, NotFound } from '../../errors/index.js'
import { afterChange } from '../../fields/hooks/afterChange' import { afterChange } from '../../fields/hooks/afterChange/index.js'
import { afterRead } from '../../fields/hooks/afterRead' import { afterRead } from '../../fields/hooks/afterRead/index.js'
import { commitTransaction } from '../../utilities/commitTransaction' import { commitTransaction } from '../../utilities/commitTransaction.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
import { getLatestCollectionVersion } from '../../versions/getLatestCollectionVersion' import { getLatestCollectionVersion } from '../../versions/getLatestCollectionVersion.js'
export type Arguments = { export type Arguments = {
collection: Collection collection: Collection

49
packages/payload/src/collections/operations/update.ts
View File

@@ -2,32 +2,31 @@ import type { DeepPartial } from 'ts-essentials'
import httpStatus from 'http-status' import httpStatus from 'http-status'
import type { GeneratedTypes } from '../../' import type { AccessResult } from '../../config/types.d.ts'
import type { AccessResult } from '../../config/types' import type { GeneratedTypes } from '../../index.d.ts'
import type { PayloadRequest } from '../../types' import type { PayloadRequest, Where } from '../../types/index.d.ts'
import type { Where } from '../../types' import type { BulkOperationResult, Collection } from '../config/types.d.ts'
import type { BulkOperationResult, Collection } from '../config/types' import type { CreateUpdateType } from './create.d.ts'
import type { CreateUpdateType } from './create'
import executeAccess from '../../auth/executeAccess' import executeAccess from '../../auth/executeAccess.js'
import { combineQueries } from '../../database/combineQueries' import { combineQueries } from '../../database/combineQueries.js'
import { validateQueryPaths } from '../../database/queryValidation/validateQueryPaths' import { validateQueryPaths } from '../../database/queryValidation/validateQueryPaths.js'
import { APIError } from '../../errors' import { APIError } from '../../errors/index.js'
import { afterChange } from '../../fields/hooks/afterChange' import { afterChange } from '../../fields/hooks/afterChange/index.js'
import { afterRead } from '../../fields/hooks/afterRead' import { afterRead } from '../../fields/hooks/afterRead/index.js'
import { beforeChange } from '../../fields/hooks/beforeChange' import { beforeChange } from '../../fields/hooks/beforeChange/index.js'
import { beforeValidate } from '../../fields/hooks/beforeValidate' import { beforeValidate } from '../../fields/hooks/beforeValidate/index.js'
import { deleteAssociatedFiles } from '../../uploads/deleteAssociatedFiles' import { deleteAssociatedFiles } from '../../uploads/deleteAssociatedFiles.js'
import { generateFileData } from '../../uploads/generateFileData' import { generateFileData } from '../../uploads/generateFileData.js'
import { unlinkTempFiles } from '../../uploads/unlinkTempFiles' import { unlinkTempFiles } from '../../uploads/unlinkTempFiles.js'
import { uploadFiles } from '../../uploads/uploadFiles' import { uploadFiles } from '../../uploads/uploadFiles.js'
import { commitTransaction } from '../../utilities/commitTransaction' import { commitTransaction } from '../../utilities/commitTransaction.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
import { buildVersionCollectionFields } from '../../versions/buildCollectionFields' import { buildVersionCollectionFields } from '../../versions/buildCollectionFields.js'
import { appendVersionToQueryKey } from '../../versions/drafts/appendVersionToQueryKey' import { appendVersionToQueryKey } from '../../versions/drafts/appendVersionToQueryKey.js'
import { saveVersion } from '../../versions/saveVersion' import { saveVersion } from '../../versions/saveVersion.js'
import { buildAfterOperation } from './utils' import { buildAfterOperation } from './utils.js'
export type Arguments<T extends CreateUpdateType> = { export type Arguments<T extends CreateUpdateType> = {
collection: Collection collection: Collection

46
packages/payload/src/collections/operations/updateByID.ts
View File

@@ -2,30 +2,30 @@ import type { DeepPartial } from 'ts-essentials'
import httpStatus from 'http-status' import httpStatus from 'http-status'
import type { FindOneArgs } from '../../database/types' import type { FindOneArgs } from '../../database/types.d.ts'
import type { GeneratedTypes } from '../../index' import type { GeneratedTypes } from '../../index.d.ts'
import type { PayloadRequest } from '../../types' import type { PayloadRequest } from '../../types/index.d.ts'
import type { Collection } from '../config/types' import type { Collection } from '../config/types.d.ts'
import executeAccess from '../../auth/executeAccess' import executeAccess from '../../auth/executeAccess.js'
import { generatePasswordSaltHash } from '../../auth/strategies/local/generatePasswordSaltHash' import { generatePasswordSaltHash } from '../../auth/strategies/local/generatePasswordSaltHash.js'
import { hasWhereAccessResult } from '../../auth/types' import { hasWhereAccessResult } from '../../auth/types.js'
import { combineQueries } from '../../database/combineQueries' import { combineQueries } from '../../database/combineQueries.js'
import { APIError, Forbidden, NotFound } from '../../errors' import { APIError, Forbidden, NotFound } from '../../errors/index.js'
import { afterChange } from '../../fields/hooks/afterChange' import { afterChange } from '../../fields/hooks/afterChange/index.js'
import { afterRead } from '../../fields/hooks/afterRead' import { afterRead } from '../../fields/hooks/afterRead/index.js'
import { beforeChange } from '../../fields/hooks/beforeChange' import { beforeChange } from '../../fields/hooks/beforeChange/index.js'
import { beforeValidate } from '../../fields/hooks/beforeValidate' import { beforeValidate } from '../../fields/hooks/beforeValidate/index.js'
import { deleteAssociatedFiles } from '../../uploads/deleteAssociatedFiles' import { deleteAssociatedFiles } from '../../uploads/deleteAssociatedFiles.js'
import { generateFileData } from '../../uploads/generateFileData' import { generateFileData } from '../../uploads/generateFileData.js'
import { unlinkTempFiles } from '../../uploads/unlinkTempFiles' import { unlinkTempFiles } from '../../uploads/unlinkTempFiles.js'
import { uploadFiles } from '../../uploads/uploadFiles' import { uploadFiles } from '../../uploads/uploadFiles.js'
import { commitTransaction } from '../../utilities/commitTransaction' import { commitTransaction } from '../../utilities/commitTransaction.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
import { getLatestCollectionVersion } from '../../versions/getLatestCollectionVersion' import { getLatestCollectionVersion } from '../../versions/getLatestCollectionVersion.js'
import { saveVersion } from '../../versions/saveVersion' import { saveVersion } from '../../versions/saveVersion.js'
import { buildAfterOperation } from './utils' import { buildAfterOperation } from './utils.js'
export type Arguments<T extends { [field: number | string | symbol]: unknown }> = { export type Arguments<T extends { [field: number | string | symbol]: unknown }> = {
autosave?: boolean autosave?: boolean

28
packages/payload/src/collections/operations/utils.ts
View File

@@ -1,15 +1,19 @@
import type { forgotPasswordOperation } from '../../auth/operations/forgotPassword' import type { forgotPasswordOperation } from '../../auth/operations/forgotPassword.d.ts'
import type { loginOperation } from '../../auth/operations/login' import type { loginOperation } from '../../auth/operations/login.d.ts'
import type { refreshOperation } from '../../auth/operations/refresh' import type { refreshOperation } from '../../auth/operations/refresh.d.ts'
import type { PayloadRequest } from '../../exports/types' import type { PayloadRequest } from '../../exports/types.d.ts'
import type { AfterOperationHook, SanitizedCollectionConfig, TypeWithID } from '../config/types' import type {
import type { createOperation } from './create' AfterOperationHook,
import type { deleteOperation } from './delete' SanitizedCollectionConfig,
import type { deleteByIDOperation } from './deleteByID' TypeWithID,
import type { findOperation } from './find' } from '../config/types.d.ts'
import type { findByIDOperation } from './findByID' import type { createOperation } from './create.d.ts'
import type { updateOperation } from './update' import type { deleteOperation } from './delete.d.ts'
import type { updateByIDOperation } from './updateByID' import type { deleteByIDOperation } from './deleteByID.d.ts'
import type { findOperation } from './find.d.ts'
import type { findByIDOperation } from './findByID.d.ts'
import type { updateOperation } from './update.d.ts'
import type { updateByIDOperation } from './updateByID.d.ts'
export type AfterOperationMap<T extends TypeWithID> = { export type AfterOperationMap<T extends TypeWithID> = {
create: typeof createOperation // todo: pass correct generic create: typeof createOperation // todo: pass correct generic

4
packages/payload/src/config/build.ts
View File

@@ -1,8 +1,8 @@
/* eslint-disable no-use-before-define */ /* eslint-disable no-use-before-define */
/* eslint-disable no-nested-ternary */ /* eslint-disable no-nested-ternary */
import type { Config, SanitizedConfig } from './types' import type { Config, SanitizedConfig } from './types.d.ts'
import { sanitizeConfig } from './sanitize' import { sanitizeConfig } from './sanitize.js'
/** /**
* @description Builds and validates Payload configuration * @description Builds and validates Payload configuration

4
packages/payload/src/config/createClientConfig.ts
View File

@@ -1,5 +1,5 @@
import type { Field } from '../fields/config/types' import type { Field } from '../fields/config/types.d.ts'
import type { ClientConfig, SanitizedConfig } from './types' import type { ClientConfig, SanitizedConfig } from './types.d.ts'
export const sanitizeField = (f) => { export const sanitizeField = (f) => {
const field = { ...f } const field = { ...f }

2
packages/payload/src/config/defaults.ts
View File

@@ -1,6 +1,6 @@
import path from 'path' import path from 'path'
import type { Config } from './types' import type { Config } from './types.d.ts'
export const defaults: Omit<Config, 'db' | 'editor' | 'secret'> = { export const defaults: Omit<Config, 'db' | 'editor' | 'secret'> = {
admin: { admin: {

6
packages/payload/src/config/load.ts
View File

@@ -1,10 +1,10 @@
/* eslint-disable import/no-dynamic-require */ /* eslint-disable import/no-dynamic-require */
/* eslint-disable global-require */ /* eslint-disable global-require */
import type { SanitizedConfig } from './types' import type { SanitizedConfig } from './types.d.ts'
import { clientFiles } from './clientFiles' import { clientFiles } from './clientFiles.js'
import findConfig from './find' import findConfig from './find.js'
const loadConfig = async (): Promise<SanitizedConfig> => { const loadConfig = async (): Promise<SanitizedConfig> => {
const configPath = findConfig() const configPath = findConfig()

18
packages/payload/src/config/sanitize.ts
View File

@@ -7,16 +7,16 @@ import type {
LocalizationConfigWithLabels, LocalizationConfigWithLabels,
LocalizationConfigWithNoLabels, LocalizationConfigWithNoLabels,
SanitizedConfig, SanitizedConfig,
} from './types' } from './types.d.ts'
import { defaultUserCollection } from '../auth/defaultUser' import { defaultUserCollection } from '../auth/defaultUser.js'
import sanitizeCollection from '../collections/config/sanitize' import sanitizeCollection from '../collections/config/sanitize.js'
import { migrationsCollection } from '../database/migrations/migrationsCollection' import { migrationsCollection } from '../database/migrations/migrationsCollection.js'
import { InvalidConfiguration } from '../errors' import { InvalidConfiguration } from '../errors/index.js'
import sanitizeGlobals from '../globals/config/sanitize' import sanitizeGlobals from '../globals/config/sanitize.js'
import getPreferencesCollection from '../preferences/preferencesCollection' import getPreferencesCollection from '../preferences/preferencesCollection.js'
import checkDuplicateCollections from '../utilities/checkDuplicateCollections' import checkDuplicateCollections from '../utilities/checkDuplicateCollections.js'
import { defaults } from './defaults' import { defaults } from './defaults.js'
const sanitizeAdminConfig = (configToSanitize: Config): Partial<SanitizedConfig> => { const sanitizeAdminConfig = (configToSanitize: Config): Partial<SanitizedConfig> => {
const sanitizedConfig = { ...configToSanitize } const sanitizedConfig = { ...configToSanitize }

4
packages/payload/src/config/schema.ts
View File

@@ -1,7 +1,7 @@
import joi from 'joi' import joi from 'joi'
import { adminViewSchema } from './shared/adminViewSchema' import { adminViewSchema } from './shared/adminViewSchema.js'
import { componentSchema, livePreviewSchema } from './shared/componentSchema' import { componentSchema, livePreviewSchema } from './shared/componentSchema.js'
const component = joi.alternatives().try(joi.object().unknown(), joi.func()) const component = joi.alternatives().try(joi.object().unknown(), joi.func())

2
packages/payload/src/config/shared/adminViewSchema.ts
View File

@@ -1,6 +1,6 @@
import joi from 'joi' import joi from 'joi'
import { componentSchema } from './componentSchema' import { componentSchema } from './componentSchema.js'
export const adminViewSchema = joi.array().items( export const adminViewSchema = joi.array().items(
joi.object().keys({ joi.object().keys({

20
packages/payload/src/config/types.ts
View File

@@ -8,21 +8,21 @@ import type React from 'react'
import type { default as sharp } from 'sharp' import type { default as sharp } from 'sharp'
import type { DeepRequired } from 'ts-essentials' import type { DeepRequired } from 'ts-essentials'
import type { Payload } from '..' import type { DocumentTab, RichTextAdapter } from '../admin/types.d.ts'
import type { DocumentTab, RichTextAdapter } from '../admin/types' import type { AdminView, ServerSideEditViewProps } from '../admin/views/types.d.ts'
import type { AdminView, ServerSideEditViewProps } from '../admin/views/types' import type { User } from '../auth/types.d.ts'
import type { User } from '../auth/types'
import type { import type {
AfterErrorHook, AfterErrorHook,
Collection, Collection,
CollectionConfig, CollectionConfig,
SanitizedCollectionConfig, SanitizedCollectionConfig,
} from '../collections/config/types' } from '../collections/config/types.d.ts'
import type { DatabaseAdapterResult } from '../database/types' import type { DatabaseAdapterResult } from '../database/types.d.ts'
import type { ClientConfigField } from '../fields/config/types' import type { ClientConfigField } from '../fields/config/types.d.ts'
import type { GlobalConfig, Globals, SanitizedGlobalConfig } from '../globals/config/types' import type { GlobalConfig, Globals, SanitizedGlobalConfig } from '../globals/config/types.d.ts'
import type { PayloadRequest, Where } from '../types' import type { Payload } from '../index.d.ts'
import type { PayloadLogger } from '../utilities/logger' import type { PayloadRequest, Where } from '../types/index.d.ts'
import type { PayloadLogger } from '../utilities/logger.d.ts'
export type BinScriptConfig = { export type BinScriptConfig = {
key: string key: string

16
packages/payload/src/config/validate.ts
View File

@@ -1,15 +1,15 @@
import type { ValidationResult } from 'joi' import type { ValidationResult } from 'joi'
import type { Logger } from 'pino' import type { Logger } from 'pino'
import type { SanitizedCollectionConfig } from '../collections/config/types' import type { SanitizedCollectionConfig } from '../collections/config/types.d.ts'
import type { SanitizedGlobalConfig } from '../globals/config/types' import type { SanitizedGlobalConfig } from '../globals/config/types.d.ts'
import type { SanitizedConfig } from './types' import type { SanitizedConfig } from './types.d.ts'
import collectionSchema from '../collections/config/schema' import collectionSchema from '../collections/config/schema.js'
import fieldSchema, { idField } from '../fields/config/schema' import fieldSchema, { idField } from '../fields/config/schema.js'
import { fieldAffectsData } from '../fields/config/types' import { fieldAffectsData } from '../fields/config/types.js'
import globalSchema from '../globals/config/schema' import globalSchema from '../globals/config/schema.js'
import schema from './schema' import schema from './schema.js'
const validateFields = ( const validateFields = (
context: string, context: string,

4
packages/payload/src/database/combineQueries.ts
View File

@@ -1,6 +1,6 @@
import type { Where } from '../types' import type { Where } from '../types/index.d.ts'
import { hasWhereAccessResult } from '../auth' import { hasWhereAccessResult } from '../auth/index.js'
export const combineQueries = (where: Where, access: Where | boolean): Where => { export const combineQueries = (where: Where, access: Where | boolean): Where => {
if (!where && !access) return {} if (!where && !access) return {}

14
packages/payload/src/database/createDatabaseAdapter.ts
View File

@@ -6,14 +6,14 @@ import type {
BeginTransaction, BeginTransaction,
CommitTransaction, CommitTransaction,
RollbackTransaction, RollbackTransaction,
} from './types' } from './types.d.ts'
import { createMigration } from './migrations/createMigration' import { createMigration } from './migrations/createMigration.js'
import { migrate } from './migrations/migrate' import { migrate } from './migrations/migrate.js'
import { migrateDown } from './migrations/migrateDown' import { migrateDown } from './migrations/migrateDown.js'
import { migrateRefresh } from './migrations/migrateRefresh' import { migrateRefresh } from './migrations/migrateRefresh.js'
import { migrateReset } from './migrations/migrateReset' import { migrateReset } from './migrations/migrateReset.js'
import { migrateStatus } from './migrations/migrateStatus' import { migrateStatus } from './migrations/migrateStatus.js'
const beginTransaction: BeginTransaction = async () => null const beginTransaction: BeginTransaction = async () => null
const rollbackTransaction: RollbackTransaction = async () => null const rollbackTransaction: RollbackTransaction = async () => null

2
packages/payload/src/database/flattenWhereToOperators.ts
View File

@@ -1,4 +1,4 @@
import type { Where, WhereField } from '../types' import type { Where, WhereField } from '../types/index.d.ts'
// Take a where query and flatten it to all top-level operators // Take a where query and flatten it to all top-level operators
const flattenWhereToOperators = (query: Where): WhereField[] => const flattenWhereToOperators = (query: Where): WhereField[] =>

10
packages/payload/src/database/getLocalizedPaths.ts
View File

@@ -1,9 +1,9 @@
import type { Payload } from '..' import type { Field } from '../fields/config/types.d.ts'
import type { Field } from '../fields/config/types' import type { Payload } from '../index.d.ts'
import type { PathToQuery } from './queryValidation/types' import type { PathToQuery } from './queryValidation/types.d.ts'
import { fieldAffectsData } from '../fields/config/types' import { fieldAffectsData } from '../fields/config/types.js'
import flattenFields from '../utilities/flattenTopLevelFields' import flattenFields from '../utilities/flattenTopLevelFields.js'
export async function getLocalizedPaths({ export async function getLocalizedPaths({
collectionSlug, collectionSlug,

4
packages/payload/src/database/migrations/createMigration.ts
View File

@@ -1,9 +1,9 @@
/* eslint-disable no-restricted-syntax, no-await-in-loop */ /* eslint-disable no-restricted-syntax, no-await-in-loop */
import fs from 'fs' import fs from 'fs'
import type { CreateMigration } from '../types' import type { CreateMigration } from '../types.d.ts'
import { migrationTemplate } from './migrationTemplate' import { migrationTemplate } from './migrationTemplate.js'
export const createMigration: CreateMigration = async function createMigration({ export const createMigration: CreateMigration = async function createMigration({
migrationName, migrationName,

4
packages/payload/src/database/migrations/getMigrations.ts
View File

@@ -1,5 +1,5 @@
import type { Payload } from '../..' import type { Payload } from '../../index.d.ts'
import type { MigrationData } from '../types' import type { MigrationData } from '../types.d.ts'
/** /**
* Gets all existing migrations from the database, excluding the dev migration * Gets all existing migrations from the database, excluding the dev migration

14
packages/payload/src/database/migrations/migrate.ts
View File

@@ -1,12 +1,12 @@
/* eslint-disable no-restricted-syntax, no-await-in-loop */ /* eslint-disable no-restricted-syntax, no-await-in-loop */
import type { PayloadRequest } from '../../types' import type { PayloadRequest } from '../../types/index.d.ts'
import type { BaseDatabaseAdapter } from '../types' import type { BaseDatabaseAdapter } from '../types.d.ts'
import { commitTransaction } from '../../utilities/commitTransaction' import { commitTransaction } from '../../utilities/commitTransaction.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
import { getMigrations } from './getMigrations' import { getMigrations } from './getMigrations.js'
import { readMigrationFiles } from './readMigrationFiles' import { readMigrationFiles } from './readMigrationFiles.js'
export async function migrate(this: BaseDatabaseAdapter): Promise<void> { export async function migrate(this: BaseDatabaseAdapter): Promise<void> {
const { payload } = this const { payload } = this

14
packages/payload/src/database/migrations/migrateDown.ts
View File

@@ -1,12 +1,12 @@
/* eslint-disable no-restricted-syntax, no-await-in-loop */ /* eslint-disable no-restricted-syntax, no-await-in-loop */
import type { PayloadRequest } from '../../types' import type { PayloadRequest } from '../../types/index.d.ts'
import type { BaseDatabaseAdapter } from '../types' import type { BaseDatabaseAdapter } from '../types.d.ts'
import { commitTransaction } from '../../utilities/commitTransaction' import { commitTransaction } from '../../utilities/commitTransaction.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
import { getMigrations } from './getMigrations' import { getMigrations } from './getMigrations.js'
import { readMigrationFiles } from './readMigrationFiles' import { readMigrationFiles } from './readMigrationFiles.js'
export async function migrateDown(this: BaseDatabaseAdapter): Promise<void> { export async function migrateDown(this: BaseDatabaseAdapter): Promise<void> {
const { payload } = this const { payload } = this

14
packages/payload/src/database/migrations/migrateRefresh.ts
View File

@@ -1,12 +1,12 @@
/* eslint-disable no-restricted-syntax, no-await-in-loop */ /* eslint-disable no-restricted-syntax, no-await-in-loop */
import type { PayloadRequest } from '../../types' import type { PayloadRequest } from '../../types/index.d.ts'
import type { BaseDatabaseAdapter } from '../types' import type { BaseDatabaseAdapter } from '../types.d.ts'
import { commitTransaction } from '../../utilities/commitTransaction' import { commitTransaction } from '../../utilities/commitTransaction.js'
import { initTransaction } from '../../utilities/initTransaction' import { initTransaction } from '../../utilities/initTransaction.js'
import { killTransaction } from '../../utilities/killTransaction' import { killTransaction } from '../../utilities/killTransaction.js'
import { getMigrations } from './getMigrations' import { getMigrations } from './getMigrations.js'
import { readMigrationFiles } from './readMigrationFiles' import { readMigrationFiles } from './readMigrationFiles.js'
/** /**
* Run all migration down functions before running up * Run all migration down functions before running up

Some files were not shown because too many files have changed in this diff Show More