@rickcedwhat/playwright-smart-table 6.20.1-next.6671496 → 6.20.1-next.e170fdd

package/dist/engine/rowFinder.d.ts

@@ -24,6 +24,7 @@ export declare class RowFinder<T = any> {
         exact?: boolean;
         maxPages?: number;
     }): Promise<SmartRow<T>>;
+    private waitForTableReady;
     findRows(filters?: Record<string, FilterValue>, options?: {
         exact?: boolean;
         maxPages?: number;

package/dist/engine/rowFinder.js

@@ -104,6 +104,22 @@ class RowFinder {
         smartRow[sentinel_1.SENTINEL_ROW] = true;
         return smartRow;
     }
+    async waitForTableReady() {
+        var _a;
+        const isTableLoading = (_a = this.config.strategies.loading) === null || _a === void 0 ? void 0 : _a.isTableLoading;
+        if (!isTableLoading)
+            return;
+        const context = {
+            root: this.rootLocator,
+            config: this.config,
+            page: this.rootLocator.page(),
+            resolve: this.resolve
+        };
+        while (await isTableLoading(context)) {
+            (0, debugUtils_1.logDebug)(this.config, 'verbose', 'Table is loading... waiting');
+            await this.rootLocator.page().waitForTimeout(200);
+        }
+    }
     async findRows(filters = {}, options) {
         var _a, _b, _c;
         const filtersRecord = filters;
@@ -114,6 +130,7 @@ class RowFinder {
         (0, debugUtils_1.logDebug)(this.config, 'verbose', `findRows: starting (maxPages=${effectiveMaxPages}, filters=${JSON.stringify(filtersRecord)})`);
         const tracker = new elementTracker_1.ElementTracker('findRows');
         try {
+            await this.waitForTableReady();
             const { domFilters, overrideFilters, syntheticFilters } = this.splitFilters(filtersRecord);
             const hasOverrideFilters = Object.keys(overrideFilters).length > 0;
             const hasSyntheticFilters = Object.keys(syntheticFilters).length > 0;
@@ -186,26 +203,13 @@ class RowFinder {
         return (0, smartRowArray_1.createSmartRowArray)(allRows);
     }
     async findRowLocator(filters, options = {}) {
-        var _a, _b, _c;
+        var _a, _b;
         const map = await this.tableMapper.getMap();
         const effectiveMaxPages = (_a = options.maxPages) !== null && _a !== void 0 ? _a : this.config.maxPages;
         let pagesScanned = 1;
         (0, debugUtils_1.logDebug)(this.config, 'verbose', `Looking for row: ${JSON.stringify(filters)} (MaxPages: ${effectiveMaxPages})`);
         while (true) {
-            // Check Loading
-            if ((_b = this.config.strategies.loading) === null || _b === void 0 ? void 0 : _b.isTableLoading) {
-                const isLoading = await this.config.strategies.loading.isTableLoading({
-                    root: this.rootLocator,
-                    config: this.config,
-                    page: this.rootLocator.page(),
-                    resolve: this.resolve
-                });
-                if (isLoading) {
-                    (0, debugUtils_1.logDebug)(this.config, 'verbose', 'Table is loading... waiting');
-                    await this.rootLocator.page().waitForTimeout(200);
-                    continue;
-                }
-            }
+            await this.waitForTableReady();
             const allRows = this.resolve(this.config.rowSelector, this.rootLocator);
             const { domFilters, overrideFilters, syntheticFilters } = this.splitFilters(filters);
             const hasPostFilters = Object.keys(overrideFilters).length > 0 || Object.keys(syntheticFilters).length > 0;
@@ -242,7 +246,7 @@ class RowFinder {
                 (0, debugUtils_1.logDebug)(this.config, 'verbose', `Page ${this.tableState.currentPageIndex}: Not found. Attempting pagination...`);
                 // Default to single-step goNext; bulk is opt-in via useBulkPagination: true (#349).
                 // Bulk-by-default made findRow jump past the page holding the target row.
-                const useBulk = options.useBulkPagination === true && !!((_c = this.config.strategies.pagination) === null || _c === void 0 ? void 0 : _c.goNextBulk);
+                const useBulk = options.useBulkPagination === true && !!((_b = this.config.strategies.pagination) === null || _b === void 0 ? void 0 : _b.goNextBulk);
                 const prevPage = this.tableState.currentPageIndex;
                 const didLoadMore = await this.advancePage(useBulk);
                 if (didLoadMore) {

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.20.1-next.6671496";
+export declare const PLAYWRIGHT_SMART_TABLE_VERSION: "6.20.1-next.e170fdd";

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.20.1-next.6671496";
+exports.PLAYWRIGHT_SMART_TABLE_VERSION = "6.20.1-next.e170fdd";

package/dist/useTable.js

@@ -301,7 +301,7 @@ const useTable = (rootLocator, configOptions = {}) => {
             return resolve(config.headerSelector, rootLocator).nth(idx);
         },
         countRows: async (filters, options) => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             if (tableState.empty)
                 return 0;
             await _autoInit();
@@ -359,6 +359,15 @@ const useTable = (rootLocator, configOptions = {}) => {
                 }
                 return count;
             };
+            // Wait for table to finish loading before counting
+            const isTableLoading = (_e = config.strategies.loading) === null || _e === void 0 ? void 0 : _e.isTableLoading;
+            if (isTableLoading) {
+                const ctx = createStrategyContext();
+                while (await isTableLoading(ctx)) {
+                    log('countRows: table is loading... waiting');
+                    await rootLocator.page().waitForTimeout(200);
+                }
+            }
             if (!hasPagination) {
                 log(`countRows: counting rows in current viewport (no pagination)${hasFilters ? ` filters=${safeStringify(filtersRecord)}` : ''}`);
                 if (!hasPostFilters)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rickcedwhat/playwright-smart-table",
-  "version": "6.20.1-next.6671496",
+  "version": "6.20.1-next.e170fdd",
   "description": "Smart, column-aware table interactions for Playwright",
   "author": "Cedrick Catalan",
   "license": "MIT",