@payloadcms/plugin-import-export 3.77.0-internal.9837b1e → 3.77.0

package/dist/utilities/getPluginCollections.js

@@ -13,12 +13,27 @@ import { getImportCollection } from '../import/getImportCollection.js';
  * @param pluginConfig - The import/export plugin config
  * @returns Object containing arrays of export and import collections
  */ export const getPluginCollections = async ({ config, pluginConfig })=>{
+    // Calculate collection slugs for base export/import collections
+    // If pluginConfig.collections is provided, filter by export/import !== false
+    // Otherwise, use all config collections
+    let baseExportSlugs;
+    let baseImportSlugs;
+    if (pluginConfig.collections && pluginConfig.collections.length > 0) {
+        baseExportSlugs = pluginConfig.collections.filter((c)=>c.export !== false).map((c)=>c.slug);
+        baseImportSlugs = pluginConfig.collections.filter((c)=>c.import !== false).map((c)=>c.slug);
+    } else {
+        // Fall back to all collections
+        const allSlugs = config.collections?.map((c)=>c.slug) || [];
+        baseExportSlugs = allSlugs;
+        baseImportSlugs = allSlugs;
+    }
     let baseExportCollection = getExportCollection({
+        collectionSlugs: baseExportSlugs,
         config,
         pluginConfig
     });
     let baseImportCollection = getImportCollection({
-        config,
+        collectionSlugs: baseImportSlugs,
         pluginConfig
     });
     if (pluginConfig.overrideExportCollection && typeof pluginConfig.overrideExportCollection === 'function') {
@@ -40,58 +55,84 @@ import { getImportCollection } from '../import/getImportCollection.js';
         for (const collectionConfig of pluginConfig.collections){
             const exportConfig = typeof collectionConfig.export === 'object' ? collectionConfig.export : undefined;
             if (exportConfig?.overrideCollection) {
-                // Generate a collection with this export config's settings (like disableJobsQueue)
-                const collectionWithSettings = getExportCollection({
+                // Create collection specific to this target collection
+                const collection = getExportCollection({
+                    collectionSlugs: [
+                        collectionConfig.slug
+                    ],
                     config,
                     exportConfig,
                     pluginConfig
                 });
-                const customExport = await exportConfig.overrideCollection({
-                    collection: collectionWithSettings
+                // Call override once to determine user intent
+                const overridden = await exportConfig.overrideCollection({
+                    collection
                 });
                 // If the slug changed, this is a separate collection; otherwise it modifies the base
-                if (customExport.slug !== baseExportCollection.slug) {
-                    // Store the source collection slug so CollectionField can use it as default
-                    customExport.admin = {
-                        ...customExport.admin,
-                        custom: {
-                            ...customExport.admin?.custom,
-                            defaultCollectionSlug: collectionConfig.slug
+                if (overridden.slug !== baseExportCollection.slug) {
+                    exportCollections.push(overridden);
+                    customExportSlugMap.set(collectionConfig.slug, overridden.slug);
+                } else {
+                    // Slug didn't change - merge settings into base collection while preserving all slugs
+                    baseExportCollection = {
+                        ...baseExportCollection,
+                        ...overridden,
+                        admin: {
+                            ...baseExportCollection.admin,
+                            ...overridden.admin,
+                            custom: {
+                                ...baseExportCollection.admin?.custom,
+                                ...overridden.admin?.custom,
+                                'plugin-import-export': {
+                                    ...overridden.admin?.custom?.['plugin-import-export'],
+                                    ...baseExportCollection.admin?.custom?.['plugin-import-export'],
+                                    // Ensure base collection's slug list is preserved
+                                    collectionSlugs: baseExportCollection.admin?.custom?.['plugin-import-export']?.collectionSlugs
+                                }
+                            }
                         }
                     };
-                    exportCollections.push(customExport);
-                    customExportSlugMap.set(collectionConfig.slug, customExport.slug);
-                } else {
-                    baseExportCollection = customExport;
                 }
             }
             const importConf = typeof collectionConfig.import === 'object' ? collectionConfig.import : undefined;
             if (importConf?.overrideCollection) {
-                // Generate a collection with this import config's settings (like disableJobsQueue)
-                const collectionWithSettings = getImportCollection({
-                    config,
+                // Create collection specific to this target collection
+                const collection = getImportCollection({
+                    collectionSlugs: [
+                        collectionConfig.slug
+                    ],
                     importConfig: importConf,
                     pluginConfig
                 });
-                const customImport = await importConf.overrideCollection({
-                    collection: collectionWithSettings
+                // Call override once to determine user intent
+                const overridden = await importConf.overrideCollection({
+                    collection
                 });
                 // If the slug changed, this is a separate collection; otherwise it modifies the base
-                if (customImport.slug !== baseImportCollection.slug) {
-                    // Store the source collection slug so CollectionField can use it as default
-                    customImport.admin = {
-                        ...customImport.admin,
-                        custom: {
-                            ...customImport.admin?.custom,
-                            defaultCollectionSlug: collectionConfig.slug
-                        }
-                    };
-                    importCollections.push(customImport);
+                if (overridden.slug !== baseImportCollection.slug) {
+                    importCollections.push(overridden);
                     // Map this target collection to its custom import collection
-                    customImportSlugMap.set(collectionConfig.slug, customImport.slug);
+                    customImportSlugMap.set(collectionConfig.slug, overridden.slug);
                 } else {
-                    // Full override - replace the base
-                    baseImportCollection = customImport;
+                    // Slug didn't change - merge settings into base collection while preserving all slugs
+                    baseImportCollection = {
+                        ...baseImportCollection,
+                        ...overridden,
+                        admin: {
+                            ...baseImportCollection.admin,
+                            ...overridden.admin,
+                            custom: {
+                                ...baseImportCollection.admin?.custom,
+                                ...overridden.admin?.custom,
+                                'plugin-import-export': {
+                                    ...overridden.admin?.custom?.['plugin-import-export'],
+                                    ...baseImportCollection.admin?.custom?.['plugin-import-export'],
+                                    // Ensure base collection's slug list is preserved
+                                    collectionSlugs: baseImportCollection.admin?.custom?.['plugin-import-export']?.collectionSlugs
+                                }
+                            }
+                        }
+                    };
                 }
             }
         }
@@ -138,6 +179,37 @@ import { getImportCollection } from '../import/getImportCollection.js';
             };
         }
     }
+    // Filter out slugs that have custom export/import collections from the base collections
+    // Collections with custom collections should ONLY be exportable/importable through those
+    const filteredExportSlugs = baseExportSlugs.filter((slug)=>!customExportSlugMap.has(slug));
+    const filteredImportSlugs = baseImportSlugs.filter((slug)=>!customImportSlugMap.has(slug));
+    // Update base collections with filtered slugs
+    baseExportCollection = {
+        ...baseExportCollection,
+        admin: {
+            ...baseExportCollection.admin,
+            custom: {
+                ...baseExportCollection.admin?.custom,
+                'plugin-import-export': {
+                    ...baseExportCollection.admin?.custom?.['plugin-import-export'],
+                    collectionSlugs: filteredExportSlugs
+                }
+            }
+        }
+    };
+    baseImportCollection = {
+        ...baseImportCollection,
+        admin: {
+            ...baseImportCollection.admin,
+            custom: {
+                ...baseImportCollection.admin?.custom,
+                'plugin-import-export': {
+                    ...baseImportCollection.admin?.custom?.['plugin-import-export'],
+                    collectionSlugs: filteredImportSlugs
+                }
+            }
+        }
+    };
     exportCollections.unshift(baseExportCollection);
     importCollections.unshift(baseImportCollection);
     return {

package/dist/utilities/getPluginCollections.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/getPluginCollections.ts"],"sourcesContent":["import type { CollectionConfig, Config } from 'payload'\n\nimport type { ExportConfig, ImportConfig, ImportExportPluginConfig } from '../types.js'\n\nimport { getExportCollection } from '../export/getExportCollection.js'\nimport { getImportCollection } from '../import/getImportCollection.js'\n\nexport type PluginCollectionsResult = {\n  /**\n   * Map from target collection slug to the export collection slug to use for it.\n   * Only contains entries for collections with custom export collection overrides.\n   */\n  customExportSlugMap: Map<string, string>\n  /**\n   * Map from target collection slug to the import collection slug to use for it.\n   * Only contains entries for collections with custom import collection overrides.\n   */\n  customImportSlugMap: Map<string, string>\n  /**\n   * All export collections (base + any per-collection overrides)\n   */\n  exportCollections: CollectionConfig[]\n  /**\n   * All import collections (base + any per-collection overrides)\n   */\n  importCollections: CollectionConfig[]\n}\n\n/**\n * Processes the plugin config and returns export/import collections.\n *\n * - Creates the base export and import collections\n * - Applies top-level overrideExportCollection/overrideImportCollection if provided\n * - For each collection in `pluginConfig.collections` that has a function override\n *   for `export` or `import`, applies the override to create customized collections\n * - Applies settings from collections without overrideCollection to the base collection\n *\n * @param config - The Payload config\n * @param pluginConfig - The import/export plugin config\n * @returns Object containing arrays of export and import collections\n */\nexport const getPluginCollections = async ({\n  config,\n  pluginConfig,\n}: {\n  config: Config\n  pluginConfig: ImportExportPluginConfig\n}): Promise<PluginCollectionsResult> => {\n  let baseExportCollection = getExportCollection({\n    config,\n    pluginConfig,\n  })\n  let baseImportCollection = getImportCollection({\n    config,\n    pluginConfig,\n  })\n\n  if (\n    pluginConfig.overrideExportCollection &&\n    typeof pluginConfig.overrideExportCollection === 'function'\n  ) {\n    baseExportCollection = await pluginConfig.overrideExportCollection({\n      collection: baseExportCollection,\n    })\n  }\n\n  if (\n    pluginConfig.overrideImportCollection &&\n    typeof pluginConfig.overrideImportCollection === 'function'\n  ) {\n    baseImportCollection = await pluginConfig.overrideImportCollection({\n      collection: baseImportCollection,\n    })\n  }\n\n  const exportCollections: CollectionConfig[] = []\n  const importCollections: CollectionConfig[] = []\n\n  const customExportSlugMap = new Map<string, string>()\n  const customImportSlugMap = new Map<string, string>()\n\n  // Process each collection config for custom collection overrides\n  if (pluginConfig.collections && pluginConfig.collections.length > 0) {\n    for (const collectionConfig of pluginConfig.collections) {\n      const exportConfig =\n        typeof collectionConfig.export === 'object' ? collectionConfig.export : undefined\n      if (exportConfig?.overrideCollection) {\n        // Generate a collection with this export config's settings (like disableJobsQueue)\n        const collectionWithSettings = getExportCollection({\n          config,\n          exportConfig,\n          pluginConfig,\n        })\n\n        const customExport = await exportConfig.overrideCollection({\n          collection: collectionWithSettings,\n        })\n\n        // If the slug changed, this is a separate collection; otherwise it modifies the base\n        if (customExport.slug !== baseExportCollection.slug) {\n          // Store the source collection slug so CollectionField can use it as default\n          customExport.admin = {\n            ...customExport.admin,\n            custom: {\n              ...customExport.admin?.custom,\n              defaultCollectionSlug: collectionConfig.slug,\n            },\n          }\n          exportCollections.push(customExport)\n          customExportSlugMap.set(collectionConfig.slug, customExport.slug)\n        } else {\n          baseExportCollection = customExport\n        }\n      }\n\n      const importConf =\n        typeof collectionConfig.import === 'object' ? collectionConfig.import : undefined\n      if (importConf?.overrideCollection) {\n        // Generate a collection with this import config's settings (like disableJobsQueue)\n        const collectionWithSettings = getImportCollection({\n          config,\n          importConfig: importConf,\n          pluginConfig,\n        })\n\n        const customImport = await importConf.overrideCollection({\n          collection: collectionWithSettings,\n        })\n\n        // If the slug changed, this is a separate collection; otherwise it modifies the base\n        if (customImport.slug !== baseImportCollection.slug) {\n          // Store the source collection slug so CollectionField can use it as default\n          customImport.admin = {\n            ...customImport.admin,\n            custom: {\n              ...customImport.admin?.custom,\n              defaultCollectionSlug: collectionConfig.slug,\n            },\n          }\n          importCollections.push(customImport)\n          // Map this target collection to its custom import collection\n          customImportSlugMap.set(collectionConfig.slug, customImport.slug)\n        } else {\n          // Full override - replace the base\n          baseImportCollection = customImport\n        }\n      }\n    }\n  }\n\n  // Apply settings from collections without overrideCollection to the base collection\n  // This is done AFTER all overrides so these settings take precedence\n  if (pluginConfig.collections && pluginConfig.collections.length > 0) {\n    let mergedExportSettings: Partial<ExportConfig> = {}\n    let mergedImportSettings: Partial<ImportConfig> = {}\n\n    for (const collectionConfig of pluginConfig.collections) {\n      const exportConf =\n        typeof collectionConfig.export === 'object' ? collectionConfig.export : undefined\n      const importConf =\n        typeof collectionConfig.import === 'object' ? collectionConfig.import : undefined\n\n      if (exportConf && !exportConf.overrideCollection) {\n        mergedExportSettings = { ...mergedExportSettings, ...exportConf }\n      }\n      if (importConf && !importConf.overrideCollection) {\n        mergedImportSettings = { ...mergedImportSettings, ...importConf }\n      }\n    }\n\n    if (\n      mergedExportSettings.format !== undefined ||\n      mergedExportSettings.disableSave !== undefined ||\n      mergedExportSettings.disableDownload !== undefined\n    ) {\n      baseExportCollection = {\n        ...baseExportCollection,\n        admin: {\n          ...baseExportCollection.admin,\n          custom: {\n            ...baseExportCollection.admin?.custom,\n            ...(mergedExportSettings.disableDownload !== undefined && {\n              disableDownload: mergedExportSettings.disableDownload,\n            }),\n            ...(mergedExportSettings.disableSave !== undefined && {\n              disableSave: mergedExportSettings.disableSave,\n            }),\n            ...(mergedExportSettings.format !== undefined && {\n              format: mergedExportSettings.format,\n            }),\n          },\n        },\n      }\n    }\n  }\n\n  exportCollections.unshift(baseExportCollection)\n  importCollections.unshift(baseImportCollection)\n\n  return {\n    customExportSlugMap,\n    customImportSlugMap,\n    exportCollections,\n    importCollections,\n  }\n}\n"],"names":["getExportCollection","getImportCollection","getPluginCollections","config","pluginConfig","baseExportCollection","baseImportCollection","overrideExportCollection","collection","overrideImportCollection","exportCollections","importCollections","customExportSlugMap","Map","customImportSlugMap","collections","length","collectionConfig","exportConfig","export","undefined","overrideCollection","collectionWithSettings","customExport","slug","admin","custom","defaultCollectionSlug","push","set","importConf","import","importConfig","customImport","mergedExportSettings","mergedImportSettings","exportConf","format","disableSave","disableDownload","unshift"],"mappings":"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"}
+{"version":3,"sources":["../../src/utilities/getPluginCollections.ts"],"sourcesContent":["import type { CollectionConfig, Config } from 'payload'\n\nimport type { ExportConfig, ImportConfig, ImportExportPluginConfig } from '../types.js'\n\nimport { getExportCollection } from '../export/getExportCollection.js'\nimport { getImportCollection } from '../import/getImportCollection.js'\n\nexport type PluginCollectionsResult = {\n  /**\n   * Map from target collection slug to the export collection slug to use for it.\n   * Only contains entries for collections with custom export collection overrides.\n   */\n  customExportSlugMap: Map<string, string>\n  /**\n   * Map from target collection slug to the import collection slug to use for it.\n   * Only contains entries for collections with custom import collection overrides.\n   */\n  customImportSlugMap: Map<string, string>\n  /**\n   * All export collections (base + any per-collection overrides)\n   */\n  exportCollections: CollectionConfig[]\n  /**\n   * All import collections (base + any per-collection overrides)\n   */\n  importCollections: CollectionConfig[]\n}\n\n/**\n * Processes the plugin config and returns export/import collections.\n *\n * - Creates the base export and import collections\n * - Applies top-level overrideExportCollection/overrideImportCollection if provided\n * - For each collection in `pluginConfig.collections` that has a function override\n *   for `export` or `import`, applies the override to create customized collections\n * - Applies settings from collections without overrideCollection to the base collection\n *\n * @param config - The Payload config\n * @param pluginConfig - The import/export plugin config\n * @returns Object containing arrays of export and import collections\n */\nexport const getPluginCollections = async ({\n  config,\n  pluginConfig,\n}: {\n  config: Config\n  pluginConfig: ImportExportPluginConfig\n}): Promise<PluginCollectionsResult> => {\n  // Calculate collection slugs for base export/import collections\n  // If pluginConfig.collections is provided, filter by export/import !== false\n  // Otherwise, use all config collections\n  let baseExportSlugs: string[]\n  let baseImportSlugs: string[]\n\n  if (pluginConfig.collections && pluginConfig.collections.length > 0) {\n    baseExportSlugs = pluginConfig.collections.filter((c) => c.export !== false).map((c) => c.slug)\n    baseImportSlugs = pluginConfig.collections.filter((c) => c.import !== false).map((c) => c.slug)\n  } else {\n    // Fall back to all collections\n    const allSlugs = config.collections?.map((c) => c.slug) || []\n    baseExportSlugs = allSlugs\n    baseImportSlugs = allSlugs\n  }\n\n  let baseExportCollection = getExportCollection({\n    collectionSlugs: baseExportSlugs,\n    config,\n    pluginConfig,\n  })\n  let baseImportCollection = getImportCollection({\n    collectionSlugs: baseImportSlugs,\n    pluginConfig,\n  })\n\n  if (\n    pluginConfig.overrideExportCollection &&\n    typeof pluginConfig.overrideExportCollection === 'function'\n  ) {\n    baseExportCollection = await pluginConfig.overrideExportCollection({\n      collection: baseExportCollection,\n    })\n  }\n\n  if (\n    pluginConfig.overrideImportCollection &&\n    typeof pluginConfig.overrideImportCollection === 'function'\n  ) {\n    baseImportCollection = await pluginConfig.overrideImportCollection({\n      collection: baseImportCollection,\n    })\n  }\n\n  const exportCollections: CollectionConfig[] = []\n  const importCollections: CollectionConfig[] = []\n\n  const customExportSlugMap = new Map<string, string>()\n  const customImportSlugMap = new Map<string, string>()\n\n  // Process each collection config for custom collection overrides\n  if (pluginConfig.collections && pluginConfig.collections.length > 0) {\n    for (const collectionConfig of pluginConfig.collections) {\n      const exportConfig =\n        typeof collectionConfig.export === 'object' ? collectionConfig.export : undefined\n\n      if (exportConfig?.overrideCollection) {\n        // Create collection specific to this target collection\n        const collection = getExportCollection({\n          collectionSlugs: [collectionConfig.slug],\n          config,\n          exportConfig,\n          pluginConfig,\n        })\n\n        // Call override once to determine user intent\n        const overridden = await exportConfig.overrideCollection({ collection })\n\n        // If the slug changed, this is a separate collection; otherwise it modifies the base\n        if (overridden.slug !== baseExportCollection.slug) {\n          exportCollections.push(overridden)\n          customExportSlugMap.set(collectionConfig.slug, overridden.slug)\n        } else {\n          // Slug didn't change - merge settings into base collection while preserving all slugs\n          baseExportCollection = {\n            ...baseExportCollection,\n            ...overridden,\n            admin: {\n              ...baseExportCollection.admin,\n              ...overridden.admin,\n              custom: {\n                ...baseExportCollection.admin?.custom,\n                ...overridden.admin?.custom,\n                'plugin-import-export': {\n                  ...overridden.admin?.custom?.['plugin-import-export'],\n                  ...baseExportCollection.admin?.custom?.['plugin-import-export'],\n                  // Ensure base collection's slug list is preserved\n                  collectionSlugs:\n                    baseExportCollection.admin?.custom?.['plugin-import-export']?.collectionSlugs,\n                },\n              },\n            },\n          }\n        }\n      }\n\n      const importConf =\n        typeof collectionConfig.import === 'object' ? collectionConfig.import : undefined\n\n      if (importConf?.overrideCollection) {\n        // Create collection specific to this target collection\n        const collection = getImportCollection({\n          collectionSlugs: [collectionConfig.slug],\n          importConfig: importConf,\n          pluginConfig,\n        })\n\n        // Call override once to determine user intent\n        const overridden = await importConf.overrideCollection({ collection })\n\n        // If the slug changed, this is a separate collection; otherwise it modifies the base\n        if (overridden.slug !== baseImportCollection.slug) {\n          importCollections.push(overridden)\n          // Map this target collection to its custom import collection\n          customImportSlugMap.set(collectionConfig.slug, overridden.slug)\n        } else {\n          // Slug didn't change - merge settings into base collection while preserving all slugs\n          baseImportCollection = {\n            ...baseImportCollection,\n            ...overridden,\n            admin: {\n              ...baseImportCollection.admin,\n              ...overridden.admin,\n              custom: {\n                ...baseImportCollection.admin?.custom,\n                ...overridden.admin?.custom,\n                'plugin-import-export': {\n                  ...overridden.admin?.custom?.['plugin-import-export'],\n                  ...baseImportCollection.admin?.custom?.['plugin-import-export'],\n                  // Ensure base collection's slug list is preserved\n                  collectionSlugs:\n                    baseImportCollection.admin?.custom?.['plugin-import-export']?.collectionSlugs,\n                },\n              },\n            },\n          }\n        }\n      }\n    }\n  }\n\n  // Apply settings from collections without overrideCollection to the base collection\n  // This is done AFTER all overrides so these settings take precedence\n  if (pluginConfig.collections && pluginConfig.collections.length > 0) {\n    let mergedExportSettings: Partial<ExportConfig> = {}\n    let mergedImportSettings: Partial<ImportConfig> = {}\n\n    for (const collectionConfig of pluginConfig.collections) {\n      const exportConf =\n        typeof collectionConfig.export === 'object' ? collectionConfig.export : undefined\n      const importConf =\n        typeof collectionConfig.import === 'object' ? collectionConfig.import : undefined\n\n      if (exportConf && !exportConf.overrideCollection) {\n        mergedExportSettings = { ...mergedExportSettings, ...exportConf }\n      }\n      if (importConf && !importConf.overrideCollection) {\n        mergedImportSettings = { ...mergedImportSettings, ...importConf }\n      }\n    }\n\n    if (\n      mergedExportSettings.format !== undefined ||\n      mergedExportSettings.disableSave !== undefined ||\n      mergedExportSettings.disableDownload !== undefined\n    ) {\n      baseExportCollection = {\n        ...baseExportCollection,\n        admin: {\n          ...baseExportCollection.admin,\n          custom: {\n            ...baseExportCollection.admin?.custom,\n            ...(mergedExportSettings.disableDownload !== undefined && {\n              disableDownload: mergedExportSettings.disableDownload,\n            }),\n            ...(mergedExportSettings.disableSave !== undefined && {\n              disableSave: mergedExportSettings.disableSave,\n            }),\n            ...(mergedExportSettings.format !== undefined && {\n              format: mergedExportSettings.format,\n            }),\n          },\n        },\n      }\n    }\n  }\n\n  // Filter out slugs that have custom export/import collections from the base collections\n  // Collections with custom collections should ONLY be exportable/importable through those\n  const filteredExportSlugs = baseExportSlugs.filter((slug) => !customExportSlugMap.has(slug))\n  const filteredImportSlugs = baseImportSlugs.filter((slug) => !customImportSlugMap.has(slug))\n\n  // Update base collections with filtered slugs\n  baseExportCollection = {\n    ...baseExportCollection,\n    admin: {\n      ...baseExportCollection.admin,\n      custom: {\n        ...baseExportCollection.admin?.custom,\n        'plugin-import-export': {\n          ...baseExportCollection.admin?.custom?.['plugin-import-export'],\n          collectionSlugs: filteredExportSlugs,\n        },\n      },\n    },\n  }\n\n  baseImportCollection = {\n    ...baseImportCollection,\n    admin: {\n      ...baseImportCollection.admin,\n      custom: {\n        ...baseImportCollection.admin?.custom,\n        'plugin-import-export': {\n          ...baseImportCollection.admin?.custom?.['plugin-import-export'],\n          collectionSlugs: filteredImportSlugs,\n        },\n      },\n    },\n  }\n\n  exportCollections.unshift(baseExportCollection)\n  importCollections.unshift(baseImportCollection)\n\n  return {\n    customExportSlugMap,\n    customImportSlugMap,\n    exportCollections,\n    importCollections,\n  }\n}\n"],"names":["getExportCollection","getImportCollection","getPluginCollections","config","pluginConfig","baseExportSlugs","baseImportSlugs","collections","length","filter","c","export","map","slug","import","allSlugs","baseExportCollection","collectionSlugs","baseImportCollection","overrideExportCollection","collection","overrideImportCollection","exportCollections","importCollections","customExportSlugMap","Map","customImportSlugMap","collectionConfig","exportConfig","undefined","overrideCollection","overridden","push","set","admin","custom","importConf","importConfig","mergedExportSettings","mergedImportSettings","exportConf","format","disableSave","disableDownload","filteredExportSlugs","has","filteredImportSlugs","unshift"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"getSchemaColumns.d.ts","sourceRoot":"","sources":["../../src/utilities/getSchemaColumns.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAA;AAIxD,MAAM,MAAM,oBAAoB,GAAG;IACjC;;OAEG;IACH,gBAAgB,EAAE,yBAAyB,CAAA;IAC3C;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;IACzB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB;;OAEG;IACH,MAAM,CAAC,EAAE,IAAI,GAAG,MAAM,CAAA;IACtB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;CACvB,CAAA;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,gBAAgB,uFAM1B,oBAAoB,KAAG,MAAM,EA4E/B,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,YAAY,kBAAmB,MAAM,EAAE,eAAe,MAAM,EAAE,KAAG,MAAM,EAyEnF,CAAA;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAmC5F"}
+{"version":3,"file":"getSchemaColumns.d.ts","sourceRoot":"","sources":["../../src/utilities/getSchemaColumns.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAA;AAIxD,MAAM,MAAM,oBAAoB,GAAG;IACjC;;OAEG;IACH,gBAAgB,EAAE,yBAAyB,CAAA;IAC3C;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;IACzB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB;;OAEG;IACH,MAAM,CAAC,EAAE,IAAI,GAAG,MAAM,CAAA;IACtB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;CACvB,CAAA;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,gBAAgB,uFAM1B,oBAAoB,KAAG,MAAM,EAmC/B,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,YAAY,kBAAmB,MAAM,EAAE,eAAe,MAAM,EAAE,KAAG,MAAM,EAqEnF,CAAA;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAmC5F"}

package/dist/utilities/getSchemaColumns.js

@@ -11,36 +11,27 @@ import { getFlattenedFieldKeys } from './getFlattenedFieldKeys.js';
  * - Works for empty exports
  * - Ensures proper column ordering
  */ export const getSchemaColumns = ({ collectionConfig, disabledFields = [], fields: selectedFields, locale, localeCodes })=>{
-    const hasVersions = Boolean(collectionConfig.versions);
-    // Determine if we need locale expansion
     const expandLocales = locale === 'all' && localeCodes && localeCodes.length > 0;
-    // Get all possible columns from schema (excludes system fields like id, createdAt, updatedAt)
     let schemaColumns = getFlattenedFieldKeys(collectionConfig.flattenedFields, '', expandLocales ? {
         localeCodes
     } : {});
-    // Add system fields that aren't in flattenedFields
-    const systemFields = [
-        'id',
-        'createdAt',
-        'updatedAt'
-    ];
-    schemaColumns = [
-        ...systemFields,
-        ...schemaColumns
-    ];
-    // Filter to user-selected fields if specified
+    // Add id if not present in schema
+    const hasIdField = schemaColumns.includes('id');
+    if (!hasIdField) {
+        schemaColumns = [
+            'id',
+            ...schemaColumns
+        ];
+    }
     if (selectedFields && selectedFields.length > 0) {
         schemaColumns = filterToSelectedFields(schemaColumns, selectedFields);
     }
-    // Remove disabled fields
     if (disabledFields.length > 0) {
         const disabledSet = new Set();
         for (const path of disabledFields){
-            // Convert dot notation to underscore and add to set
             disabledSet.add(path.replace(/\./g, '_'));
         }
         schemaColumns = schemaColumns.filter((col)=>{
-            // Check if column matches any disabled path
             for (const disabled of disabledSet){
                 if (col === disabled || col.startsWith(`${disabled}_`)) {
                     return false;
@@ -49,41 +40,7 @@ import { getFlattenedFieldKeys } from './getFlattenedFieldKeys.js';
             return true;
         });
     }
-    // When user has selected specific fields, preserve their ordering
-    // filterToSelectedFields() already returns columns in user's specified order
-    if (selectedFields && selectedFields.length > 0) {
-        return schemaColumns;
-    }
-    // No fields selected - apply default ordering (id first, timestamps last)
-    const orderedColumns = [];
-    // 1. ID always first
-    if (schemaColumns.includes('id')) {
-        orderedColumns.push('id');
-    }
-    // 2. Status field for versioned collections
-    if (hasVersions) {
-        orderedColumns.push('_status');
-    }
-    // 3. All other fields (excluding id, timestamps, status)
-    const excludeFromMiddle = new Set([
-        '_status',
-        'createdAt',
-        'id',
-        'updatedAt'
-    ]);
-    for (const col of schemaColumns){
-        if (!excludeFromMiddle.has(col)) {
-            orderedColumns.push(col);
-        }
-    }
-    // 4. Timestamps at the end
-    if (schemaColumns.includes('createdAt')) {
-        orderedColumns.push('createdAt');
-    }
-    if (schemaColumns.includes('updatedAt')) {
-        orderedColumns.push('updatedAt');
-    }
-    return orderedColumns;
+    return schemaColumns;
 };
 /**
  * Merges schema-derived columns with data-discovered columns.
@@ -95,12 +52,9 @@ import { getFlattenedFieldKeys } from './getFlattenedFieldKeys.js';
     ];
     const schemaSet = new Set(schemaColumns);
     const insertedDerived = new Map();
-    // Add any data columns not in schema (preserves schema ordering, appends new ones)
     for (const col of dataColumns){
         if (!schemaSet.has(col)) {
             let inserted = false;
-            // Check if this is a derived column from a schema column (e.g., field_id, field_email)
-            // Pattern: schemaCol_suffix where suffix is NOT a number (array indices are handled separately)
             for (const schemaCol of schemaColumns){
                 if (col.startsWith(`${schemaCol}_`)) {
                     const suffix = col.slice(schemaCol.length + 1);
@@ -137,7 +91,6 @@ import { getFlattenedFieldKeys } from './getFlattenedFieldKeys.js';
                         }
                     }
                 }
-                // Otherwise append at the end (before timestamps)
                 const createdAtIdx = result.indexOf('createdAt');
                 if (createdAtIdx !== -1) {
                     result.splice(createdAtIdx, 0, col);

package/dist/utilities/getSchemaColumns.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/getSchemaColumns.ts"],"sourcesContent":["import type { SanitizedCollectionConfig } from 'payload'\n\nimport { getFlattenedFieldKeys } from './getFlattenedFieldKeys.js'\n\nexport type GetSchemaColumnsArgs = {\n  /**\n   * The collection configuration to derive columns from\n   */\n  collectionConfig: SanitizedCollectionConfig\n  /**\n   * Array of disabled field paths from plugin config\n   */\n  disabledFields?: string[]\n  /**\n   * User-selected fields to export. If provided, only these fields (and their nested fields) will be included.\n   */\n  fields?: string[]\n  /**\n   * The locale to export. When 'all', localized fields are expanded to include all locale suffixes.\n   */\n  locale?: null | string\n  /**\n   * Available locale codes from config. Required when locale='all'.\n   */\n  localeCodes?: string[]\n}\n\n/**\n * Derives CSV column names from the collection schema.\n * This provides a base set of columns from field definitions.\n *\n * Note: For arrays/blocks with multiple items, the schema only generates index 0.\n * Additional indices from actual data should be merged with these columns.\n *\n * Benefits:\n * - Provides consistent base columns\n * - Works for empty exports\n * - Ensures proper column ordering\n */\nexport const getSchemaColumns = ({\n  collectionConfig,\n  disabledFields = [],\n  fields: selectedFields,\n  locale,\n  localeCodes,\n}: GetSchemaColumnsArgs): string[] => {\n  const hasVersions = Boolean(collectionConfig.versions)\n\n  // Determine if we need locale expansion\n  const expandLocales = locale === 'all' && localeCodes && localeCodes.length > 0\n\n  // Get all possible columns from schema (excludes system fields like id, createdAt, updatedAt)\n  let schemaColumns = getFlattenedFieldKeys(\n    collectionConfig.flattenedFields,\n    '',\n    expandLocales ? { localeCodes } : {},\n  )\n\n  // Add system fields that aren't in flattenedFields\n  const systemFields = ['id', 'createdAt', 'updatedAt']\n  schemaColumns = [...systemFields, ...schemaColumns]\n\n  // Filter to user-selected fields if specified\n  if (selectedFields && selectedFields.length > 0) {\n    schemaColumns = filterToSelectedFields(schemaColumns, selectedFields)\n  }\n\n  // Remove disabled fields\n  if (disabledFields.length > 0) {\n    const disabledSet = new Set<string>()\n    for (const path of disabledFields) {\n      // Convert dot notation to underscore and add to set\n      disabledSet.add(path.replace(/\\./g, '_'))\n    }\n    schemaColumns = schemaColumns.filter((col) => {\n      // Check if column matches any disabled path\n      for (const disabled of disabledSet) {\n        if (col === disabled || col.startsWith(`${disabled}_`)) {\n          return false\n        }\n      }\n      return true\n    })\n  }\n\n  // When user has selected specific fields, preserve their ordering\n  // filterToSelectedFields() already returns columns in user's specified order\n  if (selectedFields && selectedFields.length > 0) {\n    return schemaColumns\n  }\n\n  // No fields selected - apply default ordering (id first, timestamps last)\n  const orderedColumns: string[] = []\n\n  // 1. ID always first\n  if (schemaColumns.includes('id')) {\n    orderedColumns.push('id')\n  }\n\n  // 2. Status field for versioned collections\n  if (hasVersions) {\n    orderedColumns.push('_status')\n  }\n\n  // 3. All other fields (excluding id, timestamps, status)\n  const excludeFromMiddle = new Set(['_status', 'createdAt', 'id', 'updatedAt'])\n  for (const col of schemaColumns) {\n    if (!excludeFromMiddle.has(col)) {\n      orderedColumns.push(col)\n    }\n  }\n\n  // 4. Timestamps at the end\n  if (schemaColumns.includes('createdAt')) {\n    orderedColumns.push('createdAt')\n  }\n  if (schemaColumns.includes('updatedAt')) {\n    orderedColumns.push('updatedAt')\n  }\n\n  return orderedColumns\n}\n\n/**\n * Merges schema-derived columns with data-discovered columns.\n * Schema columns provide the base ordering, data columns add any additional\n * columns (e.g., array indices beyond 0, dynamic fields, derived columns from toCSV).\n */\nexport const mergeColumns = (schemaColumns: string[], dataColumns: string[]): string[] => {\n  const result = [...schemaColumns]\n  const schemaSet = new Set(schemaColumns)\n  const insertedDerived = new Map<string, string[]>()\n\n  // Add any data columns not in schema (preserves schema ordering, appends new ones)\n  for (const col of dataColumns) {\n    if (!schemaSet.has(col)) {\n      let inserted = false\n\n      // Check if this is a derived column from a schema column (e.g., field_id, field_email)\n      // Pattern: schemaCol_suffix where suffix is NOT a number (array indices are handled separately)\n      for (const schemaCol of schemaColumns) {\n        if (col.startsWith(`${schemaCol}_`)) {\n          const suffix = col.slice(schemaCol.length + 1)\n          // Skip if suffix starts with a digit (array index pattern like field_0_*)\n          if (!/^\\d/.test(suffix)) {\n            const baseIdx = result.indexOf(schemaCol)\n            if (baseIdx !== -1) {\n              const derivedList = insertedDerived.get(schemaCol) || []\n              const insertIdx = baseIdx + 1 + derivedList.length\n              result.splice(insertIdx, 0, col)\n              derivedList.push(col)\n              insertedDerived.set(schemaCol, derivedList)\n              schemaSet.add(col)\n              inserted = true\n              break\n            }\n          }\n        }\n      }\n\n      if (!inserted) {\n        // Check for array indices (e.g., field_1_*), insert after field_0_*\n        const match = col.match(/^(.+?)_(\\d+)(_.*)?$/)\n        if (match) {\n          const [, basePath, index, suffix] = match\n          if (basePath && index) {\n            const prevIndex = parseInt(index, 10) - 1\n            const prevCol = `${basePath}_${prevIndex}${suffix ?? ''}`\n            const prevIdx = result.indexOf(prevCol)\n            if (prevIdx !== -1) {\n              // Insert after the previous index column\n              result.splice(prevIdx + 1, 0, col)\n              schemaSet.add(col)\n              continue\n            }\n          }\n        }\n\n        // Otherwise append at the end (before timestamps)\n        const createdAtIdx = result.indexOf('createdAt')\n        if (createdAtIdx !== -1) {\n          result.splice(createdAtIdx, 0, col)\n        } else {\n          result.push(col)\n        }\n        schemaSet.add(col)\n      }\n    }\n  }\n\n  // Remove schema columns that were fully replaced by toCSV-derived columns (e.g. \"user\" → \"user_id\", \"user_email\")\n  for (const [schemaCol, derivedCols] of insertedDerived) {\n    if (!dataColumns.includes(schemaCol) && derivedCols.length > 0) {\n      const idx = result.indexOf(schemaCol)\n      if (idx !== -1) {\n        result.splice(idx, 1)\n      }\n    }\n  }\n\n  return result\n}\n\n/**\n * Filters schema columns to only include those matching user-selected fields.\n * Preserves the order specified by the user in selectedFields.\n *\n * Container fields (groups, arrays, blocks) don't produce their own column, so we prefix-expand\n * to find their children (e.g., 'group' → 'group_name', 'group_age').\n * Leaf fields (date, text, select) produce an exact column, so we only match exactly to avoid\n * including siblings with similar prefixes (e.g., 'dateWithTimezone' won't pull 'dateWithTimezone_tz').\n */\nexport function filterToSelectedFields(columns: string[], selectedFields: string[]): string[] {\n  const result: string[] = []\n  const columnsSet = new Set(columns)\n\n  // Convert selected fields to underscore notation patterns\n  const patterns = selectedFields.map((field) => {\n    const underscored = field.replace(/\\./g, '_')\n    return {\n      exact: underscored,\n      original: field,\n      prefix: `${underscored}_`,\n    }\n  })\n\n  // Iterate through user-specified fields in order to preserve their ordering\n  for (const pattern of patterns) {\n    const hasExactColumn = columnsSet.has(pattern.exact)\n\n    if (hasExactColumn && !result.includes(pattern.exact)) {\n      result.push(pattern.exact)\n    }\n\n    // Only prefix-expand if no exact column match exists (containers need expansion, leaves don't)\n    if (!hasExactColumn) {\n      for (const column of columns) {\n        if (column.startsWith(pattern.prefix)) {\n          if (!result.includes(column)) {\n            result.push(column)\n          }\n        }\n      }\n    }\n  }\n\n  return result\n}\n"],"names":["getFlattenedFieldKeys","getSchemaColumns","collectionConfig","disabledFields","fields","selectedFields","locale","localeCodes","hasVersions","Boolean","versions","expandLocales","length","schemaColumns","flattenedFields","systemFields","filterToSelectedFields","disabledSet","Set","path","add","replace","filter","col","disabled","startsWith","orderedColumns","includes","push","excludeFromMiddle","has","mergeColumns","dataColumns","result","schemaSet","insertedDerived","Map","inserted","schemaCol","suffix","slice","test","baseIdx","indexOf","derivedList","get","insertIdx","splice","set","match","basePath","index","prevIndex","parseInt","prevCol","prevIdx","createdAtIdx","derivedCols","idx","columns","columnsSet","patterns","map","field","underscored","exact","original","prefix","pattern","hasExactColumn","column"],"mappings":"AAEA,SAASA,qBAAqB,QAAQ,6BAA4B;AAyBlE;;;;;;;;;;;CAWC,GACD,OAAO,MAAMC,mBAAmB,CAAC,EAC/BC,gBAAgB,EAChBC,iBAAiB,EAAE,EACnBC,QAAQC,cAAc,EACtBC,MAAM,EACNC,WAAW,EACU;IACrB,MAAMC,cAAcC,QAAQP,iBAAiBQ,QAAQ;IAErD,wCAAwC;IACxC,MAAMC,gBAAgBL,WAAW,SAASC,eAAeA,YAAYK,MAAM,GAAG;IAE9E,8FAA8F;IAC9F,IAAIC,gBAAgBb,sBAClBE,iBAAiBY,eAAe,EAChC,IACAH,gBAAgB;QAAEJ;IAAY,IAAI,CAAC;IAGrC,mDAAmD;IACnD,MAAMQ,eAAe;QAAC;QAAM;QAAa;KAAY;IACrDF,gBAAgB;WAAIE;WAAiBF;KAAc;IAEnD,8CAA8C;IAC9C,IAAIR,kBAAkBA,eAAeO,MAAM,GAAG,GAAG;QAC/CC,gBAAgBG,uBAAuBH,eAAeR;IACxD;IAEA,yBAAyB;IACzB,IAAIF,eAAeS,MAAM,GAAG,GAAG;QAC7B,MAAMK,cAAc,IAAIC;QACxB,KAAK,MAAMC,QAAQhB,eAAgB;YACjC,oDAAoD;YACpDc,YAAYG,GAAG,CAACD,KAAKE,OAAO,CAAC,OAAO;QACtC;QACAR,gBAAgBA,cAAcS,MAAM,CAAC,CAACC;YACpC,4CAA4C;YAC5C,KAAK,MAAMC,YAAYP,YAAa;gBAClC,IAAIM,QAAQC,YAAYD,IAAIE,UAAU,CAAC,GAAGD,SAAS,CAAC,CAAC,GAAG;oBACtD,OAAO;gBACT;YACF;YACA,OAAO;QACT;IACF;IAEA,kEAAkE;IAClE,6EAA6E;IAC7E,IAAInB,kBAAkBA,eAAeO,MAAM,GAAG,GAAG;QAC/C,OAAOC;IACT;IAEA,0EAA0E;IAC1E,MAAMa,iBAA2B,EAAE;IAEnC,qBAAqB;IACrB,IAAIb,cAAcc,QAAQ,CAAC,OAAO;QAChCD,eAAeE,IAAI,CAAC;IACtB;IAEA,4CAA4C;IAC5C,IAAIpB,aAAa;QACfkB,eAAeE,IAAI,CAAC;IACtB;IAEA,yDAAyD;IACzD,MAAMC,oBAAoB,IAAIX,IAAI;QAAC;QAAW;QAAa;QAAM;KAAY;IAC7E,KAAK,MAAMK,OAAOV,cAAe;QAC/B,IAAI,CAACgB,kBAAkBC,GAAG,CAACP,MAAM;YAC/BG,eAAeE,IAAI,CAACL;QACtB;IACF;IAEA,2BAA2B;IAC3B,IAAIV,cAAcc,QAAQ,CAAC,cAAc;QACvCD,eAAeE,IAAI,CAAC;IACtB;IACA,IAAIf,cAAcc,QAAQ,CAAC,cAAc;QACvCD,eAAeE,IAAI,CAAC;IACtB;IAEA,OAAOF;AACT,EAAC;AAED;;;;CAIC,GACD,OAAO,MAAMK,eAAe,CAAClB,eAAyBmB;IACpD,MAAMC,SAAS;WAAIpB;KAAc;IACjC,MAAMqB,YAAY,IAAIhB,IAAIL;IAC1B,MAAMsB,kBAAkB,IAAIC;IAE5B,mFAAmF;IACnF,KAAK,MAAMb,OAAOS,YAAa;QAC7B,IAAI,CAACE,UAAUJ,GAAG,CAACP,MAAM;YACvB,IAAIc,WAAW;YAEf,uFAAuF;YACvF,gGAAgG;YAChG,KAAK,MAAMC,aAAazB,cAAe;gBACrC,IAAIU,IAAIE,UAAU,CAAC,GAAGa,UAAU,CAAC,CAAC,GAAG;oBACnC,MAAMC,SAAShB,IAAIiB,KAAK,CAACF,UAAU1B,MAAM,GAAG;oBAC5C,0EAA0E;oBAC1E,IAAI,CAAC,MAAM6B,IAAI,CAACF,SAAS;wBACvB,MAAMG,UAAUT,OAAOU,OAAO,CAACL;wBAC/B,IAAII,YAAY,CAAC,GAAG;4BAClB,MAAME,cAAcT,gBAAgBU,GAAG,CAACP,cAAc,EAAE;4BACxD,MAAMQ,YAAYJ,UAAU,IAAIE,YAAYhC,MAAM;4BAClDqB,OAAOc,MAAM,CAACD,WAAW,GAAGvB;4BAC5BqB,YAAYhB,IAAI,CAACL;4BACjBY,gBAAgBa,GAAG,CAACV,WAAWM;4BAC/BV,UAAUd,GAAG,CAACG;4BACdc,WAAW;4BACX;wBACF;oBACF;gBACF;YACF;YAEA,IAAI,CAACA,UAAU;gBACb,oEAAoE;gBACpE,MAAMY,QAAQ1B,IAAI0B,KAAK,CAAC;gBACxB,IAAIA,OAAO;oBACT,MAAM,GAAGC,UAAUC,OAAOZ,OAAO,GAAGU;oBACpC,IAAIC,YAAYC,OAAO;wBACrB,MAAMC,YAAYC,SAASF,OAAO,MAAM;wBACxC,MAAMG,UAAU,GAAGJ,SAAS,CAAC,EAAEE,YAAYb,UAAU,IAAI;wBACzD,MAAMgB,UAAUtB,OAAOU,OAAO,CAACW;wBAC/B,IAAIC,YAAY,CAAC,GAAG;4BAClB,yCAAyC;4BACzCtB,OAAOc,MAAM,CAACQ,UAAU,GAAG,GAAGhC;4BAC9BW,UAAUd,GAAG,CAACG;4BACd;wBACF;oBACF;gBACF;gBAEA,kDAAkD;gBAClD,MAAMiC,eAAevB,OAAOU,OAAO,CAAC;gBACpC,IAAIa,iBAAiB,CAAC,GAAG;oBACvBvB,OAAOc,MAAM,CAACS,cAAc,GAAGjC;gBACjC,OAAO;oBACLU,OAAOL,IAAI,CAACL;gBACd;gBACAW,UAAUd,GAAG,CAACG;YAChB;QACF;IACF;IAEA,kHAAkH;IAClH,KAAK,MAAM,CAACe,WAAWmB,YAAY,IAAItB,gBAAiB;QACtD,IAAI,CAACH,YAAYL,QAAQ,CAACW,cAAcmB,YAAY7C,MAAM,GAAG,GAAG;YAC9D,MAAM8C,MAAMzB,OAAOU,OAAO,CAACL;YAC3B,IAAIoB,QAAQ,CAAC,GAAG;gBACdzB,OAAOc,MAAM,CAACW,KAAK;YACrB;QACF;IACF;IAEA,OAAOzB;AACT,EAAC;AAED;;;;;;;;CAQC,GACD,OAAO,SAASjB,uBAAuB2C,OAAiB,EAAEtD,cAAwB;IAChF,MAAM4B,SAAmB,EAAE;IAC3B,MAAM2B,aAAa,IAAI1C,IAAIyC;IAE3B,0DAA0D;IAC1D,MAAME,WAAWxD,eAAeyD,GAAG,CAAC,CAACC;QACnC,MAAMC,cAAcD,MAAM1C,OAAO,CAAC,OAAO;QACzC,OAAO;YACL4C,OAAOD;YACPE,UAAUH;YACVI,QAAQ,GAAGH,YAAY,CAAC,CAAC;QAC3B;IACF;IAEA,4EAA4E;IAC5E,KAAK,MAAMI,WAAWP,SAAU;QAC9B,MAAMQ,iBAAiBT,WAAW9B,GAAG,CAACsC,QAAQH,KAAK;QAEnD,IAAII,kBAAkB,CAACpC,OAAON,QAAQ,CAACyC,QAAQH,KAAK,GAAG;YACrDhC,OAAOL,IAAI,CAACwC,QAAQH,KAAK;QAC3B;QAEA,+FAA+F;QAC/F,IAAI,CAACI,gBAAgB;YACnB,KAAK,MAAMC,UAAUX,QAAS;gBAC5B,IAAIW,OAAO7C,UAAU,CAAC2C,QAAQD,MAAM,GAAG;oBACrC,IAAI,CAAClC,OAAON,QAAQ,CAAC2C,SAAS;wBAC5BrC,OAAOL,IAAI,CAAC0C;oBACd;gBACF;YACF;QACF;IACF;IAEA,OAAOrC;AACT"}
+{"version":3,"sources":["../../src/utilities/getSchemaColumns.ts"],"sourcesContent":["import type { SanitizedCollectionConfig } from 'payload'\n\nimport { getFlattenedFieldKeys } from './getFlattenedFieldKeys.js'\n\nexport type GetSchemaColumnsArgs = {\n  /**\n   * The collection configuration to derive columns from\n   */\n  collectionConfig: SanitizedCollectionConfig\n  /**\n   * Array of disabled field paths from plugin config\n   */\n  disabledFields?: string[]\n  /**\n   * User-selected fields to export. If provided, only these fields (and their nested fields) will be included.\n   */\n  fields?: string[]\n  /**\n   * The locale to export. When 'all', localized fields are expanded to include all locale suffixes.\n   */\n  locale?: null | string\n  /**\n   * Available locale codes from config. Required when locale='all'.\n   */\n  localeCodes?: string[]\n}\n\n/**\n * Derives CSV column names from the collection schema.\n * This provides a base set of columns from field definitions.\n *\n * Note: For arrays/blocks with multiple items, the schema only generates index 0.\n * Additional indices from actual data should be merged with these columns.\n *\n * Benefits:\n * - Provides consistent base columns\n * - Works for empty exports\n * - Ensures proper column ordering\n */\nexport const getSchemaColumns = ({\n  collectionConfig,\n  disabledFields = [],\n  fields: selectedFields,\n  locale,\n  localeCodes,\n}: GetSchemaColumnsArgs): string[] => {\n  const expandLocales = locale === 'all' && localeCodes && localeCodes.length > 0\n\n  let schemaColumns = getFlattenedFieldKeys(\n    collectionConfig.flattenedFields,\n    '',\n    expandLocales ? { localeCodes } : {},\n  )\n\n  // Add id if not present in schema\n  const hasIdField = schemaColumns.includes('id')\n  if (!hasIdField) {\n    schemaColumns = ['id', ...schemaColumns]\n  }\n\n  if (selectedFields && selectedFields.length > 0) {\n    schemaColumns = filterToSelectedFields(schemaColumns, selectedFields)\n  }\n\n  if (disabledFields.length > 0) {\n    const disabledSet = new Set<string>()\n    for (const path of disabledFields) {\n      disabledSet.add(path.replace(/\\./g, '_'))\n    }\n    schemaColumns = schemaColumns.filter((col) => {\n      for (const disabled of disabledSet) {\n        if (col === disabled || col.startsWith(`${disabled}_`)) {\n          return false\n        }\n      }\n      return true\n    })\n  }\n\n  return schemaColumns\n}\n\n/**\n * Merges schema-derived columns with data-discovered columns.\n * Schema columns provide the base ordering, data columns add any additional\n * columns (e.g., array indices beyond 0, dynamic fields, derived columns from toCSV).\n */\nexport const mergeColumns = (schemaColumns: string[], dataColumns: string[]): string[] => {\n  const result = [...schemaColumns]\n  const schemaSet = new Set(schemaColumns)\n  const insertedDerived = new Map<string, string[]>()\n\n  for (const col of dataColumns) {\n    if (!schemaSet.has(col)) {\n      let inserted = false\n\n      for (const schemaCol of schemaColumns) {\n        if (col.startsWith(`${schemaCol}_`)) {\n          const suffix = col.slice(schemaCol.length + 1)\n          // Skip if suffix starts with a digit (array index pattern like field_0_*)\n          if (!/^\\d/.test(suffix)) {\n            const baseIdx = result.indexOf(schemaCol)\n            if (baseIdx !== -1) {\n              const derivedList = insertedDerived.get(schemaCol) || []\n              const insertIdx = baseIdx + 1 + derivedList.length\n              result.splice(insertIdx, 0, col)\n              derivedList.push(col)\n              insertedDerived.set(schemaCol, derivedList)\n              schemaSet.add(col)\n              inserted = true\n              break\n            }\n          }\n        }\n      }\n\n      if (!inserted) {\n        // Check for array indices (e.g., field_1_*), insert after field_0_*\n        const match = col.match(/^(.+?)_(\\d+)(_.*)?$/)\n        if (match) {\n          const [, basePath, index, suffix] = match\n          if (basePath && index) {\n            const prevIndex = parseInt(index, 10) - 1\n            const prevCol = `${basePath}_${prevIndex}${suffix ?? ''}`\n            const prevIdx = result.indexOf(prevCol)\n            if (prevIdx !== -1) {\n              // Insert after the previous index column\n              result.splice(prevIdx + 1, 0, col)\n              schemaSet.add(col)\n              continue\n            }\n          }\n        }\n\n        const createdAtIdx = result.indexOf('createdAt')\n        if (createdAtIdx !== -1) {\n          result.splice(createdAtIdx, 0, col)\n        } else {\n          result.push(col)\n        }\n        schemaSet.add(col)\n      }\n    }\n  }\n\n  // Remove schema columns that were fully replaced by toCSV-derived columns (e.g. \"user\" → \"user_id\", \"user_email\")\n  for (const [schemaCol, derivedCols] of insertedDerived) {\n    if (!dataColumns.includes(schemaCol) && derivedCols.length > 0) {\n      const idx = result.indexOf(schemaCol)\n      if (idx !== -1) {\n        result.splice(idx, 1)\n      }\n    }\n  }\n\n  return result\n}\n\n/**\n * Filters schema columns to only include those matching user-selected fields.\n * Preserves the order specified by the user in selectedFields.\n *\n * Container fields (groups, arrays, blocks) don't produce their own column, so we prefix-expand\n * to find their children (e.g., 'group' → 'group_name', 'group_age').\n * Leaf fields (date, text, select) produce an exact column, so we only match exactly to avoid\n * including siblings with similar prefixes (e.g., 'dateWithTimezone' won't pull 'dateWithTimezone_tz').\n */\nexport function filterToSelectedFields(columns: string[], selectedFields: string[]): string[] {\n  const result: string[] = []\n  const columnsSet = new Set(columns)\n\n  // Convert selected fields to underscore notation patterns\n  const patterns = selectedFields.map((field) => {\n    const underscored = field.replace(/\\./g, '_')\n    return {\n      exact: underscored,\n      original: field,\n      prefix: `${underscored}_`,\n    }\n  })\n\n  // Iterate through user-specified fields in order to preserve their ordering\n  for (const pattern of patterns) {\n    const hasExactColumn = columnsSet.has(pattern.exact)\n\n    if (hasExactColumn && !result.includes(pattern.exact)) {\n      result.push(pattern.exact)\n    }\n\n    // Only prefix-expand if no exact column match exists (containers need expansion, leaves don't)\n    if (!hasExactColumn) {\n      for (const column of columns) {\n        if (column.startsWith(pattern.prefix)) {\n          if (!result.includes(column)) {\n            result.push(column)\n          }\n        }\n      }\n    }\n  }\n\n  return result\n}\n"],"names":["getFlattenedFieldKeys","getSchemaColumns","collectionConfig","disabledFields","fields","selectedFields","locale","localeCodes","expandLocales","length","schemaColumns","flattenedFields","hasIdField","includes","filterToSelectedFields","disabledSet","Set","path","add","replace","filter","col","disabled","startsWith","mergeColumns","dataColumns","result","schemaSet","insertedDerived","Map","has","inserted","schemaCol","suffix","slice","test","baseIdx","indexOf","derivedList","get","insertIdx","splice","push","set","match","basePath","index","prevIndex","parseInt","prevCol","prevIdx","createdAtIdx","derivedCols","idx","columns","columnsSet","patterns","map","field","underscored","exact","original","prefix","pattern","hasExactColumn","column"],"mappings":"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"}

package/dist/utilities/getSchemaColumns.spec.js

@@ -0,0 +1,157 @@
+import { describe, expect, it } from 'vitest';
+import { getSchemaColumns } from './getSchemaColumns.js';
+function createCollectionConfig(flattenedFields, options) {
+    return {
+        flattenedFields,
+        timestamps: options?.timestamps ?? true,
+        trash: options?.trash ?? false,
+        versions: options?.versions
+    };
+}
+describe('getSchemaColumns', ()=>{
+    describe('fields from flattenedFields', ()=>{
+        it('should include all fields present in flattenedFields in their natural order', ()=>{
+            const flattenedFields = [
+                {
+                    name: 'id',
+                    type: 'number'
+                },
+                {
+                    name: 'title',
+                    type: 'text'
+                },
+                {
+                    name: 'createdAt',
+                    type: 'date'
+                },
+                {
+                    name: 'updatedAt',
+                    type: 'date'
+                }
+            ];
+            const collectionConfig = createCollectionConfig(flattenedFields);
+            const result = getSchemaColumns({
+                collectionConfig
+            });
+            expect(result).toEqual([
+                'id',
+                'title',
+                'createdAt',
+                'updatedAt'
+            ]);
+        });
+        it('should include custom id field when defined in flattenedFields', ()=>{
+            const flattenedFields = [
+                {
+                    name: 'id',
+                    type: 'text'
+                },
+                {
+                    name: 'title',
+                    type: 'text'
+                },
+                {
+                    name: 'createdAt',
+                    type: 'date'
+                },
+                {
+                    name: 'updatedAt',
+                    type: 'date'
+                }
+            ];
+            const collectionConfig = createCollectionConfig(flattenedFields);
+            const result = getSchemaColumns({
+                collectionConfig
+            });
+            expect(result).toContain('id');
+        });
+        it('should not include createdAt or updatedAt when timestamps disabled (not in flattenedFields)', ()=>{
+            const flattenedFields = [
+                {
+                    name: 'id',
+                    type: 'number'
+                },
+                {
+                    name: 'title',
+                    type: 'text'
+                }
+            ];
+            const collectionConfig = createCollectionConfig(flattenedFields, {
+                timestamps: false
+            });
+            const result = getSchemaColumns({
+                collectionConfig
+            });
+            expect(result).toContain('id');
+            expect(result).toContain('title');
+            expect(result).not.toContain('createdAt');
+            expect(result).not.toContain('updatedAt');
+        });
+        it('should include deletedAt when present in flattenedFields (trash enabled)', ()=>{
+            const flattenedFields = [
+                {
+                    name: 'id',
+                    type: 'number'
+                },
+                {
+                    name: 'title',
+                    type: 'text'
+                },
+                {
+                    name: 'createdAt',
+                    type: 'date'
+                },
+                {
+                    name: 'updatedAt',
+                    type: 'date'
+                },
+                {
+                    name: 'deletedAt',
+                    type: 'date'
+                }
+            ];
+            const collectionConfig = createCollectionConfig(flattenedFields);
+            const result = getSchemaColumns({
+                collectionConfig
+            });
+            expect(result).toContain('deletedAt');
+        });
+        it('should add id when missing from flattenedFields (Payload core limitation)', ()=>{
+            const flattenedFields = [
+                {
+                    name: 'title',
+                    type: 'text'
+                },
+                {
+                    name: 'excerpt',
+                    type: 'textarea'
+                },
+                {
+                    name: 'createdAt',
+                    type: 'date'
+                },
+                {
+                    name: 'updatedAt',
+                    type: 'date'
+                }
+            ];
+            const collectionConfig = createCollectionConfig(flattenedFields);
+            const result = getSchemaColumns({
+                collectionConfig
+            });
+            // id is added because Payload core doesn't add it to flattenedFields
+            // but it exists on every document
+            expect(result).toContain('id');
+            expect(result[0]).toBe('id');
+            expect(result).toEqual([
+                'id',
+                'title',
+                'excerpt',
+                'createdAt',
+                'updatedAt'
+            ]);
+        });
+    });
+});
+
+//# sourceMappingURL=getSchemaColumns.spec.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/getSchemaColumns.spec.ts"],"sourcesContent":["import type { FlattenedField, SanitizedCollectionConfig } from 'payload'\n\nimport { describe, expect, it } from 'vitest'\n\nimport { getSchemaColumns } from './getSchemaColumns.js'\n\nfunction createCollectionConfig(\n  flattenedFields: FlattenedField[],\n  options?: { timestamps?: boolean; trash?: boolean; versions?: unknown },\n): SanitizedCollectionConfig {\n  return {\n    flattenedFields,\n    timestamps: options?.timestamps ?? true,\n    trash: options?.trash ?? false,\n    versions: options?.versions,\n  } as SanitizedCollectionConfig\n}\n\ndescribe('getSchemaColumns', () => {\n  describe('fields from flattenedFields', () => {\n    it('should include all fields present in flattenedFields in their natural order', () => {\n      const flattenedFields: FlattenedField[] = [\n        { name: 'id', type: 'number' },\n        { name: 'title', type: 'text' },\n        { name: 'createdAt', type: 'date' },\n        { name: 'updatedAt', type: 'date' },\n      ]\n\n      const collectionConfig = createCollectionConfig(flattenedFields)\n      const result = getSchemaColumns({ collectionConfig })\n\n      expect(result).toEqual(['id', 'title', 'createdAt', 'updatedAt'])\n    })\n\n    it('should include custom id field when defined in flattenedFields', () => {\n      const flattenedFields: FlattenedField[] = [\n        { name: 'id', type: 'text' },\n        { name: 'title', type: 'text' },\n        { name: 'createdAt', type: 'date' },\n        { name: 'updatedAt', type: 'date' },\n      ]\n\n      const collectionConfig = createCollectionConfig(flattenedFields)\n      const result = getSchemaColumns({ collectionConfig })\n\n      expect(result).toContain('id')\n    })\n\n    it('should not include createdAt or updatedAt when timestamps disabled (not in flattenedFields)', () => {\n      const flattenedFields: FlattenedField[] = [\n        { name: 'id', type: 'number' },\n        { name: 'title', type: 'text' },\n      ]\n\n      const collectionConfig = createCollectionConfig(flattenedFields, { timestamps: false })\n      const result = getSchemaColumns({ collectionConfig })\n\n      expect(result).toContain('id')\n      expect(result).toContain('title')\n      expect(result).not.toContain('createdAt')\n      expect(result).not.toContain('updatedAt')\n    })\n\n    it('should include deletedAt when present in flattenedFields (trash enabled)', () => {\n      const flattenedFields: FlattenedField[] = [\n        { name: 'id', type: 'number' },\n        { name: 'title', type: 'text' },\n        { name: 'createdAt', type: 'date' },\n        { name: 'updatedAt', type: 'date' },\n        { name: 'deletedAt', type: 'date' },\n      ]\n\n      const collectionConfig = createCollectionConfig(flattenedFields)\n      const result = getSchemaColumns({ collectionConfig })\n\n      expect(result).toContain('deletedAt')\n    })\n\n    it('should add id when missing from flattenedFields (Payload core limitation)', () => {\n      const flattenedFields: FlattenedField[] = [\n        { name: 'title', type: 'text' },\n        { name: 'excerpt', type: 'textarea' },\n        { name: 'createdAt', type: 'date' },\n        { name: 'updatedAt', type: 'date' },\n      ]\n\n      const collectionConfig = createCollectionConfig(flattenedFields)\n      const result = getSchemaColumns({ collectionConfig })\n\n      // id is added because Payload core doesn't add it to flattenedFields\n      // but it exists on every document\n      expect(result).toContain('id')\n      expect(result[0]).toBe('id')\n      expect(result).toEqual(['id', 'title', 'excerpt', 'createdAt', 'updatedAt'])\n    })\n  })\n})\n"],"names":["describe","expect","it","getSchemaColumns","createCollectionConfig","flattenedFields","options","timestamps","trash","versions","name","type","collectionConfig","result","toEqual","toContain","not","toBe"],"mappings":"AAEA,SAASA,QAAQ,EAAEC,MAAM,EAAEC,EAAE,QAAQ,SAAQ;AAE7C,SAASC,gBAAgB,QAAQ,wBAAuB;AAExD,SAASC,uBACPC,eAAiC,EACjCC,OAAuE;IAEvE,OAAO;QACLD;QACAE,YAAYD,SAASC,cAAc;QACnCC,OAAOF,SAASE,SAAS;QACzBC,UAAUH,SAASG;IACrB;AACF;AAEAT,SAAS,oBAAoB;IAC3BA,SAAS,+BAA+B;QACtCE,GAAG,+EAA+E;YAChF,MAAMG,kBAAoC;gBACxC;oBAAEK,MAAM;oBAAMC,MAAM;gBAAS;gBAC7B;oBAAED,MAAM;oBAASC,MAAM;gBAAO;gBAC9B;oBAAED,MAAM;oBAAaC,MAAM;gBAAO;gBAClC;oBAAED,MAAM;oBAAaC,MAAM;gBAAO;aACnC;YAED,MAAMC,mBAAmBR,uBAAuBC;YAChD,MAAMQ,SAASV,iBAAiB;gBAAES;YAAiB;YAEnDX,OAAOY,QAAQC,OAAO,CAAC;gBAAC;gBAAM;gBAAS;gBAAa;aAAY;QAClE;QAEAZ,GAAG,kEAAkE;YACnE,MAAMG,kBAAoC;gBACxC;oBAAEK,MAAM;oBAAMC,MAAM;gBAAO;gBAC3B;oBAAED,MAAM;oBAASC,MAAM;gBAAO;gBAC9B;oBAAED,MAAM;oBAAaC,MAAM;gBAAO;gBAClC;oBAAED,MAAM;oBAAaC,MAAM;gBAAO;aACnC;YAED,MAAMC,mBAAmBR,uBAAuBC;YAChD,MAAMQ,SAASV,iBAAiB;gBAAES;YAAiB;YAEnDX,OAAOY,QAAQE,SAAS,CAAC;QAC3B;QAEAb,GAAG,+FAA+F;YAChG,MAAMG,kBAAoC;gBACxC;oBAAEK,MAAM;oBAAMC,MAAM;gBAAS;gBAC7B;oBAAED,MAAM;oBAASC,MAAM;gBAAO;aAC/B;YAED,MAAMC,mBAAmBR,uBAAuBC,iBAAiB;gBAAEE,YAAY;YAAM;YACrF,MAAMM,SAASV,iBAAiB;gBAAES;YAAiB;YAEnDX,OAAOY,QAAQE,SAAS,CAAC;YACzBd,OAAOY,QAAQE,SAAS,CAAC;YACzBd,OAAOY,QAAQG,GAAG,CAACD,SAAS,CAAC;YAC7Bd,OAAOY,QAAQG,GAAG,CAACD,SAAS,CAAC;QAC/B;QAEAb,GAAG,4EAA4E;YAC7E,MAAMG,kBAAoC;gBACxC;oBAAEK,MAAM;oBAAMC,MAAM;gBAAS;gBAC7B;oBAAED,MAAM;oBAASC,MAAM;gBAAO;gBAC9B;oBAAED,MAAM;oBAAaC,MAAM;gBAAO;gBAClC;oBAAED,MAAM;oBAAaC,MAAM;gBAAO;gBAClC;oBAAED,MAAM;oBAAaC,MAAM;gBAAO;aACnC;YAED,MAAMC,mBAAmBR,uBAAuBC;YAChD,MAAMQ,SAASV,iBAAiB;gBAAES;YAAiB;YAEnDX,OAAOY,QAAQE,SAAS,CAAC;QAC3B;QAEAb,GAAG,6EAA6E;YAC9E,MAAMG,kBAAoC;gBACxC;oBAAEK,MAAM;oBAASC,MAAM;gBAAO;gBAC9B;oBAAED,MAAM;oBAAWC,MAAM;gBAAW;gBACpC;oBAAED,MAAM;oBAAaC,MAAM;gBAAO;gBAClC;oBAAED,MAAM;oBAAaC,MAAM;gBAAO;aACnC;YAED,MAAMC,mBAAmBR,uBAAuBC;YAChD,MAAMQ,SAASV,iBAAiB;gBAAES;YAAiB;YAEnD,qEAAqE;YACrE,kCAAkC;YAClCX,OAAOY,QAAQE,SAAS,CAAC;YACzBd,OAAOY,MAAM,CAAC,EAAE,EAAEI,IAAI,CAAC;YACvBhB,OAAOY,QAAQC,OAAO,CAAC;gBAAC;gBAAM;gBAAS;gBAAW;gBAAa;aAAY;QAC7E;IACF;AACF"}

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

@@ -1 +1 @@
-{"version":3,"file":"parseCSV.d.ts","sourceRoot":"","sources":["../../src/utilities/parseCSV.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAI7C,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IACrB,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,QAAQ,kBAAyB,YAAY,KAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CA6D7F,CAAA"}
+{"version":3,"file":"parseCSV.d.ts","sourceRoot":"","sources":["../../src/utilities/parseCSV.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAI7C,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;IACrB,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,QAAQ,kBAAyB,YAAY,KAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CA8D7F,CAAA"}

package/dist/utilities/parseCSV.js

@@ -6,6 +6,7 @@ import { parse } from 'csv-parse';
     return new Promise((resolve, reject)=>{
         const records = [];
         const parser = parse({
+            bom: true,
             cast: (value, _context)=>{
                 // Empty strings become undefined to preserve existing data during updates
                 if (value === '') {