@payloadcms/db-mongodb 3.0.0-canary.6041f49 → 3.0.0-canary.67aae47

package/dist/utilities/sanitizeRelationshipIDs.js

@@ -0,0 +1,115 @@
+import { Types } from 'mongoose';
+import { APIError, traverseFields } from 'payload';
+import { fieldAffectsData } from 'payload/shared';
+function isValidRelationObject(value) {
+    return typeof value === 'object' && value !== null && 'relationTo' in value && 'value' in value;
+}
+const convertValue = ({ relatedCollection, value })=>{
+    const customIDField = relatedCollection.fields.find((field)=>fieldAffectsData(field) && field.name === 'id');
+    if (!customIDField) {
+        try {
+            return new Types.ObjectId(value);
+        } catch (error) {
+            throw new APIError(`Failed to create ObjectId from value: ${value}. Error: ${error.message}`, 400);
+        }
+    }
+    return value;
+};
+const sanitizeRelationship = ({ config, field, locale, ref, value })=>{
+    let relatedCollection;
+    let result = value;
+    const hasManyRelations = typeof field.relationTo !== 'string';
+    if (!hasManyRelations) {
+        relatedCollection = config.collections?.find(({ slug })=>slug === field.relationTo);
+    }
+    if (Array.isArray(value)) {
+        result = value.map((val)=>{
+            // Handle has many
+            if (relatedCollection && val && (typeof val === 'string' || typeof val === 'number')) {
+                return convertValue({
+                    relatedCollection,
+                    value: val
+                });
+            }
+            // Handle has many - polymorphic
+            if (isValidRelationObject(val)) {
+                const relatedCollectionForSingleValue = config.collections?.find(({ slug })=>slug === val.relationTo);
+                if (relatedCollectionForSingleValue) {
+                    return {
+                        relationTo: val.relationTo,
+                        value: convertValue({
+                            relatedCollection: relatedCollectionForSingleValue,
+                            value: val.value
+                        })
+                    };
+                }
+            }
+            return val;
+        });
+    }
+    // Handle has one - polymorphic
+    if (isValidRelationObject(value)) {
+        relatedCollection = config.collections?.find(({ slug })=>slug === value.relationTo);
+        if (relatedCollection) {
+            result = {
+                relationTo: value.relationTo,
+                value: convertValue({
+                    relatedCollection,
+                    value: value.value
+                })
+            };
+        }
+    }
+    // Handle has one
+    if (relatedCollection && value && (typeof value === 'string' || typeof value === 'number')) {
+        result = convertValue({
+            relatedCollection,
+            value
+        });
+    }
+    if (locale) {
+        ref[locale] = result;
+    } else {
+        ref[field.name] = result;
+    }
+};
+export const sanitizeRelationshipIDs = ({ config, data, fields })=>{
+    const sanitize = ({ field, ref })=>{
+        if (field.type === 'relationship' || field.type === 'upload') {
+            // handle localized relationships
+            if (config.localization && field.localized) {
+                const locales = config.localization.locales;
+                const fieldRef = ref[field.name];
+                for (const { code } of locales){
+                    if (ref[field.name]?.[code]) {
+                        const value = ref[field.name][code];
+                        sanitizeRelationship({
+                            config,
+                            field,
+                            locale: code,
+                            ref: fieldRef,
+                            value
+                        });
+                    }
+                }
+            } else {
+                // handle non-localized relationships
+                sanitizeRelationship({
+                    config,
+                    field,
+                    locale: undefined,
+                    ref,
+                    value: ref[field.name]
+                });
+            }
+        }
+    };
+    traverseFields({
+        callback: sanitize,
+        fields,
+        ref: data
+    });
+    return data;
+};
+
+//# sourceMappingURL=sanitizeRelationshipIDs.js.map

package/dist/utilities/sanitizeRelationshipIDs.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/sanitizeRelationshipIDs.ts"],"sourcesContent":["import type { CollectionConfig, Field, SanitizedConfig, TraverseFieldsCallback } from 'payload'\n\nimport { Types } from 'mongoose'\nimport { APIError, traverseFields } from 'payload'\nimport { fieldAffectsData } from 'payload/shared'\n\ntype Args = {\n  config: SanitizedConfig\n  data: Record<string, unknown>\n  fields: Field[]\n}\n\ninterface RelationObject {\n  relationTo: string\n  value: number | string\n}\n\nfunction isValidRelationObject(value: unknown): value is RelationObject {\n  return typeof value === 'object' && value !== null && 'relationTo' in value && 'value' in value\n}\n\nconst convertValue = ({\n  relatedCollection,\n  value,\n}: {\n  relatedCollection: CollectionConfig\n  value: number | string\n}): number | string | Types.ObjectId => {\n  const customIDField = relatedCollection.fields.find(\n    (field) => fieldAffectsData(field) && field.name === 'id',\n  )\n\n  if (!customIDField) {\n    try {\n      return new Types.ObjectId(value)\n    } catch (error) {\n      throw new APIError(\n        `Failed to create ObjectId from value: ${value}. Error: ${error.message}`,\n        400,\n      )\n    }\n  }\n\n  return value\n}\n\nconst sanitizeRelationship = ({ config, field, locale, ref, value }) => {\n  let relatedCollection: CollectionConfig | undefined\n  let result = value\n\n  const hasManyRelations = typeof field.relationTo !== 'string'\n\n  if (!hasManyRelations) {\n    relatedCollection = config.collections?.find(({ slug }) => slug === field.relationTo)\n  }\n\n  if (Array.isArray(value)) {\n    result = value.map((val) => {\n      // Handle has many\n      if (relatedCollection && val && (typeof val === 'string' || typeof val === 'number')) {\n        return convertValue({\n          relatedCollection,\n          value: val,\n        })\n      }\n\n      // Handle has many - polymorphic\n      if (isValidRelationObject(val)) {\n        const relatedCollectionForSingleValue = config.collections?.find(\n          ({ slug }) => slug === val.relationTo,\n        )\n\n        if (relatedCollectionForSingleValue) {\n          return {\n            relationTo: val.relationTo,\n            value: convertValue({\n              relatedCollection: relatedCollectionForSingleValue,\n              value: val.value,\n            }),\n          }\n        }\n      }\n\n      return val\n    })\n  }\n\n  // Handle has one - polymorphic\n  if (isValidRelationObject(value)) {\n    relatedCollection = config.collections?.find(({ slug }) => slug === value.relationTo)\n\n    if (relatedCollection) {\n      result = {\n        relationTo: value.relationTo,\n        value: convertValue({ relatedCollection, value: value.value }),\n      }\n    }\n  }\n\n  // Handle has one\n  if (relatedCollection && value && (typeof value === 'string' || typeof value === 'number')) {\n    result = convertValue({\n      relatedCollection,\n      value,\n    })\n  }\n  if (locale) {\n    ref[locale] = result\n  } else {\n    ref[field.name] = result\n  }\n}\n\nexport const sanitizeRelationshipIDs = ({\n  config,\n  data,\n  fields,\n}: Args): Record<string, unknown> => {\n  const sanitize: TraverseFieldsCallback = ({ field, ref }) => {\n    if (field.type === 'relationship' || field.type === 'upload') {\n      // handle localized relationships\n      if (config.localization && field.localized) {\n        const locales = config.localization.locales\n        const fieldRef = ref[field.name]\n        for (const { code } of locales) {\n          if (ref[field.name]?.[code]) {\n            const value = ref[field.name][code]\n            sanitizeRelationship({ config, field, locale: code, ref: fieldRef, value })\n          }\n        }\n      } else {\n        // handle non-localized relationships\n        sanitizeRelationship({\n          config,\n          field,\n          locale: undefined,\n          ref,\n          value: ref[field.name],\n        })\n      }\n    }\n  }\n\n  traverseFields({ callback: sanitize, fields, ref: data })\n\n  return data\n}\n"],"names":["Types","APIError","traverseFields","fieldAffectsData","isValidRelationObject","value","convertValue","relatedCollection","customIDField","fields","find","field","name","ObjectId","error","message","sanitizeRelationship","config","locale","ref","result","hasManyRelations","relationTo","collections","slug","Array","isArray","map","val","relatedCollectionForSingleValue","sanitizeRelationshipIDs","data","sanitize","type","localization","localized","locales","fieldRef","code","undefined","callback"],"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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-mongodb",
-  "version": "3.0.0-canary.6041f49",
+  "version": "3.0.0-canary.67aae47",
   "description": "The officially supported MongoDB database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -14,8 +14,8 @@
   "exports": {
     ".": {
       "import": "./dist/index.js",
-      "require": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     }
   },
   "main": "./dist/index.js",
@@ -26,29 +26,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.6041f49"
+    "@payloadcms/eslint-config": "3.0.0-beta.112",
+    "payload": "3.0.0-canary.67aae47"
   },
   "peerDependencies": {
-    "payload": "3.0.0-canary.6041f49"
+    "payload": "3.0.0-canary.67aae47"
   },
   "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"
   }
 }