@teleporthq/teleport-plugin-next-data-source 0.43.66 → 0.43.68

package/dist/esm/pagination-plugin.js

@@ -53,15 +53,19 @@ import { generateDataSourceFetcherWithCore } from './data-source-fetchers';
 import { buildProductTransformOptions } from './transformations';
 import { appendSortsParam, extractDynamicSort } from './sort-utils';
 import { appendFiltersParam, pushStateIdsAsDeps, pushPropIdsAsDeps } from './filter-utils';
+import { appendItemsPathParam, extractItemsPath } from './items-path';
 import { applyLoadingStateToDataProvider, buildLoadingStateDeclarations, getLoadingStateVars, } from './loading-state';
 import { mergeServerCacheOptions, resolveCacheFromRepeaterContent } from './cache/config';
 import { buildCacheHydrationEffect, buildCacheStoreThen, buildCachedFetchBody, buildCachedParamsDeclarations, registerCacheClientImports, } from './cache/ast';
 import { convertControlToButton, dropInactivePaginationControls, findPaginationControl, setJSXExpressionAttribute, } from './pagination-controls';
-import { buildCountFetchEffect } from './count-effect';
+import { buildCountFetchEffect, buildCountSeqDeclaration } from './count-effect';
+import { findAllSearchClearButtonsInJSX, findSiblingSearchInput, wireSearchClearButton, } from './search-clear';
 import { buildPageTokensDeclaration, wireNumberedPagination, } from './numbered-pagination';
 import { buildAccumulatingResponseHandler, buildInfiniteScrollDeclarations, buildSentinelElement, buildSentinelObserverEffect, getInfiniteScrollVars, } from './infinite-scroll';
 import { buildFilterSortPageResetEffect, buildPageResetRefDeclaration, hasNoPageResetDeps, } from './page-reset';
 import { buildPageUrlRefDeclaration, buildPageUrlSyncEffect } from './page-url-sync';
+import { isLocalizedProject } from './content-localization';
+import { appendClientLocaleParam, buildClientLocaleExpression, buildServerLocaleParam, ensureRouterDeclaration, hasLocaleParam, } from './request-locale';
 // tslint:disable-next-line:no-any
 function parseSearchDefaultValue(raw) {
     if (!raw || typeof raw !== 'object') {
@@ -453,6 +457,7 @@ function buildStateRegistry(uidlNode) {
                     infiniteScroll: infiniteScroll,
                     infiniteScrollLoadMore: infiniteScroll && !!content.infiniteScrollLoadMore,
                     pageUrlParamKey: pageUrlParamKey,
+                    itemsPath: extractItemsPath(content.source, parentDataSource.identifier, parentDataSource.resourceDef.dataSourceType || ''),
                     category: 'plain',
                 };
                 // Determine category
@@ -531,6 +536,7 @@ function getStateVarsForUsage(usage) {
         combinedStateVar: "ds_".concat(idx, "_state"),
         setCombinedStateVar: "setDs_".concat(idx, "_state"),
         skipDebounceRefVar: "ds_".concat(idx, "_skipDebounce"),
+        countSeqRefVar: "ds_".concat(idx, "_countSeq"),
         propsPrefix: "".concat(usage.dataSourceIdentifier, "_ds_").concat(idx),
     };
 }
@@ -743,7 +749,7 @@ function pushFilterSortPageResetEffect(stateDeclarations, effectStatements, usag
 // ==================== MAIN PLUGIN ====================
 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, registry, getStaticPropsChunk, isPage, stateDeclarations, effectStatements, needsUseRouter, hasRouterDecl, returnIndex, insertIndex, dataProviders, dataProvidersWithRepeaters, usageIndexByDataSourceId, loadingStateDeclarations, usagesWithLoadingState, usageByProviderNode, cacheDeclarations, sharedOptions, cachedScopes, dataProvidersWithoutRepeaters, searchInputs, searchEnabledUsages;
+        var uidl, chunks, dependencies, options, componentChunk, variableDeclaration, declarator, arrowFunction, blockStatement, registry, getStaticPropsChunk, isPage, localized, stateDeclarations, effectStatements, needsUseRouter, returnIndex, insertIndex, dataProviders, dataProvidersWithRepeaters, usageIndexByDataSourceId, loadingStateDeclarations, usagesWithLoadingState, usageByProviderNode, cacheDeclarations, sharedOptions, cachedScopes, dataProvidersWithoutRepeaters, searchInputs, searchEnabledUsages, usageBySearchInput;
         var _a, _b;
         return __generator(this, function (_c) {
             uidl = structure.uidl, chunks = structure.chunks, dependencies = structure.dependencies, options = structure.options;
@@ -773,6 +779,7 @@ export var createNextArrayMapperPaginationPlugin = function () {
             }
             getStaticPropsChunk = chunks.find(function (chunk) { return chunk.name === 'getStaticProps'; });
             isPage = !!getStaticPropsChunk;
+            localized = isLocalizedProject(options);
             // Add React dependencies
             if (!dependencies.useState) {
                 dependencies.useState = {
@@ -920,6 +927,7 @@ export var createNextArrayMapperPaginationPlugin = function () {
                     }
                     // Add filters to count fetch params if present
                     appendFiltersParam(urlParams, usage.filters, buildFilterDestinationExpression);
+                    appendItemsPathParam(urlParams, usage.itemsPath, 'collectionPath');
                     var countEffectDeps = [
                         types.memberExpression(types.identifier(vars.combinedStateVar), types.identifier('debouncedQuery')),
                     ];
@@ -934,12 +942,14 @@ export var createNextArrayMapperPaginationPlugin = function () {
                     pushPropIdsAsDeps(countEffectDeps, countEffectSeen, usage.filterPropIds);
                     // Same goes for URL-driven filters (already documented above).
                     pushUrlSearchParamMemoDeps(countEffectDeps, usage);
+                    stateDeclarations.push(buildCountSeqDeclaration(vars.countSeqRefVar));
                     effectStatements.push(buildCountFetchEffect({
                         fileName: fileName,
                         perPage: usage.perPage,
                         setMaxPagesVar: vars.setMaxPagesStateVar,
                         urlParams: urlParams,
                         deps: countEffectDeps,
+                        countSeqRefVar: vars.countSeqRefVar,
                     }));
                     // Two-way URL sync for the search input when bound to a URL param.
                     pushSearchUrlSyncEffects(effectStatements, usage, vars);
@@ -990,6 +1000,7 @@ export var createNextArrayMapperPaginationPlugin = function () {
                             countUrlParams.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); }))])));
                         }
                         appendFiltersParam(countUrlParams, usage.filters, buildFilterDestinationExpression);
+                        appendItemsPathParam(countUrlParams, usage.itemsPath, 'collectionPath');
                         // Default to mount-only; refresh when ANY filter destination
                         // changes — state-bound (e.g. `selectedCategory`) and URL-driven —
                         // so the pagination control reflects the current filtered count
@@ -999,12 +1010,14 @@ export var createNextArrayMapperPaginationPlugin = function () {
                         pushStateIdsAsDeps(countDeps, countDepsSeen, usage.filterStateIds);
                         pushPropIdsAsDeps(countDeps, countDepsSeen, usage.filterPropIds);
                         pushUrlSearchParamMemoDeps(countDeps, usage);
+                        stateDeclarations.push(buildCountSeqDeclaration(vars.countSeqRefVar));
                         effectStatements.push(buildCountFetchEffect({
                             fileName: fileName,
                             perPage: usage.perPage,
                             setMaxPagesVar: vars.setMaxPagesStateVar,
                             urlParams: countUrlParams,
                             deps: countDeps,
+                            countSeqRefVar: vars.countSeqRefVar,
                         }));
                     }
                     // Visible page numbers, when this mapper draws a numbered strip.
@@ -1061,35 +1074,10 @@ export var createNextArrayMapperPaginationPlugin = function () {
             });
             // Insert state declarations at the beginning
             stateDeclarations.reverse().forEach(function (s) { return blockStatement.body.unshift(s); });
-            needsUseRouter = registry.usages.some(function (u) { return hasUrlSearchParamFilters(u) || usageHasSearchUrlSync(u) || usageHasPageUrlSync(u); });
+            needsUseRouter = localized ||
+                registry.usages.some(function (u) { return hasUrlSearchParamFilters(u) || usageHasSearchUrlSync(u) || usageHasPageUrlSync(u); });
             if (needsUseRouter) {
-                if (!dependencies.useRouter) {
-                    // Match the shape the sibling Next.js plugins use (i18n locale mapper,
-                    // search-params plugin) so the deduped import line is identical and
-                    // the dependency-resolver merges instead of emitting a second one.
-                    dependencies.useRouter = {
-                        type: 'library',
-                        path: 'next/router',
-                        version: '^12.1.10',
-                        meta: { namedImport: true },
-                    };
-                }
-                hasRouterDecl = blockStatement.body.some(function (statement) {
-                    return statement.type === 'VariableDeclaration' &&
-                        statement.declarations.some(function (decl) {
-                            var _a;
-                            return decl.id.type === 'Identifier' &&
-                                decl.id.name === 'router' &&
-                                ((_a = decl.init) === null || _a === void 0 ? void 0 : _a.type) === 'CallExpression' &&
-                                decl.init.callee.type === 'Identifier' &&
-                                decl.init.callee.name === 'useRouter';
-                        });
-                });
-                if (!hasRouterDecl) {
-                    blockStatement.body.unshift(types.variableDeclaration('const', [
-                        types.variableDeclarator(types.identifier('router'), types.callExpression(types.identifier('useRouter'), [])),
-                    ]));
-                }
+                ensureRouterDeclaration(blockStatement.body, dependencies);
             }
             // Both the search write-back and the page ⇄ URL effect write the URL through
             // the shared `URLQueryWriter`, so the ref + helper they close over must be in
@@ -1131,16 +1119,16 @@ export var createNextArrayMapperPaginationPlugin = function () {
                 var fileName = 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, cacheDeclarations);
+                    updateDataProviderForPaginatedSearch(dp, usage, vars, fileName, cacheDeclarations, localized);
                 }
                 else if (usage.category === 'paginated-only') {
-                    updateDataProviderForPaginationOnly(dp, usage, vars, fileName, cacheDeclarations);
+                    updateDataProviderForPaginationOnly(dp, usage, vars, fileName, cacheDeclarations, localized);
                 }
                 else if (usage.category === 'search-only') {
-                    updateDataProviderForSearchOnly(dp, usage, vars, fileName, cacheDeclarations);
+                    updateDataProviderForSearchOnly(dp, usage, vars, fileName, cacheDeclarations, localized);
                 }
                 else if (usage.category === 'plain') {
-                    updateDataProviderForPlain(dp, fileName, usage);
+                    updateDataProviderForPlain(dp, fileName, usage, localized);
                 }
                 // Show the array mapper's loading state while a category/sort/search
                 // change refetches, instead of leaving the previous rows on screen with
@@ -1200,7 +1188,7 @@ export var createNextArrayMapperPaginationPlugin = function () {
             });
             searchInputs = findAllSearchInputsInJSX(blockStatement);
             searchEnabledUsages = registry.usages.filter(function (u) { return u.searchEnabled; });
-            // Match by order - search input 0 -> searchEnabledUsages[0], etc.
+            usageBySearchInput = new Map();
             searchInputs.forEach(function (input, idx) {
                 if (idx >= searchEnabledUsages.length) {
                     return;
@@ -1208,6 +1196,15 @@ export var createNextArrayMapperPaginationPlugin = function () {
                 var usage = searchEnabledUsages[idx];
                 var vars = getStateVarsForUsage(usage);
                 wireSearchInput(input.node, vars);
+                usageBySearchInput.set(input.node, usage);
+            });
+            // STEP 4.5: Wire the clear buttons, each to the input it shares a parent with.
+            findAllSearchClearButtonsInJSX(blockStatement).forEach(function (button) {
+                var input = findSiblingSearchInput(button, searchInputs.map(function (entry) { return entry.node; }));
+                var usage = input ? usageBySearchInput.get(input) : undefined;
+                if (usage) {
+                    wireSearchClearButton(button, getStateVarsForUsage(usage));
+                }
             });
             // STEP 5: Wire pagination widgets
             //
@@ -1229,7 +1226,7 @@ export var createNextArrayMapperPaginationPlugin = function () {
             });
             // STEP 6: Update getStaticProps if this is a page
             if (isPage) {
-                updateGetStaticProps(chunks, registry, dependencies, (_b = uidl.outputOptions) === null || _b === void 0 ? void 0 : _b.folderPath);
+                updateGetStaticProps(chunks, registry, dependencies, (_b = uidl.outputOptions) === null || _b === void 0 ? void 0 : _b.folderPath, localized);
             }
             return [2 /*return*/, structure];
         });
@@ -1278,6 +1275,20 @@ function insertSentinelAfterProvider(blockStatement, provider, sentinel) {
         if (node.alternate) {
             traverse(node.alternate);
         }
+        // `{activeTabIndex === 0 && (<div>…<DataProvider/>…</div>)}` — a tab
+        // panel, a gated section: the provider sits on the RIGHT of a logical
+        // expression (or in a ternary's `test`), which is not a child, a body or
+        // an argument. Left unvisited, the products list under the first tab of
+        // a shop was never paginated or seeded, and rendered nothing.
+        if (node.left) {
+            traverse(node.left);
+        }
+        if (node.right) {
+            traverse(node.right);
+        }
+        if (node.test) {
+            traverse(node.test);
+        }
         if (node.expression) {
             traverse(node.expression);
         }
@@ -1315,6 +1326,20 @@ function findAllDataProvidersInJSX(blockStatement) {
         if (node.alternate) {
             traverse(node.alternate);
         }
+        // `{activeTabIndex === 0 && (<div>…<DataProvider/>…</div>)}` — a tab
+        // panel, a gated section: the provider sits on the RIGHT of a logical
+        // expression (or in a ternary's `test`), which is not a child, a body or
+        // an argument. Left unvisited, the products list under the first tab of
+        // a shop was never paginated or seeded, and rendered nothing.
+        if (node.left) {
+            traverse(node.left);
+        }
+        if (node.right) {
+            traverse(node.right);
+        }
+        if (node.test) {
+            traverse(node.test);
+        }
         if (node.expression) {
             traverse(node.expression);
         }
@@ -1397,6 +1422,20 @@ function findAllSearchInputsInJSX(blockStatement) {
         if (node.alternate) {
             traverse(node.alternate);
         }
+        // `{activeTabIndex === 0 && (<div>…<DataProvider/>…</div>)}` — a tab
+        // panel, a gated section: the provider sits on the RIGHT of a logical
+        // expression (or in a ternary's `test`), which is not a child, a body or
+        // an argument. Left unvisited, the products list under the first tab of
+        // a shop was never paginated or seeded, and rendered nothing.
+        if (node.left) {
+            traverse(node.left);
+        }
+        if (node.right) {
+            traverse(node.right);
+        }
+        if (node.test) {
+            traverse(node.test);
+        }
         if (node.expression) {
             traverse(node.expression);
         }
@@ -1452,6 +1491,20 @@ function findPaginationNodesWithOwners(blockStatement, usageByProviderNode) {
         if (node.alternate) {
             traverse(node.alternate);
         }
+        // `{activeTabIndex === 0 && (<div>…<DataProvider/>…</div>)}` — a tab
+        // panel, a gated section: the provider sits on the RIGHT of a logical
+        // expression (or in a ternary's `test`), which is not a child, a body or
+        // an argument. Left unvisited, the products list under the first tab of
+        // a shop was never paginated or seeded, and rendered nothing.
+        if (node.left) {
+            traverse(node.left);
+        }
+        if (node.right) {
+            traverse(node.right);
+        }
+        if (node.test) {
+            traverse(node.test);
+        }
         if (node.expression) {
             traverse(node.expression);
         }
@@ -1494,7 +1547,7 @@ dp, usage, paramsProps, memoDeps, cacheDeclarations) {
     dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('params'), types.jsxExpressionContainer(types.identifier(hoisted.paramsIdentifier))));
     return hoisted.cachedIdentifier;
 }
-function updateDataProviderForPaginatedSearch(dp, usage, vars, fileName, cacheDeclarations) {
+function updateDataProviderForPaginatedSearch(dp, usage, vars, fileName, cacheDeclarations, localized) {
     var attrs = dp.openingElement.attributes;
     // Remove existing params, key, initialData, fetchData, persistDataDuringLoading
     dp.openingElement.attributes = attrs.filter(function (attr) {
@@ -1514,6 +1567,7 @@ function updateDataProviderForPaginatedSearch(dp, usage, vars, fileName, cacheDe
     appendSortsParam(paramsProps, usage.sorts, usage.dynamicSort);
     // Add filters if present
     appendFiltersParam(paramsProps, usage.filters, buildFilterDestinationExpression);
+    appendItemsPathParam(paramsProps, usage.itemsPath, 'itemsPath');
     // Build useMemo dependencies including filter state IDs and dynamic sort state IDs
     var memoDeps = [types.identifier(vars.combinedStateVar)];
     var seenDeps = new Set([vars.combinedStateVar]);
@@ -1523,6 +1577,9 @@ function updateDataProviderForPaginatedSearch(dp, usage, vars, fileName, cacheDe
         pushStateIdsAsDeps(memoDeps, seenDeps, usage.dynamicSort.depStateIds);
     }
     pushUrlSearchParamMemoDeps(memoDeps, usage);
+    if (localized) {
+        appendClientLocaleParam(paramsProps, memoDeps);
+    }
     var cachedInitialData = pushParamsAttribute(dp, usage, paramsProps, memoDeps, cacheDeclarations);
     // Add initialData. Skip the server-prefetched data entirely when a dynamic
     // state-bound sort is active — the prefetch ran without sort parameters, so
@@ -1574,7 +1631,7 @@ function updateDataProviderForPaginatedSearch(dp, usage, vars, fileName, cacheDe
     // Add persistDataDuringLoading
     dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('persistDataDuringLoading'), types.jsxExpressionContainer(types.booleanLiteral(true))));
 }
-function updateDataProviderForPaginationOnly(dp, usage, vars, fileName, cacheDeclarations) {
+function updateDataProviderForPaginationOnly(dp, usage, vars, fileName, cacheDeclarations, localized) {
     var attrs = dp.openingElement.attributes;
     dp.openingElement.attributes = attrs.filter(function (attr) {
         var _a;
@@ -1589,6 +1646,7 @@ function updateDataProviderForPaginationOnly(dp, usage, vars, fileName, cacheDec
     appendSortsParam(paramsProps, usage.sorts, usage.dynamicSort);
     // Add filters if present
     appendFiltersParam(paramsProps, usage.filters, buildFilterDestinationExpression);
+    appendItemsPathParam(paramsProps, usage.itemsPath, 'itemsPath');
     // Build useMemo dependencies including filter state IDs and dynamic sort state IDs
     var memoDeps = [types.identifier(vars.pageStateVar)];
     var seenDeps = new Set([vars.pageStateVar]);
@@ -1598,6 +1656,9 @@ function updateDataProviderForPaginationOnly(dp, usage, vars, fileName, cacheDec
         pushStateIdsAsDeps(memoDeps, seenDeps, usage.dynamicSort.depStateIds);
     }
     pushUrlSearchParamMemoDeps(memoDeps, usage);
+    if (localized) {
+        appendClientLocaleParam(paramsProps, memoDeps);
+    }
     // Add params
     var cachedInitialData = pushParamsAttribute(dp, usage, paramsProps, memoDeps, cacheDeclarations);
     // Add initialData. See paginated+search updater for why we skip prefetch
@@ -1623,7 +1684,7 @@ function updateDataProviderForPaginationOnly(dp, usage, vars, fileName, cacheDec
     dp.openingElement.attributes.push(buildFetchDataForUsage(fileName, usage));
     dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('persistDataDuringLoading'), types.jsxExpressionContainer(types.booleanLiteral(true))));
 }
-function updateDataProviderForSearchOnly(dp, usage, vars, fileName, cacheDeclarations) {
+function updateDataProviderForSearchOnly(dp, usage, vars, fileName, cacheDeclarations, localized) {
     var _a;
     var attrs = dp.openingElement.attributes;
     dp.openingElement.attributes = attrs.filter(function (attr) {
@@ -1641,6 +1702,7 @@ function updateDataProviderForSearchOnly(dp, usage, vars, fileName, cacheDeclara
     appendSortsParam(paramsProps, usage.sorts, usage.dynamicSort);
     // Add filters if present
     appendFiltersParam(paramsProps, usage.filters, buildFilterDestinationExpression);
+    appendItemsPathParam(paramsProps, usage.itemsPath, 'itemsPath');
     // Build useMemo dependencies including filter state IDs and dynamic sort state IDs
     var memoDeps = [types.identifier(vars.debouncedSearchQueryVar)];
     var seenDeps = new Set([vars.debouncedSearchQueryVar]);
@@ -1650,6 +1712,9 @@ function updateDataProviderForSearchOnly(dp, usage, vars, fileName, cacheDeclara
         pushStateIdsAsDeps(memoDeps, seenDeps, usage.dynamicSort.depStateIds);
     }
     pushUrlSearchParamMemoDeps(memoDeps, usage);
+    if (localized) {
+        appendClientLocaleParam(paramsProps, memoDeps);
+    }
     var cachedInitialData = pushParamsAttribute(dp, usage, paramsProps, memoDeps, cacheDeclarations);
     // Add initialData. See paginated+search updater for why we skip prefetch
     // reuse when a dynamic state-bound sort is active.
@@ -1665,7 +1730,7 @@ function updateDataProviderForSearchOnly(dp, usage, vars, fileName, cacheDeclara
     dp.openingElement.attributes.push(createFetchDataAttribute(fileName, ((_a = usage.cache) === null || _a === void 0 ? void 0 : _a.client) ? usage.cache : undefined));
     dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('persistDataDuringLoading'), types.jsxExpressionContainer(types.booleanLiteral(true))));
 }
-function updateDataProviderForPlain(dp, fileName, usage) {
+function updateDataProviderForPlain(dp, fileName, usage, localized) {
     var _a, _b, _c, _d;
     var attrs = dp.openingElement.attributes;
     var clientCache = ((_a = usage.cache) === null || _a === void 0 ? void 0 : _a.client) ? usage.cache : undefined;
@@ -1687,10 +1752,16 @@ function updateDataProviderForPlain(dp, fileName, usage) {
     if (!hasPersistData) {
         attrs.push(types.jsxAttribute(types.jsxIdentifier('persistDataDuringLoading'), types.jsxExpressionContainer(types.booleanLiteral(true))));
     }
-    // Find the params attribute
+    // Find the params attribute. A plain list may have none at all — but the
+    // fetch it was just given sends `params` regardless, and in a localized
+    // project those have to carry the locale, so the attribute is created.
     var paramsAttrIndex = attrs.findIndex(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'params'; });
     if (paramsAttrIndex === -1) {
-        return;
+        if (!localized) {
+            return;
+        }
+        attrs.push(types.jsxAttribute(types.jsxIdentifier('params'), types.jsxExpressionContainer(types.objectExpression([]))));
+        paramsAttrIndex = attrs.length - 1;
     }
     var paramsAttr = attrs[paramsAttrIndex];
     // Check if params is already wrapped in useMemo
@@ -1713,6 +1784,9 @@ function updateDataProviderForPlain(dp, fileName, usage) {
     pushStateIdsAsDeps(memoDeps, memoSeen, usage.filterStateIds);
     pushPropIdsAsDeps(memoDeps, memoSeen, usage.filterPropIds);
     pushUrlSearchParamMemoDeps(memoDeps, usage);
+    if (localized && paramsExpression.type === 'ObjectExpression') {
+        appendClientLocaleParam(paramsExpression.properties, memoDeps);
+    }
     // Wrap params in useMemo with filter state dependencies
     var memoizedParams = types.callExpression(types.identifier('useMemo'), [
         types.arrowFunctionExpression([], paramsExpression),
@@ -1744,11 +1818,18 @@ function stabilizeDataProviderWithoutRepeater(dp) {
     if (!paramsExpression) {
         return;
     }
-    // Wrap params in useMemo with empty dependencies array
-    // This ensures the object reference stays stable across re-renders
+    // Wrap params in useMemo with an empty dependencies array so the object
+    // reference stays stable across re-renders. The one thing that may vary is
+    // the locale a client-fetched item carries (put there by the data-source
+    // plugin): a locale switch must rebuild the params, or the item would keep
+    // its previous language.
+    var memoDeps = [];
+    if (paramsExpression.type === 'ObjectExpression' && hasLocaleParam(paramsExpression.properties)) {
+        memoDeps.push(buildClientLocaleExpression());
+    }
     var memoizedParams = types.callExpression(types.identifier('useMemo'), [
         types.arrowFunctionExpression([], paramsExpression),
-        types.arrayExpression([]),
+        types.arrayExpression(memoDeps),
     ]);
     // Replace the params attribute
     attrs[paramsAttrIndex] = types.jsxAttribute(types.jsxIdentifier('params'), types.jsxExpressionContainer(memoizedParams));
@@ -2060,7 +2141,7 @@ function ensureAPIRouteExists(extractedResources, usage, dataSources, transformO
         };
     }
 }
-function updateGetStaticProps(chunks, registry, dependencies, folderPath) {
+function updateGetStaticProps(chunks, registry, dependencies, folderPath, localized) {
     var _a;
     var getStaticPropsChunk = chunks.find(function (c) { return c.name === 'getStaticProps'; });
     if (!getStaticPropsChunk || getStaticPropsChunk.type !== ChunkType.AST) {
@@ -2155,6 +2236,11 @@ function updateGetStaticProps(chunks, registry, dependencies, folderPath) {
                 })),
             ])));
         }
+        appendItemsPathParam(fetchParams, usage.itemsPath, 'itemsPath');
+        // The prefetch is per locale — getStaticProps runs once per language.
+        if (localized) {
+            fetchParams.push(buildServerLocaleParam());
+        }
         // 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) {
@@ -2189,8 +2275,10 @@ function updateGetStaticProps(chunks, registry, dependencies, folderPath) {
             // Use filter-specific count variable if usage has static filters
             // (dynamic filters can't be resolved at build time)
             var staticFiltersForCount = (usage.filters || []).filter(function (f) { return !ASTUtils.isUIDLDynamicReference(f.destination); });
-            var hasStaticFilters = staticFiltersForCount.length > 0;
-            var countVarName = hasStaticFilters
+            // A count scoped to an inner array is a different number from the
+            // whole-payload one, so it gets its own variable just like a filtered one.
+            var hasScopedCount = staticFiltersForCount.length > 0 || !!usage.itemsPath;
+            var countVarName = hasScopedCount
                 ? "".concat(usage.dataSourceIdentifier, "_ds_").concat(usage.index, "_count")
                 : "".concat(usage.dataSourceIdentifier, "_count");
             // Check if maxPages calculation already exists
@@ -2228,7 +2316,7 @@ function updateGetStaticProps(chunks, registry, dependencies, folderPath) {
         var usagesByFilters = new Map();
         for (var _i = 0, usagesForDataSource_1 = usagesForDataSource; _i < usagesForDataSource_1.length; _i++) {
             var usage = usagesForDataSource_1[_i];
-            var filtersKey = JSON.stringify(usage.filters || []);
+            var filtersKey = JSON.stringify([usage.filters || [], usage.itemsPath || []]);
             var existing = usagesByFilters.get(filtersKey) || [];
             existing.push(usage);
             usagesByFilters.set(filtersKey, existing);
@@ -2239,8 +2327,9 @@ function updateGetStaticProps(chunks, registry, dependencies, folderPath) {
             // Filter out dynamic destinations for getStaticProps (they can't be resolved at build time)
             var staticFiltersForCount = (firstUsage.filters || []).filter(function (f) { return !ASTUtils.isUIDLDynamicReference(f.destination); });
             var hasStaticFilters = staticFiltersForCount.length > 0;
-            // Create unique count variable name based on filters
-            var countVarName = hasStaticFilters
+            // Create unique count variable name based on filters (and inner-array
+            // scope — must match the naming at the maxPages site above)
+            var countVarName = hasStaticFilters || firstUsage.itemsPath
                 ? "".concat(firstUsage.dataSourceIdentifier, "_ds_").concat(firstUsage.index, "_count")
                 : "".concat(firstUsage.dataSourceIdentifier, "_count");
             // Check if this count was already processed
@@ -2266,6 +2355,7 @@ function updateGetStaticProps(chunks, registry, dependencies, folderPath) {
                         })),
                     ])));
                 }
+                appendItemsPathParam(countParams, firstUsage.itemsPath, 'collectionPath');
                 fetchesArray.elements.push(types.callExpression(types.memberExpression(types.callExpression(types.memberExpression(types.identifier(fetcherImportName), types.identifier('fetchCount')), countParams.length > 0 ? [types.objectExpression(countParams)] : []), types.identifier('catch')), [
                     types.arrowFunctionExpression([types.identifier('error')], types.blockStatement([
                         types.expressionStatement(types.callExpression(types.memberExpression(types.identifier('console'), types.identifier('error')), [