@teleporthq/teleport-plugin-next-data-source 0.42.4 → 0.42.6

package/dist/cjs/pagination-plugin.js

@@ -58,26 +58,167 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNextArrayMapperPaginationPlugin = void 0;
 var teleport_types_1 = require("@teleporthq/teleport-types");
 var types = __importStar(require("@babel/types"));
-var array_mapper_pagination_1 = require("./array-mapper-pagination");
+var teleport_shared_1 = require("@teleporthq/teleport-shared");
 var utils_1 = require("./utils");
+// Scan UIDL to find all data source usages and build a registry
+function buildStateRegistry(uidlNode) {
+    var usages = [];
+    var byDataSourceId = new Map();
+    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;
+        if (!node || typeof node !== 'object') {
+            return;
+        }
+        // Found a data-source-list (DataProvider)
+        if (node.type === 'data-source-list' && ((_a = node.content) === null || _a === void 0 ? void 0 : _a.renderPropIdentifier)) {
+            var dsIdentifier = node.content.renderPropIdentifier;
+            var resourceDef = node.content.resourceDefinition || {};
+            var resourceParams = ((_b = node.content.resource) === null || _b === void 0 ? void 0 : _b.params) || {};
+            // Look for cms-list-repeater inside this data-source-list
+            var newParent = {
+                identifier: dsIdentifier,
+                resourceDef: resourceDef,
+                resourceParams: resourceParams,
+            };
+            // Traverse into success/error/loading nodes
+            if ((_c = node.content.nodes) === null || _c === void 0 ? void 0 : _c.success) {
+                traverse(node.content.nodes.success, newParent);
+            }
+            if ((_d = node.content.nodes) === null || _d === void 0 ? void 0 : _d.error) {
+                traverse(node.content.nodes.error, newParent);
+            }
+            if ((_e = node.content.nodes) === null || _e === void 0 ? void 0 : _e.loading) {
+                traverse(node.content.nodes.loading, newParent);
+            }
+            return;
+        }
+        // Found a cms-list-repeater (Repeater with pagination/search config)
+        var isCmsListRepeater = node.type === 'cms-list-repeater' ||
+            (node.type === 'element' && ((_f = node.content) === null || _f === void 0 ? void 0 : _f.elementType) === 'cms-list-repeater');
+        if (isCmsListRepeater && parentDataSource) {
+            var content = node.content || node;
+            var arrayMapperRenderProp = content.renderPropIdentifier;
+            if (arrayMapperRenderProp) {
+                // Extract query columns from parent's resource params
+                var queryColumns = [];
+                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 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) {
+                    limit = parentDataSource.resourceParams.limit.content;
+                }
+                // For paginated mappers, use perPage from cms-list-repeater
+                // For plain mappers, use limit from data-source-list resource params
+                var effectivePerPage = content.paginated ? content.perPage : limit || content.perPage;
+                var usage = {
+                    index: index++,
+                    dataSourceIdentifier: parentDataSource.identifier,
+                    arrayMapperRenderProp: arrayMapperRenderProp,
+                    resourceDefinition: {
+                        dataSourceId: parentDataSource.resourceDef.dataSourceId || '',
+                        tableName: parentDataSource.resourceDef.tableName || '',
+                        dataSourceType: parentDataSource.resourceDef.dataSourceType || '',
+                    },
+                    paginated: !!content.paginated,
+                    perPage: effectivePerPage,
+                    searchEnabled: !!content.searchEnabled,
+                    searchDebounce: content.searchDebounce || 300,
+                    queryColumns: queryColumns,
+                    category: 'plain',
+                };
+                // Determine category
+                if (usage.paginated && usage.searchEnabled) {
+                    usage.category = 'paginated+search';
+                }
+                else if (usage.paginated) {
+                    usage.category = 'paginated-only';
+                }
+                else if (usage.searchEnabled) {
+                    usage.category = 'search-only';
+                }
+                usages.push(usage);
+                // Add to maps
+                if (!byDataSourceId.has(usage.dataSourceIdentifier)) {
+                    byDataSourceId.set(usage.dataSourceIdentifier, []);
+                }
+                byDataSourceId.get(usage.dataSourceIdentifier).push(usage);
+                byArrayMapperRenderProp.set(arrayMapperRenderProp, usage);
+            }
+            // Continue traversing inside the repeater
+            if ((_l = content.nodes) === null || _l === void 0 ? void 0 : _l.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];
+                traverse(child, parentDataSource);
+            }
+        }
+        if ((_o = node.content) === null || _o === void 0 ? void 0 : _o.node) {
+            traverse(node.content.node, parentDataSource);
+        }
+        if ((_p = node.content) === null || _p === void 0 ? void 0 : _p.nodes) {
+            if (node.content.nodes.success) {
+                traverse(node.content.nodes.success, parentDataSource);
+            }
+            if (node.content.nodes.error) {
+                traverse(node.content.nodes.error, parentDataSource);
+            }
+            if (node.content.nodes.loading) {
+                traverse(node.content.nodes.loading, parentDataSource);
+            }
+            if (node.content.nodes.list) {
+                traverse(node.content.nodes.list, parentDataSource);
+            }
+            if (node.content.nodes.empty) {
+                traverse(node.content.nodes.empty, parentDataSource);
+            }
+        }
+        if (Array.isArray(node.children)) {
+            for (var _r = 0, _s = node.children; _r < _s.length; _r++) {
+                var child = _s[_r];
+                traverse(child, parentDataSource);
+            }
+        }
+    };
+    traverse(uidlNode);
+    return { usages: usages, byDataSourceId: byDataSourceId, byArrayMapperRenderProp: byArrayMapperRenderProp };
+}
+// Generate state variable names for a usage
+function getStateVarsForUsage(usage) {
+    var idx = usage.index;
+    return {
+        pageStateVar: "ds_".concat(idx, "_page"),
+        setPageStateVar: "setDs_".concat(idx, "_page"),
+        maxPagesStateVar: "ds_".concat(idx, "_maxPages"),
+        setMaxPagesStateVar: "setDs_".concat(idx, "_maxPages"),
+        searchQueryVar: "ds_".concat(idx, "_searchQuery"),
+        setSearchQueryVar: "setDs_".concat(idx, "_searchQuery"),
+        debouncedSearchQueryVar: "ds_".concat(idx, "_debouncedQuery"),
+        setDebouncedSearchQueryVar: "setDs_".concat(idx, "_debouncedQuery"),
+        combinedStateVar: "ds_".concat(idx, "_state"),
+        setCombinedStateVar: "setDs_".concat(idx, "_state"),
+        skipDebounceRefVar: "ds_".concat(idx, "_skipDebounce"),
+        skipCountFetchRefVar: "ds_".concat(idx, "_skipCountFetch"),
+        propsPrefix: "".concat(usage.dataSourceIdentifier, "_ds_").concat(idx),
+    };
+}
+// ==================== MAIN PLUGIN ====================
 var createNextArrayMapperPaginationPlugin = function () {
     var paginationPlugin = function (structure) { return __awaiter(void 0, void 0, void 0, function () {
-        var uidl, chunks, dependencies, options, componentChunk, variableDeclaration, declarator, arrowFunction, blockStatement, _a, paginatedMappers, searchOnlyMappers, paginationOnlyMappers, detectedPaginations, detectedSearchOnly, paginationInfos, getStaticPropsChunk, isPage, isComponent, opts, perPageMap, searchConfigMap, queryColumnsMap, stateDeclarations, hasSearchEnabled, firstReturnIndex, insertIndex, dataSourceToInfos_1, componentUseEffects_1, componentReturnIndex, componentEffectsInsertIndex_1, searchOnlyDataSources;
-        var _b, _c, _d;
-        return __generator(this, function (_e) {
+        var uidl, chunks, dependencies, options, componentChunk, variableDeclaration, declarator, arrowFunction, blockStatement, registry, getStaticPropsChunk, isPage, stateDeclarations, effectStatements, returnIndex, insertIndex, dataProviders, dataProvidersWithRepeaters, usageIndexByDataSourceId, dataProvidersWithoutRepeaters, searchInputs, searchEnabledUsages, paginationNodes, paginatedUsages;
+        return __generator(this, function (_a) {
             uidl = structure.uidl, chunks = structure.chunks, dependencies = structure.dependencies, options = structure.options;
             componentChunk = chunks.find(function (chunk) { return chunk.name === 'jsx-component'; });
             if (!componentChunk || componentChunk.type !== teleport_types_1.ChunkType.AST) {
@@ -99,22 +240,19 @@ var createNextArrayMapperPaginationPlugin = function () {
                 return [2 /*return*/, structure];
             }
             blockStatement = arrowFunction.body;
-            _a = detectPaginationsAndSearchFromJSX(blockStatement, uidl.node), paginatedMappers = _a.paginatedMappers, searchOnlyMappers = _a.searchOnlyMappers, paginationOnlyMappers = _a.paginationOnlyMappers;
-            if (paginatedMappers.length === 0 &&
-                searchOnlyMappers.length === 0 &&
-                paginationOnlyMappers.length === 0) {
+            registry = buildStateRegistry(uidl.node);
+            if (registry.usages.length === 0) {
                 return [2 /*return*/, structure];
             }
-            detectedPaginations = __spreadArray(__spreadArray([], paginatedMappers, true), paginationOnlyMappers, true);
-            detectedSearchOnly = searchOnlyMappers;
+            getStaticPropsChunk = chunks.find(function (chunk) { return chunk.name === 'getStaticProps'; });
+            isPage = !!getStaticPropsChunk;
+            // Add React dependencies
             if (!dependencies.useState) {
                 dependencies.useState = {
                     type: 'library',
                     path: 'react',
                     version: '',
-                    meta: {
-                        namedImport: true,
-                    },
+                    meta: { namedImport: true },
                 };
             }
             if (!dependencies.useMemo) {
@@ -122,9 +260,7 @@ var createNextArrayMapperPaginationPlugin = function () {
                     type: 'library',
                     path: 'react',
                     version: '',
-                    meta: {
-                        namedImport: true,
-                    },
+                    meta: { namedImport: true },
                 };
             }
             if (!dependencies.useCallback) {
@@ -132,9 +268,7 @@ var createNextArrayMapperPaginationPlugin = function () {
                     type: 'library',
                     path: 'react',
                     version: '',
-                    meta: {
-                        namedImport: true,
-                    },
+                    meta: { namedImport: true },
                 };
             }
             if (!dependencies.useRef) {
@@ -142,326 +276,306 @@ var createNextArrayMapperPaginationPlugin = function () {
                     type: 'library',
                     path: 'react',
                     version: '',
-                    meta: {
-                        namedImport: true,
-                    },
+                    meta: { namedImport: true },
+                };
+            }
+            if (!dependencies.useEffect) {
+                dependencies.useEffect = {
+                    type: 'library',
+                    path: 'react',
+                    version: '',
+                    meta: { namedImport: true },
                 };
             }
             if (!componentChunk.meta) {
                 componentChunk.meta = {};
             }
             componentChunk.meta.isClientComponent = true;
-            paginationInfos = [];
-            getStaticPropsChunk = chunks.find(function (chunk) { return chunk.name === 'getStaticProps'; });
-            isPage = !!getStaticPropsChunk;
-            isComponent = !isPage;
-            opts = options;
-            perPageMap = ((_b = opts.paginationConfig) === null || _b === void 0 ? void 0 : _b.perPageMap) || new Map();
-            searchConfigMap = ((_c = opts.paginationConfig) === null || _c === void 0 ? void 0 : _c.searchConfigMap) || new Map();
-            queryColumnsMap = ((_d = opts.paginationConfig) === null || _d === void 0 ? void 0 : _d.queryColumnsMap) || new Map();
             stateDeclarations = [];
-            detectedPaginations.forEach(function (detected, index) {
-                var paginationNodeId = "pg_".concat(index);
-                // Use arrayMapperRenderProp if available, otherwise fall back to dataSourceIdentifier
-                var lookupKey = detected.arrayMapperRenderProp || detected.dataSourceIdentifier;
-                var perPage = perPageMap.get(lookupKey) || 10;
-                var searchConfig = searchConfigMap.get(lookupKey);
-                // queryColumns is keyed by dataSourceIdentifier, not array mapper render prop
-                var queryColumns = queryColumnsMap.get(detected.dataSourceIdentifier);
-                var info = (0, array_mapper_pagination_1.generatePaginationLogic)(paginationNodeId, detected.dataSourceIdentifier, perPage, searchConfig, queryColumns);
-                paginationInfos.push(info);
-                // Add refs to track first render for each useEffect (add first)
-                if (info.searchEnabled) {
-                    var skipCountFetchOnMountRefVar = "skipCountFetchOnMount_pg_".concat(index);
-                    var skipCountFetchRefAST = types.variableDeclaration('const', [
-                        types.variableDeclarator(types.identifier(skipCountFetchOnMountRefVar), types.callExpression(types.identifier('useRef'), [types.booleanLiteral(true)])),
-                    ]);
-                    stateDeclarations.push(skipCountFetchRefAST);
-                    info.skipCountFetchOnMountRefVar = skipCountFetchOnMountRefVar;
-                    var skipDebounceOnMountRefVar = "skipDebounceOnMount_pg_".concat(index);
-                    var skipDebounceRefAST = types.variableDeclaration('const', [
-                        types.variableDeclarator(types.identifier(skipDebounceOnMountRefVar), types.callExpression(types.identifier('useRef'), [types.booleanLiteral(true)])),
-                    ]);
-                    stateDeclarations.push(skipDebounceRefAST);
-                    info.skipDebounceOnMountRefVar = skipDebounceOnMountRefVar;
+            effectStatements = [];
+            registry.usages.forEach(function (usage) {
+                if (usage.category === 'plain') {
+                    return; // Plain mappers don't need state
                 }
-                // Add maxPages state
-                var maxPagesStateVar = "".concat(info.pageStateVar.replace('_page', ''), "_maxPages");
-                var setMaxPagesStateVar = "set".concat(maxPagesStateVar.charAt(0).toUpperCase() + maxPagesStateVar.slice(1));
-                // For pages: initialize from props (with pagination-specific prop name), for components: initialize to 0
-                var maxPagesInitValue = isPage
-                    ? types.logicalExpression('||', types.optionalMemberExpression(types.identifier('props'), types.identifier("".concat(info.dataSourceIdentifier, "_pg_").concat(index, "_maxPages")), false, true), types.numericLiteral(0))
-                    : types.numericLiteral(0);
-                var maxPagesStateAST = types.variableDeclaration('const', [
-                    types.variableDeclarator(types.arrayPattern([
-                        types.identifier(maxPagesStateVar),
-                        types.identifier(setMaxPagesStateVar),
-                    ]), types.callExpression(types.identifier('useState'), [maxPagesInitValue])),
-                ]);
-                stateDeclarations.push(maxPagesStateAST);
-                info.maxPagesStateVar = maxPagesStateVar;
-                info.setMaxPagesStateVar = setMaxPagesStateVar;
-                // If both pagination and search are enabled, combine them into a single state object
-                if (info.searchEnabled && info.searchQueryVar && info.setSearchQueryVar) {
-                    // Combined state: { page: 1, debouncedQuery: '' }
-                    var combinedStateVar = "paginationState_pg_".concat(index);
-                    var setCombinedStateVar = "setPaginationState_pg_".concat(index);
-                    var combinedStateAST = types.variableDeclaration('const', [
+                var vars = getStateVarsForUsage(usage);
+                if (usage.category === 'paginated+search') {
+                    // Combined state object for pagination + search
+                    stateDeclarations.push(types.variableDeclaration('const', [
+                        types.variableDeclarator(types.identifier(vars.skipDebounceRefVar), types.callExpression(types.identifier('useRef'), [types.booleanLiteral(true)])),
+                    ]));
+                    // Only add skipCountFetchRef for pages (where we have server-side count)
+                    // For components, we need to fetch count on mount
+                    if (isPage) {
+                        stateDeclarations.push(types.variableDeclaration('const', [
+                            types.variableDeclarator(types.identifier(vars.skipCountFetchRefVar), types.callExpression(types.identifier('useRef'), [types.booleanLiteral(true)])),
+                        ]));
+                    }
+                    // maxPages state
+                    var maxPagesInit = isPage
+                        ? types.logicalExpression('||', types.optionalMemberExpression(types.identifier('props'), types.identifier("".concat(vars.propsPrefix, "_maxPages")), false, true), types.numericLiteral(0))
+                        : types.numericLiteral(0);
+                    stateDeclarations.push(types.variableDeclaration('const', [
                         types.variableDeclarator(types.arrayPattern([
-                            types.identifier(combinedStateVar),
-                            types.identifier(setCombinedStateVar),
+                            types.identifier(vars.maxPagesStateVar),
+                            types.identifier(vars.setMaxPagesStateVar),
+                        ]), types.callExpression(types.identifier('useState'), [maxPagesInit])),
+                    ]));
+                    // Combined state { page, debouncedQuery }
+                    stateDeclarations.push(types.variableDeclaration('const', [
+                        types.variableDeclarator(types.arrayPattern([
+                            types.identifier(vars.combinedStateVar),
+                            types.identifier(vars.setCombinedStateVar),
                         ]), types.callExpression(types.identifier('useState'), [
                             types.objectExpression([
                                 types.objectProperty(types.identifier('page'), types.numericLiteral(1)),
                                 types.objectProperty(types.identifier('debouncedQuery'), types.stringLiteral('')),
                             ]),
                         ])),
-                    ]);
-                    stateDeclarations.push(combinedStateAST);
-                    // Still need the immediate search query state for the input
-                    var searchStateAST = types.variableDeclaration('const', [
+                    ]));
+                    // Immediate search query state
+                    stateDeclarations.push(types.variableDeclaration('const', [
                         types.variableDeclarator(types.arrayPattern([
-                            types.identifier(info.searchQueryVar),
-                            types.identifier(info.setSearchQueryVar),
+                            types.identifier(vars.searchQueryVar),
+                            types.identifier(vars.setSearchQueryVar),
                         ]), types.callExpression(types.identifier('useState'), [types.stringLiteral('')])),
-                    ]);
-                    stateDeclarations.push(searchStateAST);
-                    info.combinedStateVar = combinedStateVar;
-                    info.setCombinedStateVar = setCombinedStateVar;
-                }
-                else {
-                    // If search is not enabled, just add regular page state
-                    var pageStateAST = types.variableDeclaration('const', [
-                        types.variableDeclarator(types.arrayPattern([
-                            types.identifier(info.pageStateVar),
-                            types.identifier(info.setPageStateVar),
-                        ]), types.callExpression(types.identifier('useState'), [types.numericLiteral(1)])),
-                    ]);
-                    stateDeclarations.push(pageStateAST);
-                }
-            });
-            // Add all state declarations at once to the beginning in correct order
-            stateDeclarations.reverse().forEach(function (stateDecl) {
-                blockStatement.body.unshift(stateDecl);
-            });
-            hasSearchEnabled = paginationInfos.some(function (info) { return info.searchEnabled; });
-            if (hasSearchEnabled && !dependencies.useEffect) {
-                dependencies.useEffect = {
-                    type: 'library',
-                    path: 'react',
-                    version: '',
-                    meta: {
-                        namedImport: true,
-                    },
-                };
-            }
-            firstReturnIndex = blockStatement.body.findIndex(function (stmt) { return stmt.type === 'ReturnStatement'; });
-            insertIndex = firstReturnIndex !== -1 ? firstReturnIndex : blockStatement.body.length;
-            // Add effects in reverse order so they appear in correct order
-            paginationInfos.forEach(function (info) {
-                if (info.searchEnabled &&
-                    info.searchQueryVar &&
-                    info.debouncedSearchQueryVar &&
-                    info.setDebouncedSearchQueryVar) {
-                    // Add effect that updates debounced search after delay
-                    var skipDebounceOnMountRefVar = info.skipDebounceOnMountRefVar;
-                    var setCombinedStateVar = info.setCombinedStateVar;
-                    var debounceEffect = types.expressionStatement(types.callExpression(types.identifier('useEffect'), [
+                    ]));
+                    // Debounce effect
+                    effectStatements.push(types.expressionStatement(types.callExpression(types.identifier('useEffect'), [
                         types.arrowFunctionExpression([], types.blockStatement([
-                            types.ifStatement(types.memberExpression(types.identifier(skipDebounceOnMountRefVar), types.identifier('current')), types.blockStatement([
-                                types.expressionStatement(types.assignmentExpression('=', types.memberExpression(types.identifier(skipDebounceOnMountRefVar), types.identifier('current')), types.booleanLiteral(false))),
+                            types.ifStatement(types.memberExpression(types.identifier(vars.skipDebounceRefVar), types.identifier('current')), types.blockStatement([
+                                types.expressionStatement(types.assignmentExpression('=', types.memberExpression(types.identifier(vars.skipDebounceRefVar), types.identifier('current')), types.booleanLiteral(false))),
                                 types.returnStatement(),
                             ])),
                             types.variableDeclaration('const', [
                                 types.variableDeclarator(types.identifier('timer'), types.callExpression(types.identifier('setTimeout'), [
                                     types.arrowFunctionExpression([], types.blockStatement([
-                                        types.expressionStatement(types.callExpression(types.identifier(setCombinedStateVar), [
+                                        types.expressionStatement(types.callExpression(types.identifier(vars.setCombinedStateVar), [
                                             types.objectExpression([
                                                 types.objectProperty(types.identifier('page'), types.numericLiteral(1)),
-                                                types.objectProperty(types.identifier('debouncedQuery'), types.identifier(info.searchQueryVar)),
+                                                types.objectProperty(types.identifier('debouncedQuery'), types.identifier(vars.searchQueryVar)),
                                             ]),
                                         ])),
                                     ])),
-                                    types.numericLiteral(info.searchDebounce || 300),
+                                    types.numericLiteral(usage.searchDebounce),
                                 ])),
                             ]),
                             types.returnStatement(types.arrowFunctionExpression([], types.callExpression(types.identifier('clearTimeout'), [
                                 types.identifier('timer'),
                             ]))),
                         ])),
-                        types.arrayExpression([types.identifier(info.searchQueryVar)]),
-                    ]));
-                    blockStatement.body.splice(insertIndex, 0, debounceEffect);
-                    // Add useEffect to refetch count when search changes (for both pages and components)
-                    var detected = detectedPaginations.find(function (d) { return d.dataSourceIdentifier === info.dataSourceIdentifier; });
-                    if (!detected) {
-                        return;
+                        types.arrayExpression([types.identifier(vars.searchQueryVar)]),
+                    ])));
+                    // Count refetch effect
+                    var fileName = (0, utils_1.generateSafeFileName)(usage.resourceDefinition.dataSourceType, usage.resourceDefinition.tableName, usage.resourceDefinition.dataSourceId);
+                    var urlParams = [
+                        types.objectProperty(types.identifier('query'), types.memberExpression(types.identifier(vars.combinedStateVar), types.identifier('debouncedQuery'))),
+                    ];
+                    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); }))])));
                     }
-                    var resourceDefAttr = detected.dataProviderJSX.openingElement.attributes.find(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'resourceDefinition'; });
-                    if (resourceDefAttr &&
-                        resourceDefAttr.value &&
-                        resourceDefAttr.value.type === 'JSXExpressionContainer') {
-                        var resourceDef = resourceDefAttr.value.expression;
-                        if (resourceDef.type === 'ObjectExpression') {
-                            var dataSourceIdProp = resourceDef.properties.find(function (p) { return p.type === 'ObjectProperty' && p.key.value === 'dataSourceId'; });
-                            var tableNameProp = resourceDef.properties.find(function (p) { return p.type === 'ObjectProperty' && p.key.value === 'tableName'; });
-                            var dataSourceTypeProp = resourceDef.properties.find(function (p) { return p.type === 'ObjectProperty' && p.key.value === 'dataSourceType'; });
-                            if (dataSourceIdProp && tableNameProp && dataSourceTypeProp) {
-                                var dataSourceId = dataSourceIdProp.value.value;
-                                var tableName = tableNameProp.value.value;
-                                var dataSourceType = dataSourceTypeProp.value.value;
-                                var fileName = "".concat(dataSourceType, "-").concat(tableName, "-").concat(dataSourceId.substring(0, 8));
-                                var setMaxPagesStateVar = info.setMaxPagesStateVar;
-                                // Create useEffect to refetch count when debounced search changes
-                                var skipCountFetchOnMountRefVar = info.skipCountFetchOnMountRefVar;
-                                var combinedStateVar = info.combinedStateVar;
-                                // Build URLSearchParams properties - query is always included, queryColumns is optional
-                                var urlSearchParamsProperties = [
-                                    types.objectProperty(types.identifier('query'), types.memberExpression(types.identifier(combinedStateVar), types.identifier('debouncedQuery'))),
-                                ];
-                                // Add queryColumns only if they exist
-                                if (info.queryColumns && info.queryColumns.length > 0) {
-                                    urlSearchParamsProperties.push(types.objectProperty(types.identifier('queryColumns'), types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [
-                                        types.arrayExpression(info.queryColumns.map(function (col) { return types.stringLiteral(col); })),
-                                    ])));
-                                }
-                                var refetchCountEffect = types.expressionStatement(types.callExpression(types.identifier('useEffect'), [
-                                    types.arrowFunctionExpression([], types.blockStatement([
-                                        types.ifStatement(types.memberExpression(types.identifier(skipCountFetchOnMountRefVar), types.identifier('current')), types.blockStatement([
-                                            types.expressionStatement(types.assignmentExpression('=', types.memberExpression(types.identifier(skipCountFetchOnMountRefVar), types.identifier('current')), types.booleanLiteral(false))),
-                                            types.returnStatement(),
-                                        ])),
-                                        types.expressionStatement(types.callExpression(types.memberExpression(types.callExpression(types.memberExpression(types.callExpression(types.identifier('fetch'), [
-                                            types.templateLiteral([
-                                                types.templateElement({
-                                                    raw: "/api/".concat(fileName, "-count?"),
-                                                    cooked: "/api/".concat(fileName, "-count?"),
-                                                }),
-                                                types.templateElement({ raw: '', cooked: '' }),
-                                            ], [
-                                                types.newExpression(types.identifier('URLSearchParams'), [
-                                                    types.objectExpression(urlSearchParamsProperties),
-                                                ]),
-                                            ]),
-                                        ]), types.identifier('then')), [
-                                            types.arrowFunctionExpression([types.identifier('res')], types.callExpression(types.memberExpression(types.identifier('res'), types.identifier('json')), [])),
-                                        ]), types.identifier('then')), [
-                                            types.arrowFunctionExpression([types.identifier('data')], types.blockStatement([
-                                                types.ifStatement(types.logicalExpression('&&', types.identifier('data'), types.binaryExpression('in', types.stringLiteral('count'), types.identifier('data'))), types.blockStatement([
-                                                    types.expressionStatement(types.callExpression(types.identifier(setMaxPagesStateVar), [
-                                                        types.conditionalExpression(types.binaryExpression('===', types.memberExpression(types.identifier('data'), types.identifier('count')), types.numericLiteral(0)), types.numericLiteral(0), types.callExpression(types.memberExpression(types.identifier('Math'), types.identifier('ceil')), [
-                                                            types.binaryExpression('/', types.memberExpression(types.identifier('data'), types.identifier('count')), types.numericLiteral(info.perPage)),
-                                                        ])),
-                                                    ])),
+                    // Build the count fetch effect body
+                    var countFetchEffectBody = [];
+                    // Only add skip-on-mount check for pages (where we have server-side count)
+                    if (isPage) {
+                        countFetchEffectBody.push(types.ifStatement(types.memberExpression(types.identifier(vars.skipCountFetchRefVar), types.identifier('current')), types.blockStatement([
+                            types.expressionStatement(types.assignmentExpression('=', types.memberExpression(types.identifier(vars.skipCountFetchRefVar), types.identifier('current')), types.booleanLiteral(false))),
+                            types.returnStatement(),
+                        ])));
+                    }
+                    // Add the fetch call
+                    countFetchEffectBody.push(types.expressionStatement(types.callExpression(types.memberExpression(types.callExpression(types.memberExpression(types.callExpression(types.identifier('fetch'), [
+                        types.templateLiteral([
+                            types.templateElement({
+                                raw: "/api/".concat(fileName, "-count?"),
+                                cooked: "/api/".concat(fileName, "-count?"),
+                            }),
+                            types.templateElement({ raw: '', cooked: '' }),
+                        ], [
+                            types.newExpression(types.identifier('URLSearchParams'), [
+                                types.objectExpression(urlParams),
+                            ]),
+                        ]),
+                    ]), types.identifier('then')), [
+                        types.arrowFunctionExpression([types.identifier('res')], types.callExpression(types.memberExpression(types.identifier('res'), types.identifier('json')), [])),
+                    ]), types.identifier('then')), [
+                        types.arrowFunctionExpression([types.identifier('data')], types.blockStatement([
+                            types.ifStatement(types.logicalExpression('&&', types.identifier('data'), types.binaryExpression('in', types.stringLiteral('count'), types.identifier('data'))), types.blockStatement([
+                                types.expressionStatement(types.callExpression(types.identifier(vars.setMaxPagesStateVar), [
+                                    types.conditionalExpression(types.binaryExpression('===', types.memberExpression(types.identifier('data'), types.identifier('count')), types.numericLiteral(0)), types.numericLiteral(0), types.callExpression(types.memberExpression(types.identifier('Math'), types.identifier('ceil')), [
+                                        types.binaryExpression('/', types.memberExpression(types.identifier('data'), types.identifier('count')), types.numericLiteral(usage.perPage)),
+                                    ])),
+                                ])),
+                            ])),
+                        ])),
+                    ])));
+                    effectStatements.push(types.expressionStatement(types.callExpression(types.identifier('useEffect'), [
+                        types.arrowFunctionExpression([], types.blockStatement(countFetchEffectBody)),
+                        types.arrayExpression([
+                            types.memberExpression(types.identifier(vars.combinedStateVar), types.identifier('debouncedQuery')),
+                        ]),
+                    ])));
+                }
+                else if (usage.category === 'paginated-only') {
+                    // Simple page state
+                    var maxPagesInit = isPage
+                        ? types.logicalExpression('||', types.optionalMemberExpression(types.identifier('props'), types.identifier("".concat(vars.propsPrefix, "_maxPages")), false, true), types.numericLiteral(0))
+                        : types.numericLiteral(0);
+                    stateDeclarations.push(types.variableDeclaration('const', [
+                        types.variableDeclarator(types.arrayPattern([
+                            types.identifier(vars.maxPagesStateVar),
+                            types.identifier(vars.setMaxPagesStateVar),
+                        ]), types.callExpression(types.identifier('useState'), [maxPagesInit])),
+                    ]));
+                    stateDeclarations.push(types.variableDeclaration('const', [
+                        types.variableDeclarator(types.arrayPattern([
+                            types.identifier(vars.pageStateVar),
+                            types.identifier(vars.setPageStateVar),
+                        ]), types.callExpression(types.identifier('useState'), [types.numericLiteral(1)])),
+                    ]));
+                    // For components (not pages), add a useEffect to fetch count on mount
+                    // Pages get count from getStaticProps, but components need to fetch it client-side
+                    if (!isPage) {
+                        var fileName = (0, utils_1.generateSafeFileName)(usage.resourceDefinition.dataSourceType, usage.resourceDefinition.tableName, usage.resourceDefinition.dataSourceId);
+                        effectStatements.push(types.expressionStatement(types.callExpression(types.identifier('useEffect'), [
+                            types.arrowFunctionExpression([], types.blockStatement([
+                                types.expressionStatement(types.callExpression(types.memberExpression(types.callExpression(types.memberExpression(types.callExpression(types.identifier('fetch'), [
+                                    types.stringLiteral("/api/".concat(fileName, "-count")),
+                                ]), types.identifier('then')), [
+                                    types.arrowFunctionExpression([types.identifier('res')], types.callExpression(types.memberExpression(types.identifier('res'), types.identifier('json')), [])),
+                                ]), types.identifier('then')), [
+                                    types.arrowFunctionExpression([types.identifier('data')], types.blockStatement([
+                                        types.ifStatement(types.logicalExpression('&&', types.identifier('data'), types.binaryExpression('in', types.stringLiteral('count'), types.identifier('data'))), types.blockStatement([
+                                            types.expressionStatement(types.callExpression(types.identifier(vars.setMaxPagesStateVar), [
+                                                types.conditionalExpression(types.binaryExpression('===', types.memberExpression(types.identifier('data'), types.identifier('count')), types.numericLiteral(0)), types.numericLiteral(0), types.callExpression(types.memberExpression(types.identifier('Math'), types.identifier('ceil')), [
+                                                    types.binaryExpression('/', types.memberExpression(types.identifier('data'), types.identifier('count')), types.numericLiteral(usage.perPage)),
                                                 ])),
                                             ])),
                                         ])),
                                     ])),
-                                    types.arrayExpression([
-                                        types.memberExpression(types.identifier(combinedStateVar), types.identifier('debouncedQuery')),
-                                    ]),
-                                ]));
-                                blockStatement.body.splice(insertIndex, 0, refetchCountEffect);
-                            }
-                        }
+                                ])),
+                            ])),
+                            types.arrayExpression([]), // Empty dependency array - fetch on mount only
+                        ])));
                     }
                 }
-            });
-            // For components, add useEffect to fetch count on mount
-            if (isComponent) {
-                if (!dependencies.useEffect) {
-                    dependencies.useEffect = {
-                        type: 'library',
-                        path: 'react',
-                        version: '',
-                        meta: {
-                            namedImport: true,
-                        },
-                    };
-                }
-                dataSourceToInfos_1 = new Map();
-                paginationInfos.forEach(function (info) {
-                    var detected = detectedPaginations.find(function (d) { return d.dataSourceIdentifier === info.dataSourceIdentifier; });
-                    if (!detected) {
-                        return;
-                    }
-                    var resourceDefAttr = detected.dataProviderJSX.openingElement.attributes.find(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'resourceDefinition'; });
-                    if (!resourceDefAttr ||
-                        !resourceDefAttr.value ||
-                        resourceDefAttr.value.type !== 'JSXExpressionContainer') {
-                        return;
-                    }
-                    var resourceDef = resourceDefAttr.value.expression;
-                    if (resourceDef.type !== 'ObjectExpression') {
-                        return;
-                    }
-                    var dataSourceIdProp = resourceDef.properties.find(function (p) { return p.type === 'ObjectProperty' && p.key.value === 'dataSourceId'; });
-                    var tableNameProp = resourceDef.properties.find(function (p) { return p.type === 'ObjectProperty' && p.key.value === 'tableName'; });
-                    var dataSourceTypeProp = resourceDef.properties.find(function (p) { return p.type === 'ObjectProperty' && p.key.value === 'dataSourceType'; });
-                    if (!dataSourceIdProp || !tableNameProp || !dataSourceTypeProp) {
-                        return;
-                    }
-                    var dataSourceId = dataSourceIdProp.value.value;
-                    var tableName = tableNameProp.value.value;
-                    var dataSourceType = dataSourceTypeProp.value.value;
-                    var fileName = "".concat(dataSourceType, "-").concat(tableName, "-").concat(dataSourceId.substring(0, 8));
-                    // Group by data source identifier
-                    if (!dataSourceToInfos_1.has(info.dataSourceIdentifier)) {
-                        dataSourceToInfos_1.set(info.dataSourceIdentifier, []);
-                    }
-                    dataSourceToInfos_1.get(info.dataSourceIdentifier).push({ info: info, detected: detected, fileName: fileName });
-                });
-                componentUseEffects_1 = [];
-                dataSourceToInfos_1.forEach(function (infos) {
-                    var fileName = infos[0].fileName;
-                    // Create array of setState calls - one for each pagination using this data source
-                    var setStateStatements = infos.map(function (_a) {
-                        var info = _a.info;
-                        var setMaxPagesStateVar = info.setMaxPagesStateVar;
-                        return types.expressionStatement(types.callExpression(types.identifier(setMaxPagesStateVar), [
-                            types.callExpression(types.memberExpression(types.identifier('Math'), types.identifier('ceil')), [
-                                types.binaryExpression('/', types.memberExpression(types.identifier('data'), types.identifier('count')), types.numericLiteral(info.perPage)),
-                            ]),
-                        ]));
-                    });
-                    // Create useEffect to fetch count on mount - sets ALL maxPages for this data source
-                    var useEffectAST = types.expressionStatement(types.callExpression(types.identifier('useEffect'), [
+                else if (usage.category === 'search-only') {
+                    // Search-only state
+                    stateDeclarations.push(types.variableDeclaration('const', [
+                        types.variableDeclarator(types.identifier(vars.skipDebounceRefVar), types.callExpression(types.identifier('useRef'), [types.booleanLiteral(true)])),
+                    ]));
+                    stateDeclarations.push(types.variableDeclaration('const', [
+                        types.variableDeclarator(types.arrayPattern([
+                            types.identifier(vars.debouncedSearchQueryVar),
+                            types.identifier(vars.setDebouncedSearchQueryVar),
+                        ]), types.callExpression(types.identifier('useState'), [types.stringLiteral('')])),
+                    ]));
+                    stateDeclarations.push(types.variableDeclaration('const', [
+                        types.variableDeclarator(types.arrayPattern([
+                            types.identifier(vars.searchQueryVar),
+                            types.identifier(vars.setSearchQueryVar),
+                        ]), types.callExpression(types.identifier('useState'), [types.stringLiteral('')])),
+                    ]));
+                    // Debounce effect
+                    effectStatements.push(types.expressionStatement(types.callExpression(types.identifier('useEffect'), [
                         types.arrowFunctionExpression([], types.blockStatement([
-                            types.expressionStatement(types.callExpression(types.memberExpression(types.callExpression(types.memberExpression(types.callExpression(types.identifier('fetch'), [
-                                types.stringLiteral("/api/".concat(fileName, "-count")),
-                            ]), types.identifier('then')), [
-                                types.arrowFunctionExpression([types.identifier('res')], types.callExpression(types.memberExpression(types.identifier('res'), types.identifier('json')), [])),
-                            ]), types.identifier('then')), [
-                                types.arrowFunctionExpression([types.identifier('data')], types.blockStatement([
-                                    types.ifStatement(types.logicalExpression('&&', types.identifier('data'), types.memberExpression(types.identifier('data'), types.identifier('count'))), types.blockStatement(setStateStatements)),
-                                ])),
+                            types.ifStatement(types.memberExpression(types.identifier(vars.skipDebounceRefVar), types.identifier('current')), types.blockStatement([
+                                types.expressionStatement(types.assignmentExpression('=', types.memberExpression(types.identifier(vars.skipDebounceRefVar), types.identifier('current')), types.booleanLiteral(false))),
+                                types.returnStatement(),
                             ])),
+                            types.variableDeclaration('const', [
+                                types.variableDeclarator(types.identifier('timer'), types.callExpression(types.identifier('setTimeout'), [
+                                    types.arrowFunctionExpression([], types.blockStatement([
+                                        types.expressionStatement(types.callExpression(types.identifier(vars.setDebouncedSearchQueryVar), [types.identifier(vars.searchQueryVar)])),
+                                    ])),
+                                    types.numericLiteral(usage.searchDebounce),
+                                ])),
+                            ]),
+                            types.returnStatement(types.arrowFunctionExpression([], types.callExpression(types.identifier('clearTimeout'), [
+                                types.identifier('timer'),
+                            ]))),
                         ])),
-                        types.arrayExpression([]),
-                    ]));
-                    componentUseEffects_1.push(useEffectAST);
-                });
-                componentReturnIndex = blockStatement.body.findIndex(function (stmt) { return stmt.type === 'ReturnStatement'; });
-                componentEffectsInsertIndex_1 = componentReturnIndex !== -1 ? componentReturnIndex : blockStatement.body.length;
-                // Insert in reverse order to maintain correct order
-                componentUseEffects_1.reverse().forEach(function (effect) {
-                    blockStatement.body.splice(componentEffectsInsertIndex_1, 0, effect);
-                });
-            }
-            createAPIRoutesForPaginatedDataSources(uidl.node, options.dataSources, componentChunk, options.extractedResources, paginationInfos, isComponent);
-            detectedPaginations.forEach(function (detected, index) {
-                addPaginationParamsToDataProvider(detected.dataProviderJSX, paginationInfos[index], index);
+                        types.arrayExpression([types.identifier(vars.searchQueryVar)]),
+                    ])));
+                }
+            });
+            // Insert state declarations at the beginning
+            stateDeclarations.reverse().forEach(function (s) { return blockStatement.body.unshift(s); });
+            returnIndex = blockStatement.body.findIndex(function (s) { return s.type === 'ReturnStatement'; });
+            insertIndex = returnIndex !== -1 ? returnIndex : blockStatement.body.length;
+            effectStatements.reverse().forEach(function (e) { return blockStatement.body.splice(insertIndex, 0, e); });
+            dataProviders = findAllDataProvidersInJSX(blockStatement);
+            dataProvidersWithRepeaters = dataProviders.filter(function (dp) {
+                var hasRepeater = findArrayMapperRenderPropInDataProvider(dp) !== undefined;
+                return hasRepeater;
+            });
+            usageIndexByDataSourceId = new Map();
+            dataProvidersWithRepeaters.forEach(function (dp) {
+                var _a, _b;
+                var nameAttr = dp.openingElement.attributes.find(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'name'; });
+                if (!((_b = (_a = nameAttr === null || nameAttr === void 0 ? void 0 : nameAttr.value) === null || _a === void 0 ? void 0 : _a.expression) === null || _b === void 0 ? void 0 : _b.value)) {
+                    return;
+                }
+                var dataSourceIdentifier = nameAttr.value.expression.value;
+                // Use pure order-based matching within each dataSourceIdentifier
+                var usages = registry.byDataSourceId.get(dataSourceIdentifier) || [];
+                var currentIndex = usageIndexByDataSourceId.get(dataSourceIdentifier) || 0;
+                if (currentIndex >= usages.length) {
+                    return;
+                }
+                var usage = usages[currentIndex];
+                usageIndexByDataSourceId.set(dataSourceIdentifier, currentIndex + 1);
+                var vars = getStateVarsForUsage(usage);
+                var fileName = (0, utils_1.generateSafeFileName)(usage.resourceDefinition.dataSourceType, usage.resourceDefinition.tableName, usage.resourceDefinition.dataSourceId);
+                // Update DataProvider based on category
+                if (usage.category === 'paginated+search') {
+                    updateDataProviderForPaginatedSearch(dp, usage, vars, fileName);
+                }
+                else if (usage.category === 'paginated-only') {
+                    updateDataProviderForPaginationOnly(dp, usage, vars, fileName);
+                }
+                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);
+                }
             });
-            modifyPaginationButtons(blockStatement, detectedPaginations, paginationInfos);
-            modifySearchInputs(blockStatement, detectedPaginations, paginationInfos);
+            dataProvidersWithoutRepeaters = dataProviders.filter(function (dp) {
+                var hasRepeater = findArrayMapperRenderPropInDataProvider(dp) !== undefined;
+                return !hasRepeater;
+            });
+            dataProvidersWithoutRepeaters.forEach(function (dp) {
+                stabilizeDataProviderWithoutRepeater(dp);
+            });
+            searchInputs = findAllSearchInputsInJSX(blockStatement);
+            searchEnabledUsages = registry.usages.filter(function (u) { return u.searchEnabled; });
+            // Match by order - search input 0 -> searchEnabledUsages[0], etc.
+            searchInputs.forEach(function (input, idx) {
+                if (idx >= searchEnabledUsages.length) {
+                    return;
+                }
+                var usage = searchEnabledUsages[idx];
+                var vars = getStateVarsForUsage(usage);
+                wireSearchInput(input.node, vars);
+            });
+            paginationNodes = findAllPaginationNodesInJSX(blockStatement);
+            paginatedUsages = registry.usages.filter(function (u) { return u.paginated; });
+            // Match by order - pagination node 0 -> paginatedUsages[0], etc.
+            paginationNodes.forEach(function (paginationNode, idx) {
+                if (idx >= paginatedUsages.length) {
+                    return;
+                }
+                var usage = paginatedUsages[idx];
+                var vars = getStateVarsForUsage(usage);
+                wirePaginationButtons(paginationNode.node, usage, vars);
+            });
+            // STEP 6: Update getStaticProps if this is a page
             if (isPage) {
-                modifyGetStaticPropsForPagination(chunks, paginationInfos);
-            }
-            searchOnlyDataSources = detectedSearchOnly;
-            if (searchOnlyDataSources.length > 0) {
-                handleSearchOnlyArrayMappers(blockStatement, searchOnlyDataSources, searchConfigMap, queryColumnsMap, dependencies);
-                // Create API routes for search-only data sources
-                createAPIRoutesForSearchOnlyDataSources(uidl.node, options.dataSources, componentChunk, options.extractedResources, searchOnlyDataSources);
+                updateGetStaticProps(chunks, registry);
             }
             return [2 /*return*/, structure];
         });
@@ -469,1148 +583,591 @@ var createNextArrayMapperPaginationPlugin = function () {
     return paginationPlugin;
 };
 exports.createNextArrayMapperPaginationPlugin = createNextArrayMapperPaginationPlugin;
-function findParentNode(root, target, currentParent) {
-    if (currentParent === void 0) { currentParent = null; }
-    if (!root || !target) {
-        return null;
-    }
-    if (root === target) {
-        return currentParent;
-    }
-    if (root.type === 'JSXElement' || root.type === 'JSXFragment') {
-        if (root.children && Array.isArray(root.children)) {
-            for (var _i = 0, _a = root.children; _i < _a.length; _i++) {
-                var child = _a[_i];
-                var found = findParentNode(child, target, root);
-                if (found !== null) {
-                    return found;
-                }
-            }
+// ==================== HELPER FUNCTIONS ====================
+function findAllDataProvidersInJSX(blockStatement) {
+    var results = [];
+    var traverse = function (node) {
+        var _a, _b;
+        if (!node) {
+            return;
         }
-    }
-    else if (root.type === 'JSXExpressionContainer') {
-        if (root.expression) {
-            var found = findParentNode(root.expression, target, root);
-            if (found !== null) {
-                return found;
-            }
+        if (node.type === 'JSXElement' && ((_b = (_a = node.openingElement) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.name) === 'DataProvider') {
+            results.push(node);
         }
-    }
-    else if (root.type === 'BlockStatement') {
-        if (root.body && Array.isArray(root.body)) {
-            for (var _b = 0, _c = root.body; _b < _c.length; _b++) {
-                var stmt = _c[_b];
-                var found = findParentNode(stmt, target, root);
-                if (found !== null) {
-                    return found;
-                }
-            }
+        if (node.children && Array.isArray(node.children)) {
+            node.children.forEach(function (c) { return traverse(c); });
         }
-    }
-    else if (root.type === 'ReturnStatement') {
-        if (root.argument) {
-            var found = findParentNode(root.argument, target, root);
-            if (found !== null) {
-                return found;
+        if (node.body) {
+            if (Array.isArray(node.body)) {
+                node.body.forEach(function (s) { return traverse(s); });
+            }
+            else {
+                traverse(node.body);
             }
         }
-    }
-    else if (root.type === 'ConditionalExpression') {
-        var foundConsequent = findParentNode(root.consequent, target, root);
-        if (foundConsequent !== null) {
-            return foundConsequent;
+        if (node.consequent) {
+            traverse(node.consequent);
         }
-        var foundAlternate = findParentNode(root.alternate, target, root);
-        if (foundAlternate !== null) {
-            return foundAlternate;
+        if (node.alternate) {
+            traverse(node.alternate);
         }
-    }
-    return null;
+        if (node.expression) {
+            traverse(node.expression);
+        }
+        if (node.argument) {
+            traverse(node.argument);
+        }
+        if (node.arguments) {
+            node.arguments.forEach(function (a) { return traverse(a); });
+        }
+    };
+    traverse(blockStatement);
+    return results;
 }
-function detectPaginationsAndSearchFromJSX(blockStatement, uidlNode) {
-    var dataProviderList = [];
-    var arrayMapperInfoMap = new Map();
-    if (uidlNode) {
-        var collectArrayMapperInfo_1 = function (node) {
-            var _a, _b, _c, _d, _e;
-            if (!node) {
-                return;
-            }
-            if (node.type === 'data-source-list' && ((_a = node.content) === null || _a === void 0 ? void 0 : _a.renderPropIdentifier)) {
-                var dataSourceIdentifier_1 = node.content.renderPropIdentifier;
-                if ((_d = (_c = (_b = node.content.nodes) === null || _b === void 0 ? void 0 : _b.success) === null || _c === void 0 ? void 0 : _c.content) === null || _d === void 0 ? void 0 : _d.children) {
-                    node.content.nodes.success.content.children.forEach(function (child) {
-                        var _a;
-                        if (child.type === 'cms-list-repeater' && ((_a = child.content) === null || _a === void 0 ? void 0 : _a.renderPropIdentifier)) {
-                            var arrayMapperRenderProp = child.content.renderPropIdentifier;
-                            // Key by array mapper render prop (unique), not data source identifier
-                            arrayMapperInfoMap.set(arrayMapperRenderProp, {
-                                dataSourceIdentifier: dataSourceIdentifier_1,
-                                renderProp: arrayMapperRenderProp,
-                                paginated: child.content.paginated || false,
-                                searchEnabled: child.content.searchEnabled || false,
-                            });
-                        }
-                    });
-                }
-            }
-            if ((_e = node.content) === null || _e === void 0 ? void 0 : _e.children) {
-                node.content.children.forEach(function (child) { return collectArrayMapperInfo_1(child); });
-            }
-            if (node.children && Array.isArray(node.children)) {
-                node.children.forEach(function (child) { return collectArrayMapperInfo_1(child); });
-            }
-        };
-        collectArrayMapperInfo_1(uidlNode);
+function findArrayMapperRenderPropInDataProvider(dataProvider) {
+    var _a, _b, _c, _d, _e;
+    var renderSuccessAttr = dataProvider.openingElement.attributes.find(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'renderSuccess'; });
+    if (!((_a = renderSuccessAttr === null || renderSuccessAttr === void 0 ? void 0 : renderSuccessAttr.value) === null || _a === void 0 ? void 0 : _a.expression)) {
+        return undefined;
     }
-    var dataProvidersWithParents = [];
-    var findDataProvidersAndParents = function (node, parent) {
+    var findRepeater = function (node) {
         var _a, _b;
-        if (parent === void 0) { parent = null; }
         if (!node) {
-            return;
+            return null;
         }
-        // Check if this is a DataProvider
-        if (node.type === 'JSXElement' && ((_b = (_a = node.openingElement) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.name) === 'DataProvider') {
-            dataProvidersWithParents.push({
-                dataProvider: node,
-                parent: parent,
-            });
+        if (node.type === 'JSXElement' && ((_b = (_a = node.openingElement) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.name) === 'Repeater') {
+            return node;
         }
-        // Only recurse through JSX structure, not into embedded expressions or code
-        if (node.type === 'ReturnStatement' && node.argument) {
-            findDataProvidersAndParents(node.argument, parent);
+        if (node.body) {
+            return findRepeater(node.body);
         }
-        else if (node.type === 'JSXElement' || node.type === 'JSXFragment') {
-            // Recurse through JSX children
-            if (node.children && Array.isArray(node.children)) {
-                node.children.forEach(function (child) { return findDataProvidersAndParents(child, node); });
+        if (node.children && Array.isArray(node.children)) {
+            for (var _i = 0, _c = node.children; _i < _c.length; _i++) {
+                var c = _c[_i];
+                var r = findRepeater(c);
+                if (r) {
+                    return r;
+                }
             }
         }
-        else if (node.type === 'JSXExpressionContainer') {
-            // For expression containers, continue but don't go into the expression itself
-            if (node.expression &&
-                (node.expression.type === 'JSXElement' || node.expression.type === 'JSXFragment')) {
-                findDataProvidersAndParents(node.expression, parent);
-            }
+        return null;
+    };
+    var repeater = findRepeater(renderSuccessAttr.value.expression);
+    if (!repeater) {
+        return undefined;
+    }
+    var renderItemAttr = repeater.openingElement.attributes.find(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'renderItem'; });
+    if (!((_e = (_d = (_c = (_b = renderItemAttr === null || renderItemAttr === void 0 ? void 0 : renderItemAttr.value) === null || _b === void 0 ? void 0 : _b.expression) === null || _c === void 0 ? void 0 : _c.params) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.name)) {
+        return undefined;
+    }
+    return renderItemAttr.value.expression.params[0].name;
+}
+function findAllSearchInputsInJSX(blockStatement) {
+    var results = [];
+    var traverse = function (node) {
+        var _a, _b, _c, _d, _e, _f;
+        if (!node) {
+            return;
         }
-        else if (node.type === 'BlockStatement') {
-            // For block statements (function bodies), look through body array
-            if (node.body && Array.isArray(node.body)) {
-                node.body.forEach(function (stmt) { return findDataProvidersAndParents(stmt, node); });
+        if (node.type === 'JSXElement' && ((_b = (_a = node.openingElement) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.name) === 'input') {
+            var classAttr = (_c = node.openingElement.attributes) === null || _c === void 0 ? void 0 : _c.find(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'className'; });
+            var className = ((_d = classAttr === null || classAttr === void 0 ? void 0 : classAttr.value) === null || _d === void 0 ? void 0 : _d.value) || ((_f = (_e = classAttr === null || classAttr === void 0 ? void 0 : classAttr.value) === null || _e === void 0 ? void 0 : _e.expression) === null || _f === void 0 ? void 0 : _f.value) || '';
+            if (className.includes('search-input')) {
+                results.push({ node: node, className: className });
             }
         }
-        else if (node.type === 'ConditionalExpression') {
-            // Check both branches of conditional
-            findDataProvidersAndParents(node.consequent, parent);
-            findDataProvidersAndParents(node.alternate, parent);
+        if (node.children && Array.isArray(node.children)) {
+            node.children.forEach(function (c) { return traverse(c); });
         }
-    };
-    findDataProvidersAndParents(blockStatement);
-    // Now process each DataProvider and find its siblings
-    dataProvidersWithParents.forEach(function (_a) {
-        var _b, _c;
-        var dataProvider = _a.dataProvider, parent = _a.parent;
-        var nameAttr = dataProvider.openingElement.attributes.find(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'name'; });
-        // Find the array mapper render prop by looking inside renderSuccess -> Repeater -> renderItem param
-        var renderSuccessAttr = dataProvider.openingElement.attributes.find(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'renderSuccess'; });
-        var arrayMapperRenderProp;
-        if (renderSuccessAttr && ((_b = renderSuccessAttr.value) === null || _b === void 0 ? void 0 : _b.type) === 'JSXExpressionContainer') {
-            var renderFunc = renderSuccessAttr.value.expression;
-            if (renderFunc.type === 'ArrowFunctionExpression') {
-                // Look for Repeater inside the render function
-                var findRepeater_1 = function (node) {
-                    var _a, _b;
-                    if (!node) {
-                        return null;
-                    }
-                    if (node.type === 'JSXElement' && ((_b = (_a = node.openingElement) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.name) === 'Repeater') {
-                        return node;
-                    }
-                    if (node.body) {
-                        return findRepeater_1(node.body);
-                    }
-                    if (node.children && Array.isArray(node.children)) {
-                        for (var _i = 0, _c = node.children; _i < _c.length; _i++) {
-                            var child = _c[_i];
-                            var result = findRepeater_1(child);
-                            if (result) {
-                                return result;
-                            }
-                        }
-                    }
-                    if (node.type === 'JSXFragment' || node.type === 'JSXElement') {
-                        if (node.children && Array.isArray(node.children)) {
-                            for (var _d = 0, _e = node.children; _d < _e.length; _d++) {
-                                var child = _e[_d];
-                                var result = findRepeater_1(child);
-                                if (result) {
-                                    return result;
-                                }
-                            }
-                        }
-                    }
-                    if (node.type === 'JSXExpressionContainer') {
-                        return findRepeater_1(node.expression);
-                    }
-                    if (node.expression) {
-                        return findRepeater_1(node.expression);
-                    }
-                    if (node.consequent) {
-                        var result = findRepeater_1(node.consequent);
-                        if (result) {
-                            return result;
-                        }
-                    }
-                    if (node.alternate) {
-                        return findRepeater_1(node.alternate);
-                    }
-                    return null;
-                };
-                var repeater = findRepeater_1(renderFunc);
-                if (repeater) {
-                    // Find renderItem attribute on Repeater
-                    var renderItemAttr = repeater.openingElement.attributes.find(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'renderItem'; });
-                    if (renderItemAttr && ((_c = renderItemAttr.value) === null || _c === void 0 ? void 0 : _c.type) === 'JSXExpressionContainer') {
-                        var renderItemFunc = renderItemAttr.value.expression;
-                        if (renderItemFunc.type === 'ArrowFunctionExpression' &&
-                            renderItemFunc.params &&
-                            renderItemFunc.params.length > 0) {
-                            var param = renderItemFunc.params[0];
-                            if (param.type === 'Identifier') {
-                                arrayMapperRenderProp = param.name;
-                            }
-                        }
-                    }
-                }
+        if (node.body) {
+            if (Array.isArray(node.body)) {
+                node.body.forEach(function (s) { return traverse(s); });
+            }
+            else {
+                traverse(node.body);
             }
         }
-        if (!nameAttr ||
-            !nameAttr.value ||
-            nameAttr.value.type !== 'JSXExpressionContainer' ||
-            !arrayMapperRenderProp) {
+        if (node.consequent) {
+            traverse(node.consequent);
+        }
+        if (node.alternate) {
+            traverse(node.alternate);
+        }
+        if (node.expression) {
+            traverse(node.expression);
+        }
+        if (node.argument) {
+            traverse(node.argument);
+        }
+    };
+    traverse(blockStatement);
+    return results;
+}
+function findAllPaginationNodesInJSX(blockStatement) {
+    var results = [];
+    var traverse = function (node) {
+        var _a, _b, _c, _d, _e;
+        if (!node) {
             return;
         }
-        var dataProviderIdentifier = nameAttr.value.expression.value;
-        var paginationNodeInfo = null;
-        var searchInputInfo = null;
-        var findSearchAndPaginationInScope = function (scopeNode, skipNode) {
-            var _a, _b, _c, _d, _e, _f;
-            if (skipNode === void 0) { skipNode = null; }
-            if (!scopeNode || !scopeNode.children || !Array.isArray(scopeNode.children)) {
-                return false;
+        if (node.type === 'JSXElement') {
+            var classAttr = (_b = (_a = node.openingElement) === null || _a === void 0 ? void 0 : _a.attributes) === null || _b === void 0 ? void 0 : _b.find(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'className'; });
+            var className = ((_c = classAttr === null || classAttr === void 0 ? void 0 : classAttr.value) === null || _c === void 0 ? void 0 : _c.value) || ((_e = (_d = classAttr === null || classAttr === void 0 ? void 0 : classAttr.value) === null || _d === void 0 ? void 0 : _d.expression) === null || _e === void 0 ? void 0 : _e.value) || '';
+            if (className.includes('cms-pagination-node')) {
+                results.push({ node: node, className: className });
             }
-            var foundSomething = false;
-            for (var _i = 0, _g = scopeNode.children; _i < _g.length; _i++) {
-                var child = _g[_i];
-                if (child === skipNode) {
-                    continue;
-                }
-                if (child.type === 'JSXElement') {
-                    var childClassName = getClassName(((_a = child.openingElement) === null || _a === void 0 ? void 0 : _a.attributes) || []);
-                    var childElementName = (_c = (_b = child.openingElement) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.name;
-                    // Found pagination node
-                    if (childClassName && childClassName.includes('cms-pagination-node')) {
-                        var prevClass = findChildWithClass(child, 'previous');
-                        var nextClass = findChildWithClass(child, 'next');
-                        if (prevClass || nextClass) {
-                            paginationNodeInfo = {
-                                class: childClassName,
-                                prevClass: prevClass,
-                                nextClass: nextClass,
-                            };
-                            foundSomething = true;
-                        }
-                    }
-                    // Found search container - search for input inside it
-                    if (childClassName && childClassName.includes('data-source-search-node')) {
-                        if (child.children && Array.isArray(child.children)) {
-                            for (var _h = 0, _j = child.children; _h < _j.length; _h++) {
-                                var searchChild = _j[_h];
-                                if (searchChild.type === 'JSXElement') {
-                                    var searchChildElementName = (_e = (_d = searchChild.openingElement) === null || _d === void 0 ? void 0 : _d.name) === null || _e === void 0 ? void 0 : _e.name;
-                                    var searchChildClassName = getClassName(((_f = searchChild.openingElement) === null || _f === void 0 ? void 0 : _f.attributes) || []);
-                                    if (searchChildClassName &&
-                                        searchChildClassName.includes('search-input') &&
-                                        searchChildElementName === 'input') {
-                                        searchInputInfo = {
-                                            class: searchChildClassName,
-                                            jsx: searchChild,
-                                        };
-                                        foundSomething = true;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    // Also check if search input is a direct child
-                    if (childClassName &&
-                        childClassName.includes('search-input') &&
-                        childElementName === 'input') {
-                        searchInputInfo = {
-                            class: childClassName,
-                            jsx: child,
-                        };
-                        foundSomething = true;
-                    }
-                    // Stop searching if we found both or if we found what we're looking for
-                    if (foundSomething && (searchInputInfo || paginationNodeInfo)) {
-                        return true;
-                    }
-                    // Only recurse if we haven't found what we're looking for yet
-                    if (!searchInputInfo || !paginationNodeInfo) {
-                        if (findSearchAndPaginationInScope(child, skipNode)) {
-                            return true;
-                        }
-                    }
-                }
+        }
+        if (node.children && Array.isArray(node.children)) {
+            node.children.forEach(function (c) { return traverse(c); });
+        }
+        if (node.body) {
+            if (Array.isArray(node.body)) {
+                node.body.forEach(function (s) { return traverse(s); });
             }
-            return foundSomething;
-        };
-        var currentScope = parent;
-        var depth = 0;
-        var maxDepth = 5;
-        while (currentScope && (!searchInputInfo || !paginationNodeInfo) && depth < maxDepth) {
-            var found = findSearchAndPaginationInScope(currentScope, depth === 0 ? dataProvider : null);
-            // Stop searching up the tree if we found a pagination node at this level
-            if (found && paginationNodeInfo) {
-                break;
+            else {
+                traverse(node.body);
             }
-            currentScope = findParentNode(blockStatement, currentScope);
-            depth++;
         }
-        // Record the DataProvider with its pagination/search info
-        // Use array instead of Map to handle multiple DataProviders with same name
-        dataProviderList.push({
-            identifier: dataProviderIdentifier,
-            dataProvider: dataProvider,
-            arrayMapperRenderProp: arrayMapperRenderProp,
-            paginationNode: paginationNodeInfo || undefined,
-            searchInput: searchInputInfo || undefined,
-            hasPagination: !!paginationNodeInfo,
-            hasSearch: !!searchInputInfo,
-        });
-    });
-    // Categorize data providers
-    var paginatedMappers = [];
-    var searchOnlyMappers = [];
-    var paginationOnlyMappers = [];
-    var plainMappers = [];
-    dataProviderList.forEach(function (info) {
-        var _a, _b, _c, _d;
-        // Check UIDL flags for this array mapper
-        var uidlInfo = info.arrayMapperRenderProp
-            ? arrayMapperInfoMap.get(info.arrayMapperRenderProp)
-            : null;
-        // Only process pagination/search if UIDL explicitly enables it
-        var shouldHavePagination = (uidlInfo === null || uidlInfo === void 0 ? void 0 : uidlInfo.paginated) && info.hasPagination;
-        var shouldHaveSearch = (uidlInfo === null || uidlInfo === void 0 ? void 0 : uidlInfo.searchEnabled) && info.hasSearch;
-        if (shouldHavePagination && shouldHaveSearch) {
-            // Pagination + Search
-            paginatedMappers.push({
-                paginationNodeClass: info.paginationNode.class,
-                prevButtonClass: info.paginationNode.prevClass,
-                nextButtonClass: info.paginationNode.nextClass,
-                dataSourceIdentifier: info.identifier,
-                dataProviderJSX: info.dataProvider,
-                arrayMapperRenderProp: info.arrayMapperRenderProp,
-                searchInputClass: (_a = info.searchInput) === null || _a === void 0 ? void 0 : _a.class,
-                searchInputJSX: (_b = info.searchInput) === null || _b === void 0 ? void 0 : _b.jsx,
-            });
+        if (node.consequent) {
+            traverse(node.consequent);
         }
-        else if (shouldHavePagination && !shouldHaveSearch) {
-            // Pagination only
-            paginationOnlyMappers.push({
-                paginationNodeClass: info.paginationNode.class,
-                prevButtonClass: info.paginationNode.prevClass,
-                nextButtonClass: info.paginationNode.nextClass,
-                dataSourceIdentifier: info.identifier,
-                dataProviderJSX: info.dataProvider,
-                arrayMapperRenderProp: info.arrayMapperRenderProp,
-                searchInputClass: undefined,
-                searchInputJSX: undefined,
-            });
+        if (node.alternate) {
+            traverse(node.alternate);
         }
-        else if (!shouldHavePagination && shouldHaveSearch) {
-            // Search only
-            searchOnlyMappers.push({
-                paginationNodeClass: '',
-                prevButtonClass: null,
-                nextButtonClass: null,
-                dataSourceIdentifier: info.identifier,
-                dataProviderJSX: info.dataProvider,
-                arrayMapperRenderProp: info.arrayMapperRenderProp,
-                searchInputClass: (_c = info.searchInput) === null || _c === void 0 ? void 0 : _c.class,
-                searchInputJSX: (_d = info.searchInput) === null || _d === void 0 ? void 0 : _d.jsx,
-            });
+        if (node.expression) {
+            traverse(node.expression);
         }
-        else {
-            // Plain (no pagination, no search) - UIDL doesn't enable it or no controls found
-            plainMappers.push({
-                paginationNodeClass: '',
-                prevButtonClass: null,
-                nextButtonClass: null,
-                dataSourceIdentifier: info.identifier,
-                dataProviderJSX: info.dataProvider,
-                arrayMapperRenderProp: info.arrayMapperRenderProp,
-                searchInputClass: undefined,
-                searchInputJSX: undefined,
-            });
+        if (node.argument) {
+            traverse(node.argument);
         }
-    });
-    return { paginatedMappers: paginatedMappers, searchOnlyMappers: searchOnlyMappers, paginationOnlyMappers: paginationOnlyMappers, plainMappers: plainMappers };
+    };
+    traverse(blockStatement);
+    return results;
 }
-function handleSearchOnlyArrayMappers(blockStatement, searchOnlyDataSources, searchConfigMap, queryColumnsMap, dependencies) {
-    var searchOnlyStates = [];
-    var searchOnlyEffects = [];
-    searchOnlyDataSources.forEach(function (detected, index) {
-        var searchId = "search_".concat(index);
-        var searchQueryVar = "".concat(searchId, "_query");
-        var setSearchQueryVar = "set".concat(searchQueryVar.charAt(0).toUpperCase() + searchQueryVar.slice(1));
-        var debouncedSearchQueryVar = "debounced".concat(searchQueryVar.charAt(0).toUpperCase() + searchQueryVar.slice(1));
-        var setDebouncedSearchQueryVar = "set".concat(debouncedSearchQueryVar.charAt(0).toUpperCase() + debouncedSearchQueryVar.slice(1));
-        var skipDebounceOnMountRefVar = "skipDebounceOnMount".concat(searchId);
-        var searchConfig = searchConfigMap.get(detected.dataSourceIdentifier);
-        var searchDebounce = (searchConfig === null || searchConfig === void 0 ? void 0 : searchConfig.searchDebounce) || 300;
-        var queryColumns = queryColumnsMap.get(detected.dataSourceIdentifier);
-        // Add skip ref
-        var skipRefAST = types.variableDeclaration('const', [
-            types.variableDeclarator(types.identifier(skipDebounceOnMountRefVar), types.callExpression(types.identifier('useRef'), [types.booleanLiteral(true)])),
-        ]);
-        searchOnlyStates.push(skipRefAST);
-        // Add debounced search state
-        var debouncedSearchStateAST = types.variableDeclaration('const', [
-            types.variableDeclarator(types.arrayPattern([
-                types.identifier(debouncedSearchQueryVar),
-                types.identifier(setDebouncedSearchQueryVar),
-            ]), types.callExpression(types.identifier('useState'), [types.stringLiteral('')])),
-        ]);
-        searchOnlyStates.push(debouncedSearchStateAST);
-        // Add search query state
-        var searchStateAST = types.variableDeclaration('const', [
-            types.variableDeclarator(types.arrayPattern([types.identifier(searchQueryVar), types.identifier(setSearchQueryVar)]), types.callExpression(types.identifier('useState'), [types.stringLiteral('')])),
-        ]);
-        searchOnlyStates.push(searchStateAST);
-        // Add useEffect for debouncing
-        if (!dependencies.useEffect) {
-            dependencies.useEffect = {
-                type: 'library',
-                path: 'react',
-                version: '',
-                meta: {
-                    namedImport: true,
-                },
-            };
-        }
-        var debounceEffect = types.expressionStatement(types.callExpression(types.identifier('useEffect'), [
-            types.arrowFunctionExpression([], types.blockStatement([
-                types.ifStatement(types.memberExpression(types.identifier(skipDebounceOnMountRefVar), types.identifier('current')), types.blockStatement([
-                    types.expressionStatement(types.assignmentExpression('=', types.memberExpression(types.identifier(skipDebounceOnMountRefVar), types.identifier('current')), types.booleanLiteral(false))),
-                    types.returnStatement(),
-                ])),
-                types.variableDeclaration('const', [
-                    types.variableDeclarator(types.identifier('timer'), types.callExpression(types.identifier('setTimeout'), [
-                        types.arrowFunctionExpression([], types.blockStatement([
-                            types.expressionStatement(types.callExpression(types.identifier(setDebouncedSearchQueryVar), [
-                                types.identifier(searchQueryVar),
-                            ])),
-                        ])),
-                        types.numericLiteral(searchDebounce),
-                    ])),
-                ]),
-                types.returnStatement(types.arrowFunctionExpression([], types.callExpression(types.identifier('clearTimeout'), [types.identifier('timer')]))),
-            ])),
-            types.arrayExpression([types.identifier(searchQueryVar)]),
-        ]));
-        searchOnlyEffects.push(debounceEffect);
-        // Modify DataProvider to include search params (even without queryColumns)
-        if (detected.dataProviderJSX) {
-            addSearchParamsToDataProvider(detected.dataProviderJSX, {
-                debouncedSearchQueryVar: debouncedSearchQueryVar,
-                queryColumns: queryColumns || [],
-            });
-        }
-        // Modify search input
-        if (detected.searchInputJSX) {
-            addSearchInputHandlers(detected.searchInputJSX, {
-                searchQueryVar: searchQueryVar,
-                setSearchQueryVar: setSearchQueryVar,
-                searchEnabled: true,
-            });
-        }
-    });
-    // Add all state declarations at the beginning in correct order
-    searchOnlyStates.reverse().forEach(function (stateDecl) {
-        blockStatement.body.unshift(stateDecl);
+function updateDataProviderForPaginatedSearch(dp, usage, vars, fileName) {
+    var attrs = dp.openingElement.attributes;
+    // Remove existing params, key, initialData, fetchData, persistDataDuringLoading
+    dp.openingElement.attributes = attrs.filter(function (attr) {
+        var _a;
+        return !['params', 'key', 'initialData', 'fetchData', 'persistDataDuringLoading'].includes((_a = attr.name) === null || _a === void 0 ? void 0 : _a.name);
     });
-    // Recalculate insertIndex after adding states (since unshift shifted everything)
-    var newInsertIndex = blockStatement.body.findIndex(function (stmt) { return stmt.type === 'ReturnStatement'; });
-    var finalInsertIndex = newInsertIndex !== -1 ? newInsertIndex : blockStatement.body.length;
-    // Add all useEffect hooks before the return statement
-    searchOnlyEffects.reverse().forEach(function (effect) {
-        blockStatement.body.splice(finalInsertIndex, 0, effect);
+    // Add params with useMemo
+    var paramsProps = [
+        types.objectProperty(types.identifier('page'), types.memberExpression(types.identifier(vars.combinedStateVar), types.identifier('page'))),
+        types.objectProperty(types.identifier('perPage'), types.numericLiteral(usage.perPage)),
+        types.objectProperty(types.identifier('query'), types.memberExpression(types.identifier(vars.combinedStateVar), types.identifier('debouncedQuery'))),
+    ];
+    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); }))])));
+    }
+    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)]),
+    ]))));
+    // Add initialData
+    var initialDataCondition = types.logicalExpression('&&', types.binaryExpression('===', types.memberExpression(types.identifier(vars.combinedStateVar), types.identifier('page')), types.numericLiteral(1)), types.unaryExpression('!', types.memberExpression(types.identifier(vars.combinedStateVar), types.identifier('debouncedQuery')), true));
+    dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('initialData'), types.jsxExpressionContainer(types.conditionalExpression(initialDataCondition, types.optionalMemberExpression(types.identifier('props'), types.identifier(vars.propsPrefix), false, true), types.identifier('undefined')))));
+    // Add key
+    dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('key'), types.jsxExpressionContainer(types.templateLiteral([
+        types.templateElement({
+            raw: "".concat(usage.dataSourceIdentifier, "-"),
+            cooked: "".concat(usage.dataSourceIdentifier, "-"),
+        }),
+        types.templateElement({ raw: '-', cooked: '-' }),
+        types.templateElement({ raw: '', cooked: '' }),
+    ], [
+        types.memberExpression(types.identifier(vars.combinedStateVar), types.identifier('page')),
+        types.memberExpression(types.identifier(vars.combinedStateVar), types.identifier('debouncedQuery')),
+    ]))));
+    // Add fetchData
+    dp.openingElement.attributes.push(createFetchDataAttribute(fileName));
+    // Add persistDataDuringLoading
+    dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('persistDataDuringLoading'), types.jsxExpressionContainer(types.booleanLiteral(true))));
+}
+function updateDataProviderForPaginationOnly(dp, usage, vars, fileName) {
+    var attrs = dp.openingElement.attributes;
+    dp.openingElement.attributes = attrs.filter(function (attr) {
+        var _a;
+        return !['params', 'key', 'initialData', 'fetchData', 'persistDataDuringLoading'].includes((_a = attr.name) === null || _a === void 0 ? void 0 : _a.name);
     });
+    // 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.arrayExpression([types.identifier(vars.pageStateVar)]),
+    ]))));
+    // Add initialData
+    dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('initialData'), types.jsxExpressionContainer(types.conditionalExpression(types.binaryExpression('===', types.identifier(vars.pageStateVar), types.numericLiteral(1)), types.optionalMemberExpression(types.identifier('props'), types.identifier(vars.propsPrefix), false, true), types.identifier('undefined')))));
+    // Add key
+    dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('key'), types.jsxExpressionContainer(types.templateLiteral([
+        types.templateElement({
+            raw: "".concat(usage.dataSourceIdentifier, "-page-"),
+            cooked: "".concat(usage.dataSourceIdentifier, "-page-"),
+        }),
+        types.templateElement({ raw: '', cooked: '' }),
+    ], [types.identifier(vars.pageStateVar)]))));
+    // Add fetchData
+    dp.openingElement.attributes.push(createFetchDataAttribute(fileName));
+    dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('persistDataDuringLoading'), types.jsxExpressionContainer(types.booleanLiteral(true))));
 }
-function addSearchParamsToDataProvider(dataProviderJSX, config) {
-    var _a, _b;
-    if (!dataProviderJSX || !dataProviderJSX.openingElement) {
-        return;
-    }
-    var debouncedSearchQueryVar = config.debouncedSearchQueryVar, queryColumns = config.queryColumns;
-    // 1. Update params to be wrapped in useMemo
-    var existingParamsAttr = dataProviderJSX.openingElement.attributes.find(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'params'; });
-    if (existingParamsAttr && ((_a = existingParamsAttr.value) === null || _a === void 0 ? void 0 : _a.type) === 'JSXExpressionContainer') {
-        var paramsObj = existingParamsAttr.value.expression;
-        if (paramsObj.type === 'ObjectExpression') {
-            // Add query to existing params properties
-            paramsObj.properties.push(types.objectProperty(types.identifier('query'), types.identifier(debouncedSearchQueryVar)));
-            // Add queryColumns only if they exist
-            if (queryColumns.length > 0) {
-                paramsObj.properties.push(types.objectProperty(types.identifier('queryColumns'), types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [types.arrayExpression(queryColumns.map(function (col) { return types.stringLiteral(col); }))])));
-            }
-            // Wrap in useMemo with debouncedSearchQueryVar as dependency
-            var memoizedParamsValue = types.callExpression(types.identifier('useMemo'), [
-                types.arrowFunctionExpression([], paramsObj),
-                types.arrayExpression([types.identifier(debouncedSearchQueryVar)]),
-            ]);
-            existingParamsAttr.value.expression = memoizedParamsValue;
-        }
-    }
-    // 2. Update initialData to be conditional on empty search
-    var existingInitialDataAttr = dataProviderJSX.openingElement.attributes.find(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'initialData'; });
-    if (existingInitialDataAttr && ((_b = existingInitialDataAttr.value) === null || _b === void 0 ? void 0 : _b.type) === 'JSXExpressionContainer') {
-        var currentInitialData = existingInitialDataAttr.value.expression;
-        // Make it conditional: only use initialData if search is empty
-        existingInitialDataAttr.value.expression = types.conditionalExpression(types.unaryExpression('!', types.identifier(debouncedSearchQueryVar), true), currentInitialData, types.identifier('undefined'));
+function updateDataProviderForSearchOnly(dp, usage, vars, fileName) {
+    var attrs = dp.openingElement.attributes;
+    dp.openingElement.attributes = attrs.filter(function (attr) {
+        var _a;
+        return !['params', 'key', 'initialData', 'fetchData', 'persistDataDuringLoading'].includes((_a = attr.name) === null || _a === void 0 ? void 0 : _a.name);
+    });
+    // Add params
+    var paramsProps = [
+        types.objectProperty(types.identifier('query'), types.identifier(vars.debouncedSearchQueryVar)),
+    ];
+    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); }))])));
     }
-    // 3. Update key to include search query
-    var existingKeyAttr = dataProviderJSX.openingElement.attributes.find(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'key'; });
-    var keyExpression = types.templateLiteral([
+    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)]),
+    ]))));
+    // Add initialData
+    dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('initialData'), types.jsxExpressionContainer(types.conditionalExpression(types.unaryExpression('!', types.identifier(vars.debouncedSearchQueryVar), true), types.optionalMemberExpression(types.identifier('props'), types.identifier(vars.propsPrefix), false, true), types.identifier('undefined')))));
+    // Add key
+    dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('key'), types.jsxExpressionContainer(types.templateLiteral([
         types.templateElement({ raw: 'search-', cooked: 'search-' }),
         types.templateElement({ raw: '', cooked: '' }),
-    ], [types.identifier(debouncedSearchQueryVar)]);
-    var keyAttr = types.jsxAttribute(types.jsxIdentifier('key'), types.jsxExpressionContainer(keyExpression));
-    if (existingKeyAttr) {
-        var index = dataProviderJSX.openingElement.attributes.indexOf(existingKeyAttr);
-        dataProviderJSX.openingElement.attributes[index] = keyAttr;
-    }
-    else {
-        dataProviderJSX.openingElement.attributes.push(keyAttr);
+    ], [types.identifier(vars.debouncedSearchQueryVar)]))));
+    // Add fetchData
+    dp.openingElement.attributes.push(createFetchDataAttribute(fileName));
+    dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('persistDataDuringLoading'), types.jsxExpressionContainer(types.booleanLiteral(true))));
+}
+function updateDataProviderForPlain(dp, vars) {
+    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));
     }
 }
-function addPaginationParamsToDataProvider(dataProviderJSX, info, paginationIndex) {
-    var _a;
-    if (!dataProviderJSX || !dataProviderJSX.openingElement) {
+function stabilizeDataProviderWithoutRepeater(dp) {
+    var _a, _b, _c;
+    var attrs = dp.openingElement.attributes;
+    // Find the params attribute
+    var paramsAttrIndex = attrs.findIndex(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'params'; });
+    if (paramsAttrIndex === -1) {
         return;
     }
-    var combinedStateVar = info.combinedStateVar;
-    var paramsProperties;
-    var dependencies;
-    if (info.searchEnabled && combinedStateVar) {
-        // Use combined state for both page and query
-        paramsProperties = [
-            types.objectProperty(types.identifier('page'), types.memberExpression(types.identifier(combinedStateVar), types.identifier('page'))),
-            types.objectProperty(types.identifier('perPage'), types.numericLiteral(info.perPage)),
-            types.objectProperty(types.identifier('query'), types.memberExpression(types.identifier(combinedStateVar), types.identifier('debouncedQuery'))),
-        ];
-        if (info.queryColumns && info.queryColumns.length > 0) {
-            paramsProperties.push(types.objectProperty(types.identifier('queryColumns'), types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [types.arrayExpression(info.queryColumns.map(function (col) { return types.stringLiteral(col); }))])));
-        }
-        // Single dependency: the combined state object
-        dependencies = [types.identifier(combinedStateVar)];
-    }
-    else {
-        // Pagination only (no search)
-        paramsProperties = [
-            types.objectProperty(types.identifier('page'), types.identifier(info.pageStateVar)),
-            types.objectProperty(types.identifier('perPage'), types.numericLiteral(info.perPage)),
-        ];
-        dependencies = [types.identifier(info.pageStateVar)];
-    }
-    // Wrap params in useMemo to prevent unnecessary refetches
-    var memoizedParamsValue = types.callExpression(types.identifier('useMemo'), [
-        types.arrowFunctionExpression([], types.objectExpression(paramsProperties)),
-        types.arrayExpression(dependencies),
-    ]);
-    var paramsAttr = types.jsxAttribute(types.jsxIdentifier('params'), types.jsxExpressionContainer(memoizedParamsValue));
-    var existingParamsAttr = dataProviderJSX.openingElement.attributes.find(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'params'; });
-    if (existingParamsAttr) {
-        var index = dataProviderJSX.openingElement.attributes.indexOf(existingParamsAttr);
-        dataProviderJSX.openingElement.attributes[index] = paramsAttr;
-    }
-    else {
-        dataProviderJSX.openingElement.attributes.push(paramsAttr);
-    }
-    var existingInitialDataAttr = dataProviderJSX.openingElement.attributes.find(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'initialData'; });
-    if (existingInitialDataAttr && existingInitialDataAttr.value) {
-        // Update initialData to use the paginated prop name
-        var paginatedPropName = "".concat(info.dataSourceIdentifier, "_pg_").concat(paginationIndex);
-        // If search is enabled, use combined state; otherwise use page state
-        var condition = void 0;
-        if (info.searchEnabled && combinedStateVar) {
-            condition = types.logicalExpression('&&', types.binaryExpression('===', types.memberExpression(types.identifier(combinedStateVar), types.identifier('page')), types.numericLiteral(1)), types.unaryExpression('!', types.memberExpression(types.identifier(combinedStateVar), types.identifier('debouncedQuery')), true));
-        }
-        else {
-            condition = types.binaryExpression('===', types.identifier(info.pageStateVar), types.numericLiteral(1));
-        }
-        existingInitialDataAttr.value.expression = types.conditionalExpression(condition, types.optionalMemberExpression(types.identifier('props'), types.identifier(paginatedPropName), false, true), types.identifier('undefined'));
-    }
-    var existingKeyAttr = dataProviderJSX.openingElement.attributes.find(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'key'; });
-    // Include page and search in key to trigger refetch when they change
-    var keyExpression;
-    if (info.searchEnabled && combinedStateVar) {
-        keyExpression = types.templateLiteral([
-            types.templateElement({
-                raw: "".concat(info.dataSourceIdentifier, "-page-"),
-                cooked: "".concat(info.dataSourceIdentifier, "-page-"),
-            }),
-            types.templateElement({ raw: '-search-', cooked: '-search-' }),
-            types.templateElement({ raw: '', cooked: '' }),
-        ], [
-            types.memberExpression(types.identifier(combinedStateVar), types.identifier('page')),
-            types.memberExpression(types.identifier(combinedStateVar), types.identifier('debouncedQuery')),
-        ]);
-    }
-    else {
-        keyExpression = types.templateLiteral([
-            types.templateElement({
-                raw: "".concat(info.dataSourceIdentifier, "-"),
-                cooked: "".concat(info.dataSourceIdentifier, "-"),
-            }),
-            types.templateElement({ raw: '', cooked: '' }),
-        ], [types.identifier(info.pageStateVar)]);
-    }
-    var keyAttr = types.jsxAttribute(types.jsxIdentifier('key'), types.jsxExpressionContainer(keyExpression));
-    if (existingKeyAttr) {
-        var index = dataProviderJSX.openingElement.attributes.indexOf(existingKeyAttr);
-        dataProviderJSX.openingElement.attributes[index] = keyAttr;
+    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;
     }
-    else {
-        dataProviderJSX.openingElement.attributes.push(keyAttr);
+    // 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;
     }
-    // For pagination, always create a fresh fetchData that calls the API route
-    // Get the resource definition to build the API URL
-    var resourceDefAttr = dataProviderJSX.openingElement.attributes.find(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'resourceDefinition'; });
-    if (resourceDefAttr && ((_a = resourceDefAttr.value) === null || _a === void 0 ? void 0 : _a.type) === 'JSXExpressionContainer') {
-        var resourceDef = resourceDefAttr.value.expression;
-        if (resourceDef.type === 'ObjectExpression') {
-            var dataSourceIdProp = resourceDef.properties.find(function (p) { return p.type === 'ObjectProperty' && p.key.value === 'dataSourceId'; });
-            var tableNameProp = resourceDef.properties.find(function (p) { return p.type === 'ObjectProperty' && p.key.value === 'tableName'; });
-            var dataSourceTypeProp = resourceDef.properties.find(function (p) { return p.type === 'ObjectProperty' && p.key.value === 'dataSourceType'; });
-            if (dataSourceIdProp && tableNameProp && dataSourceTypeProp) {
-                var dataSourceId = dataSourceIdProp.value.value;
-                var tableName = tableNameProp.value.value;
-                var dataSourceType = dataSourceTypeProp.value.value;
-                var fileName = "".concat(dataSourceType, "-").concat(tableName, "-").concat(dataSourceId.substring(0, 8));
-                // Create fetchData attribute with proper fetch chain wrapped in useCallback
-                var fetchDataValue = types.callExpression(types.identifier('useCallback'), [
-                    types.arrowFunctionExpression([types.identifier('params')], types.callExpression(types.memberExpression(types.callExpression(types.memberExpression(types.callExpression(types.identifier('fetch'), [
-                        types.templateLiteral([
-                            types.templateElement({
-                                raw: "/api/".concat(fileName, "?"),
-                                cooked: "/api/".concat(fileName, "?"),
-                            }),
-                            types.templateElement({ raw: '', cooked: '' }),
-                        ], [
-                            types.newExpression(types.identifier('URLSearchParams'), [
-                                types.identifier('params'),
-                            ]),
-                        ]),
-                        types.objectExpression([
-                            types.objectProperty(types.identifier('headers'), types.objectExpression([
-                                types.objectProperty(types.stringLiteral('Content-Type'), types.stringLiteral('application/json')),
-                            ])),
-                        ]),
-                    ]), types.identifier('then')), [
-                        types.arrowFunctionExpression([types.identifier('res')], types.callExpression(types.memberExpression(types.identifier('res'), types.identifier('json')), [])),
-                    ]), types.identifier('then')), [
-                        types.arrowFunctionExpression([types.identifier('response')], types.optionalMemberExpression(types.identifier('response'), types.identifier('data'), false, true)),
-                    ])),
-                    types.arrayExpression([]),
-                ]);
-                var newFetchDataAttr = types.jsxAttribute(types.jsxIdentifier('fetchData'), types.jsxExpressionContainer(fetchDataValue));
-                // Remove existing fetchData attribute if present
-                var existingFetchDataIndex = dataProviderJSX.openingElement.attributes.findIndex(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'fetchData'; });
-                if (existingFetchDataIndex !== -1) {
-                    dataProviderJSX.openingElement.attributes[existingFetchDataIndex] = newFetchDataAttr;
-                }
-                else {
-                    dataProviderJSX.openingElement.attributes.push(newFetchDataAttr);
-                }
-            }
-        }
+    if (!paramsExpression) {
+        return;
     }
+    // Wrap params in useMemo with empty dependencies array
+    // This ensures the object reference stays stable across re-renders
+    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 findChildWithClass(node, classSubstring) {
-    var _a;
-    if (!node) {
-        return null;
-    }
-    if (node.type === 'JSXElement') {
-        var className = getClassName(((_a = node.openingElement) === null || _a === void 0 ? void 0 : _a.attributes) || []);
-        if (className && className.includes(classSubstring)) {
-            return className;
-        }
-    }
-    if (node.children) {
-        for (var _i = 0, _b = node.children; _i < _b.length; _i++) {
-            var child = _b[_i];
-            var found = findChildWithClass(child, classSubstring);
-            if (found) {
-                return found;
-            }
-        }
-    }
-    if (typeof node === 'object') {
-        for (var _c = 0, _d = Object.values(node); _c < _d.length; _c++) {
-            var value = _d[_c];
-            if (Array.isArray(value)) {
-                for (var _e = 0, value_1 = value; _e < value_1.length; _e++) {
-                    var item = value_1[_e];
-                    var found = findChildWithClass(item, classSubstring);
-                    if (found) {
-                        return found;
-                    }
-                }
-            }
-            else if (typeof value === 'object') {
-                var found = findChildWithClass(value, classSubstring);
-                if (found) {
-                    return found;
-                }
-            }
-        }
-    }
-    return null;
+function createFetchDataAttribute(fileName) {
+    return types.jsxAttribute(types.jsxIdentifier('fetchData'), types.jsxExpressionContainer(types.callExpression(types.identifier('useCallback'), [
+        types.arrowFunctionExpression([types.identifier('params')], types.callExpression(types.memberExpression(types.callExpression(types.memberExpression(types.callExpression(types.identifier('fetch'), [
+            types.templateLiteral([
+                types.templateElement({
+                    raw: "/api/".concat(fileName, "?"),
+                    cooked: "/api/".concat(fileName, "?"),
+                }),
+                types.templateElement({ raw: '', cooked: '' }),
+            ], [
+                types.newExpression(types.identifier('URLSearchParams'), [
+                    types.identifier('params'),
+                ]),
+            ]),
+            types.objectExpression([
+                types.objectProperty(types.identifier('headers'), types.objectExpression([
+                    types.objectProperty(types.stringLiteral('Content-Type'), types.stringLiteral('application/json')),
+                ])),
+            ]),
+        ]), types.identifier('then')), [
+            types.arrowFunctionExpression([types.identifier('res')], types.callExpression(types.memberExpression(types.identifier('res'), types.identifier('json')), [])),
+        ]), types.identifier('then')), [
+            types.arrowFunctionExpression([types.identifier('response')], types.optionalMemberExpression(types.identifier('response'), types.identifier('data'), false, true)),
+        ])),
+        types.arrayExpression([]),
+    ])));
 }
-function modifyPaginationButtons(blockStatement, detectedPaginations, paginationInfos) {
-    var modifiedButtons = new Set();
-    var modifyNode = function (node) {
+function wireSearchInput(inputNode, vars) {
+    // Remove existing onChange and value
+    inputNode.openingElement.attributes = inputNode.openingElement.attributes.filter(function (attr) { var _a; return !['onChange', 'value'].includes((_a = attr.name) === null || _a === void 0 ? void 0 : _a.name); });
+    // Add onChange
+    inputNode.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('onChange'), types.jsxExpressionContainer(types.arrowFunctionExpression([types.identifier('e')], types.callExpression(types.identifier(vars.setSearchQueryVar), [
+        types.memberExpression(types.memberExpression(types.identifier('e'), types.identifier('target')), types.identifier('value')),
+    ])))));
+    // Add value
+    inputNode.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('value'), types.jsxExpressionContainer(types.identifier(vars.searchQueryVar))));
+}
+function wirePaginationButtons(paginationNode, usage, vars) {
+    // Find prev and next buttons
+    var findButton = function (node, direction) {
+        var _a, _b, _c, _d, _e;
         if (!node) {
-            return;
+            return null;
         }
         if (node.type === 'JSXElement') {
-            var openingElement = node.openingElement;
-            if (openingElement && openingElement.name && openingElement.name.type === 'JSXIdentifier') {
-                var className = getClassName(openingElement.attributes);
-                if (className && !modifiedButtons.has(node)) {
-                    for (var index = 0; index < detectedPaginations.length; index++) {
-                        var detected = detectedPaginations[index];
-                        var info = paginationInfos[index];
-                        if (!info) {
-                            continue;
-                        }
-                        if (className === detected.prevButtonClass) {
-                            convertToButton(node, info, 'prev');
-                            modifiedButtons.add(node);
-                            break;
-                        }
-                        else if (className === detected.nextButtonClass) {
-                            convertToButton(node, info, 'next');
-                            modifiedButtons.add(node);
-                            break;
-                        }
-                    }
-                }
+            var classAttr = (_b = (_a = node.openingElement) === null || _a === void 0 ? void 0 : _a.attributes) === null || _b === void 0 ? void 0 : _b.find(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'className'; });
+            var className = ((_c = classAttr === null || classAttr === void 0 ? void 0 : classAttr.value) === null || _c === void 0 ? void 0 : _c.value) || ((_e = (_d = classAttr === null || classAttr === void 0 ? void 0 : classAttr.value) === null || _d === void 0 ? void 0 : _d.expression) === null || _e === void 0 ? void 0 : _e.value) || '';
+            if (className.includes(direction)) {
+                return node;
             }
         }
-        if (typeof node === 'object') {
-            Object.values(node).forEach(function (value) {
-                if (Array.isArray(value)) {
-                    value.forEach(function (item) { return modifyNode(item); });
-                }
-                else if (typeof value === 'object') {
-                    modifyNode(value);
+        if (node.children && Array.isArray(node.children)) {
+            for (var _i = 0, _f = node.children; _i < _f.length; _i++) {
+                var c = _f[_i];
+                var found = findButton(c, direction);
+                if (found) {
+                    return found;
                 }
-            });
+            }
         }
+        return null;
     };
-    modifyNode(blockStatement);
-}
-function modifySearchInputs(blockStatement, detectedPaginations, paginationInfos) {
-    var modifiedInputs = new Set();
-    var modifyNode = function (node) {
-        if (!node) {
-            return;
+    var prevButton = findButton(paginationNode, 'previous');
+    var nextButton = findButton(paginationNode, 'next');
+    var isCombinedState = usage.category === 'paginated+search';
+    if (prevButton) {
+        // Change to button element
+        prevButton.openingElement.name.name = 'button';
+        if (prevButton.closingElement) {
+            prevButton.closingElement.name.name = 'button';
         }
-        if (node.type === 'JSXElement') {
-            var openingElement = node.openingElement;
-            if (openingElement && openingElement.name && openingElement.name.type === 'JSXIdentifier') {
-                var className = getClassName(openingElement.attributes);
-                if (className && !modifiedInputs.has(node)) {
-                    for (var index = 0; index < detectedPaginations.length; index++) {
-                        var detected = detectedPaginations[index];
-                        var info = paginationInfos[index];
-                        if (!info || !info.searchEnabled) {
-                            continue;
-                        }
-                        if (className === detected.searchInputClass) {
-                            addSearchInputHandlers(node, info);
-                            modifiedInputs.add(node);
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        if (typeof node === 'object') {
-            Object.values(node).forEach(function (value) {
-                if (Array.isArray(value)) {
-                    value.forEach(function (item) { return modifyNode(item); });
-                }
-                else if (typeof value === 'object') {
-                    modifyNode(value);
-                }
-            });
+        // Add type="button"
+        var hasType = prevButton.openingElement.attributes.some(function (a) { var _a; return ((_a = a.name) === null || _a === void 0 ? void 0 : _a.name) === 'type'; });
+        if (!hasType) {
+            prevButton.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('type'), types.stringLiteral('button')));
         }
-    };
-    modifyNode(blockStatement);
-}
-function addSearchInputHandlers(jsxElement, info) {
-    if (!info.searchQueryVar || !info.setSearchQueryVar) {
-        return;
-    }
-    var openingElement = jsxElement.openingElement;
-    removeAttribute(openingElement.attributes, 'onChange');
-    removeAttribute(openingElement.attributes, 'value');
-    var onChangeHandler = types.arrowFunctionExpression([types.identifier('e')], types.callExpression(types.identifier(info.setSearchQueryVar), [
-        types.memberExpression(types.memberExpression(types.identifier('e'), types.identifier('target')), types.identifier('value')),
-    ]));
-    openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('onChange'), types.jsxExpressionContainer(onChangeHandler)));
-    openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('value'), types.jsxExpressionContainer(types.identifier(info.searchQueryVar))));
-}
-function convertToButton(jsxElement, info, buttonType) {
-    var openingElement = jsxElement.openingElement;
-    if (openingElement.name.type === 'JSXIdentifier') {
-        openingElement.name.name = 'button';
-    }
-    if (jsxElement.closingElement && jsxElement.closingElement.name.type === 'JSXIdentifier') {
-        jsxElement.closingElement.name.name = 'button';
-    }
-    removeAttribute(openingElement.attributes, 'onClick');
-    removeAttribute(openingElement.attributes, 'disabled');
-    removeAttribute(openingElement.attributes, 'type');
-    var combinedStateVar = info.combinedStateVar;
-    var setCombinedStateVar = info.setCombinedStateVar;
-    var onClickHandler;
-    if (info.searchEnabled && combinedStateVar && setCombinedStateVar) {
-        // Use combined state: update only the page property
-        onClickHandler =
-            buttonType === 'prev'
-                ? types.arrowFunctionExpression([], types.callExpression(types.identifier(setCombinedStateVar), [
-                    types.arrowFunctionExpression([types.identifier('state')], types.objectExpression([
-                        types.spreadElement(types.identifier('state')),
-                        types.objectProperty(types.identifier('page'), types.callExpression(types.memberExpression(types.identifier('Math'), types.identifier('max')), [
-                            types.numericLiteral(1),
-                            types.binaryExpression('-', types.memberExpression(types.identifier('state'), types.identifier('page')), types.numericLiteral(1)),
-                        ])),
-                    ])),
-                ]))
-                : types.arrowFunctionExpression([], types.callExpression(types.identifier(setCombinedStateVar), [
-                    types.arrowFunctionExpression([types.identifier('state')], types.objectExpression([
-                        types.spreadElement(types.identifier('state')),
-                        types.objectProperty(types.identifier('page'), types.binaryExpression('+', types.memberExpression(types.identifier('state'), types.identifier('page')), types.numericLiteral(1))),
-                    ])),
-                ]));
-    }
-    else {
-        // Regular pagination (no search)
-        onClickHandler =
-            buttonType === 'prev'
-                ? types.arrowFunctionExpression([], types.callExpression(types.identifier(info.setPageStateVar), [
-                    types.arrowFunctionExpression([types.identifier('p')], types.callExpression(types.memberExpression(types.identifier('Math'), types.identifier('max')), [
+        // Add onClick
+        prevButton.openingElement.attributes = prevButton.openingElement.attributes.filter(function (a) { var _a; return ((_a = a.name) === null || _a === void 0 ? void 0 : _a.name) !== 'onClick'; });
+        if (isCombinedState) {
+            prevButton.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('onClick'), types.jsxExpressionContainer(types.arrowFunctionExpression([], types.callExpression(types.identifier(vars.setCombinedStateVar), [
+                types.arrowFunctionExpression([types.identifier('state')], types.objectExpression([
+                    types.spreadElement(types.identifier('state')),
+                    types.objectProperty(types.identifier('page'), types.callExpression(types.memberExpression(types.identifier('Math'), types.identifier('max')), [
                         types.numericLiteral(1),
-                        types.binaryExpression('-', types.identifier('p'), types.numericLiteral(1)),
+                        types.binaryExpression('-', types.memberExpression(types.identifier('state'), types.identifier('page')), types.numericLiteral(1)),
                     ])),
-                ]))
-                : types.arrowFunctionExpression([], types.callExpression(types.identifier(info.setPageStateVar), [
-                    types.arrowFunctionExpression([types.identifier('p')], types.binaryExpression('+', types.identifier('p'), types.numericLiteral(1))),
-                ]));
-    }
-    openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('onClick'), types.jsxExpressionContainer(onClickHandler)));
-    openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('type'), types.stringLiteral('button')));
-    // Add disabled attribute with simple page number checks
-    var maxPagesStateVar = info.maxPagesStateVar;
-    var disabledExpr;
-    if (info.searchEnabled && combinedStateVar) {
-        disabledExpr =
-            buttonType === 'prev'
-                ? types.binaryExpression('<=', types.memberExpression(types.identifier(combinedStateVar), types.identifier('page')), types.numericLiteral(1))
-                : types.binaryExpression('>=', types.memberExpression(types.identifier(combinedStateVar), types.identifier('page')), types.identifier(maxPagesStateVar));
-    }
-    else {
-        disabledExpr =
-            buttonType === 'prev'
-                ? types.binaryExpression('<=', types.identifier(info.pageStateVar), types.numericLiteral(1))
-                : types.binaryExpression('>=', types.identifier(info.pageStateVar), types.identifier(maxPagesStateVar));
+                ])),
+            ])))));
+            // Add disabled
+            prevButton.openingElement.attributes = prevButton.openingElement.attributes.filter(function (a) { var _a; return ((_a = a.name) === null || _a === void 0 ? void 0 : _a.name) !== 'disabled'; });
+            prevButton.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('disabled'), types.jsxExpressionContainer(types.binaryExpression('<=', types.memberExpression(types.identifier(vars.combinedStateVar), types.identifier('page')), types.numericLiteral(1)))));
+        }
+        else {
+            prevButton.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('onClick'), types.jsxExpressionContainer(types.arrowFunctionExpression([], types.callExpression(types.identifier(vars.setPageStateVar), [
+                types.arrowFunctionExpression([types.identifier('page')], types.callExpression(types.memberExpression(types.identifier('Math'), types.identifier('max')), [
+                    types.numericLiteral(1),
+                    types.binaryExpression('-', types.identifier('page'), types.numericLiteral(1)),
+                ])),
+            ])))));
+            prevButton.openingElement.attributes = prevButton.openingElement.attributes.filter(function (a) { var _a; return ((_a = a.name) === null || _a === void 0 ? void 0 : _a.name) !== 'disabled'; });
+            prevButton.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('disabled'), types.jsxExpressionContainer(types.binaryExpression('<=', types.identifier(vars.pageStateVar), types.numericLiteral(1)))));
+        }
     }
-    openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('disabled'), types.jsxExpressionContainer(disabledExpr)));
-}
-function getClassName(attributes) {
-    var classNameAttr = attributes.find(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'className'; });
-    if (classNameAttr && classNameAttr.value && classNameAttr.value.type === 'StringLiteral') {
-        return classNameAttr.value.value;
+    if (nextButton) {
+        nextButton.openingElement.name.name = 'button';
+        if (nextButton.closingElement) {
+            nextButton.closingElement.name.name = 'button';
+        }
+        var hasType = nextButton.openingElement.attributes.some(function (a) { var _a; return ((_a = a.name) === null || _a === void 0 ? void 0 : _a.name) === 'type'; });
+        if (!hasType) {
+            nextButton.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('type'), types.stringLiteral('button')));
+        }
+        nextButton.openingElement.attributes = nextButton.openingElement.attributes.filter(function (a) { var _a; return ((_a = a.name) === null || _a === void 0 ? void 0 : _a.name) !== 'onClick'; });
+        if (isCombinedState) {
+            nextButton.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('onClick'), types.jsxExpressionContainer(types.arrowFunctionExpression([], types.callExpression(types.identifier(vars.setCombinedStateVar), [
+                types.arrowFunctionExpression([types.identifier('state')], types.objectExpression([
+                    types.spreadElement(types.identifier('state')),
+                    types.objectProperty(types.identifier('page'), types.binaryExpression('+', types.memberExpression(types.identifier('state'), types.identifier('page')), types.numericLiteral(1))),
+                ])),
+            ])))));
+            nextButton.openingElement.attributes = nextButton.openingElement.attributes.filter(function (a) { var _a; return ((_a = a.name) === null || _a === void 0 ? void 0 : _a.name) !== 'disabled'; });
+            nextButton.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('disabled'), types.jsxExpressionContainer(types.binaryExpression('>=', types.memberExpression(types.identifier(vars.combinedStateVar), types.identifier('page')), types.identifier(vars.maxPagesStateVar)))));
+        }
+        else {
+            nextButton.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('onClick'), types.jsxExpressionContainer(types.arrowFunctionExpression([], types.callExpression(types.identifier(vars.setPageStateVar), [
+                types.arrowFunctionExpression([types.identifier('page')], types.binaryExpression('+', types.identifier('page'), types.numericLiteral(1))),
+            ])))));
+            nextButton.openingElement.attributes = nextButton.openingElement.attributes.filter(function (a) { var _a; return ((_a = a.name) === null || _a === void 0 ? void 0 : _a.name) !== 'disabled'; });
+            nextButton.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('disabled'), types.jsxExpressionContainer(types.binaryExpression('>=', types.identifier(vars.pageStateVar), types.identifier(vars.maxPagesStateVar)))));
+        }
     }
-    return null;
 }
-function removeAttribute(attrs, attributeName) {
-    var index = attrs.findIndex(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === attributeName; });
-    if (index !== -1) {
-        attrs.splice(index, 1);
+function ensureAPIRouteExists(extractedResources, usage) {
+    // 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,
+            };
+        }
     }
 }
-function modifyGetStaticPropsForPagination(chunks, paginationInfos) {
+function updateGetStaticProps(chunks, registry) {
     var _a;
-    var getStaticPropsChunk = chunks.find(function (chunk) { return chunk.name === 'getStaticProps'; });
-    if (!getStaticPropsChunk || getStaticPropsChunk.type !== 'ast') {
+    var getStaticPropsChunk = chunks.find(function (c) { return c.name === 'getStaticProps'; });
+    if (!getStaticPropsChunk || getStaticPropsChunk.type !== teleport_types_1.ChunkType.AST) {
         return;
     }
-    var exportDeclaration = getStaticPropsChunk.content;
-    if (!exportDeclaration || exportDeclaration.type !== 'ExportNamedDeclaration') {
+    var content = getStaticPropsChunk.content;
+    if (!content.declaration || content.declaration.type !== 'FunctionDeclaration') {
         return;
     }
-    var functionDeclaration = exportDeclaration.declaration;
-    if (!functionDeclaration || functionDeclaration.type !== 'FunctionDeclaration') {
+    var funcBody = content.declaration.body;
+    var tryStmt = funcBody.body.find(function (s) { return s.type === 'TryStatement'; });
+    if (!tryStmt) {
         return;
     }
-    // Find Promise.all and add NEW fetchData calls for each paginated DataProvider
-    var functionBody = functionDeclaration.body.body;
-    var tryBlock = functionBody.find(function (stmt) { return stmt.type === 'TryStatement'; });
-    if (!tryBlock) {
-        return;
-    }
-    var tryBody = tryBlock.block.body;
-    // Find the Promise.all statement
-    var promiseAllStmt = tryBody.find(function (stmt) {
+    var tryBlock = tryStmt.block;
+    // Find existing Promise.all
+    var promiseAllDecl = tryBlock.body.find(function (s) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
-        return stmt.type === 'VariableDeclaration' &&
-            ((_c = (_b = (_a = stmt.declarations) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.init) === null || _c === void 0 ? void 0 : _c.type) === 'AwaitExpression' &&
-            ((_g = (_f = (_e = (_d = stmt.declarations) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.init) === null || _f === void 0 ? void 0 : _f.argument) === null || _g === void 0 ? void 0 : _g.type) === 'CallExpression' &&
-            ((_m = (_l = (_k = (_j = (_h = stmt.declarations) === null || _h === void 0 ? void 0 : _h[0]) === null || _j === void 0 ? void 0 : _j.init) === null || _k === void 0 ? void 0 : _k.argument) === null || _l === void 0 ? void 0 : _l.callee) === null || _m === void 0 ? void 0 : _m.type) === 'MemberExpression' &&
-            ((_t = (_s = (_r = (_q = (_p = (_o = stmt.declarations) === null || _o === void 0 ? void 0 : _o[0]) === null || _p === void 0 ? void 0 : _p.init) === null || _q === void 0 ? void 0 : _q.argument) === null || _r === void 0 ? void 0 : _r.callee) === null || _s === void 0 ? void 0 : _s.property) === null || _t === void 0 ? void 0 : _t.name) === 'all';
+        return s.type === 'VariableDeclaration' &&
+            ((_c = (_b = (_a = s.declarations) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.init) === null || _c === void 0 ? void 0 : _c.type) === 'AwaitExpression' &&
+            ((_g = (_f = (_e = (_d = s.declarations) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.init) === null || _f === void 0 ? void 0 : _f.argument) === null || _g === void 0 ? void 0 : _g.type) === 'CallExpression' &&
+            ((_m = (_l = (_k = (_j = (_h = s.declarations) === null || _h === void 0 ? void 0 : _h[0]) === null || _j === void 0 ? void 0 : _j.init) === null || _k === void 0 ? void 0 : _k.argument) === null || _l === void 0 ? void 0 : _l.callee) === null || _m === void 0 ? void 0 : _m.type) === 'MemberExpression' &&
+            ((_t = (_s = (_r = (_q = (_p = (_o = s.declarations) === null || _o === void 0 ? void 0 : _o[0]) === null || _p === void 0 ? void 0 : _p.init) === null || _q === void 0 ? void 0 : _q.argument) === null || _r === void 0 ? void 0 : _r.callee) === null || _s === void 0 ? void 0 : _s.object) === null || _t === void 0 ? void 0 : _t.name) === 'Promise';
     });
-    if (!promiseAllStmt) {
+    if (!promiseAllDecl) {
         return;
     }
-    var awaitExpr = promiseAllStmt.declarations[0].init;
+    var declarator = promiseAllDecl.declarations[0];
+    var awaitExpr = declarator.init;
     var promiseAllCall = awaitExpr.argument;
-    var promiseArray = promiseAllCall.arguments[0];
-    var destructuringPattern = promiseAllStmt.declarations[0].id;
-    // Map import names to data source identifiers from existing fetchData calls
-    // Also track which indices to remove (non-paginated calls that will be replaced)
-    var importToDataSource = new Map();
-    var indicesToRemove = [];
-    promiseArray.elements.forEach(function (element, index) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        if (element && element.type === 'CallExpression') {
-            var fetchCallExpr = element;
-            // If wrapped in .catch(), unwrap it
-            if (((_a = element.callee) === null || _a === void 0 ? void 0 : _a.type) === 'MemberExpression' &&
-                ((_c = (_b = element.callee) === null || _b === void 0 ? void 0 : _b.property) === null || _c === void 0 ? void 0 : _c.name) === 'catch' &&
-                ((_e = (_d = element.callee) === null || _d === void 0 ? void 0 : _d.object) === null || _e === void 0 ? void 0 : _e.type) === 'CallExpression') {
-                fetchCallExpr = element.callee.object;
-            }
-            // Now find the .fetchData() call
-            if (((_f = fetchCallExpr.callee) === null || _f === void 0 ? void 0 : _f.type) === 'MemberExpression' &&
-                ((_h = (_g = fetchCallExpr.callee) === null || _g === void 0 ? void 0 : _g.property) === null || _h === void 0 ? void 0 : _h.name) === 'fetchData' &&
-                ((_k = (_j = fetchCallExpr.callee) === null || _j === void 0 ? void 0 : _j.object) === null || _k === void 0 ? void 0 : _k.type) === 'Identifier') {
-                var importName = fetchCallExpr.callee.object.name;
-                var dataSourceVar_1 = destructuringPattern.elements[index].name;
-                // Check if this fetchData call has page/perPage params
-                var params = fetchCallExpr.arguments[0];
-                var hasPageParam = params &&
-                    params.type === 'ObjectExpression' &&
-                    params.properties.some(function (prop) {
-                        return prop.type === 'ObjectProperty' &&
-                            (prop.key.name === 'page' || prop.key.name === 'perPage');
-                    });
-                // If this is a data source that will be paginated but this call has NO pagination params,
-                // mark it for removal
-                if (!hasPageParam &&
-                    paginationInfos.some(function (info) { return info.dataSourceIdentifier === dataSourceVar_1; })) {
-                    indicesToRemove.push(index);
-                }
-                importToDataSource.set(importName, dataSourceVar_1);
-            }
+    var fetchesArray = promiseAllCall.arguments[0];
+    // Find return statement
+    var returnStmt = tryBlock.body.find(function (s) { return s.type === 'ReturnStatement'; });
+    if (!returnStmt || ((_a = returnStmt.argument) === null || _a === void 0 ? void 0 : _a.type) !== 'ObjectExpression') {
+        return;
+    }
+    var returnObj = returnStmt.argument;
+    var propsProperty = returnObj.properties.find(function (p) { return p.type === 'ObjectProperty' && p.key.type === 'Identifier' && p.key.name === 'props'; });
+    if (!propsProperty || propsProperty.value.type !== 'ObjectExpression') {
+        return;
+    }
+    var propsObj = propsProperty.value;
+    var arrayPattern = declarator.id;
+    // Track unique data sources for count fetching
+    var dataSourcesNeedingCount = new Set();
+    registry.usages.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)
+        var fetcherImportName = teleport_shared_1.StringUtils.dashCaseToCamelCase(fileName);
+        // Add fetch call
+        var fetchParams = [];
+        if (usage.paginated) {
+            // For paginated array mappers, add page and perPage
+            fetchParams.push(types.objectProperty(types.identifier('page'), types.numericLiteral(1)));
+            fetchParams.push(types.objectProperty(types.identifier('perPage'), types.numericLiteral(usage.perPage)));
         }
-    });
-    // Remove non-paginated fetchData calls in reverse order to preserve indices
-    indicesToRemove.reverse().forEach(function (index) {
-        var _a, _b;
-        // Get the prop name BEFORE removing it
-        var propToRemove = (_a = destructuringPattern.elements[index]) === null || _a === void 0 ? void 0 : _a.name;
-        promiseArray.elements.splice(index, 1);
-        destructuringPattern.elements.splice(index, 1);
-        // Also remove from props in return statement
-        if (propToRemove) {
-            var foundReturnStmt = tryBody.find(function (stmt) { return stmt.type === 'ReturnStatement'; });
-            if (foundReturnStmt && ((_b = foundReturnStmt.argument) === null || _b === void 0 ? void 0 : _b.type) === 'ObjectExpression') {
-                var propsProperty = foundReturnStmt.argument.properties.find(function (prop) {
-                    return prop.type === 'ObjectProperty' && prop.key.name === 'props';
-                });
-                if (propsProperty && propsProperty.value.type === 'ObjectExpression') {
-                    var propsObject = propsProperty.value;
-                    var propIndex = propsObject.properties.findIndex(function (prop) {
-                        return prop.type === 'ObjectProperty' && prop.key.name === propToRemove;
-                    });
-                    if (propIndex !== -1) {
-                        propsObject.properties.splice(propIndex, 1);
-                    }
-                }
-            }
+        else if (usage.perPage > 0) {
+            // For non-paginated array mappers with a limit, add the limit as perPage
+            // This ensures the initial data fetch respects the limit from the UIDL
+            fetchParams.push(types.objectProperty(types.identifier('perPage'), types.numericLiteral(usage.perPage)));
         }
-    });
-    // Add NEW fetchData calls for each paginated DataProvider
-    paginationInfos.forEach(function (info, index) {
-        var _a, _b;
-        // Try exact match first, then case-insensitive match
-        var importName = (_a = Array.from(importToDataSource.entries()).find(function (_a) {
-            var _ = _a[0], dataSourceVar = _a[1];
-            return dataSourceVar === info.dataSourceIdentifier;
-        })) === null || _a === void 0 ? void 0 : _a[0];
-        if (!importName) {
-            // Try case-insensitive match
-            var normalizedIdentifier_1 = info.dataSourceIdentifier.toLowerCase().replace(/[_-]/g, '');
-            importName = (_b = Array.from(importToDataSource.entries()).find(function (_a) {
-                var _ = _a[0], dataSourceVar = _a[1];
-                return dataSourceVar.toLowerCase().replace(/[_-]/g, '') === normalizedIdentifier_1;
-            })) === null || _b === void 0 ? void 0 : _b[0];
+        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); }))])));
         }
-        if (importName) {
-            var paginatedVarName = "".concat(info.dataSourceIdentifier, "_pg_").concat(index);
-            var fetchParams = [
-                types.objectProperty(types.identifier('page'), types.numericLiteral(1)),
-                types.objectProperty(types.identifier('perPage'), types.numericLiteral(info.perPage)),
-            ];
-            // Add queryColumns if they exist
-            if (info.queryColumns && info.queryColumns.length > 0) {
-                fetchParams.push(types.objectProperty(types.identifier('queryColumns'), types.arrayExpression(info.queryColumns.map(function (col) { return types.stringLiteral(col); }))));
-            }
-            // Create new fetchData call with pagination params
-            var newFetchDataCall = types.callExpression(types.memberExpression(types.callExpression(types.memberExpression(types.identifier(importName), types.identifier('fetchData')), [types.objectExpression(fetchParams)]), types.identifier('catch')), [
+        // 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) {
+            arrayPattern.elements.push(types.identifier(vars.propsPrefix));
+            fetchesArray.elements.push(types.callExpression(types.memberExpression(types.callExpression(types.memberExpression(types.identifier(fetcherImportName), types.identifier('fetchData')), [types.objectExpression(fetchParams)]), 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(paginatedVarName, ":")),
+                        types.stringLiteral("Error fetching ".concat(vars.propsPrefix, ":")),
                         types.identifier('error'),
                     ])),
                     types.returnStatement(types.arrayExpression([])),
                 ])),
-            ]);
-            promiseArray.elements.push(newFetchDataCall);
-            destructuringPattern.elements.push(types.identifier(paginatedVarName));
+            ]));
+            // Add to props
+            propsObj.properties.push(types.objectProperty(types.identifier(vars.propsPrefix), types.identifier(vars.propsPrefix)));
         }
-    });
-    // Add fetchCount calls for paginated data sources (deduplicated by data source)
-    // Deduplicate by data source identifier
-    var uniqueDataSources = new Set(paginationInfos.map(function (info) { return info.dataSourceIdentifier; }));
-    var addedCountFetches = new Set();
-    uniqueDataSources.forEach(function (dataSourceId) {
-        var _a, _b;
-        var importName = (_a = Array.from(importToDataSource.entries()).find(function (_a) {
-            var _ = _a[0], dataSourceVar = _a[1];
-            return dataSourceVar === dataSourceId;
-        })) === null || _a === void 0 ? void 0 : _a[0];
-        if (!importName) {
-            // Try case-insensitive match
-            var normalizedIdentifier_2 = dataSourceId.toLowerCase().replace(/[_-]/g, '');
-            importName = (_b = Array.from(importToDataSource.entries()).find(function (_a) {
-                var _ = _a[0], dataSourceVar = _a[1];
-                return dataSourceVar.toLowerCase().replace(/[_-]/g, '') === normalizedIdentifier_2;
-            })) === null || _b === void 0 ? void 0 : _b[0];
+        // Track for count fetching
+        if (usage.paginated) {
+            dataSourcesNeedingCount.add("".concat(usage.resourceDefinition.dataSourceType, ":").concat(usage.resourceDefinition.tableName, ":").concat(usage.resourceDefinition.dataSourceId));
         }
-        if (importName && !addedCountFetches.has(dataSourceId)) {
-            var fetchCountCall = types.callExpression(types.memberExpression(types.identifier(importName), types.identifier('fetchCount')), []);
-            promiseArray.elements.push(fetchCountCall);
-            destructuringPattern.elements.push(types.identifier("".concat(dataSourceId, "_count")));
-            addedCountFetches.add(dataSourceId);
-        }
-    });
-    // Calculate and add maxPages before return
-    var returnStmt = tryBody.find(function (stmt) { return stmt.type === 'ReturnStatement'; });
-    if (returnStmt && ((_a = returnStmt.argument) === null || _a === void 0 ? void 0 : _a.type) === 'ObjectExpression') {
-        var propsProperty = returnStmt.argument.properties.find(function (prop) {
-            return prop.type === 'ObjectProperty' && prop.key.name === 'props';
-        });
-        if (propsProperty && propsProperty.value.type === 'ObjectExpression') {
-            var propsObject_1 = propsProperty.value;
-            var returnIndex_1 = tryBody.indexOf(returnStmt);
-            paginationInfos.forEach(function (info, index) {
-                var paginatedVarName = "".concat(info.dataSourceIdentifier, "_pg_").concat(index);
-                var countVarName = "".concat(info.dataSourceIdentifier, "_count");
-                var maxPagesVarName = "".concat(info.dataSourceIdentifier, "_pg_").concat(index, "_maxPages");
-                var maxPagesCalc = types.variableDeclaration('const', [
-                    types.variableDeclarator(types.identifier(maxPagesVarName), types.callExpression(types.memberExpression(types.identifier('Math'), types.identifier('ceil')), [
-                        types.binaryExpression('/', types.logicalExpression('||', types.identifier(countVarName), types.numericLiteral(0)), types.numericLiteral(info.perPage)),
+        // Add maxPages calculation for paginated
+        if (usage.paginated) {
+            var maxPagesPropName_1 = "".concat(vars.propsPrefix, "_maxPages");
+            var countVarName = "".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) {
+                // Insert maxPages calculation before return
+                var returnIndex = tryBlock.body.indexOf(returnStmt);
+                tryBlock.body.splice(returnIndex, 0, types.variableDeclaration('const', [
+                    types.variableDeclarator(types.identifier(maxPagesPropName_1), types.callExpression(types.memberExpression(types.identifier('Math'), types.identifier('ceil')), [
+                        types.binaryExpression('/', types.logicalExpression('||', types.identifier(countVarName), types.numericLiteral(0)), types.numericLiteral(usage.perPage)),
                     ])),
-                ]);
-                tryBody.splice(returnIndex_1, 0, maxPagesCalc);
-                // Add both the paginated data and maxPages to props
-                propsObject_1.properties.push(types.objectProperty(types.identifier(paginatedVarName), types.identifier(paginatedVarName)));
-                propsObject_1.properties.push(types.objectProperty(types.identifier(maxPagesVarName), types.identifier(maxPagesVarName)));
-            });
-        }
-    }
-}
-function createAPIRoutesForPaginatedDataSources(uidlNode, dataSources, componentChunk, extractedResources, paginationInfos, isComponent) {
-    var paginatedDataSourceIds = new Set(paginationInfos.map(function (info) { return info.dataSourceIdentifier; }));
-    var searchEnabledDataSources = new Set(paginationInfos.filter(function (info) { return info.searchEnabled; }).map(function (info) { return info.dataSourceIdentifier; }));
-    var createdCountRoutes = new Set();
-    var traverseForDataSources = function (node) {
-        var _a;
-        if (!node) {
-            return;
-        }
-        if (node.type === 'data-source-list' || node.type === 'data-source-item') {
-            var renderProp = node.content.renderPropIdentifier;
-            if (renderProp && paginatedDataSourceIds.has(renderProp)) {
-                (0, utils_1.extractDataSourceIntoNextAPIFolder)(node, dataSources, componentChunk, extractedResources);
-                var hasSearch = searchEnabledDataSources.has(renderProp);
-                var needsCountRoute = isComponent || hasSearch;
-                if (needsCountRoute) {
-                    var resourceDef = node.content.resourceDefinition;
-                    if (resourceDef) {
-                        var dataSourceId = resourceDef.dataSourceId;
-                        var tableName = resourceDef.tableName;
-                        var dataSourceType = resourceDef.dataSourceType;
-                        var fileName = "".concat(dataSourceType, "-").concat(tableName, "-").concat(dataSourceId.substring(0, 8));
-                        var countFileName = "".concat(fileName, "-count");
-                        if (!createdCountRoutes.has(countFileName)) {
-                            extractedResources["api/".concat(countFileName)] = {
-                                fileName: countFileName,
-                                fileType: teleport_types_1.FileType.JS,
-                                path: ['pages', 'api'],
-                                content: "import dataSource from '../../utils/data-sources/".concat(fileName, "'\n\nexport default dataSource.getCount\n"),
-                            };
-                            createdCountRoutes.add(countFileName);
-                        }
-                    }
-                }
+                ]));
+                // Add maxPages to props
+                propsObj.properties.push(types.objectProperty(types.identifier(maxPagesPropName_1), types.identifier(maxPagesPropName_1)));
             }
         }
-        if ((_a = node.content) === null || _a === void 0 ? void 0 : _a.children) {
-            node.content.children.forEach(function (child) { return traverseForDataSources(child); });
-        }
-    };
-    traverseForDataSources(uidlNode);
-}
-function createAPIRoutesForSearchOnlyDataSources(uidlNode, dataSources, componentChunk, extractedResources, searchOnlyDataSources) {
-    var searchOnlyDataSourceIds = new Set(searchOnlyDataSources.map(function (info) { return info.dataSourceIdentifier; }));
-    var traverseForDataSources = function (node) {
-        var _a;
-        if (!node) {
+    });
+    // Add count fetches for unique data sources
+    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) {
+            return u.resourceDefinition.dataSourceId === dataSourceId &&
+                u.resourceDefinition.tableName === tableName;
+        });
+        if (!usage) {
             return;
         }
-        if (node.type === 'data-source-list' || node.type === 'data-source-item') {
-            var renderProp = node.content.renderPropIdentifier;
-            if (renderProp && searchOnlyDataSourceIds.has(renderProp)) {
-                (0, utils_1.extractDataSourceIntoNextAPIFolder)(node, dataSources, componentChunk, extractedResources);
-            }
-        }
-        if ((_a = node.content) === null || _a === void 0 ? void 0 : _a.children) {
-            node.content.children.forEach(function (child) { return traverseForDataSources(child); });
+        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')), []));
         }
-    };
-    traverseForDataSources(uidlNode);
+    });
 }
-exports.default = (0, exports.createNextArrayMapperPaginationPlugin)();
 //# sourceMappingURL=pagination-plugin.js.map