@payloadcms/db-mongodb 3.0.0-canary.f6e77b8 → 3.0.0-canary.fb04843

package/dist/utilities/sanitizeRelationshipIDs.spec.js

@@ -0,0 +1,383 @@
+import { Types } from 'mongoose';
+import { sanitizeRelationshipIDs } from './sanitizeRelationshipIDs.js';
+const flattenRelationshipValues = (obj, prefix = '')=>{
+    return Object.keys(obj).reduce((acc, key)=>{
+        const fullKey = prefix ? `${prefix}.${key}` : key;
+        const value = obj[key];
+        if (value && typeof value === 'object' && !(value instanceof Types.ObjectId)) {
+            Object.assign(acc, flattenRelationshipValues(value, fullKey));
+        // skip relationTo and blockType
+        } else if (!fullKey.endsWith('relationTo') && !fullKey.endsWith('blockType')) {
+            acc[fullKey] = value;
+        }
+        return acc;
+    }, {});
+};
+const relsFields = [
+    {
+        name: 'rel_1',
+        type: 'relationship',
+        relationTo: 'rels'
+    },
+    {
+        name: 'rel_1_l',
+        type: 'relationship',
+        localized: true,
+        relationTo: 'rels'
+    },
+    {
+        name: 'rel_2',
+        type: 'relationship',
+        hasMany: true,
+        relationTo: 'rels'
+    },
+    {
+        name: 'rel_2_l',
+        type: 'relationship',
+        hasMany: true,
+        localized: true,
+        relationTo: 'rels'
+    },
+    {
+        name: 'rel_3',
+        type: 'relationship',
+        relationTo: [
+            'rels'
+        ]
+    },
+    {
+        name: 'rel_3_l',
+        type: 'relationship',
+        localized: true,
+        relationTo: [
+            'rels'
+        ]
+    },
+    {
+        name: 'rel_4',
+        type: 'relationship',
+        hasMany: true,
+        relationTo: [
+            'rels'
+        ]
+    },
+    {
+        name: 'rel_4_l',
+        type: 'relationship',
+        hasMany: true,
+        localized: true,
+        relationTo: [
+            'rels'
+        ]
+    }
+];
+const config = {
+    collections: [
+        {
+            slug: 'docs',
+            fields: [
+                ...relsFields,
+                {
+                    name: 'array',
+                    type: 'array',
+                    fields: [
+                        {
+                            name: 'array',
+                            type: 'array',
+                            fields: relsFields
+                        },
+                        {
+                            name: 'blocks',
+                            type: 'blocks',
+                            blocks: [
+                                {
+                                    slug: 'block',
+                                    fields: relsFields
+                                }
+                            ]
+                        },
+                        ...relsFields
+                    ]
+                },
+                {
+                    name: 'arrayLocalized',
+                    type: 'array',
+                    fields: [
+                        {
+                            name: 'array',
+                            type: 'array',
+                            fields: relsFields
+                        },
+                        {
+                            name: 'blocks',
+                            type: 'blocks',
+                            blocks: [
+                                {
+                                    slug: 'block',
+                                    fields: relsFields
+                                }
+                            ]
+                        },
+                        ...relsFields
+                    ],
+                    localized: true
+                },
+                {
+                    name: 'blocks',
+                    type: 'blocks',
+                    blocks: [
+                        {
+                            slug: 'block',
+                            fields: [
+                                ...relsFields,
+                                {
+                                    name: 'group',
+                                    type: 'group',
+                                    fields: relsFields
+                                },
+                                {
+                                    name: 'array',
+                                    type: 'array',
+                                    fields: relsFields
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    name: 'group',
+                    type: 'group',
+                    fields: [
+                        ...relsFields,
+                        {
+                            name: 'array',
+                            type: 'array',
+                            fields: relsFields
+                        }
+                    ]
+                },
+                {
+                    name: 'groupLocalized',
+                    type: 'group',
+                    fields: [
+                        ...relsFields,
+                        {
+                            name: 'array',
+                            type: 'array',
+                            fields: relsFields
+                        }
+                    ],
+                    localized: true
+                },
+                {
+                    type: 'tabs',
+                    tabs: [
+                        {
+                            name: 'tab',
+                            fields: relsFields
+                        },
+                        {
+                            name: 'tabLocalized',
+                            fields: relsFields,
+                            localized: true
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            slug: 'rels',
+            fields: []
+        }
+    ],
+    localization: {
+        defaultLocale: 'en',
+        localeCodes: [
+            'en',
+            'es'
+        ],
+        locales: [
+            {
+                code: 'en',
+                label: 'EN'
+            },
+            {
+                code: 'es',
+                label: 'ES'
+            }
+        ]
+    }
+};
+const relsData = {
+    rel_1: new Types.ObjectId().toHexString(),
+    rel_1_l: {
+        en: new Types.ObjectId().toHexString(),
+        es: new Types.ObjectId().toHexString()
+    },
+    rel_2: [
+        new Types.ObjectId().toHexString()
+    ],
+    rel_2_l: {
+        en: [
+            new Types.ObjectId().toHexString()
+        ],
+        es: [
+            new Types.ObjectId().toHexString()
+        ]
+    },
+    rel_3: {
+        relationTo: 'rels',
+        value: new Types.ObjectId().toHexString()
+    },
+    rel_3_l: {
+        en: {
+            relationTo: 'rels',
+            value: new Types.ObjectId().toHexString()
+        },
+        es: {
+            relationTo: 'rels',
+            value: new Types.ObjectId().toHexString()
+        }
+    },
+    rel_4: [
+        {
+            relationTo: 'rels',
+            value: new Types.ObjectId().toHexString()
+        }
+    ],
+    rel_4_l: {
+        en: [
+            {
+                relationTo: 'rels',
+                value: new Types.ObjectId().toHexString()
+            }
+        ],
+        es: [
+            {
+                relationTo: 'rels',
+                value: new Types.ObjectId().toHexString()
+            }
+        ]
+    }
+};
+describe('sanitizeRelationshipIDs', ()=>{
+    it('should sanitize relationships', ()=>{
+        const data = {
+            ...relsData,
+            array: [
+                {
+                    ...relsData,
+                    array: [
+                        {
+                            ...relsData
+                        }
+                    ],
+                    blocks: [
+                        {
+                            blockType: 'block',
+                            ...relsData
+                        }
+                    ]
+                }
+            ],
+            arrayLocalized: {
+                en: [
+                    {
+                        ...relsData,
+                        array: [
+                            {
+                                ...relsData
+                            }
+                        ],
+                        blocks: [
+                            {
+                                blockType: 'block',
+                                ...relsData
+                            }
+                        ]
+                    }
+                ],
+                es: [
+                    {
+                        ...relsData,
+                        array: [
+                            {
+                                ...relsData
+                            }
+                        ],
+                        blocks: [
+                            {
+                                blockType: 'block',
+                                ...relsData
+                            }
+                        ]
+                    }
+                ]
+            },
+            blocks: [
+                {
+                    blockType: 'block',
+                    ...relsData,
+                    array: [
+                        {
+                            ...relsData
+                        }
+                    ],
+                    group: {
+                        ...relsData
+                    }
+                }
+            ],
+            group: {
+                ...relsData,
+                array: [
+                    {
+                        ...relsData
+                    }
+                ]
+            },
+            groupLocalized: {
+                en: {
+                    ...relsData,
+                    array: [
+                        {
+                            ...relsData
+                        }
+                    ]
+                },
+                es: {
+                    ...relsData,
+                    array: [
+                        {
+                            ...relsData
+                        }
+                    ]
+                }
+            },
+            tab: {
+                ...relsData
+            },
+            tabLocalized: {
+                en: {
+                    ...relsData
+                },
+                es: {
+                    ...relsData
+                }
+            }
+        };
+        const flattenValuesBefore = Object.values(flattenRelationshipValues(data));
+        sanitizeRelationshipIDs({
+            config,
+            data,
+            fields: config.collections[0].fields
+        });
+        const flattenValuesAfter = Object.values(flattenRelationshipValues(data));
+        flattenValuesAfter.forEach((value, i)=>{
+            expect(value).toBeInstanceOf(Types.ObjectId);
+            expect(flattenValuesBefore[i]).toBe(value.toHexString());
+        });
+    });
+});
+
+//# sourceMappingURL=sanitizeRelationshipIDs.spec.js.map

package/dist/utilities/sanitizeRelationshipIDs.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/sanitizeRelationshipIDs.spec.ts"],"sourcesContent":["import type { Field, SanitizedConfig } from 'payload'\n\nimport { Types } from 'mongoose'\n\nimport { sanitizeRelationshipIDs } from './sanitizeRelationshipIDs.js'\n\nconst flattenRelationshipValues = (obj: Record<string, any>, prefix = ''): Record<string, any> => {\n  return Object.keys(obj).reduce(\n    (acc, key) => {\n      const fullKey = prefix ? `${prefix}.${key}` : key\n      const value = obj[key]\n\n      if (value && typeof value === 'object' && !(value instanceof Types.ObjectId)) {\n        Object.assign(acc, flattenRelationshipValues(value, fullKey))\n        // skip relationTo and blockType\n      } else if (!fullKey.endsWith('relationTo') && !fullKey.endsWith('blockType')) {\n        acc[fullKey] = value\n      }\n\n      return acc\n    },\n    {} as Record<string, any>,\n  )\n}\n\nconst relsFields: Field[] = [\n  {\n    name: 'rel_1',\n    type: 'relationship',\n    relationTo: 'rels',\n  },\n  {\n    name: 'rel_1_l',\n    type: 'relationship',\n    localized: true,\n    relationTo: 'rels',\n  },\n  {\n    name: 'rel_2',\n    type: 'relationship',\n    hasMany: true,\n    relationTo: 'rels',\n  },\n  {\n    name: 'rel_2_l',\n    type: 'relationship',\n    hasMany: true,\n    localized: true,\n    relationTo: 'rels',\n  },\n  {\n    name: 'rel_3',\n    type: 'relationship',\n    relationTo: ['rels'],\n  },\n  {\n    name: 'rel_3_l',\n    type: 'relationship',\n    localized: true,\n    relationTo: ['rels'],\n  },\n  {\n    name: 'rel_4',\n    type: 'relationship',\n    hasMany: true,\n    relationTo: ['rels'],\n  },\n  {\n    name: 'rel_4_l',\n    type: 'relationship',\n    hasMany: true,\n    localized: true,\n    relationTo: ['rels'],\n  },\n]\n\nconst config = {\n  collections: [\n    {\n      slug: 'docs',\n      fields: [\n        ...relsFields,\n        {\n          name: 'array',\n          type: 'array',\n          fields: [\n            {\n              name: 'array',\n              type: 'array',\n              fields: relsFields,\n            },\n            {\n              name: 'blocks',\n              type: 'blocks',\n              blocks: [{ slug: 'block', fields: relsFields }],\n            },\n            ...relsFields,\n          ],\n        },\n        {\n          name: 'arrayLocalized',\n          type: 'array',\n          fields: [\n            {\n              name: 'array',\n              type: 'array',\n              fields: relsFields,\n            },\n            {\n              name: 'blocks',\n              type: 'blocks',\n              blocks: [{ slug: 'block', fields: relsFields }],\n            },\n            ...relsFields,\n          ],\n          localized: true,\n        },\n        {\n          name: 'blocks',\n          type: 'blocks',\n          blocks: [\n            {\n              slug: 'block',\n              fields: [\n                ...relsFields,\n                {\n                  name: 'group',\n                  type: 'group',\n                  fields: relsFields,\n                },\n                {\n                  name: 'array',\n                  type: 'array',\n                  fields: relsFields,\n                },\n              ],\n            },\n          ],\n        },\n        {\n          name: 'group',\n          type: 'group',\n          fields: [\n            ...relsFields,\n            {\n              name: 'array',\n              type: 'array',\n              fields: relsFields,\n            },\n          ],\n        },\n        {\n          name: 'groupLocalized',\n          type: 'group',\n          fields: [\n            ...relsFields,\n            {\n              name: 'array',\n              type: 'array',\n              fields: relsFields,\n            },\n          ],\n          localized: true,\n        },\n        {\n          type: 'tabs',\n          tabs: [\n            {\n              name: 'tab',\n              fields: relsFields,\n            },\n            {\n              name: 'tabLocalized',\n              fields: relsFields,\n              localized: true,\n            },\n          ],\n        },\n      ],\n    },\n    {\n      slug: 'rels',\n      fields: [],\n    },\n  ],\n  localization: {\n    defaultLocale: 'en',\n    localeCodes: ['en', 'es'],\n    locales: [\n      { code: 'en', label: 'EN' },\n      { code: 'es', label: 'ES' },\n    ],\n  },\n} as SanitizedConfig\n\nconst relsData = {\n  rel_1: new Types.ObjectId().toHexString(),\n  rel_1_l: {\n    en: new Types.ObjectId().toHexString(),\n    es: new Types.ObjectId().toHexString(),\n  },\n  rel_2: [new Types.ObjectId().toHexString()],\n  rel_2_l: {\n    en: [new Types.ObjectId().toHexString()],\n    es: [new Types.ObjectId().toHexString()],\n  },\n  rel_3: {\n    relationTo: 'rels',\n    value: new Types.ObjectId().toHexString(),\n  },\n  rel_3_l: {\n    en: {\n      relationTo: 'rels',\n      value: new Types.ObjectId().toHexString(),\n    },\n    es: {\n      relationTo: 'rels',\n      value: new Types.ObjectId().toHexString(),\n    },\n  },\n  rel_4: [\n    {\n      relationTo: 'rels',\n      value: new Types.ObjectId().toHexString(),\n    },\n  ],\n  rel_4_l: {\n    en: [\n      {\n        relationTo: 'rels',\n        value: new Types.ObjectId().toHexString(),\n      },\n    ],\n    es: [\n      {\n        relationTo: 'rels',\n        value: new Types.ObjectId().toHexString(),\n      },\n    ],\n  },\n}\n\ndescribe('sanitizeRelationshipIDs', () => {\n  it('should sanitize relationships', () => {\n    const data = {\n      ...relsData,\n      array: [\n        {\n          ...relsData,\n          array: [{ ...relsData }],\n          blocks: [\n            {\n              blockType: 'block',\n              ...relsData,\n            },\n          ],\n        },\n      ],\n      arrayLocalized: {\n        en: [\n          {\n            ...relsData,\n            array: [{ ...relsData }],\n            blocks: [\n              {\n                blockType: 'block',\n                ...relsData,\n              },\n            ],\n          },\n        ],\n        es: [\n          {\n            ...relsData,\n            array: [{ ...relsData }],\n            blocks: [\n              {\n                blockType: 'block',\n                ...relsData,\n              },\n            ],\n          },\n        ],\n      },\n      blocks: [\n        {\n          blockType: 'block',\n          ...relsData,\n          array: [{ ...relsData }],\n          group: { ...relsData },\n        },\n      ],\n      group: {\n        ...relsData,\n        array: [{ ...relsData }],\n      },\n      groupLocalized: {\n        en: {\n          ...relsData,\n          array: [{ ...relsData }],\n        },\n        es: {\n          ...relsData,\n          array: [{ ...relsData }],\n        },\n      },\n      tab: { ...relsData },\n      tabLocalized: {\n        en: { ...relsData },\n        es: { ...relsData },\n      },\n    }\n    const flattenValuesBefore = Object.values(flattenRelationshipValues(data))\n\n    sanitizeRelationshipIDs({ config, data, fields: config.collections[0].fields })\n    const flattenValuesAfter = Object.values(flattenRelationshipValues(data))\n\n    flattenValuesAfter.forEach((value, i) => {\n      expect(value).toBeInstanceOf(Types.ObjectId)\n      expect(flattenValuesBefore[i]).toBe(value.toHexString())\n    })\n  })\n})\n"],"names":["Types","sanitizeRelationshipIDs","flattenRelationshipValues","obj","prefix","Object","keys","reduce","acc","key","fullKey","value","ObjectId","assign","endsWith","relsFields","name","type","relationTo","localized","hasMany","config","collections","slug","fields","blocks","tabs","localization","defaultLocale","localeCodes","locales","code","label","relsData","rel_1","toHexString","rel_1_l","en","es","rel_2","rel_2_l","rel_3","rel_3_l","rel_4","rel_4_l","describe","it","data","array","blockType","arrayLocalized","group","groupLocalized","tab","tabLocalized","flattenValuesBefore","values","flattenValuesAfter","forEach","i","expect","toBeInstanceOf","toBe"],"mappings":"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"}

package/dist/withSession.d.ts

@@ -1,35 +1,11 @@
-/// <reference types="mongoose/types/aggregate.js" />
-/// <reference types="mongoose/types/callback.js" />
-/// <reference types="mongoose/types/collection.js" />
-/// <reference types="mongoose/types/connection.js" />
-/// <reference types="mongoose/types/cursor.js" />
-/// <reference types="mongoose/types/document.js" />
-/// <reference types="mongoose/types/error.js" />
-/// <reference types="mongoose/types/expressions.js" />
-/// <reference types="mongoose/types/helpers.js" />
-/// <reference types="mongoose/types/middlewares.js" />
-/// <reference types="mongoose/types/indexes.js" />
-/// <reference types="mongoose/types/models.js" />
-/// <reference types="mongoose/types/mongooseoptions.js" />
-/// <reference types="mongoose/types/pipelinestage.js" />
-/// <reference types="mongoose/types/populate.js" />
-/// <reference types="mongoose/types/query.js" />
-/// <reference types="mongoose/types/schemaoptions.js" />
-/// <reference types="mongoose/types/schematypes.js" />
-/// <reference types="mongoose/types/session.js" />
-/// <reference types="mongoose/types/types.js" />
-/// <reference types="mongoose/types/utility.js" />
-/// <reference types="mongoose/types/validation.js" />
-/// <reference types="mongoose/types/virtuals.js" />
-/// <reference types="mongoose/types/inferschematype.js" />
-/// <reference types="mongoose-paginate-v2" />
 import type { ClientSession } from 'mongoose';
+import type { PayloadRequest } from 'payload';
 import type { MongooseAdapter } from './index.js';
 /**
  * returns the session belonging to the transaction of the req.session if exists
  * @returns ClientSession
  */
-export declare function withSession(db: MongooseAdapter, transactionID?: number | string): {
+export declare function withSession(db: MongooseAdapter, req: PayloadRequest): Promise<{
     session: ClientSession;
-} | object;
+} | Record<string, never>>;
 //# sourceMappingURL=withSession.d.ts.map

package/dist/withSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withSession.d.ts","sourceRoot":"","sources":["../src/withSession.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAE7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAEjD;;;GAGG;AACH,wBAAgB,WAAW,CACzB,EAAE,EAAE,eAAe,EACnB,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,GAC9B;IAAE,OAAO,EAAE,aAAa,CAAA;CAAE,GAAG,MAAM,CAErC"}
+{"version":3,"file":"withSession.d.ts","sourceRoot":"","sources":["../src/withSession.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAEjD;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,EAAE,EAAE,eAAe,EACnB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC;IAAE,OAAO,EAAE,aAAa,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAU7D"}

package/dist/withSession.js

@@ -1,10 +1,16 @@
 /**
  * returns the session belonging to the transaction of the req.session if exists
  * @returns ClientSession
- */ export function withSession(db, transactionID) {
-    return db.sessions[transactionID] ? {
-        session: db.sessions[transactionID]
-    } : {};
+ */ export async function withSession(db, req) {
+    let transactionID = req.transactionID;
+    if (transactionID instanceof Promise) {
+        transactionID = await req.transactionID;
+    }
+    if (req) {
+        return db.sessions[transactionID] ? {
+            session: db.sessions[transactionID]
+        } : {};
+    }
 }
 
 //# sourceMappingURL=withSession.js.map

package/dist/withSession.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/withSession.ts"],"sourcesContent":["import type { ClientSession } from 'mongoose'\n\nimport type { MongooseAdapter } from './index.js'\n\n/**\n * returns the session belonging to the transaction of the req.session if exists\n * @returns ClientSession\n */\nexport function withSession(\n  db: MongooseAdapter,\n  transactionID?: number | string,\n): { session: ClientSession } | object {\n  return db.sessions[transactionID] ? { session: db.sessions[transactionID] } : {}\n}\n"],"names":["withSession","db","transactionID","sessions","session"],"rangeMappings":";;;;;;;","mappings":"AAIA;;;CAGC,GACD,OAAO,SAASA,YACdC,EAAmB,EACnBC,aAA+B;IAE/B,OAAOD,GAAGE,QAAQ,CAACD,cAAc,GAAG;QAAEE,SAASH,GAAGE,QAAQ,CAACD,cAAc;IAAC,IAAI,CAAC;AACjF"}
+{"version":3,"sources":["../src/withSession.ts"],"sourcesContent":["import type { ClientSession } from 'mongoose'\nimport type { PayloadRequest } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\n/**\n * returns the session belonging to the transaction of the req.session if exists\n * @returns ClientSession\n */\nexport async function withSession(\n  db: MongooseAdapter,\n  req: PayloadRequest,\n): Promise<{ session: ClientSession } | Record<string, never>> {\n  let transactionID = req.transactionID\n\n  if (transactionID instanceof Promise) {\n    transactionID = await req.transactionID\n  }\n\n  if (req) {\n    return db.sessions[transactionID] ? { session: db.sessions[transactionID] } : {}\n  }\n}\n"],"names":["withSession","db","req","transactionID","Promise","sessions","session"],"mappings":"AAKA;;;CAGC,GACD,OAAO,eAAeA,YACpBC,EAAmB,EACnBC,GAAmB;IAEnB,IAAIC,gBAAgBD,IAAIC,aAAa;IAErC,IAAIA,yBAAyBC,SAAS;QACpCD,gBAAgB,MAAMD,IAAIC,aAAa;IACzC;IAEA,IAAID,KAAK;QACP,OAAOD,GAAGI,QAAQ,CAACF,cAAc,GAAG;YAAEG,SAASL,GAAGI,QAAQ,CAACF,cAAc;QAAC,IAAI,CAAC;IACjF;AACF"}

package/license.md

@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2018-2024 Payload CMS, Inc. <info@payloadcms.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-mongodb",
-  "version": "3.0.0-canary.f6e77b8",
+  "version": "3.0.0-canary.fb04843",
   "description": "The officially supported MongoDB database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -10,12 +10,24 @@
   },
   "license": "MIT",
   "author": "Payload <dev@payloadcms.com> (https://payloadcms.com)",
+  "maintainers": [
+    {
+      "name": "Payload",
+      "email": "info@payloadcms.com",
+      "url": "https://payloadcms.com"
+    }
+  ],
   "type": "module",
   "exports": {
     ".": {
       "import": "./dist/index.js",
-      "require": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./migration-utils": {
+      "import": "./dist/exports/migration-utils.js",
+      "types": "./dist/exports/migration-utils.d.ts",
+      "default": "./dist/exports/migration-utils.js"
     }
   },
   "main": "./dist/index.js",
@@ -26,29 +38,29 @@
     "predefinedMigrations"
   ],
   "dependencies": {
-    "bson-objectid": "2.0.4",
-    "deepmerge": "4.3.1",
-    "get-port": "5.1.1",
     "http-status": "1.6.2",
-    "mongoose": "6.12.3",
-    "mongoose-paginate-v2": "1.7.22",
+    "mongoose": "8.8.1",
+    "mongoose-aggregate-paginate-v2": "1.1.2",
+    "mongoose-paginate-v2": "1.8.5",
     "prompts": "2.4.2",
-    "uuid": "9.0.0"
+    "uuid": "10.0.0"
   },
   "devDependencies": {
-    "@types/mongoose-aggregate-paginate-v2": "1.0.9",
-    "mongodb": "4.17.1",
+    "@types/mongoose-aggregate-paginate-v2": "1.0.12",
+    "mongodb": "6.10.0",
     "mongodb-memory-server": "^9",
-    "@payloadcms/eslint-config": "1.1.1",
-    "payload": "3.0.0-canary.f6e77b8"
+    "@payloadcms/eslint-config": "3.0.0-beta.112",
+    "payload": "3.0.0-canary.fb04843"
   },
   "peerDependencies": {
-    "payload": "3.0.0-canary.f6e77b8"
+    "payload": "3.0.0-canary.fb04843"
   },
   "scripts": {
-    "build": "pnpm build:swc && pnpm build:types",
-    "build:swc": "swc ./src -d ./dist --config-file .swcrc-build",
+    "build": "pnpm build:types && pnpm build:swc",
+    "build:swc": "swc ./src -d ./dist --config-file .swcrc-build --strip-leading-paths",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
-    "clean": "rimraf {dist,*.tsbuildinfo}"
+    "clean": "rimraf {dist,*.tsbuildinfo}",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix"
   }
 }