mx-cloud 0.0.5 → 0.0.8

package/build/browserSide/scraper.js

@@ -636,6 +636,26 @@ function scrapableHeuristics(maxCountPerPage = 50, minArea = 20000, scrolls = 3,
                     return similarity >= similarityThreshold;
                 });
             }
+            function tryFallbackSelector(rootElement, originalSelector) {
+                let element = queryElement(rootElement, originalSelector);
+                if (!element && originalSelector.includes('nth-child')) {
+                    const match = originalSelector.match(/nth-child\((\d+)\)/);
+                    if (match) {
+                        const position = parseInt(match[1], 10);
+                        for (let i = position - 1; i >= 1; i--) {
+                            const fallbackSelector = originalSelector.replace(/nth-child\(\d+\)/, `nth-child(${i})`);
+                            element = queryElement(rootElement, fallbackSelector);
+                            if (element)
+                                break;
+                        }
+                        if (!element) {
+                            const baseSelector = originalSelector.replace(/\:nth-child\(\d+\)/, '');
+                            element = queryElement(rootElement, baseSelector);
+                        }
+                    }
+                }
+                return element;
+            }
             // Main scraping logic with context support
             let containers = queryElementAll(document, listSelector);
             containers = Array.from(containers);
@@ -786,7 +806,7 @@ function scrapableHeuristics(maxCountPerPage = 50, minArea = 20000, scrolls = 3,
                     for (const [label, { selector, attribute }] of Object.entries(nonTableFields)) {
                         // Get the last part of the selector after any context delimiter
                         const relativeSelector = selector.split(/(?:>>|:>>)/).slice(-1)[0];
-                        const element = queryElement(container, relativeSelector);
+                        const element = tryFallbackSelector(container, relativeSelector);
                         if (element) {
                             record[label] = extractValue(element, attribute);
                         }

package/build/interpret.js

@@ -318,6 +318,7 @@ class Interpreter extends events_1.EventEmitter {
    */
     carryOutSteps(page, steps) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             /**
              * Defines overloaded (or added) methods/actions usable in the workflow.
              * If a method overloads any existing method of the Page class, it accepts the same set
@@ -410,14 +411,14 @@ class Interpreter extends events_1.EventEmitter {
                         return;
                     }
                     yield this.ensureScriptsLoaded(page);
-                    let scrapeResults = [];
                     if (!config.pagination) {
-                        scrapeResults = yield page.evaluate((cfg) => window.scrapeList(cfg), config);
+                        const scrapeResults = yield page.evaluate((cfg) => window.scrapeList(cfg), config);
+                        yield this.options.serializableCallback(scrapeResults);
                     }
                     else {
-                        scrapeResults = yield this.handlePagination(page, config);
+                        const scrapeResults = yield this.handlePagination(page, config);
+                        yield this.options.serializableCallback(scrapeResults);
                     }
-                    yield this.options.serializableCallback(scrapeResults);
                 }),
                 scrapeListAuto: (config) => __awaiter(this, void 0, void 0, function* () {
                     var _a;
@@ -484,6 +485,9 @@ class Interpreter extends events_1.EventEmitter {
                     yield wawActions[step.action](...(params !== null && params !== void 0 ? params : []));
                 }
                 else {
+                    if ((_a = this.options.debugChannel) === null || _a === void 0 ? void 0 : _a.setActionType) {
+                        this.options.debugChannel.setActionType(String(step.action));
+                    }
                     // Implements the dot notation for the "method name" in the workflow
                     const levels = String(step.action).split('.');
                     const methodName = levels[levels.length - 1];
@@ -713,6 +717,7 @@ class Interpreter extends events_1.EventEmitter {
                                             button.click()
                                         ]);
                                         debugLog("Navigation successful after regular click");
+                                        yield page.waitForTimeout(2000);
                                         paginationSuccess = true;
                                     }
                                     catch (navError) {
@@ -728,6 +733,7 @@ class Interpreter extends events_1.EventEmitter {
                                                 button.dispatchEvent('click')
                                             ]);
                                             debugLog("Navigation successful after dispatch event");
+                                            yield page.waitForTimeout(2000);
                                             paginationSuccess = true;
                                         }
                                         catch (dispatchNavError) {

package/build/selector.js

@@ -676,7 +676,10 @@ const generateNonUniqueSelectors = (page_1, elementHandle_1, ...args_1) => __awa
                         });
                         return selectorParts.join(contextPath[0].type === 'shadow' ? ' >> ' : ' :>> ');
                     }
-                    // Regular DOM path generation
+                    const elementSelector = getNonUniqueSelector(element);
+                    if (elementSelector.includes('.') && elementSelector.split('.').length > 1) {
+                        return elementSelector;
+                    }
                     const path = [];
                     let currentElement = element;
                     const MAX_DEPTH = 2;
@@ -798,6 +801,7 @@ const generateNonUniqueSelectors = (page_1, elementHandle_1, ...args_1) => __awa
                 function getSelectorPath(element) {
                     if (!element)
                         return '';
+                    // Get the complete context path
                     const contextPath = getContextPath(element);
                     if (contextPath.length > 0) {
                         const selectorParts = [];
@@ -814,6 +818,10 @@ const generateNonUniqueSelectors = (page_1, elementHandle_1, ...args_1) => __awa
                         });
                         return selectorParts.join(contextPath[0].type === 'shadow' ? ' >> ' : ' :>> ');
                     }
+                    const elementSelector = getNonUniqueSelector(element);
+                    if (elementSelector.includes('.') && elementSelector.split('.').length > 1) {
+                        return elementSelector;
+                    }
                     const path = [];
                     let currentElement = element;
                     const MAX_DEPTH = 2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mx-cloud",
-  "version": "0.0.5",
+  "version": "0.0.8",
   "description": "mx cloud",
   "main": "build/index.js",
   "typings": "build/index.d.ts",