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

package/dist/export/handlePreview.js

@@ -1,12 +1,14 @@
 import { addDataAndFileToRequest } from 'payload';
+import { getObjectDotNotation } from 'payload/shared';
 import { DEFAULT_PREVIEW_LIMIT, MAX_PREVIEW_LIMIT, MIN_PREVIEW_LIMIT, MIN_PREVIEW_PAGE } from '../constants.js';
+import { collectTimezoneCompanionFields } from '../utilities/collectTimezoneCompanionFields.js';
 import { flattenObject } from '../utilities/flattenObject.js';
 import { getExportFieldFunctions } from '../utilities/getExportFieldFunctions.js';
 import { getFlattenedFieldKeys } from '../utilities/getFlattenedFieldKeys.js';
 import { getSchemaColumns } from '../utilities/getSchemaColumns.js';
 import { getSelect } from '../utilities/getSelect.js';
-import { getValueAtPath } from '../utilities/getvalueAtPath.js';
 import { removeDisabledFields } from '../utilities/removeDisabledFields.js';
+import { resolveLimit } from '../utilities/resolveLimit.js';
 import { setNestedValue } from '../utilities/setNestedValue.js';
 export const handlePreview = async (req)=>{
     await addDataAndFileToRequest(req);
@@ -22,6 +24,11 @@ export const handlePreview = async (req)=>{
             status: 400
         });
     }
+    const pluginConfig = targetCollection.config.custom?.['plugin-import-export'];
+    const maxLimit = await resolveLimit({
+        limit: pluginConfig?.exportLimit,
+        req
+    });
     const select = Array.isArray(fields) && fields.length > 0 ? getSelect(fields) : undefined;
     const draft = draftFromReq === 'yes';
     const collectionHasVersions = Boolean(targetCollection.config.versions);
@@ -45,8 +52,17 @@ export const handlePreview = async (req)=>{
         where
     });
     const totalMatchingDocs = countResult.totalDocs;
-    // Calculate actual export count (respecting export limit)
-    const exportTotalDocs = exportLimit && exportLimit > 0 ? Math.min(totalMatchingDocs, exportLimit) : totalMatchingDocs;
+    // Calculate actual export count (respecting both export limit and max limit)
+    let effectiveLimit = totalMatchingDocs;
+    // Apply user's export limit if provided
+    if (exportLimit && exportLimit > 0) {
+        effectiveLimit = Math.min(effectiveLimit, exportLimit);
+    }
+    // Apply max limit if configured
+    if (typeof maxLimit === 'number' && maxLimit > 0) {
+        effectiveLimit = Math.min(effectiveLimit, maxLimit);
+    }
+    const exportTotalDocs = effectiveLimit;
     // Calculate preview pagination that respects export limit
     // Preview should only show docs that will actually be exported
     const previewStartIndex = (previewPage - 1) * previewLimit;
@@ -57,16 +73,19 @@ export const handlePreview = async (req)=>{
     const localeCodes = locale === 'all' && req.payload.config.localization ? req.payload.config.localization.localeCodes : undefined;
     // Get disabled fields configuration
     const disabledFields = targetCollection.config.admin?.custom?.['plugin-import-export']?.disabledFields ?? [];
+    // Collect auto-generated timezone companion fields from schema
+    const timezoneCompanionFields = collectTimezoneCompanionFields(targetCollection.config.flattenedFields);
     // Always compute columns for CSV (even if no docs) for consistent schema
     const columns = isCSV ? getSchemaColumns({
         collectionConfig: targetCollection.config,
         disabledFields,
         fields,
         locale: locale ?? undefined,
-        localeCodes
+        localeCodes,
+        timezoneCompanionFields
     }) : undefined;
-    // If we're beyond the export limit, return empty docs with columns
-    if (exportLimit && exportLimit > 0 && previewStartIndex >= exportLimit) {
+    // If we're beyond the effective limit (considering both user limit and maxLimit), return empty docs
+    if (exportTotalDocs > 0 && previewStartIndex >= exportTotalDocs) {
         const response = {
             columns,
             docs: [],
@@ -74,6 +93,7 @@ export const handlePreview = async (req)=>{
             hasNextPage: false,
             hasPrevPage: previewPage > 1,
             limit: previewLimit,
+            maxLimit,
             page: previewPage,
             totalDocs: exportTotalDocs,
             totalPages: previewTotalPages
@@ -95,10 +115,10 @@ export const handlePreview = async (req)=>{
         sort,
         where
     });
-    // Trim docs to respect export limit boundary
+    // Trim docs to respect effective limit boundary (user limit clamped by maxLimit)
     let docs = result.docs;
-    if (exportLimit && exportLimit > 0) {
-        const remainingInExport = exportLimit - previewStartIndex;
+    if (exportTotalDocs > 0) {
+        const remainingInExport = exportTotalDocs - previewStartIndex;
         if (remainingInExport < docs.length) {
             docs = docs.slice(0, remainingInExport);
         }
@@ -116,6 +136,7 @@ export const handlePreview = async (req)=>{
             const row = flattenObject({
                 doc,
                 fields,
+                timezoneCompanionFields,
                 toCSVFunctions
             });
             for (const key of possibleKeys){
@@ -136,7 +157,7 @@ export const handlePreview = async (req)=>{
             if (Array.isArray(fields) && fields.length > 0) {
                 const trimmed = {};
                 for (const key of fields){
-                    const value = getValueAtPath(output, key);
+                    const value = getObjectDotNotation(output, key);
                     setNestedValue(trimmed, key, value ?? null);
                 }
                 output = trimmed;
@@ -153,6 +174,7 @@ export const handlePreview = async (req)=>{
         hasNextPage,
         hasPrevPage,
         limit: previewLimit,
+        maxLimit,
         page: previewPage,
         totalDocs: exportTotalDocs,
         totalPages: previewTotalPages

package/dist/export/handlePreview.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/export/handlePreview.ts"],"sourcesContent":["import type { FlattenedField, PayloadRequest, Where } from 'payload'\n\nimport { addDataAndFileToRequest } from 'payload'\n\nimport type { ExportPreviewResponse } from '../types.js'\n\nimport {\n  DEFAULT_PREVIEW_LIMIT,\n  MAX_PREVIEW_LIMIT,\n  MIN_PREVIEW_LIMIT,\n  MIN_PREVIEW_PAGE,\n} from '../constants.js'\nimport { flattenObject } from '../utilities/flattenObject.js'\nimport { getExportFieldFunctions } from '../utilities/getExportFieldFunctions.js'\nimport { getFlattenedFieldKeys } from '../utilities/getFlattenedFieldKeys.js'\nimport { getSchemaColumns } from '../utilities/getSchemaColumns.js'\nimport { getSelect } from '../utilities/getSelect.js'\nimport { getValueAtPath } from '../utilities/getvalueAtPath.js'\nimport { removeDisabledFields } from '../utilities/removeDisabledFields.js'\nimport { setNestedValue } from '../utilities/setNestedValue.js'\n\nexport const handlePreview = async (req: PayloadRequest): Promise<Response> => {\n  await addDataAndFileToRequest(req)\n\n  const {\n    collectionSlug,\n    draft: draftFromReq,\n    fields,\n    limit: exportLimit,\n    locale,\n    previewLimit: rawPreviewLimit = DEFAULT_PREVIEW_LIMIT,\n    previewPage: rawPreviewPage = 1,\n    sort,\n    where: whereFromReq = {},\n  } = req.data as {\n    collectionSlug: string\n    draft?: 'no' | 'yes'\n    fields?: string[]\n    format?: 'csv' | 'json'\n    limit?: number\n    locale?: string\n    previewLimit?: number\n    previewPage?: number\n    sort?: any\n    where?: any\n  }\n\n  // Validate and clamp pagination values to safe bounds\n  const previewLimit = Math.max(MIN_PREVIEW_LIMIT, Math.min(rawPreviewLimit, MAX_PREVIEW_LIMIT))\n  const previewPage = Math.max(MIN_PREVIEW_PAGE, rawPreviewPage)\n\n  const targetCollection = req.payload.collections[collectionSlug]\n  if (!targetCollection) {\n    return Response.json(\n      { error: `Collection with slug ${collectionSlug} not found` },\n      { status: 400 },\n    )\n  }\n\n  const select = Array.isArray(fields) && fields.length > 0 ? getSelect(fields) : undefined\n  const draft = draftFromReq === 'yes'\n  const collectionHasVersions = Boolean(targetCollection.config.versions)\n\n  // Only filter by _status for versioned collections\n  const publishedWhere: Where = collectionHasVersions ? { _status: { equals: 'published' } } : {}\n\n  const where: Where = {\n    and: [whereFromReq, draft ? {} : publishedWhere],\n  }\n\n  // Count total docs matching export criteria\n  const countResult = await req.payload.count({\n    collection: collectionSlug,\n    overrideAccess: false,\n    req,\n    where,\n  })\n\n  const totalMatchingDocs = countResult.totalDocs\n\n  // Calculate actual export count (respecting export limit)\n  const exportTotalDocs =\n    exportLimit && exportLimit > 0 ? Math.min(totalMatchingDocs, exportLimit) : totalMatchingDocs\n\n  // Calculate preview pagination that respects export limit\n  // Preview should only show docs that will actually be exported\n  const previewStartIndex = (previewPage - 1) * previewLimit\n\n  // Calculate pagination info based on export limit (not raw DB results)\n  const previewTotalPages = exportTotalDocs === 0 ? 0 : Math.ceil(exportTotalDocs / previewLimit)\n\n  const isCSV = req?.data?.format === 'csv'\n\n  // Get locale codes for locale expansion when locale='all'\n  const localeCodes =\n    locale === 'all' && req.payload.config.localization\n      ? req.payload.config.localization.localeCodes\n      : undefined\n\n  // Get disabled fields configuration\n  const disabledFields =\n    targetCollection.config.admin?.custom?.['plugin-import-export']?.disabledFields ?? []\n\n  // Always compute columns for CSV (even if no docs) for consistent schema\n  const columns = isCSV\n    ? getSchemaColumns({\n        collectionConfig: targetCollection.config,\n        disabledFields,\n        fields,\n        locale: locale ?? undefined,\n        localeCodes,\n      })\n    : undefined\n\n  // If we're beyond the export limit, return empty docs with columns\n  if (exportLimit && exportLimit > 0 && previewStartIndex >= exportLimit) {\n    const response: ExportPreviewResponse = {\n      columns,\n      docs: [],\n      exportTotalDocs,\n      hasNextPage: false,\n      hasPrevPage: previewPage > 1,\n      limit: previewLimit,\n      page: previewPage,\n      totalDocs: exportTotalDocs,\n      totalPages: previewTotalPages,\n    }\n    return Response.json(response)\n  }\n\n  // Fetch preview page with full previewLimit to maintain consistent pagination offsets\n  // We'll trim the results afterwards if needed to respect export limit\n  const result = await req.payload.find({\n    collection: collectionSlug,\n    depth: 1,\n    draft,\n    limit: previewLimit,\n    locale,\n    overrideAccess: false,\n    page: previewPage,\n    req,\n    select,\n    sort,\n    where,\n  })\n\n  // Trim docs to respect export limit boundary\n  let docs = result.docs\n  if (exportLimit && exportLimit > 0) {\n    const remainingInExport = exportLimit - previewStartIndex\n    if (remainingInExport < docs.length) {\n      docs = docs.slice(0, remainingInExport)\n    }\n  }\n\n  // Transform docs based on format\n  let transformed: Record<string, unknown>[]\n\n  if (isCSV) {\n    const toCSVFunctions = getExportFieldFunctions({\n      fields: targetCollection.config.fields as FlattenedField[],\n    })\n\n    const possibleKeys = getFlattenedFieldKeys(\n      targetCollection.config.fields as FlattenedField[],\n      '',\n      { localeCodes },\n    )\n\n    transformed = docs.map((doc) => {\n      const row = flattenObject({\n        doc,\n        fields,\n        toCSVFunctions,\n      })\n\n      for (const key of possibleKeys) {\n        if (!(key in row)) {\n          row[key] = null\n        }\n      }\n\n      return row\n    })\n  } else {\n    transformed = docs.map((doc) => {\n      let output: Record<string, unknown> = { ...doc }\n\n      // Remove disabled fields first\n      output = removeDisabledFields(output, disabledFields)\n\n      // Then trim to selected fields only (if fields are provided)\n      if (Array.isArray(fields) && fields.length > 0) {\n        const trimmed: Record<string, unknown> = {}\n\n        for (const key of fields) {\n          const value = getValueAtPath(output, key)\n          setNestedValue(trimmed, key, value ?? null)\n        }\n\n        output = trimmed\n      }\n\n      return output\n    })\n  }\n\n  const hasNextPage = previewPage < previewTotalPages\n  const hasPrevPage = previewPage > 1\n\n  const response: ExportPreviewResponse = {\n    columns,\n    docs: transformed,\n    exportTotalDocs,\n    hasNextPage,\n    hasPrevPage,\n    limit: previewLimit,\n    page: previewPage,\n    totalDocs: exportTotalDocs,\n    totalPages: previewTotalPages,\n  }\n\n  return Response.json(response)\n}\n"],"names":["addDataAndFileToRequest","DEFAULT_PREVIEW_LIMIT","MAX_PREVIEW_LIMIT","MIN_PREVIEW_LIMIT","MIN_PREVIEW_PAGE","flattenObject","getExportFieldFunctions","getFlattenedFieldKeys","getSchemaColumns","getSelect","getValueAtPath","removeDisabledFields","setNestedValue","handlePreview","req","collectionSlug","draft","draftFromReq","fields","limit","exportLimit","locale","previewLimit","rawPreviewLimit","previewPage","rawPreviewPage","sort","where","whereFromReq","data","Math","max","min","targetCollection","payload","collections","Response","json","error","status","select","Array","isArray","length","undefined","collectionHasVersions","Boolean","config","versions","publishedWhere","_status","equals","and","countResult","count","collection","overrideAccess","totalMatchingDocs","totalDocs","exportTotalDocs","previewStartIndex","previewTotalPages","ceil","isCSV","format","localeCodes","localization","disabledFields","admin","custom","columns","collectionConfig","response","docs","hasNextPage","hasPrevPage","page","totalPages","result","find","depth","remainingInExport","slice","transformed","toCSVFunctions","possibleKeys","map","doc","row","key","output","trimmed","value"],"mappings":"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"}
+{"version":3,"sources":["../../src/export/handlePreview.ts"],"sourcesContent":["import type { FlattenedField, PayloadRequest, Where } from 'payload'\n\nimport { addDataAndFileToRequest } from 'payload'\nimport { getObjectDotNotation } from 'payload/shared'\n\nimport type { ExportPreviewResponse } from '../types.js'\n\nimport {\n  DEFAULT_PREVIEW_LIMIT,\n  MAX_PREVIEW_LIMIT,\n  MIN_PREVIEW_LIMIT,\n  MIN_PREVIEW_PAGE,\n} from '../constants.js'\nimport { collectTimezoneCompanionFields } from '../utilities/collectTimezoneCompanionFields.js'\nimport { flattenObject } from '../utilities/flattenObject.js'\nimport { getExportFieldFunctions } from '../utilities/getExportFieldFunctions.js'\nimport { getFlattenedFieldKeys } from '../utilities/getFlattenedFieldKeys.js'\nimport { getSchemaColumns } from '../utilities/getSchemaColumns.js'\nimport { getSelect } from '../utilities/getSelect.js'\nimport { removeDisabledFields } from '../utilities/removeDisabledFields.js'\nimport { resolveLimit } from '../utilities/resolveLimit.js'\nimport { setNestedValue } from '../utilities/setNestedValue.js'\n\nexport const handlePreview = async (req: PayloadRequest): Promise<Response> => {\n  await addDataAndFileToRequest(req)\n\n  const {\n    collectionSlug,\n    draft: draftFromReq,\n    fields,\n    limit: exportLimit,\n    locale,\n    previewLimit: rawPreviewLimit = DEFAULT_PREVIEW_LIMIT,\n    previewPage: rawPreviewPage = 1,\n    sort,\n    where: whereFromReq = {},\n  } = req.data as {\n    collectionSlug: string\n    draft?: 'no' | 'yes'\n    fields?: string[]\n    format?: 'csv' | 'json'\n    limit?: number\n    locale?: string\n    previewLimit?: number\n    previewPage?: number\n    sort?: any\n    where?: any\n  }\n\n  // Validate and clamp pagination values to safe bounds\n  const previewLimit = Math.max(MIN_PREVIEW_LIMIT, Math.min(rawPreviewLimit, MAX_PREVIEW_LIMIT))\n  const previewPage = Math.max(MIN_PREVIEW_PAGE, rawPreviewPage)\n\n  const targetCollection = req.payload.collections[collectionSlug]\n  if (!targetCollection) {\n    return Response.json(\n      { error: `Collection with slug ${collectionSlug} not found` },\n      { status: 400 },\n    )\n  }\n\n  const pluginConfig = targetCollection.config.custom?.['plugin-import-export']\n  const maxLimit = await resolveLimit({\n    limit: pluginConfig?.exportLimit,\n    req,\n  })\n\n  const select = Array.isArray(fields) && fields.length > 0 ? getSelect(fields) : undefined\n  const draft = draftFromReq === 'yes'\n  const collectionHasVersions = Boolean(targetCollection.config.versions)\n\n  // Only filter by _status for versioned collections\n  const publishedWhere: Where = collectionHasVersions ? { _status: { equals: 'published' } } : {}\n\n  const where: Where = {\n    and: [whereFromReq, draft ? {} : publishedWhere],\n  }\n\n  // Count total docs matching export criteria\n  const countResult = await req.payload.count({\n    collection: collectionSlug,\n    overrideAccess: false,\n    req,\n    where,\n  })\n\n  const totalMatchingDocs = countResult.totalDocs\n\n  // Calculate actual export count (respecting both export limit and max limit)\n  let effectiveLimit = totalMatchingDocs\n\n  // Apply user's export limit if provided\n  if (exportLimit && exportLimit > 0) {\n    effectiveLimit = Math.min(effectiveLimit, exportLimit)\n  }\n\n  // Apply max limit if configured\n  if (typeof maxLimit === 'number' && maxLimit > 0) {\n    effectiveLimit = Math.min(effectiveLimit, maxLimit)\n  }\n\n  const exportTotalDocs = effectiveLimit\n\n  // Calculate preview pagination that respects export limit\n  // Preview should only show docs that will actually be exported\n  const previewStartIndex = (previewPage - 1) * previewLimit\n\n  // Calculate pagination info based on export limit (not raw DB results)\n  const previewTotalPages = exportTotalDocs === 0 ? 0 : Math.ceil(exportTotalDocs / previewLimit)\n\n  const isCSV = req?.data?.format === 'csv'\n\n  // Get locale codes for locale expansion when locale='all'\n  const localeCodes =\n    locale === 'all' && req.payload.config.localization\n      ? req.payload.config.localization.localeCodes\n      : undefined\n\n  // Get disabled fields configuration\n  const disabledFields =\n    targetCollection.config.admin?.custom?.['plugin-import-export']?.disabledFields ?? []\n\n  // Collect auto-generated timezone companion fields from schema\n  const timezoneCompanionFields = collectTimezoneCompanionFields(\n    targetCollection.config.flattenedFields,\n  )\n\n  // Always compute columns for CSV (even if no docs) for consistent schema\n  const columns = isCSV\n    ? getSchemaColumns({\n        collectionConfig: targetCollection.config,\n        disabledFields,\n        fields,\n        locale: locale ?? undefined,\n        localeCodes,\n        timezoneCompanionFields,\n      })\n    : undefined\n\n  // If we're beyond the effective limit (considering both user limit and maxLimit), return empty docs\n  if (exportTotalDocs > 0 && previewStartIndex >= exportTotalDocs) {\n    const response: ExportPreviewResponse = {\n      columns,\n      docs: [],\n      exportTotalDocs,\n      hasNextPage: false,\n      hasPrevPage: previewPage > 1,\n      limit: previewLimit,\n      maxLimit,\n      page: previewPage,\n      totalDocs: exportTotalDocs,\n      totalPages: previewTotalPages,\n    }\n    return Response.json(response)\n  }\n\n  // Fetch preview page with full previewLimit to maintain consistent pagination offsets\n  // We'll trim the results afterwards if needed to respect export limit\n  const result = await req.payload.find({\n    collection: collectionSlug,\n    depth: 1,\n    draft,\n    limit: previewLimit,\n    locale,\n    overrideAccess: false,\n    page: previewPage,\n    req,\n    select,\n    sort,\n    where,\n  })\n\n  // Trim docs to respect effective limit boundary (user limit clamped by maxLimit)\n  let docs = result.docs\n  if (exportTotalDocs > 0) {\n    const remainingInExport = exportTotalDocs - previewStartIndex\n    if (remainingInExport < docs.length) {\n      docs = docs.slice(0, remainingInExport)\n    }\n  }\n\n  // Transform docs based on format\n  let transformed: Record<string, unknown>[]\n\n  if (isCSV) {\n    const toCSVFunctions = getExportFieldFunctions({\n      fields: targetCollection.config.fields as FlattenedField[],\n    })\n\n    const possibleKeys = getFlattenedFieldKeys(\n      targetCollection.config.fields as FlattenedField[],\n      '',\n      { localeCodes },\n    )\n\n    transformed = docs.map((doc) => {\n      const row = flattenObject({\n        doc,\n        fields,\n        timezoneCompanionFields,\n        toCSVFunctions,\n      })\n\n      for (const key of possibleKeys) {\n        if (!(key in row)) {\n          row[key] = null\n        }\n      }\n\n      return row\n    })\n  } else {\n    transformed = docs.map((doc) => {\n      let output: Record<string, unknown> = { ...doc }\n\n      // Remove disabled fields first\n      output = removeDisabledFields(output, disabledFields)\n\n      // Then trim to selected fields only (if fields are provided)\n      if (Array.isArray(fields) && fields.length > 0) {\n        const trimmed: Record<string, unknown> = {}\n\n        for (const key of fields) {\n          const value = getObjectDotNotation(output, key)\n          setNestedValue(trimmed, key, value ?? null)\n        }\n\n        output = trimmed\n      }\n\n      return output\n    })\n  }\n\n  const hasNextPage = previewPage < previewTotalPages\n  const hasPrevPage = previewPage > 1\n\n  const response: ExportPreviewResponse = {\n    columns,\n    docs: transformed,\n    exportTotalDocs,\n    hasNextPage,\n    hasPrevPage,\n    limit: previewLimit,\n    maxLimit,\n    page: previewPage,\n    totalDocs: exportTotalDocs,\n    totalPages: previewTotalPages,\n  }\n\n  return Response.json(response)\n}\n"],"names":["addDataAndFileToRequest","getObjectDotNotation","DEFAULT_PREVIEW_LIMIT","MAX_PREVIEW_LIMIT","MIN_PREVIEW_LIMIT","MIN_PREVIEW_PAGE","collectTimezoneCompanionFields","flattenObject","getExportFieldFunctions","getFlattenedFieldKeys","getSchemaColumns","getSelect","removeDisabledFields","resolveLimit","setNestedValue","handlePreview","req","collectionSlug","draft","draftFromReq","fields","limit","exportLimit","locale","previewLimit","rawPreviewLimit","previewPage","rawPreviewPage","sort","where","whereFromReq","data","Math","max","min","targetCollection","payload","collections","Response","json","error","status","pluginConfig","config","custom","maxLimit","select","Array","isArray","length","undefined","collectionHasVersions","Boolean","versions","publishedWhere","_status","equals","and","countResult","count","collection","overrideAccess","totalMatchingDocs","totalDocs","effectiveLimit","exportTotalDocs","previewStartIndex","previewTotalPages","ceil","isCSV","format","localeCodes","localization","disabledFields","admin","timezoneCompanionFields","flattenedFields","columns","collectionConfig","response","docs","hasNextPage","hasPrevPage","page","totalPages","result","find","depth","remainingInExport","slice","transformed","toCSVFunctions","possibleKeys","map","doc","row","key","output","trimmed","value"],"mappings":"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"}

package/dist/exports/types.d.ts

@@ -1,2 +1,2 @@
-export type { ImportExportPluginConfig, ToCSVFunction } from '../types.js';
+export type { ImportExportPluginConfig, Limit, LimitFunction, ToCSVFunction } from '../types.js';
 //# sourceMappingURL=types.d.ts.map

package/dist/exports/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/exports/types.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,wBAAwB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/exports/types.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,wBAAwB,EAAE,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA"}

package/dist/exports/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/exports/types.ts"],"sourcesContent":["export type { ImportExportPluginConfig, ToCSVFunction } from '../types.js'\n"],"names":[],"mappings":"AAAA,WAA0E"}
+{"version":3,"sources":["../../src/exports/types.ts"],"sourcesContent":["export type { ImportExportPluginConfig, Limit, LimitFunction, ToCSVFunction } from '../types.js'\n"],"names":[],"mappings":"AAAA,WAAgG"}

package/dist/import/batchProcessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"batchProcessor.d.ts","sourceRoot":"","sources":["../../src/import/batchProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAExD,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEjE,OAAO,EACL,KAAK,UAAU,EAIhB,MAAM,mCAAmC,CAAA;AAE1C;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,oBAAoB,CAAC,EAAE,OAAO,GAAG,WAAW,CAAA;CAC7C;AAED;;GAEG;AACH,MAAM,WAAW,WAAY,SAAQ,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,CAAA;IAC1B,UAAU,EAAE,KAAK,CAAC;QAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACjC,KAAK,EAAE,MAAM,CAAA;QACb,SAAS,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;QACjC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAChC,CAAC,CAAA;CACH;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;IACpC,UAAU,EAAE,UAAU,CAAA;IACtB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,cAAc,CAAA;IACnB,IAAI,CAAC,EAAE,SAAS,CAAA;CACjB;AA8gBD,wBAAgB,0BAA0B,CAAC,OAAO,GAAE,2BAAgC;oCAMrC,oBAAoB,KAAG,OAAO,CAAC,YAAY,CAAC;EA2D1F"}
+{"version":3,"file":"batchProcessor.d.ts","sourceRoot":"","sources":["../../src/import/batchProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAExD,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEjE,OAAO,EACL,KAAK,UAAU,EAIhB,MAAM,mCAAmC,CAAA;AAE1C;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,oBAAoB,CAAC,EAAE,OAAO,GAAG,WAAW,CAAA;CAC7C;AAED;;GAEG;AACH,MAAM,WAAW,WAAY,SAAQ,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,CAAA;IAC1B,UAAU,EAAE,KAAK,CAAC;QAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACjC,KAAK,EAAE,MAAM,CAAA;QACb,SAAS,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;QACjC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAChC,CAAC,CAAA;CACH;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;IACpC,UAAU,EAAE,UAAU,CAAA;IACtB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,GAAG,EAAE,cAAc,CAAA;IACnB,IAAI,CAAC,EAAE,SAAS,CAAA;CACjB;AAghBD,wBAAgB,0BAA0B,CAAC,OAAO,GAAE,2BAAgC;oCAMrC,oBAAoB,KAAG,OAAO,CAAC,YAAY,CAAC;EA2D1F"}

package/dist/import/batchProcessor.js

@@ -1,10 +1,19 @@
 import { categorizeError, createBatches, extractErrorMessage } from '../utilities/useBatchProcessor.js';
-// Helper function to handle multi-locale data
-function extractMultiLocaleData(data, configuredLocales) {
+/**
+ * Separates multi-locale data from a document for sequential locale updates.
+ *
+ * When a field has locale-keyed values (e.g., { title: { en: 'Hello', es: 'Hola' } }),
+ * this extracts the first locale's data for initial create/update, and stores
+ * remaining locales for subsequent update calls.
+ *
+ * @returns
+ * - flatData: Document with first locale values extracted (for initial operation)
+ * - hasMultiLocale: Whether any multi-locale fields were found
+ * - localeUpdates: Map of locale -> field data for follow-up updates
+ */ function extractMultiLocaleData(data, configuredLocales) {
     const flatData = {};
     const localeUpdates = {};
     let hasMultiLocale = false;
-    // If no locales configured, skip multi-locale processing
     if (!configuredLocales || configuredLocales.length === 0) {
         return {
             flatData: {
@@ -18,16 +27,12 @@ function extractMultiLocaleData(data, configuredLocales) {
     for (const [key, value] of Object.entries(data)){
         if (value && typeof value === 'object' && !Array.isArray(value)) {
             const valueObj = value;
-            // Check if this object has keys matching configured locales
             const localeKeys = Object.keys(valueObj).filter((k)=>localeSet.has(k));
             if (localeKeys.length > 0) {
                 hasMultiLocale = true;
-                // This is a localized field with explicit locale keys
-                // Use the first locale for initial creation, then update others
                 const firstLocale = localeKeys[0];
                 if (firstLocale) {
                     flatData[key] = valueObj[firstLocale];
-                    // Store other locales for later update
                     for (const locale of localeKeys){
                         if (locale !== firstLocale) {
                             if (!localeUpdates[locale]) {
@@ -38,11 +43,9 @@ function extractMultiLocaleData(data, configuredLocales) {
                     }
                 }
             } else {
-                // Not locale data, keep as is
                 flatData[key] = value;
             }
         } else {
-            // Not an object, keep as is. this includes localized fields without locale suffix; ie default locale
             flatData[key] = value;
         }
     }
@@ -52,17 +55,24 @@ function extractMultiLocaleData(data, configuredLocales) {
         localeUpdates
     };
 }
-async function processImportBatch({ batch, batchIndex, collectionSlug, importMode, matchField, options, req, user }) {
+/**
+ * Processes a batch of documents for import based on the import mode.
+ *
+ * For each document in the batch:
+ * - create: Creates a new document (removes any existing ID)
+ * - update: Finds existing document by matchField and updates it
+ * - upsert: Updates if found, creates if not found
+ *
+ * Handles versioned collections, multi-locale data, and MongoDB ObjectID validation.
+ * Continues processing remaining documents even if individual imports fail.
+ */ async function processImportBatch({ batch, batchIndex, collectionSlug, importMode, matchField, options, req, user }) {
     const result = {
         failed: [],
         successful: []
     };
-    // Check if the collection has versions enabled
     const collectionConfig = req.payload.collections[collectionSlug]?.config;
     const collectionHasVersions = Boolean(collectionConfig?.versions);
-    // Get configured locales for multi-locale data detection
     const configuredLocales = req.payload.config.localization ? req.payload.config.localization.localeCodes : undefined;
-    // Calculate the starting row number for this batch
     const startingRowNumber = batchIndex * options.batchSize;
     for(let i = 0; i < batch.length; i++){
         const document = batch[i];
@@ -71,23 +81,18 @@ async function processImportBatch({ batch, batchIndex, collectionSlug, importMod
         }
         const rowNumber = startingRowNumber + i + 1;
         try {
-            let processedDoc;
-            let existing;
+            let savedDocument;
+            let existingDocResult;
             if (importMode === 'create') {
-                // Remove ID field when creating new document
                 const createData = {
                     ...document
                 };
                 delete createData.id;
-                // Only handle _status for versioned collections
                 let draftOption;
                 if (collectionHasVersions) {
-                    // Check if _status is set - use defaultVersionStatus from config
-                    // If no _status field provided, use the configured default
                     const statusValue = createData._status || options.defaultVersionStatus;
                     const isPublished = statusValue !== 'draft';
                     draftOption = !isPublished;
-                    // Debug: log status handling
                     if (req.payload.config.debug) {
                         req.payload.logger.info({
                             _status: createData._status,
@@ -96,9 +101,9 @@ async function processImportBatch({ batch, batchIndex, collectionSlug, importMod
                             willSetDraft: draftOption
                         });
                     }
-                    delete createData._status; // Remove _status from data - it's controlled via draft option
+                    // Remove _status from data - it's controlled via draft option
+                    delete createData._status;
                 }
-                // Debug: log what we're about to create
                 if (req.payload.config.debug && 'title' in createData) {
                     req.payload.logger.info({
                         msg: 'Creating document',
@@ -111,7 +116,7 @@ async function processImportBatch({ batch, batchIndex, collectionSlug, importMod
                 const { flatData, hasMultiLocale, localeUpdates } = extractMultiLocaleData(createData, configuredLocales);
                 if (hasMultiLocale) {
                     // Create with default locale data
-                    processedDoc = await req.payload.create({
+                    savedDocument = await req.payload.create({
                         collection: collectionSlug,
                         data: flatData,
                         draft: draftOption,
@@ -120,7 +125,7 @@ async function processImportBatch({ batch, batchIndex, collectionSlug, importMod
                         user
                     });
                     // Update for other locales
-                    if (processedDoc && Object.keys(localeUpdates).length > 0) {
+                    if (savedDocument && Object.keys(localeUpdates).length > 0) {
                         for (const [locale, localeData] of Object.entries(localeUpdates)){
                             try {
                                 const localeReq = {
@@ -128,7 +133,7 @@ async function processImportBatch({ batch, batchIndex, collectionSlug, importMod
                                     locale
                                 };
                                 await req.payload.update({
-                                    id: processedDoc.id,
+                                    id: savedDocument.id,
                                     collection: collectionSlug,
                                     data: localeData,
                                     draft: collectionHasVersions ? false : undefined,
@@ -140,14 +145,14 @@ async function processImportBatch({ batch, batchIndex, collectionSlug, importMod
                                 // Log but don't fail the entire import if a locale update fails
                                 req.payload.logger.error({
                                     err: error,
-                                    msg: `Failed to update locale ${locale} for document ${String(processedDoc.id)}`
+                                    msg: `Failed to update locale ${locale} for document ${String(savedDocument.id)}`
                                 });
                             }
                         }
                     }
                 } else {
                     // No multi-locale data, create normally
-                    processedDoc = await req.payload.create({
+                    savedDocument = await req.payload.create({
                         collection: collectionSlug,
                         data: createData,
                         draft: draftOption,
@@ -178,9 +183,8 @@ async function processImportBatch({ batch, batchIndex, collectionSlug, importMod
                     matchValueStr = JSON.stringify(matchValue);
                 }
                 const isValidObjectIdFormat = /^[0-9a-f]{24}$/i.test(matchValueStr);
-                // Try to search normally first, catch errors for invalid IDs
                 try {
-                    existing = await req.payload.find({
+                    existingDocResult = await req.payload.find({
                         collection: collectionSlug,
                         depth: 0,
                         limit: 1,
@@ -194,23 +198,19 @@ async function processImportBatch({ batch, batchIndex, collectionSlug, importMod
                         }
                     });
                 } catch (error) {
-                    // If we get an error when searching by ID (e.g., invalid ObjectID format)
-                    // and we're in upsert mode, treat as non-existent
+                    // MongoDB may throw for invalid ObjectID format - handle gracefully for upsert
                     if (isMatchingById && importMode === 'upsert' && !isValidObjectIdFormat) {
-                        existing = {
+                        existingDocResult = {
                             docs: []
                         };
                     } else if (isMatchingById && importMode === 'update' && !isValidObjectIdFormat) {
-                        // For update mode with invalid ID, this should fail
                         throw new Error(`Invalid ID format for update: ${matchValueStr}`);
                     } else {
-                        // Re-throw other errors
                         throw error;
                     }
                 }
-                if (existing.docs.length > 0) {
-                    // Update existing
-                    const existingDoc = existing.docs[0];
+                if (existingDocResult.docs.length > 0) {
+                    const existingDoc = existingDocResult.docs[0];
                     if (!existingDoc) {
                         throw new Error(`Document not found`);
                     }
@@ -250,7 +250,7 @@ async function processImportBatch({ batch, batchIndex, collectionSlug, importMod
                     }
                     if (hasMultiLocale) {
                         // Update with default locale data
-                        processedDoc = await req.payload.update({
+                        savedDocument = await req.payload.update({
                             id: existingDoc.id,
                             collection: collectionSlug,
                             data: flatData,
@@ -261,7 +261,7 @@ async function processImportBatch({ batch, batchIndex, collectionSlug, importMod
                             user
                         });
                         // Update for other locales
-                        if (processedDoc && Object.keys(localeUpdates).length > 0) {
+                        if (savedDocument && Object.keys(localeUpdates).length > 0) {
                             for (const [locale, localeData] of Object.entries(localeUpdates)){
                                 try {
                                     // Clone the request with the specific locale
@@ -302,7 +302,7 @@ async function processImportBatch({ batch, batchIndex, collectionSlug, importMod
                             }
                             // Update the document - don't specify draft to let Payload handle versions properly
                             // This will create a new draft version for collections with versions enabled
-                            processedDoc = await req.payload.update({
+                            savedDocument = await req.payload.update({
                                 id: existingDoc.id,
                                 collection: collectionSlug,
                                 data: updateData,
@@ -312,13 +312,12 @@ async function processImportBatch({ batch, batchIndex, collectionSlug, importMod
                                 req,
                                 user
                             });
-                            // Debug: log what was returned
-                            if (req.payload.config.debug && processedDoc) {
+                            if (req.payload.config.debug && savedDocument) {
                                 req.payload.logger.info({
-                                    id: processedDoc.id,
+                                    id: savedDocument.id,
                                     msg: 'Update completed',
-                                    status: processedDoc._status,
-                                    title: processedDoc.title
+                                    status: savedDocument._status,
+                                    title: savedDocument.title
                                 });
                             }
                         } catch (updateError) {
@@ -351,13 +350,14 @@ async function processImportBatch({ batch, batchIndex, collectionSlug, importMod
                         const statusValue = createData._status || options.defaultVersionStatus;
                         const isPublished = statusValue !== 'draft';
                         draftOption = !isPublished;
-                        delete createData._status; // Remove _status from data - it's controlled via draft option
+                        // Remove _status from data - it's controlled via draft option
+                        delete createData._status;
                     }
                     // Check if we have multi-locale data and extract it
                     const { flatData, hasMultiLocale, localeUpdates } = extractMultiLocaleData(createData, configuredLocales);
                     if (hasMultiLocale) {
                         // Create with default locale data
-                        processedDoc = await req.payload.create({
+                        savedDocument = await req.payload.create({
                             collection: collectionSlug,
                             data: flatData,
                             draft: draftOption,
@@ -366,7 +366,7 @@ async function processImportBatch({ batch, batchIndex, collectionSlug, importMod
                             user
                         });
                         // Update for other locales
-                        if (processedDoc && Object.keys(localeUpdates).length > 0) {
+                        if (savedDocument && Object.keys(localeUpdates).length > 0) {
                             for (const [locale, localeData] of Object.entries(localeUpdates)){
                                 try {
                                     // Clone the request with the specific locale
@@ -375,7 +375,7 @@ async function processImportBatch({ batch, batchIndex, collectionSlug, importMod
                                         locale
                                     };
                                     await req.payload.update({
-                                        id: processedDoc.id,
+                                        id: savedDocument.id,
                                         collection: collectionSlug,
                                         data: localeData,
                                         draft: collectionHasVersions ? false : undefined,
@@ -386,14 +386,14 @@ async function processImportBatch({ batch, batchIndex, collectionSlug, importMod
                                     // Log but don't fail the entire import if a locale update fails
                                     req.payload.logger.error({
                                         err: error,
-                                        msg: `Failed to update locale ${locale} for document ${String(processedDoc.id)}`
+                                        msg: `Failed to update locale ${locale} for document ${String(savedDocument.id)}`
                                     });
                                 }
                             }
                         }
                     } else {
                         // No multi-locale data, create normally
-                        processedDoc = await req.payload.create({
+                        savedDocument = await req.payload.create({
                             collection: collectionSlug,
                             data: createData,
                             draft: draftOption,
@@ -420,7 +420,7 @@ async function processImportBatch({ batch, batchIndex, collectionSlug, importMod
             } else {
                 throw new Error(`Unknown import mode: ${String(importMode)}`);
             }
-            if (processedDoc) {
+            if (savedDocument) {
                 // Determine operation type for proper counting
                 let operation;
                 if (importMode === 'create') {
@@ -428,8 +428,7 @@ async function processImportBatch({ batch, batchIndex, collectionSlug, importMod
                 } else if (importMode === 'update') {
                     operation = 'updated';
                 } else if (importMode === 'upsert') {
-                    // In upsert mode, check if we found an existing document
-                    if (existing && existing.docs.length > 0) {
+                    if (existingDocResult && existingDocResult.docs.length > 0) {
                         operation = 'updated';
                     } else {
                         operation = 'created';
@@ -439,7 +438,7 @@ async function processImportBatch({ batch, batchIndex, collectionSlug, importMod
                     document,
                     index: rowNumber - 1,
                     operation,
-                    result: processedDoc
+                    result: savedDocument
                 });
             }
         } catch (error) {