Merge branch 'beta' into fix/versions-permissions

packages/next/src/exports/utilities.ts

@@ -1,7 +1,7 @@
 export { addDataAndFileToRequest } from '../utilities/addDataAndFileToRequest.js'
 export { addLocalesToRequestFromData, sanitizeLocales } from '../utilities/addLocalesToRequest.js'
 export { traverseFields } from '../utilities/buildFieldSchemaMap/traverseFields.js'
-export { createPayloadRequest as createBasePayloadRequest } from '../utilities/createPayloadRequest.js'
+export { createPayloadRequest } from '../utilities/createPayloadRequest.js'
 export { getNextRequestI18n } from '../utilities/getNextRequestI18n.js'
 export { getPayloadHMR, reload } from '../utilities/getPayloadHMR.js'
 export { headersWithCors } from '../utilities/headersWithCors.js'

packages/next/src/next-fileupload/fileFactory.ts → packages/next/src/fetchAPI-multipart/fileFactory.ts

@@ -1,4 +1,4 @@
-import type { FileShape, NextFileUploadOptions } from './index.js'
+import type { FetchAPIFileUploadOptions, FileShape } from './index.js'
 
 import {
   checkAndMakeDir,
@@ -12,7 +12,7 @@ import {
 type MoveFile = (
   filePath: string,
   options: FileFactoryOptions,
-  fileUploadOptions: NextFileUploadOptions,
+  fileUploadOptions: FetchAPIFileUploadOptions,
 ) => (resolve: () => void, reject: () => void) => void
 
 /**
@@ -45,7 +45,7 @@ type FileFactoryOptions = {
 }
 type FileFactory = (
   options: FileFactoryOptions,
-  fileUploadOptions: NextFileUploadOptions,
+  fileUploadOptions: FetchAPIFileUploadOptions,
 ) => FileShape
 export const fileFactory: FileFactory = (options, fileUploadOptions) => {
   // see: https://github.com/richardgirges/express-fileupload/issues/14

packages/next/src/next-fileupload/handlers.ts → packages/next/src/fetchAPI-multipart/handlers.ts

@@ -2,12 +2,12 @@ import crypto from 'crypto'
 import fs, { WriteStream } from 'fs'
 import path from 'path'
 
-import type { NextFileUploadOptions } from './index.js'
+import type { FetchAPIFileUploadOptions } from './index.js'
 
 import { checkAndMakeDir, debugLog, deleteFile, getTempFilename } from './utilities.js'
 
 type Handler = (
-  options: NextFileUploadOptions,
+  options: FetchAPIFileUploadOptions,
   fieldname: string,
   filename: string,
 ) => {

packages/next/src/next-fileupload/index.ts → packages/next/src/fetchAPI-multipart/index.ts

@@ -34,7 +34,7 @@ export type FileShape = {
   truncated: boolean
 }
 
-export type NextFileUploadOptions = {
+export type FetchAPIFileUploadOptions = {
   /**
    * Returns a HTTP 413 when the file is bigger than the size limit if `true`.
    * Otherwise, it will add a `truncated = true` to the resulting file structure.
@@ -132,28 +132,28 @@ export type NextFileUploadOptions = {
   useTempFiles?: boolean | undefined
 } & Partial<BusboyConfig>
 
-type NextFileUploadResponseFile = {
+type FetchAPIFileUploadResponseFile = {
   data: Buffer
   mimetype: string
   name: string
   size: number
   tempFilePath?: string
 }
 
-export type NextFileUploadResponse = {
+export type FetchAPIFileUploadResponse = {
   error?: {
     code: number
     message: string
   }
   fields: Record<string, string>
-  files: Record<string, NextFileUploadResponseFile>
+  files: Record<string, FetchAPIFileUploadResponseFile>
 }
 
-type NextFileUpload = (args: {
-  options?: NextFileUploadOptions
+type FetchAPIFileUpload = (args: {
+  options?: FetchAPIFileUploadOptions
   request: Request
-}) => Promise<NextFileUploadResponse>
-export const nextFileUpload: NextFileUpload = async ({ options, request }) => {
+}) => Promise<FetchAPIFileUploadResponse>
+export const fetchAPIFileUpload: FetchAPIFileUpload = async ({ options, request }) => {
   const uploadOptions = { ...DEFAULT_OPTIONS, ...options }
   if (!isEligibleRequest(request)) {
     debugLog(uploadOptions, 'Request is not eligible for file upload!')

packages/next/src/next-fileupload/processMultipart.ts → packages/next/src/fetchAPI-multipart/processMultipart.ts

@@ -2,7 +2,7 @@ import Busboy from 'busboy'
 import httpStatus from 'http-status'
 import { APIError } from 'payload/errors'
 
-import type { NextFileUploadOptions, NextFileUploadResponse } from './index.js'
+import type { FetchAPIFileUploadOptions, FetchAPIFileUploadResponse } from './index.js'
 
 import { fileFactory } from './fileFactory.js'
 import { memHandler, tempFileHandler } from './handlers.js'
@@ -13,9 +13,9 @@ import { buildFields, debugLog, isFunc, parseFileName } from './utilities.js'
 const waitFlushProperty = Symbol('wait flush property symbol')
 
 type ProcessMultipart = (args: {
-  options: NextFileUploadOptions
+  options: FetchAPIFileUploadOptions
   request: Request
-}) => Promise<NextFileUploadResponse>
+}) => Promise<FetchAPIFileUploadResponse>
 export const processMultipart: ProcessMultipart = async ({ options, request }) => {
   let parsingRequest = true
 
@@ -29,7 +29,7 @@ export const processMultipart: ProcessMultipart = async ({ options, request }) =
     failedResolvingFiles = rej
   })
 
-  const result: NextFileUploadResponse = {
+  const result: FetchAPIFileUploadResponse = {
     fields: undefined,
     files: undefined,
   }

packages/next/src/next-fileupload/processNested.ts → packages/next/src/fetchAPI-multipart/processNested.ts

@@ -7,10 +7,10 @@ export const processNested = function (data) {
     keys = Object.keys(data)
 
   for (let i = 0; i < keys.length; i++) {
-    let key = keys[i],
+    const key = keys[i],
       value = data[key],
-      current = d,
       keyParts = key.replace(new RegExp(/\[/g), '.').replace(new RegExp(/\]/g), '').split('.')
+    let current = d
 
     for (let index = 0; index < keyParts.length; index++) {
       const k = keyParts[index]

packages/next/src/next-fileupload/utilities.ts → packages/next/src/fetchAPI-multipart/utilities.ts

@@ -2,7 +2,7 @@ import fs from 'fs'
 import path from 'path'
 import { Readable } from 'stream'
 
-import type { NextFileUploadOptions } from './index.js'
+import type { FetchAPIFileUploadOptions } from './index.js'
 
 // Parameters for safe file name parsing.
 const SAFE_FILE_NAME_REGEX = /[^\w-]/g
@@ -16,7 +16,7 @@ let tempCounter = 0
 /**
  * Logs message to console if options.debug option set to true.
  */
-export const debugLog = (options: NextFileUploadOptions, msg: string) => {
+export const debugLog = (options: FetchAPIFileUploadOptions, msg: string) => {
   const opts = options || {}
   if (!opts.debug) return false
   console.log(`Next-file-upload: ${msg}`) // eslint-disable-line
@@ -108,7 +108,7 @@ export const buildFields: BuildFields = (instance, field, value) => {
  * Creates a folder if it does not exist
  * for file specified in the path variable
  */
-type CheckAndMakeDir = (fileUploadOptions: NextFileUploadOptions, filePath: string) => boolean
+type CheckAndMakeDir = (fileUploadOptions: FetchAPIFileUploadOptions, filePath: string) => boolean
 export const checkAndMakeDir: CheckAndMakeDir = (fileUploadOptions, filePath) => {
   if (!fileUploadOptions.createParentPath) return false
   // Check whether folder for the file exists.
@@ -271,7 +271,7 @@ export const parseFileNameExtension: ParseFileNameExtension = (preserveExtension
 /**
  * Parse file name and extension.
  */
-type ParseFileName = (opts: NextFileUploadOptions, fileName: string) => string
+type ParseFileName = (opts: FetchAPIFileUploadOptions, fileName: string) => string
 export const parseFileName: ParseFileName = (opts, fileName) => {
   // Check fileName argument
   if (!fileName || typeof fileName !== 'string') return getTempFilename()

packages/next/src/routes/rest/files/getFile.ts

@@ -6,7 +6,7 @@ import httpStatus from 'http-status'
 import path from 'path'
 import { APIError } from 'payload/errors'
 
-import { streamFile } from '../../../next-stream-file/index.js'
+import { streamFile } from '../../../fetchAPI-stream-file/index.js'
 import { headersWithCors } from '../../../utilities/headersWithCors.js'
 import { routeError } from '../routeError.js'
 import { checkFileAccess } from './checkFileAccess.js'

packages/next/src/routes/rest/index.ts

@@ -149,7 +149,10 @@ const handleCustomEndpoints = ({
     })
 
     if (customEndpoint) {
-      payloadRequest.routeParams = handlerParams
+      payloadRequest.routeParams = {
+        ...payloadRequest.routeParams,
+        ...handlerParams,
+      }
       return customEndpoint.handler(payloadRequest)
     }
   }
@@ -211,9 +214,6 @@ export const GET =
     try {
       req = await createPayloadRequest({
         config,
-        params: {
-          collection: slug1,
-        },
         request,
       })
 
@@ -227,6 +227,7 @@ export const GET =
       collection = req.payload.collections?.[slug1]
 
       if (collection) {
+        req.routeParams.collection = slug1
         const disableEndpoints = endpointsAreDisabled({
           endpoints: collection.config.endpoints,
           request,
@@ -295,12 +296,12 @@ export const GET =
         }
       } else if (slug1 === 'globals') {
         const globalConfig = req.payload.config.globals.find((global) => global.slug === slug2)
+        req.routeParams.global = globalConfig.slug
 
         const disableEndpoints = endpointsAreDisabled({
           endpoints: globalConfig.endpoints,
           request,
         })
-
         if (disableEndpoints) return disableEndpoints
 
         const customEndpointResponse = await handleCustomEndpoints({
@@ -391,7 +392,6 @@ export const POST =
     try {
       req = await createPayloadRequest({
         config,
-        params: { collection: slug1 },
         request,
       })
 
@@ -405,6 +405,7 @@ export const POST =
       if (disableEndpoints) return disableEndpoints
 
       if (collection) {
+        req.routeParams.collection = slug1
         const disableEndpoints = endpointsAreDisabled({
           endpoints: collection.config.endpoints,
           request,
@@ -466,6 +467,8 @@ export const POST =
         }
       } else if (slug1 === 'globals' && slug2) {
         const globalConfig = req.payload.config.globals.find((global) => global.slug === slug2)
+        req.routeParams.global = globalConfig.slug
+
         const disableEndpoints = endpointsAreDisabled({
           endpoints: globalConfig.endpoints,
           request,
@@ -553,9 +556,6 @@ export const DELETE =
     try {
       req = await createPayloadRequest({
         config,
-        params: {
-          collection: slug1,
-        },
         request,
       })
       collection = req.payload.collections?.[slug1]
@@ -567,6 +567,8 @@ export const DELETE =
       if (disableEndpoints) return disableEndpoints
 
       if (collection) {
+        req.routeParams.collection = slug1
+
         const disableEndpoints = endpointsAreDisabled({
           endpoints: collection.config.endpoints,
           request,
@@ -635,9 +637,6 @@ export const PATCH =
     try {
       req = await createPayloadRequest({
         config,
-        params: {
-          collection: slug1,
-        },
         request,
       })
       collection = req.payload.collections?.[slug1]
@@ -649,6 +648,8 @@ export const PATCH =
       if (disableEndpoints) return disableEndpoints
 
       if (collection) {
+        req.routeParams.collection = slug1
+
         const disableEndpoints = endpointsAreDisabled({
           endpoints: collection.config.endpoints,
           request,