payload 3.0.0-beta.2 → 3.0.0-beta.21

package/dist/utilities/telemetry/events/adminInit.d.ts

@@ -1,5 +1,5 @@
-import type { User } from '../../../auth/types.js';
 import type { Payload } from '../../../index.js';
+import type { PayloadRequestWithData } from '../../../types/index.js';
 export type AdminInitEvent = {
     domainID?: string;
     type: 'admin-init';
@@ -8,7 +8,7 @@ export type AdminInitEvent = {
 type Args = {
     headers: Request['headers'];
     payload: Payload;
-    user: User | null;
+    user: PayloadRequestWithData['user'];
 };
 export declare const adminInit: ({ headers, payload, user }: Args) => void;
 export {};

package/dist/utilities/telemetry/events/adminInit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adminInit.d.ts","sourceRoot":"","sources":["../../../../src/utilities/telemetry/events/adminInit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAKhD,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,YAAY,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;IAC3B,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,IAAI,GAAG,IAAI,CAAA;CAClB,CAAA;AACD,eAAO,MAAM,SAAS,+BAAgC,IAAI,KAAG,IAuB5D,CAAA"}
+{"version":3,"file":"adminInit.d.ts","sourceRoot":"","sources":["../../../../src/utilities/telemetry/events/adminInit.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAKrE,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,YAAY,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;IAC3B,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAA;CACrC,CAAA;AACD,eAAO,MAAM,SAAS,+BAAgC,IAAI,KAAG,IAuB5D,CAAA"}

package/dist/utilities/telemetry/events/adminInit.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/utilities/telemetry/events/adminInit.ts"],"sourcesContent":["import type { User } from '../../../auth/types.js'\nimport type { Payload } from '../../../index.js'\n\nimport { sendEvent } from '../index.js'\nimport { oneWayHash } from '../oneWayHash.js'\n\nexport type AdminInitEvent = {\n  domainID?: string\n  type: 'admin-init'\n  userID?: string\n}\n\ntype Args = {\n  headers: Request['headers']\n  payload: Payload\n  user: User | null\n}\nexport const adminInit = ({ headers, payload, user }: Args): void => {\n  const host = headers.get('host')\n\n  let domainID: string\n  let userID: string\n\n  if (host) {\n    domainID = oneWayHash(host, payload.secret)\n  }\n\n  if (user?.id) {\n    userID = oneWayHash(String(user.id), payload.secret)\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-floating-promises\n  sendEvent({\n    event: {\n      type: 'admin-init',\n      domainID,\n      userID,\n    },\n    payload,\n  })\n}\n"],"names":["sendEvent","oneWayHash","adminInit","headers","payload","user","host","get","domainID","userID","secret","id","String","event","type"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;","mappings":"AAGA,SAASA,SAAS,QAAQ,cAAa;AACvC,SAASC,UAAU,QAAQ,mBAAkB;AAa7C,OAAO,MAAMC,YAAY,CAAC,EAAEC,OAAO,EAAEC,OAAO,EAAEC,IAAI,EAAQ;IACxD,MAAMC,OAAOH,QAAQI,GAAG,CAAC;IAEzB,IAAIC;IACJ,IAAIC;IAEJ,IAAIH,MAAM;QACRE,WAAWP,WAAWK,MAAMF,QAAQM,MAAM;IAC5C;IAEA,IAAIL,MAAMM,IAAI;QACZF,SAASR,WAAWW,OAAOP,KAAKM,EAAE,GAAGP,QAAQM,MAAM;IACrD;IAEA,mEAAmE;IACnEV,UAAU;QACRa,OAAO;YACLC,MAAM;YACNN;YACAC;QACF;QACAL;IACF;AACF,EAAC"}
+{"version":3,"sources":["../../../../src/utilities/telemetry/events/adminInit.ts"],"sourcesContent":["import type { User } from '../../../auth/types.js'\nimport type { Payload } from '../../../index.js'\nimport type { PayloadRequestWithData } from '../../../types/index.js'\n\nimport { sendEvent } from '../index.js'\nimport { oneWayHash } from '../oneWayHash.js'\n\nexport type AdminInitEvent = {\n  domainID?: string\n  type: 'admin-init'\n  userID?: string\n}\n\ntype Args = {\n  headers: Request['headers']\n  payload: Payload\n  user: PayloadRequestWithData['user']\n}\nexport const adminInit = ({ headers, payload, user }: Args): void => {\n  const host = headers.get('host')\n\n  let domainID: string\n  let userID: string\n\n  if (host) {\n    domainID = oneWayHash(host, payload.secret)\n  }\n\n  if (user?.id) {\n    userID = oneWayHash(String(user.id), payload.secret)\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-floating-promises\n  sendEvent({\n    event: {\n      type: 'admin-init',\n      domainID,\n      userID,\n    },\n    payload,\n  })\n}\n"],"names":["sendEvent","oneWayHash","adminInit","headers","payload","user","host","get","domainID","userID","secret","id","String","event","type"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;","mappings":"AAIA,SAASA,SAAS,QAAQ,cAAa;AACvC,SAASC,UAAU,QAAQ,mBAAkB;AAa7C,OAAO,MAAMC,YAAY,CAAC,EAAEC,OAAO,EAAEC,OAAO,EAAEC,IAAI,EAAQ;IACxD,MAAMC,OAAOH,QAAQI,GAAG,CAAC;IAEzB,IAAIC;IACJ,IAAIC;IAEJ,IAAIH,MAAM;QACRE,WAAWP,WAAWK,MAAMF,QAAQM,MAAM;IAC5C;IAEA,IAAIL,MAAMM,IAAI;QACZF,SAASR,WAAWW,OAAOP,KAAKM,EAAE,GAAGP,QAAQM,MAAM;IACrD;IAEA,mEAAmE;IACnEV,UAAU;QACRa,OAAO;YACLC,MAAM;YACNN;YACAC;QACF;QACAL;IACF;AACF,EAAC"}

package/dist/utilities/telemetry/index.d.ts

@@ -2,11 +2,19 @@ import type { Payload } from '../../types/index.js';
 import type { AdminInitEvent } from './events/adminInit.js';
 import type { ServerInitEvent } from './events/serverInit.js';
 export type BaseEvent = {
+    ciName: null | string;
+    dbAdapter: string;
+    emailAdapter: null | string;
     envID: string;
+    isCI: boolean;
+    locales: string[];
+    localizationDefaultLocale: null | string;
+    localizationEnabled: boolean;
     nodeEnv: string;
     nodeVersion: string;
     payloadVersion: string;
     projectID: string;
+    uploadAdapters: string[];
 };
 type PackageJSON = {
     dependencies: Record<string, string | undefined>;
@@ -19,5 +27,6 @@ type Args = {
 };
 export declare const sendEvent: ({ event, payload }: Args) => Promise<void>;
 export declare const getPayloadVersion: (packageJSON: PackageJSON) => string;
+export declare const getLocalizationInfo: (payload: Payload) => Pick<BaseEvent, 'locales' | 'localizationDefaultLocale' | 'localizationEnabled'>;
 export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/utilities/telemetry/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utilities/telemetry/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAM7D,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;IAChD,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,KAAK,cAAc,GAAG,cAAc,GAAG,eAAe,CAAA;AAEtD,KAAK,IAAI,GAAG;IACV,KAAK,EAAE,cAAc,CAAA;IACrB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,SAAS,uBAA8B,IAAI,KAAG,QAAQ,IAAI,CAwBtE,CAAA;AAsDD,eAAO,MAAM,iBAAiB,gBAAiB,WAAW,KAAG,MAE5D,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utilities/telemetry/index.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAM7D,MAAM,MAAM,SAAS,GAAG;IACtB,MAAM,EAAE,IAAI,GAAG,MAAM,CAAA;IACrB,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,IAAI,GAAG,MAAM,CAAA;IAC3B,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,OAAO,CAAA;IACb,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,yBAAyB,EAAE,IAAI,GAAG,MAAM,CAAA;IACxC,mBAAmB,EAAE,OAAO,CAAA;IAC5B,OAAO,EAAE,MAAM,CAAA;IACf,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,cAAc,EAAE,MAAM,EAAE,CAAA;CACzB,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;IAChD,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,KAAK,cAAc,GAAG,cAAc,GAAG,eAAe,CAAA;AAEtD,KAAK,IAAI,GAAG;IACV,KAAK,EAAE,cAAc,CAAA;IACrB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAID,eAAO,MAAM,SAAS,uBAA8B,IAAI,KAAG,QAAQ,IAAI,CAyCtE,CAAA;AAiED,eAAO,MAAM,iBAAiB,gBAAiB,WAAW,KAAG,MAE5D,CAAA;AAED,eAAO,MAAM,mBAAmB,wBAE7B,KAAK,SAAS,EAAE,SAAS,GAAG,2BAA2B,GAAG,qBAAqB,CAcjF,CAAA"}

package/dist/utilities/telemetry/index.js

@@ -1,4 +1,5 @@
 import { execSync } from 'child_process';
+import ciInfo from 'ci-info';
 import ConfImport from 'conf';
 import { randomBytes } from 'crypto';
 import findUp from 'find-up';
@@ -7,17 +8,38 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import { oneWayHash } from './oneWayHash.js';
 const Conf = ConfImport.default || ConfImport;
+let baseEvent = null;
 export const sendEvent = async ({ event, payload })=>{
-    if (payload.config.telemetry !== false) {
-        try {
-            const packageJSON = await getPackageJSON();
-            const baseEvent = {
+    try {
+        const { packageJSON, packageJSONPath } = await getPackageJSON();
+        // Only generate the base event once
+        if (!baseEvent) {
+            baseEvent = {
+                ciName: ciInfo.isCI ? ciInfo.name : null,
                 envID: getEnvID(),
+                isCI: ciInfo.isCI,
                 nodeEnv: process.env.NODE_ENV || 'development',
                 nodeVersion: process.version,
                 payloadVersion: getPayloadVersion(packageJSON),
-                projectID: getProjectID(payload, packageJSON)
+                projectID: getProjectID(payload, packageJSON),
+                ...getLocalizationInfo(payload),
+                dbAdapter: payload.db.name,
+                emailAdapter: payload.email?.name || null,
+                uploadAdapters: payload.config.upload.adapters
             };
+        }
+        if (process.env.PAYLOAD_TELEMETRY_DEBUG) {
+            payload.logger.info({
+                event: {
+                    ...baseEvent,
+                    ...event,
+                    packageJSONPath
+                },
+                msg: 'Telemetry Event'
+            });
+            return;
+        }
+        if (payload.config.telemetry !== false) {
             await fetch('https://telemetry.payloadcms.com/events', {
                 body: JSON.stringify({
                     ...baseEvent,
@@ -28,9 +50,9 @@ export const sendEvent = async ({ event, payload })=>{
                 },
                 method: 'post'
             });
-        } catch (_) {
-        // Eat any errors in sending telemetry event
         }
+    } catch (_) {
+    // Eat any errors in sending telemetry event
     }
 };
 /**
@@ -63,13 +85,25 @@ const getGitID = (payload)=>{
     }
 };
 const getPackageJSON = async ()=>{
-    const filename = fileURLToPath(import.meta.url);
-    const dirname = path.dirname(filename);
-    const packageJsonPath = await findUp('package.json', {
-        cwd: dirname
-    });
-    const jsonContent = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
-    return jsonContent;
+    let packageJSONPath = path.resolve(process.cwd(), 'package.json');
+    if (!fs.existsSync(packageJSONPath)) {
+        // Old logic
+        const filename = fileURLToPath(import.meta.url);
+        const dirname = path.dirname(filename);
+        packageJSONPath = await findUp('package.json', {
+            cwd: dirname
+        });
+        const jsonContent = JSON.parse(fs.readFileSync(packageJSONPath, 'utf-8'));
+        return {
+            packageJSON: jsonContent,
+            packageJSONPath
+        };
+    }
+    const packageJSON = JSON.parse(fs.readFileSync(packageJSONPath, 'utf-8'));
+    return {
+        packageJSON,
+        packageJSONPath
+    };
 };
 const getPackageJSONID = (payload, packageJSON)=>{
     return oneWayHash(packageJSON.name, payload.secret);
@@ -77,5 +111,19 @@ const getPackageJSONID = (payload, packageJSON)=>{
 export const getPayloadVersion = (packageJSON)=>{
     return packageJSON?.dependencies?.payload ?? '';
 };
+export const getLocalizationInfo = (payload)=>{
+    if (!payload.config.localization) {
+        return {
+            locales: [],
+            localizationDefaultLocale: null,
+            localizationEnabled: false
+        };
+    }
+    return {
+        locales: payload.config.localization.localeCodes,
+        localizationDefaultLocale: payload.config.localization.defaultLocale,
+        localizationEnabled: true
+    };
+};
 
 //# sourceMappingURL=index.js.map

package/dist/utilities/telemetry/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/utilities/telemetry/index.ts"],"sourcesContent":["import { execSync } from 'child_process'\nimport ConfImport from 'conf'\nimport { randomBytes } from 'crypto'\nimport findUp from 'find-up'\nimport fs from 'fs'\nimport path from 'path'\nimport { fileURLToPath } from 'url'\n\nimport type { Payload } from '../../types/index.js'\nimport type { AdminInitEvent } from './events/adminInit.js'\nimport type { ServerInitEvent } from './events/serverInit.js'\n\nimport { oneWayHash } from './oneWayHash.js'\n\nconst Conf = (ConfImport.default || ConfImport) as unknown as typeof ConfImport.default\n\nexport type BaseEvent = {\n  envID: string\n  nodeEnv: string\n  nodeVersion: string\n  payloadVersion: string\n  projectID: string\n}\n\ntype PackageJSON = {\n  dependencies: Record<string, string | undefined>\n  name: string\n}\n\ntype TelemetryEvent = AdminInitEvent | ServerInitEvent\n\ntype Args = {\n  event: TelemetryEvent\n  payload: Payload\n}\n\nexport const sendEvent = async ({ event, payload }: Args): Promise<void> => {\n  if (payload.config.telemetry !== false) {\n    try {\n      const packageJSON = await getPackageJSON()\n\n      const baseEvent: BaseEvent = {\n        envID: getEnvID(),\n        nodeEnv: process.env.NODE_ENV || 'development',\n        nodeVersion: process.version,\n        payloadVersion: getPayloadVersion(packageJSON),\n        projectID: getProjectID(payload, packageJSON),\n      }\n\n      await fetch('https://telemetry.payloadcms.com/events', {\n        body: JSON.stringify({ ...baseEvent, ...event }),\n        headers: {\n          'Content-Type': 'application/json',\n        },\n        method: 'post',\n      })\n    } catch (_) {\n      // Eat any errors in sending telemetry event\n    }\n  }\n}\n\n/**\n * This is a quasi-persistent identifier used to dedupe recurring events. It's\n * generated from random data and completely anonymous.\n */\nconst getEnvID = (): string => {\n  const conf = new Conf()\n  const ENV_ID = 'envID'\n\n  const val = conf.get(ENV_ID)\n  if (val) {\n    return val as string\n  }\n\n  const generated = randomBytes(32).toString('hex')\n  conf.set(ENV_ID, generated)\n  return generated\n}\n\nconst getProjectID = (payload: Payload, packageJSON: PackageJSON): string => {\n  const projectID =\n    getGitID(payload) ||\n    getPackageJSONID(payload, packageJSON) ||\n    payload.config.serverURL ||\n    process.cwd()\n  return oneWayHash(projectID, payload.secret)\n}\n\nconst getGitID = (payload: Payload) => {\n  try {\n    const originBuffer = execSync('git config --local --get remote.origin.url', {\n      stdio: 'pipe',\n      timeout: 1000,\n    })\n\n    return oneWayHash(String(originBuffer).trim(), payload.secret)\n  } catch (_) {\n    return null\n  }\n}\n\nconst getPackageJSON = async (): Promise<PackageJSON> => {\n  const filename = fileURLToPath(import.meta.url)\n  const dirname = path.dirname(filename)\n  const packageJsonPath = await findUp('package.json', { cwd: dirname })\n  const jsonContent: PackageJSON = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'))\n  return jsonContent\n}\n\nconst getPackageJSONID = (payload: Payload, packageJSON: PackageJSON): string => {\n  return oneWayHash(packageJSON.name, payload.secret)\n}\n\nexport const getPayloadVersion = (packageJSON: PackageJSON): string => {\n  return packageJSON?.dependencies?.payload ?? ''\n}\n"],"names":["execSync","ConfImport","randomBytes","findUp","fs","path","fileURLToPath","oneWayHash","Conf","default","sendEvent","event","payload","config","telemetry","packageJSON","getPackageJSON","baseEvent","envID","getEnvID","nodeEnv","process","env","NODE_ENV","nodeVersion","version","payloadVersion","getPayloadVersion","projectID","getProjectID","fetch","body","JSON","stringify","headers","method","_","conf","ENV_ID","val","get","generated","toString","set","getGitID","getPackageJSONID","serverURL","cwd","secret","originBuffer","stdio","timeout","String","trim","filename","url","dirname","packageJsonPath","jsonContent","parse","readFileSync","name","dependencies"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA,SAASA,QAAQ,QAAQ,gBAAe;AACxC,OAAOC,gBAAgB,OAAM;AAC7B,SAASC,WAAW,QAAQ,SAAQ;AACpC,OAAOC,YAAY,UAAS;AAC5B,OAAOC,QAAQ,KAAI;AACnB,OAAOC,UAAU,OAAM;AACvB,SAASC,aAAa,QAAQ,MAAK;AAMnC,SAASC,UAAU,QAAQ,kBAAiB;AAE5C,MAAMC,OAAQP,WAAWQ,OAAO,IAAIR;AAsBpC,OAAO,MAAMS,YAAY,OAAO,EAAEC,KAAK,EAAEC,OAAO,EAAQ;IACtD,IAAIA,QAAQC,MAAM,CAACC,SAAS,KAAK,OAAO;QACtC,IAAI;YACF,MAAMC,cAAc,MAAMC;YAE1B,MAAMC,YAAuB;gBAC3BC,OAAOC;gBACPC,SAASC,QAAQC,GAAG,CAACC,QAAQ,IAAI;gBACjCC,aAAaH,QAAQI,OAAO;gBAC5BC,gBAAgBC,kBAAkBZ;gBAClCa,WAAWC,aAAajB,SAASG;YACnC;YAEA,MAAMe,MAAM,2CAA2C;gBACrDC,MAAMC,KAAKC,SAAS,CAAC;oBAAE,GAAGhB,SAAS;oBAAE,GAAGN,KAAK;gBAAC;gBAC9CuB,SAAS;oBACP,gBAAgB;gBAClB;gBACAC,QAAQ;YACV;QACF,EAAE,OAAOC,GAAG;QACV,4CAA4C;QAC9C;IACF;AACF,EAAC;AAED;;;CAGC,GACD,MAAMjB,WAAW;IACf,MAAMkB,OAAO,IAAI7B;IACjB,MAAM8B,SAAS;IAEf,MAAMC,MAAMF,KAAKG,GAAG,CAACF;IACrB,IAAIC,KAAK;QACP,OAAOA;IACT;IAEA,MAAME,YAAYvC,YAAY,IAAIwC,QAAQ,CAAC;IAC3CL,KAAKM,GAAG,CAACL,QAAQG;IACjB,OAAOA;AACT;AAEA,MAAMZ,eAAe,CAACjB,SAAkBG;IACtC,MAAMa,YACJgB,SAAShC,YACTiC,iBAAiBjC,SAASG,gBAC1BH,QAAQC,MAAM,CAACiC,SAAS,IACxBzB,QAAQ0B,GAAG;IACb,OAAOxC,WAAWqB,WAAWhB,QAAQoC,MAAM;AAC7C;AAEA,MAAMJ,WAAW,CAAChC;IAChB,IAAI;QACF,MAAMqC,eAAejD,SAAS,8CAA8C;YAC1EkD,OAAO;YACPC,SAAS;QACX;QAEA,OAAO5C,WAAW6C,OAAOH,cAAcI,IAAI,IAAIzC,QAAQoC,MAAM;IAC/D,EAAE,OAAOZ,GAAG;QACV,OAAO;IACT;AACF;AAEA,MAAMpB,iBAAiB;IACrB,MAAMsC,WAAWhD,cAAc,YAAYiD,GAAG;IAC9C,MAAMC,UAAUnD,KAAKmD,OAAO,CAACF;IAC7B,MAAMG,kBAAkB,MAAMtD,OAAO,gBAAgB;QAAE4C,KAAKS;IAAQ;IACpE,MAAME,cAA2B1B,KAAK2B,KAAK,CAACvD,GAAGwD,YAAY,CAACH,iBAAiB;IAC7E,OAAOC;AACT;AAEA,MAAMb,mBAAmB,CAACjC,SAAkBG;IAC1C,OAAOR,WAAWQ,YAAY8C,IAAI,EAAEjD,QAAQoC,MAAM;AACpD;AAEA,OAAO,MAAMrB,oBAAoB,CAACZ;IAChC,OAAOA,aAAa+C,cAAclD,WAAW;AAC/C,EAAC"}
+{"version":3,"sources":["../../../src/utilities/telemetry/index.ts"],"sourcesContent":["import { execSync } from 'child_process'\nimport ciInfo from 'ci-info'\nimport ConfImport from 'conf'\nimport { randomBytes } from 'crypto'\nimport findUp from 'find-up'\nimport fs from 'fs'\nimport path from 'path'\nimport { fileURLToPath } from 'url'\n\nimport type { Payload } from '../../types/index.js'\nimport type { AdminInitEvent } from './events/adminInit.js'\nimport type { ServerInitEvent } from './events/serverInit.js'\n\nimport { oneWayHash } from './oneWayHash.js'\n\nconst Conf = (ConfImport.default || ConfImport) as unknown as typeof ConfImport.default\n\nexport type BaseEvent = {\n  ciName: null | string\n  dbAdapter: string\n  emailAdapter: null | string\n  envID: string\n  isCI: boolean\n  locales: string[]\n  localizationDefaultLocale: null | string\n  localizationEnabled: boolean\n  nodeEnv: string\n  nodeVersion: string\n  payloadVersion: string\n  projectID: string\n  uploadAdapters: string[]\n}\n\ntype PackageJSON = {\n  dependencies: Record<string, string | undefined>\n  name: string\n}\n\ntype TelemetryEvent = AdminInitEvent | ServerInitEvent\n\ntype Args = {\n  event: TelemetryEvent\n  payload: Payload\n}\n\nlet baseEvent: BaseEvent | null = null\n\nexport const sendEvent = async ({ event, payload }: Args): Promise<void> => {\n  try {\n    const { packageJSON, packageJSONPath } = await getPackageJSON()\n\n    // Only generate the base event once\n    if (!baseEvent) {\n      baseEvent = {\n        ciName: ciInfo.isCI ? ciInfo.name : null,\n        envID: getEnvID(),\n        isCI: ciInfo.isCI,\n        nodeEnv: process.env.NODE_ENV || 'development',\n        nodeVersion: process.version,\n        payloadVersion: getPayloadVersion(packageJSON),\n        projectID: getProjectID(payload, packageJSON),\n        ...getLocalizationInfo(payload),\n        dbAdapter: payload.db.name,\n        emailAdapter: payload.email?.name || null,\n        uploadAdapters: payload.config.upload.adapters,\n      }\n    }\n\n    if (process.env.PAYLOAD_TELEMETRY_DEBUG) {\n      payload.logger.info({\n        event: { ...baseEvent, ...event, packageJSONPath },\n        msg: 'Telemetry Event',\n      })\n      return\n    }\n\n    if (payload.config.telemetry !== false) {\n      await fetch('https://telemetry.payloadcms.com/events', {\n        body: JSON.stringify({ ...baseEvent, ...event }),\n        headers: {\n          'Content-Type': 'application/json',\n        },\n        method: 'post',\n      })\n    }\n  } catch (_) {\n    // Eat any errors in sending telemetry event\n  }\n}\n\n/**\n * This is a quasi-persistent identifier used to dedupe recurring events. It's\n * generated from random data and completely anonymous.\n */\nconst getEnvID = (): string => {\n  const conf = new Conf()\n  const ENV_ID = 'envID'\n\n  const val = conf.get(ENV_ID)\n  if (val) {\n    return val as string\n  }\n\n  const generated = randomBytes(32).toString('hex')\n  conf.set(ENV_ID, generated)\n  return generated\n}\n\nconst getProjectID = (payload: Payload, packageJSON: PackageJSON): string => {\n  const projectID =\n    getGitID(payload) ||\n    getPackageJSONID(payload, packageJSON) ||\n    payload.config.serverURL ||\n    process.cwd()\n  return oneWayHash(projectID, payload.secret)\n}\n\nconst getGitID = (payload: Payload) => {\n  try {\n    const originBuffer = execSync('git config --local --get remote.origin.url', {\n      stdio: 'pipe',\n      timeout: 1000,\n    })\n\n    return oneWayHash(String(originBuffer).trim(), payload.secret)\n  } catch (_) {\n    return null\n  }\n}\n\nconst getPackageJSON = async (): Promise<{\n  packageJSON?: PackageJSON\n  packageJSONPath: string\n}> => {\n  let packageJSONPath = path.resolve(process.cwd(), 'package.json')\n\n  if (!fs.existsSync(packageJSONPath)) {\n    // Old logic\n    const filename = fileURLToPath(import.meta.url)\n    const dirname = path.dirname(filename)\n    packageJSONPath = await findUp('package.json', { cwd: dirname })\n    const jsonContent: PackageJSON = JSON.parse(fs.readFileSync(packageJSONPath, 'utf-8'))\n    return { packageJSON: jsonContent, packageJSONPath }\n  }\n\n  const packageJSON: PackageJSON = JSON.parse(fs.readFileSync(packageJSONPath, 'utf-8'))\n  return { packageJSON, packageJSONPath }\n}\n\nconst getPackageJSONID = (payload: Payload, packageJSON: PackageJSON): string => {\n  return oneWayHash(packageJSON.name, payload.secret)\n}\n\nexport const getPayloadVersion = (packageJSON: PackageJSON): string => {\n  return packageJSON?.dependencies?.payload ?? ''\n}\n\nexport const getLocalizationInfo = (\n  payload: Payload,\n): Pick<BaseEvent, 'locales' | 'localizationDefaultLocale' | 'localizationEnabled'> => {\n  if (!payload.config.localization) {\n    return {\n      locales: [],\n      localizationDefaultLocale: null,\n      localizationEnabled: false,\n    }\n  }\n\n  return {\n    locales: payload.config.localization.localeCodes,\n    localizationDefaultLocale: payload.config.localization.defaultLocale,\n    localizationEnabled: true,\n  }\n}\n"],"names":["execSync","ciInfo","ConfImport","randomBytes","findUp","fs","path","fileURLToPath","oneWayHash","Conf","default","baseEvent","sendEvent","event","payload","packageJSON","packageJSONPath","getPackageJSON","ciName","isCI","name","envID","getEnvID","nodeEnv","process","env","NODE_ENV","nodeVersion","version","payloadVersion","getPayloadVersion","projectID","getProjectID","getLocalizationInfo","dbAdapter","db","emailAdapter","email","uploadAdapters","config","upload","adapters","PAYLOAD_TELEMETRY_DEBUG","logger","info","msg","telemetry","fetch","body","JSON","stringify","headers","method","_","conf","ENV_ID","val","get","generated","toString","set","getGitID","getPackageJSONID","serverURL","cwd","secret","originBuffer","stdio","timeout","String","trim","resolve","existsSync","filename","url","dirname","jsonContent","parse","readFileSync","dependencies","localization","locales","localizationDefaultLocale","localizationEnabled","localeCodes","defaultLocale"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

package/dist/versions/deleteCollectionVersions.d.ts

@@ -1,9 +1,9 @@
 import type { Payload } from '../index.js';
-import type { PayloadRequest } from '../types/index.js';
+import type { PayloadRequestWithData } from '../types/index.js';
 type Args = {
     id?: number | string;
     payload: Payload;
-    req?: PayloadRequest;
+    req?: PayloadRequestWithData;
     slug: string;
 };
 export declare const deleteCollectionVersions: ({ id, slug, payload, req }: Args) => Promise<void>;

package/dist/versions/deleteCollectionVersions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteCollectionVersions.d.ts","sourceRoot":"","sources":["../../src/versions/deleteCollectionVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAEvD,KAAK,IAAI,GAAG;IACV,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,eAAO,MAAM,wBAAwB,+BAAsC,IAAI,KAAG,QAAQ,IAAI,CAgB7F,CAAA"}
+{"version":3,"file":"deleteCollectionVersions.d.ts","sourceRoot":"","sources":["../../src/versions/deleteCollectionVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE/D,KAAK,IAAI,GAAG;IACV,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,sBAAsB,CAAA;IAC5B,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,eAAO,MAAM,wBAAwB,+BAAsC,IAAI,KAAG,QAAQ,IAAI,CAgB7F,CAAA"}

package/dist/versions/deleteCollectionVersions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/versions/deleteCollectionVersions.ts"],"sourcesContent":["import type { Payload } from '../index.js'\nimport type { PayloadRequest } from '../types/index.js'\n\ntype Args = {\n  id?: number | string\n  payload: Payload\n  req?: PayloadRequest\n  slug: string\n}\n\nexport const deleteCollectionVersions = async ({ id, slug, payload, req }: Args): Promise<void> => {\n  try {\n    await payload.db.deleteVersions({\n      collection: slug,\n      req,\n      where: {\n        parent: {\n          equals: id,\n        },\n      },\n    })\n  } catch (err) {\n    payload.logger.error(\n      `There was an error removing versions for the deleted ${slug} document with ID ${id}.`,\n    )\n  }\n}\n"],"names":["deleteCollectionVersions","id","slug","payload","req","db","deleteVersions","collection","where","parent","equals","err","logger","error"],"rangeMappings":";;;;;;;;;;;;;;","mappings":"AAUA,OAAO,MAAMA,2BAA2B,OAAO,EAAEC,EAAE,EAAEC,IAAI,EAAEC,OAAO,EAAEC,GAAG,EAAQ;IAC7E,IAAI;QACF,MAAMD,QAAQE,EAAE,CAACC,cAAc,CAAC;YAC9BC,YAAYL;YACZE;YACAI,OAAO;gBACLC,QAAQ;oBACNC,QAAQT;gBACV;YACF;QACF;IACF,EAAE,OAAOU,KAAK;QACZR,QAAQS,MAAM,CAACC,KAAK,CAClB,CAAC,qDAAqD,EAAEX,KAAK,kBAAkB,EAAED,GAAG,CAAC,CAAC;IAE1F;AACF,EAAC"}
+{"version":3,"sources":["../../src/versions/deleteCollectionVersions.ts"],"sourcesContent":["import type { Payload } from '../index.js'\nimport type { PayloadRequestWithData } from '../types/index.js'\n\ntype Args = {\n  id?: number | string\n  payload: Payload\n  req?: PayloadRequestWithData\n  slug: string\n}\n\nexport const deleteCollectionVersions = async ({ id, slug, payload, req }: Args): Promise<void> => {\n  try {\n    await payload.db.deleteVersions({\n      collection: slug,\n      req,\n      where: {\n        parent: {\n          equals: id,\n        },\n      },\n    })\n  } catch (err) {\n    payload.logger.error(\n      `There was an error removing versions for the deleted ${slug} document with ID ${id}.`,\n    )\n  }\n}\n"],"names":["deleteCollectionVersions","id","slug","payload","req","db","deleteVersions","collection","where","parent","equals","err","logger","error"],"rangeMappings":";;;;;;;;;;;;;;","mappings":"AAUA,OAAO,MAAMA,2BAA2B,OAAO,EAAEC,EAAE,EAAEC,IAAI,EAAEC,OAAO,EAAEC,GAAG,EAAQ;IAC7E,IAAI;QACF,MAAMD,QAAQE,EAAE,CAACC,cAAc,CAAC;YAC9BC,YAAYL;YACZE;YACAI,OAAO;gBACLC,QAAQ;oBACNC,QAAQT;gBACV;YACF;QACF;IACF,EAAE,OAAOU,KAAK;QACZR,QAAQS,MAAM,CAACC,KAAK,CAClB,CAAC,qDAAqD,EAAEX,KAAK,kBAAkB,EAAED,GAAG,CAAC,CAAC;IAE1F;AACF,EAAC"}

package/dist/versions/drafts/replaceWithDraftIfAvailable.d.ts

@@ -1,14 +1,14 @@
 import type { SanitizedCollectionConfig, TypeWithID } from '../../collections/config/types.js';
 import type { AccessResult } from '../../config/types.js';
 import type { SanitizedGlobalConfig } from '../../globals/config/types.js';
-import type { PayloadRequest } from '../../types/index.js';
+import type { PayloadRequestWithData } from '../../types/index.js';
 type Arguments<T> = {
     accessResult: AccessResult;
     doc: T;
     entity: SanitizedCollectionConfig | SanitizedGlobalConfig;
     entityType: 'collection' | 'global';
     overrideAccess: boolean;
-    req: PayloadRequest;
+    req: PayloadRequestWithData;
 };
 declare const replaceWithDraftIfAvailable: <T extends TypeWithID>({ accessResult, doc, entity, entityType, req, }: Arguments<T>) => Promise<T>;
 export default replaceWithDraftIfAvailable;

package/dist/versions/drafts/replaceWithDraftIfAvailable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replaceWithDraftIfAvailable.d.ts","sourceRoot":"","sources":["../../../src/versions/drafts/replaceWithDraftIfAvailable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAA;AAC9F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAEzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAA;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAS,MAAM,sBAAsB,CAAA;AAQjE,KAAK,SAAS,CAAC,CAAC,IAAI;IAClB,YAAY,EAAE,YAAY,CAAA;IAC1B,GAAG,EAAE,CAAC,CAAA;IACN,MAAM,EAAE,yBAAyB,GAAG,qBAAqB,CAAA;IACzD,UAAU,EAAE,YAAY,GAAG,QAAQ,CAAA;IACnC,cAAc,EAAE,OAAO,CAAA;IACvB,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED,QAAA,MAAM,2BAA2B,0EAM9B,UAAU,CAAC,CAAC,KAAG,QAAQ,CAAC,CA4E1B,CAAA;AAED,eAAe,2BAA2B,CAAA"}
+{"version":3,"file":"replaceWithDraftIfAvailable.d.ts","sourceRoot":"","sources":["../../../src/versions/drafts/replaceWithDraftIfAvailable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAA;AAC9F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAEzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAA;AAC1E,OAAO,KAAK,EAAE,sBAAsB,EAAS,MAAM,sBAAsB,CAAA;AAQzE,KAAK,SAAS,CAAC,CAAC,IAAI;IAClB,YAAY,EAAE,YAAY,CAAA;IAC1B,GAAG,EAAE,CAAC,CAAA;IACN,MAAM,EAAE,yBAAyB,GAAG,qBAAqB,CAAA;IACzD,UAAU,EAAE,YAAY,GAAG,QAAQ,CAAA;IACnC,cAAc,EAAE,OAAO,CAAA;IACvB,GAAG,EAAE,sBAAsB,CAAA;CAC5B,CAAA;AAED,QAAA,MAAM,2BAA2B,0EAM9B,UAAU,CAAC,CAAC,KAAG,QAAQ,CAAC,CA4E1B,CAAA;AAED,eAAe,2BAA2B,CAAA"}

package/dist/versions/drafts/replaceWithDraftIfAvailable.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/versions/drafts/replaceWithDraftIfAvailable.ts"],"sourcesContent":["import type { SanitizedCollectionConfig, TypeWithID } from '../../collections/config/types.js'\nimport type { AccessResult } from '../../config/types.js'\nimport type { FindGlobalVersionsArgs, FindVersionsArgs } from '../../database/types.js'\nimport type { SanitizedGlobalConfig } from '../../globals/config/types.js'\nimport type { PayloadRequest, Where } from '../../types/index.js'\n\nimport { hasWhereAccessResult } from '../../auth/index.js'\nimport { combineQueries } from '../../database/combineQueries.js'\nimport { docHasTimestamps } from '../../types/index.js'\nimport sanitizeInternalFields from '../../utilities/sanitizeInternalFields.js'\nimport { appendVersionToQueryKey } from './appendVersionToQueryKey.js'\n\ntype Arguments<T> = {\n  accessResult: AccessResult\n  doc: T\n  entity: SanitizedCollectionConfig | SanitizedGlobalConfig\n  entityType: 'collection' | 'global'\n  overrideAccess: boolean\n  req: PayloadRequest\n}\n\nconst replaceWithDraftIfAvailable = async <T extends TypeWithID>({\n  accessResult,\n  doc,\n  entity,\n  entityType,\n  req,\n}: Arguments<T>): Promise<T> => {\n  const { locale } = req\n\n  const queryToBuild: Where = {\n    and: [\n      {\n        'version._status': {\n          equals: 'draft',\n        },\n      },\n    ],\n  }\n\n  if (entityType === 'collection') {\n    queryToBuild.and.push({\n      parent: {\n        equals: doc.id,\n      },\n    })\n  }\n\n  if (docHasTimestamps(doc)) {\n    queryToBuild.and.push({\n      updatedAt: {\n        greater_than: doc.updatedAt,\n      },\n    })\n  }\n\n  let versionAccessResult\n\n  if (hasWhereAccessResult(accessResult)) {\n    versionAccessResult = appendVersionToQueryKey(accessResult)\n  }\n\n  const findVersionsArgs: FindVersionsArgs & FindGlobalVersionsArgs = {\n    collection: entity.slug,\n    global: entity.slug,\n    limit: 1,\n    locale,\n    pagination: false,\n    req,\n    sort: '-updatedAt',\n    where: combineQueries(queryToBuild, versionAccessResult),\n  }\n\n  let versionDocs\n  if (entityType === 'global') {\n    versionDocs = (await req.payload.db.findGlobalVersions<T>(findVersionsArgs)).docs\n  } else {\n    versionDocs = (await req.payload.db.findVersions<T>(findVersionsArgs)).docs\n  }\n\n  let draft = versionDocs[0]\n\n  if (!draft) {\n    return doc\n  }\n\n  draft = JSON.parse(JSON.stringify(draft))\n  draft = sanitizeInternalFields(draft)\n\n  // Patch globalType onto version doc\n  if (entityType === 'global' && 'globalType' in doc) {\n    draft.version.globalType = doc.globalType\n  }\n\n  // Disregard all other draft content at this point,\n  // Only interested in the version itself.\n  // Operations will handle firing hooks, etc.\n  return {\n    id: doc.id,\n    ...draft.version,\n    createdAt: draft.createdAt,\n    updatedAt: draft.updatedAt,\n  }\n}\n\nexport default replaceWithDraftIfAvailable\n"],"names":["hasWhereAccessResult","combineQueries","docHasTimestamps","sanitizeInternalFields","appendVersionToQueryKey","replaceWithDraftIfAvailable","accessResult","doc","entity","entityType","req","locale","queryToBuild","and","equals","push","parent","id","updatedAt","greater_than","versionAccessResult","findVersionsArgs","collection","slug","global","limit","pagination","sort","where","versionDocs","payload","db","findGlobalVersions","docs","findVersions","draft","JSON","parse","stringify","version","globalType","createdAt"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAMA,SAASA,oBAAoB,QAAQ,sBAAqB;AAC1D,SAASC,cAAc,QAAQ,mCAAkC;AACjE,SAASC,gBAAgB,QAAQ,uBAAsB;AACvD,OAAOC,4BAA4B,4CAA2C;AAC9E,SAASC,uBAAuB,QAAQ,+BAA8B;AAWtE,MAAMC,8BAA8B,OAA6B,EAC/DC,YAAY,EACZC,GAAG,EACHC,MAAM,EACNC,UAAU,EACVC,GAAG,EACU;IACb,MAAM,EAAEC,MAAM,EAAE,GAAGD;IAEnB,MAAME,eAAsB;QAC1BC,KAAK;YACH;gBACE,mBAAmB;oBACjBC,QAAQ;gBACV;YACF;SACD;IACH;IAEA,IAAIL,eAAe,cAAc;QAC/BG,aAAaC,GAAG,CAACE,IAAI,CAAC;YACpBC,QAAQ;gBACNF,QAAQP,IAAIU,EAAE;YAChB;QACF;IACF;IAEA,IAAIf,iBAAiBK,MAAM;QACzBK,aAAaC,GAAG,CAACE,IAAI,CAAC;YACpBG,WAAW;gBACTC,cAAcZ,IAAIW,SAAS;YAC7B;QACF;IACF;IAEA,IAAIE;IAEJ,IAAIpB,qBAAqBM,eAAe;QACtCc,sBAAsBhB,wBAAwBE;IAChD;IAEA,MAAMe,mBAA8D;QAClEC,YAAYd,OAAOe,IAAI;QACvBC,QAAQhB,OAAOe,IAAI;QACnBE,OAAO;QACPd;QACAe,YAAY;QACZhB;QACAiB,MAAM;QACNC,OAAO3B,eAAeW,cAAcQ;IACtC;IAEA,IAAIS;IACJ,IAAIpB,eAAe,UAAU;QAC3BoB,cAAc,AAAC,CAAA,MAAMnB,IAAIoB,OAAO,CAACC,EAAE,CAACC,kBAAkB,CAAIX,iBAAgB,EAAGY,IAAI;IACnF,OAAO;QACLJ,cAAc,AAAC,CAAA,MAAMnB,IAAIoB,OAAO,CAACC,EAAE,CAACG,YAAY,CAAIb,iBAAgB,EAAGY,IAAI;IAC7E;IAEA,IAAIE,QAAQN,WAAW,CAAC,EAAE;IAE1B,IAAI,CAACM,OAAO;QACV,OAAO5B;IACT;IAEA4B,QAAQC,KAAKC,KAAK,CAACD,KAAKE,SAAS,CAACH;IAClCA,QAAQhC,uBAAuBgC;IAE/B,oCAAoC;IACpC,IAAI1B,eAAe,YAAY,gBAAgBF,KAAK;QAClD4B,MAAMI,OAAO,CAACC,UAAU,GAAGjC,IAAIiC,UAAU;IAC3C;IAEA,mDAAmD;IACnD,yCAAyC;IACzC,4CAA4C;IAC5C,OAAO;QACLvB,IAAIV,IAAIU,EAAE;QACV,GAAGkB,MAAMI,OAAO;QAChBE,WAAWN,MAAMM,SAAS;QAC1BvB,WAAWiB,MAAMjB,SAAS;IAC5B;AACF;AAEA,eAAeb,4BAA2B"}
+{"version":3,"sources":["../../../src/versions/drafts/replaceWithDraftIfAvailable.ts"],"sourcesContent":["import type { SanitizedCollectionConfig, TypeWithID } from '../../collections/config/types.js'\nimport type { AccessResult } from '../../config/types.js'\nimport type { FindGlobalVersionsArgs, FindVersionsArgs } from '../../database/types.js'\nimport type { SanitizedGlobalConfig } from '../../globals/config/types.js'\nimport type { PayloadRequestWithData, Where } from '../../types/index.js'\n\nimport { hasWhereAccessResult } from '../../auth/index.js'\nimport { combineQueries } from '../../database/combineQueries.js'\nimport { docHasTimestamps } from '../../types/index.js'\nimport sanitizeInternalFields from '../../utilities/sanitizeInternalFields.js'\nimport { appendVersionToQueryKey } from './appendVersionToQueryKey.js'\n\ntype Arguments<T> = {\n  accessResult: AccessResult\n  doc: T\n  entity: SanitizedCollectionConfig | SanitizedGlobalConfig\n  entityType: 'collection' | 'global'\n  overrideAccess: boolean\n  req: PayloadRequestWithData\n}\n\nconst replaceWithDraftIfAvailable = async <T extends TypeWithID>({\n  accessResult,\n  doc,\n  entity,\n  entityType,\n  req,\n}: Arguments<T>): Promise<T> => {\n  const { locale } = req\n\n  const queryToBuild: Where = {\n    and: [\n      {\n        'version._status': {\n          equals: 'draft',\n        },\n      },\n    ],\n  }\n\n  if (entityType === 'collection') {\n    queryToBuild.and.push({\n      parent: {\n        equals: doc.id,\n      },\n    })\n  }\n\n  if (docHasTimestamps(doc)) {\n    queryToBuild.and.push({\n      updatedAt: {\n        greater_than: doc.updatedAt,\n      },\n    })\n  }\n\n  let versionAccessResult\n\n  if (hasWhereAccessResult(accessResult)) {\n    versionAccessResult = appendVersionToQueryKey(accessResult)\n  }\n\n  const findVersionsArgs: FindVersionsArgs & FindGlobalVersionsArgs = {\n    collection: entity.slug,\n    global: entity.slug,\n    limit: 1,\n    locale,\n    pagination: false,\n    req,\n    sort: '-updatedAt',\n    where: combineQueries(queryToBuild, versionAccessResult),\n  }\n\n  let versionDocs\n  if (entityType === 'global') {\n    versionDocs = (await req.payload.db.findGlobalVersions<T>(findVersionsArgs)).docs\n  } else {\n    versionDocs = (await req.payload.db.findVersions<T>(findVersionsArgs)).docs\n  }\n\n  let draft = versionDocs[0]\n\n  if (!draft) {\n    return doc\n  }\n\n  draft = JSON.parse(JSON.stringify(draft))\n  draft = sanitizeInternalFields(draft)\n\n  // Patch globalType onto version doc\n  if (entityType === 'global' && 'globalType' in doc) {\n    draft.version.globalType = doc.globalType\n  }\n\n  // Disregard all other draft content at this point,\n  // Only interested in the version itself.\n  // Operations will handle firing hooks, etc.\n  return {\n    id: doc.id,\n    ...draft.version,\n    createdAt: draft.createdAt,\n    updatedAt: draft.updatedAt,\n  }\n}\n\nexport default replaceWithDraftIfAvailable\n"],"names":["hasWhereAccessResult","combineQueries","docHasTimestamps","sanitizeInternalFields","appendVersionToQueryKey","replaceWithDraftIfAvailable","accessResult","doc","entity","entityType","req","locale","queryToBuild","and","equals","push","parent","id","updatedAt","greater_than","versionAccessResult","findVersionsArgs","collection","slug","global","limit","pagination","sort","where","versionDocs","payload","db","findGlobalVersions","docs","findVersions","draft","JSON","parse","stringify","version","globalType","createdAt"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAMA,SAASA,oBAAoB,QAAQ,sBAAqB;AAC1D,SAASC,cAAc,QAAQ,mCAAkC;AACjE,SAASC,gBAAgB,QAAQ,uBAAsB;AACvD,OAAOC,4BAA4B,4CAA2C;AAC9E,SAASC,uBAAuB,QAAQ,+BAA8B;AAWtE,MAAMC,8BAA8B,OAA6B,EAC/DC,YAAY,EACZC,GAAG,EACHC,MAAM,EACNC,UAAU,EACVC,GAAG,EACU;IACb,MAAM,EAAEC,MAAM,EAAE,GAAGD;IAEnB,MAAME,eAAsB;QAC1BC,KAAK;YACH;gBACE,mBAAmB;oBACjBC,QAAQ;gBACV;YACF;SACD;IACH;IAEA,IAAIL,eAAe,cAAc;QAC/BG,aAAaC,GAAG,CAACE,IAAI,CAAC;YACpBC,QAAQ;gBACNF,QAAQP,IAAIU,EAAE;YAChB;QACF;IACF;IAEA,IAAIf,iBAAiBK,MAAM;QACzBK,aAAaC,GAAG,CAACE,IAAI,CAAC;YACpBG,WAAW;gBACTC,cAAcZ,IAAIW,SAAS;YAC7B;QACF;IACF;IAEA,IAAIE;IAEJ,IAAIpB,qBAAqBM,eAAe;QACtCc,sBAAsBhB,wBAAwBE;IAChD;IAEA,MAAMe,mBAA8D;QAClEC,YAAYd,OAAOe,IAAI;QACvBC,QAAQhB,OAAOe,IAAI;QACnBE,OAAO;QACPd;QACAe,YAAY;QACZhB;QACAiB,MAAM;QACNC,OAAO3B,eAAeW,cAAcQ;IACtC;IAEA,IAAIS;IACJ,IAAIpB,eAAe,UAAU;QAC3BoB,cAAc,AAAC,CAAA,MAAMnB,IAAIoB,OAAO,CAACC,EAAE,CAACC,kBAAkB,CAAIX,iBAAgB,EAAGY,IAAI;IACnF,OAAO;QACLJ,cAAc,AAAC,CAAA,MAAMnB,IAAIoB,OAAO,CAACC,EAAE,CAACG,YAAY,CAAIb,iBAAgB,EAAGY,IAAI;IAC7E;IAEA,IAAIE,QAAQN,WAAW,CAAC,EAAE;IAE1B,IAAI,CAACM,OAAO;QACV,OAAO5B;IACT;IAEA4B,QAAQC,KAAKC,KAAK,CAACD,KAAKE,SAAS,CAACH;IAClCA,QAAQhC,uBAAuBgC;IAE/B,oCAAoC;IACpC,IAAI1B,eAAe,YAAY,gBAAgBF,KAAK;QAClD4B,MAAMI,OAAO,CAACC,UAAU,GAAGjC,IAAIiC,UAAU;IAC3C;IAEA,mDAAmD;IACnD,yCAAyC;IACzC,4CAA4C;IAC5C,OAAO;QACLvB,IAAIV,IAAIU,EAAE;QACV,GAAGkB,MAAMI,OAAO;QAChBE,WAAWN,MAAMM,SAAS;QAC1BvB,WAAWiB,MAAMjB,SAAS;IAC5B;AACF;AAEA,eAAeb,4BAA2B"}

package/dist/versions/enforceMaxVersions.d.ts

@@ -1,13 +1,13 @@
 import type { SanitizedCollectionConfig } from '../collections/config/types.js';
 import type { SanitizedGlobalConfig } from '../globals/config/types.js';
-import type { Payload, PayloadRequest } from '../types/index.js';
+import type { Payload, PayloadRequestWithData } from '../types/index.js';
 type Args = {
     collection?: SanitizedCollectionConfig;
     global?: SanitizedGlobalConfig;
     id?: number | string;
     max: number;
     payload: Payload;
-    req?: PayloadRequest;
+    req?: PayloadRequestWithData;
 };
 export declare const enforceMaxVersions: ({ id, collection, global, max, payload, req, }: Args) => Promise<void>;
 export {};

package/dist/versions/enforceMaxVersions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enforceMaxVersions.d.ts","sourceRoot":"","sources":["../../src/versions/enforceMaxVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA;AAC/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAS,MAAM,mBAAmB,CAAA;AAEvE,KAAK,IAAI,GAAG;IACV,UAAU,CAAC,EAAE,yBAAyB,CAAA;IACtC,MAAM,CAAC,EAAE,qBAAqB,CAAA;IAC9B,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,kBAAkB,mDAO5B,IAAI,KAAG,QAAQ,IAAI,CA4DrB,CAAA"}
+{"version":3,"file":"enforceMaxVersions.d.ts","sourceRoot":"","sources":["../../src/versions/enforceMaxVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA;AAC/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,KAAK,EAAE,OAAO,EAAE,sBAAsB,EAAS,MAAM,mBAAmB,CAAA;AAE/E,KAAK,IAAI,GAAG;IACV,UAAU,CAAC,EAAE,yBAAyB,CAAA;IACtC,MAAM,CAAC,EAAE,qBAAqB,CAAA;IAC9B,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,sBAAsB,CAAA;CAC7B,CAAA;AAED,eAAO,MAAM,kBAAkB,mDAO5B,IAAI,KAAG,QAAQ,IAAI,CA4DrB,CAAA"}

package/dist/versions/enforceMaxVersions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/versions/enforceMaxVersions.ts"],"sourcesContent":["import type { SanitizedCollectionConfig } from '../collections/config/types.js'\nimport type { SanitizedGlobalConfig } from '../globals/config/types.js'\nimport type { Payload, PayloadRequest, Where } from '../types/index.js'\n\ntype Args = {\n  collection?: SanitizedCollectionConfig\n  global?: SanitizedGlobalConfig\n  id?: number | string\n  max: number\n  payload: Payload\n  req?: PayloadRequest\n}\n\nexport const enforceMaxVersions = async ({\n  id,\n  collection,\n  global,\n  max,\n  payload,\n  req,\n}: Args): Promise<void> => {\n  const entityType = collection ? 'collection' : 'global'\n  const slug = collection ? collection.slug : global?.slug\n\n  try {\n    const where: Where = {}\n    let oldestAllowedDoc\n\n    if (collection) {\n      where.parent = {\n        equals: id,\n      }\n\n      const query = await payload.db.findVersions({\n        collection: collection.slug,\n        pagination: false,\n        req,\n        skip: max,\n        sort: '-updatedAt',\n        where,\n      })\n\n      ;[oldestAllowedDoc] = query.docs\n    } else if (global) {\n      const query = await payload.db.findGlobalVersions({\n        global: global.slug,\n        pagination: false,\n        req,\n        skip: max,\n        sort: '-updatedAt',\n        where,\n      })\n\n      ;[oldestAllowedDoc] = query.docs\n    }\n\n    if (oldestAllowedDoc?.updatedAt) {\n      const deleteQuery: Where = {\n        updatedAt: {\n          less_than_equal: oldestAllowedDoc.updatedAt,\n        },\n      }\n\n      if (collection) {\n        deleteQuery.parent = {\n          equals: id,\n        }\n      }\n\n      await payload.db.deleteVersions({\n        collection: collection?.slug,\n        req,\n        where: deleteQuery,\n      })\n    }\n  } catch (err) {\n    payload.logger.error(\n      `There was an error cleaning up old versions for the ${entityType} ${slug}`,\n    )\n  }\n}\n"],"names":["enforceMaxVersions","id","collection","global","max","payload","req","entityType","slug","where","oldestAllowedDoc","parent","equals","query","db","findVersions","pagination","skip","sort","docs","findGlobalVersions","updatedAt","deleteQuery","less_than_equal","deleteVersions","err","logger","error"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAaA,OAAO,MAAMA,qBAAqB,OAAO,EACvCC,EAAE,EACFC,UAAU,EACVC,MAAM,EACNC,GAAG,EACHC,OAAO,EACPC,GAAG,EACE;IACL,MAAMC,aAAaL,aAAa,eAAe;IAC/C,MAAMM,OAAON,aAAaA,WAAWM,IAAI,GAAGL,QAAQK;IAEpD,IAAI;QACF,MAAMC,QAAe,CAAC;QACtB,IAAIC;QAEJ,IAAIR,YAAY;YACdO,MAAME,MAAM,GAAG;gBACbC,QAAQX;YACV;YAEA,MAAMY,QAAQ,MAAMR,QAAQS,EAAE,CAACC,YAAY,CAAC;gBAC1Cb,YAAYA,WAAWM,IAAI;gBAC3BQ,YAAY;gBACZV;gBACAW,MAAMb;gBACNc,MAAM;gBACNT;YACF;YAEC,CAACC,iBAAiB,GAAGG,MAAMM,IAAI;QAClC,OAAO,IAAIhB,QAAQ;YACjB,MAAMU,QAAQ,MAAMR,QAAQS,EAAE,CAACM,kBAAkB,CAAC;gBAChDjB,QAAQA,OAAOK,IAAI;gBACnBQ,YAAY;gBACZV;gBACAW,MAAMb;gBACNc,MAAM;gBACNT;YACF;YAEC,CAACC,iBAAiB,GAAGG,MAAMM,IAAI;QAClC;QAEA,IAAIT,kBAAkBW,WAAW;YAC/B,MAAMC,cAAqB;gBACzBD,WAAW;oBACTE,iBAAiBb,iBAAiBW,SAAS;gBAC7C;YACF;YAEA,IAAInB,YAAY;gBACdoB,YAAYX,MAAM,GAAG;oBACnBC,QAAQX;gBACV;YACF;YAEA,MAAMI,QAAQS,EAAE,CAACU,cAAc,CAAC;gBAC9BtB,YAAYA,YAAYM;gBACxBF;gBACAG,OAAOa;YACT;QACF;IACF,EAAE,OAAOG,KAAK;QACZpB,QAAQqB,MAAM,CAACC,KAAK,CAClB,CAAC,oDAAoD,EAAEpB,WAAW,CAAC,EAAEC,KAAK,CAAC;IAE/E;AACF,EAAC"}
+{"version":3,"sources":["../../src/versions/enforceMaxVersions.ts"],"sourcesContent":["import type { SanitizedCollectionConfig } from '../collections/config/types.js'\nimport type { SanitizedGlobalConfig } from '../globals/config/types.js'\nimport type { Payload, PayloadRequestWithData, Where } from '../types/index.js'\n\ntype Args = {\n  collection?: SanitizedCollectionConfig\n  global?: SanitizedGlobalConfig\n  id?: number | string\n  max: number\n  payload: Payload\n  req?: PayloadRequestWithData\n}\n\nexport const enforceMaxVersions = async ({\n  id,\n  collection,\n  global,\n  max,\n  payload,\n  req,\n}: Args): Promise<void> => {\n  const entityType = collection ? 'collection' : 'global'\n  const slug = collection ? collection.slug : global?.slug\n\n  try {\n    const where: Where = {}\n    let oldestAllowedDoc\n\n    if (collection) {\n      where.parent = {\n        equals: id,\n      }\n\n      const query = await payload.db.findVersions({\n        collection: collection.slug,\n        pagination: false,\n        req,\n        skip: max,\n        sort: '-updatedAt',\n        where,\n      })\n\n      ;[oldestAllowedDoc] = query.docs\n    } else if (global) {\n      const query = await payload.db.findGlobalVersions({\n        global: global.slug,\n        pagination: false,\n        req,\n        skip: max,\n        sort: '-updatedAt',\n        where,\n      })\n\n      ;[oldestAllowedDoc] = query.docs\n    }\n\n    if (oldestAllowedDoc?.updatedAt) {\n      const deleteQuery: Where = {\n        updatedAt: {\n          less_than_equal: oldestAllowedDoc.updatedAt,\n        },\n      }\n\n      if (collection) {\n        deleteQuery.parent = {\n          equals: id,\n        }\n      }\n\n      await payload.db.deleteVersions({\n        collection: collection?.slug,\n        req,\n        where: deleteQuery,\n      })\n    }\n  } catch (err) {\n    payload.logger.error(\n      `There was an error cleaning up old versions for the ${entityType} ${slug}`,\n    )\n  }\n}\n"],"names":["enforceMaxVersions","id","collection","global","max","payload","req","entityType","slug","where","oldestAllowedDoc","parent","equals","query","db","findVersions","pagination","skip","sort","docs","findGlobalVersions","updatedAt","deleteQuery","less_than_equal","deleteVersions","err","logger","error"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAaA,OAAO,MAAMA,qBAAqB,OAAO,EACvCC,EAAE,EACFC,UAAU,EACVC,MAAM,EACNC,GAAG,EACHC,OAAO,EACPC,GAAG,EACE;IACL,MAAMC,aAAaL,aAAa,eAAe;IAC/C,MAAMM,OAAON,aAAaA,WAAWM,IAAI,GAAGL,QAAQK;IAEpD,IAAI;QACF,MAAMC,QAAe,CAAC;QACtB,IAAIC;QAEJ,IAAIR,YAAY;YACdO,MAAME,MAAM,GAAG;gBACbC,QAAQX;YACV;YAEA,MAAMY,QAAQ,MAAMR,QAAQS,EAAE,CAACC,YAAY,CAAC;gBAC1Cb,YAAYA,WAAWM,IAAI;gBAC3BQ,YAAY;gBACZV;gBACAW,MAAMb;gBACNc,MAAM;gBACNT;YACF;YAEC,CAACC,iBAAiB,GAAGG,MAAMM,IAAI;QAClC,OAAO,IAAIhB,QAAQ;YACjB,MAAMU,QAAQ,MAAMR,QAAQS,EAAE,CAACM,kBAAkB,CAAC;gBAChDjB,QAAQA,OAAOK,IAAI;gBACnBQ,YAAY;gBACZV;gBACAW,MAAMb;gBACNc,MAAM;gBACNT;YACF;YAEC,CAACC,iBAAiB,GAAGG,MAAMM,IAAI;QAClC;QAEA,IAAIT,kBAAkBW,WAAW;YAC/B,MAAMC,cAAqB;gBACzBD,WAAW;oBACTE,iBAAiBb,iBAAiBW,SAAS;gBAC7C;YACF;YAEA,IAAInB,YAAY;gBACdoB,YAAYX,MAAM,GAAG;oBACnBC,QAAQX;gBACV;YACF;YAEA,MAAMI,QAAQS,EAAE,CAACU,cAAc,CAAC;gBAC9BtB,YAAYA,YAAYM;gBACxBF;gBACAG,OAAOa;YACT;QACF;IACF,EAAE,OAAOG,KAAK;QACZpB,QAAQqB,MAAM,CAACC,KAAK,CAClB,CAAC,oDAAoD,EAAEpB,WAAW,CAAC,EAAEC,KAAK,CAAC;IAE/E;AACF,EAAC"}

package/dist/versions/getLatestCollectionVersion.d.ts

@@ -1,12 +1,12 @@
 import type { SanitizedCollectionConfig, TypeWithID } from '../collections/config/types.js';
 import type { FindOneArgs } from '../database/types.js';
-import type { Payload, PayloadRequest } from '../types/index.js';
+import type { Payload, PayloadRequestWithData } from '../types/index.js';
 type Args = {
     config: SanitizedCollectionConfig;
     id: number | string;
     payload: Payload;
     query: FindOneArgs;
-    req?: PayloadRequest;
+    req?: PayloadRequestWithData;
 };
 export declare const getLatestCollectionVersion: <T extends TypeWithID = any>({ id, config, payload, query, req, }: Args) => Promise<T>;
 export {};

package/dist/versions/getLatestCollectionVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getLatestCollectionVersion.d.ts","sourceRoot":"","sources":["../../src/versions/getLatestCollectionVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAC3F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAKhE,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,yBAAyB,CAAA;IACjC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,WAAW,CAAA;IAClB,GAAG,CAAC,EAAE,cAAc,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,0BAA0B,qEAMpC,IAAI,KAAG,QAAQ,CAAC,CA2BlB,CAAA"}
+{"version":3,"file":"getLatestCollectionVersion.d.ts","sourceRoot":"","sources":["../../src/versions/getLatestCollectionVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAC3F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAKxE,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,yBAAyB,CAAA;IACjC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,WAAW,CAAA;IAClB,GAAG,CAAC,EAAE,sBAAsB,CAAA;CAC7B,CAAA;AAED,eAAO,MAAM,0BAA0B,qEAMpC,IAAI,KAAG,QAAQ,CAAC,CA2BlB,CAAA"}

package/dist/versions/getLatestCollectionVersion.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/versions/getLatestCollectionVersion.ts"],"sourcesContent":["import type { SanitizedCollectionConfig, TypeWithID } from '../collections/config/types.js'\nimport type { FindOneArgs } from '../database/types.js'\nimport type { Payload, PayloadRequest } from '../types/index.js'\nimport type { TypeWithVersion } from './types.js'\n\nimport { docHasTimestamps } from '../types/index.js'\n\ntype Args = {\n  config: SanitizedCollectionConfig\n  id: number | string\n  payload: Payload\n  query: FindOneArgs\n  req?: PayloadRequest\n}\n\nexport const getLatestCollectionVersion = async <T extends TypeWithID = any>({\n  id,\n  config,\n  payload,\n  query,\n  req,\n}: Args): Promise<T> => {\n  let latestVersion: TypeWithVersion<T>\n\n  if (config.versions?.drafts) {\n    const { docs } = await payload.db.findVersions<T>({\n      collection: config.slug,\n      limit: 1,\n      pagination: false,\n      req,\n      sort: '-updatedAt',\n      where: { parent: { equals: id } },\n    })\n    ;[latestVersion] = docs\n  }\n\n  const doc = await payload.db.findOne<T>({ ...query, req })\n\n  if (!latestVersion || (docHasTimestamps(doc) && latestVersion.updatedAt < doc.updatedAt)) {\n    return doc\n  }\n\n  return {\n    ...latestVersion.version,\n    id,\n    createdAt: latestVersion.createdAt,\n    updatedAt: latestVersion.updatedAt,\n  }\n}\n"],"names":["docHasTimestamps","getLatestCollectionVersion","id","config","payload","query","req","latestVersion","versions","drafts","docs","db","findVersions","collection","slug","limit","pagination","sort","where","parent","equals","doc","findOne","updatedAt","version","createdAt"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAKA,SAASA,gBAAgB,QAAQ,oBAAmB;AAUpD,OAAO,MAAMC,6BAA6B,OAAmC,EAC3EC,EAAE,EACFC,MAAM,EACNC,OAAO,EACPC,KAAK,EACLC,GAAG,EACE;IACL,IAAIC;IAEJ,IAAIJ,OAAOK,QAAQ,EAAEC,QAAQ;QAC3B,MAAM,EAAEC,IAAI,EAAE,GAAG,MAAMN,QAAQO,EAAE,CAACC,YAAY,CAAI;YAChDC,YAAYV,OAAOW,IAAI;YACvBC,OAAO;YACPC,YAAY;YACZV;YACAW,MAAM;YACNC,OAAO;gBAAEC,QAAQ;oBAAEC,QAAQlB;gBAAG;YAAE;QAClC;QACC,CAACK,cAAc,GAAGG;IACrB;IAEA,MAAMW,MAAM,MAAMjB,QAAQO,EAAE,CAACW,OAAO,CAAI;QAAE,GAAGjB,KAAK;QAAEC;IAAI;IAExD,IAAI,CAACC,iBAAkBP,iBAAiBqB,QAAQd,cAAcgB,SAAS,GAAGF,IAAIE,SAAS,EAAG;QACxF,OAAOF;IACT;IAEA,OAAO;QACL,GAAGd,cAAciB,OAAO;QACxBtB;QACAuB,WAAWlB,cAAckB,SAAS;QAClCF,WAAWhB,cAAcgB,SAAS;IACpC;AACF,EAAC"}
+{"version":3,"sources":["../../src/versions/getLatestCollectionVersion.ts"],"sourcesContent":["import type { SanitizedCollectionConfig, TypeWithID } from '../collections/config/types.js'\nimport type { FindOneArgs } from '../database/types.js'\nimport type { Payload, PayloadRequestWithData } from '../types/index.js'\nimport type { TypeWithVersion } from './types.js'\n\nimport { docHasTimestamps } from '../types/index.js'\n\ntype Args = {\n  config: SanitizedCollectionConfig\n  id: number | string\n  payload: Payload\n  query: FindOneArgs\n  req?: PayloadRequestWithData\n}\n\nexport const getLatestCollectionVersion = async <T extends TypeWithID = any>({\n  id,\n  config,\n  payload,\n  query,\n  req,\n}: Args): Promise<T> => {\n  let latestVersion: TypeWithVersion<T>\n\n  if (config.versions?.drafts) {\n    const { docs } = await payload.db.findVersions<T>({\n      collection: config.slug,\n      limit: 1,\n      pagination: false,\n      req,\n      sort: '-updatedAt',\n      where: { parent: { equals: id } },\n    })\n    ;[latestVersion] = docs\n  }\n\n  const doc = await payload.db.findOne<T>({ ...query, req })\n\n  if (!latestVersion || (docHasTimestamps(doc) && latestVersion.updatedAt < doc.updatedAt)) {\n    return doc\n  }\n\n  return {\n    ...latestVersion.version,\n    id,\n    createdAt: latestVersion.createdAt,\n    updatedAt: latestVersion.updatedAt,\n  }\n}\n"],"names":["docHasTimestamps","getLatestCollectionVersion","id","config","payload","query","req","latestVersion","versions","drafts","docs","db","findVersions","collection","slug","limit","pagination","sort","where","parent","equals","doc","findOne","updatedAt","version","createdAt"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAKA,SAASA,gBAAgB,QAAQ,oBAAmB;AAUpD,OAAO,MAAMC,6BAA6B,OAAmC,EAC3EC,EAAE,EACFC,MAAM,EACNC,OAAO,EACPC,KAAK,EACLC,GAAG,EACE;IACL,IAAIC;IAEJ,IAAIJ,OAAOK,QAAQ,EAAEC,QAAQ;QAC3B,MAAM,EAAEC,IAAI,EAAE,GAAG,MAAMN,QAAQO,EAAE,CAACC,YAAY,CAAI;YAChDC,YAAYV,OAAOW,IAAI;YACvBC,OAAO;YACPC,YAAY;YACZV;YACAW,MAAM;YACNC,OAAO;gBAAEC,QAAQ;oBAAEC,QAAQlB;gBAAG;YAAE;QAClC;QACC,CAACK,cAAc,GAAGG;IACrB;IAEA,MAAMW,MAAM,MAAMjB,QAAQO,EAAE,CAACW,OAAO,CAAI;QAAE,GAAGjB,KAAK;QAAEC;IAAI;IAExD,IAAI,CAACC,iBAAkBP,iBAAiBqB,QAAQd,cAAcgB,SAAS,GAAGF,IAAIE,SAAS,EAAG;QACxF,OAAOF;IACT;IAEA,OAAO;QACL,GAAGd,cAAciB,OAAO;QACxBtB;QACAuB,WAAWlB,cAAckB,SAAS;QAClCF,WAAWhB,cAAcgB,SAAS;IACpC;AACF,EAAC"}

package/dist/versions/getLatestGlobalVersion.d.ts

@@ -1,10 +1,10 @@
 import type { SanitizedGlobalConfig } from '../globals/config/types.js';
-import type { Document, Payload, PayloadRequest, Where } from '../types/index.js';
+import type { Document, Payload, PayloadRequestWithData, Where } from '../types/index.js';
 type Args = {
     config: SanitizedGlobalConfig;
     locale?: string;
     payload: Payload;
-    req?: PayloadRequest;
+    req?: PayloadRequestWithData;
     slug: string;
     where: Where;
 };

package/dist/versions/getLatestGlobalVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getLatestGlobalVersion.d.ts","sourceRoot":"","sources":["../../src/versions/getLatestGlobalVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAIjF,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,eAAO,MAAM,sBAAsB,mDAOhC,IAAI,KAAG,QAAQ;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,YAAY,EAAE,OAAO,CAAA;CAAE,CAwC5D,CAAA"}
+{"version":3,"file":"getLatestGlobalVersion.d.ts","sourceRoot":"","sources":["../../src/versions/getLatestGlobalVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,sBAAsB,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAIzF,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,sBAAsB,CAAA;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,eAAO,MAAM,sBAAsB,mDAOhC,IAAI,KAAG,QAAQ;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,YAAY,EAAE,OAAO,CAAA;CAAE,CAwC5D,CAAA"}

package/dist/versions/getLatestGlobalVersion.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/versions/getLatestGlobalVersion.ts"],"sourcesContent":["import type { SanitizedGlobalConfig } from '../globals/config/types.js'\nimport type { Document, Payload, PayloadRequest, Where } from '../types/index.js'\n\nimport { docHasTimestamps } from '../types/index.js'\n\ntype Args = {\n  config: SanitizedGlobalConfig\n  locale?: string\n  payload: Payload\n  req?: PayloadRequest\n  slug: string\n  where: Where\n}\n\nexport const getLatestGlobalVersion = async ({\n  slug,\n  config,\n  locale,\n  payload,\n  req,\n  where,\n}: Args): Promise<{ global: Document; globalExists: boolean }> => {\n  let latestVersion\n\n  if (config.versions?.drafts) {\n    // eslint-disable-next-line prefer-destructuring\n    latestVersion = (\n      await payload.db.findGlobalVersions({\n        global: slug,\n        limit: 1,\n        locale,\n        pagination: false,\n        req,\n        sort: '-updatedAt',\n      })\n    ).docs[0]\n  }\n\n  const global = await payload.db.findGlobal({\n    slug,\n    locale,\n    req,\n    where,\n  })\n  const globalExists = Boolean(global)\n\n  if (!latestVersion || (docHasTimestamps(global) && latestVersion.updatedAt < global.updatedAt)) {\n    return {\n      global,\n      globalExists,\n    }\n  }\n\n  return {\n    global: {\n      ...latestVersion.version,\n      createdAt: latestVersion.createdAt,\n      updatedAt: latestVersion.updatedAt,\n    },\n    globalExists,\n  }\n}\n"],"names":["docHasTimestamps","getLatestGlobalVersion","slug","config","locale","payload","req","where","latestVersion","versions","drafts","db","findGlobalVersions","global","limit","pagination","sort","docs","findGlobal","globalExists","Boolean","updatedAt","version","createdAt"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAGA,SAASA,gBAAgB,QAAQ,oBAAmB;AAWpD,OAAO,MAAMC,yBAAyB,OAAO,EAC3CC,IAAI,EACJC,MAAM,EACNC,MAAM,EACNC,OAAO,EACPC,GAAG,EACHC,KAAK,EACA;IACL,IAAIC;IAEJ,IAAIL,OAAOM,QAAQ,EAAEC,QAAQ;QAC3B,gDAAgD;QAChDF,gBAAgB,AACd,CAAA,MAAMH,QAAQM,EAAE,CAACC,kBAAkB,CAAC;YAClCC,QAAQX;YACRY,OAAO;YACPV;YACAW,YAAY;YACZT;YACAU,MAAM;QACR,EAAC,EACDC,IAAI,CAAC,EAAE;IACX;IAEA,MAAMJ,SAAS,MAAMR,QAAQM,EAAE,CAACO,UAAU,CAAC;QACzChB;QACAE;QACAE;QACAC;IACF;IACA,MAAMY,eAAeC,QAAQP;IAE7B,IAAI,CAACL,iBAAkBR,iBAAiBa,WAAWL,cAAca,SAAS,GAAGR,OAAOQ,SAAS,EAAG;QAC9F,OAAO;YACLR;YACAM;QACF;IACF;IAEA,OAAO;QACLN,QAAQ;YACN,GAAGL,cAAcc,OAAO;YACxBC,WAAWf,cAAce,SAAS;YAClCF,WAAWb,cAAca,SAAS;QACpC;QACAF;IACF;AACF,EAAC"}
+{"version":3,"sources":["../../src/versions/getLatestGlobalVersion.ts"],"sourcesContent":["import type { SanitizedGlobalConfig } from '../globals/config/types.js'\nimport type { Document, Payload, PayloadRequestWithData, Where } from '../types/index.js'\n\nimport { docHasTimestamps } from '../types/index.js'\n\ntype Args = {\n  config: SanitizedGlobalConfig\n  locale?: string\n  payload: Payload\n  req?: PayloadRequestWithData\n  slug: string\n  where: Where\n}\n\nexport const getLatestGlobalVersion = async ({\n  slug,\n  config,\n  locale,\n  payload,\n  req,\n  where,\n}: Args): Promise<{ global: Document; globalExists: boolean }> => {\n  let latestVersion\n\n  if (config.versions?.drafts) {\n    // eslint-disable-next-line prefer-destructuring\n    latestVersion = (\n      await payload.db.findGlobalVersions({\n        global: slug,\n        limit: 1,\n        locale,\n        pagination: false,\n        req,\n        sort: '-updatedAt',\n      })\n    ).docs[0]\n  }\n\n  const global = await payload.db.findGlobal({\n    slug,\n    locale,\n    req,\n    where,\n  })\n  const globalExists = Boolean(global)\n\n  if (!latestVersion || (docHasTimestamps(global) && latestVersion.updatedAt < global.updatedAt)) {\n    return {\n      global,\n      globalExists,\n    }\n  }\n\n  return {\n    global: {\n      ...latestVersion.version,\n      createdAt: latestVersion.createdAt,\n      updatedAt: latestVersion.updatedAt,\n    },\n    globalExists,\n  }\n}\n"],"names":["docHasTimestamps","getLatestGlobalVersion","slug","config","locale","payload","req","where","latestVersion","versions","drafts","db","findGlobalVersions","global","limit","pagination","sort","docs","findGlobal","globalExists","Boolean","updatedAt","version","createdAt"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAGA,SAASA,gBAAgB,QAAQ,oBAAmB;AAWpD,OAAO,MAAMC,yBAAyB,OAAO,EAC3CC,IAAI,EACJC,MAAM,EACNC,MAAM,EACNC,OAAO,EACPC,GAAG,EACHC,KAAK,EACA;IACL,IAAIC;IAEJ,IAAIL,OAAOM,QAAQ,EAAEC,QAAQ;QAC3B,gDAAgD;QAChDF,gBAAgB,AACd,CAAA,MAAMH,QAAQM,EAAE,CAACC,kBAAkB,CAAC;YAClCC,QAAQX;YACRY,OAAO;YACPV;YACAW,YAAY;YACZT;YACAU,MAAM;QACR,EAAC,EACDC,IAAI,CAAC,EAAE;IACX;IAEA,MAAMJ,SAAS,MAAMR,QAAQM,EAAE,CAACO,UAAU,CAAC;QACzChB;QACAE;QACAE;QACAC;IACF;IACA,MAAMY,eAAeC,QAAQP;IAE7B,IAAI,CAACL,iBAAkBR,iBAAiBa,WAAWL,cAAca,SAAS,GAAGR,OAAOQ,SAAS,EAAG;QAC9F,OAAO;YACLR;YACAM;QACF;IACF;IAEA,OAAO;QACLN,QAAQ;YACN,GAAGL,cAAcc,OAAO;YACxBC,WAAWf,cAAce,SAAS;YAClCF,WAAWb,cAAca,SAAS;QACpC;QACAF;IACF;AACF,EAAC"}

package/dist/versions/saveVersion.d.ts

@@ -1,7 +1,7 @@
 import type { SanitizedCollectionConfig, TypeWithID } from '../collections/config/types.js';
 import type { SanitizedGlobalConfig } from '../globals/config/types.js';
 import type { Payload } from '../index.js';
-import type { PayloadRequest } from '../types/index.js';
+import type { PayloadRequestWithData } from '../types/index.js';
 type Args = {
     autosave?: boolean;
     collection?: SanitizedCollectionConfig;
@@ -10,7 +10,7 @@ type Args = {
     global?: SanitizedGlobalConfig;
     id?: number | string;
     payload: Payload;
-    req?: PayloadRequest;
+    req?: PayloadRequestWithData;
 };
 export declare const saveVersion: ({ id, autosave, collection, docWithLocales: doc, draft, global, payload, req, }: Args) => Promise<TypeWithID>;
 export {};

package/dist/versions/saveVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"saveVersion.d.ts","sourceRoot":"","sources":["../../src/versions/saveVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAC3F,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAMvD,KAAK,IAAI,GAAG;IACV,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,UAAU,CAAC,EAAE,yBAAyB,CAAA;IACtC,cAAc,EAAE,GAAG,CAAA;IACnB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,MAAM,CAAC,EAAE,qBAAqB,CAAA;IAC9B,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,WAAW,oFASrB,IAAI,KAAG,QAAQ,UAAU,CAkI3B,CAAA"}
+{"version":3,"file":"saveVersion.d.ts","sourceRoot":"","sources":["../../src/versions/saveVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAC3F,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAM/D,KAAK,IAAI,GAAG;IACV,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,UAAU,CAAC,EAAE,yBAAyB,CAAA;IACtC,cAAc,EAAE,GAAG,CAAA;IACnB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,MAAM,CAAC,EAAE,qBAAqB,CAAA;IAC9B,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,sBAAsB,CAAA;CAC7B,CAAA;AAED,eAAO,MAAM,WAAW,oFASrB,IAAI,KAAG,QAAQ,UAAU,CAkI3B,CAAA"}

package/dist/versions/saveVersion.js

@@ -112,7 +112,7 @@ export const saveVersion = async ({ id, autosave, collection, docWithLocales: do
     createdVersion.createdAt = result.createdAt;
     createdVersion.updatedAt = result.updatedAt;
     createdVersion = sanitizeInternalFields(createdVersion);
-    createdVersion.id = id;
+    createdVersion.id = result.parent;
     return createdVersion;
 };
 

package/dist/versions/saveVersion.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/versions/saveVersion.ts"],"sourcesContent":["import type { SanitizedCollectionConfig, TypeWithID } from '../collections/config/types.js'\nimport type { SanitizedGlobalConfig } from '../globals/config/types.js'\nimport type { Payload } from '../index.js'\nimport type { PayloadRequest } from '../types/index.js'\n\nimport { deepCopyObject } from '../utilities/deepCopyObject.js'\nimport sanitizeInternalFields from '../utilities/sanitizeInternalFields.js'\nimport { enforceMaxVersions } from './enforceMaxVersions.js'\n\ntype Args = {\n  autosave?: boolean\n  collection?: SanitizedCollectionConfig\n  docWithLocales: any\n  draft?: boolean\n  global?: SanitizedGlobalConfig\n  id?: number | string\n  payload: Payload\n  req?: PayloadRequest\n}\n\nexport const saveVersion = async ({\n  id,\n  autosave,\n  collection,\n  docWithLocales: doc,\n  draft,\n  global,\n  payload,\n  req,\n}: Args): Promise<TypeWithID> => {\n  let result\n  let createNewVersion = true\n  const now = new Date().toISOString()\n  const versionData = deepCopyObject(doc)\n  if (draft) versionData._status = 'draft'\n  if (versionData._id) delete versionData._id\n\n  try {\n    if (autosave) {\n      let docs\n      const findVersionArgs = {\n        limit: 1,\n        pagination: false,\n        req,\n        sort: '-updatedAt',\n      }\n      if (collection) {\n        ;({ docs } = await payload.db.findVersions({\n          ...findVersionArgs,\n          collection: collection.slug,\n          req,\n          where: {\n            parent: {\n              equals: id,\n            },\n          },\n        }))\n      } else {\n        ;({ docs } = await payload.db.findGlobalVersions({\n          ...findVersionArgs,\n          global: global.slug,\n          req,\n        }))\n      }\n      const [latestVersion] = docs\n\n      // overwrite the latest version if it's set to autosave\n      if (latestVersion?.autosave === true) {\n        createNewVersion = false\n\n        const data: Record<string, unknown> = {\n          createdAt: new Date(latestVersion.createdAt).toISOString(),\n          updatedAt: draft ? now : new Date(doc.updatedAt).toISOString(),\n          version: versionData,\n        }\n\n        const updateVersionArgs = {\n          id: latestVersion.id,\n          req,\n          versionData: data as TypeWithID,\n        }\n\n        if (collection) {\n          result = await payload.db.updateVersion({\n            ...updateVersionArgs,\n            collection: collection.slug,\n            req,\n          })\n        } else {\n          result = await payload.db.updateGlobalVersion({\n            ...updateVersionArgs,\n            global: global.slug,\n            req,\n          })\n        }\n      }\n    }\n\n    if (createNewVersion) {\n      if (collection) {\n        result = await payload.db.createVersion({\n          autosave: Boolean(autosave),\n          collectionSlug: collection.slug,\n          createdAt: doc?.createdAt ? new Date(doc.createdAt).toISOString() : now,\n          parent: collection ? id : undefined,\n          req,\n          updatedAt: draft ? now : new Date(doc.updatedAt).toISOString(),\n          versionData,\n        })\n      }\n\n      if (global) {\n        result = await payload.db.createGlobalVersion({\n          autosave: Boolean(autosave),\n          createdAt: doc?.createdAt ? new Date(doc.createdAt).toISOString() : now,\n          globalSlug: global.slug,\n          parent: collection ? id : undefined,\n          req,\n          updatedAt: draft ? now : new Date(doc.updatedAt).toISOString(),\n          versionData,\n        })\n      }\n    }\n  } catch (err) {\n    let errorMessage: string\n\n    if (collection)\n      errorMessage = `There was an error while saving a version for the ${collection.labels.singular} with ID ${id}.`\n    if (global)\n      errorMessage = `There was an error while saving a version for the global ${global.label}.`\n    payload.logger.error(errorMessage)\n    payload.logger.error(err)\n  }\n\n  let max = 100\n\n  if (collection && typeof collection.versions.maxPerDoc === 'number')\n    max = collection.versions.maxPerDoc\n  if (global && typeof global.versions.max === 'number') max = global.versions.max\n\n  if (createNewVersion && max > 0) {\n    await enforceMaxVersions({\n      id,\n      collection,\n      global,\n      max,\n      payload,\n      req,\n    })\n  }\n\n  let createdVersion = result.version\n  createdVersion.createdAt = result.createdAt\n  createdVersion.updatedAt = result.updatedAt\n\n  createdVersion = sanitizeInternalFields(createdVersion)\n  createdVersion.id = id\n\n  return createdVersion\n}\n"],"names":["deepCopyObject","sanitizeInternalFields","enforceMaxVersions","saveVersion","id","autosave","collection","docWithLocales","doc","draft","global","payload","req","result","createNewVersion","now","Date","toISOString","versionData","_status","_id","docs","findVersionArgs","limit","pagination","sort","db","findVersions","slug","where","parent","equals","findGlobalVersions","latestVersion","data","createdAt","updatedAt","version","updateVersionArgs","updateVersion","updateGlobalVersion","createVersion","Boolean","collectionSlug","undefined","createGlobalVersion","globalSlug","err","errorMessage","labels","singular","label","logger","error","max","versions","maxPerDoc","createdVersion"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../src/versions/saveVersion.ts"],"sourcesContent":["import type { SanitizedCollectionConfig, TypeWithID } from '../collections/config/types.js'\nimport type { SanitizedGlobalConfig } from '../globals/config/types.js'\nimport type { Payload } from '../index.js'\nimport type { PayloadRequestWithData } from '../types/index.js'\n\nimport { deepCopyObject } from '../utilities/deepCopyObject.js'\nimport sanitizeInternalFields from '../utilities/sanitizeInternalFields.js'\nimport { enforceMaxVersions } from './enforceMaxVersions.js'\n\ntype Args = {\n  autosave?: boolean\n  collection?: SanitizedCollectionConfig\n  docWithLocales: any\n  draft?: boolean\n  global?: SanitizedGlobalConfig\n  id?: number | string\n  payload: Payload\n  req?: PayloadRequestWithData\n}\n\nexport const saveVersion = async ({\n  id,\n  autosave,\n  collection,\n  docWithLocales: doc,\n  draft,\n  global,\n  payload,\n  req,\n}: Args): Promise<TypeWithID> => {\n  let result\n  let createNewVersion = true\n  const now = new Date().toISOString()\n  const versionData = deepCopyObject(doc)\n  if (draft) versionData._status = 'draft'\n  if (versionData._id) delete versionData._id\n\n  try {\n    if (autosave) {\n      let docs\n      const findVersionArgs = {\n        limit: 1,\n        pagination: false,\n        req,\n        sort: '-updatedAt',\n      }\n      if (collection) {\n        ;({ docs } = await payload.db.findVersions({\n          ...findVersionArgs,\n          collection: collection.slug,\n          req,\n          where: {\n            parent: {\n              equals: id,\n            },\n          },\n        }))\n      } else {\n        ;({ docs } = await payload.db.findGlobalVersions({\n          ...findVersionArgs,\n          global: global.slug,\n          req,\n        }))\n      }\n      const [latestVersion] = docs\n\n      // overwrite the latest version if it's set to autosave\n      if (latestVersion?.autosave === true) {\n        createNewVersion = false\n\n        const data: Record<string, unknown> = {\n          createdAt: new Date(latestVersion.createdAt).toISOString(),\n          updatedAt: draft ? now : new Date(doc.updatedAt).toISOString(),\n          version: versionData,\n        }\n\n        const updateVersionArgs = {\n          id: latestVersion.id,\n          req,\n          versionData: data as TypeWithID,\n        }\n\n        if (collection) {\n          result = await payload.db.updateVersion({\n            ...updateVersionArgs,\n            collection: collection.slug,\n            req,\n          })\n        } else {\n          result = await payload.db.updateGlobalVersion({\n            ...updateVersionArgs,\n            global: global.slug,\n            req,\n          })\n        }\n      }\n    }\n\n    if (createNewVersion) {\n      if (collection) {\n        result = await payload.db.createVersion({\n          autosave: Boolean(autosave),\n          collectionSlug: collection.slug,\n          createdAt: doc?.createdAt ? new Date(doc.createdAt).toISOString() : now,\n          parent: collection ? id : undefined,\n          req,\n          updatedAt: draft ? now : new Date(doc.updatedAt).toISOString(),\n          versionData,\n        })\n      }\n\n      if (global) {\n        result = await payload.db.createGlobalVersion({\n          autosave: Boolean(autosave),\n          createdAt: doc?.createdAt ? new Date(doc.createdAt).toISOString() : now,\n          globalSlug: global.slug,\n          parent: collection ? id : undefined,\n          req,\n          updatedAt: draft ? now : new Date(doc.updatedAt).toISOString(),\n          versionData,\n        })\n      }\n    }\n  } catch (err) {\n    let errorMessage: string\n\n    if (collection)\n      errorMessage = `There was an error while saving a version for the ${collection.labels.singular} with ID ${id}.`\n    if (global)\n      errorMessage = `There was an error while saving a version for the global ${global.label}.`\n    payload.logger.error(errorMessage)\n    payload.logger.error(err)\n  }\n\n  let max = 100\n\n  if (collection && typeof collection.versions.maxPerDoc === 'number')\n    max = collection.versions.maxPerDoc\n  if (global && typeof global.versions.max === 'number') max = global.versions.max\n\n  if (createNewVersion && max > 0) {\n    await enforceMaxVersions({\n      id,\n      collection,\n      global,\n      max,\n      payload,\n      req,\n    })\n  }\n\n  let createdVersion = result.version\n  createdVersion.createdAt = result.createdAt\n  createdVersion.updatedAt = result.updatedAt\n\n  createdVersion = sanitizeInternalFields(createdVersion)\n  createdVersion.id = result.parent\n\n  return createdVersion\n}\n"],"names":["deepCopyObject","sanitizeInternalFields","enforceMaxVersions","saveVersion","id","autosave","collection","docWithLocales","doc","draft","global","payload","req","result","createNewVersion","now","Date","toISOString","versionData","_status","_id","docs","findVersionArgs","limit","pagination","sort","db","findVersions","slug","where","parent","equals","findGlobalVersions","latestVersion","data","createdAt","updatedAt","version","updateVersionArgs","updateVersion","updateGlobalVersion","createVersion","Boolean","collectionSlug","undefined","createGlobalVersion","globalSlug","err","errorMessage","labels","singular","label","logger","error","max","versions","maxPerDoc","createdVersion"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}