- Notifications
You must be signed in to change notification settings - Fork 1.1k
fix: extract clean data #822
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits Select commit Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| | @@ -555,36 +555,23 @@ class ClientSelectorGenerator { | |
| */ | ||
| private isMeaningfulElement(element: HTMLElement): boolean { | ||
| const tagName = element.tagName.toLowerCase(); | ||
| | ||
| // Fast path for common meaningful elements | ||
| if (["a", "img", "input", "button", "select"].includes(tagName)) { | ||
| return true; | ||
| | ||
| if (tagName === "img") { | ||
| return element.hasAttribute("src"); | ||
| } | ||
| | ||
| const text = (element.textContent || "").trim(); | ||
| const hasHref = element.hasAttribute("href"); | ||
| const hasSrc = element.hasAttribute("src"); | ||
| | ||
| // Quick checks first | ||
| if (text.length > 0 || hasHref || hasSrc) { | ||
| if (tagName === "a" && element.hasAttribute("href")) { | ||
| return true; | ||
| } | ||
| | ||
| const isCustomElement = tagName.includes("-"); | ||
| if (element.children.length > 0) { | ||
| return false; | ||
| } | ||
| | ||
| // For custom elements, be more lenient about what's considered meaningful | ||
| if (isCustomElement) { | ||
| const hasChildren = element.children.length > 0; | ||
| const hasSignificantAttributes = Array.from(element.attributes).some( | ||
| (attr) => !["class", "style", "id"].includes(attr.name.toLowerCase()) | ||
| ); | ||
| const text = (element.textContent || "").trim(); | ||
| | ||
| return ( | ||
| hasChildren || | ||
| hasSignificantAttributes || | ||
| element.hasAttribute("role") || | ||
| element.hasAttribute("aria-label") | ||
| ); | ||
| if (text.length > 0) { | ||
| return true; | ||
| } | ||
| | ||
| return false; | ||
| | @@ -2561,12 +2548,9 @@ class ClientSelectorGenerator { | |
| | ||
| const MAX_MEANINGFUL_ELEMENTS = 300; | ||
| const MAX_NODES_TO_CHECK = 1200; | ||
| const MAX_DEPTH = 12; | ||
| const MAX_DEPTH = 20; | ||
| let nodesChecked = 0; | ||
| | ||
| let adjustedMaxDepth = MAX_DEPTH; | ||
| const elementDensityThreshold = 50; | ||
| | ||
| const depths: number[] = [0]; | ||
| let queueIndex = 0; | ||
| | ||
| | @@ -2576,14 +2560,10 @@ class ClientSelectorGenerator { | |
| queueIndex++; | ||
| nodesChecked++; | ||
| | ||
| if (currentDepth <= 3 && meaningfulDescendants.length > elementDensityThreshold) { | ||
| adjustedMaxDepth = Math.max(6, adjustedMaxDepth - 2); | ||
| } | ||
| | ||
| if ( | ||
| nodesChecked > MAX_NODES_TO_CHECK || | ||
| meaningfulDescendants.length >= MAX_MEANINGFUL_ELEMENTS || | ||
| currentDepth > adjustedMaxDepth | ||
| currentDepth > MAX_DEPTH | ||
| ) { | ||
| break; | ||
| } | ||
| | @@ -2592,7 +2572,7 @@ class ClientSelectorGenerator { | |
| meaningfulDescendants.push(element); | ||
| } | ||
| | ||
| if (currentDepth >= adjustedMaxDepth) { | ||
| if (currentDepth >= MAX_DEPTH) { | ||
| continue; | ||
| } | ||
| | ||
| | @@ -2607,7 +2587,7 @@ class ClientSelectorGenerator { | |
| } | ||
| } | ||
| | ||
| if (element.shadowRoot && currentDepth < adjustedMaxDepth - 1) { | ||
| if (element.shadowRoot && currentDepth < MAX_DEPTH - 1) { | ||
| const shadowChildren = element.shadowRoot.children; | ||
| const shadowLimit = Math.min(shadowChildren.length, 20); | ||
| for (let i = 0; i < shadowLimit; i++) { | ||
| | @@ -2716,22 +2696,46 @@ class ClientSelectorGenerator { | |
| } | ||
| | ||
| if (!addPositionToAll) { | ||
| const meaningfulAttrs = ["role", "type", "name", "src", "aria-label"]; | ||
| const meaningfulAttrs = ["role", "type"]; | ||
| for (const attrName of meaningfulAttrs) { | ||
| if (element.hasAttribute(attrName)) { | ||
| const value = element.getAttribute(attrName)!.replace(/'/g, "\\'"); | ||
| return `${tagName}[@${attrName}='${value}']`; | ||
| const isCommonAttribute = this.isAttributeCommonAcrossLists( | ||
| element, | ||
| attrName, | ||
| value, | ||
| otherListElements | ||
| ); | ||
| if (isCommonAttribute) { | ||
| return `${tagName}[@${attrName}='${value}']`; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| | ||
| const testId = element.getAttribute("data-testid"); | ||
| if (testId && !addPositionToAll) { | ||
| return `${tagName}[@data-testid='${testId}']`; | ||
| const isCommon = this.isAttributeCommonAcrossLists( | ||
| element, | ||
| "data-testid", | ||
| testId, | ||
| otherListElements | ||
| ); | ||
| if (isCommon) { | ||
| return `${tagName}[@data-testid='${testId}']`; | ||
| } | ||
| } | ||
| | ||
| if (element.id && !element.id.match(/^\d/) && !addPositionToAll) { | ||
| return `${tagName}[@id='${element.id}']`; | ||
| const isCommon = this.isAttributeCommonAcrossLists( | ||
| element, | ||
| "id", | ||
| element.id, | ||
| otherListElements | ||
| ); | ||
| if (isCommon) { | ||
| return `${tagName}[@id='${element.id}']`; | ||
| } | ||
| } | ||
| | ||
| if (!addPositionToAll) { | ||
| | @@ -2742,7 +2746,15 @@ class ClientSelectorGenerator { | |
| attr.name !== "data-mx-id" && | ||
| attr.value | ||
| ) { | ||
| return `${tagName}[@${attr.name}='${attr.value}']`; | ||
| const isCommon = this.isAttributeCommonAcrossLists( | ||
| element, | ||
| attr.name, | ||
| attr.value, | ||
| otherListElements | ||
| ); | ||
| if (isCommon) { | ||
| return `${tagName}[@${attr.name}='${attr.value}']`; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| | @@ -2906,12 +2918,70 @@ class ClientSelectorGenerator { | |
| const result = pathParts.length > 0 ? "/" + pathParts.join("/") : null; | ||
| | ||
| this.pathCache.set(targetElement, result); | ||
| | ||
| return result; | ||
| } | ||
| | ||
| private isAttributeCommonAcrossLists( | ||
| targetElement: HTMLElement, | ||
| attrName: string, | ||
| attrValue: string, | ||
| otherListElements: HTMLElement[] | ||
| ): boolean { | ||
| if (otherListElements.length === 0) { | ||
| return true; | ||
| } | ||
| | ||
| const targetPath = this.getElementPath(targetElement); | ||
| | ||
| for (const otherListElement of otherListElements) { | ||
| const correspondingElement = this.findCorrespondingElement( | ||
| otherListElement, | ||
| targetPath | ||
| ); | ||
| if (correspondingElement) { | ||
| const otherValue = correspondingElement.getAttribute(attrName); | ||
| if (otherValue !== attrValue) { | ||
| return false; | ||
| } | ||
| } | ||
| } | ||
| | ||
| return true; | ||
| } | ||
| | ||
| private getElementPath(element: HTMLElement): number[] { | ||
| const path: number[] = []; | ||
| let current: HTMLElement | null = element; | ||
| | ||
| while (current && current.parentElement) { | ||
| const siblings = Array.from(current.parentElement.children); | ||
| path.unshift(siblings.indexOf(current)); | ||
| current = current.parentElement; | ||
| } | ||
| | ||
| return path; | ||
| } | ||
| | ||
| private findCorrespondingElement( | ||
| rootElement: HTMLElement, | ||
| path: number[] | ||
| ): HTMLElement | null { | ||
| let current: HTMLElement = rootElement; | ||
| | ||
| for (const index of path) { | ||
| const children = Array.from(current.children); | ||
| if (index >= children.length) { | ||
| return null; | ||
| } | ||
| current = children[index] as HTMLElement; | ||
| } | ||
| | ||
| return current; | ||
| } | ||
| | ||
| private getCommonClassesAcrossLists( | ||
| targetElement: HTMLElement, | ||
| targetElement: HTMLElement, | ||
| otherListElements: HTMLElement[] | ||
| ): string[] { | ||
| if (otherListElements.length === 0) { | ||
| | @@ -3919,9 +3989,48 @@ class ClientSelectorGenerator { | |
| ); | ||
| if (!deepestElement) return null; | ||
| | ||
| if (!this.isMeaningfulElementCached(deepestElement)) { | ||
| const atomicChild = this.findAtomicChildAtPoint(deepestElement, x, y); | ||
| if (atomicChild) { | ||
| return atomicChild; | ||
| } | ||
| } | ||
| | ||
| Comment on lines +3992 to +3998 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🛠️ Refactor suggestion | 🟠 Major Atomic-child fallback misses shadow DOM descendants. findAtomicChildAtPoint only walks light DOM children. If the meaningful descendant is in a shadow root, the fallback won’t find it. Apply this diff: - if (!this.isMeaningfulElementCached(deepestElement)) { - const atomicChild = this.findAtomicChildAtPoint(deepestElement, x, y); + if (!this.isMeaningfulElementCached(deepestElement)) { + const atomicChild = this.findAtomicChildAtPoint(deepestElement, x, y); if (atomicChild) { return atomicChild; } }And enhance traversal: private findAtomicChildAtPoint( parent: HTMLElement, x: number, y: number ): HTMLElement | null { const stack: HTMLElement[] = [parent]; const visited = new Set<HTMLElement>(); while (stack.length > 0) { const element = stack.pop()!; if (visited.has(element)) continue; visited.add(element); if (element !== parent && this.isMeaningfulElementCached(element)) { const rect = element.getBoundingClientRect(); if (x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom) { return element; } } - for (let i = element.children.length - 1; i >= 0; i--) { + // Light DOM children (iterate from topmost in stacking order approximation) + for (let i = element.children.length - 1; i >= 0; i--) { const child = element.children[i] as HTMLElement; const rect = child.getBoundingClientRect(); if (x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom) { stack.push(child); } } + // Shadow DOM children (if any) + if ((element as HTMLElement).shadowRoot) { + const shadowChildren = (element as HTMLElement).shadowRoot!.children; + for (let i = shadowChildren.length - 1; i >= 0; i--) { + const child = shadowChildren[i] as HTMLElement; + const rect = child.getBoundingClientRect(); + if (x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom) { + stack.push(child); + } + } + } } return null; }Also applies to: 4003-4034 🤖 Prompt for AI Agents | ||
| return deepestElement; | ||
| } | ||
| | ||
| private findAtomicChildAtPoint( | ||
| parent: HTMLElement, | ||
| x: number, | ||
| y: number | ||
| ): HTMLElement | null { | ||
| const stack: HTMLElement[] = [parent]; | ||
| const visited = new Set<HTMLElement>(); | ||
| | ||
| while (stack.length > 0) { | ||
| const element = stack.pop()!; | ||
| if (visited.has(element)) continue; | ||
| visited.add(element); | ||
| | ||
| if (element !== parent && this.isMeaningfulElementCached(element)) { | ||
| const rect = element.getBoundingClientRect(); | ||
| if (x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom) { | ||
| return element; | ||
| } | ||
| } | ||
| | ||
| for (let i = element.children.length - 1; i >= 0; i--) { | ||
| const child = element.children[i] as HTMLElement; | ||
| const rect = child.getBoundingClientRect(); | ||
| if (x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom) { | ||
| stack.push(child); | ||
| } | ||
| } | ||
| } | ||
| | ||
| return null; | ||
| } | ||
| | ||
| /** | ||
| * Helper methods used by the unified getDeepestElementFromPoint | ||
| */ | ||
| | ||
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Cross-list attribute check maps by absolute path; compute relative path to the list root and fail closed.
isAttributeCommonAcrossLists builds a path from the document root (getElementPath) then applies it starting from other list roots. This mismaps descendants and treats “corresponding element not found” as implicitly OK, letting non-common attributes pass. Compute a path relative to the current list root and require a match in every other list.
Apply these diffs:
Also applies to: 2717-2728, 2730-2740, 2749-2759, 2926-2953, 2954-2966, 2967-2983
🤖 Prompt for AI Agents