@payloadcms/figma 0.0.1-alpha.40 → 0.0.1-alpha.42

package/dist/db-content-api/temp-utilities/unwrapDocument.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/db-content-api/temp-utilities/unwrapDocument.ts"],"sourcesContent":["import type { Payload } from 'payload'\n\nimport type { components } from '../generated/content-api-types.js'\n\nimport { dataFromContentAPI } from '../utilities/data/index.js'\n\n// Helper to unwrap Content API document format to Payload format\n// Content API returns:\n//   - For documents: { id, data: { ...fields }, createdAt, updatedAt }\n//   - For versions: { id, documentId, latest, data: { ...fields }, createdAt, updatedAt }\n// Payload expects:\n//   - For documents: { id, ...fields, createdAt, updatedAt }\n//   - For versions: { id, parent, latest, version: { ...fields }, createdAt, updatedAt }\nexport function unwrapDocument(\n  payload: Payload,\n  doc: components['schemas']['Document'] | components['schemas']['DocumentVersion'],\n  collectionSlug?: string,\n): Record<string, unknown> {\n  if (!doc) {\n    return doc as unknown as Record<string, unknown>\n  }\n\n  // Check if this is a DocumentVersion (has documentId and latest fields)\n  const isVersion = 'documentId' in doc && 'latest' in doc\n\n  if (isVersion) {\n    // For versions, Payload expects nested structure with 'version' field\n    const versionDoc = doc\n    const baseDoc = {\n      id: versionDoc.id,\n      createdAt: versionDoc.createdAt,\n      latest: versionDoc.latest,\n      parent: versionDoc.documentId, // Content API uses 'documentId', Payload expects 'parent'\n      updatedAt: versionDoc.updatedAt,\n      version: versionDoc.data, // Nest data inside 'version'\n    } as Record<string, unknown>\n\n    // Transform data from Content API format to Payload format\n    if (collectionSlug) {\n      // Only transform the nested 'version' field\n      baseDoc.version = dataFromContentAPI(payload, collectionSlug, baseDoc.version) as Record<\n        string,\n        unknown\n      >\n\n      // Also convert version ID if collection uses numeric custom ID\n      const customIDType = payload.collections?.[collectionSlug]?.customIDType\n      if (customIDType === 'number') {\n        baseDoc.id = Number(baseDoc.id)\n      }\n    }\n\n    return baseDoc\n  } else {\n    // For regular documents, spread data at root level\n    const baseDoc = {\n      ...doc.data, // Spread the actual document fields\n      id: doc.id,\n      createdAt: doc.createdAt,\n      updatedAt: doc.updatedAt,\n    }\n\n    // Transform data from Content API format to Payload format\n    if (collectionSlug) {\n      return dataFromContentAPI(payload, collectionSlug, baseDoc) as Record<string, unknown>\n    }\n\n    return baseDoc as Record<string, unknown>\n  }\n}\n"],"names":["dataFromContentAPI","unwrapDocument","payload","doc","collectionSlug","isVersion","versionDoc","baseDoc","id","createdAt","latest","parent","documentId","updatedAt","version","data","customIDType","collections","Number"],"mappings":"AAIA,SAASA,kBAAkB,QAAQ,6BAA4B;AAE/D,iEAAiE;AACjE,uBAAuB;AACvB,uEAAuE;AACvE,0FAA0F;AAC1F,mBAAmB;AACnB,6DAA6D;AAC7D,yFAAyF;AACzF,OAAO,SAASC,eACdC,OAAgB,EAChBC,GAAiF,EACjFC,cAAuB;IAEvB,IAAI,CAACD,KAAK;QACR,OAAOA;IACT;IAEA,wEAAwE;IACxE,MAAME,YAAY,gBAAgBF,OAAO,YAAYA;IAErD,IAAIE,WAAW;QACb,sEAAsE;QACtE,MAAMC,aAAaH;QACnB,MAAMI,UAAU;YACdC,IAAIF,WAAWE,EAAE;YACjBC,WAAWH,WAAWG,SAAS;YAC/BC,QAAQJ,WAAWI,MAAM;YACzBC,QAAQL,WAAWM,UAAU;YAC7BC,WAAWP,WAAWO,SAAS;YAC/BC,SAASR,WAAWS,IAAI;QAC1B;QAEA,2DAA2D;QAC3D,IAAIX,gBAAgB;YAClB,4CAA4C;YAC5CG,QAAQO,OAAO,GAAGd,mBAAmBE,SAASE,gBAAgBG,QAAQO,OAAO;YAK7E,+DAA+D;YAC/D,MAAME,eAAed,QAAQe,WAAW,EAAE,CAACb,eAAe,EAAEY;YAC5D,IAAIA,iBAAiB,UAAU;gBAC7BT,QAAQC,EAAE,GAAGU,OAAOX,QAAQC,EAAE;YAChC;QACF;QAEA,OAAOD;IACT,OAAO;QACL,mDAAmD;QACnD,MAAMA,UAAU;YACd,GAAGJ,IAAIY,IAAI;YACXP,IAAIL,IAAIK,EAAE;YACVC,WAAWN,IAAIM,SAAS;YACxBI,WAAWV,IAAIU,SAAS;QAC1B;QAEA,2DAA2D;QAC3D,IAAIT,gBAAgB;YAClB,OAAOJ,mBAAmBE,SAASE,gBAAgBG;QACrD;QAEA,OAAOA;IACT;AACF"}
+{"version":3,"sources":["../../../src/db-content-api/temp-utilities/unwrapDocument.ts"],"sourcesContent":["import type { Payload } from 'payload'\n\nimport type { components } from '../generated/content-api-types.js'\n\nimport { dataFromContentAPI } from '../utilities/data/index.js'\n\ntype DocumentResponse = { id: string } & components['schemas']['Document']\ntype DocumentVersionResponse = { id: string } & components['schemas']['DocumentVersion']\n\n// Helper to unwrap Content API document format to Payload format\n// Content API returns:\n//   - For documents: { id, contentSystemId, collection, doc: { ...fields, createdAt, updatedAt } }\n//   - For versions: { id, contentSystemId, collection, versionDoc: { id, createdAt, updatedAt, latest, parent, version: {...fields} } }\n// Payload expects:\n//   - For documents: { id, ...fields, createdAt, updatedAt }\n//   - For versions: { id, parent, latest, version: { ...fields }, createdAt, updatedAt }\nexport function unwrapDocument(\n  payload: Payload,\n  doc: DocumentResponse | DocumentVersionResponse,\n  collectionSlug?: string,\n): Record<string, unknown> {\n  if (!doc) {\n    return doc as unknown as Record<string, unknown>\n  }\n\n  // Check if this is a DocumentVersion (has versionDoc field)\n  const isVersion = 'versionDoc' in doc\n\n  if (isVersion) {\n    // For versions, Payload expects nested structure with 'version' field\n    const { versionDoc } = doc\n    const baseDoc = { ...versionDoc } as Record<string, unknown>\n\n    // Transform data from Content API format to Payload format\n    if (collectionSlug) {\n      // Only transform the nested 'version' field\n      baseDoc.version = dataFromContentAPI(payload, collectionSlug, baseDoc.version) as Record<\n        string,\n        unknown\n      >\n\n      // Also convert version ID if collection uses numeric custom ID\n      const customIDType = payload.collections?.[collectionSlug]?.customIDType\n      if (customIDType === 'number') {\n        baseDoc.id = Number(baseDoc.id)\n      }\n    }\n\n    return baseDoc\n  }\n\n  // For regular documents, spread doc data at root level\n  const { id, doc: docData } = doc\n  const baseDoc = { ...docData, id }\n\n  // Transform data from Content API format to Payload format\n  if (collectionSlug) {\n    return dataFromContentAPI(payload, collectionSlug, baseDoc) as Record<string, unknown>\n  }\n\n  return baseDoc\n}\n\nexport const unwrapFindResponse = (\n  payload: Payload,\n  response:\n    | components['schemas']['FindDocumentsResponse']['result']\n    | components['schemas']['FindDocumentVersionsResponse']['result'],\n  collection: string,\n) => {\n  const { data, ...paginationFields } = response\n  return {\n    docs: data.map((doc) =>\n      unwrapDocument(payload, doc as DocumentResponse | DocumentVersionResponse, collection),\n    ),\n    ...paginationFields,\n  }\n}\n"],"names":["dataFromContentAPI","unwrapDocument","payload","doc","collectionSlug","isVersion","versionDoc","baseDoc","version","customIDType","collections","id","Number","docData","unwrapFindResponse","response","collection","data","paginationFields","docs","map"],"mappings":"AAIA,SAASA,kBAAkB,QAAQ,6BAA4B;AAK/D,iEAAiE;AACjE,uBAAuB;AACvB,mGAAmG;AACnG,wIAAwI;AACxI,mBAAmB;AACnB,6DAA6D;AAC7D,yFAAyF;AACzF,OAAO,SAASC,eACdC,OAAgB,EAChBC,GAA+C,EAC/CC,cAAuB;IAEvB,IAAI,CAACD,KAAK;QACR,OAAOA;IACT;IAEA,4DAA4D;IAC5D,MAAME,YAAY,gBAAgBF;IAElC,IAAIE,WAAW;QACb,sEAAsE;QACtE,MAAM,EAAEC,UAAU,EAAE,GAAGH;QACvB,MAAMI,UAAU;YAAE,GAAGD,UAAU;QAAC;QAEhC,2DAA2D;QAC3D,IAAIF,gBAAgB;YAClB,4CAA4C;YAC5CG,QAAQC,OAAO,GAAGR,mBAAmBE,SAASE,gBAAgBG,QAAQC,OAAO;YAK7E,+DAA+D;YAC/D,MAAMC,eAAeP,QAAQQ,WAAW,EAAE,CAACN,eAAe,EAAEK;YAC5D,IAAIA,iBAAiB,UAAU;gBAC7BF,QAAQI,EAAE,GAAGC,OAAOL,QAAQI,EAAE;YAChC;QACF;QAEA,OAAOJ;IACT;IAEA,uDAAuD;IACvD,MAAM,EAAEI,EAAE,EAAER,KAAKU,OAAO,EAAE,GAAGV;IAC7B,MAAMI,UAAU;QAAE,GAAGM,OAAO;QAAEF;IAAG;IAEjC,2DAA2D;IAC3D,IAAIP,gBAAgB;QAClB,OAAOJ,mBAAmBE,SAASE,gBAAgBG;IACrD;IAEA,OAAOA;AACT;AAEA,OAAO,MAAMO,qBAAqB,CAChCZ,SACAa,UAGAC;IAEA,MAAM,EAAEC,IAAI,EAAE,GAAGC,kBAAkB,GAAGH;IACtC,OAAO;QACLI,MAAMF,KAAKG,GAAG,CAAC,CAACjB,MACdF,eAAeC,SAASC,KAAmDa;QAE7E,GAAGE,gBAAgB;IACrB;AACF,EAAC"}

package/dist/db-content-api/utilities/buildPathTypes.d.ts

@@ -0,0 +1,12 @@
+import type { Payload, Where } from 'payload';
+/**
+ * Builds metadata for Content API request with pathTypes information
+ * Returns an object ready to spread into the request body
+ * This tells the Content API which paths are arrays/objects for proper query generation
+ */
+export declare function buildPathTypes(payload: Payload, collectionSlug: string, where: undefined | Where): {
+    meta?: {
+        pathTypes: Record<string, 'array'>;
+    };
+};
+//# sourceMappingURL=buildPathTypes.d.ts.map

package/dist/db-content-api/utilities/buildPathTypes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildPathTypes.d.ts","sourceRoot":"","sources":["../../../src/db-content-api/utilities/buildPathTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAS,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AA8JpD;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,SAAS,GAAG,KAAK,GACvB;IAAE,IAAI,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAA;CAAE,CA2BnD"}

package/dist/db-content-api/utilities/buildPathTypes.js

@@ -0,0 +1,157 @@
+/**
+ * Extracts all field paths from a where clause recursively
+ */ function extractPathsFromWhere(where, paths = new Set()) {
+    if (!where || typeof where !== 'object') {
+        return paths;
+    }
+    // Handle 'and' operator
+    if ('and' in where && Array.isArray(where.and)) {
+        for (const clause of where.and){
+            extractPathsFromWhere(clause, paths);
+        }
+        return paths;
+    }
+    // Handle 'or' operator
+    if ('or' in where && Array.isArray(where.or)) {
+        for (const clause of where.or){
+            extractPathsFromWhere(clause, paths);
+        }
+        return paths;
+    }
+    // Handle regular conditions - keys are field paths
+    for(const key in where){
+        if (key === 'and' || key === 'or') {
+            continue;
+        }
+        // Add the path
+        paths.add(key);
+        // Check if the value is a nested where clause (for relationships)
+        const value = where[key];
+        if (value && typeof value === 'object' && !('equals' in value) && !('in' in value)) {
+            // Might be a nested where, recurse
+            extractPathsFromWhere(value, paths);
+        }
+    }
+    return paths;
+}
+/**
+ * Determines the type of a field based on its configuration
+ */ function getFieldType(field) {
+    // Array field
+    if (field.type === 'array') {
+        return 'array';
+    }
+    // Blocks field (array of objects)
+    if (field.type === 'blocks') {
+        return 'array';
+    }
+    // Relationship field with hasMany (array)
+    if (field.type === 'relationship' && 'hasMany' in field && field.hasMany) {
+        return 'array';
+    }
+    // Select field with hasMany (array)
+    if (field.type === 'select' && 'hasMany' in field && field.hasMany) {
+        return 'array';
+    }
+    // Upload field with hasMany (array)
+    if (field.type === 'upload' && 'hasMany' in field && field.hasMany) {
+        return 'array';
+    }
+    // Objects (group, collapsible, row, tabs) don't need traversal
+    return null;
+}
+/**
+ * Finds a field in the collection schema by its path
+ * Supports nested paths like "access.read.users"
+ */ function findFieldByPath(payload, collectionSlug, path) {
+    const collectionConfig = payload.config.collections.find((c)=>c.slug === collectionSlug);
+    if (!collectionConfig) {
+        return undefined;
+    }
+    const pathSegments = path.split('.');
+    // Walk through the path segments to find the field
+    let currentFields = collectionConfig.fields;
+    let currentField = undefined;
+    for(let i = 0; i < pathSegments.length; i++){
+        const segment = pathSegments[i];
+        // First try to find a direct match
+        currentField = currentFields.find((f)=>'name' in f && f.name === segment);
+        // If not found, check if any unnamed container fields (collapsible, row) contain it
+        if (!currentField) {
+            for (const field of currentFields){
+                if (!('name' in field) || !field.name) {
+                    // This is an unnamed field, check its contents
+                    if ('fields' in field && field.type === 'collapsible' || 'fields' in field && field.type === 'row') {
+                        currentField = field.fields.find((f)=>'name' in f && f.name === segment);
+                        if (currentField) {
+                            break;
+                        }
+                    } else if ('tabs' in field && field.type === 'tabs') {
+                        // Check all tabs
+                        for (const tab of field.tabs){
+                            currentField = tab.fields.find((f)=>'name' in f && f.name === segment);
+                            if (currentField) {
+                                break;
+                            }
+                        }
+                        if (currentField) {
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        if (!currentField) {
+            return undefined;
+        }
+        // If we're not at the end, get nested fields
+        if (i < pathSegments.length - 1) {
+            if (currentField.type === 'group' && 'fields' in currentField) {
+                currentFields = currentField.fields;
+            } else if (currentField.type === 'array' && 'fields' in currentField) {
+                currentFields = currentField.fields;
+            } else if (currentField.type === 'blocks' && 'blocks' in currentField) {
+                // For blocks, we can't determine the exact field without knowing the block type
+                // Return the blocks field itself
+                return currentField;
+            } else {
+                // Field doesn't have nested fields, can't continue
+                return undefined;
+            }
+        }
+    }
+    return currentField;
+}
+/**
+ * Builds metadata for Content API request with pathTypes information
+ * Returns an object ready to spread into the request body
+ * This tells the Content API which paths are arrays/objects for proper query generation
+ */ export function buildPathTypes(payload, collectionSlug, where) {
+    if (!where) {
+        return {};
+    }
+    const pathTypes = {};
+    const paths = extractPathsFromWhere(where);
+    for (const path of paths){
+        // For each path, we need to check all segments to see if any intermediate ones are arrays/objects
+        const segments = path.split('.');
+        for(let i = 0; i < segments.length; i++){
+            const partialPath = segments.slice(0, i + 1).join('.');
+            const field = findFieldByPath(payload, collectionSlug, partialPath);
+            if (field) {
+                const fieldType = getFieldType(field);
+                if (fieldType === 'array') {
+                    pathTypes[partialPath] = fieldType;
+                }
+            }
+        }
+    }
+    // Only include meta if there are pathTypes
+    return Object.keys(pathTypes).length > 0 ? {
+        meta: {
+            pathTypes
+        }
+    } : {};
+}
+
+//# sourceMappingURL=buildPathTypes.js.map

package/dist/db-content-api/utilities/buildPathTypes.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/db-content-api/utilities/buildPathTypes.ts"],"sourcesContent":["import type { Field, Payload, Where } from 'payload'\n\n/**\n * Extracts all field paths from a where clause recursively\n */\nfunction extractPathsFromWhere(where: Where, paths: Set<string> = new Set()): Set<string> {\n  if (!where || typeof where !== 'object') {\n    return paths\n  }\n\n  // Handle 'and' operator\n  if ('and' in where && Array.isArray(where.and)) {\n    for (const clause of where.and) {\n      extractPathsFromWhere(clause, paths)\n    }\n    return paths\n  }\n\n  // Handle 'or' operator\n  if ('or' in where && Array.isArray(where.or)) {\n    for (const clause of where.or) {\n      extractPathsFromWhere(clause, paths)\n    }\n    return paths\n  }\n\n  // Handle regular conditions - keys are field paths\n  for (const key in where) {\n    if (key === 'and' || key === 'or') {\n      continue\n    }\n\n    // Add the path\n    paths.add(key)\n\n    // Check if the value is a nested where clause (for relationships)\n    const value = where[key]\n    if (value && typeof value === 'object' && !('equals' in value) && !('in' in value)) {\n      // Might be a nested where, recurse\n      extractPathsFromWhere(value as Where, paths)\n    }\n  }\n\n  return paths\n}\n\n/**\n * Determines the type of a field based on its configuration\n */\nfunction getFieldType(field: Field): 'array' | null {\n  // Array field\n  if (field.type === 'array') {\n    return 'array'\n  }\n\n  // Blocks field (array of objects)\n  if (field.type === 'blocks') {\n    return 'array'\n  }\n\n  // Relationship field with hasMany (array)\n  if (field.type === 'relationship' && 'hasMany' in field && field.hasMany) {\n    return 'array'\n  }\n\n  // Select field with hasMany (array)\n  if (field.type === 'select' && 'hasMany' in field && field.hasMany) {\n    return 'array'\n  }\n\n  // Upload field with hasMany (array)\n  if (field.type === 'upload' && 'hasMany' in field && field.hasMany) {\n    return 'array'\n  }\n\n  // Objects (group, collapsible, row, tabs) don't need traversal\n  return null\n}\n\n/**\n * Finds a field in the collection schema by its path\n * Supports nested paths like \"access.read.users\"\n */\nfunction findFieldByPath(\n  payload: Payload,\n  collectionSlug: string,\n  path: string,\n): Field | undefined {\n  const collectionConfig = payload.config.collections.find((c) => c.slug === collectionSlug)\n  if (!collectionConfig) {\n    return undefined\n  }\n\n  const pathSegments = path.split('.')\n\n  // Walk through the path segments to find the field\n  let currentFields = collectionConfig.fields\n  let currentField: Field | undefined = undefined\n\n  for (let i = 0; i < pathSegments.length; i++) {\n    const segment = pathSegments[i]\n\n    // First try to find a direct match\n    currentField = currentFields.find((f) => 'name' in f && f.name === segment)\n\n    // If not found, check if any unnamed container fields (collapsible, row) contain it\n    if (!currentField) {\n      for (const field of currentFields) {\n        if (!('name' in field) || !field.name) {\n          // This is an unnamed field, check its contents\n          if (\n            ('fields' in field && field.type === 'collapsible') ||\n            ('fields' in field && field.type === 'row')\n          ) {\n            currentField = field.fields.find((f) => 'name' in f && f.name === segment)\n            if (currentField) {\n              break\n            }\n          } else if ('tabs' in field && field.type === 'tabs') {\n            // Check all tabs\n            for (const tab of field.tabs) {\n              currentField = tab.fields.find((f) => 'name' in f && f.name === segment)\n              if (currentField) {\n                break\n              }\n            }\n            if (currentField) {\n              break\n            }\n          }\n        }\n      }\n    }\n\n    if (!currentField) {\n      return undefined\n    }\n\n    // If we're not at the end, get nested fields\n    if (i < pathSegments.length - 1) {\n      if (currentField.type === 'group' && 'fields' in currentField) {\n        currentFields = currentField.fields\n      } else if (currentField.type === 'array' && 'fields' in currentField) {\n        currentFields = currentField.fields\n      } else if (currentField.type === 'blocks' && 'blocks' in currentField) {\n        // For blocks, we can't determine the exact field without knowing the block type\n        // Return the blocks field itself\n        return currentField\n      } else {\n        // Field doesn't have nested fields, can't continue\n        return undefined\n      }\n    }\n  }\n\n  return currentField\n}\n\n/**\n * Builds metadata for Content API request with pathTypes information\n * Returns an object ready to spread into the request body\n * This tells the Content API which paths are arrays/objects for proper query generation\n */\nexport function buildPathTypes(\n  payload: Payload,\n  collectionSlug: string,\n  where: undefined | Where,\n): { meta?: { pathTypes: Record<string, 'array'> } } {\n  if (!where) {\n    return {}\n  }\n\n  const pathTypes: Record<string, 'array'> = {}\n  const paths = extractPathsFromWhere(where)\n\n  for (const path of paths) {\n    // For each path, we need to check all segments to see if any intermediate ones are arrays/objects\n    const segments = path.split('.')\n\n    for (let i = 0; i < segments.length; i++) {\n      const partialPath = segments.slice(0, i + 1).join('.')\n      const field = findFieldByPath(payload, collectionSlug, partialPath)\n\n      if (field) {\n        const fieldType = getFieldType(field)\n        if (fieldType === 'array') {\n          pathTypes[partialPath] = fieldType\n        }\n      }\n    }\n  }\n\n  // Only include meta if there are pathTypes\n  return Object.keys(pathTypes).length > 0 ? { meta: { pathTypes } } : {}\n}\n"],"names":["extractPathsFromWhere","where","paths","Set","Array","isArray","and","clause","or","key","add","value","getFieldType","field","type","hasMany","findFieldByPath","payload","collectionSlug","path","collectionConfig","config","collections","find","c","slug","undefined","pathSegments","split","currentFields","fields","currentField","i","length","segment","f","name","tab","tabs","buildPathTypes","pathTypes","segments","partialPath","slice","join","fieldType","Object","keys","meta"],"mappings":"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"}

package/dist/db-content-api/utilities/data/index.d.ts

@@ -9,11 +9,13 @@ type DataWithOperations = components['schemas']['DataWithOperations'];
  * - Type casting: Convert values to match field types (e.g., number -> string for text fields)
  * - RichText fields: Objects -> JSON strings
  * - Virtual fields: Remove fields with `virtual: true` (pure virtual fields should never be saved)
+ * - Timestamps: Add updatedAt (always), and createdAt (when createdAt=true)
  *
  * Note: Date fields are automatically converted to ISO strings by JSON.stringify()
  */
 export declare function dataToContentAPI(payload: Payload, collectionSlug: string, data: unknown, options?: {
     applyDefaults?: boolean;
+    createdAt?: boolean;
 }): DataWithOperations;
 /**
  * Transform data received from Content API (READ operations)

package/dist/db-content-api/utilities/data/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/db-content-api/utilities/data/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkC,OAAO,EAA0B,MAAM,SAAS,CAAA;AAI9F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAA;AAOtE,KAAK,kBAAkB,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,oBAAoB,CAAC,CAAA;AAErE;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,OAAO,EACb,OAAO,CAAC,EAAE;IAAE,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,GACpC,kBAAkB,CAsEpB;AAED;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,OAAO,GACZ,OAAO,CAgFT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/db-content-api/utilities/data/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkC,OAAO,EAA0B,MAAM,SAAS,CAAA;AAI9F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAA;AAOtE,KAAK,kBAAkB,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,oBAAoB,CAAC,CAAA;AAErE;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,OAAO,EACb,OAAO,CAAC,EAAE;IAAE,aAAa,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAAE,GACzD,kBAAkB,CA8EpB;AAED;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,OAAO,GACZ,OAAO,CA0FT"}

package/dist/db-content-api/utilities/data/index.js

@@ -11,6 +11,7 @@ import { stripFields } from './stripFields.js';
  * - Type casting: Convert values to match field types (e.g., number -> string for text fields)
  * - RichText fields: Objects -> JSON strings
  * - Virtual fields: Remove fields with `virtual: true` (pure virtual fields should never be saved)
+ * - Timestamps: Add updatedAt (always), and createdAt (when createdAt=true)
  *
  * Note: Date fields are automatically converted to ISO strings by JSON.stringify()
  */ export function dataToContentAPI(payload, collectionSlug, data, options) {
@@ -78,6 +79,13 @@ import { stripFields } from './stripFields.js';
     if (customIDType === 'number') {
         transformed.id = String(transformed.id);
     }
+    // Add timestamps (Content API no longer auto-sets these in DB)
+    // updatedAt is always set, createdAt only on create operations
+    const now = new Date().toISOString();
+    transformed.updatedAt = now;
+    if (options?.createdAt) {
+        transformed.createdAt = now;
+    }
     return transformed;
 }
 /**
@@ -112,7 +120,16 @@ import { stripFields } from './stripFields.js';
         }
         const current = ref;
         const value = current[field.name];
-        if (value !== null && value !== undefined) {
+        // Normalize undefined → null for optional fields
+        // Content API may omit fields (undefined) but Payload expects null for optional fields
+        if (value === undefined) {
+            const isRequired = 'required' in field && field.required;
+            if (!isRequired) {
+                current[field.name] = null;
+            }
+            return;
+        }
+        if (value !== null) {
             // RichText: JSON string -> object
             if (field.type === 'richText' && typeof value === 'string') {
                 try {

package/dist/db-content-api/utilities/data/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/db-content-api/utilities/data/index.ts"],"sourcesContent":["import type { CollectionConfig, GlobalConfig, Payload, TraverseFieldsCallback } from 'payload'\n\nimport { flattenAllFields, traverseFields } from 'payload'\n\nimport type { components } from '../../generated/content-api-types.js'\n\nimport { applyDefaults } from './applyDefaults.js'\nimport { castFieldValue } from './castFieldValue.js'\nimport { removeVirtualFields } from './removeVirtualFields.js'\nimport { stripFields } from './stripFields.js'\n\ntype DataWithOperations = components['schemas']['DataWithOperations']\n\n/**\n * Transform data before sending to Content API (WRITE operations)\n *\n * Conversions applied:\n * - Default values: Apply static defaults for undefined fields (when applyDefaults=true)\n * - Type casting: Convert values to match field types (e.g., number -> string for text fields)\n * - RichText fields: Objects -> JSON strings\n * - Virtual fields: Remove fields with `virtual: true` (pure virtual fields should never be saved)\n *\n * Note: Date fields are automatically converted to ISO strings by JSON.stringify()\n */\nexport function dataToContentAPI(\n  payload: Payload,\n  collectionSlug: string,\n  data: unknown,\n  options?: { applyDefaults?: boolean },\n): DataWithOperations {\n  if (!data || typeof data !== 'object') {\n    return data as DataWithOperations\n  }\n\n  // Deep clone to avoid mutating original data\n  const transformed = JSON.parse(JSON.stringify(data))\n\n  // Get collection config\n  const isGlobal = collectionSlug.startsWith('_global-')\n  const actualSlug = isGlobal ? collectionSlug.substring(8) : collectionSlug\n  const collectionConfig: CollectionConfig | GlobalConfig | undefined = isGlobal\n    ? payload.config.globals?.find((g) => g.slug === actualSlug)\n    : payload.config.collections.find((c) => c.slug === actualSlug)\n\n  if (!collectionConfig?.fields) {\n    return transformed as DataWithOperations\n  }\n\n  // Apply static defaults recursively to handle nested structures (arrays, groups)\n  // This must happen before traverseFields to ensure defaults are in place\n  if (options?.applyDefaults) {\n    applyDefaults(transformed, collectionConfig.fields)\n  }\n\n  // Use Payload's traverseFields to iterate over all fields for transformations\n  const callback: TraverseFieldsCallback = ({ field, ref }) => {\n    if (!('name' in field) || !field.name) {\n      return\n    }\n    if (!ref || typeof ref !== 'object') {\n      return\n    }\n\n    const current = ref as Record<string, unknown>\n    let value = current[field.name]\n\n    // Transform existing values\n    if (value !== null && value !== undefined) {\n      // Step 1: Apply type casting (e.g., number -> string for text fields)\n      value = castFieldValue(field, value)\n      current[field.name] = value\n\n      // Step 2: Apply Content API specific transformations\n      // RichText: object -> JSON string\n      if (field.type === 'richText' && typeof value !== 'string') {\n        current[field.name] = JSON.stringify(value)\n      }\n      // Date fields are already handled by JSON.stringify() which converts Date -> ISO string\n    }\n  }\n\n  traverseFields({ callback, fields: collectionConfig.fields, fillEmpty: false, ref: transformed })\n\n  stripFields({\n    config: payload.config,\n    data: transformed,\n    fields: flattenAllFields({ cache: true, fields: collectionConfig.fields }),\n    reservedKeys: ['id', 'globalType'],\n  })\n\n  removeVirtualFields(transformed, collectionConfig.fields)\n\n  // Convert numeric ID to string for Content API\n  const customIDType = payload.collections?.[collectionSlug]?.customIDType\n  if (customIDType === 'number') {\n    transformed.id = String(transformed.id)\n  }\n\n  return transformed as DataWithOperations\n}\n\n/**\n * Transform data received from Content API (READ operations)\n *\n * Conversions applied:\n * - RichText fields: JSON strings -> Objects\n * - Virtual fields: Remove fields with `virtual: true` (should not be in DB but Content API backend may add them)\n *\n * Note: Date fields come as ISO strings from Content API and stay as strings\n * (matching MongoDB and other adapters' behavior)\n */\nexport function dataFromContentAPI(\n  payload: Payload,\n  collectionSlug: string,\n  data: unknown,\n): unknown {\n  if (!data || typeof data !== 'object') {\n    return data\n  }\n\n  // Deep clone to avoid mutating original data\n  const transformed = JSON.parse(JSON.stringify(data))\n\n  // Get collection config\n  const isGlobal = collectionSlug.startsWith('_global-')\n  const actualSlug = isGlobal ? collectionSlug.substring(8) : collectionSlug\n  const collectionConfig: CollectionConfig | GlobalConfig | undefined = isGlobal\n    ? payload.config.globals?.find((g) => g.slug === actualSlug)\n    : payload.config.collections.find((c) => c.slug === actualSlug)\n\n  if (!collectionConfig?.fields) {\n    return transformed\n  }\n\n  // Use Payload's traverseFields to iterate over all fields\n  const callback: TraverseFieldsCallback = ({ field, parentPath, ref }) => {\n    if (!('name' in field) || !field.name) {\n      return\n    }\n    if (!ref || typeof ref !== 'object') {\n      return\n    }\n\n    const current = ref as Record<string, unknown>\n    const value = current[field.name]\n\n    if (value !== null && value !== undefined) {\n      // RichText: JSON string -> object\n      if (field.type === 'richText' && typeof value === 'string') {\n        try {\n          current[field.name] = JSON.parse(value)\n        } catch (error) {\n          const fieldPath = parentPath ? `${parentPath}.${field.name}` : field.name\n          payload.logger.warn({\n            err: error instanceof Error ? error : new Error(String(error)),\n            msg: `Failed to parse richtext field '${fieldPath}' in collection '${collectionSlug}'`,\n          })\n        }\n      }\n      // Date fields: Already ISO strings from Content API, no conversion needed\n    }\n  }\n\n  traverseFields({ callback, fields: collectionConfig.fields, ref: transformed })\n\n  // Convert string ID to number if collection uses numeric custom ID\n  const customIDType = payload.collections?.[collectionSlug]?.customIDType\n  if (customIDType === 'number') {\n    transformed.id = Number(transformed.id)\n  }\n\n  stripFields({\n    config: payload.config,\n    data: transformed,\n    fields: flattenAllFields({ cache: true, fields: collectionConfig.fields }),\n    reservedKeys: ['id', 'globalType'],\n  })\n\n  // Remove virtual fields - must happen AFTER stripFields\n  removeVirtualFields(transformed, collectionConfig.fields)\n\n  // Handle auth-specific fields that aren't in the field schema\n  // When these fields are null in DB, Content API omits them from response (undefined)\n  // But Payload expects them to be null, not undefined\n  // Only add them if the collection has auth enabled\n  if ('auth' in collectionConfig && collectionConfig.auth) {\n    const authFields = ['resetPasswordExpiration', 'lockUntil']\n    for (const fieldName of authFields) {\n      if (!(fieldName in transformed)) {\n        transformed[fieldName] = null\n      }\n    }\n  }\n\n  return transformed\n}\n"],"names":["flattenAllFields","traverseFields","applyDefaults","castFieldValue","removeVirtualFields","stripFields","dataToContentAPI","payload","collectionSlug","data","options","transformed","JSON","parse","stringify","isGlobal","startsWith","actualSlug","substring","collectionConfig","config","globals","find","g","slug","collections","c","fields","callback","field","ref","name","current","value","undefined","type","fillEmpty","cache","reservedKeys","customIDType","id","String","dataFromContentAPI","parentPath","error","fieldPath","logger","warn","err","Error","msg","Number","auth","authFields","fieldName"],"mappings":"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"}
+{"version":3,"sources":["../../../../src/db-content-api/utilities/data/index.ts"],"sourcesContent":["import type { CollectionConfig, GlobalConfig, Payload, TraverseFieldsCallback } from 'payload'\n\nimport { flattenAllFields, traverseFields } from 'payload'\n\nimport type { components } from '../../generated/content-api-types.js'\n\nimport { applyDefaults } from './applyDefaults.js'\nimport { castFieldValue } from './castFieldValue.js'\nimport { removeVirtualFields } from './removeVirtualFields.js'\nimport { stripFields } from './stripFields.js'\n\ntype DataWithOperations = components['schemas']['DataWithOperations']\n\n/**\n * Transform data before sending to Content API (WRITE operations)\n *\n * Conversions applied:\n * - Default values: Apply static defaults for undefined fields (when applyDefaults=true)\n * - Type casting: Convert values to match field types (e.g., number -> string for text fields)\n * - RichText fields: Objects -> JSON strings\n * - Virtual fields: Remove fields with `virtual: true` (pure virtual fields should never be saved)\n * - Timestamps: Add updatedAt (always), and createdAt (when createdAt=true)\n *\n * Note: Date fields are automatically converted to ISO strings by JSON.stringify()\n */\nexport function dataToContentAPI(\n  payload: Payload,\n  collectionSlug: string,\n  data: unknown,\n  options?: { applyDefaults?: boolean; createdAt?: boolean },\n): DataWithOperations {\n  if (!data || typeof data !== 'object') {\n    return data as DataWithOperations\n  }\n\n  // Deep clone to avoid mutating original data\n  const transformed = JSON.parse(JSON.stringify(data))\n\n  // Get collection config\n  const isGlobal = collectionSlug.startsWith('_global-')\n  const actualSlug = isGlobal ? collectionSlug.substring(8) : collectionSlug\n  const collectionConfig: CollectionConfig | GlobalConfig | undefined = isGlobal\n    ? payload.config.globals?.find((g) => g.slug === actualSlug)\n    : payload.config.collections.find((c) => c.slug === actualSlug)\n\n  if (!collectionConfig?.fields) {\n    return transformed as DataWithOperations\n  }\n\n  // Apply static defaults recursively to handle nested structures (arrays, groups)\n  // This must happen before traverseFields to ensure defaults are in place\n  if (options?.applyDefaults) {\n    applyDefaults(transformed, collectionConfig.fields)\n  }\n\n  // Use Payload's traverseFields to iterate over all fields for transformations\n  const callback: TraverseFieldsCallback = ({ field, ref }) => {\n    if (!('name' in field) || !field.name) {\n      return\n    }\n    if (!ref || typeof ref !== 'object') {\n      return\n    }\n\n    const current = ref as Record<string, unknown>\n    let value = current[field.name]\n\n    // Transform existing values\n    if (value !== null && value !== undefined) {\n      // Step 1: Apply type casting (e.g., number -> string for text fields)\n      value = castFieldValue(field, value)\n      current[field.name] = value\n\n      // Step 2: Apply Content API specific transformations\n      // RichText: object -> JSON string\n      if (field.type === 'richText' && typeof value !== 'string') {\n        current[field.name] = JSON.stringify(value)\n      }\n      // Date fields are already handled by JSON.stringify() which converts Date -> ISO string\n    }\n  }\n\n  traverseFields({ callback, fields: collectionConfig.fields, fillEmpty: false, ref: transformed })\n\n  stripFields({\n    config: payload.config,\n    data: transformed,\n    fields: flattenAllFields({ cache: true, fields: collectionConfig.fields }),\n    reservedKeys: ['id', 'globalType'],\n  })\n\n  removeVirtualFields(transformed, collectionConfig.fields)\n\n  // Convert numeric ID to string for Content API\n  const customIDType = payload.collections?.[collectionSlug]?.customIDType\n  if (customIDType === 'number') {\n    transformed.id = String(transformed.id)\n  }\n\n  // Add timestamps (Content API no longer auto-sets these in DB)\n  // updatedAt is always set, createdAt only on create operations\n  const now = new Date().toISOString()\n  transformed.updatedAt = now\n  if (options?.createdAt) {\n    transformed.createdAt = now\n  }\n\n  return transformed as DataWithOperations\n}\n\n/**\n * Transform data received from Content API (READ operations)\n *\n * Conversions applied:\n * - RichText fields: JSON strings -> Objects\n * - Virtual fields: Remove fields with `virtual: true` (should not be in DB but Content API backend may add them)\n *\n * Note: Date fields come as ISO strings from Content API and stay as strings\n * (matching MongoDB and other adapters' behavior)\n */\nexport function dataFromContentAPI(\n  payload: Payload,\n  collectionSlug: string,\n  data: unknown,\n): unknown {\n  if (!data || typeof data !== 'object') {\n    return data\n  }\n\n  // Deep clone to avoid mutating original data\n  const transformed = JSON.parse(JSON.stringify(data))\n\n  // Get collection config\n  const isGlobal = collectionSlug.startsWith('_global-')\n  const actualSlug = isGlobal ? collectionSlug.substring(8) : collectionSlug\n  const collectionConfig: CollectionConfig | GlobalConfig | undefined = isGlobal\n    ? payload.config.globals?.find((g) => g.slug === actualSlug)\n    : payload.config.collections.find((c) => c.slug === actualSlug)\n\n  if (!collectionConfig?.fields) {\n    return transformed\n  }\n\n  // Use Payload's traverseFields to iterate over all fields\n  const callback: TraverseFieldsCallback = ({ field, parentPath, ref }) => {\n    if (!('name' in field) || !field.name) {\n      return\n    }\n    if (!ref || typeof ref !== 'object') {\n      return\n    }\n\n    const current = ref as Record<string, unknown>\n    const value = current[field.name]\n\n    // Normalize undefined → null for optional fields\n    // Content API may omit fields (undefined) but Payload expects null for optional fields\n    if (value === undefined) {\n      const isRequired = 'required' in field && field.required\n      if (!isRequired) {\n        current[field.name] = null\n      }\n      return\n    }\n\n    if (value !== null) {\n      // RichText: JSON string -> object\n      if (field.type === 'richText' && typeof value === 'string') {\n        try {\n          current[field.name] = JSON.parse(value)\n        } catch (error) {\n          const fieldPath = parentPath ? `${parentPath}.${field.name}` : field.name\n          payload.logger.warn({\n            err: error instanceof Error ? error : new Error(String(error)),\n            msg: `Failed to parse richtext field '${fieldPath}' in collection '${collectionSlug}'`,\n          })\n        }\n      }\n      // Date fields: Already ISO strings from Content API, no conversion needed\n    }\n  }\n\n  traverseFields({ callback, fields: collectionConfig.fields, ref: transformed })\n\n  // Convert string ID to number if collection uses numeric custom ID\n  const customIDType = payload.collections?.[collectionSlug]?.customIDType\n  if (customIDType === 'number') {\n    transformed.id = Number(transformed.id)\n  }\n\n  stripFields({\n    config: payload.config,\n    data: transformed,\n    fields: flattenAllFields({ cache: true, fields: collectionConfig.fields }),\n    reservedKeys: ['id', 'globalType'],\n  })\n\n  // Remove virtual fields - must happen AFTER stripFields\n  removeVirtualFields(transformed, collectionConfig.fields)\n\n  // Handle auth-specific fields that aren't in the field schema\n  // When these fields are null in DB, Content API omits them from response (undefined)\n  // But Payload expects them to be null, not undefined\n  // Only add them if the collection has auth enabled\n  if ('auth' in collectionConfig && collectionConfig.auth) {\n    const authFields = ['resetPasswordExpiration', 'lockUntil']\n    for (const fieldName of authFields) {\n      if (!(fieldName in transformed)) {\n        transformed[fieldName] = null\n      }\n    }\n  }\n\n  return transformed\n}\n"],"names":["flattenAllFields","traverseFields","applyDefaults","castFieldValue","removeVirtualFields","stripFields","dataToContentAPI","payload","collectionSlug","data","options","transformed","JSON","parse","stringify","isGlobal","startsWith","actualSlug","substring","collectionConfig","config","globals","find","g","slug","collections","c","fields","callback","field","ref","name","current","value","undefined","type","fillEmpty","cache","reservedKeys","customIDType","id","String","now","Date","toISOString","updatedAt","createdAt","dataFromContentAPI","parentPath","isRequired","required","error","fieldPath","logger","warn","err","Error","msg","Number","auth","authFields","fieldName"],"mappings":"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"}

package/dist/db-content-api/utilities/where.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"where.d.ts","sourceRoot":"","sources":["../../../src/db-content-api/utilities/where.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAEpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAA;AAEnE,KAAK,WAAW,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC,CAAA;AASvD,KAAK,cAAc,GAAG;IACpB,yEAAyE;IACzE,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,mFAAmF;IACnF,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC7B,CAAA;AAED,wBAAgB,+BAA+B,CAC7C,KAAK,EAAE,SAAS,GAAG,KAAK,EACxB,OAAO,GAAE,cAAmB,GAC3B,WAAW,CA4Gb"}
+{"version":3,"file":"where.d.ts","sourceRoot":"","sources":["../../../src/db-content-api/utilities/where.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAEpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAA;AAEnE,KAAK,WAAW,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC,CAAA;AASvD,KAAK,cAAc,GAAG;IACpB,yEAAyE;IACzE,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,mFAAmF;IACnF,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC7B,CAAA;AAED,wBAAgB,+BAA+B,CAC7C,KAAK,EAAE,SAAS,GAAG,KAAK,EACxB,OAAO,GAAE,cAAmB,GAC3B,WAAW,CA6Hb"}

package/dist/db-content-api/utilities/where.js

@@ -70,6 +70,19 @@ export function convertPayloadWhereToContentAPI(where, options = {}) {
             }
             // Convert field conditions: { fieldName: { operator: value } }
             // to: { path: fieldName, operator, value }
+            // Handle Payload's shorthand: { fieldName: value } → { fieldName: { equals: value } }
+            // If value is a primitive (string, number, boolean, null) or not a plain object,
+            // treat it as an implicit 'equals' operator
+            const isPrimitive = value === null || typeof value !== 'object' || Array.isArray(value);
+            if (isPrimitive) {
+                // Shorthand format: { id: "some-value" } means { id: { equals: "some-value" } }
+                conditions.push({
+                    operator: 'equals',
+                    path: fieldPath,
+                    value
+                });
+                continue;
+            }
             const operators = value;
             // Skip empty operator objects { fieldName: {} }
             if (Object.keys(operators).length === 0) {
@@ -82,9 +95,10 @@ export function convertPayloadWhereToContentAPI(where, options = {}) {
                     continue;
                 }
                 let finalValue = operatorValue;
-                // Add wildcards for contains/like operators (Payload doesn't add them)
-                if ((op === 'contains' || op === 'like') && typeof operatorValue === 'string') {
-                    finalValue = `%${operatorValue}%`;
+                // Convert string booleans to actual booleans for exists operator
+                // REST API sends "true"/"false" as strings, but Content API requires boolean
+                if (op === 'exists' && typeof operatorValue === 'string') {
+                    finalValue = operatorValue === 'true';
                 }
                 conditions.push({
                     operator: op,

package/dist/db-content-api/utilities/where.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/db-content-api/utilities/where.ts"],"sourcesContent":["import type { Where } from 'payload'\n\nimport type { components } from '../generated/content-api-types.js'\n\ntype WhereClause = components['schemas']['WhereClause']\n\n// Payload's format: { fieldName: { operator: value }, and: [...], or: [...] }\n// Content API expects: { and: [{ path, operator, value }], or: [{ path, operator, value }] }\n//\n// The format stays different. This allows the Content API to evolve its filter schema,\n// for example to support composite types like Point, which are not lexicographically sortable.\n// Semantics must remain identical to Payload.\n\ntype ConvertOptions = {\n  /** Internal flag to track if we're inside a logical operator (and/or) */\n  insideLogicalOperator?: boolean\n  /** If true, transform 'parent' field to 'documentId' (used for version queries) */\n  parentToDocumentId?: boolean\n}\n\nexport function convertPayloadWhereToContentAPI(\n  where: undefined | Where,\n  options: ConvertOptions = {},\n): WhereClause {\n  // Empty where {} should be { and: [] } not undefined\n  // Content API requires a where clause structure even for \"no filter\"\n  if (!where || Object.keys(where).length === 0) {\n    return { and: [] }\n  }\n\n  // Extract the condition type (the variant with 'path', 'operator', 'value') from WhereClause union\n  type WhereCondition = Extract<WhereClause, { path: string }>\n  const conditions: WhereClause[] = []\n\n  for (const [key, value] of Object.entries(where)) {\n    if (key === 'and') {\n      // Recursively convert nested 'and' conditions, preserving options\n      const nestedConditions = (value as Where[])\n        .map((item) =>\n          convertPayloadWhereToContentAPI(item, { ...options, insideLogicalOperator: true }),\n        )\n        // TODO: A better solution would be to make the `where` schema of `zod` in `content-api`\n        // more permissive. For now I'll do it this way because I have an idea to simplify\n        // everything we're doing with `where` (Post EAP) anyway.\n        // Filter out empty conditions { and: [] } that would be invalid\n        .filter((condition) => {\n          if ('and' in condition) {\n            return condition.and.length > 0\n          }\n          if ('or' in condition) {\n            return condition.or.length > 0\n          }\n          return true // Keep path/operator/value conditions\n        })\n\n      // If filtering resulted in no conditions, return empty and\n      if (nestedConditions.length === 0) {\n        return { and: [] }\n      }\n\n      return { and: nestedConditions }\n    } else if (key === 'or') {\n      // Recursively convert nested 'or' conditions, preserving options\n      const nestedConditions = (value as Where[])\n        .map((item) =>\n          convertPayloadWhereToContentAPI(item, { ...options, insideLogicalOperator: true }),\n        )\n        // Filter out empty conditions { and: [] } or { or: [] } that would be invalid\n        .filter((condition) => {\n          if ('and' in condition) {\n            return condition.and.length > 0\n          }\n          if ('or' in condition) {\n            return condition.or.length > 0\n          }\n          return true // Keep path/operator/value conditions\n        })\n\n      // If filtering resulted in no conditions, return empty and\n      if (nestedConditions.length === 0) {\n        return { and: [] }\n      }\n\n      return { or: nestedConditions }\n    } else {\n      // TODO: fix this in content api\n      // WORKAROUND: Payload uses 'parent' for version queries, but Content API expects 'documentId'\n      let fieldPath = key\n      if (options.parentToDocumentId && key === 'parent') {\n        fieldPath = 'documentId'\n      }\n\n      // Convert field conditions: { fieldName: { operator: value } }\n      // to: { path: fieldName, operator, value }\n      const operators = value as Record<string, unknown>\n\n      // Skip empty operator objects { fieldName: {} }\n      if (Object.keys(operators).length === 0) {\n        continue\n      }\n\n      for (const [op, operatorValue] of Object.entries(operators)) {\n        // Skip operators with undefined values (e.g., { equals: undefined })\n        // This can happen when Payload sends incomplete where clauses\n        if (operatorValue === undefined) {\n          continue\n        }\n\n        let finalValue = operatorValue\n\n        // Add wildcards for contains/like operators (Payload doesn't add them)\n        if ((op === 'contains' || op === 'like') && typeof operatorValue === 'string') {\n          finalValue = `%${operatorValue}%`\n        }\n\n        conditions.push({\n          operator: op as WhereCondition['operator'],\n          path: fieldPath,\n          value: finalValue,\n        } as WhereCondition)\n      }\n    }\n  }\n\n  // If inside a logical operator (and/or), return conditions directly\n  // Otherwise, wrap in 'and' to match WhereClause type\n  if (options.insideLogicalOperator && conditions.length === 1) {\n    return conditions[0]\n  }\n\n  return { and: conditions }\n}\n"],"names":["convertPayloadWhereToContentAPI","where","options","Object","keys","length","and","conditions","key","value","entries","nestedConditions","map","item","insideLogicalOperator","filter","condition","or","fieldPath","parentToDocumentId","operators","op","operatorValue","undefined","finalValue","push","operator","path"],"mappings":"AAoBA,OAAO,SAASA,gCACdC,KAAwB,EACxBC,UAA0B,CAAC,CAAC;IAE5B,qDAAqD;IACrD,qEAAqE;IACrE,IAAI,CAACD,SAASE,OAAOC,IAAI,CAACH,OAAOI,MAAM,KAAK,GAAG;QAC7C,OAAO;YAAEC,KAAK,EAAE;QAAC;IACnB;IAIA,MAAMC,aAA4B,EAAE;IAEpC,KAAK,MAAM,CAACC,KAAKC,MAAM,IAAIN,OAAOO,OAAO,CAACT,OAAQ;QAChD,IAAIO,QAAQ,OAAO;YACjB,kEAAkE;YAClE,MAAMG,mBAAmB,AAACF,MACvBG,GAAG,CAAC,CAACC,OACJb,gCAAgCa,MAAM;oBAAE,GAAGX,OAAO;oBAAEY,uBAAuB;gBAAK,GAElF,wFAAwF;YACxF,kFAAkF;YAClF,yDAAyD;YACzD,gEAAgE;aAC/DC,MAAM,CAAC,CAACC;gBACP,IAAI,SAASA,WAAW;oBACtB,OAAOA,UAAUV,GAAG,CAACD,MAAM,GAAG;gBAChC;gBACA,IAAI,QAAQW,WAAW;oBACrB,OAAOA,UAAUC,EAAE,CAACZ,MAAM,GAAG;gBAC/B;gBACA,OAAO,KAAK,sCAAsC;;YACpD;YAEF,2DAA2D;YAC3D,IAAIM,iBAAiBN,MAAM,KAAK,GAAG;gBACjC,OAAO;oBAAEC,KAAK,EAAE;gBAAC;YACnB;YAEA,OAAO;gBAAEA,KAAKK;YAAiB;QACjC,OAAO,IAAIH,QAAQ,MAAM;YACvB,iEAAiE;YACjE,MAAMG,mBAAmB,AAACF,MACvBG,GAAG,CAAC,CAACC,OACJb,gCAAgCa,MAAM;oBAAE,GAAGX,OAAO;oBAAEY,uBAAuB;gBAAK,GAElF,8EAA8E;aAC7EC,MAAM,CAAC,CAACC;gBACP,IAAI,SAASA,WAAW;oBACtB,OAAOA,UAAUV,GAAG,CAACD,MAAM,GAAG;gBAChC;gBACA,IAAI,QAAQW,WAAW;oBACrB,OAAOA,UAAUC,EAAE,CAACZ,MAAM,GAAG;gBAC/B;gBACA,OAAO,KAAK,sCAAsC;;YACpD;YAEF,2DAA2D;YAC3D,IAAIM,iBAAiBN,MAAM,KAAK,GAAG;gBACjC,OAAO;oBAAEC,KAAK,EAAE;gBAAC;YACnB;YAEA,OAAO;gBAAEW,IAAIN;YAAiB;QAChC,OAAO;YACL,gCAAgC;YAChC,8FAA8F;YAC9F,IAAIO,YAAYV;YAChB,IAAIN,QAAQiB,kBAAkB,IAAIX,QAAQ,UAAU;gBAClDU,YAAY;YACd;YAEA,+DAA+D;YAC/D,2CAA2C;YAC3C,MAAME,YAAYX;YAElB,gDAAgD;YAChD,IAAIN,OAAOC,IAAI,CAACgB,WAAWf,MAAM,KAAK,GAAG;gBACvC;YACF;YAEA,KAAK,MAAM,CAACgB,IAAIC,cAAc,IAAInB,OAAOO,OAAO,CAACU,WAAY;gBAC3D,qEAAqE;gBACrE,8DAA8D;gBAC9D,IAAIE,kBAAkBC,WAAW;oBAC/B;gBACF;gBAEA,IAAIC,aAAaF;gBAEjB,uEAAuE;gBACvE,IAAI,AAACD,CAAAA,OAAO,cAAcA,OAAO,MAAK,KAAM,OAAOC,kBAAkB,UAAU;oBAC7EE,aAAa,CAAC,CAAC,EAAEF,cAAc,CAAC,CAAC;gBACnC;gBAEAf,WAAWkB,IAAI,CAAC;oBACdC,UAAUL;oBACVM,MAAMT;oBACNT,OAAOe;gBACT;YACF;QACF;IACF;IAEA,oEAAoE;IACpE,qDAAqD;IACrD,IAAItB,QAAQY,qBAAqB,IAAIP,WAAWF,MAAM,KAAK,GAAG;QAC5D,OAAOE,UAAU,CAAC,EAAE;IACtB;IAEA,OAAO;QAAED,KAAKC;IAAW;AAC3B"}
+{"version":3,"sources":["../../../src/db-content-api/utilities/where.ts"],"sourcesContent":["import type { Where } from 'payload'\n\nimport type { components } from '../generated/content-api-types.js'\n\ntype WhereClause = components['schemas']['WhereClause']\n\n// Payload's format: { fieldName: { operator: value }, and: [...], or: [...] }\n// Content API expects: { and: [{ path, operator, value }], or: [{ path, operator, value }] }\n//\n// The format stays different. This allows the Content API to evolve its filter schema,\n// for example to support composite types like Point, which are not lexicographically sortable.\n// Semantics must remain identical to Payload.\n\ntype ConvertOptions = {\n  /** Internal flag to track if we're inside a logical operator (and/or) */\n  insideLogicalOperator?: boolean\n  /** If true, transform 'parent' field to 'documentId' (used for version queries) */\n  parentToDocumentId?: boolean\n}\n\nexport function convertPayloadWhereToContentAPI(\n  where: undefined | Where,\n  options: ConvertOptions = {},\n): WhereClause {\n  // Empty where {} should be { and: [] } not undefined\n  // Content API requires a where clause structure even for \"no filter\"\n  if (!where || Object.keys(where).length === 0) {\n    return { and: [] }\n  }\n\n  // Extract the condition type (the variant with 'path', 'operator', 'value') from WhereClause union\n  type WhereCondition = Extract<WhereClause, { path: string }>\n  const conditions: WhereClause[] = []\n\n  for (const [key, value] of Object.entries(where)) {\n    if (key === 'and') {\n      // Recursively convert nested 'and' conditions, preserving options\n      const nestedConditions = (value as Where[])\n        .map((item) =>\n          convertPayloadWhereToContentAPI(item, { ...options, insideLogicalOperator: true }),\n        )\n        // TODO: A better solution would be to make the `where` schema of `zod` in `content-api`\n        // more permissive. For now I'll do it this way because I have an idea to simplify\n        // everything we're doing with `where` (Post EAP) anyway.\n        // Filter out empty conditions { and: [] } that would be invalid\n        .filter((condition) => {\n          if ('and' in condition) {\n            return condition.and.length > 0\n          }\n          if ('or' in condition) {\n            return condition.or.length > 0\n          }\n          return true // Keep path/operator/value conditions\n        })\n\n      // If filtering resulted in no conditions, return empty and\n      if (nestedConditions.length === 0) {\n        return { and: [] }\n      }\n\n      return { and: nestedConditions }\n    } else if (key === 'or') {\n      // Recursively convert nested 'or' conditions, preserving options\n      const nestedConditions = (value as Where[])\n        .map((item) =>\n          convertPayloadWhereToContentAPI(item, { ...options, insideLogicalOperator: true }),\n        )\n        // Filter out empty conditions { and: [] } or { or: [] } that would be invalid\n        .filter((condition) => {\n          if ('and' in condition) {\n            return condition.and.length > 0\n          }\n          if ('or' in condition) {\n            return condition.or.length > 0\n          }\n          return true // Keep path/operator/value conditions\n        })\n\n      // If filtering resulted in no conditions, return empty and\n      if (nestedConditions.length === 0) {\n        return { and: [] }\n      }\n\n      return { or: nestedConditions }\n    } else {\n      // TODO: fix this in content api\n      // WORKAROUND: Payload uses 'parent' for version queries, but Content API expects 'documentId'\n      let fieldPath = key\n      if (options.parentToDocumentId && key === 'parent') {\n        fieldPath = 'documentId'\n      }\n\n      // Convert field conditions: { fieldName: { operator: value } }\n      // to: { path: fieldName, operator, value }\n\n      // Handle Payload's shorthand: { fieldName: value } → { fieldName: { equals: value } }\n      // If value is a primitive (string, number, boolean, null) or not a plain object,\n      // treat it as an implicit 'equals' operator\n      const isPrimitive = value === null || typeof value !== 'object' || Array.isArray(value)\n\n      if (isPrimitive) {\n        // Shorthand format: { id: \"some-value\" } means { id: { equals: \"some-value\" } }\n        conditions.push({\n          operator: 'equals',\n          path: fieldPath,\n          value,\n        } as WhereCondition)\n        continue\n      }\n\n      const operators = value as Record<string, unknown>\n\n      // Skip empty operator objects { fieldName: {} }\n      if (Object.keys(operators).length === 0) {\n        continue\n      }\n\n      for (const [op, operatorValue] of Object.entries(operators)) {\n        // Skip operators with undefined values (e.g., { equals: undefined })\n        // This can happen when Payload sends incomplete where clauses\n        if (operatorValue === undefined) {\n          continue\n        }\n\n        let finalValue = operatorValue\n\n        // Convert string booleans to actual booleans for exists operator\n        // REST API sends \"true\"/\"false\" as strings, but Content API requires boolean\n        if (op === 'exists' && typeof operatorValue === 'string') {\n          finalValue = operatorValue === 'true'\n        }\n\n        conditions.push({\n          operator: op as WhereCondition['operator'],\n          path: fieldPath,\n          value: finalValue,\n        } as WhereCondition)\n      }\n    }\n  }\n\n  // If inside a logical operator (and/or), return conditions directly\n  // Otherwise, wrap in 'and' to match WhereClause type\n  if (options.insideLogicalOperator && conditions.length === 1) {\n    return conditions[0]\n  }\n\n  return { and: conditions }\n}\n"],"names":["convertPayloadWhereToContentAPI","where","options","Object","keys","length","and","conditions","key","value","entries","nestedConditions","map","item","insideLogicalOperator","filter","condition","or","fieldPath","parentToDocumentId","isPrimitive","Array","isArray","push","operator","path","operators","op","operatorValue","undefined","finalValue"],"mappings":"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"}

package/dist/oauth/components/LogoutButton/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/oauth/components/LogoutButton/index.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,cAAc,CAAA;AAIrB,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CA0D/E,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/oauth/components/LogoutButton/index.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,cAAc,CAAA;AAIrB,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CA6D/E,CAAA"}

package/dist/oauth/components/LogoutButton/index.js

@@ -1,8 +1,8 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Logout, useConfig } from '@payloadcms/ui';
+import { formatAdminURL } from 'payload/shared';
 import React from 'react';
-import { getAdminPath } from '../../utilities/getAdminPath.js';
 import './index.scss';
 const baseClass = 'oauth-logout';
 export const LogoutButton = ({ disabled, endpointSlug })=>{
@@ -16,8 +16,10 @@ export const LogoutButton = ({ disabled, endpointSlug })=>{
         if (port) {
             redirectToSet += `:${port}`;
         }
-        redirectToSet += getAdminPath(config);
-        setRedirect(redirectToSet);
+        setRedirect(formatAdminURL({
+            adminRoute: config.routes.admin,
+            serverURL: redirectToSet
+        }));
     }, [
         config
     ]);

package/dist/oauth/components/LogoutButton/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/oauth/components/LogoutButton/index.tsx"],"sourcesContent":["'use client'\n\nimport { Logout, useConfig } from '@payloadcms/ui'\nimport React from 'react'\n\nimport { getAdminPath } from '../../utilities/getAdminPath.js'\nimport './index.scss'\n\nconst baseClass = 'oauth-logout'\n\nexport const LogoutButton: React.FC<{ disabled?: boolean; endpointSlug: string }> = ({\n  disabled,\n  endpointSlug,\n}) => {\n  const {\n    config,\n    config: {\n      admin: { user: userSlug },\n      routes: { api },\n      serverURL,\n    },\n  } = useConfig()\n\n  const [redirect, setRedirect] = React.useState('')\n  React.useEffect(() => {\n    const protocol = window.location.protocol\n    const domain = window.location.hostname\n    const port = window.location.port\n\n    let redirectToSet = `${protocol}//${domain}`\n    if (port) {\n      redirectToSet += `:${port}`\n    }\n\n    redirectToSet += getAdminPath(config)\n\n    setRedirect(redirectToSet)\n  }, [config])\n\n  if (!redirect) {\n    return null\n  }\n\n  if (disabled) {\n    return <Logout />\n  }\n\n  return (\n    <div className={baseClass}>\n      <a\n        aria-label=\"Logout\"\n        href={`${serverURL}${api}/${userSlug}/${endpointSlug}/logout?redirect=${redirect}`}\n      >\n        <svg\n          className=\"icon icon--logout\"\n          fill=\"none\"\n          viewBox=\"0 0 25 25\"\n          xmlns=\"http://www.w3.org/2000/svg\"\n        >\n          <path className=\"stroke\" d=\"M10 5H18V19H10\" />\n          <g>\n            <path className=\"stroke\" d=\"M8 8.5L4.46447 12.0355L8 15.5711\" />\n            <line className=\"stroke\" x1=\"5\" x2=\"13\" y1=\"12\" y2=\"12\" />\n          </g>\n        </svg>\n      </a>\n    </div>\n  )\n}\n"],"names":["Logout","useConfig","React","getAdminPath","baseClass","LogoutButton","disabled","endpointSlug","config","admin","user","userSlug","routes","api","serverURL","redirect","setRedirect","useState","useEffect","protocol","window","location","domain","hostname","port","redirectToSet","div","className","a","aria-label","href","svg","fill","viewBox","xmlns","path","d","g","line","x1","x2","y1","y2"],"mappings":"AAAA;;AAEA,SAASA,MAAM,EAAEC,SAAS,QAAQ,iBAAgB;AAClD,OAAOC,WAAW,QAAO;AAEzB,SAASC,YAAY,QAAQ,kCAAiC;AAC9D,OAAO,eAAc;AAErB,MAAMC,YAAY;AAElB,OAAO,MAAMC,eAAuE,CAAC,EACnFC,QAAQ,EACRC,YAAY,EACb;IACC,MAAM,EACJC,MAAM,EACNA,QAAQ,EACNC,OAAO,EAAEC,MAAMC,QAAQ,EAAE,EACzBC,QAAQ,EAAEC,GAAG,EAAE,EACfC,SAAS,EACV,EACF,GAAGb;IAEJ,MAAM,CAACc,UAAUC,YAAY,GAAGd,MAAMe,QAAQ,CAAC;IAC/Cf,MAAMgB,SAAS,CAAC;QACd,MAAMC,WAAWC,OAAOC,QAAQ,CAACF,QAAQ;QACzC,MAAMG,SAASF,OAAOC,QAAQ,CAACE,QAAQ;QACvC,MAAMC,OAAOJ,OAAOC,QAAQ,CAACG,IAAI;QAEjC,IAAIC,gBAAgB,GAAGN,SAAS,EAAE,EAAEG,QAAQ;QAC5C,IAAIE,MAAM;YACRC,iBAAiB,CAAC,CAAC,EAAED,MAAM;QAC7B;QAEAC,iBAAiBtB,aAAaK;QAE9BQ,YAAYS;IACd,GAAG;QAACjB;KAAO;IAEX,IAAI,CAACO,UAAU;QACb,OAAO;IACT;IAEA,IAAIT,UAAU;QACZ,qBAAO,KAACN;IACV;IAEA,qBACE,KAAC0B;QAAIC,WAAWvB;kBACd,cAAA,KAACwB;YACCC,cAAW;YACXC,MAAM,GAAGhB,YAAYD,IAAI,CAAC,EAAEF,SAAS,CAAC,EAAEJ,aAAa,iBAAiB,EAAEQ,UAAU;sBAElF,cAAA,MAACgB;gBACCJ,WAAU;gBACVK,MAAK;gBACLC,SAAQ;gBACRC,OAAM;;kCAEN,KAACC;wBAAKR,WAAU;wBAASS,GAAE;;kCAC3B,MAACC;;0CACC,KAACF;gCAAKR,WAAU;gCAASS,GAAE;;0CAC3B,KAACE;gCAAKX,WAAU;gCAASY,IAAG;gCAAIC,IAAG;gCAAKC,IAAG;gCAAKC,IAAG;;;;;;;;AAM/D,EAAC"}
+{"version":3,"sources":["../../../../src/oauth/components/LogoutButton/index.tsx"],"sourcesContent":["'use client'\n\nimport { Logout, useConfig } from '@payloadcms/ui'\nimport { formatAdminURL } from 'payload/shared'\nimport React from 'react'\n\nimport './index.scss'\n\nconst baseClass = 'oauth-logout'\n\nexport const LogoutButton: React.FC<{ disabled?: boolean; endpointSlug: string }> = ({\n  disabled,\n  endpointSlug,\n}) => {\n  const {\n    config,\n    config: {\n      admin: { user: userSlug },\n      routes: { api },\n      serverURL,\n    },\n  } = useConfig()\n\n  const [redirect, setRedirect] = React.useState('')\n  React.useEffect(() => {\n    const protocol = window.location.protocol\n    const domain = window.location.hostname\n    const port = window.location.port\n\n    let redirectToSet = `${protocol}//${domain}`\n    if (port) {\n      redirectToSet += `:${port}`\n    }\n\n    setRedirect(\n      formatAdminURL({\n        adminRoute: config.routes.admin,\n        serverURL: redirectToSet,\n      }),\n    )\n  }, [config])\n\n  if (!redirect) {\n    return null\n  }\n\n  if (disabled) {\n    return <Logout />\n  }\n\n  return (\n    <div className={baseClass}>\n      <a\n        aria-label=\"Logout\"\n        href={`${serverURL}${api}/${userSlug}/${endpointSlug}/logout?redirect=${redirect}`}\n      >\n        <svg\n          className=\"icon icon--logout\"\n          fill=\"none\"\n          viewBox=\"0 0 25 25\"\n          xmlns=\"http://www.w3.org/2000/svg\"\n        >\n          <path className=\"stroke\" d=\"M10 5H18V19H10\" />\n          <g>\n            <path className=\"stroke\" d=\"M8 8.5L4.46447 12.0355L8 15.5711\" />\n            <line className=\"stroke\" x1=\"5\" x2=\"13\" y1=\"12\" y2=\"12\" />\n          </g>\n        </svg>\n      </a>\n    </div>\n  )\n}\n"],"names":["Logout","useConfig","formatAdminURL","React","baseClass","LogoutButton","disabled","endpointSlug","config","admin","user","userSlug","routes","api","serverURL","redirect","setRedirect","useState","useEffect","protocol","window","location","domain","hostname","port","redirectToSet","adminRoute","div","className","a","aria-label","href","svg","fill","viewBox","xmlns","path","d","g","line","x1","x2","y1","y2"],"mappings":"AAAA;;AAEA,SAASA,MAAM,EAAEC,SAAS,QAAQ,iBAAgB;AAClD,SAASC,cAAc,QAAQ,iBAAgB;AAC/C,OAAOC,WAAW,QAAO;AAEzB,OAAO,eAAc;AAErB,MAAMC,YAAY;AAElB,OAAO,MAAMC,eAAuE,CAAC,EACnFC,QAAQ,EACRC,YAAY,EACb;IACC,MAAM,EACJC,MAAM,EACNA,QAAQ,EACNC,OAAO,EAAEC,MAAMC,QAAQ,EAAE,EACzBC,QAAQ,EAAEC,GAAG,EAAE,EACfC,SAAS,EACV,EACF,GAAGb;IAEJ,MAAM,CAACc,UAAUC,YAAY,GAAGb,MAAMc,QAAQ,CAAC;IAC/Cd,MAAMe,SAAS,CAAC;QACd,MAAMC,WAAWC,OAAOC,QAAQ,CAACF,QAAQ;QACzC,MAAMG,SAASF,OAAOC,QAAQ,CAACE,QAAQ;QACvC,MAAMC,OAAOJ,OAAOC,QAAQ,CAACG,IAAI;QAEjC,IAAIC,gBAAgB,GAAGN,SAAS,EAAE,EAAEG,QAAQ;QAC5C,IAAIE,MAAM;YACRC,iBAAiB,CAAC,CAAC,EAAED,MAAM;QAC7B;QAEAR,YACEd,eAAe;YACbwB,YAAYlB,OAAOI,MAAM,CAACH,KAAK;YAC/BK,WAAWW;QACb;IAEJ,GAAG;QAACjB;KAAO;IAEX,IAAI,CAACO,UAAU;QACb,OAAO;IACT;IAEA,IAAIT,UAAU;QACZ,qBAAO,KAACN;IACV;IAEA,qBACE,KAAC2B;QAAIC,WAAWxB;kBACd,cAAA,KAACyB;YACCC,cAAW;YACXC,MAAM,GAAGjB,YAAYD,IAAI,CAAC,EAAEF,SAAS,CAAC,EAAEJ,aAAa,iBAAiB,EAAEQ,UAAU;sBAElF,cAAA,MAACiB;gBACCJ,WAAU;gBACVK,MAAK;gBACLC,SAAQ;gBACRC,OAAM;;kCAEN,KAACC;wBAAKR,WAAU;wBAASS,GAAE;;kCAC3B,MAACC;;0CACC,KAACF;gCAAKR,WAAU;gCAASS,GAAE;;0CAC3B,KAACE;gCAAKX,WAAU;gCAASY,IAAG;gCAAIC,IAAG;gCAAKC,IAAG;gCAAKC,IAAG;;;;;;;;AAM/D,EAAC"}

package/dist/oauth/endpoints/getLoginEndpoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getLoginEndpoint.d.ts","sourceRoot":"","sources":["../../../src/oauth/endpoints/getLoginEndpoint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAKzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAY,MAAM,aAAa,CAAA;AAS7E,UAAU,IAAI;IACZ,UAAU,EAAE,gBAAgB,CAAA;IAC5B,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,aAAa,CAAA;IAC5B,QAAQ,EAAE,QAAQ,CAAA;CACnB;AAID,eAAO,MAAM,gBAAgB,8EAM1B,IAAI,KAAG,QAkPR,CAAA"}
+{"version":3,"file":"getLoginEndpoint.d.ts","sourceRoot":"","sources":["../../../src/oauth/endpoints/getLoginEndpoint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAKzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAY,MAAM,aAAa,CAAA;AAQ7E,UAAU,IAAI;IACZ,UAAU,EAAE,gBAAgB,CAAA;IAC5B,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,aAAa,CAAA;IAC5B,QAAQ,EAAE,QAAQ,CAAA;CACnB;AAID,eAAO,MAAM,gBAAgB,8EAM1B,IAAI,KAAG,QA4PR,CAAA"}

package/dist/oauth/endpoints/getLoginEndpoint.js

@@ -1,16 +1,15 @@
 import { APIError, generateCookie, parseCookies } from 'payload';
-import { getSafeRedirect } from 'payload/shared';
+import { formatAdminURL, getSafeRedirect } from 'payload/shared';
 import { getProjectToken } from '../../api/figma-api.js';
 import { createCookieOptions } from '../utilities/createCookieOptions.js';
 import { createDebugLogger } from '../utilities/createDebugLogger.js';
 import { extractOrigin } from '../utilities/extractOrigin.js';
-import { getAdminPath } from '../utilities/getAdminPath.js';
 import { getCookieExpiration } from '../utilities/getCookieExpiration.js';
 const isAbsoluteURL = (url)=>/^[a-z][a-z\d+.-]*:/.test(url);
 export const getLoginEndpoint = ({ collection, collectionOptions, endpointSlug, pluginOptions, strategy })=>({
         handler: async (req)=>{
             const { config } = req.payload;
-            const adminPath = getAdminPath(config);
+            const adminRoute = config.routes?.admin || '/admin';
             try {
                 await strategy.ensureMeta();
                 const path = req.pathname;
@@ -37,9 +36,16 @@ export const getLoginEndpoint = ({ collection, collectionOptions, endpointSlug,
                 }
                 const stateRaw = jsonBody.state;
                 const state = JSON.parse(Buffer.from(stateRaw, 'base64').toString('utf-8'));
-                const redirectDestination = state.serverURL || pluginOptions.redirectServerURL || config.serverURL;
-                let failedRedirect = `${redirectDestination}${adminPath}/login`;
-                let redirectToUse = `${redirectDestination}${adminPath}`;
+                const redirectServerURL = state.serverURL || pluginOptions.redirectServerURL || config.serverURL;
+                let failedRedirect = formatAdminURL({
+                    adminRoute,
+                    path: '/login',
+                    serverURL: redirectServerURL
+                });
+                let redirectToUse = formatAdminURL({
+                    adminRoute,
+                    serverURL: redirectServerURL
+                });
                 if (state.redirect) {
                     redirectToUse = state.redirect;
                 }
@@ -126,7 +132,11 @@ export const getLoginEndpoint = ({ collection, collectionOptions, endpointSlug,
                     code,
                     code_verifier: req.payload.decrypt(state.verifier),
                     grant_type: 'authorization_code',
-                    redirect_uri: `${redirectDestination}${config?.routes?.api || '/api'}/${collection.slug}/${endpointSlug}/login`
+                    redirect_uri: formatAdminURL({
+                        apiRoute: config.routes?.api || '/api',
+                        path: `/${collection.slug}/${endpointSlug}/login`,
+                        serverURL: redirectServerURL
+                    })
                 };
                 if (strategy.collectionOptions.clientSecret) {
                     body.client_secret = strategy.collectionOptions.clientSecret;