payload 3.0.0-beta.11 → 3.0.0-beta.111

package/dist/versions/buildCollectionFields.js

@@ -1,4 +1,5 @@
-export const buildVersionCollectionFields = (collection)=>{
+import { versionSnapshotField } from './baseFields.js';
+export const buildVersionCollectionFields = (config, collection)=>{
     const fields = [
         {
             name: 'parent',
@@ -29,6 +30,24 @@ export const buildVersionCollectionFields = (collection)=>{
         }
     ];
     if (collection?.versions?.drafts) {
+        if (config.localization) {
+            fields.push(versionSnapshotField);
+            fields.push({
+                name: 'publishedLocale',
+                type: 'select',
+                admin: {
+                    disableBulkEdit: true,
+                    disabled: true
+                },
+                index: true,
+                options: config.localization.locales.map((locale)=>{
+                    if (typeof locale === 'string') {
+                        return locale;
+                    }
+                    return locale.code;
+                })
+            });
+        }
         fields.push({
             name: 'latest',
             type: 'checkbox',
@@ -37,13 +56,13 @@ export const buildVersionCollectionFields = (collection)=>{
             },
             index: true
         });
-    }
-    if (collection?.versions?.drafts && collection?.versions?.drafts?.autosave) {
-        fields.push({
-            name: 'autosave',
-            type: 'checkbox',
-            index: true
-        });
+        if (collection?.versions?.drafts?.autosave) {
+            fields.push({
+                name: 'autosave',
+                type: 'checkbox',
+                index: true
+            });
+        }
     }
     return fields;
 };

package/dist/versions/buildCollectionFields.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/versions/buildCollectionFields.ts"],"sourcesContent":["import type { SanitizedCollectionConfig } from '../collections/config/types.js'\nimport type { Field } from '../fields/config/types.js'\n\nexport const buildVersionCollectionFields = (collection: SanitizedCollectionConfig): Field[] => {\n  const fields: Field[] = [\n    {\n      name: 'parent',\n      type: 'relationship',\n      index: true,\n      relationTo: collection.slug,\n    },\n    {\n      name: 'version',\n      type: 'group',\n      fields: collection.fields.filter((field) => !('name' in field) || field.name !== 'id'),\n    },\n    {\n      name: 'createdAt',\n      type: 'date',\n      admin: {\n        disabled: true,\n      },\n      index: true,\n    },\n    {\n      name: 'updatedAt',\n      type: 'date',\n      admin: {\n        disabled: true,\n      },\n      index: true,\n    },\n  ]\n\n  if (collection?.versions?.drafts) {\n    fields.push({\n      name: 'latest',\n      type: 'checkbox',\n      admin: {\n        disabled: true,\n      },\n      index: true,\n    })\n  }\n\n  if (collection?.versions?.drafts && collection?.versions?.drafts?.autosave) {\n    fields.push({\n      name: 'autosave',\n      type: 'checkbox',\n      index: true,\n    })\n  }\n\n  return fields\n}\n"],"names":["buildVersionCollectionFields","collection","fields","name","type","index","relationTo","slug","filter","field","admin","disabled","versions","drafts","push","autosave"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAGA,OAAO,MAAMA,+BAA+B,CAACC;IAC3C,MAAMC,SAAkB;QACtB;YACEC,MAAM;YACNC,MAAM;YACNC,OAAO;YACPC,YAAYL,WAAWM,IAAI;QAC7B;QACA;YACEJ,MAAM;YACNC,MAAM;YACNF,QAAQD,WAAWC,MAAM,CAACM,MAAM,CAAC,CAACC,QAAU,CAAE,CAAA,UAAUA,KAAI,KAAMA,MAAMN,IAAI,KAAK;QACnF;QACA;YACEA,MAAM;YACNC,MAAM;YACNM,OAAO;gBACLC,UAAU;YACZ;YACAN,OAAO;QACT;QACA;YACEF,MAAM;YACNC,MAAM;YACNM,OAAO;gBACLC,UAAU;YACZ;YACAN,OAAO;QACT;KACD;IAED,IAAIJ,YAAYW,UAAUC,QAAQ;QAChCX,OAAOY,IAAI,CAAC;YACVX,MAAM;YACNC,MAAM;YACNM,OAAO;gBACLC,UAAU;YACZ;YACAN,OAAO;QACT;IACF;IAEA,IAAIJ,YAAYW,UAAUC,UAAUZ,YAAYW,UAAUC,QAAQE,UAAU;QAC1Eb,OAAOY,IAAI,CAAC;YACVX,MAAM;YACNC,MAAM;YACNC,OAAO;QACT;IACF;IAEA,OAAOH;AACT,EAAC"}
+{"version":3,"sources":["../../src/versions/buildCollectionFields.ts"],"sourcesContent":["import type { SanitizedCollectionConfig } from '../collections/config/types.js'\nimport type { SanitizedConfig } from '../config/types.js'\nimport type { Field } from '../fields/config/types.js'\n\nimport { versionSnapshotField } from './baseFields.js'\n\nexport const buildVersionCollectionFields = (\n  config: SanitizedConfig,\n  collection: SanitizedCollectionConfig,\n): Field[] => {\n  const fields: Field[] = [\n    {\n      name: 'parent',\n      type: 'relationship',\n      index: true,\n      relationTo: collection.slug,\n    },\n    {\n      name: 'version',\n      type: 'group',\n      fields: collection.fields.filter((field) => !('name' in field) || field.name !== 'id'),\n    },\n    {\n      name: 'createdAt',\n      type: 'date',\n      admin: {\n        disabled: true,\n      },\n      index: true,\n    },\n    {\n      name: 'updatedAt',\n      type: 'date',\n      admin: {\n        disabled: true,\n      },\n      index: true,\n    },\n  ]\n\n  if (collection?.versions?.drafts) {\n    if (config.localization) {\n      fields.push(versionSnapshotField)\n\n      fields.push({\n        name: 'publishedLocale',\n        type: 'select',\n        admin: {\n          disableBulkEdit: true,\n          disabled: true,\n        },\n        index: true,\n        options: config.localization.locales.map((locale) => {\n          if (typeof locale === 'string') {\n            return locale\n          }\n\n          return locale.code\n        }),\n      })\n    }\n\n    fields.push({\n      name: 'latest',\n      type: 'checkbox',\n      admin: {\n        disabled: true,\n      },\n      index: true,\n    })\n\n    if (collection?.versions?.drafts?.autosave) {\n      fields.push({\n        name: 'autosave',\n        type: 'checkbox',\n        index: true,\n      })\n    }\n  }\n\n  return fields\n}\n"],"names":["versionSnapshotField","buildVersionCollectionFields","config","collection","fields","name","type","index","relationTo","slug","filter","field","admin","disabled","versions","drafts","localization","push","disableBulkEdit","options","locales","map","locale","code","autosave"],"mappings":"AAIA,SAASA,oBAAoB,QAAQ,kBAAiB;AAEtD,OAAO,MAAMC,+BAA+B,CAC1CC,QACAC;IAEA,MAAMC,SAAkB;QACtB;YACEC,MAAM;YACNC,MAAM;YACNC,OAAO;YACPC,YAAYL,WAAWM,IAAI;QAC7B;QACA;YACEJ,MAAM;YACNC,MAAM;YACNF,QAAQD,WAAWC,MAAM,CAACM,MAAM,CAAC,CAACC,QAAU,CAAE,CAAA,UAAUA,KAAI,KAAMA,MAAMN,IAAI,KAAK;QACnF;QACA;YACEA,MAAM;YACNC,MAAM;YACNM,OAAO;gBACLC,UAAU;YACZ;YACAN,OAAO;QACT;QACA;YACEF,MAAM;YACNC,MAAM;YACNM,OAAO;gBACLC,UAAU;YACZ;YACAN,OAAO;QACT;KACD;IAED,IAAIJ,YAAYW,UAAUC,QAAQ;QAChC,IAAIb,OAAOc,YAAY,EAAE;YACvBZ,OAAOa,IAAI,CAACjB;YAEZI,OAAOa,IAAI,CAAC;gBACVZ,MAAM;gBACNC,MAAM;gBACNM,OAAO;oBACLM,iBAAiB;oBACjBL,UAAU;gBACZ;gBACAN,OAAO;gBACPY,SAASjB,OAAOc,YAAY,CAACI,OAAO,CAACC,GAAG,CAAC,CAACC;oBACxC,IAAI,OAAOA,WAAW,UAAU;wBAC9B,OAAOA;oBACT;oBAEA,OAAOA,OAAOC,IAAI;gBACpB;YACF;QACF;QAEAnB,OAAOa,IAAI,CAAC;YACVZ,MAAM;YACNC,MAAM;YACNM,OAAO;gBACLC,UAAU;YACZ;YACAN,OAAO;QACT;QAEA,IAAIJ,YAAYW,UAAUC,QAAQS,UAAU;YAC1CpB,OAAOa,IAAI,CAAC;gBACVZ,MAAM;gBACNC,MAAM;gBACNC,OAAO;YACT;QACF;IACF;IAEA,OAAOH;AACT,EAAC"}

package/dist/versions/buildGlobalFields.d.ts

@@ -1,4 +1,5 @@
+import type { SanitizedConfig } from '../config/types.js';
 import type { Field } from '../fields/config/types.js';
 import type { SanitizedGlobalConfig } from '../globals/config/types.js';
-export declare const buildVersionGlobalFields: (global: SanitizedGlobalConfig) => Field[];
+export declare const buildVersionGlobalFields: (config: SanitizedConfig, global: SanitizedGlobalConfig) => Field[];
 //# sourceMappingURL=buildGlobalFields.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"buildGlobalFields.d.ts","sourceRoot":"","sources":["../../src/versions/buildGlobalFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAEvE,eAAO,MAAM,wBAAwB,WAAY,qBAAqB,KAAG,KAAK,EA2C7E,CAAA"}
+{"version":3,"file":"buildGlobalFields.d.ts","sourceRoot":"","sources":["../../src/versions/buildGlobalFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAIvE,eAAO,MAAM,wBAAwB,WAC3B,eAAe,UACf,qBAAqB,KAC5B,KAAK,EAgEP,CAAA"}

package/dist/versions/buildGlobalFields.js

@@ -1,4 +1,5 @@
-export const buildVersionGlobalFields = (global)=>{
+import { versionSnapshotField } from './baseFields.js';
+export const buildVersionGlobalFields = (config, global)=>{
     const fields = [
         {
             name: 'version',
@@ -21,6 +22,24 @@ export const buildVersionGlobalFields = (global)=>{
         }
     ];
     if (global?.versions?.drafts) {
+        if (config.localization) {
+            fields.push(versionSnapshotField);
+            fields.push({
+                name: 'publishedLocale',
+                type: 'select',
+                admin: {
+                    disableBulkEdit: true,
+                    disabled: true
+                },
+                index: true,
+                options: config.localization.locales.map((locale)=>{
+                    if (typeof locale === 'string') {
+                        return locale;
+                    }
+                    return locale.code;
+                })
+            });
+        }
         fields.push({
             name: 'latest',
             type: 'checkbox',
@@ -29,13 +48,13 @@ export const buildVersionGlobalFields = (global)=>{
             },
             index: true
         });
-    }
-    if (global?.versions?.drafts && global?.versions?.drafts?.autosave) {
-        fields.push({
-            name: 'autosave',
-            type: 'checkbox',
-            index: true
-        });
+        if (global?.versions?.drafts?.autosave) {
+            fields.push({
+                name: 'autosave',
+                type: 'checkbox',
+                index: true
+            });
+        }
     }
     return fields;
 };

package/dist/versions/buildGlobalFields.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/versions/buildGlobalFields.ts"],"sourcesContent":["import type { Field } from '../fields/config/types.js'\nimport type { SanitizedGlobalConfig } from '../globals/config/types.js'\n\nexport const buildVersionGlobalFields = (global: SanitizedGlobalConfig): Field[] => {\n  const fields: Field[] = [\n    {\n      name: 'version',\n      type: 'group',\n      fields: global.fields,\n    },\n    {\n      name: 'createdAt',\n      type: 'date',\n      admin: {\n        disabled: true,\n      },\n    },\n    {\n      name: 'updatedAt',\n      type: 'date',\n      admin: {\n        disabled: true,\n      },\n    },\n  ]\n\n  if (global?.versions?.drafts) {\n    fields.push({\n      name: 'latest',\n      type: 'checkbox',\n      admin: {\n        disabled: true,\n      },\n      index: true,\n    })\n  }\n\n  if (global?.versions?.drafts && global?.versions?.drafts?.autosave) {\n    fields.push({\n      name: 'autosave',\n      type: 'checkbox',\n      index: true,\n    })\n  }\n\n  return fields\n}\n"],"names":["buildVersionGlobalFields","global","fields","name","type","admin","disabled","versions","drafts","push","index","autosave"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAGA,OAAO,MAAMA,2BAA2B,CAACC;IACvC,MAAMC,SAAkB;QACtB;YACEC,MAAM;YACNC,MAAM;YACNF,QAAQD,OAAOC,MAAM;QACvB;QACA;YACEC,MAAM;YACNC,MAAM;YACNC,OAAO;gBACLC,UAAU;YACZ;QACF;QACA;YACEH,MAAM;YACNC,MAAM;YACNC,OAAO;gBACLC,UAAU;YACZ;QACF;KACD;IAED,IAAIL,QAAQM,UAAUC,QAAQ;QAC5BN,OAAOO,IAAI,CAAC;YACVN,MAAM;YACNC,MAAM;YACNC,OAAO;gBACLC,UAAU;YACZ;YACAI,OAAO;QACT;IACF;IAEA,IAAIT,QAAQM,UAAUC,UAAUP,QAAQM,UAAUC,QAAQG,UAAU;QAClET,OAAOO,IAAI,CAAC;YACVN,MAAM;YACNC,MAAM;YACNM,OAAO;QACT;IACF;IAEA,OAAOR;AACT,EAAC"}
+{"version":3,"sources":["../../src/versions/buildGlobalFields.ts"],"sourcesContent":["import type { SanitizedConfig } from '../config/types.js'\nimport type { Field } from '../fields/config/types.js'\nimport type { SanitizedGlobalConfig } from '../globals/config/types.js'\n\nimport { versionSnapshotField } from './baseFields.js'\n\nexport const buildVersionGlobalFields = (\n  config: SanitizedConfig,\n  global: SanitizedGlobalConfig,\n): Field[] => {\n  const fields: Field[] = [\n    {\n      name: 'version',\n      type: 'group',\n      fields: global.fields,\n    },\n    {\n      name: 'createdAt',\n      type: 'date',\n      admin: {\n        disabled: true,\n      },\n    },\n    {\n      name: 'updatedAt',\n      type: 'date',\n      admin: {\n        disabled: true,\n      },\n    },\n  ]\n\n  if (global?.versions?.drafts) {\n    if (config.localization) {\n      fields.push(versionSnapshotField)\n\n      fields.push({\n        name: 'publishedLocale',\n        type: 'select',\n        admin: {\n          disableBulkEdit: true,\n          disabled: true,\n        },\n        index: true,\n        options: config.localization.locales.map((locale) => {\n          if (typeof locale === 'string') {\n            return locale\n          }\n\n          return locale.code\n        }),\n      })\n    }\n\n    fields.push({\n      name: 'latest',\n      type: 'checkbox',\n      admin: {\n        disabled: true,\n      },\n      index: true,\n    })\n\n    if (global?.versions?.drafts?.autosave) {\n      fields.push({\n        name: 'autosave',\n        type: 'checkbox',\n        index: true,\n      })\n    }\n  }\n\n  return fields\n}\n"],"names":["versionSnapshotField","buildVersionGlobalFields","config","global","fields","name","type","admin","disabled","versions","drafts","localization","push","disableBulkEdit","index","options","locales","map","locale","code","autosave"],"mappings":"AAIA,SAASA,oBAAoB,QAAQ,kBAAiB;AAEtD,OAAO,MAAMC,2BAA2B,CACtCC,QACAC;IAEA,MAAMC,SAAkB;QACtB;YACEC,MAAM;YACNC,MAAM;YACNF,QAAQD,OAAOC,MAAM;QACvB;QACA;YACEC,MAAM;YACNC,MAAM;YACNC,OAAO;gBACLC,UAAU;YACZ;QACF;QACA;YACEH,MAAM;YACNC,MAAM;YACNC,OAAO;gBACLC,UAAU;YACZ;QACF;KACD;IAED,IAAIL,QAAQM,UAAUC,QAAQ;QAC5B,IAAIR,OAAOS,YAAY,EAAE;YACvBP,OAAOQ,IAAI,CAACZ;YAEZI,OAAOQ,IAAI,CAAC;gBACVP,MAAM;gBACNC,MAAM;gBACNC,OAAO;oBACLM,iBAAiB;oBACjBL,UAAU;gBACZ;gBACAM,OAAO;gBACPC,SAASb,OAAOS,YAAY,CAACK,OAAO,CAACC,GAAG,CAAC,CAACC;oBACxC,IAAI,OAAOA,WAAW,UAAU;wBAC9B,OAAOA;oBACT;oBAEA,OAAOA,OAAOC,IAAI;gBACpB;YACF;QACF;QAEAf,OAAOQ,IAAI,CAAC;YACVP,MAAM;YACNC,MAAM;YACNC,OAAO;gBACLC,UAAU;YACZ;YACAM,OAAO;QACT;QAEA,IAAIX,QAAQM,UAAUC,QAAQU,UAAU;YACtChB,OAAOQ,IAAI,CAAC;gBACVP,MAAM;gBACNC,MAAM;gBACNQ,OAAO;YACT;QACF;IACF;IAEA,OAAOV;AACT,EAAC"}

package/dist/versions/defaults.d.ts

@@ -0,0 +1,4 @@
+export declare const versionDefaults: {
+    autosaveInterval: number;
+};
+//# sourceMappingURL=defaults.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../src/versions/defaults.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe;;CAE3B,CAAA"}

package/dist/versions/defaults.js

@@ -0,0 +1,5 @@
+export const versionDefaults = {
+    autosaveInterval: 2000
+};
+
+//# sourceMappingURL=defaults.js.map

package/dist/versions/defaults.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/versions/defaults.ts"],"sourcesContent":["export const versionDefaults = {\n  autosaveInterval: 2000,\n}\n"],"names":["versionDefaults","autosaveInterval"],"mappings":"AAAA,OAAO,MAAMA,kBAAkB;IAC7BC,kBAAkB;AACpB,EAAC"}

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,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,OAAO,CAAC,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 { 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"],"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/appendVersionToQueryKey.js

@@ -2,8 +2,8 @@ export const appendVersionToQueryKey = (query)=>{
     return Object.entries(query).reduce((res, [key, val])=>{
         if ([
             'AND',
-            'OR',
             'and',
+            'OR',
             'or'
         ].includes(key) && Array.isArray(val)) {
             return {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/versions/drafts/appendVersionToQueryKey.ts"],"sourcesContent":["import type { Where } from '../../types/index.js'\n\nexport const appendVersionToQueryKey = (query: Where): Where => {\n  return Object.entries(query).reduce((res, [key, val]) => {\n    if (['AND', 'OR', 'and', 'or'].includes(key) && Array.isArray(val)) {\n      return {\n        ...res,\n        [key.toLowerCase()]: val.map((subQuery) => appendVersionToQueryKey(subQuery)),\n      }\n    }\n\n    if (key !== 'id') {\n      return {\n        ...res,\n        [`version.${key}`]: val,\n      }\n    }\n\n    return {\n      ...res,\n      parent: val,\n    }\n  }, {})\n}\n"],"names":["appendVersionToQueryKey","query","Object","entries","reduce","res","key","val","includes","Array","isArray","toLowerCase","map","subQuery","parent"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAEA,OAAO,MAAMA,0BAA0B,CAACC;IACtC,OAAOC,OAAOC,OAAO,CAACF,OAAOG,MAAM,CAAC,CAACC,KAAK,CAACC,KAAKC,IAAI;QAClD,IAAI;YAAC;YAAO;YAAM;YAAO;SAAK,CAACC,QAAQ,CAACF,QAAQG,MAAMC,OAAO,CAACH,MAAM;YAClE,OAAO;gBACL,GAAGF,GAAG;gBACN,CAACC,IAAIK,WAAW,GAAG,EAAEJ,IAAIK,GAAG,CAAC,CAACC,WAAab,wBAAwBa;YACrE;QACF;QAEA,IAAIP,QAAQ,MAAM;YAChB,OAAO;gBACL,GAAGD,GAAG;gBACN,CAAC,CAAC,QAAQ,EAAEC,IAAI,CAAC,CAAC,EAAEC;YACtB;QACF;QAEA,OAAO;YACL,GAAGF,GAAG;YACNS,QAAQP;QACV;IACF,GAAG,CAAC;AACN,EAAC"}
+{"version":3,"sources":["../../../src/versions/drafts/appendVersionToQueryKey.ts"],"sourcesContent":["import type { Where } from '../../types/index.js'\n\nexport const appendVersionToQueryKey = (query: Where): Where => {\n  return Object.entries(query).reduce((res, [key, val]) => {\n    if (['AND', 'and', 'OR', 'or'].includes(key) && Array.isArray(val)) {\n      return {\n        ...res,\n        [key.toLowerCase()]: val.map((subQuery) => appendVersionToQueryKey(subQuery)),\n      }\n    }\n\n    if (key !== 'id') {\n      return {\n        ...res,\n        [`version.${key}`]: val,\n      }\n    }\n\n    return {\n      ...res,\n      parent: val,\n    }\n  }, {})\n}\n"],"names":["appendVersionToQueryKey","query","Object","entries","reduce","res","key","val","includes","Array","isArray","toLowerCase","map","subQuery","parent"],"mappings":"AAEA,OAAO,MAAMA,0BAA0B,CAACC;IACtC,OAAOC,OAAOC,OAAO,CAACF,OAAOG,MAAM,CAAC,CAACC,KAAK,CAACC,KAAKC,IAAI;QAClD,IAAI;YAAC;YAAO;YAAO;YAAM;SAAK,CAACC,QAAQ,CAACF,QAAQG,MAAMC,OAAO,CAACH,MAAM;YAClE,OAAO;gBACL,GAAGF,GAAG;gBACN,CAACC,IAAIK,WAAW,GAAG,EAAEJ,IAAIK,GAAG,CAAC,CAACC,WAAab,wBAAwBa;YACrE;QACF;QAEA,IAAIP,QAAQ,MAAM;YAChB,OAAO;gBACL,GAAGD,GAAG;gBACN,CAAC,CAAC,QAAQ,EAAEC,IAAI,CAAC,CAAC,EAAEC;YACtB;QACF;QAEA,OAAO;YACL,GAAGF,GAAG;YACNS,QAAQP;QACV;IACF,GAAG,CAAC;AACN,EAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"getQueryDraftsSort.d.ts","sourceRoot":"","sources":["../../../src/versions/drafts/getQueryDraftsSort.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,eAAO,MAAM,kBAAkB,SAAU,MAAM,KAAG,MAYjD,CAAA"}
+{"version":3,"file":"getQueryDraftsSort.d.ts","sourceRoot":"","sources":["../../../src/versions/drafts/getQueryDraftsSort.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,eAAO,MAAM,kBAAkB,SAAU,MAAM,KAAG,MAkBjD,CAAA"}

package/dist/versions/drafts/getQueryDraftsSort.js

@@ -2,13 +2,18 @@
  * Takes the incoming sort argument and prefixes it with `versions.` and preserves any `-` prefixes for descending order
  * @param sort
  */ export const getQueryDraftsSort = (sort)=>{
-    if (!sort) return sort;
+    if (!sort) {
+        return sort;
+    }
     let direction = '';
     let orderBy = sort;
     if (sort[0] === '-') {
         direction = '-';
         orderBy = sort.substring(1);
     }
+    if (orderBy === 'id') {
+        return `${direction}parent`;
+    }
     return `${direction}version.${orderBy}`;
 };
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/versions/drafts/getQueryDraftsSort.ts"],"sourcesContent":["/**\n * Takes the incoming sort argument and prefixes it with `versions.` and preserves any `-` prefixes for descending order\n * @param sort\n */\nexport const getQueryDraftsSort = (sort: string): string => {\n  if (!sort) return sort\n\n  let direction = ''\n  let orderBy = sort\n\n  if (sort[0] === '-') {\n    direction = '-'\n    orderBy = sort.substring(1)\n  }\n\n  return `${direction}version.${orderBy}`\n}\n"],"names":["getQueryDraftsSort","sort","direction","orderBy","substring"],"rangeMappings":";;;;;;;;;;;;","mappings":"AAAA;;;CAGC,GACD,OAAO,MAAMA,qBAAqB,CAACC;IACjC,IAAI,CAACA,MAAM,OAAOA;IAElB,IAAIC,YAAY;IAChB,IAAIC,UAAUF;IAEd,IAAIA,IAAI,CAAC,EAAE,KAAK,KAAK;QACnBC,YAAY;QACZC,UAAUF,KAAKG,SAAS,CAAC;IAC3B;IAEA,OAAO,CAAC,EAAEF,UAAU,QAAQ,EAAEC,QAAQ,CAAC;AACzC,EAAC"}
+{"version":3,"sources":["../../../src/versions/drafts/getQueryDraftsSort.ts"],"sourcesContent":["/**\n * Takes the incoming sort argument and prefixes it with `versions.` and preserves any `-` prefixes for descending order\n * @param sort\n */\nexport const getQueryDraftsSort = (sort: string): string => {\n  if (!sort) {\n    return sort\n  }\n\n  let direction = ''\n  let orderBy = sort\n\n  if (sort[0] === '-') {\n    direction = '-'\n    orderBy = sort.substring(1)\n  }\n\n  if (orderBy === 'id') {\n    return `${direction}parent`\n  }\n\n  return `${direction}version.${orderBy}`\n}\n"],"names":["getQueryDraftsSort","sort","direction","orderBy","substring"],"mappings":"AAAA;;;CAGC,GACD,OAAO,MAAMA,qBAAqB,CAACC;IACjC,IAAI,CAACA,MAAM;QACT,OAAOA;IACT;IAEA,IAAIC,YAAY;IAChB,IAAIC,UAAUF;IAEd,IAAIA,IAAI,CAAC,EAAE,KAAK,KAAK;QACnBC,YAAY;QACZC,UAAUF,KAAKG,SAAS,CAAC;IAC3B;IAEA,IAAID,YAAY,MAAM;QACpB,OAAO,CAAC,EAAED,UAAU,MAAM,CAAC;IAC7B;IAEA,OAAO,CAAC,EAAEA,UAAU,QAAQ,EAAEC,QAAQ,CAAC;AACzC,EAAC"}

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,cAAc,EAAS,MAAM,sBAAsB,CAAA;AASjE,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,GAAU,CAAC,SAAS,UAAU,mDAM5D,SAAS,CAAC,CAAC,CAAC,KAAG,OAAO,CAAC,CAAC,CAqF1B,CAAA;AAED,eAAe,2BAA2B,CAAA"}

package/dist/versions/drafts/replaceWithDraftIfAvailable.js

@@ -1,6 +1,7 @@
 import { hasWhereAccessResult } from '../../auth/index.js';
 import { combineQueries } from '../../database/combineQueries.js';
 import { docHasTimestamps } from '../../types/index.js';
+import { deepCopyObjectSimple } from '../../utilities/deepCopyObject.js';
 import sanitizeInternalFields from '../../utilities/sanitizeInternalFields.js';
 import { appendVersionToQueryKey } from './appendVersionToQueryKey.js';
 const replaceWithDraftIfAvailable = async ({ accessResult, doc, entity, entityType, req })=>{
@@ -23,9 +24,18 @@ const replaceWithDraftIfAvailable = async ({ accessResult, doc, entity, entityTy
     }
     if (docHasTimestamps(doc)) {
         queryToBuild.and.push({
-            updatedAt: {
-                greater_than: doc.updatedAt
-            }
+            or: [
+                {
+                    updatedAt: {
+                        greater_than: doc.updatedAt
+                    }
+                },
+                {
+                    latest: {
+                        equals: true
+                    }
+                }
+            ]
         });
     }
     let versionAccessResult;
@@ -52,7 +62,7 @@ const replaceWithDraftIfAvailable = async ({ accessResult, doc, entity, entityTy
     if (!draft) {
         return doc;
     }
-    draft = JSON.parse(JSON.stringify(draft));
+    draft = deepCopyObjectSimple(draft);
     draft = sanitizeInternalFields(draft);
     // Patch globalType onto version doc
     if (entityType === 'global' && 'globalType' in doc) {

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 { 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 { deepCopyObjectSimple } from '../../utilities/deepCopyObject.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      or: [\n        {\n          updatedAt: {\n            greater_than: doc.updatedAt,\n          },\n        },\n        {\n          latest: {\n            equals: true,\n          },\n        },\n      ],\n    })\n  }\n\n  let versionAccessResult\n\n  if (hasWhereAccessResult(accessResult)) {\n    versionAccessResult = appendVersionToQueryKey(accessResult)\n  }\n\n  const findVersionsArgs: FindGlobalVersionsArgs & FindVersionsArgs = {\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 = deepCopyObjectSimple(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","deepCopyObjectSimple","sanitizeInternalFields","appendVersionToQueryKey","replaceWithDraftIfAvailable","accessResult","doc","entity","entityType","req","locale","queryToBuild","and","equals","push","parent","id","or","updatedAt","greater_than","latest","versionAccessResult","findVersionsArgs","collection","slug","global","limit","pagination","sort","where","versionDocs","payload","db","findGlobalVersions","docs","findVersions","draft","version","globalType","createdAt"],"mappings":"AAMA,SAASA,oBAAoB,QAAQ,sBAAqB;AAC1D,SAASC,cAAc,QAAQ,mCAAkC;AACjE,SAASC,gBAAgB,QAAQ,uBAAsB;AACvD,SAASC,oBAAoB,QAAQ,oCAAmC;AACxE,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,IAAIhB,iBAAiBM,MAAM;QACzBK,aAAaC,GAAG,CAACE,IAAI,CAAC;YACpBG,IAAI;gBACF;oBACEC,WAAW;wBACTC,cAAcb,IAAIY,SAAS;oBAC7B;gBACF;gBACA;oBACEE,QAAQ;wBACNP,QAAQ;oBACV;gBACF;aACD;QACH;IACF;IAEA,IAAIQ;IAEJ,IAAIvB,qBAAqBO,eAAe;QACtCgB,sBAAsBlB,wBAAwBE;IAChD;IAEA,MAAMiB,mBAA8D;QAClEC,YAAYhB,OAAOiB,IAAI;QACvBC,QAAQlB,OAAOiB,IAAI;QACnBE,OAAO;QACPhB;QACAiB,YAAY;QACZlB;QACAmB,MAAM;QACNC,OAAO9B,eAAeY,cAAcU;IACtC;IAEA,IAAIS;IACJ,IAAItB,eAAe,UAAU;QAC3BsB,cAAc,AAAC,CAAA,MAAMrB,IAAIsB,OAAO,CAACC,EAAE,CAACC,kBAAkB,CAAIX,iBAAgB,EAAGY,IAAI;IACnF,OAAO;QACLJ,cAAc,AAAC,CAAA,MAAMrB,IAAIsB,OAAO,CAACC,EAAE,CAACG,YAAY,CAAIb,iBAAgB,EAAGY,IAAI;IAC7E;IAEA,IAAIE,QAAQN,WAAW,CAAC,EAAE;IAE1B,IAAI,CAACM,OAAO;QACV,OAAO9B;IACT;IAEA8B,QAAQnC,qBAAqBmC;IAC7BA,QAAQlC,uBAAuBkC;IAE/B,oCAAoC;IACpC,IAAI5B,eAAe,YAAY,gBAAgBF,KAAK;QAClD8B,MAAMC,OAAO,CAACC,UAAU,GAAGhC,IAAIgC,UAAU;IAC3C;IAEA,mDAAmD;IACnD,yCAAyC;IACzC,4CAA4C;IAC5C,OAAO;QACLtB,IAAIV,IAAIU,EAAE;QACV,GAAGoB,MAAMC,OAAO;QAChBE,WAAWH,MAAMG,SAAS;QAC1BrB,WAAWkB,MAAMlB,SAAS;IAC5B;AACF;AAEA,eAAed,4BAA2B"}

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,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,OAAO,CAAC,IAAI,CA8DrB,CAAA"}

package/dist/versions/enforceMaxVersions.js

@@ -10,6 +10,7 @@ export const enforceMaxVersions = async ({ id, collection, global, max, payload,
             };
             const query = await payload.db.findVersions({
                 collection: collection.slug,
+                limit: 1,
                 pagination: false,
                 req,
                 skip: max,
@@ -20,6 +21,7 @@ export const enforceMaxVersions = async ({ id, collection, global, max, payload,
         } else if (global) {
             const query = await payload.db.findGlobalVersions({
                 global: global.slug,
+                limit: 1,
                 pagination: false,
                 req,
                 skip: max,
@@ -40,7 +42,7 @@ export const enforceMaxVersions = async ({ id, collection, global, max, payload,
                 };
             }
             await payload.db.deleteVersions({
-                collection: collection?.slug,
+                collection: slug,
                 req,
                 where: deleteQuery
             });

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, 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        limit: 1,\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        limit: 1,\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: 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","limit","pagination","skip","sort","docs","findGlobalVersions","updatedAt","deleteQuery","less_than_equal","deleteVersions","err","logger","error"],"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,OAAO;gBACPC,YAAY;gBACZX;gBACAY,MAAMd;gBACNe,MAAM;gBACNV;YACF;YAEC,CAACC,iBAAiB,GAAGG,MAAMO,IAAI;QAClC,OAAO,IAAIjB,QAAQ;YACjB,MAAMU,QAAQ,MAAMR,QAAQS,EAAE,CAACO,kBAAkB,CAAC;gBAChDlB,QAAQA,OAAOK,IAAI;gBACnBQ,OAAO;gBACPC,YAAY;gBACZX;gBACAY,MAAMd;gBACNe,MAAM;gBACNV;YACF;YAEC,CAACC,iBAAiB,GAAGG,MAAMO,IAAI;QAClC;QAEA,IAAIV,kBAAkBY,WAAW;YAC/B,MAAMC,cAAqB;gBACzBD,WAAW;oBACTE,iBAAiBd,iBAAiBY,SAAS;gBAC7C;YACF;YAEA,IAAIpB,YAAY;gBACdqB,YAAYZ,MAAM,GAAG;oBACnBC,QAAQX;gBACV;YACF;YAEA,MAAMI,QAAQS,EAAE,CAACW,cAAc,CAAC;gBAC9BvB,YAAYM;gBACZF;gBACAG,OAAOc;YACT;QACF;IACF,EAAE,OAAOG,KAAK;QACZrB,QAAQsB,MAAM,CAACC,KAAK,CAClB,CAAC,oDAAoD,EAAErB,WAAW,CAAC,EAAEC,KAAK,CAAC;IAE/E;AACF,EAAC"}

package/dist/versions/getLatestCollectionVersion.d.ts

@@ -5,9 +5,10 @@ type Args = {
     config: SanitizedCollectionConfig;
     id: number | string;
     payload: Payload;
+    published?: boolean;
     query: FindOneArgs;
     req?: PayloadRequest;
 };
-export declare const getLatestCollectionVersion: <T extends TypeWithID = any>({ id, config, payload, query, req, }: Args) => Promise<T>;
+export declare const getLatestCollectionVersion: <T extends TypeWithID = any>({ id, config, payload, published, query, req, }: Args) => Promise<T>;
 export {};
 //# sourceMappingURL=getLatestCollectionVersion.d.ts.map

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,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAGhE,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,yBAAyB,CAAA;IACjC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,KAAK,EAAE,WAAW,CAAA;IAClB,GAAG,CAAC,EAAE,cAAc,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,0BAA0B,GAAU,CAAC,SAAS,UAAU,yDAOlE,IAAI,KAAG,OAAO,CAAC,CAAC,CAmClB,CAAA"}

package/dist/versions/getLatestCollectionVersion.js

@@ -1,6 +1,32 @@
-import { docHasTimestamps } from '../types/index.js';
-export const getLatestCollectionVersion = async ({ id, config, payload, query, req })=>{
+export const getLatestCollectionVersion = async ({ id, config, payload, published, query, req })=>{
     let latestVersion;
+    const whereQuery = published ? {
+        and: [
+            {
+                parent: {
+                    equals: id
+                }
+            },
+            {
+                'version._status': {
+                    equals: 'published'
+                }
+            }
+        ]
+    } : {
+        and: [
+            {
+                parent: {
+                    equals: id
+                }
+            },
+            {
+                latest: {
+                    equals: true
+                }
+            }
+        ]
+    };
     if (config.versions?.drafts) {
         const { docs } = await payload.db.findVersions({
             collection: config.slug,
@@ -8,20 +34,19 @@ export const getLatestCollectionVersion = async ({ id, config, payload, query, r
             pagination: false,
             req,
             sort: '-updatedAt',
-            where: {
-                parent: {
-                    equals: id
-                }
-            }
+            where: whereQuery
         });
         [latestVersion] = docs;
     }
-    const doc = await payload.db.findOne({
-        ...query,
-        req
-    });
-    if (!latestVersion || docHasTimestamps(doc) && latestVersion.updatedAt < doc.updatedAt) {
-        return doc;
+    if (!latestVersion) {
+        if (!published) {
+            const doc = await payload.db.findOne({
+                ...query,
+                req
+            });
+            return doc;
+        }
+        return undefined;
     }
     return {
         ...latestVersion.version,

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, PayloadRequest } from '../types/index.js'\nimport type { TypeWithVersion } from './types.js'\n\ntype Args = {\n  config: SanitizedCollectionConfig\n  id: number | string\n  payload: Payload\n  published?: boolean\n  query: FindOneArgs\n  req?: PayloadRequest\n}\n\nexport const getLatestCollectionVersion = async <T extends TypeWithID = any>({\n  id,\n  config,\n  payload,\n  published,\n  query,\n  req,\n}: Args): Promise<T> => {\n  let latestVersion: TypeWithVersion<T>\n\n  const whereQuery = published\n    ? { and: [{ parent: { equals: id } }, { 'version._status': { equals: 'published' } }] }\n    : { and: [{ parent: { equals: id } }, { latest: { equals: true } }] }\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: whereQuery,\n    })\n    ;[latestVersion] = docs\n  }\n\n  if (!latestVersion) {\n    if (!published) {\n      const doc = await payload.db.findOne<T>({ ...query, req })\n\n      return doc\n    }\n\n    return undefined\n  }\n\n  return {\n    ...latestVersion.version,\n    id,\n    createdAt: latestVersion.createdAt,\n    updatedAt: latestVersion.updatedAt,\n  }\n}\n"],"names":["getLatestCollectionVersion","id","config","payload","published","query","req","latestVersion","whereQuery","and","parent","equals","latest","versions","drafts","docs","db","findVersions","collection","slug","limit","pagination","sort","where","doc","findOne","undefined","version","createdAt","updatedAt"],"mappings":"AAcA,OAAO,MAAMA,6BAA6B,OAAmC,EAC3EC,EAAE,EACFC,MAAM,EACNC,OAAO,EACPC,SAAS,EACTC,KAAK,EACLC,GAAG,EACE;IACL,IAAIC;IAEJ,MAAMC,aAAaJ,YACf;QAAEK,KAAK;YAAC;gBAAEC,QAAQ;oBAAEC,QAAQV;gBAAG;YAAE;YAAG;gBAAE,mBAAmB;oBAAEU,QAAQ;gBAAY;YAAE;SAAE;IAAC,IACpF;QAAEF,KAAK;YAAC;gBAAEC,QAAQ;oBAAEC,QAAQV;gBAAG;YAAE;YAAG;gBAAEW,QAAQ;oBAAED,QAAQ;gBAAK;YAAE;SAAE;IAAC;IAEtE,IAAIT,OAAOW,QAAQ,EAAEC,QAAQ;QAC3B,MAAM,EAAEC,IAAI,EAAE,GAAG,MAAMZ,QAAQa,EAAE,CAACC,YAAY,CAAI;YAChDC,YAAYhB,OAAOiB,IAAI;YACvBC,OAAO;YACPC,YAAY;YACZf;YACAgB,MAAM;YACNC,OAAOf;QACT;QACC,CAACD,cAAc,GAAGQ;IACrB;IAEA,IAAI,CAACR,eAAe;QAClB,IAAI,CAACH,WAAW;YACd,MAAMoB,MAAM,MAAMrB,QAAQa,EAAE,CAACS,OAAO,CAAI;gBAAE,GAAGpB,KAAK;gBAAEC;YAAI;YAExD,OAAOkB;QACT;QAEA,OAAOE;IACT;IAEA,OAAO;QACL,GAAGnB,cAAcoB,OAAO;QACxB1B;QACA2B,WAAWrB,cAAcqB,SAAS;QAClCC,WAAWtB,cAAcsB,SAAS;IACpC;AACF,EAAC"}

package/dist/versions/getLatestGlobalVersion.d.ts

@@ -4,11 +4,12 @@ type Args = {
     config: SanitizedGlobalConfig;
     locale?: string;
     payload: Payload;
+    published?: boolean;
     req?: PayloadRequest;
     slug: string;
     where: Where;
 };
-export declare const getLatestGlobalVersion: ({ slug, config, locale, payload, req, where, }: Args) => Promise<{
+export declare const getLatestGlobalVersion: ({ slug, config, locale, payload, published, req, where, }: Args) => Promise<{
     global: Document;
     globalExists: boolean;
 }>;

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,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,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,eAAO,MAAM,sBAAsB,8DAQhC,IAAI,KAAG,OAAO,CAAC;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,YAAY,EAAE,OAAO,CAAA;CAAE,CA2C5D,CAAA"}

package/dist/versions/getLatestGlobalVersion.js

@@ -1,15 +1,22 @@
-import { docHasTimestamps } from '../types/index.js';
-export const getLatestGlobalVersion = async ({ slug, config, locale, payload, req, where })=>{
+export const getLatestGlobalVersion = async ({ slug, config, locale, payload, published, req, where })=>{
     let latestVersion;
+    const whereQuery = published ? {
+        'version._status': {
+            equals: 'published'
+        }
+    } : {
+        latest: {
+            equals: true
+        }
+    };
     if (config.versions?.drafts) {
-        // eslint-disable-next-line prefer-destructuring
         latestVersion = (await payload.db.findGlobalVersions({
             global: slug,
             limit: 1,
             locale,
             pagination: false,
             req,
-            sort: '-updatedAt'
+            where: whereQuery
         })).docs[0];
     }
     const global = await payload.db.findGlobal({
@@ -19,7 +26,7 @@ export const getLatestGlobalVersion = async ({ slug, config, locale, payload, re
         where
     });
     const globalExists = Boolean(global);
-    if (!latestVersion || docHasTimestamps(global) && latestVersion.updatedAt < global.updatedAt) {
+    if (!latestVersion) {
         return {
             global,
             globalExists

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, 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  published?: boolean\n  req?: PayloadRequest\n  slug: string\n  where: Where\n}\n\nexport const getLatestGlobalVersion = async ({\n  slug,\n  config,\n  locale,\n  payload,\n  published,\n  req,\n  where,\n}: Args): Promise<{ global: Document; globalExists: boolean }> => {\n  let latestVersion\n\n  const whereQuery = published\n    ? { 'version._status': { equals: 'published' } }\n    : { latest: { equals: true } }\n\n  if (config.versions?.drafts) {\n    latestVersion = (\n      await payload.db.findGlobalVersions({\n        global: slug,\n        limit: 1,\n        locale,\n        pagination: false,\n        req,\n        where: whereQuery,\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) {\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":["getLatestGlobalVersion","slug","config","locale","payload","published","req","where","latestVersion","whereQuery","equals","latest","versions","drafts","db","findGlobalVersions","global","limit","pagination","docs","findGlobal","globalExists","Boolean","version","createdAt","updatedAt"],"mappings":"AAeA,OAAO,MAAMA,yBAAyB,OAAO,EAC3CC,IAAI,EACJC,MAAM,EACNC,MAAM,EACNC,OAAO,EACPC,SAAS,EACTC,GAAG,EACHC,KAAK,EACA;IACL,IAAIC;IAEJ,MAAMC,aAAaJ,YACf;QAAE,mBAAmB;YAAEK,QAAQ;QAAY;IAAE,IAC7C;QAAEC,QAAQ;YAAED,QAAQ;QAAK;IAAE;IAE/B,IAAIR,OAAOU,QAAQ,EAAEC,QAAQ;QAC3BL,gBAAgB,AACd,CAAA,MAAMJ,QAAQU,EAAE,CAACC,kBAAkB,CAAC;YAClCC,QAAQf;YACRgB,OAAO;YACPd;YACAe,YAAY;YACZZ;YACAC,OAAOE;QACT,EAAC,EACDU,IAAI,CAAC,EAAE;IACX;IAEA,MAAMH,SAAS,MAAMZ,QAAQU,EAAE,CAACM,UAAU,CAAC;QACzCnB;QACAE;QACAG;QACAC;IACF;IACA,MAAMc,eAAeC,QAAQN;IAE7B,IAAI,CAACR,eAAe;QAClB,OAAO;YACLQ;YACAK;QACF;IACF;IAEA,OAAO;QACLL,QAAQ;YACN,GAAGR,cAAce,OAAO;YACxBC,WAAWhB,cAAcgB,SAAS;YAClCC,WAAWjB,cAAciB,SAAS;QACpC;QACAJ;IACF;AACF,EAAC"}

package/dist/versions/payloadPackageList.d.ts

@@ -0,0 +1,2 @@
+export declare const PAYLOAD_PACKAGE_LIST: string[];
+//# sourceMappingURL=payloadPackageList.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"payloadPackageList.d.ts","sourceRoot":"","sources":["../../src/versions/payloadPackageList.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB,UA8BhC,CAAA"}

package/dist/versions/payloadPackageList.js

@@ -0,0 +1,33 @@
+export const PAYLOAD_PACKAGE_LIST = [
+    'payload',
+    '@payloadcms/bundler-vite',
+    '@payloadcms/bundler-webpack',
+    '@payloadcms/db-mongodb',
+    '@payloadcms/db-postgres',
+    '@payloadcms/email-nodemailer',
+    '@payloadcms/email-resend',
+    '@payloadcms/graphql',
+    '@payloadcms/live-preview-react',
+    '@payloadcms/live-preview',
+    '@payloadcms/next/utilities',
+    '@payloadcms/plugin-cloud-storage',
+    '@payloadcms/plugin-cloud',
+    '@payloadcms/plugin-form-builder',
+    '@payloadcms/plugin-nested-docs',
+    '@payloadcms/plugin-redirects',
+    '@payloadcms/plugin-search',
+    '@payloadcms/plugin-seo',
+    '@payloadcms/plugin-stripe',
+    '@payloadcms/plugin-zapier',
+    '@payloadcms/richtext-lexical',
+    '@payloadcms/richtext-slate',
+    '@payloadcms/storage-azure',
+    '@payloadcms/storage-gcs',
+    '@payloadcms/storage-s3',
+    '@payloadcms/storage-uploadthing',
+    '@payloadcms/storage-vercel-blob',
+    '@payloadcms/translations',
+    '@payloadcms/ui/shared'
+];
+
+//# sourceMappingURL=payloadPackageList.js.map

package/dist/versions/payloadPackageList.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/versions/payloadPackageList.ts"],"sourcesContent":["export const PAYLOAD_PACKAGE_LIST = [\n  'payload',\n  '@payloadcms/bundler-vite',\n  '@payloadcms/bundler-webpack',\n  '@payloadcms/db-mongodb',\n  '@payloadcms/db-postgres',\n  '@payloadcms/email-nodemailer',\n  '@payloadcms/email-resend',\n  '@payloadcms/graphql',\n  '@payloadcms/live-preview-react',\n  '@payloadcms/live-preview',\n  '@payloadcms/next/utilities',\n  '@payloadcms/plugin-cloud-storage',\n  '@payloadcms/plugin-cloud',\n  '@payloadcms/plugin-form-builder',\n  '@payloadcms/plugin-nested-docs',\n  '@payloadcms/plugin-redirects',\n  '@payloadcms/plugin-search',\n  '@payloadcms/plugin-seo',\n  '@payloadcms/plugin-stripe',\n  '@payloadcms/plugin-zapier',\n  '@payloadcms/richtext-lexical',\n  '@payloadcms/richtext-slate',\n  '@payloadcms/storage-azure',\n  '@payloadcms/storage-gcs',\n  '@payloadcms/storage-s3',\n  '@payloadcms/storage-uploadthing',\n  '@payloadcms/storage-vercel-blob',\n  '@payloadcms/translations',\n  '@payloadcms/ui/shared',\n]\n"],"names":["PAYLOAD_PACKAGE_LIST"],"mappings":"AAAA,OAAO,MAAMA,uBAAuB;IAClC;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;CACD,CAAA"}