@rickcedwhat/playwright-smart-table 6.15.0 → 6.17.0

package/dist/engine/rowFinder.d.ts

@@ -3,6 +3,7 @@ import { FinalTableConfig, Selector, SmartRow, FilterValue } from '../types';
 import { FilterEngine } from '../filterEngine';
 import { TableMapper } from './tableMapper';
 import { SmartRowArray } from '../utils/smartRowArray';
+import { NavigationBarrier } from '../utils/navigationBarrier';
 export declare class RowFinder<T = any> {
     private rootLocator;
     private config;
@@ -10,10 +11,11 @@ export declare class RowFinder<T = any> {
     private tableMapper;
     private makeSmartRow;
     private tableState;
+    private advancePage;
     private resolve;
-    constructor(rootLocator: Locator, config: FinalTableConfig, resolve: (item: Selector, parent: Locator | Page) => Locator, filterEngine: FilterEngine, tableMapper: TableMapper, makeSmartRow: (loc: Locator, map: Map<string, number>, index: number | undefined, tablePageIndex?: number) => SmartRow<T>, tableState?: {
+    constructor(rootLocator: Locator, config: FinalTableConfig, resolve: (item: Selector, parent: Locator | Page) => Locator, filterEngine: FilterEngine, tableMapper: TableMapper, makeSmartRow: (loc: Locator, map: Map<string, number>, index: number | undefined, tablePageIndex?: number, barrier?: NavigationBarrier) => SmartRow<T>, tableState?: {
         currentPageIndex: number;
-    });
+    }, advancePage?: (useBulk: boolean) => Promise<boolean>);
     findRow(filters: Record<string, FilterValue>, options?: {
         exact?: boolean;
         maxPages?: number;

package/dist/engine/rowFinder.js

@@ -3,17 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RowFinder = void 0;
 const debugUtils_1 = require("../utils/debugUtils");
 const smartRowArray_1 = require("../utils/smartRowArray");
-const validation_1 = require("../strategies/validation");
 const elementTracker_1 = require("../utils/elementTracker");
 const sentinel_1 = require("../utils/sentinel");
+const navigationBarrier_1 = require("../utils/navigationBarrier");
 class RowFinder {
-    constructor(rootLocator, config, resolve, filterEngine, tableMapper, makeSmartRow, tableState = { currentPageIndex: 0 }) {
+    constructor(rootLocator, config, resolve, filterEngine, tableMapper, makeSmartRow, tableState = { currentPageIndex: 0 }, advancePage = async () => false) {
         this.rootLocator = rootLocator;
         this.config = config;
         this.filterEngine = filterEngine;
         this.tableMapper = tableMapper;
         this.makeSmartRow = makeSmartRow;
         this.tableState = tableState;
+        this.advancePage = advancePage;
         this.resolve = resolve;
     }
     async findRow(filters, options = {}) {
@@ -31,12 +32,12 @@ class RowFinder {
         await (0, debugUtils_1.debugDelay)(this.config, 'findRow');
         const sentinel = this.resolve(this.config.rowSelector, this.rootLocator)
             .filter({ hasText: "___SENTINEL_ROW_NOT_FOUND___" + Date.now() });
-        const smartRow = this.makeSmartRow(sentinel, await this.tableMapper.getMap(), 0);
+        const smartRow = this.makeSmartRow(sentinel, await this.tableMapper.getMap(), undefined);
         smartRow[sentinel_1.SENTINEL_ROW] = true;
         return smartRow;
     }
     async findRows(filters = {}, options) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const filtersRecord = filters;
         const map = await this.tableMapper.getMap();
         const allRows = [];
@@ -64,12 +65,16 @@ class RowFinder {
                     : undefined;
                 const onRowLoadingTimeout = (_e = (_d = this.config.strategies.loading) === null || _d === void 0 ? void 0 : _d.onRowLoadingTimeout) !== null && _e !== void 0 ? _e : 'read-as-is';
                 let added = 0;
+                // One barrier per batch — synchronizes cell navigation across all rows in this page's results
+                const useBarrier = this.config.concurrency === 'synchronized' && newIndices.length > 1;
+                const barrier = useBarrier ? new navigationBarrier_1.NavigationBarrier(newIndices.length) : undefined;
                 for (const idx of newIndices) {
-                    const smartRow = this.makeSmartRow(currentRows[idx], map, allRows.length, this.tableState.currentPageIndex);
+                    const smartRow = this.makeSmartRow(currentRows[idx], map, allRows.length, this.tableState.currentPageIndex, barrier);
                     if (isRowLoading && await isRowLoading(smartRow)) {
                         if (rowLoadingTimeout === undefined) {
                             // No timeout configured (or invalid value) — legacy skip behavior
                             (0, debugUtils_1.logDebug)(this.config, 'verbose', `findRows: page ${this.tableState.currentPageIndex} — row skipped (isRowLoading=true, no timeout)`);
+                            barrier === null || barrier === void 0 ? void 0 : barrier.markFinished();
                             continue;
                         }
                         // Wait up to rowLoadingTimeout ms (0 = one immediate re-check, no polling)
@@ -82,9 +87,12 @@ class RowFinder {
                         }
                         if (!resolved) {
                             (0, debugUtils_1.logDebug)(this.config, 'verbose', `findRows: row ${allRows.length} — still loading after ${rowLoadingTimeout}ms, action: ${onRowLoadingTimeout}`);
-                            if (onRowLoadingTimeout === 'skip')
+                            if (onRowLoadingTimeout === 'skip') {
+                                barrier === null || barrier === void 0 ? void 0 : barrier.markFinished();
                                 continue;
+                            }
                             if (onRowLoadingTimeout === 'throw') {
+                                barrier === null || barrier === void 0 ? void 0 : barrier.markFinished();
                                 throw new Error(`[SmartTable] Row ${allRows.length} did not finish loading within ${rowLoadingTimeout}ms`);
                             }
                             // 'read-as-is': fall through and add the row
@@ -102,31 +110,14 @@ class RowFinder {
             await collectMatches();
             // Pagination Loop
             while (pagesScanned < effectiveMaxPages && this.config.strategies.pagination) {
-                const context = {
-                    root: this.rootLocator,
-                    config: this.config,
-                    resolve: this.resolve,
-                    page: this.rootLocator.page()
-                };
-                let paginationResult;
                 const useBulk = (options === null || options === void 0 ? void 0 : options.useBulkPagination) !== false && !!((_c = this.config.strategies.pagination) === null || _c === void 0 ? void 0 : _c.goNextBulk);
-                if (useBulk) {
-                    paginationResult = await this.config.strategies.pagination.goNextBulk(context);
-                }
-                else if ((_d = this.config.strategies.pagination) === null || _d === void 0 ? void 0 : _d.goNext) {
-                    paginationResult = await this.config.strategies.pagination.goNext(context);
-                }
-                else {
-                    (0, debugUtils_1.logDebug)(this.config, 'verbose', `findRows: no pagination primitive — stopping`);
-                    break;
-                }
-                const didPaginate = (0, validation_1.validatePaginationResult)(paginationResult, 'Pagination Strategy');
+                const prevPage = this.tableState.currentPageIndex;
+                const didPaginate = await this.advancePage(useBulk);
                 if (!didPaginate) {
                     (0, debugUtils_1.logDebug)(this.config, 'verbose', `findRows: pagination returned false — end of data`);
                     break;
                 }
-                const pagesJumped = typeof paginationResult === 'number' ? paginationResult : 1;
-                this.tableState.currentPageIndex += pagesJumped;
+                const pagesJumped = this.tableState.currentPageIndex - prevPage;
                 pagesScanned += pagesJumped;
                 (0, debugUtils_1.logDebug)(this.config, 'verbose', `findRows: advanced ${pagesJumped} page(s), now at page ${this.tableState.currentPageIndex}`);
                 await (0, debugUtils_1.debugDelay)(this.config, 'pagination');
@@ -140,7 +131,7 @@ class RowFinder {
         return (0, smartRowArray_1.createSmartRowArray)(allRows);
     }
     async findRowLocator(filters, options = {}) {
-        var _a, _b;
+        var _a, _b, _c;
         const map = await this.tableMapper.getMap();
         const effectiveMaxPages = (_a = options.maxPages) !== null && _a !== void 0 ? _a : this.config.maxPages;
         let pagesScanned = 1;
@@ -183,29 +174,11 @@ class RowFinder {
                 return matchedRows.first();
             if (pagesScanned < effectiveMaxPages) {
                 (0, debugUtils_1.logDebug)(this.config, 'verbose', `Page ${this.tableState.currentPageIndex}: Not found. Attempting pagination...`);
-                const context = {
-                    root: this.rootLocator,
-                    config: this.config,
-                    resolve: this.resolve,
-                    page: this.rootLocator.page()
-                };
-                let paginationResult;
-                const pagination = this.config.strategies.pagination;
-                const useBulk = options.useBulkPagination !== false && !!(pagination === null || pagination === void 0 ? void 0 : pagination.goNextBulk);
-                if (useBulk && (pagination === null || pagination === void 0 ? void 0 : pagination.goNextBulk)) {
-                    paginationResult = await pagination.goNextBulk(context);
-                }
-                else if (pagination === null || pagination === void 0 ? void 0 : pagination.goNext) {
-                    paginationResult = await pagination.goNext(context);
-                }
-                else {
-                    (0, debugUtils_1.logDebug)(this.config, 'verbose', `Page ${this.tableState.currentPageIndex}: Pagination failed (no goNext or goNextBulk primitive).`);
-                    return null;
-                }
-                const didLoadMore = (0, validation_1.validatePaginationResult)(paginationResult, 'Pagination Strategy');
+                const useBulk = options.useBulkPagination !== false && !!((_c = this.config.strategies.pagination) === null || _c === void 0 ? void 0 : _c.goNextBulk);
+                const prevPage = this.tableState.currentPageIndex;
+                const didLoadMore = await this.advancePage(useBulk);
                 if (didLoadMore) {
-                    const pagesJumped = typeof paginationResult === 'number' ? paginationResult : 1;
-                    this.tableState.currentPageIndex += pagesJumped;
+                    const pagesJumped = this.tableState.currentPageIndex - prevPage;
                     pagesScanned += pagesJumped;
                     (0, debugUtils_1.logDebug)(this.config, 'verbose', `findRowLocator: advanced ${pagesJumped} page(s), now at page ${this.tableState.currentPageIndex}`);
                     await (0, debugUtils_1.debugDelay)(this.config, 'pagination');

package/dist/index.d.ts

@@ -5,3 +5,4 @@ export { Strategies } from './strategies';
 export * as presets from './presets';
 /** @deprecated Use `presets` instead. Plugins will be removed in v7.0.0. */
 export { Plugins } from './plugins';
+export { mergeTableConfig } from './utils/mergeTableConfig';

package/dist/index.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Plugins = exports.presets = exports.Strategies = exports.useTable = exports.PLAYWRIGHT_SMART_TABLE_VERSION = void 0;
+exports.mergeTableConfig = exports.Plugins = exports.presets = exports.Strategies = exports.useTable = exports.PLAYWRIGHT_SMART_TABLE_VERSION = void 0;
 var packageVersion_1 = require("./packageVersion");
 Object.defineProperty(exports, "PLAYWRIGHT_SMART_TABLE_VERSION", { enumerable: true, get: function () { return packageVersion_1.PLAYWRIGHT_SMART_TABLE_VERSION; } });
 var useTable_1 = require("./useTable");
@@ -45,3 +45,5 @@ exports.presets = __importStar(require("./presets"));
 /** @deprecated Use `presets` instead. Plugins will be removed in v7.0.0. */
 var plugins_1 = require("./plugins");
 Object.defineProperty(exports, "Plugins", { enumerable: true, get: function () { return plugins_1.Plugins; } });
+var mergeTableConfig_1 = require("./utils/mergeTableConfig");
+Object.defineProperty(exports, "mergeTableConfig", { enumerable: true, get: function () { return mergeTableConfig_1.mergeTableConfig; } });

package/dist/packageVersion.d.ts

@@ -3,4 +3,4 @@
  * Generated by scripts/embed-version.mjs from package.json
  */
 /** Semver of this package. Use in logs or diagnostics to confirm the installed build. */
-export declare const PLAYWRIGHT_SMART_TABLE_VERSION: "6.15.0";
+export declare const PLAYWRIGHT_SMART_TABLE_VERSION: "6.17.0";

package/dist/packageVersion.js

@@ -6,4 +6,4 @@ exports.PLAYWRIGHT_SMART_TABLE_VERSION = void 0;
  * Generated by scripts/embed-version.mjs from package.json
  */
 /** Semver of this package. Use in logs or diagnostics to confirm the installed build. */
-exports.PLAYWRIGHT_SMART_TABLE_VERSION = "6.15.0";
+exports.PLAYWRIGHT_SMART_TABLE_VERSION = "6.17.0";

package/dist/presets/glide/index.d.ts

@@ -36,3 +36,4 @@ export declare function createGlide(options?: GlideOptions): Partial<TableConfig
 export declare const Glide: Partial<TableConfig> & {
     Strategies: typeof GlideStrategies;
 };
+export { Glide as glide };

package/dist/presets/glide/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Glide = exports.GlideStrategies = exports.createGlideViewport = void 0;
+exports.glide = exports.Glide = exports.GlideStrategies = exports.createGlideViewport = void 0;
 exports.createGlide = createGlide;
 const headers_1 = require("./headers");
 const pagination_1 = require("../../strategies/pagination");
@@ -75,9 +75,15 @@ const glideGetActiveCell = async ({ page }) => {
     let rowIndex = -1;
     let columnIndex = -1;
     if (parts.length >= 4 && parts[0] === 'glide' && parts[1] === 'cell') {
-        columnIndex = parseInt(parts[2]) - 1;
+        columnIndex = parseInt(parts[2]); // 0-based in Glide's id format: glide-cell-{col}-{row}
         rowIndex = parseInt(parts[3]);
     }
+    else if (id !== '') {
+        throw new Error(`Glide preset: focused element has id "${id}" which does not match the expected format "glide-cell-{colIndex}-{rowIndex}". ` +
+            `Glide may have changed its internal id format. Please open an issue at https://github.com/rickcedwhat/playwright-smart-table/issues.`);
+    }
+    if (rowIndex === -1 || columnIndex === -1)
+        return null;
     return {
         rowIndex,
         columnIndex,
@@ -129,3 +135,4 @@ const GlidePreset = {
     strategies: GlideDefaultStrategies
 };
 exports.Glide = Object.defineProperty(GlidePreset, 'Strategies', { get: () => exports.GlideStrategies, enumerable: false });
+exports.glide = exports.Glide;

package/dist/presets/index.d.ts

@@ -1,4 +1,5 @@
-export { muiTable, muiDataGrid } from './mui';
-export { RDG as rdg } from './rdg';
+export { muiTable, muiDataGrid, createMuiTable, createMuiDataGrid } from './mui';
+export type { MuiButtonLabels } from './mui';
+export { RDG as rdg, RDG2D as rdg2D } from './rdg';
 export { Glide as glide, createGlide, createGlideViewport } from './glide';
 export type { GlideOptions, GlideViewportOptions } from './glide';

package/dist/presets/index.js

@@ -1,11 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createGlideViewport = exports.createGlide = exports.glide = exports.rdg = exports.muiDataGrid = exports.muiTable = void 0;
+exports.createGlideViewport = exports.createGlide = exports.glide = exports.rdg2D = exports.rdg = exports.createMuiDataGrid = exports.createMuiTable = exports.muiDataGrid = exports.muiTable = void 0;
 var mui_1 = require("./mui");
 Object.defineProperty(exports, "muiTable", { enumerable: true, get: function () { return mui_1.muiTable; } });
 Object.defineProperty(exports, "muiDataGrid", { enumerable: true, get: function () { return mui_1.muiDataGrid; } });
+Object.defineProperty(exports, "createMuiTable", { enumerable: true, get: function () { return mui_1.createMuiTable; } });
+Object.defineProperty(exports, "createMuiDataGrid", { enumerable: true, get: function () { return mui_1.createMuiDataGrid; } });
 var rdg_1 = require("./rdg");
 Object.defineProperty(exports, "rdg", { enumerable: true, get: function () { return rdg_1.RDG; } });
+Object.defineProperty(exports, "rdg2D", { enumerable: true, get: function () { return rdg_1.RDG2D; } });
 var glide_1 = require("./glide");
 Object.defineProperty(exports, "glide", { enumerable: true, get: function () { return glide_1.Glide; } });
 Object.defineProperty(exports, "createGlide", { enumerable: true, get: function () { return glide_1.createGlide; } });

package/dist/presets/mui.d.ts

@@ -1,16 +1,28 @@
 import { TableConfig } from '../types';
+/** Aria-labels for MUI pagination buttons. Override for non-English locales. */
+export interface MuiButtonLabels {
+    nextPage?: string;
+    previousPage?: string;
+    firstPage?: string;
+}
 /**
- * Preset configuration for the standard Material UI `<Table />` component.
+ * Creates a preset configuration for the standard Material UI `<Table />` component.
  *
- * Handles:
- * - Selectors for `.MuiTableRow-root`, `.MuiTableCell-head`, etc.
- * - Pagination via the standard `.MuiTablePagination-actions` footer.
- * - Sorting via the `.MuiTableSortLabel-root` header classes.
- * - Virtualized DOM deduplication (falls back to cell text if unvirtualized).
+ * @param opts.buttonLabels - Override aria-labels for pagination buttons (use for non-English locales).
+ *
+ * @example
+ * // French locale
+ * const table = useTable(loc, createMuiTable({ buttonLabels: { nextPage: 'Page suivante', previousPage: 'Page précédente' } }));
  */
+export declare function createMuiTable(opts?: {
+    buttonLabels?: MuiButtonLabels;
+}): Partial<TableConfig>;
+/** Default preset for MUI `<Table />`. For non-English locales use `createMuiTable({ buttonLabels })`. */
 export declare const muiTable: Partial<TableConfig>;
 /**
- * Preset configuration for the MUI DataGrid component (@mui/x-data-grid).
+ * Creates a preset configuration for the MUI DataGrid component (@mui/x-data-grid).
+ *
+ * @param opts.buttonLabels - Override aria-labels for pagination buttons (use for non-English locales).
  *
  * Handles:
  * - Selectors for `.MuiDataGrid-row`, `.MuiDataGrid-cell`, and `.MuiDataGrid-columnHeader`.
@@ -19,4 +31,8 @@ export declare const muiTable: Partial<TableConfig>;
  * - Vertical Virtualization deduplication using `data-rowindex`.
  * - Horizontal Virtualization support via `aria-colindex`.
  */
+export declare function createMuiDataGrid(opts?: {
+    buttonLabels?: MuiButtonLabels;
+}): Partial<TableConfig>;
+/** Default preset for MUI DataGrid. For non-English locales use `createMuiDataGrid({ buttonLabels })`. */
 export declare const muiDataGrid: Partial<TableConfig>;