@payloadcms/next 3.0.0-beta.11 → 3.0.0-beta.110

package/dist/routes/rest/routeError.js

@@ -1,93 +1,128 @@
 import httpStatus from 'http-status';
-import { APIError } from 'payload/errors';
-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 === 'ValidationError' || proto.constructor.name === 'APIError') && 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 === 'ValidationError' && '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
-                    }
-                ]
-            };
-        }
+import { APIError, APIErrorName, ValidationErrorName } from 'payload';
+import { getPayloadHMR } from '../../utilities/getPayloadHMR.js';
+import { headersWithCors } from '../../utilities/headersWithCors.js';
+import { mergeHeaders } from '../../utilities/mergeHeaders.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
+        }]
+      };
     }
-    return {
-        errors: [
-            {
-                message: 'An unknown error occurred.'
-            }
-        ]
-    };
-};
-export const routeError = ({ collection, err, req })=>{
-    if (!req?.payload) {
-        return Response.json({
-            message: err.message,
-            stack: err.stack
-        }, {
-            status: httpStatus.INTERNAL_SERVER_ERROR
-        });
-    }
-    const { config, logger } = req.payload;
-    let response = formatErrors(err);
-    let status = err.status || httpStatus.INTERNAL_SERVER_ERROR;
-    logger.error(err.stack);
-    // 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) {
-        response = formatErrors(new APIError('Something went wrong.'));
+    // 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 (config.debug && config.debug === true) {
-        response.stack = err.stack;
+    if (Array.isArray(incoming.message)) {
+      return {
+        errors: incoming.message
+      };
     }
-    if (collection && typeof collection.config.hooks.afterError === 'function') {
-        ({ response, status } = collection.config.hooks.afterError(err, response, req.context, collection.config) || {
-            response,
-            status
-        });
+    if (incoming.name) {
+      return {
+        errors: [{
+          message: incoming.message
+        }]
+      };
     }
-    if (typeof config.hooks.afterError === 'function') {
-        ({ response, status } = config.hooks.afterError(err, response, req.context, collection?.config) || {
-            response,
-            status
-        });
+  }
+  return {
+    errors: [{
+      message: 'An unknown error occurred.'
+    }]
+  };
+};
+export const routeError = async ({
+  collection,
+  config: configArg,
+  err,
+  req: incomingReq
+}) => {
+  let payload = 'payload' in incomingReq && incomingReq?.payload;
+  if (!payload) {
+    try {
+      payload = await getPayloadHMR({
+        config: configArg
+      });
+    } catch (e) {
+      return Response.json({
+        message: 'There was an error initializing Payload'
+      }, {
+        status: httpStatus.INTERNAL_SERVER_ERROR
+      });
     }
-    return Response.json(response, {
-        status
+  }
+  const req = incomingReq;
+  req.payload = payload;
+  const headers = headersWithCors({
+    headers: new Headers(),
+    req
+  });
+  const {
+    config,
+    logger
+  } = payload;
+  let response = formatErrors(err);
+  let status = err.status || httpStatus.INTERNAL_SERVER_ERROR;
+  logger.error(err.stack);
+  // 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) {
+    response = formatErrors(new APIError('Something went wrong.'));
+  }
+  if (config.debug && config.debug === true) {
+    response.stack = err.stack;
+  }
+  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());
+  }
+  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: req.responseHeaders ? mergeHeaders(req.responseHeaders, headers) : headers,
+    status
+  });
 };
-
 //# sourceMappingURL=routeError.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/routes/rest/routeError.ts"],"sourcesContent":["import type { Collection, PayloadRequest } from 'payload/types'\n\nimport httpStatus from 'http-status'\nimport { APIError } from 'payload/errors'\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 === 'ValidationError' || proto.constructor.name === 'APIError') &&\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 === 'ValidationError' && '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 = ({\n  collection,\n  err,\n  req,\n}: {\n  collection?: Collection\n  err: APIError\n  req: PayloadRequest\n}) => {\n  if (!req?.payload) {\n    return Response.json(\n      {\n        message: err.message,\n        stack: err.stack,\n      },\n      { status: httpStatus.INTERNAL_SERVER_ERROR },\n    )\n  }\n\n  const { config, logger } = req.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, { status })\n}\n"],"names":["httpStatus","APIError","formatErrors","incoming","proto","Object","getPrototypeOf","constructor","name","data","errors","message","keys","reduce","acc","key","push","field","path","Array","isArray","routeError","collection","err","req","payload","Response","json","stack","status","INTERNAL_SERVER_ERROR","config","logger","response","error","debug","hooks","afterError","context"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAEA,OAAOA,gBAAgB,cAAa;AACpC,SAASC,QAAQ,QAAQ,iBAAgB;AAIzC,MAAMC,eAAe,CAACC;IACpB,IAAIA,UAAU;QACZ,oGAAoG;QACpG,kFAAkF;QAClF,MAAMC,QAAQC,OAAOC,cAAc,CAACH;QAEpC,2CAA2C;QAC3C,IACE,AAACC,CAAAA,MAAMG,WAAW,CAACC,IAAI,KAAK,qBAAqBJ,MAAMG,WAAW,CAACC,IAAI,KAAK,UAAS,KACrFL,SAASM,IAAI,EACb;YACA,OAAO;gBACLC,QAAQ;oBACN;wBACEF,MAAML,SAASK,IAAI;wBACnBC,MAAMN,SAASM,IAAI;wBACnBE,SAASR,SAASQ,OAAO;oBAC3B;iBACD;YACH;QACF;QAEA,+FAA+F;QAC/F,IAAIP,MAAMG,WAAW,CAACC,IAAI,KAAK,qBAAqB,YAAYL,YAAYA,SAASO,MAAM,EAAE;YAC3F,OAAO;gBACLA,QAAQL,OAAOO,IAAI,CAACT,SAASO,MAAM,EAAEG,MAAM,CAAC,CAACC,KAAKC;oBAChDD,IAAIE,IAAI,CAAC;wBACPC,OAAOd,SAASO,MAAM,CAACK,IAAI,CAACG,IAAI;wBAChCP,SAASR,SAASO,MAAM,CAACK,IAAI,CAACJ,OAAO;oBACvC;oBACA,OAAOG;gBACT,GAAG,EAAE;YACP;QACF;QAEA,IAAIK,MAAMC,OAAO,CAACjB,SAASQ,OAAO,GAAG;YACnC,OAAO;gBACLD,QAAQP,SAASQ,OAAO;YAC1B;QACF;QAEA,IAAIR,SAASK,IAAI,EAAE;YACjB,OAAO;gBACLE,QAAQ;oBACN;wBACEC,SAASR,SAASQ,OAAO;oBAC3B;iBACD;YACH;QACF;IACF;IAEA,OAAO;QACLD,QAAQ;YACN;gBACEC,SAAS;YACX;SACD;IACH;AACF;AAEA,OAAO,MAAMU,aAAa,CAAC,EACzBC,UAAU,EACVC,GAAG,EACHC,GAAG,EAKJ;IACC,IAAI,CAACA,KAAKC,SAAS;QACjB,OAAOC,SAASC,IAAI,CAClB;YACEhB,SAASY,IAAIZ,OAAO;YACpBiB,OAAOL,IAAIK,KAAK;QAClB,GACA;YAAEC,QAAQ7B,WAAW8B,qBAAqB;QAAC;IAE/C;IAEA,MAAM,EAAEC,MAAM,EAAEC,MAAM,EAAE,GAAGR,IAAIC,OAAO;IAEtC,IAAIQ,WAAW/B,aAAaqB;IAE5B,IAAIM,SAASN,IAAIM,MAAM,IAAI7B,WAAW8B,qBAAqB;IAE3DE,OAAOE,KAAK,CAACX,IAAIK,KAAK;IAEtB,qFAAqF;IACrF,4FAA4F;IAC5F,IAAI,CAACG,OAAOI,KAAK,IAAIN,WAAW7B,WAAW8B,qBAAqB,EAAE;QAChEG,WAAW/B,aAAa,IAAID,SAAS;IACvC;IAEA,IAAI8B,OAAOI,KAAK,IAAIJ,OAAOI,KAAK,KAAK,MAAM;QACzCF,SAASL,KAAK,GAAGL,IAAIK,KAAK;IAC5B;IAEA,IAAIN,cAAc,OAAOA,WAAWS,MAAM,CAACK,KAAK,CAACC,UAAU,KAAK,YAAY;QACxE,CAAA,EAAEJ,QAAQ,EAAEJ,MAAM,EAAE,GAAGP,WAAWS,MAAM,CAACK,KAAK,CAACC,UAAU,CACzDd,KACAU,UACAT,IAAIc,OAAO,EACXhB,WAAWS,MAAM,KACd;YAAEE;YAAUJ;QAAO,CAAA;IAC1B;IAEA,IAAI,OAAOE,OAAOK,KAAK,CAACC,UAAU,KAAK,YAAY;QAC/C,CAAA,EAAEJ,QAAQ,EAAEJ,MAAM,EAAE,GAAGE,OAAOK,KAAK,CAACC,UAAU,CAC9Cd,KACAU,UACAT,IAAIc,OAAO,EACXhB,YAAYS,WACT;YACHE;YACAJ;QACF,CAAA;IACF;IAEA,OAAOH,SAASC,IAAI,CAACM,UAAU;QAAEJ;IAAO;AAC1C,EAAC"}
+{"version":3,"file":"routeError.js","names":["httpStatus","APIError","APIErrorName","ValidationErrorName","getPayloadHMR","headersWithCors","mergeHeaders","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","incomingReq","payload","e","Response","json","status","INTERNAL_SERVER_ERROR","headers","Headers","logger","response","error","stack","debug","hooks","afterError","promise","hook","result","context","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, APIErrorName, ValidationErrorName } from 'payload'\n\nimport { getPayloadHMR } from '../../utilities/getPayloadHMR.js'\nimport { headersWithCors } from '../../utilities/headersWithCors.js'\nimport { mergeHeaders } from '../../utilities/mergeHeaders.js'\n\nconst formatErrors = (incoming: { [key: string]: unknown } | APIError): ErrorResult => {\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: 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 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  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  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) {\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/types.d.ts

@@ -1,4 +1,4 @@
-import type { Collection, PayloadRequest, SanitizedGlobalConfig } from 'payload/types';
+import type { Collection, PayloadRequest, SanitizedGlobalConfig } from 'payload';
 export type BaseRouteHandler = ({ req }: {
     req: PayloadRequest;
 }) => Promise<Response> | Response;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/routes/rest/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AAEtF,MAAM,MAAM,gBAAgB,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE;IAAE,GAAG,EAAE,cAAc,CAAA;CAAE,KAAK,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAA;AAEjG,MAAM,MAAM,sBAAsB,GAAG,CAAC,EACpC,UAAU,EACV,GAAG,GACJ,EAAE;IACD,UAAU,EAAE,UAAU,CAAA;IACtB,GAAG,EAAE,cAAc,CAAA;CACpB,KAAK,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAA;AAElC,MAAM,MAAM,4BAA4B,GAAG,CAAC,EAC1C,EAAE,EACF,UAAU,EACV,GAAG,GACJ,EAAE;IACD,UAAU,EAAE,UAAU,CAAA;IACtB,EAAE,EAAE,MAAM,CAAA;IACV,GAAG,EAAE,cAAc,CAAA;CACpB,KAAK,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAA;AAElC,MAAM,MAAM,kBAAkB,GAAG,CAAC,EAChC,YAAY,EACZ,GAAG,GACJ,EAAE;IACD,YAAY,EAAE,qBAAqB,CAAA;IACnC,GAAG,EAAE,cAAc,CAAA;CACpB,KAAK,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAA;AAElC,MAAM,MAAM,wBAAwB,GAAG,CAAC,EACtC,EAAE,EACF,YAAY,EACZ,GAAG,GACJ,EAAE;IACD,YAAY,EAAE,qBAAqB,CAAA;IACnC,EAAE,EAAE,MAAM,CAAA;IACV,GAAG,EAAE,cAAc,CAAA;CACpB,KAAK,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/routes/rest/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAEhF,MAAM,MAAM,gBAAgB,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE;IAAE,GAAG,EAAE,cAAc,CAAA;CAAE,KAAK,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAA;AAEjG,MAAM,MAAM,sBAAsB,GAAG,CAAC,EACpC,UAAU,EACV,GAAG,GACJ,EAAE;IACD,UAAU,EAAE,UAAU,CAAA;IACtB,GAAG,EAAE,cAAc,CAAA;CACpB,KAAK,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAA;AAElC,MAAM,MAAM,4BAA4B,GAAG,CAAC,EAC1C,EAAE,EACF,UAAU,EACV,GAAG,GACJ,EAAE;IACD,UAAU,EAAE,UAAU,CAAA;IACtB,EAAE,EAAE,MAAM,CAAA;IACV,GAAG,EAAE,cAAc,CAAA;CACpB,KAAK,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAA;AAElC,MAAM,MAAM,kBAAkB,GAAG,CAAC,EAChC,YAAY,EACZ,GAAG,GACJ,EAAE;IACD,YAAY,EAAE,qBAAqB,CAAA;IACnC,GAAG,EAAE,cAAc,CAAA;CACpB,KAAK,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAA;AAElC,MAAM,MAAM,wBAAwB,GAAG,CAAC,EACtC,EAAE,EACF,YAAY,EACZ,GAAG,GACJ,EAAE;IACD,YAAY,EAAE,qBAAqB,CAAA;IACnC,EAAE,EAAE,MAAM,CAAA;IACV,GAAG,EAAE,cAAc,CAAA;CACpB,KAAK,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAA"}

package/dist/routes/rest/types.js

@@ -1,3 +1,2 @@
-export { };
-
+export {};
 //# sourceMappingURL=types.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/routes/rest/types.ts"],"sourcesContent":["import type { Collection, PayloadRequest, SanitizedGlobalConfig } from 'payload/types'\n\nexport type BaseRouteHandler = ({ req }: { req: PayloadRequest }) => Promise<Response> | Response\n\nexport type CollectionRouteHandler = ({\n  collection,\n  req,\n}: {\n  collection: Collection\n  req: PayloadRequest\n}) => Promise<Response> | Response\n\nexport type CollectionRouteHandlerWithID = ({\n  id,\n  collection,\n  req,\n}: {\n  collection: Collection\n  id: string\n  req: PayloadRequest\n}) => Promise<Response> | Response\n\nexport type GlobalRouteHandler = ({\n  globalConfig,\n  req,\n}: {\n  globalConfig: SanitizedGlobalConfig\n  req: PayloadRequest\n}) => Promise<Response> | Response\n\nexport type GlobalRouteHandlerWithID = ({\n  id,\n  globalConfig,\n  req,\n}: {\n  globalConfig: SanitizedGlobalConfig\n  id: string\n  req: PayloadRequest\n}) => Promise<Response> | Response\n"],"names":[],"rangeMappings":"","mappings":"AA8BA,WAQkC"}
+{"version":3,"file":"types.js","names":[],"sources":["../../../src/routes/rest/types.ts"],"sourcesContent":["import type { Collection, PayloadRequest, SanitizedGlobalConfig } from 'payload'\n\nexport type BaseRouteHandler = ({ req }: { req: PayloadRequest }) => Promise<Response> | Response\n\nexport type CollectionRouteHandler = ({\n  collection,\n  req,\n}: {\n  collection: Collection\n  req: PayloadRequest\n}) => Promise<Response> | Response\n\nexport type CollectionRouteHandlerWithID = ({\n  id,\n  collection,\n  req,\n}: {\n  collection: Collection\n  id: string\n  req: PayloadRequest\n}) => Promise<Response> | Response\n\nexport type GlobalRouteHandler = ({\n  globalConfig,\n  req,\n}: {\n  globalConfig: SanitizedGlobalConfig\n  req: PayloadRequest\n}) => Promise<Response> | Response\n\nexport type GlobalRouteHandlerWithID = ({\n  id,\n  globalConfig,\n  req,\n}: {\n  globalConfig: SanitizedGlobalConfig\n  id: string\n  req: PayloadRequest\n}) => Promise<Response> | Response\n"],"mappings":"AA8BA","ignoreList":[]}

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

@@ -1,4 +1,4 @@
-import type { Payload } from 'payload/types';
+import type { Payload } from 'payload';
 type Args = {
     collectionSlug: string;
     id: string;

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,eAAe,CAAA;AAE5C,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

@@ -1,13 +1,20 @@
-export const sanitizeCollectionID = ({ id, collectionSlug, payload })=>{
-    let sanitizedID = id;
-    const collection = payload.collections[collectionSlug];
-    // 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 we still should sanitize, parse float
-    if (shouldSanitize) sanitizedID = parseFloat(sanitizedID);
-    return sanitizedID;
+export const sanitizeCollectionID = ({
+  id,
+  collectionSlug,
+  payload
+}) => {
+  let sanitizedID = id;
+  const collection = payload.collections[collectionSlug];
+  // 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 we still should sanitize, parse float
+  if (shouldSanitize) {
+    sanitizedID = parseFloat(sanitizedID);
+  }
+  return sanitizedID;
 };
-
 //# sourceMappingURL=sanitizeCollectionID.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/routes/rest/utilities/sanitizeCollectionID.ts"],"sourcesContent":["import type { Payload } from 'payload/types'\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"],"names":["sanitizeCollectionID","id","collectionSlug","payload","sanitizedID","collection","collections","shouldSanitize","Boolean","db","defaultIDType","customIDType","parseFloat"],"rangeMappings":";;;;;;;;;;","mappings":"AAQA,OAAO,MAAMA,uBAAuB,CAAC,EAAEC,EAAE,EAAEC,cAAc,EAAEC,OAAO,EAAQ;IACxE,IAAIC,cAA+BH;IACnC,MAAMI,aAAaF,QAAQG,WAAW,CAACJ,eAAe;IAEtD,wDAAwD;IACxD,IAAIK,iBAAiBC,QAAQL,QAAQM,EAAE,CAACC,aAAa,KAAK;IAE1D,2EAA2E;IAC3E,IAAIH,kBAAkBF,WAAWM,YAAY,KAAK,QAAQJ,iBAAiB;IAE3E,2CAA2C;IAC3C,IAAIA,gBAAgBH,cAAcQ,WAAWR;IAE7C,OAAOA;AACT,EAAC"}
+{"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) => 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,GAAG;QACpB,KAAK,CAAC,EAAE,OAAO,CAAA;QACf,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,KAAK,CAAC,EAAE,OAAO,CAAA;KAChB,CAAA;CACF,GACD,KAAK,KACR,SAYF,CAAA"}

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

@@ -0,0 +1,17 @@
+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 => {
+    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          limit?: unknown\n          sort?: string\n          where?: unknown\n        }\n      }\n    | false = {},\n): JoinQuery => {\n  const joinQuery = {}\n\n  Object.keys(joins).forEach((schemaPath) => {\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  return joinQuery\n}\n"],"mappings":"AAEA,SAASA,QAAQ,QAAQ;AAEzB;;;;AAIA,OAAO,MAAMC,kBAAA,GAAqBA,CAChCC,KAAA,GAQY,CAAC,CAAC;EAEd,MAAMC,SAAA,GAAY,CAAC;EAEnBC,MAAA,CAAOC,IAAI,CAACH,KAAA,EAAOI,OAAO,CAAEC,UAAA;IAC1BJ,SAAS,CAACI,UAAA,CAAW,GAAG;MACtBC,KAAA,EAAOR,QAAA,CAASE,KAAK,CAACK,UAAA,CAAW,EAAEC,KAAA,IAASC,MAAA,CAAOP,KAAK,CAACK,UAAA,CAAW,CAACC,KAAK,IAAIE,SAAA;MAC9EC,IAAA,EAAMT,KAAK,CAACK,UAAA,CAAW,EAAEI,IAAA,GAAOT,KAAK,CAACK,UAAA,CAAW,CAACI,IAAI,GAAGD,SAAA;MACzDE,KAAA,EAAOV,KAAK,CAACK,UAAA,CAAW,EAAEK,KAAA,GAAQV,KAAK,CAACK,UAAA,CAAW,CAACK,KAAK,GAAGF;IAC9D;EACF;EAEA,OAAOP,SAAA;AACT","ignoreList":[]}

package/dist/scss/app.scss

@@ -1,9 +1,9 @@
-@import './styles.scss';
-@import './toastify.scss';
+@import 'styles';
+@import './toasts.scss';
 @import './colors.scss';
 
 :root {
-  --base-px: 25;
+  --base-px: 20;
   --base-body-size: 13;
   --base: calc((var(--base-px) / var(--base-body-size)) * 1rem);
 
@@ -21,7 +21,8 @@
   --theme-baseline-body-size: #{$baseline-body-size};
   --font-body: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial,
     sans-serif;
-  --font-mono: monospace;
+  --font-serif: 'Georgia', 'Bitstream Charter', 'Charis SIL', Utopia, 'URW Bookman L', serif;
+  --font-mono: 'SF Mono', Menlo, Consolas, Monaco, monospace;
 
   --style-radius-s: #{$style-radius-s};
   --style-radius-m: #{$style-radius-m};
@@ -37,19 +38,19 @@
 
   --gutter-h: #{base(3)};
   --spacing-view-bottom: var(--gutter-h);
-  --app-header-height: calc(var(--base) * 3);
-  --doc-controls-height: calc(var(--base) * 3);
+  --doc-controls-height: calc(var(--base) * 2.8);
+  --app-header-height: calc(var(--base) * 2.8);
   --nav-width: 275px;
   --nav-trans-time: 150ms;
 
   @include mid-break {
     --gutter-h: #{base(2)};
-    --app-header-height: calc(var(--base) * 2);
-    --doc-controls-height: calc(var(--base) * 2.5);
+    --app-header-height: calc(var(--base) * 2.4);
+    --doc-controls-height: calc(var(--base) * 2.4);
   }
 
   @include small-break {
-    --gutter-h: #{base(0.5)};
+    --gutter-h: #{base(0.8)};
     --spacing-view-bottom: calc(var(--base) * 2);
     --nav-width: 100vw;
   }
@@ -67,12 +68,6 @@ html {
   @extend %body;
   background: var(--theme-bg);
   -webkit-font-smoothing: antialiased;
-  opacity: 0;
-
-  &[data-theme='dark'],
-  &[data-theme='light'] {
-    opacity: initial;
-  }
 
   &[data-theme='dark'] {
     --theme-bg: var(--theme-elevation-0);
@@ -111,12 +106,12 @@ body {
 }
 
 ::selection {
-  background: var(--theme-success-500);
+  background: var(--color-success-250);
   color: var(--theme-base-800);
 }
 
 ::-moz-selection {
-  background: var(--theme-success-500);
+  background: var(--color-success-250);
   color: var(--theme-base-800);
 }
 
@@ -151,13 +146,13 @@ h6 {
 }
 
 p {
-  margin: 0 0 $baseline;
+  margin: 0;
 }
 
 ul,
 ol {
   padding-left: $baseline;
-  margin: 0 0 $baseline;
+  margin: 0;
 }
 
 :focus-visible {