@payloadcms/plugin-import-export 3.75.0 → 3.76.0-canary.0

package/dist/utilities/getSchemaColumns.js

@@ -10,7 +10,7 @@ import { getFlattenedFieldKeys } from './getFlattenedFieldKeys.js';
  * - Provides consistent base columns
  * - Works for empty exports
  * - Ensures proper column ordering
- */ export const getSchemaColumns = ({ collectionConfig, disabledFields = [], fields: selectedFields, locale, localeCodes })=>{
+ */ export const getSchemaColumns = ({ collectionConfig, disabledFields = [], fields: selectedFields, locale, localeCodes, timezoneCompanionFields })=>{
     const hasVersions = Boolean(collectionConfig.versions);
     // Determine if we need locale expansion
     const expandLocales = locale === 'all' && localeCodes && localeCodes.length > 0;
@@ -30,7 +30,7 @@ import { getFlattenedFieldKeys } from './getFlattenedFieldKeys.js';
     ];
     // Filter to user-selected fields if specified
     if (selectedFields && selectedFields.length > 0) {
-        schemaColumns = filterToSelectedFields(schemaColumns, selectedFields);
+        schemaColumns = filterToSelectedFields(schemaColumns, selectedFields, timezoneCompanionFields);
     }
     // Remove disabled fields
     if (disabledFields.length > 0) {
@@ -88,40 +88,64 @@ import { getFlattenedFieldKeys } from './getFlattenedFieldKeys.js';
 /**
  * Merges schema-derived columns with data-discovered columns.
  * Schema columns provide the base ordering, data columns add any additional
- * columns (e.g., array indices beyond 0, dynamic fields).
+ * columns (e.g., array indices beyond 0, dynamic fields, derived columns from toCSV).
  */ export const mergeColumns = (schemaColumns, dataColumns)=>{
     const result = [
         ...schemaColumns
     ];
     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)) {
-            // Find the best position to insert this column
-            // For array indices (e.g., field_1_*), insert after field_0_*
-            const match = col.match(/^(.+?)_(\d+)(_.*)?$/);
-            if (match) {
-                const [, basePath, index, suffix] = match;
-                if (basePath && index) {
-                    const prevIndex = parseInt(index, 10) - 1;
-                    const prevCol = `${basePath}_${prevIndex}${suffix ?? ''}`;
-                    const prevIdx = result.indexOf(prevCol);
-                    if (prevIdx !== -1) {
-                        // Insert after the previous index column
-                        result.splice(prevIdx + 1, 0, col);
-                        schemaSet.add(col);
-                        continue;
+            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);
+                    // Skip if suffix starts with a digit (array index pattern like field_0_*)
+                    if (!/^\d/.test(suffix)) {
+                        const baseIdx = result.indexOf(schemaCol);
+                        if (baseIdx !== -1) {
+                            const derivedList = insertedDerived.get(schemaCol) || [];
+                            const insertIdx = baseIdx + 1 + derivedList.length;
+                            result.splice(insertIdx, 0, col);
+                            derivedList.push(col);
+                            insertedDerived.set(schemaCol, derivedList);
+                            schemaSet.add(col);
+                            inserted = true;
+                            break;
+                        }
                     }
                 }
             }
-            // Otherwise append at the end (before timestamps)
-            const createdAtIdx = result.indexOf('createdAt');
-            if (createdAtIdx !== -1) {
-                result.splice(createdAtIdx, 0, col);
-            } else {
-                result.push(col);
+            if (!inserted) {
+                // Check for array indices (e.g., field_1_*), insert after field_0_*
+                const match = col.match(/^(.+?)_(\d+)(_.*)?$/);
+                if (match) {
+                    const [, basePath, index, suffix] = match;
+                    if (basePath && index) {
+                        const prevIndex = parseInt(index, 10) - 1;
+                        const prevCol = `${basePath}_${prevIndex}${suffix ?? ''}`;
+                        const prevIdx = result.indexOf(prevCol);
+                        if (prevIdx !== -1) {
+                            // Insert after the previous index column
+                            result.splice(prevIdx + 1, 0, col);
+                            schemaSet.add(col);
+                            continue;
+                        }
+                    }
+                }
+                // Otherwise append at the end (before timestamps)
+                const createdAtIdx = result.indexOf('createdAt');
+                if (createdAtIdx !== -1) {
+                    result.splice(createdAtIdx, 0, col);
+                } else {
+                    result.push(col);
+                }
+                schemaSet.add(col);
             }
-            schemaSet.add(col);
         }
     }
     return result;
@@ -130,7 +154,7 @@ import { getFlattenedFieldKeys } from './getFlattenedFieldKeys.js';
  * Filters schema columns to only include those matching user-selected fields.
  * Preserves the order specified by the user in selectedFields.
  * Handles nested field selection (e.g., 'group.value' includes 'group_value' and 'group_value_*')
- */ function filterToSelectedFields(columns, selectedFields) {
+ */ function filterToSelectedFields(columns, selectedFields, timezoneCompanionFields) {
     const result = [];
     const columnsSet = new Set(columns);
     // Convert selected fields to underscore notation patterns
@@ -142,15 +166,25 @@ import { getFlattenedFieldKeys } from './getFlattenedFieldKeys.js';
             prefix: `${underscored}_`
         };
     });
+    // Track which timezone companion fields were explicitly selected
+    const explicitlySelectedTzFields = new Set(selectedFields.filter((f)=>{
+        const underscored = f.replace(/\./g, '_');
+        return timezoneCompanionFields?.has(underscored);
+    }).map((f)=>f.replace(/\./g, '_')));
     // Iterate through user-specified fields in order to preserve their ordering
     for (const pattern of patterns){
-        // First add the exact match if it exists
-        if (columnsSet.has(pattern.exact)) {
+        // First add the exact match if it exists and not already added
+        // (it may have been added as a nested field of a previous pattern)
+        if (columnsSet.has(pattern.exact) && !result.includes(pattern.exact)) {
             result.push(pattern.exact);
         }
         // Then add any columns with the prefix (nested fields)
         for (const column of columns){
             if (column !== pattern.exact && column.startsWith(pattern.prefix)) {
+                // Skip auto-generated timezone companion fields unless explicitly selected
+                if (timezoneCompanionFields?.has(column) && !explicitlySelectedTzFields.has(column)) {
+                    continue;
+                }
                 if (!result.includes(column)) {
                     result.push(column);
                 }

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).\n */\nexport const mergeColumns = (schemaColumns: string[], dataColumns: string[]): string[] => {\n  const result = [...schemaColumns]\n  const schemaSet = new Set(schemaColumns)\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      // Find the best position to insert this column\n      // 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      // 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  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 * Handles nested field selection (e.g., 'group.value' includes 'group_value' and 'group_value_*')\n */\nfunction 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    // First add the exact match if it exists\n    if (columnsSet.has(pattern.exact)) {\n      result.push(pattern.exact)\n    }\n\n    // Then add any columns with the prefix (nested fields)\n    for (const column of columns) {\n      if (column !== pattern.exact && column.startsWith(pattern.prefix)) {\n        if (!result.includes(column)) {\n          result.push(column)\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","match","basePath","index","suffix","prevIndex","parseInt","prevCol","prevIdx","indexOf","splice","createdAtIdx","columns","columnsSet","patterns","map","field","underscored","exact","original","prefix","pattern","column"],"mappings":"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"}
+{"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   * Set of auto-generated timezone companion field names (from collectTimezoneCompanionFields).\n   * These fields are excluded unless explicitly selected.\n   * If not provided, no timezone filtering is applied.\n   */\n  timezoneCompanionFields?: Set<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  timezoneCompanionFields,\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, timezoneCompanionFields)\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  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 * Handles nested field selection (e.g., 'group.value' includes 'group_value' and 'group_value_*')\n */\nfunction filterToSelectedFields(\n  columns: string[],\n  selectedFields: string[],\n  timezoneCompanionFields?: Set<string>,\n): 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  // Track which timezone companion fields were explicitly selected\n  const explicitlySelectedTzFields = new Set(\n    selectedFields\n      .filter((f) => {\n        const underscored = f.replace(/\\./g, '_')\n        return timezoneCompanionFields?.has(underscored)\n      })\n      .map((f) => f.replace(/\\./g, '_')),\n  )\n\n  // Iterate through user-specified fields in order to preserve their ordering\n  for (const pattern of patterns) {\n    // First add the exact match if it exists and not already added\n    // (it may have been added as a nested field of a previous pattern)\n    if (columnsSet.has(pattern.exact) && !result.includes(pattern.exact)) {\n      result.push(pattern.exact)\n    }\n\n    // Then add any columns with the prefix (nested fields)\n    for (const column of columns) {\n      if (column !== pattern.exact && column.startsWith(pattern.prefix)) {\n        // Skip auto-generated timezone companion fields unless explicitly selected\n        if (timezoneCompanionFields?.has(column) && !explicitlySelectedTzFields.has(column)) {\n          continue\n        }\n        if (!result.includes(column)) {\n          result.push(column)\n        }\n      }\n    }\n  }\n\n  return result\n}\n"],"names":["getFlattenedFieldKeys","getSchemaColumns","collectionConfig","disabledFields","fields","selectedFields","locale","localeCodes","timezoneCompanionFields","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","columns","columnsSet","patterns","map","field","underscored","exact","original","prefix","explicitlySelectedTzFields","f","pattern","column"],"mappings":"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"}

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,CAmE7F,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,CA6D7F,CAAA"}

package/dist/utilities/parseCSV.js

@@ -7,36 +7,30 @@ import { parse } from 'csv-parse';
         const records = [];
         const parser = parse({
             cast: (value, _context)=>{
-                // Empty strings should be undefined (field not present in update)
-                // This preserves existing data instead of overwriting with null
+                // Empty strings become undefined to preserve existing data during updates
                 if (value === '') {
                     return undefined;
                 }
-                // Handle booleans
                 if (value === 'true') {
                     return true;
                 }
                 if (value === 'false') {
                     return false;
                 }
-                // Handle explicit null - user must type "null" to set field to null
+                // Explicit null requires typing "null" or "NULL"
                 if (value === 'null' || value === 'NULL') {
                     return null;
                 }
-                // Don't auto-convert to numbers if the value contains a comma
-                // This allows hasMany fields to use comma-separated values
+                // Keep comma-separated values as strings for hasMany fields
                 if (value.includes(',')) {
-                    return value // Keep as string for comma-separated values
-                    ;
+                    return value;
                 }
-                // Handle numbers (only after checking for commas)
                 if (!isNaN(Number(value)) && value !== '') {
                     const num = Number(value);
                     if (String(num) === value || value.includes('.')) {
                         return num;
                     }
                 }
-                // Return as string
                 return value;
             },
             columns: true,

package/dist/utilities/parseCSV.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/parseCSV.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\nimport { parse } from 'csv-parse'\n\nexport type ParseCSVArgs = {\n  data: Buffer | string\n  req: PayloadRequest\n}\n\n/**\n * Parses CSV data into an array of record objects.\n * Handles type coercion for booleans, numbers, and null values.\n */\nexport const parseCSV = async ({ data, req }: ParseCSVArgs): Promise<Record<string, unknown>[]> => {\n  return new Promise((resolve, reject) => {\n    const records: Record<string, unknown>[] = []\n\n    const parser = parse({\n      cast: (value, _context) => {\n        // Empty strings should be undefined (field not present in update)\n        // This preserves existing data instead of overwriting with null\n        if (value === '') {\n          return undefined\n        }\n\n        // Handle booleans\n        if (value === 'true') {\n          return true\n        }\n        if (value === 'false') {\n          return false\n        }\n\n        // Handle explicit null - user must type \"null\" to set field to null\n        if (value === 'null' || value === 'NULL') {\n          return null\n        }\n\n        // Don't auto-convert to numbers if the value contains a comma\n        // This allows hasMany fields to use comma-separated values\n        if (value.includes(',')) {\n          return value // Keep as string for comma-separated values\n        }\n\n        // Handle numbers (only after checking for commas)\n        if (!isNaN(Number(value)) && value !== '') {\n          const num = Number(value)\n\n          if (String(num) === value || value.includes('.')) {\n            return num\n          }\n        }\n\n        // Return as string\n        return value\n      },\n      columns: true,\n      skip_empty_lines: true,\n      trim: true,\n    })\n\n    parser.on('readable', () => {\n      let record\n      while ((record = parser.read()) !== null) {\n        records.push(record)\n      }\n    })\n\n    parser.on('error', (err) => {\n      req.payload.logger.error({ err, msg: 'Error parsing CSV' })\n      reject(err)\n    })\n\n    parser.on('end', () => {\n      resolve(records)\n    })\n\n    parser.write(data)\n    parser.end()\n  })\n}\n"],"names":["parse","parseCSV","data","req","Promise","resolve","reject","records","parser","cast","value","_context","undefined","includes","isNaN","Number","num","String","columns","skip_empty_lines","trim","on","record","read","push","err","payload","logger","error","msg","write","end"],"mappings":"AAEA,SAASA,KAAK,QAAQ,YAAW;AAOjC;;;CAGC,GACD,OAAO,MAAMC,WAAW,OAAO,EAAEC,IAAI,EAAEC,GAAG,EAAgB;IACxD,OAAO,IAAIC,QAAQ,CAACC,SAASC;QAC3B,MAAMC,UAAqC,EAAE;QAE7C,MAAMC,SAASR,MAAM;YACnBS,MAAM,CAACC,OAAOC;gBACZ,kEAAkE;gBAClE,gEAAgE;gBAChE,IAAID,UAAU,IAAI;oBAChB,OAAOE;gBACT;gBAEA,kBAAkB;gBAClB,IAAIF,UAAU,QAAQ;oBACpB,OAAO;gBACT;gBACA,IAAIA,UAAU,SAAS;oBACrB,OAAO;gBACT;gBAEA,oEAAoE;gBACpE,IAAIA,UAAU,UAAUA,UAAU,QAAQ;oBACxC,OAAO;gBACT;gBAEA,8DAA8D;gBAC9D,2DAA2D;gBAC3D,IAAIA,MAAMG,QAAQ,CAAC,MAAM;oBACvB,OAAOH,MAAM,4CAA4C;;gBAC3D;gBAEA,kDAAkD;gBAClD,IAAI,CAACI,MAAMC,OAAOL,WAAWA,UAAU,IAAI;oBACzC,MAAMM,MAAMD,OAAOL;oBAEnB,IAAIO,OAAOD,SAASN,SAASA,MAAMG,QAAQ,CAAC,MAAM;wBAChD,OAAOG;oBACT;gBACF;gBAEA,mBAAmB;gBACnB,OAAON;YACT;YACAQ,SAAS;YACTC,kBAAkB;YAClBC,MAAM;QACR;QAEAZ,OAAOa,EAAE,CAAC,YAAY;YACpB,IAAIC;YACJ,MAAO,AAACA,CAAAA,SAASd,OAAOe,IAAI,EAAC,MAAO,KAAM;gBACxChB,QAAQiB,IAAI,CAACF;YACf;QACF;QAEAd,OAAOa,EAAE,CAAC,SAAS,CAACI;YAClBtB,IAAIuB,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;gBAAEH;gBAAKI,KAAK;YAAoB;YACzDvB,OAAOmB;QACT;QAEAjB,OAAOa,EAAE,CAAC,OAAO;YACfhB,QAAQE;QACV;QAEAC,OAAOsB,KAAK,CAAC5B;QACbM,OAAOuB,GAAG;IACZ;AACF,EAAC"}
+{"version":3,"sources":["../../src/utilities/parseCSV.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\nimport { parse } from 'csv-parse'\n\nexport type ParseCSVArgs = {\n  data: Buffer | string\n  req: PayloadRequest\n}\n\n/**\n * Parses CSV data into an array of record objects.\n * Handles type coercion for booleans, numbers, and null values.\n */\nexport const parseCSV = async ({ data, req }: ParseCSVArgs): Promise<Record<string, unknown>[]> => {\n  return new Promise((resolve, reject) => {\n    const records: Record<string, unknown>[] = []\n\n    const parser = parse({\n      cast: (value, _context) => {\n        // Empty strings become undefined to preserve existing data during updates\n        if (value === '') {\n          return undefined\n        }\n\n        if (value === 'true') {\n          return true\n        }\n        if (value === 'false') {\n          return false\n        }\n\n        // Explicit null requires typing \"null\" or \"NULL\"\n        if (value === 'null' || value === 'NULL') {\n          return null\n        }\n\n        // Keep comma-separated values as strings for hasMany fields\n        if (value.includes(',')) {\n          return value\n        }\n\n        if (!isNaN(Number(value)) && value !== '') {\n          const num = Number(value)\n          if (String(num) === value || value.includes('.')) {\n            return num\n          }\n        }\n\n        return value\n      },\n      columns: true,\n      skip_empty_lines: true,\n      trim: true,\n    })\n\n    parser.on('readable', () => {\n      let record\n      while ((record = parser.read()) !== null) {\n        records.push(record)\n      }\n    })\n\n    parser.on('error', (err) => {\n      req.payload.logger.error({ err, msg: 'Error parsing CSV' })\n      reject(err)\n    })\n\n    parser.on('end', () => {\n      resolve(records)\n    })\n\n    parser.write(data)\n    parser.end()\n  })\n}\n"],"names":["parse","parseCSV","data","req","Promise","resolve","reject","records","parser","cast","value","_context","undefined","includes","isNaN","Number","num","String","columns","skip_empty_lines","trim","on","record","read","push","err","payload","logger","error","msg","write","end"],"mappings":"AAEA,SAASA,KAAK,QAAQ,YAAW;AAOjC;;;CAGC,GACD,OAAO,MAAMC,WAAW,OAAO,EAAEC,IAAI,EAAEC,GAAG,EAAgB;IACxD,OAAO,IAAIC,QAAQ,CAACC,SAASC;QAC3B,MAAMC,UAAqC,EAAE;QAE7C,MAAMC,SAASR,MAAM;YACnBS,MAAM,CAACC,OAAOC;gBACZ,0EAA0E;gBAC1E,IAAID,UAAU,IAAI;oBAChB,OAAOE;gBACT;gBAEA,IAAIF,UAAU,QAAQ;oBACpB,OAAO;gBACT;gBACA,IAAIA,UAAU,SAAS;oBACrB,OAAO;gBACT;gBAEA,iDAAiD;gBACjD,IAAIA,UAAU,UAAUA,UAAU,QAAQ;oBACxC,OAAO;gBACT;gBAEA,4DAA4D;gBAC5D,IAAIA,MAAMG,QAAQ,CAAC,MAAM;oBACvB,OAAOH;gBACT;gBAEA,IAAI,CAACI,MAAMC,OAAOL,WAAWA,UAAU,IAAI;oBACzC,MAAMM,MAAMD,OAAOL;oBACnB,IAAIO,OAAOD,SAASN,SAASA,MAAMG,QAAQ,CAAC,MAAM;wBAChD,OAAOG;oBACT;gBACF;gBAEA,OAAON;YACT;YACAQ,SAAS;YACTC,kBAAkB;YAClBC,MAAM;QACR;QAEAZ,OAAOa,EAAE,CAAC,YAAY;YACpB,IAAIC;YACJ,MAAO,AAACA,CAAAA,SAASd,OAAOe,IAAI,EAAC,MAAO,KAAM;gBACxChB,QAAQiB,IAAI,CAACF;YACf;QACF;QAEAd,OAAOa,EAAE,CAAC,SAAS,CAACI;YAClBtB,IAAIuB,OAAO,CAACC,MAAM,CAACC,KAAK,CAAC;gBAAEH;gBAAKI,KAAK;YAAoB;YACzDvB,OAAOmB;QACT;QAEAjB,OAAOa,EAAE,CAAC,OAAO;YACfhB,QAAQE;QACV;QAEAC,OAAOsB,KAAK,CAAC5B;QACbM,OAAOuB,GAAG;IACZ;AACF,EAAC"}

package/dist/utilities/resolveLimit.d.ts

@@ -0,0 +1,15 @@
+import type { PayloadRequest } from 'payload';
+import type { Limit } from '../types.js';
+/**
+ * Resolves a Limit value to a number.
+ * If the value is a function, it will be called with the request context.
+ * If the value is a number, it will be returned as-is.
+ * If the value is undefined, undefined will be returned.
+ *
+ * Note: A resolved value of 0 means unlimited (no restriction).
+ */
+export declare function resolveLimit(args: {
+    limit?: Limit;
+    req: PayloadRequest;
+}): Promise<number | undefined>;
+//# sourceMappingURL=resolveLimit.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"resolveLimit.d.ts","sourceRoot":"","sources":["../../src/utilities/resolveLimit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAExC;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,GAAG,EAAE,cAAc,CAAA;CACpB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAY9B"}

package/dist/utilities/resolveLimit.js

@@ -0,0 +1,21 @@
+/**
+ * Resolves a Limit value to a number.
+ * If the value is a function, it will be called with the request context.
+ * If the value is a number, it will be returned as-is.
+ * If the value is undefined, undefined will be returned.
+ *
+ * Note: A resolved value of 0 means unlimited (no restriction).
+ */ export async function resolveLimit(args) {
+    const { limit, req } = args;
+    if (limit === undefined) {
+        return undefined;
+    }
+    if (typeof limit === 'number') {
+        return limit;
+    }
+    return limit({
+        req
+    });
+}
+
+//# sourceMappingURL=resolveLimit.js.map

package/dist/utilities/resolveLimit.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/resolveLimit.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\nimport type { Limit } from '../types.js'\n\n/**\n * Resolves a Limit value to a number.\n * If the value is a function, it will be called with the request context.\n * If the value is a number, it will be returned as-is.\n * If the value is undefined, undefined will be returned.\n *\n * Note: A resolved value of 0 means unlimited (no restriction).\n */\nexport async function resolveLimit(args: {\n  limit?: Limit\n  req: PayloadRequest\n}): Promise<number | undefined> {\n  const { limit, req } = args\n\n  if (limit === undefined) {\n    return undefined\n  }\n\n  if (typeof limit === 'number') {\n    return limit\n  }\n\n  return limit({ req })\n}\n"],"names":["resolveLimit","args","limit","req","undefined"],"mappings":"AAIA;;;;;;;CAOC,GACD,OAAO,eAAeA,aAAaC,IAGlC;IACC,MAAM,EAAEC,KAAK,EAAEC,GAAG,EAAE,GAAGF;IAEvB,IAAIC,UAAUE,WAAW;QACvB,OAAOA;IACT;IAEA,IAAI,OAAOF,UAAU,UAAU;QAC7B,OAAOA;IACT;IAEA,OAAOA,MAAM;QAAEC;IAAI;AACrB"}

package/dist/utilities/unflattenObject.d.ts

@@ -6,6 +6,19 @@ type UnflattenArgs = {
     fromCSVFunctions?: Record<string, FromCSVFunction>;
     req: PayloadRequest;
 };
+/**
+ * Converts flattened CSV data back into a nested document structure.
+ *
+ * The algorithm:
+ * 1. Sorts keys to ensure array indices are processed in order
+ * 2. For each flattened key (e.g., "blocks_0_hero_title"), splits by underscore into path segments
+ * 3. Traverses/builds the nested structure, handling:
+ *    - Arrays (numeric segments like "0", "1")
+ *    - Blocks (blockType detection from slug patterns)
+ *    - Polymorphic relationships (_relationTo and _id suffix pairs)
+ *    - Regular nested objects
+ * 4. Post-processes to handle localized fields, hasMany conversions, and relationship transforms
+ */
 export declare const unflattenObject: ({ data, fields, fromCSVFunctions, req, }: UnflattenArgs) => Record<string, unknown>;
 export {};
 //# sourceMappingURL=unflattenObject.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"unflattenObject.d.ts","sourceRoot":"","sources":["../../src/utilities/unflattenObject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAIlD,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7B,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAClD,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,eAAe,6CAKzB,aAAa,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CA0TxC,CAAA"}
+{"version":3,"file":"unflattenObject.d.ts","sourceRoot":"","sources":["../../src/utilities/unflattenObject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAIlD,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7B,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAClD,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,eAAe,6CAKzB,aAAa,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAoSxC,CAAA"}

package/dist/utilities/unflattenObject.js

@@ -1,5 +1,17 @@
 import { processRichTextField } from './processRichTextField.js';
-export const unflattenObject = ({ data, fields, fromCSVFunctions = {}, req })=>{
+/**
+ * Converts flattened CSV data back into a nested document structure.
+ *
+ * The algorithm:
+ * 1. Sorts keys to ensure array indices are processed in order
+ * 2. For each flattened key (e.g., "blocks_0_hero_title"), splits by underscore into path segments
+ * 3. Traverses/builds the nested structure, handling:
+ *    - Arrays (numeric segments like "0", "1")
+ *    - Blocks (blockType detection from slug patterns)
+ *    - Polymorphic relationships (_relationTo and _id suffix pairs)
+ *    - Regular nested objects
+ * 4. Post-processes to handle localized fields, hasMany conversions, and relationship transforms
+ */ export const unflattenObject = ({ data, fields, fromCSVFunctions = {}, req })=>{
     if (!data || typeof data !== 'object') {
         return {};
     }
@@ -31,7 +43,6 @@ export const unflattenObject = ({ data, fields, fromCSVFunctions = {}, req })=>{
             // Check if this is a polymorphic relationship field
             const isPolymorphic = fields.some((field)=>field.name === baseKey && field.type === 'relationship' && 'relationTo' in field && Array.isArray(field.relationTo));
             if (isPolymorphic) {
-                // Check if we've already processed this field
                 if (baseKey in result) {
                     continue;
                 }
@@ -64,29 +75,27 @@ export const unflattenObject = ({ data, fields, fromCSVFunctions = {}, req })=>{
                 value
             });
         }
-        // Parse the flat key into segments
         // Example: "blocks_0_content_text" -> ["blocks", "0", "content", "text"]
-        const segments = flatKey.split('_');
-        let current = result;
-        for(let i = 0; i < segments.length; i++){
-            const segment = segments[i];
+        const pathSegments = flatKey.split('_');
+        let currentObject = result;
+        for(let i = 0; i < pathSegments.length; i++){
+            const segment = pathSegments[i];
             if (!segment) {
                 continue;
             } // Skip empty segments
-            const nextSegment = segments[i + 1];
-            const isLast = i === segments.length - 1;
+            const nextSegment = pathSegments[i + 1];
+            const isLast = i === pathSegments.length - 1;
             // Check if next segment is a numeric array index (e.g., "0", "1", "2")
             const isArrayIndex = nextSegment !== undefined && /^\d+$/.test(nextSegment);
             if (isLast) {
                 // Special handling for blockType suffix in blocks
                 if (segment === 'blockType' && i >= 3) {
                     // Pattern: blocks_0_hero_blockType -> set blockType on the block
-                    const blockFieldName = segments[0] // 'blocks'
+                    const blockFieldName = pathSegments[0] // 'blocks'
                     ;
                     const isBlockField = fields.some((field)=>field.name === blockFieldName && field.type === 'blocks');
-                    if (isBlockField && segments[1]?.match(/^\d+$/)) {
-                        // This is a block type field
-                        const parent = getParentObject(result, segments.slice(0, 2));
+                    if (isBlockField && pathSegments[1]?.match(/^\d+$/)) {
+                        const parent = getParentObject(result, pathSegments.slice(0, 2));
                         if (parent && typeof parent === 'object') {
                             parent.blockType = value;
                         }
@@ -95,10 +104,9 @@ export const unflattenObject = ({ data, fields, fromCSVFunctions = {}, req })=>{
                 }
                 // Special handling for relationship fields with _id suffix
                 if (segment === 'id' && i > 0) {
-                    const parentKey = segments[i - 1];
-                    // Check if the previous segment is an array index
-                    const prevIsIndex = parentKey ? /^\d+$/.test(parentKey) : false;
-                    if (!prevIsIndex) {
+                    const parentKey = pathSegments[i - 1];
+                    const isPreviousSegmentArrayIndex = parentKey ? /^\d+$/.test(parentKey) : false;
+                    if (!isPreviousSegmentArrayIndex) {
                         // Check if this is a relationship field
                         const isRelationship = fields.some((field)=>field.name === parentKey && field.type === 'relationship');
                         if (isRelationship) {
@@ -106,11 +114,9 @@ export const unflattenObject = ({ data, fields, fromCSVFunctions = {}, req })=>{
                             const field = fields.find((f)=>f.name === parentKey && f.type === 'relationship');
                             const isPolymorphic = field && 'relationTo' in field && Array.isArray(field.relationTo);
                             if (isPolymorphic) {
-                                // For polymorphic relationships, check for the corresponding _relationTo field
-                                const relationToKey = segments.slice(0, i).concat('relationTo').join('_');
+                                const relationToKey = pathSegments.slice(0, i).concat('relationTo').join('_');
                                 const relationToValue = data[relationToKey];
-                                // This is a polymorphic relationship
-                                const parent = getParentObject(result, segments.slice(0, i - 1));
+                                const parent = getParentObject(result, pathSegments.slice(0, i - 1));
                                 if (parent && parentKey && typeof parent === 'object') {
                                     // Both fields must be defined to create/update the relationship
                                     // If either is undefined, skip the field entirely (preserve existing data)
@@ -132,8 +138,7 @@ export const unflattenObject = ({ data, fields, fromCSVFunctions = {}, req })=>{
                                 }
                                 continue;
                             } else if (!isPolymorphic) {
-                                // Non-polymorphic relationship
-                                const parent = getParentObject(result, segments.slice(0, i - 1));
+                                const parent = getParentObject(result, pathSegments.slice(0, i - 1));
                                 if (parent && parentKey && typeof parent === 'object') {
                                     parent[parentKey] = value;
                                 }
@@ -142,9 +147,9 @@ export const unflattenObject = ({ data, fields, fromCSVFunctions = {}, req })=>{
                         }
                     }
                 }
-                // Special handling for _relationTo suffix (skip it, handled above)
+                // _relationTo suffix is handled when processing the _id field above
                 if (segment === 'relationTo' && i > 0) {
-                    const parentKey = segments[i - 1];
+                    const parentKey = pathSegments[i - 1];
                     if (parentKey && !parentKey.match(/^\d+$/)) {
                         const field = fields.find((f)=>f.name === parentKey && f.type === 'relationship');
                         const isPolymorphic = field && 'relationTo' in field && Array.isArray(field.relationTo);
@@ -153,14 +158,13 @@ export const unflattenObject = ({ data, fields, fromCSVFunctions = {}, req })=>{
                         }
                     }
                 }
-                current[segment] = value;
+                currentObject[segment] = value;
             } else if (isArrayIndex && nextSegment !== undefined) {
-                // Initialize array if needed
-                if (!current[segment] || !Array.isArray(current[segment])) {
-                    current[segment] = [];
+                if (!currentObject[segment] || !Array.isArray(currentObject[segment])) {
+                    currentObject[segment] = [];
                 }
                 const arrayIndex = parseInt(nextSegment);
-                const arr = current[segment];
+                const arr = currentObject[segment];
                 // Ensure array has sufficient length
                 while(arr.length <= arrayIndex){
                     arr.push(null);
@@ -169,65 +173,55 @@ export const unflattenObject = ({ data, fields, fromCSVFunctions = {}, req })=>{
                 if (arr[arrayIndex] === null || arr[arrayIndex] === undefined) {
                     arr[arrayIndex] = {};
                 }
-                // Check if this is a blocks field with block slug pattern
+                // Handle blocks field with block slug pattern (e.g., blocks_0_hero_title)
                 const isBlocksField = fields.some((f)=>f.name === segment && f.type === 'blocks');
-                if (isBlocksField && i + 3 < segments.length) {
-                    // Pattern: blocks_0_hero_title where 'hero' is the block slug
-                    const blockSlug = segments[i + 2];
-                    const blockFieldName = segments[i + 3];
+                if (isBlocksField && i + 3 < pathSegments.length) {
+                    const blockSlug = pathSegments[i + 2];
+                    const blockFieldName = pathSegments[i + 3];
                     if (blockSlug && blockFieldName) {
                         const blockObject = arr[arrayIndex];
-                        // Set the blockType based on the slug
                         blockObject.blockType = blockSlug;
-                        // Handle nested block fields
-                        if (i + 3 === segments.length - 1) {
-                            // Direct field on the block
+                        if (i + 3 === pathSegments.length - 1) {
                             blockObject[blockFieldName] = value;
                         } else {
-                            // Nested field in the block
                             if (!blockObject[blockFieldName] || typeof blockObject[blockFieldName] !== 'object') {
                                 blockObject[blockFieldName] = {};
                             }
-                            // Continue processing remaining segments
-                            current = blockObject[blockFieldName];
-                            i = i + 3; // Skip index, slug, and field name
-                            continue; // Continue processing the remaining segments (not break!)
+                            currentObject = blockObject[blockFieldName];
+                            i = i + 3;
+                            continue;
                         }
                         break;
                     }
                 }
-                // If this is the last segment after the index, set the value
-                if (i + 2 === segments.length - 1) {
-                    const lastSegment = segments[segments.length - 1];
+                if (i + 2 === pathSegments.length - 1) {
+                    const lastSegment = pathSegments[pathSegments.length - 1];
                     if (lastSegment && arr[arrayIndex] && typeof arr[arrayIndex] === 'object') {
                         ;
                         arr[arrayIndex][lastSegment] = value;
                     }
                     break;
-                } else if (i + 1 === segments.length - 1) {
+                } else if (i + 1 === pathSegments.length - 1) {
                     // Direct array value (e.g., tags_0 = "value")
                     arr[arrayIndex] = value;
                     break;
                 } else {
-                    // Continue traversing into the array element
-                    current = arr[arrayIndex];
-                    i++; // skip the index segment
+                    currentObject = arr[arrayIndex];
+                    i++;
                 }
             } else {
-                // Regular object property
-                // Check if this segment is already set to null (polymorphic relationship already processed)
-                if (current[segment] === null && isLast && segment === 'relationTo') {
+                // Skip if already set to null (polymorphic relationship already processed)
+                if (currentObject[segment] === null && isLast && segment === 'relationTo') {
                     continue;
                 }
-                if (!current[segment] || typeof current[segment] !== 'object' || Array.isArray(current[segment])) {
-                    current[segment] = {};
+                if (!currentObject[segment] || typeof currentObject[segment] !== 'object' || Array.isArray(currentObject[segment])) {
+                    currentObject[segment] = {};
                 }
-                // Handle special cases for polymorphic relationships
-                if (segment === 'relationTo' && i > 0 && segments[i - 1]?.match(/^\d+$/)) {
-                    // This is part of a polymorphic relationship array
-                    current[segment] = value;
-                } else if (typeof current[segment] === 'object' && !Array.isArray(current[segment]) && current[segment] !== null) {
-                    current = current[segment];
+                // Handle polymorphic relationship arrays
+                if (segment === 'relationTo' && i > 0 && pathSegments[i - 1]?.match(/^\d+$/)) {
+                    currentObject[segment] = value;
+                } else if (typeof currentObject[segment] === 'object' && !Array.isArray(currentObject[segment]) && currentObject[segment] !== null) {
+                    currentObject = currentObject[segment];
                 }
             }
         }
@@ -272,9 +266,14 @@ const getParentObject = (obj, segments)=>{
     }
     return current;
 };
-const postProcessDocument = (doc, fields)=>{
-    // Handle localized fields - transform from field_locale to { field: { locale: value } }
-    // This is the format Payload stores in the database
+/**
+ * Post-processes the unflattened document to handle special field types:
+ * - Localized fields: transforms field_locale keys to nested { field: { locale: value } }
+ * - Number hasMany: converts comma-separated strings or arrays to number arrays
+ * - Relationship hasMany: converts comma-separated IDs to arrays
+ * - Polymorphic relationships: transforms flat {relationTo, id} to {relationTo, value}
+ * - Rich text fields: ensures proper data structure
+ */ const postProcessDocument = (doc, fields)=>{
     const localizedFields = fields.filter((field)=>field.localized);
     const processedLocalizedFields = new Set();
     for (const field of localizedFields){