@teleporthq/teleport-plugin-next-data-source 0.43.71 → 0.43.75

package/dist/esm/filter-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter-utils.d.ts","sourceRoot":"","sources":["../../src/filter-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AA6ErC,eAAO,MAAM,yBAAyB,YAC3B,MAAM;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,CAAC,4CACjC,OAAO,KAAK,MAAM,UAAU,KACrE,MAAM,cAkBR,CAAA;AAGD,eAAO,MAAM,kBAAkB,gBAChB,MAAM,cAAc,EAAE,WAC1B,MAAM;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,CAAC,GAAG,SAAS,4CAC7C,OAAO,KAAK,MAAM,UAAU,KACrE,IAUF,CAAA;AAUD,eAAO,MAAM,kBAAkB,SACvB,MAAM,UAAU,EAAE,QAClB,IAAI,MAAM,CAAC,YACP,MAAM,EAAE,KACjB,IAQF,CAAA;AAaD,eAAO,MAAM,iBAAiB,SACtB,MAAM,UAAU,EAAE,QAClB,IAAI,MAAM,CAAC,WACR,MAAM,EAAE,KAChB,IASF,CAAA"}
+{"version":3,"file":"filter-utils.d.ts","sourceRoot":"","sources":["../../src/filter-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,CAAA;AACzF,MAAM,MAAM,WAAW,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,WAAW,EAAE,CAAA;CAAE,CAAA;AACvF,MAAM,MAAM,WAAW,GAAG,eAAe,GAAG,WAAW,CAAA;AAEvD,eAAO,MAAM,aAAa,UAAW,OAAO,yBAIe,CAAA;AA+H3D,eAAO,MAAM,yBAAyB,YAC3B,WAAW,EAAE,4CACoB,OAAO,KAAK,MAAM,UAAU,KACrE,MAAM,cAIN,CAAA;AAiBH,eAAO,MAAM,+BAA+B,YAAa,WAAW,EAAE,KAAG,MAAM,cAI5E,CAAA;AAGH,eAAO,MAAM,kBAAkB,gBAChB,MAAM,cAAc,EAAE,WAC1B,WAAW,EAAE,GAAG,SAAS,4CACQ,OAAO,KAAK,MAAM,UAAU,KACrE,IAUF,CAAA;AAUD,eAAO,MAAM,kBAAkB,SACvB,MAAM,UAAU,EAAE,QAClB,IAAI,MAAM,CAAC,YACP,MAAM,EAAE,KACjB,IAQF,CAAA;AAaD,eAAO,MAAM,iBAAiB,SACtB,MAAM,UAAU,EAAE,QAClB,IAAI,MAAM,CAAC,WACR,MAAM,EAAE,KAChB,IASF,CAAA"}

package/dist/esm/filter-utils.js

@@ -1,4 +1,10 @@
 import * as types from '@babel/types';
+export var isFilterGroup = function (entry) {
+    return !!entry &&
+        typeof entry === 'object' &&
+        entry.type === 'group' &&
+        Array.isArray(entry.children);
+};
 // Build a single filter entry: { source: '<src>', destination: <destExpr>, operand: '<op>' }
 var buildFilterEntry = function (source, destinationExpr, operand) {
     return types.objectExpression([
@@ -7,10 +13,19 @@ var buildFilterEntry = function (source, destinationExpr, operand) {
         types.objectProperty(types.identifier('operand'), types.stringLiteral(operand)),
     ]);
 };
+// { type: 'group', operator: 'and' | 'or', children: <childrenExpr> }
+var buildFilterGroup = function (operator, childrenExpr) {
+    return types.objectExpression([
+        types.objectProperty(types.identifier('type'), types.stringLiteral('group')),
+        types.objectProperty(types.identifier('operator'), types.stringLiteral(operator === 'or' ? 'or' : 'and')),
+        types.objectProperty(types.identifier('children'), childrenExpr),
+    ]);
+};
 // Predicate:
-//   (__f) => __f.destination !== '' && __f.destination !== null &&
-//            __f.destination !== undefined &&
-//            !(Array.isArray(__f.destination) && __f.destination.filter(Boolean).length === 0)
+//   (__f) => __f.type === 'group' ||
+//            (__f.destination !== '' && __f.destination !== null &&
+//             __f.destination !== undefined &&
+//             !(Array.isArray(__f.destination) && __f.destination.filter(Boolean).length === 0))
 // Used at runtime to drop filter conditions whose destination resolves to an
 // empty value. Keeps the page generic: state-bound filters (e.g.
 // `selectedCategory === ''` after picking "All Categories") and url-bound
@@ -20,19 +35,31 @@ var buildFilterEntry = function (source, destinationExpr, operand) {
 // string and returns zero rows. The array clause covers array-overlap filters
 // (e.g. category `CATEGORY_DESCENDANTS[selectedCategory] || []`) whose "All"
 // reset resolves to `[]` — an empty overlap set must mean "no filter", not
-// "match nothing".
+// "match nothing". A group has no destination of its own and is kept; its
+// children carry the same `.filter(...)`, and a group emptied that way is
+// dropped by the fetcher's `normalizeFilterTree`.
 var buildNonEmptyDestinationPredicate = function () {
     var f = types.identifier('__f');
     var dest = types.memberExpression(f, types.identifier('destination'));
     var isEmptyArray = types.logicalExpression('&&', types.callExpression(types.memberExpression(types.identifier('Array'), types.identifier('isArray')), [dest]), types.binaryExpression('===', types.memberExpression(types.callExpression(types.memberExpression(dest, types.identifier('filter')), [
         types.identifier('Boolean'),
     ]), types.identifier('length')), types.numericLiteral(0)));
-    return types.arrowFunctionExpression([f], types.logicalExpression('&&', types.logicalExpression('&&', types.logicalExpression('&&', types.binaryExpression('!==', dest, types.stringLiteral('')), types.binaryExpression('!==', dest, types.nullLiteral())), types.binaryExpression('!==', dest, types.identifier('undefined'))), types.unaryExpression('!', isEmptyArray)));
+    return types.arrowFunctionExpression([f], types.logicalExpression('||', types.binaryExpression('===', types.memberExpression(f, types.identifier('type')), types.stringLiteral('group')), types.logicalExpression('&&', types.logicalExpression('&&', types.logicalExpression('&&', types.binaryExpression('!==', dest, types.stringLiteral('')), types.binaryExpression('!==', dest, types.nullLiteral())), types.binaryExpression('!==', dest, types.identifier('undefined'))), types.unaryExpression('!', isEmptyArray))));
+};
+// `[ entry, ... ].filter(<non-empty destination>)`, recursing into groups so
+// every level of the tree drops its empty conditions at runtime.
+var buildFilteredEntriesArray = function (filters, buildDestinationExpression) {
+    var entries = filters.map(function (filter) {
+        return isFilterGroup(filter)
+            ? buildFilterGroup(filter.operator, buildFilteredEntriesArray(filter.children, buildDestinationExpression))
+            : buildFilterEntry(filter.source || '', buildDestinationExpression(filter.destination), filter.operand || '');
+    });
+    return types.callExpression(types.memberExpression(types.arrayExpression(entries), types.identifier('filter')), [buildNonEmptyDestinationPredicate()]);
 };
 // Build the AST for:
 //   JSON.stringify(
-//     [ {source, destination, operand}, ... ]
-//       .filter(__f => __f.destination !== '' && __f.destination !== null && __f.destination !== undefined)
+//     [ {source, destination, operand}, { type: 'group', operator, children: [...].filter(...) }, ... ]
+//       .filter(__f => __f.type === 'group' || (__f.destination !== '' && __f.destination !== null && __f.destination !== undefined))
 //   )
 //
 // The `.filter(...)` step is unconditional even when every entry is a static
@@ -41,11 +68,18 @@ var buildNonEmptyDestinationPredicate = function () {
 // type is added but its empty-value behavior is forgotten don't silently
 // re-introduce empty-string filters.
 export var buildFiltersStringifyCall = function (filters, buildDestinationExpression) {
-    var entries = filters.map(function (filter) {
-        return buildFilterEntry(filter.source || '', buildDestinationExpression(filter.destination), filter.operand || '');
-    });
-    var filteredArray = types.callExpression(types.memberExpression(types.arrayExpression(entries), types.identifier('filter')), [buildNonEmptyDestinationPredicate()]);
-    return types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [filteredArray]);
+    return types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [buildFilteredEntriesArray(filters, buildDestinationExpression)]);
+};
+// The build-time counterpart for `getStaticProps`: every destination is a
+// literal (the dynamic ones were pruned — see `pruneFilterTree`), so the tree
+// is written out as plain string literals with no runtime `.filter(...)`.
+var buildStaticFilterEntryAST = function (filter) {
+    return isFilterGroup(filter)
+        ? buildFilterGroup(filter.operator, types.arrayExpression(filter.children.map(buildStaticFilterEntryAST)))
+        : buildFilterEntry(filter.source || '', types.stringLiteral(typeof filter.destination === 'string' ? filter.destination : ''), filter.operand || '');
+};
+export var buildStaticFiltersStringifyCall = function (filters) {
+    return types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [types.arrayExpression(filters.map(buildStaticFilterEntryAST))]);
 };
 // Convenience: push `filters: <call>` onto a paramsProps array.
 export var appendFiltersParam = function (paramsProps, filters, buildDestinationExpression) {

package/dist/esm/filter-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter-utils.js","sourceRoot":"","sources":["../../src/filter-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"filter-utils.js","sourceRoot":"","sources":["../../src/filter-utils.ts"],"names":[],"mappings":"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"}

package/dist/esm/pagination-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pagination-plugin.d.ts","sourceRoot":"","sources":["../../src/pagination-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,sBAAsB,EAGvB,MAAM,4BAA4B,CAAA;AAwkCnC,eAAO,MAAM,qCAAqC,EAAE,sBAAsB,CAAC,EAAE,CAs1B5E,CAAA"}
+{"version":3,"file":"pagination-plugin.d.ts","sourceRoot":"","sources":["../../src/pagination-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,sBAAsB,EAGvB,MAAM,4BAA4B,CAAA;AAooCnC,eAAO,MAAM,qCAAqC,EAAE,sBAAsB,CAAC,EAAE,CAq1B5E,CAAA"}

package/dist/esm/pagination-plugin.js

@@ -48,11 +48,11 @@ import * as types from '@babel/types';
 import { parseExpression } from '@babel/parser';
 import { ASTStatementOrder, GenericUtils, StringUtils } from '@teleporthq/teleport-shared';
 import { ASTUtils, URLQueryWriter, URLSearchParamSync } from '@teleporthq/teleport-plugin-common';
-import { generateSafeFileName } from './utils';
+import { collectFilterLeafConditions, generateSafeFileName, pruneFilterTree } from './utils';
 import { generateDataSourceFetcherWithCore } from './data-source-fetchers';
 import { buildProductTransformOptions } from './transformations';
-import { appendSortsParam, extractDynamicSort } from './sort-utils';
-import { appendFiltersParam, pushStateIdsAsDeps, pushPropIdsAsDeps } from './filter-utils';
+import { appendSortsParam, extractDynamicSort, readFixedSort } from './sort-utils';
+import { appendFiltersParam, buildStaticFiltersStringifyCall, pushStateIdsAsDeps, pushPropIdsAsDeps, } from './filter-utils';
 import { appendItemsPathParam, extractItemsPath } from './items-path';
 import { resolveRepeaterPerPage } from './repeater-page-size';
 import { applyLoadingStateToDataProvider, buildLoadingStateDeclarations, getLoadingStateVars, } from './loading-state';
@@ -103,79 +103,37 @@ function searchDefaultValueInitAST(value) {
     // independent AST node — Babel does not support shared references.
     return types.cloneNode(value.ast, /* deep */ true);
 }
-// Builds the `useState(...)` initializer for the search query. When the
-// cms-list-repeater is bound to a URL param (`searchUrlParamKey`), the query is
-// seeded from `window.location.search` on the client so a deep link such as
-// `/products-list?searchKeyword=yoga` arrives pre-filtered on the very first
-// paint; the server render (where `window` is undefined) and any missing param
-// fall back to the `searchDefaultValue` seed (empty string by default). This
-// mirrors the `selectedCategory` / `sortBy` initializer emitted by
-// `createStateHookAST` for state-level `urlSearchParamBinding`, keeping the
-// three products-list controls consistent.
+// Builds the `useState(...)` initializer for the search query: the
+// `searchDefaultValue` seed (empty string by default), never the address. A
+// statically generated page is rendered on the server without the visitor's
+// `?searchKeyword=`, and the browser's first render must match it — a query
+// seeded from `window.location.search` rendered a filled input and skipped the
+// prefetched rows there, and React warned of a hydration mismatch. A URL-bound
+// search adopts the address after mount instead (`pushSearchUrlSyncEffects`),
+// as the page number does (`page-url-sync.ts`).
 //
 // Returns a fresh AST on every call (no shared node references) so the same
 // initializer can seed both the immediate `ds_N_searchQuery` state and the
 // debounced `ds_N_state.debouncedQuery` value.
 function buildSearchQueryInitAST(usage) {
-    var fallback = searchDefaultValueInitAST(usage.searchDefaultValue);
-    if (!usage.searchUrlParamKey) {
-        return fallback;
-    }
-    // (typeof window !== 'undefined'
-    //   ? new URLSearchParams(window.location.search).get('<key>')
-    //   : null) ?? <fallback>
-    return types.logicalExpression('??', types.conditionalExpression(types.binaryExpression('!==', types.unaryExpression('typeof', types.identifier('window')), types.stringLiteral('undefined')), types.callExpression(types.memberExpression(types.newExpression(types.identifier('URLSearchParams'), [
-        types.memberExpression(types.memberExpression(types.identifier('window'), types.identifier('location')), types.identifier('search')),
-    ]), types.identifier('get')), [types.stringLiteral(usage.searchUrlParamKey)]), types.nullLiteral()), fallback);
+    return searchDefaultValueInitAST(usage.searchDefaultValue);
 }
-// The UIDL's `filters.content` array can wrap one or more conditions inside
-// a `{ type: 'group', operator: 'and' | 'or', children: [...] }` entry — the
-// GUI builds this shape when the inspector adds a logical group. The data
-// source API endpoint (`processFilters` in the generated data-source module)
-// only knows how to consume a FLAT array of `{ source, destination, operand }`
-// conditions, so we walk groups recursively here and collect their leaf
-// conditions in order. Anything that isn't a group AND isn't a condition is
-// dropped — defensive against partially-built filter entries that would
-// otherwise emit `{ source: '', destination: '', operand: '' }` rows the
-// API ignores anyway.
-//
-// `or`-grouped conditions are flattened just like `and`-grouped ones — the
-// downstream SQL builder always joins flat filters with `AND`, so emitting
-// the conditions side-by-side approximates AND semantics. A future API
-// upgrade that respects group operators would key off the original tree
-// directly; until then, AND-flattening is the closest correct behaviour and
-// matches what the inspector preview shows for the common single-group case
-// the GUI emits today.
-function flattenFilterGroups(filters) {
+// The UIDL's `filters.content` array is the tree the inspector authored:
+// `{ type: 'group', operator: 'and' | 'or', children: [...] }` entries around
+// `{ source, destination, operand }` conditions, nested as deep as the user
+// grouped them. The tree is kept as it is — the generated fetchers read it with
+// `normalizeFilterTree`, so an `or` group stays an `or`. Only junk is dropped:
+// an entry that is neither a group nor a condition (a half-built inspector
+// row) would otherwise reach the API as `{ source: '', destination: '' }`.
+// Entries without an explicit `type` are the legacy flat form and are
+// conditions.
+function readFilterTree(filters) {
     if (!Array.isArray(filters)) {
         return [];
     }
-    var out = [];
-    var walk = function (entry) {
-        if (!entry || typeof entry !== 'object') {
-            return;
-        }
-        if (entry.type === 'group' && Array.isArray(entry.children)) {
-            for (var _i = 0, _a = entry.children; _i < _a.length; _i++) {
-                var child = _a[_i];
-                walk(child);
-            }
-            return;
-        }
-        // Backwards-compatible: entries without an explicit `type` (legacy flat
-        // form) and entries explicitly tagged `condition` are both treated as
-        // condition leaves.
-        if (entry.type === undefined || entry.type === 'condition') {
-            out.push(entry);
-        }
-    };
-    for (var _i = 0, filters_1 = filters; _i < filters_1.length; _i++) {
-        var entry = filters_1[_i];
-        walk(entry);
-    }
-    return out;
+    return pruneFilterTree(filters, function (entry) { return entry.type === undefined || entry.type === 'condition'; });
 }
-// Walks a flat filter list to extract every `urlSearchParams` reference key
+// Walks the filter tree to extract every `urlSearchParams` reference key
 // (e.g. `'categoryFilter'`). Used to (a) inject `const router = useRouter()`
 // once at the top of the component, (b) wire `router.query.<key>` into the
 // `useMemo` dependency array so the client-side fetch reruns whenever the
@@ -184,8 +142,8 @@ function flattenFilterGroups(filters) {
 function collectFilterUrlSearchParamKeys(filters) {
     var seen = new Set();
     var out = [];
-    for (var _i = 0, filters_2 = filters; _i < filters_2.length; _i++) {
-        var f = filters_2[_i];
+    for (var _i = 0, _a = collectFilterLeafConditions(filters); _i < _a.length; _i++) {
+        var f = _a[_i];
         var dest = f === null || f === void 0 ? void 0 : f.destination;
         if (!ASTUtils.isUIDLDynamicReference(dest)) {
             continue;
@@ -202,6 +160,12 @@ function collectFilterUrlSearchParamKeys(filters) {
     }
     return out;
 }
+// The filter tree with every dynamic destination pruned — what `getStaticProps`
+// can resolve at build time. Groups keep their operator; a group left empty by
+// the pruning disappears with it (`pruneFilterTree`).
+function staticFiltersOf(usage) {
+    return pruneFilterTree(usage.filters || [], function (f) { return !ASTUtils.isUIDLDynamicReference(f.destination); });
+}
 // Returns true when any filter destination is a `urlSearchParams` dynamic
 // reference — used by the plugin to know it needs to import `useRouter` and
 // emit `const router = useRouter()` at the top of the component. Cheaper to
@@ -359,22 +323,28 @@ function buildStateRegistry(uidlNode) {
                 if ((_k = (_j = parentDataSource.resourceParams) === null || _j === void 0 ? void 0 : _j.sorts) === null || _k === void 0 ? void 0 : _k.content) {
                     sorts = parentDataSource.resourceParams.sorts.content;
                 }
-                // If legacy sorts aren't set, fall back to the new dynamic single-column
-                // sort fields on the cms-list-repeater (used by admin-panel listing pages).
+                // If legacy sorts aren't set, fall back to the single-column sort fields
+                // on the cms-list-repeater. A FIXED one (a column chosen in the editor,
+                // e.g. a blog listing's newest first) is a static sort: read as dynamic,
+                // it made the list drop the server-side first page (`initialData` below
+                // is skipped for a dynamic sort) — the pre-rendered HTML carried no
+                // posts, and the browser fetched page 1 a second time. Only a sort
+                // bound to state (the admin panel's sortable columns) is dynamic.
                 var dynamicSort = void 0;
                 if ((!sorts || sorts.length === 0) && content.sort) {
-                    dynamicSort = extractDynamicSort(content.sort, content.sortDirection);
+                    var fixedSort = readFixedSort(content.sort, content.sortDirection);
+                    if (fixedSort) {
+                        sorts = [fixedSort];
+                    }
+                    else {
+                        dynamicSort = extractDynamicSort(content.sort, content.sortDirection);
+                    }
                 }
-                // Extract filters from parent's resource params. The inspector wraps
-                // every condition in a `{ type: 'group' }` envelope (single-group or
-                // nested), so flatten to leaf conditions before the downstream emit
-                // sites consume `.source` / `.destination` / `.operand` directly —
-                // they expect a flat condition array. See `flattenFilterGroups`'s
-                // header comment for why AND-flattening is the correct fallback for
-                // the API endpoint's flat-condition contract.
+                // Extract filters from parent's resource params, keeping the group tree
+                // the inspector authored (see `readFilterTree`).
                 var filters = [];
                 if ((_m = (_l = parentDataSource.resourceParams) === null || _l === void 0 ? void 0 : _l.filters) === null || _m === void 0 ? void 0 : _m.content) {
-                    filters = flattenFilterGroups(parentDataSource.resourceParams.filters.content);
+                    filters = readFilterTree(parentDataSource.resourceParams.filters.content);
                 }
                 // Split dynamic destination keys by reference type. `state`/`prop`
                 // refs resolve to bare identifiers (so they're useMemo deps as-is);
@@ -382,8 +352,8 @@ function buildStateRegistry(uidlNode) {
                 // `useRouter()` declaration injected separately.
                 var filterStateIds = [];
                 var filterPropIds = [];
-                for (var _i = 0, filters_3 = filters; _i < filters_3.length; _i++) {
-                    var f = filters_3[_i];
+                for (var _i = 0, _u = collectFilterLeafConditions(filters); _i < _u.length; _i++) {
+                    var f = _u[_i];
                     if (!ASTUtils.isUIDLDynamicReference(f.destination)) {
                         continue;
                     }
@@ -489,8 +459,8 @@ function buildStateRegistry(uidlNode) {
         }
         // Recurse into children
         if (((_r = node.content) === null || _r === void 0 ? void 0 : _r.children) && Array.isArray(node.content.children)) {
-            for (var _u = 0, _v = node.content.children; _u < _v.length; _u++) {
-                var child = _v[_u];
+            for (var _v = 0, _w = node.content.children; _v < _w.length; _v++) {
+                var child = _w[_v];
                 traverse(child, parentDataSource);
             }
         }
@@ -515,8 +485,8 @@ function buildStateRegistry(uidlNode) {
             }
         }
         if (Array.isArray(node.children)) {
-            for (var _w = 0, _x = node.children; _w < _x.length; _w++) {
-                var child = _x[_w];
+            for (var _x = 0, _y = node.children; _x < _y.length; _x++) {
+                var child = _y[_x];
                 traverse(child, parentDataSource);
             }
         }
@@ -596,11 +566,55 @@ function pushSearchUrlSyncEffects(effectStatements, usage, vars) {
             ? types.memberExpression(types.identifier(vars.combinedStateVar), types.identifier('debouncedQuery'))
             : types.identifier(vars.debouncedSearchQueryVar);
     };
+    // The query starts at its default (see `buildSearchQueryInitAST`), so the
+    // pair must agree on who goes first: the read-back adopts the address, THEN
+    // the write-back may write — before that, its first run would delete the very
+    // `?<key>=` the read-back is about to adopt.
+    var adoptedRefVar = "ds_".concat(usage.index, "_searchUrlAdopted");
+    var adopterVar = "ds_".concat(usage.index, "_adoptUrlSearch");
+    effectStatements.push(types.variableDeclaration('const', [
+        types.variableDeclarator(types.identifier(adoptedRefVar), types.callExpression(types.identifier('useRef'), [types.booleanLiteral(false)])),
+    ]), buildUrlSearchAdopter(adopterVar, usage, vars));
     // write-back: debounced query → `?<searchUrlParamKey>=`
-    effectStatements.push(URLSearchParamSync.buildUrlWriteBackEffect(usage.searchUrlParamKey, buildDebouncedValueExpr(), buildDebouncedValueExpr()));
-    // read-back: `?<searchUrlParamKey>=` → input (`setDs_N_searchQuery`). The
-    // debounce effect propagates the change into the debounced value + fetch.
-    effectStatements.push(URLSearchParamSync.buildUrlReadBackEffect(usage.searchUrlParamKey, vars.setSearchQueryVar));
+    effectStatements.push(URLSearchParamSync.buildUrlWriteBackEffect(usage.searchUrlParamKey, buildDebouncedValueExpr(), buildDebouncedValueExpr(), undefined, adoptedRefVar));
+    // read-back: `?<searchUrlParamKey>=` → the input AND the applied query at once
+    // (`ds_N_adoptUrlSearch`), so an address is not a typed change: it skips the
+    // debounce and keeps the page — `?searchKeyword=x&page=3` lands on page 3.
+    effectStatements.push(URLSearchParamSync.buildUrlReadBackEffect(usage.searchUrlParamKey, adopterVar, undefined, adoptedRefVar));
+}
+// `const ds_N_adoptUrlSearch = (update) => { … }`: the setter the search's URL
+// read-back calls with its `(prev) => next` updater. It moves the input and the
+// applied (debounced) query together; the combined paginated state keeps its
+// page, which a typed change resets to 1 in the debounce effect.
+function buildUrlSearchAdopter(adopterVar, usage, vars) {
+    var update = types.identifier('update');
+    var applyToDebounced = usage.category === 'paginated+search'
+        ? // setDs_N_state((state) => {
+            //   const next = update(state.debouncedQuery)
+            //   return next === state.debouncedQuery ? state : { ...state, debouncedQuery: next }
+            // })
+            types.callExpression(types.identifier(vars.setCombinedStateVar), [
+                types.arrowFunctionExpression([types.identifier('state')], types.blockStatement([
+                    types.variableDeclaration('const', [
+                        types.variableDeclarator(types.identifier('next'), types.callExpression(types.identifier('update'), [
+                            types.memberExpression(types.identifier('state'), types.identifier('debouncedQuery')),
+                        ])),
+                    ]),
+                    types.returnStatement(types.conditionalExpression(types.binaryExpression('===', types.identifier('next'), types.memberExpression(types.identifier('state'), types.identifier('debouncedQuery'))), types.identifier('state'), types.objectExpression([
+                        types.spreadElement(types.identifier('state')),
+                        types.objectProperty(types.identifier('debouncedQuery'), types.identifier('next')),
+                    ]))),
+                ])),
+            ])
+        : types.callExpression(types.identifier(vars.setDebouncedSearchQueryVar), [update]);
+    return types.variableDeclaration('const', [
+        types.variableDeclarator(types.identifier(adopterVar), types.arrowFunctionExpression([types.identifier('update')], types.blockStatement([
+            types.expressionStatement(types.callExpression(types.identifier(vars.setSearchQueryVar), [
+                types.identifier('update'),
+            ])),
+            types.expressionStatement(applyToDebounced),
+        ]))),
+    ]);
 }
 // How one usage reads and writes its current page.
 //
@@ -862,13 +876,12 @@ export var createNextArrayMapperPaginationPlugin = function () {
                             ]),
                         ])),
                     ]));
-                    // Immediate search query state — seeded with `searchDefaultValue` (or
-                    // the `searchUrlParamKey` URL value when bound) so the input is
-                    // pre-filled on mount. The debounced value above is seeded identically
-                    // so a deep-linked `?searchKeyword=` fetches filtered results on the
-                    // first paint: the paginated+search `initialData` is gated on
-                    // `!ds_N_state.debouncedQuery`, so a non-empty seed forces the
-                    // DataProvider to fetch instead of reusing the unfiltered SSG prefetch.
+                    // Immediate search query state — seeded with `searchDefaultValue`, like
+                    // the debounced value above. A deep-linked `?searchKeyword=` is adopted
+                    // after mount by the URL read-back, which sets both at once; the
+                    // paginated+search `initialData` is gated on `!ds_N_state.debouncedQuery`,
+                    // so the adopted query makes the DataProvider fetch filtered rows
+                    // instead of reusing the unfiltered SSG prefetch the first render shows.
                     stateDeclarations.push(types.variableDeclaration('const', [
                         types.variableDeclarator(types.arrayPattern([
                             types.identifier(vars.searchQueryVar),
@@ -1734,7 +1747,13 @@ function updateDataProviderForSearchOnly(dp, usage, vars, fileName, cacheDeclara
     dp.openingElement.attributes.push(types.jsxAttribute(types.jsxIdentifier('persistDataDuringLoading'), types.jsxExpressionContainer(types.booleanLiteral(true))));
 }
 function updateDataProviderForPlain(dp, fileName, usage, localized) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
+    // A sort bound to state is the visitor's, which the server cannot know: rows
+    // pre-rendered in the table's order would stand in for it, since a seeded
+    // provider skips its first fetch — the paginated lists drop them the same way.
+    if (usage.dynamicSort) {
+        dp.openingElement.attributes = dp.openingElement.attributes.filter(function (attr) { var _a; return !(attr.type === 'JSXAttribute' && ((_a = attr.name) === null || _a === void 0 ? void 0 : _a.name) === 'initialData'); });
+    }
     var attrs = dp.openingElement.attributes;
     var clientCache = ((_a = usage.cache) === null || _a === void 0 ? void 0 : _a.client) ? usage.cache : undefined;
     // Check if fetchData already exists
@@ -1757,10 +1776,12 @@ function updateDataProviderForPlain(dp, fileName, usage, localized) {
     }
     // 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.
+    // project those have to carry the locale, and a sorted list its sort, so the
+    // attribute is created.
     var paramsAttrIndex = attrs.findIndex(function (attr) { return attr.type === 'JSXAttribute' && attr.name.name === 'params'; });
+    var isSorted = usage.sorts.length > 0 || !!usage.dynamicSort;
     if (paramsAttrIndex === -1) {
-        if (!localized) {
+        if (!localized && !isSorted) {
             return;
         }
         attrs.push(types.jsxAttribute(types.jsxIdentifier('params'), types.jsxExpressionContainer(types.objectExpression([]))));
@@ -1781,10 +1802,17 @@ function updateDataProviderForPlain(dp, fileName, usage, localized) {
     if (!paramsExpression) {
         return;
     }
-    // Build useMemo dependencies including filter state IDs
+    // The repeater's sort, which the paginated and searchable lists add to the
+    // params they rebuild: kept as they come, a plain list's params never
+    // carried it, and the rows arrived in the table's own order.
+    if (paramsExpression.type === 'ObjectExpression' && !hasObjectKey(paramsExpression, 'sorts')) {
+        appendSortsParam(paramsExpression.properties, usage.sorts, usage.dynamicSort);
+    }
+    // Build useMemo dependencies including filter state IDs and a dynamic sort's state
     var memoDeps = [];
     var memoSeen = new Set();
     pushStateIdsAsDeps(memoDeps, memoSeen, usage.filterStateIds);
+    pushStateIdsAsDeps(memoDeps, memoSeen, (_f = (_e = usage.dynamicSort) === null || _e === void 0 ? void 0 : _e.depStateIds) !== null && _f !== void 0 ? _f : []);
     pushPropIdsAsDeps(memoDeps, memoSeen, usage.filterPropIds);
     pushUrlSearchParamMemoDeps(memoDeps, usage);
     if (localized && paramsExpression.type === 'ObjectExpression') {
@@ -1798,6 +1826,13 @@ function updateDataProviderForPlain(dp, fileName, usage, localized) {
     // Replace the params attribute
     attrs[paramsAttrIndex] = types.jsxAttribute(types.jsxIdentifier('params'), types.jsxExpressionContainer(memoizedParams));
 }
+var hasObjectKey = function (object, key) {
+    return object.properties.some(function (property) {
+        return property.type === 'ObjectProperty' &&
+            ((property.key.type === 'Identifier' && property.key.name === key) ||
+                (property.key.type === 'StringLiteral' && property.key.value === key));
+    });
+};
 function stabilizeDataProviderWithoutRepeater(dp) {
     var _a, _b, _c;
     var attrs = dp.openingElement.attributes;
@@ -2227,17 +2262,9 @@ function updateGetStaticProps(chunks, registry, dependencies, folderPath, locali
         }
         // Add filters if present
         // Filter out dynamic destinations for getStaticProps (they can't be resolved at build time)
-        var staticFilters = (usage.filters || []).filter(function (f) { return !ASTUtils.isUIDLDynamicReference(f.destination); });
+        var staticFilters = staticFiltersOf(usage);
         if (staticFilters.length > 0) {
-            fetchParams.push(types.objectProperty(types.identifier('filters'), types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [
-                types.arrayExpression(staticFilters.map(function (filter) {
-                    return types.objectExpression([
-                        types.objectProperty(types.identifier('source'), types.stringLiteral(filter.source || '')),
-                        types.objectProperty(types.identifier('destination'), types.stringLiteral(typeof filter.destination === 'string' ? filter.destination : '')),
-                        types.objectProperty(types.identifier('operand'), types.stringLiteral(filter.operand || '')),
-                    ]);
-                })),
-            ])));
+            fetchParams.push(types.objectProperty(types.identifier('filters'), buildStaticFiltersStringifyCall(staticFilters)));
         }
         appendItemsPathParam(fetchParams, usage.itemsPath, 'itemsPath');
         // The prefetch is per locale — getStaticProps runs once per language.
@@ -2277,7 +2304,7 @@ function updateGetStaticProps(chunks, registry, dependencies, folderPath, locali
             var maxPagesPropName_1 = "".concat(vars.propsPrefix, "_maxPages");
             // 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 staticFiltersForCount = staticFiltersOf(usage);
             // 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;
@@ -2328,7 +2355,7 @@ function updateGetStaticProps(chunks, registry, dependencies, folderPath, locali
         usagesByFilters.forEach(function (usages, filtersKey) {
             var firstUsage = usages[0];
             // 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 staticFiltersForCount = staticFiltersOf(firstUsage);
             var hasStaticFilters = staticFiltersForCount.length > 0;
             // Create unique count variable name based on filters (and inner-array
             // scope — must match the naming at the maxPages site above)
@@ -2348,15 +2375,7 @@ function updateGetStaticProps(chunks, registry, dependencies, folderPath, locali
                 // Build count params if static filters exist
                 var countParams = [];
                 if (hasStaticFilters) {
-                    countParams.push(types.objectProperty(types.identifier('filters'), types.callExpression(types.memberExpression(types.identifier('JSON'), types.identifier('stringify')), [
-                        types.arrayExpression(staticFiltersForCount.map(function (f) {
-                            return types.objectExpression([
-                                types.objectProperty(types.identifier('source'), types.stringLiteral(f.source || '')),
-                                types.objectProperty(types.identifier('destination'), types.stringLiteral(typeof f.destination === 'string' ? f.destination : '')),
-                                types.objectProperty(types.identifier('operand'), types.stringLiteral(f.operand || '')),
-                            ]);
-                        })),
-                    ])));
+                    countParams.push(types.objectProperty(types.identifier('filters'), buildStaticFiltersStringifyCall(staticFiltersForCount)));
                 }
                 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')), [