@teleporthq/teleport-plugin-next-data-source 0.42.8 → 0.42.10

package/dist/cjs/pagination-plugin.js

@@ -64,6 +64,7 @@ var teleport_types_1 = require("@teleporthq/teleport-types");
 var types = __importStar(require("@babel/types"));
 var teleport_shared_1 = require("@teleporthq/teleport-shared");
 var utils_1 = require("./utils");
+var data_source_fetchers_1 = require("./data-source-fetchers");
 // Scan UIDL to find all data source usages and build a registry
 function buildStateRegistry(uidlNode) {
     var usages = [];
@@ -71,7 +72,7 @@ function buildStateRegistry(uidlNode) {
     var byArrayMapperRenderProp = new Map();
     var index = 0;
     var traverse = function (node, parentDataSource) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
         if (!node || typeof node !== 'object') {
             return;
         }
@@ -110,9 +111,19 @@ function buildStateRegistry(uidlNode) {
                 if ((_h = (_g = parentDataSource.resourceParams) === null || _g === void 0 ? void 0 : _g.queryColumns) === null || _h === void 0 ? void 0 : _h.content) {
                     queryColumns = parentDataSource.resourceParams.queryColumns.content;
                 }
+                // Extract sorts from parent's resource params
+                var sorts = [];
+                if ((_k = (_j = parentDataSource.resourceParams) === null || _j === void 0 ? void 0 : _j.sorts) === null || _k === void 0 ? void 0 : _k.content) {
+                    sorts = parentDataSource.resourceParams.sorts.content;
+                }
+                // Extract filters from parent's resource params
+                var filters = [];
+                if ((_m = (_l = parentDataSource.resourceParams) === null || _l === void 0 ? void 0 : _l.filters) === null || _m === void 0 ? void 0 : _m.content) {
+                    filters = parentDataSource.resourceParams.filters.content;
+                }
                 // Extract limit from parent's resource params (for plain array mappers)
                 var limit = 0;
-                if ((_k = (_j = parentDataSource.resourceParams) === null || _j === void 0 ? void 0 : _j.limit) === null || _k === void 0 ? void 0 : _k.content) {
+                if ((_p = (_o = parentDataSource.resourceParams) === null || _o === void 0 ? void 0 : _o.limit) === null || _p === void 0 ? void 0 : _p.content) {
                     limit = parentDataSource.resourceParams.limit.content;
                 }
                 // For paginated mappers, use perPage from cms-list-repeater
@@ -132,6 +143,8 @@ function buildStateRegistry(uidlNode) {
                     searchEnabled: !!content.searchEnabled,
                     searchDebounce: content.searchDebounce || 300,
                     queryColumns: queryColumns,
+                    sorts: sorts,
+                    filters: filters,
                     category: 'plain',
                 };
                 // Determine category
@@ -153,22 +166,22 @@ function buildStateRegistry(uidlNode) {
                 byArrayMapperRenderProp.set(arrayMapperRenderProp, usage);
             }
             // Continue traversing inside the repeater
-            if ((_l = content.nodes) === null || _l === void 0 ? void 0 : _l.list) {
+            if ((_q = content.nodes) === null || _q === void 0 ? void 0 : _q.list) {
                 traverse(content.nodes.list, parentDataSource);
             }
             return;
         }
         // Recurse into children
-        if (((_m = node.content) === null || _m === void 0 ? void 0 : _m.children) && Array.isArray(node.content.children)) {
-            for (var _i = 0, _q = node.content.children; _i < _q.length; _i++) {
-                var child = _q[_i];
+        if (((_r = node.content) === null || _r === void 0 ? void 0 : _r.children) && Array.isArray(node.content.children)) {
+            for (var _i = 0, _u = node.content.children; _i < _u.length; _i++) {
+                var child = _u[_i];
                 traverse(child, parentDataSource);
             }
         }
-        if ((_o = node.content) === null || _o === void 0 ? void 0 : _o.node) {
+        if ((_s = node.content) === null || _s === void 0 ? void 0 : _s.node) {
             traverse(node.content.node, parentDataSource);
         }
-        if ((_p = node.content) === null || _p === void 0 ? void 0 : _p.nodes) {
+        if ((_t = node.content) === null || _t === void 0 ? void 0 : _t.nodes) {
             if (node.content.nodes.success) {
                 traverse(node.content.nodes.success, parentDataSource);
             }
@@ -186,8 +199,8 @@ function buildStateRegistry(uidlNode) {
             }
         }
         if (Array.isArray(node.children)) {
-            for (var _r = 0, _s = node.children; _r < _s.length; _r++) {
-                var child = _s[_r];
+            for (var _v = 0, _w = node.children; _v < _w.length; _v++) {
+                var child = _w[_v];
                 traverse(child, parentDataSource);
             }
         }
@@ -373,6 +386,29 @@ var createNextArrayMapperPaginationPlugin = function () {
                     if (usage.queryColumns.length > 0) {
                         urlParams.push(types.objectProperty(types.identifier('queryColumns'), types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [types.arrayExpression(usage.queryColumns.map(function (c) { return types.stringLiteral(c); }))])));
                     }
+                    // Add sorts to count fetch params if present
+                    if (usage.sorts && usage.sorts.length > 0) {
+                        urlParams.push(types.objectProperty(types.identifier('sorts'), types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [
+                            types.arrayExpression(usage.sorts.map(function (sort) {
+                                return types.objectExpression([
+                                    types.objectProperty(types.identifier('field'), types.stringLiteral(sort.field || '')),
+                                    types.objectProperty(types.identifier('order'), types.stringLiteral(sort.order || '')),
+                                ]);
+                            })),
+                        ])));
+                    }
+                    // Add filters to count fetch params if present
+                    if (usage.filters && usage.filters.length > 0) {
+                        urlParams.push(types.objectProperty(types.identifier('filters'), types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [
+                            types.arrayExpression(usage.filters.map(function (filter) {
+                                return types.objectExpression([
+                                    types.objectProperty(types.identifier('source'), types.stringLiteral(filter.source || '')),
+                                    types.objectProperty(types.identifier('destination'), types.stringLiteral(filter.destination || '')),
+                                    types.objectProperty(types.identifier('operand'), types.stringLiteral(filter.operand || '')),
+                                ]);
+                            })),
+                        ])));
+                    }
                     // Build the count fetch effect body
                     var countFetchEffectBody = [];
                     // Only add skip-on-mount check for pages (where we have server-side count)
@@ -536,13 +572,11 @@ var createNextArrayMapperPaginationPlugin = function () {
                 else if (usage.category === 'search-only') {
                     updateDataProviderForSearchOnly(dp, usage, vars, fileName);
                 }
-                else {
-                    updateDataProviderForPlain(dp, vars);
-                }
-                // Create API route if needed
-                if (usage.category !== 'plain') {
-                    ensureAPIRouteExists(options.extractedResources, usage);
+                else if (usage.category === 'plain') {
+                    updateDataProviderForPlain(dp, fileName);
                 }
+                // Create API route for all categories (including 'plain' for components)
+                ensureAPIRouteExists(options.extractedResources, usage, options.dataSources);
             });
             dataProvidersWithoutRepeaters = dataProviders.filter(function (dp) {
                 var hasRepeater = findArrayMapperRenderPropInDataProvider(dp) !== undefined;
@@ -575,7 +609,7 @@ var createNextArrayMapperPaginationPlugin = function () {
             });
             // STEP 6: Update getStaticProps if this is a page
             if (isPage) {
-                updateGetStaticProps(chunks, registry);
+                updateGetStaticProps(chunks, registry, dependencies);
             }
             return [2 /*return*/, structure];
         });
@@ -760,6 +794,29 @@ function updateDataProviderForPaginatedSearch(dp, usage, vars, fileName) {
     if (usage.queryColumns.length > 0) {
         paramsProps.push(types.objectProperty(types.identifier('queryColumns'), types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [types.arrayExpression(usage.queryColumns.map(function (c) { return types.stringLiteral(c); }))])));
     }
+    // Add sorts if present
+    if (usage.sorts && usage.sorts.length > 0) {
+        paramsProps.push(types.objectProperty(types.identifier('sorts'), types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [
+            types.arrayExpression(usage.sorts.map(function (sort) {
+                return types.objectExpression([
+                    types.objectProperty(types.identifier('field'), types.stringLiteral(sort.field || '')),
+                    types.objectProperty(types.identifier('order'), types.stringLiteral(sort.order || '')),
+                ]);
+            })),
+        ])));
+    }
+    // Add filters if present
+    if (usage.filters && usage.filters.length > 0) {
+        paramsProps.push(types.objectProperty(types.identifier('filters'), types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [
+            types.arrayExpression(usage.filters.map(function (filter) {
+                return types.objectExpression([
+                    types.objectProperty(types.identifier('source'), types.stringLiteral(filter.source || '')),
+                    types.objectProperty(types.identifier('destination'), types.stringLiteral(filter.destination || '')),
+                    types.objectProperty(types.identifier('operand'), types.stringLiteral(filter.operand || '')),
+                ]);
+            })),
+        ])));
+    }
     dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('params'), types.jsxExpressionContainer(types.callExpression(types.identifier('useMemo'), [
         types.arrowFunctionExpression([], types.objectExpression(paramsProps)),
         types.arrayExpression([types.identifier(vars.combinedStateVar)]),
@@ -790,12 +847,37 @@ function updateDataProviderForPaginationOnly(dp, usage, vars, fileName) {
         var _a;
         return !['params', 'key', 'initialData', 'fetchData', 'persistDataDuringLoading'].includes((_a = attr.name) === null || _a === void 0 ? void 0 : _a.name);
     });
+    // Build params properties
+    var paramsProps = [
+        types.objectProperty(types.identifier('page'), types.identifier(vars.pageStateVar)),
+        types.objectProperty(types.identifier('perPage'), types.numericLiteral(usage.perPage)),
+    ];
+    // Add sorts if present
+    if (usage.sorts && usage.sorts.length > 0) {
+        paramsProps.push(types.objectProperty(types.identifier('sorts'), types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [
+            types.arrayExpression(usage.sorts.map(function (sort) {
+                return types.objectExpression([
+                    types.objectProperty(types.identifier('field'), types.stringLiteral(sort.field || '')),
+                    types.objectProperty(types.identifier('order'), types.stringLiteral(sort.order || '')),
+                ]);
+            })),
+        ])));
+    }
+    // Add filters if present
+    if (usage.filters && usage.filters.length > 0) {
+        paramsProps.push(types.objectProperty(types.identifier('filters'), types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [
+            types.arrayExpression(usage.filters.map(function (filter) {
+                return types.objectExpression([
+                    types.objectProperty(types.identifier('source'), types.stringLiteral(filter.source || '')),
+                    types.objectProperty(types.identifier('destination'), types.stringLiteral(filter.destination || '')),
+                    types.objectProperty(types.identifier('operand'), types.stringLiteral(filter.operand || '')),
+                ]);
+            })),
+        ])));
+    }
     // Add params
     dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('params'), types.jsxExpressionContainer(types.callExpression(types.identifier('useMemo'), [
-        types.arrowFunctionExpression([], types.objectExpression([
-            types.objectProperty(types.identifier('page'), types.identifier(vars.pageStateVar)),
-            types.objectProperty(types.identifier('perPage'), types.numericLiteral(usage.perPage)),
-        ])),
+        types.arrowFunctionExpression([], types.objectExpression(paramsProps)),
         types.arrayExpression([types.identifier(vars.pageStateVar)]),
     ]))));
     // Add initialData
@@ -825,6 +907,29 @@ function updateDataProviderForSearchOnly(dp, usage, vars, fileName) {
     if (usage.queryColumns.length > 0) {
         paramsProps.push(types.objectProperty(types.identifier('queryColumns'), types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [types.arrayExpression(usage.queryColumns.map(function (c) { return types.stringLiteral(c); }))])));
     }
+    // Add sorts if present
+    if (usage.sorts && usage.sorts.length > 0) {
+        paramsProps.push(types.objectProperty(types.identifier('sorts'), types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [
+            types.arrayExpression(usage.sorts.map(function (sort) {
+                return types.objectExpression([
+                    types.objectProperty(types.identifier('field'), types.stringLiteral(sort.field || '')),
+                    types.objectProperty(types.identifier('order'), types.stringLiteral(sort.order || '')),
+                ]);
+            })),
+        ])));
+    }
+    // Add filters if present
+    if (usage.filters && usage.filters.length > 0) {
+        paramsProps.push(types.objectProperty(types.identifier('filters'), types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [
+            types.arrayExpression(usage.filters.map(function (filter) {
+                return types.objectExpression([
+                    types.objectProperty(types.identifier('source'), types.stringLiteral(filter.source || '')),
+                    types.objectProperty(types.identifier('destination'), types.stringLiteral(filter.destination || '')),
+                    types.objectProperty(types.identifier('operand'), types.stringLiteral(filter.operand || '')),
+                ]);
+            })),
+        ])));
+    }
     dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('params'), types.jsxExpressionContainer(types.callExpression(types.identifier('useMemo'), [
         types.arrowFunctionExpression([], types.objectExpression(paramsProps)),
         types.arrayExpression([types.identifier(vars.debouncedSearchQueryVar)]),
@@ -840,15 +945,48 @@ function updateDataProviderForSearchOnly(dp, usage, vars, fileName) {
     dp.openingElement.attributes.push(createFetchDataAttribute(fileName));
     dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('persistDataDuringLoading'), types.jsxExpressionContainer(types.booleanLiteral(true))));
 }
-function updateDataProviderForPlain(dp, vars) {
+function updateDataProviderForPlain(dp, fileName) {
+    var _a, _b, _c;
     var attrs = dp.openingElement.attributes;
-    // Remove params and fetchData - plain mappers only use initialData
-    dp.openingElement.attributes = attrs.filter(function (attr) { var _a; return !['params', 'fetchData'].includes((_a = attr.name) === null || _a === void 0 ? void 0 : _a.name); });
-    // Update initialData to use correct prop
-    var existingInitialData = dp.openingElement.attributes.find(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'initialData'; });
-    if (existingInitialData) {
-        existingInitialData.value = types.jsxExpressionContainer(types.optionalMemberExpression(types.identifier('props'), types.identifier(vars.propsPrefix), false, true));
+    // Check if fetchData already exists
+    var hasFetchData = attrs.some(function (attr) { var _a; return attr.type === 'JSXAttribute' && ((_a = attr.name) === null || _a === void 0 ? void 0 : _a.name) === 'fetchData'; });
+    // If no fetchData, add it
+    if (!hasFetchData) {
+        attrs.push(createFetchDataAttribute(fileName));
+    }
+    // Check if persistDataDuringLoading already exists
+    var hasPersistData = attrs.some(function (attr) { var _a; return attr.type === 'JSXAttribute' && ((_a = attr.name) === null || _a === void 0 ? void 0 : _a.name) === 'persistDataDuringLoading'; });
+    // If no persistDataDuringLoading, add it
+    if (!hasPersistData) {
+        attrs.push(types.jsxAttribute(types.jsxIdentifier('persistDataDuringLoading'), types.jsxExpressionContainer(types.booleanLiteral(true))));
+    }
+    // Find the params attribute
+    var paramsAttrIndex = attrs.findIndex(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'params'; });
+    if (paramsAttrIndex === -1) {
+        return;
+    }
+    var paramsAttr = attrs[paramsAttrIndex];
+    // Check if params is already wrapped in useMemo
+    if (((_a = paramsAttr.value) === null || _a === void 0 ? void 0 : _a.type) === 'JSXExpressionContainer' &&
+        paramsAttr.value.expression.type === 'CallExpression' &&
+        ((_b = paramsAttr.value.expression.callee) === null || _b === void 0 ? void 0 : _b.name) === 'useMemo') {
+        return;
     }
+    // Get the current params value expression
+    var paramsExpression = null;
+    if (((_c = paramsAttr.value) === null || _c === void 0 ? void 0 : _c.type) === 'JSXExpressionContainer') {
+        paramsExpression = paramsAttr.value.expression;
+    }
+    if (!paramsExpression) {
+        return;
+    }
+    // Wrap params in useMemo with empty dependencies array
+    var memoizedParams = types.callExpression(types.identifier('useMemo'), [
+        types.arrowFunctionExpression([], paramsExpression),
+        types.arrayExpression([]),
+    ]);
+    // Replace the params attribute
+    attrs[paramsAttrIndex] = types.jsxAttribute(types.jsxIdentifier('params'), types.jsxExpressionContainer(memoizedParams));
 }
 function stabilizeDataProviderWithoutRepeater(dp) {
     var _a, _b, _c;
@@ -1014,35 +1152,54 @@ function wirePaginationButtons(paginationNode, usage, vars) {
         }
     }
 }
-function ensureAPIRouteExists(extractedResources, usage) {
+function ensureAPIRouteExists(extractedResources, usage, dataSources) {
     // Generate file name for the API route
     var fileName = (0, utils_1.generateSafeFileName)(usage.resourceDefinition.dataSourceType, usage.resourceDefinition.tableName, usage.resourceDefinition.dataSourceId);
-    // Check if the utils data source file exists - if so, create API routes that re-export from it
-    if (extractedResources["utils/".concat(fileName)]) {
-        // Create main data API route if not exists
-        if (!extractedResources["api/".concat(fileName)]) {
-            var apiRouteCode = "import dataSourceModule from '../../utils/data-sources/".concat(fileName, "'\n\nexport default dataSourceModule.handler\n");
-            extractedResources["api/".concat(fileName)] = {
-                fileName: fileName,
-                fileType: teleport_types_1.FileType.JS,
-                path: ['pages', 'api'],
-                content: apiRouteCode,
-            };
-        }
-        // Create count API route if not exists (needed for paginated+search cases)
-        var countFileName = "".concat(fileName, "-count");
-        if (!extractedResources["api/".concat(countFileName)]) {
-            var countApiRouteCode = "import dataSourceModule from '../../utils/data-sources/".concat(fileName, "'\n\nexport default dataSourceModule.getCount\n");
-            extractedResources["api/".concat(countFileName)] = {
-                fileName: countFileName,
-                fileType: teleport_types_1.FileType.JS,
-                path: ['pages', 'api'],
-                content: countApiRouteCode,
-            };
+    // Check if the utils data source file exists - if not, create it
+    if (!extractedResources["utils/".concat(fileName)]) {
+        // Get the data source from dataSources
+        var dataSource = dataSources[usage.resourceDefinition.dataSourceId];
+        if (dataSource) {
+            try {
+                // Generate the utils file with fetchData, fetchCount, handler, and getCount
+                var fetcherCode = (0, data_source_fetchers_1.generateDataSourceFetcherWithCore)(dataSource, usage.resourceDefinition.tableName || 'data');
+                extractedResources["utils/".concat(fileName)] = {
+                    fileName: fileName,
+                    fileType: teleport_types_1.FileType.JS,
+                    path: ['utils', 'data-sources'],
+                    content: fetcherCode,
+                };
+            }
+            catch (error) {
+                // If generation fails, skip
+                return;
+            }
         }
     }
+    // Now create API routes that re-export from the utils file
+    // Create main data API route if not exists
+    if (!extractedResources["api/".concat(fileName)]) {
+        var apiRouteCode = "import dataSourceModule from '../../utils/data-sources/".concat(fileName, "'\n\nexport default dataSourceModule.handler\n");
+        extractedResources["api/".concat(fileName)] = {
+            fileName: fileName,
+            fileType: teleport_types_1.FileType.JS,
+            path: ['pages', 'api'],
+            content: apiRouteCode,
+        };
+    }
+    // Create count API route if not exists (needed for paginated+search cases)
+    var countFileName = "".concat(fileName, "-count");
+    if (!extractedResources["api/".concat(countFileName)]) {
+        var countApiRouteCode = "import dataSourceModule from '../../utils/data-sources/".concat(fileName, "'\n\nexport default dataSourceModule.getCount\n");
+        extractedResources["api/".concat(countFileName)] = {
+            fileName: countFileName,
+            fileType: teleport_types_1.FileType.JS,
+            path: ['pages', 'api'],
+            content: countApiRouteCode,
+        };
+    }
 }
-function updateGetStaticProps(chunks, registry) {
+function updateGetStaticProps(chunks, registry, dependencies) {
     var _a;
     var getStaticPropsChunk = chunks.find(function (c) { return c.name === 'getStaticProps'; });
     if (!getStaticPropsChunk || getStaticPropsChunk.type !== teleport_types_1.ChunkType.AST) {
@@ -1088,7 +1245,11 @@ function updateGetStaticProps(chunks, registry) {
     var arrayPattern = declarator.id;
     // Track unique data sources for count fetching
     var dataSourcesNeedingCount = new Set();
-    registry.usages.forEach(function (usage) {
+    // Only process usages that need pagination or search functionality
+    // Non-paginated, non-search usages are handled by the main plugin
+    registry.usages
+        .filter(function (u) { return u.paginated || u.searchEnabled; })
+        .forEach(function (usage) {
         var vars = getStateVarsForUsage(usage);
         var fileName = (0, utils_1.generateSafeFileName)(usage.resourceDefinition.dataSourceType, usage.resourceDefinition.tableName, usage.resourceDefinition.dataSourceId);
         // Use consistent import name generation (matches extractDataSourceIntoGetStaticProps)
@@ -1108,6 +1269,29 @@ function updateGetStaticProps(chunks, registry) {
         if (usage.queryColumns.length > 0) {
             fetchParams.push(types.objectProperty(types.identifier('queryColumns'), types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [types.arrayExpression(usage.queryColumns.map(function (c) { return types.stringLiteral(c); }))])));
         }
+        // Add sorts if present
+        if (usage.sorts && usage.sorts.length > 0) {
+            fetchParams.push(types.objectProperty(types.identifier('sorts'), types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [
+                types.arrayExpression(usage.sorts.map(function (sort) {
+                    return types.objectExpression([
+                        types.objectProperty(types.identifier('field'), types.stringLiteral(sort.field || '')),
+                        types.objectProperty(types.identifier('order'), types.stringLiteral(sort.order || '')),
+                    ]);
+                })),
+            ])));
+        }
+        // Add filters if present
+        if (usage.filters && usage.filters.length > 0) {
+            fetchParams.push(types.objectProperty(types.identifier('filters'), types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [
+                types.arrayExpression(usage.filters.map(function (filter) {
+                    return types.objectExpression([
+                        types.objectProperty(types.identifier('source'), types.stringLiteral(filter.source || '')),
+                        types.objectProperty(types.identifier('destination'), types.stringLiteral(filter.destination || '')),
+                        types.objectProperty(types.identifier('operand'), types.stringLiteral(filter.operand || '')),
+                    ]);
+                })),
+            ])));
+        }
         // Check if this fetch already exists
         var existingFetchIndex = arrayPattern.elements.findIndex(function (el) { return (el === null || el === void 0 ? void 0 : el.type) === 'Identifier' && el.name === vars.propsPrefix; });
         if (existingFetchIndex === -1) {
@@ -1121,6 +1305,13 @@ function updateGetStaticProps(chunks, registry) {
                     types.returnStatement(types.arrayExpression([])),
                 ])),
             ]));
+            // Add import dependency for the fetcher
+            if (!dependencies[fetcherImportName]) {
+                dependencies[fetcherImportName] = {
+                    type: 'local',
+                    path: "../utils/data-sources/".concat(fileName),
+                };
+            }
             // Add to props
             propsObj.properties.push(types.objectProperty(types.identifier(vars.propsPrefix), types.identifier(vars.propsPrefix)));
         }
@@ -1131,7 +1322,11 @@ function updateGetStaticProps(chunks, registry) {
         // Add maxPages calculation for paginated
         if (usage.paginated) {
             var maxPagesPropName_1 = "".concat(vars.propsPrefix, "_maxPages");
-            var countVarName = "".concat(usage.dataSourceIdentifier, "_count");
+            // Use filter-specific count variable if usage has filters
+            var hasFilters = usage.filters && usage.filters.length > 0;
+            var countVarName = hasFilters
+                ? "".concat(usage.dataSourceIdentifier, "_ds_").concat(usage.index, "_count")
+                : "".concat(usage.dataSourceIdentifier, "_count");
             // Check if maxPages calculation already exists
             var existingMaxPages = tryBlock.body.find(function (s) { var _a, _b, _c; return s.type === 'VariableDeclaration' && ((_c = (_b = (_a = s.declarations) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.id) === null || _c === void 0 ? void 0 : _c.name) === maxPagesPropName_1; });
             if (!existingMaxPages) {
@@ -1148,26 +1343,86 @@ function updateGetStaticProps(chunks, registry) {
         }
     });
     // Add count fetches for unique data sources
+    // Group usages by filters to determine which need separate count fetches
+    var processedCountKeys = new Set();
     dataSourcesNeedingCount.forEach(function (key) {
         var _a = key.split(':'), dataSourceType = _a[0], tableName = _a[1], dataSourceId = _a[2];
         var fileName = (0, utils_1.generateSafeFileName)(dataSourceType, tableName, dataSourceId);
-        // Use consistent import name generation (matches extractDataSourceIntoGetStaticProps)
         var fetcherImportName = teleport_shared_1.StringUtils.dashCaseToCamelCase(fileName);
-        // Find usage to get dataSourceIdentifier
-        var usage = registry.usages.find(function (u) {
+        // Find all paginated usages for this data source
+        var usagesForDataSource = registry.usages.filter(function (u) {
             return u.resourceDefinition.dataSourceId === dataSourceId &&
-                u.resourceDefinition.tableName === tableName;
+                u.resourceDefinition.tableName === tableName &&
+                u.paginated;
         });
-        if (!usage) {
+        if (usagesForDataSource.length === 0) {
             return;
         }
-        var countVarName = "".concat(usage.dataSourceIdentifier, "_count");
-        // Check if count fetch already exists
-        var existingCount = arrayPattern.elements.findIndex(function (el) { return (el === null || el === void 0 ? void 0 : el.type) === 'Identifier' && el.name === countVarName; });
-        if (existingCount === -1) {
-            arrayPattern.elements.push(types.identifier(countVarName));
-            fetchesArray.elements.push(types.callExpression(types.memberExpression(types.identifier(fetcherImportName), types.identifier('fetchCount')), []));
+        // Group usages by their filters (stringify for comparison)
+        var usagesByFilters = new Map();
+        for (var _i = 0, usagesForDataSource_1 = usagesForDataSource; _i < usagesForDataSource_1.length; _i++) {
+            var usage = usagesForDataSource_1[_i];
+            var filtersKey = JSON.stringify(usage.filters || []);
+            var existing = usagesByFilters.get(filtersKey) || [];
+            existing.push(usage);
+            usagesByFilters.set(filtersKey, existing);
         }
+        // Generate count fetches for each unique filter configuration
+        usagesByFilters.forEach(function (usages, filtersKey) {
+            var firstUsage = usages[0];
+            var hasFilters = firstUsage.filters && firstUsage.filters.length > 0;
+            // Create unique count variable name based on filters
+            var countVarName = hasFilters
+                ? "".concat(firstUsage.dataSourceIdentifier, "_ds_").concat(firstUsage.index, "_count")
+                : "".concat(firstUsage.dataSourceIdentifier, "_count");
+            // Check if this count was already processed
+            var countKey = "".concat(key, ":").concat(filtersKey);
+            if (processedCountKeys.has(countKey)) {
+                return;
+            }
+            processedCountKeys.add(countKey);
+            // Check if count fetch already exists
+            var existingCount = arrayPattern.elements.findIndex(function (el) { return (el === null || el === void 0 ? void 0 : el.type) === 'Identifier' && el.name === countVarName; });
+            if (existingCount === -1) {
+                arrayPattern.elements.push(types.identifier(countVarName));
+                // Build count params if filters exist
+                var countParams = [];
+                if (hasFilters) {
+                    countParams.push(types.objectProperty(types.identifier('filters'), types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [
+                        types.arrayExpression(firstUsage.filters.map(function (f) {
+                            return types.objectExpression([
+                                types.objectProperty(types.identifier('source'), types.stringLiteral(f.source)),
+                                types.objectProperty(types.identifier('destination'), types.stringLiteral(f.destination)),
+                                types.objectProperty(types.identifier('operand'), types.stringLiteral(f.operand)),
+                            ]);
+                        })),
+                    ])));
+                }
+                fetchesArray.elements.push(types.callExpression(types.memberExpression(types.callExpression(types.memberExpression(types.identifier(fetcherImportName), types.identifier('fetchCount')), countParams.length > 0 ? [types.objectExpression(countParams)] : []), types.identifier('catch')), [
+                    types.arrowFunctionExpression([types.identifier('error')], types.blockStatement([
+                        types.expressionStatement(types.callExpression(types.memberExpression(types.identifier('console'), types.identifier('error')), [
+                            types.stringLiteral("Error fetching ".concat(countVarName, ":")),
+                            types.identifier('error'),
+                        ])),
+                        types.returnStatement(types.numericLiteral(0)),
+                    ])),
+                ]));
+                // Store which usages use this count variable for maxPages calculation
+                for (var _i = 0, usages_1 = usages; _i < usages_1.length; _i++) {
+                    var usage = usages_1[_i];
+                    // tslint:disable-next-line:no-any
+                    ;
+                    usage.countVarName = countVarName;
+                }
+                // Add import dependency for the fetcher
+                if (!dependencies[fetcherImportName]) {
+                    dependencies[fetcherImportName] = {
+                        type: 'local',
+                        path: "../utils/data-sources/".concat(fileName),
+                    };
+                }
+            }
+        });
     });
 }
 //# sourceMappingURL=pagination-plugin.js.map