@teleporthq/teleport-plugin-next-data-source 0.42.1 → 0.42.3

package/dist/esm/pagination-plugin.js

@@ -49,7 +49,7 @@ import { generatePaginationLogic } from './array-mapper-pagination';
 import { extractDataSourceIntoNextAPIFolder } from './utils';
 export 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, hasSearchEnabled, firstReturnIndex, insertIndex, dataSourceToInfos_1, searchOnlyDataSources;
+        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) {
             uidl = structure.uidl, chunks = structure.chunks, dependencies = structure.dependencies, options = structure.options;
@@ -133,6 +133,7 @@ export var createNextArrayMapperPaginationPlugin = function () {
             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
@@ -143,6 +144,37 @@ export var createNextArrayMapperPaginationPlugin = function () {
                 var queryColumns = queryColumnsMap.get(detected.dataSourceIdentifier);
                 var info = 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;
+                }
+                // 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: '' }
@@ -159,7 +191,7 @@ export var createNextArrayMapperPaginationPlugin = function () {
                             ]),
                         ])),
                     ]);
-                    blockStatement.body.unshift(combinedStateAST);
+                    stateDeclarations.push(combinedStateAST);
                     // Still need the immediate search query state for the input
                     var searchStateAST = types.variableDeclaration('const', [
                         types.variableDeclarator(types.arrayPattern([
@@ -167,7 +199,7 @@ export var createNextArrayMapperPaginationPlugin = function () {
                             types.identifier(info.setSearchQueryVar),
                         ]), types.callExpression(types.identifier('useState'), [types.stringLiteral('')])),
                     ]);
-                    blockStatement.body.unshift(searchStateAST);
+                    stateDeclarations.push(searchStateAST);
                     info.combinedStateVar = combinedStateVar;
                     info.setCombinedStateVar = setCombinedStateVar;
                 }
@@ -179,40 +211,13 @@ export var createNextArrayMapperPaginationPlugin = function () {
                             types.identifier(info.setPageStateVar),
                         ]), types.callExpression(types.identifier('useState'), [types.numericLiteral(1)])),
                     ]);
-                    blockStatement.body.unshift(pageStateAST);
-                }
-                // 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])),
-                ]);
-                blockStatement.body.unshift(maxPagesStateAST);
-                info.maxPagesStateVar = maxPagesStateVar;
-                info.setMaxPagesStateVar = setMaxPagesStateVar;
-                // Add refs to track first render for each useEffect
-                if (info.searchEnabled) {
-                    var skipDebounceOnMountRefVar = "skipDebounceOnMount_pg_".concat(index);
-                    var skipDebounceRefAST = types.variableDeclaration('const', [
-                        types.variableDeclarator(types.identifier(skipDebounceOnMountRefVar), types.callExpression(types.identifier('useRef'), [types.booleanLiteral(true)])),
-                    ]);
-                    blockStatement.body.unshift(skipDebounceRefAST);
-                    info.skipDebounceOnMountRefVar = skipDebounceOnMountRefVar;
-                    var skipCountFetchOnMountRefVar = "skipCountFetchOnMount_pg_".concat(index);
-                    var skipCountFetchRefAST = types.variableDeclaration('const', [
-                        types.variableDeclarator(types.identifier(skipCountFetchOnMountRefVar), types.callExpression(types.identifier('useRef'), [types.booleanLiteral(true)])),
-                    ]);
-                    blockStatement.body.unshift(skipCountFetchRefAST);
-                    info.skipCountFetchOnMountRefVar = skipCountFetchOnMountRefVar;
+                    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 = {
@@ -262,74 +267,75 @@ export var createNextArrayMapperPaginationPlugin = function () {
                     ]));
                     blockStatement.body.splice(insertIndex, 0, debounceEffect);
                     // Add useEffect to refetch count when search changes (for both pages and components)
-                    if (info.queryColumns && info.queryColumns.length > 0) {
-                        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') {
-                            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;
-                                    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([
-                                                            types.objectProperty(types.identifier('query'), types.memberExpression(types.identifier(combinedStateVar), types.identifier('debouncedQuery'))),
-                                                            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 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') {
+                        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)),
-                                                            ])),
+                                            ]),
+                                        ]), 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)),
                                                         ])),
                                                     ])),
                                                 ])),
                                             ])),
                                         ])),
-                                        types.arrayExpression([
-                                            types.memberExpression(types.identifier(combinedStateVar), types.identifier('debouncedQuery')),
-                                        ]),
-                                    ]));
-                                    blockStatement.body.splice(insertIndex, 0, refetchCountEffect);
-                                }
+                                    ])),
+                                    types.arrayExpression([
+                                        types.memberExpression(types.identifier(combinedStateVar), types.identifier('debouncedQuery')),
+                                    ]),
+                                ]));
+                                blockStatement.body.splice(insertIndex, 0, refetchCountEffect);
                             }
                         }
                     }
@@ -379,7 +385,7 @@ export var createNextArrayMapperPaginationPlugin = function () {
                     }
                     dataSourceToInfos_1.get(info.dataSourceIdentifier).push({ info: info, detected: detected, fileName: fileName });
                 });
-                // Create ONE useEffect per unique data source
+                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
@@ -407,7 +413,13 @@ export var createNextArrayMapperPaginationPlugin = function () {
                         ])),
                         types.arrayExpression([]),
                     ]));
-                    blockStatement.body.unshift(useEffectAST);
+                    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);
@@ -421,7 +433,7 @@ export var createNextArrayMapperPaginationPlugin = function () {
             }
             searchOnlyDataSources = detectedSearchOnly;
             if (searchOnlyDataSources.length > 0) {
-                handleSearchOnlyArrayMappers(blockStatement, searchOnlyDataSources, searchConfigMap, queryColumnsMap, insertIndex, dependencies);
+                handleSearchOnlyArrayMappers(blockStatement, searchOnlyDataSources, searchConfigMap, queryColumnsMap, dependencies);
                 // Create API routes for search-only data sources
                 createAPIRoutesForSearchOnlyDataSources(uidl.node, options.dataSources, componentChunk, options.extractedResources, searchOnlyDataSources);
             }
@@ -489,7 +501,7 @@ function findParentNode(root, target, currentParent) {
     return null;
 }
 function detectPaginationsAndSearchFromJSX(blockStatement, uidlNode) {
-    var dataProviderMap = new Map();
+    var dataProviderList = [];
     var arrayMapperInfoMap = new Map();
     if (uidlNode) {
         var collectArrayMapperInfo_1 = function (node) {
@@ -724,8 +736,8 @@ function detectPaginationsAndSearchFromJSX(blockStatement, uidlNode) {
             depth++;
         }
         // Record the DataProvider with its pagination/search info
-        var uniqueKey = "".concat(dataProviderIdentifier, "__").concat(arrayMapperRenderProp);
-        dataProviderMap.set(uniqueKey, {
+        // Use array instead of Map to handle multiple DataProviders with same name
+        dataProviderList.push({
             identifier: dataProviderIdentifier,
             dataProvider: dataProvider,
             arrayMapperRenderProp: arrayMapperRenderProp,
@@ -740,9 +752,16 @@ function detectPaginationsAndSearchFromJSX(blockStatement, uidlNode) {
     var searchOnlyMappers = [];
     var paginationOnlyMappers = [];
     var plainMappers = [];
-    dataProviderMap.forEach(function (info) {
+    dataProviderList.forEach(function (info) {
         var _a, _b, _c, _d;
-        if (info.hasPagination && info.hasSearch) {
+        // 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,
@@ -755,7 +774,7 @@ function detectPaginationsAndSearchFromJSX(blockStatement, uidlNode) {
                 searchInputJSX: (_b = info.searchInput) === null || _b === void 0 ? void 0 : _b.jsx,
             });
         }
-        else if (info.hasPagination && !info.hasSearch) {
+        else if (shouldHavePagination && !shouldHaveSearch) {
             // Pagination only
             paginationOnlyMappers.push({
                 paginationNodeClass: info.paginationNode.class,
@@ -768,7 +787,7 @@ function detectPaginationsAndSearchFromJSX(blockStatement, uidlNode) {
                 searchInputJSX: undefined,
             });
         }
-        else if (!info.hasPagination && info.hasSearch) {
+        else if (!shouldHavePagination && shouldHaveSearch) {
             // Search only
             searchOnlyMappers.push({
                 paginationNodeClass: '',
@@ -782,7 +801,7 @@ function detectPaginationsAndSearchFromJSX(blockStatement, uidlNode) {
             });
         }
         else {
-            // Plain (no pagination, no search)
+            // Plain (no pagination, no search) - UIDL doesn't enable it or no controls found
             plainMappers.push({
                 paginationNodeClass: '',
                 prevButtonClass: null,
@@ -797,7 +816,9 @@ function detectPaginationsAndSearchFromJSX(blockStatement, uidlNode) {
     });
     return { paginatedMappers: paginatedMappers, searchOnlyMappers: searchOnlyMappers, paginationOnlyMappers: paginationOnlyMappers, plainMappers: plainMappers };
 }
-function handleSearchOnlyArrayMappers(blockStatement, searchOnlyDataSources, searchConfigMap, queryColumnsMap, insertIndex, dependencies) {
+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");
@@ -808,11 +829,11 @@ function handleSearchOnlyArrayMappers(blockStatement, searchOnlyDataSources, sea
         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 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('')])),
+        // Add skip ref
+        var skipRefAST = types.variableDeclaration('const', [
+            types.variableDeclarator(types.identifier(skipDebounceOnMountRefVar), types.callExpression(types.identifier('useRef'), [types.booleanLiteral(true)])),
         ]);
-        blockStatement.body.unshift(searchStateAST);
+        searchOnlyStates.push(skipRefAST);
         // Add debounced search state
         var debouncedSearchStateAST = types.variableDeclaration('const', [
             types.variableDeclarator(types.arrayPattern([
@@ -820,12 +841,12 @@ function handleSearchOnlyArrayMappers(blockStatement, searchOnlyDataSources, sea
                 types.identifier(setDebouncedSearchQueryVar),
             ]), types.callExpression(types.identifier('useState'), [types.stringLiteral('')])),
         ]);
-        blockStatement.body.unshift(debouncedSearchStateAST);
-        // Add skip ref
-        var skipRefAST = types.variableDeclaration('const', [
-            types.variableDeclarator(types.identifier(skipDebounceOnMountRefVar), types.callExpression(types.identifier('useRef'), [types.booleanLiteral(true)])),
+        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('')])),
         ]);
-        blockStatement.body.unshift(skipRefAST);
+        searchOnlyStates.push(searchStateAST);
         // Add useEffect for debouncing
         if (!dependencies.useEffect) {
             dependencies.useEffect = {
@@ -857,7 +878,7 @@ function handleSearchOnlyArrayMappers(blockStatement, searchOnlyDataSources, sea
             ])),
             types.arrayExpression([types.identifier(searchQueryVar)]),
         ]));
-        blockStatement.body.splice(insertIndex, 0, debounceEffect);
+        searchOnlyEffects.push(debounceEffect);
         // Modify DataProvider to include search params (even without queryColumns)
         if (detected.dataProviderJSX) {
             addSearchParamsToDataProvider(detected.dataProviderJSX, {
@@ -874,6 +895,17 @@ function handleSearchOnlyArrayMappers(blockStatement, searchOnlyDataSources, sea
             });
         }
     });
+    // Add all state declarations at the beginning in correct order
+    searchOnlyStates.reverse().forEach(function (stateDecl) {
+        blockStatement.body.unshift(stateDecl);
+    });
+    // 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);
+    });
 }
 function addSearchParamsToDataProvider(dataProviderJSX, config) {
     var _a, _b;