@payloadcms/db-mongodb 3.1.1-canary.9da0158 → 3.1.1

package/dist/predefinedMigrations/migrateRelationshipsV2_V3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrateRelationshipsV2_V3.d.ts","sourceRoot":"","sources":["../../src/predefinedMigrations/migrateRelationshipsV2_V3.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAS,cAAc,EAAmB,MAAM,SAAS,CAAA;AAmGrE,wBAAsB,yBAAyB,CAAC,EAC9C,SAAS,EACT,GAAG,GACJ,EAAE;IACD,SAAS,EAAE,MAAM,CAAA;IACjB,GAAG,EAAE,cAAc,CAAA;CACpB,GAAG,OAAO,CAAC,IAAI,CAAC,CA4EhB"}
+{"version":3,"file":"migrateRelationshipsV2_V3.d.ts","sourceRoot":"","sources":["../../src/predefinedMigrations/migrateRelationshipsV2_V3.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAS,cAAc,EAAmB,MAAM,SAAS,CAAA;AAmGrE,wBAAsB,yBAAyB,CAAC,EAC9C,SAAS,EACT,GAAG,GACJ,EAAE;IACD,SAAS,EAAE,MAAM,CAAA;IACjB,GAAG,EAAE,cAAc,CAAA;CACpB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+EhB"}

package/dist/predefinedMigrations/migrateRelationshipsV2_V3.js

@@ -111,18 +111,21 @@ export async function migrateRelationshipsV2_V3({ batchSize, req }) {
             lean: true,
             session
         });
-        sanitizeRelationshipIDs({
-            config,
-            data: doc,
-            fields: global.fields
-        });
-        await GlobalsModel.collection.updateOne({
-            globalType: global.slug
-        }, {
-            $set: doc
-        }, {
-            session
-        });
+        // in case if the global doesn't exist in the database yet  (not saved)
+        if (doc) {
+            sanitizeRelationshipIDs({
+                config,
+                data: doc,
+                fields: global.fields
+            });
+            await GlobalsModel.collection.updateOne({
+                globalType: global.slug
+            }, {
+                $set: doc
+            }, {
+                session
+            });
+        }
         payload.logger.info(`Migrated global "${global.slug}"`);
         if (global.versions) {
             payload.logger.info(`Migrating global versions "${global.slug}"`);

package/dist/predefinedMigrations/migrateRelationshipsV2_V3.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/predefinedMigrations/migrateRelationshipsV2_V3.ts"],"sourcesContent":["import type { ClientSession, Model } from 'mongoose'\nimport type { Field, PayloadRequest, SanitizedConfig } from 'payload'\n\nimport { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload'\n\nimport type { MongooseAdapter } from '../index.js'\n\nimport { sanitizeRelationshipIDs } from '../utilities/sanitizeRelationshipIDs.js'\nimport { withSession } from '../withSession.js'\n\nconst migrateModelWithBatching = async ({\n  batchSize,\n  config,\n  fields,\n  Model,\n  session,\n}: {\n  batchSize: number\n  config: SanitizedConfig\n  fields: Field[]\n  Model: Model<any>\n  session: ClientSession\n}): Promise<void> => {\n  let hasNext = true\n  let skip = 0\n\n  while (hasNext) {\n    const docs = await Model.find(\n      {},\n      {},\n      {\n        lean: true,\n        limit: batchSize + 1,\n        session,\n        skip,\n      },\n    )\n\n    if (docs.length === 0) {\n      break\n    }\n\n    hasNext = docs.length > batchSize\n\n    if (hasNext) {\n      docs.pop()\n    }\n\n    for (const doc of docs) {\n      sanitizeRelationshipIDs({ config, data: doc, fields })\n    }\n\n    await Model.collection.bulkWrite(\n      docs.map((doc) => ({\n        updateOne: {\n          filter: { _id: doc._id },\n          update: {\n            $set: doc,\n          },\n        },\n      })),\n      { session },\n    )\n\n    skip += batchSize\n  }\n}\n\nconst hasRelationshipOrUploadField = ({ fields }: { fields: Field[] }): boolean => {\n  for (const field of fields) {\n    if (field.type === 'relationship' || field.type === 'upload') {\n      return true\n    }\n\n    if ('fields' in field) {\n      if (hasRelationshipOrUploadField({ fields: field.fields })) {\n        return true\n      }\n    }\n\n    if ('blocks' in field) {\n      for (const block of field.blocks) {\n        if (hasRelationshipOrUploadField({ fields: block.fields })) {\n          return true\n        }\n      }\n    }\n\n    if ('tabs' in field) {\n      for (const tab of field.tabs) {\n        if (hasRelationshipOrUploadField({ fields: tab.fields })) {\n          return true\n        }\n      }\n    }\n  }\n\n  return false\n}\n\nexport async function migrateRelationshipsV2_V3({\n  batchSize,\n  req,\n}: {\n  batchSize: number\n  req: PayloadRequest\n}): Promise<void> {\n  const { payload } = req\n  const db = payload.db as MongooseAdapter\n  const config = payload.config\n\n  const { session } = await withSession(db, req)\n\n  for (const collection of payload.config.collections.filter(hasRelationshipOrUploadField)) {\n    payload.logger.info(`Migrating collection \"${collection.slug}\"`)\n\n    await migrateModelWithBatching({\n      batchSize,\n      config,\n      fields: collection.fields,\n      Model: db.collections[collection.slug],\n      session,\n    })\n\n    payload.logger.info(`Migrated collection \"${collection.slug}\"`)\n\n    if (collection.versions) {\n      payload.logger.info(`Migrating collection versions \"${collection.slug}\"`)\n\n      await migrateModelWithBatching({\n        batchSize,\n        config,\n        fields: buildVersionCollectionFields(config, collection),\n        Model: db.versions[collection.slug],\n        session,\n      })\n\n      payload.logger.info(`Migrated collection versions \"${collection.slug}\"`)\n    }\n  }\n\n  const { globals: GlobalsModel } = db\n\n  for (const global of payload.config.globals.filter(hasRelationshipOrUploadField)) {\n    payload.logger.info(`Migrating global \"${global.slug}\"`)\n\n    const doc = await GlobalsModel.findOne<Record<string, unknown>>(\n      {\n        globalType: {\n          $eq: global.slug,\n        },\n      },\n      {},\n      { lean: true, session },\n    )\n\n    sanitizeRelationshipIDs({ config, data: doc, fields: global.fields })\n\n    await GlobalsModel.collection.updateOne(\n      {\n        globalType: global.slug,\n      },\n      { $set: doc },\n      { session },\n    )\n\n    payload.logger.info(`Migrated global \"${global.slug}\"`)\n\n    if (global.versions) {\n      payload.logger.info(`Migrating global versions \"${global.slug}\"`)\n\n      await migrateModelWithBatching({\n        batchSize,\n        config,\n        fields: buildVersionGlobalFields(config, global),\n        Model: db.versions[global.slug],\n        session,\n      })\n\n      payload.logger.info(`Migrated global versions \"${global.slug}\"`)\n    }\n  }\n}\n"],"names":["buildVersionCollectionFields","buildVersionGlobalFields","sanitizeRelationshipIDs","withSession","migrateModelWithBatching","batchSize","config","fields","Model","session","hasNext","skip","docs","find","lean","limit","length","pop","doc","data","collection","bulkWrite","map","updateOne","filter","_id","update","$set","hasRelationshipOrUploadField","field","type","block","blocks","tab","tabs","migrateRelationshipsV2_V3","req","payload","db","collections","logger","info","slug","versions","globals","GlobalsModel","global","findOne","globalType","$eq"],"mappings":"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"}
+{"version":3,"sources":["../../src/predefinedMigrations/migrateRelationshipsV2_V3.ts"],"sourcesContent":["import type { ClientSession, Model } from 'mongoose'\nimport type { Field, PayloadRequest, SanitizedConfig } from 'payload'\n\nimport { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload'\n\nimport type { MongooseAdapter } from '../index.js'\n\nimport { sanitizeRelationshipIDs } from '../utilities/sanitizeRelationshipIDs.js'\nimport { withSession } from '../withSession.js'\n\nconst migrateModelWithBatching = async ({\n  batchSize,\n  config,\n  fields,\n  Model,\n  session,\n}: {\n  batchSize: number\n  config: SanitizedConfig\n  fields: Field[]\n  Model: Model<any>\n  session: ClientSession\n}): Promise<void> => {\n  let hasNext = true\n  let skip = 0\n\n  while (hasNext) {\n    const docs = await Model.find(\n      {},\n      {},\n      {\n        lean: true,\n        limit: batchSize + 1,\n        session,\n        skip,\n      },\n    )\n\n    if (docs.length === 0) {\n      break\n    }\n\n    hasNext = docs.length > batchSize\n\n    if (hasNext) {\n      docs.pop()\n    }\n\n    for (const doc of docs) {\n      sanitizeRelationshipIDs({ config, data: doc, fields })\n    }\n\n    await Model.collection.bulkWrite(\n      docs.map((doc) => ({\n        updateOne: {\n          filter: { _id: doc._id },\n          update: {\n            $set: doc,\n          },\n        },\n      })),\n      { session },\n    )\n\n    skip += batchSize\n  }\n}\n\nconst hasRelationshipOrUploadField = ({ fields }: { fields: Field[] }): boolean => {\n  for (const field of fields) {\n    if (field.type === 'relationship' || field.type === 'upload') {\n      return true\n    }\n\n    if ('fields' in field) {\n      if (hasRelationshipOrUploadField({ fields: field.fields })) {\n        return true\n      }\n    }\n\n    if ('blocks' in field) {\n      for (const block of field.blocks) {\n        if (hasRelationshipOrUploadField({ fields: block.fields })) {\n          return true\n        }\n      }\n    }\n\n    if ('tabs' in field) {\n      for (const tab of field.tabs) {\n        if (hasRelationshipOrUploadField({ fields: tab.fields })) {\n          return true\n        }\n      }\n    }\n  }\n\n  return false\n}\n\nexport async function migrateRelationshipsV2_V3({\n  batchSize,\n  req,\n}: {\n  batchSize: number\n  req: PayloadRequest\n}): Promise<void> {\n  const { payload } = req\n  const db = payload.db as MongooseAdapter\n  const config = payload.config\n\n  const { session } = await withSession(db, req)\n\n  for (const collection of payload.config.collections.filter(hasRelationshipOrUploadField)) {\n    payload.logger.info(`Migrating collection \"${collection.slug}\"`)\n\n    await migrateModelWithBatching({\n      batchSize,\n      config,\n      fields: collection.fields,\n      Model: db.collections[collection.slug],\n      session,\n    })\n\n    payload.logger.info(`Migrated collection \"${collection.slug}\"`)\n\n    if (collection.versions) {\n      payload.logger.info(`Migrating collection versions \"${collection.slug}\"`)\n\n      await migrateModelWithBatching({\n        batchSize,\n        config,\n        fields: buildVersionCollectionFields(config, collection),\n        Model: db.versions[collection.slug],\n        session,\n      })\n\n      payload.logger.info(`Migrated collection versions \"${collection.slug}\"`)\n    }\n  }\n\n  const { globals: GlobalsModel } = db\n\n  for (const global of payload.config.globals.filter(hasRelationshipOrUploadField)) {\n    payload.logger.info(`Migrating global \"${global.slug}\"`)\n\n    const doc = await GlobalsModel.findOne<Record<string, unknown>>(\n      {\n        globalType: {\n          $eq: global.slug,\n        },\n      },\n      {},\n      { lean: true, session },\n    )\n\n    // in case if the global doesn't exist in the database yet  (not saved)\n    if (doc) {\n      sanitizeRelationshipIDs({ config, data: doc, fields: global.fields })\n\n      await GlobalsModel.collection.updateOne(\n        {\n          globalType: global.slug,\n        },\n        { $set: doc },\n        { session },\n      )\n    }\n\n    payload.logger.info(`Migrated global \"${global.slug}\"`)\n\n    if (global.versions) {\n      payload.logger.info(`Migrating global versions \"${global.slug}\"`)\n\n      await migrateModelWithBatching({\n        batchSize,\n        config,\n        fields: buildVersionGlobalFields(config, global),\n        Model: db.versions[global.slug],\n        session,\n      })\n\n      payload.logger.info(`Migrated global versions \"${global.slug}\"`)\n    }\n  }\n}\n"],"names":["buildVersionCollectionFields","buildVersionGlobalFields","sanitizeRelationshipIDs","withSession","migrateModelWithBatching","batchSize","config","fields","Model","session","hasNext","skip","docs","find","lean","limit","length","pop","doc","data","collection","bulkWrite","map","updateOne","filter","_id","update","$set","hasRelationshipOrUploadField","field","type","block","blocks","tab","tabs","migrateRelationshipsV2_V3","req","payload","db","collections","logger","info","slug","versions","globals","GlobalsModel","global","findOne","globalType","$eq"],"mappings":"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"}

package/dist/utilities/sanitizeRelationshipIDs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sanitizeRelationshipIDs.d.ts","sourceRoot":"","sources":["../../src/utilities/sanitizeRelationshipIDs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAoB,KAAK,EAAE,eAAe,EAA0B,MAAM,SAAS,CAAA;AAM/F,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7B,MAAM,EAAE,KAAK,EAAE,CAAA;CAChB,CAAA;AAuGD,eAAO,MAAM,uBAAuB,8BAIjC,IAAI,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAyC/B,CAAA"}
+{"version":3,"file":"sanitizeRelationshipIDs.d.ts","sourceRoot":"","sources":["../../src/utilities/sanitizeRelationshipIDs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAoB,KAAK,EAAE,eAAe,EAA0B,MAAM,SAAS,CAAA;AAM/F,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7B,MAAM,EAAE,KAAK,EAAE,CAAA;CAChB,CAAA;AAoGD,eAAO,MAAM,uBAAuB,8BAIjC,IAAI,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAyC/B,CAAA"}

package/dist/utilities/sanitizeRelationshipIDs.js

@@ -1,19 +1,19 @@
 import { Types } from 'mongoose';
-import { APIError, traverseFields } from 'payload';
+import { 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);
-        }
+    if (customIDField) {
+        return value;
+    }
+    try {
+        return new Types.ObjectId(value);
+    } catch  {
+        return value;
     }
-    return value;
 };
 const sanitizeRelationship = ({ config, field, locale, ref, value })=>{
     let relatedCollection;

package/dist/utilities/sanitizeRelationshipIDs.js.map

@@ -1 +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 (!ref || typeof ref !== 'object') {\n      return\n    }\n\n    if (field.type === 'relationship' || field.type === 'upload') {\n      if (!ref[field.name]) {\n        return\n      }\n\n      // handle localized relationships\n      if (config.localization && field.localized) {\n        const locales = config.localization.locales\n        const fieldRef = ref[field.name]\n        if (typeof fieldRef !== 'object') {\n          return\n        }\n\n        for (const { code } of locales) {\n          const value = ref[field.name][code]\n          if (value) {\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, fillEmpty: false, 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","fillEmpty"],"mappings":"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"}
+{"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    return value\n  }\n\n  try {\n    return new Types.ObjectId(value)\n  } catch {\n    return value\n  }\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 (!ref || typeof ref !== 'object') {\n      return\n    }\n\n    if (field.type === 'relationship' || field.type === 'upload') {\n      if (!ref[field.name]) {\n        return\n      }\n\n      // handle localized relationships\n      if (config.localization && field.localized) {\n        const locales = config.localization.locales\n        const fieldRef = ref[field.name]\n        if (typeof fieldRef !== 'object') {\n          return\n        }\n\n        for (const { code } of locales) {\n          const value = ref[field.name][code]\n          if (value) {\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, fillEmpty: false, ref: data })\n\n  return data\n}\n"],"names":["Types","traverseFields","fieldAffectsData","isValidRelationObject","value","convertValue","relatedCollection","customIDField","fields","find","field","name","ObjectId","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","fillEmpty"],"mappings":"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"}

package/dist/utilities/sanitizeRelationshipIDs.spec.js

@@ -197,6 +197,20 @@ const config = {
                             name: 'tabLocalized',
                             fields: relsFields,
                             localized: true
+                        },
+                        {
+                            label: 'another',
+                            fields: [
+                                {
+                                    type: 'tabs',
+                                    tabs: [
+                                        {
+                                            name: 'nestedTab',
+                                            fields: relsFields
+                                        }
+                                    ]
+                                }
+                            ]
                         }
                     ]
                 }
@@ -389,6 +403,9 @@ describe('sanitizeRelationshipIDs', ()=>{
                 es: {
                     ...relsData
                 }
+            },
+            nestedTab: {
+                ...relsData
             }
         };
         const flattenValuesBefore = Object.values(flattenRelationshipValues(data));

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

@@ -1 +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          name: 'groupAndRow',\n          type: 'group',\n          fields: [\n            {\n              type: 'row',\n              fields: [\n                ...relsFields,\n                {\n                  type: 'array',\n                  name: 'array',\n                  fields: relsFields,\n                },\n              ],\n            },\n          ],\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      groupAndRow: {\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","groupAndRow","groupLocalized","tab","tabLocalized","flattenValuesBefore","values","flattenValuesAfter","forEach","i","expect","toBeInstanceOf","toBe"],"mappings":"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"}
+{"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          name: 'groupAndRow',\n          type: 'group',\n          fields: [\n            {\n              type: 'row',\n              fields: [\n                ...relsFields,\n                {\n                  type: 'array',\n                  name: 'array',\n                  fields: relsFields,\n                },\n              ],\n            },\n          ],\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              label: 'another',\n              fields: [\n                {\n                  type: 'tabs',\n                  tabs: [\n                    {\n                      name: 'nestedTab',\n                      fields: relsFields,\n                    },\n                  ],\n                },\n              ],\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      groupAndRow: {\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      nestedTab: { ...relsData },\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","label","localization","defaultLocale","localeCodes","locales","code","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","groupAndRow","groupLocalized","tab","tabLocalized","nestedTab","flattenValuesBefore","values","flattenValuesAfter","forEach","i","expect","toBeInstanceOf","toBe"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-mongodb",
-  "version": "3.1.1-canary.9da0158",
+  "version": "3.1.1",
   "description": "The officially supported MongoDB database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -49,10 +49,10 @@
     "mongodb": "6.10.0",
     "mongodb-memory-server": "^9",
     "@payloadcms/eslint-config": "3.0.0",
-    "payload": "3.1.1-canary.9da0158"
+    "payload": "3.1.1"
   },
   "peerDependencies": {
-    "payload": "3.1.1-canary.9da0158"
+    "payload": "3.1.1"
   },
   "scripts": {
     "build": "pnpm build:types && pnpm build:swc",