@payloadcms/next 3.0.0-canary.294ea5c → 3.0.0-canary.2d0dd26

package/dist/routes/rest/og/image.d.ts

@@ -1,9 +1,11 @@
-import type { MappedComponent } from 'payload';
+import type { ImportMap, PayloadComponent } from 'payload';
 import React from 'react';
 export declare const OGImage: React.FC<{
-    Icon: MappedComponent;
     description?: string;
+    Fallback: React.ComponentType;
     fontFamily?: string;
+    Icon: PayloadComponent;
+    importMap: ImportMap;
     leader?: string;
     title?: string;
 }>;

package/dist/routes/rest/og/image.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../../../src/routes/rest/og/image.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAG9C,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,eAAO,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;IAC7B,IAAI,EAAE,eAAe,CAAA;IACrB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAqFA,CAAA"}
+{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../../../src/routes/rest/og/image.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAG1D,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,eAAO,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,KAAK,CAAC,aAAa,CAAA;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,gBAAgB,CAAA;IACtB,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CA+FA,CAAA"}

package/dist/routes/rest/og/image.js

@@ -1,10 +1,12 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { RenderComponent } from '@payloadcms/ui/shared';
+import { RenderServerComponent } from '@payloadcms/ui/elements/RenderServerComponent';
 import React from 'react';
 export const OGImage = ({
-  Icon,
   description,
+  Fallback,
   fontFamily = 'Arial, sans-serif',
+  Icon,
+  importMap,
   leader,
   title
 }) => {
@@ -36,27 +38,27 @@ export const OGImage = ({
         children: leader
       }), /*#__PURE__*/_jsx("p", {
         style: {
-          WebkitBoxOrient: 'vertical',
-          WebkitLineClamp: 2,
           display: '-webkit-box',
           fontSize: 90,
           lineHeight: 1,
           marginBottom: 0,
           marginTop: 0,
-          textOverflow: 'ellipsis'
+          textOverflow: 'ellipsis',
+          WebkitBoxOrient: 'vertical',
+          WebkitLineClamp: 2
         },
         children: title
       }), description && /*#__PURE__*/_jsx("p", {
         style: {
-          WebkitBoxOrient: 'vertical',
-          WebkitLineClamp: 2,
           display: '-webkit-box',
           flexGrow: 1,
           fontSize: 30,
           lineHeight: 1,
           marginBottom: 0,
           marginTop: 40,
-          textOverflow: 'ellipsis'
+          textOverflow: 'ellipsis',
+          WebkitBoxOrient: 'vertical',
+          WebkitLineClamp: 2
         },
         children: description
       })]
@@ -69,11 +71,13 @@ export const OGImage = ({
         justifyContent: 'center',
         width: '38px'
       },
-      children: /*#__PURE__*/_jsx(RenderComponent, {
+      children: /*#__PURE__*/_jsx(RenderServerComponent, {
         clientProps: {
           fill: 'white'
         },
-        mappedComponent: Icon
+        Component: Icon,
+        Fallback: Fallback,
+        importMap: importMap
       })
     })]
   });

package/dist/routes/rest/og/image.js.map

@@ -1 +1 @@
-{"version":3,"file":"image.js","names":["RenderComponent","React","OGImage","Icon","description","fontFamily","leader","title","_jsxs","style","backgroundColor","color","display","flexDirection","height","justifyContent","padding","width","flexGrow","fontSize","_jsx","marginBottom","WebkitBoxOrient","WebkitLineClamp","lineHeight","marginTop","textOverflow","alignItems","flexShrink","clientProps","fill","mappedComponent"],"sources":["../../../../src/routes/rest/og/image.tsx"],"sourcesContent":["import type { MappedComponent } from 'payload'\n\nimport { RenderComponent } from '@payloadcms/ui/shared'\nimport React from 'react'\n\nexport const OGImage: React.FC<{\n  Icon: MappedComponent\n  description?: string\n  fontFamily?: string\n  leader?: string\n  title?: string\n}> = ({ Icon, description, fontFamily = 'Arial, sans-serif', leader, title }) => {\n  return (\n    <div\n      style={{\n        backgroundColor: '#000',\n        color: '#fff',\n        display: 'flex',\n        flexDirection: 'column',\n        fontFamily,\n        height: '100%',\n        justifyContent: 'space-between',\n        padding: '100px',\n        width: '100%',\n      }}\n    >\n      <div\n        style={{\n          display: 'flex',\n          flexDirection: 'column',\n          flexGrow: 1,\n          fontSize: 50,\n          height: '100%',\n        }}\n      >\n        {leader && (\n          <div\n            style={{\n              fontSize: 30,\n              marginBottom: 10,\n            }}\n          >\n            {leader}\n          </div>\n        )}\n        <p\n          style={{\n            WebkitBoxOrient: 'vertical',\n            WebkitLineClamp: 2,\n            display: '-webkit-box',\n            fontSize: 90,\n            lineHeight: 1,\n            marginBottom: 0,\n            marginTop: 0,\n            textOverflow: 'ellipsis',\n          }}\n        >\n          {title}\n        </p>\n        {description && (\n          <p\n            style={{\n              WebkitBoxOrient: 'vertical',\n              WebkitLineClamp: 2,\n              display: '-webkit-box',\n              flexGrow: 1,\n              fontSize: 30,\n              lineHeight: 1,\n              marginBottom: 0,\n              marginTop: 40,\n              textOverflow: 'ellipsis',\n            }}\n          >\n            {description}\n          </p>\n        )}\n      </div>\n      <div\n        style={{\n          alignItems: 'flex-end',\n          display: 'flex',\n          flexShrink: 0,\n          height: '38px',\n          justifyContent: 'center',\n          width: '38px',\n        }}\n      >\n        <RenderComponent\n          clientProps={{\n            fill: 'white',\n          }}\n          mappedComponent={Icon}\n        />\n      </div>\n    </div>\n  )\n}\n"],"mappings":";AAEA,SAASA,eAAe,QAAQ;AAChC,OAAOC,KAAA,MAAW;AAElB,OAAO,MAAMC,OAAA,GAMRA,CAAC;EAAEC,IAAI;EAAEC,WAAW;EAAEC,UAAA,GAAa,mBAAmB;EAAEC,MAAM;EAAEC;AAAK,CAAE;EAC1E,oBACEC,KAAA,CAAC;IACCC,KAAA,EAAO;MACLC,eAAA,EAAiB;MACjBC,KAAA,EAAO;MACPC,OAAA,EAAS;MACTC,aAAA,EAAe;MACfR,UAAA;MACAS,MAAA,EAAQ;MACRC,cAAA,EAAgB;MAChBC,OAAA,EAAS;MACTC,KAAA,EAAO;IACT;4BAEAT,KAAA,CAAC;MACCC,KAAA,EAAO;QACLG,OAAA,EAAS;QACTC,aAAA,EAAe;QACfK,QAAA,EAAU;QACVC,QAAA,EAAU;QACVL,MAAA,EAAQ;MACV;iBAECR,MAAA,iBACCc,IAAA,CAAC;QACCX,KAAA,EAAO;UACLU,QAAA,EAAU;UACVE,YAAA,EAAc;QAChB;kBAECf;uBAGLc,IAAA,CAAC;QACCX,KAAA,EAAO;UACLa,eAAA,EAAiB;UACjBC,eAAA,EAAiB;UACjBX,OAAA,EAAS;UACTO,QAAA,EAAU;UACVK,UAAA,EAAY;UACZH,YAAA,EAAc;UACdI,SAAA,EAAW;UACXC,YAAA,EAAc;QAChB;kBAECnB;UAEFH,WAAA,iBACCgB,IAAA,CAAC;QACCX,KAAA,EAAO;UACLa,eAAA,EAAiB;UACjBC,eAAA,EAAiB;UACjBX,OAAA,EAAS;UACTM,QAAA,EAAU;UACVC,QAAA,EAAU;UACVK,UAAA,EAAY;UACZH,YAAA,EAAc;UACdI,SAAA,EAAW;UACXC,YAAA,EAAc;QAChB;kBAECtB;;qBAIPgB,IAAA,CAAC;MACCX,KAAA,EAAO;QACLkB,UAAA,EAAY;QACZf,OAAA,EAAS;QACTgB,UAAA,EAAY;QACZd,MAAA,EAAQ;QACRC,cAAA,EAAgB;QAChBE,KAAA,EAAO;MACT;gBAEA,aAAAG,IAAA,CAACpB,eAAA;QACC6B,WAAA,EAAa;UACXC,IAAA,EAAM;QACR;QACAC,eAAA,EAAiB5B;;;;AAK3B","ignoreList":[]}
+{"version":3,"file":"image.js","names":["RenderServerComponent","React","OGImage","description","Fallback","fontFamily","Icon","importMap","leader","title","_jsxs","style","backgroundColor","color","display","flexDirection","height","justifyContent","padding","width","flexGrow","fontSize","_jsx","marginBottom","lineHeight","marginTop","textOverflow","WebkitBoxOrient","WebkitLineClamp","alignItems","flexShrink","clientProps","fill","Component"],"sources":["../../../../src/routes/rest/og/image.tsx"],"sourcesContent":["import type { ImportMap, PayloadComponent } from 'payload'\n\nimport { RenderServerComponent } from '@payloadcms/ui/elements/RenderServerComponent'\nimport React from 'react'\n\nexport const OGImage: React.FC<{\n  description?: string\n  Fallback: React.ComponentType\n  fontFamily?: string\n  Icon: PayloadComponent\n  importMap: ImportMap\n  leader?: string\n  title?: string\n}> = ({\n  description,\n  Fallback,\n  fontFamily = 'Arial, sans-serif',\n  Icon,\n  importMap,\n  leader,\n  title,\n}) => {\n  return (\n    <div\n      style={{\n        backgroundColor: '#000',\n        color: '#fff',\n        display: 'flex',\n        flexDirection: 'column',\n        fontFamily,\n        height: '100%',\n        justifyContent: 'space-between',\n        padding: '100px',\n        width: '100%',\n      }}\n    >\n      <div\n        style={{\n          display: 'flex',\n          flexDirection: 'column',\n          flexGrow: 1,\n          fontSize: 50,\n          height: '100%',\n        }}\n      >\n        {leader && (\n          <div\n            style={{\n              fontSize: 30,\n              marginBottom: 10,\n            }}\n          >\n            {leader}\n          </div>\n        )}\n        <p\n          style={{\n            display: '-webkit-box',\n            fontSize: 90,\n            lineHeight: 1,\n            marginBottom: 0,\n            marginTop: 0,\n            textOverflow: 'ellipsis',\n            WebkitBoxOrient: 'vertical',\n            WebkitLineClamp: 2,\n          }}\n        >\n          {title}\n        </p>\n        {description && (\n          <p\n            style={{\n              display: '-webkit-box',\n              flexGrow: 1,\n              fontSize: 30,\n              lineHeight: 1,\n              marginBottom: 0,\n              marginTop: 40,\n              textOverflow: 'ellipsis',\n              WebkitBoxOrient: 'vertical',\n              WebkitLineClamp: 2,\n            }}\n          >\n            {description}\n          </p>\n        )}\n      </div>\n      <div\n        style={{\n          alignItems: 'flex-end',\n          display: 'flex',\n          flexShrink: 0,\n          height: '38px',\n          justifyContent: 'center',\n          width: '38px',\n        }}\n      >\n        <RenderServerComponent\n          clientProps={{\n            fill: 'white',\n          }}\n          Component={Icon}\n          Fallback={Fallback}\n          importMap={importMap}\n        />\n      </div>\n    </div>\n  )\n}\n"],"mappings":";AAEA,SAASA,qBAAqB,QAAQ;AACtC,OAAOC,KAAA,MAAW;AAElB,OAAO,MAAMC,OAAA,GAQRA,CAAC;EACJC,WAAW;EACXC,QAAQ;EACRC,UAAA,GAAa,mBAAmB;EAChCC,IAAI;EACJC,SAAS;EACTC,MAAM;EACNC;AAAK,CACN;EACC,oBACEC,KAAA,CAAC;IACCC,KAAA,EAAO;MACLC,eAAA,EAAiB;MACjBC,KAAA,EAAO;MACPC,OAAA,EAAS;MACTC,aAAA,EAAe;MACfV,UAAA;MACAW,MAAA,EAAQ;MACRC,cAAA,EAAgB;MAChBC,OAAA,EAAS;MACTC,KAAA,EAAO;IACT;4BAEAT,KAAA,CAAC;MACCC,KAAA,EAAO;QACLG,OAAA,EAAS;QACTC,aAAA,EAAe;QACfK,QAAA,EAAU;QACVC,QAAA,EAAU;QACVL,MAAA,EAAQ;MACV;iBAECR,MAAA,iBACCc,IAAA,CAAC;QACCX,KAAA,EAAO;UACLU,QAAA,EAAU;UACVE,YAAA,EAAc;QAChB;kBAECf;uBAGLc,IAAA,CAAC;QACCX,KAAA,EAAO;UACLG,OAAA,EAAS;UACTO,QAAA,EAAU;UACVG,UAAA,EAAY;UACZD,YAAA,EAAc;UACdE,SAAA,EAAW;UACXC,YAAA,EAAc;UACdC,eAAA,EAAiB;UACjBC,eAAA,EAAiB;QACnB;kBAECnB;UAEFN,WAAA,iBACCmB,IAAA,CAAC;QACCX,KAAA,EAAO;UACLG,OAAA,EAAS;UACTM,QAAA,EAAU;UACVC,QAAA,EAAU;UACVG,UAAA,EAAY;UACZD,YAAA,EAAc;UACdE,SAAA,EAAW;UACXC,YAAA,EAAc;UACdC,eAAA,EAAiB;UACjBC,eAAA,EAAiB;QACnB;kBAECzB;;qBAIPmB,IAAA,CAAC;MACCX,KAAA,EAAO;QACLkB,UAAA,EAAY;QACZf,OAAA,EAAS;QACTgB,UAAA,EAAY;QACZd,MAAA,EAAQ;QACRC,cAAA,EAAgB;QAChBE,KAAA,EAAO;MACT;gBAEA,aAAAG,IAAA,CAACtB,qBAAA;QACC+B,WAAA,EAAa;UACXC,IAAA,EAAM;QACR;QACAC,SAAA,EAAW3B,IAAA;QACXF,QAAA,EAAUA,QAAA;QACVG,SAAA,EAAWA;;;;AAKrB","ignoreList":[]}

package/dist/routes/rest/og/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/routes/rest/og/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAI7C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAU7C,eAAO,MAAM,OAAO,WAAW,CAAA;AAE/B,eAAO,MAAM,WAAW,cAAc,CAAA;AAEtC,eAAO,MAAM,eAAe,YAAmB;IAAE,GAAG,EAAE,cAAc,CAAA;CAAE;;mBAwErE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/routes/rest/og/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAI7C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAU7C,eAAO,MAAM,OAAO,WAAW,CAAA;AAE/B,eAAO,MAAM,WAAW,cAAc,CAAA;AAEtC,eAAO,MAAM,eAAe,YAAmB;IAAE,GAAG,EAAE,cAAc,CAAA;CAAE;;mBA8DrE,CAAA"}

package/dist/routes/rest/og/index.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { PayloadIcon, getCreateMappedComponent } from '@payloadcms/ui/shared';
+import { PayloadIcon } from '@payloadcms/ui/shared';
 import fs from 'fs/promises';
 import { ImageResponse } from 'next/og.js';
 import { NextResponse } from 'next/server.js';
@@ -31,11 +31,6 @@ export const generateOGImage = async ({
     const hasLeader = searchParams.has('leader');
     const leader = hasLeader ? searchParams.get('leader')?.slice(0, 100).replace('-', ' ') : '';
     const description = searchParams.has('description') ? searchParams.get('description') : '';
-    const createMappedComponent = getCreateMappedComponent({
-      importMap: req.payload.importMap,
-      serverProps: {}
-    });
-    const mappedIcon = createMappedComponent(config.admin?.components?.graphics?.Icon, undefined, PayloadIcon, 'config.admin.components.graphics.Icon');
     let fontData;
     try {
       // TODO: replace with `.woff2` file when supported
@@ -43,14 +38,15 @@ export const generateOGImage = async ({
       // Or better yet, use a CDN like Google Fonts if ever supported
       fontData = fs.readFile(path.join(dirname, 'roboto-regular.woff'));
     } catch (e) {
-      console.error(`Error reading font file or not readable: ${e.message}`) // eslint-disable-line no-console
-      ;
+      req.payload.logger.error(`Error reading font file or not readable: ${e.message}`);
     }
     const fontFamily = 'Roboto, sans-serif';
-    return new ImageResponse( /*#__PURE__*/_jsx(OGImage, {
-      Icon: mappedIcon,
+    return new ImageResponse(/*#__PURE__*/_jsx(OGImage, {
       description: description,
+      Fallback: PayloadIcon,
       fontFamily: fontFamily,
+      Icon: config.admin?.components?.graphics?.Icon,
+      importMap: req.payload.importMap,
       leader: leader,
       title: title
     }), {
@@ -66,8 +62,7 @@ export const generateOGImage = async ({
       width: 1200
     });
   } catch (e) {
-    console.error(`${e.message}`) // eslint-disable-line no-console
-    ;
+    req.payload.logger.error(`Error generating Open Graph image: ${e.message}`);
     return NextResponse.json({
       error: `Internal Server Error: ${e.message}`
     }, {

package/dist/routes/rest/og/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["PayloadIcon","getCreateMappedComponent","fs","ImageResponse","NextResponse","path","React","fileURLToPath","OGImage","filename","import","meta","url","dirname","runtime","contentType","generateOGImage","req","config","payload","admin","defaultOGImageType","json","error","status","searchParams","URL","hasTitle","has","title","get","slice","hasLeader","leader","replace","description","createMappedComponent","importMap","serverProps","mappedIcon","components","graphics","Icon","undefined","fontData","readFile","join","e","console","message","fontFamily","_jsx","fonts","name","data","style","weight","height","width"],"sources":["../../../../src/routes/rest/og/index.tsx"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\nimport { PayloadIcon, getCreateMappedComponent } from '@payloadcms/ui/shared'\nimport fs from 'fs/promises'\nimport { ImageResponse } from 'next/og.js'\nimport { NextResponse } from 'next/server.js'\nimport path from 'path'\nimport React from 'react'\nimport { fileURLToPath } from 'url'\n\nimport { OGImage } from './image.js'\n\nconst filename = fileURLToPath(import.meta.url)\nconst dirname = path.dirname(filename)\n\nexport const runtime = 'nodejs'\n\nexport const contentType = 'image/png'\n\nexport const generateOGImage = async ({ req }: { req: PayloadRequest }) => {\n  const config = req.payload.config\n\n  if (config.admin.meta.defaultOGImageType === 'off') {\n    return NextResponse.json({ error: `Open Graph images are disabled` }, { status: 400 })\n  }\n\n  try {\n    const { searchParams } = new URL(req.url)\n\n    const hasTitle = searchParams.has('title')\n    const title = hasTitle ? searchParams.get('title')?.slice(0, 100) : ''\n    const hasLeader = searchParams.has('leader')\n    const leader = hasLeader ? searchParams.get('leader')?.slice(0, 100).replace('-', ' ') : ''\n    const description = searchParams.has('description') ? searchParams.get('description') : ''\n\n    const createMappedComponent = getCreateMappedComponent({\n      importMap: req.payload.importMap,\n      serverProps: {},\n    })\n\n    const mappedIcon = createMappedComponent(\n      config.admin?.components?.graphics?.Icon,\n      undefined,\n      PayloadIcon,\n      'config.admin.components.graphics.Icon',\n    )\n\n    let fontData\n\n    try {\n      // TODO: replace with `.woff2` file when supported\n      // See https://github.com/vercel/next.js/issues/63935\n      // Or better yet, use a CDN like Google Fonts if ever supported\n      fontData = fs.readFile(path.join(dirname, 'roboto-regular.woff'))\n    } catch (e) {\n      console.error(`Error reading font file or not readable: ${e.message}`) // eslint-disable-line no-console\n    }\n\n    const fontFamily = 'Roboto, sans-serif'\n\n    return new ImageResponse(\n      (\n        <OGImage\n          Icon={mappedIcon}\n          description={description}\n          fontFamily={fontFamily}\n          leader={leader}\n          title={title}\n        />\n      ),\n      {\n        ...(fontData\n          ? {\n              fonts: [\n                {\n                  name: 'Roboto',\n                  data: await fontData,\n                  style: 'normal',\n                  weight: 400,\n                },\n              ],\n            }\n          : {}),\n        height: 630,\n        width: 1200,\n      },\n    )\n  } catch (e: any) {\n    console.error(`${e.message}`) // eslint-disable-line no-console\n    return NextResponse.json({ error: `Internal Server Error: ${e.message}` }, { status: 500 })\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["PayloadIcon","fs","ImageResponse","NextResponse","path","React","fileURLToPath","OGImage","filename","import","meta","url","dirname","runtime","contentType","generateOGImage","req","config","payload","admin","defaultOGImageType","json","error","status","searchParams","URL","hasTitle","has","title","get","slice","hasLeader","leader","replace","description","fontData","readFile","join","e","logger","message","fontFamily","_jsx","Fallback","Icon","components","graphics","importMap","fonts","name","data","style","weight","height","width"],"sources":["../../../../src/routes/rest/og/index.tsx"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\nimport { PayloadIcon } from '@payloadcms/ui/shared'\nimport fs from 'fs/promises'\nimport { ImageResponse } from 'next/og.js'\nimport { NextResponse } from 'next/server.js'\nimport path from 'path'\nimport React from 'react'\nimport { fileURLToPath } from 'url'\n\nimport { OGImage } from './image.js'\n\nconst filename = fileURLToPath(import.meta.url)\nconst dirname = path.dirname(filename)\n\nexport const runtime = 'nodejs'\n\nexport const contentType = 'image/png'\n\nexport const generateOGImage = async ({ req }: { req: PayloadRequest }) => {\n  const config = req.payload.config\n\n  if (config.admin.meta.defaultOGImageType === 'off') {\n    return NextResponse.json({ error: `Open Graph images are disabled` }, { status: 400 })\n  }\n\n  try {\n    const { searchParams } = new URL(req.url)\n\n    const hasTitle = searchParams.has('title')\n    const title = hasTitle ? searchParams.get('title')?.slice(0, 100) : ''\n    const hasLeader = searchParams.has('leader')\n    const leader = hasLeader ? searchParams.get('leader')?.slice(0, 100).replace('-', ' ') : ''\n    const description = searchParams.has('description') ? searchParams.get('description') : ''\n\n    let fontData\n\n    try {\n      // TODO: replace with `.woff2` file when supported\n      // See https://github.com/vercel/next.js/issues/63935\n      // Or better yet, use a CDN like Google Fonts if ever supported\n      fontData = fs.readFile(path.join(dirname, 'roboto-regular.woff'))\n    } catch (e) {\n      req.payload.logger.error(`Error reading font file or not readable: ${e.message}`)\n    }\n\n    const fontFamily = 'Roboto, sans-serif'\n\n    return new ImageResponse(\n      (\n        <OGImage\n          description={description}\n          Fallback={PayloadIcon}\n          fontFamily={fontFamily}\n          Icon={config.admin?.components?.graphics?.Icon}\n          importMap={req.payload.importMap}\n          leader={leader}\n          title={title}\n        />\n      ),\n      {\n        ...(fontData\n          ? {\n              fonts: [\n                {\n                  name: 'Roboto',\n                  data: await fontData,\n                  style: 'normal',\n                  weight: 400,\n                },\n              ],\n            }\n          : {}),\n        height: 630,\n        width: 1200,\n      },\n    )\n  } catch (e: any) {\n    req.payload.logger.error(`Error generating Open Graph image: ${e.message}`)\n    return NextResponse.json({ error: `Internal Server Error: ${e.message}` }, { status: 500 })\n  }\n}\n"],"mappings":";AAEA,SAASA,WAAW,QAAQ;AAC5B,OAAOC,EAAA,MAAQ;AACf,SAASC,aAAa,QAAQ;AAC9B,SAASC,YAAY,QAAQ;AAC7B,OAAOC,IAAA,MAAU;AACjB,OAAOC,KAAA,MAAW;AAClB,SAASC,aAAa,QAAQ;AAE9B,SAASC,OAAO,QAAQ;AAExB,MAAMC,QAAA,GAAWF,aAAA,CAAcG,MAAA,CAAAC,IAAA,CAAYC,GAAG;AAC9C,MAAMC,OAAA,GAAUR,IAAA,CAAKQ,OAAO,CAACJ,QAAA;AAE7B,OAAO,MAAMK,OAAA,GAAU;AAEvB,OAAO,MAAMC,WAAA,GAAc;AAE3B,OAAO,MAAMC,eAAA,GAAkB,MAAAA,CAAO;EAAEC;AAAG,CAA2B;EACpE,MAAMC,MAAA,GAASD,GAAA,CAAIE,OAAO,CAACD,MAAM;EAEjC,IAAIA,MAAA,CAAOE,KAAK,CAACT,IAAI,CAACU,kBAAkB,KAAK,OAAO;IAClD,OAAOjB,YAAA,CAAakB,IAAI,CAAC;MAAEC,KAAA,EAAO;IAAiC,GAAG;MAAEC,MAAA,EAAQ;IAAI;EACtF;EAEA,IAAI;IACF,MAAM;MAAEC;IAAY,CAAE,GAAG,IAAIC,GAAA,CAAIT,GAAA,CAAIL,GAAG;IAExC,MAAMe,QAAA,GAAWF,YAAA,CAAaG,GAAG,CAAC;IAClC,MAAMC,KAAA,GAAQF,QAAA,GAAWF,YAAA,CAAaK,GAAG,CAAC,UAAUC,KAAA,CAAM,GAAG,OAAO;IACpE,MAAMC,SAAA,GAAYP,YAAA,CAAaG,GAAG,CAAC;IACnC,MAAMK,MAAA,GAASD,SAAA,GAAYP,YAAA,CAAaK,GAAG,CAAC,WAAWC,KAAA,CAAM,GAAG,KAAKG,OAAA,CAAQ,KAAK,OAAO;IACzF,MAAMC,WAAA,GAAcV,YAAA,CAAaG,GAAG,CAAC,iBAAiBH,YAAA,CAAaK,GAAG,CAAC,iBAAiB;IAExF,IAAIM,QAAA;IAEJ,IAAI;MACF;MACA;MACA;MACAA,QAAA,GAAWlC,EAAA,CAAGmC,QAAQ,CAAChC,IAAA,CAAKiC,IAAI,CAACzB,OAAA,EAAS;IAC5C,EAAE,OAAO0B,CAAA,EAAG;MACVtB,GAAA,CAAIE,OAAO,CAACqB,MAAM,CAACjB,KAAK,CAAC,4CAA4CgB,CAAA,CAAEE,OAAO,EAAE;IAClF;IAEA,MAAMC,UAAA,GAAa;IAEnB,OAAO,IAAIvC,aAAA,cAEPwC,IAAA,CAACnC,OAAA;MACC2B,WAAA,EAAaA,WAAA;MACbS,QAAA,EAAU3C,WAAA;MACVyC,UAAA,EAAYA,UAAA;MACZG,IAAA,EAAM3B,MAAA,CAAOE,KAAK,EAAE0B,UAAA,EAAYC,QAAA,EAAUF,IAAA;MAC1CG,SAAA,EAAW/B,GAAA,CAAIE,OAAO,CAAC6B,SAAS;MAChCf,MAAA,EAAQA,MAAA;MACRJ,KAAA,EAAOA;QAGX;MACE,IAAIO,QAAA,GACA;QACEa,KAAA,EAAO,CACL;UACEC,IAAA,EAAM;UACNC,IAAA,EAAM,MAAMf,QAAA;UACZgB,KAAA,EAAO;UACPC,MAAA,EAAQ;QACV;MAEJ,IACA,CAAC,CAAC;MACNC,MAAA,EAAQ;MACRC,KAAA,EAAO;IACT;EAEJ,EAAE,OAAOhB,CAAA,EAAQ;IACftB,GAAA,CAAIE,OAAO,CAACqB,MAAM,CAACjB,KAAK,CAAC,sCAAsCgB,CAAA,CAAEE,OAAO,EAAE;IAC1E,OAAOrC,YAAA,CAAakB,IAAI,CAAC;MAAEC,KAAA,EAAO,0BAA0BgB,CAAA,CAAEE,OAAO;IAAG,GAAG;MAAEjB,MAAA,EAAQ;IAAI;EAC3F;AACF","ignoreList":[]}

package/dist/routes/rest/routeError.d.ts

@@ -1,14 +1,9 @@
 import type { Collection, PayloadRequest, SanitizedConfig } from 'payload';
 import { APIError } from 'payload';
-export type ErrorResponse = {
-    data?: any;
-    errors: unknown[];
-    stack?: string;
-};
-export declare const routeError: ({ collection, config: configArg, err, req, }: {
+export declare const routeError: ({ collection, config: configArg, err, req: incomingReq, }: {
     collection?: Collection;
     config: Promise<SanitizedConfig> | SanitizedConfig;
     err: APIError;
-    req: Partial<PayloadRequest>;
+    req: PayloadRequest | Request;
 }) => Promise<Response>;
 //# sourceMappingURL=routeError.d.ts.map

package/dist/routes/rest/routeError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routeError.d.ts","sourceRoot":"","sources":["../../../src/routes/rest/routeError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAG1E,OAAO,EAAE,QAAQ,EAAqC,MAAM,SAAS,CAAA;AAKrE,MAAM,MAAM,aAAa,GAAG;IAAE,IAAI,CAAC,EAAE,GAAG,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AA+D7E,eAAO,MAAM,UAAU,iDAKpB;IACD,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IAClD,GAAG,EAAE,QAAQ,CAAA;IACb,GAAG,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;CAC7B,sBA8DA,CAAA"}
+{"version":3,"file":"routeError.d.ts","sourceRoot":"","sources":["../../../src/routes/rest/routeError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAe,cAAc,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAGvF,OAAO,EAAE,QAAQ,EAA4B,MAAM,SAAS,CAAA;AAK5D,eAAO,MAAM,UAAU,8DAKpB;IACD,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,CAAA;IAClD,GAAG,EAAE,QAAQ,CAAA;IACb,GAAG,EAAE,cAAc,GAAG,OAAO,CAAA;CAC9B,sBAqFA,CAAA"}

package/dist/routes/rest/routeError.js

@@ -1,63 +1,17 @@
 import httpStatus from 'http-status';
-import { APIError, APIErrorName, ValidationErrorName } from 'payload';
-import { getPayloadHMR } from '../../utilities/getPayloadHMR.js';
+import { APIError, formatErrors, getPayload } from 'payload';
 import { headersWithCors } from '../../utilities/headersWithCors.js';
-const formatErrors = incoming => {
-  if (incoming) {
-    // Cannot use `instanceof` to check error type: https://github.com/microsoft/TypeScript/issues/13965
-    // Instead, get the prototype of the incoming error and check its constructor name
-    const proto = Object.getPrototypeOf(incoming);
-    // Payload 'ValidationError' and 'APIError'
-    if ((proto.constructor.name === ValidationErrorName || proto.constructor.name === APIErrorName) && incoming.data) {
-      return {
-        errors: [{
-          name: incoming.name,
-          data: incoming.data,
-          message: incoming.message
-        }]
-      };
-    }
-    // Mongoose 'ValidationError': https://mongoosejs.com/docs/api/error.html#Error.ValidationError
-    if (proto.constructor.name === ValidationErrorName && 'errors' in incoming && incoming.errors) {
-      return {
-        errors: Object.keys(incoming.errors).reduce((acc, key) => {
-          acc.push({
-            field: incoming.errors[key].path,
-            message: incoming.errors[key].message
-          });
-          return acc;
-        }, [])
-      };
-    }
-    if (Array.isArray(incoming.message)) {
-      return {
-        errors: incoming.message
-      };
-    }
-    if (incoming.name) {
-      return {
-        errors: [{
-          message: incoming.message
-        }]
-      };
-    }
-  }
-  return {
-    errors: [{
-      message: 'An unknown error occurred.'
-    }]
-  };
-};
+import { mergeHeaders } from '../../utilities/mergeHeaders.js';
 export const routeError = async ({
   collection,
   config: configArg,
   err,
-  req
+  req: incomingReq
 }) => {
-  let payload = req?.payload;
+  let payload = 'payload' in incomingReq && incomingReq?.payload;
   if (!payload) {
     try {
-      payload = await getPayloadHMR({
+      payload = await getPayload({
         config: configArg
       });
     } catch (e) {
@@ -68,6 +22,7 @@ export const routeError = async ({
       });
     }
   }
+  const req = incomingReq;
   req.payload = payload;
   const headers = headersWithCors({
     headers: new Headers(),
@@ -79,7 +34,14 @@ export const routeError = async ({
   } = payload;
   let response = formatErrors(err);
   let status = err.status || httpStatus.INTERNAL_SERVER_ERROR;
-  logger.error(err.stack);
+  const level = payload.config.loggingLevels[err.name] ?? 'error';
+  if (level) {
+    logger[level](level === 'info' ? {
+      msg: err.message
+    } : {
+      err
+    });
+  }
   // Internal server errors can contain anything, including potentially sensitive data.
   // Therefore, error details will be hidden from the response unless `config.debug` is `true`
   if (!config.debug && status === httpStatus.INTERNAL_SERVER_ERROR) {
@@ -88,26 +50,38 @@ export const routeError = async ({
   if (config.debug && config.debug === true) {
     response.stack = err.stack;
   }
-  if (collection && typeof collection.config.hooks.afterError === 'function') {
-    ({
-      response,
-      status
-    } = collection.config.hooks.afterError(err, response, req?.context, collection.config) || {
-      response,
-      status
-    });
+  if (collection) {
+    await collection.config.hooks.afterError?.reduce(async (promise, hook) => {
+      await promise;
+      const result = await hook({
+        collection: collection.config,
+        context: req.context,
+        error: err,
+        req,
+        result: response
+      });
+      if (result) {
+        response = result.response || response;
+        status = result.status || status;
+      }
+    }, Promise.resolve());
   }
-  if (typeof config.hooks.afterError === 'function') {
-    ({
-      response,
-      status
-    } = config.hooks.afterError(err, response, req?.context, collection?.config) || {
-      response,
-      status
+  await config.hooks.afterError?.reduce(async (promise, hook) => {
+    await promise;
+    const result = await hook({
+      collection: collection?.config,
+      context: req.context,
+      error: err,
+      req,
+      result: response
     });
-  }
+    if (result) {
+      response = result.response || response;
+      status = result.status || status;
+    }
+  }, Promise.resolve());
   return Response.json(response, {
-    headers,
+    headers: req.responseHeaders ? mergeHeaders(req.responseHeaders, headers) : headers,
     status
   });
 };

package/dist/routes/rest/routeError.js.map

@@ -1 +1 @@
-{"version":3,"file":"routeError.js","names":["httpStatus","APIError","APIErrorName","ValidationErrorName","getPayloadHMR","headersWithCors","formatErrors","incoming","proto","Object","getPrototypeOf","constructor","name","data","errors","message","keys","reduce","acc","key","push","field","path","Array","isArray","routeError","collection","config","configArg","err","req","payload","e","Response","json","status","INTERNAL_SERVER_ERROR","headers","Headers","logger","response","error","stack","debug","hooks","afterError","context"],"sources":["../../../src/routes/rest/routeError.ts"],"sourcesContent":["import type { Collection, PayloadRequest, SanitizedConfig } from 'payload'\n\nimport httpStatus from 'http-status'\nimport { APIError, APIErrorName, ValidationErrorName } from 'payload'\n\nimport { getPayloadHMR } from '../../utilities/getPayloadHMR.js'\nimport { headersWithCors } from '../../utilities/headersWithCors.js'\n\nexport type ErrorResponse = { data?: any; errors: unknown[]; stack?: string }\n\nconst formatErrors = (incoming: { [key: string]: unknown } | APIError): ErrorResponse => {\n  if (incoming) {\n    // Cannot use `instanceof` to check error type: https://github.com/microsoft/TypeScript/issues/13965\n    // Instead, get the prototype of the incoming error and check its constructor name\n    const proto = Object.getPrototypeOf(incoming)\n\n    // Payload 'ValidationError' and 'APIError'\n    if (\n      (proto.constructor.name === ValidationErrorName || proto.constructor.name === APIErrorName) &&\n      incoming.data\n    ) {\n      return {\n        errors: [\n          {\n            name: incoming.name,\n            data: incoming.data,\n            message: incoming.message,\n          },\n        ],\n      }\n    }\n\n    // Mongoose 'ValidationError': https://mongoosejs.com/docs/api/error.html#Error.ValidationError\n    if (proto.constructor.name === ValidationErrorName && 'errors' in incoming && incoming.errors) {\n      return {\n        errors: Object.keys(incoming.errors).reduce((acc, key) => {\n          acc.push({\n            field: incoming.errors[key].path,\n            message: incoming.errors[key].message,\n          })\n          return acc\n        }, []),\n      }\n    }\n\n    if (Array.isArray(incoming.message)) {\n      return {\n        errors: incoming.message,\n      }\n    }\n\n    if (incoming.name) {\n      return {\n        errors: [\n          {\n            message: incoming.message,\n          },\n        ],\n      }\n    }\n  }\n\n  return {\n    errors: [\n      {\n        message: 'An unknown error occurred.',\n      },\n    ],\n  }\n}\n\nexport const routeError = async ({\n  collection,\n  config: configArg,\n  err,\n  req,\n}: {\n  collection?: Collection\n  config: Promise<SanitizedConfig> | SanitizedConfig\n  err: APIError\n  req: Partial<PayloadRequest>\n}) => {\n  let payload = req?.payload\n\n  if (!payload) {\n    try {\n      payload = await getPayloadHMR({ config: configArg })\n    } catch (e) {\n      return Response.json(\n        {\n          message: 'There was an error initializing Payload',\n        },\n        { status: httpStatus.INTERNAL_SERVER_ERROR },\n      )\n    }\n  }\n\n  req.payload = payload\n  const headers = headersWithCors({\n    headers: new Headers(),\n    req,\n  })\n\n  const { config, logger } = payload\n\n  let response = formatErrors(err)\n\n  let status = err.status || httpStatus.INTERNAL_SERVER_ERROR\n\n  logger.error(err.stack)\n\n  // Internal server errors can contain anything, including potentially sensitive data.\n  // Therefore, error details will be hidden from the response unless `config.debug` is `true`\n  if (!config.debug && status === httpStatus.INTERNAL_SERVER_ERROR) {\n    response = formatErrors(new APIError('Something went wrong.'))\n  }\n\n  if (config.debug && config.debug === true) {\n    response.stack = err.stack\n  }\n\n  if (collection && typeof collection.config.hooks.afterError === 'function') {\n    ;({ response, status } = collection.config.hooks.afterError(\n      err,\n      response,\n      req?.context,\n      collection.config,\n    ) || { response, status })\n  }\n\n  if (typeof config.hooks.afterError === 'function') {\n    ;({ response, status } = config.hooks.afterError(\n      err,\n      response,\n      req?.context,\n      collection?.config,\n    ) || {\n      response,\n      status,\n    })\n  }\n\n  return Response.json(response, { headers, status })\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"routeError.js","names":["httpStatus","APIError","formatErrors","getPayload","headersWithCors","mergeHeaders","routeError","collection","config","configArg","err","req","incomingReq","payload","e","Response","json","message","status","INTERNAL_SERVER_ERROR","headers","Headers","logger","response","level","loggingLevels","name","msg","debug","stack","hooks","afterError","reduce","promise","hook","result","context","error","Promise","resolve","responseHeaders"],"sources":["../../../src/routes/rest/routeError.ts"],"sourcesContent":["import type { Collection, ErrorResult, PayloadRequest, SanitizedConfig } from 'payload'\n\nimport httpStatus from 'http-status'\nimport { APIError, formatErrors, getPayload } from 'payload'\n\nimport { headersWithCors } from '../../utilities/headersWithCors.js'\nimport { mergeHeaders } from '../../utilities/mergeHeaders.js'\n\nexport const routeError = async ({\n  collection,\n  config: configArg,\n  err,\n  req: incomingReq,\n}: {\n  collection?: Collection\n  config: Promise<SanitizedConfig> | SanitizedConfig\n  err: APIError\n  req: PayloadRequest | Request\n}) => {\n  let payload = 'payload' in incomingReq && incomingReq?.payload\n\n  if (!payload) {\n    try {\n      payload = await getPayload({ config: configArg })\n    } catch (e) {\n      return Response.json(\n        {\n          message: 'There was an error initializing Payload',\n        },\n        { status: httpStatus.INTERNAL_SERVER_ERROR },\n      )\n    }\n  }\n\n  const req = incomingReq as PayloadRequest\n\n  req.payload = payload\n  const headers = headersWithCors({\n    headers: new Headers(),\n    req,\n  })\n\n  const { config, logger } = payload\n\n  let response = formatErrors(err)\n\n  let status = err.status || httpStatus.INTERNAL_SERVER_ERROR\n\n  const level = payload.config.loggingLevels[err.name] ?? 'error'\n  if (level) {\n    logger[level](level === 'info' ? { msg: err.message } : { err })\n  }\n\n  // Internal server errors can contain anything, including potentially sensitive data.\n  // Therefore, error details will be hidden from the response unless `config.debug` is `true`\n  if (!config.debug && status === httpStatus.INTERNAL_SERVER_ERROR) {\n    response = formatErrors(new APIError('Something went wrong.'))\n  }\n\n  if (config.debug && config.debug === true) {\n    response.stack = err.stack\n  }\n\n  if (collection) {\n    await collection.config.hooks.afterError?.reduce(async (promise, hook) => {\n      await promise\n\n      const result = await hook({\n        collection: collection.config,\n        context: req.context,\n        error: err,\n        req,\n        result: response,\n      })\n\n      if (result) {\n        response = (result.response as ErrorResult) || response\n        status = result.status || status\n      }\n    }, Promise.resolve())\n  }\n\n  await config.hooks.afterError?.reduce(async (promise, hook) => {\n    await promise\n\n    const result = await hook({\n      collection: collection?.config,\n      context: req.context,\n      error: err,\n      req,\n      result: response,\n    })\n\n    if (result) {\n      response = (result.response as ErrorResult) || response\n      status = result.status || status\n    }\n  }, Promise.resolve())\n\n  return Response.json(response, {\n    headers: req.responseHeaders ? mergeHeaders(req.responseHeaders, headers) : headers,\n    status,\n  })\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/routes/rest/utilities/sanitizeCollectionID.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sanitizeCollectionID.d.ts","sourceRoot":"","sources":["../../../../src/routes/rest/utilities/sanitizeCollectionID.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEtC,KAAK,IAAI,GAAG;IACV,cAAc,EAAE,MAAM,CAAA;IACtB,EAAE,EAAE,MAAM,CAAA;IACV,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,oBAAoB,oCAAqC,IAAI,KAAG,MAAM,GAAG,MAcrF,CAAA"}
+{"version":3,"file":"sanitizeCollectionID.d.ts","sourceRoot":"","sources":["../../../../src/routes/rest/utilities/sanitizeCollectionID.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEtC,KAAK,IAAI,GAAG;IACV,cAAc,EAAE,MAAM,CAAA;IACtB,EAAE,EAAE,MAAM,CAAA;IACV,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,oBAAoB,oCAAqC,IAAI,KAAG,MAAM,GAAG,MAkBrF,CAAA"}

package/dist/routes/rest/utilities/sanitizeCollectionID.js

@@ -8,9 +8,13 @@ export const sanitizeCollectionID = ({
   // If default db ID type is a number, we should sanitize
   let shouldSanitize = Boolean(payload.db.defaultIDType === 'number');
   // UNLESS the customIDType for this collection is text.... then we leave it
-  if (shouldSanitize && collection.customIDType === 'text') shouldSanitize = false;
+  if (shouldSanitize && collection.customIDType === 'text') {
+    shouldSanitize = false;
+  }
   // If we still should sanitize, parse float
-  if (shouldSanitize) sanitizedID = parseFloat(sanitizedID);
+  if (shouldSanitize) {
+    sanitizedID = parseFloat(sanitizedID);
+  }
   return sanitizedID;
 };
 //# sourceMappingURL=sanitizeCollectionID.js.map

package/dist/routes/rest/utilities/sanitizeCollectionID.js.map

@@ -1 +1 @@
-{"version":3,"file":"sanitizeCollectionID.js","names":["sanitizeCollectionID","id","collectionSlug","payload","sanitizedID","collection","collections","shouldSanitize","Boolean","db","defaultIDType","customIDType","parseFloat"],"sources":["../../../../src/routes/rest/utilities/sanitizeCollectionID.ts"],"sourcesContent":["import type { Payload } from 'payload'\n\ntype Args = {\n  collectionSlug: string\n  id: string\n  payload: Payload\n}\n\nexport const sanitizeCollectionID = ({ id, collectionSlug, payload }: Args): number | string => {\n  let sanitizedID: number | string = id\n  const collection = payload.collections[collectionSlug]\n\n  // If default db ID type is a number, we should sanitize\n  let shouldSanitize = Boolean(payload.db.defaultIDType === 'number')\n\n  // UNLESS the customIDType for this collection is text.... then we leave it\n  if (shouldSanitize && collection.customIDType === 'text') shouldSanitize = false\n\n  // If we still should sanitize, parse float\n  if (shouldSanitize) sanitizedID = parseFloat(sanitizedID)\n\n  return sanitizedID\n}\n"],"mappings":"AAQA,OAAO,MAAMA,oBAAA,GAAuBA,CAAC;EAAEC,EAAE;EAAEC,cAAc;EAAEC;AAAO,CAAQ;EACxE,IAAIC,WAAA,GAA+BH,EAAA;EACnC,MAAMI,UAAA,GAAaF,OAAA,CAAQG,WAAW,CAACJ,cAAA,CAAe;EAEtD;EACA,IAAIK,cAAA,GAAiBC,OAAA,CAAQL,OAAA,CAAQM,EAAE,CAACC,aAAa,KAAK;EAE1D;EACA,IAAIH,cAAA,IAAkBF,UAAA,CAAWM,YAAY,KAAK,QAAQJ,cAAA,GAAiB;EAE3E;EACA,IAAIA,cAAA,EAAgBH,WAAA,GAAcQ,UAAA,CAAWR,WAAA;EAE7C,OAAOA,WAAA;AACT","ignoreList":[]}
+{"version":3,"file":"sanitizeCollectionID.js","names":["sanitizeCollectionID","id","collectionSlug","payload","sanitizedID","collection","collections","shouldSanitize","Boolean","db","defaultIDType","customIDType","parseFloat"],"sources":["../../../../src/routes/rest/utilities/sanitizeCollectionID.ts"],"sourcesContent":["import type { Payload } from 'payload'\n\ntype Args = {\n  collectionSlug: string\n  id: string\n  payload: Payload\n}\n\nexport const sanitizeCollectionID = ({ id, collectionSlug, payload }: Args): number | string => {\n  let sanitizedID: number | string = id\n  const collection = payload.collections[collectionSlug]\n\n  // If default db ID type is a number, we should sanitize\n  let shouldSanitize = Boolean(payload.db.defaultIDType === 'number')\n\n  // UNLESS the customIDType for this collection is text.... then we leave it\n  if (shouldSanitize && collection.customIDType === 'text') {\n    shouldSanitize = false\n  }\n\n  // If we still should sanitize, parse float\n  if (shouldSanitize) {\n    sanitizedID = parseFloat(sanitizedID)\n  }\n\n  return sanitizedID\n}\n"],"mappings":"AAQA,OAAO,MAAMA,oBAAA,GAAuBA,CAAC;EAAEC,EAAE;EAAEC,cAAc;EAAEC;AAAO,CAAQ;EACxE,IAAIC,WAAA,GAA+BH,EAAA;EACnC,MAAMI,UAAA,GAAaF,OAAA,CAAQG,WAAW,CAACJ,cAAA,CAAe;EAEtD;EACA,IAAIK,cAAA,GAAiBC,OAAA,CAAQL,OAAA,CAAQM,EAAE,CAACC,aAAa,KAAK;EAE1D;EACA,IAAIH,cAAA,IAAkBF,UAAA,CAAWM,YAAY,KAAK,QAAQ;IACxDJ,cAAA,GAAiB;EACnB;EAEA;EACA,IAAIA,cAAA,EAAgB;IAClBH,WAAA,GAAcQ,UAAA,CAAWR,WAAA;EAC3B;EAEA,OAAOA,WAAA;AACT","ignoreList":[]}

package/dist/routes/rest/utilities/sanitizeJoinParams.d.ts

@@ -0,0 +1,13 @@
+import type { JoinQuery } from 'payload';
+/**
+ * Convert request JoinQuery object from strings to numbers
+ * @param joins
+ */
+export declare const sanitizeJoinParams: (joins?: {
+    [schemaPath: string]: {
+        limit?: unknown;
+        sort?: string;
+        where?: unknown;
+    } | false;
+} | false) => JoinQuery;
+//# sourceMappingURL=sanitizeJoinParams.d.ts.map

package/dist/routes/rest/utilities/sanitizeJoinParams.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sanitizeJoinParams.d.ts","sourceRoot":"","sources":["../../../../src/routes/rest/utilities/sanitizeJoinParams.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAIxC;;;GAGG;AACH,eAAO,MAAM,kBAAkB,WAEzB;IACE,CAAC,UAAU,EAAE,MAAM,GACf;QACE,KAAK,CAAC,EAAE,OAAO,CAAA;QACf,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,KAAK,CAAC,EAAE,OAAO,CAAA;KAChB,GACD,KAAK,CAAA;CACV,GACD,KAAK,KACR,SAgBF,CAAA"}

package/dist/routes/rest/utilities/sanitizeJoinParams.js

@@ -0,0 +1,21 @@
+import { isNumber } from 'payload/shared';
+/**
+ * Convert request JoinQuery object from strings to numbers
+ * @param joins
+ */
+export const sanitizeJoinParams = (joins = {}) => {
+  const joinQuery = {};
+  Object.keys(joins).forEach(schemaPath => {
+    if (joins[schemaPath] === 'false' || joins[schemaPath] === false) {
+      joinQuery[schemaPath] = false;
+    } else {
+      joinQuery[schemaPath] = {
+        limit: isNumber(joins[schemaPath]?.limit) ? Number(joins[schemaPath].limit) : undefined,
+        sort: joins[schemaPath]?.sort ? joins[schemaPath].sort : undefined,
+        where: joins[schemaPath]?.where ? joins[schemaPath].where : undefined
+      };
+    }
+  });
+  return joinQuery;
+};
+//# sourceMappingURL=sanitizeJoinParams.js.map

package/dist/routes/rest/utilities/sanitizeJoinParams.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sanitizeJoinParams.js","names":["isNumber","sanitizeJoinParams","joins","joinQuery","Object","keys","forEach","schemaPath","limit","Number","undefined","sort","where"],"sources":["../../../../src/routes/rest/utilities/sanitizeJoinParams.ts"],"sourcesContent":["import type { JoinQuery } from 'payload'\n\nimport { isNumber } from 'payload/shared'\n\n/**\n * Convert request JoinQuery object from strings to numbers\n * @param joins\n */\nexport const sanitizeJoinParams = (\n  joins:\n    | {\n        [schemaPath: string]:\n          | {\n              limit?: unknown\n              sort?: string\n              where?: unknown\n            }\n          | false\n      }\n    | false = {},\n): JoinQuery => {\n  const joinQuery = {}\n\n  Object.keys(joins).forEach((schemaPath) => {\n    if (joins[schemaPath] === 'false' || joins[schemaPath] === false) {\n      joinQuery[schemaPath] = false\n    } else {\n      joinQuery[schemaPath] = {\n        limit: isNumber(joins[schemaPath]?.limit) ? Number(joins[schemaPath].limit) : undefined,\n        sort: joins[schemaPath]?.sort ? joins[schemaPath].sort : undefined,\n        where: joins[schemaPath]?.where ? joins[schemaPath].where : undefined,\n      }\n    }\n  })\n\n  return joinQuery\n}\n"],"mappings":"AAEA,SAASA,QAAQ,QAAQ;AAEzB;;;;AAIA,OAAO,MAAMC,kBAAA,GAAqBA,CAChCC,KAAA,GAUY,CAAC,CAAC;EAEd,MAAMC,SAAA,GAAY,CAAC;EAEnBC,MAAA,CAAOC,IAAI,CAACH,KAAA,EAAOI,OAAO,CAAEC,UAAA;IAC1B,IAAIL,KAAK,CAACK,UAAA,CAAW,KAAK,WAAWL,KAAK,CAACK,UAAA,CAAW,KAAK,OAAO;MAChEJ,SAAS,CAACI,UAAA,CAAW,GAAG;IAC1B,OAAO;MACLJ,SAAS,CAACI,UAAA,CAAW,GAAG;QACtBC,KAAA,EAAOR,QAAA,CAASE,KAAK,CAACK,UAAA,CAAW,EAAEC,KAAA,IAASC,MAAA,CAAOP,KAAK,CAACK,UAAA,CAAW,CAACC,KAAK,IAAIE,SAAA;QAC9EC,IAAA,EAAMT,KAAK,CAACK,UAAA,CAAW,EAAEI,IAAA,GAAOT,KAAK,CAACK,UAAA,CAAW,CAACI,IAAI,GAAGD,SAAA;QACzDE,KAAA,EAAOV,KAAK,CAACK,UAAA,CAAW,EAAEK,KAAA,GAAQV,KAAK,CAACK,UAAA,CAAW,CAACK,KAAK,GAAGF;MAC9D;IACF;EACF;EAEA,OAAOP,SAAA;AACT","ignoreList":[]}

package/dist/routes/rest/utilities/sanitizePopulate.d.ts

@@ -0,0 +1,3 @@
+import type { PopulateType } from 'payload';
+export declare const sanitizePopulate: (unsanitizedPopulate: unknown) => PopulateType | undefined;
+//# sourceMappingURL=sanitizePopulate.d.ts.map

package/dist/routes/rest/utilities/sanitizePopulate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sanitizePopulate.d.ts","sourceRoot":"","sources":["../../../../src/routes/rest/utilities/sanitizePopulate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAI3C,eAAO,MAAM,gBAAgB,wBAAyB,OAAO,KAAG,YAAY,GAAG,SAU9E,CAAA"}

package/dist/routes/rest/utilities/sanitizePopulate.js

@@ -0,0 +1,11 @@
+import { sanitizeSelect } from './sanitizeSelect.js';
+export const sanitizePopulate = unsanitizedPopulate => {
+  if (!unsanitizedPopulate || typeof unsanitizedPopulate !== 'object') {
+    return;
+  }
+  for (const k in unsanitizedPopulate) {
+    unsanitizedPopulate[k] = sanitizeSelect(unsanitizedPopulate[k]);
+  }
+  return unsanitizedPopulate;
+};
+//# sourceMappingURL=sanitizePopulate.js.map

package/dist/routes/rest/utilities/sanitizePopulate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sanitizePopulate.js","names":["sanitizeSelect","sanitizePopulate","unsanitizedPopulate","k"],"sources":["../../../../src/routes/rest/utilities/sanitizePopulate.ts"],"sourcesContent":["import type { PopulateType } from 'payload'\n\nimport { sanitizeSelect } from './sanitizeSelect.js'\n\nexport const sanitizePopulate = (unsanitizedPopulate: unknown): PopulateType | undefined => {\n  if (!unsanitizedPopulate || typeof unsanitizedPopulate !== 'object') {\n    return\n  }\n\n  for (const k in unsanitizedPopulate) {\n    unsanitizedPopulate[k] = sanitizeSelect(unsanitizedPopulate[k])\n  }\n\n  return unsanitizedPopulate as PopulateType\n}\n"],"mappings":"AAEA,SAASA,cAAc,QAAQ;AAE/B,OAAO,MAAMC,gBAAA,GAAoBC,mBAAA;EAC/B,IAAI,CAACA,mBAAA,IAAuB,OAAOA,mBAAA,KAAwB,UAAU;IACnE;EACF;EAEA,KAAK,MAAMC,CAAA,IAAKD,mBAAA,EAAqB;IACnCA,mBAAmB,CAACC,CAAA,CAAE,GAAGH,cAAA,CAAeE,mBAAmB,CAACC,CAAA,CAAE;EAChE;EAEA,OAAOD,mBAAA;AACT","ignoreList":[]}

package/dist/routes/rest/utilities/sanitizeSelect.d.ts

@@ -0,0 +1,6 @@
+import type { SelectType } from 'payload';
+/**
+ * Sanitizes REST select query to SelectType
+ */
+export declare const sanitizeSelect: (unsanitizedSelect: unknown) => SelectType | undefined;
+//# sourceMappingURL=sanitizeSelect.d.ts.map

package/dist/routes/rest/utilities/sanitizeSelect.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sanitizeSelect.d.ts","sourceRoot":"","sources":["../../../../src/routes/rest/utilities/sanitizeSelect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAEzC;;GAEG;AACH,eAAO,MAAM,cAAc,sBAAuB,OAAO,KAAG,UAAU,GAAG,SAcxE,CAAA"}

package/dist/routes/rest/utilities/sanitizeSelect.js

@@ -0,0 +1,17 @@
+/**
+ * Sanitizes REST select query to SelectType
+ */export const sanitizeSelect = unsanitizedSelect => {
+  if (unsanitizedSelect && typeof unsanitizedSelect === 'object') {
+    for (const k in unsanitizedSelect) {
+      if (unsanitizedSelect[k] === 'true') {
+        unsanitizedSelect[k] = true;
+      } else if (unsanitizedSelect[k] === 'false') {
+        unsanitizedSelect[k] = false;
+      } else if (typeof unsanitizedSelect[k] === 'object') {
+        sanitizeSelect(unsanitizedSelect[k]);
+      }
+    }
+  }
+  return unsanitizedSelect;
+};
+//# sourceMappingURL=sanitizeSelect.js.map

package/dist/routes/rest/utilities/sanitizeSelect.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sanitizeSelect.js","names":["sanitizeSelect","unsanitizedSelect","k"],"sources":["../../../../src/routes/rest/utilities/sanitizeSelect.ts"],"sourcesContent":["import type { SelectType } from 'payload'\n\n/**\n * Sanitizes REST select query to SelectType\n */\nexport const sanitizeSelect = (unsanitizedSelect: unknown): SelectType | undefined => {\n  if (unsanitizedSelect && typeof unsanitizedSelect === 'object') {\n    for (const k in unsanitizedSelect) {\n      if (unsanitizedSelect[k] === 'true') {\n        unsanitizedSelect[k] = true\n      } else if (unsanitizedSelect[k] === 'false') {\n        unsanitizedSelect[k] = false\n      } else if (typeof unsanitizedSelect[k] === 'object') {\n        sanitizeSelect(unsanitizedSelect[k])\n      }\n    }\n  }\n\n  return unsanitizedSelect as SelectType\n}\n"],"mappings":"AAEA;;GAGA,OAAO,MAAMA,cAAA,GAAkBC,iBAAA;EAC7B,IAAIA,iBAAA,IAAqB,OAAOA,iBAAA,KAAsB,UAAU;IAC9D,KAAK,MAAMC,CAAA,IAAKD,iBAAA,EAAmB;MACjC,IAAIA,iBAAiB,CAACC,CAAA,CAAE,KAAK,QAAQ;QACnCD,iBAAiB,CAACC,CAAA,CAAE,GAAG;MACzB,OAAO,IAAID,iBAAiB,CAACC,CAAA,CAAE,KAAK,SAAS;QAC3CD,iBAAiB,CAACC,CAAA,CAAE,GAAG;MACzB,OAAO,IAAI,OAAOD,iBAAiB,CAACC,CAAA,CAAE,KAAK,UAAU;QACnDF,cAAA,CAAeC,iBAAiB,CAACC,CAAA,CAAE;MACrC;IACF;EACF;EAEA,OAAOD,iBAAA;AACT","ignoreList":[]}